From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4141A138331 for ; Sat, 17 Sep 2016 21:32:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4CD8F21C07E; Sat, 17 Sep 2016 21:32:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8613EE0B7C for ; Sat, 17 Sep 2016 21:32:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 66DE4340BC1 for ; Sat, 17 Sep 2016 21:32:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5E6932492 for ; Sat, 17 Sep 2016 21:32:25 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <1474147932.e5b3ed5473a6331485306565953d8436533fe59d.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice/Manifest app-office/libreoffice/files/libreoffice-5.3-system-pyuno.patch app-office/libreoffice/libreoffice-9999.ebuild X-VCS-Directories: app-office/libreoffice/ app-office/libreoffice/files/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: e5b3ed5473a6331485306565953d8436533fe59d X-VCS-Branch: master Date: Sat, 17 Sep 2016 21:32:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 931cb7d5-7b20-4cfd-8aa8-1d864711d515 X-Archives-Hash: 3b0baed1ac44961d80129f1d18627985 commit: e5b3ed5473a6331485306565953d8436533fe59d Author: Andreas Sturmlechner gmail com> AuthorDate: Fri Jul 8 15:17:41 2016 +0000 Commit: Andreas Hüttel gentoo org> CommitDate: Sat Sep 17 21:32:12 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5b3ed54 app-office/libreoffice: Fix system-pyuno.patch, libxmlsec tarball Gentoo-bug: 577278 bump libxmlsec tarball to 1.2.22 Gentoo-bug: 589040 adapted patch kindly provided by 'cyrillic' Also, recent upstream commits removed some build options: 9ee01c424e37f7cd76d2edf38e9bc5f6e988d18d, 8dc38d9ded92960eda46343b67da8a8b95404b5a Package-Manager: portage-2.3.0 app-office/libreoffice/Manifest | 1 + .../files/libreoffice-5.3-system-pyuno.patch | 47 ++++++++++++++++++++++ app-office/libreoffice/libreoffice-9999.ebuild | 6 +-- 3 files changed, 50 insertions(+), 4 deletions(-) diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 60572d8..97e7f23 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -1,3 +1,4 @@ +DIST 0fb1bb06d60d7708abc4797008209bcc-xmlsec1-1.2.22.tar.gz 1792363 SHA256 8c06bf161c565b907a499e6d906f0b640f063b2b4efd2b471048ac5b3c1ad527 SHA512 69ea729cc8e3154e0644b076c8217905920b7e5ef0360640a750f73d90c8a1d8bf139c6400571a7940727c85413a8f69b2204801d2fe97796ff944eb09bbbb69 WHIRLPOOL a443c0542cf19d1491db86bb0e12970c6d6fc80b4ba9f98cb5caecd2cd1c290809b2756f8a95daabe6493bed8f4ae39991288552bece1599eb218c43da9f6efe DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 SHA256 d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a WHIRLPOOL c4b3b0c3e10171155e1d3431e8ab9b495dbf2fb924882024306bfb53f533f5b0231c06f47e3cfa77052013a816ea4cc5f237cc76fdb44a048fb6d5c177729aec DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 SHA256 eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c WHIRLPOOL 16eb79e3674250fcb760b9698b4980414052d20f720d946701d1915c9b8915b4af75378668653d29581b77c19fcdba8f51d1f834c286cfcefcf4a420f8fcc1d5 DIST 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz 1652670 SHA256 390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a SHA512 5664203e6426880041cdb227e91f79f00d2ca7ae28c6997f61b72cc599aac55838d082d2b2b551bd7a228424c350ddea5d41599b8ca58d444a2cd46c9206ea91 WHIRLPOOL 6486c48b73a4f79760b443cfd397b704eca0fd32b72304ae7e7cfa0f43583b0af15c7384548b5215ae57513ed8366c8f3a74630ab466ba19a63b346af8c5eaca diff --git a/app-office/libreoffice/files/libreoffice-5.3-system-pyuno.patch b/app-office/libreoffice/files/libreoffice-5.3-system-pyuno.patch new file mode 100644 index 00000000..3ab3e82 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-5.3-system-pyuno.patch @@ -0,0 +1,47 @@ +diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh +index a259bf6..672fa23 100755 +--- a/desktop/scripts/soffice.sh ++++ b/desktop/scripts/soffice.sh +@@ -139,6 +139,9 @@ if echo "$checks" | grep -q "cc" ; then + exit 1; + fi + ++PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH} ++export PYTHONPATH ++ + case "`uname -s`" in + NetBSD|OpenBSD|DragonFly) + # this is a temporary hack until we can live with the default search paths + +--- a/pyuno/source/module/uno.py 2016-08-07 20:57:51.653712240 -0400 ++++ b/pyuno/source/module/uno.py 2016-08-07 20:59:33.958896861 -0400 +@@ -16,11 +16,16 @@ + # except in compliance with the License. You may obtain a copy of + # the License at http://www.apache.org/licenses/LICENSE-2.0 . + # ++import os + import pyuno + import sys + import traceback + import warnings + ++sys.path.append('%eprefix%/usr/%libdir%/libreoffice/program') ++if getattr(os.environ, 'URE_BOOTSTRAP', None) is None: ++ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:%eprefix%/usr/%libdir%/libreoffice/program/fundamentalrc" ++ + # since on Windows sal3.dll no longer calls WSAStartup + import socket + +diff --git a/pyuno/source/officehelper.py b/pyuno/source/officehelper.py +index 99d3b03..704edab 100755 +--- a/pyuno/source/officehelper.py ++++ b/pyuno/source/officehelper.py +@@ -44,7 +44,7 @@ def bootstrap(): + if "UNO_PATH" in os.environ: + sOffice = os.environ["UNO_PATH"] + else: +- sOffice = "" # lets hope for the best ++ sOffice = "%eprefix%/usr/%libdir%/libreoffice/program" + sOffice = os.path.join(sOffice, "soffice") + if platform.startswith("win"): + sOffice += ".exe" diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 1e137d5..1cea506 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -57,7 +57,7 @@ unset DEV_URI # These are bundles that can't be removed for now due to huge patchsets. # If you want them gone, patches are welcome. ADDONS_SRC=( - "${ADDONS_URI}/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz" # modifies source code + "${ADDONS_URI}/0fb1bb06d60d7708abc4797008209bcc-xmlsec1-1.2.22.tar.gz" # modifies source code "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )" "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" # no release for 8 years, should we package it? @@ -241,7 +241,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} PATCHES=( # not upstreamable stuff - "${FILESDIR}/${PN}-5.2-system-pyuno.patch" + "${FILESDIR}/${PN}-5.3-system-pyuno.patch" ) CHECKREQS_MEMORY="512M" @@ -424,7 +424,6 @@ src_configure() { --disable-epm \ --disable-fetch-external \ --disable-gstreamer-0-10 \ - --disable-hardlink-deliver \ --disable-online-update \ --disable-report-builder \ --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \ @@ -443,7 +442,6 @@ src_configure() { --without-myspell-dicts \ --without-help \ --with-helppack-integration \ - --without-sun-templates \ --without-system-sane \ $(use_enable bluetooth sdremote-bluetooth) \ $(use_enable coinmp) \