diff options
| -rw-r--r-- | dev-python/pyxf86config/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-python/pyxf86config/files/0.3.34-remove-rgbpath.patch | 11 | ||||
| -rw-r--r-- | dev-python/pyxf86config/files/Makefile.am | 12 | ||||
| -rw-r--r-- | dev-python/pyxf86config/pyxf86config-0.3.34-r1.ebuild | 11 |
4 files changed, 39 insertions, 3 deletions
diff --git a/dev-python/pyxf86config/ChangeLog b/dev-python/pyxf86config/ChangeLog index e226d264231e..8fe7db7e816f 100644 --- a/dev-python/pyxf86config/ChangeLog +++ b/dev-python/pyxf86config/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-python/pyxf86config # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxf86config/ChangeLog,v 1.8 2008/02/14 02:50:22 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxf86config/ChangeLog,v 1.9 2008/03/19 07:46:14 dberkholz Exp $ + + 19 Mar 2008; Donnie Berkholz <dberkholz@gentoo.org>; + +files/0.3.34-remove-rgbpath.patch, +files/Makefile.am, + pyxf86config-0.3.34-r1.ebuild: + (#206989) Fix for amd64 by using rewritten Makefile.am (Dough Klima and + me). Also fix for xorg-server 1.5 by removing knowledge of RgbPath. 14 Feb 2008; Robin H. Johnson <robbat2@gentoo.org> pyxf86config-0.3.34-r1.ebuild: diff --git a/dev-python/pyxf86config/files/0.3.34-remove-rgbpath.patch b/dev-python/pyxf86config/files/0.3.34-remove-rgbpath.patch new file mode 100644 index 000000000000..f9e6a9e60ea3 --- /dev/null +++ b/dev-python/pyxf86config/files/0.3.34-remove-rgbpath.patch @@ -0,0 +1,11 @@ +diff -u pyxf86config-0.3.34.orig/pyxf86conf.c pyxf86config-0.3.34/pyxf86conf.c +--- pyxf86config-0.3.34.orig/pyxf86conf.c 2008-03-19 00:13:41.000000000 -0700 ++++ pyxf86config-0.3.34/pyxf86conf.c 2008-03-19 00:13:59.000000000 -0700 +@@ -1700,7 +1700,6 @@ + + WrapperAttribute files_attributes[] = { + { "logfile", offsetof(XF86ConfFilesRec,file_logfile), ATTRIBUTE_STRING}, +- { "rgbpath", offsetof(XF86ConfFilesRec,file_rgbpath), ATTRIBUTE_STRING}, + { "module", offsetof(XF86ConfFilesRec,file_modulepath), ATTRIBUTE_STRING}, + { "fontpath", offsetof(XF86ConfFilesRec,file_fontpath), ATTRIBUTE_STRING}, + { "comment", offsetof(XF86ConfFilesRec,file_comment), ATTRIBUTE_STRING}, diff --git a/dev-python/pyxf86config/files/Makefile.am b/dev-python/pyxf86config/files/Makefile.am new file mode 100644 index 000000000000..c405c444a02f --- /dev/null +++ b/dev-python/pyxf86config/files/Makefile.am @@ -0,0 +1,12 @@ +AM_CFLAGS = -fvisibility=hidden + +INCLUDES = -I@PYTHON_INC@ @GLIB_CFLAGS@ @X_CFLAGS@ @XORG_SERVER_CFLAGS@ + +pythondir = $(libdir)/python@PYTHON_VERSION@/site-packages + +python_LTLIBRARIES = ixf86configmodule.la +dist_python_DATA = xf86config.py + +ixf86configmodule_la_SOURCES = pyxf86conf.h pyxf86conf.c xf86ParserExt.h xf86config_ext.c +ixf86configmodule_la_LDFLAGS = -module -shared -avoid-version +ixf86configmodule_la_LIBADD = @GOBJECT_LIBS@ -lxf86config diff --git a/dev-python/pyxf86config/pyxf86config-0.3.34-r1.ebuild b/dev-python/pyxf86config/pyxf86config-0.3.34-r1.ebuild index e92f9d9b4d4c..db0fb9600b04 100644 --- a/dev-python/pyxf86config/pyxf86config-0.3.34-r1.ebuild +++ b/dev-python/pyxf86config/pyxf86config-0.3.34-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxf86config/pyxf86config-0.3.34-r1.ebuild,v 1.2 2008/02/14 02:50:22 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxf86config/pyxf86config-0.3.34-r1.ebuild,v 1.3 2008/03/19 07:46:14 dberkholz Exp $ -inherit eutils python rpm +inherit eutils python rpm autotools # Tag for which Fedora Core version it's from FCVER="8" @@ -32,6 +32,13 @@ src_unpack() { if has_version '>=x11-base/xorg-server-1.4' ; then epatch "${FILESDIR}/xorg-server-1.4-compat.patch" fi + + # Compat with 1.5 + epatch "${FILESDIR}"/0.3.34-remove-rgbpath.patch + + # (#206989) Cleaned up Makefile.am that works correctly on amd64 + cp "${FILESDIR}"/Makefile.am "${S}"/ || die + eautoreconf } src_compile() { |