[libreoffice] 02/02: git update (gpgme->gpgmecpp, update pdfium, update patches)
Rene Engelhard
rene at moszumanska.debian.org
Fri Feb 24 11:30:51 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 6bd33ceba4131f96ade04f12272ed22ce3542056
Author: Rene Engelhard <rene at debian.org>
Date: Fri Feb 24 12:29:31 2017 +0100
git update (gpgme->gpgmecpp, update pdfium, update patches)
---
changelog | 4 ++--
control | 2 +-
patches/javadoc-optional.diff | 2 +-
patches/mysqlcppconn-libmysqlclient-SONAME.diff | 6 +++---
rules | 6 +++---
source/include-binaries | 2 +-
tests/control | 2 +-
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/changelog b/changelog
index 35f11c2..9eb6a8b 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.4.0~alpha0~git20170213-1) UNRELEASED; urgency=medium
+libreoffice (1:5.4.0~alpha0~git20170224-1) UNRELEASED; urgency=medium
* New upstream snapshot
- is now able to do "insert->image, choose pdf". Not insert->docunent
@@ -10,7 +10,7 @@ libreoffice (1:5.4.0~alpha0~git20170213-1) UNRELEASED; urgency=medium
dependency...) back to -common/-core since it has the above new feature and
otherwise it may get confusing what is what.
- * tarballs/9ac66c71463f9440e3ccc996c5e66556-pdfium-3004.tar.bz2,
+ * tarballs/cfcb6b4f3b5b6097edc5df7903ef00ea-pdfium-3021.tar.bz2,
debian/copyright, debian/source/include-binaries: include pdfium
-- Rene Engelhard <rene at debian.org> Thu, 24 Nov 2016 07:27:55 +0100
diff --git a/control b/control
index 3df6478..c22c373 100644
--- a/control
+++ b/control
@@ -75,7 +75,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
libglib2.0-dev (>= 2.15.0),
libglm-dev (>= 0.9.6.3),
libgltf-dev (>= 0.1.0),
- libgpgme-dev,
+ libgpgmepp-dev,
libgraphite2-dev (>= 0.9.3),
libgstreamer-plugins-base1.0-dev,
libgstreamer1.0-dev,
diff --git a/patches/javadoc-optional.diff b/patches/javadoc-optional.diff
index 1afcd0b..82fc772 100644
--- a/patches/javadoc-optional.diff
+++ b/patches/javadoc-optional.diff
@@ -45,7 +45,7 @@ Gemeinsame Unterverzeichnisse: odk-old/util und odk/util.
+ [with_javadoc=yes])
+
AC_ARG_WITH(visual-studio,
- AS_HELP_STRING([--with-visual-studio=<2013/2015>],
+ AS_HELP_STRING([--with-visual-studio=<2013/2015/2017>],
[Specify which Visual Studio version to use in case several are
@@ -6290,34 +6302,44 @@
dnl ===================================================================
diff --git a/patches/mysqlcppconn-libmysqlclient-SONAME.diff b/patches/mysqlcppconn-libmysqlclient-SONAME.diff
index 038b780..3091bda 100644
--- a/patches/mysqlcppconn-libmysqlclient-SONAME.diff
+++ b/patches/mysqlcppconn-libmysqlclient-SONAME.diff
@@ -26,8 +26,8 @@ index 1670de8..c5bab4f 100644
+ #endif
+
+ template<typename FunctionType>
-diff --git a/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk b/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
-index 3f86236..f75b60a 100644
+diff --git a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
+index 82a368460747..03d0a8b05057 100644
--- a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
+++ b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_file,mysqlcppconn,driver/nativeapi/binding_
@@ -37,4 +37,4 @@ index 3f86236..f75b60a 100644
+ external/mysqlcppconn/patches/mysql-connector-c++-1.1.0-SONAME.patch \
external/mysqlcppconn/patches/warnings.patch.0 \
external/mysqlcppconn/patches/enable-libmysql-proxy.patch \
- ))
+ external/mysqlcppconn/patches/dynexcspec.patch.0 \
diff --git a/rules b/rules
index 9d6f502..96b56eb 100755
--- a/rules
+++ b/rules
@@ -522,7 +522,7 @@ endif
SYSTEM_STUFF += glm
BUILD_PPC64EL=y
BUILD_ARM64=y
-SYSTEM_STUFF += gpgme
+SYSTEM_STUFF += gpgmepp
# Default flags to pass to configure
CONFIGURE_FLAGS= \
@@ -1497,8 +1497,8 @@ ifneq (,$(filter glm, $(SYSTEM_STUFF)))
BUILD_DEPS += , libglm-dev (>= 0.9.6.3)
endif
-ifneq (,$(filter gpgme, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libgpgme-dev
+ifneq (,$(filter gpgmepp, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libgpgmepp-dev
endif
ifeq "$(ENABLE_GIO)" "y"
diff --git a/source/include-binaries b/source/include-binaries
index 43dad70..abf2e8f 100644
--- a/source/include-binaries
+++ b/source/include-binaries
@@ -5,4 +5,4 @@ tarballs/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
tarballs/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
tarballs/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
tarballs/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz
-tarballs/9ac66c71463f9440e3ccc996c5e66556-pdfium-3004.tar.bz2
+tarballs/cfcb6b4f3b5b6097edc5df7903ef00ea-pdfium-3021.tar.bz2
diff --git a/tests/control b/tests/control
index 1f03c32..2b49efe 100644
--- a/tests/control
+++ b/tests/control
@@ -1,5 +1,5 @@
Tests: junit-subsequentcheck
-Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libgl1-mesa-dev, libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.1.0) , opencollada-dev (>= 0.1.0~2014070 [...]
+Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libgl1-mesa-dev, libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.1.0) , opencollada-dev (>= 0.1.0~2014070 [...]
Tests: pyuno-import
Depends: python3-uno
--
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