[arch-commits] Commit in libreoffice-fresh/trunk (PKGBUILD pyuno-python37.patch)
Andreas Radke
andyrtr at archlinux.org
Sun Aug 5 16:20:44 UTC 2018
Date: Sunday, August 5, 2018 @ 16:20:43
Author: andyrtr
Revision: 330610
upgpkg: libreoffice-fresh 6.0.6-1
upstream update 6.0.6
Modified:
libreoffice-fresh/trunk/PKGBUILD
Deleted:
libreoffice-fresh/trunk/pyuno-python37.patch
----------------------+
PKGBUILD | 21 +++++++------------
pyuno-python37.patch | 54 -------------------------------------------------
2 files changed, 8 insertions(+), 67 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-08-05 09:38:35 UTC (rev 330609)
+++ PKGBUILD 2018-08-05 16:20:43 UTC (rev 330610)
@@ -11,9 +11,9 @@
pkgbase=libreoffice-fresh
pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
-_LOver=6.0.5.2
-pkgver=6.0.5
-pkgrel=2
+_LOver=6.0.6.2
+pkgver=6.0.6
+pkgrel=1
arch=('x86_64')
license=('LGPL3')
url="http://www.libreoffice.org/"
@@ -55,7 +55,6 @@
${_additional_source_url2}/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar # for test suite
${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
make-pyuno-work-with-system-wide-module-install.diff
- pyuno-python37.patch
emfio.patch
libreoffice-fresh.sh libreoffice-fresh.csh)
noextract=(boost_1_65_1.tar.bz2
@@ -75,11 +74,11 @@
185d60944ea767075d27247c3162b3bc-unowinreg.dll
)
validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build at documentfoundation.org>
-sha256sums=('b6fd3951ad50bfbe48340c0368f3cbd9eae92b31550809a1db88fc048f04069a'
+sha256sums=('f1666430abf616a3813e4c886b51f157366f592102ae0e874abc17f3d58c6a8e'
'SKIP'
- '492db3e52c67944c2747a573f1b0efa1afb2ca747b95c1cdd495c46fcca97fb6'
+ '7e49f0dc0e7fd8e2628939833063d60e6c92bdec019226037446595c87eee85e'
'SKIP'
- '99e62f75bc94ca0797d22ef6fcca29af575578fb58bba5e77bc892dd655a0fdd'
+ 'ab55fcc7e6103e541288a369236c5fe2c7b6c3f7d86b2b62b198f7977ca92742'
'SKIP'
'9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81'
'64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1'
@@ -97,7 +96,6 @@
'702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769'
'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
- '5d874bfa2ef7340615dfd34dc17e9e72bfc8587dce7864b949cfcde7fcbabb52'
'8b4815788be087940750b775690b5890c4cf9e121f11006a72ccab834f212abb'
'76f62957d0058092b11316357d9d716a62b48a53e5277426ffa87429ab5510e4'
'd24cfcb556ae1db02087c49012bbc4621f9ef7e3465ca832e1410326d260f283')
@@ -115,7 +113,8 @@
# don't run broken tests
sed -i "/CppunitTest_sw_ooxmlexport9/d" sw/Module_sw.mk
- sed -i "/CppunitTest_sw_uiwriter/d" sw/Module_sw.mk
+ sed -i "/CppunitTest_sw_uiwriter/d" sw/Module_sw.mk
+ sed -i "/CppunitTest_sw_ww8export2/d" sw/Module_sw.mk
sed -i "/CppunitTest_xmlsecurity_signing/d" xmlsecurity/Module_xmlsecurity.mk
sed -i "/CppunitTest_sc_subsequent_filters_test/d" sc/Module_sc.mk
sed -i "/CppunitTest_sc_subsequent_export_test/d" sc/Module_sc.mk
@@ -124,7 +123,6 @@
sed -i "/CppunitTest_dbaccess_hsqldb/d" dbaccess/Module_dbaccess.mk
# apply upstream fix for broken cppunit test
patch -Np1 -i ../emfio.patch
-# sed -i "/emfio\/emfio/d" emfio/CppunitTest_emfio_emf_test.mk
sed -i "/CppunitTest_emfio_emf_test/d" emfio/Module_emfio.mk
# unowinreg.dll must be a file not a symlink or the result will become a broken symlink
@@ -135,9 +133,6 @@
# fix not upstreamable pyuno paths - FS#54250
patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff
- # const fixes for Python 3.7
- patch -Np1 -i ${srcdir}/pyuno-python37.patch
-
#use the CFLAGS but remove the LibO overridden ones
for i in $CFLAGS; do
case "$i" in
Deleted: pyuno-python37.patch
===================================================================
--- pyuno-python37.patch 2018-08-05 09:38:35 UTC (rev 330609)
+++ pyuno-python37.patch 2018-08-05 16:20:43 UTC (rev 330610)
@@ -1,54 +0,0 @@
-From 76a29148be63cb006a7e25e312dc93acc93e071f Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman at redhat.com>
-Date: Tue, 3 Jul 2018 08:33:34 +0200
-Subject: [PATCH] const fixes for python3-devel-3.7.0-1.fc29.x86_64
-
-Change-Id: Ia16a8b828e11ce36e9bb77ecf9e8a1179bd9b90c
-Reviewed-on: https://gerrit.libreoffice.org/56841
-Tested-by: Jenkins
-Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
----
- pyuno/source/module/pyuno_impl.hxx | 2 +-
- pyuno/source/module/pyuno_type.cxx | 2 +-
- pyuno/source/module/pyuno_util.cxx | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/pyuno/source/module/pyuno_impl.hxx b/pyuno/source/module/pyuno_impl.hxx
-index ea0e419ffb1b..73acabdf4a16 100644
---- a/pyuno/source/module/pyuno_impl.hxx
-+++ b/pyuno/source/module/pyuno_impl.hxx
-@@ -80,7 +80,7 @@ inline PyObject* PyStr_FromString(const char *string)
- return PyUnicode_FromString(string);
- }
-
--inline char * PyStr_AsString(PyObject *object)
-+inline char const * PyStr_AsString(PyObject *object)
- {
- return PyUnicode_AsUTF8(object);
- }
-diff --git a/pyuno/source/module/pyuno_type.cxx b/pyuno/source/module/pyuno_type.cxx
-index c6fc1351436b..80505d85bbd1 100644
---- a/pyuno/source/module/pyuno_type.cxx
-+++ b/pyuno/source/module/pyuno_type.cxx
-@@ -157,7 +157,7 @@ Any PyEnum2Enum( PyObject *obj )
- }
-
- OUString strTypeName( OUString::createFromAscii( PyStr_AsString( typeName.get() ) ) );
-- char *stringValue = PyStr_AsString( value.get() );
-+ char const *stringValue = PyStr_AsString( value.get() );
-
- TypeDescription desc( strTypeName );
- if( !desc.is() )
-diff --git a/pyuno/source/module/pyuno_util.cxx b/pyuno/source/module/pyuno_util.cxx
-index 45ee5a38e40b..f9714fb270f0 100644
---- a/pyuno/source/module/pyuno_util.cxx
-+++ b/pyuno/source/module/pyuno_util.cxx
-@@ -69,7 +69,7 @@ OUString pyString2ustring( PyObject *pystr )
- #else
- #if PY_MAJOR_VERSION >= 3
- Py_ssize_t size(0);
-- char *pUtf8(PyUnicode_AsUTF8AndSize(pystr, &size));
-+ char const *pUtf8(PyUnicode_AsUTF8AndSize(pystr, &size));
- ret = OUString(pUtf8, size, RTL_TEXTENCODING_UTF8);
- #else
- PyObject* pUtf8 = PyUnicode_AsUTF8String(pystr);
More information about the arch-commits
mailing list