rpm/libreoffice
SHA256
1
0
Fork 0
forked from pool/libreoffice
Code Pull Requests Activity

- Update patch to not call python directly during help generating:

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

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=639
This commit is contained in:
Tomáš Chvátal 2018-04-11 11:24:23 +00:00 committed by Git OBS Bridge
parent da055e4f91
commit 21c9e05385
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
0001-Use-PYTHON_FOR_BUILD-instead-of-calling-python-direc.patch
View File

@ -38,3 +38,40 @@ index 5dbd0038f009..112be23c9ce8 100644
--
2.16.1
From 76635096e9c9832d856e8eb1798ce70256f6d81b Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 23 Feb 2018 08:43:00 +0100
Subject: Adapt CustomTarget_helpcontent2/source/auxiliary
...to core 906a2e4fa4e9ce231126c608e741c0c0d809157d "Always execute
pack_images.py with the right Python interpreter"
Change-Id: I7c6c9aed33222fb5b902e30a05cefe8f88c66df1
---
CustomTarget_imagelist.mk | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'CustomTarget_imagelist.mk')
diff --git a/CustomTarget_imagelist.mk b/CustomTarget_imagelist.mk
index f0710e6..099bebe 100644
--- a/helpcontent2/CustomTarget_imagelist.mk
+++ b/helpcontent2/CustomTarget_imagelist.mk
@@ -19,11 +19,12 @@ $(eval $(call gb_CustomTarget_register_targets,helpcontent2/source/auxiliary,\
$(call gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/images_helpimg.zip : \
$(call gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/helpimg.ilst \
- $(call gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/screenshotimg.ilst
+ $(call gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/screenshotimg.ilst \
+ | $(call gb_ExternalExecutable_get_dependencies,python)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
$(call gb_Helper_abbreviate_dirs, \
ILSTFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,$(filter %.ilst,$^)) && \
- $(PYTHON) $(SRCDIR)/solenv/bin/pack_images.py \
+ $(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/solenv/bin/pack_images.py \
-g $(helpmedia_DIR) -m $(helpmedia_DIR) -c $(helpmedia_DIR) \
-l $${ILSTFILE} \
-s $< -o $@ \
--
cgit v1.1

2
libreoffice.changes
View File

@ -13,6 +13,8 @@ Tue Apr 10 11:27:05 UTC 2018 - tchvatal@suse.com
- Bring back offline help per popular demand as lto saves space
we could use with it bsc#915996
- Update patch to not call python directly during help generating:
* 0001-Use-PYTHON_FOR_BUILD-instead-of-calling-python-direc.patch
-------------------------------------------------------------------
Tue Apr 10 11:00:15 UTC 2018 - tchvatal@suse.com