diff --git a/evince-lzmasdk-s390x.patch b/evince-lzmasdk-s390x.patch new file mode 100644 index 0000000..618d1d0 --- /dev/null +++ b/evince-lzmasdk-s390x.patch @@ -0,0 +1,17 @@ +MY_CPU_BE expands to an empty token sequence, so defined (MY_CPU_BE) +has to be used in this context. This code is only reachable for +s390x, ppc64 sets MY_CPU_NAME earlier. + +diff -ur evince-3.25.4.orig/cut-n-paste/unarr/lzmasdk/CpuArch.h evince-3.25.4/cut-n-paste/unarr/lzmasdk/CpuArch.h +--- evince-3.25.4.orig/cut-n-paste/unarr/lzmasdk/CpuArch.h 2017-07-22 07:58:23.000000000 +0200 ++++ evince-3.25.4/cut-n-paste/unarr/lzmasdk/CpuArch.h 2017-07-31 13:32:33.893245858 +0200 +@@ -174,7 +174,7 @@ + #ifndef MY_CPU_NAME + #ifdef MY_CPU_LE + #define MY_CPU_NAME "LE" +- #elif MY_CPU_BE ++ #elif defined (MY_CPU_BE) + #define MY_CPU_NAME "BE" + #else + /* +Only in evince-3.25.4/cut-n-paste/unarr/lzmasdk: CpuArch.h~ diff --git a/evince.spec b/evince.spec index b3e8c7c..aada091 100644 --- a/evince.spec +++ b/evince.spec @@ -17,6 +17,7 @@ Patch0: evince-3.21.4-NPNVToolKit.patch Patch3: 0001-Resolves-deb-762530-rhbz-1061177-add-man-pages.patch Patch4: 0001-Resolves-rhbz-1358249-page-up-down.patch Patch6: 0001-Revert-Bump-poppler-requirements-to-0.33.0.patch +Patch7: evince-lzmasdk-s390x.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1468488 BuildRequires: pkgconfig(adwaita-icon-theme) @@ -267,6 +268,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null ||: %changelog * Mon Jul 31 2017 Florian Weimer - 3.25.4-2 - Rebuild with binutils fix for ppc64le (#1475636) +- Fix s390x build issue related to MY_CPU_BE preprocessor conditional * Thu Jul 27 2017 Kalev Lember - 3.25.4-1 - Update to 3.25.4