TDE
/
thirdparty
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/thirdparty
0
0
Fork 0
Code Issues Releases Wiki Activity

Update LO 4.3.2 patch

Browse Source
r14.0.x r14.0.0
Timothy Pearson 11 years ago
parent 968c890bd8
commit f36c7b0aa2
1 changed files with 29 additions and 91 deletions
Show Stats Download Patch File Download Diff File

120
libreoffice/4.2.3/patches/libreoffice-debian.diff
Unescape View File

@ -1,6 +1,6 @@
diff -urN LIBREOFFICE.ORIG/libreoffice-4.2.3~rc3/debian/changelog LIBREOFFICE.UNCOMPILED/libreoffice-4.2.3~rc3/debian/changelog diff -urN debian/changelog debian/changelog
--- LIBREOFFICE.ORIG/libreoffice-4.2.3~rc3/debian/changelog 2014-04-09 12:11:09.000000000 +0000 --- debian/changelog 2014-04-09 12:11:09.000000000 +0000
+++ LIBREOFFICE.UNCOMPILED/libreoffice-4.2.3~rc3/debian/changelog 2014-07-15 15:30:54.690780867 +0000 +++ debian/changelog 2014-07-16 14:07:45.139122481 +0000
@@ -1,3 +1,9 @@ @@ -1,3 +1,9 @@
+libreoffice (1:4.2.3~rc3-0ubuntu3) trusty; urgency=medium +libreoffice (1:4.2.3~rc3-0ubuntu3) trusty; urgency=medium
+ +
@ -11,9 +11,9 @@ diff -urN LIBREOFFICE.ORIG/libreoffice-4.2.3~rc3/debian/changelog LIBREOFFICE.UN
libreoffice (1:4.2.3~rc3-0ubuntu2) trusty; urgency=medium libreoffice (1:4.2.3~rc3-0ubuntu2) trusty; urgency=medium
* revert 7dba6e0a, to at least let LibreOffice start on KDE4 (LP: #1300283) * revert 7dba6e0a, to at least let LibreOffice start on KDE4 (LP: #1300283)
diff -urN LIBREOFFICE.ORIG/libreoffice-4.2.3~rc3/debian/control LIBREOFFICE.UNCOMPILED/libreoffice-4.2.3~rc3/debian/control diff -urN debian/control debian/control
--- LIBREOFFICE.ORIG/libreoffice-4.2.3~rc3/debian/control 2014-04-09 12:14:01.000000000 +0000 --- debian/control 2014-04-09 12:14:01.000000000 +0000
+++ LIBREOFFICE.UNCOMPILED/libreoffice-4.2.3~rc3/debian/control 2014-07-15 15:32:27.180338004 +0000 +++ debian/control 2014-07-16 14:07:45.139122481 +0000
@@ -26,7 +26,8 @@ @@ -26,7 +26,8 @@
gperf, gperf,
javahelper (>= 0.37~), javahelper (>= 0.37~),
@ -84,9 +84,9 @@ diff -urN LIBREOFFICE.ORIG/libreoffice-4.2.3~rc3/debian/control LIBREOFFICE.UNCO
Package: libreoffice-sdbc-postgresql Package: libreoffice-sdbc-postgresql
Section: misc Section: misc
Architecture: amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc Architecture: amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc
diff -urN LIBREOFFICE.ORIG/libreoffice-4.2.3~rc3/debian/control.in LIBREOFFICE.UNCOMPILED/libreoffice-4.2.3~rc3/debian/control.in diff -urN debian/control.in debian/control.in
--- LIBREOFFICE.ORIG/libreoffice-4.2.3~rc3/debian/control.in 2014-04-09 12:11:09.000000000 +0000 --- debian/control.in 2014-04-09 12:11:09.000000000 +0000
+++ LIBREOFFICE.UNCOMPILED/libreoffice-4.2.3~rc3/debian/control.in 2014-07-15 15:30:10.922042725 +0000 +++ debian/control.in 2014-07-16 14:07:45.139122481 +0000
@@ -199,6 +199,7 @@ @@ -199,6 +199,7 @@
libreoffice-impress (<< ${binary:Version}), libreoffice-impress (<< ${binary:Version}),
libreoffice-kab (<< 1:3.4.1~), libreoffice-kab (<< 1:3.4.1~),
@ -95,9 +95,9 @@ diff -urN LIBREOFFICE.ORIG/libreoffice-4.2.3~rc3/debian/control.in LIBREOFFICE.U
libreoffice-officebean (<< ${binary:Version}), libreoffice-officebean (<< ${binary:Version}),
libreoffice-presentation-minimizer (<< 1:4.2~), libreoffice-presentation-minimizer (<< 1:4.2~),
libreoffice-sdbc-postgresql (<< 0.8.1~), libreoffice-sdbc-postgresql (<< 0.8.1~),
diff -urN LIBREOFFICE.ORIG/libreoffice-4.2.3~rc3/debian/control.tdeab.in LIBREOFFICE.UNCOMPILED/libreoffice-4.2.3~rc3/debian/control.tdeab.in diff -urN debian/control.tdeab.in debian/control.tdeab.in
--- LIBREOFFICE.ORIG/libreoffice-4.2.3~rc3/debian/control.tdeab.in 1970-01-01 00:00:00.000000000 +0000 --- debian/control.tdeab.in 1970-01-01 00:00:00.000000000 +0000
+++ LIBREOFFICE.UNCOMPILED/libreoffice-4.2.3~rc3/debian/control.tdeab.in 2014-07-15 15:30:10.922042725 +0000 +++ debian/control.tdeab.in 2014-07-16 14:07:45.139122481 +0000
@@ -0,0 +1,14 @@ @@ -0,0 +1,14 @@
+Package: libreofficeVER-tdeab-trinity +Package: libreofficeVER-tdeab-trinity
+Architecture: %OOO_BASE_ARCHS% +Architecture: %OOO_BASE_ARCHS%
@ -114,9 +114,9 @@ diff -urN LIBREOFFICE.ORIG/libreoffice-4.2.3~rc3/debian/control.tdeab.in LIBREOF
+ This package allows LibreOffice to access the TDE Addressbook. + This package allows LibreOffice to access the TDE Addressbook.
+ You need to install kaddressbook-trinity separately. + You need to install kaddressbook-trinity separately.
\ No newline at end of file \ No newline at end of file
diff -urN LIBREOFFICE.ORIG/libreoffice-4.2.3~rc3/debian/control.trinity.in LIBREOFFICE.UNCOMPILED/libreoffice-4.2.3~rc3/debian/control.trinity.in diff -urN debian/control.trinity.in debian/control.trinity.in
--- LIBREOFFICE.ORIG/libreoffice-4.2.3~rc3/debian/control.trinity.in 1970-01-01 00:00:00.000000000 +0000 --- debian/control.trinity.in 1970-01-01 00:00:00.000000000 +0000
+++ LIBREOFFICE.UNCOMPILED/libreoffice-4.2.3~rc3/debian/control.trinity.in 2014-07-15 15:30:10.922042725 +0000 +++ debian/control.trinity.in 2014-07-16 14:07:45.139122481 +0000
@@ -0,0 +1,23 @@ @@ -0,0 +1,23 @@
+Package: libreofficeVER-trinity +Package: libreofficeVER-trinity
+Architecture: %OOO_ARCHS% +Architecture: %OOO_ARCHS%
@ -141,79 +141,17 @@ diff -urN LIBREOFFICE.ORIG/libreoffice-4.2.3~rc3/debian/control.trinity.in LIBRE
+ * konqueror / kmail + * konqueror / kmail
+ * libreoffice-tdeab-trinity: TDE Addressbook support + * libreoffice-tdeab-trinity: TDE Addressbook support
+ +
diff -urN LIBREOFFICE.ORIG/libreoffice-4.2.3~rc3/debian/patches/libreoffice_ubuntu-tde-make-package-modules-not-stink.diff LIBREOFFICE.UNCOMPILED/libreoffice-4.2.3~rc3/debian/patches/libreoffice_ubuntu-tde-make-package-modules-not-stink.diff diff -urN debian/patches/series debian/patches/series
--- LIBREOFFICE.ORIG/libreoffice-4.2.3~rc3/debian/patches/libreoffice_ubuntu-tde-make-package-modules-not-stink.diff 1970-01-01 00:00:00.000000000 +0000 --- debian/patches/series 2014-04-09 12:11:09.000000000 +0000
+++ LIBREOFFICE.UNCOMPILED/libreoffice-4.2.3~rc3/debian/patches/libreoffice_ubuntu-tde-make-package-modules-not-stink.diff 2014-07-15 15:30:10.922042725 +0000 +++ debian/patches/series 2014-07-16 14:08:03.835439244 +0000
@@ -0,0 +1,50 @@ @@ -35,3 +35,4 @@
+diff -ur a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
+--- a/scp2/source/ooo/module_hidden_ooo.scp
++++ b/scp2/source/ooo/module_hidden_ooo.scp
+@@ -90,7 +90,6 @@
+ Default = YES;
+ Styles = (HIDDEN_ROOT);
+ Files = (gid_File_Bin_Cde_Open_Url,
+- gid_File_Bin_Tde_Open_Url,
+ gid_File_Bin_Open_Url,
+ gid_File_Bin_Pagein,
+ gid_File_Bin_Pluginapp,
+@@ -272,7 +271,6 @@
+ gid_File_Lib_Odfflatxml,
+ gid_File_Lib_Zip,
+ gid_File_Lib_Vclplug_Gen,
+- gid_File_Lib_Vclplug_Tde,
+ gid_File_Lib_Vclplug_Svp,
+ gid_File_Lib_Basctl,
+ gid_File_Lib_CanvasTools,
+@@ -317,8 +315,6 @@
+ gid_File_Lib_Dbpool,
+ gid_File_Lib_Embobj,
+ gid_File_Lib_Emboleobj,
+- gid_File_Lib_Tdeab_1,
+- gid_File_Lib_Tdeab_Drv_1,
+ gid_File_Lib_Kab_1,
+ gid_File_Lib_Kab_Drv_1,
+ gid_File_Lib_Macab_1,
+diff -ur a/scp2/source/tde/module_tde.scp b/scp2/source/tde/module_tde.scp
+--- a/scp2/source/tde/module_tde.scp
++++ b/scp2/source/tde/module_tde.scp
+@@ -32,9 +32,17 @@
+ MOD_NAME_DESC(MODULE_OPTIONAL_TDE);
+ Styles = ();
+ Files = (
++ gid_File_Bin_Tde_Open_Url,
+ #ifdef ENABLE_TDE
+- gid_File_Lib_Tdebe
++ gid_File_Lib_Tdebe,
++ gid_File_Lib_Vclplug_Tde,
++ gid_File_Lib_Fps_Tde
+ #endif // ENABLE_TDE
++#ifdef ENABLE_TDEAB
++ ,
++ gid_File_Lib_Tdeab_1,
++ gid_File_Lib_Tdeab_Drv_1
++#endif
+ );
+ End
+ #endif
diff -urN LIBREOFFICE.ORIG/libreoffice-4.2.3~rc3/debian/patches/series LIBREOFFICE.UNCOMPILED/libreoffice-4.2.3~rc3/debian/patches/series
--- LIBREOFFICE.ORIG/libreoffice-4.2.3~rc3/debian/patches/series 2014-04-09 12:11:09.000000000 +0000
+++ LIBREOFFICE.UNCOMPILED/libreoffice-4.2.3~rc3/debian/patches/series 2014-07-16 02:11:59.503319905 +0000
@@ -14,6 +14,7 @@
mysqlcppconn-libmysqlclient-SONAME.diff
#search-usr-share-for-images.diff
make-package-modules-not-suck.diff
+libreoffice_ubuntu-tde-make-package-modules-not-stink.diff
#mediwiki-oor-replace.diff
debian-hardened-buildflags-CPPFLAGS.diff
gtk3-hack-explicit-gmodule.diff
@@ -35,3 +36,4 @@
fdo-74981.diff fdo-74981.diff
fdo-50672.diff fdo-50672.diff
fdo-77128-lp-1300283.diff fdo-77128-lp-1300283.diff
+tde-update-r14.diff +tde-update-r14.diff
diff -urN LIBREOFFICE.ORIG/libreoffice-4.2.3~rc3/debian/patches/tde-update-r14.diff LIBREOFFICE.UNCOMPILED/libreoffice-4.2.3~rc3/debian/patches/tde-update-r14.diff diff -urN debian/patches/tde-update-r14.diff debian/patches/tde-update-r14.diff
--- LIBREOFFICE.ORIG/libreoffice-4.2.3~rc3/debian/patches/tde-update-r14.diff 1970-01-01 00:00:00.000000000 +0000 --- debian/patches/tde-update-r14.diff 1970-01-01 00:00:00.000000000 +0000
+++ LIBREOFFICE.UNCOMPILED/libreoffice-4.2.3~rc3/debian/patches/tde-update-r14.diff 2014-07-16 03:12:33.193454344 +0000 +++ debian/patches/tde-update-r14.diff 2014-07-16 14:08:40.100053652 +0000
@@ -0,0 +1,68 @@ @@ -0,0 +1,68 @@
+diff --git a/connectivity/Library_tdeab1.mk b/connectivity/Library_tdeab1.mk +diff --git a/connectivity/Library_tdeab1.mk b/connectivity/Library_tdeab1.mk
+index 298ed4c..8243280 100644 +index 298ed4c..8243280 100644
@ -238,8 +176,8 @@ diff -urN LIBREOFFICE.ORIG/libreoffice-4.2.3~rc3/debian/patches/tde-update-r14.d
++ -I$(SRCDIR)/include/shell \ ++ -I$(SRCDIR)/include/shell \
++ -I$(WORKDIR)/YaccTarget/connectivity/source/parse \ ++ -I$(WORKDIR)/YaccTarget/connectivity/source/parse \
+ $$(INCLUDE) \ + $$(INCLUDE) \
+ -I$(WORKDIR)/YaccTarget/connectivity/source/parse \
+ )) + ))
+
+diff --git a/shell/Library_tdebe.mk b/shell/Library_tdebe.mk +diff --git a/shell/Library_tdebe.mk b/shell/Library_tdebe.mk
+index dc5b735..3b516d8 100644 +index dc5b735..3b516d8 100644
+--- a/shell/Library_tdebe.mk +--- a/shell/Library_tdebe.mk
@ -283,9 +221,9 @@ diff -urN LIBREOFFICE.ORIG/libreoffice-4.2.3~rc3/debian/patches/tde-update-r14.d
+ )) + ))
+ +
+ $(eval $(call gb_Library_set_include,vclplug_tde,\ + $(eval $(call gb_Library_set_include,vclplug_tde,\
diff -urN LIBREOFFICE.ORIG/libreoffice-4.2.3~rc3/debian/rules LIBREOFFICE.UNCOMPILED/libreoffice-4.2.3~rc3/debian/rules diff -urN debian/rules debian/rules
--- LIBREOFFICE.ORIG/libreoffice-4.2.3~rc3/debian/rules 2014-04-09 12:11:09.000000000 +0000 --- debian/rules 2014-04-09 12:11:09.000000000 +0000
+++ LIBREOFFICE.UNCOMPILED/libreoffice-4.2.3~rc3/debian/rules 2014-07-15 15:30:10.926042793 +0000 +++ debian/rules 2014-07-16 14:07:45.139122481 +0000
@@ -217,7 +217,8 @@ @@ -217,7 +217,8 @@
BUILD_CAIROCANVAS=y BUILD_CAIROCANVAS=y
SYSTEM_STUFF += cairo SYSTEM_STUFF += cairo
@ -443,9 +381,9 @@ diff -urN LIBREOFFICE.ORIG/libreoffice-4.2.3~rc3/debian/rules LIBREOFFICE.UNCOMP
-V'lpsolve-dep=$(LPSOLVE_DEP)' \ -V'lpsolve-dep=$(LPSOLVE_DEP)' \
-V'gstreamer-plugins-suggests=$(GSTREAMER_PLUGINS_SUGGESTS)' \ -V'gstreamer-plugins-suggests=$(GSTREAMER_PLUGINS_SUGGESTS)' \
-V'libebook-dep=$(shell debian/scripts/get_libebook_dep.sh)' \ -V'libebook-dep=$(shell debian/scripts/get_libebook_dep.sh)' \
diff -urN LIBREOFFICE.ORIG/libreoffice-4.2.3~rc3/debian/scripts/gid2pkgdirs.sh LIBREOFFICE.UNCOMPILED/libreoffice-4.2.3~rc3/debian/scripts/gid2pkgdirs.sh diff -urN debian/scripts/gid2pkgdirs.sh debian/scripts/gid2pkgdirs.sh
--- LIBREOFFICE.ORIG/libreoffice-4.2.3~rc3/debian/scripts/gid2pkgdirs.sh 2014-04-09 12:11:09.000000000 +0000 --- debian/scripts/gid2pkgdirs.sh 2014-04-09 12:11:09.000000000 +0000
+++ LIBREOFFICE.UNCOMPILED/libreoffice-4.2.3~rc3/debian/scripts/gid2pkgdirs.sh 2014-07-15 15:30:10.926042793 +0000 +++ debian/scripts/gid2pkgdirs.sh 2014-07-16 14:07:45.139122481 +0000
@@ -101,6 +101,7 @@ @@ -101,6 +101,7 @@
create_package_directory gid_Module_Script_Provider_For_Python pkg/libreoffice-script-provider-python create_package_directory gid_Module_Script_Provider_For_Python pkg/libreoffice-script-provider-python
create_package_directory gid_Module_Optional_Gnome pkg/libreoffice-gnome create_package_directory gid_Module_Optional_Gnome pkg/libreoffice-gnome

Write Preview
Loading…
Cancel
Save