From: Pacho Ramos Date: Sat, 22 Oct 2011 00:27:51 +0000 (+0000) Subject: Drop DEPRECATED flags, bug #388019 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=59c4384c23252134baa81e98aa9f839187be11b3;p=gentoo.git Drop DEPRECATED flags, bug #388019 Package-Manager: portage-2.1.10.29/cvs/Linux x86_64 --- diff --git a/gnome-extra/lock-keys-applet/ChangeLog b/gnome-extra/lock-keys-applet/ChangeLog index 51e7a170c18f..e4aca6460340 100644 --- 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 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/lock-keys-applet/ChangeLog,v 1.12 2010/12/08 17:32:23 pacho Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/lock-keys-applet/ChangeLog,v 1.13 2011/10/22 00:27:51 pacho Exp $ + + 22 Oct 2011; Pacho Ramos + -files/lock-keys-applet-1.0-gtk-disable-deprecated.patch, + lock-keys-applet-1.0.ebuild: + Drop DEPRECATED flags, bug #388019 08 Dec 2010; Pacho Ramos lock-keys-applet-1.0.ebuild: Needs gnome-panel with bonobo support. diff --git a/gnome-extra/lock-keys-applet/Manifest b/gnome-extra/lock-keys-applet/Manifest index 3cdf60003548..c63e59f4dc21 100644 --- a/gnome-extra/lock-keys-applet/Manifest +++ b/gnome-extra/lock-keys-applet/Manifest @@ -1,15 +1,14 @@ -----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 1102 RMD160 75504843eb9aec983896bc5b8a238a6be2a7384f SHA1 996cfcf68df32d5075de40813f2c7b3438a74f85 SHA256 4fb31f7e6a76964f6c1a916b66316edd17782ebe738589203a410760f511d2f1 -MISC ChangeLog 1641 RMD160 64a9249530115c97e5695073dbfa0e4488a286d0 SHA1 b4210bf4d8a4d841838388f1b117670c8d587f9e SHA256 1cbeda8ceb594e172a16f20ed5fcd40377783da52295b752d24dc5ca20d43404 +EBUILD lock-keys-applet-1.0.ebuild 1017 RMD160 3240f34cbdd2ae5d2f3647e117eb557c89eb04d5 SHA1 5ed0c529a0ac5951c278d6a48e136321ef95e558 SHA256 3d8e11a23e96eb1a55b9cecacfc4960adb05bd8f110a8773604249df5a746141 +MISC ChangeLog 1816 RMD160 0607c29635bc46e0294064ce046fe9de658c4196 SHA1 37ae0f9d0e12277434d0ad3a767e787c67490ea7 SHA256 327873aa02077473aa5129fb43908de677caee97629b48cea4ddc8f893ff84d7 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAkz/wS0ACgkQCaWpQKGI+9SosgCggo5Ruk5mH9WXscjqPWUoIt0w -GncAn3yiD8qDj6oztvRRQ/tfV1XqeHRq -=PNpb +iEYEARECAAYFAk6iDgwACgkQCaWpQKGI+9R/hgCeLCQx9EIxukBWBTW62cALT8Wu +zOYAn0lny/dUUcbveZ3SZjdSTQta3TVi +=JDV2 -----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 deleted file mode 100644 index b38987e8f0c0..000000000000 --- a/gnome-extra/lock-keys-applet/files/lock-keys-applet-1.0-gtk-disable-deprecated.patch +++ /dev/null @@ -1,28 +0,0 @@ -# -# 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 b4231dd91b85..b8faf70f8ce9 100644 --- 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,9 +1,11 @@ # Copyright 1999-2010 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.15 2010/12/08 17:32:23 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/lock-keys-applet/lock-keys-applet-1.0.ebuild,v 1.16 2011/10/22 00:27:51 pacho Exp $ -EAPI="3" -inherit autotools gnome2 eutils +EAPI="4" +GCONF_DEBUG="yes" + +inherit gnome2 DESCRIPTION="An applet that shows the status of your Caps, Num and Scroll Lock keys" HOMEPAGE="http://mfcn.ilo.de/led_applet" @@ -26,13 +28,10 @@ DOCS="AUTHORS ChangeLog NEWS README TODO" src_prepare() { gnome2_src_prepare - # remove deprecated definitions, bug #206459 - # courtesy of ubuntu/debian developers - epatch "${FILESDIR}/${P}-gtk-disable-deprecated.patch" + # Drop DEPRECATED flags, bug #388019 + sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \ + src/Makefile.am src/Makefile.in || die # Fix intltool tests echo "GNOME_LockKeysApplet.server.in" >> po/POTFILES.in - - intltoolize --force --copy --automake || die "intltoolize failed" - eautomake }