diff options
| -rw-r--r-- | libreoffice/4.0.3/patches/libreoffice-debian.diff | 836 |
1 files changed, 836 insertions, 0 deletions
diff --git a/libreoffice/4.0.3/patches/libreoffice-debian.diff b/libreoffice/4.0.3/patches/libreoffice-debian.diff new file mode 100644 index 0000000..94e701e --- /dev/null +++ b/libreoffice/4.0.3/patches/libreoffice-debian.diff @@ -0,0 +1,836 @@ +diff -urN debian/changelog debian/changelog +--- debian/changelog 2013-05-11 11:11:54.000000000 +0000 ++++ debian/changelog 2013-06-04 19:07:09.618754652 +0000 +@@ -1,3 +1,9 @@ ++libreoffice (1:4.0.3-2) wheezy; urgency=low ++ ++ * Enable TDE module ++ ++ -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Tue, 04 Jun 2013 14:07:00 -0600 ++ + libreoffice (1:4.0.3-2~bpo70+1) wheezy-backports; urgency=low + + * Rebuild for wheezy-backports. +diff -urN debian/control debian/control +--- debian/control 2013-05-11 11:10:29.000000000 +0000 ++++ debian/control 2013-06-04 18:59:03.581453968 +0000 +@@ -24,7 +24,7 @@ + gperf, + javahelper (>= 0.37~), + junit4 (>= 4.8.2-2), +- kdelibs5-dev (>= 4:4.3.4), ++ tdelibs4-trinity-dev, + libarchive-zip-perl, + libbluetooth-dev [!kfreebsd-amd64 !kfreebsd-i386], + libboost-date-time-dev (>= 1.38), +@@ -184,7 +184,7 @@ + iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser, + imagemagick | graphicsmagick-imagemagick-compat, + libgl1, +- libreoffice-gnome | libreoffice-kde, ++ libreoffice-gnome | libreoffice-kde | libreoffice-trinity, + libreoffice-grammarcheck, + libreoffice-help-${help-l10n-virtual-version}, + libreoffice-l10n-${help-l10n-virtual-version}, +@@ -223,6 +223,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 +@@ -325,6 +326,7 @@ + libreoffice-impress (<< ${binary:Version}), + libreoffice-kab (<< 1:3.4.1~), + libreoffice-kde (<< ${binary:Version}), ++ libreoffice-trinity (<< ${binary:Version}), + libreoffice-officebean (<< ${binary:Version}), + libreoffice-sdbc-postgresql (<< 0.8.1~), + libreoffice-style-andromeda (<< 1:3.3.0-1), +@@ -4240,7 +4242,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}) | python-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}) | python-uno (= ${binary:Version}) | browser-plugin-libreoffice (= ${binary:Version}) | libreoffice-ogltrans (= ${binary:Version}), + ${misc:Depends} + Recommends: ure-dbg + Suggests: ${dbg-dbg-suggests} +@@ -4352,6 +4354,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 debian/control.in debian/control.in +--- debian/control.in 2013-05-10 20:05:04.000000000 +0000 ++++ debian/control.in 2013-06-04 18:59:36.691951126 +0000 +@@ -204,6 +204,7 @@ + libreoffice-gtk (<< ${binary:Version}), + libreoffice-impress (<< ${binary:Version}), + libreoffice-kde (<< ${binary:Version}), ++ libreoffice-trinity (<< ${binary:Version}), + libreoffice-officebean (<< ${binary:Version}), + libreoffice-writer (<< ${binary:Version}), + mozilla-libreoffice (<< 1:3.5.0~beta~), +diff -urN debian/control.tdeab.in debian/control.tdeab.in +--- debian/control.tdeab.in 1970-01-01 00:00:00.000000000 +0000 ++++ debian/control.tdeab.in 2013-06-04 18:58:33.340999923 +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 debian/control.trinity.in debian/control.trinity.in +--- debian/control.trinity.in 1970-01-01 00:00:00.000000000 +0000 ++++ debian/control.trinity.in 2013-06-04 18:58:33.340999923 +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 debian/patches/libreoffice_ubuntu-tde-make-package-modules-not-stink.diff debian/patches/libreoffice_ubuntu-tde-make-package-modules-not-stink.diff +--- debian/patches/libreoffice_ubuntu-tde-make-package-modules-not-stink.diff 1970-01-01 00:00:00.000000000 +0000 ++++ debian/patches/libreoffice_ubuntu-tde-make-package-modules-not-stink.diff 2013-06-04 18:58:33.340999923 +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 debian/patches/series debian/patches/series +--- debian/patches/series 2013-05-04 12:38:06.000000000 +0000 ++++ debian/patches/series 2013-06-04 19:00:08.672431349 +0000 +@@ -18,6 +18,7 @@ + make-pyuno-work-with-system-wide-module-install.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 +@@ -30,3 +31,4 @@ + wheezy-backports-python.diff + fix-internal-hsqldb-build.diff + boost-1.53.diff ++tde-update-r14.diff +diff -urN debian/patches/tde-update-r14.diff debian/patches/tde-update-r14.diff +--- debian/patches/tde-update-r14.diff 1970-01-01 00:00:00.000000000 +0000 ++++ debian/patches/tde-update-r14.diff 2013-06-04 18:58:33.441001423 +0000 +@@ -0,0 +1,440 @@ ++diff --git a/configure.ac b/configure.ac ++index 401352a..0ea3acf 100644 ++--- a/configure.ac +++++ b/configure.ac ++@@ -10258,7 +10258,7 @@ your TDE installation by exporting TDEDIR before running "configure".]) ++ ++ dnl Set the variables ++ TDE_CFLAGS="-I$tqt_incdir -I$tde_incdir -I/usr/include/tqt -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT" ++- TDE_LIBS="-L$tde_libdir -L$tqt_libdir -lkio -ltdeui -ltdecore -ltqt -ltqt-mt" +++ TDE_LIBS="-L$tde_libdir -L$tqt_libdir -ltdeio -ltdeui -ltdecore -ltqt -ltqt-mt" ++ fi ++ AC_SUBST(TDE_CFLAGS) ++ AC_SUBST(TDE_LIBS) ++diff --git a/connectivity/Library_tdeabdrv1.mk b/connectivity/Library_tdeabdrv1.mk ++index b2df458..b8786fd 100644 ++--- a/connectivity/Library_tdeabdrv1.mk +++++ b/connectivity/Library_tdeabdrv1.mk ++@@ -39,7 +39,7 @@ $(eval $(call gb_Library_use_externals,tdeabdrv1,\ ++ )) ++ ++ $(eval $(call gb_Library_add_libs,tdeabdrv1,\ ++- -lkabc \ +++ -ltdeabc \ ++ )) ++ ++ $(eval $(call gb_Library_use_libraries,tdeabdrv1,\ ++diff --git a/connectivity/source/drivers/kab/KConnection.hxx b/connectivity/source/drivers/kab/KConnection.hxx ++index fc4cc55..b14bbac 100644 ++--- a/connectivity/source/drivers/kab/KConnection.hxx +++++ b/connectivity/source/drivers/kab/KConnection.hxx ++@@ -30,6 +30,7 @@ ++ #include <com/sun/star/sdbcx/XTablesSupplier.hpp> ++ #include <comphelper/broadcasthelper.hxx> ++ #include <cppuhelper/compbase3.hxx> +++#include <shell/kde_headers.h> ++ ++ namespace KABC ++ { ++diff --git a/connectivity/source/drivers/kab/KDEInit.cxx b/connectivity/source/drivers/kab/KDEInit.cxx ++index 46bbe13..83f4bd9 100644 ++--- a/connectivity/source/drivers/kab/KDEInit.cxx +++++ b/connectivity/source/drivers/kab/KDEInit.cxx ++@@ -20,6 +20,7 @@ ++ #include "KDEInit.h" ++ #include <osl/diagnose.h> ++ #include <osl/process.h> +++ ++ #include <shell/kde_headers.h> ++ ++ namespace connectivity ++diff --git a/shell/inc/shell/tde_defines.h b/shell/inc/shell/tde_defines.h ++index 52e610c..0dc91e9 100644 ++--- a/shell/inc/shell/tde_defines.h +++++ b/shell/inc/shell/tde_defines.h ++@@ -26,67 +26,83 @@ ++ #ifndef INCLUDED_VCL_TDE_DEFINE_HEADERS_H ++ #define INCLUDED_VCL_TDE_DEFINE_HEADERS_H ++ ++-#define QObject TQObject ++-#define QWidget TQWidget ++-#define QVBox TQVBox ++-#define QHBox TQHBox ++-#define QGrid TQGrid ++-#define QString TQString ++-#define QStringList TQStringList ++-#define QCustomEvent TQCustomEvent ++-#define QMutex TQMutex ++-#define QEvent TQEvent ++-#define QFont TQFont ++-#define QDateTime TQDateTime ++-#define QThread TQThread ++-#define QStyle TQStyle ++-#define QApplication TQApplication ++-#define QRect TQRect ++-#define QProgressBar TQProgressBar ++-#define QPopupMenu TQPopupMenu ++-#define QMenuBar TQMenuBar ++-#define QToolButton TQToolButton ++-#define QToolBar TQToolBar ++-#define QScrollBar TQScrollBar ++-#define QListView TQListView ++-#define QSpinWidget TQSpinWidget ++-#define QScrollBar TQScrollBar ++-#define QLineEdit TQLineEdit ++-#define QComboBox TQComboBox ++-#define QCheckBox TQCheckBox ++-#define QRadioButton TQRadioButton ++-#define QPushButton TQPushButton ++-#define QPainter TQPainter ++-#define QResizeEvent TQResizeEvent ++-#define QShowEvent TQShowEvent ++-#define QPoint TQPoint ++-#define QDialog TQDialog ++-#define QFile TQFile ++-#define QLabel TQLabel ++-#define QObjectList TQObjectList ++-#define QCString TQCString ++-#define QRegExp TQRegExp ++-#define QSessionManager TQSessionManager ++-#define QPaintDevice TQPaintDevice ++-#define QTextIStream TQTextIStream ++-#define QTextStream TQTextStream ++-#define QMutexLocker TQMutexLocker ++-#define QValueList TQValueList ++-#define QTab TQTab ++-#define QTabBar TQTabBar ++-#define QTabWidget TQTabWidget ++-#define QMainWindow TQMainWindow ++-#define QPixmap TQPixmap ++-#define QColorGroup TQColorGroup ++-#define QStyleOption TQStyleOption ++-#define QSize TQSize ++-#define QMenuItem TQMenuItem ++-#define QFontInfo TQFontInfo +++#define QObject TQObject +++#define QWidget TQWidget +++#define QVBox TQVBox +++#define QHBox TQHBox +++#define QGrid TQGrid +++#define QString TQString +++#define QStringList TQStringList +++#define QCustomEvent TQCustomEvent +++#define QMutex TQMutex +++#define QEvent TQEvent +++#define QFont TQFont +++#define QDateTime TQDateTime +++#define QThread TQThread +++#define QStyle TQStyle +++#define QApplication TQApplication +++#define QRect TQRect +++#define QProgressBar TQProgressBar +++#define QPopupMenu TQPopupMenu +++#define QMenuBar TQMenuBar +++#define QToolButton TQToolButton +++#define QToolBar TQToolBar +++#define QScrollBar TQScrollBar +++#define QListView TQListView +++#define QSpinWidget TQSpinWidget +++#define QScrollBar TQScrollBar +++#define QLineEdit TQLineEdit +++#define QComboBox TQComboBox +++#define QCheckBox TQCheckBox +++#define QRadioButton TQRadioButton +++#define QPushButton TQPushButton +++#define QPainter TQPainter +++#define QResizeEvent TQResizeEvent +++#define QShowEvent TQShowEvent +++#define QPoint TQPoint +++#define QDialog TQDialog +++#define QFile TQFile +++#define QLabel TQLabel +++#define QObjectList TQObjectList +++#define QCString TQCString +++#define QRegExp TQRegExp +++#define QSessionManager TQSessionManager +++#define QPaintDevice TQPaintDevice +++#define QTextIStream TQTextIStream +++#define QTextStream TQTextStream +++#define QMutexLocker TQMutexLocker +++#define QValueList TQValueList +++#define QTab TQTab +++#define QTabBar TQTabBar +++#define QTabWidget TQTabWidget +++#define QMainWindow TQMainWindow +++#define QPixmap TQPixmap +++#define QColorGroup TQColorGroup +++#define QStyleOption TQStyleOption +++#define QSize TQSize +++#define QMenuItem TQMenuItem +++#define QFontInfo TQFontInfo ++ ++-#define qSwap tqSwap ++-#define qt_cast tqt_cast ++-#define qt_xdisplay tqt_xdisplay ++-#define qVersion tqVersion +++#define qSwap tqSwap +++#define qt_cast tqt_cast +++#define qt_xdisplay tqt_xdisplay +++#define qVersion tqVersion +++ +++#define KAboutData TDEAboutData +++#define KApplication TDEApplication +++#define KCmdLineArgs TDECmdLineArgs +++#define KConfig TDEConfig +++#define KGlobal TDEGlobal +++#define KGlobalSettings TDEGlobalSettings +++#define KMainWindow TDEMainWindow +++#define KStartupInfo TDEStartupInfo +++#define KStyle TDEStyle +++#define KToolBar TDEToolBar +++ +++#define drawKStylePrimitive drawTDEStylePrimitive +++ +++#define KIO TDEIO +++#define KABC TDEABC ++ ++ #endif ++ ++diff --git a/shell/inc/shell/tde_headers.h b/shell/inc/shell/tde_headers.h ++index d0f1444..ed3739e 100644 ++--- a/shell/inc/shell/tde_headers.h +++++ b/shell/inc/shell/tde_headers.h ++@@ -68,27 +68,27 @@ ++ ++ ++ /* ********* TDE base headers */ ++-#include <kaboutdata.h> ++-#include <kapplication.h> ++-#include <kcmdlineargs.h> ++-#include <kconfig.h> +++#include <tdeaboutdata.h> +++#include <tdeapplication.h> +++#include <tdecmdlineargs.h> +++#include <tdeconfig.h> ++ #include <tdeversion.h> ++-#include <kemailsettings.h> ++-#include <kglobal.h> ++-#include <kglobalsettings.h> ++-#include <klocale.h> ++-#include <kmainwindow.h> ++-#include <kmenubar.h> ++-#include <kprotocolmanager.h> ++-#include <kstartupinfo.h> ++-#include <kstyle.h> +++#include <tdeemailsettings.h> +++#include <tdeglobal.h> +++#include <tdeglobalsettings.h> +++#include <tdelocale.h> +++#include <tdemainwindow.h> +++#include <tdemenubar.h> +++#include <tdeprotocolmanager.h> +++#include <tdestartupinfo.h> +++#include <tdestyle.h> ++ ++ ++ /* ********* TDE address book connectivity headers */ ++-#include <kabc/addressbook.h> ++-#include <kabc/addressee.h> ++-#include <kabc/field.h> ++-#include <kabc/stdaddressbook.h> +++#include <tdeabc/addressbook.h> +++#include <tdeabc/addressee.h> +++#include <tdeabc/field.h> +++#include <tdeabc/stdaddressbook.h> ++ ++ #include "tde_defines.h" ++ ++diff --git a/vcl/Executable_tdefilepicker.mk b/vcl/Executable_tdefilepicker.mk ++index 4c912e4..10af256 100644 ++--- a/vcl/Executable_tdefilepicker.mk +++++ b/vcl/Executable_tdefilepicker.mk ++@@ -46,7 +46,7 @@ $(eval $(call gb_Executable_use_libraries,tdefilepicker,\ ++ ++ $(eval $(call gb_Executable_add_libs,tdefilepicker,\ ++ $(TDE_LIBS) \ ++- -lkio -lX11 \ +++ -ltdeio -lX11 \ ++ )) ++ ++ $(eval $(call gb_Executable_add_exception_objects,tdefilepicker,\ ++diff --git a/vcl/unx/kde/fpicker/kdecommandthread.cxx b/vcl/unx/kde/fpicker/kdecommandthread.cxx ++index 1f9f663..064d06c 100644 ++--- a/vcl/unx/kde/fpicker/kdecommandthread.cxx +++++ b/vcl/unx/kde/fpicker/kdecommandthread.cxx ++@@ -25,11 +25,11 @@ ++ ++ #ifdef ENABLE_TDE ++ #include <tqstringlist.h> +++#include <tdeapplication.h> ++ #else // ENABLE_TDE ++ #include <qstringlist.h> ++-#endif // ENABLE_TDE ++- ++ #include <kapplication.h> +++#endif // ENABLE_TDE ++ ++ #if OSL_DEBUG_LEVEL > 1 ++ #include <iostream> ++@@ -121,12 +121,18 @@ void KDECommandThread::handleCommand( const QString &rString, bool &bQuit ) ++ ++ QString qCommand = pTokens->front(); ++ pTokens->pop_front(); +++#if OSL_DEBUG_LEVEL > 1 +++ ::std::cerr << "kdefilepicker first command: " << qCommand.latin1() << ::std::endl; +++#endif ++ ++ if ( qCommand == "exit" ) ++ { ++ bQuit = true; ++ kapp->exit(); ++ kapp->wakeUpGuiThread(); +++#if OSL_DEBUG_LEVEL > 1 +++ ::std::cerr << "kdefilepicker: exiting" << ::std::endl; +++#endif ++ } ++ else ++ kapp->postEvent( m_pObject, new KDECommandEvent( qCommand, pTokens ) ); ++diff --git a/vcl/unx/kde/fpicker/kdefilepicker.cxx b/vcl/unx/kde/fpicker/kdefilepicker.cxx ++index b0d20e4..5163079 100644 ++--- a/vcl/unx/kde/fpicker/kdefilepicker.cxx +++++ b/vcl/unx/kde/fpicker/kdefilepicker.cxx ++@@ -42,13 +42,13 @@ ++ #endif ++ ++ #include <tdeversion.h> ++-#include <kdiroperator.h> ++-#include <kfiledialog.h> ++-#include <kfilefiltercombo.h> ++-#include <kio/netaccess.h> ++-#include <klocale.h> ++-#include <kmessagebox.h> ++-#include <ktempfile.h> +++#include <tdediroperator.h> +++#include <tdefiledialog.h> +++#include <tdefilefiltercombo.h> +++#include <tdeio/netaccess.h> +++#include <tdelocale.h> +++#include <tdemessagebox.h> +++#include <tdetempfile.h> ++ ++ #else // ENABLE_TDE ++ ++diff --git a/vcl/unx/kde/fpicker/kdefilepicker.hxx b/vcl/unx/kde/fpicker/kdefilepicker.hxx ++index e7638ea..046a1bc 100644 ++--- a/vcl/unx/kde/fpicker/kdefilepicker.hxx +++++ b/vcl/unx/kde/fpicker/kdefilepicker.hxx ++@@ -28,8 +28,13 @@ ++ ++ #include <cstddef> ++ +++#ifdef ENABLE_TDE +++#include <tdefiledialog.h> +++#include <tdefilefiltercombo.h> +++#else // ENABLE_TDE ++ #include <kfiledialog.h> ++ #include <kfilefiltercombo.h> +++#endif // ENABLE_TDE ++ ++ class QGrid; ++ class QHBox; ++diff --git a/vcl/unx/kde/fpicker/kdefpmain.cxx b/vcl/unx/kde/fpicker/kdefpmain.cxx ++index a18a969..df39e01 100644 ++--- a/vcl/unx/kde/fpicker/kdefpmain.cxx +++++ b/vcl/unx/kde/fpicker/kdefpmain.cxx ++@@ -23,9 +23,16 @@ ++ #include <kdefilepicker.hxx> ++ #include <kdecommandthread.hxx> ++ +++#ifdef ENABLE_TDE +++#include <tqeventloop.h> +++#include <tdeaboutdata.h> +++#include <tdeapplication.h> +++#include <tdecmdlineargs.h> +++#else // ENABLE_TDE ++ #include <kaboutdata.h> ++ #include <kapplication.h> ++ #include <kcmdlineargs.h> +++#endif // ENABLE_TDE ++ ++ #include <iostream> ++ #include <stdlib.h> ++@@ -40,6 +47,15 @@ ++ #define THIS_DESKENV_NAME_LOW "kde" ++ #endif // ENABLE_TDE ++ +++#ifdef ENABLE_TDE +++#define KAboutData TDEAboutData +++#define KCmdLineArgs TDECmdLineArgs +++#define KCmdLineOptions TDECmdLineOptions +++#define KCmdLineLastOption TDECmdLineLastOption +++#define KApplication TDEApplication +++#define KLocale TDELocale +++#endif // ENABLE_TDE +++ ++ ////////////////////////////////////////////////////////////////////////// ++ // Main ++ ////////////////////////////////////////////////////////////////////////// ++diff --git a/vcl/unx/kde/fpicker/kdemodalityfilter.cxx b/vcl/unx/kde/fpicker/kdemodalityfilter.cxx ++index 5c8c482..2c1f034 100644 ++--- a/vcl/unx/kde/fpicker/kdemodalityfilter.cxx +++++ b/vcl/unx/kde/fpicker/kdemodalityfilter.cxx ++@@ -21,8 +21,13 @@ ++ ++ #include <kdemodalityfilter.hxx> ++ +++#ifdef ENABLE_TDE +++#include <tdeapplication.h> +++#include <kdialogbase.h> +++#else // ENABLE_TDE ++ #include <kapplication.h> ++ #include <kdialogbase.h> +++#endif // ENABLE_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 --git a/connectivity/Library_tdeab1.mk b/connectivity/Library_tdeab1.mk ++index 59f2f80..94bafe5 100644 ++--- a/connectivity/Library_tdeab1.mk +++++ b/connectivity/Library_tdeab1.mk ++@@ -33,6 +33,10 @@ $(eval $(call gb_Library_use_externals,tdeab1,\ ++ ++ $(eval $(call gb_Library_set_componentfile,tdeab1,connectivity/source/drivers/kab/tdeab1)) ++ +++$(eval $(call gb_Library_use_packages,tdeab1,\ +++ shell_inc \ +++)) +++ ++ $(eval $(call gb_Library_set_include,tdeab1,\ ++ -I$(SRCDIR)/connectivity/source/inc \ ++ $$(INCLUDE) \ +diff -urN debian/rules debian/rules +--- debian/rules 2013-05-11 11:09:56.000000000 +0000 ++++ debian/rules 2013-06-04 18:58:33.451001574 +0000 +@@ -197,7 +197,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 "$(SYSTEM_GCC_VERSION)" "4.7" +@@ -207,6 +208,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 +@@ -462,6 +469,7 @@ + ENABLE_MYSQLNATIVE=n + ENABLE_EVO2=n + ENABLE_KDEAB=n ++ ENABLE_TDEAB=n + ENABLE_REPORTDESIGN=n + DEBHELPER_OPTIONS += -Nlibreoffice-base libreoffice-base-core + DEBHELPER_OPTIONS += -Nlibreoffice-evolution -Nlibreoffice-kab +@@ -1068,6 +1076,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 += , tdelibs4-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-mysql-connector + ifneq (,$(filter mysql, $(SYSTEM_STUFF))) +@@ -1499,6 +1526,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 +@@ -1519,6 +1551,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 +@@ -1596,6 +1632,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 +@@ -2179,6 +2218,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)-trinity/$(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 +@@ -2453,6 +2531,12 @@ + rm -f $(PKGDIR)-wiki-publisher/$(OODIR)/share/extensions/wiki-publisher/registration/LICENSE + endif + ++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 +@@ -3021,6 +3105,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 debian/scripts/gid2pkgdirs.sh debian/scripts/gid2pkgdirs.sh +--- debian/scripts/gid2pkgdirs.sh 2013-05-04 12:37:17.000000000 +0000 ++++ debian/scripts/gid2pkgdirs.sh 2013-06-04 18:58:33.451001574 +0000 +@@ -102,6 +102,7 @@ + create_package_directory gid_Module_Optional_Extensions_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 +@@ -152,7 +153,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 \; + ); + |