Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gdk_pixbuf: 2.36.7 → 2.36.11 #36312

Merged
merged 1 commit into from Mar 22, 2018
Merged

gdk_pixbuf: 2.36.7 → 2.36.11 #36312

merged 1 commit into from Mar 22, 2018

Conversation

jtojnar
Copy link
Contributor

@jtojnar jtojnar commented Mar 4, 2018

Motivation for this change

Depends on meson prefix patch (#36326)

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@vcunat
Copy link
Member

vcunat commented Mar 4, 2018

Nitpick: the gtk3 update is in 01bf838 also (staging).

@jtojnar jtojnar changed the base branch from master to staging March 4, 2018 21:59
@jtojnar jtojnar changed the title gtk3: 3.22.26 → 3.22.28 gdk_pixbuf: 2.36.7 → 2.36.11 Mar 4, 2018
@jtojnar
Copy link
Contributor Author

jtojnar commented Mar 4, 2018

Regarding the shared-mime-info, it was always required, they just did not check for it during build. We have the following options:

  1. Add it during build and ignore it at runtime as before.
  2. Patch glib [1][2][3][4]

@jtojnar jtojnar mentioned this pull request Mar 18, 2018
@jtojnar jtojnar changed the base branch from staging to master March 20, 2018 19:54
@jtojnar
Copy link
Contributor Author

jtojnar commented Mar 20, 2018

Rebasing onto master as it will be merged with GNOME 3.28.

@jtojnar jtojnar merged commit 3abd1ec into NixOS:master Mar 22, 2018
@jtojnar jtojnar deleted the gtk3-update branch March 22, 2018 13:29
@peti
Copy link
Member

peti commented Mar 23, 2018

EDIT: Accidentally wrote my message into wrong thread. Sorry.

@peti
Copy link
Member

peti commented Mar 23, 2018

This update causes reproducible (and fairly frequent) crashes on my system: #37696.

@jtojnar
Copy link
Contributor Author

jtojnar commented Mar 23, 2018

At a glance, I do not see any particularly suspicious changes https://git.gnome.org/browse/gdk-pixbuf/log/?h=2.36.11 but we can probably safely revert this until it is investigated.

@jtojnar
Copy link
Contributor Author

jtojnar commented Mar 24, 2018

I narrowed it down to 2.36.8, will need to do more detailed bisection later.

@jtojnar
Copy link
Contributor Author

jtojnar commented Apr 16, 2018

I created the following testcase:

with import <nixpkgs> { };
with pkgs;

let
  testSrc = writeText "test.c" ''
    #include <gdk-pixbuf/gdk-pixbuf.h>
    #include <glib.h>

    int main(int argc, char const *argv[]) {
        GError* err = NULL;
        if (gdk_pixbuf_new_from_file("${nixos-artwork.wallpapers.gnome-dark}/share/artwork/gnome/Gnome_Dark.png", &err) == NULL) {
            g_error("%s", err->message);
            return 1;
        }

        return 0;
    }
  '';
in runCommand "gdk-pixbuf-loading-test" {
    buildInputs = [ gdk_pixbuf pkgconfig gcc ];
  } ''
    cc \
      $(pkg-config --cflags gdk-pixbuf-2.0) \
      $(pkg-config --libs gdk-pixbuf-2.0) \
      ${testSrc} -o test

    mkdir -p $out
    mv test $out/test

    $out/test
  ''

It works with 2.36.7 from the nixpkgs but when I add shared-mime-info to buildInputs:

--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, gnome3
-, jasper, gobjectIntrospection, doCheck ? false }:
+, jasper, gobjectIntrospection, shared-mime-info, doCheck ? false }:
 
 let
   pname = "gdk-pixbuf";
@@ -22,7 +22,7 @@
   enableParallelBuilding = true;
 
   # !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
-  buildInputs = [ libX11 gobjectIntrospection ];
+  buildInputs = [ libX11 gobjectIntrospection shared-mime-info ];
 
   nativeBuildInputs = [ pkgconfig ];
 

it fails.

It seems that the addition of shared-mime-info is the culprit, not the update.

@jtojnar jtojnar mentioned this pull request Apr 16, 2018
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants