[libreoffice] 01/01: port patches to apply again after gnomevfs/kde3 removal
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.
commit a0eff72a360295a59dc4437c66de74af8a7c8120
Author: Rene Engelhard <rene@debian.org>
Date: Sat Sep 12 23:33:31 2015 +0200
port patches to apply again after gnomevfs/kde3 removal
---
patches/install-fixes.diff | 8 +++---
patches/make-package-modules-not-suck.diff | 40 +++++++++++++++---------------
patches/sensible-browser.diff | 18 --------------
patches/series | 1 -
patches/split-evoab.diff | 26 +++++++++----------
5 files changed, 37 insertions(+), 56 deletions(-)
diff --git a/patches/install-fixes.diff b/patches/install-fixes.diff
index 0dfbd0a..9a25d69 100644
--- a/patches/install-fixes.diff
+++ b/patches/install-fixes.diff
@@ -11,10 +11,11 @@ index eaabf9c..c1b1ec6 100755
BUILDDIR=`pwd`
FILELISTSDIR="$BUILDDIR/file-lists"
-@@ -378,154 +378,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
+@@ -366,154 +366,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
+ remove_duplicity_from_flists common_list.txt lang_bg_list.txt $INSTALLDIR/presets/config/styles.sod
# the British fixes can be removed after the issue #54113 is fixed
remove_duplicity_from_flists common_list.txt lang_en-GB_list.txt $INSTALLDIR/presets/config/standard.sog
-
+-
-else
-
- echo "Creating package directories..."
@@ -60,7 +61,6 @@ index eaabf9c..c1b1ec6 100755
- create_package_directory gid_Module_Pyuno pkg/python-uno
- create_package_directory gid_Module_Optional_Gnome pkg/libreoffice-gnome
- create_package_directory gid_Module_Optional_Tde pkg/libreoffice-tde
-- create_package_directory gid_Module_Optional_Kde pkg/libreoffice-kde
-
- create_package_directory gid_Module_Root_Files_2 pkg/libreoffice-common
- create_package_directory gid_Module_Root_Files_3 pkg/libreoffice-common
@@ -132,7 +132,7 @@ index eaabf9c..c1b1ec6 100755
- fi &&
- ( cd pkg/libreoffice-common/$d
- find -maxdepth 1 \
-- -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|tdefilepicker\|kdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|uri-encode\)' \
+- -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|tdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|uri-encode\)' \
- -exec mv {} $DESTDIR/pkg/libreoffice-core/$d \;
- ); \
- done
diff --git a/patches/make-package-modules-not-suck.diff b/patches/make-package-modules-not-suck.diff
index 5b8e94b..fb4cfa2 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -1,5 +1,5 @@
diff --git a/scp2/InstallModule_draw.mk b/scp2/InstallModule_draw.mk
-index 63a29f8..5e455a5 100644
+index a7c02be..d48edf2 100644
--- a/scp2/InstallModule_draw.mk
+++ b/scp2/InstallModule_draw.mk
@@ -10,6 +10,7 @@
@@ -11,7 +11,7 @@ index 63a29f8..5e455a5 100644
))
diff --git a/scp2/source/draw/module_draw.scp b/scp2/source/draw/module_draw.scp
-index f7d92c1..a102275 100644
+index 8737579..0913c61 100644
--- a/scp2/source/draw/module_draw.scp
+++ b/scp2/source/draw/module_draw.scp
@@ -18,6 +18,7 @@
@@ -22,7 +22,7 @@ index f7d92c1..a102275 100644
#include "AutoInstall/draw_brand"
Module gid_Module_Prg_Draw
-@@ -34,7 +34,8 @@ Module gid_Module_Prg_Draw_Bin
+@@ -34,7 +35,8 @@ Module gid_Module_Prg_Draw_Bin
Sortkey = "100";
Default = YES;
Styles = (HIDDEN_ROOT);
@@ -33,10 +33,10 @@ index f7d92c1..a102275 100644
gid_File_Tmp_Userinstall_Draw_Inf);
End
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
-index 4983fc7..f286d13 100644
+index 7d2a347..a15ac52 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
-@@ -17,6 +17,7 @@ $(eval $(call gb_AutoInstall_add_module,base_brand,,LIBO_EXECUTABLE))
+@@ -18,6 +18,7 @@ $(eval $(call gb_AutoInstall_add_module,base_brand,,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,brand,,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,calc,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,calc_brand,,LIBO_EXECUTABLE))
@@ -45,10 +45,10 @@ index 4983fc7..f286d13 100644
$(eval $(call gb_AutoInstall_add_module,extensions_ct2n,,,,))
$(eval $(call gb_AutoInstall_add_module,extensions_bsh,,,LIBO_JAR_FILE))
diff --git a/Repository.mk b/Repository.mk
-index 51089bb..3cffd92 100644
+index 9a7c31d..09eda0c 100644
--- a/Repository.mk
+++ b/Repository.mk
-@@ -143,13 +143,28 @@ endif
+@@ -196,13 +196,28 @@ $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,base, \
abp \
@@ -78,7 +78,7 @@ index 51089bb..3cffd92 100644
date \
pricing \
sc \
-@@ -162,6 +178,13 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,calc, \
+@@ -214,6 +229,13 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,calc, \
$(call gb_Helper_optional,SCRIPTING,vbaobj) \
))
@@ -92,7 +92,7 @@ index 51089bb..3cffd92 100644
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,graphicfilter, \
svgfilter \
flash \
-@@ -179,6 +202,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,impress, \
+@@ -231,6 +253,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,impress, \
PresenterScreen \
PresentationMinimizer \
wpftimpress \
@@ -100,7 +100,7 @@ index 51089bb..3cffd92 100644
))
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,onlineupdate, \
-@@ -228,11 +252,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
+@@ -295,11 +318,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
ctl \
cui \
$(call gb_Helper_optional,DBCONNECTIVITY, \
@@ -113,7 +113,7 @@ index 51089bb..3cffd92 100644
deploymentmisc \
$(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
$(if $(filter unx,$(GUIBASE)),desktop_detector) \
-@@ -255,10 +276,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
+@@ -322,10 +342,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
exp \
expwrap \
$(call gb_Helper_optional,DBCONNECTIVITY, \
@@ -124,15 +124,15 @@ index 51089bb..3cffd92 100644
fps_office \
for \
forui \
-@@ -287,7 +306,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
+@@ -354,7 +372,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
ira \
itg \
iti \
- $(if $(ENABLE_JAVA),jdbc) \
- $(if $(ENABLE_KAB),kab1) \
- $(if $(ENABLE_KAB),kabdrv1) \
ldapbe2 \
-@@ -302,8 +320,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
+ localebe1 \
+ log \
+@@ -367,8 +384,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
msfilter \
$(call gb_Helper_optional,SCRIPTING,msforms) \
mtfrenderer \
@@ -141,7 +141,7 @@ index 51089bb..3cffd92 100644
odfflatxml \
offacc \
oox \
-@@ -317,13 +333,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
+@@ -383,13 +398,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
sb \
$(call gb_Helper_optional,DBCONNECTIVITY,sdbt) \
scn \
@@ -155,7 +155,7 @@ index 51089bb..3cffd92 100644
sot \
spell \
$(if $(ENABLE_HEADLESS),,spl) \
-@@ -333,7 +344,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
+@@ -400,7 +410,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
svt \
svx \
svxcore \
@@ -163,7 +163,7 @@ index 51089bb..3cffd92 100644
syssh \
$(if $(ENABLE_TDEAB),tdeab1) \
$(if $(ENABLE_TDEAB),tdeabdrv1) \
-@@ -397,6 +407,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,writer, \
+@@ -490,6 +499,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,writer, \
hwp \
$(if $(ENABLE_LWP),lwpft) \
msword \
@@ -171,7 +171,7 @@ index 51089bb..3cffd92 100644
swd \
swui \
t602filter \
-@@ -504,13 +515,11 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
+@@ -568,13 +578,11 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
cached1 \
collator_data \
comphelper \
@@ -185,7 +185,7 @@ index 51089bb..3cffd92 100644
i18nlangtag \
i18nutil \
index_data \
-@@ -526,7 +535,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
+@@ -591,7 +599,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
package2 \
$(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))),recentfile) \
$(call gb_Helper_optional,SCRIPTING,scriptframe) \
diff --git a/patches/sensible-browser.diff b/patches/sensible-browser.diff
deleted file mode 100644
index a863f42..0000000
--- a/patches/sensible-browser.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/shell/source/unix/misc/kde-open-url.sh b/shell/source/unix/misc/kde-open-url.sh
-index b0eac27..27bf6de 100755
---- a/shell/source/unix/misc/kde-open-url.sh
-+++ b/shell/source/unix/misc/kde-open-url.sh
-@@ -19,7 +19,11 @@
-
- # special handling for mailto: uris
- if echo $1 | grep '^mailto:' > /dev/null; then
-- kmailservice "$1" &
-+ if which kde-open; then
-+ kde-open "$1" &
-+ else
-+ kmailservice "$1" &
-+ fi
- else
-- kfmclient openURL "$1" &
-+ sensible-browser "$1" &
- fi
diff --git a/patches/series b/patches/series
index b2ce5b9..1feef23 100644
--- a/patches/series
+++ b/patches/series
@@ -9,7 +9,6 @@ install-fixes.diff
#mention-java-common-package.diff
#help-msg-add-package-info.diff
sensible-lomua.diff
-sensible-browser.diff
reportdesign-mention-package.diff
jdbc-driver-classpaths.diff
mysqlcppconn-libmysqlclient-SONAME.diff
diff --git a/patches/split-evoab.diff b/patches/split-evoab.diff
index 8d4edec..609bd00 100644
--- a/patches/split-evoab.diff
+++ b/patches/split-evoab.diff
@@ -1,8 +1,8 @@
diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp
-index 68f413f..96baa6f 100644
+index c7a13c8..a3f59a6 100644
--- a/scp2/source/gnome/file_gnome.scp
+++ b/scp2/source/gnome/file_gnome.scp
-@@ -34,3 +34,13 @@ File gid_File_Share_Registry_Gnome_Xcd
+@@ -25,3 +25,13 @@ File gid_File_Share_Registry_Gnome_Xcd
Name = "gnome.xcd";
End
#endif
@@ -17,11 +17,11 @@ index 68f413f..96baa6f 100644
+#endif
+
diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp
-index 9f4d0b8..da58fe2 100644
+index 08d9efe..492e274 100644
--- a/scp2/source/gnome/module_gnome.scp
+++ b/scp2/source/gnome/module_gnome.scp
-@@ -33,6 +33,9 @@ Module gid_Module_Optional_Gnome
- #if (defined ENABLE_GNOMEVFS && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO
+@@ -30,6 +30,9 @@ Module gid_Module_Optional_Gnome
+ #if defined ENABLE_GIO
gid_File_Share_Registry_Gnome_Xcd,
#endif
+#ifdef ENABLE_EVOAB2
@@ -31,11 +31,11 @@ index 9f4d0b8..da58fe2 100644
);
End
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
-index e12640f..ec17244 100644
+index 510b444..3ff190f 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
-@@ -333,8 +333,9 @@ postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/ucb/Configuration-ne
- endif
+@@ -331,8 +331,9 @@ ifneq ($(WITH_WEBDAV),)
+ postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/ucb/Configuration-webdav.xcu
endif
ifeq ($(ENABLE_EVOAB2),TRUE)
-postprocess_FILES_main += $(call gb_XcuModuleTarget_get_target,connectivity/registry/evoab2)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu
@@ -47,14 +47,14 @@ index e12640f..ec17244 100644
endif
ifeq ($(ENABLE_JAVA),TRUE)
diff --git a/scp2/InstallModule_gnome.mk b/scp2/InstallModule_gnome.mk
-index 3e2fa77..4cb7235 100644
+index 686f6c1..d633c90 100644
--- a/scp2/InstallModule_gnome.mk
+++ b/scp2/InstallModule_gnome.mk
-@@ -15,6 +15,7 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/gnome,\
+@@ -14,6 +14,7 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/gnome,gnome))
+ $(eval $(call gb_InstallModule_define_if_set,scp2/gnome,\
ENABLE_GIO \
- ENABLE_GNOMEVFS \
ENABLE_LOCKDOWN \
-+ ENABLE_EVOAB2 \
- ENABLE_GTK \
++ ENABLE_EVOAB2 \
+ ENABLE_GTK \
))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: