haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 03:30:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

imagemagick7, bump version (#1973)

Browse Source
This commit is contained in:
Schrijvers Luc
2017-12-28 10:54:08 +01:00
committed by fbrosson
parent c6251ad5ec
commit 0bf64da687
2 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media-gfx/imagemagick/imagemagick7-7.0.7.8.recipe → media-gfx/imagemagick/imagemagick7-7.0.7.17.recipe
View File

@@ -12,7 +12,7 @@ REVISION="1"
imageMagickVersion="${portVersion%.*}-${portVersion##*.}"
SOURCE_URI="https://www.imagemagick.org/download/releases/ImageMagick-$imageMagickVersion.tar.xz
https://mirror.sobukus.de/files/src/imagemagick/ImageMagick-$imageMagickVersion.tar.xz"
CHECKSUM_SHA256="77e9798ae32140d36a3a7cd09cb1fb6403c3f4482db8cc4a66ade69ebb5a5240"
CHECKSUM_SHA256="13548d1670a488f48f89ef6e09395c213efd47978bef9cff564c4b1b3f5df84a"
SOURCE_DIR="ImageMagick-$imageMagickVersion"
PATCHES="imagemagick-$portVersion.patchset"
@@ -126,7 +126,7 @@ GLOBAL_WRITABLE_FILES="
BUILD()
{
export LDFLAGS="-lnetwork"
aclocal
aclocal
autoconf
automake
runConfigure ./configure \

38
media-gfx/imagemagick/patches/imagemagick-7.0.7.8.patchset → media-gfx/imagemagick/patches/imagemagick-7.0.7.17.patchset
View File

@@ -1,18 +1,16 @@
From 2e2dd08b3fdbb7e899eae8ee072b894e96ffa246 Mon Sep 17 00:00:00 2001
From 3006b24ccdb54f030bce41107b3e661fcfd0f9cb Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Sun, 26 Oct 2014 17:47:29 +0100
Date: Wed, 27 Dec 2017 18:43:52 +0100
Subject: Don't reset LIBRARY_PATH.
Using a variable named LIBRARY_PATH is not a good idea on Haiku. Just
rename it.
diff --git a/configure.ac b/configure.ac
index d8fc51b..5def208 100644
index 58f6c46..9f82e5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2885,15 +2885,15 @@ AC_DEFINE_UNQUOTED(EXECUTABLE_PATH,"$DEFINE_EXECUTABLE_PATH",[Directory where ex
@@ -2971,15 +2971,15 @@ AC_DEFINE_UNQUOTED(EXECUTABLE_PATH,"$DEFINE_EXECUTABLE_PATH",[Directory where ex
AC_SUBST(EXECUTABLE_PATH)
# Path to ImageMagick lib
-LIBRARY_PATH="${LIB_DIR}/${LIBRARY_RELATIVE_PATH}"
-DEFINE_LIBRARY_PATH="${LIB_DIR}/${LIBRARY_RELATIVE_PATH}/"
@@ -21,43 +19,43 @@ index d8fc51b..5def208 100644
case "${build_os}" in
mingw* )
- DEFINE_LIBRARY_PATH=`$WinPathScript "$DEFINE_LIBRARY_PATH" 1`
+ DEFINE_XLIBRARY_PATH=`$WinPathScript "$DEFINE_XLIBRARY_PATH" 1`
+ DEFINE_XLIBRARY_PATH=`$WinPathScript "$DEFINE_XLIBRARY_PATH" 1`
;;
esac
-AC_DEFINE_UNQUOTED(LIBRARY_PATH,"$DEFINE_LIBRARY_PATH",[Directory where architecture-dependent files live.])
-AC_SUBST(LIBRARY_PATH)
+AC_DEFINE_UNQUOTED(LIBRARY_PATH,"$DEFINE_XLIBRARY_PATH",[Directory where architecture-dependent files live.])
+AC_SUBST(XLIBRARY_PATH)
#
# path to local binaries
@@ -2910,7 +2910,7 @@ AC_SUBST(LIB_BIN_DIR)
@@ -2996,7 +2996,7 @@ AC_SUBST(LIB_BIN_DIR)
LIB_BIN_DIR_RELATIVE_PATH=$LIB_BIN_DIR
AC_SUBST(LIB_BIN_DIR_RELATIVE_PATH)
-LIB_BIN_DIR_PATH="${LIBRARY_PATH}/${LIB_BIN_DIR_RELATIVE_PATH}"
+LIB_BIN_DIR_PATH="${XLIBRARY_PATH}/${LIB_BIN_DIR_RELATIVE_PATH}"
AC_SUBST(LIB_BIN_DIR_PATH)
#
@@ -2930,7 +2930,7 @@ AC_SUBST(MODULES_DIRNAME)
@@ -3016,7 +3016,7 @@ AC_SUBST(MODULES_DIRNAME)
MODULES_RELATIVE_PATH="${MODULES_DIRNAME}"
AC_SUBST(MODULES_RELATIVE_PATH)
-MODULES_PATH="${LIBRARY_PATH}/${MODULES_RELATIVE_PATH}"
+MODULES_PATH="${XLIBRARY_PATH}/${MODULES_RELATIVE_PATH}"
AC_SUBST(MODULES_PATH)
#
@@ -3023,7 +3023,7 @@ AC_SUBST(SHAREARCH_DIRNAME)
@@ -3109,7 +3109,7 @@ AC_SUBST(SHAREARCH_DIRNAME)
SHAREARCH_RELATIVE_PATH="${SHAREARCH_DIRNAME}"
AC_SUBST(SHAREARCH_RELATIVE_PATH)
-SHAREARCH_PATH="${LIBRARY_PATH}/${SHAREARCH_RELATIVE_PATH}"
+SHAREARCH_PATH="${XLIBRARY_PATH}/${SHAREARCH_RELATIVE_PATH}"
AC_SUBST(SHAREARCH_PATH)
#
--
2.10.2
--
2.15.1