From 02b966ab9271999b0333f60f7095aebffa813b0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 7 Oct 2019 05:51:32 +0000 Subject: [PATCH 1/8] =?UTF-8?q?glib:=202.62.0=20=E2=86=92=202.62.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/glib/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index bbe503a67f3..4f8b289b084 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -48,21 +48,15 @@ in stdenv.mkDerivation rec { pname = "glib"; - version = "2.62.0"; + version = "2.62.1"; src = fetchurl { url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "046sqfmr84blxh4vkipmh8ff7wd19fxmh6lnr5ibchx3l02p49bc"; + sha256 = "1pzrw2x9r0kyghrvwdbx3nqn2wcrrxy962f5gbdacwh83m705n9x"; }; patches = optionals stdenv.isDarwin [ ./darwin-compilation.patch - # fix loading dylibs on darwin - # Remove on 2.62.1 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/glib/commit/e2409e5e180f1fa369d0e87e38e4d646d9f68791.patch"; - sha256 = "1dhjwlsqdgnn8fr8pzfrnd63m7pdgf7mizdyn8lwg17ggvq6qsqf"; - }) ] ++ optionals stdenv.hostPlatform.isMusl [ ./quark_init_on_demand.patch ./gobject_init_on_demand.patch From f0b89403c475a5355e1a833561d96cc2ac1e3d6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 7 Oct 2019 05:51:33 +0000 Subject: [PATCH 2/8] =?UTF-8?q?glib-networking:=202.62.0=20=E2=86=92=202.6?= =?UTF-8?q?2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/glib-networking/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index ad3b77c1bc6..a571fffebf0 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.62.0"; + version = "2.62.1"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1p7vgav0g03r00qiafhrdiad2gh1w6wsd1a7nnn79psng5gnh8ck"; + sha256 = "043imcynl3rwdz79wvpdfhkmqmgdhr34z0vac3x7jymdf5kswm9w"; }; patches = [ From 88273d47687b36bcf78e3ac67aa09224e1d015eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 7 Oct 2019 05:52:19 +0000 Subject: [PATCH 3/8] =?UTF-8?q?gtk3:=203.24.11=20=E2=86=92=203.24.12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/gtk/3.x.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index d05c2aa57e5..4a7cf07d2e6 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -44,7 +44,7 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "gtk+3"; - version = "3.24.11"; + version = "3.24.12"; outputs = [ "out" "dev" ]; outputBin = "dev"; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "1598k357xvffbswsrvc63lyj73wq0b510lhg4vcgl6rf1a6nb9yv"; + sha256 = "10xyyhlfb0yk4hglngxh2zsv9xrxkqv343df8h01dvagc6jyp10k"; }; patches = [ @@ -68,12 +68,6 @@ stdenv.mkDerivation rec { }) # https://gitlab.gnome.org/GNOME/gtk/merge_requests/1002 ./01-build-Fix-path-handling-in-pkgconfig.patch - # 3.32.11 had wrong version in .pc - # drop in next release - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gtk/commit/70c4b66d99f66b9da27ded63f2c26e3c13ce07f8.patch"; - sha256 = "0nkc3y85wp5sn8xbr7c5zcpn9gsd5zcmdhjqwpmq54jwmg07fk52"; - }) ] ++ optionals stdenv.isDarwin [ # X11 module requires which is not installed on Darwin # let’s drop that dependency in similar way to how other parts of the library do it From e3ccf11fca6c93b0c0b59d62198b3c5e6cce154d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 7 Oct 2019 17:49:05 +0000 Subject: [PATCH 4/8] =?UTF-8?q?librsvg:=202.46.0=20=E2=86=92=202.46.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/librsvg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 54aed7b4fed..e54098b4459 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -4,14 +4,14 @@ let pname = "librsvg"; - version = "2.46.0"; + version = "2.46.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1la3az2af2ccm6rp86b6wh0kq7kxzl4n8pli5qxhyic1rd91xj4n"; + sha256 = "0hvnqrgfi8c2xh94gxs6xwwg1m2z3l0lblqs2anlx8k3g9ag589d"; }; outputs = [ "out" "dev" "installedTests" ]; From f8ae755433b0bad2b7b09e9bf60c17ae77da4907 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sat, 12 Oct 2019 11:07:31 +0200 Subject: [PATCH 5/8] libsoup: 2.68.1 -> 2.68.2 --- pkgs/development/libraries/libsoup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index fae1581c87a..7c4772c9cf1 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "libsoup"; - version = "2.68.1"; + version = "2.68.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "13dz7x092yswdidj69hadzqfyv6cyfnjbzidjym7nycf7gjj60vz"; + sha256 = "0crr9qprmacr626fx83cx81ggk85zsgxr4mn577kpzj6m40k1bai"; }; postPatch = '' From 6f1deb7d45d6e2b790e94d3d171f6a7e88adbbf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sat, 12 Oct 2019 11:11:46 +0200 Subject: [PATCH 6/8] gdk-pixbuf: 2.38.2 -> 2.46.0 --- pkgs/development/libraries/gdk-pixbuf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 86d89d6eef5..4cf28b7dbee 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -4,13 +4,13 @@ let pname = "gdk-pixbuf"; - version = "2.38.2"; + version = "2.40.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "10875lywkabh6nm2rgf0vxqn39h34b72kcbh63fp77fqq0g6bykk"; + sha256 = "1rnlx9yfw970maxi2x6niaxmih5la11q1ilr7gzshz2kk585k0hm"; }; patches = [ From f03b26c1345fbc32834249ccfa5abe4f7d5fa8d1 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 12 Oct 2019 17:25:59 -0400 Subject: [PATCH 7/8] gtk-doc: 1.30 -> 1.32 Drop patch for "Wrong permissions for style CSS file". It was fixed in 1.31 https://gitlab.gnome.org/GNOME/gtk-doc/blob/GTK_DOC_1_32/NEWS --- ...ghlight-fix-permission-on-file-style.patch | 24 ------------------- .../tools/documentation/gtk-doc/default.nix | 19 ++++++++++----- 2 files changed, 13 insertions(+), 30 deletions(-) delete mode 100644 pkgs/development/tools/documentation/gtk-doc/0001-highlight-fix-permission-on-file-style.patch diff --git a/pkgs/development/tools/documentation/gtk-doc/0001-highlight-fix-permission-on-file-style.patch b/pkgs/development/tools/documentation/gtk-doc/0001-highlight-fix-permission-on-file-style.patch deleted file mode 100644 index f7e37a1a5e5..00000000000 --- a/pkgs/development/tools/documentation/gtk-doc/0001-highlight-fix-permission-on-file-style.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 95a75c95c5c4e641ce7cda0ded968d66f07f822a Mon Sep 17 00:00:00 2001 -From: worldofpeace -Date: Sat, 18 May 2019 14:44:08 -0400 -Subject: [PATCH] highlight: fix permission on file style - ---- - gtkdoc/highlight.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gtkdoc/highlight.py b/gtkdoc/highlight.py -index 8f6e470..d11c432 100644 ---- a/gtkdoc/highlight.py -+++ b/gtkdoc/highlight.py -@@ -47,6 +47,6 @@ def highlight_code(code, lang='c'): - - - def append_style_defs(css_file_name): -- os.chmod(css_file_name, stat.S_IWRITE) -+ os.chmod(css_file_name, 0o664) - with open(css_file_name, 'at', newline='\n', encoding='utf-8') as css: - css.write(HTML_FORMATTER.get_style_defs()) --- -2.21.0 - diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index 7792d14775c..8898eaa272a 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -13,22 +13,29 @@ , withDblatex ? false, dblatex }: +let + + # Needed for https://gitlab.gnome.org/GNOME/gtk-doc/blob/GTK_DOC_1_32/meson.build#L42 + python = python3.withPackages (p: with p; [ + pygments + ]); + +in + stdenv.mkDerivation rec { pname = "gtk-doc"; - version = "1.30"; + version = "1.32"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; rev = "GTK_DOC_${stdenv.lib.replaceStrings ["."] ["_"] version }"; - sha256 = "05lr6apj3pd3s59a7k6p45k9ywwrp577ra4pvkhxvb5p7v90c2fi"; + sha256 = "14fihxj662gg4ln1ngff6s52zzkpbcc58qa0nxysxypnhp0h4ypk"; }; patches = [ passthru.respect_xml_catalog_files_var_patch - # https://gitlab.gnome.org/GNOME/gtk-doc/issues/84 - ./0001-highlight-fix-permission-on-file-style.patch ]; outputDevdoc = "out"; @@ -44,7 +51,7 @@ stdenv.mkDerivation rec { docbook_xsl libxslt pkgconfig - python3 + python libxml2Python ] ++ stdenv.lib.optional withDblatex dblatex @@ -77,6 +84,6 @@ stdenv.mkDerivation rec { description = "Tools to extract documentation embedded in GTK and GNOME source code"; homepage = "https://www.gtk.org/gtk-doc"; license = licenses.gpl2; - maintainers = with maintainers; [ pSub ]; + maintainers = with maintainers; [ pSub worldofpeace ]; }; } From 082b0b2619e7e6bae609d200dd398eabb02eccb8 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 13 Oct 2019 14:40:24 -0400 Subject: [PATCH 8/8] gtk: reorganize This directory was mess of patches and hooks. Have a patches dir and a setup-hooks dir. --- pkgs/development/libraries/gtk/2.x.nix | 10 +++++----- pkgs/development/libraries/gtk/3.x.nix | 10 +++++----- .../libraries/gtk/{ => hooks}/drop-icon-theme-cache.sh | 0 .../gtk/{ => hooks}/gtk2-clean-immodules-cache.sh | 0 .../gtk/{ => hooks}/gtk3-clean-immodules-cache.sh | 0 .../01-build-Fix-path-handling-in-pkgconfig.patch | 0 .../libraries/gtk/{ => patches}/2.0-darwin-x11.patch | 0 .../gtk/{ => patches}/2.0-immodules.cache.patch | 0 .../libraries/gtk/{ => patches}/3.0-darwin-x11.patch | 0 .../gtk/{ => patches}/3.0-immodules.cache.patch | 0 .../libraries/gtk/{ => patches}/gtk2-theme-paths.patch | 0 11 files changed, 10 insertions(+), 10 deletions(-) rename pkgs/development/libraries/gtk/{ => hooks}/drop-icon-theme-cache.sh (100%) rename pkgs/development/libraries/gtk/{ => hooks}/gtk2-clean-immodules-cache.sh (100%) rename pkgs/development/libraries/gtk/{ => hooks}/gtk3-clean-immodules-cache.sh (100%) rename pkgs/development/libraries/gtk/{ => patches}/01-build-Fix-path-handling-in-pkgconfig.patch (100%) rename pkgs/development/libraries/gtk/{ => patches}/2.0-darwin-x11.patch (100%) rename pkgs/development/libraries/gtk/{ => patches}/2.0-immodules.cache.patch (100%) rename pkgs/development/libraries/gtk/{ => patches}/3.0-darwin-x11.patch (100%) rename pkgs/development/libraries/gtk/{ => patches}/3.0-immodules.cache.patch (100%) rename pkgs/development/libraries/gtk/{ => patches}/gtk2-theme-paths.patch (100%) diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix index 8bef9d92f5f..4286d6a73fb 100644 --- a/pkgs/development/libraries/gtk/2.x.nix +++ b/pkgs/development/libraries/gtk/2.x.nix @@ -26,21 +26,21 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; setupHooks = [ - ./gtk2-clean-immodules-cache.sh - ./drop-icon-theme-cache.sh + ./hooks/gtk2-clean-immodules-cache.sh + ./hooks/drop-icon-theme-cache.sh ]; nativeBuildInputs = [ setupHooks perl pkgconfig gettext gobject-introspection ]; patches = [ - ./2.0-immodules.cache.patch - ./gtk2-theme-paths.patch + ./patches/2.0-immodules.cache.patch + ./patches/gtk2-theme-paths.patch ] ++ optionals stdenv.isDarwin [ (fetchpatch { url = https://bug557780.bugzilla-attachments.gnome.org/attachment.cgi?id=306776; sha256 = "0sp8f1r5c4j2nlnbqgv7s7nxa4cfwigvm033hvhb1ld652pjag4r"; }) - ./2.0-darwin-x11.patch + ./patches/2.0-darwin-x11.patch ]; propagatedBuildInputs = with xorg; diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 4a7cf07d2e6..0e4fddaa010 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -50,8 +50,8 @@ stdenv.mkDerivation rec { outputBin = "dev"; setupHooks = [ - ./gtk3-clean-immodules-cache.sh - ./drop-icon-theme-cache.sh + ./hooks/gtk3-clean-immodules-cache.sh + ./hooks/drop-icon-theme-cache.sh ]; src = fetchurl { @@ -60,19 +60,19 @@ stdenv.mkDerivation rec { }; patches = [ - ./3.0-immodules.cache.patch + ./patches/3.0-immodules.cache.patch (fetchpatch { name = "Xft-setting-fallback-compute-DPI-properly.patch"; url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123"; sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p"; }) # https://gitlab.gnome.org/GNOME/gtk/merge_requests/1002 - ./01-build-Fix-path-handling-in-pkgconfig.patch + ./patches/01-build-Fix-path-handling-in-pkgconfig.patch ] ++ optionals stdenv.isDarwin [ # X11 module requires which is not installed on Darwin # let’s drop that dependency in similar way to how other parts of the library do it # e.g. https://gitlab.gnome.org/GNOME/gtk/blob/3.24.4/gtk/gtk-launch.c#L31-33 - ./3.0-darwin-x11.patch + ./patches/3.0-darwin-x11.patch ]; mesonFlags = [ diff --git a/pkgs/development/libraries/gtk/drop-icon-theme-cache.sh b/pkgs/development/libraries/gtk/hooks/drop-icon-theme-cache.sh similarity index 100% rename from pkgs/development/libraries/gtk/drop-icon-theme-cache.sh rename to pkgs/development/libraries/gtk/hooks/drop-icon-theme-cache.sh diff --git a/pkgs/development/libraries/gtk/gtk2-clean-immodules-cache.sh b/pkgs/development/libraries/gtk/hooks/gtk2-clean-immodules-cache.sh similarity index 100% rename from pkgs/development/libraries/gtk/gtk2-clean-immodules-cache.sh rename to pkgs/development/libraries/gtk/hooks/gtk2-clean-immodules-cache.sh diff --git a/pkgs/development/libraries/gtk/gtk3-clean-immodules-cache.sh b/pkgs/development/libraries/gtk/hooks/gtk3-clean-immodules-cache.sh similarity index 100% rename from pkgs/development/libraries/gtk/gtk3-clean-immodules-cache.sh rename to pkgs/development/libraries/gtk/hooks/gtk3-clean-immodules-cache.sh diff --git a/pkgs/development/libraries/gtk/01-build-Fix-path-handling-in-pkgconfig.patch b/pkgs/development/libraries/gtk/patches/01-build-Fix-path-handling-in-pkgconfig.patch similarity index 100% rename from pkgs/development/libraries/gtk/01-build-Fix-path-handling-in-pkgconfig.patch rename to pkgs/development/libraries/gtk/patches/01-build-Fix-path-handling-in-pkgconfig.patch diff --git a/pkgs/development/libraries/gtk/2.0-darwin-x11.patch b/pkgs/development/libraries/gtk/patches/2.0-darwin-x11.patch similarity index 100% rename from pkgs/development/libraries/gtk/2.0-darwin-x11.patch rename to pkgs/development/libraries/gtk/patches/2.0-darwin-x11.patch diff --git a/pkgs/development/libraries/gtk/2.0-immodules.cache.patch b/pkgs/development/libraries/gtk/patches/2.0-immodules.cache.patch similarity index 100% rename from pkgs/development/libraries/gtk/2.0-immodules.cache.patch rename to pkgs/development/libraries/gtk/patches/2.0-immodules.cache.patch diff --git a/pkgs/development/libraries/gtk/3.0-darwin-x11.patch b/pkgs/development/libraries/gtk/patches/3.0-darwin-x11.patch similarity index 100% rename from pkgs/development/libraries/gtk/3.0-darwin-x11.patch rename to pkgs/development/libraries/gtk/patches/3.0-darwin-x11.patch diff --git a/pkgs/development/libraries/gtk/3.0-immodules.cache.patch b/pkgs/development/libraries/gtk/patches/3.0-immodules.cache.patch similarity index 100% rename from pkgs/development/libraries/gtk/3.0-immodules.cache.patch rename to pkgs/development/libraries/gtk/patches/3.0-immodules.cache.patch diff --git a/pkgs/development/libraries/gtk/gtk2-theme-paths.patch b/pkgs/development/libraries/gtk/patches/gtk2-theme-paths.patch similarity index 100% rename from pkgs/development/libraries/gtk/gtk2-theme-paths.patch rename to pkgs/development/libraries/gtk/patches/gtk2-theme-paths.patch