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

Accepting request 172472 from LibreOffice:Unstable

Browse Source 
- buildfix-sfx2-dependency.diff: svx headers started to be used in sfx2

* solenv-touch-no-dereference.diff: touch --no-dereference in not
  available on SLED11-SP1 and it is not needed when not using hardlinks

OBS-URL: https://build.opensuse.org/request/show/172472
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=31
This commit is contained in:
Petr Mladek 2013-04-19 12:50:40 +00:00 committed by Git OBS Bridge
parent 701d96e34a
commit 11a530a46c
4 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
buildfix-sfx2-dependency.diff Normal file
View File

@ -0,0 +1,10 @@
--- sfx2/Library_sfx.mk.old 2013-04-16 18:14:55.000000000 +0200
+++ sfx2/Library_sfx.mk 2013-04-19 13:25:37.000000000 +0200
@@ -22,6 +22,7 @@ $(eval $(call gb_Library_Library,sfx))
$(eval $(call gb_Library_use_packages,sfx,\
sfx2_inc \
sfx2_sdi \
+ svx_inc \
))
$(eval $(call gb_Library_add_sdi_headers,sfx,sfx2/sdi/sfxslots))

11
libreoffice.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Fri Apr 19 11:32:28 UTC 2013 - pmladek@suse.com
- buildfix-sfx2-dependency.diff: svx headers started to be used in sfx2
-------------------------------------------------------------------
Thu Apr 18 10:31:42 UTC 2013 - pmladek@suse.com
* solenv-touch-no-dereference.diff: touch --no-dereference in not
available on SLED11-SP1 and it is not needed when not using hardlinks
-------------------------------------------------------------------
Wed Apr 17 10:10:05 UTC 2013 - pmladek@suse.com

10
libreoffice.spec
View File

@ -588,6 +588,8 @@ Patch6: pack-desktop-files-for-optional-filters.diff
# put internal rhino into XBootClasspath to fix build with OpenJDK
# FIXME: make it clean to be able to push upstream
Patch7: scripting-prefer-internal-rhino.diff
# svx headers started to be used in sfx2
Patch8: buildfix-sfx2-dependency.diff
# search <lo-home>/share/template/common for language independent templates
# FIXME: make it configurable to push upstream
Patch9: office-cfg-linux-common-template-dir.diff
@ -617,6 +619,9 @@ Patch910: libreoffice-poppler-0.17.0-reject-fix.diff
Patch920: redland-rpath-hack.diff
# try to save space by using hardlinks
Patch990: install-with-hardlinks.diff
# FIXME: touch --no-dereference in not available on SLED11-SP1
# and it is not needed when not using harlinks
Patch991: solenv-touch-no-dereference.diff
#
# Patches against zip-3.0
Patch2000: zip-3.0-iso8859_2.patch
@ -1289,6 +1294,7 @@ the LibreOffice localizations separately.
%patch5
%patch6 -p1
%patch7 -p1
%patch8
%patch9
%patch10 -p1
%patch11
@ -1311,6 +1317,10 @@ the LibreOffice localizations separately.
%if %save_space == 1
# use hardlinks when installing files
%patch990
%else
# FIXME: touch --no-dereference in not available on SLED11-SP1
# and it is not needed when not using harlinks
%patch991
%endif
# 256x256 icons
tar -xjf %{S:20}

11
solenv-touch-no-dereference.diff Normal file
View File

@ -0,0 +1,11 @@
--- solenv/gbuild/Deliver.mk.old 2013-03-28 19:01:42.000000000 +0100
+++ solenv/gbuild/Deliver.mk 2013-04-18 12:24:05.000000000 +0200
@@ -60,7 +60,7 @@ endif
endef
define gb_Deliver__deliver
-$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) && touch --no-dereference -r $(1) $(2)
+$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) && touch -r $(1) $(2)
endef
ifneq ($(strip $(gb_Deliver_GNUCOPY)),)