libosinfo: externalize patches, fetch w/fetchpatch

3 files changed, 11 insertions, 77 deletions

diff --git a/pkgs/development/libraries/libosinfo/0001-tests-Expand-the-arch-s-parser-for-isodetect.patch b/pkgs/development/libraries/libosinfo/0001-tests-Expand-the-arch-s-parser-for-isodetect.patch
deleted file mode 100644
index 7dcbb75df3964..0000000000000
--- a/pkgs/development/libraries/libosinfo/0001-tests-Expand-the-arch-s-parser-for-isodetect.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From b9cb227842948b1b2289cdd3e9b8d925664c2ee7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
-Date: Fri, 7 Sep 2018 15:04:20 +0200
-Subject: [PATCH 1/2] tests: Expand the arch's parser for isodetect
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Some Windows ISOs isodata, as the ones added as part of commit 857f503,
-uses X64 and X86 and load_iso() didn't take those into consideration.
-
-Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Cole Robinson <crobinso@redhat.com>
----
- tests/test-isodetect.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tests/test-isodetect.c b/tests/test-isodetect.c
-index 415770b..76f0c5a 100644
---- a/tests/test-isodetect.c
-+++ b/tests/test-isodetect.c
-@@ -106,6 +106,7 @@ static struct ISOInfo *load_iso(GFile *file, const gchar *shortid, const gchar *
-     info->langs = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
-     if (strstr(name, "amd64") ||
-              strstr(name, "x64") ||
-+             strstr(name, "X64") ||
-              strstr(name, "x86_64") ||
-              strstr(name, "64bit") ||
-              strstr(name, "64-bit"))
-@@ -114,6 +115,7 @@ static struct ISOInfo *load_iso(GFile *file, const gchar *shortid, const gchar *
-              strstr(name, "i586") ||
-              strstr(name, "i686") ||
-              strstr(name, "x86") ||
-+             strstr(name, "X86") ||
-              strstr(name, "32bit") ||
-              strstr(name, "32-bit"))
-         arch = "i386";
--- 
-2.19.0
-
diff --git a/pkgs/development/libraries/libosinfo/0002-db-Force-anchored-patterns-when-matching-regex.patch b/pkgs/development/libraries/libosinfo/0002-db-Force-anchored-patterns-when-matching-regex.patch
deleted file mode 100644
index b47c93f3d3900..0000000000000
--- a/pkgs/development/libraries/libosinfo/0002-db-Force-anchored-patterns-when-matching-regex.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From e6168463f4fc659b9827b5c8694dc1c6d7d5239a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
-Date: Fri, 7 Sep 2018 15:53:20 +0200
-Subject: [PATCH 2/2] db: Force anchored patterns when matching regex
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Without forcing anchored patterns some matches may be completely wrong
-as "(J_)?CENN?A_X64FREV" (volume-id for Windows 10) that could be taken
-as a match for "HRM_CENNA_X64FREV" (volume-id of a Windows 8 ISO).
-
-Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Cole Robinson <crobinso@redhat.com>
----
- osinfo/osinfo_db.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c
-index fa14c6d..f4b3a8c 100644
---- a/osinfo/osinfo_db.c
-+++ b/osinfo/osinfo_db.c
-@@ -37,7 +37,7 @@ G_DEFINE_TYPE(OsinfoDb, osinfo_db, G_TYPE_OBJECT);
- #define match_regex(pattern, str)                                       \
-     (((pattern) == NULL) ||                                             \
-      (((str) != NULL) &&                                                \
--      g_regex_match_simple((pattern), (str), 0, 0)))
-+      g_regex_match_simple((pattern), (str), 0, G_REGEX_MATCH_ANCHORED)))
- 
- static gchar *get_raw_lang(const char *volume_id, const gchar *regex_str)
- {
--- 
-2.19.0
-
diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix
index 3a3dc6952a618..ba267b797870e 100644
--- a/pkgs/development/libraries/libosinfo/default.nix
+++ b/pkgs/development/libraries/libosinfo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gobjectIntrospection, gtk-doc, docbook_xsl
+{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gobjectIntrospection, gtk-doc, docbook_xsl
 , glib, libsoup, libxml2, libxslt, check, curl, perl, hwdata, osinfo-db, vala ? null
 }:
 
@@ -20,8 +20,16 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./osinfo-db-data-dir.patch
-    ./0001-tests-Expand-the-arch-s-parser-for-isodetect.patch
-    ./0002-db-Force-anchored-patterns-when-matching-regex.patch
+    # Fix bug causing tests to fail (and presumably the real scenarios they're representative of)
+    # using upstream commits:
+    (fetchpatch {
+      url = "https://gitlab.com/libosinfo/libosinfo/commit/b9cb227842948b1b2289cdd3e9b8d925664c2ee7.patch";
+      sha256 = "0nj0wmibq52j8qbzmxfzj76fpkqjs18kssbb9lmfhz16s30darbw";
+    })
+    (fetchpatch {
+      url = "https://gitlab.com/libosinfo/libosinfo/commit/e6168463f4fc659b9827b5c8694dc1c6d7d5239a.patch";
+      sha256 = "135yfhjm2wxip5dnng3r9k9igfhdi1083ys4a4f3ipjxfskcs9rv";
+    })
   ];
 
   postPatch = ''