From 3359a8d6b47e438be384fd3bab2e93a7ad122745 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Wed, 7 Apr 2021 01:49:26 +0000 Subject: [PATCH] 3p/nixpkgs: fix gtk+ tracker build under i686 --- third_party/nixpkgs/patches/series | 1 + .../nixpkgs/patches/tracker-i686.patch | 30 +++++++++++++++++++ .../development/libraries/tracker/default.nix | 2 +- .../libraries/tracker/i686-tracker-fix.patch | 13 ++++++++ 4 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 third_party/nixpkgs/patches/tracker-i686.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/tracker/i686-tracker-fix.patch diff --git a/third_party/nixpkgs/patches/series b/third_party/nixpkgs/patches/series index 13de97c025..2dd9371a71 100644 --- a/third_party/nixpkgs/patches/series +++ b/third_party/nixpkgs/patches/series @@ -2,3 +2,4 @@ various.patch patch-cherrypy.patch pomerium-fix.patch dino-vala-boxing.patch +tracker-i686.patch diff --git a/third_party/nixpkgs/patches/tracker-i686.patch b/third_party/nixpkgs/patches/tracker-i686.patch new file mode 100644 index 0000000000..1e168aee66 --- /dev/null +++ b/third_party/nixpkgs/patches/tracker-i686.patch @@ -0,0 +1,30 @@ +diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix +--- a/pkgs/development/libraries/tracker/default.nix ++++ b/pkgs/development/libraries/tracker/default.nix +@@ -43,7 +43,7 @@ stdenv.mkDerivation rec { + src = ./fix-paths.patch; + inherit asciidoc; + }) +- ]; ++ ] ++ lib.optional stdenv.isi686 ./i686-tracker-fix.patch; + + nativeBuildInputs = [ + meson +diff --git a/pkgs/development/libraries/tracker/i686-tracker-fix.patch b/pkgs/development/libraries/tracker/i686-tracker-fix.patch +new file mode 100644 +--- /dev/null ++++ b/pkgs/development/libraries/tracker/i686-tracker-fix.patch +@@ -0,0 +1,13 @@ ++diff -u -r tracker-3.0.3_pristine/tests/libtracker-data/tracker-sparql-test.c tracker-3.0.3/tests/libtracker-data/tracker-sparql-test.c ++--- tracker-3.0.3_pristine/tests/libtracker-data/tracker-sparql-test.c 2021-01-10 17:46:25.607677700 +0000 +++++ tracker-3.0.3/tests/libtracker-data/tracker-sparql-test.c 2021-04-07 01:44:49.863184812 +0000 ++@@ -92,9 +92,7 @@ ++ { "construct/construct-where", "construct/data", FALSE }, ++ { "construct/construct-pattern", "construct/data", FALSE }, ++ { "construct/construct-with-modifiers", "construct/data", FALSE }, ++- { "datetime/direct-1", "datetime/data-1", FALSE }, ++ { "datetime/delete-1", "datetime/data-3", FALSE }, ++- { "datetime/insert-1", "datetime/data-4", FALSE }, ++ { "datetime/functions-localtime-1", "datetime/data-1", FALSE }, ++ { "datetime/functions-timezone-1", "datetime/data-2", FALSE }, ++ { "datetime/functions-timezone-2", "datetime/data-2", FALSE }, diff --git a/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix index 1da2f34aa5..f7fe531f28 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit asciidoc; }) - ]; + ] ++ lib.optional stdenv.isi686 ./i686-tracker-fix.patch; nativeBuildInputs = [ meson diff --git a/third_party/nixpkgs/pkgs/development/libraries/tracker/i686-tracker-fix.patch b/third_party/nixpkgs/pkgs/development/libraries/tracker/i686-tracker-fix.patch new file mode 100644 index 0000000000..c3210fa3c0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/tracker/i686-tracker-fix.patch @@ -0,0 +1,13 @@ +diff -u -r tracker-3.0.3_pristine/tests/libtracker-data/tracker-sparql-test.c tracker-3.0.3/tests/libtracker-data/tracker-sparql-test.c +--- tracker-3.0.3_pristine/tests/libtracker-data/tracker-sparql-test.c 2021-01-10 17:46:25.607677700 +0000 ++++ tracker-3.0.3/tests/libtracker-data/tracker-sparql-test.c 2021-04-07 01:44:49.863184812 +0000 +@@ -92,9 +92,7 @@ + { "construct/construct-where", "construct/data", FALSE }, + { "construct/construct-pattern", "construct/data", FALSE }, + { "construct/construct-with-modifiers", "construct/data", FALSE }, +- { "datetime/direct-1", "datetime/data-1", FALSE }, + { "datetime/delete-1", "datetime/data-3", FALSE }, +- { "datetime/insert-1", "datetime/data-4", FALSE }, + { "datetime/functions-localtime-1", "datetime/data-1", FALSE }, + { "datetime/functions-timezone-1", "datetime/data-2", FALSE }, + { "datetime/functions-timezone-2", "datetime/data-2", FALSE },