diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 09:52:23 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 09:52:23 +0000 |
| commit | bc03a4d4588d46e447d4cbb05e10e55ebc915e7a (patch) | |
| tree | 2e156648c23e5ac46fbc9125fdb86ebb9ff40a9a /debian/patches | |
| parent | Releasing progress-linux version 4:24.2.2-1~progress7.99u1. (diff) | |
| download | libreoffice-bc03a4d4588d46e447d4cbb05e10e55ebc915e7a.tar.xz libreoffice-bc03a4d4588d46e447d4cbb05e10e55ebc915e7a.zip | |
Merging debian version 4:24.2.2-2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/patches/split-sdbc-firebird-mariadb.diff | 58 |
2 files changed, 59 insertions, 0 deletions
diff --git a/debian/patches/series b/debian/patches/series index 2c12454c06..aea9d1e126 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -50,3 +50,4 @@ fix-system-abseil-build.diff fix-riscv64-bridge.diff pdfium-ports.diff python-3.12.diff +split-sdbc-firebird-mariadb.diff diff --git a/debian/patches/split-sdbc-firebird-mariadb.diff b/debian/patches/split-sdbc-firebird-mariadb.diff new file mode 100644 index 0000000000..020a3f5019 --- /dev/null +++ b/debian/patches/split-sdbc-firebird-mariadb.diff @@ -0,0 +1,58 @@ +diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk +index 1e2e473e0b4d..3741e94fd729 100644 +--- a/postprocess/CustomTarget_registry.mk ++++ b/postprocess/CustomTarget_registry.mk +@@ -466,13 +467,17 @@ postprocess_DRIVERS += hsqldb jdbc mysql_jdbc + endif + + ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE) +-postprocess_FILES_main += \ ++postprocess_XCDS += firebird_sdbc.xcd ++postprocess_DEPS_firebird_sdbc := main ++postprocess_FILES_firebird_sdbc += \ + $(call gb_XcuModuleTarget_get_target,connectivity/registry/firebird)/org/openoffice/Office/DataAccess/Drivers-firebird.xcu + postprocess_DRIVERS += firebird_sdbc + endif + + ifeq ($(ENABLE_MARIADBC),TRUE) +-postprocess_FILES_main += \ ++postprocess_XCDS += mysqlc.xcd ++postprocess_DEPS_mysqlc := main ++postprocess_FILES_mysqlc += \ + $(call gb_XcuModuleTarget_get_target,connectivity/registry/mysqlc)/org/openoffice/Office/DataAccess/Drivers-mysqlc.xcu + postprocess_DRIVERS += mysqlc + endif +diff --git a/scp2/source/base/firebird.scp b/scp2/source/base/firebird.scp +index 61cfff9cc496..0fdb2ffc6e66 100644 +--- a/scp2/source/base/firebird.scp ++++ b/scp2/source/base/firebird.scp +@@ -20,15 +20,27 @@ + + #include "AutoInstall/firebirdsdbc" + +-#if defined( ENABLE_FIREBIRD_SDBC ) && !defined( SYSTEM_FIREBIRD ) ++#if defined( ENABLE_FIREBIRD_SDBC ) ++ ++#if !defined( SYSTEM_FIREBIRD ) + + Module gid_Module_Optional_Firebird + Name = "Firebird"; + Description = "Firebird embedded database"; + PackageInfo = "packinfo_office.txt"; + ParentID = gid_Module_Root_Brand; +- Files = (auto_firebirdsdbc_ALL); ++ Files = (auto_firebirdsdbc_ALL, ++ gid_File_FirebirdSdbc_Xcd); + Styles = (HIDDEN_ROOT); + End + + #endif ++ ++File gid_File_FirebirdSdbc_Xcd ++ TXT_FILE_BODY; ++ Dir = gid_Brand_Dir_Share_Registry; ++ Name = "firebird_sdbc.xcd"; ++ Styles = (PACKED); ++End ++ ++#endif |