diff options
author | Timo Teräs <timo.teras@iki.fi> | 2017-04-14 19:05:20 +0000 |
---|---|---|
committer | Timo Teräs <timo.teras@iki.fi> | 2017-04-14 19:24:55 +0000 |
commit | 2e939e62766bb3312688de5c933788f9e86f4b6c (patch) | |
tree | a26ec8ae93ee9364d9509b502d76263a3cfffc5d | |
parent | 65e89ddba7e72ad0b40b40b66f1193d978bc5678 (diff) |
main/ghostscript: additional libopenjpeg build fix
-rw-r--r-- | main/ghostscript/APKBUILD | 10 | ||||
-rw-r--r-- | main/ghostscript/fix-libopenjp-static.patch | 11 |
2 files changed, 18 insertions, 3 deletions
diff --git a/main/ghostscript/APKBUILD b/main/ghostscript/APKBUILD index 0f094c0c215..7e2a09f6674 100644 --- a/main/ghostscript/APKBUILD +++ b/main/ghostscript/APKBUILD @@ -18,6 +18,7 @@ source="http://downloads.ghostscript.com/public/$pkgname-$pkgver.tar.gz fix-sprintf.patch CVE-2015-3228.patch fix-alignment.patch + fix-libopenjp-static.patch " _builddir="$srcdir/ghostscript-$pkgver" @@ -118,18 +119,21 @@ c180cac458c6ab7bcd319fe092abb9cd ghostscript-system-zlib.patch f5129f6cc01a3d593cf02fe1ef94cbe8 ghostscript-wrf-snprintf.patch ed14fa288463e08e1e6074a5d1ebbcbb fix-sprintf.patch 27971c7530ffd4e4046d1ffb61cac13d CVE-2015-3228.patch -5ebdebe1e22a6eb1b7ebbf3e89c55314 fix-alignment.patch" +5ebdebe1e22a6eb1b7ebbf3e89c55314 fix-alignment.patch +a6f6d40d785617b14f0d32d6650d24e0 fix-libopenjp-static.patch" sha256sums="746d77280cca8afdd3d4c2c1389e332ed9b0605bd107bcaae1d761b061d1a68d ghostscript-9.16.tar.gz bcbd4154fc186b3564fa6140d57117f243a5d703823c03443434c09aeef20684 ghostscript-system-zlib.patch 0d029c98b2149715b63d2eae9634eca0d427bf77e713dd355854412fc92b35ac ghostscript-system-openjpeg2.patch 3ca8f75d743aae7f2baa109a2a9217c33867c13e88e0ddbc96dc9be39157ae72 ghostscript-wrf-snprintf.patch 3051dff937ab9ced9f88b36384400b10bc9cdb39b2abd3ece8f4c41a0246874e fix-sprintf.patch e6407cc5d74b6963242efec942c92b093a076c835451e6b949417b85d24c85d1 CVE-2015-3228.patch -22262be45ba77db5508e60cb2eef7f78178b9a38bfbfbb85d4082d4d7a2c1710 fix-alignment.patch" +22262be45ba77db5508e60cb2eef7f78178b9a38bfbfbb85d4082d4d7a2c1710 fix-alignment.patch +1fefc3e2de4bb969e168bc1cda950d5adc0374e8857b91068985d13bd8087cc4 fix-libopenjp-static.patch" sha512sums="cd7da12f55379f7d388bd2573a307426da230a2220766a7138ab49990fb34343801a6d5e76ba0f4d6c97a5871359658ca043fcc700242b02f30de30a15b2847f ghostscript-9.16.tar.gz 6449fe3594d2b61aa4a96762a91db847242dbbb407c6743af8a5db0f7f18bb82df3c89e974e6b23deecaaf7b6bf1fb6930713cbe6229ec3d8b26dd65115893a8 ghostscript-system-zlib.patch f874540fc53f85a3587253aaf8a29fc7792590938daf7f44e573cbbdac258b39db8baccce9569737c5c1a0a3816c6a8ff55b97f60dbefbba0c1729fd202d0ddd ghostscript-system-openjpeg2.patch 86f30dd61c4ee87e1cf72686da4ee6d0dd89100e122279c038dd7cb813a72b95d170ca2ae8cf6a10f2a01b18e49c704dc6aca5cbb5253886908332a90b7a7c2b ghostscript-wrf-snprintf.patch 300712709ec75f728c703f6a2a5abd992b7c2137df81cc1dd4f6e96c690077e0d5a4afd0e06ce55660061911ddfbf1e68d7020ec3e5f2124602133a10451ec42 fix-sprintf.patch 142772a600d69e48e2a58d84ebf08fb89a8794cfa0424b81f35b7bb99399a07ed2bbfb2a2e7c60663f3e8cfcc223c04c23433cb81a3ab5dbd59cd8252f930367 CVE-2015-3228.patch -7c6f40217dc687df27ee6d33351fba12a737c2ae06d1c35208dc943776d8efa66c3e882f0b1b9aec566fad69fd28ce360cc243f1c1aa20834467e769889194f2 fix-alignment.patch" +7c6f40217dc687df27ee6d33351fba12a737c2ae06d1c35208dc943776d8efa66c3e882f0b1b9aec566fad69fd28ce360cc243f1c1aa20834467e769889194f2 fix-alignment.patch +53cff34a9b5eda8241bb1835913cb10e44ad4077495b3e26953b00c95aae0019e6a177c6ecb138bd57f68867445deb53bd83df2ba3d530f7f25d1ca1b0295b21 fix-libopenjp-static.patch" diff --git a/main/ghostscript/fix-libopenjp-static.patch b/main/ghostscript/fix-libopenjp-static.patch new file mode 100644 index 00000000000..c2c742f9cad --- /dev/null +++ b/main/ghostscript/fix-libopenjp-static.patch @@ -0,0 +1,11 @@ +--- ghostscript-9.18/base/lib.mak.orig 2017-04-14 19:02:04.166047598 +0000 ++++ ghostscript-9.18/base/lib.mak 2017-04-14 19:03:54.614782450 +0000 +@@ -1794,7 +1794,7 @@ + $(memory__h) $(gserror_h) $(gserrors_h) \ + $(gdebug_h) $(strimpl_h) $(sjpx_openjpeg_h) $(MAKEDIRS) + $(GLJPXOPJCC) $(GLO_)sjpx_openjpeg.$(OBJ) \ +- $(C_) -DOPJ_STATIC $(GLSRC)sjpx_openjpeg.c ++ $(C_) $(GLSRC)sjpx_openjpeg.c + + # ---------------- Pixel-difference filters ---------------- # + # The Predictor facility of the LZW and Flate filters uses these. |