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

2023-11-10 Thread Mike Kaganski (via logerrit) 
 Repository.mk |2 +-
 RepositoryExternal.mk |6 --
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit fac623a8b844ffd42bd6318dba91e9253268198d
Author: Mike Kaganski 
AuthorDate: Fri Nov 10 21:10:11 2023 +0300
Commit: Mike Kaganski 
CommitDate: Fri Nov 10 21:38:08 2023 +0100

Fix packaging with --enable-mpl-subset

Change-Id: I1cae9e9a9837df968663b6f46bd1e0d369377126
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159308
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 46b1c1bb70ed..9659ec7c163f 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3057,9 +3057,10 @@ endef
 else # !SYSTEM_POSTGRESQL
 
 ifeq ($(OS),WNT)
+$(if $(MPL_SUBSET),,\
 $(eval $(call gb_Helper_register_packages_for_install,postgresqlsdbc,\
postgresql \
-))
+)))
 endif # WNT
 
 define gb_LinkTarget__use_postgresql
commit cf53900ae8f25529a001602d56fd2f08b6bdde3a
Author: Mike Kaganski 
AuthorDate: Fri Nov 10 21:09:11 2023 +0300
Commit: Mike Kaganski 
CommitDate: Fri Nov 10 21:38:00 2023 +0100

Fix packaging with --disable-curl

Change-Id: I9c3c1f1953c4d59c5a2d4c6017e73768d93a7bc7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159307
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/Repository.mk b/Repository.mk
index 72a88d3e8429..b9cf9c2ddb9c 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -376,7 +376,7 @@ endif
 
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 avmedia \
-   LanguageTool \
+   $(if $(ENABLE_CURL),LanguageTool) \
 $(call gb_Helper_optional,AVMEDIA, \
$(if $(filter MACOSX,$(OS)),\
avmediaMacAVF \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 0eddf400a77c..46b1c1bb70ed 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2737,9 +2737,10 @@ endef
 
 else # !SYSTEM_CURL
 
+$(if $(ENABLE_CURL),\
 $(eval $(call gb_Helper_register_packages_for_install,ooo,\
curl \
-))
+)))
 
 define gb_LinkTarget__use_curl
 $(call gb_LinkTarget_use_package,$(1),curl)

[Libreoffice-commits] core.git: 2 commits - RepositoryExternal.mk Repository.mk scp2/AutoInstall.mk scp2/InstallModule_base.mk scp2/source

2017-01-09 Thread Michael Stahl 
 Repository.mk |5 -
 RepositoryExternal.mk |4 
 scp2/AutoInstall.mk   |1 +
 scp2/InstallModule_base.mk|1 +
 scp2/source/base/firebird.scp |   13 +++--
 5 files changed, 13 insertions(+), 11 deletions(-)

New commits:
commit e014213ae42da5e5464724bc79956e684f7f20cd
Author: Michael Stahl 
Date:   Mon Jan 9 14:49:38 2017 +0100

scp2: move firebird_sdbc library to firebirdsdbc module

Change-Id: Ie57ae3452947a8454eca5d83f2e80d168ef2fa6d

diff --git a/Repository.mk b/Repository.mk
index 560716d..f891da0 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -334,7 +334,6 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
flat \
file) \
filterconfig \
-   $(if $(filter $(ENABLE_FIREBIRD_SDBC),TRUE),firebird_sdbc) \
fps_office \
for \
forui \
@@ -457,6 +456,10 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,postgresqlsdbc, \
postgresql-sdbc-impl) \
 ))
 
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,firebirdsdbc, \
+   $(if $(ENABLE_FIREBIRD_SDBC),firebird_sdbc) \
+))
+
 ifneq ($(ENABLE_PDFIMPORT),)
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,pdfimport, \
pdfimport \
commit 2c78d4965a8ddd77b926edc0e0aa4a19577e2453
Author: Michael Stahl 
Date:   Mon Jan 9 14:45:11 2017 +0100

tdf#90753 scp2: move firebirdsdbc packages to AutoInstall

Change-Id: Ifabb9fa65115fcc1728fa16e142ef008834eedda

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f4732df..02392ae 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2925,6 +2925,10 @@ endef
 
 else # !SYSTEM_FIREBIRD
 
+$(eval $(call gb_Helper_register_packages_for_install,firebirdsdbc,\
+   firebird \
+))
+
 #$(call gb_LinkTarget__use_libatomic_ops,$(1))
 #$(call gb_LinkTarget__use_libtommath,$(1))
 
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 43c53ab..409ceb9 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_AutoInstall_add_module,extensions_ct2n))
 $(eval $(call gb_AutoInstall_add_module,extensions_bsh,,,LIBO_JAR_FILE))
 $(eval $(call gb_AutoInstall_add_module,extensions_numbertext))
 $(eval $(call gb_AutoInstall_add_module,extensions_rhino,,,LIBO_JAR_FILE))
+$(eval $(call gb_AutoInstall_add_module,firebirdsdbc,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,gnome,LIBO_LIB_FILE,LIBO_EXECUTABLE))
 $(eval $(call gb_AutoInstall_add_module,graphicfilter,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE))
diff --git a/scp2/InstallModule_base.mk b/scp2/InstallModule_base.mk
index 2efba18..709d149 100644
--- a/scp2/InstallModule_base.mk
+++ b/scp2/InstallModule_base.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/base))
 $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/base,\
base \
base_brand \
+   firebirdsdbc \
postgresqlsdbc \
 ))
 
diff --git a/scp2/source/base/firebird.scp b/scp2/source/base/firebird.scp
index dd7288f..61cfff9 100644
--- a/scp2/source/base/firebird.scp
+++ b/scp2/source/base/firebird.scp
@@ -18,6 +18,8 @@
 
 #include "macros.inc"
 
+#include "AutoInstall/firebirdsdbc"
+
 #if defined( ENABLE_FIREBIRD_SDBC ) && !defined( SYSTEM_FIREBIRD )
 
 Module gid_Module_Optional_Firebird
@@ -25,17 +27,8 @@ Module gid_Module_Optional_Firebird
 Description = "Firebird embedded database";
 PackageInfo = "packinfo_office.txt";
 ParentID = gid_Module_Root_Brand;
-Files = (
-File gid_File_Firebird
-);
+Files = (auto_firebirdsdbc_ALL);
 Styles = (HIDDEN_ROOT);
 End
 
-File gid_File_Firebird
-TXT_FILE_BODY;
-Styles = (FILELIST, PACKED);
-Dir = FILELIST_DIR;
-Name = "firebird.filelist";
-End
-
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-08-03 Thread Tor Lillqvist 
 Repository.mk |2 --
 RepositoryExternal.mk |2 --
 2 files changed, 4 deletions(-)

New commits:
commit 66a117c8473cfa8181e139e406470428edffd32c
Author: Tor Lillqvist 
Date:   Wed Aug 3 21:19:56 2016 +0300

ENABLE_OPENGL does not mean whether to enable OpenGL use in general

It refers to only the (old) OpenGL slideshow transition code. So no
reason to have glew conditional on it.

Change-Id: I13bc3e3c25fd7a33e05b39b405af0c85ab6a8e96

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 04546e5..c880d63 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -183,7 +183,6 @@ endef
 
 endif # SYSTEM_CPPUNIT
 
-ifneq ($(ENABLE_OPENGL)$(if $(filter ANDROID,$(OS)),TRUE),)
 ifneq ($(SYSTEM_GLEW),)
 
 define gb_LinkTarget__use_glew
@@ -229,7 +228,6 @@ $(call gb_ExternalProject_use_external_project,$(1),glew)
 endef
 
 endif # SYSTEM_GLEW
-endif # ENABLE_OPENGL
 
 ifneq ($(SYSTEM_GLYPHY),)
 
commit e782dc304415e47652eb33be86ce8c28062c3426
Author: Tor Lillqvist 
Date:   Wed Aug 3 21:17:34 2016 +0300

ENABLE_OPENGL does not mean whether to enable OpenGL use in general

It refers to only the OpenGL slideshow transitions. So no reason for
avmediaogl to depend on it.

Change-Id: If85ad6bcd077d9e753c259aa8dc6ad5629105136

diff --git a/Repository.mk b/Repository.mk
index 4dcd930..157fdd4 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -605,13 +605,11 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
) \
 ))
 
-ifeq ($(ENABLE_OPENGL),TRUE)
 ifeq ($(ENABLE_GLTF),TRUE)
 $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
 avmediaogl \
 ))
 endif
-endif
 
 ifeq ($(OS),WNT)
 $(eval $(call 
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,activexbinarytable, \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-17 Thread Michael Stahl 
 Repository.mk |   10 +---
 RepositoryExternal.mk |   25 +++--
 scp2/source/ooo/file_library_ooo.scp  |   40 --
 scp2/source/ooo/module_hidden_ooo.scp |5 
 4 files changed, 25 insertions(+), 55 deletions(-)

New commits:
commit 32a617d8f00636d5cf660577c8cd47633b0bcd7e
Author: Michael Stahl mst...@redhat.com
Date:   Mon Feb 17 11:23:19 2014 +0100

move external packages registration to RepositoryExternal.mk

(with condition from configure.ac for cairo)

Change-Id: I7f4864a7f331f1a3da9c796b51f4e16c58382580

diff --git a/Repository.mk b/Repository.mk
index 79afd37..87916df 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -706,15 +706,6 @@ $(eval $(call gb_Helper_register_packages_for_install,ure,\
) \
 ))
 
-$(eval $(call gb_Helper_register_packages_for_install,ooo,\
-   $(if $(SYSTEM_CURL),,curl) \
-   $(if $(SYSTEM_LCMS2),,lcms2) \
-   $(if $(SYSTEM_LIBXSLT),,xslt) \
-   $(if $(SYSTEM_CAIRO),,cairo \
-   $(if $(filter $(OS),WNT),,pixman) \
-   ) \
-))
-
 # External executables
 $(eval $(call gb_ExternalExecutable_register_executables,\
genbrk \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 23d5a6a..1133bb9 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -871,6 +871,10 @@ endef
 
 else # !SYSTEM_LIBXSLT
 
+$(eval $(call gb_Helper_register_packages_for_install,ooo,\
+   xslt \
+))
+
 define gb_LinkTarget__use_libxslt
 $(call gb_LinkTarget_use_package,$(1),xslt)
 $(call gb_LinkTarget_set_include,$(1),\
@@ -1073,6 +1077,8 @@ endif # ANDROID
 endif # SYSTEM_REDLAND
 
 
+ifneq ($(filter unx,$(GUIBASE))$(ENABLE_CAIRO_CANVAS),) # or
+
 ifneq ($(SYSTEM_CAIRO),)
 
 define gb_LinkTarget__use_cairo
@@ -1087,6 +1093,11 @@ endef
 
 else # !SYSTEM_CAIRO
 
+$(eval $(call gb_Helper_register_packages_for_install,ooo,\
+   cairo \
+   $(if $(filter $(OS),WNT),,pixman) \
+))
+
 define gb_LinkTarget__use_cairo
 $(call gb_LinkTarget_use_package,$(1),cairo)
 $(call gb_LinkTarget_use_package,$(1),pixman)
@@ -1107,6 +1118,8 @@ endef
 
 endif # SYSTEM_CAIRO
 
+endif # CAIRO
+
 ifneq ($(SYSTEM_FREETYPE),)
 
 define gb_LinkTarget__use_freetype_headers
@@ -1810,6 +1823,10 @@ gb_ExternalProject__use_lcms2 :=
 
 else # !SYSTEM_LCMS2
 
+$(eval $(call gb_Helper_register_packages_for_install,ooo,\
+   lcms2 \
+))
+
 define gb_ExternalProject__use_lcms2
 $(call gb_ExternalProject_use_package,$(1),lcms2)
 
@@ -2093,6 +2110,10 @@ endef
 
 else # !SYSTEM_CURL
 
+$(eval $(call gb_Helper_register_packages_for_install,ooo,\
+   curl \
+))
+
 define gb_LinkTarget__use_curl
 $(call gb_LinkTarget_use_package,$(1),curl)
 $(call gb_LinkTarget_set_include,$(1),\
commit f703432dd1160edace1a2f457fb3b33a7322
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date:   Wed Feb 12 06:53:02 2014 -0200

fdo#60924: Move more libs/packages to autoinstall

Change-Id: I687f45eeea1e60e8076222865bd803c2ad18f758

diff --git a/Repository.mk b/Repository.mk
index b702ae3..79afd37 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -530,9 +530,11 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
sdbc2 \
sofficeapp \
srtrs1 \
+   $(if $(filter $(OS),WNT),sysdtrans) \
textconv_dict \
ucb1 \
ucbhelper \
+   $(if $(DISABLE_NEON),,ucpdav1) \
ucpfile1 \
ucpftp1 \
ucpchelp1 \
@@ -561,7 +563,6 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
pyuno \
pyuno_wrapper \
-   ucpdav1 \
xsec_xmlsec \
$(if $(filter $(OS),ANDROID), \
lo-bootstrap \
@@ -606,7 +607,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
regpatchactivex \
so_activex \
so_activex_x64 \
-   sysdtrans \
thidxmsi \
 ))
 endif
@@ -710,6 +710,9 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
$(if $(SYSTEM_CURL),,curl) \
$(if $(SYSTEM_LCMS2),,lcms2) \
$(if $(SYSTEM_LIBXSLT),,xslt) \
+   $(if $(SYSTEM_CAIRO),,cairo \
+   $(if $(filter $(OS),WNT),,pixman) \
+   ) \
 ))
 
 # External executables
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index bb57257..23d5a6a 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -969,7 +969,7 @@ endef
 
 else # !SYSTEM_NEON
 
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
+$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
neon \
 ))
 
@@ -2218,7 +2218,7 @@ $(call gb_LinkTarget_use_libraries,$(1),\
 
 endef
 
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
+$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
clucene \
 ))
 
diff --git a/scp2/source/ooo/file_library_ooo.scp

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

2013-10-21 Thread David Tardon 
 Repository.mk |1 +
 RepositoryExternal.mk |   17 ++---
 2 files changed, 15 insertions(+), 3 deletions(-)

New commits:
commit 670690e200e82be6a087ab57599e23a320dd5dde
Author: David Tardon dtar...@redhat.com
Date:   Sun Oct 20 21:06:59 2013 +0200

fix registration path for ucpp

Change-Id: I1a4d8f38dc0279bb427e07f97b96547c9d7d350f

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 3877dc2..c23d894 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3033,7 +3033,7 @@ gb_ExternalExecutable__register_ucpp :=
 else # ! SYSTEM_UCPP
 
 define gb_ExternalExecutable__register_ucpp
-$(call gb_ExternalExecutable_set_internal,ucpp)
+$(call 
gb_ExternalExecutable_set_internal,ucpp,$(INSTROOT_FOR_BUILD)/$(SDKDIRNAME)/bin/ucpp$(gb_Executable_EXT_for_build))
 
 endef
 
commit ce038cf8d75dde575643042e57addf559eb57059
Author: David Tardon dtar...@redhat.com
Date:   Sun Oct 20 20:43:46 2013 +0200

Revert ucpp is not an ExternalExecutable

Wrong! It is.

This reverts commit 7369a8cad62ba6151ba8c16c41d0005fdf87f0ec.

diff --git a/Repository.mk b/Repository.mk
index cb876cb..5a92fd6 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -728,6 +728,7 @@ $(eval $(call gb_ExternalExecutable_register_executables,\
genccode \
gencmn \
python \
+   ucpp \
xmllint \
xsltproc \
 ))
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 20a4881..3877dc2 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2953,13 +2953,11 @@ endef
 
 endif
 
-ifeq (,$(SYSTEM_UCPP))
 define gb_Executable__register_idlc
 $(call gb_Executable_add_runtime_dependencies,idlc,\
-   $(call gb_Executable_get_target_for_build,ucpp) \
+   $(call gb_ExternalExecutable_get_dependencies,ucpp) \
 )
 endef
-endif
 
 define gb_Executable__register_localize
 $(call gb_Executable_add_runtime_dependencies,localize,\
@@ -3028,6 +3026,19 @@ endef
 
 endif # SYSTEM_LIBXSLT_FOR_BUILD
 
+ifneq (,$(SYSTEM_UCPP))
+
+gb_ExternalExecutable__register_ucpp :=
+
+else # ! SYSTEM_UCPP
+
+define gb_ExternalExecutable__register_ucpp
+$(call gb_ExternalExecutable_set_internal,ucpp)
+
+endef
+
+endif # SYSTEM_UCPP
+
 ifeq (,$(PYTHON_FOR_BUILD))
 
 define gb_ExternalExecutable__register_python
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits