diff --git a/libreoffice/4.2.3/patches/libreoffice-debian.diff b/libreoffice/4.2.3/patches/libreoffice-debian.diff new file mode 100644 index 0000000..1e2fd52 --- /dev/null +++ b/libreoffice/4.2.3/patches/libreoffice-debian.diff @@ -0,0 +1,465 @@ +diff -urN LIBREOFFICE.ORIG/libreoffice-4.2.3~rc3/debian/changelog LIBREOFFICE.UNCOMPILED/libreoffice-4.2.3~rc3/debian/changelog +--- LIBREOFFICE.ORIG/libreoffice-4.2.3~rc3/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 +@@ -1,3 +1,9 @@ ++libreoffice (1:4.2.3~rc3-0ubuntu3) trusty; urgency=medium ++ ++ * Enable TDE module ++ ++ -- Timothy Pearson Tue, 15 Jul 2014 14:30:00 -0600 ++ + libreoffice (1:4.2.3~rc3-0ubuntu2) trusty; urgency=medium + + * 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 +--- LIBREOFFICE.ORIG/libreoffice-4.2.3~rc3/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 +@@ -26,7 +26,8 @@ + gperf, + javahelper (>= 0.37~), + junit4 (>= 4.8.2-2), +- kdelibs5-dev (>= 4:4.3.4), ++ tdelibs14-trinity-dev, ++ tdepim-trinity-dev, + libarchive-zip-perl, + libavahi-client-dev, + libbluetooth-dev [!kfreebsd-amd64 !kfreebsd-i386], +@@ -180,7 +181,7 @@ + ${pyuno-depends} + Recommends: fonts-liberation | ttf-mscorefonts-installer, + libpaper-utils, +- libreoffice-gnome | libreoffice-kde ++ libreoffice-gnome | libreoffice-kde | libreoffice-trinity + Suggests: cups-bsd, + hunspell-dictionary, + hyphen-hyphenation-patterns, +@@ -224,6 +225,7 @@ + QuickStarter for GNOMEs notification are + * libreoffice-gnome: GIO, GConf backend + * libreoffice-kde: KDE UI Plugin and KDE File Picker support ++ * libreoffice-trinity: TDE UI Plugin and TDE File Picker support + * unixodbc: ODBC database support + * cups-bsd: Allows LibreOffice to detect your CUPS printer queues + automatically +@@ -327,6 +329,7 @@ + libreoffice-impress (<< ${binary:Version}), + libreoffice-kab (<< 1:3.4.1~), + libreoffice-kde (<< ${binary:Version}), ++ libreoffice-trinity (<< ${binary:Version}), + libreoffice-officebean (<< ${binary:Version}), + libreoffice-presentation-minimizer (<< 1:4.2~), + libreoffice-sdbc-postgresql (<< 0.8.1~), +@@ -1174,7 +1177,7 @@ + Section: debug + Architecture: amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc + Priority: extra +-Depends: libreoffice-core (= ${binary:Version}) | libreoffice-dev (= ${binary:Version}) | libreoffice-gnome (= ${binary:Version}) | libreoffice-kde (= ${binary:Version}) | libreoffice-calc (= ${binary:Version}) | libreoffice-base-core (= ${binary:Version}) | libreoffice-base (= ${binary:Version}) | libreoffice-impress (= ${binary:Version}) | libreoffice-draw (= ${binary:Version}) | libreoffice-writer (= ${binary:Version}) | python3-uno (= ${binary:Version}) | browser-plugin-libreoffice (= ${binary:Version}) | libreoffice-ogltrans (= ${binary:Version}), ++Depends: libreoffice-core (= ${binary:Version}) | libreoffice-dev (= ${binary:Version}) | libreoffice-gnome (= ${binary:Version}) | libreoffice-kde (= ${binary:Version}) | libreoffice-trinity (= ${binary:Version}) | libreoffice-calc (= ${binary:Version}) | libreoffice-base-core (= ${binary:Version}) | libreoffice-base (= ${binary:Version}) | libreoffice-impress (= ${binary:Version}) | libreoffice-draw (= ${binary:Version}) | libreoffice-writer (= ${binary:Version}) | python3-uno (= ${binary:Version}) | browser-plugin-libreoffice (= ${binary:Version}) | libreoffice-ogltrans (= ${binary:Version}), + ${misc:Depends} + Recommends: ure-dbg + Suggests: ${dbg-dbg-suggests} +@@ -1288,6 +1291,25 @@ + * konqueror / kmail + * libreoffice-kab: KDE Addressbook support + ++Package: libreoffice-trinity ++Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386 ++Depends: libreoffice-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} ++Recommends: ${tde-iconset-dep} ++Suggests: konqueror-trinity, kmail-trinity, libreoffice-kab-trinity ++Section: tde ++Enhances: libreoffice ++Replaces: openoffice.org-trinity (<< 1:3.3.0~) ++Description: office productivity suite -- TDE integration ++ LibreOffice is a full-featured office productivity suite that provides ++ a near drop-in replacement for Microsoft(R) Office. ++ . ++ This package contains the TDE plugin for drawing OOo's widgets with ++ TDE/Qt and a TDEish File Picker when running under TDE. ++ You can extend the functionality of this by installing these packages: ++ . ++ * konqueror-trinity / kmail-trinity ++ * libreoffice-kab-trinity: TDE Addressbook support ++ + Package: libreoffice-sdbc-postgresql + Section: misc + 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 +--- LIBREOFFICE.ORIG/libreoffice-4.2.3~rc3/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 +@@ -199,6 +199,7 @@ + libreoffice-impress (<< ${binary:Version}), + libreoffice-kab (<< 1:3.4.1~), + libreoffice-kde (<< ${binary:Version}), ++ libreoffice-trinity (<< ${binary:Version}), + libreoffice-officebean (<< ${binary:Version}), + libreoffice-presentation-minimizer (<< 1:4.2~), + 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 +--- LIBREOFFICE.ORIG/libreoffice-4.2.3~rc3/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 +@@ -0,0 +1,14 @@ ++Package: libreofficeVER-tdeab-trinity ++Architecture: %OOO_BASE_ARCHS% ++Depends: libreofficeVER-core (= ${binary:Version}), ++ libreofficeVER-common (>= 1:3.4.0~), ++ ${shlibs:Depends}, ++ ${misc:Depends} ++Recommends: kaddressbook-trinity ++Conflicts: ure (<< 1.5.1+OOo3.1.1-15) ++Description: office productivity suite -- TDE adressbook support ++ LibreOffice is a full-featured office productivity suite that provides ++ a near drop-in replacement for Microsoft(R) Office. ++ . ++ This package allows LibreOffice to access the TDE Addressbook. ++ You need to install kaddressbook-trinity separately. +\ 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 +--- LIBREOFFICE.ORIG/libreoffice-4.2.3~rc3/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 +@@ -0,0 +1,23 @@ ++Package: libreofficeVER-trinity ++Architecture: %OOO_ARCHS% ++Depends: libreofficeVER-core (= ${binary:Version}), ++ ${shlibs:Depends}, ++ ${misc:Depends} ++Recommends: ${trinity-iconset-dep} ++Suggests: konqueror-trinity, ++ kmail-trinity, ++ libreofficeVER-tdeab-trinity ++Section: tde ++Enhances: libreofficeVER ++Replaces: openoffice.org-trinity (<< 1:3.3.0~), libreoffice-core (= 1:3.5.0~beta2-1) ++Description: office productivity suite -- TDE integration ++ LibreOffice is a full-featured office productivity suite that provides ++ a near drop-in replacement for Microsoft(R) Office. ++ . ++ This package contains the TDE plugin for drawing OOo's widgets with ++ TDE/Qt and a TDEish File Picker when running under TDE. ++ You can extend the functionality of this by installing these packages: ++ . ++ * konqueror / kmail ++ * 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 +--- 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 ++++ 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 +@@ -0,0 +1,50 @@ ++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-50672.diff + fdo-77128-lp-1300283.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 +--- LIBREOFFICE.ORIG/libreoffice-4.2.3~rc3/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 +@@ -0,0 +1,68 @@ ++diff --git a/connectivity/Library_tdeab1.mk b/connectivity/Library_tdeab1.mk ++index 298ed4c..8243280 100644 ++--- a/connectivity/Library_tdeab1.mk +++++ b/connectivity/Library_tdeab1.mk ++@@ -18,6 +18,7 @@ $(eval $(call gb_Library_set_componentfile,tdeab1,connectivity/source/drivers/ka ++ ++ $(eval $(call gb_Library_set_include,tdeab1,\ ++ -I$(SRCDIR)/connectivity/source/inc \ +++ -I$(SRCDIR)/include/shell \ ++ $$(INCLUDE) \ ++ )) ++ ++diff --git a/connectivity/Library_tdeabdrv1.mk b/connectivity/Library_tdeabdrv1.mk ++index 8301e5f..1398d9f 100644 ++--- a/connectivity/Library_tdeabdrv1.mk +++++ b/connectivity/Library_tdeabdrv1.mk ++@@ -12,6 +12,8 @@ $(eval $(call gb_Library_Library,tdeabdrv1)) ++ ++ $(eval $(call gb_Library_set_include,tdeabdrv1,\ ++ -I$(SRCDIR)/connectivity/source/inc \ +++ -I$(SRCDIR)/include/shell \ +++ -I$(WORKDIR)/YaccTarget/connectivity/source/parse \ ++ $$(INCLUDE) \ ++ -I$(WORKDIR)/YaccTarget/connectivity/source/parse \ ++ )) ++diff --git a/shell/Library_tdebe.mk b/shell/Library_tdebe.mk ++index dc5b735..3b516d8 100644 ++--- a/shell/Library_tdebe.mk +++++ b/shell/Library_tdebe.mk ++@@ -9,6 +9,11 @@ ++ ++ $(eval $(call gb_Library_Library,tdebe1)) ++ +++$(eval $(call gb_Library_set_include,tdebe1,\ +++ $$(INCLUDE) \ +++ -I$(SRCDIR)/include/shell \ +++)) +++ ++ $(eval $(call gb_Library_use_sdk_api,tdebe1)) ++ ++ $(eval $(call gb_Library_use_externals,tdebe1,\ ++diff --git a/vcl/Executable_tdefilepicker.mk b/vcl/Executable_tdefilepicker.mk ++index 6a39235..9811e6d 100644 ++--- a/vcl/Executable_tdefilepicker.mk +++++ b/vcl/Executable_tdefilepicker.mk ++@@ -19,7 +19,7 @@ $(eval $(call gb_Executable_set_include,tdefilepicker,\ ++ $$(INCLUDE) \ ++ -I$(SRCDIR)/vcl/inc \ ++ -I$(SRCDIR)/solenv/inc \ ++- -I$(SRCDIR)/vcl/inc/unx/tde \ +++ -I$(SRCDIR)/vcl/inc/unx/kde \ ++ )) ++ ++ $(eval $(call gb_Executable_use_libraries,tdefilepicker,\ ++diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk ++index 74551bd..d05780b 100644 ++--- a/vcl/Library_vclplug_tde.mk +++++ b/vcl/Library_vclplug_tde.mk ++@@ -15,7 +15,8 @@ $(eval $(call gb_Library_set_include,vclplug_tde,\ ++ $$(INCLUDE) \ ++ -I$(SRCDIR)/vcl/inc \ ++ -I$(SRCDIR)/solenv/inc \ ++- -I$(SRCDIR)/vcl/inc/unx/tde \ +++ -I$(SRCDIR)/vcl/inc/unx/kde \ +++ -I$(SRCDIR)/include/shell \ ++ )) ++ ++ $(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 +--- LIBREOFFICE.ORIG/libreoffice-4.2.3~rc3/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 +@@ -217,7 +217,8 @@ + BUILD_CAIROCANVAS=y + SYSTEM_STUFF += cairo + CAIRO_FONTS_PATCH=y +-BUILD_KDE=y ++BUILD_KDE=n ++BUILD_TDE=y + # not ported to KDE 4 + ENABLE_KDEAB=n + ifeq "$(shell dpkg --compare-versions $(SYSTEM_GCC_VERSION) ge 4.7 && echo true)" "true" +@@ -227,6 +228,12 @@ + QT_MINVER= (>= 4:4.5) + endif + KDELIBS_MINVER= (>= 4:4.3.4) ++ifeq "$(BUILD_TDE)" "y" ++ ENABLE_TDEAB=y ++endif ++ifeq "$(BUILD_TDE)" "y" ++ TDELIBS_MINVER= (>= 4:3.5.13) ++endif + BUILD_DBG_PACKAGE=y + ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) + BUILD_TEST_PACKAGE=y +@@ -509,6 +516,7 @@ + ENABLE_MYSQLNATIVE=n + ENABLE_EVO2=n + ENABLE_KDEAB=n ++ ENABLE_TDEAB=n + ENABLE_REPORTDESIGN=n + DEBHELPER_OPTIONS += -Nlibreoffice-base libreoffice-base-core -Nlibreoffice-base-drivers + DEBHELPER_OPTIONS += -Nlibreoffice-evolution -Nlibreoffice-kab +@@ -1203,6 +1211,25 @@ + endif + endif + ++ifeq "$(BUILD_TDE)" "n" ++ CONFIGURE_FLAGS+= --disable-tde ++ CONFIGURE_FLAGS+= --with-images="$(IMAGES)" ++else ++ CONFIGURE_FLAGS+= --disable-kde ++ CONFIGURE_FLAGS+= --disable-kde4 ++ CONFIGURE_FLAGS+= --enable-tde ++ TDE_ICONSET_DEP=libreoffice$(VER)-style-crystal ++ BUILD_DEPS += , tdelibs14-trinity-dev ++ ++ DBG_DBG_SUGGESTS+= , tdelibs-trinity-dbg, libtqtinterface-dbg ++ ++ ifeq "$(ENABLE_TDEAB)" "y" ++ BUILD_DEPS += , tdepim-trinity-dev ++ else ++ CONFIGURE_FLAGS+= --disable-tdeab ++ endif ++endif ++ + ifeq "$(ENABLE_MYSQLNATIVE)" "y" + CONFIGURE_FLAGS += --enable-ext-mariadb-connector + ifneq "$(USE_MARIADB)" "y" +@@ -1608,6 +1635,11 @@ + ifeq "$(BUILD_KDE)" "y" + cat debian/control.kde.in >> debian/control + endif ++ifeq "$(BUILD_TDE)" "y" ++ sed -e "s|libreofficeVER|libreoffice$(VER)|g" \ ++ >> debian/control < debian/control.trinity.in ++ perl -pi -e 's/ libreoffice$(VER)-gnome,/ libreoffice-gnome | libreoffice$(VER)-trinity,/' debian/control ++endif + ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y" + cat debian/control.postgresql.in >> debian/control + endif +@@ -1628,6 +1660,10 @@ + ifeq "$(PACKAGE_LIBRELOGO)" "y" + cat debian/control.librelogo.in >> debian/control + endif ++ifeq "$(ENABLE_TDEAB)" "y" ++ sed -e "s|libreofficeVER|libreoffice$(VER)|g" \ ++ >> debian/control < debian/control.tdeab.in ++endif + + perl -pi -e "s,%OOO_ARCHS%,$(OOO_ARCHS),g" debian/control + perl -pi -e "s,%OOO_BASE_ARCHS%,$(OOO_BASE_ARCHS),g" debian/control +@@ -1698,6 +1734,9 @@ + perl -pi -e 's/paperconf$$/paperconf\n * bluez: Bluetooth support for Impress (slideshow remote control)/' debian/control + perl -pi -e 's/Description: office productivity suite -- presentation/Suggests: bluez\nDescription: office productivity suite -- presentation/' debian/control + endif ++ifeq "$(BUILD_TDE)" "y" ++ perl -pi -e 's/GConf backend$$/GConf backend\n * libreoffice$(VER)-trinity: TDE UI Plugin and TDE File Picker support/' debian/control ++endif + + ifneq "$(DICT_DIR)" "/usr/share/hunspell" + perl -pi -e 's/^Breaks:.*myspell.*\n//' debian/control +@@ -2175,6 +2214,45 @@ + > $(PKGDIR)-kde/usr/share/templates/soffice.odg.desktop + endif + ++ifeq "$(BUILD_TDE)" "y" ++ mkdir -p -m755 $(PKGDIR)-trinity/$(OODIR)/program ++ mv $(PKGDIR)-core/$(OODIR)/program/tdefilepicker \ ++ $(PKGDIR)-trinity/$(OODIR)/program ++ ++ # install files for TDEs "create new" ... ++ mkdir -p $(PKGDIR)-trinity/usr/share/templates/.source ++ for i in $(SOURCE_TREE)/extras/source/shellnew/*; do \ ++ cp $$i $(PKGDIR)-trinity/usr/share/templates/.source/`basename $$i`; \ ++ done ++ cat debian/templates/soffice-template.desktop.in \ ++ | sed -e "s/@APP@/Writer/" \ ++ | sed -e "s/@EXT@/odt/" \ ++ | sed -e "s/@TYPE@/text/" \ ++ > $(PKGDIR)-trinity/usr/share/templates/soffice.odt.desktop ++ cat debian/templates/soffice-template.desktop.in \ ++ | sed -e "s/@APP@/Calc/" \ ++ | sed -e "s/@EXT@/ods/" \ ++ | sed -e "s/@TYPE@/spreadsheet/" \ ++ > $(PKGDIR)-trinity/usr/share/templates/soffice.ods.desktop ++ cat debian/templates/soffice-template.desktop.in \ ++ | sed -e "s/@APP@/Impress/" \ ++ | sed -e "s/@EXT@/odp/" \ ++ | sed -e "s/@TYPE@/presentation/" \ ++ > $(PKGDIR)-trinity/usr/share/templates/soffice.odp.desktop ++ cat debian/templates/soffice-template.desktop.in \ ++ | sed -e "s/@APP@/Draw/" \ ++ | sed -e "s/@EXT@/odg/" \ ++ | sed -e "s/@TYPE@/drawing/" \ ++ > $(PKGDIR)-trinity/usr/share/templates/soffice.odg.desktop ++endif ++ifeq "$(ENABLE_TDEAB)" "y" ++ rm -rf $(PKGDIR)-tdeab-trinity ++ mkdir -p -m755 $(PKGDIR)-tdeab-trinity/$(OODIR)/program ++ for f in libtdeab*so; do \ ++ mv $(PKGDIR)-core/$(OODIR)/program/$$f $(PKGDIR)-tdeab-trinity/$(OODIR)/program || exit 1 ;\ ++ done ++endif ++ + # split out gtk stuff + rm -rf $(PKGDIR)-gtk + mkdir -p -m755 $(PKGDIR)-gtk/$(OODIR)/program +@@ -2874,6 +2952,12 @@ + # register technical.dic + perl -pi -e 's/standard.dic;/standard.dic;technical.dic;/' $(PKGDIR)-common/$(OODIR)/share/registry/main.xcd + ++ifeq "$(BUILD_TDE)" "y" ++ # be sure we use the right moc, FIXME: Trinity uses its own moc ++ mkdir -p $(CURDIR)/debian/usr/bin ++ ln -sf /usr/bin/moc-qt$(KDE_VER) $(CURDIR)/debian/usr/bin/moc ++endif ++ + #ifeq "$(PACKAGE_SDK)" "y" + # # install gengal stuff into -dev + # mkdir -p $(PKGDIR)-dev/$(OODIR)/program +@@ -3061,6 +3145,7 @@ + -V'Binary-Version=$(BINARY_VERSION)' \ + -V'ooo-officebean-dep=$(OOO_OFFICEBEAN_DEP)' \ + -V'kde-iconset-dep=$(KDE_ICONSET_DEP)' \ ++ -V'tde-iconset-dep=$(TDE_ICONSET_DEP)' \ + -V'lpsolve-dep=$(LPSOLVE_DEP)' \ + -V'gstreamer-plugins-suggests=$(GSTREAMER_PLUGINS_SUGGESTS)' \ + -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 +--- LIBREOFFICE.ORIG/libreoffice-4.2.3~rc3/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 +@@ -101,6 +101,7 @@ + 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_Kde pkg/libreoffice-kde ++create_package_directory gid_Module_Optional_Tde pkg/libreoffice-trinity + create_package_directory gid_Module_Root_Files_2 pkg/libreoffice-common + create_package_directory gid_Module_Root_Files_3 pkg/libreoffice-common + create_package_directory gid_Module_Root_Files_4 pkg/libreoffice-common +@@ -151,7 +152,7 @@ + fi && + ( cd pkg/libreoffice-common/$OOINSTBASE/program + find -maxdepth 1 \ +- -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|nsplugin\|kdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|oosplash\|uri-encode\|xpdfimport\|ui-previewer\)' \ ++ -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|nsplugin\|kdefilepicker\|tdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|oosplash\|uri-encode\|xpdfimport\|ui-previewer\)' \ + -exec mv {} $OODESTDIR/pkg/libreoffice-core/$OOINSTBASE/program \; + ); +