fix gtk2.4 build issues

3 files changed, 79 insertions, 2 deletions

diff --git a/net-print/gnome-cups-manager/ChangeLog b/net-print/gnome-cups-manager/ChangeLog
index d518eaf2e1c8..5a70e3d391fa 100644
--- a/net-print/gnome-cups-manager/ChangeLog
+++ b/net-print/gnome-cups-manager/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-print/gnome-cups-manager
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gnome-cups-manager/ChangeLog,v 1.15 2004/03/20 22:18:20 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/gnome-cups-manager/ChangeLog,v 1.16 2004/03/21 23:42:37 foser Exp $
+
+  21 Mar 2004; foser <foser@gentoo.org> gnome-cups-manager-0.17.ebuild :
+  Add patch to fix issues with gtk+-2.4 deprecations (#45259)
 
   20 Mar 2004; foser <foser@gentoo.org> gnome-cups-manager-0.17-r03202004.ebuild :
   Add hicolor theme dep, to make sure the icons work
diff --git a/net-print/gnome-cups-manager/files/gnome-cups-manager-0.17-fix_gtk24_deprecation.patch b/net-print/gnome-cups-manager/files/gnome-cups-manager-0.17-fix_gtk24_deprecation.patch
new file mode 100644
index 000000000000..6afa3b5e4a90
--- /dev/null
+++ b/net-print/gnome-cups-manager/files/gnome-cups-manager-0.17-fix_gtk24_deprecation.patch
@@ -0,0 +1,64 @@
+diff -uNr gnome-cups-manager-0.17/gnome-cups-add/Makefile.am gnome-cups-manager-0.17.patched/gnome-cups-add/Makefile.am
+--- gnome-cups-manager-0.17/gnome-cups-add/Makefile.am	2003-05-02 12:44:21.000000000 +0200
++++ gnome-cups-manager-0.17.patched/gnome-cups-add/Makefile.am	2004-03-22 00:29:34.260671832 +0100
+@@ -9,9 +9,7 @@
+ 	-DDATADIR=\""$(datadir)"\" \
+ 	-DGNOME_CUPS_MANAGER_DATADIR=\""$(datadir)/gnome-cups-manager"\" \
+ 	-DLIBDIR=\""$(libdir)"\" \
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
+-	-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED	\
+-	-DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED
++	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	
+ 
+ cupsmanagerdatadir=$(datadir)/gnome-cups-manager
+ cupsmanagerdata_DATA=gnome-cups-add.glade
+@@ -39,4 +37,4 @@
+ gnome_cups_add_LDFLAGS= $(GNOME_LIBS) \
+ 	snmpkit/libsnmpkit.a ../libgnomecups/libgnomecupsui-1.0.la
+ 
+-EXTRA_DIST=gnome-cups-add.glade
+\ No newline at end of file
++EXTRA_DIST=gnome-cups-add.glade
+diff -uNr gnome-cups-manager-0.17/gnome-cups-add/Makefile.in gnome-cups-manager-0.17.patched/gnome-cups-add/Makefile.in
+--- gnome-cups-manager-0.17/gnome-cups-add/Makefile.in	2003-07-01 17:41:06.000000000 +0200
++++ gnome-cups-manager-0.17.patched/gnome-cups-add/Makefile.in	2004-03-22 00:30:07.027690488 +0100
+@@ -129,10 +129,7 @@
+ 	-DDATADIR=\""$(datadir)"\" \
+ 	-DGNOME_CUPS_MANAGER_DATADIR=\""$(datadir)/gnome-cups-manager"\" \
+ 	-DLIBDIR=\""$(libdir)"\" \
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
+-	-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED	\
+-	-DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED
+-
++	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
+ 
+ cupsmanagerdatadir = $(datadir)/gnome-cups-manager
+ cupsmanagerdata_DATA = gnome-cups-add.glade
+diff -uNr gnome-cups-manager-0.17/gnome-cups-manager/Makefile.am gnome-cups-manager-0.17.patched/gnome-cups-manager/Makefile.am
+--- gnome-cups-manager-0.17/gnome-cups-manager/Makefile.am	2003-07-01 17:16:48.000000000 +0200
++++ gnome-cups-manager-0.17.patched/gnome-cups-manager/Makefile.am	2004-03-22 00:29:58.571975952 +0100
+@@ -8,9 +8,7 @@
+ 	-DGNOME_CUPS_MANAGER_DATADIR=\""$(datadir)/gnome-cups-manager"\" \
+ 	-DGNOME_CUPS_MANAGER_PIXMAPDIR=\""$(datadir)/pixmaps/gnome-cups-manager"\" \
+ 	-DLIBDIR=\""$(libdir)"\" \
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
+-	-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED	\
+-	-DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED
++	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
+ 
+ cupsmanagerdatadir=$(datadir)/gnome-cups-manager
+ cupsmanagerdata_DATA=gnome-cups-manager.glade
+diff -uNr gnome-cups-manager-0.17/gnome-cups-manager/Makefile.in gnome-cups-manager-0.17.patched/gnome-cups-manager/Makefile.in
+--- gnome-cups-manager-0.17/gnome-cups-manager/Makefile.in	2003-07-01 17:41:07.000000000 +0200
++++ gnome-cups-manager-0.17.patched/gnome-cups-manager/Makefile.in	2004-03-22 00:29:48.958437432 +0100
+@@ -128,9 +128,7 @@
+ 	-DGNOME_CUPS_MANAGER_DATADIR=\""$(datadir)/gnome-cups-manager"\" \
+ 	-DGNOME_CUPS_MANAGER_PIXMAPDIR=\""$(datadir)/pixmaps/gnome-cups-manager"\" \
+ 	-DLIBDIR=\""$(libdir)"\" \
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
+-	-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED	\
+-	-DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED
++	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
+ 
+ 
+ cupsmanagerdatadir = $(datadir)/gnome-cups-manager
diff --git a/net-print/gnome-cups-manager/gnome-cups-manager-0.17.ebuild b/net-print/gnome-cups-manager/gnome-cups-manager-0.17.ebuild
index 7b1ae99d8280..a49fce7dcc4b 100644
--- a/net-print/gnome-cups-manager/gnome-cups-manager-0.17.ebuild
+++ b/net-print/gnome-cups-manager/gnome-cups-manager-0.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gnome-cups-manager/gnome-cups-manager-0.17.ebuild,v 1.14 2004/03/16 02:37:37 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/gnome-cups-manager/gnome-cups-manager-0.17.ebuild,v 1.15 2004/03/21 23:42:37 foser Exp $
 
 inherit gnome2
 
@@ -21,3 +21,13 @@ RDEPEND=">=dev-libs/glib-2
 
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.20"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	# Fix gtk+-2.4 deprecation issues (#45259)
+	epatch ${FILESDIR}/${P}-fix_gtk24_deprecation.patch
+
+}