git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #87235 from NixOS/staging-next

Staging next

commit82ca249c924eb9e49083ec72a6ac4e3593bc074d authorFrederik Rietdijk <freddyrietdijk@fridh.nl> dateMon 11 May 2020, 22:07 (7 years ago) parent33a756fd20d734
28 files changed+958−51
compare with master
unifiedsplit
pkgs/build-support/rust/default.nix+16−2 pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix+2−2 pkgs/development/libraries/audio/lv2/default.nix+2−2 pkgs/development/libraries/glib-networking/default.nix+2−2 pkgs/development/libraries/glibmm/default.nix+2−2 pkgs/development/libraries/gsettings-desktop-schemas/default.nix+2−2 pkgs/development/libraries/libdvdread/default.nix+2−2 pkgs/development/libraries/libgdiplus/default.nix+2−2 pkgs/development/libraries/libgsf/default.nix+2−2 pkgs/development/libraries/libiberty/default.nix+2−1 pkgs/development/libraries/libinput/default.nix+2−2 pkgs/development/libraries/libqmi/default.nix+2−2 pkgs/development/libraries/librsvg/default.nix+2−2 pkgs/development/libraries/libsass/default.nix+2−2 pkgs/development/libraries/libsecret/default.nix+2−2 pkgs/development/libraries/libuninameslist/default.nix+2−2 pkgs/development/libraries/libuv/default.nix+2−2 pkgs/development/libraries/pangomm/default.nix+2−2 pkgs/development/libraries/poppler/default.nix+2−2 pkgs/development/libraries/science/math/mkl/default.nix+11−4 pkgs/development/libraries/science/math/openblas/default.nix+12−4 pkgs/development/python-modules/numpy/default.nix+8 pkgs/development/tools/build-managers/cmake/default.nix+2−2 pkgs/development/tools/misc/help2man/default.nix+2−2 pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch+862 pkgs/misc/ghostscript/default.nix+3 pkgs/shells/bash/bash-completion/default.nix+5−1 pkgs/top-level/all-packages.nix+1−1
pkgs/build-support/rust/default.nix+16−2
@@ -1,4 +1,14 @@
1−{ stdenv, cacert, git, rust, cargo, rustc, fetchCargoTarball, buildPackages, windows }:
1+{ stdenv
2+, buildPackages
3+, cacert
4+, cargo
5+, diffutils
6+, fetchCargoTarball
7+, git
8+, rust
9+, rustc
10+, windows
11+}:
212
313{ name ? "${args.pname}-${args.version}"
414, cargoSha256 ? "unset"
@@ -58,6 +68,10 @@ let
5868 cxxForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++";
5969 releaseDir = "target/${rustTarget}/${buildType}";
6070
71+ # Specify the stdenv's `diff` by abspath to ensure that the user's build
72+ # inputs do not cause us to find the wrong `diff`.
73+ diff = "${diffutils}/bin/diff";
74+
6175in
6276
6377stdenv.mkDerivation (args // {
@@ -110,7 +124,7 @@ stdenv.mkDerivation (args // {
110124 srcLockfile=$NIX_BUILD_TOP/$sourceRoot/Cargo.lock
111125
112126 echo "Validating consistency between $srcLockfile and $cargoDepsLockfile"
113− if ! diff $srcLockfile $cargoDepsLockfile; then
127+ if ! ${diff} $srcLockfile $cargoDepsLockfile; then
114128
115129 # If the diff failed, first double-check that the file exists, so we can
116130 # give a friendlier error msg.
pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix+2−2
@@ -3,11 +3,11 @@
33
44stdenv.mkDerivation rec {
55 pname = "adwaita-icon-theme";
6− version = "3.36.0";
6+ version = "3.36.1";
77
88 src = fetchurl {
99 url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
10− sha256 = "066m3vd6k6xf3ap1ahrbw5hnx2322wf0qsnywcxjsj6snq9225qs";
10+ sha256 = "0kgiq712lfidd81yzx0yk7qwlj3q8cymp6npnxyzsk844y353674";
1111 };
1212
1313 # For convenience, we can specify adwaita-icon-theme only in packages
pkgs/development/libraries/audio/lv2/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "lv2";
5− version = "1.16.0";
5+ version = "1.18.0";
66
77 src = fetchurl {
88 url = "https://lv2plug.in/spec/${pname}-${version}.tar.bz2";
9− sha256 = "1ppippbpdpv13ibs06b0bixnazwfhiw0d0ja6hx42jnkgdyp5hyy";
9+ sha256 = "0gs7401xz23q9vajqr31aa2db8dvssgyh5zrvr4ipa6wig7yb8wh";
1010 };
1111
1212 nativeBuildInputs = [ pkgconfig wafHook ];
pkgs/development/libraries/glib-networking/default.nix+2−2
@@ -18,13 +18,13 @@
1818
1919stdenv.mkDerivation rec {
2020 pname = "glib-networking";
21− version = "2.64.1";
21+ version = "2.64.2";
2222
2323 outputs = [ "out" "installedTests" ];
2424
2525 src = fetchurl {
2626 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
27− sha256 = "0wmg5n2h0r1rcdmp4w48akqlsbpjrjrj6p59g5ylc5yqyzg4dhx4";
27+ sha256 = "19wmyv7j355z1wk650fyygadbwwmmhqggr54845rn7smbiqz1pj5";
2828 };
2929
3030 patches = [
pkgs/development/libraries/glibmm/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "glibmm";
5− version = "2.62.0";
5+ version = "2.64.2";
66
77 src = fetchurl {
88 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
9− sha256 = "1ziwx6r7k7wbvg4qq1rgrv8zninapgrmhn1hs6926a3krh9ryr9n";
9+ sha256 = "1v6lp23fr2qh4zshcnm28sn29j3nzgsvcqj2nhmrnvamipjq4lm7";
1010 };
1111
1212 outputs = [ "out" "dev" ];
pkgs/development/libraries/gsettings-desktop-schemas/default.nix+2−2
@@ -7,11 +7,11 @@
77
88stdenv.mkDerivation rec {
99 pname = "gsettings-desktop-schemas";
10− version = "3.36.0";
10+ version = "3.36.1";
1111
1212 src = fetchurl {
1313 url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
14− sha256 = "19hfjqzddkmvxg80v23xpbd1my2pzjalx3d56d2k4dk5521vcjkn";
14+ sha256 = "1nf97vq07gadwdla6kws8z510xlmv0a7wlyqwwnhyagq7kjdnjq0";
1515 };
1616
1717 passthru = {
pkgs/development/libraries/libdvdread/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "libdvdread";
5− version = "6.1.0";
5+ version = "6.1.1";
66
77 src = fetchurl {
88 url = "http://get.videolan.org/libdvdread/${version}/${pname}-${version}.tar.bz2";
9− sha256 = "033mnhq3mx0qz3z85vw01rz5wzmx5ynadl7q1wm2spvx3ryvs6sh";
9+ sha256 = "15hpwbw3nm84y432l0j61w0zmqxplsyymfc52dry6nvwl44p6d9y";
1010 };
1111
1212 buildInputs = [libdvdcss];
pkgs/development/libraries/libgdiplus/default.nix+2−2
@@ -4,13 +4,13 @@
44
55stdenv.mkDerivation rec {
66 pname = "libgdiplus";
7− version = "6.0.4";
7+ version = "6.0.5";
88
99 src = fetchFromGitHub {
1010 owner = "mono";
1111 repo = "libgdiplus";
1212 rev = version;
13− sha256 = "1pf3yhwq9qk0w3yv9bb8qlwwqkffg7xb4sgc8yqdnn6pa56i3vmn";
13+ sha256 = "1387lgph5r17viv3rkf5hbksdn435njzmra7s17q0nzk2mkkm68c";
1414 };
1515
1616 NIX_LDFLAGS = "-lgif";
pkgs/development/libraries/libgsf/default.nix+2−2
@@ -3,11 +3,11 @@
33
44stdenv.mkDerivation rec {
55 pname = "libgsf";
6− version = "1.14.46";
6+ version = "1.14.47";
77
88 src = fetchurl {
99 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
10− sha256 = "0bddmlzg719sjhlbzqlhb7chwk93qc7g68m2r9r8xz112jdradpa";
10+ sha256 = "0kbpp9ksl7977xiga37sk1gdw1r039v6zviqznl7alvvg39yp26i";
1111 };
1212
1313 nativeBuildInputs = [ pkgconfig intltool libintl ];
pkgs/development/libraries/libiberty/default.nix+2−1
@@ -3,7 +3,8 @@
33let inherit (buildPackages.buildPackages) gcc; in
44
55stdenv.mkDerivation {
6− name = "libiberty-${gcc.cc.version}";
6+ pname = "libiberty";
7+ version = "${gcc.cc.version}";
78
89 inherit (gcc.cc) src;
910
pkgs/development/libraries/libinput/default.nix+2−2
@@ -27,11 +27,11 @@ in
2727with stdenv.lib;
2828stdenv.mkDerivation rec {
2929 pname = "libinput";
30− version = "1.15.4";
30+ version = "1.15.5";
3131
3232 src = fetchurl {
3333 url = "https://www.freedesktop.org/software/libinput/${pname}-${version}.tar.xz";
34− sha256 = "1ha5qyak1ka5npy5i6hzqfpii8samkj389mkppj4wdsfv536i2ww";
34+ sha256 = "15ww4jl3lcxyi8m8idg8canklbqv729gnwpkz7r98c1w8a7zq3m9";
3535 };
3636
3737 outputs = [ "bin" "out" "dev" ];
pkgs/development/libraries/libqmi/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "libqmi";
5− version = "1.24.6";
5+ version = "1.24.10";
66
77 src = fetchurl {
88 url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz";
9− sha256 = "1jfq8jdjc9z5c0g7m377svdlniwkr4k9hs7s8fsb5rvdq5xja98k";
9+ sha256 = "1rzxapr6hb18ccvqh5fizx7zk63l47bs0p3gizycz2ysnm1i44n2";
1010 };
1111
1212 outputs = [ "out" "dev" "devdoc" ];
pkgs/development/libraries/librsvg/default.nix+2−2
@@ -4,14 +4,14 @@
44
55let
66 pname = "librsvg";
7− version = "2.48.2";
7+ version = "2.48.4";
88in
99stdenv.mkDerivation rec {
1010 name = "${pname}-${version}";
1111
1212 src = fetchurl {
1313 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
14− sha256 = "1jmxd03fs8vkwycxpmx69kdfmgq52g64bhv82gmj3kjgw2h5h9i7";
14+ sha256 = "0vlmgisf87dz4vcl1ypcw7g211wkyvhydv6ksf1p6mgdbkw3mdi8";
1515 };
1616
1717 outputs = [ "out" "dev" "installedTests" ];
pkgs/development/libraries/libsass/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "libsass";
5− version = "3.6.3";
5+ version = "3.6.4";
66
77 src = fetchFromGitHub {
88 owner = "sass";
99 repo = pname;
1010 rev = version;
11− sha256 = "1q6lvd8sj5k5an32qir918pa5khhcb8h08dzrg1bcxmw7a23j514";
11+ sha256 = "074kvacdan85h4qrvsk97575ys9xgkc044gplz3m6vn4a8pcl2rn";
1212 # Remove unicode file names which leads to different checksums on HFS+
1313 # vs. other filesystems because of unicode normalisation.
1414 extraPostFetch = ''
pkgs/development/libraries/libsecret/default.nix+2−2
@@ -4,11 +4,11 @@
44
55stdenv.mkDerivation rec {
66 pname = "libsecret";
7− version = "0.20.2";
7+ version = "0.20.3";
88
99 src = fetchurl {
1010 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
11− sha256 = "1hzz34gmsxxf1jm1b7qin390rkwbg8sx198xdkwxqp3q6cw19sc1";
11+ sha256 = "1r4habxdzmn02id324m0m4mg5isf22q1z436bg3vjjmcz1b3rjsg";
1212 };
1313
1414 postPatch = ''
pkgs/development/libraries/libuninameslist/default.nix+2−2
@@ -5,13 +5,13 @@
55
66stdenv.mkDerivation rec {
77 pname = "libuninameslist";
8− version = "20200313";
8+ version = "20200413";
99
1010 src = fetchFromGitHub {
1111 owner = "fontforge";
1212 repo = pname;
1313 rev = version;
14− sha256 = "1rs4mrmfcw7864kssnk559ac1sdlpl8yrd10xspxrnfz08ynqxw8";
14+ sha256 = "0jbg94z00f5vwqyjfrbill6cjvzp1zrki6m3d235jjxyw0hm3wr5";
1515 };
1616
1717 nativeBuildInputs = [
pkgs/development/libraries/libuv/default.nix+2−2
@@ -1,14 +1,14 @@
11{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }:
22
33stdenv.mkDerivation rec {
4− version = "1.35.0";
4+ version = "1.37.0";
55 pname = "libuv";
66
77 src = fetchFromGitHub {
88 owner = pname;
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "0pd94h10ay38r8fwj0qqgw908rrj83n768n8mbbpnd5w2c7wy9fz";
11+ sha256 = "0iy25w4wy9f5y7i7aqidhqz93qi00lv7vhx6s521n0kphvaj8ijz";
1212 };
1313
1414 postPatch = let
pkgs/development/libraries/pangomm/default.nix+2−2
@@ -3,11 +3,11 @@
33
44stdenv.mkDerivation rec {
55 pname = "pangomm";
6− version= "2.42.0";
6+ version= "2.42.1";
77
88 src = fetchurl {
99 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
10− sha256 = "0mmzxp3wniaafkxr30sb22mq9x44xckb5d60h1bl99lkzxks0vfa";
10+ sha256 = "03zli5amizhv9bfklwfq7xyf0b5dagchx1lnz9f0v1rhk69h9gql";
1111 };
1212
1313 outputs = [ "out" "dev" ];
pkgs/development/libraries/poppler/default.nix+2−2
@@ -12,11 +12,11 @@ let
1212in
1313stdenv.mkDerivation rec {
1414 name = "poppler-${suffix}-${version}";
15− version = "0.87.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too!
15+ version = "0.88.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too!
1616
1717 src = fetchurl {
1818 url = "${meta.homepage}/poppler-${version}.tar.xz";
19− sha256 = "b2ArnCTC0FeAvpPnMGIBAS5BRZ8om4J5onp5QxrUFQ4=";
19+ sha256 = "1isns9s484irq9ir4hbhpyqf6af2xzswh2pfrvk1k9d5x423hidl";
2020 };
2121
2222 outputs = [ "out" "dev" ];
pkgs/development/libraries/science/math/mkl/default.nix+11−4
@@ -20,6 +20,8 @@ let
2020 openmp = if stdenvNoCC.isDarwin then "19.0" else "19.1";
2121 openmp-ver = "${openmp}.${spot}-${rel}-${openmp}.${spot}-${rel}";
2222
23+ shlibExt = stdenvNoCC.hostPlatform.extensions.sharedLibrary;
24+
2325in stdenvNoCC.mkDerivation {
2426 pname = "mkl";
2527 inherit version;
@@ -114,10 +116,15 @@ in stdenvNoCC.mkDerivation {
114116 '') + ''
115117
116118 # Setup symlinks for blas / lapack
117− ln -s $out/lib/libmkl_rt${stdenvNoCC.hostPlatform.extensions.sharedLibrary} $out/lib/libblas${stdenvNoCC.hostPlatform.extensions.sharedLibrary}${stdenvNoCC.lib.optionalString stdenvNoCC.hostPlatform.isLinux ".3"}
118− ln -s $out/lib/libmkl_rt${stdenvNoCC.hostPlatform.extensions.sharedLibrary} $out/lib/libcblas${stdenvNoCC.hostPlatform.extensions.sharedLibrary}${stdenvNoCC.lib.optionalString stdenvNoCC.hostPlatform.isLinux ".3"}
119− ln -s $out/lib/libmkl_rt${stdenvNoCC.hostPlatform.extensions.sharedLibrary} $out/lib/liblapack${stdenvNoCC.hostPlatform.extensions.sharedLibrary}${stdenvNoCC.lib.optionalString stdenvNoCC.hostPlatform.isLinux ".3"}
120− ln -s $out/lib/libmkl_rt${stdenvNoCC.hostPlatform.extensions.sharedLibrary} $out/lib/liblapacke${stdenvNoCC.hostPlatform.extensions.sharedLibrary}${stdenvNoCC.lib.optionalString stdenvNoCC.hostPlatform.isLinux ".3"}
119+ ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libblas${shlibExt}
120+ ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${shlibExt}
121+ ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapack${shlibExt}
122+ ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapacke${shlibExt}
123+ '' + stdenvNoCC.lib.optionalString stdenvNoCC.hostPlatform.isLinux ''
124+ ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libblas${shlibExt}".3"
125+ ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${shlibExt}".3"
126+ ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapack${shlibExt}".3"
127+ ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapacke${shlibExt}".3"
121128 '';
122129
123130 # fixDarwinDylibName fails for libmkl_cdft_core.dylib because the
pkgs/development/libraries/science/math/openblas/default.nix+12−4
@@ -93,6 +93,9 @@ let
9393 if !builtins.isBool val then toString val
9494 else if val then "1" else "0";
9595 mkMakeFlagsFromConfig = mapAttrsToList (var: val: "${var}=${mkMakeFlagValue val}");
96+
97+ shlibExt = stdenv.hostPlatform.extensions.sharedLibrary;
98+
9699in
97100stdenv.mkDerivation rec {
98101 pname = "openblas";
@@ -178,10 +181,15 @@ EOF
178181 done
179182
180183 # Setup symlinks for blas / lapack
181− ln -s $out/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}${stdenv.lib.optionalString stdenv.hostPlatform.isLinux ".3"}
182− ln -s $out/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libcblas${stdenv.hostPlatform.extensions.sharedLibrary}${stdenv.lib.optionalString stdenv.hostPlatform.isLinux ".3"}
183− ln -s $out/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}${stdenv.lib.optionalString stdenv.hostPlatform.isLinux ".3"}
184− ln -s $out/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/liblapacke${stdenv.hostPlatform.extensions.sharedLibrary}${stdenv.lib.optionalString stdenv.hostPlatform.isLinux ".3"}
184+ ln -s $out/lib/libopenblas${shlibExt} $out/lib/libblas${shlibExt}
185+ ln -s $out/lib/libopenblas${shlibExt} $out/lib/libcblas${shlibExt}
186+ ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapack${shlibExt}
187+ ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapacke${shlibExt}
188+ '' + stdenv.lib.optionalString stdenv.hostPlatform.isLinux ''
189+ ln -s $out/lib/libopenblas${shlibExt} $out/lib/libblas${shlibExt}.3
190+ ln -s $out/lib/libopenblas${shlibExt} $out/lib/libcblas${shlibExt}.3
191+ ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapack${shlibExt}.3
192+ ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapacke${shlibExt}.3
185193 '';
186194
187195 meta = with stdenv.lib; {
pkgs/development/python-modules/numpy/default.nix+8
@@ -23,6 +23,14 @@ let
2323 library_dirs = "${blas}/lib:${lapack}/lib";
2424 libraries = "lapack,lapacke,blas,cblas";
2525 };
26+ lapack = {
27+ include_dirs = "${lib.getDev lapack}/include";
28+ library_dirs = "${lapack}/lib";
29+ };
30+ blas = {
31+ include_dirs = "${lib.getDev blas}/include";
32+ library_dirs = "${blas}/lib";
33+ };
2634 });
2735 };
2836in buildPythonPackage rec {
pkgs/development/tools/build-managers/cmake/default.nix+2−2
@@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
1919 + lib.optionalString useNcurses "-cursesUI"
2020 + lib.optionalString withQt5 "-qt5UI"
2121 + lib.optionalString useQt4 "-qt4UI";
22− version = "3.17.0";
22+ version = "3.17.2";
2323
2424 src = fetchurl {
2525 url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
2626 # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt
27− sha256 = "0iq8y1rb5dqnzrwy4lssr76hbnnvh54q2ympl97wrshma6shak5p";
27+ sha256 = "199srp8yfai51pcbpmfyc4s8vzrmh2dm91bp582hj2l29x634xzw";
2828 };
2929
3030 patches = [
pkgs/development/tools/misc/help2man/default.nix+2−2
@@ -1,11 +1,11 @@
11{ stdenv, fetchurl, perlPackages, gettext }:
22
33stdenv.mkDerivation rec {
4− name = "help2man-1.47.13";
4+ name = "help2man-1.47.15";
55
66 src = fetchurl {
77 url = "mirror://gnu/help2man/${name}.tar.xz";
8− sha256 = "08q5arxz4j4pyx5q4712c2rn7p7dw7as9xg38yvmsh1c3ynvpy5p";
8+ sha256 = "076dvc0z0qp73rpmg0c8bkpfh969h4gzzc442hv1bcyf1srkann2";
99 };
1010
1111 nativeBuildInputs = [ gettext perlPackages.LocaleGettext ];
pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patchnew file+862
@@ -0,0 +1,862 @@
1+From 9f56e78d111d726ca95a59b2d64e5c3298451505 Mon Sep 17 00:00:00 2001
2+From: Chris Liddell <chris.liddell@artifex.com>
3+Date: Mon, 27 Apr 2020 11:04:57 +0100
4+Subject: [PATCH] Bug 702364: Fix missing echogs dependencies
5+
6+Rebased version of http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=1b4c3669a20c
7+to fix parallel build
8+---
9+ contrib/contrib.mak | 281 ++++++++++++++++++++++----------------------
10+ 1 file changed, 143 insertions(+), 138 deletions(-)
11+
12+diff --git a/contrib/contrib.mak b/contrib/contrib.mak
13+index 5411ae902..7dd9822a9 100644
14+--- a/contrib/contrib.mak
15++++ b/contrib/contrib.mak
16+@@ -22,6 +22,10 @@
17+ CONTRIB_MAK=$(CONTRIBDIR)$(D)contrib.mak $(TOP_MAKEFILES)
18+ CONTRIBSRC=$(CONTRIBDIR)$(D)
19+
20++# Almost all device drivers depend on the following:
21++CONTDEVH=$(gserrors_h) $(gx_h) $(gxdevice_h)
22++CONTDEV=$(AK) $(ECHOGS_XE) $(GDEVH)
23++
24+ ###### --------------------------- Catalog -------------------------- ######
25+
26+ # The following drivers are user-contributed, and maintained (if at all) by
27+@@ -161,19 +165,19 @@ $(DEVOBJ)gdevbjca.$(OBJ) : $(CONTRIBSRC)gdevbjca.c $(PDEVH) $(bjc_h) \
28+ $(DEVCC) $(DEVO_)gdevbjca.$(OBJ) $(C_) $(CONTRIBSRC)gdevbjca.c
29+
30+ $(DD)bjcmono.dev : $(bjc_) $(DD)page.dev \
31+- $(CONTRIB_MAK) $(MAKEDIRS)
32++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
33+ $(SETPDEV) $(DD)bjcmono $(bjc_)
34+
35+ $(DD)bjcgray.dev : $(bjc_) $(DD)page.dev \
36+- $(CONTRIB_MAK) $(MAKEDIRS)
37++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
38+ $(SETPDEV) $(DD)bjcgray $(bjc_)
39+
40+ $(DD)bjccmyk.dev : $(bjc_) $(DD)page.dev \
41+- $(CONTRIB_MAK) $(MAKEDIRS)
42++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
43+ $(SETPDEV) $(DD)bjccmyk $(bjc_)
44+
45+ $(DD)bjccolor.dev : $(bjc_) $(DD)page.dev \
46+- $(CONTRIB_MAK) $(MAKEDIRS)
47++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
48+ $(SETPDEV) $(DD)bjccolor $(bjc_)
49+
50+
51+@@ -184,25 +188,25 @@ cdeskjet8_=$(DEVOBJ)gdevcd8.$(OBJ) $(HPPCL)
52+ # Author: Uli Wortmann (uliw@erdw.ethz.ch), Martin Gerbershagen (ger@ulm.temic.de)
53+ # Printer: HP 670
54+ $(DD)cdj670.dev : $(cdeskjet8_) $(DD)page.dev \
55+- $(CONTRIB_MAK) $(MAKEDIRS)
56++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
57+ $(SETPDEV2) $(DD)cdj670 $(cdeskjet8_)
58+
59+ # Author: Uli Wortmann (uliw@erdw.ethz.ch)
60+ # Printer: HP 850
61+ $(DD)cdj850.dev : $(cdeskjet8_) $(DD)page.dev \
62+- $(CONTRIB_MAK) $(MAKEDIRS)
63++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
64+ $(SETPDEV2) $(DD)cdj850 $(cdeskjet8_)
65+
66+ # Author: Uli Wortmann (uliw@erdw.ethz.ch), Martin Gerbershagen (ger@ulm.temic.de)
67+ # Printer: HP 890
68+ $(DD)cdj890.dev : $(cdeskjet8_) $(DD)page.dev \
69+- $(CONTRIB_MAK) $(MAKEDIRS)
70++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
71+ $(SETPDEV2) $(DD)cdj890 $(cdeskjet8_)
72+
73+ # Author: Uli Wortmann (uliw@erdw.ethz.ch), Martin Gerbershagen (ger@ulm.temic.de)
74+ # Printer: HP 1600
75+ $(DD)cdj1600.dev : $(cdeskjet8_) $(DD)page.dev \
76+- $(CONTRIB_MAK) $(MAKEDIRS)
77++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
78+ $(SETPDEV2) $(DD)cdj1600 $(cdeskjet8_)
79+
80+ $(DEVOBJ)gdevcd8.$(OBJ) : $(CONTRIBSRC)gdevcd8.c $(PDEVH) $(math__h)\
81+@@ -220,7 +224,8 @@ $(DEVOBJ)gdevcd8.$(OBJ) : $(CONTRIBSRC)gdevcd8.c $(PDEVH) $(math__h)\
82+
83+ # Author: Matthew Gelhaus (mgelhaus@proaxis.com)
84+ # Printer: HP 880c
85+-$(DD)cdj880.dev : $(cdeskjet8_) $(DD)page.dev
86++$(DD)cdj880.dev : $(cdeskjet8_) $(DD)page.dev $(CONTDEV) \
87++ $(CONTRIB_MAK) $(MAKEDIRS)
88+ $(SETPDEV2) $(DD)cdj880 $(cdeskjet8_)
89+
90+
91+@@ -231,7 +236,7 @@ cdeskjet9_=$(DEVOBJ)gdevdj9.$(OBJ) $(HPPCL)
92+ # Author: Rene Harsch (rene@harsch.net)
93+ # Printer: HP 970Cxi
94+ $(DD)cdj970.dev : $(cdeskjet9_) $(DD)page.dev \
95+- $(CONTRIB_MAK) $(MAKEDIRS)
96++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
97+ $(SETPDEV2) $(DD)cdj970 $(cdeskjet9_)
98+
99+ $(DEVOBJ)gdevdj9.$(OBJ) : $(CONTRIBSRC)gdevdj9.c $(PDEVH) $(math__h) $(string__h)\
100+@@ -244,7 +249,7 @@ $(DEVOBJ)gdevdj9.$(OBJ) : $(CONTRIBSRC)gdevdj9.c $(PDEVH) $(math__h) $(string__h
101+ ### NOTE: Same as chp2200 (some PJL and CRD changes).
102+
103+ $(DD)cdnj500.dev : $(cdeskjet8_) $(DD)page.dev \
104+- $(CONTRIB_MAK) $(MAKEDIRS)
105++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
106+ $(SETPDEV2) $(DD)cdnj500 $(cdeskjet8_)
107+
108+
109+@@ -253,7 +258,7 @@ $(DD)cdnj500.dev : $(cdeskjet8_) $(DD)page.dev \
110+ ### NOTE: Depends on the presence of the cdj850 section.
111+
112+ $(DD)chp2200.dev : $(cdeskjet8_) $(DD)page.dev \
113+- $(CONTRIB_MAK) $(MAKEDIRS)
114++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
115+ $(SETPDEV2) $(DD)chp2200 $(cdeskjet8_)
116+
117+
118+@@ -264,11 +269,11 @@ $(DD)chp2200.dev : $(cdeskjet8_) $(DD)page.dev \
119+ GDIMONO=$(DEVOBJ)gdevgdi.$(OBJ) $(HPPCL)
120+
121+ $(DD)gdi.dev : $(GDIMONO) $(DD)page.dev \
122+- $(CONTRIB_MAK) $(MAKEDIRS)
123++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
124+ $(SETPDEV) $(DD)gdi $(GDIMONO)
125+
126+ $(DD)samsunggdi.dev : $(GDIMONO) $(DD)page.dev \
127+- $(CONTRIB_MAK) $(MAKEDIRS)
128++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
129+ $(SETPDEV) $(DD)samsunggdi $(GDIMONO)
130+
131+ $(DEVOBJ)gdevgdi.$(OBJ) : $(CONTRIBSRC)gdevgdi.c $(PDEVH) $(gdevpcl_h) \
132+@@ -282,17 +287,17 @@ $(DEVOBJ)gdevgdi.$(OBJ) : $(CONTRIBSRC)gdevgdi.c $(PDEVH) $(gdevpcl_h) \
133+
134+ hl1250_=$(DEVOBJ)gdevhl12.$(OBJ) $(HPDLJM)
135+ $(DD)hl1250.dev : $(hl1250_) $(DD)page.dev \
136+- $(CONTRIB_MAK) $(MAKEDIRS)
137++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
138+ $(SETPDEV) $(DD)hl1250 $(hl1250_)
139+
140+ $(DD)hl1240.dev : $(hl1250_) $(DD)page.dev \
141+- $(CONTRIB_MAK) $(MAKEDIRS)
142++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
143+ $(SETPDEV) $(DD)hl1240 $(hl1250_)
144+
145+ # Author: Marek Michalkiewicz <marekm@linux.org.pl>
146+ # Printer: Brother HL-1250 (may work with some other models too)
147+ $(DEVOBJ)gdevhl12.$(OBJ) : $(CONTRIBSRC)gdevhl12.c $(PDEVH) $(gdevdljm_h) \
148+- $(CONTRIB_MAK) $(MAKEDIRS)
149++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
150+ $(DEVCC) $(DEVO_)gdevhl12.$(OBJ) $(C_) $(CONTRIBSRC)gdevhl12.c
151+
152+
153+@@ -303,37 +308,37 @@ ln03_=$(DEVOBJ)gdevln03.$(OBJ)
154+ # Author: Ulrich Mueller (ulm@vsnhd1.cern.ch)
155+ # Printer: DEC LN03
156+ $(DD)ln03.dev : $(ln03_) $(DD)page.dev \
157+- $(CONTRIB_MAK) $(MAKEDIRS)
158++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
159+ $(SETPDEV) $(DD)ln03 $(ln03_)
160+
161+ # Author: Nick Brown (nick.brown@coe.int)
162+ # Printer: DEClaser 2100
163+ $(DD)dl2100.dev : $(ln03_) $(DD)page.dev \
164+- $(CONTRIB_MAK) $(MAKEDIRS)
165++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
166+ $(SETPDEV) $(DD)dl2100 $(ln03_)
167+
168+ # Author: Ian MacPhedran (macphed@dvinci.USask.CA)
169+ # Printer: DEC LA50
170+ $(DD)la50.dev : $(ln03_) $(DD)page.dev \
171+- $(CONTRIB_MAK) $(MAKEDIRS)
172++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
173+ $(SETPDEV) $(DD)la50 $(ln03_)
174+
175+ # Author: Bruce Lowekamp (lowekamp@csugrad.cs.vt.edu)
176+ # Printer: DEC LA70
177+ $(DD)la70.dev : $(ln03_) $(DD)page.dev \
178+- $(CONTRIB_MAK) $(MAKEDIRS)
179++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
180+ $(SETPDEV) $(DD)la70 $(ln03_)
181+
182+ # Author: Ian MacPhedran (macphed@dvinci.USask.CA)
183+ # Printer: DEC LA75
184+ $(DD)la75.dev : $(ln03_) $(DD)page.dev \
185+- $(CONTRIB_MAK) $(MAKEDIRS)
186++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
187+ $(SETPDEV) $(DD)la75 $(ln03_)
188+
189+ # Author: Andre' Beck (Andre_Beck@IRS.Inf.TU-Dresden.de)
190+ # Printer: DEC LA75plus
191+ $(DD)la75plus.dev : $(ln03_) $(DD)page.dev \
192+- $(CONTRIB_MAK) $(MAKEDIRS)
193++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
194+ $(SETPDEV) $(DD)la75plus $(ln03_)
195+
196+ $(DEVOBJ)gdevln03.$(OBJ) : $(CONTRIBSRC)gdevln03.c $(PDEVH) \
197+@@ -356,27 +361,27 @@ $(DEVOBJ)gdevescv.$(OBJ) : $(ESCV_SRC)gdevescv.c $(ESCV_SRC)gdevescv.h $(PDEVH)
198+ $(DEVCC) -DA4 $(DEVO_)gdevescv.$(OBJ) $(C_) $(escv_opts) $(ESCV_SRC)gdevescv.c
199+
200+ $(DD)alc1900.dev : $(escv_) $(DD)page.dev \
201+- $(CONTRIB_MAK) $(MAKEDIRS)
202++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
203+ $(SETPDEV) $(DD)alc1900 $(escv_)
204+
205+ $(DD)alc2000.dev : $(escv_) $(DD)page.dev \
206+- $(CONTRIB_MAK) $(MAKEDIRS)
207++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
208+ $(SETPDEV) $(DD)alc2000 $(escv_)
209+
210+ $(DD)alc4000.dev : $(escv_) $(DD)page.dev \
211+- $(CONTRIB_MAK) $(MAKEDIRS)
212++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
213+ $(SETPDEV) $(DD)alc4000 $(escv_)
214+
215+ $(DD)alc4100.dev : $(escv_) $(DD)page.dev \
216+- $(CONTRIB_MAK) $(MAKEDIRS)
217++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
218+ $(SETPDEV) $(DD)alc4100 $(escv_)
219+
220+ $(DD)alc8500.dev : $(escv_) $(DD)page.dev \
221+- $(CONTRIB_MAK) $(MAKEDIRS)
222++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
223+ $(SETPDEV) $(DD)alc8500 $(escv_)
224+
225+ $(DD)alc8600.dev : $(escv_) $(DD)page.dev \
226+- $(CONTRIB_MAK) $(MAKEDIRS)
227++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
228+ $(SETPDEV) $(DD)alc8600 $(escv_)
229+
230+ $(DD)alc9100.dev : $(escv_) $(DD)page.dev \
231+@@ -384,11 +389,11 @@ $(DD)alc9100.dev : $(escv_) $(DD)page.dev \
232+ $(SETPDEV) $(DD)alc9100 $(escv_)
233+
234+ $(DD)lp3000c.dev : $(escv_) $(DD)page.dev \
235+- $(CONTRIB_MAK) $(MAKEDIRS)
236++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
237+ $(SETPDEV) $(DD)lp3000c $(escv_)
238+
239+ $(DD)lp8000c.dev : $(escv_) $(DD)page.dev \
240+- $(CONTRIB_MAK) $(MAKEDIRS)
241++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
242+ $(SETPDEV) $(DD)lp8000c $(escv_)
243+
244+ $(DD)lp8200c.dev : $(escv_) $(DD)page.dev \
245+@@ -396,15 +401,15 @@ $(DD)lp8200c.dev : $(escv_) $(DD)page.dev \
246+ $(SETPDEV) $(DD)lp8200c $(escv_)
247+
248+ $(DD)lp8300c.dev : $(escv_) $(DD)page.dev \
249+- $(CONTRIB_MAK) $(MAKEDIRS)
250++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
251+ $(SETPDEV) $(DD)lp8300c $(escv_)
252+
253+ $(DD)lp8500c.dev : $(escv_) $(DD)page.dev \
254+- $(CONTRIB_MAK) $(MAKEDIRS)
255++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
256+ $(SETPDEV) $(DD)lp8500c $(escv_)
257+
258+ $(DD)lp8800c.dev : $(escv_) $(DD)page.dev \
259+- $(CONTRIB_MAK) $(MAKEDIRS)
260++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
261+ $(SETPDEV) $(DD)lp8800c $(escv_)
262+
263+ $(DD)lp9000c.dev : $(escv_) $(DD)page.dev \
264+@@ -412,177 +417,177 @@ $(DD)lp9000c.dev : $(escv_) $(DD)page.dev \
265+ $(SETPDEV) $(DD)lp9000c $(escv_)
266+
267+ $(DD)lp9200c.dev : $(escv_) $(DD)page.dev \
268+- $(CONTRIB_MAK) $(MAKEDIRS)
269++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
270+ $(SETPDEV) $(DD)lp9200c $(escv_)
271+
272+ $(DD)lp9500c.dev : $(escv_) $(DD)page.dev \
273+- $(CONTRIB_MAK) $(MAKEDIRS)
274++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
275+ $(SETPDEV) $(DD)lp9500c $(escv_)
276+
277+ $(DD)lp9800c.dev : $(escv_) $(DD)page.dev \
278+- $(CONTRIB_MAK) $(MAKEDIRS)
279++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
280+ $(SETPDEV) $(DD)lp9800c $(escv_)
281+
282+ $(DD)lps6500.dev : $(escv_) $(DD)page.dev \
283+- $(CONTRIB_MAK) $(MAKEDIRS)
284++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
285+ $(SETPDEV) $(DD)lps6500 $(escv_)
286+
287+ $(DD)epl2050.dev : $(escv_) $(DD)page.dev \
288+- $(CONTRIB_MAK) $(MAKEDIRS)
289++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
290+ $(SETPDEV) $(DD)epl2050 $(escv_)
291+
292+ $(DD)epl2050p.dev : $(escv_) $(DD)page.dev \
293+- $(CONTRIB_MAK) $(MAKEDIRS)
294++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
295+ $(SETPDEV) $(DD)epl2050p $(escv_)
296+
297+ $(DD)epl2120.dev : $(escv_) $(DD)page.dev \
298+- $(CONTRIB_MAK) $(MAKEDIRS)
299++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
300+ $(SETPDEV) $(DD)epl2120 $(escv_)
301+
302+ $(DD)epl2500.dev : $(escv_) $(DD)page.dev \
303+- $(CONTRIB_MAK) $(MAKEDIRS)
304++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
305+ $(SETPDEV) $(DD)epl2500 $(escv_)
306+
307+ $(DD)epl2750.dev : $(escv_) $(DD)page.dev \
308+- $(CONTRIB_MAK) $(MAKEDIRS)
309++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
310+ $(SETPDEV) $(DD)epl2750 $(escv_)
311+
312+ $(DD)epl5800.dev : $(escv_) $(DD)page.dev \
313+- $(CONTRIB_MAK) $(MAKEDIRS)
314++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
315+ $(SETPDEV) $(DD)epl5800 $(escv_)
316+
317+ $(DD)epl5900.dev : $(escv_) $(DD)page.dev \
318+- $(CONTRIB_MAK) $(MAKEDIRS)
319++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
320+ $(SETPDEV) $(DD)epl5900 $(escv_)
321+
322+ $(DD)epl6100.dev : $(escv_) $(DD)page.dev \
323+- $(CONTRIB_MAK) $(MAKEDIRS)
324++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
325+ $(SETPDEV) $(DD)epl6100 $(escv_)
326+
327+ $(DD)epl6200.dev : $(escv_) $(DD)page.dev \
328+- $(CONTRIB_MAK) $(MAKEDIRS)
329++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
330+ $(SETPDEV) $(DD)epl6200 $(escv_)
331+
332+ $(DD)lp1800.dev : $(escv_) $(DD)page.dev \
333+- $(CONTRIB_MAK) $(MAKEDIRS)
334++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
335+ $(SETPDEV) $(DD)lp1800 $(escv_)
336+
337+ $(DD)lp1900.dev : $(escv_) $(DD)page.dev \
338+- $(CONTRIB_MAK) $(MAKEDIRS)
339++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
340+ $(SETPDEV) $(DD)lp1900 $(escv_)
341+
342+ $(DD)lp2200.dev : $(escv_) $(DD)page.dev \
343+- $(CONTRIB_MAK) $(MAKEDIRS)
344++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
345+ $(SETPDEV) $(DD)lp2200 $(escv_)
346+
347+ $(DD)lp2400.dev : $(escv_) $(DD)page.dev \
348+- $(CONTRIB_MAK) $(MAKEDIRS)
349++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
350+ $(SETPDEV) $(DD)lp2400 $(escv_)
351+
352+ $(DD)lp2500.dev : $(escv_) $(DD)page.dev \
353+- $(CONTRIB_MAK) $(MAKEDIRS)
354++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
355+ $(SETPDEV) $(DD)lp2500 $(escv_)
356+
357+ $(DD)lp7500.dev : $(escv_) $(DD)page.dev \
358+- $(CONTRIB_MAK) $(MAKEDIRS)
359++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
360+ $(SETPDEV) $(DD)lp7500 $(escv_)
361+
362+ $(DD)lp7700.dev : $(escv_) $(DD)page.dev \
363+- $(CONTRIB_MAK) $(MAKEDIRS)
364++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
365+ $(SETPDEV) $(DD)lp7700 $(escv_)
366+
367+ $(DD)lp7900.dev : $(escv_) $(DD)page.dev \
368+- $(CONTRIB_MAK) $(MAKEDIRS)
369++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
370+ $(SETPDEV) $(DD)lp7900 $(escv_)
371+
372+ $(DD)lp8100.dev : $(escv_) $(DD)page.dev \
373+- $(CONTRIB_MAK) $(MAKEDIRS)
374++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
375+ $(SETPDEV) $(DD)lp8100 $(escv_)
376+
377+ $(DD)lp8300f.dev : $(escv_) $(DD)page.dev \
378+- $(CONTRIB_MAK) $(MAKEDIRS)
379++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
380+ $(SETPDEV) $(DD)lp8300f $(escv_)
381+
382+ $(DD)lp8400f.dev : $(escv_) $(DD)page.dev \
383+- $(CONTRIB_MAK) $(MAKEDIRS)
384++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
385+ $(SETPDEV) $(DD)lp8400f $(escv_)
386+
387+ $(DD)lp8600.dev : $(escv_) $(DD)page.dev \
388+- $(CONTRIB_MAK) $(MAKEDIRS)
389++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
390+ $(SETPDEV) $(DD)lp8600 $(escv_)
391+
392+ $(DD)lp8600f.dev : $(escv_) $(DD)page.dev \
393+- $(CONTRIB_MAK) $(MAKEDIRS)
394++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
395+ $(SETPDEV) $(DD)lp8600f $(escv_)
396+
397+ $(DD)lp8700.dev : $(escv_) $(DD)page.dev \
398+- $(CONTRIB_MAK) $(MAKEDIRS)
399++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
400+ $(SETPDEV) $(DD)lp8700 $(escv_)
401+
402+ $(DD)lp8900.dev : $(escv_) $(DD)page.dev \
403+- $(CONTRIB_MAK) $(MAKEDIRS)
404++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
405+ $(SETPDEV) $(DD)lp8900 $(escv_)
406+
407+ $(DD)lp9000b.dev : $(escv_) $(DD)page.dev \
408+- $(CONTRIB_MAK) $(MAKEDIRS)
409++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
410+ $(SETPDEV) $(DD)lp9000b $(escv_)
411+
412+ $(DD)lp9100.dev : $(escv_) $(DD)page.dev \
413+- $(CONTRIB_MAK) $(MAKEDIRS)
414++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
415+ $(SETPDEV) $(DD)lp9100 $(escv_)
416+
417+ $(DD)lp9200b.dev : $(escv_) $(DD)page.dev \
418+- $(CONTRIB_MAK) $(MAKEDIRS)
419++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
420+ $(SETPDEV) $(DD)lp9200b $(escv_)
421+
422+ $(DD)lp9300.dev : $(escv_) $(DD)page.dev \
423+- $(CONTRIB_MAK) $(MAKEDIRS)
424++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
425+ $(SETPDEV) $(DD)lp9300 $(escv_)
426+
427+ $(DD)lp9400.dev : $(escv_) $(DD)page.dev \
428+- $(CONTRIB_MAK) $(MAKEDIRS)
429++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
430+ $(SETPDEV) $(DD)lp9400 $(escv_)
431+
432+ $(DD)lp9600.dev : $(escv_) $(DD)page.dev \
433+- $(CONTRIB_MAK) $(MAKEDIRS)
434++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
435+ $(SETPDEV) $(DD)lp9600 $(escv_)
436+
437+ $(DD)lp9600s.dev : $(escv_) $(DD)page.dev \
438+- $(CONTRIB_MAK) $(MAKEDIRS)
439++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
440+ $(SETPDEV) $(DD)lp9600s $(escv_)
441+
442+ $(DD)lps4500.dev : $(escv_) $(DD)page.dev \
443+- $(CONTRIB_MAK) $(MAKEDIRS)
444++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
445+ $(SETPDEV) $(DD)lps4500 $(escv_)
446+
447+ $(DD)eplcolor.dev: $(escv_) $(DD)page.dev \
448+- $(CONTRIB_MAK) $(MAKEDIRS)
449++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
450+ $(SETPDEV) $(DD)eplcolor $(escv_)
451+
452+ $(DD)eplmono.dev: $(escv_) $(DD)page.dev \
453+- $(CONTRIB_MAK) $(MAKEDIRS)
454++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
455+ $(SETPDEV) $(DD)eplmono $(escv_)
456+
457+ # ------ The Lexmark 5700 and 7000 devices ------ #
458+
459+ lex7000_=$(DEVOBJ)gdevlx7.$(OBJ)
460+ $(DD)lex7000.dev : $(lex7000_) $(DD)page.dev \
461+- $(CONTRIB_MAK) $(MAKEDIRS)
462++ $(CONTDEV) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
463+ $(SETPDEV) $(DD)lex7000 $(lex7000_)
464+
465+ lex5700_=$(DEVOBJ)gdevlx7.$(OBJ)
466+ $(DD)lex5700.dev : $(lex5700_) $(DD)page.dev \
467+- $(CONTRIB_MAK) $(MAKEDIRS)
468++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
469+ $(SETPDEV) $(DD)lex5700 $(lex5700_)
470+
471+ lex3200_=$(DEVOBJ)gdevlx7.$(OBJ)
472+ $(DD)lex3200.dev : $(lex3200_) $(DD)page.dev \
473+- $(CONTRIB_MAK) $(MAKEDIRS)
474++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
475+ $(SETPDEV) $(DD)lex3200 $(lex3200_)
476+
477+ lex2050_=$(DEVOBJ)gdevlx7.$(OBJ)
478+ $(DD)lex2050.dev : $(lex2050_) $(DD)page.dev \
479+- $(CONTRIB_MAK) $(MAKEDIRS)
480++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
481+ $(SETPDEV) $(DD)lex2050 $(lex2050_)
482+
483+ $(DEVOBJ)gdevlx7.$(OBJ) : $(CONTRIBSRC)gdevlx7.c $(PDEVH) \
484+@@ -599,7 +604,7 @@ $(DEVOBJ)gdevlx32.$(OBJ) : $(CONTRIBSRC)gdevlx32.c $(PDEVH) $(gsparam_h) \
485+ $(DEVCC) $(DEVO_)gdevlx32.$(OBJ) $(C_) $(CONTRIBSRC)gdevlx32.c
486+
487+ $(DD)lxm3200.dev : $(lxm3200_) $(DD)page.dev \
488+- $(CONTRIB_MAK) $(MAKEDIRS)
489++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
490+ $(SETPDEV) $(DD)lxm3200 $(lxm3200_)
491+
492+
493+@@ -625,13 +630,13 @@ $(DEVOBJ)gdevlips.$(OBJ) : $(GX) $(LIPS_SRC)gdevlips.c $(std_h) \
494+ $(DEVCC) $(DEVO_)gdevlips.$(OBJ) $(LIPS_OPT) $(C_) $(LIPS_SRC)gdevlips.c
495+
496+ $(DD)lips4.dev : $(lipsr_) $(DD)page.dev \
497+- $(CONTRIB_MAK) $(MAKEDIRS)
498++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
499+ $(SETPDEV) $(DD)lips4 $(lipsr_)
500+
501+ lipsv_=$(DEVOBJ)gdevl4v.$(OBJ) $(DEVOBJ)gdevlips.$(OBJ)
502+
503+ $(DD)lips4v.dev : $(ECHOGS_XE) $(lipsv_) $(DD)vector.dev \
504+- $(CONTRIB_MAK) $(MAKEDIRS)
505++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
506+ $(SETDEV) $(DD)lips4v $(lipsv_)
507+ $(ADDMOD) $(DD)lips4v -include $(GLD)vector
508+
509+@@ -644,11 +649,11 @@ $(DEVOBJ)gdevl4v.$(OBJ) : $(LIPS_SRC)gdevl4v.c $(LIPS_SRC)gdevlips.h $(GDEV)\
510+ ### --------------- Some extra devices: lips2p, bjc880j ---------------- ###
511+
512+ $(DD)lips2p.dev : $(lipsr_) $(DD)page.dev \
513+- $(CONTRIB_MAK) $(MAKEDIRS)
514++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
515+ $(SETPDEV) $(DD)lips2p $(lipsr_)
516+
517+ $(DD)bjc880j.dev : $(lipsr_) $(DD)page.dev \
518+- $(CONTRIB_MAK) $(MAKEDIRS)
519++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
520+ $(SETPDEV) $(DD)bjc880j $(lipsr_)
521+
522+
523+@@ -657,15 +662,15 @@ $(DD)bjc880j.dev : $(lipsr_) $(DD)page.dev \
524+ md2k_=$(DEVOBJ)gdevmd2k.$(OBJ)
525+
526+ $(DD)md2k.dev : $(md2k_) $(DD)page.dev \
527+- $(CONTRIB_MAK) $(MAKEDIRS)
528++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
529+ $(SETPDEV) $(DD)md2k $(md2k_)
530+
531+ $(DD)md5k.dev : $(md2k_) $(DD)page.dev \
532+- $(CONTRIB_MAK) $(MAKEDIRS)
533++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
534+ $(SETPDEV) $(DD)md5k $(md2k_)
535+
536+ $(DEVOBJ)gdevmd2k.$(OBJ) : $(CONTRIBSRC)gdevmd2k.c $(PDEVH) $(gsparam_h) \
537+- $(CONTRIB_MAK) $(MAKEDIRS)
538++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
539+ $(DEVCC) $(DEVO_)gdevmd2k.$(OBJ) $(C_) $(CONTRIBSRC)gdevmd2k.c
540+
541+
542+@@ -673,7 +678,7 @@ $(DEVOBJ)gdevmd2k.$(OBJ) : $(CONTRIBSRC)gdevmd2k.c $(PDEVH) $(gsparam_h) \
543+
544+ oki4w_=$(DEVOBJ)gdevop4w.$(OBJ)
545+ $(DD)oki4w.dev : $(oki4w_) $(DD)page.dev \
546+- $(CONTRIB_MAK) $(MAKEDIRS)
547++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
548+ $(SETPDEV) $(DD)oki4w $(oki4w_)
549+
550+ # Author: Ivan Schreter (ivan@shadow.sk)
551+@@ -696,11 +701,11 @@ $(DEVOBJ)gdevopvp.$(OBJ) : $(OPVP_SRC)gdevopvp.c $(OPVP_SRC)opvp_common.h\
552+ $(DEVCC) $(DEVO_)gdevopvp.$(OBJ) $(OPVP_OPT) $(C_) $(OPVP_SRC)gdevopvp.c
553+
554+ $(DD)opvp.dev : $(opvp_) $(DD)page.dev \
555+- $(CONTRIB_MAK) $(MAKEDIRS)
556++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
557+ $(SETPDEV) $(DD)opvp $(opvp_)
558+
559+ $(DD)oprp.dev : $(opvp_) $(DD)page.dev \
560+- $(CONTRIB_MAK) $(MAKEDIRS)
561++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
562+ $(SETPDEV) $(DD)oprp $(opvp_)
563+
564+
565+@@ -877,78 +882,78 @@ $(DEVOBJ)pclcomp.$(OBJ) : $(pcl3_src)pclcomp.c $(pcl3_src)pclgen.h \
566+
567+ # The generic pcl3 device with selectable subdevices
568+ $(DD)pcl3.dev : $(pcl3_) $(DD)page.dev \
569+- $(CONTRIB_MAK) $(MAKEDIRS)
570++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
571+ $(SETPDEV) $(DD)pcl3 $(pcl3_)
572+
573+ # Fixed devices for specific printers
574+ $(DD)hpdjplus.dev : $(pcl3_) $(DD)page.dev \
575+- $(CONTRIB_MAK) $(MAKEDIRS)
576++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
577+ $(SETPDEV) $(DD)hpdjplus $(pcl3_)
578+ $(DD)hpdjportable.dev : $(pcl3_) $(DD)page.dev \
579+- $(CONTRIB_MAK) $(MAKEDIRS)
580++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
581+ $(SETPDEV) $(DD)hpdjportable $(pcl3_)
582+ $(DD)hpdj310.dev : $(pcl3_) $(DD)page.dev \
583+- $(CONTRIB_MAK) $(MAKEDIRS)
584++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
585+ $(SETPDEV) $(DD)hpdj310 $(pcl3_)
586+ $(DD)hpdj320.dev : $(pcl3_) $(DD)page.dev \
587+- $(CONTRIB_MAK) $(MAKEDIRS)
588++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
589+ $(SETPDEV) $(DD)hpdj320 $(pcl3_)
590+ $(DD)hpdj340.dev : $(pcl3_) $(DD)page.dev \
591+- $(CONTRIB_MAK) $(MAKEDIRS)
592++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
593+ $(SETPDEV) $(DD)hpdj340 $(pcl3_)
594+ $(DD)hpdj400.dev : $(pcl3_) $(DD)page.dev \
595+- $(CONTRIB_MAK) $(MAKEDIRS)
596++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
597+ $(SETPDEV) $(DD)hpdj400 $(pcl3_)
598+ $(DD)hpdj500.dev : $(pcl3_) $(DD)page.dev \
599+- $(CONTRIB_MAK) $(MAKEDIRS)
600++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
601+ $(SETPDEV) $(DD)hpdj500 $(pcl3_)
602+ $(DD)hpdj500c.dev : $(pcl3_) $(DD)page.dev \
603+- $(CONTRIB_MAK) $(MAKEDIRS)
604++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
605+ $(SETPDEV) $(DD)hpdj500c $(pcl3_)
606+ $(DD)hpdj510.dev : $(pcl3_) $(DD)page.dev \
607+- $(CONTRIB_MAK) $(MAKEDIRS)
608++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
609+ $(SETPDEV) $(DD)hpdj510 $(pcl3_)
610+ $(DD)hpdj520.dev : $(pcl3_) $(DD)page.dev \
611+- $(CONTRIB_MAK) $(MAKEDIRS)
612++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
613+ $(SETPDEV) $(DD)hpdj520 $(pcl3_)
614+ $(DD)hpdj540.dev : $(pcl3_) $(DD)page.dev \
615+- $(CONTRIB_MAK) $(MAKEDIRS)
616++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
617+ $(SETPDEV) $(DD)hpdj540 $(pcl3_)
618+ $(DD)hpdj550c.dev : $(pcl3_) $(DD)page.dev \
619+- $(CONTRIB_MAK) $(MAKEDIRS)
620++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
621+ $(SETPDEV) $(DD)hpdj550c $(pcl3_)
622+ $(DD)hpdj560c.dev : $(pcl3_) $(DD)page.dev \
623+- $(CONTRIB_MAK) $(MAKEDIRS)
624++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
625+ $(SETPDEV) $(DD)hpdj560c $(pcl3_)
626+ $(DD)hpdj600.dev : $(pcl3_) $(DD)page.dev \
627+- $(CONTRIB_MAK) $(MAKEDIRS)
628++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
629+ $(SETPDEV) $(DD)hpdj600 $(pcl3_)
630+ $(DD)hpdj660c.dev : $(pcl3_) $(DD)page.dev \
631+- $(CONTRIB_MAK) $(MAKEDIRS)
632++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
633+ $(SETPDEV) $(DD)hpdj660c $(pcl3_)
634+ $(DD)hpdj670c.dev : $(pcl3_) $(DD)page.dev \
635+- $(CONTRIB_MAK) $(MAKEDIRS)
636++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
637+ $(SETPDEV) $(DD)hpdj670c $(pcl3_)
638+ $(DD)hpdj680c.dev : $(pcl3_) $(DD)page.dev \
639+- $(CONTRIB_MAK) $(MAKEDIRS)
640++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
641+ $(SETPDEV) $(DD)hpdj680c $(pcl3_)
642+ $(DD)hpdj690c.dev : $(pcl3_) $(DD)page.dev \
643+- $(CONTRIB_MAK) $(MAKEDIRS)
644++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
645+ $(SETPDEV) $(DD)hpdj690c $(pcl3_)
646+ $(DD)hpdj850c.dev : $(pcl3_) $(DD)page.dev \
647+- $(CONTRIB_MAK) $(MAKEDIRS)
648++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
649+ $(SETPDEV) $(DD)hpdj850c $(pcl3_)
650+ $(DD)hpdj855c.dev : $(pcl3_) $(DD)page.dev \
651+- $(CONTRIB_MAK) $(MAKEDIRS)
652++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
653+ $(SETPDEV) $(DD)hpdj855c $(pcl3_)
654+ $(DD)hpdj870c.dev : $(pcl3_) $(DD)page.dev \
655+- $(CONTRIB_MAK) $(MAKEDIRS)
656++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
657+ $(SETPDEV) $(DD)hpdj870c $(pcl3_)
658+ $(DD)hpdj890c.dev : $(pcl3_) $(DD)page.dev \
659+- $(CONTRIB_MAK) $(MAKEDIRS)
660++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
661+ $(SETPDEV) $(DD)hpdj890c $(pcl3_)
662+ $(DD)hpdj1120c.dev : $(pcl3_) $(DD)page.dev \
663+- $(CONTRIB_MAK) $(MAKEDIRS)
664++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
665+ $(SETPDEV) $(DD)hpdj1120c $(pcl3_)
666+
667+ #------------------------------------------------------------------------------
668+@@ -985,7 +990,7 @@ pcl3-install:
669+
670+ xes_=$(DEVOBJ)gdevxes.$(OBJ)
671+ $(DD)xes.dev : $(xes_) $(DD)page.dev \
672+- $(CONTRIB_MAK) $(MAKEDIRS)
673++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
674+ $(SETPDEV) $(DD)xes $(xes_)
675+
676+ # Author: Peter Flass (flass@lbdrscs.bitnet)
677+@@ -1005,16 +1010,16 @@ JAPSRC=$(JAPDIR)$(D)
678+
679+ pr201_=$(DEVOBJ)gdevp201.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ)
680+
681+-$(DD)pr201.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS)
682++$(DD)pr201.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
683+ $(SETPDEV) $(DD)pr201 $(pr201_)
684+
685+-$(DD)pr150.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS)
686++$(DD)pr150.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
687+ $(SETPDEV) $(DD)pr150 $(pr201_)
688+
689+-$(DD)pr1000.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS)
690++$(DD)pr1000.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
691+ $(SETPDEV) $(DD)pr1000 $(pr201_)
692+
693+-$(DD)pr1000_4.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS)
694++$(DD)pr1000_4.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
695+ $(SETPDEV) $(DD)pr1000_4 $(pr201_)
696+
697+ $(DEVOBJ)gdevp201.$(OBJ) : $(JAPSRC)gdevp201.c $(PDEVH) \
698+@@ -1025,7 +1030,7 @@ $(DEVOBJ)gdevp201.$(OBJ) : $(JAPSRC)gdevp201.c $(PDEVH) \
699+
700+ jj100_=$(DEVOBJ)gdevj100.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ)
701+
702+-$(DD)jj100.dev : $(jj100_) $(CONTRIB_MAK) $(MAKEDIRS)
703++$(DD)jj100.dev : $(jj100_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
704+ $(SETPDEV) $(DD)jj100 $(jj100_)
705+
706+ $(DEVOBJ)gdevj100.$(OBJ) : $(JAPSRC)gdevj100.c $(PDEVH) \
707+@@ -1037,11 +1042,11 @@ $(DEVOBJ)gdevj100.$(OBJ) : $(JAPSRC)gdevj100.c $(PDEVH) \
708+ bj10v_=$(DEVOBJ)gdev10v.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ)
709+
710+ $(DD)bj10v.dev : $(bj10v_) \
711+- $(CONTRIB_MAK) $(MAKEDIRS)
712++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
713+ $(SETPDEV) $(DD)bj10v $(bj10v_)
714+
715+ $(DD)bj10vh.dev : $(bj10v_) \
716+- $(CONTRIB_MAK) $(MAKEDIRS)
717++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
718+ $(SETPDEV) $(DD)bj10vh $(bj10v_)
719+
720+ # Uncomment the following line if you are using MS-DOS on PC9801 series.
721+@@ -1056,7 +1061,7 @@ $(DEVOBJ)gdev10v.$(OBJ) : $(JAPSRC)gdev10v.c $(PDEVH) \
722+ dmprt_=$(DEVOBJ)gdevdmpr.$(OBJ) $(DEVOBJ)dviprlib.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ)
723+
724+ $(DD)dmprt.dev : $(dmprt_) $(DD)page.dev \
725+- $(CONTRIB_MAK) $(MAKEDIRS)
726++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
727+ $(SETDEV) $(DD)dmprt $(dmprt_)
728+ $(ADDMOD) $(DD)dmprt -ps dmp_init
729+
730+@@ -1086,19 +1091,19 @@ $(DEVOBJ)gdevmjc.$(OBJ) : $(JAPSRC)gdevmjc.c $(JAPSRC)gdevmjc.h $(PDEVH) $(gdevp
731+ $(DEVCC) -DA4 $(DEVO_)gdevmjc.$(OBJ) $(C_) $(JAPSRC)gdevmjc.c
732+
733+ $(DD)mj700v2c.dev : $(mj700v2c_) $(DD)page.dev \
734+- $(CONTRIB_MAK) $(MAKEDIRS)
735++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
736+ $(SETPDEV) $(DD)mj700v2c $(mj700v2c_)
737+
738+ $(DD)mj500c.dev : $(mj700v2c_) $(DD)page.dev \
739+- $(CONTRIB_MAK) $(MAKEDIRS)
740++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
741+ $(SETPDEV) $(DD)mj500c $(mj700v2c_)
742+
743+ $(DD)mj6000c.dev : $(mj700v2c_) $(DD)page.dev \
744+- $(CONTRIB_MAK) $(MAKEDIRS)
745++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
746+ $(SETPDEV) $(DD)mj6000c $(mj700v2c_)
747+
748+ $(DD)mj8000c.dev : $(mj700v2c_) $(DD)page.dev \
749+- $(CONTRIB_MAK) $(MAKEDIRS)
750++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
751+ $(SETPDEV) $(DD)mj8000c $(mj700v2c_)
752+
753+ ### ----------------- The Fujitsu FMPR printer device ----------------- ###
754+@@ -1106,7 +1111,7 @@ $(DD)mj8000c.dev : $(mj700v2c_) $(DD)page.dev \
755+ fmpr_=$(DEVOBJ)gdevfmpr.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ)
756+
757+ $(DD)fmpr.dev : $(fmpr_) $(DD)page.dev \
758+- $(CONTRIB_MAK) $(MAKEDIRS)
759++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
760+ $(SETPDEV) $(DD)fmpr $(fmpr_)
761+
762+ $(DEVOBJ)gdevfmpr.$(OBJ) : $(JAPSRC)gdevfmpr.c $(PDEVH) \
763+@@ -1118,7 +1123,7 @@ $(DEVOBJ)gdevfmpr.$(OBJ) : $(JAPSRC)gdevfmpr.c $(PDEVH) \
764+ fmlbp_=$(DEVOBJ)gdevfmlbp.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ)
765+
766+ $(DD)fmlbp.dev : $(fmlbp_) $(DD)page.dev \
767+- $(CONTRIB_MAK) $(MAKEDIRS)
768++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
769+ $(SETPDEV) $(DD)fmlbp $(fmlbp_)
770+
771+ $(DEVOBJ)gdevfmlbp.$(OBJ) : $(JAPSRC)gdevfmlbp.c $(PDEVH) \
772+@@ -1135,7 +1140,7 @@ $(DEVOBJ)gdevfmlbp.$(OBJ) : $(JAPSRC)gdevfmlbp.c $(PDEVH) \
773+ ml6_=$(DEVOBJ)gdevml6.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ)
774+
775+ $(DD)ml600.dev : $(ml6_) $(DD)page.dev \
776+- $(CONTRIB_MAK) $(MAKEDIRS)
777++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
778+ $(SETPDEV) $(DD)ml600 $(ml6_)
779+
780+ $(DEVOBJ)gdevml6.$(OBJ) : $(JAPSRC)gdevml6.c $(PDEVH) \
781+@@ -1148,11 +1153,11 @@ $(DEVOBJ)gdevml6.$(OBJ) : $(JAPSRC)gdevml6.c $(PDEVH) \
782+ lbp3x0_=$(DEVOBJ)gdevlbp3.$(OBJ)
783+
784+ $(DD)lbp310.dev :$(lbp3x0_) $(DD)page.dev \
785+- $(CONTRIB_MAK) $(MAKEDIRS)
786++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
787+ $(SETPDEV) $(DD)lbp310 $(lbp3x0_)
788+
789+ $(DD)lbp320.dev :$(lbp3x0_) $(DD)page.dev \
790+- $(CONTRIB_MAK) $(MAKEDIRS)
791++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
792+ $(SETPDEV) $(DD)lbp320 $(lbp3x0_)
793+
794+ $(DEVOBJ)gdevlbp3.$(OBJ) : $(JAPSRC)gdevlbp3.c $(PDEVH)
795+@@ -1167,7 +1172,7 @@ $(DEVOBJ)gdevnpdl.$(OBJ) : $(JAPSRC)gdevnpdl.c $(LIPS_SRC)gdevlprn.h $(PDEVH) \
796+ $(DEVCC) -DA4 $(DEVO_)gdevnpdl.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevnpdl.c
797+
798+ $(DD)npdl.dev : $(npdl_) $(DD)page.dev \
799+- $(CONTRIB_MAK) $(MAKEDIRS)
800++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
801+ $(SETPDEV) $(DD)npdl $(npdl_)
802+
803+ ### ------- EPSON ESC/Page printer device ----------------- ###
804+@@ -1179,11 +1184,11 @@ $(DEVOBJ)gdevespg.$(OBJ) : $(JAPSRC)gdevespg.c $(LIPS_SRC)gdevlprn.h $(PDEVH) \
805+ $(DEVCC) -DA4 $(DEVO_)gdevespg.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevespg.c
806+
807+ $(DD)escpage.dev : $(escpage_) $(DD)page.dev \
808+- $(CONTRIB_MAK) $(MAKEDIRS)
809++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
810+ $(SETPDEV) $(DD)escpage $(escpage_)
811+
812+ $(DD)lp2000.dev : $(escpage_) $(DD)page.dev \
813+- $(CONTRIB_MAK) $(MAKEDIRS)
814++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
815+ $(SETPDEV) $(DD)lp2000 $(escpage_)
816+
817+ ### --- The RICOH RPDL language printer device ------ ###
818+@@ -1194,7 +1199,7 @@ $(DEVOBJ)gdevrpdl.$(OBJ) : $(JAPSRC)gdevrpdl.c $(LIPS_SRC)gdevlprn.h $(PDEVH) \
819+ $(DEVCC) $(DEVO_)gdevrpdl.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevrpdl.c
820+
821+ $(DD)rpdl.dev : $(rpdl_) $(DD)page.dev \
822+- $(CONTRIB_MAK) $(MAKEDIRS)
823++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
824+ $(SETPDEV) $(DD)rpdl $(rpdl_)
825+
826+ ### ---------- RICOH RPDL IV(600dpi) printer devices ---------- ###
827+@@ -1204,11 +1209,11 @@ $(DD)rpdl.dev : $(rpdl_) $(DD)page.dev \
828+ # $(DEVCC) $(DEVO_)gdevrpdl.$(OBJ) $(C_) $(JAPSRC)gdevrpdl.c
829+ #
830+ #$(DD)nx100f.dev : $(rpdl_) $(DD)page.dev \
831+- $(CONTRIB_MAK) $(MAKEDIRS)
832++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
833+ # $(SETPDEV2) $(DD)nx100f $(rpdl_)
834+ #
835+ #$(DD)nx100v.dev : $(rpdl_) $(DD)page.dev \
836+- $(CONTRIB_MAK) $(MAKEDIRS)
837++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
838+ # $(SETPDEV2) $(DD)nx100v $(rpdl_)
839+
840+ ### ------------ The ALPS Micro Dry printer devices ------------ ###
841+@@ -1216,15 +1221,15 @@ $(DD)rpdl.dev : $(rpdl_) $(DD)page.dev \
842+ alps_=$(DEVOBJ)gdevalps.$(OBJ)
843+
844+ $(DD)md50Mono.dev : $(alps_) $(DD)page.dev \
845+- $(CONTRIB_MAK) $(MAKEDIRS)
846++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
847+ $(SETPDEV) $(DD)md50Mono $(alps_)
848+
849+ $(DD)md50Eco.dev : $(alps_) $(DD)page.dev \
850+- $(CONTRIB_MAK) $(MAKEDIRS)
851++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
852+ $(SETPDEV) $(DD)md50Eco $(alps_)
853+
854+ $(DD)md1xMono.dev : $(alps_) $(DD)page.dev \
855+- $(CONTRIB_MAK) $(MAKEDIRS)
856++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
857+ $(SETPDEV) $(DD)md1xMono $(alps_)
858+
859+ $(DEVOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH) \
860+--
861+2.26.2
862+
pkgs/misc/ghostscript/default.nix+3
@@ -52,6 +52,9 @@ stdenv.mkDerivation rec {
5252 url = "https://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=485904772c5f0aa1140032746e5a0abfc40f4cef";
5353 sha256 = "0z5gnvgpp0dlzgvpw9a1yan7qyycv3mf88l93fvb1kyay893rshp";
5454 })
55+ # rebased version of upstream http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=1b4c3669a20c,
56+ # Remove on update to version > 9.52
57+ ./0001-Bug-702364-Fix-missing-echogs-dependencies.patch
5558 ];
5659
5760 outputs = [ "out" "man" "doc" ];
pkgs/shells/bash/bash-completion/default.nix+5−1
@@ -30,6 +30,10 @@ stdenv.mkDerivation rec {
3030 python3Packages.pexpect
3131 python3Packages.pytest
3232 bashInteractive
33+
34+ # use xdist to speed up the test run, just like upstream:
35+ # https://github.com/scop/bash-completion/blob/009bf2228c68894629eb6fd17b3dc0f1f6d67615/test/requirements.txt#L4
36+ python3Packages.pytest_xdist
3337 ];
3438
3539 # - ignore test_gcc on ARM because it assumes -march=native
@@ -40,7 +44,7 @@ stdenv.mkDerivation rec {
4044 # - ignore test_ls because impure logic
4145 # - ignore test_screen because it assumes vt terminals exist
4246 checkPhase = ''
43− pytest . \
47+ pytest -n $NIX_BUILD_CORES . \
4448 ${stdenv.lib.optionalString (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) "--ignore=test/t/test_gcc.py"} \
4549 --ignore=test/t/test_chsh.py \
4650 --ignore=test/t/test_ether_wake.py \
pkgs/top-level/all-packages.nix+1−1
@@ -14048,7 +14048,7 @@ in
1404814048 python = python37;
1404914049 };
1405014050
14051− protobuf = protobuf3_7;
14051+ protobuf = protobuf3_8;
1405214052
1405314053 protobuf3_11 = callPackage ../development/libraries/protobuf/3.11.nix { };
1405414054 protobuf3_10 = callPackage ../development/libraries/protobuf/3.10.nix { };