Fixed compilation failure with gtk+ 2.4. Thanks to ikezoe <ikezoe@users.sourceforge.jp> for the patch. Closing bug #46425

6 files changed, 50 insertions, 9 deletions

diff --git a/app-dicts/ebview/ChangeLog b/app-dicts/ebview/ChangeLog
index f71dbaac9a1d..86abaa742183 100644
--- a/app-dicts/ebview/ChangeLog
+++ b/app-dicts/ebview/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-dicts/ebview
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/ebview/ChangeLog,v 1.10 2004/03/04 18:52:53 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/ebview/ChangeLog,v 1.11 2004/04/01 18:07:25 usata Exp $
+
+  02 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> ebview-0.3.1-r1.ebuild,
+  ebview-0.3.2-r1.ebuild, ebview-0.3.5.ebuild, files/ebview-gtk24.diff:
+  Fixed compilation failure with gtk+ 2.4. Thanks to ikezoe
+  <ikezoe@users.sourceforge.jp> for the patch. Closing bug #46425
 
 *ebview-0.3.5 (05 Mar 2004)
 
diff --git a/app-dicts/ebview/Manifest b/app-dicts/ebview/Manifest
index 490ce7b2f920..d46edd27f267 100644
--- a/app-dicts/ebview/Manifest
+++ b/app-dicts/ebview/Manifest
@@ -1,10 +1,11 @@
-MD5 6e318d1f4912b718e4ff879ddccf8df9 ChangeLog 1361
+MD5 de5b4a71d86976f54addc1325c57bacd ChangeLog 1633
 MD5 d1411e42201207c6fd5ce3c1e9c37483 metadata.xml 251
-MD5 33073f1af33858574c46f9193f3f86eb ebview-0.3.2-r1.ebuild 950
-MD5 64bb4ae0b18cb3dd48639e71d3d1bbbf ebview-0.3.1-r1.ebuild 950
-MD5 f287eeb331c0b438583e4a53d6d5a113 ebview-0.3.5.ebuild 997
+MD5 6253ec09efc29260ad3367a474b9d623 ebview-0.3.2-r1.ebuild 1003
+MD5 adbd27be7219656f145c0ac0cc1aff6f ebview-0.3.1-r1.ebuild 1003
+MD5 11e74afc879c59b8a488343be8af71b6 ebview-0.3.5.ebuild 1049
 MD5 669a87056e662de95352ff0a7386f940 files/ebview-gettext-0.12-gentoo.diff 371
 MD5 fe8e1c89543dc8e25d6d76c9224140c1 files/ebview-eb4-gentoo.diff 814
 MD5 d875e51767ea447936891b25d7ce395c files/digest-ebview-0.3.1-r1 64
 MD5 496f3a478b1a1766fb374c5f2cb77f28 files/digest-ebview-0.3.2-r1 64
 MD5 7ca1e93a927c69f06d6aba5a74e87927 files/digest-ebview-0.3.5 64
+MD5 fa8622e5791a18b9b15cbf69bb75f736 files/ebview-gtk24.diff 873
diff --git a/app-dicts/ebview/ebview-0.3.1-r1.ebuild b/app-dicts/ebview/ebview-0.3.1-r1.ebuild
index 6d90b26884fc..335ef0563723 100644
--- a/app-dicts/ebview/ebview-0.3.1-r1.ebuild
+++ b/app-dicts/ebview/ebview-0.3.1-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/ebview/ebview-0.3.1-r1.ebuild,v 1.2 2004/03/04 18:52:53 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/ebview/ebview-0.3.1-r1.ebuild,v 1.3 2004/04/01 18:07:25 usata Exp $
+
+inherit eutils
 
 IUSE=""
 
@@ -23,6 +25,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-eb4-gentoo.diff
+	epatch ${FILESDIR}/${PN}-gtk24.diff
 
 	if has_version '>=sys-devel/gettext-0.12' ; then
 		cd ${S}/po
diff --git a/app-dicts/ebview/ebview-0.3.2-r1.ebuild b/app-dicts/ebview/ebview-0.3.2-r1.ebuild
index 2930009871e9..06bf8113a394 100644
--- a/app-dicts/ebview/ebview-0.3.2-r1.ebuild
+++ b/app-dicts/ebview/ebview-0.3.2-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/ebview/ebview-0.3.2-r1.ebuild,v 1.2 2004/03/04 18:52:53 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/ebview/ebview-0.3.2-r1.ebuild,v 1.3 2004/04/01 18:07:25 usata Exp $
+
+inherit eutils
 
 IUSE=""
 
@@ -23,6 +25,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-eb4-gentoo.diff
+	epatch ${FILESDIR}/${PN}-gtk24.diff
 
 	if has_version '>=sys-devel/gettext-0.12' ; then
 		cd ${S}/po
diff --git a/app-dicts/ebview/ebview-0.3.5.ebuild b/app-dicts/ebview/ebview-0.3.5.ebuild
index e25cea0c48fe..a8d86725c424 100644
--- a/app-dicts/ebview/ebview-0.3.5.ebuild
+++ b/app-dicts/ebview/ebview-0.3.5.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/ebview/ebview-0.3.5.ebuild,v 1.1 2004/03/04 18:52:53 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/ebview/ebview-0.3.5.ebuild,v 1.2 2004/04/01 18:07:25 usata Exp $
+
+inherit eutils
 
 IUSE=""
 
@@ -10,7 +12,7 @@ SRC_URI="mirror://sourceforge/ebview/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 DEPEND="${RDEPEND}
 	>=sys-devel/autoconf-2.57"
@@ -23,6 +25,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-eb4-gentoo.diff
+	epatch ${FILESDIR}/${PN}-gtk24.diff
 	rm -rf autom4te.cache
 
 	if has_version '>=sys-devel/gettext-0.12' ; then
diff --git a/app-dicts/ebview/files/ebview-gtk24.diff b/app-dicts/ebview/files/ebview-gtk24.diff
new file mode 100644
index 000000000000..8881127dace8
--- /dev/null
+++ b/app-dicts/ebview/files/ebview-gtk24.diff
@@ -0,0 +1,26 @@
+diff -urN ebview-0.3.5/src/defs.h ebview-0.3.5_gtk240/src/defs.h
+--- ebview-0.3.5/src/defs.h	2004-02-15 22:59:41.000000000 +0900
++++ ebview-0.3.5_gtk240/src/defs.h	2004-04-02 02:04:04.868289632 +0900
+@@ -19,7 +19,9 @@
+ #define __DEFS_H__
+ 
+ /* Disable old GTK+ functions */
++#if (GTK_MAJOR_VERSION == 2) && (GTK_MINOR_VERSION < 3)
+ #define GTK_DISABLE_DEPRECATED 1
++#endif
+ 
+ #include "../config.h"
+ #include <sys/stat.h>
+diff -urN ebview-0.3.5/src/ebview.c ebview-0.3.5_gtk240/src/ebview.c
+--- ebview-0.3.5/src/ebview.c	2004-02-22 12:46:29.000000000 +0900
++++ ebview-0.3.5_gtk240/src/ebview.c	2004-04-02 02:03:39.758106960 +0900
+@@ -15,7 +15,9 @@
+  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+ 
++#if (GTK_MAJOR_VERSION == 2) && (GTK_MINOR_VERSION < 3)
+ #define GTK_DISABLE_DEPRECATED 1
++#endif
+ 
+ #define _GLOBAL
+ #include <signal.h>