public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gimp: 2.10.14 → 2.10.16

Browse Source 
https://gitlab.gnome.org/GNOME/gimp/blob/GIMP_2_10_16/NEWS#L11-211
This commit is contained in:
Jan Tojnar 2020-02-21 12:02:55 +01:00
parent abacc68138
commit 75132e6eb5
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/graphics/gimp/default.nix
View File

@ -50,13 +50,13 @@ let
inherit (python2Packages) pygtk wrapPython python; inherit (python2Packages) pygtk wrapPython python;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "gimp"; pname = "gimp";
version = "2.10.14"; version = "2.10.16";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
src = fetchurl { src = fetchurl {
url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "0m6wdnfvsxyhimdd4v3351g4r1fklllnbipbwcfym3h7q88hz6yz"; sha256 = "1sybf1yilw272lr8qbyx3zbvysf5rc89gk80gd4aj4xr6jazxyfb";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -155,6 +155,7 @@ in stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--without-webkit" # old version is required "--without-webkit" # old version is required
"--disable-check-update"
"--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new" "--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new"
"--with-icc-directory=/run/current-system/sw/share/color/icc" "--with-icc-directory=/run/current-system/sw/share/color/icc"
# fix libdir in pc files (${exec_prefix} needs to be passed verbatim) # fix libdir in pc files (${exec_prefix} needs to be passed verbatim)

16
pkgs/applications/graphics/gimp/remove-cc-reference.patch
View File

@ -1,13 +1,15 @@
diff --git a/app/gimp-version.c b/app/gimp-version.c diff --git a/app/gimp-version.c b/app/gimp-version.c
index 12605c6..a9083da 100644 index 0f7bfb9bf9..1679624b8e 100644
--- a/app/gimp-version.c --- a/app/gimp-version.c
+++ b/app/gimp-version.c +++ b/app/gimp-version.c
@@ -203,7 +203,7 @@ gimp_version (gboolean be_verbose, @@ -228,9 +228,9 @@
lib_versions = gimp_library_versions (localized); "# Libraries #\n%s",
verbose_info = g_strdup_printf ("git-describe: %s\n" GIMP_GIT_VERSION,
"C compiler:\n%s\n%s", GIMP_BUILD_ID,
- GIMP_GIT_VERSION, CC_VERSION, gimp_version_get_revision (),
+ GIMP_GIT_VERSION, "@cc_version@", GIMP_BUILD_PLATFORM,
- CC_VERSION,
+ "@cc_version@",
lib_versions); lib_versions);
g_free (lib_versions); g_free (lib_versions);