diff options
| author | B. Watson <yalhcru@gmail.com> | 2018-11-26 03:40:58 -0500 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2018-12-01 07:28:04 +0700 |
| commit | e86066a3586072f4cd4084293291778ef457a877 (patch) | |
| tree | 3ed9cadea3102de84b2bb69d71d6afa83b57cddf /graphics/GraphicsMagick | |
| parent | 9befcce3901c3a5a5f3050c504a2103378462088 (diff) | |
| download | slackbuilds-e86066a3586072f4cd4084293291778ef457a877.tar.gz | |
graphics/GraphicsMagick: Fix perl module.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Diffstat (limited to 'graphics/GraphicsMagick')
| -rw-r--r-- | graphics/GraphicsMagick/GraphicsMagick.SlackBuild | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/graphics/GraphicsMagick/GraphicsMagick.SlackBuild b/graphics/GraphicsMagick/GraphicsMagick.SlackBuild index e9920d37aa..f3af20e830 100644 --- a/graphics/GraphicsMagick/GraphicsMagick.SlackBuild +++ b/graphics/GraphicsMagick/GraphicsMagick.SlackBuild @@ -8,6 +8,14 @@ # MIA. Original version had no license; I'm licensing the update under the # terms of the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. +# 20181126 bkw: +# - fix the perl module. at one point it really did work, but lately +# people (including me) were getting 'undefined symbol' errors when +# trying to load the perl module (e.g. by running findimagedupes). +# Thanks to Kevin Smallman for a very helpful bug report. +# - update find/chmod stuff to my personal template. +# - BUILD=2 + # 20180627 bkw: # - updated for v1.3.30. # - get rid of the need to build/install/build again for the Tcl bindings. @@ -30,7 +38,7 @@ PRGNAM=GraphicsMagick VERSION=${VERSION:-1.3.30} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -86,11 +94,8 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 cd $PRGNAM-$VERSION chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ # libfpx isn't autodetected, so let's help it a bit: if [ -e /usr/include/fpxlib.h ]; then @@ -140,26 +145,22 @@ make install INSTALLDIRS=vendor DESTDIR=$PKG # is integrated into the GraphicsMagick source. Supposedly, PerlMagick # has to be built after GraphicsMagick is installed system-wide, but # I've come up with functional (if unattractive) way around that. +# 20181126 bkw: ...which stopped working with 1.3.30. Updated this +# so it works again, and as a side effect, it's slightly less repulsive +# to look at. WITHPERL=WITHOUT if [ "${PERL:-yes}" = "yes" ]; then cd PerlMagick - # munge Makefile.PL to build using the includes/libs we just installed - # to $PKG, instead of systemwide ones. - sed -i \ - -e "/magick_CFLAGS/s,=',&-I$PKG/usr/include ," \ - -e "/magick_LDFLAGS/s,=',&-L$PKG/usr/lib$LIBDIRSUFFIX ," \ - Makefile.PL - - # don't know why we have to explicitly force -lGraphicsMagick here... perl Makefile.PL \ - LIBS=-lGraphicsMagick \ PREFIX=/usr \ INSTALLDIRS=vendor \ INSTALLVENDORMAN1DIR=/usr/man/man1 \ INSTALLVENDORMAN3DIR=/usr/man/man3 + sed -i "/^LDDLFLAGS/s,\$, -L$PKG/usr/lib$LIBDIRSUFFIX -l$PRGNAM," Makefile + make # 'make test' will attempt to display an image, if it thinks it's running |