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

- Bridges now seem to get the cflags properly so patch is not

Browse Source 
really needed.
  * removed patch bridges-missing-cxxflags.diff

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=81
This commit is contained in:
Tomáš Chvátal 2014-01-17 20:16:52 +00:00 committed by Git OBS Bridge
parent 46472bbe00
commit 817d83bebf
4 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bridges-missing-cxxflags.diff
View File

@ -1,11 +0,0 @@
--- bridges/Library_cpp_uno.mk.old 2013-08-02 13:53:59.000000000 +0200
+++ bridges/Library_cpp_uno.mk 2013-08-02 13:54:22.000000000 +0200
@@ -230,7 +230,7 @@ $(eval $(call gb_Library_add_exception_o
$(eval $(call gb_Library_add_cxxobjects,$(gb_CPPU_ENV)_uno,\
bridges/source/cpp_uno/shared/cppinterfaceproxy \
- , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+ , $(CXXFLAGS) $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
))
# vim: set noet sw=4 ts=4:

2
install-with-hardlinks.diff
View File

@ -6,7 +6,7 @@ diff -urN libreoffice-4.1.0.0.beta1.old/solenv/bin/modules/installer/worker.pm l
}
else {
- copy ("$sourcepath", "$destdir$destination") || die "Can't copy file: $sourcepath -> $destdir$destination $!";
+ link ("$sourcepath", "$destdir$destination") || die "Can't hardlink file: $sourcepath -> $destdir$destination $!";
+ link ("$sourcepath", "$destdir$destination") || die "Can't hardlink file: $sourcepath -> $destdir$destination $!";
my $sourcestat = stat($sourcepath);
utime ($sourcestat->atime, $sourcestat->mtime, "$destdir$destination");
chmod (oct($unixrights), "$destdir$destination") || die "Can't change permissions: $!";

6
libreoffice.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jan 17 20:13:38 UTC 2014 - tchvatal@suse.com
- Bridges now seem to get the cflags properly so patch is not
really needed.
-------------------------------------------------------------------
Fri Jan 17 19:08:20 UTC 2014 - tchvatal@suse.com

2
libreoffice.spec
View File

@ -100,8 +100,6 @@ Patch11: nlpsolver-no-broken-help.diff
Patch12: mediawiki-no-broken-help.diff
# LO newer worked well with it
Patch13: jvmfwk-disable-gcj.diff
# lost RPM optflags when compiling bridges
Patch15: bridges-missing-cxxflags.diff
# Fix running wizzards in py2 as the utf is not htere
Patch16: wizards-create-temlates-with-python-2.6.diff
# try to save space by using hardlinks