alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Adding a patch for go-oo, so it does not dislike gcc 4.6.

Browse source 
svn path=/nixpkgs/trunk/; revision=32892
This commit is contained in:
Lluís Batlle i Rossell 2012-03-08 13:35:42 +00:00
parent d2747b12e9
commit b73a6999d0
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/applications/office/openoffice/gcc46.patch Normal file
View file

@ -0,0 +1,11 @@
--- a/build/OOO320_m19/cppu/inc/uno/lbnames.h
+++ b/build/OOO320_m19/cppu/inc/uno/lbnames.h
@@ -59,7 +59,7 @@ provoking error here, because PP ignores #error
#error "Tested gcc 2 versions are 2.91 and 2.95. Patch uno/lbnames.h to try your gcc 2 version."
#elif (__GNUC__ == 3 && __GNUC_MINOR__ <= 4)
#define __CPPU_ENV gcc3
-#elif (__GNUC__ == 4 && __GNUC_MINOR__ <= 5)
+#elif (__GNUC__ == 4 && __GNUC_MINOR__ <= 6)
#define __CPPU_ENV gcc3
#elif (__GNUC__ == 3)
#error "Tested gcc 3 version is <= 3.4. Patch uno/lbnames.h to try your gcc 3 version."

1
pkgs/applications/office/openoffice/go-oo.nix
View file

@ -56,6 +56,7 @@ stdenv.mkDerivation rec {
pushd build/${tag}
patch -p1 < ${./xlib.patch}
patch -p3 < ${./gcc46.patch}
# Fix svtools: hardcoded jpeg path
sed -i -e 's,^JPEG3RDLIB=.*,JPEG3RDLIB=${libjpeg}/lib/libjpeg.so,' solenv/inc/libs.mk