Unverified Commit 1ab1a748 authored by Jan Tojnar's avatar Jan Tojnar Committed by GitHub
Browse files

gimp: 3.0.4 -> 3.0.6 (#459702)

parents 96dd2068 0a80dadf

pkgs/applications/graphics/gimp/default.nix

+11 −11
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
  vala,

  gi-docgen,

  perl,

  appstream-glib,

  appstream,

  desktop-file-utils,

  xorg,

  glib-networking,
@@ -79,7 +79,7 @@ let 
in

stdenv.mkDerivation (finalAttrs: {

  pname = "gimp";

  version = "3.0.4";

  version = "3.0.6";



  outputs = [

    "out"
@@ -90,10 +90,17 @@ stdenv.mkDerivation (finalAttrs: { 


  src = fetchurl {

    url = "https://download.gimp.org/gimp/v${lib.versions.majorMinor finalAttrs.version}/gimp-${finalAttrs.version}.tar.xz";

    hash = "sha256-jKouwnW/CTJldWVKwnavwIP4SR58ykXRnPKeaWrsqyU=";

    hash = "sha256-JGwiU4PHLvnw3HcDt9cHCEu/F3vSkA6UzkZqYoYuKWs=";

  };



  patches = [

    # https://gitlab.gnome.org/GNOME/gimp/-/issues/15257

    (fetchpatch {

      name = "fix-gegl-bevel-test.patch";

      url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/2fd12847496a9a242ca8edc448d400d3660b8009.patch";

      hash = "sha256-pjOjyzZxxl+zRqThXBwCBfYHdGhgaMI/IMKaL3XGAMs=";

    })



    # to remove compiler from the runtime closure, reference was retained via

    # gimp --version --verbose output

    (replaceVars ./remove-cc-reference.patch {
@@ -113,13 +120,6 @@ stdenv.mkDerivation (finalAttrs: { 
    (replaceVars ./tests-dbus-conf.patch {

      session_conf = "${dbus.out}/share/dbus-1/session.conf";

    })



    # Fix a crash that occurs when trying to pick a color for text outline

    # TODO: remove after GIMP 3.2 is released, per https://gitlab.gnome.org/GNOME/gimp/-/issues/14047#note_2491655

    (fetchpatch {

      url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/1685c86af5d6253151d0056a9677ba469ea10164.diff";

      hash = "sha256-Rb3ANXWki21thByEIWkBgWEml4x9Qq2HAIB9ho1bygw=";

    })

  ];



  nativeBuildInputs = [
@@ -148,7 +148,7 @@ stdenv.mkDerivation (finalAttrs: { 
  ];



  buildInputs = [

    appstream-glib # for library

    appstream # for library

    babl

    cfitsio

    gegl

pkgs/applications/graphics/gimp/tests-dbus-conf.patch

+2 −2
Original line number Diff line number Diff line 
--- a/build/meson/run_test_env.sh

+++ b/build/meson/run_test_env.sh

--- a/tools/run_test_env.sh

+++ b/tools/run_test_env.sh

@@ -33,7 +33,7 @@ if [ -n "${UI_TEST}" ]; then

     OPT="--auto-servernum"

   fi