diff --git a/pkgs/applications/office/openoffice/gcc46.patch b/pkgs/applications/office/openoffice/gcc46.patch new file mode 100644 index 00000000000..a301e078d53 --- /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 59cd517b55c..c0eaf0deb9b 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