From: Peter Weller Date: Sat, 6 Jan 2007 10:50:49 +0000 (+0000) Subject: Added patch to fix bug #144968 for good... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b24fac4665fa1dc9d08b1f544762e2e1075bee6e;p=gentoo.git Added patch to fix bug #144968 for good... Package-Manager: portage-2.1.1-r2 --- diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog index bb96df385ec7..750fd5d0ff89 100644 --- a/net-im/gajim/ChangeLog +++ b/net-im/gajim/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/gajim # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.31 2007/01/06 09:07:54 antarus Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.32 2007/01/06 10:50:49 welp Exp $ + + 06 Jan 2007; Peter Weller (welp) + +files/gajim-10.1-FLAGS_noOverride.patch, gajim-0.10.1.ebuild: + Added patch to fix bug #144968 for good... 06 Jan 2007; Alec Warner gajim-0.11-r3.ebuild: dbus needs to die, thanks to drac again for reporting diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest index ca05a0f27bed..8a089a7b1437 100644 --- a/net-im/gajim/Manifest +++ b/net-im/gajim/Manifest @@ -1,3 +1,7 @@ +AUX gajim-10.1-FLAGS_noOverride.patch 2838 RMD160 3b67f3c6e09378ac215e74edbdf4814ccd8e89bd SHA1 7ce20640491f6efdddc39385d68398a6729c7eaa SHA256 bc33aa2492d68c6a95a5a322ccc6c5c3adb4b5e18640f6d99e63321b7240985b +MD5 e43b8a78f00f2e806c7ba9f8ca302913 files/gajim-10.1-FLAGS_noOverride.patch 2838 +RMD160 3b67f3c6e09378ac215e74edbdf4814ccd8e89bd files/gajim-10.1-FLAGS_noOverride.patch 2838 +SHA256 bc33aa2492d68c6a95a5a322ccc6c5c3adb4b5e18640f6d99e63321b7240985b files/gajim-10.1-FLAGS_noOverride.patch 2838 AUX gajim-10.1-Makefile.patch 475 RMD160 7bad6b10f48a3bc8a5bcd53c7e96f444a7f9c941 SHA1 67bb9cbb179bf62f1c4a6d3c6f4a9fee1c3c26c5 SHA256 df756da82d1bfa05f5df0658ff24e6f5401aeb302025b5f98c6f35f4392b4dc1 MD5 df0bdfb4e54c040e2b5e9e4c8c473517 files/gajim-10.1-Makefile.patch 475 RMD160 7bad6b10f48a3bc8a5bcd53c7e96f444a7f9c941 files/gajim-10.1-Makefile.patch 475 @@ -9,22 +13,22 @@ SHA256 c78a602738e0c50e680ee1c5913726116e6c5df18080f28c326fcfab1179d380 files/ga DIST gajim-0.10.1.tar.bz2 2066396 RMD160 405b813db9b7e4aa4c690a77108948886c61fc62 SHA1 909f197594f1d9f0ca678bd6b0b8edbb45d357af SHA256 b167a3405d8a5e9a3913fe711562a9cb8bb8dbfc78240dbb5b3c9c51a1610174 DIST gajim-0.11.tar.bz2 2684957 RMD160 ff92f3914eb14596f725a47efa04acb402053723 SHA1 b4cea429f67d4cf241873cf7079827b160d25cb2 SHA256 1b660d2516b918fdba7533aab3dead8c222c98964ea459c5e4204c4949055422 DIST gajim-0.8.2.tar.bz2 775069 RMD160 d712614d9e9985de0ce0dc624465255376b67ffd SHA1 6ff83ebfcb86095485843e70810f78d3594be4b0 SHA256 069225ebd1aca9799fcfba4243e666105523ce7846c35476bd1e2670fe437653 -EBUILD gajim-0.10.1.ebuild 2015 RMD160 8cbd45485960b659d08b23346c50af4c87aa6812 SHA1 3da3a41c515882148b6c67dd414100cf2ab73622 SHA256 7528f76aeff8c405c2a3dc355444e05d1f6ccf4bc2567eb24d1cb691b708b980 -MD5 db0090ae72c5bfb808aa0c2853a8b557 gajim-0.10.1.ebuild 2015 -RMD160 8cbd45485960b659d08b23346c50af4c87aa6812 gajim-0.10.1.ebuild 2015 -SHA256 7528f76aeff8c405c2a3dc355444e05d1f6ccf4bc2567eb24d1cb691b708b980 gajim-0.10.1.ebuild 2015 -EBUILD gajim-0.11-r3.ebuild 2318 RMD160 e6d789c3603827fad72b0ecb796371cc34ed3a19 SHA1 cf4ec53470072e7f4185cfc3140c6eee83b0b3af SHA256 6829490474e09dee1eed440b967cb4a2b531616fe97e0851c37f3cca5ae61813 -MD5 b80b354588483a722c76fc2dfb1d0faf gajim-0.11-r3.ebuild 2318 -RMD160 e6d789c3603827fad72b0ecb796371cc34ed3a19 gajim-0.11-r3.ebuild 2318 -SHA256 6829490474e09dee1eed440b967cb4a2b531616fe97e0851c37f3cca5ae61813 gajim-0.11-r3.ebuild 2318 +EBUILD gajim-0.10.1.ebuild 2069 RMD160 9bccbef60e9612b651546d196e81ccfaf5f1c0b6 SHA1 3018560b483f0887d3ded3bd0fce1034fa724e9d SHA256 6fb6114a9b49c7ebc09256ec874f20fd755cb04c2fab7541f6877bb18f5211d4 +MD5 0a844c72ab126266d3fda9e8dd58b0fe gajim-0.10.1.ebuild 2069 +RMD160 9bccbef60e9612b651546d196e81ccfaf5f1c0b6 gajim-0.10.1.ebuild 2069 +SHA256 6fb6114a9b49c7ebc09256ec874f20fd755cb04c2fab7541f6877bb18f5211d4 gajim-0.10.1.ebuild 2069 +EBUILD gajim-0.11-r3.ebuild 2314 RMD160 cdcff510de522d52fe0cc51ca515c8632b71885c SHA1 cfbbdb9dd66e6aa48a2faf7d3b11b5b15672e744 SHA256 1740c5aeb6122f31c214c2a9862662294eeb89a5f60c90979a2d6354fe8d384c +MD5 57b70eba535044ea37b65bc9540c7741 gajim-0.11-r3.ebuild 2314 +RMD160 cdcff510de522d52fe0cc51ca515c8632b71885c gajim-0.11-r3.ebuild 2314 +SHA256 1740c5aeb6122f31c214c2a9862662294eeb89a5f60c90979a2d6354fe8d384c gajim-0.11-r3.ebuild 2314 EBUILD gajim-0.8.2.ebuild 1190 RMD160 81610feba58eaa4127333336cb1a73f6d767f079 SHA1 9221883cd141194faca6ff687ba3d3711b8cd5b2 SHA256 017d9d24ea9443f83da9bcfcd78a28d89a55c4ef8de358fddef50b30b6a62742 MD5 3550a55fbbb772a7e346e810966eeb14 gajim-0.8.2.ebuild 1190 RMD160 81610feba58eaa4127333336cb1a73f6d767f079 gajim-0.8.2.ebuild 1190 SHA256 017d9d24ea9443f83da9bcfcd78a28d89a55c4ef8de358fddef50b30b6a62742 gajim-0.8.2.ebuild 1190 -MISC ChangeLog 4882 RMD160 8ea63a2bd2292b9f7f2c95655ebba9faca105555 SHA1 81386e27d202584200deffab97f50c719906fe7a SHA256 0b2d002b40bca905ae881035e7c459bc650c2f6ed15e251162c57da97068723e -MD5 b0c6429e4a7157186ad05092c855088a ChangeLog 4882 -RMD160 8ea63a2bd2292b9f7f2c95655ebba9faca105555 ChangeLog 4882 -SHA256 0b2d002b40bca905ae881035e7c459bc650c2f6ed15e251162c57da97068723e ChangeLog 4882 +MISC ChangeLog 5043 RMD160 49b6ef54568054fa075ba683fdbf9f2fdbde558a SHA1 7731725be6f6e4c070739b6589c0342f62a88c85 SHA256 928c465272c1a3ad2b6686108d99b245f9a081b89597a81a4731203b662bdeb7 +MD5 0ffc41ad6c8bebe331a17f60260d5b5a ChangeLog 5043 +RMD160 49b6ef54568054fa075ba683fdbf9f2fdbde558a ChangeLog 5043 +SHA256 928c465272c1a3ad2b6686108d99b245f9a081b89597a81a4731203b662bdeb7 ChangeLog 5043 MISC metadata.xml 369 RMD160 b5684f22a8b81f5213bda704ee8d123d1cd796f7 SHA1 873a1e33738638929c94655538bf9d46d0df79f6 SHA256 7b181490899f19191e60d8b702571f6a642fbe355c37c25d8cd710bfe2f2fe0d MD5 bd9809fa23d644d4ee6cb9497f22654c metadata.xml 369 RMD160 b5684f22a8b81f5213bda704ee8d123d1cd796f7 metadata.xml 369 diff --git a/net-im/gajim/files/gajim-10.1-FLAGS_noOverride.patch b/net-im/gajim/files/gajim-10.1-FLAGS_noOverride.patch new file mode 100644 index 000000000000..c680fee26c9c --- /dev/null +++ b/net-im/gajim/files/gajim-10.1-FLAGS_noOverride.patch @@ -0,0 +1,63 @@ +Index: src/Makefile +=================================================================== +--- src/Makefile (revision 6612) ++++ src/Makefile (working copy) +@@ -1,21 +1,24 @@ + # Set the C flags to include the GTK+ and Python libraries + PYTHON ?= python + PYTHONVER = `$(PYTHON) -c 'import sys; print sys.version[:3]'` +-CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -fPIC -I/usr/include/python$(PYTHONVER) -I. +-LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0` -lpython$(PYTHONVER) ++gtk_CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -fPIC -I/usr/include/python$(PYTHONVER) -I. ++gtk_LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0` -lpython$(PYTHONVER) + + all: trayicon.so gtkspell.so + + # Build the shared objects + trayicon.so: trayicon.o eggtrayicon.o trayiconmodule.o +- $(CC) $(LDFLAGS) -shared $^ -o $@ ++ $(CC) -shared $^ -o $@ $(LDFLAGS) $(gtk_LDFLAGS) + + gtkspell.so: +- $(CC) $(OPTFLAGS) $(CFLAGS) $(LDFLAGS) `pkg-config --libs --cflags gtkspell-2.0` -shared gtkspellmodule.c $^ -o $@ ++ $(CC) $(OPTFLAGS) $(CFLAGS) $(LDFLAGS) $(gtk_CFLAGS) $(gtk_LDFLAGS) `pkg-config --libs --cflags gtkspell-2.0` -shared gtkspellmodule.c $^ -o $@ + + # The path to the GTK+ python types + DEFS=`pkg-config --variable=defsdir pygtk-2.0` + ++%.o: %.c ++ $(CC) -o $@ -c $< $(CFLAGS) $(gtk_CFLAGS) ++ + # Generate the C wrapper from the defs and our override file + trayicon.c: trayicon.defs trayicon.override + pygtk-codegen-2.0 --prefix trayicon \ +Index: src/common/Makefile +=================================================================== +--- src/common/Makefile (revision 6612) ++++ src/common/Makefile (working copy) +@@ -6,19 +6,19 @@ + + ifeq ($(HAVE_XSCRNSAVER),YES) + # We link with libXScrnsaver from modular X.Org X11 +-CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0 xscrnsaver` -fpic -I/usr/include/python$(PYTHONVER) -I. +-LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0 xscrnsaver` -lpython$(PYTHONVER) ++gtk_and_x_CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0 xscrnsaver` -fpic -I/usr/include/python$(PYTHONVER) -I. ++gtk_and_x_LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0 xscrnsaver` -lpython$(PYTHONVER) + else + # # We link with libXScrnsaver from monolithic X.Org X11 +-CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -fpic -I/usr/include/python$(PYTHONVER) -I. +-LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0` -L/usr/X11R6$(LIBDIR) -lX11 \ +- -lXss -lXext -lpython$(PYTHONVER) ++gtk_and_x_CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -fpic -I/usr/include/python$(PYTHONVER) -I. ++gtk_and_x_LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0` \ ++ -L/usr/X11R6$(LIBDIR) -lX11 -lXss -lXext -lpython$(PYTHONVER) + endif + + all: idle.so + + idle.so: +- $(CC) $(OPTFLAGS) $(CFLAGS) $(LDFLAGS) -shared idle.c $^ -o $@ ++ $(CC) $(OPTFLAGS) $(CFLAGS) $(LDFLAGS) $(gtk_and_x_CFLAGS) $(gtk_and_x_LDFLAGS) -shared idle.c $^ -o $@ + + clean: + rm -f *.so diff --git a/net-im/gajim/gajim-0.10.1.ebuild b/net-im/gajim/gajim-0.10.1.ebuild index a1d19605d164..b978d76ba311 100644 --- a/net-im/gajim/gajim-0.10.1.ebuild +++ b/net-im/gajim/gajim-0.10.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.10.1.ebuild,v 1.11 2007/01/06 00:04:22 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.10.1.ebuild,v 1.12 2007/01/06 10:50:49 welp Exp $ inherit virtualx multilib eutils @@ -42,6 +42,7 @@ src_unpack() { unpack ${A} cd ${S} epatch ${FILESDIR}/gajim-10.1-Makefile.patch + epatch ${FILESDIR}/gajim-10.1-FLAGS_noOverride.patch } src_compile() { diff --git a/net-im/gajim/gajim-0.11-r3.ebuild b/net-im/gajim/gajim-0.11-r3.ebuild index b2c4c9be1783..9f2f31b44901 100644 --- a/net-im/gajim/gajim-0.11-r3.ebuild +++ b/net-im/gajim/gajim-0.11-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.11-r3.ebuild,v 1.4 2007/01/06 09:07:54 antarus Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.11-r3.ebuild,v 1.5 2007/01/06 10:50:49 welp Exp $ inherit multilib python eutils @@ -20,7 +20,7 @@ DEPEND="dev-python/pysqlite dev-util/pkgconfig" RDEPEND="gnome? ( dev-python/gnome-python-extras dev-python/gnome-python-desktop ) - dbus? ( || + dbus? ( || ( ( >=sys-apps/dbus-0.90 dev-python/dbus-python dev-libs/dbus-glib ) (