[Libreoffice-commits] core.git: RepositoryExternal.mk

[Stephan Bergmann (via logerrit)]

 RepositoryExternal.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit e096fbc3e06d2c2b55ef8706c954efb6555ca0e6
Author: Stephan Bergmann 
AuthorDate: Tue Mar 7 10:13:25 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Mar 7 18:43:56 2023 +

Depend on ExternalPackage_fontconfig, not just ExternalProject_fontconfig

...so that e.g. a from-scratch `make CppunitTest_sw_core_layout` doesn't 
fail
with

> warn:sal.osl:3973661:3973661:sal/osl/unx/module.cxx:103: 
dlopen(workdir/LinkTarget/Library/libvclbootstrapprotector.so, 257): 
libfontconfig-lo.so.1.12.0: cannot open shared object file: No such file or 
directory
> Failure instantiating protector 
"workdir/LinkTarget/Library/libvclbootstrapprotector.so", 
"vclbootstrapprotector"

(This is LINUX-only, as ExternalPackage_fontconfig has been introduced as
LINUX-only by d552b4a549d614a03aa9328e017dec27bd3ff41e "Enable opening of
downloaded fonts only in ForKit in Online":  "All this is relevant for Linux
only, as Collabora Online runs on Linux.")

Change-Id: I8976726ee8080f91a0fa97d60b8f345c48cae686
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148381
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 9e8a46fa733e..3ec3cd924395 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1293,7 +1293,11 @@ $(eval $(call 
gb_Helper_register_packages_for_install,ooo,\
 endif
 
 define gb_LinkTarget__use_fontconfig
+ifeq ($(OS),LINUX)
+$(call gb_LinkTarget_use_package,$(1),fontconfig)
+else
 $(call gb_LinkTarget_use_external_project,$(1),fontconfig)
+endif
 $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,fontconfig) \
$$(INCLUDE) \

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Tor Lillqvist (via logerrit)]

 RepositoryExternal.mk |8 
 1 file changed, 8 insertions(+)

New commits:
commit 8d90e02b4cecdc7fd74b05b122f074a5f36ca965
Author: Tor Lillqvist 
AuthorDate: Thu Oct 20 11:20:12 2022 +0300
Commit: Tor Lillqvist 
CommitDate: Fri Feb 10 11:54:16 2023 +

Get the shared object of a bundled fontconfig into rpm and deb packages

Change-Id: I9630fa25178637bba189c263605a2198ef5c6064
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141550
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146720
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146740
Tested-by: Jenkins

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 0f7c77f443d6..9e8a46fa733e 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1284,6 +1284,14 @@ gb_ExternalProject__use_fontconfig :=
 
 else # SYSTEM_FONTCONFIG
 
+ifneq ($(filter-out MACOSX WNT,$(OS)),)
+
+$(eval $(call gb_Helper_register_packages_for_install,ooo,\
+   fontconfig \
+))
+
+endif
+
 define gb_LinkTarget__use_fontconfig
 $(call gb_LinkTarget_use_external_project,$(1),fontconfig)
 $(call gb_LinkTarget_set_include,$(1),\

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Stephan Bergmann (via logerrit)]

 RepositoryExternal.mk |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 5ce9bf3ff3b7453fe792ce71547b991423d6280f
Author: Stephan Bergmann 
AuthorDate: Mon Nov 28 23:37:15 2022 +0100
Commit: Michael Stahl 
CommitDate: Tue Nov 29 14:21:33 2022 +0100

Fix Linux --without-system-cairo build

...(as I e.g. use for a max-coverage ASan build) after
e5658b209a23a17b3f89fe3eabd1e065513622f1 "WASM cairo: link static lib 
directly",
causing

> [LNK] Library/libvcllo.so
> clang-16: error: no such file or directory: 
'.../workdir/UnpackedTarball/cairo/src/.libs/libcairo.a'
> clang-16: error: no such file or directory: 
'.../workdir/UnpackedTarball/pixman/pixman/.libs/libpixman-1.a'
> make[1]: *** [.../vcl/Library_vcl.mk:20: .../instdir/program/libvcllo.so] 
Error 1

because at least on Linux external/cairo only provides dynamic libraries

Change-Id: I7a35d7f28d99664ea749be23c76e74cd5a760f62
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143422
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 9a0eb56b1a7b..ad8f0204cd4e 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1213,8 +1213,11 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
-   $(call gb_UnpackedTarball_get_dir,cairo)/src/.libs/libcairo.a \
-   $(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs/libpixman-1.a \
+   $(if $(filter EMSCRIPTEN,$(OS)), \
+   $(call gb_UnpackedTarball_get_dir,cairo)/src/.libs/libcairo.a \
+   $(call 
gb_UnpackedTarball_get_dir,pixman)/pixman/.libs/libpixman-1.a, \
+   -L$(call gb_UnpackedTarball_get_dir,cairo)/src/.libs -lcairo \
+   -L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs 
-lpixman-1) \
 )
 
 endef

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Michael Stahl (via logerrit)]

 RepositoryExternal.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e5658b209a23a17b3f89fe3eabd1e065513622f1
Author: Michael Stahl 
AuthorDate: Mon Nov 14 20:08:33 2022 +0100
Commit: Michael Stahl 
CommitDate: Mon Nov 28 16:24:29 2022 +0100

WASM cairo: link static lib directly

Because bundled cairo is only used on Android currently, and that does
static linking, this doesn't make a difference for LO build.

But it does improve the situation when linking the bundled cairo via
libtool, because libtool unhelpfully finds libcairo.la via -lcairo,
which contains an unhelpful dependency_libs that includes "-lz", which
does not exist anywhere (LO's bundled one is called libzlib.a).

Ideally GNU libtool could be told to ignore .la files, but i don't know
how.

Change-Id: Icaaa0b441e1410a297f6d61afd81e31425138955
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143392
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 025909c36945..9a0eb56b1a7b 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1213,8 +1213,8 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
-   -L$(call gb_UnpackedTarball_get_dir,cairo)/src/.libs -lcairo \
-   -L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs 
-lpixman-1 \
+   $(call gb_UnpackedTarball_get_dir,cairo)/src/.libs/libcairo.a \
+   $(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs/libpixman-1.a \
 )
 
 endef

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Stephan Bergmann (via logerrit)]

 RepositoryExternal.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3e21c3c037134054195946720da8548ebb07c57b
Author: Stephan Bergmann 
AuthorDate: Tue May 24 09:18:38 2022 +0200
Commit: Stephan Bergmann 
CommitDate: Tue May 24 10:00:04 2022 +0200

workdir/UnpackedTarball/libtiff/libtiff/tiff.h is generated

...and included via vcl/source/filter/itiff/itiff.cxx ->
workdir/UnpackedTarball/libtiff/libtiff/tiffio.h ->
workdir/UnpackedTarball/libtiff/libtiff/tiff.h

Change-Id: I717e23946d7d14572c5e9de9f7319d553a76364a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134851
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 6b3ae0cafd8b..2b2063483d31 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2644,7 +2644,7 @@ $(call gb_LinkTarget_add_libs,$(1),\
-L$(call gb_UnpackedTarball_get_dir,libtiff)/libtiff/.libs -ltiff \
 )
 endif
-$(call gb_LinkTarget_use_external_project,$(1),libtiff)
+$(call gb_LinkTarget_use_external_project,$(1),libtiff,full)
 
 endef
 

[Libreoffice-commits] core.git: RepositoryExternal.mk vcl/qa vcl/source

[Caolán McNamara (via logerrit)]

 RepositoryExternal.mk  |2 
 vcl/qa/cppunit/graphicfilter/filters-tiff-test.cxx |5 
 vcl/source/filter/itiff/itiff.cxx  |  140 +
 3 files changed, 144 insertions(+), 3 deletions(-)

New commits:
commit 22b50f1937de67e4ad9e692d6964aa5b8d33af7a
Author: Caolán McNamara 
AuthorDate: Thu May 19 17:11:23 2022 +0100
Commit: Caolán McNamara 
CommitDate: Sat May 21 11:52:30 2022 +0200

use libtiff for tiff import

TODO: check testTdf138818 change is acceptable/meaningful

Change-Id: Ia72f2e7ec49a9f8fc23b178fe61cbc3d0e1287c3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134647
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index fa97dc350597..1e2329d69339 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2632,7 +2632,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 )
 
 $(call gb_LinkTarget_set_include,$(1),\
-   -I$(call gb_UnpackedTarball_get_dir,libtiff)/src \
+   -I$(call gb_UnpackedTarball_get_dir,libtiff)/libtiff \
$$(INCLUDE) \
 )
 ifeq ($(OS),WNT)
diff --git a/vcl/qa/cppunit/graphicfilter/data/tiff/pass/CVE-2007-2217-1.tiff 
b/vcl/qa/cppunit/graphicfilter/data/tiff/fail/CVE-2007-2217-1.tiff
similarity index 100%
rename from vcl/qa/cppunit/graphicfilter/data/tiff/pass/CVE-2007-2217-1.tiff
rename to vcl/qa/cppunit/graphicfilter/data/tiff/fail/CVE-2007-2217-1.tiff
diff --git a/vcl/qa/cppunit/graphicfilter/data/tiff/pass/CVE-2013-5575-1.tiff 
b/vcl/qa/cppunit/graphicfilter/data/tiff/fail/CVE-2013-5575-1.tiff
similarity index 100%
rename from vcl/qa/cppunit/graphicfilter/data/tiff/pass/CVE-2013-5575-1.tiff
rename to vcl/qa/cppunit/graphicfilter/data/tiff/fail/CVE-2013-5575-1.tiff
diff --git a/vcl/qa/cppunit/graphicfilter/data/tiff/fail/CVE-2012-0276-1.tiff 
b/vcl/qa/cppunit/graphicfilter/data/tiff/pass/CVE-2012-0276-1.tiff
similarity index 100%
rename from vcl/qa/cppunit/graphicfilter/data/tiff/fail/CVE-2012-0276-1.tiff
rename to vcl/qa/cppunit/graphicfilter/data/tiff/pass/CVE-2012-0276-1.tiff
diff --git a/vcl/qa/cppunit/graphicfilter/data/tiff/fail/CVE-2012-0276-2.tiff 
b/vcl/qa/cppunit/graphicfilter/data/tiff/pass/CVE-2012-0276-2.tiff
similarity index 100%
rename from vcl/qa/cppunit/graphicfilter/data/tiff/fail/CVE-2012-0276-2.tiff
rename to vcl/qa/cppunit/graphicfilter/data/tiff/pass/CVE-2012-0276-2.tiff
diff --git a/vcl/qa/cppunit/graphicfilter/data/tiff/fail/CVE-2012-2027-1.tiff 
b/vcl/qa/cppunit/graphicfilter/data/tiff/pass/CVE-2012-2027-1.tiff
similarity index 100%
rename from vcl/qa/cppunit/graphicfilter/data/tiff/fail/CVE-2012-2027-1.tiff
rename to vcl/qa/cppunit/graphicfilter/data/tiff/pass/CVE-2012-2027-1.tiff
diff --git a/vcl/qa/cppunit/graphicfilter/filters-tiff-test.cxx 
b/vcl/qa/cppunit/graphicfilter/filters-tiff-test.cxx
index 72f12ca565f5..d4fdeea43524 100644
--- a/vcl/qa/cppunit/graphicfilter/filters-tiff-test.cxx
+++ b/vcl/qa/cppunit/graphicfilter/filters-tiff-test.cxx
@@ -113,6 +113,7 @@ void TiffFilterTest::testTdf115863()
 CPPUNIT_ASSERT_EQUAL(tools::Long(618), aSize.Height());
 }
 
+//TODO-check if this is still correct, looks ok, but what was it testing 
exactly
 void TiffFilterTest::testTdf138818()
 {
 OUString aURL = getUrl() + "tdf138818.tif";
@@ -125,9 +126,9 @@ void TiffFilterTest::testTdf138818()
 CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, bResult);
 
 // Without the fix in place, this test would have failed with
-// - Expected: 46428
+// - Expected: 45953
 // - Actual  : 45951
-CPPUNIT_ASSERT_EQUAL(sal_uInt32(46428), 
aGraphic.GetGfxLink().GetDataSize());
+CPPUNIT_ASSERT_EQUAL(sal_uInt32(45953), 
aGraphic.GetGfxLink().GetDataSize());
 }
 
 void TiffFilterTest::testTdf74331()
diff --git a/vcl/source/filter/itiff/itiff.cxx 
b/vcl/source/filter/itiff/itiff.cxx
index cff68f9e6ec9..b434471b2317 100644
--- a/vcl/source/filter/itiff/itiff.cxx
+++ b/vcl/source/filter/itiff/itiff.cxx
@@ -25,13 +25,152 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include "lzwdecom.hxx"
 #include "ccidecom.hxx"
 
+#include 
+
 #include 
 
+#if 1
+namespace
+{
+struct Context
+{
+SvStream& rStream;
+tsize_t nSize;
+Context(SvStream& rInStream, tsize_t nInSize)
+: rStream(rInStream)
+, nSize(nInSize)
+{
+}
+};
+}
+
+static tsize_t tiff_read(thandle_t handle, tdata_t buf, tsize_t size)
+{
+Context* pContext = static_cast(handle);
+return pContext->rStream.ReadBytes(buf, size);
+}
+
+static tsize_t tiff_write(thandle_t, tdata_t, tsize_t)
+{
+return -1;
+}
+
+static toff_t tiff_seek(thandle_t handle, toff_t offset, int whence)
+{
+Context* pContext = static_cast(handle);
+
+switch (whence)
+{
+case SEEK_SET:
+pContext->rStream.Seek(offset);
+break;
+case SEEK_CUR:
+pContext->rStream.SeekRel(offset);
+ 

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Stephan Bergmann (via logerrit)]

 RepositoryExternal.mk |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c7a920a9b742ee273f3e7a8583d11eaeebf4fe1d
Author: Stephan Bergmann 
AuthorDate: Wed Feb 23 08:51:28 2022 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Feb 23 10:17:22 2022 +0100

Sync the two definitions of python_arch_subdir

...in RepositoryExternal.mk and external/python3/ExternalPackage_python3.mk.
The variance in trailing slash had caused
 "external/python3: 
Explicitly
check that all extension modules got built" to fail on Windows at
 with

> Error: missing PCbuild/win32_asyncio_d.pyd
> make[1]: *** 
[C:/cygwin64/home/tdf/lode/jenkins/workspace/gerrit_windows/external/python3/ExternalProject_python3.mk:37:
 
C:/cygwin64/home/tdf/lode/jenkins/workspace/gerrit_windows/workdir/ExternalProject/python3/build]
 Error 1

(and note the missing slash in "PCbuild/win32_asyncio_d.pyd").

(Ideally, these two definitions would be consolidated anyway, but that's 
left
for later.)

Change-Id: If2e6081e966bf3931eb0092616705521b4cfd3ce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130410
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f63c95c142ea..b51660e182cb 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3164,14 +3164,14 @@ endif
 
 ifeq ($(OS),WNT)
 ifeq ($(CPUNAME),X86_64)
-python_arch_subdir=amd64
+python_arch_subdir=amd64/
 else ifeq ($(CPUNAME),AARCH64)
-python_arch_subdir=arm64
+python_arch_subdir=arm64/
 else
-python_arch_subdir=win32
+python_arch_subdir=win32/
 endif
 $(call gb_LinkTarget_add_libs,$(1),\
-   $(call 
gb_UnpackedTarball_get_dir,python3)/PCbuild/$(python_arch_subdir)/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if
 $(MSVC_USE_DEBUG_RUNTIME),_d).lib \
+   $(call 
gb_UnpackedTarball_get_dir,python3)/PCbuild/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if
 $(MSVC_USE_DEBUG_RUNTIME),_d).lib \
 )
 else ifeq ($(OS),MACOSX)
 $(call gb_LinkTarget_add_libs,$(1),\

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Michael Weghorn (via logerrit)]

 RepositoryExternal.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ba67202007f37d228a813c0915fd630bc2ff177b
Author: Michael Weghorn 
AuthorDate: Thu Jan 27 15:16:47 2022 +0100
Commit: Julien Nabet 
CommitDate: Thu Jan 27 16:58:20 2022 +0100

Fix up "Fix gtk3_kde5 build when qt5/kf5 VCL plugins are not built"

commit 5801b9fc65508391e130670f79a9af51f18d4e96
Author: Michael Weghorn 
Date:   Thu Jan 27 08:17:54 2022 +

Fix gtk3_kde5 build when qt5/kf5 VCL plugins are not built

was missing the spaces for the 'filter' function, resulting
in an '--enable-kf5 --enable-gtk3-kde5' build failing because
"TRUETRUE" doesn't match "TRUE".

Change-Id: I6dca8fb4cd9f58077ce08f51e003f3539f368f77
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129047
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 2962679864fd..6ba871409779 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2979,7 +2979,7 @@ endef # gb_LinkTarget__use_postgresql
 
 endif # !SYSTEM_POSTGRESQL
 
-ifneq (,$(filter TRUE,$(ENABLE_KF5)$(ENABLE_GTK3_KDE5)))
+ifneq (,$(filter TRUE,$(ENABLE_KF5) $(ENABLE_GTK3_KDE5)))
 
 define gb_LinkTarget__use_kf5
 $(call gb_LinkTarget_set_include,$(1),\
@@ -3007,7 +3007,7 @@ endif # ENABLE_KF5
 
 
 
-ifneq (,$(filter TRUE,$(ENABLE_QT5)$(ENABLE_GTK3_KDE5)))
+ifneq (,$(filter TRUE,$(ENABLE_QT5) $(ENABLE_GTK3_KDE5)))
 
 define gb_LinkTarget__use_qt5
 $(call gb_LinkTarget_set_include,$(1),\

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Michael Weghorn (via logerrit)]

 RepositoryExternal.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5801b9fc65508391e130670f79a9af51f18d4e96
Author: Michael Weghorn 
AuthorDate: Thu Jan 27 08:17:54 2022 +
Commit: Michael Weghorn 
CommitDate: Thu Jan 27 12:04:24 2022 +0100

Fix gtk3_kde5 build when qt5/kf5 VCL plugins are not built

Since

commit 894450d6ebbb2d5e063d72b971580d1b8c10a5e3
Author: Michael Weghorn 
Date:   Tue Sep 28 08:36:44 2021 +0200

Unify how Qt/KF build flags/libs are set

the qt5/kf5 externals are used to set includes and
compiler/linker flags for the gtk3_kde5 VCL plugin
as well.

However, the relevant link targets were only actually
defined as needed when building the qt5 and kf5 VCL plugins
was enabled as well.
Adapt that so that building the gtk3_kde5 VCL plugin
but not the qt5 and kf5 ones also works again
(e.g. '--enable-gtk3-kde5 --disable-qt5 --disable-kf5').

Change-Id: I65b75d7c2ccab71eade01aa2529fb45174056701
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129022
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index fc18d0562277..2962679864fd 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2979,7 +2979,7 @@ endef # gb_LinkTarget__use_postgresql
 
 endif # !SYSTEM_POSTGRESQL
 
-ifeq ($(ENABLE_KF5),TRUE)
+ifneq (,$(filter TRUE,$(ENABLE_KF5)$(ENABLE_GTK3_KDE5)))
 
 define gb_LinkTarget__use_kf5
 $(call gb_LinkTarget_set_include,$(1),\
@@ -3007,7 +3007,7 @@ endif # ENABLE_KF5
 
 
 
-ifeq ($(ENABLE_QT5),TRUE)
+ifneq (,$(filter TRUE,$(ENABLE_QT5)$(ENABLE_GTK3_KDE5)))
 
 define gb_LinkTarget__use_qt5
 $(call gb_LinkTarget_set_include,$(1),\

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Stephan Bergmann (via logerrit)]

 RepositoryExternal.mk |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit f6e02294ce8d71a03c8e440e041094d2dd0a9834
Author: Stephan Bergmann 
AuthorDate: Sun Jan 2 20:14:04 2022 +0100
Commit: Stephan Bergmann 
CommitDate: Sun Jan 2 22:29:03 2022 +0100

Replace obsolete *_use_external_project for libjpeg-turbo

...which no longer is an ExternalProject but just a StaticLibrary since
1295f497e0cc7fc7cfcb66182496a4d29aa701b3 "upgrade libjpeg-turbo to 2.1.1".
(This caused e.g. a from-scratch `make Library_pdfium` to fail with

> [PRJ] libjpeg-turbo
> touch: cannot touch '.../workdir/ExternalProject/libjpeg-turbo.done': No 
such file or directory

when workdir/ExternalProject/ happens not to exist yet.)

Change-Id: Id0f0e3b13cc7e9e556d9c8e7698d4dfa1bb01659
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127874
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 709376b80034..e791935b2cda 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -419,7 +419,6 @@ gb_ExternalProject__use_libjpeg :=
 else
 
 define gb_LinkTarget__use_libjpeg
-$(call gb_LinkTarget_use_external_project,$(1),libjpeg-turbo,full)
 $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,libjpeg-turbo) \
$$(INCLUDE) \
@@ -429,7 +428,7 @@ $(call 
gb_LinkTarget_use_static_libraries,$(1),libjpeg-turbo)
 endef
 
 define gb_ExternalProject__use_libjpeg
-$(call gb_ExternalProject_use_external_project,$(1),libjpeg-turbo)
+$(call gb_ExternalProject_use_static_libraries,$(1),libjpeg-turbo)
 
 endef
 

[Libreoffice-commits] core.git: RepositoryExternal.mk Repository.mk sal/Library_sal.mk sal/Module_sal.mk solenv/gbuild

[Jan-Marek Glogowski (via logerrit)]

 Repository.mk   |2 +-
 RepositoryExternal.mk   |4 ++--
 sal/Library_sal.mk  |   12 ++--
 sal/Module_sal.mk   |2 +-
 solenv/gbuild/Conditions.mk |4 
 5 files changed, 10 insertions(+), 14 deletions(-)

New commits:
commit bd1868c1057f0582f1a733bb90eca0c1c7e07933
Author: Jan-Marek Glogowski 
AuthorDate: Mon Dec 13 18:21:11 2021 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Thu Dec 16 11:17:08 2021 +0100

Refactor Library_sal_textenc build condition

... by adding and using gb_CondSalTextEncodingLibrary.

Change-Id: I04e8f56bde6296477d449f1c447e8133cdf86e6e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126788
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/Repository.mk b/Repository.mk
index 91e8780a01ba..018628e6d9ec 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -612,7 +612,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,PRIVATELIBS_URE,ure, \
 ))
 
 $(eval $(call gb_Helper_register_plugins_for_install,PRIVATELIBS_URE,ure, \
-sal_textenc \
+$(call gb_CondSalTextEncodingLibrary,sal_textenc) \
 ))
 
 $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 5569aa0f1027..e24e35150713 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3800,7 +3800,7 @@ endif # SYSTEM_JFREEREPORT
 
 define gb_Executable__register_bestreversemap
 $(call gb_Executable_add_runtime_dependencies,bestreversemap,\
-   $(if $(filter $(OS),ANDROID),,$(if $(filter 
TRUE,$(DISABLE_DYNLOADING)),,$(call 
gb_Library_get_target_for_build,sal_textenc))) \
+$(call gb_CondSalTextEncodingLibrary,$(call 
gb_Library_get_target_for_build,sal_textenc)) \
 )
 endef
 
@@ -3817,7 +3817,7 @@ endef
 
 define gb_Executable__register_cppumaker
 $(call gb_Executable_add_runtime_dependencies,cppumaker,\
-   $(if $(filter $(OS),ANDROID),,$(if $(filter 
TRUE,$(DISABLE_DYNLOADING)),,$(call gb_Library_get_target,sal_textenc))) \
+$(call gb_CondSalTextEncodingLibrary,$(call 
gb_Library_get_target,sal_textenc)) \
 )
 endef
 
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index a323aedaa7b1..ac121098273f 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -130,7 +130,8 @@ $(eval $(call gb_Library_add_cxxflags,sal,\
 ))
 endif
 
-sal_textenc_code= \
+ifeq (,$(call gb_CondSalTextEncodingLibrary,$(true)))
+$(eval $(call gb_Library_add_exception_objects,sal,\
 sal/textenc/context \
 sal/textenc/convertbig5hkscs \
 sal/textenc/converteuctw \
@@ -144,15 +145,6 @@ sal_textenc_code= \
 sal/textenc/tcvtbyte \
 sal/textenc/tcvtmb \
 sal/textenc/tcvtutf7 \
-
-ifeq ($(OS),ANDROID)
-$(eval $(call gb_Library_add_exception_objects,sal,\
-$(sal_textenc_code) \
-))
-else ifeq ($(DISABLE_DYNLOADING),TRUE)
-
-$(eval $(call gb_Library_add_exception_objects,sal,\
-$(sal_textenc_code) \
 ))
 endif
 
diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
index 1a190037f05b..19bf547ad572 100644
--- a/sal/Module_sal.mk
+++ b/sal/Module_sal.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_Module_add_targets,sal,\
$(if $(filter $(OS),ANDROID), \
Library_lo-bootstrap) \
Library_sal \
-   $(if $(filter $(OS),ANDROID),,$(if $(filter 
TRUE,$(DISABLE_DYNLOADING)),,Library_sal_textenc)) \
+$(call gb_CondSalTextEncodingLibrary,Library_sal_textenc) \
 ))
 
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
diff --git a/solenv/gbuild/Conditions.mk b/solenv/gbuild/Conditions.mk
index bf81215f25eb..88e705524d65 100644
--- a/solenv/gbuild/Conditions.mk
+++ b/solenv/gbuild/Conditions.mk
@@ -11,4 +11,8 @@ define gb_CondBuildLockfile
 $(if $(and $(filter-out ANDROID MACOSX iOS WNT,$(OS))),$(1),$(2))
 endef
 
+define gb_CondSalTextEncodingLibrary
+$(if $(filter ANDROID,$(OS)),,$(if $(DISABLE_DYNLOADING),$(2),$(1)))
+endef
+
 # vim: set noet sw=4 ts=4:

[Libreoffice-commits] core.git: RepositoryExternal.mk vcl/inc vcl/skia

[Luboš Luňák (via logerrit)]

 RepositoryExternal.mk   |1 +
 vcl/inc/skia/utils.hxx  |4 
 vcl/skia/SkiaHelper.cxx |   35 ++-
 vcl/skia/salbmp.cxx |   14 --
 4 files changed, 51 insertions(+), 3 deletions(-)

New commits:
commit 2c86b79e87bc8579f5213708954d5c85fe231407
Author: Luboš Luňák 
AuthorDate: Thu Dec 9 14:30:15 2021 +0100
Commit: Luboš Luňák 
CommitDate: Fri Dec 10 11:59:39 2021 +0100

cache Skia drawing based on checksum of bitmap content (tdf#146095)

Previously the caching was based on SkImage's uniqueID(), which
detects whether it's the same image. For caching to work based on
this it is required that the underlying image does not change,
which generally means using the same Bitmap(Ex) for repeated drawing.
But e.g. in tdf#146096 canvas (AFAICT) tries to cache bitmaps
by copying them around, which generates so many bitmaps that they all
do not fit in the cache (helped by the fact that the edit window
still animates them too, and bitmap caching in canvas being broken).

It feels kinda lame and unnecessary to checksum pixels of many bitmaps
to be drawn just to find out whether their drawing can be sped up,
and it really should be fixed higher up wherever it's broken, but
I've already failed several times trying to fix this in canvas,
so let's just roll with this.

This is done only for raster-based images, because GPU-backed drawing
is fast enough to deal even with expensive drawing (and fetching
GPU-backend pixels would be expensive).

On my machine this changes showing the slide from not being able
to quite keep up to about 20% CPU usage.

Change-Id: I25a362a02dc61e99b391cb305e2fdcd2feb67879
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126613
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e63ab24dba27..fbb02d802142 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -128,6 +128,7 @@ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,skia)/include/gpu \
-I$(call gb_UnpackedTarball_get_dir,skia)/include/config \
-I$(call gb_UnpackedTarball_get_dir,skia)/include/ports \
+   -I$(call gb_UnpackedTarball_get_dir,skia)/include/private \
-I$(call gb_UnpackedTarball_get_dir,skia)/include/third_party/vulkan \
-I$(call gb_UnpackedTarball_get_dir,skia)/tools/gpu \
-I$(call gb_UnpackedTarball_get_dir,skia) \
diff --git a/vcl/inc/skia/utils.hxx b/vcl/inc/skia/utils.hxx
index 35180c016e24..d2d4c81c3f94 100644
--- a/vcl/inc/skia/utils.hxx
+++ b/vcl/inc/skia/utils.hxx
@@ -119,6 +119,10 @@ sk_sp findCachedImage(const OString& key);
 void removeCachedImage(sk_sp image);
 tools::Long maxImageCacheSize();
 
+// Get checksum of the image content, only for raster images. Is cached,
+// but may still be somewhat expensive.
+uint32_t getSkImageChecksum(sk_sp image);
+
 // SkSurfaceProps to be used by all Skia surfaces.
 VCL_DLLPUBLIC const SkSurfaceProps* surfaceProps();
 // Set pixel geometry to be used by SkSurfaceProps.
diff --git a/vcl/skia/SkiaHelper.cxx b/vcl/skia/SkiaHelper.cxx
index 5b022d51b50d..2a4a7f1a6d7f 100644
--- a/vcl/skia/SkiaHelper.cxx
+++ b/vcl/skia/SkiaHelper.cxx
@@ -36,6 +36,7 @@ bool isVCLSkiaEnabled() { return false; }
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -43,6 +44,7 @@ bool isVCLSkiaEnabled() { return false; }
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -581,7 +583,7 @@ struct ImageCacheItem
 } //namespace
 
 // LRU cache, last item is the least recently used. Hopefully there won't be 
that many items
-// to require a hash/map. Using o3tl::lru_cache would be simpler, but it 
doesn't support
+// to require a hash/map. Using o3tl::lru_map would be simpler, but it doesn't 
support
 // calculating cost of each item.
 static std::list imageCache;
 static tools::Long imageCacheSize = 0; // sum of all ImageCacheItem.size
@@ -644,6 +646,37 @@ tools::Long maxImageCacheSize()
 return officecfg::Office::Common::Cache::Skia::ImageCacheSize::get();
 }
 
+static o3tl::lru_map checksumCache(256);
+
+uint32_t computeSkPixmapChecksum(const SkPixmap& pixmap)
+{
+// Use uint32_t because that's what SkOpts::hash_fn() returns.
+static_assert(std::is_same_v);
+const size_t dataRowBytes = pixmap.width() << pixmap.shiftPerPixel();
+if (dataRowBytes == pixmap.rowBytes())
+return SkOpts::hash_fn(pixmap.addr(), pixmap.height() * dataRowBytes, 
0);
+uint32_t sum = 0;
+for (int row = 0; row < pixmap.height(); ++row)
+sum = SkOpts::hash_fn(pixmap.addr(0, row), dataRowBytes, sum);
+return sum;
+}
+
+uint32_t getSkImageChecksum(sk_sp image)
+{
+// Cache the checksums based on the uniqueID() (which should stay the same
+// for the same image), because it may be still somewhat expensive.
+

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Michael Warner (via logerrit)]

 RepositoryExternal.mk |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 6ea7ca45782a7e1b46e18e994534ec0a7c71951b
Author: Michael Warner 
AuthorDate: Fri Nov 12 08:13:16 2021 -0500
Commit: Michael Stahl 
CommitDate: Mon Nov 15 16:27:54 2021 +0100

tdf#141709 Register poppler_data for install

Added call to gb_Helper_register_packages_for_install to 
RepositoryExternal.mk
for poppler_data.

Change-Id: Ie65ff0083d2c731486254066db2034e3bd4a99a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125108
Reviewed-by: Michael Stahl 
Tested-by: Jenkins

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index a2a7212aa837..e63ab24dba27 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2815,6 +2815,10 @@ endef
 
 else # !SYSTEM_POPPLER
 
+$(eval $(call gb_Helper_register_packages_for_install,pdfimport,\
+   poppler_data \
+))
+
 define gb_LinkTarget__use_poppler
 $(call gb_LinkTarget_use_external_project,$(1),poppler,full)
 $(call gb_LinkTarget_use_package,$(1),poppler_data)
@@ -2826,7 +2830,6 @@ $(call gb_LinkTarget_set_include,$(1),\
 )
 
 $(call gb_LinkTarget_use_static_libraries,$(1),poppler)
-
 $(call gb_LinkTarget_use_external,$(1),libjpeg)
 
 ifeq ($(OS),MACOSX)

[Libreoffice-commits] core.git: RepositoryExternal.mk xmlsecurity/CppunitTest_xmlsecurity_pdfsigning.mk xmlsecurity/CppunitTest_xmlsecurity_signing.mk

[Michael Stahl (via logerrit)]

 RepositoryExternal.mk |   26 ++
 xmlsecurity/CppunitTest_xmlsecurity_pdfsigning.mk |2 -
 xmlsecurity/CppunitTest_xmlsecurity_signing.mk|2 -
 3 files changed, 28 insertions(+), 2 deletions(-)

New commits:
commit 395c0c0bbaceadf909e0189af99c6358487c7978
Author: Michael Stahl 
AuthorDate: Tue Oct 19 16:00:53 2021 +0200
Commit: Michael Stahl 
CommitDate: Tue Oct 19 19:28:54 2021 +0200

xmlsecurity: fix --without-system-nss usage of NSS_SetAlgorithmPolicy

The problem with commit ff572d9222ec16ffd679ae907a0bf4a8900265e1
is that it's using the wrong library; NSS_SetAlgorithmPolicy is actually
in libnssutil3.so.

This causes a linking problem when upgrading the internal NSS to a
version that has NSS_USE_ALG_IN_ANY_SIGNATURE.

Change-Id: I954d88062c38881bc721bdf052db4f7b55888aae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123819
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 4c45caa7e746..951267d0e624 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3446,6 +3446,11 @@ $(call gb_LinkTarget_add_libs,$(1),\
 
 endef
 
+define gb_LinkTarget__use_nssutil3
+$(call gb_LinkTarget__use_nss3,$(1))
+
+endef
+
 define gb_LinkTarget__use_plc4
 $(call gb_LinkTarget__use_nss3,$(1))
 
@@ -3515,6 +3520,27 @@ endif
 
 endef
 
+define gb_LinkTarget__use_nssutil3
+$(call gb_LinkTarget_use_package,$(1),nss)
+$(call gb_LinkTarget_set_include,$(1),\
+   $$(INCLUDE) \
+   -I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss \
+   -I$(call gb_UnpackedTarball_get_dir,nss)/dist/out/include \
+)
+
+ifeq ($(COM),MSC)
+$(call gb_LinkTarget_add_libs,$(1),\
+   $(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/nssutil3.lib \
+)
+else
+$(call gb_LinkTarget_add_libs,$(1),\
+   -L$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib \
+   -lnssutil3 \
+)
+endif
+
+endef
+
 define gb_ExternalProject__use_nss3
 $(call gb_ExternalProject_use_package,$(1),nss)
 
diff --git a/xmlsecurity/CppunitTest_xmlsecurity_pdfsigning.mk 
b/xmlsecurity/CppunitTest_xmlsecurity_pdfsigning.mk
index dbedd1a1f7c9..667acc97e3e1 100644
--- a/xmlsecurity/CppunitTest_xmlsecurity_pdfsigning.mk
+++ b/xmlsecurity/CppunitTest_xmlsecurity_pdfsigning.mk
@@ -37,7 +37,7 @@ $(eval $(call 
gb_CppunitTest_use_externals,xmlsecurity_pdfsigning,\
 ifneq ($(OS),WNT)
 ifneq (,$(ENABLE_NSS))
 $(eval $(call gb_CppunitTest_use_externals,xmlsecurity_pdfsigning,\
-nss3 \
+nssutil3 \
 ))
 endif
 endif
diff --git a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk 
b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk
index 126427fdada0..f64a7ecf367d 100644
--- a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk
+++ b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk
@@ -40,7 +40,7 @@ $(eval $(call 
gb_CppunitTest_use_externals,xmlsecurity_signing,\
 ifneq ($(OS),WNT)
 ifneq (,$(ENABLE_NSS))
 $(eval $(call gb_CppunitTest_use_externals,xmlsecurity_signing,\
-nss3 \
+nssutil3 \
 ))
 endif
 endif

[Libreoffice-commits] core.git: RepositoryExternal.mk solenv/gbuild

[Stephan Bergmann (via logerrit)]

 RepositoryExternal.mk  |1 +
 solenv/gbuild/extensions/pre_BuildTools.mk |1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0e7d4d99beda181f4e22725e4b8295d25489696f
Author: Stephan Bergmann 
AuthorDate: Sun Aug 22 11:26:38 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Sun Aug 22 14:32:08 2021 +0200

gengal needs Library_localedata_en now

Whatever caused that requirement, but a from-scratch build of e.g.
Gallery_backgrounds failed for me (with a follow-on SIGABRT after
"framework/source/services/desktop.cxx:176: Desktop::~Desktop(): Who forgot 
to
dispose this service?") because it failed to load
instdir/program/../program/liblocaledata_en.so at

> #1  0x7fffda0b9671 in 
i18npool::LocaleDataImpl::getFunctionSymbol(com::sun::star::lang::Locale 
const&, char const*) (this=0x159b630, rLocale=..., pFunction=0x7fffda136ed8 
"getAllFormats0") at i18npool/source/localedata/localedata.cxx:1460
> #2  0x7fffda0b6a93 in 
i18npool::LocaleDataImpl::FormatSection::getFunc(i18npool::LocaleDataImpl&, 
com::sun::star::lang::Locale const&, char const*) (this=0x7fffc840, 
rLocaleData=..., rL=..., pName=0x7fffda136ed8 "getAllFormats0") at 
i18npool/source/localedata/localedata.cxx:857
> #3  0x7fffda0b6b5c in 
i18npool::LocaleDataImpl::getAllFormats(com::sun::star::lang::Locale const&) 
(this=0x159b630, rLocale=...) at i18npool/source/localedata/localedata.cxx:865
> #4  0x7fffda0d4815 in 
NumberFormatCodeMapper::getFormats(com::sun::star::lang::Locale const&) 
(this=0x1594fa0, rLocale=...) at 
i18npool/source/numberformatcode/numberformatcode.cxx:150
> #5  0x7fffda0d4155 in NumberFormatCodeMapper::getAllFormatCode(short, 
com::sun::star::lang::Locale const&) (this=0x1594fa0, formatUsage=8, 
rLocale=...) at i18npool/source/numberformatcode/numberformatcode.cxx:92
> #6  0x7572a824 in LocaleDataWrapper::loadCurrencyFormats() 
(this=0x159b3f0) at unotools/source/i18n/localedatawrapper.cxx:544
> #7  0x7572777e in LocaleDataWrapper::loadData() (this=0x159b3f0) 
at unotools/source/i18n/localedatawrapper.cxx:131
> #8  0x757271b4 in 
LocaleDataWrapper::LocaleDataWrapper(LanguageTag const&, 
std::__debug::vector > const&) 
(this=0x159b3f0, rLanguageTag=..., 
rOverrideDateAcceptancePatterns=std::__debug::vector of length 0, capacity 0) 
at unotools/source/i18n/localedatawrapper.cxx:80
> #9  0x75766fd6 in SvtSysLocale_Impl::SvtSysLocale_Impl() 
(this=0x158a4e0) at unotools/source/misc/syslocale.cxx:67
> #10 0x75768ad7 in 
std::construct_at(SvtSysLocale_Impl*) (__location=0x158a4e0) 
at ~/gcc/trunk/inst/include/c++/12.0.0/bits/stl_construct.h:97
> #11 0x75768b1c in 
std::allocator_traits 
>::construct(std::allocator&, 
SvtSysLocale_Impl*) (__a=..., __p=0x158a4e0) at 
~/gcc/trunk/inst/include/c++/12.0.0/bits/alloc_traits.h:514
> #12 0x757688c2 in std::_Sp_counted_ptr_inplace, 
(__gnu_cxx::_Lock_policy)2>::_Sp_counted_ptr_inplace<>(std::allocator)
 (this=0x158a4d0, __a=...) at 
~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr_base.h:519
> #13 0x7576860a in 
std::__shared_count<(__gnu_cxx::_Lock_policy)2>::__shared_count>(SvtSysLocale_Impl*&, 
std::_Sp_alloc_shared_tag >) 
(this=0x7fffd0a8, __p=@0x7fffd0a0: 0x0, __a=...) at 
~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr_base.h:650
> #14 0x757684c6 in std::__shared_ptr::__shared_ptr>(std::_Sp_alloc_shared_tag
 >) (this=0x7fffd0a0, __tag=...) at 
~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr_base.h:1342
> #15 0x7576838d in 
std::shared_ptr::shared_ptr>(std::_Sp_alloc_shared_tag
 >) (this=0x7fffd0a0, __tag=...) at 
~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr.h:409
> #16 0x75768164 in std::allocate_shared>(std::allocator const&) 
(__a=...) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr.h:863
> #17 0x75767dfc in std::make_shared() () at 
~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr.h:879
> #18 0x75767583 in SvtSysLocale::SvtSysLocale() 
(this=0x7fffd120) at unotools/source/misc/syslocale.cxx:122
> #19 0x7015148f in FwkResId(TranslateId) (aId=...) at 
framework/source/fwe/classes/fwkresid.cxx:22
> #20 0x7025f333 in framework::Desktop::constructorInit() 
(this=0x1588850) at framework/source/services/desktop.cxx:106
> #21 0x70265c1c in (anonymous 
namespace)::createDesktop(com::sun::star::uno::Reference
 const&) (context=...) at framework/source/services/desktop.cxx:1764
> #22 0x70265ce5 in 
framework::getDesktop(com::sun::star::uno::Reference
 const&) (context=...) at framework/source/services/desktop.cxx:1773
> #23 0x70265d9e in 
com_sun_star_comp_framework_Desktop_get_implementation(com::sun::star::uno::XComponentContext*,
 com::sun::star::uno::Sequence const&) 
(context=0x522200) at 

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Christian Lohmaier (via logerrit)]

 RepositoryExternal.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit dac70b9debb7c68def456ae90463ef6ced44c07d
Author: Christian Lohmaier 
AuthorDate: Tue Jun 8 20:04:46 2021 +0200
Commit: Christian Lohmaier 
CommitDate: Tue Jun 8 23:26:06 2021 +0200

fix packaging on mac/linux re cairo/pixman

1193c331945481dd155a55c6695ff6fd88bd3d10 tried to simplify the makefiles
for the Android case, but removed the conditional that would skip
registering cairo/pixman for install for mac/windows (USING_X11,
ENABLE_CAIRO_CANVAS & DISABLE_GUI all unset)

Change-Id: I21509aaa1b2b1bffb583885148190b28fb097ecc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116860
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index df4a8f15c703..36c74ee95985 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1286,6 +1286,8 @@ endef
 
 else # !SYSTEM_CAIRO
 
+ifneq ($(filter-out MACOSX WNT,$(OS)),)
+
 $(eval $(call gb_Helper_register_packages_for_install,ooo,\
cairo \
 pixman \
@@ -1308,6 +1310,8 @@ $(call gb_LinkTarget_add_libs,$(1),\
 
 endef
 
+endif # !MACOSX, !WNT
+
 endif # !SYSTEM_CAIRO
 
 ifneq ($(SYSTEM_FREETYPE),)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk solenv/gbuild

[Jan-Marek Glogowski (via logerrit)]

 RepositoryExternal.mk|   10 +-
 solenv/gbuild/TargetLocations.mk |1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 7efb6328cb5e43d87afbbd81cf0165683e9fd4c3
Author: Jan-Marek Glogowski 
AuthorDate: Mon May 31 02:26:43 2021 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Mon May 31 13:19:21 2021 +0200

gbuild: implement gb_UnoApi_get_target_for_build

Change-Id: Iaee243510023bf935097914fd6c4fcb701d35c13
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116438
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index d9a22effc962..688bef98ac1a 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3869,7 +3869,7 @@ define gb_Executable__register_climaker
 $(call gb_Executable_add_runtime_dependencies,climaker,\
$(call gb_Library_get_target_for_build,$(CPPU_ENV_FOR_BUILD)_uno) \
$(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER)/services.rdb \
-   $(call gb_UnoApi_get_target,udkapi) \
+   $(call gb_UnoApi_get_target_for_build,udkapi) \
$(INSTROOT_FOR_BUILD)/$(LIBO_URE_ETC_FOLDER)/$(call 
gb_Helper_get_rcfile,uno)
 )
 endef
@@ -3893,8 +3893,8 @@ $(call gb_Executable_add_runtime_dependencies,gengal,\
$(INSTROOT_FOR_BUILD)/$(LIBO_ETC_FOLDER)/$(call 
gb_Helper_get_rcfile,louno) \
$(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER)/services.rdb \
$(INSTROOT_FOR_BUILD)/$(LIBO_ETC_FOLDER)/services/services.rdb \
-   $(call gb_UnoApi_get_target,offapi) \
-   $(call gb_UnoApi_get_target,udkapi) \
+   $(call gb_UnoApi_get_target_for_build,offapi) \
+   $(call gb_UnoApi_get_target_for_build,udkapi) \
 )
 endef
 
@@ -3932,7 +3932,7 @@ $(call gb_Executable_add_runtime_dependencies,saxparser,\
$(call gb_Package_get_target_for_build,instsetoo_native_setup_ure) \
$(call gb_Rdb_get_target_for_build,saxparser) \
$(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER_FOR_BUILD)/services.rdb \
-   $(call gb_UnoApi_get_target,udkapi) \
+   $(call gb_UnoApi_get_target_for_build,udkapi) \
 )
 endef
 
@@ -3943,7 +3943,7 @@ define gb_Executable__register_uno
 $(call gb_Executable_add_runtime_dependencies,uno,\
$(call gb_Library_get_target_for_build,$(CPPU_ENV_FOR_BUILD)_uno) \
$(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER)/services.rdb \
-   $(call gb_UnoApi_get_target,udkapi) \
+   $(call gb_UnoApi_get_target_for_build,udkapi) \
 )
 endef
 
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 46e875d6d227..0df1cd2bb9d5 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -29,6 +29,7 @@ gb_PackagePart_get_destinations = \
 
 # kind of lame but with just 3 of these why bother with registration etc.
 gb_UnoApi_get_target = $(INSTROOT)/$(if $(filter 
udkapi,$(1)),$(LIBO_URE_MISC_FOLDER)/types,$(LIBO_ETC_FOLDER)/types/$(1)).rdb
+gb_UnoApi_get_target_for_build = $(INSTROOT_FOR_BUILD)/$(if $(filter 
udkapi,$(1)),$(LIBO_URE_MISC_FOLDER)/types,$(LIBO_ETC_FOLDER)/types/$(1)).rdb
 
 # workdir target patterns
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Jan-Marek Glogowski (via logerrit)]

 RepositoryExternal.mk |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 58d5f74a7b8634919d4842e623c582c570997952
Author: Jan-Marek Glogowski 
AuthorDate: Sat May 22 21:42:26 2021 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Tue May 25 18:07:41 2021 +0200

postgres: fix internal linking with WITH_GSSAPI

Change-Id: If5a741cfe5863d0cad09463ba7e958ac0f3bb24d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116108
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 224fd7526bec..a45ffa35613d 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3092,19 +3092,20 @@ $(call gb_LinkTarget_add_libs,$(1),\
$(call 
gb_UnpackedTarball_get_dir,postgresql)/$(gb_MSBUILD_CONFIG)/libpq/libpq.lib \
 )
 
-else # WNT
+else # !WNT
 
 $(call gb_LinkTarget_add_libs,$(1),\
$(call 
gb_UnpackedTarball_get_dir,postgresql)/src/interfaces/libpq/libpq$(gb_StaticLibrary_PLAINEXT)
 \
$(call 
gb_UnpackedTarball_get_dir,postgresql)/src/common/libpgcommon$(gb_StaticLibrary_PLAINEXT)
 \
$(call 
gb_UnpackedTarball_get_dir,postgresql)/src/port/libpgport$(gb_StaticLibrary_PLAINEXT)
 \
+$(if $(WITH_GSSAPI),$(GSSAPI_LIBS)) \
 )
 
-endif # WNT
+endif # !WNT
 
-endef
+endef # gb_LinkTarget__use_postgresql
 
-endif # SYSTEM_POSTGRESQL
+endif # !SYSTEM_POSTGRESQL
 
 ifeq ($(ENABLE_KF5),TRUE)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Luboš Luňák (via logerrit)]

 RepositoryExternal.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 04bd21d483c33c5011e31ac12d02c9e00dc410ce
Author: Luboš Luňák 
AuthorDate: Thu Apr 22 17:10:53 2021 +0200
Commit: Luboš Luňák 
CommitDate: Thu Apr 22 22:08:55 2021 +0200

fix cairocanvas build with internal cairo

3a4bfe3e45be2d5b591ab5cae3694c9492ca9e1b made cairocanvas #include
also a pixman header, but the internal cairo case wasn't setting
up the pixman include path.

Change-Id: Ib0daab3a5ec1a6ebf1b29eb37b039d2f41f770c9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114491
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index dd1386b43bb8..12124f1fbbf7 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1301,6 +1301,7 @@ $(call gb_LinkTarget_use_external,$(1),freetype_headers)
 $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,cairo) \
-I$(call gb_UnpackedTarball_get_dir,cairo)/src \
+   -I$(call gb_UnpackedTarball_get_dir,pixman)/pixman \
$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Jan-Marek Glogowski (via logerrit)]

 RepositoryExternal.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit fad7e203a25963128b9ce786d3fc465a32c238ce
Author: Jan-Marek Glogowski 
AuthorDate: Sun Feb 7 15:15:58 2021 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Sun Feb 7 19:17:35 2021 +0100

tdf#140236 WIN install libffi with Python

Regression from commit b4dfba947768834ffecc09056992019878711c8b
("python3: update to 3.8.4"). Previous Python versions included
the source for libffi on all platforms, but now just for MacOS.
So now LO must build that DLL on Windows, which was done in
commit 883068462fe5bcbb01a8e14736fc06d0c3695c62 ("libffi: build
DLL on Windows").

Since OpenSSL is installed in the program directory and the LO
Python directory, this currently works "accidentially". Not sure
the Python OpenSSL DLLs should be handled via some extra gbuild
package to separate both, but that can be done in an additional
change.

Change-Id: I4a42e39cc2f4434a9944aad32836f66ec2819931
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110537
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 03099d4aeb1c..03833bd5c56a 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3169,6 +3169,7 @@ else # !SYSTEM_PYTHON
 
 $(eval $(call gb_Helper_register_packages_for_install,python,\
python3 \
+$(if $(filter WNT,$(OS)),libffi) \
 ))
 
 define gb_LinkTarget__use_python_headers
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Michael Stahl (via logerrit)]

 RepositoryExternal.mk |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 5e6e87f1556e484c4d4be7e3b01ef668ab602f3c
Author: Michael Stahl 
AuthorDate: Thu Jan 21 14:26:01 2021 +0100
Commit: Michael Stahl 
CommitDate: Thu Jan 21 17:28:57 2021 +0100

postgresql: fix mistake in RepositoryExternal.mk

Apparently causes "ERROR: Source for postgresql.filelist not found!" on
non-WNT.

Change-Id: I79cf9074bc8e4948febe76fc963231c916a274cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109760
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 3d9ca8da5551..03099d4aeb1c 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3050,6 +3050,12 @@ endef
 
 else # !SYSTEM_POSTGRESQL
 
+ifeq ($(OS),WNT)
+$(eval $(call gb_Helper_register_packages_for_install,postgresqlsdbc,\
+   postgresql \
+))
+endif # WNT
+
 define gb_LinkTarget__use_postgresql
 
 $(call gb_LinkTarget_use_external_project,$(1),postgresql,full)
@@ -3062,10 +3068,6 @@ $(call gb_LinkTarget_set_include,$(1),\
 
 ifeq ($(OS),WNT)
 
-$(eval $(call gb_Helper_register_packages_for_install,postgresqlsdbc,\
-   postgresql \
-))
-
 $(call gb_LinkTarget_add_libs,$(1),\
$(call 
gb_UnpackedTarball_get_dir,postgresql)/$(gb_MSBUILD_CONFIG)/libpq/libpq.lib \
 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Stephan Bergmann (via logerrit)]

 RepositoryExternal.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0f7008e91f45cf8e3cee6f372ce012b38a795e26
Author: Stephan Bergmann 
AuthorDate: Thu Jan 7 10:15:51 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Jan 7 14:50:13 2021 +0100

openssl_headers depends on generated opensslconf.h

...at workdir/UnpackedTarball/openssl/include/openssl/opensslconf.h, as can 
be
seen with failed builds like
:

[...]
> [build PAT] openssl
> [build C  ] 
UnpackedTarball/mariadb-connector-c/plugins/auth/caching_sha2_pw.c
> [build C  ] 
UnpackedTarball/mariadb-connector-c/libmariadb/secure/openssl_crypt.c
> [build DEP] LNK:Library/libclucene.dylib
> [build LNK] Library/libclucene.dylib
> In file included from 
/Users/tdf/lode/jenkins/workspace/lo_tb_master_mac/workdir/UnpackedTarball/mariadb-connector-c/libmariadb/secure/openssl_crypt.c:21:
> 
/Users/tdf/lode/jenkins/workspace/lo_tb_master_mac/workdir/UnpackedTarball/openssl/include/openssl/evp.h:13:11:
 fatal error: 'openssl/opensslconf.h' file not found
> # include 
>   ^~~
> 1 error generated.

Change-Id: Ied1dcdd0afb6099e9218671c6a06c0edaafc931e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108928
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 99dfcea22b40..b525fb5b40be 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1580,7 +1580,7 @@ $(call gb_ExternalProject_use_package,$(1),openssl)
 endef
 
 define gb_LinkTarget__use_openssl_headers
-$(call gb_LinkTarget_use_external_project,$(1),openssl)
+$(call gb_LinkTarget_use_external_project,$(1),openssl,full)
 $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,openssl)/include \
$$(INCLUDE) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Miklos Vajna (via logerrit)]

 RepositoryExternal.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 47fda617fc4dad8273919227ca45ea3b8b61aea1
Author: Miklos Vajna 
AuthorDate: Wed Oct 7 21:05:32 2020 +0200
Commit: Miklos Vajna 
CommitDate: Thu Oct 8 12:40:31 2020 +0200

pdfium: remove non-public headers from include path

This was only needed to use upstream scopers, but we don't use those
anymore.

Change-Id: Idac60119d4d4e8587170fe3e5c69b3ec069e6a6b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104069
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 19421d4df8d4..f0cad01beb49 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -4163,7 +4163,6 @@ endef
 ifneq ($(ENABLE_PDFIUM),)
 define gb_LinkTarget__use_pdfium
 $(call gb_LinkTarget_set_include,$(1),\
-   -I$(call gb_UnpackedTarball_get_dir,pdfium) \
-I$(call gb_UnpackedTarball_get_dir,pdfium)/public \
-DCOMPONENT_BUILD \
$$(INCLUDE) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk xmlsecurity/CppunitTest_xmlsecurity_signing.mk xmlsecurity/qa

[Miklos Vajna (via logerrit)]

 RepositoryExternal.mk  |1 
 xmlsecurity/CppunitTest_xmlsecurity_signing.mk |3 
 xmlsecurity/qa/unit/signing/data/add-visible-signature.pdf |binary
 xmlsecurity/qa/unit/signing/signing.cxx|   76 +
 4 files changed, 80 insertions(+)

New commits:
commit fb8f0ef26d57986bd27c6c5088939c32453e6b06
Author: Miklos Vajna 
AuthorDate: Fri Jun 19 17:21:58 2020 +0200
Commit: Miklos Vajna 
CommitDate: Fri Jun 19 18:42:42 2020 +0200

sd signature line: add testcase

Fails with commit 9b7a890fd59744459692d7f66402c6bdd25acec4 (sd signature
line: include shape in the appearance widget, 2020-06-19) reverted.

Change-Id: Ib237774374553af5d37c9deaffdea6fae65a28f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96737
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index c2f8383aa02e..05e07c4bc5ea 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -4157,6 +4157,7 @@ endef
 ifneq ($(ENABLE_PDFIUM),)
 define gb_LinkTarget__use_pdfium
 $(call gb_LinkTarget_set_include,$(1),\
+   -I$(call gb_UnpackedTarball_get_dir,pdfium) \
-I$(call gb_UnpackedTarball_get_dir,pdfium)/public \
-DCOMPONENT_BUILD \
$$(INCLUDE) \
diff --git a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk 
b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk
index c748c644aecb..11a00d0482b4 100644
--- a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk
+++ b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk
@@ -22,16 +22,19 @@ $(eval $(call 
gb_CppunitTest_use_libraries,xmlsecurity_signing, \
sal \
sax \
sfx \
+   svx \
test \
tl \
unotest \
utl \
+   vcl \
xmlsecurity \
 ))
 
 $(eval $(call gb_CppunitTest_use_externals,xmlsecurity_signing,\
 boost_headers \
 libxml2 \
+$(if $(filter PDFIUM,$(BUILD_TYPE)),pdfium) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,xmlsecurity_signing,\
diff --git a/xmlsecurity/qa/unit/signing/data/add-visible-signature.pdf 
b/xmlsecurity/qa/unit/signing/data/add-visible-signature.pdf
new file mode 100644
index ..8dedb6998b23
Binary files /dev/null and 
b/xmlsecurity/qa/unit/signing/data/add-visible-signature.pdf differ
diff --git a/xmlsecurity/qa/unit/signing/signing.cxx 
b/xmlsecurity/qa/unit/signing/signing.cxx
index 637e5057bd05..4373a5a5bb26 100644
--- a/xmlsecurity/qa/unit/signing/signing.cxx
+++ b/xmlsecurity/qa/unit/signing/signing.cxx
@@ -26,6 +26,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include 
 #include 
@@ -50,6 +52,16 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
+
+#if HAVE_FEATURE_PDFIUM
+#include 
+#include 
+#include 
+#endif
 
 using namespace com::sun::star;
 
@@ -623,6 +635,70 @@ CPPUNIT_TEST_FIXTURE(SigningTest, testPDFNo)
  
static_cast(pObjectShell->GetDocumentSignatureState()));
 }
 
+#if HAVE_FEATURE_PDFIUM
+CPPUNIT_TEST_FIXTURE(SigningTest, testPDFAddVisibleSignature)
+{
+// Given: copy the test document to a temporary file, as it'll be modified.
+utl::TempFile aTempFile;
+aTempFile.EnableKillingFile();
+OUString aSourceURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + 
"add-visible-signature.pdf";
+OUString aURL = aTempFile.GetURL();
+osl::File::RC eRet = osl::File::copy(aSourceURL, aURL);
+CPPUNIT_ASSERT_EQUAL(osl::File::RC::E_None, eRet);
+
+// Open it.
+uno::Sequence aArgs = { 
comphelper::makePropertyValue("ReadOnly", true) };
+mxComponent = loadFromDesktop(aURL, 
"com.sun.star.drawing.DrawingDocument", aArgs);
+SfxBaseModel* pBaseModel = dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pBaseModel);
+SfxObjectShell* pObjectShell = pBaseModel->GetObjectShell();
+CPPUNIT_ASSERT(pObjectShell);
+
+// Add a signature line.
+uno::Reference xFactory(mxComponent, 
uno::UNO_QUERY);
+uno::Reference xShape(
+xFactory->createInstance("com.sun.star.drawing.GraphicObjectShape"), 
uno::UNO_QUERY);
+xShape->setPosition(awt::Point(1000, 15000));
+xShape->setSize(awt::Size(1, 1));
+uno::Reference xSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference xDrawPages = xSupplier->getDrawPages();
+uno::Reference xDrawPage(xDrawPages->getByIndex(0), 
uno::UNO_QUERY);
+xDrawPage->add(xShape);
+
+// Select it and assign a certificate.
+uno::Reference 
xSelectionSupplier(pBaseModel->getCurrentController(),
+
uno::UNO_QUERY);
+xSelectionSupplier->select(uno::makeAny(xShape));
+uno::Sequence> aCertificates
+= 
mxSecurityContext->getSecurityEnvironment()->getPersonalCertificates();
+if (!aCertificates.hasElements())
+{
+return;
+}
+SdrView* pView = SfxViewShell::Current()->GetDrawView();
+

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Stephan Bergmann (via logerrit)]

 RepositoryExternal.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 986a7625745241d8b2742b9bd15da553c9e6e54a
Author: Stephan Bergmann 
AuthorDate: Mon May 4 17:05:55 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Mon May 4 18:46:33 2020 +0200

Missing gengal vclplug dependencies for macOS and Windows

Building e.g. Gallery_backgrounds from scratch failed there with

  no suitable windowing system found, exiting.

Change-Id: Icf2dd26441554e573914f371d0d5eb21e99f5f0f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93429
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 9cba1af4cb40..ba6437276f28 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3882,6 +3882,8 @@ endef
 define gb_Executable__register_gengal
 $(call gb_Executable_add_runtime_dependencies,gengal,\
$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
+   $(if $(filter MACOSX,$(OS)),$(call gb_Library_get_target,vclplug_osx)) \
+   $(if $(filter WNT,$(OS)),$(call gb_Library_get_target,vclplug_win)) \
$(call gb_Package_get_target_for_build,postprocess_images) \
$(call gb_Package_get_target_for_build,postprocess_registry) \
$(INSTROOT_FOR_BUILD)/$(LIBO_URE_ETC_FOLDER)/$(call 
gb_Helper_get_rcfile,uno) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk slideshow/Library_OGLTrans.mk

[Caolán McNamara (via logerrit)]

 RepositoryExternal.mk |   11 ++-
 slideshow/Library_OGLTrans.mk |1 -
 2 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 2f86601db1ff8f198666a07f4b25d113760c879c
Author: Caolán McNamara 
AuthorDate: Thu Feb 6 16:45:18 2020 +
Commit: Caolán McNamara 
CommitDate: Thu Feb 6 21:04:40 2020 +0100

always define GLM_FORCE_CTOR_INIT when using glm

Change-Id: I2a4ed756c6d18937d2c720243652df7a2d629959
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88121
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 405ad054510e..1f36dda8f202 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -90,12 +90,21 @@ endif # SYSTEM_MDDS
 
 ifneq ($(SYSTEM_GLM),)
 
-gb_LinkTarget__use_glm_headers :=
+define gb_LinkTarget__use_glm_headers
+$(call gb_LinkTarget_add_defs,$(1),\
+-DGLM_FORCE_CTOR_INIT \
+)
+
+endef
+
 gb_ExternalProject__use_glm_headers :=
 
 else
 
 define gb_LinkTarget__use_glm_headers
+$(call gb_LinkTarget_add_defs,$(1),\
+-DGLM_FORCE_CTOR_INIT \
+)
 $(call gb_LinkTarget_use_unpacked,$(1),glm)
 $(call gb_LinkTarget_set_include,$(1),\
$(GLM_CFLAGS) \
diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk
index 9b64181d6a46..4eca2a1ecaa3 100644
--- a/slideshow/Library_OGLTrans.mk
+++ b/slideshow/Library_OGLTrans.mk
@@ -17,7 +17,6 @@ endif
 
 $(eval $(call gb_Library_add_defs,OGLTrans,\
 -DGLM_FORCE_RADIANS \
--DGLM_FORCE_CTOR_INIT \
 ))
 
 $(eval $(call gb_Library_use_sdk_api,OGLTrans))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Stephan Bergmann (via logerrit)]

 RepositoryExternal.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5447117899e688a6b0003ebbd256e92bcefd76c8
Author: Stephan Bergmann 
AuthorDate: Sat Oct 19 15:50:07 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Oct 22 22:44:05 2019 +0200

Missing test dependency

Noticed when executing CppunitTest_sccomp_solver that it apparently 
depended on
ExternalProject_lpsolve but not on ExternalPackage_lpsolve.
(LpSolverTest::testLpSolver in sccomp/qa/unit/solver.cxx instantiates UNO
service com.sun.star.comp.Calc.LpsolveSolver in Library_solver, which uses
lpsolve as an external.)

Thanks to mst for showing me the right place to fix.

Change-Id: I71a1c3552473ff6fea616805eea1fb68143d255b
Reviewed-on: https://gerrit.libreoffice.org/81133
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 5ce23a10c6db..8561ba84a0ea 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2470,7 +2470,7 @@ endef
 else # !SYSTEM_LPSOLVE
 
 define gb_LinkTarget__use_lpsolve
-$(call gb_LinkTarget_use_external_project,$(1),lpsolve)
+$(call gb_LinkTarget_use_package,$(1),lpsolve)
 ifeq ($(COM),MSC)
 $(call gb_LinkTarget_add_libs,$(1),\
$(call gb_UnpackedTarball_get_dir,lpsolve)/lpsolve55/lpsolve55.lib \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Michael Weghorn (via logerrit)]

 RepositoryExternal.mk |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 2d4bb24588dc872ba856dd4430541e0e0a641b7e
Author: Michael Weghorn 
AuthorDate: Mon Sep 30 15:08:30 2019 +
Commit: Michael Weghorn 
CommitDate: Tue Oct 1 07:44:10 2019 +0200

gbuild: treat $(DCONF_CFLAGS) as includes, not defines

Since that variable holds the relevant includes, using
'gb_LinkTarget_set_include' makes sure that those
flags end up in the correct section, e.g. when generating
IDE integration using 'gbuild-to-ide', and thus prevents
issues like that described in
4aa60490622cc10f8d3a31489c62a5622d240c83
("gbuild: treat $({QT,KF}5_CFLAGS) as cxxflags, not defines").

(Value of 'DCONF_CFLAGS' variable on Debian testing with
'libdconf-dev' 0.34.0-1 is:

DCONF_CFLAGS=-pthread -I/usr/include/dconf -I/usr/include/libmount
  -I/usr/include/blkid -I/usr/include/glib-2.0
  -I/usr/lib/x86_64-linux-gnu/glib-2.0/include
)

Change-Id: I74c5194d88838bffa2b8515372266336627f235c
Reviewed-on: https://gerrit.libreoffice.org/79874
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 4d99f79e86ec..5ce23a10c6db 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3589,7 +3589,11 @@ gb_LinkTarget__use_libgpg-error :=
 endif # ENABLE_GPGMEPP
 
 define gb_LinkTarget__use_dconf
-$(call gb_LinkTarget_add_defs,$(1),$(DCONF_CFLAGS))
+$(call gb_LinkTarget_set_include,$(1),\
+   $$(INCLUDE) \
+   $(DCONF_CFLAGS) \
+)
+
 $(call gb_LinkTarget_add_libs,$(1),$(DCONF_LIBS))
 endef
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Michael Weghorn (via logerrit)]

 RepositoryExternal.mk |   12 
 1 file changed, 12 deletions(-)

New commits:
commit 41a644dae966ecb958d1fe56cb14f3c091b0eceb
Author: Michael Weghorn 
AuthorDate: Wed Jun 12 17:17:07 2019 +0200
Commit: Michael Weghorn 
CommitDate: Thu Jun 13 07:31:15 2019 +0200

Drop '-Wno-shadow' previously set for qt5/kde5

The flag has been introduced with commit
9335945c7cb215f387ed1444e28533fac437c6e8 ("KF5 initial VCL plugin")
and was presumably just copy-pasted in commit
4d78cf97d7b1629556df68fc461922fda930d9ec.

The flag should no longer be necessary now; the only issue showing
up after removing the flag was fixed.

Change-Id: I65fe4d12bdf7d5888b75f8a5743bab6979a63295
Reviewed-on: https://gerrit.libreoffice.org/73892
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 6b0c69b3c804..922347228b81 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3092,12 +3092,6 @@ $(call gb_LinkTarget_add_libs,$(1),\
$(KF5_LIBS) \
 )
 
-ifeq ($(COM),GCC)
-$(call gb_LinkTarget_add_cxxflags,$(1),\
-   -Wno-shadow \
-)
-endif
-
 endef
 
 else # !ENABLE_KDE5
@@ -3126,12 +3120,6 @@ $(call gb_LinkTarget_add_libs,$(1),\
$(QT5_LIBS) \
 )
 
-ifeq ($(COM),GCC)
-$(call gb_LinkTarget_add_cxxflags,$(1),\
-   -Wno-shadow \
-)
-endif
-
 endef
 
 else # !ENABLE_QT5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk vcl/Executable_lo_kde5filepicker.mk vcl/Library_vclplug_gtk3_kde5.mk vcl/Library_vclplug_kde5.mk vcl/Library_vclplug_qt5.mk

[Michael Weghorn (via logerrit)]

 RepositoryExternal.mk   |2 +-
 vcl/Executable_lo_kde5filepicker.mk |8 +++-
 vcl/Library_vclplug_gtk3_kde5.mk|2 +-
 vcl/Library_vclplug_kde5.mk |4 ++--
 vcl/Library_vclplug_qt5.mk  |4 ++--
 5 files changed, 9 insertions(+), 11 deletions(-)

New commits:
commit 4aa60490622cc10f8d3a31489c62a5622d240c83
Author: Michael Weghorn 
AuthorDate: Sat Jun 8 13:45:36 2019 +0200
Commit: Michael Weghorn 
CommitDate: Sat Jun 8 17:12:55 2019 +0200

gbuild: treat $({QT,KF}5_CFLAGS) as cxxflags, not defines

Treat all of QT5_CFLAGS, QT5_GLIB_CFLAGS and KF5_CFLAGS as
C++ flags, since those contain C++ flags in the first place.
Therefore, set them using 'gb_Library_add_cxxflags',
not 'gb_Library_add_defs'.
(Strictly speaking, those variables contain includes as well,
but handling that properly would require splitting this
up further, either in 'configure.ac' or see e.g. how it's done
in 'RepositoryExternal.mk'.)

This also prevents the values of those variables from ending
up in the wrong section in IDE integration generated by
gbuild-to-ide.

Handling them as includes previously resulted e.g. in 'vcl/vcl.pro'
(generated by 'make qtcreator-ide-integration') containing

DEFINES += BOOST_ALL_NO_LIB \
... \
VCLPLUG_GTK3_KDE5_IMPLEMENTATION  -isystem /usr/include//KF5 -isystem 
/usr/include//KF5/KCoreAddons [...]

and Qt Creator would show a (rather unhelpful) warning like the
following when opening a header file inside 'vcl/inc/':

> Warning: The code model could not parse an included file,
> which might lead to incorrect code completion and highlighting,
> for, example.
>
> 4:9: error: macro name must be an identifier

Change-Id: I2bb0c37fdf1112650e8adc712f60737888a8169b
Reviewed-on: https://gerrit.libreoffice.org/73699
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index b039484338a8..6b0c69b3c804 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3084,7 +3084,7 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
 )
 
-$(call gb_LinkTarget_add_defs,$(1),\
+$(call gb_LinkTarget_add_cxxflags,$(1),\
$(filter-out -I% -isystem%,$(subst -isystem /,-isystem/,$(KF5_CFLAGS))) 
\
 )
 
diff --git a/vcl/Executable_lo_kde5filepicker.mk 
b/vcl/Executable_lo_kde5filepicker.mk
index f3e940953601..a34682966778 100644
--- a/vcl/Executable_lo_kde5filepicker.mk
+++ b/vcl/Executable_lo_kde5filepicker.mk
@@ -29,6 +29,9 @@ $(eval $(call gb_Executable_set_include,lo_kde5filepicker,\
 $(eval $(call gb_Executable_add_cxxflags,lo_kde5filepicker,\
 $$(INCLUDE) \
 $$(BOOST_CXXFLAGS) \
+$(QT5_CFLAGS) \
+$(QT5_GLIB_CFLAGS) \
+$(KF5_CFLAGS) \
 ))
 
 $(eval $(call gb_Executable_use_custom_headers,lo_kde5filepicker,\
@@ -69,11 +72,6 @@ $(eval $(call gb_Executable_use_externals,lo_kde5filepicker,\
dbus \
 ))
 
-$(eval $(call gb_Executable_add_defs,lo_kde5filepicker,\
-$(QT5_CFLAGS) \
-$(QT5_GLIB_CFLAGS) \
-$(KF5_CFLAGS) \
-))
 $(eval $(call gb_Executable_add_libs,lo_kde5filepicker,\
 $(QT5_LIBS) \
 $(QT5_GLIB_LIBS) \
diff --git a/vcl/Library_vclplug_gtk3_kde5.mk b/vcl/Library_vclplug_gtk3_kde5.mk
index 089d6ee31a1f..cfd370221dde 100644
--- a/vcl/Library_vclplug_gtk3_kde5.mk
+++ b/vcl/Library_vclplug_gtk3_kde5.mk
@@ -35,11 +35,11 @@ $(eval $(call gb_Library_set_include,vclplug_gtk3_kde5,\
 $(eval $(call gb_Library_add_cxxflags,vclplug_gtk3_kde5,\
 $$(INCLUDE) \
 $$(GTK3_CFLAGS) \
+$(KF5_CFLAGS) \
 ))
 
 $(eval $(call gb_Library_add_defs,vclplug_gtk3_kde5,\
 -DVCLPLUG_GTK_IMPLEMENTATION -DVCLPLUG_GTK3_KDE5_IMPLEMENTATION \
-$(KF5_CFLAGS) \
 ))
 
 $(eval $(call gb_Library_use_custom_headers,vclplug_gtk3_kde5,\
diff --git a/vcl/Library_vclplug_kde5.mk b/vcl/Library_vclplug_kde5.mk
index d097845bd5ce..181a318ab797 100644
--- a/vcl/Library_vclplug_kde5.mk
+++ b/vcl/Library_vclplug_kde5.mk
@@ -62,7 +62,7 @@ $(eval $(call gb_Library_use_externals,vclplug_kde5,\
 ))
 
 ifneq ($(QT5_HAVE_GLIB),)
-$(eval $(call gb_Library_add_defs,vclplug_kde5,\
+$(eval $(call gb_Library_add_cxxflags,vclplug_kde5,\
 $(QT5_GLIB_CFLAGS) \
 ))
 
@@ -71,7 +71,7 @@ $(eval $(call gb_Library_add_libs,vclplug_kde5,\
 ))
 endif
 
-$(eval $(call gb_Library_add_defs,vclplug_kde5,\
+$(eval $(call gb_Library_add_cxxflags,vclplug_kde5,\
 $(KF5_CFLAGS) \
 ))
 $(eval $(call gb_Library_add_libs,vclplug_kde5,\
diff --git a/vcl/Library_vclplug_qt5.mk b/vcl/Library_vclplug_qt5.mk
index 3231672c8743..543a4569ceb9 100644
--- a/vcl/Library_vclplug_qt5.mk
+++ b/vcl/Library_vclplug_qt5.mk
@@ -63,7 +63,7 @@ $(eval $(call gb_Library_use_externals,vclplug_qt5,\
 qt5 \
 ))
 
-$(eval $(call gb_Library_add_defs,vclplug_qt5,\
+$(eval $(call gb_Library_add_cxxflags,vclplug_qt5,\
 $(QT5_CFLAGS) \
 ))
 $(eval $(call 

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Libreoffice Gerrit user]

 RepositoryExternal.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2a81eee109f1bb55538e3897e382f738dab644d8
Author: Andrea Gelmini 
AuthorDate: Thu Dec 6 23:10:27 2018 +0100
Commit: Julien Nabet 
CommitDate: Sun Dec 9 09:26:08 2018 +0100

Fix typo in code

Change-Id: I766d68b8e79c500aedc1741dedf662663851ffc9
Reviewed-on: https://gerrit.libreoffice.org/64742
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 9312d0b7ab2a..f7ecf3c3c010 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3170,7 +3170,7 @@ ifneq ($(SYSTEM_PYTHON),)
 
 define gb_LinkTarget__use_python_headers
 $(call gb_LinkTarget_add_defs,$(1),\
-   $(filter-out -I% -isystem%,$(subst -isystem 
/,-isystem/,$(PYHTON_CFLAGS \
+   $(filter-out -I% -isystem%,$(subst -isystem 
/,-isystem/,$(PYTHON_CFLAGS \
 )
 
 $(call gb_LinkTarget_set_include,$(1),\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Libreoffice Gerrit user]

 RepositoryExternal.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0a5542438320ee81bbf285b11d0996796c8a9830
Author: Stephan Bergmann 
AuthorDate: Sat Sep 22 17:30:36 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Sat Sep 22 20:55:16 2018 +0200

external/harfbuzz's libharfbuzz.a links against icuuc library

buovjaga reported on IRC that his build (implicitly 
--without-system-harfbuzz
--without-system-icu) failed to link e.g. Library_vclplug_gtk3 due to 
harfbuzz
missing symbols from ICU, like

> /usr/bin/ld: 
/home/user/libreoffice/workdir/UnpackedTarball/harfbuzz/src/.libs/libharfbuzz.a(libharfbuzz_la-hb-icu.o):
 in function `hb_icu_unicode_decompose_compatibility(hb_unicode_funcs_t*, 
unsigned int, unsigned int*, void*)':
> 
/home/user/libreoffice/workdir/UnpackedTarball/harfbuzz/src/hb-icu.cc:334: 
undefined reference to `unorm2_getNFKDInstance_62'
[...]

It is not clear to me why Library_vclplug_gtk3 would actually use
libharfbuzz.a's hb_icu_unicode_decompose_compatibility (and for e.g. my 
builds,
it apparently doesn't), but in general libharfbuzz.a does depend on some 
symbols
from icuuc, so it is correct to add icuuc to the link when linking against
harfbuzz.  (And "gb_LinkTarget_use_external,...,icuuc" conveniently only 
adds
libs for linking, and does not add C/C++ include file paths, which would 
not be
wanted here.)

( "Revert 'Add more more 
dependencies
to VCL makefiles'" was a false start trying to address the above issue.)

Change-Id: Ic8bcfa2aab185f8a9487d7787b4f22068e7cb481
Reviewed-on: https://gerrit.libreoffice.org/60898
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas 
Reviewed-by: Stephan Bergmann 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f172765a84f8..9312d0b7ab2a 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1505,6 +1505,7 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),$(HARFBUZZ_LIBS))
+$(call gb_LinkTarget_use_external,$(1),icuuc)
 $(call gb_LinkTarget_use_external_project,$(1),harfbuzz)
 
 endef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Libreoffice Gerrit user]

 RepositoryExternal.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit 566050c5f3f3e54bfec115f9dba693404ca91770
Author: Christian Lohmaier 
AuthorDate: Wed Aug 22 00:47:13 2018 +0200
Commit: Christian Lohmaier 
CommitDate: Wed Aug 22 08:44:21 2018 +0200

tdf#118261 package libnumbertext data files into installation sets

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

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 54a71fb38ef4..788840851726 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -828,6 +828,10 @@ else # !SYSTEM_LIBNUMBERTEXT
 
 ifneq ($(ENABLE_LIBNUMBERTEXT),)
 
+$(eval $(call gb_Helper_register_packages_for_install,ooo, \
+   libnumbertext_numbertext \
+))
+
 define gb_LinkTarget__use_libnumbertext
 $(call gb_LinkTarget_use_package,$(1),libnumbertext_numbertext)
 $(call gb_LinkTarget_set_include,$(1),\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk svl/CppunitTest_svl_qa_cppunit.mk

[Mike Kaganski]

 RepositoryExternal.mk |2 +-
 svl/CppunitTest_svl_qa_cppunit.mk |8 
 2 files changed, 1 insertion(+), 9 deletions(-)

New commits:
commit 19c45de4cb41ac7519b601b29d58760a65de0adc
Author: Mike Kaganski 
Date:   Tue May 15 15:39:01 2018 +0100

Fix dependencies for CppunitTest_svl_qa_cppunit.mk

Change-Id: I391ea52f5137975073a674ac1ad380277fe99846
Reviewed-on: https://gerrit.libreoffice.org/54381
Reviewed-by: Michael Stahl 
Reviewed-by: Rene Engelhard 
Tested-by: Rene Engelhard 
Tested-by: Jenkins 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index ce29fb744cfe..92ab41cbdea1 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -829,7 +829,7 @@ else # !SYSTEM_LIBNUMBERTEXT
 ifneq ($(ENABLE_LIBNUMBERTEXT),)
 
 define gb_LinkTarget__use_libnumbertext
-
+$(call gb_LinkTarget_use_package,$(1),libnumbertext_numbertext)
 $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,libnumbertext/src) \
$$(INCLUDE) \
diff --git a/svl/CppunitTest_svl_qa_cppunit.mk 
b/svl/CppunitTest_svl_qa_cppunit.mk
index 4f3cdcae7b63..0cee925f85df 100644
--- a/svl/CppunitTest_svl_qa_cppunit.mk
+++ b/svl/CppunitTest_svl_qa_cppunit.mk
@@ -27,14 +27,6 @@ $(eval $(call gb_CppunitTest_use_externals,svl_qa_cppunit, \
icu_headers \
 ))
 
-ifeq ($(ENABLE_LIBNUMBERTEXT),TRUE)
-ifneq ($(SYSTEM_LIBNUMBERTEXT),YES)
-$(eval $(call gb_CppunitTest_use_package,svl_qa_cppunit, \
-libnumbertext_numbertext \
-))
-endif
-endif
-
 $(eval $(call gb_CppunitTest_add_defs,svl_qa_cppunit, \
 -DENABLE_LIBNUMBERTEXT=$(if $(filter TRUE,$(ENABLE_LIBNUMBERTEXT)),1,0) \
 ))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Stephan Bergmann]

 RepositoryExternal.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e046c36776503f2dc934891412a8019c62530e03
Author: Stephan Bergmann 
Date:   Fri May 4 10:21:23 2018 +0200

workdir/UnpackedTarball/libnumbertext/src/config.h is generated

...from workdir/UnpackedTarball/libnumbertext/src/config.h.in, and included 
via
lingucomponent/source/numbertext/numbertext.cxx ->
workdir/UnpackedTarball/libnumbertext/src/Numbertext.hxx

Change-Id: Idd007cf230b0c297c6dd692b1565336209a73ba8

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 299400174d2c..ce29fb744cfe 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -847,7 +847,7 @@ else
 $(call gb_LinkTarget_add_libs,$(1),\
$(call 
gb_UnpackedTarball_get_dir,libnumbertext)/src/.libs/libnumbertext-1.0.a\
 )
-$(call gb_LinkTarget_use_external_project,$(1),libnumbertext)
+$(call gb_LinkTarget_use_external_project,$(1),libnumbertext,full)
 
 endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Stephan Bergmann]

 RepositoryExternal.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit b4429d5b8d7f871ede5ca1608f73d7ecda8ec1f2
Author: Stephan Bergmann 
Date:   Thu Mar 8 08:48:08 2018 +0100

Probably better to comment on these dependencies

...added with f23651ff10da2d4bbbc47d0152b5cc321c29f0d1 "Missing 
dependencies"

Change-Id: I4cd02fc8b242b3a3737305546bf3155425614d65

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index eb91d14c3152..0fa3524a582a 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3927,6 +3927,9 @@ $(call gb_Executable_add_runtime_dependencies,saxparser,\
 )
 endef
 
+# Executable_svidl links against Library_tl, which links against 
Library_comphelper, which links
+# against libraries from ExternalProject_gpgmepp, which links against 
libraries from
+# ExternalProject_libassuan and ExternalProject_libgpg-error:
 define gb_Executable__register_svidl
 $(call gb_Executable_add_runtime_dependencies,svidl, \
 $(call gb_Helper_optional,GPGMEPP, \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Stephan Bergmann]

 RepositoryExternal.mk |8 
 1 file changed, 8 insertions(+)

New commits:
commit f23651ff10da2d4bbbc47d0152b5cc321c29f0d1
Author: Stephan Bergmann 
Date:   Wed Mar 7 21:13:36 2018 +0100

Missing dependencies

Change-Id: Iabdc81c9df2cc50ec4f4713af42d2fb9c3cc1f43
Reviewed-on: https://gerrit.libreoffice.org/50915
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index aecbd71b8b43..eb91d14c3152 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3927,6 +3927,14 @@ $(call gb_Executable_add_runtime_dependencies,saxparser,\
 )
 endef
 
+define gb_Executable__register_svidl
+$(call gb_Executable_add_runtime_dependencies,svidl, \
+$(call gb_Helper_optional,GPGMEPP, \
+$(call gb_Helper_optional,LIBASSUAN,$(call 
gb_Package_get_target_for_build,libassuan)) \
+$(call gb_Helper_optional,LIBGPGERROR,$(call 
gb_Package_get_target_for_build,libgpg-error))) \
+)
+endef
+
 # NOTE: the dependencies on ure/services.rdb and udkapi.rdb are implicitly
 # required due to the settings for URE_SERVICES and URE_TYPES in
 # cppuhelper/source/unorc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk xmlsecurity/Library_xsec_xmlsec.mk

[David Tardon]

 RepositoryExternal.mk  |   14 ++
 xmlsecurity/Library_xsec_xmlsec.mk |6 +-
 2 files changed, 15 insertions(+), 5 deletions(-)

New commits:
commit 7c77ff5dd2d0573a56f8b59dc9113c23e0ea29c9
Author: David Tardon 
Date:   Fri Nov 24 10:44:42 2017 +0100

move conditional stuff to RepositoryExternal.mk

Change-Id: I33e299277c53e8e2b8ab7e4cdf52d2487f90b51b
Reviewed-on: https://gerrit.libreoffice.org/45211
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index bb3c9b6895e0..bdc5d65a2d81 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3451,6 +3451,8 @@ endef
 
 endif # ENABLE_BREAKPAD
 
+ifeq ($(ENABLE_GPGMEPP),TRUE)
+
 ifneq ($(SYSTEM_GPGMEPP),)
 
 gb_ExternalProject__use_gpgmepp:=
@@ -3567,6 +3569,18 @@ endif
 
 endif
 
+else # !ENABLE_GPGMEPP
+
+gb_ExternalProject__use_gpgmepp :=
+gb_ExternalProject__use_libassuan :=
+gb_ExternalProject__use_libgpg-error :=
+
+gb_LinkTarget__use_gpgmepp :=
+gb_LinkTarget__use_libassuan :=
+gb_LinkTarget__use_libgpg-error :=
+
+endif # ENABLE_GPGMEPP
+
 define gb_LinkTarget__use_dconf
 $(call gb_LinkTarget_add_defs,$(1),$(DCONF_CFLAGS))
 $(call gb_LinkTarget_add_libs,$(1),$(DCONF_LIBS))
diff --git a/xmlsecurity/Library_xsec_xmlsec.mk 
b/xmlsecurity/Library_xsec_xmlsec.mk
index ee2f9da7bb1b..1ef27dbc6602 100644
--- a/xmlsecurity/Library_xsec_xmlsec.mk
+++ b/xmlsecurity/Library_xsec_xmlsec.mk
@@ -55,14 +55,10 @@ endif
 
 $(eval $(call gb_Library_use_externals,xsec_xmlsec,\
boost_headers \
+   gpgmepp \
libxml2 \
xmlsec \
 ))
-ifeq ($(ENABLE_GPGMEPP),TRUE)
-$(eval $(call gb_Library_use_externals,xsec_xmlsec,\
-   gpgmepp \
-))
-endif
 
 $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\
xmlsecurity/source/xmlsec/biginteger \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Thorsten Behrens]

 RepositoryExternal.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a27f26228c8311b3b01ecca81d6cdcd3ceb644e1
Author: Thorsten Behrens 
Date:   Thu Nov 23 18:06:59 2017 +0100

fix build: use same conditional as in configure

Change-Id: I2383baaafbb5f79e1469a6296f3d65f1eadfa5eb

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index cad1db6ddc7c..4fba2a4c00e5 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3469,7 +3469,7 @@ $(call gb_LinkTarget_add_libs,$(1),\
 
 endef
 
-else # NON-SYSTEM_GPGME
+else ifneq ($(filter GPGMEPP,$(BUILD_TYPE)),) # NON-SYSTEM_GPGME
 
 define gb_ExternalProject__use_gpgmepp
 $(call gb_ExternalProject_use_external_project,$(1),gpgmepp)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Thorsten Behrens]

 RepositoryExternal.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit db2111d207770c7a15e9535dfd7d8ec012125d19
Author: Thorsten Behrens 
Date:   Thu Nov 23 10:02:09 2017 +0100

gpg4libre: package gpgme spawn helper for Windows

Change-Id: If8dbe10b87d329fab3639392f6c352bce75c54c1
Reviewed-on: https://gerrit.libreoffice.org/45127
Reviewed-by: Siegmund Gorr 
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 995a490214ec..cad1db6ddc7c 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3534,6 +3534,10 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
gpgmepp \
 ))
 
+$(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
+   gpgmepp-w32spawn \
+))
+
 endif
 
 ifneq ($(filter MACOSX LINUX,$(OS)),)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Thorsten Behrens]

 RepositoryExternal.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit a4034d56813b6716ae93d455204079cdd2ff9f6f
Author: Thorsten Behrens 
Date:   Sun Mar 26 05:57:10 2017 +0200

Package gpgme only for Linux currently

Change-Id: Ie7323c59f0183c8e132127694e9e865de494c7a3

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index ed00ea4a9dac..c7671a336466 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3412,6 +3412,8 @@ $(call gb_LinkTarget_use_package,$(1),gpgme)
 
 endef
 
+ifeq ($(OS),LINUX)
+
 $(eval $(call gb_Helper_register_packages_for_install,ooo,\
gpgme \
libassuan \
@@ -3420,6 +3422,8 @@ $(eval $(call 
gb_Helper_register_packages_for_install,ooo,\
 
 endif
 
+endif
+
 ifeq ($(ENABLE_GLTF),TRUE)
 
 ifneq ($(SYSTEM_LIBGLTF),TRUE)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk solenv/bin

[Thorsten Behrens]

 RepositoryExternal.mk   |2 +-
 solenv/bin/modules/installer/control.pm |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8724bcff1e4c9e666125927659db747b483401c3
Author: Thorsten Behrens 
Date:   Sun Mar 26 04:01:02 2017 +0200

Fix gpgme packaging

Change-Id: I26ef55b8a7a210f9d86becd4f0aa10c2598681fd

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 75897bc7799e..ed00ea4a9dac 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3413,7 +3413,7 @@ $(call gb_LinkTarget_use_package,$(1),gpgme)
 endef
 
 $(eval $(call gb_Helper_register_packages_for_install,ooo,\
-   gpgmepp \
+   gpgme \
libassuan \
libgpg-error \
 ))
diff --git a/solenv/bin/modules/installer/control.pm 
b/solenv/bin/modules/installer/control.pm
index 7670535715ea..decf519eb881 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -325,7 +325,7 @@ sub check_logfile
 $compareline =~ s/Error\.html//g;   # removing all occurrences of 
"Error.html"
 $compareline =~ s/error\.py//g; # removing all occurrences of 
"error.py"
 $compareline =~ s/error\.cpython\-3.(\.opt\-.|)\.py[co]//g;  # 
removing all occurrences of "error-cpython"
-$compareline =~ s/libgpg-error-0.dll//g;
+$compareline =~ s/libgpg-error//g;
 $compareline =~ s/Error-xref\.html//g;
 
 if ( $compareline =~ /\bError\b/i )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Thorsten Behrens]

 RepositoryExternal.mk |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit cc71c6adfd811e50d2dc92ee60eae2c709019574
Author: Thorsten Behrens 
Date:   Sat Mar 25 01:28:07 2017 +0100

gpg4libre: actually package the gpgme libs

Change-Id: Ibcfc7946210d64450e8d0ce3b53461c6270cc473
Reviewed-on: https://gerrit.libreoffice.org/35674
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 57b9a217dd6e..75897bc7799e 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3412,6 +3412,12 @@ $(call gb_LinkTarget_use_package,$(1),gpgme)
 
 endef
 
+$(eval $(call gb_Helper_register_packages_for_install,ooo,\
+   gpgmepp \
+   libassuan \
+   libgpg-error \
+))
+
 endif
 
 ifeq ($(ENABLE_GLTF),TRUE)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk xmlsecurity/Executable_pdfverify.mk

[Michael Stahl]

 RepositoryExternal.mk   |2 +-
 xmlsecurity/Executable_pdfverify.mk |   12 
 2 files changed, 1 insertion(+), 13 deletions(-)

New commits:
commit ee9cb85e9adc03693141a106630a4f278b4e93ac
Author: Michael Stahl 
Date:   Fri Mar 10 17:11:49 2017 +0100

gpgme: change gb_LinkTarget__use_gpgmepp to depend on package

This replaces f764d67da42caa71fd5e02146b1ca32680ae2f6e with a better
fix, no point in littering the makefiles with manual dependencies when
we can just avoid the problem in one place with a tiny performance cost.

Change-Id: Ic7e91ee4c99deb12a9544cf691c0995de6ae2bad

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 00cae64..284fe0a 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3427,7 +3427,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 $(call gb_LinkTarget_add_libs,$(1),\
-L$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src/.libs/ 
-lgpgmepp \
 )
-$(call gb_LinkTarget_use_external_project,$(1),gpgme,full)
+$(call gb_LinkTarget_use_package,$(1),gpgme)
 
 endef
 
diff --git a/xmlsecurity/Executable_pdfverify.mk 
b/xmlsecurity/Executable_pdfverify.mk
index 9364e39..9a67a78 100644
--- a/xmlsecurity/Executable_pdfverify.mk
+++ b/xmlsecurity/Executable_pdfverify.mk
@@ -34,16 +34,4 @@ $(eval $(call gb_Executable_add_exception_objects,pdfverify,\
 xmlsecurity/workben/pdfverify \
 ))
 
-# Library_xmlsecurity links against Library_xsec_gpg (on certain OS), which
-# links against gpgmepp dynamic library from external project gpgmepp, which
-# (for non-SYSTEM_GPGMEPP) is delivered to instdir/program in
-# ExternalPackage_gpgme, and at least the Linux linker wants to see all
-# (recursively) linked libraries when linking an executable:
-ifneq ($(filter-out WNT MACOSX ANDROID IOS,$(OS)),)
-ifneq ($(SYSTEM_GPGMEPP),TRUE)
-$(call gb_Executable_get_target,pdfverify): \
-$(call gb_ExternalPackage_get_target,gpgme)
-endif
-endif
-
 # vim:set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Michael Stahl]

 RepositoryExternal.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3e23beda17b12e35da3be3ca65f0c3d41c60d79d
Author: Michael Stahl 
Date:   Thu Mar 9 22:07:12 2017 +0100

RepositoryExternal: fix MSVC 2017 python3 library directory

Change-Id: I74514993ca1cbeb1a7e7bf1ba121b28ce9dab2f3

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e97e14e..00cae64 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3075,7 +3075,7 @@ endif
 
 ifeq ($(OS),WNT)
 $(call gb_LinkTarget_add_libs,$(1),\
-   $(call gb_UnpackedTarball_get_dir,python3)/PCbuild$(if $(filter 
X86_64,$(CPUNAME)),/amd64)$(if $(filter 
140-INTEL,$(VCVER)-$(CPUNAME)),/win32)/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if
 $(MSVC_USE_DEBUG_RUNTIME),_d).lib \
+   $(call gb_UnpackedTarball_get_dir,python3)/PCbuild$(if $(filter 
X86_64,$(CPUNAME)),/amd64)$(if $(filter 
INTEL,$(CPUNAME)),/win32)/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if
 $(MSVC_USE_DEBUG_RUNTIME),_d).lib \
 )
 else ifeq ($(OS),MACOSX)
 $(call gb_LinkTarget_add_libs,$(1),\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Rene Engelhard]

 RepositoryExternal.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit f05d8e3fa3c05f565dae9aef292d9c736771f357
Author: Rene Engelhard 
Date:   Mon Mar 6 18:49:00 2017 +0100

don't try to install pdfium lib in --disable-pdfium

Change-Id: I77f2ab2b627ceee2d6b0d44e530b4ac691510bf3

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f34fc04..e97e14e 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -4065,6 +4065,7 @@ $(call gb_LinkTarget_set_include,$(1), \
 $(call gb_LinkTarget_use_libraries,$(1),clew)
 endef
 
+ifneq ($(ENABLE_PDFIUM),)
 define gb_LinkTarget__use_pdfium
 $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,pdfium)/public \
@@ -4075,5 +4076,6 @@ endef
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo,\
pdfium \
 ))
+endif
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Stephan Bergmann]

 RepositoryExternal.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4149a30e7bce6e34d80beb17053453156ed1c243
Author: Stephan Bergmann 
Date:   Sun Mar 5 12:02:58 2017 +0100

workdir/UnpackedTarball/gpgme/src/gpgme.h is generated

...from workdir/UnpackedTarball/gpgme/src/gpgme.h.in

Change-Id: I1fc1871f9fa1da14f209b3b2902eb2be3a680d56

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 0e1e6a6..f34fc04 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3427,7 +3427,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 $(call gb_LinkTarget_add_libs,$(1),\
-L$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src/.libs/ 
-lgpgmepp \
 )
-$(call gb_LinkTarget_use_external_project,$(1),gpgme)
+$(call gb_LinkTarget_use_external_project,$(1),gpgme,full)
 
 endef
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Samuel Mehrbrodt]

 RepositoryExternal.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 65866961cf0893c92ad5d8a960e29fd2c559c52c
Author: Samuel Mehrbrodt 
Date:   Fri Feb 24 16:54:36 2017 +0100

gpg4libre: Add libgpg-error to include path

Change-Id: I7e87b2ecc107c91f9fcb9f385a8cace65776fc25
Reviewed-on: https://gerrit.libreoffice.org/34622
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 650c1b7..0e1e6a6 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3421,6 +3421,7 @@ define gb_LinkTarget__use_gpgmepp
 $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src \
-I$(call gb_UnpackedTarball_get_dir,gpgme)/src \
+   $$(GPG_ERROR_CFLAGS) \
$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Katarina Behrens]

 RepositoryExternal.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6017732e0bc2be82e6a2be3bfd0b090b7904e29a
Author: Katarina Behrens 
Date:   Fri Feb 24 13:47:46 2017 +0100

gpg4libre: include also plain C headers from internal gpgme

Change-Id: Iddae7a3e664273b53a49450527f55814a9ef6f55
Reviewed-on: https://gerrit.libreoffice.org/34610
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 258e0b6..429e3c3 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3427,6 +3427,7 @@ endef
 define gb_LinkTarget__use_gpgmepp
 $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src \
+   -I$(call gb_UnpackedTarball_get_dir,gpgme)/src \
$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Katarina Behrens]

 RepositoryExternal.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 684b9de16f41ca7662ed0d848fd63c3c5661d671
Author: Katarina Behrens 
Date:   Thu Feb 16 21:44:06 2017 +0100

gpg4libre: Fix linking against internal gpgmepp

including headers still broken

Change-Id: Id631c978d820046db880ff8035158200dcb8951b
Reviewed-on: https://gerrit.libreoffice.org/34343
Reviewed-by: Katarina Behrens 
Tested-by: Katarina Behrens 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 0d387f2..da85d05 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3430,7 +3430,7 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
-   $(call 
gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src/.libs/libgpgmepp$(gb_StaticLibrary_PLAINEXT)
  \
+   -L$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src/.libs/ 
-lgpgmepp \
 )
 $(call gb_LinkTarget_use_external_project,$(1),gpgme)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Katarina Behrens]

 RepositoryExternal.mk |   14 ++
 1 file changed, 14 insertions(+)

New commits:
commit 55519a18be63be5a6ce955784f0d326fc6cabf9d
Author: Katarina Behrens 
Date:   Wed Feb 15 16:00:16 2017 +0100

gpg4libre: gbuild funcs for building with internal gpgme(pp)

Change-Id: I12b57b8925c263ec904549ea38a2c581f20b9d14
Reviewed-on: https://gerrit.libreoffice.org/34301
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 3871080..d1b2416 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3405,6 +3405,20 @@ $(call gb_LinkTarget_add_libs,$(1),\
 
 endef
 
+else # NON-SYSTEM_GPGME
+
+define gb_LinkTarget__use_gpgme
+$(call gb_LinkTarget_set_include,$(1),\
+   -I$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src \
+   $$(INCLUDE) \
+)
+$(call gb_LinkTarget_add_libs,$(1),\
+   $(call 
gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src/.libs/libgpgmepp$(gb_StaticLibrary_PLAINEXT)
  \
+)
+$(call gb_LinkTarget_use_external_project,$(1),gpgme)
+
+endef
+
 endif
 
 ifeq ($(ENABLE_GLTF),TRUE)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Caolán McNamara]

 RepositoryExternal.mk |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 1ad871ce0d4f2809161c8450e53c6598f449de95
Author: Caolán McNamara 
Date:   Tue Dec 20 11:37:13 2016 +

link to our own static fontconfig and freetype when we build them

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

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 49d0c91..f4732df 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1287,7 +1287,10 @@ endef
 
 define gb_LinkTarget__use_freetype
 $(call gb_LinkTarget_use_external,$(1),freetype_headers)
-$(call gb_LinkTarget_add_libs,$(1),-lfreetype)
+
+$(call gb_LinkTarget_add_libs,$(1),\
+-L$(call gb_UnpackedTarball_get_dir,freetype)/instdir/lib -lfreetype \
+)
 
 endef
 
@@ -1319,7 +1322,9 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
 )
 
-$(call gb_LinkTarget_add_libs,$(1),-lfontconfig)
+$(call gb_LinkTarget_add_libs,$(1),\
+-L$(call gb_UnpackedTarball_get_dir,fontconfig)/src/.libs -lfontconfig \
+)
 
 endef
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Caolán McNamara]

 RepositoryExternal.mk |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 87114367d74526e738f8726e2567be5a0cf085d1
Author: Caolán McNamara 
Date:   Mon Dec 19 21:17:48 2016 +

some raptor tweaks for --disable-dynload

Change-Id: I63229ea57acc36b377f430d2305530cfe5617a35
Reviewed-on: https://gerrit.libreoffice.org/32203
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 4b21b93..49d0c91 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1172,11 +1172,12 @@ $(call gb_LinkTarget_use_libraries,$(1),\
rdf \
 )
 else
-$(call gb_LinkTarget_use_packages,$(1),raptor rasqal redland)
+$(call gb_LinkTarget_use_packages,$(1),redland raptor rasqal)
 
 $(call gb_LinkTarget_add_libs,$(1),\
-   -L$(call gb_UnpackedTarball_get_dir,raptor)/src/.libs -lraptor2 \
-L$(call gb_UnpackedTarball_get_dir,redland)/src/.libs -lrdf \
+   -L$(call gb_UnpackedTarball_get_dir,raptor)/src/.libs -lraptor2 \
+   -L$(call gb_UnpackedTarball_get_dir,rasqal)/src/.libs -lrasqal \
 )
 endif
 
@@ -1185,7 +1186,7 @@ endef
 else # ANDROID
 
 define gb_LinkTarget__use_librdf
-$(call gb_LinkTarget_use_packages,$(1),raptor rasqal redland)
+$(call gb_LinkTarget_use_packages,$(1),redland raptor rasqal)
 
 endef
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk sal/Library_sal.mk sal/Module_sal.mk

[Caolán McNamara]

 RepositoryExternal.mk |4 ++--
 sal/Library_sal.mk|   12 ++--
 sal/Module_sal.mk |3 +--
 3 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit 002a83fca94dd34cc30a58162c3316e371478308
Author: Caolán McNamara 
Date:   Thu Dec 15 10:15:59 2016 +

this textenc hack is for android and disable-dynamic-loading

Change-Id: If2191161e82fc1e05b1442ae4b3b729cc1b8994d
Reviewed-on: https://gerrit.libreoffice.org/32038
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 3d5c5aa..4b21b93 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3742,7 +3742,7 @@ endif # SYSTEM_JFREEREPORT
 # FIXME: the library target should be for build too
 define gb_Executable__register_bestreversemap
 $(call gb_Executable_add_runtime_dependencies,bestreversemap,\
-   $(if $(filter-out ANDROID,$(OS)),$(call 
gb_Library_get_target,sal_textenc)) \
+   $(if $(filter $(OS),ANDROID),,$(if $(filter 
TRUE,$(DISABLE_DYNLOADING)),,$(call gb_Library_get_target,sal_textenc))) \
 )
 endef
 
@@ -3760,7 +3760,7 @@ endef
 
 define gb_Executable__register_cppumaker
 $(call gb_Executable_add_runtime_dependencies,cppumaker,\
-   $(if $(filter-out ANDROID,$(OS)),$(call 
gb_Library_get_target,sal_textenc)) \
+   $(if $(filter $(OS),ANDROID),,$(if $(filter 
TRUE,$(DISABLE_DYNLOADING)),,$(call gb_Library_get_target,sal_textenc))) \
 )
 endef
 
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 868dea4..4bf9021 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -126,8 +126,7 @@ $(eval $(call gb_Library_add_cxxflags,sal,\
 ))
 endif
 
-ifeq ($(OS),ANDROID)
-$(eval $(call gb_Library_add_exception_objects,sal,\
+sal_textenc_code= \
sal/textenc/context \
sal/textenc/convertbig5hkscs \
sal/textenc/converteuctw \
@@ -141,6 +140,15 @@ $(eval $(call gb_Library_add_exception_objects,sal,\
sal/textenc/tcvtbyte \
sal/textenc/tcvtmb \
sal/textenc/tcvtutf7 \
+
+ifeq ($(OS),ANDROID)
+$(eval $(call gb_Library_add_exception_objects,sal,\
+$(sal_textenc_code) \
+))
+else ifeq ($(DISABLE_DYNLOADING),TRUE)
+
+$(eval $(call gb_Library_add_exception_objects,sal,\
+$(sal_textenc_code) \
 ))
 endif
 
diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
index 46ca260..668ee20 100644
--- a/sal/Module_sal.mk
+++ b/sal/Module_sal.mk
@@ -14,8 +14,7 @@ $(eval $(call gb_Module_add_targets,sal,\
$(if $(filter $(OS),ANDROID), \
Library_lo-bootstrap) \
Library_sal \
-   $(if $(filter $(OS),ANDROID),, \
-   Library_sal_textenc) \
+   $(if $(filter $(OS),ANDROID),,$(if $(filter 
TRUE,$(DISABLE_DYNLOADING)),,Library_sal_textenc)) \
$(if $(filter $(OS),WNT), \
Library_uwinapi) \
 ))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Michael Stahl]

 RepositoryExternal.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f4732872aaba09c3d5b7cebb9af6bc7b7be534d4
Author: Michael Stahl 
Date:   Fri Dec 9 17:23:11 2016 +0100

fix lpsolve dependency

It currently only requires unpacking the tarball so linking can fail
with "cannot open input file ... lpsolve55.lib"

Change-Id: I6ab99d7ecfd08b1b934f5c189d8fe74b7ee517e5
Reviewed-on: https://gerrit.libreoffice.org/31805
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 
Reviewed-by: Thorsten Behrens 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f024f05..fd6f4c8 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2377,7 +2377,7 @@ endef
 else # !SYSTEM_LPSOLVE
 
 define gb_LinkTarget__use_lpsolve
-$(call gb_LinkTarget_use_unpacked,$(1),lpsolve)
+$(call gb_LinkTarget_use_external_project,$(1),lpsolve)
 ifeq ($(COM),MSC)
 $(call gb_LinkTarget_add_libs,$(1),\
$(call gb_UnpackedTarball_get_dir,lpsolve)/lpsolve55/lpsolve55.lib \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Michael Stahl]

 RepositoryExternal.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 43532a0944b0ee4727ea2ae480e54687e41d9201
Author: Michael Stahl 
Date:   Thu Nov 3 15:58:08 2016 +0100

RepositoryExternal.mk: fix poppler linking on Ubuntu

need to link poppler static library *before* jpeg

Change-Id: I0fd2abc12c93432715a02a3a567349abda4f990b

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index b3fbeba..e4f592d 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2771,7 +2771,6 @@ endef
 else # !SYSTEM_POPPLER
 
 define gb_LinkTarget__use_poppler
-$(call gb_LinkTarget_use_external,$(1),jpeg)
 $(call gb_LinkTarget_use_external_project,$(1),poppler,full)
 
 $(call gb_LinkTarget_set_include,$(1),\
@@ -2787,6 +2786,8 @@ $(call gb_LinkTarget_add_libs,$(1),\
$(call 
gb_UnpackedTarball_get_dir,poppler)/poppler/.libs/libpoppler$(gb_StaticLibrary_PLAINEXT)
 \
 )
 
+$(call gb_LinkTarget_use_external,$(1),jpeg)
+
 ifeq ($(OS),MACOSX)
 $(call gb_LinkTarget_add_libs,$(1),\
-lobjc \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Michael Stahl]

 RepositoryExternal.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8d1c80e2633b8a63050cdd81b7e089f27b996c0f
Author: Michael Stahl 
Date:   Thu Nov 3 13:23:45 2016 +0100

RepositoryExternal.mk: really fix jpeg build

Change-Id: I1969db554d156e6af0975d03013ea4f7c10d839f

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 5dbde22..f93c819 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -459,12 +459,12 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
 )
 
-endef
-
 $(call gb_LinkTarget_use_static_libraries,$(1),\
jpeg \
 )
 
+endef
+
 define gb_ExternalProject__use_jpeg
 $(call gb_ExternalProject_use_static_libraries,$(1),jpeg)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Jan-Marek Glogowski]

 RepositoryExternal.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f144d319d58cbb0d358250540cd666d9644f5fa5
Author: Jan-Marek Glogowski 
Date:   Thu Nov 3 13:14:42 2016 +0100

Fix external libjpeg build

Change-Id: I952dd39559cff18dc7850b62915405954eac2fd7

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 1f891d5..5dbde22 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -459,6 +459,8 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
 )
 
+endef
+
 $(call gb_LinkTarget_use_static_libraries,$(1),\
jpeg \
 )
@@ -468,8 +470,6 @@ $(call gb_ExternalProject_use_static_libraries,$(1),jpeg)
 
 endef
 
-endef
-
 endif # SYSTEM_JPEG
 
 ifneq ($(SYSTEM_MYTHES),)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Michael Stahl]

 RepositoryExternal.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit bc3f952e66fe0a44044b4b101be3e96e20a670e6
Author: Michael Stahl 
Date:   Thu Oct 27 22:24:13 2016 +0200

avoid odd make warning on WNT

Library_vcl.mk:753: extraneous text after 'endif' directive

Change-Id: Iec487705b762880dd463acaba2d3590ff2587562

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e127aa2..93a5459 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -262,6 +262,7 @@ $(call gb_LinkTarget_add_libs,$(1),\
-L$(call gb_UnpackedTarball_get_dir,glyphy)/src/.libs -lglyphy \
 )
 endif
+
 endef
 
 endif # SYSTEM_GLYPHY
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Stephan Bergmann]

 RepositoryExternal.mk |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit f51656c5b29ee317daa92aa9937fc65b66ab3e83
Author: Stephan Bergmann 
Date:   Tue May 31 13:32:15 2016 +0200

Reuse BOOST_CPPFLAGS computed by configure.ac

Change-Id: I58cba84030f6a7872f912e0136dfb8d3970ac890

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 938bfc0..563c0d4 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -715,8 +715,7 @@ endef
 define gb_LinkTarget__use_boost_headers
 $(call gb_LinkTarget_use_unpacked,$(1),boost)
 $(call gb_LinkTarget_set_include,$(1),\
-   $(if $(or $(COM_IS_CLANG),$(filter 
GCC,$(COM))),-I$(SRCDIR)/external/boost/include) \
-   -I$(call gb_UnpackedTarball_get_dir,boost) \
+   $(BOOST_CPPFLAGS) \
$$(INCLUDE) \
 )
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Julien Nabet]

 RepositoryExternal.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3ee2edf47a148e14937d8964847dfb46f027ce05
Author: Julien Nabet 
Date:   Sat May 7 22:43:37 2016 +0200

Typo: SYSTEN_LIBGLTF->SYSTEM_LIBGLTF

Change-Id: Idf81e7b6d3629ae1170d52ca23dbab4db63eebae
Reviewed-on: https://gerrit.libreoffice.org/24733
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 713994e..8d03be3 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3383,7 +3383,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(LIBGLTF_LIBS))
 
 endef
 
-endif # SYSTEN_LIBGLTF
+endif # SYSTEM_LIBGLTF
 
 ifeq ($(ENABLE_COLLADA),TRUE)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Michael Stahl]

 RepositoryExternal.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1fe53fe514dac2445197a663025ccb35ddd6b794
Author: Michael Stahl 
Date:   Wed Mar 30 12:24:02 2016 +0200

RepositoryExternal: fix confusing condition

This looks like it does XOR but vmiklos says it should do OR.

Change-Id: I11cee255fb243d0cd763e97d13da1e31a8e598e9

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index af22fe2..3582790 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -183,7 +183,7 @@ endef
 
 endif # SYSTEM_CPPUNIT
 
-ifeq ($(ENABLE_OPENGL)$(if $(filter ANDROID,$(OS)),TRUE),TRUE)
+ifneq ($(ENABLE_OPENGL)$(if $(filter ANDROID,$(OS)),TRUE),)
 ifneq ($(SYSTEM_GLEW),)
 
 define gb_LinkTarget__use_glew
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Michael Stahl]

 RepositoryExternal.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c7ca0718f721c6551ebf5514c58a2f517ee2c6e8
Author: Michael Stahl 
Date:   Mon Mar 7 21:18:23 2016 +0100

RepositoryExternal: missing dependency in openssl_headers

Change-Id: I4a9f6c07204f2784ac6cac28bed9dfa700950c09

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index ef79b1d..5b497ee 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1578,6 +1578,7 @@ $(call gb_ExternalProject_use_package,$(1),openssl)
 endef
 
 define gb_LinkTarget__use_openssl_headers
+$(call gb_LinkTarget_use_external_project,$(1),openssl)
 $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,openssl)/include \
$$(INCLUDE) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[David Ostrovsky]

 RepositoryExternal.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e04c734f56d7e4a16a2dd1b64a51cecbdf6796cf
Author: David Ostrovsky 
Date:   Sat Feb 27 14:14:12 2016 +0100

MSVC 14.0: Second attempt to fix Python in 32bit build mode

Change-Id: I709fda2e6df5048bdbf9157518d6b7b98ff45515
Reviewed-on: https://gerrit.libreoffice.org/22730
Reviewed-by: David Ostrovsky 
Tested-by: David Ostrovsky 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 39b740b..8e91812 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3046,7 +3046,7 @@ endif
 
 ifeq ($(OS),WNT)
 $(call gb_LinkTarget_add_libs,$(1),\
-   $(call gb_UnpackedTarball_get_dir,python3)/PCbuild$(if $(filter 
X86_64,$(CPUNAME)),/amd64)/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if
 $(MSVC_USE_DEBUG_RUNTIME),_d).lib \
+   $(call gb_UnpackedTarball_get_dir,python3)/PCbuild$(if $(filter 
X86_64,$(CPUNAME)),/amd64)$(if $(filter 
140-INTEL,$(VCVER)-$(CPUNAME)),/win32)/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if
 $(MSVC_USE_DEBUG_RUNTIME),_d).lib \
 )
 else ifeq ($(OS),MACOSX)
 $(call gb_LinkTarget_add_libs,$(1),\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Stephan Bergmann]

 RepositoryExternal.mk |6 --
 1 file changed, 6 deletions(-)

New commits:
commit d69eb22d4ec3d1d44d80e462e2ae746bd5a9a8cf
Author: Stephan Bergmann 
Date:   Thu Feb 25 10:26:59 2016 +0100

-Wno-shadow appears no longer necessary for KDE4

Change-Id: I5edace31b5c73c88c301444aaabee3734fc8154e
Reviewed-on: https://gerrit.libreoffice.org/22696
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index b7fa391..c61d394 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2961,12 +2961,6 @@ $(call gb_LinkTarget_add_libs,$(1),\
$(KDE4_LIBS) \
 )
 
-ifeq ($(COM),GCC)
-$(call gb_LinkTarget_add_cxxflags,$(1),\
-   -Wno-shadow \
-)
-endif
-
 endef
 
 else # !ENABLE_KDE4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Michael Stahl]

 RepositoryExternal.mk |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit b4d3a0d6744b8c6e5861b8198b31a434a5c2a6f6
Author: Michael Stahl 
Date:   Tue Feb 23 15:08:47 2016 +0100

RepositoryExternal: move that out of gb_LinkTarget__use_breakpad

otherwise package would be registered multiple times, looks like one
tinderbox fails due to that.

Change-Id: I3bcbc9fff1e1993ae30cda634a50f815a30bc094

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 772b1fd..b7fa391 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3368,13 +3368,12 @@ endif
 
 $(call gb_LinkTarget_use_external_project,$(1),breakpad)
 
+endef
+
 $(eval $(call gb_Helper_register_packages_for_install,ooo,\
breakpad \
 ))
 
-
-endef
-
 # else # SYSTEM_LIBBREAKPAD
 # 
 # define gb_LinkTarget__use_libgltf
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Markus Mohrhard]

 RepositoryExternal.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d63a940853459bc70df032a36a6432d9515e0ecb
Author: Markus Mohrhard 
Date:   Tue Feb 23 11:28:31 2016 +0100

we need the complete cppunit build

Change-Id: I71de79a7a10453da73e96793dcd58c3c64c044ee
Reviewed-on: https://gerrit.libreoffice.org/22639
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e0f6c9b..772b1fd 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -162,7 +162,7 @@ endef
 else # !SYSTEM_CPPUNIT
 
 define gb_LinkTarget__use_cppunit
-$(call gb_LinkTarget_use_external_project,$(1),cppunit)
+$(call gb_LinkTarget_use_external_project,$(1),cppunit, full)
 
 $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,cppunit/include)\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Stephan Bergmann]

 RepositoryExternal.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8d34d36f93c6704b59d95c11f604d3347655f32f
Author: Stephan Bergmann 
Date:   Thu Feb 18 12:51:41 2016 +0100

jpeg-turbo's jconfig.h is only generated during build

Change-Id: I2fd510806212a05c6cad5c3002c4ede032c4f63c

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 31847d3..8ef7074 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -441,7 +441,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 $(call gb_LinkTarget_add_libs,$(1),\
$(call 
gb_UnpackedTarball_get_dir,jpeg-turbo)/.libs/libjpeg$(gb_StaticLibrary_PLAINEXT)
 \
 )
-$(call gb_LinkTarget_use_external_project,$(1),jpeg-turbo)
+$(call gb_LinkTarget_use_external_project,$(1),jpeg-turbo,full)
 
 endef
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Michael Stahl]

 RepositoryExternal.mk |   26 --
 1 file changed, 26 deletions(-)

New commits:
commit 4336db6d89a8531673fdbac790692a89f3c1fe79
Author: Michael Stahl 
Date:   Fri Dec 18 13:17:29 2015 +0100

remove unused gb_LinkTarget__use_npapi_headers

Change-Id: I527eeb82202de0d7b3545c545c492eda89c78e47

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 356da54..fe614db3 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -37,32 +37,6 @@ endif
 
 # External headers
 
-ifneq ($(SYSTEM_NPAPI_HEADERS),)
-
-# yes this uses internal headers too...
-# they are split across 2 dirs for this reason
-define gb_LinkTarget__use_npapi_headers
-$(call gb_LinkTarget_set_include,$(1),\
-   $(NPAPI_HEADERS_CFLAGS) \
-   -I$(SRCDIR)/external/np_sdk \
-   $$(INCLUDE) \
-)
-
-endef
-
-else #!SYSTEM_NPAPI_HEADERS
-
-define gb_LinkTarget__use_npapi_headers
-$(call gb_LinkTarget_set_include,$(1),\
-   -I$(SRCDIR)/external/np_sdk/inc \
-   -I$(SRCDIR)/external/np_sdk \
-   $$(INCLUDE) \
-)
-
-endef
-
-endif #SYSTEM_NPAPI_HEADERS
-
 ifneq ($(SYSTEM_ODBC_HEADERS),)
 
 define gb_LinkTarget__use_odbc_headers
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Matúš Kukan]

 RepositoryExternal.mk |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 15614c847dde4c52a4974022e5523c9c4fea856b
Author: Matúš Kukan 
Date:   Sat Dec 5 07:05:37 2015 +0100

gengal: Don't depend on whole instsetoo_native_setup package

..to avoid rebuilding galleries all the time
because 'version' rc-file target is PHONY.
Instead name what exactly is needed.

Change-Id: Idf3c5a4a5b64a48ae06c46acf24e49f6a1ac2114
Reviewed-on: https://gerrit.libreoffice.org/20407
Tested-by: Jenkins 
Reviewed-by: Matúš Kukan 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index cba5316..356da54 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3747,8 +3747,9 @@ $(call gb_Executable_add_runtime_dependencies,gengal,\
$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
$(call gb_Package_get_target_for_build,postprocess_images) \
$(call gb_Package_get_target_for_build,postprocess_registry) \
-   $(call gb_Package_get_target_for_build,instsetoo_native_setup_ure) \
-   $(call gb_Package_get_target_for_build,instsetoo_native_setup) \
+   $(INSTROOT_FOR_BUILD)/$(LIBO_URE_ETC_FOLDER)/$(call 
gb_Helper_get_rcfile,uno) \
+   $(INSTROOT_FOR_BUILD)/$(LIBO_ETC_FOLDER)/$(call 
gb_Helper_get_rcfile,fundamental) \
+   $(INSTROOT_FOR_BUILD)/$(LIBO_ETC_FOLDER)/$(call 
gb_Helper_get_rcfile,louno) \
$(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER)/services.rdb \
$(INSTROOT_FOR_BUILD)/$(LIBO_ETC_FOLDER)/services/services.rdb \
$(call gb_UnoApi_get_target,offapi) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk solenv/gbuild

[Michael Stahl]

 RepositoryExternal.mk|1 +
 solenv/gbuild/Gallery.mk |6 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit d764100d620ab8331a8d6bb80984ace09ec65b5c
Author: Michael Stahl 
Date:   Fri Nov 27 11:40:16 2015 +0100

try to fix gengal dependencies

The component files are not necessary as gb_Executable__register_gengal
already adds the service.rdb; the gengal.rc is insufficient as that file
references fundamental.rc which is missing, so depend on the Package
instead.  Also, INSTDIR is wrong for cross-compile.

Change-Id: I30711a51e04539832657a242d2573c626b1cf8ec

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 3830d14..994348f 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3755,6 +3755,7 @@ $(call gb_Executable_add_runtime_dependencies,gengal,\
$(call gb_Package_get_target_for_build,postprocess_images) \
$(call gb_Package_get_target_for_build,postprocess_registry) \
$(call gb_Package_get_target_for_build,instsetoo_native_setup_ure) \
+   $(call gb_Package_get_target_for_build,instsetoo_native_setup) \
$(call gb_Rdb_get_target_for_build,ure/services) \
$(INSTROOT)/$(LIBO_URE_MISC_FOLDER)/services.rdb \
$(call gb_UnoApi_get_target,offapi) \
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index a923d0a..2ce708d 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -68,11 +68,7 @@ $(dir $(call gb_Gallery_get_target,$(1)))%/.dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
 $(call gb_Gallery_get_target,%) : \
-   $(call gb_Executable_get_runtime_dependencies,gengal) \
-   $(INSTROOT)/$(LIBO_ETC_FOLDER)/services/services.rdb \
-   $(INSTROOT)/$(LIBO_ETC_FOLDER)/$(call 
gb_Helper_get_rcfile,gengal) \
-   $(call gb_ComponentTarget_get_target,ucb/source/core/ucb1) \
-   $(call gb_ComponentTarget_get_target,ucb/source/ucp/file/ucpfile1)
+   $(call gb_Executable_get_runtime_dependencies,gengal)
$(call gb_Gallery__command,$@,$*)
 
 $(call gb_Gallery__get_final_target,%) :
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Tor Lillqvist]

 RepositoryExternal.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fdab1a6bed363edcc4562dba6799de8f6ef0a872
Author: Tor Lillqvist 
Date:   Thu Nov 19 16:10:45 2015 +0200

Fix thinko

Change-Id: Ie7bc589e11687db38057adbbb7bb803e425628cf

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 302126b..3830d14 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -284,7 +284,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(GLYPHY_LIBS))
 endef
 else # !SYSTEM_GLYPHY
 
-$(eval $(gb_Helper_optional,GLYPHY,$(call 
gb_Helper_register_packages_for_install,ooo,\
+$(eval $(call gb_Helper_optional,GLYPHY,$(call 
gb_Helper_register_packages_for_install,ooo,\
glyphy \
 )))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Tor Lillqvist]

 RepositoryExternal.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c4db7aa8ac9b0db07d6143e8f8149293b17b6f3c
Author: Tor Lillqvist 
Date:   Thu Nov 19 16:06:49 2015 +0200

Don't register a glyphy package if we aren't actually building it

Hopefully fixes the Mac tb.

Change-Id: I4786e060009e5232fc7d5ae200fec15334411c57

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index c87e0e4..302126b 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -284,9 +284,9 @@ $(call gb_LinkTarget_add_libs,$(1),$(GLYPHY_LIBS))
 endef
 else # !SYSTEM_GLYPHY
 
-$(eval $(call gb_Helper_register_packages_for_install,ooo,\
+$(eval $(gb_Helper_optional,GLYPHY,$(call 
gb_Helper_register_packages_for_install,ooo,\
glyphy \
-))
+)))
 
 define gb_LinkTarget__use_glyphy
 $(call gb_LinkTarget_use_package,$(1),glyphy)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Michael Stahl]

 RepositoryExternal.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 57dd4d01c1ba036e5da4abf986b8d594d0ccdb95
Author: Michael Stahl mst...@redhat.com
Date:   Wed Jul 29 10:56:57 2015 +0200

RepositoryExternal.mk: missing dependency on python3 package

This was causing all these libpython3.3m.so: file not recognized: File
truncated failures.

Change-Id: Ib814ab4fa43d9c8f20cf9b16ad04e1a71057e595

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 7398916..28acf9c 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3170,6 +3170,7 @@ endef
 
 define gb_LinkTarget__use_python
 $(call gb_LinkTarget__use_python_headers,$(1))
+$(call gb_LinkTarget_use_package,$(1),python3)
 
 ifeq ($(OS),WNT)
 $(call gb_LinkTarget_add_libs,$(1),\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk solenv/gbuild

[Michael Stahl]

 RepositoryExternal.mk   |4 
 solenv/gbuild/LinkTarget.mk |8 
 2 files changed, 12 insertions(+)

New commits:
commit d9162d24ce242f27f9cc0430f0650daac8e5db24
Author: Michael Stahl mst...@redhat.com
Date:   Wed Jul 29 12:17:03 2015 +0200

RepositoryExternal.mk: for some reason Mac wants a GeneratedPackage

Change-Id: I5d983fee8d5cd313fbd0d6ece800fa8b80d81b35

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 28acf9c..7c87f5e 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3170,7 +3170,11 @@ endef
 
 define gb_LinkTarget__use_python
 $(call gb_LinkTarget__use_python_headers,$(1))
+ifeq ($(OS),MACOSX)
+$(call gb_LinkTarget_use_generated_package,$(1),python3)
+else
 $(call gb_LinkTarget_use_package,$(1),python3)
+endif
 
 ifeq ($(OS),WNT)
 $(call gb_LinkTarget_add_libs,$(1),\
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 49bd40b..b4b9060 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -1301,6 +1301,14 @@ define gb_LinkTarget_use_packages
 $(foreach package,$(2),$(call gb_LinkTarget_use_package,$(1),$(package)))
 endef
 
+# use a GeneratedPackage, possibly from another module
+# call gb_LinkTarget_use_generated_package,linktarget,package
+define gb_LinkTarget_use_generated_package
+$(call gb_LinkTarget_get_headers_target,$(1)) :| \
+   $(call gb_GeneratedPackage_get_target,$(strip $(2)))
+
+endef
+
 # Use sources from unpacked tarball of an external project
 # call gb_LinkTarget_use_unpacked,linktarget,unpackedtarget
 define gb_LinkTarget_use_unpacked
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Jan Holesovsky]

 RepositoryExternal.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ec47717b352dfa194d183be7aba5fa237045cd11
Author: Jan Holesovsky ke...@collabora.com
Date:   Tue Jul 7 09:24:45 2015 +0200

online update: Make sure that bzip2 builds at the correct time.

Change-Id: I4973b4aaf311b0899831ea7f5335204f2e0bd9dd

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index a556c3d..a0a0d61 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -4144,6 +4144,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 $(call gb_LinkTarget_add_libs,$(1),\
-L$(call gb_UnpackedTarball_get_dir,bzip2) -lbz2 \
 )
+$(call gb_LinkTarget_use_external_project,$(1),bzip2)
 endef
 
 define gb_ExternalProject__use_bzip2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Michael Stahl]

 RepositoryExternal.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ae08fceafc47279d17d6e1d002cbcd574b7bf028
Author: Michael Stahl mst...@redhat.com
Date:   Tue Apr 28 13:32:28 2015 +0200

RepositoryExternal.mk: gengal needs runtime dependency on unorc

Change-Id: I33f7592cf990f9298fec375d06a86c16ac4389b3

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index a0a4d91..b6324cf 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3831,6 +3831,7 @@ $(call gb_Executable_add_runtime_dependencies,gengal,\
$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
$(call gb_Package_get_target_for_build,postprocess_images) \
$(call gb_Package_get_target_for_build,postprocess_registry) \
+   $(call gb_Package_get_target_for_build,instsetoo_native_setup_ure) \
$(call gb_Rdb_get_target_for_build,ure/services) \
$(INSTROOT)/$(LIBO_URE_MISC_FOLDER)/services.rdb \
$(call gb_UnoApi_get_target,offapi) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk Repository.mk solenv/gbuild vcl/headless vcl/inc vcl/Library_vcl.mk vcl/Library_vclplug_svp.mk vcl/Module_vcl.mk vcl/unx

[Tor Lillqvist]

 Repository.mk  |1 
 RepositoryExternal.mk  |3 -
 solenv/gbuild/CppunitTest.mk   |1 
 solenv/gbuild/extensions/pre_MergedLibsList.mk |3 -
 vcl/Library_vcl.mk |1 
 vcl/Library_vclplug_svp.mk |   65 -
 vcl/Module_vcl.mk  |1 
 vcl/headless/svpdata.cxx   |2 
 vcl/inc/headless/svpinst.hxx   |2 
 vcl/unx/generic/plugadapt/salplug.cxx  |7 +-
 10 files changed, 7 insertions(+), 79 deletions(-)

New commits:
commit 41c66312885393614c274897fd75a25c2ddf6ba0
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Mar 20 16:57:22 2015 +0200

The 'svp' plug-in library is empty so don't build it at all

Its code is in the vcl library nowadays.

Change-Id: Idb659e541226724004660102f6641c38a2312c27

diff --git a/Repository.mk b/Repository.mk
index 1dda9f4..7b6f7d6 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -450,7 +450,6 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
$(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \
vclplug_gen \
$(if $(ENABLE_TDE),vclplug_tde) \
-   $(if $(ENABLE_HEADLESS),,vclplug_svp) \
) \
writerperfect \
xmlscript \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 44036dd..e3dc039 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3813,9 +3813,6 @@ $(call gb_Executable_add_runtime_dependencies,gengal,\
,$(call gb_ComponentTarget_get_target_for_build,$(component))) \
$(call gb_AllLangResTarget_get_target,ofa) \
$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
-   $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(ENABLE_HEADLESS),, 
\
-   $(call gb_Library_get_target,vclplug_svp) \
-   )) \
$(call gb_Package_get_target_for_build,postprocess_images) \
$(call gb_Package_get_target_for_build,postprocess_registry) \
$(call gb_Rdb_get_target_for_build,ure/services) \
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index f7c8577..970e8b9 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -168,7 +168,6 @@ $(call gb_CppunitTest_get_target,$(1)) : $(call 
gb_Library_get_target,vclbootstr
 ifeq ($(GUIBASE),unx)
 $(call gb_CppunitTest_get_target,$(1)) : $(call 
gb_Library_get_target,desktop_detector)
 $(call gb_CppunitTest_get_target,$(1)) : $(if $(filter $(2),$(true)), \
-$(call gb_Library_get_target,vclplug_svp), \
 $(call gb_Library_get_target,vclplug_gen) \
 $(if $(ENABLE_GTK),$(call gb_Library_get_target,vclplug_gtk)) \
 $(if $(ENABLE_GTK3),$(call gb_Library_get_target,vclplug_gtk3)) \
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 3c73485..ea2b600 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -153,9 +153,6 @@ gb_MERGEDLIBS := \
utl \
uui \
vcl \
-   $(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \
-   $(if $(ENABLE_HEADLESS),,vclplug_svp) \
-   ) \
xmlscript \
xo \
xstor \
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 08b08e9..a1a2d7f 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_Library_add_defs,vcl,\
-DCUI_DLL_NAME=\$(call gb_Library_get_runtime_filename,$(call 
gb_Library__get_name,cui))\ \
-DDESKTOP_DETECTOR_DLL_NAME=\$(call 
gb_Library_get_runtime_filename,$(call 
gb_Library__get_name,desktop_detector))\ \
-DTK_DLL_NAME=\$(call gb_Library_get_runtime_filename,$(call 
gb_Library__get_name,tk))\ \
-   -DVCLPLUG_SVP_DLL_NAME=\$(call gb_Library_get_runtime_filename,$(call 
gb_Library__get_name,vclplug_svp))\ \
 ))
 
 $(eval $(call gb_Library_use_sdk_api,vcl))
diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk
deleted file mode 100644
index 3084ec8..000
--- a/vcl/Library_vclplug_svp.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the 

[Libreoffice-commits] core.git: RepositoryExternal.mk sdext/source

[Caolán McNamara]

 RepositoryExternal.mk |4 
 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |7 +++
 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |7 +++
 3 files changed, 18 insertions(+)

New commits:
commit 37e4920a310c265848ebbf7205efad26f71d928c
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Jan 20 15:48:05 2015 +

continue to implement drawChar for unpatched popplers without drawChar2 hack

Change-Id: Id4ad86f3f563d88777352722e397cd77cfad45e4

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 5799da2..1968fe1 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2628,6 +2628,10 @@ endif # ENABLE_VALGRIND
 ifneq ($(SYSTEM_POPPLER),)
 
 define gb_LinkTarget__use_poppler
+$(call gb_LinkTarget_add_defs,$(1),\
+-DSYSTEM_POPPLER_HEADERS \
+)
+
 $(call gb_LinkTarget_set_include,$(1),\
$(POPPLER_CFLAGS) \
$$(INCLUDE) \
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 838ada5..e785339 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -834,10 +834,17 @@ void PDFOutDev::eoClip(GfxState *state)
 local offset of character (zero for horizontal writing mode). not
 taken into account for output pos updates. Used for vertical writing.
  */
+#ifdef SYSTEM_POPPLER_HEADERS
+void PDFOutDev::drawChar(GfxState *state, double x, double y,
+ double dx, double dy,
+ double originX, double originY,
+ CharCode, int /*nBytes*/, Unicode *u, int uLen)
+#else
 void PDFOutDev::drawChar2(GfxState *state, double x, double y,
  double dx, double dy,
  double originX, double originY,
  CharCode, int /*nBytes*/, Unicode *u, int uLen)
+#endif
 {
 assert(state);
 
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index a577e5e..b8414c7 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -220,10 +220,17 @@ namespace pdfi
 virtual void eoClip(GfxState *state) SAL_OVERRIDE;
 
 //- text drawing
+#ifdef SYSTEM_POPPLER_HEADERS
+virtual void drawChar(GfxState *state, double x, double y,
+  double dx, double dy,
+  double originX, double originY,
+  CharCode code, int nBytes, Unicode *u, int uLen) 
SAL_OVERRIDE;
+#else
 virtual void drawChar2(GfxState *state, double x, double y,
   double dx, double dy,
   double originX, double originY,
   CharCode code, int nBytes, Unicode *u, int uLen) 
SAL_OVERRIDE;
+#endif
 virtual void drawString(GfxState *state, GooString *s) SAL_OVERRIDE;
 virtual void endTextObject(GfxState *state) SAL_OVERRIDE;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk solenv/gbuild

[David Tardon]

 RepositoryExternal.mk  |1 +
 solenv/gbuild/CliUnoApi.mk |3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c7b4aa22ebbaf24c5e98ef7311cc88f7e99f71f0
Author: David Tardon dtar...@redhat.com
Date:   Wed Dec 24 18:27:48 2014 +0100

all deps for tools are expected to be at one place

Change-Id: Ie0d359f6607811cd76aefe4e19d0fb05379f1762

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 6360652a..06088c8 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3768,6 +3768,7 @@ $(call gb_Executable_add_runtime_dependencies,climaker,\
$(call gb_Rdb_get_target_for_build,ure/services) \
$(INSTROOT)/$(LIBO_URE_MISC_FOLDER)/services.rdb \
$(call gb_UnoApi_get_target,udkapi) \
+   $(INSTROOT)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno)
 )
 endef
 
diff --git a/solenv/gbuild/CliUnoApi.mk b/solenv/gbuild/CliUnoApi.mk
index 4c0b9aa..16f331b 100644
--- a/solenv/gbuild/CliUnoApi.mk
+++ b/solenv/gbuild/CliUnoApi.mk
@@ -13,8 +13,7 @@ gb_CliUnoApi_EXT := $(gb_CliAssembly_POLICYEXT)
 
 gb_CliUnoApi_KEYFILE_DEFAULT := $(gb_CliAssembly_KEYFILE_DEFAULT)
 
-gb_CliUnoApi_DEPS := $(call gb_Executable_get_runtime_dependencies,climaker) \
-$(INSTROOT)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno)
+gb_CliUnoApi_DEPS := $(call gb_Executable_get_runtime_dependencies,climaker)
 gb_CliUnoApi_COMMAND := $(call gb_Executable_get_command,climaker)
 
 define gb_CliUnoApi__command
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Tor Lillqvist]

 RepositoryExternal.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 801408c4412eb6151a3b4c92e6f7cc98503fad65
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Dec 12 23:51:17 2014 +0200

Define gb_LinkTarget__use_plc4 for Android build

Change-Id: Ib44177a27b58e1f11fc98bfe0852f381251e436e

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index b32b06d..3b6d490 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3243,6 +3243,7 @@ gb_ExternalProject__use_nss3:=
 ifeq ($(OS),ANDROID)
 
 gb_LinkTarget__use_nss3:=
+gb_LinkTarget__use_plc4:=
 
 else
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Caolán McNamara]

 RepositoryExternal.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit 0d5cc8ce2976b8a69cc4ef1091b0dfe72c15fba2
Author: Caolán McNamara caol...@redhat.com
Date:   Sat Aug 30 15:12:53 2014 +0100

seem to need to link against pthreads on linux for poppler now

Change-Id: Ibca5ad9ff6a3ab28f24ac2554bd0534b0827a24e

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 1350449..daaf2fc 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2589,6 +2589,10 @@ ifeq ($(OS),MACOSX)
 $(call gb_LinkTarget_add_libs,$(1),\
-lobjc \
 )
+else ifeq ($(OS),LINUX)
+$(call gb_LinkTarget_add_libs,$(1),\
+   -pthread \
+)
 else ifeq ($(OS),WNT)
 $(call gb_LinkTarget_use_system_win32_libs,$(1),\
advapi32 \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Markus Mohrhard]

 RepositoryExternal.mk |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 62101bcacb2096dc60c4123196105dce39cfd056
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Thu Aug 7 19:40:33 2014 +0200

also move isystem parts to the includes

Change-Id: Ib88064744c7ae678d6c3dcce835a295de8fb274e
Reviewed-on: https://gerrit.libreoffice.org/10814
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 1822f95..6f6d787 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2605,11 +2605,11 @@ ifneq ($(SYSTEM_CLUCENE),)
 
 define gb_LinkTarget__use_clucene
 $(call gb_LinkTarget_add_defs,$(1),\
-   $(filter-out -I%,$(CLUCENE_CFLAGS)) \
+   $(filter-out -I% -isystem%,$(subst -isystem 
/,-isystem/,$(CLUCENE_CFLAGS))) \
 )
 
 $(call gb_LinkTarget_set_include,$(1),\
-   $(filter -I%,$(CLUCENE_CFLAGS)) \
+   $(subst -isystem/,-isystem /,$(filter -I% -isystem%,$(subst -isystem 
/,-isystem/,$(CLUCENE_CFLAGS \
$$(INCLUDE) \
 )
 
@@ -2907,12 +2907,12 @@ ifeq ($(ENABLE_KDE),TRUE)
 
 define gb_LinkTarget__use_kde
 $(call gb_LinkTarget_set_include,$(1),\
-   $(filter -I%,$(KDE_CFLAGS)) \
+   $(subst -isystem/,-isystem /,$(filter -I% -isystem%,$(subst -isystem 
/,-isystem/,$(KDE_CFLAGS \
$$(INCLUDE) \
 )
 
 $(call gb_LinkTarget_add_defs,$(1),\
-   $(filter-out -I%,$(KDE_CFLAGS)) \
+   $(filter-out -I% -isystem%,$(subst -isystem /,-isystem/,$(KDE_CFLAGS))) 
\
 )
 
 $(call gb_LinkTarget_add_libs,$(1),\
@@ -2940,12 +2940,12 @@ ifeq ($(ENABLE_KDE4),TRUE)
 
 define gb_LinkTarget__use_kde4
 $(call gb_LinkTarget_set_include,$(1),\
-   $(filter -I%,$(KDE4_CFLAGS)) \
+   $(subst -isystem/,-isystem /,$(filter -I% -isystem%,$(subst -isystem 
/,-isystem/,$(KDE4_CFLAGS \
$$(INCLUDE) \
 )
 
 $(call gb_LinkTarget_add_defs,$(1),\
-   $(filter-out -I%,$(KDE4_CFLAGS)) \
+   $(filter-out -I% -isystem%,$(subst -isystem 
/,-isystem/,$(KDE4_CFLAGS))) \
 )
 
 $(call gb_LinkTarget_add_libs,$(1),\
@@ -2995,12 +2995,12 @@ ifeq ($(ENABLE_GCONF),TRUE)
 
 define gb_LinkTarget__use_gconf
 $(call gb_LinkTarget_set_include,$(1),\
-   $(filter -I%,$(GCONF_CFLAGS)) \
+   $(subst -isystem/,-isystem /,$(filter -I% -isystem%,$(subst -isystem 
/,-isystem/,$(GCONF_CFLAGS \
$$(INCLUDE) \
 )
 
 $(call gb_LinkTarget_add_defs,$(1),\
-   $(filter-out -I%,$(GCONF_CFLAGS)) \
+   $(filter-out -I% -isystem%,$(subst -isystem 
/,-isystem/,$(GCONF_CFLAGS))) \
 )
 
 $(call gb_LinkTarget_add_libs,$(1),\
@@ -3024,11 +3024,11 @@ ifneq ($(SYSTEM_PYTHON),)
 
 define gb_LinkTarget__use_python_headers
 $(call gb_LinkTarget_add_defs,$(1),\
-   $(filter-out -I%,$(PYTHON_CFLAGS)) \
+   $(filter-out -I% -isystem%,$(subst -isystem 
/,-isystem/,$(PYHTON_CFLAGS \
 )
 
 $(call gb_LinkTarget_set_include,$(1),\
-   $(filter -I%,$(PYTHON_CFLAGS)) \
+   $(subst -isystem/,-isystem /,$(filter -I% -isystem%,$(subst -isystem 
/,-isystem/,$(PYTHON_CFLAGS \
$$(INCLUDE) \
 )
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[David Tardon]

 RepositoryExternal.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e59420dd1ee5c3474ba3d6ef444b0ee947081624
Author: David Tardon dtar...@redhat.com
Date:   Mon Aug 4 17:23:54 2014 +0200

make sure image zips are done when gengal is run

... to avoid potential uncaught exception.

Change-Id: I454b9fbb5c35fd72757dfc21687b980982453465

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f10c68f..4026bd7 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3690,6 +3690,7 @@ $(call gb_Executable_add_runtime_dependencies,gengal,\
$(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(ENABLE_HEADLESS),, 
\
$(call gb_Library_get_target,vclplug_svp) \
)) \
+   $(call gb_Package_get_target_for_build,postprocess_images) \
$(call gb_Package_get_target_for_build,postprocess_registry) \
$(call gb_Rdb_get_target_for_build,ure/services) \
$(INSTROOT)/$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[David Tardon]

 RepositoryExternal.mk |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 5b66024c117f2c354dda5c928f09d4cc21403b51
Author: David Tardon dtar...@redhat.com
Date:   Mon Jul 28 10:38:49 2014 +0200

make sure ICU libs are available when needed

Change-Id: I56faa8f0b1567a4e45cafc8edff17423b1e29c35

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 15bd09b..f10c68f 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3760,7 +3760,10 @@ else # ! SYSTEM_LIBXML_FOR_BUILD
 
 define gb_ExternalExecutable__register_xmllint
 $(call 
gb_ExternalExecutable_set_internal,xmllint,$(WORKDIR_FOR_BUILD)/UnpackedTarball/xml2/$(if
 $(filter 
MSC,$(COM)),win32/bin.msvc)/xmllint$(gb_Executable_EXT_for_build),xml2)
-$(call gb_ExternalExecutable_add_dependencies,xmllint,$(call 
gb_Package_get_target,xml2))
+$(call gb_ExternalExecutable_add_dependencies,xmllint,\
+   $(if $(filter WNT,$(OS)),$(call gb_Package_get_target,icu_ure)) \
+   $(call gb_Package_get_target,xml2) \
+)
 
 endef
 
@@ -3774,7 +3777,10 @@ else # ! SYSTEM_LIBXSLT_FOR_BUILD
 
 define gb_ExternalExecutable__register_xsltproc
 $(call 
gb_ExternalExecutable_set_internal,xsltproc,$(WORKDIR_FOR_BUILD)/UnpackedTarball/xslt/$(if
 $(filter 
MSC,$(COM)),win32/bin.msvc,xsltproc)/xsltproc$(gb_Executable_EXT_for_build),xslt)
-$(call gb_ExternalExecutable_add_dependencies,xsltproc,$(call 
gb_Package_get_target,xslt))
+$(call gb_ExternalExecutable_add_dependencies,xsltproc,\
+   $(if $(filter WNT,$(OS)),$(call gb_Package_get_target,icu_ure)) \
+   $(call gb_Package_get_target,xslt) \
+)
 
 endef
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk ucb/Library_ucpdav1.mk

[Michael Stahl]

 RepositoryExternal.mk  |2 ++
 ucb/Library_ucpdav1.mk |5 -
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 5cf2205387a8df61329196241397dfde42d85f7c
Author: Michael Stahl mst...@redhat.com
Date:   Thu Jun 5 13:35:14 2014 +0200

ucb: move APR dependencies to gb_LinkTarget__use_apr

Change-Id: I6768e5f2400f3020d85c48b80d58e13a3f6f07e9

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 9e20991..640452d 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1041,6 +1041,8 @@ $(call gb_LinkTarget_set_include,$(1),\
 )
 $(call gb_LinkTarget_add_libs,$(1),\
$(APR_LIBS) \
+   $(if $(filter $(OS),LINUX),-lpthread) \
+   $(if $(filter $(OS),MACOSX),-liconv) \
 )
 
 ifeq ($(SYSTEM_APR),)
diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk
index 0dae22f..f6e8a62 100644
--- a/ucb/Library_ucpdav1.mk
+++ b/ucb/Library_ucpdav1.mk
@@ -67,11 +67,6 @@ $(eval $(call gb_Library_use_externals,ucpdav1,\
zlib \
 ))
 
-$(eval $(call gb_Library_add_libs,ucpdav1,\
-   $(if $(filter $(OS),LINUX),-lpthread) \
-   $(if $(filter $(OS),MACOSX),-liconv) \
-))
-
 $(eval $(call gb_Library_add_exception_objects,ucpdav1,\
ucb/source/ucp/webdav/AprEnv \
ucb/source/ucp/webdav/ContentProperties \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[David Tardon]

 RepositoryExternal.mk |8 
 1 file changed, 8 insertions(+)

New commits:
commit 026dc56eb7deb7c49b6d54875a697d4a431082fe
Author: David Tardon dtar...@redhat.com
Date:   Fri May 30 19:50:24 2014 +0200

only def graphite external if --enable-graphite

Change-Id: I58271b5138b6dda4c448af63146a2f2171cb61a1

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 240a7fe..ada101e 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1321,6 +1321,8 @@ endef
 
 endif # SYSTEM_FONTCONFIG
 
+ifeq ($(ENABLE_GRAPHITE),TRUE)
+
 ifneq ($(SYSTEM_GRAPHITE),)
 
 define gb_LinkTarget__use_graphite
@@ -1348,6 +1350,12 @@ endef
 
 endif # SYSTEM_GRAPHITE
 
+else # !ENABLE_GRAPHITE
+
+gb_LinkTarget__use_graphite :=
+
+endif # ENABLE_GRAPHITE
+
 ifneq ($(SYSTEM_ICU),)
 
 gb_LinkTarget__use_icu_headers:=
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Rene Engelhard]

 RepositoryExternal.mk |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 40facc4ea878fb674214af697cc738cdf6573150
Author: Rene Engelhard r...@debian.org
Date:   Fri May 23 07:43:19 2014 +0200

don't unconditionally require bsh.jar and js.jar in RepositoryExternal.mk

... as they can be disabled and thus are not there at install

Change-Id: I197b5053971d2721114b2ebc7b3c31db36c3f58e

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 2db4c38..8b35b8c 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3181,6 +3181,8 @@ endef
 endif # SYSTEM_HSQLDB
 
 
+ifeq ($(ENABLE_SCRIPTING_BEANSHELL),TRUE)
+
 ifneq ($(SYSTEM_BSH),)
 
 define gb_Jar__use_bsh
@@ -3201,6 +3203,9 @@ endef
 
 endif # SYSTEM_BSH
 
+endif
+
+ifeq ($(ENABLE_SCRIPTING_JAVASCRIPT),TRUE)
 
 ifneq ($(SYSTEM_RHINO),)
 
@@ -3222,6 +3227,8 @@ endef
 
 endif # SYSTEM_RHINO
 
+endif
+
 ifneq ($(SYSTEM_APACHE_COMMONS),)
 
 define gb_Jar__use_commons-codec
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[David Tardon]

 RepositoryExternal.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 32cd12c8a7e9ddf3d7b3833f70051cdd01ceb911
Author: David Tardon dtar...@redhat.com
Date:   Sat Apr 26 19:46:40 2014 +0200

YES - TRUE

Change-Id: I8d6764d555c50923af5bdc6672753b5e84230144

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e9031c6..8e03366 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -762,7 +762,7 @@ endef
 
 endif # SYSTEM_CMIS
 
-ifeq ($(ENABLE_JAVA),YES)
+ifeq ($(ENABLE_JAVA),TRUE)
 
 ifeq ($(OS)$(COM),WNTGCC)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk solenv/gbuild

[David Tardon]

 RepositoryExternal.mk   |   10 +-
 solenv/gbuild/ExternalExecutable.mk |   14 +-
 solenv/gbuild/TargetLocations.mk|1 +
 3 files changed, 15 insertions(+), 10 deletions(-)

New commits:
commit dbac8f5a075a8e39068d5e21ab63de224f818eca
Author: David Tardon dtar...@redhat.com
Date:   Fri Apr 18 18:34:40 2014 +0200

restore deps on bins from bundled projects used during build

Change-Id: Ibd97268e4aaa61ec896135bf780173a18536101d

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 878d4b7..f11407e 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3467,7 +3467,7 @@ gb_ExternalExecutable__register_xmllint :=
 else # ! SYSTEM_LIBXML_FOR_BUILD
 
 define gb_ExternalExecutable__register_xmllint
-$(call 
gb_ExternalExecutable_set_internal,xmllint,$(WORKDIR_FOR_BUILD)/UnpackedTarball/xml2/$(if
 $(filter MSC,$(COM)),win32/bin.msvc)/xmllint$(gb_Executable_EXT_for_build))
+$(call 
gb_ExternalExecutable_set_internal,xmllint,$(WORKDIR_FOR_BUILD)/UnpackedTarball/xml2/$(if
 $(filter 
MSC,$(COM)),win32/bin.msvc)/xmllint$(gb_Executable_EXT_for_build),xml2)
 $(call gb_ExternalExecutable_add_dependencies,xmllint,$(call 
gb_Package_get_target,xml2))
 
 endef
@@ -3481,7 +3481,7 @@ gb_ExternalExecutable__register_xsltproc :=
 else # ! SYSTEM_LIBXSLT_FOR_BUILD
 
 define gb_ExternalExecutable__register_xsltproc
-$(call 
gb_ExternalExecutable_set_internal,xsltproc,$(WORKDIR_FOR_BUILD)/UnpackedTarball/xslt/$(if
 $(filter 
MSC,$(COM)),win32/bin.msvc,xsltproc)/xsltproc$(gb_Executable_EXT_for_build))
+$(call 
gb_ExternalExecutable_set_internal,xsltproc,$(WORKDIR_FOR_BUILD)/UnpackedTarball/xslt/$(if
 $(filter 
MSC,$(COM)),win32/bin.msvc,xsltproc)/xsltproc$(gb_Executable_EXT_for_build),xslt)
 $(call gb_ExternalExecutable_add_dependencies,xsltproc,$(call 
gb_Package_get_target,xslt))
 
 endef
@@ -3543,7 +3543,7 @@ endef
 else # ! SYSTEM_GENBRK
 
 define gb_ExternalExecutable__register_genbrk
-$(call 
gb_ExternalExecutable_set_internal,genbrk,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/genbrk$(gb_Executable_EXT_for_build))
+$(call 
gb_ExternalExecutable_set_internal,genbrk,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/genbrk$(gb_Executable_EXT_for_build),icu)
 $(call gb_ExternalExecutable_set_precommand,genbrk,$(subst 
$$,,$(gb_ICU_PRECOMMAND)))
 $(call gb_ExternalExecutable_add_dependencies,genbrk,\
$(call gb_Package_get_target_for_build,icu) \
@@ -3563,7 +3563,7 @@ endef
 else # ! SYSTEM_GENCCODE
 
 define gb_ExternalExecutable__register_genccode
-$(call 
gb_ExternalExecutable_set_internal,genccode,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/genccode$(gb_Executable_EXT_for_build))
+$(call 
gb_ExternalExecutable_set_internal,genccode,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/genccode$(gb_Executable_EXT_for_build),icu)
 $(call gb_ExternalExecutable_set_precommand,genccode,$(subst 
$$,,$(gb_ICU_PRECOMMAND)))
 $(call gb_ExternalExecutable_add_dependencies,genccode,\
$(call gb_Package_get_target_for_build,icu) \
@@ -3583,7 +3583,7 @@ endef
 else # ! SYSTEM_GENCMN
 
 define gb_ExternalExecutable__register_gencmn
-$(call 
gb_ExternalExecutable_set_internal,gencmn,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/gencmn$(gb_Executable_EXT_for_build))
+$(call 
gb_ExternalExecutable_set_internal,gencmn,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/gencmn$(gb_Executable_EXT_for_build),icu)
 $(call gb_ExternalExecutable_set_precommand,gencmn,$(subst 
$$,,$(gb_ICU_PRECOMMAND)))
 $(call gb_ExternalExecutable_add_dependencies,gencmn,\
$(call gb_Package_get_target_for_build,icu) \
diff --git a/solenv/gbuild/ExternalExecutable.mk 
b/solenv/gbuild/ExternalExecutable.mk
index 014e011..c1b3503 100644
--- a/solenv/gbuild/ExternalExecutable.mk
+++ b/solenv/gbuild/ExternalExecutable.mk
@@ -111,10 +111,11 @@ endef
 
 # FIXME need to subst in some more $$ in gb_Helper_set_ld_path here - ugly
 # but other uses (gb_CppunitTest_CPPTESTPRECOMMAND) require less $$ - ugly
-# FIXME hack to avoid dependency into workdir - those must be added explicitly
 define gb_ExternalExecutable__set_internal
+$(if $(3),,$(if $(filter $(WORKDIR_FOR_BUILD)/UnpackedTarball,$(2)),\
+   $(call gb_Output_error,depending directly on executable $(2) from 
UnpackedTarball is not allowed. Use the UnpackedTarball target as dependency.)))
 gb_ExternalExecutable_$(1)_EXECUTABLE := $(2)
-gb_ExternalExecutable_$(1)_DEPENDENCIES := $(if $(findstring 
$(WORKDIR_FOR_BUILD),$(2)),,$(2))
+gb_ExternalExecutable_$(1)_DEPENDENCIES := $(if $(3),$(3),$(2))
 gb_ExternalExecutable_$(1)_PRECOMMAND := $(subst 
$$,,$(gb_Helper_set_ld_path)) $(BUILDTOOLTRACE)
 
 endef
@@ -123,11 +124,14 @@ endef
 #
 # Optionally set a specific executable target to use (if the target
 # $(gb_Executable_BINDIR_FOR_BUILD)/$(1)$(gb_Executable_EXT_for_build) is
-# not suitable).
+# not suitable). Also optionally, set the ExternalProject that builds
+# the executable. This 

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Matúš Kukan]

 RepositoryExternal.mk |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 81e7f75f472e7264750de8063b32f4348a40a628
Author: Matúš Kukan matus.ku...@collabora.com
Date:   Tue Apr 8 11:00:38 2014 +0200

Use condition from Module_chart2.mk for external glew.

I wonder what's best to use here.

Change-Id: Icf641dcf640a12832ea86782414357fa9f71829c

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 722e22f..3738fde 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -228,7 +228,10 @@ endef
 
 endif # SYSTEM_CPPUNIT
 
-ifneq ($(SYSTEM_GLEW),)
+ifeq ($(filter FREEBSD LINUX MACOSX WNT,$(OS)),)
+gb_LinkTarget__use_glew :=
+
+else ifneq ($(SYSTEM_GLEW),)
 
 define gb_LinkTarget__use_glew
 $(call gb_LinkTarget_set_include,$(1),\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Stephan Bergmann]

 RepositoryExternal.mk |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 58d80a6f439f2834470659397ccd1913c6955d29
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Mar 19 10:39:40 2014 +0100

gbuild: More crude hacking to fix over-evaluation of gb_ICU_PRECOMMAND

...in the spirit of 3e70e26cbc96667e2968cd325737053bf8bffb78 gbuild: fix 
over-
evaluation in gb_ExternalExecutable__set_internal

Change-Id: I43ff930267cfd3cc537e79c41a8b4167fd5c77d3

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e9b0261..a1fbcda 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3518,7 +3518,7 @@ else # ! SYSTEM_GENBRK
 
 define gb_ExternalExecutable__register_genbrk
 $(call 
gb_ExternalExecutable_set_internal,genbrk,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/genbrk$(gb_Executable_EXT_for_build))
-$(call gb_ExternalExecutable_set_precommand,genbrk,$(gb_ICU_PRECOMMAND))
+$(call gb_ExternalExecutable_set_precommand,genbrk,$(subst 
$$,,$(gb_ICU_PRECOMMAND)))
 $(call gb_ExternalExecutable_add_dependencies,genbrk,\
$(call gb_Package_get_target_for_build,icu) \
 )
@@ -3538,7 +3538,7 @@ else # ! SYSTEM_GENCCODE
 
 define gb_ExternalExecutable__register_genccode
 $(call 
gb_ExternalExecutable_set_internal,genccode,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/genccode$(gb_Executable_EXT_for_build))
-$(call gb_ExternalExecutable_set_precommand,genccode,$(gb_ICU_PRECOMMAND))
+$(call gb_ExternalExecutable_set_precommand,genccode,$(subst 
$$,,$(gb_ICU_PRECOMMAND)))
 $(call gb_ExternalExecutable_add_dependencies,genccode,\
$(call gb_Package_get_target_for_build,icu) \
 )
@@ -3558,7 +3558,7 @@ else # ! SYSTEM_GENCMN
 
 define gb_ExternalExecutable__register_gencmn
 $(call 
gb_ExternalExecutable_set_internal,gencmn,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/gencmn$(gb_Executable_EXT_for_build))
-$(call gb_ExternalExecutable_set_precommand,gencmn,$(gb_ICU_PRECOMMAND))
+$(call gb_ExternalExecutable_set_precommand,gencmn,$(subst 
$$,,$(gb_ICU_PRECOMMAND)))
 $(call gb_ExternalExecutable_add_dependencies,gencmn,\
$(call gb_Package_get_target_for_build,icu) \
 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[David Tardon]

 RepositoryExternal.mk |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit d5d3927dedf1a7ff71753c5a90011dd6b3515671
Author: David Tardon dtar...@redhat.com
Date:   Mon Mar 3 15:29:27 2014 +0100

allow ext. projects to depend on mdds_headers

Change-Id: Ie5b8576e12ef1b95b8ad8775379ec60041c6d816

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 8476ae3..c23a879 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -111,10 +111,17 @@ endif
 
 ifneq ($(SYSTEM_MDDS),)
 
+gb_ExternalProject__use_mdds_headers :=
+
 gb_LinkTarget__use_mdds_headers :=
 
 else # !SYSTEM_MDDS
 
+define gb_ExternalProject__use_mdds_headers
+$(call gb_ExternalProject_use_external_project,$(1),mdds)
+
+endef
+
 define gb_LinkTarget__use_mdds_headers
 $(call gb_LinkTarget_use_unpacked,$(1),mdds)
 $(call gb_LinkTarget_set_include,$(1),\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[David Tardon]

 RepositoryExternal.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 6d9de6bbe9133bb0c7710489a2ba531d7d43eca6
Author: David Tardon dtar...@redhat.com
Date:   Mon Mar 3 20:39:13 2014 +0100

fix build with system boost

Change-Id: I3834355674e0b9a947bfc10d9872d3a4805bf552

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index a0cd2b8..4ff6748 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -631,6 +631,8 @@ $(call gb_LinkTarget_add_libs,$(1),\
 
 endef
 
+gb_ExternalProject__use_boost_iostreams :=
+
 define gb_LinkTarget__use_boost_system
 $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[David Tardon]

 RepositoryExternal.mk |   68 +-
 1 file changed, 34 insertions(+), 34 deletions(-)

New commits:
commit 864f775189c23053bfa6ce8fb051dbc0d71929d9
Author: David Tardon dtar...@redhat.com
Date:   Sun Feb 9 21:19:07 2014 +0100

move glew to libs section

Change-Id: I1e6a4b025b945fc725738303c499c0ea44f9c8a6

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 0c48bf2..d0cb1fb 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -126,40 +126,6 @@ endef
 
 endif
 
-ifeq ($(SYSTEM_GLEW),YES)
-
-define gb_LinkTarget__use_glew
-$(call gb_LinkTarget_set_include,$(1),\
-   $$(INCLUDE) \
-$(GLEW_CFLAGS) \
-)
-$(call gb_LinkTarget_add_libs,$(1),$(GLEW_LIBS))
-
-endef
-
-else
-
-define gb_LinkTarget__use_glew
-$(call gb_LinkTarget_use_external_project,$(1),glew)
-$(call gb_LinkTarget_set_include,$(1),\
-   -I$(call gb_UnpackedTarball_get_dir,glew/include) \
-   $$(INCLUDE) \
-)
-
-ifeq ($(COM),MSC)
-$(call gb_LinkTarget_add_libs,$(1),\
-   $(call gb_UnpackedTarball_get_dir,glew)/lib/$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug/Win32/glew32d.lib,Release/Win32/glew32.lib) \
-)
-else
-$(call gb_LinkTarget_add_libs,$(1),\
-   -L$(call gb_UnpackedTarball_get_dir,glew)/lib/ -lGLEW \
-)
-endif
-
-endef
-
-endif
-
 ifeq ($(SYSTEM_GLM),YES)
 
 gb_LinkTarget__use_glm_headers :=
@@ -249,6 +215,40 @@ endef
 
 endif
 
+ifeq ($(SYSTEM_GLEW),YES)
+
+define gb_LinkTarget__use_glew
+$(call gb_LinkTarget_set_include,$(1),\
+   $$(INCLUDE) \
+$(GLEW_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(GLEW_LIBS))
+
+endef
+
+else
+
+define gb_LinkTarget__use_glew
+$(call gb_LinkTarget_use_external_project,$(1),glew)
+$(call gb_LinkTarget_set_include,$(1),\
+   -I$(call gb_UnpackedTarball_get_dir,glew/include) \
+   $$(INCLUDE) \
+)
+
+ifeq ($(COM),MSC)
+$(call gb_LinkTarget_add_libs,$(1),\
+   $(call gb_UnpackedTarball_get_dir,glew)/lib/$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug/Win32/glew32d.lib,Release/Win32/glew32.lib) \
+)
+else
+$(call gb_LinkTarget_add_libs,$(1),\
+   -L$(call gb_UnpackedTarball_get_dir,glew)/lib/ -lGLEW \
+)
+endif
+
+endef
+
+endif
+
 define gb_LinkTarget__use_iconv
 $(call gb_LinkTarget_add_libs,$(1),-liconv)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk scp2/source

[Michael Stahl]

 RepositoryExternal.mk|2 +-
 scp2/source/ooo/file_library_ooo.scp |   20 +++-
 2 files changed, 4 insertions(+), 18 deletions(-)

New commits:
commit ae8e579515fff84cbef1ccc2da78fa769fb079ec
Author: Michael Stahl mst...@redhat.com
Date:   Fri Jan 10 12:07:31 2014 +0100

scp2: fix windows build

913bf64b0bf1330a5055c26770faedf2ad7fc3c5 had some issues with redland
stuff that is built as Library on windows, and the libxslt package is
actually called xslt for unknown reasons; unfortunately the buildbot
did not actually try to create an installation set so it was not
detected.

Change-Id: I0437f09228f62b21036a6c26e3d17029d1aab79e

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 98736fc..721eb9d 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -986,7 +986,7 @@ endef
 ifneq ($(OS),ANDROID)
 
 ifeq ($(COM),MSC)
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
raptor2 \
rasqal \
rdf \
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index f9aa5c4..c90e28a 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -275,23 +275,7 @@ File gid_File_Lib_Xslt
 LIB_FILE_BODY;
 Styles = (FILELIST);
 Dir = FILELIST_DIR;
-Name = libxslt.filelist;
-End
-File gid_File_Lib_eXslt
-PACKED_LIB_FILE_BODY;
-  #ifdef UNX
-#ifdef MACOSX
-   Name = STRING(CONCAT4(libexslt,.,0,UNXSUFFIX));
-#else
-   Name = STRING(CONCAT4(libexslt,UNXSUFFIX,.,0));
-#endif
-  #else
-   #ifdef _gcc3
-Name = libexslt-0.dll;
-   #else
-Name = libexslt.dll;
-   #endif
-  #endif
+Name = xslt.filelist;
 End
 #endif
 
@@ -369,6 +353,7 @@ End
 #endif
 
 #ifndef SYSTEM_REDLAND
+#ifndef WNT
 File gid_File_Lib_Raptor
 LIB_FILE_BODY;
 Styles = (FILELIST);
@@ -389,5 +374,6 @@ File gid_File_Lib_Rdf
 Dir = FILELIST_DIR;
 Name = redland.filelist;
 End
+#endif // WNT
 #endif // SYSTEM_REDLAND
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Rene Engelhard]

 RepositoryExternal.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3e2a03a8f4b56ef1553837ec47a65cb818bcf673
Author: Rene Engelhard r...@debian.org
Date:   Sun Dec 1 14:05:38 2013 +0100

fix system-libeot build

Change-Id: I1473dc65cf768bbe92e50cb0a8414d526c5e7c68

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 97d4bbf..3073c565 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2641,7 +2641,7 @@ endif
 
 ifeq ($(ENABLE_EOT),TRUE)
 
-ifeq ($(SYSTEM_LIBEOT),TRUE)
+ifeq ($(SYSTEM_LIBEOT),YES)
 
 define gb_LinkTarget__use_libeot
 $(call gb_LinkTarget_set_include,$(1),\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[David Tardon]

 RepositoryExternal.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9ce38ef1e6583ddf344a9d5d5a51ea381dc2cef1
Author: David Tardon dtar...@redhat.com
Date:   Tue Nov 5 07:03:08 2013 +0100

fix build

Change-Id: I90892fe0b585a5b50ee46fcc48f964f423bee256

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 8ca76f5..32711b4 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1809,7 +1809,7 @@ endef
 
 else # ENABLE_AVAHI
 
-define gb_LinkTarget__use_avahi :=
+gb_LinkTarget__use_avahi :=
 
 endif # ENABLE_AVAHI
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk RepositoryFixes.mk Repository.mk

[Michael Stahl]

 Repository.mk |   15 -
 RepositoryExternal.mk |   78 +-
 RepositoryFixes.mk|   52 -
 3 files changed, 3 insertions(+), 142 deletions(-)

New commits:
commit 5f9cda2dc5e6d217328ff4f7da27a6f0e6fcf5de
Author: Michael Stahl mst...@redhat.com
Date:   Fri Nov 1 15:43:47 2013 +0100

Repository*: no need to register libraries built via ExternalProject

Only libraries (and similar for executables) built as Library need to be
registered; those built via ExternalProject are delivered by Project and
used via gb_LinkTarget_add_libs.  This also means there is no need to
mangle the names in RepositoryFixes.mk.

Change-Id: Ib0b67f54e2eb6efdb0c454c9e2dd599ada229676
Reviewed-on: https://gerrit.libreoffice.org/6533
Tested-by: LibreOffice gerrit bot ger...@libreoffice.org
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com

diff --git a/Repository.mk b/Repository.mk
index b3e21fe..c490c6b 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -646,21 +646,6 @@ $(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \
passive_native \
 ))
 
-ifeq ($(OS),WNT)
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-   xmlsec1 \
-))
-ifeq ($(COM),MSC)
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-   xmlsec1-mscrypto \
-))
-else
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-   xmlsec1-nss \
-))
-endif
-endif
-
 $(eval $(call gb_Helper_register_jars,URE, \
java_uno \
juh \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index d3b8dc5..568d2ac 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -192,10 +192,6 @@ endef
 
 else
 
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE,\
-cppunit \
-))
-
 define gb_LinkTarget__use_cppunit
 $(call gb_LinkTarget_use_external_project,$(1),cppunit)
 
@@ -767,10 +763,6 @@ gb_ExternalProject__use_libxml2:=
 
 else # !SYSTEM_LIBXML
 
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
-   xml2 \
-))
-
 define gb_LinkTarget__use_libxml2
 $(call gb_LinkTarget_use_package,$(1),xml2)
 $(call gb_LinkTarget_set_include,$(1),\
@@ -820,11 +812,6 @@ endef
 
 else # !SYSTEM_LIBXSLT
 
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-   exslt \
-   xslt \
-))
-
 define gb_LinkTarget__use_libxslt
 $(call gb_LinkTarget_use_package,$(1),xslt)
 $(call gb_LinkTarget_set_include,$(1),\
@@ -990,11 +977,13 @@ endef
 
 ifneq ($(OS),ANDROID)
 
+ifeq ($(COM),MSC)
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
raptor2 \
rasqal \
rdf \
 ))
+endif
 
 define gb_LinkTarget__use_librdf
 $(call gb_LinkTarget_use_packages,$(1),raptor rasqal redland)
@@ -1039,13 +1028,6 @@ endef
 
 else ifeq ($(SYSTEM_CAIRO),NO)
 
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-   cairo \
-   $(if $(filter-out MACOSX WNT,$(OS)), \
-   pixman-1 \
-   ) \
-))
-
 define gb_LinkTarget__use_cairo
 $(call gb_LinkTarget_use_package,$(1),cairo)
 $(call gb_LinkTarget_use_package,$(1),pixman)
@@ -1206,21 +1188,6 @@ $(call gb_ExternalProject_use_package,$(1),icu)
 endef
 
 # icudata and icui18n is called icudt and icuin when built with MSVC :-/
-ifeq ($(OS)$(COM),WNTMSC)
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-   icudt \
-   icuin \
-))
-else
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-   icudata$(gb_ICU_suffix) \
-   icui18n$(gb_ICU_suffix) \
-))
-endif
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-   icuuc$(gb_ICU_suffix) \
-))
-
 define gb_LinkTarget__use_icudata
 $(call gb_LinkTarget_use_package,$(1),icu)
 
@@ -1323,13 +1290,6 @@ endef
 
 else # !SYSTEM_OPENSSL
 
-ifeq ($(OS),WNT)
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-crypto \
-ssl \
-))
-endif
-
 define gb_ExternalProject__use_openssl
 $(call gb_ExternalProject_use_package,$(1),openssl)
 
@@ -1745,10 +1705,6 @@ endef
 
 else
 
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-   lcms2 \
-))
-
 define gb_LinkTarget__use_lcms2
 $(call gb_LinkTarget_use_package,$(1),lcms2)
 $(call gb_LinkTarget_set_include,$(1),\
@@ -1775,10 +1731,6 @@ endef
 
 else # !SYSTEM_LPSOLVE
 
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-   lpsolve55 \
-))
-
 define gb_LinkTarget__use_lpsolve
 $(call gb_LinkTarget_use_unpacked,$(1),lpsolve)
 ifeq ($(COM),MSC)
@@ -2020,10 +1972,6 @@ endef
 
 else # !SYSTEM_CURL
 
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-   curl \
-))
-
 define gb_LinkTarget__use_curl
 $(call gb_LinkTarget_use_package,$(1),curl)
 $(call gb_LinkTarget_set_include,$(1),\
@@ -2248,10 +2196,6 @@ else # !SYSTEM_FIREBIRD
 
 #$(call gb_LinkTarget__use_libatomic_ops,$(1))
 
-$(eval $(call 

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Michael Stahl]

 RepositoryExternal.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5bad73429cd6c105c85c14763edbe012a92e9e49
Author: Michael Stahl mst...@redhat.com
Date:   Fri Oct 25 23:42:17 2013 +0200

oops, fix gb_ExternalProject__use_commons-logging

Change-Id: I11ed8f8c51fde0205d86580c2af46a1d7c399b3a

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 75d2b52..ccb0fdc 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2860,7 +2860,7 @@ $(call 
gb_Jar_use_external_project,$(1),apache_commons_logging)
 $(call gb_Jar_use_jar,$(1),commons-logging-1.1.1)
 endef
 define gb_ExternalProject__use_commons-logging
-$(call gb_ExternalProject_use_external_project,$(1),apache_commons_logging)
+$(call gb_ExternalProject_use_package,$(1),apache_commons_logging)
 endef
 
 endif # SYSTEM_APACHE_COMMONS
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits