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

2022-11-06 Thread Tor Lillqvist (via logerrit) 
 scp2/InstallModule_ooo.mk|1 +
 scp2/source/ooo/file_ooo.scp |6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 07d303b74108debc9e2b9855a49d69bf156a91a9
Author: Tor Lillqvist 
AuthorDate: Mon Oct 31 13:30:27 2022 +0200
Commit: Andras Timar 
CommitDate: Mon Nov 7 00:02:57 2022 +0100

Match conditionals in dictionaries/Module_dictionaries.mk

Change-Id: Ia80af0e949c160718cf815630d383bf7c36e5b00
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142071
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 8739b86cfdf9..9a6f3eb4cb46 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -23,6 +23,7 @@ $(eval $(call 
gb_InstallModule_use_auto_install_libs,scp2/ooo,\
 $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
ENABLE_MACOSX_SANDBOX \
ENABLE_ONLINE_UPDATE \
+   MPL_SUBSET \
SYSTEM_CURL \
SYSTEM_HSQLDB \
SYSTEM_LIBXSLT \
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index dc85a8b0154c..d6e424629536 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -383,7 +383,7 @@ File gid_File_Extension_Dictionary_Da
 End
 #endif
 
-#if defined WITH_MYSPELL_DICTS
+#if defined WITH_MYSPELL_DICTS && !defined MPL_SUBSET
 File gid_File_Extension_Dictionary_De
Dir = FILELIST_DIR;
Name = "Dictionary/dict-de.filelist";
@@ -392,7 +392,7 @@ File gid_File_Extension_Dictionary_De
 End
 #endif
 
-#if defined WITH_MYSPELL_DICTS
+#if defined WITH_MYSPELL_DICTS && !defined MPL_SUBSET
 File gid_File_Extension_Dictionary_En
Dir = FILELIST_DIR;
Name = "Dictionary/dict-en.filelist";
@@ -536,7 +536,7 @@ File gid_File_Extension_Dictionary_Is
 End
 #endif
 
-#if defined WITH_MYSPELL_DICTS
+#if defined WITH_MYSPELL_DICTS && !defined MPL_SUBSET
 File gid_File_Extension_Dictionary_It
Dir = FILELIST_DIR;
Name = "Dictionary/dict-it.filelist";

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

2016-04-11 Thread Rene Engelhard 
 scp2/InstallModule_ooo.mk|1 +
 scp2/source/ooo/common_brand.scp |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit cb6d938a07f727138a5ec2db1cbefaf4b1be3c50
Author: Rene Engelhard 
Date:   Mon Apr 11 09:56:23 2016 +0200

don't install qstart.desktop if it's disabled (--disable-systray)

Change-Id: I21a53381ad4018034de3833e8e244d0d7a7d28b8

diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index d54ca2e..35db721 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -19,6 +19,7 @@ $(eval $(call 
gb_InstallModule_use_auto_install_libs,scp2/ooo,\
 
 $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
ENABLE_GTK \
+   ENABLE_SYSTRAY_GTK \
ENABLE_GTK3 \
ENABLE_MACOSX_SANDBOX \
ENABLE_ONLINE_UPDATE \
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 3bf3c91..7cd7733 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -609,7 +609,7 @@ End
 #endif
 
 #if defined UNX && ! defined MACOSX
-#ifdef ENABLE_GTK
+#ifdef ENABLE_SYSTRAY_GTK
 File gid_Brand_File_Share_Xdg_QStart
 TXT_FILE_BODY;
 Dir = gid_Brand_Dir_Share_Xdg;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-01-19 Thread Miklos Vajna 
 scp2/InstallModule_ooo.mk |1 +
 scp2/source/ooo/module_libreofficekit.scp |2 ++
 2 files changed, 3 insertions(+)

New commits:
commit 8373ae58eb0dfb57d5145afaf6830ec9f05849de
Author: Miklos Vajna 
Date:   Tue Jan 19 22:03:39 2016 +0100

scp2: fix --disable-gtk3 build

Change-Id: I231cb935f1d0a4e69bc3f970e48aece8305ab2b3

diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 77b865c..47c8cc6 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -19,6 +19,7 @@ $(eval $(call 
gb_InstallModule_use_auto_install_libs,scp2/ooo,\
 
 $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
ENABLE_GTK \
+   ENABLE_GTK3 \
ENABLE_MACOSX_SANDBOX \
ENABLE_ONLINE_UPDATE \
ENABLE_TDE \
diff --git a/scp2/source/ooo/module_libreofficekit.scp 
b/scp2/source/ooo/module_libreofficekit.scp
index e66331f..09b3220 100644
--- a/scp2/source/ooo/module_libreofficekit.scp
+++ b/scp2/source/ooo/module_libreofficekit.scp
@@ -28,6 +28,7 @@ Directory gid_Dir_Share_Libreofficekit
 DosName = "libreofficekit";
 End
 
+#ifdef ENABLE_GTK3
 File gid_File_Dat_HandleImageStart
 TXT_FILE_BODY;
 Dir = gid_Dir_Share_Libreofficekit;
@@ -55,5 +56,6 @@ File gid_File_Dat_HandleGraphic
 Name = "handle_graphic.png";
 Styles = (PACKED);
 End
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-01-19 Thread Pranav Kant 
 scp2/InstallModule_ooo.mk|1 
 scp2/source/ooo/module_libreofficekit.scp|   59 +++
 setup_native/source/packinfo/packinfo_office.txt |   14 +
 3 files changed, 74 insertions(+)

New commits:
commit 85b46f51928dc17cda1bc974bca9159de9221b4d
Author: Pranav Kant 
Date:   Tue Jan 19 19:05:40 2016 +0530

lokdocview: Add scp files for selection handle PNGs

Change-Id: I4d3eab1f16751a1b3f24a995e3d28322fd2f510b
Reviewed-on: https://gerrit.libreoffice.org/21606
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index c9e4199..77b865c 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -102,6 +102,7 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/ooo,\
scp2/source/ooo/mingw_dlls \
) \
 scp2/source/ooo/module_filter \
+scp2/source/ooo/module_libreofficekit \
 ))
 
 $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/ooo,\
diff --git a/scp2/source/ooo/module_libreofficekit.scp 
b/scp2/source/ooo/module_libreofficekit.scp
new file mode 100644
index 000..e66331f
--- /dev/null
+++ b/scp2/source/ooo/module_libreofficekit.scp
@@ -0,0 +1,59 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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/.
+ */
+
+#include "macros.inc"
+
+Module gid_Module_Libreofficekit
+Name = "Libreofficekit Data";
+Description = "Libreofficekit Data";
+PackageInfo = "packinfo_office.txt";
+ParentID = gid_Module_Root_Brand;
+Styles = (HIDDEN_ROOT);
+Dirs = (gid_Dir_Share_Libreofficekit);
+Files = (
+gid_File_Dat_HandleImageStart,
+gid_File_Dat_HandleImageMiddle,
+gid_File_Dat_HandleImageEnd,
+gid_File_Dat_HandleGraphic);
+End
+
+Directory gid_Dir_Share_Libreofficekit
+ParentID = gid_Brand_Dir_Share;
+DosName = "libreofficekit";
+End
+
+File gid_File_Dat_HandleImageStart
+TXT_FILE_BODY;
+Dir = gid_Dir_Share_Libreofficekit;
+Name = "handle_image_start.png";
+Styles = (PACKED);
+End
+
+File gid_File_Dat_HandleImageMiddle
+TXT_FILE_BODY;
+Dir = gid_Dir_Share_Libreofficekit;
+Name = "handle_image_middle.png";
+Styles = (PACKED);
+End
+
+File gid_File_Dat_HandleImageEnd
+TXT_FILE_BODY;
+Dir = gid_Dir_Share_Libreofficekit;
+Name = "handle_image_end.png";
+Styles = (PACKED);
+End
+
+File gid_File_Dat_HandleGraphic
+TXT_FILE_BODY;
+Dir = gid_Dir_Share_Libreofficekit;
+Name = "handle_graphic.png";
+Styles = (PACKED);
+End
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/setup_native/source/packinfo/packinfo_office.txt 
b/setup_native/source/packinfo/packinfo_office.txt
index 8bc7ed8..a097481 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -1177,3 +1177,17 @@ destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
 End
 
+Start
+module = "gid_Module_Libreofficekit"
+solarispackagename = 
"%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-libreofficekit-data"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core 
(Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-libreofficekit-data"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
+linuxpatchrequires = ""
+copyright = "2016 The Document Foundation"
+solariscopyright = "solariscopyrightfile"
+vendor = "The Document Foundation"
+description = "Libreofficekit data files for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%PACKAGEVERSION"
+End
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-09-28 Thread Samuel Mehrbrodt 
 scp2/InstallModule_ooo.mk  |2 +-
 scp2/source/ooo/file_extra_ooo.scp |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit cc09a58ef3fd39db61369cf399de11360966d39e
Author: Samuel Mehrbrodt 
Date:   Mon Sep 28 09:57:56 2015 +0200

One more GUIBASE -> USING_X11

Change-Id: I383b83b3778b11a012a931c19a2be85445af29c5
Reviewed-on: https://gerrit.libreoffice.org/18900
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 

diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 955a0d7..ccbe548 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -53,7 +53,7 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
 
 ifeq ($(USING_X11),TRUE)
 $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
-   -DGUIBASE_UNX \
+   -DUSING_X11 \
 ))
 endif
 
diff --git a/scp2/source/ooo/file_extra_ooo.scp 
b/scp2/source/ooo/file_extra_ooo.scp
index f56c028..11c6ffa 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -74,7 +74,7 @@ File gid_File_Extra_Databasebiblio
 Name = "extras_databasebiblio.filelist";
 End
 
-#ifdef GUIBASE_UNX
+#ifdef USING_X11
 
 File gid_File_Extra_Fontunxppds
 Dir = FILELIST_DIR;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-07-18 Thread Michael Stahl 
 scp2/InstallModule_ooo.mk|2 +-
 scp2/source/ooo/module_pdfimport.scp |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d52985d8147f5d6c21bf62d2c9375dbbd47423b1
Author: Michael Stahl mst...@redhat.com
Date:   Fri Jul 18 18:01:54 2014 +0200

scp2: stupid typos

Change-Id: I94b3f39ce3dc642c97dfd515b026e4470724b06c

diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 0a4b83e4..ebfe131 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -13,7 +13,7 @@ $(eval $(call 
gb_InstallModule_use_auto_install_libs,scp2/ooo,\
ooo \
ooobinarytable \
reportbuilder \
-   xpdfimport \
+   pdfimport \
 ))
 
 $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
diff --git a/scp2/source/ooo/module_pdfimport.scp 
b/scp2/source/ooo/module_pdfimport.scp
index b882570..320ba85 100644
--- a/scp2/source/ooo/module_pdfimport.scp
+++ b/scp2/source/ooo/module_pdfimport.scp
@@ -25,7 +25,7 @@
 
 #include macros.inc
 
-#include AutoInstall/xpdfimport
+#include AutoInstall/pdfimport
 
 Module gid_Module_Pdfimport
 Name = PDF Import;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-15 Thread Tor Lillqvist 
 scp2/InstallModule_ooo.mk|3 +++
 scp2/source/ooo/file_library_ooo.scp |5 +
 2 files changed, 8 insertions(+)

New commits:
commit 9986f236d6b56ad773adfbc2107bfc1c6bd181d0
Author: Tor Lillqvist t...@collabora.com
Date:   Thu May 15 19:53:07 2014 +0300

Don't reference the avmediaMacAVF library if not built

Change-Id: If4f5c51e986b51f5795012b9535ab7a7ea51337b

diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 4396ef4..4564c72 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -69,6 +69,9 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
$(if $(SYSTEM_HSQLDB),\
-DHSQLDB_JAR=\$(call gb_Helper_make_path,$(HSQLDB_JAR))\ \
) \
+   $(if $(MACOSX_SDK_VERSION),\
+   -DMACOSX_SDK_VERSION=$(MACOSX_SDK_VERSION) \
+   ) \
$(if $(filter MSC,$(COM)),$(if 
$(MSVC_USE_DEBUG_RUNTIME),-DMSVC_PKG_DEBUG_RUNTIME)) \
 ))
 
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index 81ad4de..fa61087 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -107,11 +107,16 @@ File gid_File_Lib_avmediaQuickTime
Name = LIBNAME(avmediaQuickTime);
 End
 
+#if MAXOSX_SDK_VERSION = 1070
+#ifdef X86_64
 File gid_File_Lib_avmediaMacAVF
PACKED_LIB_FILE_BODY;
Name = LIBNAME(avmediaMacAVF);
 End
 #endif
+#endif
+
+#endif
 
 #if defined(MACOSX)
 File gid_File_Lib_Basebmp
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits