[arch-commits] Commit in php/repos (3 files)
Pierre Schmitz
pierre at archlinux.org
Tue Aug 18 10:06:44 UTC 2009
Date: Tuesday, August 18, 2009 @ 06:06:44
Author: pierre
Revision: 50001
Merged revisions 50000 via svnmerge from
svn+ssh://svn.archlinux.org/srv/svn-packages/php/trunk
........
r50000 | pierre | 2009-08-18 12:02:42 +0200 (Di, 18 Aug 2009) | 1 line
fix segfault and some other stuff
........
Added:
php/repos/testing-x86_64/gd-info-segfault.patch
(from rev 50000, php/trunk/gd-info-segfault.patch)
Modified:
php/repos/testing-x86_64/ (properties)
php/repos/testing-x86_64/PKGBUILD
------------------------+
PKGBUILD | 15 ++++++++++-----
gd-info-segfault.patch | 26 ++++++++++++++++++++++++++
2 files changed, 36 insertions(+), 5 deletions(-)
Property changes on: php/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /php/trunk:1-49821
+ /php/trunk:1-50000
Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2009-08-18 10:02:42 UTC (rev 50000)
+++ testing-x86_64/PKGBUILD 2009-08-18 10:06:44 UTC (rev 50001)
@@ -21,7 +21,7 @@
'php-tidy'
'php-xsl')
pkgver=5.3.0
-pkgrel=1
+pkgrel=2
_suhosinver=${pkgver}-0.9.8-BETA-1
arch=('i686' 'x86_64')
license=('PHP')
@@ -33,12 +33,13 @@
options=('!makeflags')
source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
"http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz"
- 'php.ini.patch' 'apache.conf' 'db-configure.patch')
+ 'php.ini.patch' 'apache.conf' 'db-configure.patch' 'gd-info-segfault.patch')
md5sums=('846760cd655c98dfd86d6d97c3d964b0'
'62dc36545b86bf86e44ada1fccc17d0a'
'67c63d2c8a976a333bbd2216cdd60413'
'96ca078be6729b665be8a865535a97bf'
- '45ecb6fb0aadfd3462097e3bab951aa5')
+ '45ecb6fb0aadfd3462097e3bab951aa5'
+ '1c1a50aae7207b12d27bdecd8967e7ce')
build() {
phpconfig="--prefix=/usr \
@@ -135,6 +136,9 @@
# adjust paths
patch -p0 -i ${srcdir}/php.ini.patch || return 1
+ # fix gd segfault; http://bugs.php.net/bug.php?id=49193
+ patch -p0 -i ${srcdir}/gd-info-segfault.patch || return 1
+
# php
mkdir ${srcdir}/build-php
cd ${srcdir}/build-php
@@ -186,6 +190,7 @@
depends=('pcre' 'libxml2' 'bzip2' 'openssl')
replaces=('php-fileinfo')
provides=('php-fileinfo')
+ conflicts=('php-fileinfo')
backup=('etc/php/php.ini')
cd ${srcdir}/build-php
@@ -251,13 +256,13 @@
package_php-gmp() {
depends=('php' 'gmp')
- pkgmpesc="gmp module for PHP"
+ pkgdesc="gmp module for PHP"
install -D -m755 ${srcdir}/build-php/modules/gmp.so ${pkgdir}/usr/lib/php/modules/gmp.so
}
package_php-intl() {
depends=('php' 'icu')
- pkgmpesc="intl module for PHP"
+ pkgdesc="intl module for PHP"
install -D -m755 ${srcdir}/build-php/modules/intl.so ${pkgdir}/usr/lib/php/modules/intl.so
}
Copied: php/repos/testing-x86_64/gd-info-segfault.patch (from rev 50000, php/trunk/gd-info-segfault.patch)
===================================================================
--- testing-x86_64/gd-info-segfault.patch (rev 0)
+++ testing-x86_64/gd-info-segfault.patch 2009-08-18 10:06:44 UTC (rev 50001)
@@ -0,0 +1,26 @@
+Index: ext/gd/libgd/gd_compat.c
+===================================================================
+--- ext/gd/libgd/gd_compat.c (Revision 286947)
++++ ext/gd/libgd/gd_compat.c (Revision 286948)
+@@ -14,7 +14,7 @@
+ return JPEG_LIB_VERSION;
+ }
+
+-int gdJpegGetVersionString()
++const char * gdJpegGetVersionString()
+ {
+ switch(JPEG_LIB_VERSION) {
+ case 62:
+Index: ext/gd/libgd/gd_compat.h
+===================================================================
+--- ext/gd/libgd/gd_compat.h (Revision 286947)
++++ ext/gd/libgd/gd_compat.h (Revision 286948)
+@@ -8,7 +8,7 @@
+ #endif
+
+ const char * gdPngGetVersionString();
+-int gdJpegGetVersionString();
++const char * gdJpegGetVersionString();
+ int gdJpegGetVersionInt();
+ int overflow2(int a, int b);
+
More information about the arch-commits
mailing list