[libreoffice] 04/05: git update; update patches
Rene Engelhard
rene at moszumanska.debian.org
Mon Feb 13 19:06:42 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.
commit 53116a2323513ca6a1f0585f0bf809e75e004ac0
Author: Rene Engelhard <rene at debian.org>
Date: Mon Feb 13 20:02:54 2017 +0100
git update; update patches
---
changelog | 2 +-
patches/build-against-shared-lpsolve.diff | 2 +-
patches/debian-branding.diff | 4 ++--
patches/install-fixes.diff | 3 +--
patches/no-openssl.diff | 17 +++++------------
patches/no-packagekit-per-default.diff | 2 +-
6 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/changelog b/changelog
index 4e201e6..67487ce 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.4.0~alpha0~git20170201-1) UNRELEASED; urgency=medium
+libreoffice (1:5.4.0~alpha0~git20170213-1) UNRELEASED; urgency=medium
* New upstream snapshot
diff --git a/patches/build-against-shared-lpsolve.diff b/patches/build-against-shared-lpsolve.diff
index c759445..1f1d531 100644
--- a/patches/build-against-shared-lpsolve.diff
+++ b/patches/build-against-shared-lpsolve.diff
@@ -11,8 +11,8 @@ index cdae8b5..49f3ba2 100644
- [ AC_MSG_ERROR(lpsolve library not found or too old.)], [])
+ [ AC_MSG_ERROR(lpsolve library not found or too old.)], [-L/usr/lib/lp_solve])
LIBS=$save_LIBS
- libo_MINGW_CHECK_DLL([lpsolve55])
else
+ AC_MSG_RESULT([internal])
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index a4daea7..0dea12d 100644
--- a/RepositoryExternal.mk
diff --git a/patches/debian-branding.diff b/patches/debian-branding.diff
index 79d738f..60bbd5c 100644
--- a/patches/debian-branding.diff
+++ b/patches/debian-branding.diff
@@ -3,9 +3,9 @@ index 8cf38a2..6bda352 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -16,7 +16,7 @@ Globals
+ BASISPACKAGEPREFIX libobasis
+ UREPACKAGEPREFIX libreoffice
SOLSUREPACKAGEPREFIX libreoffice
- REGISTRATION_HOST https://registration.libreoffice.org/RegistrationWeb
- REGISTRATIONURL http://survey.libreoffice.org/user/index.php
- PROGRESSBARCOLOR 0,0,0
+ PROGRESSBARCOLOR 215,7,81
PROGRESSSIZE 444,8
diff --git a/patches/install-fixes.diff b/patches/install-fixes.diff
index 9a25d69..ba0b211 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"
-@@ -366,154 +366,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
+@@ -364,153 +364,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
@@ -44,7 +44,6 @@ index eaabf9c..c1b1ec6 100755
- create_package_directory gid_Module_Root_Files_Images pkg/libreoffice-common
- create_package_directory gid_Module_Oo_Linguistic pkg/libreoffice-common
- create_package_directory gid_Module_Optional_Xsltfiltersamples pkg/libreoffice-common
-- create_package_directory gid_Module_Filter pkg/libreoffice-common
- create_package_directory gid_Module_Optional_Grfflt pkg/libreoffice-draw
- create_package_directory gid_Module_Prg_Calc_Bin pkg/libreoffice-calc
- create_package_directory gid_Module_Prg_Math_Bin pkg/libreoffice-math
diff --git a/patches/no-openssl.diff b/patches/no-openssl.diff
index 502f11d..a0c66c7 100644
--- a/patches/no-openssl.diff
+++ b/patches/no-openssl.diff
@@ -8,10 +8,10 @@ index 0fc7d25..952b140 100644
$(call gb_UnpackedTarball_get_dir,postgresql)/src/interfaces/libpq/libpq$(gb_StaticLibrary_PLAINEXT) \
)
--ifeq ($(OS)$(COM),WNTMSC)
+-ifeq ($(OS),WNT)
$(call gb_LinkTarget_use_external,$(1),openssl)
-+ifeq ($(OS)$(COM),WNTMSC)
++ifeq ($(OS),WNT)
+
$(call gb_LinkTarget_use_system_win32_libs,$(1),\
secur32 \
@@ -64,7 +64,7 @@ diff --git a/configure.ac b/configure.ac
index 3862386..45d5e25 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -9476,51 +9476,6 @@ else
+@@ -9164,49 +9164,6 @@ else
fi
dnl ===================================================================
@@ -92,8 +92,6 @@ index 3862386..45d5e25 100644
- libo_CHECK_SYSTEM_MODULE([openssl],[OPENSSL],[openssl])
- fi
- if test "$with_system_openssl" = "yes"; then
-- libo_MINGW_CHECK_DLL([libssl])
-- libo_MINGW_CHECK_DLL([libcrypto])
- AC_MSG_CHECKING([whether openssl supports SHA512])
- AC_LANG_PUSH([C])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <openssl/sha.h>]],[[
@@ -215,16 +213,11 @@ diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlse
index 65b3cfc..8217bc1 100644
--- a/xmlsecurity/Library_xsec_xmlsec.mk
+++ b/xmlsecurity/Library_xsec_xmlsec.mk
-@@ -104,22 +104,10 @@ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\
+@@ -105,17 +105,10 @@ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\
-DXMLSEC_CRYPTO_NSS \
))
--ifeq ($(OS)-$(COM),WNT-GCC)
--$(eval $(call gb_Library_add_libs,xsec_xmlsec,\
-- $(call gb_UnpackedTarball_get_dir,xmlsec)/src/nss/.libs/libxmlsec1-nss.dll.a \
-- $(call gb_UnpackedTarball_get_dir,xmlsec)/src/.libs/libxmlsec1.dll.a \
--))
--else ifeq ($(OS),ANDROID)
+-ifeq ($(OS),ANDROID)
-$(eval $(call gb_Library_add_libs,xsec_xmlsec,\
- $(call gb_UnpackedTarball_get_dir,xmlsec)/src/openssl/.libs/libxmlsec1-openssl.a \
- $(call gb_UnpackedTarball_get_dir,xmlsec)/src/.libs/libxmlsec1.a \
diff --git a/patches/no-packagekit-per-default.diff b/patches/no-packagekit-per-default.diff
index 4d80c82..1ca6bd6 100644
--- a/patches/no-packagekit-per-default.diff
+++ b/patches/no-packagekit-per-default.diff
@@ -41,7 +41,7 @@ index 6170227..2721820 100644
+export ENABLE_PACKAGEKIT=@ENABLE_PACKAGEKIT@
export ENABLE_PCH=@ENABLE_PCH@
export ENABLE_PDFIMPORT=@ENABLE_PDFIMPORT@
- export ENABLE_RANDR=@ENABLE_RANDR@
+ export ENABLE_PDFIUM=@ENABLE_PDFIUM@
diff --git a/configure.ac b/configure.ac
index b6f6f37..c6a9b7d 100644
--- a/configure.ac
--
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