[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - 2 commits - download.lst external/libcdr solenv/flatpak-manifest.in
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Jan 5 20:24:30 UTC 2019
download.lst | 8 ++++----
external/libcdr/UnpackedTarball_libcdr.mk | 4 ++++
external/libcdr/libcdr-visibility-win.patch | 11 +++++++++++
solenv/flatpak-manifest.in | 12 ++++++------
4 files changed, 25 insertions(+), 10 deletions(-)
New commits:
commit 3cb952c96b4ced58672804825e58f95c134be913
Author: David Tardon <dtardon at redhat.com>
AuthorDate: Sat Dec 29 14:53:07 2018 +0100
Commit: Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Sat Jan 5 21:24:24 2019 +0100
upload libcdr 0.1.5
Change-Id: I01454cc35baf96743bd19e64dd3a7269c58621bf
Reviewed-on: https://gerrit.libreoffice.org/65715
Tested-by: Jenkins
Reviewed-by: David Tardon <dtardon at redhat.com>
(cherry picked from commit a8965ebc1b29ba578fc3e9cd6915e85e807d9fd6)
Reviewed-on: https://gerrit.libreoffice.org/65726
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
diff --git a/download.lst b/download.lst
index 962021fef822..360fd9949bbf 100644
--- a/download.lst
+++ b/download.lst
@@ -17,8 +17,8 @@ export BZIP2_TARBALL := 00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz
export CAIRO_SHA256SUM := 7623081b94548a47ee6839a7312af34e9322997806948b6eec421a8c6d0594c9
export CAIRO_VERSION_MICRO := 12
export CAIRO_TARBALL := cairo-1.15.$(CAIRO_VERSION_MICRO).tar.xz
-export CDR_SHA256SUM := e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d
-export CDR_TARBALL := libcdr-0.1.4.tar.xz
+export CDR_SHA256SUM := 6ace5c499a8be34ad871e825442ce388614ae2d8675c4381756a7319429e3a48
+export CDR_TARBALL := libcdr-0.1.5.tar.xz
export CLUCENE_SHA256SUM := ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab
export CLUCENE_TARBALL := 48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
export LIBCMIS_SHA256SUM := d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2
diff --git a/external/libcdr/UnpackedTarball_libcdr.mk b/external/libcdr/UnpackedTarball_libcdr.mk
index 4ca54804e6aa..23874f7d01b5 100644
--- a/external/libcdr/UnpackedTarball_libcdr.mk
+++ b/external/libcdr/UnpackedTarball_libcdr.mk
@@ -15,6 +15,10 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libcdr,0))
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libcdr))
+$(eval $(call gb_UnpackedTarball_add_patches,libcdr, \
+ external/libcdr/libcdr-visibility-win.patch \
+))
+
ifeq ($(COM_IS_CLANG),TRUE)
ifneq ($(filter -fsanitize=%,$(CC)),)
$(eval $(call gb_UnpackedTarball_add_patches,libcdr, \
diff --git a/external/libcdr/libcdr-visibility-win.patch b/external/libcdr/libcdr-visibility-win.patch
new file mode 100644
index 000000000000..7700cfd32f2f
--- /dev/null
+++ b/external/libcdr/libcdr-visibility-win.patch
@@ -0,0 +1,11 @@
+--- configure.dt 2018-12-29 16:23:02.355271146 +0100
++++ configure 2018-12-29 16:23:21.644060142 +0100
+@@ -19116,6 +19116,8 @@
+
+
+ if test $platform_win32 = yes; then :
++ HAVE_VISIBILITY_TRUE='#'
++ HAVE_VISIBILITY_FALSE=
+
+ else
+
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 53ade9196647..a58d53de8153 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -194,10 +194,10 @@
"dest-filename": "external/tarballs/libabw-0.1.2.tar.xz"
},
{
- "url": "https://dev-www.libreoffice.org/src/libcdr-0.1.4.tar.xz",
- "sha256": "e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d",
+ "url": "https://dev-www.libreoffice.org/src/libcdr-0.1.5.tar.xz",
+ "sha256": "6ace5c499a8be34ad871e825442ce388614ae2d8675c4381756a7319429e3a48",
"type": "file",
- "dest-filename": "external/tarballs/libcdr-0.1.4.tar.xz"
+ "dest-filename": "external/tarballs/libcdr-0.1.5.tar.xz"
},
{
"url": "https://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz",
commit ea59f78f09c87b20bd46cdcceba21abe47cefa78
Author: David Tardon <dtardon at redhat.com>
AuthorDate: Sat Dec 29 20:23:26 2018 +0100
Commit: Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Sat Jan 5 21:24:10 2019 +0100
upload libqxp 0.0.2
Change-Id: Idda6c0ce0c087a3be2e7fe31999a7d5a6fde4835
Reviewed-on: https://gerrit.libreoffice.org/65725
Tested-by: Jenkins
Reviewed-by: David Tardon <dtardon at redhat.com>
(cherry picked from commit 6aaed7c5165ea87c3a263fd9582c97892345120f)
Reviewed-on: https://gerrit.libreoffice.org/65735
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
diff --git a/download.lst b/download.lst
index f4fbcbcf5bc2..962021fef822 100644
--- a/download.lst
+++ b/download.lst
@@ -212,8 +212,8 @@ export POSTGRESQL_SHA256SUM := a754c02f7051c2f21e52f8669a421b50485afcde9a581674d
export POSTGRESQL_TARBALL := postgresql-9.2.24.tar.bz2
export PYTHON_SHA256SUM := 063d2c3b0402d6191b90731e0f735c64830e7522348aeb7ed382a83165d45009
export PYTHON_TARBALL := Python-3.5.5.tar.xz
-export QXP_SHA256SUM := 8c257f6184ff94aefa7c9fa1cfae82083d55a49247266905c71c53e013f95c73
-export QXP_TARBALL := libqxp-0.0.1.tar.xz
+export QXP_SHA256SUM := e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c
+export QXP_TARBALL := libqxp-0.0.2.tar.xz
export RAPTOR_SHA256SUM := ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed
export RAPTOR_TARBALL := a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz
export RASQAL_SHA256SUM := 6924c9ac6570bd241a9669f83b467c728a322470bf34f4b2da4f69492ccfd97c
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 634b03e08e24..53ade9196647 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -398,10 +398,10 @@
"dest-filename": "external/tarballs/libepubgen-0.1.1.tar.xz"
},
{
- "url": "https://dev-www.libreoffice.org/src/libqxp-0.0.1.tar.xz",
- "sha256": "8c257f6184ff94aefa7c9fa1cfae82083d55a49247266905c71c53e013f95c73",
+ "url": "https://dev-www.libreoffice.org/src/libqxp-0.0.2.tar.xz",
+ "sha256": "e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c",
"type": "file",
- "dest-filename": "external/tarballs/libqxp-0.0.1.tar.xz"
+ "dest-filename": "external/tarballs/libqxp-0.0.2.tar.xz"
},
{
"url": "https://dev-www.libreoffice.org/src/alef-1.001.tar.gz",
More information about the Libreoffice-commits
mailing list