diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2012-03-08 13:35:42 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2012-03-08 13:35:42 +0000 |
| commit | b73a6999d03c78c6f7e663e64c75e48338b9e02f (patch) | |
| tree | 9ee5363557b2f0f159d8a91e70bd1a8655454c4e /pkgs/applications/office | |
| parent | d2747b12e98a91b734528cb29eab3a3af288c7b9 (diff) | |
| download | nixlib-b73a6999d03c78c6f7e663e64c75e48338b9e02f.tar nixlib-b73a6999d03c78c6f7e663e64c75e48338b9e02f.tar.gz nixlib-b73a6999d03c78c6f7e663e64c75e48338b9e02f.tar.bz2 nixlib-b73a6999d03c78c6f7e663e64c75e48338b9e02f.tar.lz nixlib-b73a6999d03c78c6f7e663e64c75e48338b9e02f.tar.xz nixlib-b73a6999d03c78c6f7e663e64c75e48338b9e02f.tar.zst nixlib-b73a6999d03c78c6f7e663e64c75e48338b9e02f.zip | |
Adding a patch for go-oo, so it does not dislike gcc 4.6.
svn path=/nixpkgs/trunk/; revision=32892
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/openoffice/gcc46.patch | 11 | ||||
| -rw-r--r-- | pkgs/applications/office/openoffice/go-oo.nix | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/applications/office/openoffice/gcc46.patch b/pkgs/applications/office/openoffice/gcc46.patch new file mode 100644 index 000000000000..a301e078d535 --- /dev/null +++ b/pkgs/applications/office/openoffice/gcc46.patch @@ -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." diff --git a/pkgs/applications/office/openoffice/go-oo.nix b/pkgs/applications/office/openoffice/go-oo.nix index 59cd517b55cd..c0eaf0deb9b3 100644 --- a/pkgs/applications/office/openoffice/go-oo.nix +++ b/pkgs/applications/office/openoffice/go-oo.nix @@ -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 |