[libreoffice] 01/01: fix-m68k-build-again.diff is upstream
Rene Engelhard
rene at moszumanska.debian.org
Wed Jul 5 08:14:52 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 867dbd240f8e532077fbdcc91376ef6ada07900c
Author: Rene Engelhard <rene at rene-engelhard.de>
Date: Wed Jul 5 09:59:29 2017 +0200
fix-m68k-build-again.diff is upstream
---
changelog | 5 +--
control | 28 ++-------------
patches/fix-m68k-build-again.diff | 76 ---------------------------------------
patches/series | 1 -
4 files changed, 4 insertions(+), 106 deletions(-)
diff --git a/changelog b/changelog
index 7cb385c..36baabf 100644
--- a/changelog
+++ b/changelog
@@ -1,10 +1,7 @@
-libreoffice (1:5.4.0~rc2~git20170704-1) UNRELEASED; urgency=medium
+libreoffice (1:5.4.0~rc2~git20170705-1) UNRELEASED; urgency=medium
* New upstream snapshot
- * debian/patches/fix-m68k-build-again.diff: as name says; remove
- somehow misapplied upstream patch and reapply 5.3s m68k-alignment.diff
-
* debian/tests/control, debian/uitest: improve, we can only run the test
now; remove build-needed
* debian/tests/control, debian/tests/sdk-examples: move ...
diff --git a/control b/control
index 9b42d3b..f7c88aa 100644
--- a/control
+++ b/control
@@ -11,7 +11,6 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
binutils (>= 2.23) [mips mipsel],
bison,
bzip2,
- chromium (>= 39.0.2171.71-1) [i386 amd64 armhf arm64],
coinor-libcoinmp-dev (>= 1.7.6+dfsg1-2),
coinor-libcoinutils-dev (>= 2.9.15-3.1),
debhelper (>= 10),
@@ -22,14 +21,14 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
dh-python,
dpkg-dev (>= 1.18.2~),
fastjar,
- firebird-dev (>= 3.0.0.32483.ds4-4) [!hppa !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64],
- firebird3.0-server-core [!hppa !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
flex (>= 2.3.35),
fontconfig [!kfreebsd-amd64 !kfreebsd-i386 !sparc64] <!nocheck>,
fonts-crosextra-carlito [!kfreebsd-amd64 !kfreebsd-i386 !sparc64] <!nocheck>,
fonts-dejavu [!kfreebsd-amd64 !kfreebsd-i386 !sparc64] <!nocheck>,
fonts-liberation [!kfreebsd-amd64 !kfreebsd-i386 !sparc64] <!nocheck>,
+ g++-7,
g++-7 (>= 7-20170106) [m68k],
+ gcc-7,
gcc-7 (>= 7-20170106) [m68k],
gdb [!kfreebsd-amd64 !kfreebsd-i386 !sparc64] <!nocheck>,
gettext,
@@ -37,7 +36,6 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
gperf,
java-common (>= 0.49),
javahelper (>= 0.37~),
- junit4 (>= 4.8.2-2) [!kfreebsd-amd64 !kfreebsd-i386 !sparc64] <!nocheck>,
kdelibs5-dev (>= 4:4.3.4),
libabw-dev (>= 0.1),
libarchive-zip-perl [!hppa !ia64 !mips64 !s390 !sparc],
@@ -56,7 +54,6 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
libcdr-dev (>= 0.1),
libclucene-dev (>= 2.3.3.4-4.1),
libcmis-dev (>= 0.5.0-3),
- libcollada2gltfconvert-dev (>= 20140924-2)[amd64 i386],
libcppunit-dev (>= 1.14) [!kfreebsd-amd64 !kfreebsd-i386 !sparc64] <!nocheck>,
libcups2-dev,
libcurl4-gnutls-dev,
@@ -104,11 +101,9 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
libneon27-gnutls-dev,
libnspr4-dev,
libnss3-dev (>= 3.12.3),
- libo3dgc-dev (>= 0~20131011-2) [amd64 i386],
libodfgen-dev (>= 0.1),
liborcus-dev (>= 0.12),
libpagemaker-dev,
- libpcre3-dev [amd64 i386],
libpng-dev,
libpoppler-cpp-dev,
libpoppler-dev (>= 0.12.0),
@@ -144,11 +139,9 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
lp-solve (>= 5.5.0.13-5+b1),
make (>= 3.81-8.2),
maven-repo-helper,
- opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg1-2) [amd64 i386],
pkg-config,
python3,
python3-dev (>= 3.3),
- rapidjson-dev [amd64 i386],
ucpp,
unixodbc-dev (>= 2.2.11),
unzip,
@@ -193,7 +186,7 @@ Build-Conflicts: amd-libopencl1,
Standards-Version: 4.0.0
Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git -b debian-experimental-5.4
Vcs-Browser: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
-Bugs:
+Bugs: mailto:debian-openoffice at lists.debian.org
Homepage: http://www.libreoffice.org
Package: libreoffice
@@ -4502,21 +4495,6 @@ Description: Logo-like progamming language for LibreOffice
- Python data structures (list, tuple, set, dictionary) and other Python
features
-Package: libreoffice-sdbc-firebird
-Depends: libreoffice-core,
- ${firebird-engine-depends},
- ${misc:Depends},
- ${shlibs:Depends}
-Architecture: alpha amd64 arm64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mipsel mips64el ppc64el
-Section: database
-Enhances: libreoffice-base-drivers
-Description: Firebird SDBC driver for LibreOffice
- LibreOffice is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- The Firebird SDBC Driver allows one to use the Firebird database from
- LibreOffice without any wrapper layer such as ODBC or JDBC.
-
Package: libreoffice-pdfimport
Section: oldlibs
Priority: extra
diff --git a/patches/fix-m68k-build-again.diff b/patches/fix-m68k-build-again.diff
deleted file mode 100644
index 2822c77..0000000
--- a/patches/fix-m68k-build-again.diff
+++ /dev/null
@@ -1,76 +0,0 @@
-From 79a6ffd82bc8a142cbc5777efae977e79c8f7bb6 Mon Sep 17 00:00:00 2001
-From: Rene Engelhard <rene at debian.org>
-Date: Mon, 26 Jun 2017 22:18:41 +0200
-Subject: [PATCH] fix m68k build again
-
-This reverts commit d5d6ee3b3e7cf3d93f892a452244051e4294fe6d and applies
-the patch cleanly again. somehow it got mis-applied.
-
-Change-Id: Id199d9086fb8e2e52bb810c8ddcbdd7fa7060676
----
- cppu/source/uno/check.cxx | 26 ++++++++++++++++++++------
- 1 file changed, 20 insertions(+), 6 deletions(-)
-
-diff --git a/cppu/source/uno/check.cxx b/cppu/source/uno/check.cxx
-index 9a734a78e8cf..353e2c977493 100644
---- a/cppu/source/uno/check.cxx
-+++ b/cppu/source/uno/check.cxx
-@@ -153,7 +153,7 @@ static_assert( static_cast<sal_Bool>(false) == sal_False,
- "must be binary compatible" );
- #if SAL_TYPES_ALIGNMENT8 == 2
- static_assert(offsetof(AlignSize_Impl, dDouble) == 2, "offsetof(AlignSize_Impl, dDouble) != 2");
--static_assert(sizeof(AlignSize_Impl) == 12, "sizeof(AlignSize_Impl) != 12");
-+static_assert(sizeof(AlignSize_Impl) == 10, "sizeof(AlignSize_Impl) != 10");
- #elif SAL_TYPES_ALIGNMENT8 == 4
- static_assert(offsetof(AlignSize_Impl, dDouble) == 4, "offsetof(AlignSize_Impl, dDouble) != 4");
- static_assert(sizeof(AlignSize_Impl) == 12, "sizeof(AlignSize_Impl) != 12");
-@@ -177,13 +177,19 @@ static_assert(offsetof(uno_Any, pReserved) == 2 * sizeof(void *), "offsetof(uno_
- // string
- static_assert(sizeof(OUString) == sizeof(rtl_uString *), "binary compatibility test failed: sizeof(OUString) != sizeof(rtl_uString *)");
- // struct
-+#if SAL_TYPES_ALIGNMENT8 == 2
-+static_assert(sizeof(M) == 6, "sizeof(M) != 6");
-+static_assert(sizeof(N) == 8, "sizeof(N) != 8");
-+static_assert(sizeof(N2) == 8, "sizeof(N2) != 8");
-+static_assert(offsetof(N2, p) == 6, "offsetof(N2, p) != 6");
-+#else
- static_assert(sizeof(M) == 8, "sizeof(M) != 8");
--static_assert(offsetof(M, o) == 4, "offsetof(M, o) != 4");
- static_assert(sizeof(N) == 12, "sizeof(N) != 12");
--
- static_assert(sizeof(N2) == 12, "sizeof(N2) != 12");
--
- static_assert(offsetof(N2, p) == 8, "offsetof(N2, p) != 8");
-+#endif
-+static_assert(offsetof(M, o) == 4, "offsetof(M, o) != 4");
-+
- #if SAL_TYPES_ALIGNMENT8 == 2
- static_assert(sizeof(O) == 16, "sizeof(O) != 16");
- #elif SAL_TYPES_ALIGNMENT8 == 4
-@@ -193,13 +199,21 @@ static_assert(sizeof(O) == 24, "sizeof(O) != 24");
- #else
- # error unexpected alignment of 8 byte types
- #endif
-+
-+#if SAL_TYPES_ALIGNMENT8 == 2
-+static_assert(sizeof(C2) == 6, "sizeof(C2) != 6");
-+static_assert(sizeof(D) == 6, "sizeof(D) != 6");
-+static_assert(offsetof(D, e) == 2, "offsetof(D, e) != 2");
-+static_assert(offsetof(E, e) == 6, "offsetof(E, e) != 6");
-+#else
-+static_assert(sizeof(C2) == 8, "sizeof(C2) != 8");
- static_assert(sizeof(D) == 8, "sizeof(D) != 8");
- static_assert(offsetof(D, e) == 4, "offsetof(D, e) != 4");
--static_assert(offsetof(E, d) == 4, "offsetof(E, d) != 4");
- static_assert(offsetof(E, e) == 8, "offsetof(E, e) != 8");
-+#endif
-
- static_assert(sizeof(C1) == 2, "sizeof(C1) != 2");
--static_assert(sizeof(C2) == 8, "sizeof(C2) != 8");
-+static_assert(offsetof(E, d) == 4, "offsetof(E, d) != 4");
-
- #if SAL_TYPES_ALIGNMENT8 == 2
- static_assert(sizeof(C3) == 18, "sizeof(C3) != 18");
---
-2.11.0
-
diff --git a/patches/series b/patches/series
index 3fec93c..b9a5328 100644
--- a/patches/series
+++ b/patches/series
@@ -32,4 +32,3 @@ disable-sc_subsequent_filters_test-with-internal-cppunit.diff
cppunit-optional.diff
disable-unused-test-programs.diff
gb_SUPPRESS_TESTS.diff
-fix-m68k-build-again.diff
--
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