fix bug #206459, removing GTK_DISABLE_DEPRECATED stanzas

Package-Manager: portage-2.1.4.4

diff --git a/gnome-extra/lock-keys-applet/ChangeLog b/gnome-extra/lock-keys-applet/ChangeLog
index 141ddb494b6d73b7592ae460bd9ec28373a0103b..f98c6b741493828f6c4e6ed0a37d598f71ba65d3 100644 (file)
--- a/gnome-extra/lock-keys-applet/ChangeLog
+++ b/gnome-extra/lock-keys-applet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/lock-keys-applet
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/lock-keys-applet/ChangeLog,v 1.7 2005/07/19 02:55:10 tester Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/lock-keys-applet/ChangeLog,v 1.8 2008/02/24 22:33:31 eva Exp $
+
+  24 Feb 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/lock-keys-applet-1.0-gtk-disable-deprecated.patch,
+  lock-keys-applet-1.0.ebuild:
+  fix bug #206459, removing GTK_DISABLE_DEPRECATED stanzas
 
   19 Jul 2005; Olivier Crête <tester@gentoo.org>
   lock-keys-applet-1.0.ebuild:

diff --git a/gnome-extra/lock-keys-applet/Manifest b/gnome-extra/lock-keys-applet/Manifest
index e4e2364afa8186eceaab7fcce38376a346f38cd1..323f2b1cddc4d162a35cf61ac216db4b1d3e429b 100644 (file)
--- a/gnome-extra/lock-keys-applet/Manifest
+++ b/gnome-extra/lock-keys-applet/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX lock-keys-applet-1.0-gtk-disable-deprecated.patch 1324 RMD160 bbb81d3bd74f6a86c3cd6872115be9241052202c SHA1 9e7bdf96d387e8c687435472074786129a52e75e SHA256 19b1f0b411b2a87f57cbec2b2f1eeebd7128326df90681fdca6de4f65981c677
 DIST lock-keys-applet-1.0.tar.gz 278970 RMD160 b0ac6e24d89cf324188b3f3ff7ca234aec158947 SHA1 6db4c4613fc52ed78845fcf2d298b1448542df95 SHA256 68bb408792621b0dedfac8961ceb9056736bcb96f8dabe9a9594cbaa47573936
-EBUILD lock-keys-applet-1.0.ebuild 694 RMD160 671c3e9501096437bbf13f021e21d67e4d63b217 SHA1 d3378654de7b2dac6f7097a492815320430f2904 SHA256 1eb6c4944cffcf2bf7dbc71e499c712e541ddf17087567abd27fbe2df25d5421
-MISC ChangeLog 924 RMD160 23535ebb9987fcfba6c477e7321a90d41fc9b9df SHA1 4b8493ff6daeb59e9cd852e4b100af1c02bbbfe8 SHA256 28325ca43b3f5ef13de1ba82ef67e0c36f03d457e2be676fccd7dabdac38174c
+EBUILD lock-keys-applet-1.0.ebuild 880 RMD160 e4dcda711a3be96ab047e5d79e1c65bf75a3646b SHA1 b2296079152ca4870d833e55b088567b586ea5b6 SHA256 2c8cd2da434b206571425114cf67bc8ec13fde9723b07699872066fd79fcff43
+MISC ChangeLog 1126 RMD160 ff7d0901e2225a9439c1c9924ee288db683d8aee SHA1 3ad0fe762135e8d3df83eb8b718bba035a761bb3 SHA256 540d00d51973e51fbfde3e2c25fdef1d29bfa3fa1eeda3469bef23fca356418c
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHwfDD1fmVwcYIWAYRApqfAJ9LxCX1lkte1XlIODRFD6JR3OJbAwCg61o4
+Li6lX60JdeAuAtFrT3Au+98=
+=lFWp
+-----END PGP SIGNATURE-----

diff --git a/gnome-extra/lock-keys-applet/files/lock-keys-applet-1.0-gtk-disable-deprecated.patch b/gnome-extra/lock-keys-applet/files/lock-keys-applet-1.0-gtk-disable-deprecated.patch
new file mode 100644 (file)
index 0000000..b38987e
--- /dev/null
+++ b/gnome-extra/lock-keys-applet/files/lock-keys-applet-1.0-gtk-disable-deprecated.patch
@@ -0,0 +1,28 @@
+#
+# Remove GTK_DISABLE_DEPRECATED stanzas to allow building against >= GTK+ 2.12
+#
+# Patch taken from:
+# http://patches.ubuntu.com/by-release/extracted/ubuntu/l/lock-keys-applet/1.0-8.1/02_gtk_disable_deprecated.patch
+#
+diff -Naur lock-keys-applet-1.0/src/Makefile.am lock-keys-applet.new/src/Makefile.am
+--- lock-keys-applet-1.0/src/Makefile.am       2003-01-07 22:20:40.000000000 +0100
++++ lock-keys-applet.new/src/Makefile.am       2007-12-10 19:37:37.000000000 +0100
+@@ -1,7 +1,6 @@
+ INCLUDES = -I$(top_srcdir) -I$(includedir) $(LK_APPLET_CFLAGS) \
+        -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+        -DGNOME_DISABLE_DEPRECATED \
+-       -DGTK_DISABLE_DEPRECATED \
+        -DGDK_DISABLE_DEPRECATED \
+        -DG_DISABLE_DEPRECATED \
+        -DDATADIR=\""$(datadir)/"\" \
+diff -Naur lock-keys-applet-1.0/src/Makefile.in lock-keys-applet.new/src/Makefile.in
+--- lock-keys-applet-1.0/src/Makefile.in       2007-12-10 19:36:28.000000000 +0100
++++ lock-keys-applet.new/src/Makefile.in       2007-12-10 19:37:42.000000000 +0100
+@@ -174,7 +174,6 @@
+ INCLUDES = -I$(top_srcdir) -I$(includedir) $(LK_APPLET_CFLAGS) \
+        -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+        -DGNOME_DISABLE_DEPRECATED \
+-       -DGTK_DISABLE_DEPRECATED \
+        -DGDK_DISABLE_DEPRECATED \
+        -DG_DISABLE_DEPRECATED \
+        -DDATADIR=\""$(datadir)/"\" \

diff --git a/gnome-extra/lock-keys-applet/lock-keys-applet-1.0.ebuild b/gnome-extra/lock-keys-applet/lock-keys-applet-1.0.ebuild
index 31c9556a8d8ca6577245778dd121fcced6ca15a7..b9df6d1e4edd8fb3a2a9c82aa5edb3ce3aeab701 100644 (file)
--- a/gnome-extra/lock-keys-applet/lock-keys-applet-1.0.ebuild
+++ b/gnome-extra/lock-keys-applet/lock-keys-applet-1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/lock-keys-applet/lock-keys-applet-1.0.ebuild,v 1.10 2007/11/21 11:41:12 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/lock-keys-applet/lock-keys-applet-1.0.ebuild,v 1.11 2008/02/24 22:33:31 eva Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="An applet that shows the status of your Caps, Num and Scroll Lock keys"
 HOMEPAGE="http://mfcn.ilo.de/led_applet"
@@ -21,3 +21,11 @@ DEPEND="${RDEPEND}
        app-text/scrollkeeper"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+src_unpack() {
+       gnome2_src_unpack
+
+       # remove deprecated definitions, bug #206459
+       # courtesy of ubuntu/debian developers
+       epatch "${FILESDIR}/${P}-gtk-disable-deprecated.patch"
+}