Applied patch to compile against gtk+-2.4.

7 files changed, 59 insertions, 16 deletions

diff --git a/app-dicts/stardict/ChangeLog b/app-dicts/stardict/ChangeLog
index 1f9bee149a81..8ba0aa5aeb3f 100644
--- a/app-dicts/stardict/ChangeLog
+++ b/app-dicts/stardict/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-dicts/stardict
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/stardict/ChangeLog,v 1.14 2004/03/06 12:03:51 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/stardict/ChangeLog,v 1.15 2004/04/22 22:47:31 khai Exp $
+
+  22 Apr 2004; <khai@gentoo.org> +files/stardict-gtk24.patch,
+  stardict-2.4.2.ebuild:
+  Applied patch to fix compilation against gtk+-2.4.
 
   06 Mar 2004; Alastair Tse <liquidx@gentoo.org> stardict-2.4.2.ebuild:
   make tools executable (#43719)
diff --git a/app-dicts/stardict/Manifest b/app-dicts/stardict/Manifest
index 495b7ea2e807..6f761b8cf679 100644
--- a/app-dicts/stardict/Manifest
+++ b/app-dicts/stardict/Manifest
@@ -1,12 +1,13 @@
-MD5 6ede5f60c1f9f2d528bf03c53a3ce02a ChangeLog 2741
+MD5 1f15bbbd0cc58f25ac3b7a6b1f752a58 stardict-2.4.2.ebuild 1761
+MD5 811be79d679c618f13b182a098cef521 stardict-2.4.0.ebuild 1482
+MD5 709cd169b8b42f50ecb8b4d2c658bf6c stardict-2.4.1.ebuild 1505
+MD5 038b9053939bfa701c933dbfe86d16c0 stardict-2.2.1.ebuild 1481
 MD5 b1119d84c7a4c3535572b94ec508e907 metadata.xml 215
-MD5 0e5909fb870eeff821ac45eda885f94a stardict-2.2.1.ebuild 1484
-MD5 caebfb96f5f9fd2a9ed4947b853b89e7 stardict-2.4.0.ebuild 1485
-MD5 38ac21f9576282188a9171b3fdb9978d stardict-2.4.1.ebuild 1508
-MD5 ec084217d838f08e9e83e33b62cf7677 stardict-2.4.2.ebuild 1688
+MD5 2be0fe4a7a1369f8962a046525a55d7a ChangeLog 2879
+MD5 40e8df6800d5f7bf138a3a6692854a56 files/stardict-gentoo.patch 547
 MD5 3316b188ec45fd4d24db494c5990c20b files/digest-stardict-2.2.1 67
+MD5 b41107d5daeb5414fa21b3f9905e105c files/stardict-config.sh 565
+MD5 390090b978f088147ce59b0308822093 files/digest-stardict-2.4.2 67
+MD5 9f2bc974d89734beae9aa192bafc68ef files/stardict-gtk24.patch 1210
 MD5 c08bafc9808a52a742f5794f68a9327b files/digest-stardict-2.4.0 67
 MD5 38728c3a0ad675dd5f23d72cb143741a files/digest-stardict-2.4.1 67
-MD5 390090b978f088147ce59b0308822093 files/digest-stardict-2.4.2 67
-MD5 b41107d5daeb5414fa21b3f9905e105c files/stardict-config.sh 565
-MD5 40e8df6800d5f7bf138a3a6692854a56 files/stardict-gentoo.patch 547
diff --git a/app-dicts/stardict/files/stardict-gtk24.patch b/app-dicts/stardict/files/stardict-gtk24.patch
new file mode 100644
index 000000000000..bc79052f93ad
--- /dev/null
+++ b/app-dicts/stardict/files/stardict-gtk24.patch
@@ -0,0 +1,35 @@
+diff -ruN stardict-2.4.2.old/src/Makefile.am stardict-2.4.2/src/Makefile.am
+--- stardict-2.4.2.old/src/Makefile.am	2004-04-22 15:37:45.326039331 -0700
++++ stardict-2.4.2/src/Makefile.am	2004-04-22 15:40:13.902664279 -0700
+@@ -9,12 +9,7 @@
+ 	-DGNOME_ICONDIR=\""$(datadir)/pixmaps"\"		\
+ 	-DSTARDICT_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"		\
+ 	-DSTARDICT_DATA_DIR=\""$(datadir)/stardict"\"		\
+-	-DG_DISABLE_DEPRECATED					\
+-	-DGDK_DISABLE_DEPRECATED				\
+-	-DGTK_DISABLE_DEPRECATED				\
+-	-DGDK_PIXBUF_DISABLE_DEPRECATED				\
+-	-DGNOME_DISABLE_DEPRECATED
+-
++	
+ 
+ stardict_LDFLAGS = 
+ 
+diff -ruN stardict-2.4.2.old/src/Makefile.in stardict-2.4.2/src/Makefile.in
+--- stardict-2.4.2.old/src/Makefile.in	2004-04-22 15:37:45.332037580 -0700
++++ stardict-2.4.2/src/Makefile.in	2004-04-22 15:40:13.902664279 -0700
+@@ -141,13 +141,7 @@
+ 	-DGNOME_ICONDIR=\""$(datadir)/pixmaps"\"		\
+ 	-DSTARDICT_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"		\
+ 	-DSTARDICT_DATA_DIR=\""$(datadir)/stardict"\"		\
+-	-DG_DISABLE_DEPRECATED					\
+-	-DGDK_DISABLE_DEPRECATED				\
+-	-DGTK_DISABLE_DEPRECATED				\
+-	-DGDK_PIXBUF_DISABLE_DEPRECATED				\
+-	-DGNOME_DISABLE_DEPRECATED
+-
+-
++	
+ stardict_LDFLAGS = 
+ 
+ stardict_LDADD = \
diff --git a/app-dicts/stardict/stardict-2.2.1.ebuild b/app-dicts/stardict/stardict-2.2.1.ebuild
index 08cbc5ba1bbc..c53b32eb1a85 100644
--- a/app-dicts/stardict/stardict-2.2.1.ebuild
+++ b/app-dicts/stardict/stardict-2.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/stardict/stardict-2.2.1.ebuild,v 1.4 2003/09/12 19:20:49 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/stardict/stardict-2.2.1.ebuild,v 1.5 2004/04/22 22:47:31 khai Exp $
 
 inherit gnome2
 
diff --git a/app-dicts/stardict/stardict-2.4.0.ebuild b/app-dicts/stardict/stardict-2.4.0.ebuild
index 0b00182fb10e..385f9fc82f1f 100644
--- a/app-dicts/stardict/stardict-2.4.0.ebuild
+++ b/app-dicts/stardict/stardict-2.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/stardict/stardict-2.4.0.ebuild,v 1.2 2003/10/30 10:02:39 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/stardict/stardict-2.4.0.ebuild,v 1.3 2004/04/22 22:47:31 khai Exp $
 
 inherit gnome2
 
diff --git a/app-dicts/stardict/stardict-2.4.1.ebuild b/app-dicts/stardict/stardict-2.4.1.ebuild
index b00ae51c43d6..3a5bc1a38827 100644
--- a/app-dicts/stardict/stardict-2.4.1.ebuild
+++ b/app-dicts/stardict/stardict-2.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/stardict/stardict-2.4.1.ebuild,v 1.2 2004/01/07 16:53:15 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/stardict/stardict-2.4.1.ebuild,v 1.3 2004/04/22 22:47:31 khai Exp $
 
 inherit gnome2
 
diff --git a/app-dicts/stardict/stardict-2.4.2.ebuild b/app-dicts/stardict/stardict-2.4.2.ebuild
index 464efa224f31..bbd19d37a292 100644
--- a/app-dicts/stardict/stardict-2.4.2.ebuild
+++ b/app-dicts/stardict/stardict-2.4.2.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/app-dicts/stardict/stardict-2.4.2.ebuild,v 1.2 2004/03/06 12:03:51 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/stardict/stardict-2.4.2.ebuild,v 1.3 2004/04/22 22:47:31 khai Exp $
 
 inherit gnome2
 
@@ -35,6 +35,9 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	gnome2_omf_fix
+
+	# Fix gtk-2.4 deprecation issues
+	epatch ${FILESDIR}/stardict-gtk24.patch
 }
 
 src_install() {