[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - solenv/flatpak-manifest.in

[Libreoffice Gerrit user]

 solenv/flatpak-manifest.in |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b36c5676a2f2eca8acc440d3bd1a4c5e0b834660
Author: Stephan Bergmann 
AuthorDate: Wed Jul 25 12:52:38 2018 +0200
Commit: Michael Stahl 
CommitDate: Thu Jul 26 10:46:28 2018 +0200

Adapt solenv/flatpak-manifest.in to recent download.lst changes

(cherry picked from commit 5c016d6ae4e59629cfd0b80c631f67cf46e42d3e)
Conflicts:
solenv/flatpak-manifest.in

Change-Id: I7799abe1a6fc9cf79a751d76360ea7ad2face133
Reviewed-on: https://gerrit.libreoffice.org/57981
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 7adaa1bbd83a..369bef4c1233 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -405,10 +405,10 @@
 "dest-filename": "external/tarballs/liborcus-0.13.3.tar.gz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/poppler-0.59.0.tar.xz;,
-"sha256": 
"a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641",
+"url": 
"https://dev-www.libreoffice.org/src/poppler-0.66.0.tar.xz;,
+"sha256": 
"2c096431adfb74bc2f53be466889b7646e1b599f28fa036094f3f7235cc9eae7",
 "type": "file",
-"dest-filename": "external/tarballs/poppler-0.59.0.tar.xz"
+"dest-filename": "external/tarballs/poppler-0.66.0.tar.xz"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2;,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - solenv/flatpak-manifest.in

[Stephan Bergmann]

 solenv/flatpak-manifest.in |   15 +++
 1 file changed, 15 insertions(+)

New commits:
commit 0625358f79cbbc15f4374aec207f516a004c4207
Author: Stephan Bergmann 
Date:   Thu Jun 7 17:36:37 2018 +0200

Merge in Flatpak improvements

...from :

commit 0242fa00493c0521d75c60cc4987fb8c7f3abeb1
Author: Robert McQueen 
Date:   Tue May 15 11:08:30 2018 +0100

add missing share of dconf runtime dir

This breaks dconf change notifications, including the GSettings used 
for Gtk+
themes. Could also cause other weird settings problems.

https://github.com/flathub/org.libreoffice.LibreOffice/issues/31

commit 800d0d553fec6bd093f813cb4aa2f10dcbe10aee
Author: Stephan Bergmann 
Date:   Thu May 31 18:02:13 2018 +0200

Re-enable GIO support

...that was inadvertently lost when switching from the GNOME to the
freedesktop.org runtime.  For one, LO configure's --disable-gtk 
erroneously
implied --disable-gio, even under --enable-gtk3.  For another, gvfs is 
missing
from the freedesktop.org runtime; the recipe is copied from
.

This hopefully fixes
 
"Again unable
to open files on network shares".

Change-Id: Ib0a3680dc4eb2595eb2d8b0bb30c54082651686c
Reviewed-on: https://gerrit.libreoffice.org/55431
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 67aaa98600269e6b8fa631146c3649a261369471)
Reviewed-on: https://gerrit.libreoffice.org/55439
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index c22d921f91dc..ebeda89a78cc 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -59,6 +59,19 @@
 ]
 },
 {
+"name": "gvfs",
+"cleanup": [ "/libexec/*", "/share/dbus-1/services/*", 
"/share/gvfs/mounts" ],
+"config-opts": [ "--disable-hal", "--disable-gdu", 
"--disable-gcr", "--disable-obexftp",
+ "--disable-avahi", "--disable-documentation", 
"--disable-admin" ],
+"sources": [
+{
+"type": "archive",
+"url": 
"https://download.gnome.org/sources/gvfs/1.36/gvfs-1.36.1.tar.xz;,
+"sha256": 
"3840dff386c2c8a445337bea4ade0eb71339efaff8602767659fa2896792f026"
+}
+]
+},
+{
 "name": "libreoffice",
 "sources": [
 {
@@ -591,7 +604,9 @@
 "--socket=pulseaudio",
 "--device=dri",
 "--filesystem=host",
+"--filesystem=xdg-run/dconf",
 "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
+"--env=GIO_EXTRA_MODULES=/app/lib/gio/modules",
 "--env=JAVA_HOME=/app/jre",
 "--env=LIBO_FLATPAK=1",
 "--own-name=org.libreoffice.LibreOfficeIpc0",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - solenv/flatpak-manifest.in

[Stephan Bergmann]

 solenv/flatpak-manifest.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ef389eb874e29dba91be55acdbe238396687ec54
Author: Stephan Bergmann 
Date:   Mon May 14 16:58:14 2018 +0200

Merge in Flatpak improvements

...from :

Author: Stephan Bergmann 
Date:   Mon May 14 16:51:37 2018 +0200

Find flatpak'ed Java installation via JAVA_HOME

...instead of via PATH, so that a JAVA_HOME inherited from the 
environment
doesn't accidentally select a different Java installation.  Fixes
 
"undefined
symbol: FT_Done_MM_Var".

Change-Id: I2b4c3a55c92f0ef5c5925f0a9909b7b061eedeeb
Reviewed-on: https://gerrit.libreoffice.org/54331
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 2134b139c7d6..c22d921f91dc 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -592,8 +592,8 @@
 "--device=dri",
 "--filesystem=host",
 "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
+"--env=JAVA_HOME=/app/jre",
 "--env=LIBO_FLATPAK=1",
-"--env=PATH=/usr/bin:/app/jre/bin",
 "--own-name=org.libreoffice.LibreOfficeIpc0",
 "--talk-name=ca.desrt.dconf",
 "--talk-name=org.gtk.vfs.*"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - solenv/flatpak-manifest.in

[Stephan Bergmann]

 solenv/flatpak-manifest.in |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit d1407aac59f3f218a311452fc7dcb7692fdf5285
Author: Stephan Bergmann 
Date:   Fri Apr 20 14:58:57 2018 +0200

Adapt solenv/flatpak-manifest.in to recent download.lst change

...58433a8b88537a1a0883d107972de5c5fad59d4a "Upgrade to
language-subtag-registry-2018-03-30"

Change-Id: Ic58160a56e739d8850566bf67eaed5c981109eb1
(cherry picked from commit 6ea4b982fada0bbca957dfa0729e2c3225c8a460)
Reviewed-on: https://gerrit.libreoffice.org/53210
Reviewed-by: Michael Stahl 
Tested-by: Jenkins 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 52b4c163c207..2134b139c7d6 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -266,10 +266,10 @@
 "dest-filename": 
"external/tarballs/libfreehand-0.1.2.tar.xz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/language-subtag-registry-2017-12-14.tar.bz2;,
-"sha256": 
"0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362",
+"url": 
"https://dev-www.libreoffice.org/src/language-subtag-registry-2018-03-30.tar.bz2;,
+"sha256": 
"b7ad618b7db518155f00490a11b861496864f18b23b4b537eb80bfe84ca6f854",
 "type": "file",
-"dest-filename": 
"external/tarballs/language-subtag-registry-2017-12-14.tar.bz2"
+"dest-filename": 
"external/tarballs/language-subtag-registry-2018-03-30.tar.bz2"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2;,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - solenv/flatpak-manifest.in

[Stephan Bergmann]

 solenv/flatpak-manifest.in |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit e395b177ef34843e6f60e5802d640cb79aa8afae
Author: Stephan Bergmann 
Date:   Fri Apr 20 08:56:47 2018 +0200

Merge in Flatpak improvements

...from :

commit 715fbcfb4e5c51d40387998932984e54639476a1
Author: Robert McQueen 
Date:   Tue Apr 17 10:26:32 2018 +0100

edit .desktop files to add X-Endless-Alias with original names

Endless OS uses this to update icon grids & taskbar pins if the 
original files
have been removed. (Happy to update this to a more standardised key if a
consensus emerges.)

Change-Id: I646350090c38d84d1930c5afbec0ee500b60d0fb
(cherry picked from commit a161e41439fc6f9093c212a523154e5146bb1502)
Reviewed-on: https://gerrit.libreoffice.org/53198
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 679ffa773872..52b4c163c207 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -577,7 +577,9 @@
 "./autogen.sh --prefix=/run/build/libreoffice/inst 
--with-distro=LibreOfficeFlatpak --disable-symbols $(if test \"$(uname -m)\" = 
aarch64; then printf %s --disable-pdfium; fi)",
 "make $(if test \"$(uname -i)\" = i386; then printf 
build-nocheck; fi)",
 "make distro-pack-install",
-"make cmd cmd='$(SRCDIR)/solenv/bin/assemble-flatpak.sh'"
+"make cmd cmd='$(SRCDIR)/solenv/bin/assemble-flatpak.sh'",
+"desktop-file-edit --set-key=X-Endless-Alias 
--set-value=libreoffice-startcenter 
/app/share/applications/org.libreoffice.LibreOffice.desktop",
+"for i in base calc draw impress math writer xsltfilter; do 
desktop-file-edit --set-key=X-Endless-Alias --set-value=libreoffice-$i 
/app/share/applications/org.libreoffice.LibreOffice-$i.desktop; done"
 ]
 }
 ],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - solenv/flatpak-manifest.in

[Stephan Bergmann]

 solenv/flatpak-manifest.in |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 31441ecfb42a2dfde4ba8fae1f5a004ccf7d16a4
Author: Stephan Bergmann 
Date:   Thu Mar 15 12:32:30 2018 +0100

Adapt solenv/flatpak-manifest.in to recent download.lst changes

(cherry picked from commit bca14a7126a8cea12eecd248ae84e3d07db9609b)
Conflicts:
solenv/flatpak-manifest.in

Change-Id: Id9a41e528e45d60a5429be4c51d58badff200f0a
Reviewed-on: https://gerrit.libreoffice.org/51336
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 479a5a0c6465..99936a700749 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -373,10 +373,10 @@
 "dest-filename": "external/tarballs/openldap-2.4.45.tgz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/liborcus-0.13.1.tar.gz;,
-"sha256": 
"d7041ef455bb78db66b4ba7876af1b3d0fa377b9444e3ef72ceaccd2e8400937",
+"url": 
"https://dev-www.libreoffice.org/src/liborcus-0.13.3.tar.gz;,
+"sha256": 
"62e76de1fd3101e77118732b860354121b40a87bbb1ebfeb8203477fffac16e9",
 "type": "file",
-"dest-filename": "external/tarballs/liborcus-0.13.1.tar.gz"
+"dest-filename": "external/tarballs/liborcus-0.13.3.tar.gz"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/poppler-0.59.0.tar.xz;,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - solenv/flatpak-manifest.in

[Stephan Bergmann]

 solenv/flatpak-manifest.in |   15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 46fe7d8928baa4762fba723aaed22ff018be716a
Author: Stephan Bergmann 
Date:   Wed Feb 28 10:13:27 2018 +0100

Merge upstream fixes into solenv/flatpak-manifest.in

*  "Bump runtime-version to
  org.gnome.Platform 3.26"

*  "For now, bundle gst-libav to be
  able to play mp4 videos in impress"

Change-Id: I1924d84be7fe577e302b0c1b8c7e2971e8583d73
(cherry picked from commit 756c9f2317605e39d9cb058e650962acd2d81739)
Reviewed-on: https://gerrit.libreoffice.org/50492
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index e2ea71713377..479a5a0c6465 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -1,7 +1,7 @@
 {
 "id": "org.libreoffice.LibreOffice",
 "runtime": "org.gnome.Platform",
-"runtime-version": "3.24",
+"runtime-version": "3.26",
 "sdk": "org.gnome.Sdk",
 "sdk-extensions": [
 "org.freedesktop.Sdk.Extension.gcc7",
@@ -33,6 +33,19 @@
 ]
 },
 {
+"name": "gst-libav",
+"buildsystem": "meson",
+"builddir": true,
+"config-opts": ["-Ddisable_gtkdoc=true"],
+"sources": [
+{
+"type": "archive",
+"url": 
"https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.12.4.tar.xz;,
+"sha256": 
"2a56aa5d2d8cd912f2bce17f174713d2c417ca298f1f9c28ee66d4aa1e1d9e62"
+}
+]
+},
+{
 "name": "libreoffice",
 "sources": [
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - solenv/flatpak-manifest.in

[Stephan Bergmann]

 solenv/flatpak-manifest.in |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4d8587ea43c514bfca76684cbe3c3c3fa6f8a405
Author: Stephan Bergmann 
Date:   Fri Feb 23 09:22:10 2018 +0100

Merge "Enable device=dri to fix opengl crashes" into flatpak-manifest.in

...from 
 "Enable device=dri to fix opengl
crashes"

Change-Id: Ic989bfb3e46057dc2fd20d2cd6f17d578642
(cherry picked from commit e3166f4034c3997134c679872d6ce66c8abe16c6)
Reviewed-on: https://gerrit.libreoffice.org/50225
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index e313d8debfdb..e2ea71713377 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -561,6 +561,7 @@
 "--socket=x11",
 "--socket=wayland",
 "--socket=pulseaudio",
+"--device=dri",
 "--filesystem=host",
 "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
 "--env=LIBO_FLATPAK=1",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - solenv/flatpak-manifest.in

[Stephan Bergmann]

 solenv/flatpak-manifest.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 637d2ffe1b9290714c20c2b977b5817d471997c6
Author: Stephan Bergmann 
Date:   Mon Feb 12 15:48:23 2018 +0100

Work around i386 kernel vs. JVM bug for now by disabling all tests on i386

 "Libreoffice Writer
crashing with segmentation fault in libjvm.so _expand_stack_to when wiki 
plugin
installed" still hits various machines (e.g., my local 
4.14.16-300.fc27.x86_64
as well as 3.10.0-693.11.6.el7.x86_64 flathub-builder-pdx1, see
), causing --arch=i386
builds to fail tests that instantiate a JVM in-process, e.g.
CppunitTest_dbaccess_RowSetClones with SIGSEGV at

> #0  _expand_stack_to (bottom=0xff605fff , bottom@entry=0xff605000 ) at /run/build/java/hotspot/src/os/linux/vm/os_linux.cpp:608
> #1  0xed207564 in os::Linux::manually_expand_stack (t=0x58314800, 
addr=0xff605000 ) at 
/run/build/java/hotspot/src/os/linux/vm/os_linux.cpp:621
> #2  0xed211d5b in os::create_attached_thread (thread=0x58314800) at 
/run/build/java/hotspot/src/os/linux/vm/os_linux.cpp:839
> #3  os::create_main_thread (thread=0x58314800) at 
/run/build/java/hotspot/src/os/linux/vm/os_linux.cpp:789
> #4  0xed36d8a7 in Thread::set_as_starting_thread (this=0x58314800) at 
/run/build/java/hotspot/src/share/vm/runtime/thread.cpp:941
> #5  Threads::create_vm (args=0xffdf0810, canTryAgain=0xffdf068f) at 
/run/build/java/hotspot/src/share/vm/runtime/thread.cpp:3614
> #6  0xecfc5081 in JNI_CreateJavaVM_inner (args=0xffdf0810, 
penv=0xffdf0a84, vm=0xffdf0798) at 
/run/build/java/hotspot/src/share/vm/prims/jni.cpp:3937
> #7  JNI_CreateJavaVM (vm=0xffdf0798, penv=0xffdf0a84, args=0xffdf0810) at 
/run/build/java/hotspot/src/share/vm/prims/jni.cpp:4032
> #8  0xf32b5397 in jfw_plugin_startJavaVirtualMachine(JavaInfo const*, 
JavaVMOption const*, long, JavaVM_**, JNIEnv_**) () from 
/run/build/libreoffice/instdir/program/libjvmfwklo.so
...

Disabling tests leads to successful builds, but using Java functionality in 
the
LO flatpak on affected machines (where the above bug or similar for other 
Linux
distros is not yet fixed) will still crash, of course.  Users of the LO 
flatpak
will need to seek a fixed kernel (or there will need to be an update of
org.freedesktop.Sdk.Extension.openjdk9 and a rebuild of the LO flatpak, if 
it
turns out that a fix will need to be applied to OpenJDK instead of the 
kernel).
This workaround can be removed again once no Flathub build machines are 
affected
by the bug any longer.

(`uname -i`, reporting "i386", appears to be more appropriate for this check
than `uname -m`, which might probably report other tokens besides "i686".)

Change-Id: I6e4b01d1df5aff5ac31847fd56285506af003f4b
(cherry picked from commit 9cf2616c5e709b5956ab88dacdfad2003f98)
Reviewed-on: https://gerrit.libreoffice.org/49605
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index baff33ec3811..e313d8debfdb 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -549,7 +549,7 @@
 "buildsystem": "simple",
 "build-commands": [
 "./autogen.sh --prefix=/run/build/libreoffice/inst 
--with-distro=LibreOfficeFlatpak --disable-symbols $(if test \"$(uname -m)\" = 
aarch64; then printf %s --disable-pdfium; fi)",
-"make",
+"make $(if test \"$(uname -i)\" = i386; then printf 
build-nocheck; fi)",
 "make distro-pack-install",
 "make cmd cmd='$(SRCDIR)/solenv/bin/assemble-flatpak.sh'"
 ]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - solenv/flatpak-manifest.in

[Stephan Bergmann]

 solenv/flatpak-manifest.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 93a2325fa2cc0db2dc40a187ba52c5d1a6f8d0a7
Author: Stephan Bergmann 
Date:   Fri Feb 9 11:16:33 2018 +0100

solenv/flatpak-manifest.in: Disable debug information again, for now

Merge in  "Disable debug information again, 
for
now", to bring repos back in sync.  If we want to keep this permanently,
--enable-symbols should instead be dropped from
distro-configs/LibreOfficeFlatpak.conf.

Change-Id: I656d77a446deecbc41ab25f05af7187dc544126c
(cherry picked from commit 02248e9e191f798f96218a0c4d281f99e15bea31)
Reviewed-on: https://gerrit.libreoffice.org/49513
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 80165783ca69..3edd0b09f216 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -532,7 +532,7 @@
 ],
 "buildsystem": "simple",
 "build-commands": [
-"./autogen.sh --prefix=/run/build/libreoffice/inst 
--with-distro=LibreOfficeFlatpak",
+"./autogen.sh --prefix=/run/build/libreoffice/inst 
--with-distro=LibreOfficeFlatpak --disable-symbols",
 "make",
 "make distro-pack-install",
 "make cmd cmd='$(SRCDIR)/solenv/bin/assemble-flatpak.sh'"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - solenv/flatpak-manifest.in

[Stephan Bergmann]

 solenv/flatpak-manifest.in |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2758c87e0483ca80a388f0ce00f785c65ad94af5
Author: Stephan Bergmann 
Date:   Thu Feb 8 15:32:56 2018 +0100

Adapt solenv/flatpak-manifest.in to apache-ant-1.10.2

...that apparently made the URL for apache-ant-1.10.1 become 404.  (Again, 
the
sha512 for the new version is as given at
.)

(Asked at  "Stable link to
apache-ant-*-bin.tar.xz?" whether there's any better link that I could use, 
to
avoid having to constantly track the latest revision of Ant here.)

Change-Id: Ic13732d172ade9337f006d4495f066fdd52302a1
(cherry picked from commit d9796b91fec23990e494efcce373a2f0944f294a)
Reviewed-on: https://gerrit.libreoffice.org/49479
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 6bad9afc6e78..03d617578237 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -27,8 +27,8 @@
 },
 {
 "type": "archive",
-"url": 
"http://www-us.apache.org/dist/ant/binaries/apache-ant-1.10.1-bin.tar.xz;,
-"sha512": 
"8732ecfd96bcfde626260939f17fdb7e85700092ef69932b250e3572810cd53eaac24e1c72921d89900170804d27cc3100bee7c8b5159d0e5b64c3d79e07bec6",
+"url": 
"http://www-us.apache.org/dist/ant/binaries/apache-ant-1.10.2-bin.tar.xz;,
+"sha512": 
"a1af5173eafbc5b76fe0ae62c656c96a4c3bfd9d67b10ad19fef53152ae73d61aa05d1b57ceca1d007475113f234feb9d1541d2c624f6ac606361a6e6e375385",
 "dest": "ant"
 },
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - solenv/flatpak-manifest.in

[Stephan Bergmann]

 solenv/flatpak-manifest.in |   24 
 1 file changed, 24 insertions(+)

New commits:
commit 987a50f3a70cf6ece9245b9a3e6d353c15cb1fdf
Author: Stephan Bergmann 
Date:   Wed Jan 24 12:02:50 2018 +0100

Adapt solenv/flatpak-manifest.in

...to libreoffice-6-0 26c4a36cad9aca8e07abcbfeddf744ae112a4bc0 "tdf#113532 
Add
Arabic fonts into default installation" (picking the relevant parts of 
master
cf1dcd1475a22f10c35105a59e6d02dc342ccb16 "Adapt solenv/flatpak-manifest.in 
to
recent download.lst changes and recently added fonts")

Change-Id: I126a1695733f7ac70f83f37debd47251989657d5
Reviewed-on: https://gerrit.libreoffice.org/48508
Tested-by: Jenkins 
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 0f212badf2a2..6bad9afc6e78 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -380,6 +380,12 @@
 "dest-filename": 
"external/tarballs/e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz"
 },
 {
+"url": 
"https://dev-www.libreoffice.org/src/ReemKufi-0.6.tar.gz;,
+"sha256": 
"4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b",
+"type": "file",
+"dest-filename": "external/tarballs/ReemKufi-0.6.tar.gz"
+},
+{
 "url": 
"https://dev-www.libreoffice.org/src/libepubgen-0.1.0.tar.bz2;,
 "sha256": 
"730bd1cbeee166334faadbc06c953a67b145c3c4754a3b503482066dae4cd633",
 "type": "file",
@@ -398,6 +404,12 @@
 "dest-filename": "external/tarballs/alef-1.001.tar.gz"
 },
 {
+"url": 
"https://dev-www.libreoffice.org/src/amiri-0.109.zip;,
+"sha256": 
"97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6",
+"type": "file",
+"dest-filename": "external/tarballs/amiri-0.109.zip"
+},
+{
 "url": 
"https://dev-www.libreoffice.org/src/culmus-0.131.tar.gz;,
 "sha256": 
"dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b",
 "type": "file",
@@ -410,6 +422,18 @@
 "dest-filename": 
"external/tarballs/libre-hebrew-1.0.tar.gz"
 },
 {
+"url": 
"https://dev-www.libreoffice.org/src/Scheherazade-2.100.zip;,
+"sha256": 
"251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5",
+"type": "file",
+"dest-filename": "external/tarballs/Scheherazade-2.100.zip"
+},
+{
+"url": 
"https://dev-www.libreoffice.org/src/ttf-kacst_2.01+mry.tar.gz;,
+"sha256": 
"dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56",
+"type": "file",
+"dest-filename": 
"external/tarballs/ttf-kacst_2.01+mry.tar.gz"
+},
+{
 "url": 
"https://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip;,
 "sha256": 
"9e93c73e23aff644b17dfff65674c14150e7f3b38b19635e622235e01c96",
 "type": "file",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - solenv/flatpak-manifest.in

[Stephan Bergmann]

 solenv/flatpak-manifest.in |   60 +
 1 file changed, 39 insertions(+), 21 deletions(-)

New commits:
commit db15e9345b96d888070a49b9b7fbe9098435af18
Author: Stephan Bergmann 
Date:   Thu Jan 4 13:38:01 2018 +0100

Adapt solenv/flatpak-manifest.in to recent download.lst changes

...and recently added fonts

(similar to cf1dcd1475a22f10c35105a59e6d02dc342ccb16 "Adapt
solenv/flatpak-manifest.in to recent download.lst changes" on master)

Change-Id: I7a66118354ff2f7fb7f3b936a7909ff40910edd6
Reviewed-on: https://gerrit.libreoffice.org/47392
Reviewed-by: Michael Stahl 
Tested-by: Stephan Bergmann 

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index a6e8340ee693..9c1079b8334b 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -208,10 +208,10 @@
 "dest-filename": 
"external/tarballs/libfreehand-0.1.2.tar.xz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/language-subtag-registry-2017-08-15.tar.bz2;,
-"sha256": 
"d6a97fc8da5ae54d867e7f1b65ffb51e816cadd11714e45fc23ee0abf81a51ab",
+"url": 
"https://dev-www.libreoffice.org/src/language-subtag-registry-2017-12-14.tar.bz2;,
+"sha256": 
"0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362",
 "type": "file",
-"dest-filename": 
"external/tarballs/language-subtag-registry-2017-08-15.tar.bz2"
+"dest-filename": 
"external/tarballs/language-subtag-registry-2017-12-14.tar.bz2"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2;,
@@ -220,16 +220,16 @@
 "dest-filename": 
"external/tarballs/liblangtag-0.6.2.tar.bz2"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/libmspub-0.1.2.tar.bz2;,
-"sha256": 
"26d488527ffbb0b41686d4bab756e3e6aaeb99f88adeb169d0c16d2cde96859a",
+"url": 
"https://dev-www.libreoffice.org/src/libmspub-0.1.3.tar.xz;,
+"sha256": 
"f0225f0ff03f6bec4847d7c2d8719a36cafc4b97a09e504b610372cc5b981c97",
 "type": "file",
-"dest-filename": "external/tarballs/libmspub-0.1.2.tar.bz2"
+"dest-filename": "external/tarballs/libmspub-0.1.3.tar.xz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/libmwaw-0.3.12.tar.xz;,
-"sha256": 
"7691a6e6e7221d61c40e3f630a8907e3e516b99a587e47d09ec53f8ac60ed1e7",
+"url": 
"https://dev-www.libreoffice.org/src/libmwaw-0.3.13.tar.xz;,
+"sha256": 
"db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea",
 "type": "file",
-"dest-filename": "external/tarballs/libmwaw-0.3.12.tar.xz"
+"dest-filename": "external/tarballs/libmwaw-0.3.13.tar.xz"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2;,
@@ -316,10 +316,10 @@
 "dest-filename": "external/tarballs/neon-0.30.2.tar.gz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/noto-fonts-20170306.tar.gz;,
-"sha256": 
"8a269926a3c88dd14b124b19138b54408938a45ea6e60db65073469f45ae6ac8",
+"url": 
"https://dev-www.libreoffice.org/src/noto-fonts-20171024.tar.gz;,
+"sha256": 
"29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994",
 "type": "file",
-"dest-filename": 
"external/tarballs/noto-fonts-20170306.tar.gz"
+"dest-filename": 
"external/tarballs/noto-fonts-20171024.tar.gz"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/openldap-2.4.45.tgz;,
@@ -328,10 +328,10 @@
 "dest-filename": "external/tarballs/openldap-2.4.45.tgz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/liborcus-0.12.1.tar.gz;,
-"sha256": 
"676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908",
+"url": 
"https://dev-www.libreoffice.org/src/liborcus-0.13.1.tar.gz;,
+"sha256": 
"d7041ef455bb78db66b4ba7876af1b3d0fa377b9444e3ef72ceaccd2e8400937",
 "type": "file",
-"dest-filename": "external/tarballs/liborcus-0.12.1.tar.gz"
+"dest-filename": "external/tarballs/liborcus-0.13.1.tar.gz"
 },
 {
 "url": 

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - solenv/flatpak-manifest.in

[Stephan Bergmann]

 solenv/flatpak-manifest.in |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 82e794f782de6c922d0323172715d4dff2151c28
Author: Stephan Bergmann 
Date:   Mon Dec 4 14:48:36 2017 +0100

Honor GTK theming in LO flatpak

...according to alexlarson, for now (until "eventually we'll have a sane 
dconf
in the sandbox") apps need to specify --filesystem=xdg-run/dconf,
--filesystem=~/.config/dconf:ro, --talk-name=ca.desrt.dconf,
--env=DCONF_USER_CONFIG_DIR=.config/dconf (where the first two are 
irrelevant
for LO due to its --filesystem=host).

This fixes 
"Libreoffice flatpak is not respecting user theme".

Change-Id: If5ed33e1b524bfa877b89f052c6067398b5600a3
(cherry picked from commit 12ba14c6bee1c773e4500f79a90a07f871cf3feb)
Reviewed-on: https://gerrit.libreoffice.org/45806
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index f316d143843f..a6e8340ee693 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -392,8 +392,10 @@
 "--socket=wayland",
 "--socket=pulseaudio",
 "--filesystem=host",
+"--env=DCONF_USER_CONFIG_DIR=.config/dconf",
 "--env=LIBO_FLATPAK=1",
 "--own-name=org.libreoffice.LibreOfficeIpc0",
+"--talk-name=ca.desrt.dconf",
 "--talk-name=org.gtk.vfs.*"
 ]
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - solenv/flatpak-manifest.in

[Stephan Bergmann]

 solenv/flatpak-manifest.in |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 7bbf8cd79bc5968b03a4611e01bf645348143d38
Author: Stephan Bergmann 
Date:   Tue Nov 28 14:52:11 2017 +0100

DBus permissions missing from LO flatpak

...after 243d743dae127fe11ecd7f807121da8815af8f01 
"solenv/flatpak-manifest.in:
incorporate upstream sandboxing improvements", causing
 "Doesn't 
open
files in network shares".

Change-Id: I15d7a170b3ffaf6092ff4d2fe4e93b1dcfd32b0b
(cherry picked from commit 95fbb490e68b044226518a88a109de7ae1c89731)
Reviewed-on: https://gerrit.libreoffice.org/45413
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 2c5a3ff1df47..6e4bc2b2ce81 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -393,6 +393,7 @@
 "--socket=pulseaudio",
 "--filesystem=host",
 "--env=LIBO_FLATPAK=1",
-"--own-name=org.libreoffice.LibreOfficeIpc0"
+"--own-name=org.libreoffice.LibreOfficeIpc0",
+"--talk-name=org.gtk.vfs.*"
 ]
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits