pool/libreoffice
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* 0001-Use-PYTHON_FOR_BUILD-instead-of-calling-python-direc.patch

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=601
This commit is contained in:
Tomáš Chvátal 2018-02-13 11:29:58 +00:00 committed by Git OBS Bridge
parent dab7527eec
commit ea000d08bd
3 changed files with 49 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
0001-Use-PYTHON_FOR_BUILD-instead-of-calling-python-direc.patch Normal file
View File

@ -0,0 +1,40 @@
From 5c4c83dd7ee9145408d80dbac606547c8006ad2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Tue, 13 Feb 2018 10:57:54 +0100
Subject: [PATCH] Use PYTHON_FOR_BUILD instead of calling python directly
Change-Id: I85ff669c3cfd6d9b3284972cfa1d8a805ea3b6d4
---
postprocess/CustomTarget_images.mk | 2 +-
testtools/source/bridgetest/pyuno/makefile.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk
index 603c73d522d4..871c7bd6470c 100644
--- a/postprocess/CustomTarget_images.mk
+++ b/postprocess/CustomTarget_images.mk
@@ -33,7 +33,7 @@ $(packimages_DIR)/%.zip : \
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
$(call gb_Helper_abbreviate_dirs, \
ILSTFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,$(filter %.ilst,$^)) && \
- $(PYTHON) $(SRCDIR)/solenv/bin/pack_images.py \
+ $(PYTHON_FOR_BUILD) $(SRCDIR)/solenv/bin/pack_images.py \
$(if $(DEFAULT_THEME),\
-g $(packimages_DIR) -m $(packimages_DIR) -c $(packimages_DIR),\
-g $(SRCDIR)/icon-themes/$(subst images_,,$*) -m $(SRCDIR)/icon-themes/$(subst images_,,$*) -c $(SRCDIR)/icon-themes/$(subst images_,,$*) \
diff --git a/testtools/source/bridgetest/pyuno/makefile.mk b/testtools/source/bridgetest/pyuno/makefile.mk
index 5dbd0038f009..112be23c9ce8 100644
--- a/testtools/source/bridgetest/pyuno/makefile.mk
+++ b/testtools/source/bridgetest/pyuno/makefile.mk
@@ -46,7 +46,7 @@ REGEXC=$(DLLDEST)$/regcomp$(EXECPOST)
.IF "$(SYSTEM_PYTHON)"!="YES"
PYTHON=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)/python
.ELSE # "$(SYSTEM_PYTHON)"!="YES"
-PYTHON=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) python
+PYTHON=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(PYTHON_FOR_BUILD)
.ENDIF # "$(SYSTEM_PYTHON)"!="YES"
.IF "$(OS)"=="WNT"
PYTHONPATH:=$(SOLARLIBDIR)$/pyuno;$(PWD);$(SOLARLIBDIR);$(SOLARLIBDIR)$/python;$(SOLARLIBDIR)$/python$/lib-dynload
--
2.16.1

1
libreoffice.changes
View File

@ -2,6 +2,7 @@
Mon Feb 12 09:24:51 UTC 2018 - tchvatal@suse.com
- Make sure we execute everything with python3
* 0001-Use-PYTHON_FOR_BUILD-instead-of-calling-python-direc.patch
- Bump version of bundled gpgme to 1.9.0
-------------------------------------------------------------------

16
libreoffice.spec
View File

@ -87,9 +87,10 @@ Source2008: %{external_url}/pdfium-3235.tar.bz2
Patch1: scp2-user-config-suse.diff
# do not use the broken help; unopkg complained about it when registering extensions
# FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files
Patch4: nlpsolver-no-broken-help.diff
Patch5: mediawiki-no-broken-help.diff
Patch6: kde5-configure-checks.patch
Patch2: nlpsolver-no-broken-help.diff
Patch3: mediawiki-no-broken-help.diff
Patch4: kde5-configure-checks.patch
Patch5: 0001-Use-PYTHON_FOR_BUILD-instead-of-calling-python-direc.patch
# try to save space by using hardlinks
Patch990: install-with-hardlinks.diff
BuildRequires: %{name}-share-linker
@ -876,9 +877,10 @@ Provides additional %{langname} translations and resources for %{project}. \
%if 0%{?suse_version} < 1330
%patch1
%endif
%patch4
%patch5
%patch6 -p1
%patch2
%patch3
%patch4 -p1
%patch5 -p1
%patch990 -p1
# Disable some of the failing tests (some are random)
@ -946,8 +948,6 @@ google_api_key="AIzaSyD1hTe85_a14kr1Ks8T3Ce75rvbR1_Dx7Q"
google_default_client_id="4139804441.apps.googleusercontent.com"
google_default_client_secret="KDTRKEZk2jwT_7CDpcmMA--P"
# make sure we execute everything with python3
export PYTHON=%{_bindir}/python3
# do not run configure in autogen but use macro later
export NOCONFIGURE=yes
./autogen.sh