diff options
author | Akinori Hattori <hattya@gentoo.org> | 2006-10-30 10:29:13 +0000 |
---|---|---|
committer | Akinori Hattori <hattya@gentoo.org> | 2006-10-30 10:29:13 +0000 |
commit | 6229bcf841067e0ff79815e8d2730dec2450575a (patch) | |
tree | 6741d45fd86aa119f92dfd8961a74c74a5eb4e2b /dev-scheme/gauche-gtk | |
parent | Mask bpmdj pending last rites, if nobody steps up. (diff) | |
download | historical-6229bcf841067e0ff79815e8d2730dec2450575a.tar.gz historical-6229bcf841067e0ff79815e8d2730dec2450575a.tar.bz2 historical-6229bcf841067e0ff79815e8d2730dec2450575a.zip |
fix compilation problem with gtk+ v2.8.
Package-Manager: portage-2.1.1
Diffstat (limited to 'dev-scheme/gauche-gtk')
-rw-r--r-- | dev-scheme/gauche-gtk/ChangeLog | 6 | ||||
-rw-r--r-- | dev-scheme/gauche-gtk/Manifest | 28 | ||||
-rw-r--r-- | dev-scheme/gauche-gtk/files/digest-gauche-gtk-0.4.1 | 2 | ||||
-rw-r--r-- | dev-scheme/gauche-gtk/files/gauche-gtk-0.4.1-gtk+-2.8.diff | 23 | ||||
-rw-r--r-- | dev-scheme/gauche-gtk/gauche-gtk-0.4.1.ebuild | 69 |
5 files changed, 89 insertions, 39 deletions
diff --git a/dev-scheme/gauche-gtk/ChangeLog b/dev-scheme/gauche-gtk/ChangeLog index e919c5bc8da4..0e8d184c98f3 100644 --- a/dev-scheme/gauche-gtk/ChangeLog +++ b/dev-scheme/gauche-gtk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-scheme/gauche-gtk # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-scheme/gauche-gtk/ChangeLog,v 1.8 2006/04/22 15:16:35 hattya Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-scheme/gauche-gtk/ChangeLog,v 1.9 2006/10/30 10:29:13 hattya Exp $ + + 30 Oct 2006; Akinori Hattori <hattya@gentoo.org> + +files/gauche-gtk-0.4.1-gtk+-2.8.diff, gauche-gtk-0.4.1.ebuild: + fix compilation problem with gtk+ v2.8. 22 Apr 2006; Akinori Hattori <hattya@gentoo.org> -gauche-gtk-0.3.1.ebuild, -gauche-gtk-0.3.2.ebuild, -gauche-gtk-0.4.ebuild: diff --git a/dev-scheme/gauche-gtk/Manifest b/dev-scheme/gauche-gtk/Manifest index ca164a8b8c4e..d39f882511eb 100644 --- a/dev-scheme/gauche-gtk/Manifest +++ b/dev-scheme/gauche-gtk/Manifest @@ -1,10 +1,20 @@ -MD5 00356fc22883ead9fe29be83982bbec9 ChangeLog 2431 -MD5 bd8bbfa0aae1a2c053ecfca70fdcd682 files/digest-gauche-gtk-0.3.1 65 -MD5 923c01868e508cefb39569847a3a0ecf files/digest-gauche-gtk-0.3.2 65 -MD5 c00557c3f8ab697553606421240cab68 files/digest-gauche-gtk-0.4 63 -MD5 9ddaabebaa15b0092351bc8b0775726b files/digest-gauche-gtk-0.4.1 65 -MD5 b9d115bbe75ab3fef5817b7747906e1c gauche-gtk-0.3.1.ebuild 1345 -MD5 ae0ede3ab54ce7521f21ed01f209affb gauche-gtk-0.3.2.ebuild 1324 -MD5 9be968288a160d94a6e21ea655aff95a gauche-gtk-0.4.1.ebuild 1672 -MD5 0164b6424827312225982d3e01b06e8e gauche-gtk-0.4.ebuild 1675 +AUX gauche-gtk-0.4.1-gtk+-2.8.diff 932 RMD160 05cb3c74d47ef5d238d209d093daf2660f2d84a9 SHA1 95f8e3720c300f5f96bb98ac9f730fc78fed0457 SHA256 faf3b430dcfd33d3b8582652e5da566f2339e26da1190b9b1b4d16b3e87e62a4 +MD5 66e3bc9372b21a306b7051eb6cb0f6fe files/gauche-gtk-0.4.1-gtk+-2.8.diff 932 +RMD160 05cb3c74d47ef5d238d209d093daf2660f2d84a9 files/gauche-gtk-0.4.1-gtk+-2.8.diff 932 +SHA256 faf3b430dcfd33d3b8582652e5da566f2339e26da1190b9b1b4d16b3e87e62a4 files/gauche-gtk-0.4.1-gtk+-2.8.diff 932 +DIST Gauche-gtk-0.4.1.tgz 324945 RMD160 8ee51c2444505dfe6bc70d18f244c510f0c2bcfc SHA1 46a8380f318b4acfc012c2c861de21cbdf4ef157 SHA256 5f600214b04ce4090ca6aa63f9344a0c6ec9a2462e4106b53a7a44514d4a73db +EBUILD gauche-gtk-0.4.1.ebuild 1682 RMD160 9cfb1f9fe10dd23bdffd37c37b64b8469c1c00cc SHA1 6d7e42aee872fa46dcb89f831dc086049bf5f6ba SHA256 f89e4950ab7c07751c382ec9d4e01b629a67356424f4fca5febe8fc23b0f3ceb +MD5 859f8351a215c080c6ce5337bef06390 gauche-gtk-0.4.1.ebuild 1682 +RMD160 9cfb1f9fe10dd23bdffd37c37b64b8469c1c00cc gauche-gtk-0.4.1.ebuild 1682 +SHA256 f89e4950ab7c07751c382ec9d4e01b629a67356424f4fca5febe8fc23b0f3ceb gauche-gtk-0.4.1.ebuild 1682 +MISC ChangeLog 2743 RMD160 47f648985137045b653c16834c79381d53749f02 SHA1 ea596352806c94f1ecb88594eab4b0c9ae0598ab SHA256 faa59b5a2da55d10e73e196b3540f7e015b2d3c856be265bedf2e25592a92978 +MD5 8a583979f6961fa24553c9a5056bf848 ChangeLog 2743 +RMD160 47f648985137045b653c16834c79381d53749f02 ChangeLog 2743 +SHA256 faa59b5a2da55d10e73e196b3540f7e015b2d3c856be265bedf2e25592a92978 ChangeLog 2743 +MISC metadata.xml 312 RMD160 7b2dcc1ae250016f1f27727ea2209096e128f045 SHA1 05c3b2b37d0afb44411f4e63eab08d319559a1c6 SHA256 a2a57222e7b51455a20c18f51ab7475b6c3ad87b33107d8ce2459b20b73426f8 MD5 e4a585426caa56a65128b6504cab7d4d metadata.xml 312 +RMD160 7b2dcc1ae250016f1f27727ea2209096e128f045 metadata.xml 312 +SHA256 a2a57222e7b51455a20c18f51ab7475b6c3ad87b33107d8ce2459b20b73426f8 metadata.xml 312 +MD5 fd91d98d65f61d3e94eff18fb79b1728 files/digest-gauche-gtk-0.4.1 241 +RMD160 9e4fed7d6c8da82580bae6d6c0356b1fc8dc2458 files/digest-gauche-gtk-0.4.1 241 +SHA256 5d74d5e1ee6e26e5bae00e2d9812d5a0971096dc3bb823584eb8b8a171564ae3 files/digest-gauche-gtk-0.4.1 241 diff --git a/dev-scheme/gauche-gtk/files/digest-gauche-gtk-0.4.1 b/dev-scheme/gauche-gtk/files/digest-gauche-gtk-0.4.1 index 92895dc34aec..b33ec17bd66f 100644 --- a/dev-scheme/gauche-gtk/files/digest-gauche-gtk-0.4.1 +++ b/dev-scheme/gauche-gtk/files/digest-gauche-gtk-0.4.1 @@ -1 +1,3 @@ MD5 18356efab446b9524be8371a3b852a6a Gauche-gtk-0.4.1.tgz 324945 +RMD160 8ee51c2444505dfe6bc70d18f244c510f0c2bcfc Gauche-gtk-0.4.1.tgz 324945 +SHA256 5f600214b04ce4090ca6aa63f9344a0c6ec9a2462e4106b53a7a44514d4a73db Gauche-gtk-0.4.1.tgz 324945 diff --git a/dev-scheme/gauche-gtk/files/gauche-gtk-0.4.1-gtk+-2.8.diff b/dev-scheme/gauche-gtk/files/gauche-gtk-0.4.1-gtk+-2.8.diff new file mode 100644 index 000000000000..9734da949518 --- /dev/null +++ b/dev-scheme/gauche-gtk/files/gauche-gtk-0.4.1-gtk+-2.8.diff @@ -0,0 +1,23 @@ +diff -urN Gauche-gtk-0.4.1.orig/src/gtktexttag.stub Gauche-gtk-0.4.1/src/gtktexttag.stub +--- Gauche-gtk-0.4.1.orig/src/gtktexttag.stub 2004-06-27 12:59:26.000000000 +0900 ++++ Gauche-gtk-0.4.1/src/gtktexttag.stub 2006-10-30 17:53:25.039657000 +0900 +@@ -36,7 +36,6 @@ + (language-set :type <uint>) + (pad1 :type <uint>) + (pad2 :type <uint>) +- (pad3 :type <uint>) + ) + (allocator (c "Scm_GtkObjectAllocate")) + ) +diff -urN Gauche-gtk-0.4.1.orig/src/gtktoolbar.stub Gauche-gtk-0.4.1/src/gtktoolbar.stub +--- Gauche-gtk-0.4.1.orig/src/gtktoolbar.stub 2004-06-27 12:59:26.000000000 +0900 ++++ Gauche-gtk-0.4.1/src/gtktoolbar.stub 2006-10-30 18:16:32.889657000 +0900 +@@ -51,8 +51,6 @@ + (tooltips :type <gtk-tooltips>) + (button-maxw :type <int>) + (button-maxh :type <int>) +- (style-set-connection :type <uint>) +- (icon-size-connection :type <uint>) + (style-set :type <uint>) + (icon-size-set :type <uint>) + ) diff --git a/dev-scheme/gauche-gtk/gauche-gtk-0.4.1.ebuild b/dev-scheme/gauche-gtk/gauche-gtk-0.4.1.ebuild index 51945d743988..7c844a1ea76c 100644 --- a/dev-scheme/gauche-gtk/gauche-gtk-0.4.1.ebuild +++ b/dev-scheme/gauche-gtk/gauche-gtk-0.4.1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-scheme/gauche-gtk/gauche-gtk-0.4.1.ebuild,v 1.5 2006/04/22 15:15:01 hattya Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-scheme/gauche-gtk/gauche-gtk-0.4.1.ebuild,v 1.6 2006/10/30 10:29:13 hattya Exp $ inherit eutils flag-o-matic -IUSE="glgd nls opengl" +IUSE="examples glgd nls opengl" MY_P="${P/g/G}" @@ -12,11 +12,10 @@ DESCRIPTION="GTK2 binding for Gauche" HOMEPAGE="http://gauche.sf.net/" SRC_URI="mirror://sourceforge/gauche/${MY_P}.tgz" -RESTRICT="nomirror" LICENSE="BSD" KEYWORDS="~ppc x86" SLOT="0" -S="${WORKDIR}/${MY_P}" +S=${WORKDIR}/${MY_P} DEPEND="${RDEPEND} dev-util/pkgconfig" @@ -24,9 +23,20 @@ RDEPEND=">=x11-libs/gtk+-2 >=dev-lang/gauche-0.7.4.1 opengl? ( >=x11-libs/gtkglext-0.6.0 )" +src_unpack() { + + unpack ${A} + cd ${S} + + if has_version '>=x11-libs/gtk+-2.8'; then + epatch "${FILESDIR}"/${P}-gtk+-2.8.diff + fi + +} + src_compile() { - local myconf myflags + local myconf if use opengl; then if use glgd; then @@ -42,44 +52,45 @@ src_compile() { strip-flags - myflags=${CFLAGS} - unset CFLAGS CXXFLAGS - econf ${myconf} || die - emake OPTFLAGS="${myflags}" || die + emake || die } -src_install() { +src_test() { - dodir $(gauche-config --syslibdir) - dodir $(gauche-config --sysincdir) - dodir $(gauche-config --sysarchdir) + return - make DESTDIR=${D} install || die +} + +src_install() { + + emake DESTDIR="${D}" install || die dodoc ChangeLog README + if use examples; then + docinto examples - docinto examples - for f in examples/*; do - [ -f ${f} ] && dodoc ${f} - done + for f in examples/*; do + [ -f ${f} ] && dodoc ${f} + done - docinto examples/gtk-tutorial - dodoc examples/gtk-tutorial/* + docinto examples/gtk-tutorial + dodoc examples/gtk-tutorial/* - if use opengl; then - docinto examples/gtkglext - dodoc examples/gtkglext/* + if use opengl; then + docinto examples/gtkglext + dodoc examples/gtkglext/* - if use glgd; then - docinto examples/glgd - dodoc examples/glgd/* + if use glgd; then + docinto examples/glgd + dodoc examples/glgd/* - docinto - newdoc glgd/README README.glgd - newdoc glgd/README.eucjp README.eucjp.glgd + docinto + newdoc glgd/README README.glgd + newdoc glgd/README.eucjp README.eucjp.glgd + fi fi fi |