summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2023-03-11 10:59:26 -0300
committerDaniel Bermond2023-03-11 10:59:26 -0300
commitca33747ca0f7e36b360e06b70344dff49a24ed41 (patch)
tree37cc1dabec757ac5cf3edc59a47b89d60fd20dc4
parent1efee40df18aa2016bb1656352bf0c285d00eaec (diff)
downloadaur-ca33747ca0f7e36b360e06b70344dff49a24ed41.tar.gz
Add patch to fix memory leak
https://github.com/ImageMagick/ImageMagick/issues/6149
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD7
2 files changed, 9 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 840f38cc0e07..ac86ba95865c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = imagemagick-full
pkgdesc = An image viewing/manipulation program (Q32 HDRI with all possible features)
pkgver = 7.1.1.2
- pkgrel = 1
+ pkgrel = 2
url = https://www.imagemagick.org/
arch = x86_64
license = custom
@@ -57,10 +57,12 @@ pkgbase = imagemagick-full
makedepends = libumem-git
source = https://imagemagick.org/archive/releases/ImageMagick-7.1.1-2.tar.xz
source = https://imagemagick.org/archive/releases/ImageMagick-7.1.1-2.tar.xz.asc
+ source = 010-imagemagick-fix-memory-leak.patch::https://github.com/ImageMagick/ImageMagick/commit/84d7ad135f61073304053a7d9ab2cf66b63df0ef.patch
source = arch-fonts.diff
validpgpkeys = D8272EF51DA223E4D05B466989AB63D48277377A
sha256sums = d9b1c6e666e6886b8b8aab5d6ff06c3b51e229110115b585e2cf912e5715880a
sha256sums = SKIP
+ sha256sums = bd9d3622aa3b8484daaec20793f0082ea9d62bd9d7e32680c14db4bf90e0f08a
sha256sums = 290c6a87845b419459fb552c0e7dcd81fbeafcecc370818d442fedf4d315b7fb
pkgname = imagemagick-full
diff --git a/PKGBUILD b/PKGBUILD
index d708de1c1189..f48348e04ebe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,7 +14,7 @@
pkgbase=imagemagick-full
pkgname=('imagemagick-full' 'imagemagick-full-doc')
pkgver=7.1.1.2
-pkgrel=1
+pkgrel=2
arch=('x86_64')
_qdepth='32'
pkgdesc="An image viewing/manipulation program (Q${_qdepth} HDRI with all possible features)"
@@ -33,15 +33,20 @@ makedepends=(
'dmalloc' 'flif' 'libfpx' 'libumem-git'
)
source=("https://imagemagick.org/archive/releases/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz"{,.asc}
+ '010-imagemagick-fix-memory-leak.patch'::'https://github.com/ImageMagick/ImageMagick/commit/84d7ad135f61073304053a7d9ab2cf66b63df0ef.patch'
'arch-fonts.diff')
sha256sums=('d9b1c6e666e6886b8b8aab5d6ff06c3b51e229110115b585e2cf912e5715880a'
'SKIP'
+ 'bd9d3622aa3b8484daaec20793f0082ea9d62bd9d7e32680c14db4bf90e0f08a'
'290c6a87845b419459fb552c0e7dcd81fbeafcecc370818d442fedf4d315b7fb')
validpgpkeys=('D8272EF51DA223E4D05B466989AB63D48277377A') # Lexie Parsimoniae
prepare() {
# fix up typemaps to match Arch Linux packages, where possible
patch -d "ImageMagick-${pkgver%.*}-${pkgver##*.}" -Np1 -i "${srcdir}/arch-fonts.diff"
+
+ # https://github.com/ImageMagick/ImageMagick/issues/6149
+ patch -d "ImageMagick-${pkgver%.*}-${pkgver##*.}" -Np1 -i "${srcdir}/010-imagemagick-fix-memory-leak.patch"
}
build() {