[Libreoffice-commits] core.git: 4 commits - distro-configs/LibreOfficeFlatpak.conf solenv/bin solenv/flatpak-manifest.in

[Stephan Bergmann]

 distro-configs/LibreOfficeFlatpak.conf |    1 +
 solenv/bin/assemble-flatpak.sh         |   26 +++++++++++---------------
 solenv/flatpak-manifest.in             |   18 ++++++++++++------
 3 files changed, 24 insertions(+), 21 deletions(-)

New commits:
commit 5a38658e5e232ce39e22ea76642c58f6babc89cd
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Sep 7 11:26:25 2017 +0200

    Adapt flatpak-manifest.in to updated pdfium
    
    ...0365ca351aac534d3fc09d22f6a91017525bfef8 "pdfium: update to 3196"
    
    Change-Id: Ia291b30b79bb0873529e474164d24dcb8b491f40

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 3cd80f680614..c1e3960e3f8d 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -28,10 +28,10 @@
                     "dest-filename": "external/tarballs/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2"
                 },
                 {
-                    "url": "https://dev-www.libreoffice.org/src/pdfium-3151.tar.bz2",
-                    "sha256": "d24f41b65a797e545eeafc37106a85001437664267361a7576572b967d31ed6a",
+                    "url": "https://dev-www.libreoffice.org/src/pdfium-3196.tar.bz2",
+                    "sha256": "76b08c5bc9cd41ccdd58aa41491d3f8e1fad517d7cb3e16d285b68ab175dc0fa",
                     "type": "file",
-                    "dest-filename": "external/tarballs/pdfium-3151.tar.bz2"
+                    "dest-filename": "external/tarballs/pdfium-3196.tar.bz2"
                 },
                 {
                     "url": "https://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af.tar.bz2",
commit 374a721aca251e8988d4edb7f88ffd06ddef43b9
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Sep 7 11:17:18 2017 +0200

    Adapt flatpak-manifest.in to updated language-subtag-registry
    
    ...04d70c0999c716f5465631eca50945915ec607c4 "Upgrade to
    language-subtag-registry-2017-08-15"
    
    Change-Id: I4178545869a6d97cb1f90034f3944d9c72700bd6

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 6ca5be1d5a32..3cd80f680614 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -226,10 +226,10 @@
                     "dest-filename": "external/tarballs/libgltf-0.1.0.tar.gz"
                 },
                 {
-                    "url": "https://dev-www.libreoffice.org/src/language-subtag-registry-2017-04-19.tar.bz2",
-                    "sha256": "8333809eec6fce852a1d6de68859962106e13a84705417efb03452164da3ee7a",
+                    "url": "https://dev-www.libreoffice.org/src/language-subtag-registry-2017-08-15.tar.bz2",
+                    "sha256": "d6a97fc8da5ae54d867e7f1b65ffb51e816cadd11714e45fc23ee0abf81a51ab",
                     "type": "file",
-                    "dest-filename": "external/tarballs/language-subtag-registry-2017-04-19.tar.bz2"
+                    "dest-filename": "external/tarballs/language-subtag-registry-2017-08-15.tar.bz2"
                 },
                 {
                     "url": "https://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2",
commit 6665da201ce2a87562897d9bdf087b2ff4572976
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Sep 7 11:11:06 2017 +0200

    No libqxp in org.gnome.Sdk//3.24
    
    Change-Id: Ia3551572269e1cf04b2a398cd08f718fd248c6e6

diff --git a/distro-configs/LibreOfficeFlatpak.conf b/distro-configs/LibreOfficeFlatpak.conf
index 0cf090da77f1..e046ce648deb 100644
--- a/distro-configs/LibreOfficeFlatpak.conf
+++ b/distro-configs/LibreOfficeFlatpak.conf
@@ -27,6 +27,7 @@
 --without-system-libmwaw
 --without-system-libodfgen
 --without-system-libpagemaker
+--without-system-libqxp
 --without-system-librevenge
 --without-system-libstaroffice
 --without-system-libtommath
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 5a2813d48569..6ca5be1d5a32 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -380,6 +380,12 @@
                     "sha256": "eea910b042526ed52f7ab9292b7fa31fca32f9e042285818074ff33664db4fa2",
                     "type": "file",
                     "dest-filename": "external/tarballs/libepubgen-0.0.1.tar.bz2"
+                },
+                {
+                    "url": "https://dev-www.libreoffice.org/src/libqxp-0.0.0.tar.xz",
+                    "sha256": "0dd32afbf1c889debc28848b260c1bdc0eba5f57504476b787e164f7c59776d5",
+                    "type": "file",
+                    "dest-filename": "external/tarballs/libqxp-0.0.0.tar.xz"
                 }
             ],
             "buildsystem": "simple",
commit 1b85d725663a7d7546549e6b78ea43bea1cde7b9
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Sep 7 10:50:34 2017 +0200

    Include all .desktop files in the Flatpak
    
    ...GNOME Software reportedly is fine with that now.
    
    Change-Id: I418fc60a3215078109d3d8e9f426f98fdf37322b

diff --git a/solenv/bin/assemble-flatpak.sh b/solenv/bin/assemble-flatpak.sh
index e73848b6e050..d514c3ee41fc 100755
--- a/solenv/bin/assemble-flatpak.sh
+++ b/solenv/bin/assemble-flatpak.sh
@@ -15,29 +15,25 @@ set -e
 
 cp -r "${PREFIXDIR?}"/lib/libreoffice /app/
 
-## libreoffice-startcenter.desktop -> org.libreoffice.LibreOffice.desktop,
-## combining all libreoffice-*.desktop MimeType= lines:
+## libreoffice-*.desktop -> org.libreoffice.LibreOffice-*.desktop:
 mkdir /app/share
 mkdir /app/share/applications
-my_mimetypes=$(awk -d 'BEGIN { FS="="; ORS=""; semi=0 }; \
- /^MimeType=/ && length($2) \
-  { if (semi) print ";"; print $2; semi = match($2, ";$") == 0 }' \
- "${PREFIXDIR?}"/share/applications/libreoffice-*.desktop)
-sed -e 's,^Exec=libreoffice,Exec=/app/libreoffice/program/soffice,' \
- -e 's/^Icon=libreoffice-/Icon=org.libreoffice.LibreOffice-/' \
- -e 's|^MimeType=.*$|MimeType='"$my_mimetypes"'|' \
- "${PREFIXDIR?}"/share/applications/libreoffice-startcenter.desktop \
- >/app/share/applications/org.libreoffice.LibreOffice.desktop
+for i in "${PREFIXDIR?}"/share/applications/libreoffice-*.desktop
+do
+ sed -e 's,^Exec=libreoffice,Exec=/app/libreoffice/program/soffice,' \
+  -e 's/^Icon=libreoffice-/Icon=org.libreoffice.LibreOffice-/' "$i" \
+  >/app/share/applications/org.libreoffice.LibreOffice-"${i#"${PREFIXDIR?}"/share/applications/libreoffice-}"
+done
 
-## icons/hicolor/*/apps/libreoffice-startcenter.* ->
-## icons/hicolor/*/apps/org.libreoffice.LibreOffice-startcenter.*:
+## icons/hicolor/*/apps/libreoffice-* ->
+## icons/hicolor/*/apps/org.libreoffice.LibreOffice-*:
 mkdir /app/share/icons
-for i in "${PREFIXDIR?}"/share/icons/hicolor/*/apps/libreoffice-startcenter.*
+for i in "${PREFIXDIR?}"/share/icons/hicolor/*/apps/libreoffice-*
 do
  mkdir -p \
   "$(dirname /app/share/icons/hicolor/"${i#"${PREFIXDIR?}"/share/icons/hicolor/}")"
  cp -a "$i" \
-  "$(dirname /app/share/icons/hicolor/"${i#"${PREFIXDIR?}"/share/icons/hicolor/}")"/org.libreoffice.LibreOffice-startcenter."${i##*/apps/libreoffice-startcenter.}"
+  "$(dirname /app/share/icons/hicolor/"${i#"${PREFIXDIR?}"/share/icons/hicolor/}")"/org.libreoffice.LibreOffice-"${i##*/apps/libreoffice-}"
 done
 
 ## org.libreoffice.LibreOffice.appdata.xml is manually derived from the various