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

imagemagick, bump version, fixes 32bit issue (#10686)

Browse Source
This commit is contained in:
Schrijvers Luc
2024-07-13 09:26:26 +02:00
committed by GitHub
parent 9490deae17
commit 733411cfef
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media-gfx/imagemagick/imagemagick-7.1.1.21.recipe → media-gfx/imagemagick/imagemagick-7.1.1.34.recipe
View File

@@ -14,7 +14,7 @@ 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
https://github.com/ImageMagick/ImageMagick/archive/$imageMagickVersion.tar.gz"
CHECKSUM_SHA256="1e44faec8bf603e8c894a7c039fb1b4bb83dc0c429c79c74577e73ceefe4a238"
CHECKSUM_SHA256="abab52de4b8f0356c05ddee3d3398c147fd9f6c099760f2cb15f3b8168a776c7"
SOURCE_DIR="ImageMagick-$imageMagickVersion"
PATCHES="imagemagick-$portVersion.patchset"

20
media-gfx/imagemagick/patches/imagemagick-7.1.1.21.patchset → media-gfx/imagemagick/patches/imagemagick-7.1.1.34.patchset
View File

@@ -1,4 +1,4 @@
From 1618b533cc3fcf73ad07658a8e1df4f154639504 Mon Sep 17 00:00:00 2001
From 7762355c4ecc48701c1b1ab59c6f9c13a6f57ada Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Wed, 27 Dec 2017 18:43:52 +0100
Subject: Don't reset LIBRARY_PATH.
@@ -27,10 +27,10 @@ index 4b5dc06..4e66b38 100644
#ifndef MAGICKCORE_SHAREARCH_RELATIVE_PATH
diff --git a/configure.ac b/configure.ac
index d581d48..ea092fa 100644
index dc52f77..85c7abf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3106,15 +3106,15 @@ AC_DEFINE_UNQUOTED([EXECUTABLE_PATH],["$DEFINE_EXECUTABLE_PATH"],[Directory wher
@@ -3139,15 +3139,15 @@ AC_DEFINE_UNQUOTED([EXECUTABLE_PATH],["$DEFINE_EXECUTABLE_PATH"],[Directory wher
AC_SUBST([EXECUTABLE_PATH])
# Path to ImageMagick lib
@@ -51,7 +51,7 @@ index d581d48..ea092fa 100644
#
# path to local binaries
@@ -3131,7 +3131,7 @@ AC_SUBST([LIB_BIN_DIR])
@@ -3164,7 +3164,7 @@ AC_SUBST([LIB_BIN_DIR])
LIB_BIN_DIR_RELATIVE_PATH=$LIB_BIN_DIR
AC_SUBST([LIB_BIN_DIR_RELATIVE_PATH])
@@ -60,7 +60,7 @@ index d581d48..ea092fa 100644
AC_SUBST([LIB_BIN_DIR_PATH])
#
@@ -3151,7 +3151,7 @@ AC_SUBST([MODULES_DIRNAME])
@@ -3184,7 +3184,7 @@ AC_SUBST([MODULES_DIRNAME])
MODULES_RELATIVE_PATH="${MODULES_DIRNAME}"
AC_SUBST([MODULES_RELATIVE_PATH])
@@ -69,7 +69,7 @@ index d581d48..ea092fa 100644
AC_SUBST([MODULES_PATH])
#
@@ -3244,7 +3244,7 @@ AC_SUBST([SHAREARCH_DIRNAME])
@@ -3277,7 +3277,7 @@ AC_SUBST([SHAREARCH_DIRNAME])
SHAREARCH_RELATIVE_PATH="${SHAREARCH_DIRNAME}"
AC_SUBST([SHAREARCH_RELATIVE_PATH])
@@ -79,10 +79,10 @@ index d581d48..ea092fa 100644
#
--
2.42.0
2.45.2
From cfbe268c8af8c99ec4f918683df2a0492073d066 Mon Sep 17 00:00:00 2001
From 9f4779ca6c4f24daed780c156c98a1ec79c0e4e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
Date: Sat, 3 Jun 2023 13:17:44 +0200
Subject: set DOC_DIR from configure argument
@@ -90,7 +90,7 @@ Subject: set DOC_DIR from configure argument
A subdirectory is added to the final docDir
diff --git a/configure.ac b/configure.ac
index ea092fa..139b843 100644
index 85c7abf..7314a7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -207,7 +207,7 @@ eval "eval LIBEXEC_DIR=$libexecdir"
@@ -103,5 +103,5 @@ index ea092fa..139b843 100644
eval "eval SYSCONF_DIR=$sysconfdir"
AC_SUBST([SYSCONF_DIR])
--
2.42.0
2.45.2