Author: eelco Date: Tue Feb 15 16:06:33 2011 New Revision: 25983 URL: https://svn.nixos.org/websvn/nix/?rev=25983&sc=1
Log: * Fix an OpenOffice build problem (http://hydra.nixos.org/build/911291). Not tested. Added: nixpkgs/branches/x-updates/pkgs/applications/office/openoffice/xlib.patch Modified: nixpkgs/branches/x-updates/pkgs/applications/office/openoffice/default.nix Modified: nixpkgs/branches/x-updates/pkgs/applications/office/openoffice/default.nix ============================================================================== --- nixpkgs/branches/x-updates/pkgs/applications/office/openoffice/default.nix Tue Feb 15 15:54:57 2011 (r25982) +++ nixpkgs/branches/x-updates/pkgs/applications/office/openoffice/default.nix Tue Feb 15 16:06:33 2011 (r25983) @@ -7,6 +7,7 @@ }: let version = "3.2.1"; in + stdenv.mkDerivation rec { name = "openoffice.org-${version}"; builder = ./builder.sh; @@ -19,7 +20,7 @@ sha256 = "0gj2hinhnzkazh44k1an05x5cj7n6721f2grqrkjh31cm38r9p6i"; }; - patches = [ ./oo.patch ./root-required.patch ]; + patches = [ ./oo.patch ./root-required.patch ./xlib.patch ]; postPatch = /* Compiling with GCC 4.5 fails: Added: nixpkgs/branches/x-updates/pkgs/applications/office/openoffice/xlib.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ nixpkgs/branches/x-updates/pkgs/applications/office/openoffice/xlib.patch Tue Feb 15 16:06:33 2011 (r25983) @@ -0,0 +1,22 @@ +https://bugs.freedesktop.org/show_bug.cgi?id=31322 + +diff -rc OOO320_m19-orig//vcl/unx/inc/dtint.hxx OOO320_m19//vcl/unx/inc/dtint.hxx +*** OOO320_m19-orig//vcl/unx/inc/dtint.hxx 2010-05-26 20:34:28.000000000 +0200 +--- OOO320_m19//vcl/unx/inc/dtint.hxx 2011-02-15 17:04:32.134813676 +0100 +*************** +*** 36,42 **** + class SalDisplay; + class AllSettings; + +! #ifndef _XLIB_H_ + // forwards from X + struct Display; + struct XEvent; +--- 36,42 ---- + class SalDisplay; + class AllSettings; + +! #if !defined(_XLIB_H_) && !defined(_X11_XLIB_H_) + // forwards from X + struct Display; + struct XEvent; _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
