Author: urkud
Date: Tue Dec 28 18:47:41 2010
New Revision: 25312
URL: https://svn.nixos.org/websvn/nix/?rev=25312&sc=1
Log:
splix-2.0.0: fix compilation with gcc-4.5
Added:
nixpkgs/branches/stdenv-updates/pkgs/misc/cups/drivers/splix/splix-2.0.0-gcc45.patch
Modified:
nixpkgs/branches/stdenv-updates/pkgs/misc/cups/drivers/splix/default.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/misc/cups/drivers/splix/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/misc/cups/drivers/splix/default.nix
Tue Dec 28 17:25:17 2010 (r25311)
+++ nixpkgs/branches/stdenv-updates/pkgs/misc/cups/drivers/splix/default.nix
Tue Dec 28 18:47:41 2010 (r25312)
@@ -8,6 +8,8 @@
sha256 = "0bwivrwwvh6hzvnycpzqs7a0capgycahc4s3v9ihx552fgy07xwp";
};
+ patches = [ ./splix-2.0.0-gcc45.patch ];
+
preBuild=''
makeFlags="V=1 DISABLE_JBIG=1 CUPSFILTER=$out/lib/cups/filter
CUPSPPD=$out/share/cups/model"
'';
Added:
nixpkgs/branches/stdenv-updates/pkgs/misc/cups/drivers/splix/splix-2.0.0-gcc45.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/stdenv-updates/pkgs/misc/cups/drivers/splix/splix-2.0.0-gcc45.patch
Tue Dec 28 18:47:41 2010 (r25312)
@@ -0,0 +1,18 @@
+Fixing build with gcc 4.5
+
+http://bugs.gentoo.org/show_bug.cgi?id=318581
+
+downloaded from
+http://gentoo-overlays.zugaina.org/gentoo/portage/net-print/splix/files/splix-2.0.0-gcc45.patch
+
+--- splix-old/src/ppdfile.cpp
++++ splix-new/src/ppdfile.cpp
+@@ -282,7 +282,7 @@
+ * Opérateur d'assignation
+ * Assignment operator
+ */
+-void PPDFile::Value::operator = (const PPDFile::Value::Value &val)
++void PPDFile::Value::operator = (const PPDFile::Value &val)
+ {
+ if (_preformatted)
+ delete[] _preformatted;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
