From bdceebe9e2850085609f36a9635419715c9a0519 Mon Sep 17 00:00:00 2001 From: Tom Schoonjans Date: Sun, 29 Sep 2019 17:50:17 +0100 Subject: [PATCH] evince 3.32.1 Closes #44666. Signed-off-by: FX Coudert --- Formula/evince.rb | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/Formula/evince.rb b/Formula/evince.rb index 43a0d5a99c..76b490ee13 100644 --- a/Formula/evince.rb +++ b/Formula/evince.rb @@ -1,8 +1,8 @@ class Evince < Formula desc "GNOME document viewer" homepage "https://wiki.gnome.org/Apps/Evince" - url "https://download.gnome.org/sources/evince/3.32/evince-3.32.0.tar.xz" - sha256 "f0d977216466ed2f5a6de64476ef7113dc7c7c9832336f1ff07f3c03c5324c40" + url "https://download.gnome.org/sources/evince/3.32/evince-3.32.1.tar.xz" + sha256 "bdb49e7705b6b3599fd5882a0648bba018b6de322a0db4e814382c6697c63d36" bottle do sha256 "8d1fb23658da65d47d29adb98a07332168d5b5ec8be5d29069c43f88e1e55c64" => :mojave @@ -27,9 +27,6 @@ class Evince < Formula depends_on "poppler" depends_on "python" - # patch submitted upstream at https://gitlab.gnome.org/GNOME/evince/merge_requests/154 - patch :DATA - def install ENV["GETTEXTDATADIR"] = "#{Formula["appstream-glib"].opt_share}/gettext" @@ -71,22 +68,3 @@ class Evince < Formula assert_match version.to_s, shell_output("#{bin}/evince --version") end end - -__END__ -diff --git a/libdocument/ev-document-factory.c b/libdocument/ev-document-factory.c -index ca1aeeb..4f7f40b 100644 ---- a/libdocument/ev-document-factory.c -+++ b/libdocument/ev-document-factory.c -@@ -58,8 +58,12 @@ get_backend_info_for_mime_type (const gchar *mime_type) - guint i; - - for (i = 0; mime_types[i] != NULL; ++i) { -- if (g_content_type_is_mime_type (mime_type, mime_types[i])) -+ gchar *content_type = g_content_type_from_mime_type(mime_type); -+ if (g_content_type_is_mime_type (content_type, mime_types[i])) { -+ g_free(content_type); - return info; -+ } -+ g_free(content_type); - } - }