From 95202a4042c6cb613afed7bc3d5c4cd0debbd9f7940650a4b24f495f3e918bd8 Mon Sep 17 00:00:00 2001 From: Johannes Meixner Date: Tue, 31 Mar 2015 13:42:40 +0000 Subject: [PATCH] Accepting request 293795 from home:jsmeix:branches:Printing Ghostscript version upgrade to 9.16 OBS-URL: https://build.opensuse.org/request/show/293795 OBS-URL: https://build.opensuse.org/package/show/Printing/ghostscript?expand=0&rev=51 --- ...read.pwrite.pthread_mutexattr_settype.diff | 92 ------------------- ghostscript-9.16.tar.gz | 3 + ghostscript-9.16rc2.tar.gz | 3 - ghostscript-mini.changes | 14 +++ ghostscript-mini.spec | 34 +++---- ghostscript.changes | 14 +++ ghostscript.spec | 34 +++---- 7 files changed, 53 insertions(+), 141 deletions(-) delete mode 100644 fix.including.pread.pwrite.pthread_mutexattr_settype.diff create mode 100644 ghostscript-9.16.tar.gz delete mode 100644 ghostscript-9.16rc2.tar.gz diff --git a/fix.including.pread.pwrite.pthread_mutexattr_settype.diff b/fix.including.pread.pwrite.pthread_mutexattr_settype.diff deleted file mode 100644 index a14c730..0000000 --- a/fix.including.pread.pwrite.pthread_mutexattr_settype.diff +++ /dev/null @@ -1,92 +0,0 @@ - -From: Chris Liddell -Date: Mon, 23 Mar 2015 17:03:41 +0000 (+0000) -Subject: Bug 695882: ensure function protypes are available -X-Git-Url: http://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff_plain;h=8bb53a7f - -Bug 695882: ensure function protypes are available - -There are some special defines on Linux to include prototypes for pread, pwrite -and pthread_mutexattr_settype: add these to our "unistd_.h" header. - -Also, tweak the the configure script to check for prototypes as well as just -successful linking before including the code that uses those functions - -No cluster differences - ---- base/gp_psync.c -+++ base/gp_psync.c -@@ -17,6 +17,7 @@ - /* POSIX pthreads threads / semaphore / monitor implementation */ - #include "std.h" - #include "malloc_.h" -+#include "unistd_.h" /* for __USE_UNIX98 */ - #include - #include "gserrors.h" - #include "gpsync.h" ---- base/unistd_.h -+++ base/unistd_.h -@@ -53,6 +53,7 @@ - /* _XOPEN_SOURCE 500 define is needed to get - * access to pread and pwrite */ - # define _XOPEN_SOURCE 500 -+# define __USE_UNIX98 - # include - #endif - ---- configure.ac -+++ configure.ac -@@ -494,6 +494,16 @@ AC_CHECK_LIB(m, cos) - - AC_CHECK_FUNCS([pread pwrite], [HAVE_PREAD_PWRITE="-DHAVE_PREAD_PWRITE=1"], [HAVE_PREAD_PWRITE=]) - -+if test "x$HAVE_PREAD_PWRITE" != "x"; then -+ save_cflags=$CFLAGS -+ CFLAGS="$CFLAGS -D__USE_UNIX98=1 -D_XOPEN_SOURCE=500" -+ AC_CHECK_DECLS([pwrite,pread], [], [HAVE_PREAD_PWRITE=]) -+ CFLAGS=$save_cflags -+ if test "x$HAVE_PREAD_PWRITE" != "x"; then -+ GCFLAGS="$GCFLAGS -D__USE_UNIX98=1" -+ fi -+fi -+ - AC_SUBST(HAVE_PREAD_PWRITE) - - SYNC="nosync" -@@ -515,11 +525,34 @@ if test "x$HAVE_PREAD_PWRITE" != "x"; then - SYNC=posync; - PTHREAD_LIBS="-lpthread" - ]) -+ AC_MSG_CHECKING([recursive mutexes.......]) - AC_TRY_COMPILE([#include ], -- [static int k = PTHREAD_MUTEX_RECURSIVE;], -+ [ -+ static int k = PTHREAD_MUTEX_RECURSIVE; -+ #ifndef pthread_mutexattr_settype -+ #ifdef __cplusplus -+ (void) pthread_mutexattr_settype; -+ #else -+ (void) pthread_mutexattr_settype; -+ #endif -+ #endif -+ ; -+ return 0; -+ ], - [RECURSIVE_MUTEXATTR="-DGS_RECURSIVE_MUTEXATTR=PTHREAD_MUTEX_RECURSIVE"], - [AC_TRY_COMPILE([#include ], -- [static int k = PTHREAD_MUTEX_RECURSIVE_NP;], -+ [ -+ static int k = PTHREAD_MUTEX_RECURSIVE_NP; -+ #ifndef pthread_mutexattr_settype -+ #ifdef __cplusplus -+ (void) pthread_mutexattr_settype; -+ #else -+ (void) pthread_mutexattr_settype; -+ #endif -+ #endif -+ ; -+ return 0; -+ ], - [RECURSIVE_MUTEXATTR="-DGS_RECURSIVE_MUTEXATTR=PTHREAD_MUTEX_RECURSIVE_NP"])]) - ;; - esac diff --git a/ghostscript-9.16.tar.gz b/ghostscript-9.16.tar.gz new file mode 100644 index 0000000..78cea87 --- /dev/null +++ b/ghostscript-9.16.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:746d77280cca8afdd3d4c2c1389e332ed9b0605bd107bcaae1d761b061d1a68d +size 33623036 diff --git a/ghostscript-9.16rc2.tar.gz b/ghostscript-9.16rc2.tar.gz deleted file mode 100644 index 9feb9b1..0000000 --- a/ghostscript-9.16rc2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:75aa9c197cbb1814c147ffe328043f1032cfb0a8726ef6a029921ada70c771ed -size 33621830 diff --git a/ghostscript-mini.changes b/ghostscript-mini.changes index bdad37a..82c5444 100644 --- a/ghostscript-mini.changes +++ b/ghostscript-mini.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Mar 31 10:18:06 CEST 2015 - jsmeix@suse.de + +- Version upgrade to 9.16. Primarily a maintenance release. + There are no recorded incompatible changes (as of this writing). + Highlights in this release include: + * "LockColorants" command line option for tiffsep and psdcmyk + devices. + * Improved high level devices handling of Forms. + See http://www.ghostscript.com/doc/9.16/News.htm + For details see the News.htm and History9.htm files. +- fix.including.pread.pwrite.pthread_mutexattr_settype.diff + is no longer needed because it is fixed in the upstream sources. + ------------------------------------------------------------------- Wed Mar 25 12:38:16 CET 2015 - jsmeix@suse.de diff --git a/ghostscript-mini.spec b/ghostscript-mini.spec index cbe54ed..f87651a 100644 --- a/ghostscript-mini.spec +++ b/ghostscript-mini.spec @@ -35,32 +35,32 @@ Url: http://www.ghostscript.com/ # But only with the alphabetic prefix "9.pre15rc1" would be older than the previous version number "9.14" # because rpmvercmp would treat 9.pre15rc1 as 9.pre.15.rc1 and letters are older than numbers # so that we keep additionally the previous version number to upgrade from the previous version: -Version: 9.15pre16rc2 -Release: 0 +#Version: 9.15pre16rc2 # Normal version for Ghostscript releases is the upstream version: -#Version: 9.15 +Version: 9.16 +Release: 0 # tarball_version is used below to specify the directory via "setup -n": # Special tarball_version needed for Ghostscript release candidates e.g. "define tarball_version 9.15rc1". # For Ghostscript releases tarball_version and version are the same (i.e. the upstream version): -#define tarball_version %{version} -%define tarball_version 9.16rc2 +%define tarball_version %{version} +#define tarball_version 9.16rc2 # built_version is used below in the install and files sections: # Separated built_version needed in case of Ghostscript release candidates e.g. "define built_version 9.15". # For Ghostscript releases built_version and version are the same (i.e. the upstream version): -#define built_version %{version} -%define built_version 9.16 +%define built_version %{version} +#define built_version 9.16 # Source0...Source9 is for sources from upstream: # Special URLs for Ghostscript release candidates: # URL for Source0: http://downloads.ghostscript.com/public/.release_candidate/ghostscript-9.16rc2.tar.gz # URL for MD5 checksums: http://www.ghostscript.com/~chrisl/MD5SUMS or http://www.ghostscript.com/~chrisl/MD5SUM # or http://downloads.ghostscript.com/public/.release_candidate/MD5SUMS # MD5 checksum for Source0: 17983ee93d97596ffa72fd32be2426a4 -Source0: http://downloads.ghostscript.com/public/.release_candidate/ghostscript-9.16rc2.tar.gz +#Source0: http://downloads.ghostscript.com/public/.release_candidate/ghostscript-9.16rc2.tar.gz # Normal URLs for Ghostscript releases: -# URL for Source0: http://downloads.ghostscript.com/public/ghostscript-9.15.tar.gz +# URL for Source0: http://downloads.ghostscript.com/public/ghostscript-9.16.tar.gz # URL for MD5 checksums: http://downloads.ghostscript.com/public/MD5SUMS -# MD5 checksum for Source0: 5a78ab0990ff6ec3a103576bc8777c46 -#Source0: http://downloads.ghostscript.com/public/ghostscript-%{version}.tar.gz +# MD5 checksum for Source0: 829319325bbdb83f5c81379a8f86f38f +Source0: http://downloads.ghostscript.com/public/ghostscript-%{version}.tar.gz # Patch0...Patch9 is for patches from upstream: # # Source10...Source99 is for sources from SUSE which are intended for upstream: @@ -72,12 +72,6 @@ Source0: http://downloads.ghostscript.com/public/.release_candidate/ghost # but the hunk for LCMS2 (lcms2/include/lcms2.h) is still needed # see http://bugs.ghostscript.com/show_bug.cgi?id=695544 Patch11: ppc64le-support.patch -# Patch12 fix.including.pread.pwrite.pthread_mutexattr_settype.diff fixes on SLE11 -# ./base/gp_unifs.c:187: warning: implicit declaration of function 'pread' -# ./base/gp_unifs.c:209: warning: implicit declaration of function 'pwrite' -# ./base/gp_psync.c:170: warning: implicit declaration of function 'pthread_mutexattr_settype' -# see http://bugs.ghostscript.com/show_bug.cgi?id=695882 -Patch12: fix.including.pread.pwrite.pthread_mutexattr_settype.diff # # Source100...Source999 is for sources from SUSE which are not intended for upstream: # @@ -156,12 +150,6 @@ This package contains the development files for Minimal Ghostscript. # but the hunk for LCMS2 (lcms2/include/lcms2.h) is still needed # see http://bugs.ghostscript.com/show_bug.cgi?id=695544 %patch11 -p1 -# Patch12 fix.including.pread.pwrite.pthread_mutexattr_settype.diff fixes on SLE11 -# ./base/gp_unifs.c:187: warning: implicit declaration of function 'pread' -# ./base/gp_unifs.c:209: warning: implicit declaration of function 'pwrite' -# ./base/gp_psync.c:170: warning: implicit declaration of function 'pthread_mutexattr_settype' -# see http://bugs.ghostscript.com/show_bug.cgi?id=695882 -%patch12 %build # Set our preferred architecture-specific flags for the compiler and linker: diff --git a/ghostscript.changes b/ghostscript.changes index 4d0649e..e2580e3 100644 --- a/ghostscript.changes +++ b/ghostscript.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Mar 31 10:18:06 CEST 2015 - jsmeix@suse.de + +- Version upgrade to 9.16. Primarily a maintenance release. + There are no recorded incompatible changes (as of this writing). + Highlights in this release include: + * "LockColorants" command line option for tiffsep and psdcmyk + devices. + * Improved high level devices handling of Forms. + See http://www.ghostscript.com/doc/9.16/News.htm + For details see the News.htm and History9.htm files. +- fix.including.pread.pwrite.pthread_mutexattr_settype.diff + is no longer needed because it is fixed in the upstream sources. + ------------------------------------------------------------------- Wed Mar 25 12:38:16 CET 2015 - jsmeix@suse.de diff --git a/ghostscript.spec b/ghostscript.spec index 38db176..38a3ff8 100644 --- a/ghostscript.spec +++ b/ghostscript.spec @@ -55,32 +55,32 @@ Url: http://www.ghostscript.com/ # But only with the alphabetic prefix "9.pre15rc1" would be older than the previous version number "9.14" # because rpmvercmp would treat 9.pre15rc1 as 9.pre.15.rc1 and letters are older than numbers # so that we keep additionally the previous version number to upgrade from the previous version: -Version: 9.15pre16rc2 -Release: 0 +#Version: 9.15pre16rc2 # Normal version for Ghostscript releases is the upstream version: -#Version: 9.15 +Version: 9.16 +Release: 0 # tarball_version is used below to specify the directory via "setup -n": # Special tarball_version needed for Ghostscript release candidates e.g. "define tarball_version 9.15rc1". # For Ghostscript releases tarball_version and version are the same (i.e. the upstream version): -#define tarball_version %{version} -%define tarball_version 9.16rc2 +%define tarball_version %{version} +#define tarball_version 9.16rc2 # built_version is used below in the install and files sections: # Separated built_version needed in case of Ghostscript release candidates e.g. "define built_version 9.15". # For Ghostscript releases built_version and version are the same (i.e. the upstream version): -#define built_version %{version} -%define built_version 9.16 +%define built_version %{version} +#define built_version 9.16 # Source0...Source9 is for sources from upstream: # Special URLs for Ghostscript release candidates: # URL for Source0: http://downloads.ghostscript.com/public/.release_candidate/ghostscript-9.16rc2.tar.gz # URL for MD5 checksums: http://www.ghostscript.com/~chrisl/MD5SUMS or http://www.ghostscript.com/~chrisl/MD5SUM # or http://downloads.ghostscript.com/public/.release_candidate/MD5SUMS # MD5 checksum for Source0: 17983ee93d97596ffa72fd32be2426a4 -Source0: http://downloads.ghostscript.com/public/.release_candidate/ghostscript-9.16rc2.tar.gz +#Source0: http://downloads.ghostscript.com/public/.release_candidate/ghostscript-9.16rc2.tar.gz # Normal URLs for Ghostscript releases: -# URL for Source0: http://downloads.ghostscript.com/public/ghostscript-9.15.tar.gz +# URL for Source0: http://downloads.ghostscript.com/public/ghostscript-9.16.tar.gz # URL for MD5 checksums: http://downloads.ghostscript.com/public/MD5SUMS -# MD5 checksum for Source0: 5a78ab0990ff6ec3a103576bc8777c46 -#Source0: http://downloads.ghostscript.com/public/ghostscript-%{version}.tar.gz +# MD5 checksum for Source0: 829319325bbdb83f5c81379a8f86f38f +Source0: http://downloads.ghostscript.com/public/ghostscript-%{version}.tar.gz # Patch0...Patch9 is for patches from upstream: # # Source10...Source99 is for sources from SUSE which are intended for upstream: @@ -92,12 +92,6 @@ Source0: http://downloads.ghostscript.com/public/.release_candidate/ghost # but the hunk for LCMS2 (lcms2/include/lcms2.h) is still needed # see http://bugs.ghostscript.com/show_bug.cgi?id=695544 Patch11: ppc64le-support.patch -# Patch12 fix.including.pread.pwrite.pthread_mutexattr_settype.diff fixes on SLE11 -# ./base/gp_unifs.c:187: warning: implicit declaration of function 'pread' -# ./base/gp_unifs.c:209: warning: implicit declaration of function 'pwrite' -# ./base/gp_psync.c:170: warning: implicit declaration of function 'pthread_mutexattr_settype' -# see http://bugs.ghostscript.com/show_bug.cgi?id=695882 -Patch12: fix.including.pread.pwrite.pthread_mutexattr_settype.diff # # Source100...Source999 is for sources from SUSE which are not intended for upstream: # @@ -293,12 +287,6 @@ This package contains the development files for Ghostscript. # but the hunk for LCMS2 (lcms2/include/lcms2.h) is still needed # see http://bugs.ghostscript.com/show_bug.cgi?id=695544 %patch11 -p1 -# Patch12 fix.including.pread.pwrite.pthread_mutexattr_settype.diff fixes on SLE11 -# ./base/gp_unifs.c:187: warning: implicit declaration of function 'pread' -# ./base/gp_unifs.c:209: warning: implicit declaration of function 'pwrite' -# ./base/gp_psync.c:170: warning: implicit declaration of function 'pthread_mutexattr_settype' -# see http://bugs.ghostscript.com/show_bug.cgi?id=695882 -%patch12 %build # Set our preferred architecture-specific flags for the compiler and linker: