summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Longinotti <chtekk@gentoo.org>2006-01-20 18:07:29 +0000
committerLuca Longinotti <chtekk@gentoo.org>2006-01-20 18:07:29 +0000
commitedec9a7bcc4a04730905463a327a6995b9400925 (patch)
tree1698a4cd379b2648919e461154321c56001d2af3 /dev-php4/php-gtk
parentVersion bump, closes bug 119696. (diff)
downloadgentoo-2-edec9a7bcc4a04730905463a327a6995b9400925.tar.gz
gentoo-2-edec9a7bcc4a04730905463a327a6995b9400925.tar.bz2
gentoo-2-edec9a7bcc4a04730905463a327a6995b9400925.zip
Fix bug #90570.
(Portage version: 2.0.54)
Diffstat (limited to 'dev-php4/php-gtk')
-rw-r--r--dev-php4/php-gtk/ChangeLog8
-rw-r--r--dev-php4/php-gtk/Manifest15
-rw-r--r--dev-php4/php-gtk/files/undef-gtk_shpaned_new.patch15
-rw-r--r--dev-php4/php-gtk/php-gtk-1.0.2.ebuild13
4 files changed, 35 insertions, 16 deletions
diff --git a/dev-php4/php-gtk/ChangeLog b/dev-php4/php-gtk/ChangeLog
index 08f4b323c6bc..3fcecca38b83 100644
--- a/dev-php4/php-gtk/ChangeLog
+++ b/dev-php4/php-gtk/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-php4/php-gtk
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php4/php-gtk/ChangeLog,v 1.3 2005/12/29 03:27:15 josejx Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php4/php-gtk/ChangeLog,v 1.4 2006/01/20 18:07:29 chtekk Exp $
+
+ 20 Jan 2006; Luca Longinotti <chtekk@gentoo.org>
+ +files/undef-gtk_shpaned_new.patch, php-gtk-1.0.2.ebuild:
+ Fix bug #90570.
29 Dec 2005; Joseph Jezak <josejx@gentoo.org> php-gtk-1.0.2.ebuild:
Marked ~ppc.
diff --git a/dev-php4/php-gtk/Manifest b/dev-php4/php-gtk/Manifest
index 0e555ee9625c..a88acca370a9 100644
--- a/dev-php4/php-gtk/Manifest
+++ b/dev-php4/php-gtk/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 3d6cb4166c34cba26c124b8a2723d35e ChangeLog 566
+MD5 8a793469b8e31c540463f14a850e1b6c ChangeLog 696
MD5 104e4a1d719126cf73c9bdb45796f91e files/digest-php-gtk-1.0.2 65
+MD5 f4ea3c445c7e3580939d944a80c45a60 files/undef-gtk_shpaned_new.patch 665
MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-MD5 d59d5649f69344badd200a234b22b589 php-gtk-1.0.2.ebuild 1117
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDs1edcsIHjyDViGQRAjHsAJ9TMZAxzxvZ8DXodXbCxXa+bydiLwCeK6Z/
-2L7t+s13w/LkIxpNWMXIg6w=
-=LoMV
------END PGP SIGNATURE-----
+MD5 6a3bd3df1ef4c5c234120d489ea498b6 php-gtk-1.0.2.ebuild 1238
diff --git a/dev-php4/php-gtk/files/undef-gtk_shpaned_new.patch b/dev-php4/php-gtk/files/undef-gtk_shpaned_new.patch
new file mode 100644
index 000000000000..335471b92e22
--- /dev/null
+++ b/dev-php4/php-gtk/files/undef-gtk_shpaned_new.patch
@@ -0,0 +1,15 @@
+--- ext/spaned/config.m4 30 Apr 2002 04:42:55 -0000 1.3
++++ ext/spaned/config.m4 20 Jan 2006 13:55:46 -0000 1.3.6.1
+@@ -1,4 +1,4 @@
+-dnl $Id: config.m4,v 1.3 2002/04/30 04:42:55 andrei Exp $
++dnl $Id: config.m4,v 1.3.6.1 2006/01/20 13:55:46 sfox Exp $
+ dnl config.m4 for spaned module
+
+ PHP_GTK_ARG_ENABLE(spaned,for GtkSPaned support,
+@@ -8,5 +8,5 @@
+ if test "$PHP_GTK_SPANED" != "no"; then
+
+ AC_DEFINE(HAVE_SPANED,1,[spaned support])
+- PHP_GTK_EXTENSION(spaned, $php_gtk_ext_shared, php_spaned.c gtkspaned.c gtksvpaned.c, gen_spaned.c)
++ PHP_GTK_EXTENSION(spaned, $php_gtk_ext_shared, php_spaned.c gtkspaned.c gtkshpaned.c, gtksvpaned.c, gen_spaned.c)
+ fi
diff --git a/dev-php4/php-gtk/php-gtk-1.0.2.ebuild b/dev-php4/php-gtk/php-gtk-1.0.2.ebuild
index 4df263202dcc..b254b7edce8a 100644
--- a/dev-php4/php-gtk/php-gtk-1.0.2.ebuild
+++ b/dev-php4/php-gtk/php-gtk-1.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php4/php-gtk/php-gtk-1.0.2.ebuild,v 1.3 2005/12/29 03:27:15 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php4/php-gtk/php-gtk-1.0.2.ebuild,v 1.4 2006/01/20 18:07:29 chtekk Exp $
PHP_EXT_NAME="php_gtk"
PHP_EXT_INI="yes"
@@ -32,6 +32,15 @@ pkg_setup() {
require_php_with_use cli
}
+src_unpack() {
+ unpack ${A}
+
+ cd "${S}"
+
+ # patch to fix bug #90570
+ epatch "${FILESDIR}/undef-gtk_shpaned_new.patch"
+}
+
src_compile() {
has_php