diff --git a/printer/ghostscript/DETAILS b/printer/ghostscript/DETAILS
index 0b08eb0..0f39c7e 100755
--- a/printer/ghostscript/DETAILS
+++ b/printer/ghostscript/DETAILS
@@ -1,6 +1,6 @@
SPELL=ghostscript
- VERSION=9.21
- SOURCE_HASH=sha1:6f60d7fcb5eef6a8bec5abedf21c6a7008a8c0c7:UPSTREAM_HASH
+ VERSION=9.22
+
SOURCE_HASH=sha512:599ba003e168d302e327ea7c2b83a4247059a1b7222452cbea4966dac448a79e8d7f07a1f287fa0c14cfa5269bb623382ed02fb3ea3a0e526dae08aaa1cd8b89
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.ghostscript.com/
diff --git a/printer/ghostscript/HISTORY b/printer/ghostscript/HISTORY
index 4c81d0d..dd2fb85 100644
--- a/printer/ghostscript/HISTORY
+++ b/printer/ghostscript/HISTORY
@@ -1,3 +1,7 @@
+2017-10-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 9.22
+ * fix_openjp2_dynamic_linking.patch, PRE_BUILD: remove obsolete patch
+
2017-04-02 Thomas Orgis <sobukus AT sourcemage.org>
* PRE_BUILD: Do not remove cups dir, prevents usage of _any_ cups.
This is sort of needed to be able to print using some drivers at
least.
diff --git a/printer/ghostscript/PRE_BUILD b/printer/ghostscript/PRE_BUILD
index 712e3f3..1a08974 100755
--- a/printer/ghostscript/PRE_BUILD
+++ b/printer/ghostscript/PRE_BUILD
@@ -3,7 +3,5 @@ cd $SOURCE_DIRECTORY &&
# remove most of the embedded libraries. use the system ones instead
rm -rf freetype jpeg libpng tiff lcms2 ijs openjpeg zlib &&
-patch -p1 < "$SPELL_DIRECTORY/fix_openjp2_dynamic_linking.patch" &&
-
# remove non-existing openjpeg header inclusion
sed -i "/opj_malloc.h/d" base/sjpx_openjpeg.c
diff --git a/printer/ghostscript/fix_openjp2_dynamic_linking.patch
b/printer/ghostscript/fix_openjp2_dynamic_linking.patch
deleted file mode 100644
index 1106ad0..0000000
--- a/printer/ghostscript/fix_openjp2_dynamic_linking.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Descrtiption: Don't pass -DOPJ_STATIC when compiling the OpenJPEG code, as it
- makes the symbols hidden when including /usr/include/openjpeg-2.1/openjpeg.h
- .
- Fixes a FTBFS against libopenjp2-7 (>= 2.1.1)
-Author: Didier Raboud <odyx AT debian.org>
-Origin: vendor
-Bug-Debian: https://bugs.debian.org/832873
-
---- a/base/lib.mak
-+++ b/base/lib.mak
-@@ -1830,11 +1830,11 @@
-
- $(GLOBJ)sjpx_openjpeg.$(OBJ) : $(GLSRC)sjpx_openjpeg.c $(AK) \
- $(memory__h) $(gserror_h) $(gserrors_h) \
- $(gdebug_h) $(strimpl_h) $(sjpx_openjpeg_h) $(LIB_MAK) $(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.
-
- pdiff_=$(GLOBJ)spdiff.$(OBJ)
diff --git a/x11-toolkits/gtk+3/DETAILS b/x11-toolkits/gtk+3/DETAILS
index 160f275..16b15a1 100755
--- a/x11-toolkits/gtk+3/DETAILS
+++ b/x11-toolkits/gtk+3/DETAILS
@@ -1,10 +1,10 @@
SPELL=gtk+3
if [[ $GTK_VER == devel ]];then
- VERSION=3.22.22
-
SOURCE_HASH=sha256:862dc22c5e93cd800753e5e90dfdb3af0fc760a47f6ebd918ae19136d527c6cd:UPSTREAM_HASH
+ VERSION=3.22.24
+
SOURCE_HASH=sha256:cbb16e4cfc928ab8f5f22f7290616f95f6ebc8c97cc724a2007b07ced833592b:UPSTREAM_HASH
else
- VERSION=3.22.22
-
SOURCE_HASH=sha256:862dc22c5e93cd800753e5e90dfdb3af0fc760a47f6ebd918ae19136d527c6cd:UPSTREAM_HASH
+ VERSION=3.22.24
+
SOURCE_HASH=sha256:cbb16e4cfc928ab8f5f22f7290616f95f6ebc8c97cc724a2007b07ced833592b:UPSTREAM_HASH
fi
SOURCE=gtk+-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/gtk+-$VERSION"
diff --git a/x11-toolkits/gtk+3/HISTORY b/x11-toolkits/gtk+3/HISTORY
index 3ac3d3c..5a7bde3 100644
--- a/x11-toolkits/gtk+3/HISTORY
+++ b/x11-toolkits/gtk+3/HISTORY
@@ -1,3 +1,6 @@
+2017-10-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.22.24
+
2017-10-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.22.22
[SM-Commit] GIT changes to master grimoire by Florian Franzmann (8653f9293a794fa9c94e814e55a87c2773b57745),
Florian Franzmann, 10/04/2017