[arch-commits] Commit in gnome-characters/trunk (2 files)

[Jan Steffens]

    Date: Monday, April 8, 2019 @ 10:50:33
  Author: heftig
Revision: 350326

3.32.1-1

Modified:
  gnome-characters/trunk/PKGBUILD
Deleted:
  gnome-characters/trunk/0001-searchProvider-Fix-deprecation-fixes.patch

-------------------------------------------------+
 0001-searchProvider-Fix-deprecation-fixes.patch |   45 ----------------------
 PKGBUILD                                        |   15 ++-----
 2 files changed, 5 insertions(+), 55 deletions(-)

Deleted: 0001-searchProvider-Fix-deprecation-fixes.patch
===================================================================
--- 0001-searchProvider-Fix-deprecation-fixes.patch	2019-04-08 09:57:15 UTC (rev 350325)
+++ 0001-searchProvider-Fix-deprecation-fixes.patch	2019-04-08 10:50:33 UTC (rev 350326)
@@ -1,45 +0,0 @@
-From 5d5089285d93b5aa9bda5990bbc5586acd620a7b Mon Sep 17 00:00:00 2001
-Message-Id: <5d5089285d93b5aa9bda5990bbc5586acd620a7b.1553116135.git.jan.steffens at gmail.com>
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Wed, 20 Mar 2019 21:07:01 +0000
-Subject: [PATCH] searchProvider: Fix deprecation fixes
-
-- `ByteArray` did not get imported and was missing.
-- `String.prototype.toUpperCase` cannot be passed directly to `map`.
-
-Fixes https://gitlab.gnome.org/GNOME/gnome-characters/issues/49
----
- src/searchProvider.js | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/searchProvider.js b/src/searchProvider.js
-index efe776f..5b50864 100644
---- a/src/searchProvider.js
-+++ b/src/searchProvider.js
-@@ -19,6 +19,7 @@
- 
- const {Gc, Gdk, Gio, GLib, GObject} = imports.gi;
- 
-+const ByteArray = imports.byteArray;
- const Service = imports.service;
- const Util = imports.util;
- 
-@@ -48,7 +49,7 @@ var SearchProvider = GObject.registerClass({
-         this._cancellable.cancel();
-         this._cancellable.reset();
- 
--        let upper = keywords.map(String.prototype.toUpperCase);
-+        let upper = keywords.map(x => x.toUpperCase());
-         let criteria = Gc.SearchCriteria.new_keywords(upper);
-         let context = new Gc.SearchContext({ criteria: criteria,
-                                              flags: Gc.SearchFlag.WORD });
-@@ -154,4 +155,4 @@ var SearchProvider = GObject.registerClass({
-         this._activateAction('search', new GLib.Variant('as', terms),
-                              timestamp);
-     }
--});
-\ No newline at end of file
-+});
--- 
-2.21.0
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-08 09:57:15 UTC (rev 350325)
+++ PKGBUILD	2019-04-08 10:50:33 UTC (rev 350326)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-characters
-pkgver=3.32.0
-pkgrel=2
+pkgver=3.32.1
+pkgrel=1
 pkgdesc="A character map application"
 arch=(x86_64)
 url="https://gitlab.gnome.org/GNOME/gnome-characters"
@@ -11,11 +11,9 @@
 depends=(gjs gtk3 libunistring gnome-desktop)
 makedepends=(meson gobject-introspection appstream-glib git gperf)
 groups=(gnome)
-_commit=329e8a8929408086b5de72657c0d564a592e872a  # tags/v3.32.0^0
-source=("git+https://gitlab.gnome.org/GNOME/gnome-characters.git#commit=$_commit"
-        0001-searchProvider-Fix-deprecation-fixes.patch)
-sha256sums=('SKIP'
-            '21896401a98f28a296973ea3d4c11206dafc00d324a4e3166b028d505116d52c')
+_commit=076a53976518831b264191a322fa3377137165ce  # tags/v3.32.1^0
+source=("git+https://gitlab.gnome.org/GNOME/gnome-characters.git#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgname
@@ -24,9 +22,6 @@
 
 prepare() {
   cd $pkgname
-
-  # https://gitlab.gnome.org/GNOME/gnome-characters/issues/49
-  git apply -3 ../0001-searchProvider-Fix-deprecation-fixes.patch
 }
 
 build() {