diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2017-03-04 15:08:12 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2017-03-04 15:09:39 +0100 |
| commit | d5d0dc5137943f3fc2f8123688b6151328612ba9 (patch) | |
| tree | bbfb3187366bd66cafe164acbf52912ad325c098 | |
| parent | e87e698d9602dd5da90046da2e029dd2381c85b9 (diff) | |
| download | thirdparty-d5d0dc5137943f3fc2f8123688b6151328612ba9.tar.gz thirdparty-d5d0dc5137943f3fc2f8123688b6151328612ba9.zip | |
Update LibreOffice packaging patches:
+ 4.3.3 - Debian 7.x - Wheezy-backports
Fixed FTBFS with GCC < 4.7 (armel, armhf)
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 84314564254bec77cf9a339cb4290030a073873b)
| -rw-r--r-- | libreoffice/4.3.3/wheezy-backports/debian.diff | 40 |
1 files changed, 35 insertions, 5 deletions
diff --git a/libreoffice/4.3.3/wheezy-backports/debian.diff b/libreoffice/4.3.3/wheezy-backports/debian.diff index 20de5f3..5b69a64 100644 --- a/libreoffice/4.3.3/wheezy-backports/debian.diff +++ b/libreoffice/4.3.3/wheezy-backports/debian.diff @@ -1,12 +1,13 @@ diff -ruN a/debian/changelog b/debian/changelog ---- a/debian/changelog 2015-04-06 14:18:58.000000000 +0000 -+++ b/debian/changelog 2015-05-12 17:08:33.220000000 +0000 -@@ -1,3 +1,9 @@ -+libreoffice (1:4.3.3-2+tde1+deb8u6~bpo70+1) wheezy-backports; urgency=high +--- a/debian/changelog 2017-02-25 16:48:23.000000000 +0000 ++++ b/debian/changelog 2017-03-03 12:42:16.000000000 +0000 +@@ -1,3 +1,10 @@ ++libreoffice (1:4.3.3-2+tde1+deb8u6~bpo70+1a) wheezy; urgency=high + + * Enable TDE module ++ * Fix FTBFS with GCC < 4.7 + -+ -- Slávek Banko <slavek.banko@axis.cz> Mon, 27 Feb 2017 16:46:56 +0100 ++ -- Slávek Banko <slavek.banko@axis.cz> Fri, 03 Mar 2017 13:43:23 +0100 + libreoffice (1:4.3.3-2+deb8u6~bpo70+1) wheezy-backports; urgency=high @@ -156,6 +157,35 @@ diff -ruN a/debian/control.trinity.in b/debian/control.trinity.in + * konqueror / kmail + * libreoffice-tdeab-trinity: TDE Addressbook support + +diff -ruN a/debian/patches/olefix-gcc-4.6.diff b/debian/patches/olefix-gcc-4.6.diff +--- a/debian/patches/olefix-gcc-4.6.diff 1970-01-01 00:00:00.000000000 +0000 ++++ b/debian/patches/olefix-gcc-4.6.diff 2017-03-03 12:12:03.000000000 +0000 +@@ -0,0 +1,16 @@ ++Index: b/include/svx/svdoole2.hxx ++=================================================================== ++--- a/include/svx/svdoole2.hxx +++++ b/include/svx/svdoole2.hxx ++@@ -204,9 +204,9 @@ ++ explicit SdrEmbedObjectLink(SdrOle2Obj* pObj); ++ virtual ~SdrEmbedObjectLink(); ++ ++- virtual void Closed() override; +++ virtual void Closed(); ++ virtual ::sfx2::SvBaseLink::UpdateResult DataChanged( ++- const OUString& rMimeType, const css::uno::Any & rValue ) override; +++ const OUString& rMimeType, const css::uno::Any & rValue ); ++ ++ bool Connect() { return GetRealObject() != nullptr; } ++ }; +diff -ruN a/debian/patches/series b/debian/patches/series +--- a/debian/patches/series 2017-02-25 16:47:19.000000000 +0000 ++++ b/debian/patches/series 2017-03-03 12:39:17.000000000 +0000 +@@ -48,4 +48,5 @@ + ppc64el-jdk-paths.diff + CVE-2016-4324.diff + olefix.diff ++olefix-gcc-4.6.diff + icu-icudata-link-fix-armhf.diff diff -ruN a/debian/rules b/debian/rules --- a/debian/rules 2015-04-06 12:49:47.000000000 +0000 +++ b/debian/rules 2015-05-12 17:07:51.160000000 +0000 |