aboutsummaryrefslogtreecommitdiffstats
path: root/community
diff options
context:
space:
mode:
authorCarlo Landmeter <clandmeter@gmail.com>2017-08-10 10:10:41 +0200
committerCarlo Landmeter <clandmeter@gmail.com>2017-08-10 10:10:45 +0200
commitb1384db7d2e4614c9a99b980e9f781786edcb87b (patch)
treea522ff3fa0d1eaebc4acc67b5a5c7295c02e0c21 /community
parent37b042ddf4e8bc69536d6e42fb1f09e091823b9b (diff)
community/evince: fix build on s390x
Diffstat (limited to 'community')
-rw-r--r--community/evince/APKBUILD7
-rw-r--r--community/evince/evince-lzmasdk-s390x.patch17
2 files changed, 22 insertions, 2 deletions
diff --git a/community/evince/APKBUILD b/community/evince/APKBUILD
index 3efe009d718..65dc9c8d624 100644
--- a/community/evince/APKBUILD
+++ b/community/evince/APKBUILD
@@ -16,7 +16,9 @@ makedepends="$depends_dev intltool itstool gnome-doc-utils
adwaita-icon-theme-dev gnome-common automake autoconf
gtk-doc yelp-tools"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-libs"
-source="http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
+source="http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
+ evince-lzmasdk-s390x.patch
+ "
builddir="${srcdir}/${pkgname}-${pkgver}"
# secfixes:
@@ -55,4 +57,5 @@ doc() {
fi
}
-sha512sums="d0d72eeeb935c36ce9185c2ecff763c20926ce12b10565108ff927bd973758754a48ceda99ee1d4e6f27d5abd42e7224a3cce3721263c35e2fc135ea4b026fc9 evince-3.25.4.tar.xz"
+sha512sums="d0d72eeeb935c36ce9185c2ecff763c20926ce12b10565108ff927bd973758754a48ceda99ee1d4e6f27d5abd42e7224a3cce3721263c35e2fc135ea4b026fc9 evince-3.25.4.tar.xz
+6bb93159e27c609a353b98855c6602b1b92b7445dbb242863f8120c5ca84a05a019e0e5f1b8d4122066ef33e3433fa2a5278403b420f312d66934631d910faa6 evince-lzmasdk-s390x.patch"
diff --git a/community/evince/evince-lzmasdk-s390x.patch b/community/evince/evince-lzmasdk-s390x.patch
new file mode 100644
index 00000000000..618d1d0d5f1
--- /dev/null
+++ b/community/evince/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~