Author: simons
Date: Tue Mar  6 20:04:58 2012
New Revision: 32832
URL: https://nixos.org/websvn/nix/?rev=32832&sc=1

Log:
libgnomeprint: fix gcc 4.6 compilation error

Added:
   nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libgnomeprint/bug653388.patch
Modified:
   nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix

Added: 
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libgnomeprint/bug653388.patch
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libgnomeprint/bug653388.patch  
Tue Mar  6 20:04:58 2012        (r32832)
@@ -0,0 +1,21 @@
+From 9b82b7e75b83395e7c5692085e1934202cf7f65f Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <[email protected]>
+Date: Wed, 12 Oct 2011 15:08:59 +0000
+Subject: Add missing include
+
+https://bugzilla.gnome.org/show_bug.cgi?id=653388
+---
+diff --git a/libgnomeprint/modules/cups/gnome-print-cups-transport.c 
b/libgnomeprint/modules/cups/gnome-print-cups-transport.c
+index aeb7111..85de91b 100644
+--- a/libgnomeprint/modules/cups/gnome-print-cups-transport.c
++++ b/libgnomeprint/modules/cups/gnome-print-cups-transport.c
+@@ -34,6 +34,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#include <stdio.h>
+ #include <unistd.h>
+ #include <locale.h>
+ 
+--
+cgit v0.9.0.2

Modified: nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix      
Tue Mar  6 19:06:33 2012        (r32831)
+++ nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix      
Tue Mar  6 20:04:58 2012        (r32832)
@@ -12,6 +12,8 @@
     sha256 = 
"1034ec8651051f84d2424e7a1da61c530422cc20ce5b2d9e107e1e46778d9691";
   };
 
+  patches = [ ./bug653388.patch ];
+
   buildInputs = [ pkgconfig gtk gettext intltool libart_lgpl libgnomecups 
bison flex ];
   propagatedBuildInputs = [ libxml2 ];
 }
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to