From 8230e651e6110e554f53cc89c303000c06888d336a085d8f5bff7c020cb4c62d Mon Sep 17 00:00:00 2001 From: Johannes Meixner Date: Mon, 29 Sep 2014 09:25:33 +0000 Subject: [PATCH 1/2] Accepting request 252724 from home:oertel:branches:Printing - readd ppc64le patch ppc64le-support.patch lcms has not been fixed upstream and lcms2 has been fixed in a broken way - readd ppc64le patch ppc64le-support.patch lcms has not been fixed upstream and lcms2 has been fixed in a broken way OBS-URL: https://build.opensuse.org/request/show/252724 OBS-URL: https://build.opensuse.org/package/show/Printing/ghostscript?expand=0&rev=45 --- ghostscript-mini.changes | 7 +++++++ ghostscript-mini.spec | 5 +++++ ghostscript.changes | 7 +++++++ ghostscript.spec | 5 +++++ ppc64le-support.patch | 28 ++++++++++++++++++++++++++++ 5 files changed, 52 insertions(+) create mode 100644 ppc64le-support.patch diff --git a/ghostscript-mini.changes b/ghostscript-mini.changes index dd47109..1c8e464 100644 --- a/ghostscript-mini.changes +++ b/ghostscript-mini.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Sep 28 18:00:37 CEST 2014 - ro@suse.de + +- readd ppc64le patch ppc64le-support.patch + lcms has not been fixed upstream and lcms2 has been fixed + in a broken way + ------------------------------------------------------------------- Tue Sep 23 10:14:28 CEST 2014 - jsmeix@suse.de diff --git a/ghostscript-mini.spec b/ghostscript-mini.spec index 0d6235a..423f544 100644 --- a/ghostscript-mini.spec +++ b/ghostscript-mini.spec @@ -65,6 +65,9 @@ Source0: http://downloads.ghostscript.com/public/ghostscript-%{version}.t # Source10...Source99 is for sources from SUSE which are intended for upstream: # # Patch10...Patch99 is for patches from SUSE which are intended for upstream: +# remainder of the previous patch, lcms2 has been fixed upstream not working +# lcms has not been fixed +Patch10: ppc64le-support.patch # # Source100...Source999 is for sources from SUSE which are not intended for upstream: # @@ -137,6 +140,8 @@ This package contains the development files for Minimal Ghostscript. # Be quiet when unpacking and # use a directory name matching Source0 to make it work also for ghostscript-mini: %setup -q -n ghostscript-%{tarball_version} +# Patch10 ppc64le-support.patch from IBM fixes endianness in lcms (the Little-CMS library): +%patch10 -p1 %build # Set our preferred architecture-specific flags for the compiler and linker: diff --git a/ghostscript.changes b/ghostscript.changes index a427713..61500b8 100644 --- a/ghostscript.changes +++ b/ghostscript.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Sep 28 18:00:37 CEST 2014 - ro@suse.de + +- readd ppc64le patch ppc64le-support.patch + lcms has not been fixed upstream and lcms2 has been fixed + in a broken way + ------------------------------------------------------------------- Tue Sep 23 10:14:28 CEST 2014 - jsmeix@suse.de diff --git a/ghostscript.spec b/ghostscript.spec index 8571707..f5bf215 100644 --- a/ghostscript.spec +++ b/ghostscript.spec @@ -71,6 +71,9 @@ Source0: http://downloads.ghostscript.com/public/ghostscript-%{version}.t # Source10...Source99 is for sources from SUSE which are intended for upstream: # # Patch10...Patch99 is for patches from SUSE which are intended for upstream: +# remainder of the previous patch, lcms2 has been fixed upstream not working +# lcms has not been fixed +Patch10: ppc64le-support.patch # # Source100...Source999 is for sources from SUSE which are not intended for upstream: # @@ -260,6 +263,8 @@ This package contains the development files for Ghostscript. # Be quiet when unpacking and # use a directory name matching Source0 to make it work also for ghostscript-mini: %setup -q -n ghostscript-%{tarball_version} +# Patch10 ppc64le-support.patch from IBM fixes endianness in lcms (the Little-CMS library): +%patch10 -p1 %build # Set our preferred architecture-specific flags for the compiler and linker: diff --git a/ppc64le-support.patch b/ppc64le-support.patch new file mode 100644 index 0000000..b3e65df --- /dev/null +++ b/ppc64le-support.patch @@ -0,0 +1,28 @@ +--- ghostscript-9.15/lcms/include/lcms.h ++++ ghostscript-9.15/lcms/include/lcms.h +@@ -140,11 +140,15 @@ + #endif + + #if defined(__sgi__) || defined(__sgi) || defined(__powerpc__) || defined(sparc) || defined(__ppc__) || defined(__s390__) || defined(__s390x__) ++# ifndef __LITTLE_ENDIAN__ + # define USE_BIG_ENDIAN 1 ++# endif + #endif + + #if TARGET_CPU_PPC ++# ifndef __LITTLE_ENDIAN__ + # define USE_BIG_ENDIAN 1 ++# endif + #endif + + #if macintosh +--- ghostscript-9.15/lcms2/include/lcms2.h ++++ ghostscript-9.15/lcms2/include/lcms2.h +@@ -67,6 +67,7 @@ + #include + #include + #include ++#include + + #ifndef CMS_USE_CPP_API + # ifdef __cplusplus From 9876c3a3b9428c109928b9006fa2d3123adb5c5fd9f01c905e11afc4ea1ee90f Mon Sep 17 00:00:00 2001 From: Johannes Meixner Date: Mon, 29 Sep 2014 12:56:54 +0000 Subject: [PATCH 2/2] Accepting request 253097 from home:jsmeix:branches:Printing More descriptive texts and upstream bug regarding re-added ppc64le-support.patch OBS-URL: https://build.opensuse.org/request/show/253097 OBS-URL: https://build.opensuse.org/package/show/Printing/ghostscript?expand=0&rev=46 --- ghostscript-mini.changes | 9 ++++++--- ghostscript-mini.spec | 15 +++++++++------ ghostscript.changes | 9 ++++++--- ghostscript.spec | 13 ++++++++----- 4 files changed, 29 insertions(+), 17 deletions(-) diff --git a/ghostscript-mini.changes b/ghostscript-mini.changes index 1c8e464..7d35da6 100644 --- a/ghostscript-mini.changes +++ b/ghostscript-mini.changes @@ -1,9 +1,12 @@ ------------------------------------------------------------------- Sun Sep 28 18:00:37 CEST 2014 - ro@suse.de -- readd ppc64le patch ppc64le-support.patch - lcms has not been fixed upstream and lcms2 has been fixed - in a broken way +- readd ppc64le patch ppc64le-support.patch (adapted for lcms2 in + Ghostscript version 9.15): the tests in lcms2.h cannot work + without "include " that is now added and + regardless that lcms is not used by default (unless the + configure option --with-lcms is set), lcms is again fixed + (see http://bugs.ghostscript.com/show_bug.cgi?id=695544). ------------------------------------------------------------------- Tue Sep 23 10:14:28 CEST 2014 - jsmeix@suse.de diff --git a/ghostscript-mini.spec b/ghostscript-mini.spec index 423f544..cd4b4fc 100644 --- a/ghostscript-mini.spec +++ b/ghostscript-mini.spec @@ -65,9 +65,10 @@ Source0: http://downloads.ghostscript.com/public/ghostscript-%{version}.t # Source10...Source99 is for sources from SUSE which are intended for upstream: # # Patch10...Patch99 is for patches from SUSE which are intended for upstream: -# remainder of the previous patch, lcms2 has been fixed upstream not working -# lcms has not been fixed -Patch10: ppc64le-support.patch +# Patch11 ppc64le-support.patch is a remainder of the previous patch +# lcms2 has been fixed upstream not working and lcms has not been fixed +# see http://bugs.ghostscript.com/show_bug.cgi?id=695544 +Patch11: ppc64le-support.patch # # Source100...Source999 is for sources from SUSE which are not intended for upstream: # @@ -122,7 +123,7 @@ a link to its matching ghostscript "parent" package. Only that ghostscript package must contain all sources and any changes must happen only for that ghostscript package. This means any changes for the ghostscript-mini -package will be rejected in the openSUSE build service. +package will be rejected in the openSUSE build service. %package devel Summary: Development files for Minimal Ghostscript @@ -140,8 +141,10 @@ This package contains the development files for Minimal Ghostscript. # Be quiet when unpacking and # use a directory name matching Source0 to make it work also for ghostscript-mini: %setup -q -n ghostscript-%{tarball_version} -# Patch10 ppc64le-support.patch from IBM fixes endianness in lcms (the Little-CMS library): -%patch10 -p1 +# Patch11 ppc64le-support.patch is a remainder of the previous patch +# lcms2 has been fixed upstream not working and lcms has not been fixed +# see http://bugs.ghostscript.com/show_bug.cgi?id=695544 +%patch11 -p1 %build # Set our preferred architecture-specific flags for the compiler and linker: diff --git a/ghostscript.changes b/ghostscript.changes index 61500b8..848a0b3 100644 --- a/ghostscript.changes +++ b/ghostscript.changes @@ -1,9 +1,12 @@ ------------------------------------------------------------------- Sun Sep 28 18:00:37 CEST 2014 - ro@suse.de -- readd ppc64le patch ppc64le-support.patch - lcms has not been fixed upstream and lcms2 has been fixed - in a broken way +- readd ppc64le patch ppc64le-support.patch (adapted for lcms2 in + Ghostscript version 9.15): the tests in lcms2.h cannot work + without "include " that is now added and + regardless that lcms is not used by default (unless the + configure option --with-lcms is set), lcms is again fixed + (see http://bugs.ghostscript.com/show_bug.cgi?id=695544). ------------------------------------------------------------------- Tue Sep 23 10:14:28 CEST 2014 - jsmeix@suse.de diff --git a/ghostscript.spec b/ghostscript.spec index f5bf215..8c99a8e 100644 --- a/ghostscript.spec +++ b/ghostscript.spec @@ -71,9 +71,10 @@ Source0: http://downloads.ghostscript.com/public/ghostscript-%{version}.t # Source10...Source99 is for sources from SUSE which are intended for upstream: # # Patch10...Patch99 is for patches from SUSE which are intended for upstream: -# remainder of the previous patch, lcms2 has been fixed upstream not working -# lcms has not been fixed -Patch10: ppc64le-support.patch +# Patch11 ppc64le-support.patch is a remainder of the previous patch +# lcms2 has been fixed upstream not working and lcms has not been fixed +# see http://bugs.ghostscript.com/show_bug.cgi?id=695544 +Patch11: ppc64le-support.patch # # Source100...Source999 is for sources from SUSE which are not intended for upstream: # @@ -263,8 +264,10 @@ This package contains the development files for Ghostscript. # Be quiet when unpacking and # use a directory name matching Source0 to make it work also for ghostscript-mini: %setup -q -n ghostscript-%{tarball_version} -# Patch10 ppc64le-support.patch from IBM fixes endianness in lcms (the Little-CMS library): -%patch10 -p1 +# Patch11 ppc64le-support.patch is a remainder of the previous patch +# lcms2 has been fixed upstream not working and lcms has not been fixed +# see http://bugs.ghostscript.com/show_bug.cgi?id=695544 +%patch11 -p1 %build # Set our preferred architecture-specific flags for the compiler and linker: