Update to fix single core builds

r14.0.x
Timothy Pearson 12 years ago
parent c25af609a6
commit b31d3f934e

@ -215,7 +215,7 @@ diff -urN original/libreoffice-4.0.1~rc1/debian/patches/series tde/libreoffice-4
diff -urN original/libreoffice-4.0.1~rc1/debian/patches/tde-update-r14.diff tde/libreoffice-4.0.1~rc1/debian/patches/tde-update-r14.diff
--- original/libreoffice-4.0.1~rc1/debian/patches/tde-update-r14.diff 1970-01-01 00:00:00.000000000 +0000
+++ tde/libreoffice-4.0.1~rc1/debian/patches/tde-update-r14.diff 2013-02-28 23:40:44.099581680 +0000
@@ -0,0 +1,395 @@
@@ -0,0 +1,425 @@
+diff --git a/configure.ac b/configure.ac
+index 401352a..0ea3acf 100644
+--- a/configure.ac
@ -611,6 +611,36 @@ diff -urN original/libreoffice-4.0.1~rc1/debian/patches/tde-update-r14.diff tde/
+
+ #include <netwm.h>
+ #include <X11/Xlib.h>
+diff --git a/connectivity/Library_tdeabdrv1.mk b/connectivity/Library_tdeabdrv1.mk
+index b8786fd..5e091fe 100644
+--- a/connectivity/Library_tdeabdrv1.mk
++++ b/connectivity/Library_tdeabdrv1.mk
+@@ -27,6 +27,10 @@
+
+ $(eval $(call gb_Library_Library,tdeabdrv1))
+
++$(eval $(call gb_Library_use_packages,tdeabdrv1,\
++ shell_inc \
++))
++
+ $(eval $(call gb_Library_set_include,tdeabdrv1,\
+ -I$(SRCDIR)/connectivity/source/inc \
+ $$(INCLUDE) \
+diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk
+index 4a078ac..c4dd88d 100644
+--- a/vcl/Library_vclplug_tde.mk
++++ b/vcl/Library_vclplug_tde.mk
+@@ -26,6 +26,10 @@
+
+ $(eval $(call gb_Library_Library,vclplug_tde))
+
++$(eval $(call gb_Library_use_packages,vclplug_tde,\
++ shell_inc \
++))
++
+ $(eval $(call gb_Library_set_include,vclplug_tde,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/vcl/inc \
diff -urN original/libreoffice-4.0.1~rc1/debian/rules tde/libreoffice-4.0.1~rc1/debian/rules
--- original/libreoffice-4.0.1~rc1/debian/rules 2013-02-24 08:04:29.000000000 +0000
+++ tde/libreoffice-4.0.1~rc1/debian/rules 2013-02-28 23:40:44.103581629 +0000

Loading…
Cancel
Save