diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2012-03-08 22:28:26 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2012-03-08 22:28:26 +0000 |
| commit | e277e44e343a4da4a7226560bbacdbd4ef6ba3fe (patch) | |
| tree | eb806bb80750fdd35c64e47875ba1e99c636e7ca /pkgs/misc/ghostscript | |
| parent | 47e76fde881e1fcf0c244e8b1753deddb480f82d (diff) | |
| download | nixlib-e277e44e343a4da4a7226560bbacdbd4ef6ba3fe.tar nixlib-e277e44e343a4da4a7226560bbacdbd4ef6ba3fe.tar.gz nixlib-e277e44e343a4da4a7226560bbacdbd4ef6ba3fe.tar.bz2 nixlib-e277e44e343a4da4a7226560bbacdbd4ef6ba3fe.tar.lz nixlib-e277e44e343a4da4a7226560bbacdbd4ef6ba3fe.tar.xz nixlib-e277e44e343a4da4a7226560bbacdbd4ef6ba3fe.tar.zst nixlib-e277e44e343a4da4a7226560bbacdbd4ef6ba3fe.zip | |
Updating GPL Ghostscript.
svn path=/nixpkgs/trunk/; revision=32914
Diffstat (limited to 'pkgs/misc/ghostscript')
| -rw-r--r-- | pkgs/misc/ghostscript/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/misc/ghostscript/purity-9.05.patch | 27 |
2 files changed, 33 insertions, 4 deletions
diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index af82a45c0fab..8df46dd66d4f 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -35,18 +35,20 @@ let }; inherit meta; + patches = [ ./purity.patch ]; }; mainlineData = { - name = "ghostscript-9.04"; + name = "ghostscript-9.05"; src = fetchurl { - url = http://downloads.ghostscript.com/public/ghostscript-9.04.tar.bz2; - sha256 = "1i0bsfzwppzk112vy62ydz927m9dlc1wvywanzi09hnk9as20b7q"; + url = http://downloads.ghostscript.com/public/ghostscript-9.05.tar.bz2; + sha256 = "1b6fi76x6pn9dmr9k9lh8kimn968dmh91k824fmm59d5ycm22h8g"; }; meta = meta // { homepage = http://www.ghostscript.com/; description = "GPL Ghostscript, a PostScript interpreter"; }; + patches = [ ./purity-9.05.patch ]; }; variant = if gnuFork then gnuForkData else mainlineData; @@ -75,7 +77,7 @@ stdenv.mkDerivation rec { CFLAGS = "-fPIC"; NIX_LDFLAGS = "-lz -rpath=${freetype}/lib"; - patches = [ ./purity.patch ./urw-font-files.patch ]; + patches = variant.patches ++ [ ./urw-font-files.patch ]; preConfigure = '' # "ijs" is impure: it contains symlinks to /usr/share/automake etc.! diff --git a/pkgs/misc/ghostscript/purity-9.05.patch b/pkgs/misc/ghostscript/purity-9.05.patch new file mode 100644 index 000000000000..cae9df7110ba --- /dev/null +++ b/pkgs/misc/ghostscript/purity-9.05.patch @@ -0,0 +1,27 @@ +diff --git a/base/unix-aux.mak b/base/unix-aux.mak +index 18745bc..0a67942 100644 +--- a/base/unix-aux.mak ++++ b/base/unix-aux.mak +@@ -111,15 +111,15 @@ $(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(MAKEDIRS) + # The "else true;" is required because Ultrix's implementation of sh -e + # terminates execution of a command if any error occurs, even if the command + # traps the error with ||. +-INCLUDE=/usr/include ++INCLUDE=/no-such-path + $(gconfig__h): $(UNIX_AUX_MAK) $(ECHOGS_XE) + $(ECHOGS_XE) -w $(gconfig__h) -x 2f2a -s This file was generated automatically by unix-aux.mak. -s -x 2a2f +- if ( test -f $(INCLUDE)/dirent.h ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_DIRENT_H; else true; fi +- if ( test -f $(INCLUDE)/ndir.h ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_NDIR_H; else true; fi +- if ( test -f $(INCLUDE)/sys/dir.h ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_DIR_H; else true; fi +- if ( test -f $(INCLUDE)/sys/ndir.h ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_NDIR_H; else true; fi +- if ( test -f $(INCLUDE)/sys/time.h ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 ifndef HAVE_SYS_TIME_H ; \ ++ if ( true ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_DIRENT_H; else true; fi ++ if ( true ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_NDIR_H; else true; fi ++ if ( true ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_DIR_H; else true; fi ++ if ( true ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_NDIR_H; else true; fi ++ if ( true ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 ifndef HAVE_SYS_TIME_H ; \ + $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_TIME_H ; \ + $(ECHOGS_XE) -a $(gconfig__h) -x 23 endif; else true; fi +- if ( test -f $(INCLUDE)/sys/times.h ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_TIMES_H; else true; fi ++ if ( true ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_TIMES_H; else true; fi + if ( test -f $(JSRCDIR)/jmemsys.h); then true; else $(ECHOGS_XE) -a $(gconfig__h) -x 23 define DONT_HAVE_JMEMSYS_H; fi |