[libreoffice] 03/03: update patches

Rene Engelhard rene at moszumanska.debian.org
Thu Jun 15 18:05:20 UTC 2017 

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-6.0
in repository libreoffice.

commit e6009fb94acf3e26a18f7a18f0e614bf6a49d0bb
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Jun 15 20:05:15 2017 +0200

    update patches
---
 changelog                                                |  2 +-
 patches/cppunit-optional.diff                            |  2 +-
 ...sc_subsequent_filters_test-with-internal-cppunit.diff |  2 +-
 patches/install-fixes.diff                               |  5 ++---
 patches/make-package-modules-not-suck.diff               | 16 ++++++++--------
 patches/no-packagekit-per-default.diff                   |  2 +-
 6 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/changelog b/changelog
index e0c2e26..ba76059 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:6.0.0~alpha0~git20170612-1) UNRELEASED; urgency=medium
+libreoffice (1:6.0.0~alpha0~git20170615-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
 
diff --git a/patches/cppunit-optional.diff b/patches/cppunit-optional.diff
index 7a3eb6d..c806a54 100644
--- a/patches/cppunit-optional.diff
+++ b/patches/cppunit-optional.diff
@@ -36,9 +36,9 @@ index 880895e3c00f..a3dab3e00979 100644
  export COINMP_LIBS=@COINMP_LIBS@
  export ENABLE_COLLADA=@ENABLE_COLLADA@
 +export ENABLE_CPPUNIT=@ENABLE_CPPUNIT@
- export ENABLE_CRASHDUMP=@ENABLE_CRASHDUMP@
  export ENABLE_CUPS=@ENABLE_CUPS@
  export ENABLE_CURL=@ENABLE_CURL@
+ export ENABLE_FUZZERS=@ENABLE_FUZZERS@
 diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
 index fe9523a7a6e2..719edf8c6252 100644
 --- a/sal/Module_sal.mk
diff --git a/patches/disable-sc_subsequent_filters_test-with-internal-cppunit.diff b/patches/disable-sc_subsequent_filters_test-with-internal-cppunit.diff
index 292c1f0..ac3e87b 100644
--- a/patches/disable-sc_subsequent_filters_test-with-internal-cppunit.diff
+++ b/patches/disable-sc_subsequent_filters_test-with-internal-cppunit.diff
@@ -14,13 +14,13 @@ index ef82147d781b..f737236d40c3 100644
 --- a/sc/Module_sc.mk
 +++ b/sc/Module_sc.mk
 @@ -53,12 +53,17 @@ endif
- $(eval $(call gb_Module_add_slowcheck_targets,sc, \
  	CppunitTest_sc_condformats \
  	CppunitTest_sc_new_cond_format_api \
 -	CppunitTest_sc_subsequent_filters_test \
  	CppunitTest_sc_subsequent_export_test \
  	CppunitTest_sc_html_export_test \
  	CppunitTest_sc_copypaste \
+ 	CppunitTest_sc_dataproviders_test \
  ))
  
 +ifeq ($(SYSTEM_CPPUNIT),TRUE)
diff --git a/patches/install-fixes.diff b/patches/install-fixes.diff
index ba0b211..891bb32 100644
--- a/patches/install-fixes.diff
+++ b/patches/install-fixes.diff
@@ -11,7 +11,7 @@ index eaabf9c..c1b1ec6 100755
  BUILDDIR=`pwd`
  FILELISTSDIR="$BUILDDIR/file-lists"
  
-@@ -364,153 +364,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
+@@ -351,152 +351,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
@@ -59,7 +59,6 @@ index eaabf9c..c1b1ec6 100755
 -    create_package_directory gid_Module_Brand_Prg_Base              pkg/libreoffice-base
 -    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_Root_Files_2                pkg/libreoffice-common
 -    create_package_directory gid_Module_Root_Files_3                pkg/libreoffice-common
@@ -131,7 +130,7 @@ index eaabf9c..c1b1ec6 100755
 -      fi &&
 -      ( cd pkg/libreoffice-common/$d
 -        find -maxdepth 1 \
--           -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|tdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|uri-encode\)' \
+-           -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|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 bc8b90a..5082a34 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -36,13 +36,13 @@ diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
 index 7d2a347..a15ac52 100644
 --- a/scp2/AutoInstall.mk
 +++ b/scp2/AutoInstall.mk
-@@ -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))
+@@ -17,6 +17,7 @@ $(eval $(call gb_AutoInstall_add_module,base_brand,,LIBO_EXECUTABLE,,PACKAGE_FIL
+ $(eval $(call gb_AutoInstall_add_module,brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
+ $(eval $(call gb_AutoInstall_add_module,calc,LIBO_LIB_FILE,,,PACKAGE_FILELIST))
+ $(eval $(call gb_AutoInstall_add_module,calc_brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
 +$(eval $(call gb_AutoInstall_add_module,draw,LIBO_LIB_FILE))
- $(eval $(call gb_AutoInstall_add_module,draw_brand,,LIBO_EXECUTABLE))
- $(eval $(call gb_AutoInstall_add_module,extensions_ct2n,,,,))
+ $(eval $(call gb_AutoInstall_add_module,draw_brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
+ $(eval $(call gb_AutoInstall_add_module,extensions_ct2n,,,,PACKAGE_FILELIST))
  $(eval $(call gb_AutoInstall_add_module,extensions_bsh,,,LIBO_JAR_FILE))
 diff --git a/Repository.mk b/Repository.mk
 index 14a1c07..eab8078 100644
@@ -161,8 +161,8 @@ index 14a1c07..eab8078 100644
  	svxcore \
 -	sw \
  	syssh \
- 	$(if $(ENABLE_TDEAB),tdeab1) \
- 	$(if $(ENABLE_TDEAB),tdeabdrv1) \
+ 	textconversiondlgs \
+ 	textfd \
 @@ -486,6 +495,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,writer, \
  	hwp \
  	$(if $(ENABLE_LWP),lwpft) \
diff --git a/patches/no-packagekit-per-default.diff b/patches/no-packagekit-per-default.diff
index 1ca6bd6..3e2b545 100644
--- a/patches/no-packagekit-per-default.diff
+++ b/patches/no-packagekit-per-default.diff
@@ -177,7 +177,7 @@ index f467783..b48e763 100644
 --- a/sfx2/source/appl/appserv.cxx
 +++ b/sfx2/source/appl/appserv.cxx
 @@ -159,6 +159,7 @@ namespace
-         // make sure we actually can instanciate services from base first
+         // make sure we actually can instantiate services from base first
          if(!lcl_isBaseAvailable())
          {
 +#if defined (ENABLE_PACKAGEKIT)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git

More information about the Pkg-openoffice-commits mailing list