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

Update libreoffice patches

Browse Source
r14.0.x
root 12 years ago
parent 5e9e6972ab
commit 06974482bf
2 changed files with 81 additions and 33 deletions
Show Stats Download Patch File Download Diff File

69
libreoffice/3.6.0/patches/libreoffice-debian.diff
Unescape View File

@ -108,7 +108,7 @@ diff -urN a/debian/control.tdeab.in b/debian/control.tdeab.in
--- a/debian/control.tdeab.in --- a/debian/control.tdeab.in
+++ b/debian/control.tdeab.in +++ b/debian/control.tdeab.in
@@ -0,0 +1,14 @@ @@ -0,0 +1,14 @@
+Package: libreofficeVER-tdeab +Package: libreofficeVER-tdeab-trinity
+Architecture: %OOO_BASE_ARCHS% +Architecture: %OOO_BASE_ARCHS%
+Depends: libreofficeVER-core (= ${binary:Version}), +Depends: libreofficeVER-core (= ${binary:Version}),
+ libreofficeVER-common (>= 1:3.4.0~), + libreofficeVER-common (>= 1:3.4.0~),
@ -135,7 +135,7 @@ diff -urN a/debian/control.trinity.in b/debian/control.trinity.in
+Recommends: ${trinity-iconset-dep} +Recommends: ${trinity-iconset-dep}
+Suggests: konqueror-trinity, +Suggests: konqueror-trinity,
+ kmail-trinity, + kmail-trinity,
+ libreofficeVER-tdeab + libreofficeVER-tdeab-trinity
+Section: trinity +Section: trinity
+Enhances: libreofficeVER +Enhances: libreofficeVER
+Replaces: openoffice.org-trinity (<< 1:3.3.0~), libreoffice-core (= 1:3.5.0~beta2-1) +Replaces: openoffice.org-trinity (<< 1:3.3.0~), libreoffice-core (= 1:3.5.0~beta2-1)
@ -148,9 +148,27 @@ diff -urN a/debian/control.trinity.in b/debian/control.trinity.in
+ You can extend the functionality of this by installing these packages: + You can extend the functionality of this by installing these packages:
+ . + .
+ * konqueror / kmail + * konqueror / kmail
+ * libreoffice-tdeab: TDE Addressbook support + * libreoffice-tdeab-trinity: TDE Addressbook support
+ +
diff -urN a/debian/rules b/debian/rules --- a/debian/scripts/gid2pkgdirs.sh
+++ b/debian/scripts/gid2pkgdirs.sh
@@ -103,6 +103,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
@@ -160,7 +161,7 @@
fi &&
( cd pkg/libreoffice-common/$OOINSTBASE/program
find -maxdepth 1 \
- -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|nsplugin\|kdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|oosplash\|uri-encode\)' \
+ -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|nsplugin\|kdefilepicker\|tdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|oosplash\|uri-encode\)' \
-exec mv {} $OODESTDIR/pkg/libreoffice-core/$OOINSTBASE/program \;
);
--- a/debian/rules --- a/debian/rules
+++ b/debian/rules +++ b/debian/rules
@@ -162,7 +162,8 @@ @@ -162,7 +162,8 @@
@ -243,11 +261,15 @@ diff -urN a/debian/rules b/debian/rules
ifeq "$(ENABLE_LDAP)" "y" ifeq "$(ENABLE_LDAP)" "y"
perl -pi -e 's/paperconf$$/paperconf\n * $(LDAP_LIB): LDAP client library; needed for LibreOffice getting its\n profiles from LDAP/' debian/control perl -pi -e 's/paperconf$$/paperconf\n * $(LDAP_LIB): LDAP client library; needed for LibreOffice getting its\n profiles from LDAP/' debian/control
@@ -2075,6 +2114,41 @@ @@ -2075,6 +2114,45 @@
> $(PKGDIR)-kde/usr/share/templates/soffice.odg.desktop > $(PKGDIR)-kde/usr/share/templates/soffice.odg.desktop
endif endif
+ifeq "$(BUILD_TDE)" "y" +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" ... + # install files for TDEs "create new" ...
+ mkdir -p $(PKGDIR)-trinity/usr/share/templates/.source + mkdir -p $(PKGDIR)-trinity/usr/share/templates/.source
+ for i in $(SOURCE_TREE)/extras/source/shellnew/*; do \ + for i in $(SOURCE_TREE)/extras/source/shellnew/*; do \
@ -274,18 +296,18 @@ diff -urN a/debian/rules b/debian/rules
+ | sed -e "s/@TYPE@/drawing/" \ + | sed -e "s/@TYPE@/drawing/" \
+ > $(PKGDIR)-trinity/usr/share/templates/soffice.odg.desktop + > $(PKGDIR)-trinity/usr/share/templates/soffice.odg.desktop
+endif +endif
+#ifeq "$(ENABLE_TDEAB)" "y" +ifeq "$(ENABLE_TDEAB)" "y"
+# rm -rf $(PKGDIR)-tdeab-trinity + rm -rf $(PKGDIR)-tdeab-trinity
+# mkdir -p -m755 $(PKGDIR)-tdeab-trinity/$(OODIR)/program + mkdir -p -m755 $(PKGDIR)-tdeab-trinity/$(OODIR)/program
+# for f in libtdeab*so; do \ + for f in libtdeab*so; do \
+# mv $(PKGDIR)-core/$(OODIR)/program/$$f $(PKGDIR)-tdeab-trinity/$(OODIR)/program || exit 1 ;\ + mv $(PKGDIR)-trinity/$(OODIR)/program/$$f $(PKGDIR)-tdeab-trinity/$(OODIR)/program || exit 1 ;\
+# done + done
+#endif +endif
+ +
# split out gtk stuff # split out gtk stuff
rm -rf $(PKGDIR)-gtk rm -rf $(PKGDIR)-gtk
mkdir -p -m755 $(PKGDIR)-gtk/$(OODIR)/program mkdir -p -m755 $(PKGDIR)-gtk/$(OODIR)/program
@@ -2292,6 +2366,12 @@ @@ -2292,6 +2370,12 @@
endif endif
@ -298,7 +320,7 @@ diff -urN a/debian/rules b/debian/rules
ifeq "$(LINK_TO_STLPORT)" "y" ifeq "$(LINK_TO_STLPORT)" "y"
rm -f debian/ure/$(OOUREDIR)/lib/libstlport* rm -f debian/ure/$(OOUREDIR)/lib/libstlport*
ln -s `readlink -f /usr/lib/libstlport_gcc.so` \ ln -s `readlink -f /usr/lib/libstlport_gcc.so` \
@@ -2917,6 +2997,7 @@ @@ -2917,6 +3001,7 @@
-V'ooo-binfilter-dep=$(OOO_BINFILTER_DEP)' \ -V'ooo-binfilter-dep=$(OOO_BINFILTER_DEP)' \
-V'ooo-officebean-dep=$(OOO_OFFICEBEAN_DEP)' \ -V'ooo-officebean-dep=$(OOO_OFFICEBEAN_DEP)' \
-V'kde-iconset-dep=$(KDE_ICONSET_DEP)' \ -V'kde-iconset-dep=$(KDE_ICONSET_DEP)' \
@ -306,22 +328,3 @@ diff -urN a/debian/rules b/debian/rules
-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)' \
--- a/debian/scripts/gid2pkgdirs.sh
+++ b/debian/scripts/gid2pkgdirs.sh
@@ -103,6 +103,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
@@ -160,7 +161,7 @@
fi &&
( cd pkg/libreoffice-common/$OOINSTBASE/program
find -maxdepth 1 \
- -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|nsplugin\|kdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|oosplash\|uri-encode\)' \
+ -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|nsplugin\|kdefilepicker\|tdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|oosplash\|uri-encode\)' \
-exec mv {} $OODESTDIR/pkg/libreoffice-core/$OOINSTBASE/program \;
);

45
libreoffice/3.6.0/patches/libreoffice-trinity.diff
Unescape View File

@ -264,3 +264,48 @@
Styles = (PACKED); Styles = (PACKED);
Dir = SCP2_OOO_BIN_DIR; Dir = SCP2_OOO_BIN_DIR;
Name = STRING(CONCAT2(tdebe1.uno,UNXSUFFIX)); Name = STRING(CONCAT2(tdebe1.uno,UNXSUFFIX));
--- a/fpicker/source/generic/fpicker.cxx
+++ b/fpicker/source/generic/fpicker.cxx
@@ -57,7 +57,9 @@
{
#ifdef UNX
OUString aDesktopEnvironment (Application::GetDesktopEnvironment());
- if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde")))
+ if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("tde")))
+ return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.TDEFilePicker"));
+ else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde")))
return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.KDEFilePicker"));
else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde4")))
return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.KDE4FilePicker"));
@@ -138,7 +140,9 @@
{
OUString aDesktopEnvironment (Application::GetDesktopEnvironment());
#ifdef UNX
- if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde")))
+ if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("tde")))
+ return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.TDEFolderPicker"));
+ else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde")))
return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.KDEFolderPicker"));
else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("macosx")))
return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.AquaFolderPicker"));
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -46,6 +46,8 @@
ENABLE_NSPLUGIN \
ENABLE_ONLINE_UPDATE \
ENABLE_OPENGL \
+ ENABLE_TDE \
+ ENABLE_TDEAB \
ENABLE_XMLSEC \
MERGELIBS \
SYSTEM_BOOST \
--- a/scp2/InstallModule_tde.mk
+++ b/scp2/InstallModule_tde.mk
@@ -34,6 +34,7 @@
$(eval $(call gb_InstallModule_define_if_set,scp2/tde,\
ENABLE_TDE \
+ ENABLE_TDEAB \
))
$(eval $(call gb_InstallModule_add_scpfiles,scp2/tde,\

Write Preview
Loading…
Cancel
Save