From f233fecbd0a644074e09f0e6cd48ab2851ee15e0 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Thu, 27 Feb 2020 06:48:34 +0100
Subject: [PATCH] Update to 3.34.0

---
 .gitignore                          |  1 +
 0001-Fix-deprecation-warnings.patch | 49 -----------------------------
 gnome-characters.spec               | 12 +++----
 sources                             |  2 +-
 4 files changed, 8 insertions(+), 56 deletions(-)
 delete mode 100644 0001-Fix-deprecation-warnings.patch

diff --git a/.gitignore b/.gitignore
index 18656c8..7cef47c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@
 /gnome-characters-3.30.0.tar.xz
 /gnome-characters-3.32.0.tar.xz
 /gnome-characters-3.32.1.tar.xz
+/gnome-characters-3.34.0.tar.xz
diff --git a/0001-Fix-deprecation-warnings.patch b/0001-Fix-deprecation-warnings.patch
deleted file mode 100644
index e740c13..0000000
--- a/0001-Fix-deprecation-warnings.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From b5ea2f8bb6df077b1d1eaa88b062d558a5cdb3e4 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Fri, 26 Jul 2019 16:38:42 +0200
-Subject: [PATCH] Fix deprecation warnings
-
-Similarly to https://gitlab.gnome.org/GNOME/gnome-characters/issues/44
----
- src/menu.js   | 4 ++--
- src/window.js | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/menu.js b/src/menu.js
-index c7510f5..cbd28a4 100644
---- a/src/menu.js
-+++ b/src/menu.js
-@@ -72,7 +72,7 @@ var MenuPopover = GObject.registerClass({
-     _handleSearchChanged(entry) {
-         let text = entry.get_text().replace(/^\s+|\s+$/g, '');
-         let keywords = text == '' ? [] : text.split(/\s+/);
--        this._keywords = keywords.map(String.toLowerCase);
-+        this._keywords = keywords.map(x => x.toLowerCase());
-         this._font_listbox.invalidate_filter();
-         return true;
-     }
-@@ -91,7 +91,7 @@ var MenuPopover = GObject.registerClass({
-         if (row._family == 'None')
-             return true;
- 
--        let nameWords = row._family.split(/\s+/).map(String.toLowerCase);
-+        let nameWords = row._family.split(/\s+/).map(x => x.toLowerCase());
-         return this._keywords.every(function(keyword, index, array) {
-             return nameWords.some(function(nameWord, index, array) {
-                 return nameWord.indexOf(keyword) >= 0;
-diff --git a/src/window.js b/src/window.js
-index 2066105..5498b58 100644
---- a/src/window.js
-+++ b/src/window.js
-@@ -168,7 +168,7 @@ var MainWindow = GObject.registerClass({
-     _handleSearchChanged(entry) {
-         const text = entry.get_text().replace(/^\s+|\s+$/g, '');
-         let keywords = text == '' ? [] : text.split(/\s+/);
--        keywords = keywords.map(String.toUpperCase);
-+        keywords = keywords.map(x => x.toUpperCase());
-         if (keywords != this._searchKeywords) {
-             this._mainView.cancelSearch();
-             this._searchKeywords = keywords;
--- 
-2.25.1
-
diff --git a/gnome-characters.spec b/gnome-characters.spec
index 65281eb..e45f5fc 100644
--- a/gnome-characters.spec
+++ b/gnome-characters.spec
@@ -3,14 +3,14 @@
 %global gjs_version 1.50
 
 Name:		gnome-characters
-Version:	3.32.1
-Release:	5%{?dist}
+Version:	3.34.0
+Release:	1%{?dist}
 Summary:	Character map application for GNOME
 # Files from gtk-js-app are licensed under 3-clause BSD.
 # Other files are GPL 2.0 or later.
 License:	BSD and GPLv2+
 URL:		https://wiki.gnome.org/Design/Apps/CharacterMap
-Source0:	https://download.gnome.org/sources/gnome-characters/3.32/%{name}-%{version}.tar.xz
+Source0:	https://download.gnome.org/sources/gnome-characters/3.34/%{name}-%{version}.tar.xz
 
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
@@ -24,9 +24,6 @@ BuildRequires:	meson
 Requires:	gjs >= %{gjs_version}
 Requires:	gnome-desktop3
 
-# https://gitlab.gnome.org/GNOME/gnome-characters/-/merge_requests/36
-Patch0: 0001-Fix-deprecation-warnings.patch
-
 %description
 Characters is a simple utility application to find and insert unusual
 characters.
@@ -67,6 +64,9 @@ desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/%{appname}.deskto
 
 
 %changelog
+* Thu Feb 27 2020 Kalev Lember <klember@redhat.com> - 3.34.0-1
+- Update to 3.34.0
+
 * Wed Feb 26 2020 Bastien Nocera <bnocera@redhat.com> - 3.32.1-5
 + gnome-characters-3.32.1-5
 - Fix use of removed functions
diff --git a/sources b/sources
index 6737261..f64f5a5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gnome-characters-3.32.1.tar.xz) = d2c18b136da6ab35938de4adf74ee6c3841f5f8e46f3b1ed2bbb8f9d0e953bba1dc43e105ae2aafc880f3cba37b75a55d274e6776d2bc17a5e30364f5d625537
+SHA512 (gnome-characters-3.34.0.tar.xz) = 4dc2f0027c7079034d50c2743607391a0e529bcaf4f8fdd495b05aa776027609a43686f4621bcf30f09a29fa6f4d5fba6ed6166e51ab66f03dedf3032bc65632