git » libreoffice-still.git » commit bb6d76b

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a43258a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/src/
+/pkg/
diff --git a/PKGBUILD b/PKGBUILD
index a09dd37..0c9d6ae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,8 +12,8 @@ pkgbase=libreoffice-still
 pkgname=('libreoffice-still-sdk' 'libreoffice-still')
 _LOver=7.6.7.2
 pkgver=7.6.7
-pkgrel=1
-arch=('x86_64')
+pkgrel=2
+arch=('x86_64' 'armv7h')
 license=('MPL-2.0' 'LGPL-3.0-or-later')
 url="https://www.libreoffice.org/"
 makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python' 'libwpd>=0.9.2' 'libwps'
@@ -21,16 +21,16 @@ makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python' 'libwpd>=0.9.2' 'libwps'
     'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'icu' 'libxslt'
     'lcms2' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
     'libmspub' 'harfbuzz-icu' 'nss' 'hicolor-icon-theme'
-    'gst-plugins-base-libs' 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'ant'
-    'gperf' 'gtk3' 'gtk4' 'qt5-base' 'qt5-x11extras' 'qt6-base' 'cppunit' 'beanshell' 'clucene'
-    'junit' 'libmythes' 'libwpg'  'java-environment=11' 'postgresql-libs' 'mariadb-libs' 'libgl'
+    'gst-plugins-base-libs' 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc'
+    'gperf' 'gtk3' 'qt5-base' 'plasma-framework' 'cppunit' 'clucene'
+    'libmythes' 'libwpg' 'libgl'
     'bluez-libs' 'gdb' 'doxygen'  'libatomic_ops'  'mdds'
     'ttf-liberation' 'ttf-dejavu' 'ttf-carlito' 'libxinerama' 'libpagemaker' 'glm'
     'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liblangtag' 'liborcus'
     'libexttextcat' 'gobject-introspection' 'libcmis' # 'libfbclient'
     'libtommath' 'libzmf' 'rxvt-unicode' 'gpgme' 'libwebp' # 'xmlsec'
     'libepubgen' 'libfreehand' 'libqxp' 'libstaroffice'  'boost' 'libnumbertext'
-    'abseil-cpp' 'clang' 'zxing-cpp'
+    'abseil-cpp' 'clang' 'zxing-cpp' 'openjpeg2'
     'libffi' 'box2d' 'git' 'python-setuptools'
 )
 options=('!lto') # using --enable-lto (for parallel link-time optimization)
@@ -121,7 +121,7 @@ sha256sums=('75d052ee101aca0d75cd5cb2998e2f705c0089c6acaa263b696e45f8c95e3b95'
             'd7b952a51e1e40d3faf2f465b68f46d56828d8c46948748fa82fe82a29af2599'
             'ddc7aaed0b755c4f2a89ddc2ff68a7d9bc1b7b3458177f1de34085cd3163a1f7'
             'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879'
-            '364af7c45bc4e41f9ebaa36944daefb9bf3aca823b7e0059307ef0cbb41bbf4c'
+            'SKIP'
             '060390bec7882072099c54508993fcfa7e3dd34d6e4b44996bd197d5e99cf0f6')
 
 prepare() {
@@ -161,6 +161,7 @@ prepare() {
     export ARCH_FLAGS
     export CFLAGS="$ARCH_FLAGS"
     export CXXFLAGS="$ARCH_FLAGS"
+    export CPPFLAGS+=" -D_FILE_OFFSET_BITS=64"
 }
 
 build() {
@@ -178,14 +179,12 @@ build() {
     export CFLAGS="${CFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}"
     export CXXFLAGS="${CXXFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}"
 
+
     # http://site.icu-project.org/download/61#TOC-Migration-Issues
     CPPFLAGS+=' -DU_USING_ICU_NAMESPACE=1'
 
-    # fix build with qt6 expecting libexec path
-    export qt6_libexec_dirs="/usr/lib/qt6"
-
     ./autogen.sh --with-extra-buildid="${pkgver}-${pkgrel}" \
-        --with-vendor="Arch Linux" \
+        --with-vendor="ARMLFS" \
         --enable-split-app-modules \
         --with-parallelism=${_MAKEFLAGS/-j/} \
         --with-external-tar="${srcdir}/ext_sources" \
@@ -199,23 +198,19 @@ build() {
         --enable-dbus \
         --enable-evolution2\
         --enable-gio\
-        --disable-gtk3-kde5 \
-        --disable-kf5 \
+        --enable-gtk3-kde5 \
+        --enable-kf5 \
         --enable-qt5 \
-        --enable-qt6 \
+        --disable-qt6 \
         --enable-gtk3 \
-        --enable-gtk4 \
+        --disable-gtk4 \
         --enable-introspection \
-        --enable-lto \
         --enable-openssl \
         --enable-odk\
         --enable-python=system \
-        --enable-scripting-beanshell \
         --enable-scripting-javascript \
         --disable-dconf \
         --disable-report-builder \
-        --enable-ext-wiki-publisher \
-        --enable-ext-nlpsolver \
         --without-fonts\
         --with-system-libxml \
         --with-system-libcdr \
@@ -242,7 +237,6 @@ build() {
         --with-external-dict-dir=/usr/share/hunspell \
         --with-external-hyph-dir=/usr/share/hyphen \
         --with-external-thes-dir=/usr/share/mythes \
-        --with-system-beanshell \
         --with-system-cppunit\
         --with-system-graphite\
         --with-system-glm \
@@ -254,8 +248,6 @@ build() {
         --with-system-gpgmepp \
         --with-system-libstaroffice \
         --without-system-xmlsec \
-        --with-jdk-home="/usr/lib/jvm/default" \
-        --with-ant-home="/usr/share/ant"\
         --with-system-boost\
         --with-system-icu \
         --with-system-cairo \
@@ -270,7 +262,19 @@ build() {
         --without-system-poppler \
         --with-gdrive-client-id=${_google_default_client_id} \
         --with-gdrive-client-secret=${_google_default_client_secret} \
-        --disable-dependency-tracking
+	--without-java \
+        --disable-dependency-tracking \
+        --disable-mariadb-sdbc \
+        --disable-postgresql-sdbc \
+        --disable-ldap
+
+#        --with-system-beanshell \
+#        --enable-scripting-beanshell \
+#        --enable-ext-wiki-publisher \
+#        --enable-ext-nlpsolver \
+#        --with-jdk-home="/usr/lib/jvm/default" \
+#        --with-ant-home="/usr/share/ant"\
+
 
     touch src.downloaded
     make build
@@ -325,25 +329,27 @@ package_libreoffice-still() {
         'libtommath' 'libzmf' 'libatomic_ops' 'libnumbertext' 'gpgme' # 'xmlsec'
         'libfreehand' 'libstaroffice' 'libepubgen' 'libqxp' 'libepoxy' 'box2d'
         'zxing-cpp' 'xdg-utils'
-                'libldap' 'fontconfig' 'zlib' 'libpng' 'freetype2' 'raptor' 'libxml2'
+                #'libldap' 
+       'fontconfig' 'zlib' 'libpng' 'freetype2' 'raptor' 'libxml2'
                 'cairo' 'libx11' 'expat' 'glib2' 'boost-libs' 'libtiff' 'dbus' 'glibc'
                 'librevenge' 'libxext' 'openjpeg2' )
-    optdepends=('java-runtime:     adds java support'
-        'java-environment: required by extension-wiki-publisher and extension-nlpsolver'
+    optdepends=(#'java-runtime:     adds java support'
+#        'java-environment: required by extension-wiki-publisher and extension-nlpsolver'
         'pstoedit:         translates PostScript and PDF graphics into other vector formats'
         'libmythes:        for use in thesaurus'
-        'beanshell:       interactive java -- good for prototyping/macros'
+#        'beanshell:       interactive java -- good for prototyping/macros'
         'libwpg:           library for importing and converting WordPerfect Graphics format'
         'sane:             for scanner access'
         'unixodbc:         adds ODBC database support'
         'gst-plugins-base-libs: for multimedia content, e.g. in Impress'
         'libpaper:         takes care of papersize'
-        'postgresql-libs:  for postgresql-connector'
-        'mariadb-libs:     for mysql-connector'
+#        'postgresql-libs:  for postgresql-connector'
+#        'mariadb-libs:     for mysql-connector'
         'coin-or-mp:       required by the Calc solver'
         'gtk3:             for GTK3 integration'
-        'gtk4:             for GTK4 integration (experimental)'
-        'qt6-base:         for Qt6 desktop integration')
+#        'gtk4:             for GTK4 integration (experimental)'
+#        'qt6-base:         for Qt6 desktop integration'
+)
     backup=(etc/libreoffice/sofficerc
         etc/libreoffice/bootstraprc
         etc/libreoffice/psprint.conf
diff --git a/libreoffice-still.sh b/libreoffice-still.sh
index 332ab6d..2f4db79 100644
--- a/libreoffice-still.sh
+++ b/libreoffice-still.sh
@@ -1,7 +1,7 @@
 # to force a certain look'n feel
 
 #export SAL_USE_VCLPLUGIN=gen
+#export SAL_USE_VCLPLUGIN=gtk3_kde5
+#export SAL_USE_VCLPLUGIN=kf5
 #export SAL_USE_VCLPLUGIN=qt5
-#export SAL_USE_VCLPLUGIN=qt6
 #export SAL_USE_VCLPLUGIN=gtk3
-#export SAL_USE_VCLPLUGIN=gtk4