From 12e7407abefe3bee80034d247b22e68d9da2312f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Sep 2011 17:35:26 +0000 Subject: [PATCH] libgnomeprint: updated to version 2.18.8 I made this update hoping that it would fix the build errors with CUPS 1.5.x, but unfortunately the new version still fails to compile: gnome-print-cups-transport.c:59:2: error: expected specifier-qualifier-list before 'FILE' gnome-print-cups-transport.c: In function 'gp_transport_cups_init': gnome-print-cups-transport.c:128:11: error: 'GPTransportCups' has no member named 'file' gnome-print-cups-transport.c: In function 'gp_transport_cups_finalize': gnome-print-cups-transport.c:140:15: error: 'GPTransportCups' has no member named 'file' gnome-print-cups-transport.c: In function 'gp_transport_cups_open': gnome-print-cups-transport.c:194:11: error: 'GPTransportCups' has no member named 'file' gnome-print-cups-transport.c:196:15: error: 'GPTransportCups' has no member named 'file' gnome-print-cups-transport.c: In function 'gp_transport_cups_close': gnome-print-cups-transport.c:238:2: error: 'GPTransportCups' has no member named 'file' gnome-print-cups-transport.c:241:23: error: 'GPTransportCups' has no member named 'file' gnome-print-cups-transport.c:245:11: error: 'GPTransportCups' has no member named 'file' gnome-print-cups-transport.c: In function 'gp_transport_cups_write': gnome-print-cups-transport.c:270:2: error: 'GPTransportCups' has no member named 'file' gnome-print-cups-transport.c:276:13: warning: incompatible implicit declaration of built-in function 'fwrite' gnome-print-cups-transport.c:276:57: error: 'GPTransportCups' has no member named 'file' make[4]: *** [gnome-print-cups-transport.lo] Error 1 I commit the update anyway, because (a) I feel that having the latest version probably can't hurt and (b) the old expression had an incorrect name attribute, which is now fixed. svn path=/nixpkgs/trunk/; revision=29281 --- .../gnome-2.28/platform/libgnomeprint/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome-2.28/platform/libgnomeprint/default.nix b/pkgs/desktops/gnome-2.28/platform/libgnomeprint/default.nix index 3fa902c67e6..54b5d638242 100644 --- a/pkgs/desktops/gnome-2.28/platform/libgnomeprint/default.nix +++ b/pkgs/desktops/gnome-2.28/platform/libgnomeprint/default.nix @@ -1,14 +1,17 @@ {stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2, intltool, libart_lgpl, libgnomecups, bison, flex }: +let + name = "libgnomeprint-2.18.8"; +in stdenv.mkDerivation { - name = "libgnomeprint-2.11.1"; - + inherit name; + src = fetchurl { - url = mirror://gnome/sources/libgnomeprint/2.18/libgnomeprint-2.18.6.tar.bz2; - sha256 = "15c00ya2mx0x4mh8lyy3xg9dd66z5yjnax74bqx99zd90sar10fg"; + url = "mirror://gnome/sources/libgnomeprint/2.18/${name}.tar.bz2"; + sha256 = "1034ec8651051f84d2424e7a1da61c530422cc20ce5b2d9e107e1e46778d9691"; }; - + buildInputs = [ pkgconfig gtk gettext intltool libart_lgpl libgnomecups bison flex ]; propagatedBuildInputs = [ libxml2 ]; }