[libreoffice] fix KDE4 detection on aarch64

David Tardon dtardon at fedoraproject.org
Wed Sep 3 07:48:05 UTC 2014


commit 4296692bf26ef386381a3efd1c4b6416f8b41ea6
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Sep 3 09:43:41 2014 +0200

    fix KDE4 detection on aarch64

 0001-fix-KDE4-detection-on-aarch64.patch |   31 ++++++++++++++++++++++++++++++
 libreoffice.spec                         |    1 +
 2 files changed, 32 insertions(+), 0 deletions(-)
---
diff --git a/0001-fix-KDE4-detection-on-aarch64.patch b/0001-fix-KDE4-detection-on-aarch64.patch
new file mode 100644
index 0000000..18537e3
--- /dev/null
+++ b/0001-fix-KDE4-detection-on-aarch64.patch
@@ -0,0 +1,31 @@
+From fdb81f1a2012e558eaeb7fcf762736f1afcdeee9 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Wed, 3 Sep 2014 09:36:22 +0200
+Subject: [PATCH] fix KDE4 detection on aarch64
+
+Change-Id: Iafe65564e8c2534cb03497d82d7dd3498abdf7c8
+---
+ configure.ac | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index c0b5658..f65ab66 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -11045,9 +11045,12 @@ AC_SUBST(ENABLE_SCRIPTING_JAVASCRIPT)
+ AC_SUBST(SYSTEM_RHINO)
+ AC_SUBST(RHINO_JAR)
+ 
++# This is only used in KDE3/KDE4/TDE checks to determine if /usr/lib64
++# paths should be added to library search path. So lets put all 64-bit
++# platforms there.
+ supports_multilib=
+ case "$host_cpu" in
+-x86_64 | powerpc64 | s390x)
++x86_64 | powerpc64 | powerpc64le | s390x | aarch64)
+     if test "$SAL_TYPES_SIZEOFLONG" = "8"; then
+         supports_multilib="yes"
+     fi
+-- 
+1.9.3
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 8ba7ebf..e6900ca 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -317,6 +317,7 @@ Patch24: 0001-fix-variable-name.patch
 Patch25: 0001-cast-arg-to-the-right-type.patch
 Patch26: 0001-sigh-simply-forgot-to-include-the-endian-header.patch
 Patch27: 0002-Linux-AArch64-port.patch
+Patch28: 0001-fix-KDE4-detection-on-aarch64.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice


More information about the scm-commits mailing list