Merge pull request #4343 from ayhanyalcinsoy/master

libreoffice v.bump to 5.4.4.2

office/libreoffice/libreoffice/actions.py

@@ -14,6 +14,10 @@ shelltools.export("LC_ALL", "C")
 pixmaps = "/usr/share/pixmaps/"
 LoVersion = "%s" % get.srcVERSION()
 OurWorkDir = "%s/libreoffice-%s" % (get.workDIR(), LoVersion)
+#for support all languages.
+langall= "am ar ast bg bn bn-IN bo bs ca ca-valencia cs da de dz el en-GB en-US en-ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko lo lt lv mk nb ne nl nn om pl pt pt-BR ro ru si sid sk sl sq sv ta tg tr ug uk vi zh-CN zh-TW"
+#for support some languages.
+lang="ar bg ca cs de el en-US es he hu ja kk ko ru tr tt uz zh-CN zh-TW"
 
 # temporarily disable failing tests, don't run broken tests on i686
 if get.buildTYPE() == "i686":
@@ -33,7 +37,7 @@ def setup():
                         --prefix=/usr      \
                         --sysconfdir=/etc               \
                         --with-vendor="Pisi Linux"         \
-                        --with-lang="ALL"      \
+                        --with-lang="%s"     \
                         --enable-gtk3         \
                         --with-help            \
                         --with-myspell-dicts  \
@@ -61,6 +65,7 @@ def setup():
                         --with-system-hunspell \
                         --with-system-icu               \
                         --with-system-jpeg              \
+                        --with-jdk-home=/usr/lib/jvm/java \
                         --with-system-lcms2             \
                         --with-system-libcdr \
                         --without-system-libcmis \
@@ -101,7 +106,7 @@ def setup():
                         --with-external-tar=external/tarballs \
                         --with-gdrive-client-id=413772536636.apps.googleusercontent.com \
                         --with-gdrive-client-secret=0ZChLK6AxeA3Isu96MkwqDR4 \
-                        --with-parallelism=%s' % (get.makeJOBS().replace("-j","")))
+                        --with-parallelism=%s' % (lang,get.makeJOBS().replace("-j","")))
 
 #--with-system-glew \
 def build():
@@ -111,7 +116,7 @@ def install():
     autotools.rawInstall("DESTDIR=%s distro-pack-install" % get.installDIR())
     
     pisitools.remove("gid_Module*")
-    
+        
     pisitools.insinto("/usr/share/appdata/", "sysui/desktop/appstream-appdata/libreoffice-*.xml")
     
     for pix in ["libreoffice-base.png", "libreoffice-calc.png", "libreoffice-draw.png", "libreoffice-impress.png", "libreoffice-main.png", "libreoffice-math.png", "libreoffice-startcenter.png", "libreoffice-writer.png"]:

office/libreoffice/libreoffice/files/0001-gtk3-only-for-3.20.patch

@@ -0,0 +1,25 @@
+From cd928ec49d4bcf8f9736c3a07ccd1b3fd5df6ad8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Mon, 25 Sep 2017 11:20:34 +0100
+Subject: [PATCH] gtk3 only for >= 3.20
+
+Change-Id: I98008c0028ed5d85fe8770197078360de70010a8
+---
+ vcl/unx/gtk/gtkinst.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/vcl/unx/gtk/gtkinst.cxx b/vcl/unx/gtk/gtkinst.cxx
+index e01a267b..7237b6c 100644
+--- a/vcl/unx/gtk/gtkinst.cxx
++++ b/vcl/unx/gtk/gtkinst.cxx
+@@ -82,7 +82,7 @@ extern "C"
+             XInitThreads();
+ 
+ #if GTK_CHECK_VERSION(3,0,0)
+-        if (gtk_minor_version < 14)
++        if (gtk_minor_version < 20)
+         {
+             g_warning("require a newer gtk than 3.%d for theme expectations", gtk_minor_version);
+             return nullptr;
+-- 
+2.9.5

office/libreoffice/libreoffice/files/make-pyuno-work-with-system-wide-module-install.diff

@@ -1,44 +1,18 @@
-diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
-index defd7b2..ea2a809 100755
---- a/desktop/scripts/soffice.sh
-+++ b/desktop/scripts/soffice.sh
-@@ -128,6 +128,9 @@ if echo "$checks" | grep -q "cc" ; then
-     exit 1;
- fi
- 
-+PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH}
-+export PYTHONPATH
-+
- case "`uname -s`" in
- NetBSD|OpenBSD|FreeBSD|DragonFly)
- # this is a temporary hack until we can live with the default search paths
-diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py
-index f93ac5e..92a2891 100644
---- a/pyuno/source/module/uno.py
-+++ b/pyuno/source/module/uno.py
-@@ -26,8 +26,12 @@
+--- a/pyuno/source/module/uno.py	2017-05-03 18:46:29.000000000 +0200
++++ b/pyuno/source/module/uno.py.new	2017-06-06 17:11:27.585959637 +0200
+@@ -16,8 +16,14 @@
  #   except in compliance with the License. You may obtain a copy of
  #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  #
+-import pyuno
++
++# Special modification to make uno load on Arch
 +import os
  import sys
++sys.path.append("/usr/lib/libreoffice/program/")
++os.putenv("URE_BOOTSTRAP", "vnd.sun.star.pathname:/usr/lib/libreoffice/program/fundamentalrc")
++
++import pyuno
+ import traceback
+ import warnings
  
-+sys.path.append('/usr/lib/libreoffice/program')
-+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
-+     os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:/usr/lib/libreoffice/program/fundamentalrc"
- import pyuno
- 
- try:
-diff --git a/pyuno/source/officehelper.py b/pyuno/source/officehelper.py
-index 610ac5f..df243d0 100755
---- a/pyuno/source/officehelper.py
-+++ b/pyuno/source/officehelper.py
-@@ -44,7 +44,7 @@ def bootstrap():
-         if "UNO_PATH" in os.environ:
-             sOffice = os.environ["UNO_PATH"]
-         else:
--            sOffice = "" # lets hope for the best
-+            sOffice = "/usr/lib/libreoffice/program"
-         sOffice = os.path.join(sOffice, "soffice")
-         if platform.startswith("win"):
-             sOffice += ".exe"