[libreoffice] 01/02: git update; update patches to apply again

[Rene Engelhard]

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 da8afc39ff3d2dd2a0a46ad0337cd7037a943169
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Dec 30 15:22:29 2016 +0100

    git update; update patches to apply again
---
 changelog                |  2 +-
 patches/no-openssl.diff  |  4 ++--
 patches/split-evoab.diff | 15 ++++++++-------
 rules                    |  3 ---
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/changelog b/changelog
index ef40dab..9c75e08 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.4.0~alpha0~git20161223-1) UNRELEASED; urgency=medium
+libreoffice (1:5.4.0~alpha0~git20161229-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
 
diff --git a/patches/no-openssl.diff b/patches/no-openssl.diff
index 627d5e7..502f11d 100644
--- a/patches/no-openssl.diff
+++ b/patches/no-openssl.diff
@@ -64,7 +64,7 @@ diff --git a/configure.ac b/configure.ac
 index 3862386..45d5e25 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -9412,51 +9451,6 @@ else
+@@ -9476,51 +9476,6 @@ else
  fi
  
  dnl ===================================================================
@@ -105,7 +105,7 @@ index 3862386..45d5e25 100644
 -    AC_MSG_RESULT([yes])
 -    DISABLE_OPENSSL=TRUE
 -
--    # warn that although OpenSSL is disabled, system libraries may be depending on it
+-    # warn that although OpenSSL is disabled, system libraries may depend on it
 -    AC_MSG_WARN([OpenSSL has been disabled. No code compiled by LibO will make use of it but system librares may create indirect dependencies])
 -    add_warning "OpenSSL has been disabled. No code compiled by LibO will make use of it but system librares may create indirect dependencies"
 -fi
diff --git a/patches/split-evoab.diff b/patches/split-evoab.diff
index 6b89cc2..f563560 100644
--- a/patches/split-evoab.diff
+++ b/patches/split-evoab.diff
@@ -47,14 +47,15 @@ index 510b444..3ff190f 100644
  endif
  ifeq ($(ENABLE_JAVA),TRUE)
 diff --git a/scp2/InstallModule_gnome.mk b/scp2/InstallModule_gnome.mk
-index 686f6c1..d633c90 100644
+index c33f4f52d67b..8f06c0273eff 100644
 --- a/scp2/InstallModule_gnome.mk
 +++ b/scp2/InstallModule_gnome.mk
-@@ -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_EVOAB2 \
-     ENABLE_GTK \
+@@ -19,4 +19,8 @@ $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/gnome,\
+     scp2/source/gnome/module_gnome \
  ))
  
- $(eval $(call gb_InstallModule_add_scpfiles,scp2/gnome,\
++$(eval $(call gb_InstallModule_define_if_set,scp2/gnome,\
++    ENABLE_EVOAB2 \
++))
++
+ # vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/rules b/rules
index fcd1687..db58bcb 100755
--- a/rules
+++ b/rules
@@ -1261,9 +1261,6 @@ ifeq "$(BUILD_GTK3)" "y"
   ifneq (cairo,$(findstring cairo,$(SYSTEM_STUFF)))
   $(error GTK3 build fails without system-cairo!!)
   endif
-  ifneq (epoxy,$(findstring epoxy,$(SYSTEM_STUFF)))
-  $(error GTK3 conflicts with internal epoxy)
-  endif
 	GNOME_GTK_RECOMMENDS += libreoffice-gtk3
   ifeq "$(ENABLE_INTROSPECTION)" "y"
 	BUILD_DEPS += , gobject-introspection (>= 1.32.0), libgirepository1.0-dev (>= 1.32)

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