[SCM] LibreOffice packaging repository branch, debian-experimental-3.7, updated. libreoffice_3.6.2_rc1-1-40-g6530f45
The following commit has been merged in the debian-experimental-3.7 branch:
commit 7d0db22e38c5a2f41b7ff9b6243b8ec49ecee654
Author: Rene Engelhard <rene@debian.org>
Date: Tue Sep 18 01:37:41 2012 +0200
port/unfuzzy most patches to current git
diff --git a/patches/build-dont-run-checks.diff b/patches/build-dont-run-checks.diff
index de314df..5805387 100644
--- a/patches/build-dont-run-checks.diff
+++ b/patches/build-dont-run-checks.diff
@@ -15,16 +15,16 @@ diff --git a/Makefile.top b/Makefile.top
index 7362bbc..ae849fb 100644
--- a/Makefile.top
+++ b/Makefile.top
-@@ -243,7 +243,7 @@ xsltml\
+@@ -251,7 +252,7 @@ xpdf\
+ xsltml\
zlib\
- gb_TAILBUILDMODULES := $(shell $(GNUMAKE) -r -f $(SRCDIR)/tail_build/Makefile showmodules)
-export gb_TAILBUILDTARGET=all slowcheck
+export gb_TAILBUILDTARGET=all
define gbuild_module_rules
.PHONY: $(1) $(1).all $(1).clean $(1).deliver
-@@ -480,11 +480,17 @@ findunusedcode:
+@@ -526,7 +527,7 @@ findunusedcode:
| grep -v WPX \
> unusedcode.easy
@@ -33,16 +33,6 @@ index 7362bbc..ae849fb 100644
subsequentcheck :| $(if $(filter-out subsequentcheck,$(MAKECMDGOALS)),dev-install)
$(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
-
-+unitcheck:
-+ $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
-+
-+slowcheck:
-+ $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
-+
- debugrun:
- $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
-
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 74d0f32..daa4ae0 100755
--- a/solenv/bin/build.pl
diff --git a/patches/debian-debug.diff b/patches/debian-debug.diff
index 7902b29..6484ce8 100644
--- a/patches/debian-debug.diff
+++ b/patches/debian-debug.diff
@@ -2,9 +2,9 @@ diff --git a/configure.in b/configure.in
index 3257668..afd36de 100755
--- libreoffice-3.5.0/configure.in
+++ libreoffice-3.5.0/configure.in
-@@ -3683,8 +3683,13 @@ dnl whether to include symbols into final build.
+@@ -4078,8 +4078,13 @@ dnl whether to include debgugging information into final build.
dnl ===================================================================
- AC_MSG_CHECKING([whether to include symbols])
+ AC_MSG_CHECKING([whether to include debugging information])
if test -n "$enable_symbols" -a "$enable_symbols" != "no"; then
- ENABLE_SYMBOLS="TRUE"
- AC_MSG_RESULT([yes])
diff --git a/patches/debian-hardened-buildflags.diff b/patches/debian-hardened-buildflags.diff
index b058740..590c8ca 100644
--- a/patches/debian-hardened-buildflags.diff
+++ b/patches/debian-hardened-buildflags.diff
@@ -71,14 +71,14 @@ diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index a3231a6..b97f354 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
-@@ -233,6 +233,10 @@ LINKFLAGS += -Wl,--hash-style=$(WITH_LINKER_HASH_STYLE)
- LINKFLAGS += -Wl,-zdynsort
+@@ -204,6 +204,10 @@ LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBA
+ LINKFLAGS += -Wl,-Bsymbolic-functions
.ENDIF
-
+
+LINKFLAGS += $(HARDEN_LDFLAGS)
+CDEFS += $(HARDEN_CPPFLAGS)
+CFLAGS += $(HARDEN_CFLAGS)
+
- # libraries for linking applications
- STDLIBGUIMT+=-Wl,--as-needed $(DL_LIB) $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
- STDLIBCUIMT+=-Wl,--as-needed $(DL_LIB) $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
+ # linker flags for linking applications
+ LINKFLAGSAPPGUI= -Wl,-export-dynamic \
+ -Wl,-rpath-link,$(LB):$(SOLARLIBDIR):$(SYSBASE)/lib:$(SYSBASE)/usr/lib
diff --git a/patches/disable-flaky-unoapi-tests.diff b/patches/disable-flaky-unoapi-tests.diff
index 402d2e2..0a65b20 100644
--- a/patches/disable-flaky-unoapi-tests.diff
+++ b/patches/disable-flaky-unoapi-tests.diff
@@ -6,8 +6,8 @@
--- a/toolkit/Module_toolkit.mk-old 2012-09-05 14:24:27.129693868 +0200
+++ b/toolkit/Module_toolkit.mk 2012-09-05 14:24:39.521755312 +0200
-@@ -35,8 +35,8 @@
- Package_util \
+@@ -34,8 +34,8 @@ $(eval $(call gb_Module_add_targets,toolkit,\
+ Package_inc \
))
-$(eval $(call gb_Module_add_subsequentcheck_targets,toolkit,\
@@ -20,11 +20,10 @@
# vim: set noet sw=4 ts=4:
--- a/sc/qa/unoapi/sc.sce-old 2012-09-06 10:38:29.160466870 +0200
+++ b/sc/qa/unoapi/sc.sce 2012-09-06 10:39:13.684687646 +0200
-@@ -1,19 +1,4 @@
- # i84653 -o sc.ScPageObj
--# i84554 -o sc.AccessibleEditableTextPara_PreviewNote
--# i88241 -o sc.AccessibleEditableTextPara_HeaderFooter
---o sc.AccessibleEditableTextPara_PreviewCell
+@@ -19,18 +19,6 @@
+ # i84554 -o sc.AccessibleEditableTextPara_PreviewNote
+ # i88241 -o sc.AccessibleEditableTextPara_HeaderFooter
+ -o sc.AccessibleEditableTextPara_PreviewCell
--o sc.ScAccessibleCell
-# i91044 -o sc.ScAccessibleCsvCell
-# i91044 -o sc.ScAccessibleCsvGrid
diff --git a/patches/gcc-4.4.diff b/patches/gcc-4.4.diff
index 4a7af21..ddaef8f 100644
--- a/patches/gcc-4.4.diff
+++ b/patches/gcc-4.4.diff
@@ -13,8 +13,8 @@
diff --git a/l10ntools/source/help/HelpCompiler.hxx b/l10ntools/source/help/HelpCompiler.hxx
index 49ebd60..df943b4 100644
---- a/l10ntools/source/help/HelpCompiler.hxx
-+++ b/l10ntools/source/help/HelpCompiler.hxx
+--- a/helpcompiler/inc/HelpCompiler.hxx
++++ b/helpcompiler/inc/HelpCompiler.hxx
@@ -30,6 +30,9 @@
#define HELPCOMPILER_HXX
@@ -27,8 +27,8 @@ index 49ebd60..df943b4 100644
#include <list>
diff --git a/l10ntools/Library_helplinker.mk b/l10ntools/Library_helplinker.mk
index 8cabe50..c5fabe3 100644
---- a/l10ntools/Library_helplinker.mk
-+++ b/l10ntools/Library_helplinker.mk
+--- a/helpcompiler/Library_helplinker.mk
++++ b/helpcompiler/Library_helplinker.mk
@@ -35,6 +35,12 @@ $(eval $(call gb_Library_add_defs,helplinker,\
-DHELPLINKER_DLLIMPLEMENTATION \
))
diff --git a/patches/ignore-sc_cellrangesbase-fails.diff b/patches/ignore-sc_cellrangesbase-fails.diff
index f7d8a84..47b1ee0 100644
--- a/patches/ignore-sc_cellrangesbase-fails.diff
+++ b/patches/ignore-sc_cellrangesbase-fails.diff
@@ -1,9 +1,9 @@
--- a/sc/CppunitTest_sc_cellrangeobj.mk-old 2012-05-09 01:02:30.359827642 +0200
+++ b/sc/CppunitTest_sc_cellrangeobj.mk 2012-05-09 01:04:10.416323786 +0200
-@@ -132,4 +132,6 @@
- $(call gb_CppunitTest_get_target,sc_cellrangesbase) : \
- $(WORKDIR)/AllLangRes/sc \
-
+@@ -125,4 +125,6 @@ $(eval $(call gb_CppunitTest_use_filter_configuration,sc_cellrangesbase))
+
+ $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_cellrangesbase))
+
+.IGNORE: $(call gb_CppunitTest_get_target,sc_cellrangesbase)
+
# vim: set noet sw=4 ts=4:
diff --git a/patches/make-package-modules-not-suck.diff b/patches/make-package-modules-not-suck.diff
index 3be434c..30cf6f5 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -70,7 +70,7 @@ index 55180c5..742cb6e 100644
+++ b/scp2/source/kde/module_kde.scp
@@ -35,15 +35,25 @@ Module gid_Module_Optional_Kde
MOD_NAME_DESC(MODULE_OPTIONAL_KDE);
- Styles = (DONTSHOWINUSERINSTALL);
+ Styles = ();
Files = (
+ gid_File_Bin_Kde_Open_Url,
#ifdef ENABLE_KDE
@@ -116,10 +116,10 @@ index 024ec68..a46e972 100644
gid_File_Filter_Icg,
gid_File_Filter_Egi,
gid_File_Filter_Epb,
-@@ -208,9 +206,6 @@ Module gid_Module_Root_Files_4
+@@ -210,9 +210,6 @@ Module gid_Module_Root_Files_4
gid_File_Lib_Cui,
- gid_File_Lib_Sdbt,
- gid_File_Lib_Dbmm,
+ gid_File_Lib_Sdbt,
+ gid_File_Lib_Dbmm,
- gid_File_Lib_Dba,
- gid_File_Lib_Dbase2,
- gid_File_Lib_Dbaxml,
diff --git a/patches/make-pyuno-work-with-system-wide-module-install.diff b/patches/make-pyuno-work-with-system-wide-module-install.diff
index e865481..c2e8ba3 100644
--- a/patches/make-pyuno-work-with-system-wide-module-install.diff
+++ b/patches/make-pyuno-work-with-system-wide-module-install.diff
@@ -17,9 +17,9 @@ index f93ac5e..92a2891 100644
--- a/pyuno/source/module/uno.py
+++ b/pyuno/source/module/uno.py
@@ -26,8 +26,12 @@
- # for a copy of the LGPLv3 License.
+ # except in compliance with the License. You may obtain a copy of
+ # the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
- #*************************************************************************
+import os
import sys
diff --git a/patches/mediwiki-oor-replace.diff b/patches/mediwiki-oor-replace.diff
index 1301528..08f72f5 100644
--- a/patches/mediwiki-oor-replace.diff
+++ b/patches/mediwiki-oor-replace.diff
@@ -1,9 +1,9 @@
diff --git a/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu b/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu
-index 6888448..c41aee6 100644
+index c96e7a8..400416b 100644
--- a/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu
+++ b/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu
-@@ -27,12 +27,12 @@
- ************************************************************************ -->
+@@ -18,12 +18,12 @@
+ -->
<oor:component-data xmlns:oor="http://openoffice.org/2001/registry"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; oor:name="WikiExtension" oor:package="org.openoffice.Office.Custom">
<node oor:name="SpecialData">
- <node oor:name="so-wiki.germany.sun.com" oor:op="fuse">
@@ -18,11 +18,11 @@ index 6888448..c41aee6 100644
<value>sun</value>
</prop>
diff --git a/swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu b/swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu
-index 5ae52ce..ecc89d4 100644
+index 2b35ced..0c96070 100644
--- a/swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu
+++ b/swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu
-@@ -27,9 +27,9 @@
- ************************************************************************ -->
+@@ -18,9 +18,9 @@
+ -->
<oor:component-data oor:name="OptionsDialog" oor:package="org.openoffice.Office" xmlns:oor="http://openoffice.org/2001/registry";>
<node oor:name="Nodes">
- <node oor:name="Internet" oor:op="fuse">
@@ -34,11 +34,11 @@ index 5ae52ce..ecc89d4 100644
<value>com.sun.wiki-publisher</value>
</prop>
diff --git a/swext/mediawiki/src/registry/data/org/openoffice/Office/Paths.xcu b/swext/mediawiki/src/registry/data/org/openoffice/Office/Paths.xcu
-index e39bbc7..ab10cd7 100644
+index 01763bf..fe18a9c 100644
--- a/swext/mediawiki/src/registry/data/org/openoffice/Office/Paths.xcu
+++ b/swext/mediawiki/src/registry/data/org/openoffice/Office/Paths.xcu
-@@ -27,9 +27,9 @@
- ************************************************************************ -->
+@@ -18,9 +18,9 @@
+ -->
<oor:component-data xmlns:oor="http://openoffice.org/2001/registry"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; oor:name="Paths" oor:package="org.openoffice.Office">
<node oor:name="Paths">
- <node oor:name="Template" oor:op="fuse">
@@ -50,10 +50,10 @@ index e39bbc7..ab10cd7 100644
</node>
</node>
diff --git a/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu b/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu
-index d0ddad5..9c8b6b3 100644
+index a37369a..240be99 100644
--- a/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu
+++ b/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu
-@@ -28,7 +28,7 @@
+@@ -19,7 +19,7 @@
<!DOCTYPE oor:component-data SYSTEM "../../../../component-update.dtd">
<oor:component-data xmlns:oor="http://openoffice.org/2001/registry"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; oor:package="org.openoffice.TypeDetection" oor:name="Filter">
<node oor:name="Filters">
@@ -62,7 +62,7 @@ index d0ddad5..9c8b6b3 100644
<prop oor:name="FileFormatVersion"><value>0</value></prop>
<prop oor:name="Type"><value>MediaWiki</value></prop>
<prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
-@@ -40,7 +40,7 @@
+@@ -31,7 +31,7 @@
</prop>
<prop oor:name="Flags"><value>EXPORT ALIEN 3RDPARTYFILTER</value></prop>
</node>
@@ -72,10 +72,10 @@ index d0ddad5..9c8b6b3 100644
<prop oor:name="Type"><value>MediaWiki</value></prop>
<prop oor:name="DocumentService"><value>com.sun.star.text.WebDocument</value></prop>
diff --git a/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Types.xcu b/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Types.xcu
-index 64031b8..e6739c9 100644
+index 8c864a3..6e31afc 100644
--- a/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Types.xcu
+++ b/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Types.xcu
-@@ -28,7 +28,7 @@
+@@ -19,7 +19,7 @@
<!DOCTYPE oor:component-data SYSTEM "../../../../component-update.dtd">
<oor:component-data xmlns:oor="http://openoffice.org/2001/registry"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; oor:package="org.openoffice.TypeDetection" oor:name="Types">
<node oor:name="Types">
diff --git a/patches/py3uno-module.diff b/patches/py3uno.diff
similarity index 81%
copy from patches/py3uno-module.diff
copy to patches/py3uno.diff
index 695c005..b721fb9 100644
--- a/patches/py3uno-module.diff
+++ b/patches/py3uno.diff
@@ -1,6 +1,8 @@
---- a/Makefile.top-old 2012-04-06 14:26:46.828238642 +0200
-+++ b/Makefile.top 2012-04-06 14:26:58.308239187 +0200
-@@ -111,6 +111,7 @@ packimages\
+diff --git a/Makefile.top b/Makefile.top
+index 9387d1e..4cb9314 100644
+--- a/Makefile.top
++++ b/Makefile.top
+@@ -111,6 +112,7 @@ packimages\
padmin\
psprint_config\
pyuno\
diff --git a/patches/series b/patches/series
index def35eb..f41dc74 100644
--- a/patches/series
+++ b/patches/series
@@ -8,8 +8,8 @@ debian-debug.diff
disable-dynamic-list-cpp.diff
fix-system-lpsolve-build.diff
install-fixes.diff
-mention-java-common-package.diff
-help-msg-add-package-info.diff
+#mention-java-common-package.diff
+#help-msg-add-package-info.diff
sensible-lomua.diff
sensible-browser.diff
reportdesign-mention-package.diff
@@ -28,3 +28,4 @@ build-dont-run-checks.diff
#disable-broken-sdext_pdfimport-cppunit-test-for-now.diff
disable-flaky-unoapi-tests.diff
gcc-4.4.diff
+system-bluez.diff
diff --git a/patches/split-binfilters-and-evo.diff b/patches/split-binfilters-and-evo.diff
index 9074287..90091af 100644
--- a/patches/split-binfilters-and-evo.diff
+++ b/patches/split-binfilters-and-evo.diff
@@ -1,6 +1,6 @@
--- libreoffice-3.5.0/postprocess/packcomponents/makefile.mk-old 2011-06-13 23:35:26.000000000 +0000
+++ libreoffice-3.5.0/postprocess/packcomponents/makefile.mk 2011-06-13 23:35:58.000000000 +0000
-@@ -269,12 +265,6 @@
+@@ -303,12 +303,6 @@ my_components += \
component/wizards/com/sun/star/wizards/web/web
.END
@@ -10,10 +10,10 @@
- bindet
-.END
-
- .IF "$(WITH_LDAP)" == "YES"
- my_components += component/extensions/source/config/ldap/ldapbe2
+ .IF "$(WITH_MOZILLA)" != "NO"
+ my_components += component/extensions/source/plugin/pl
.END
-@@ -394,10 +394,6 @@
+@@ -388,10 +382,6 @@ my_components += component/connectivity/source/drivers/mozab/bootstrap/mozbootst
my_components += component/shell/source/cmdmail/cmdmail
.END
@@ -24,10 +24,10 @@
.IF "$(OS)" != "WNT" && "$(ENABLE_GSTREAMER)" != ""
my_components += component/avmedia/source/gstreamer/avmediagstreamer
.END
-@@ -394,3 +404,50 @@
- '<list><filename>component/scripting/java/ScriptProviderForJavaScript.component</filename></list>' \
+@@ -414,3 +404,51 @@ $(MISC)/services.input : makefile.mk
+ '<list>$(my_components:^"<filename>":+".component</filename>")</list>' \
> $@
- .END
+
+
+.IF "$(WITH_BINFILTER)" == "YES"
+ALLTAR: $(MISC)/bf_migratefilter.rdb $(MISC)/bindet.rdb
@@ -75,18 +75,19 @@
+ '<list><filename>evoab.component</filename></list>' \
+ > $@
+.END
++
--- libreoffice-3.5.0/postprocess/packregistry/makefile.mk-old 2011-12-20 04:49:53.000000000 +0100
+++ libreoffice-3.5.0/postprocess/packregistry/makefile.mk 2011-12-20 04:52:13.000000000 +0100
-@@ -40,6 +40,7 @@
+@@ -41,6 +41,7 @@ MY_XCDS = \
$(MISC)/ctl.xcd \
$(MISC)/ctlseqcheck.xcd \
$(MISC)/draw.xcd \
-+ $(MISC)/evoab.xcd \
++ $(MISC)/evoab2.xcd \
$(MISC)/graphicfilter.xcd \
$(MISC)/impress.xcd \
$(MISC)/korea.xcd \
-@@ -329,8 +329,8 @@
- ERROR : unknown-GUIBASE
+@@ -334,8 +335,8 @@ ERROR : unknown-GUIBASE
+ MY_FILES_main += $(MY_MOD)/org/openoffice/ucb/Configuration-neon.xcu
.END
.IF "$(ENABLE_EVOAB2)" == "TRUE"
-MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu
diff --git a/patches/system-bluez.diff b/patches/system-bluez.diff
new file mode 100644
index 0000000..fe6a615
--- /dev/null
+++ b/patches/system-bluez.diff
@@ -0,0 +1,75 @@
+diff --git a/configure.in b/configure.in
+index 563bcdc..fcdd59b8 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1576,6 +1576,11 @@ AC_ARG_WITH(system-sane,
+ [Use sane.h already on system.]),,
+ [with_system_sane="$with_system_headers"])
+
++AC_ARG_WITH(system-bluez,
++ AS_HELP_STRING([--with-system-bluez],
++ [Use bluetooth.h already on system.]),,
++ [with_system_bluez="$with_system_headers"])
++
+ AC_ARG_WITH(system-xextensions-headers,
+ AS_HELP_STRING([--with-system-xextensions-headers],
+ [To build without system X11 extensions headers, use
+@@ -8234,6 +8246,19 @@ else
+ fi
+
+ dnl ===================================================================
++dnl Check for system bluez
++dnl ===================================================================
++AC_MSG_CHECKING([which bluetooth header to use])
++if test "$with_system_bluez" = "yes"; then
++ AC_MSG_RESULT([external])
++ AC_CHECK_HEADER(bluetooth/bluetooth.h, [],
++ [AC_MSG_ERROR(bluetooth.h not found. install bluez)], [])
++else
++ AC_MSG_RESULT([internal])
++ BUILD_TYPE="$BUILD_TYPE BLUEZ"
++fi
++
++dnl ===================================================================
+ dnl Check for system icu
+ dnl ===================================================================
+ SYSTEM_GENBRK=
+diff --git a/sd/prj/build.lst b/sd/prj/build.lst
+index b4dc93d..b340431 100644
+--- a/sd/prj/build.lst
++++ b/sd/prj/build.lst
+@@ -1,3 +1,3 @@
+-sd sd : filter TRANSLATIONS:translations animations configmgr svx sfx2 stoc canvas embeddedobj LIBXSLT:libxslt oox ure test xmloff fileaccess unoxml dbaccess NULL
++sd sd : filter TRANSLATIONS:translations animations configmgr svx sfx2 stoc canvas embeddedobj LIBXSLT:libxslt oox ure test xmloff fileaccess unoxml dbaccess BLUEZ:bluez_bluetooth NULL
+ sd sd usr1 - all sd_mkout NULL
+ sd sd\prj nmake - all sd_prj NULL
+diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx
+index 01adb96..ebfdd3c 100644
+--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
++++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
+@@ -14,8 +14,8 @@
+ #include <dbus/dbus-glib.h>
+ #include <sys/unistd.h>
+ #include <sys/socket.h>
+-#include "bluetooth/bluetooth.h"
+-#include "bluetooth/rfcomm.h"
++#include <bluetooth/bluetooth.h>
++#include <bluetooth/rfcomm.h>
+ #endif
+
+ #ifdef WIN32
+diff --git a/Module_tail_build.mk b/Module_tail_build.mk
+index ec9e006..c2d6c5d 100644
+--- a/Module_tail_build.mk
++++ b/Module_tail_build.mk
+@@ -36,7 +36,9 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
+ basic \
+ bean \
+ binaryurp \
+- bluez_bluetooth \
++ $(if $(filter BLUEZ,$(BUILD_TYPE)),\
++ bluez_bluetooth \
++ ) \
+ canvas \
+ chart2 \
+ configmgr \
diff --git a/patches/x b/patches/x
new file mode 100644
index 0000000..8bd71f8
--- /dev/null
+++ b/patches/x
@@ -0,0 +1,39 @@
+diff --git a/patches/series b/patches/series
+index a62ebc9..13486fc 100644
+--- a/patches/series
++++ b/patches/series
+@@ -2,28 +2,27 @@ no-minimaltoc.diff
+ debian-opt.diff
+ gcj-safe-jni-h-include.diff
+ jurt-soffice-location.diff
+-split-binfilters-and-evo.diff
++#split-binfilters-and-evo.diff
+ debian-debug.diff
+ #rhino-build-optional.diff
+ disable-dynamic-list-cpp.diff
+ fix-system-lpsolve-build.diff
+ install-fixes.diff
+-mention-java-common-package.diff
+-help-msg-add-package-info.diff
++#mention-java-common-package.diff
++#help-msg-add-package-info.diff
+ sensible-lomua.diff
+ sensible-browser.diff
+ reportdesign-mention-package.diff
+ jdbc-driver-classpaths.diff
+ mysqlcppconn-libmysqlclient-SONAME.diff
+-make-pyuno-work-with-system-wide-module-install.diff
++#make-pyuno-work-with-system-wide-module-install.diff
+ #search-usr-share-for-images.diff
+-make-package-modules-not-suck.diff
++#make-package-modules-not-suck.diff
+ mediwiki-oor-replace.diff
+ pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff
+ debian-hardened-buildflags.diff
+ gtk3-hack-explicit-gmodule.diff
+-pyuno-py3-module.diff
+ ignore-sc_cellrangesbase-fails.diff
+-build-dont-run-checks.diff
++#build-dont-run-checks.diff
+ #disable-broken-sdext_pdfimport-cppunit-test-for-now.diff
+ disable-flaky-unoapi-tests.diff
--
LibreOffice packaging repository
Reply to: