development/ming: Updated for version 0.4.7.

Fixes build failure with giflib-5.1 on -current.

Signed-off-by: David Spencer <baildon.research@googlemail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
David Spencer 2015-07-23 18:37:19 +01:00 committed by Willy Sudiarto Raharjo
parent 623c66c7c2
commit 2f34ffad4b
4 changed files with 12 additions and 79 deletions

View file

@ -1,43 +0,0 @@
From a0ea1cc47330a3ab316713d720892b6272401890 Mon Sep 17 00:00:00 2001
From: Niko Tyni <ntyni@debian.org>
Date: Sun, 10 Jul 2011 21:46:09 +0300
Subject: [PATCH] GvCV() isn't an lvalue since Perl 5.13.10
GvCV() can't be assigned to anymore with recent perls, so use the new
GvCV_set() macro when available or implement it the old way if it isn't.
---
perl_ext/Exports.c | 2 +-
perl_ext/perl_swf.h | 4 ++++
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/perl_ext/Exports.c b/perl_ext/Exports.c
index 65f8912..5529728 100644
--- a/perl_ext/Exports.c
+++ b/perl_ext/Exports.c
@@ -190,7 +190,7 @@ void export_cv(SV *class, SV *caller, char *sub)
SvPVX(caller), sub, SvPVX(class), sub);
#endif
gv = gv_fetchpv(form("%s::%s",SvPVX( caller), sub), TRUE, SVt_PVCV);
- GvCV(gv) = perl_get_cv(form("%s::%s", SvPVX(class), sub), TRUE);
+ GvCV_set(gv, perl_get_cv(form("%s::%s", SvPVX(class), sub), TRUE));
GvIMPORTED_CV_on(gv);
GvMULTI_on(gv);
}
diff --git a/perl_ext/perl_swf.h b/perl_ext/perl_swf.h
index b960229..1a3656e 100644
--- a/perl_ext/perl_swf.h
+++ b/perl_ext/perl_swf.h
@@ -58,6 +58,10 @@ typedef SWFFontCollection SWF__FontCollection;
#define aTHXo_
#endif
+#ifndef GvCV_set
+# define GvCV_set(G, C) (GvCV(G) = (C))
+#endif
+
#ifndef S_DEBUG
#define swf_debug 0 /* Should we get this from, say, $SWF::debug? */
#define S_DEBUG(level,code) if (swf_debug >= level) { code; }
--
1.7.5.4

View file

@ -23,8 +23,10 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=ming PRGNAM=ming
VERSION=0.4.4 VERSION=${VERSION:-0.4.7}
BUILD=${BUILD:-2} TARNAM=libming-ming
TARVERSION=$(echo $VERSION | tr . _)
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo} TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then if [ -z "$ARCH" ]; then
@ -59,9 +61,9 @@ set -e
rm -rf $PKG rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT mkdir -p $TMP $PKG $OUTPUT
cd $TMP cd $TMP
rm -rf $PRGNAM-$VERSION rm -rf $TARNAM-$TARVERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 tar xvf $CWD/$TARNAM-$TARVERSION.tar.?z* || tar xvf $CWD/$PRGNAM-$TARVERSION.tar.?z*
cd $PRGNAM-$VERSION cd $TARNAM-$TARVERSION
chown -R root:root . chown -R root:root .
find -L . \ find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@ -69,11 +71,7 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# Fix PHP 5.4 compatibility autoreconf -vif
patch -p0 -d php_ext -i $CWD/patch-ming.c.diff
# Fix building against perl 5.16
patch -p1 -i $CWD/0001-GvCV-isn-t-an-lvalue-since-Perl-5.13.10.patch
# static library is activated because the perl extension needs it # static library is activated because the perl extension needs it
CFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \
@ -124,7 +122,7 @@ find $PKG -depth -type d -empty -delete || true
find $PKG/usr/man -type f -exec gzip -9 {} \; find $PKG/usr/man -type f -exec gzip -9 {} \;
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a AUTHORS COPYING HISTORY INSTALL LICENSE* NEWS README TODO \ cp -a AUTHORS HISTORY INSTALL LICENSE* NEWS README TODO \
$PKG/usr/doc/$PRGNAM-$VERSION $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild

View file

@ -1,8 +1,8 @@
PRGNAM="ming" PRGNAM="ming"
VERSION="0.4.4" VERSION="0.4.7"
HOMEPAGE="http://www.libming.org" HOMEPAGE="http://www.libming.org"
DOWNLOAD="http://downloads.sourceforge.net/ming/ming-0.4.4.tar.bz2" DOWNLOAD="https://github.com/libming/libming/archive/ming-0_4_7.tar.gz"
MD5SUM="9e780f93670eaf68b1eefa6cdfc1d1e2" MD5SUM="dbb71ae5bc131a609fbfe2005bc095cc"
DOWNLOAD_x86_64="" DOWNLOAD_x86_64=""
MD5SUM_x86_64="" MD5SUM_x86_64=""
REQUIRES="" REQUIRES=""

View file

@ -1,22 +0,0 @@
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=662620
--- ming.c.orig 2011-10-26 01:33:18.000000000 -0500
+++ ming.c 2012-05-14 17:06:09.000000000 -0500
@@ -87,10 +87,17 @@
static SWFMatrix getMatrix(zval *id TSRMLS_DC);
#endif
+#if PHP_API_VERSION < 20100412
#define PHP_MING_FILE_CHK(file) \
if ((PG(safe_mode) && !php_checkuid((file), NULL, CHECKUID_CHECK_FILE_AND_DIR)) || php_check_open_basedir((file) TSRMLS_CC)) { \
RETURN_FALSE; \
- } \
+ }
+#else
+#define PHP_MING_FILE_CHK(file) \
+ if (php_check_open_basedir((file) TSRMLS_CC)) { \
+ RETURN_FALSE; \
+ }
+#endif
/* {{{ proto void ming_setcubicthreshold (int threshold)
Set cubic threshold (?) */