[arch-commits] Commit in gnome-characters/repos/extra-x86_64 (3 files)
Jan Steffens
heftig at archlinux.org
Wed Mar 20 21:13:56 UTC 2019
Date: Wednesday, March 20, 2019 @ 21:13:56
Author: heftig
Revision: 348775
archrelease: copy trunk to extra-x86_64
Added:
gnome-characters/repos/extra-x86_64/0001-searchProvider-Fix-deprecation-fixes.patch
(from rev 348774, gnome-characters/trunk/0001-searchProvider-Fix-deprecation-fixes.patch)
gnome-characters/repos/extra-x86_64/PKGBUILD
(from rev 348774, gnome-characters/trunk/PKGBUILD)
Deleted:
gnome-characters/repos/extra-x86_64/PKGBUILD
-------------------------------------------------+
0001-searchProvider-Fix-deprecation-fixes.patch | 45 ++++++++++++
PKGBUILD | 77 ++++++++++++----------
2 files changed, 88 insertions(+), 34 deletions(-)
Copied: gnome-characters/repos/extra-x86_64/0001-searchProvider-Fix-deprecation-fixes.patch (from rev 348774, gnome-characters/trunk/0001-searchProvider-Fix-deprecation-fixes.patch)
===================================================================
--- 0001-searchProvider-Fix-deprecation-fixes.patch (rev 0)
+++ 0001-searchProvider-Fix-deprecation-fixes.patch 2019-03-20 21:13:56 UTC (rev 348775)
@@ -0,0 +1,45 @@
+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
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-03-20 21:13:39 UTC (rev 348774)
+++ PKGBUILD 2019-03-20 21:13:56 UTC (rev 348775)
@@ -1,34 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=gnome-characters
-pkgver=3.32.0
-pkgrel=1
-pkgdesc="A character map application"
-arch=(x86_64)
-url="https://gitlab.gnome.org/GNOME/gnome-characters"
-license=(GPL2)
-depends=(gjs gtk3 libunistring gnome-desktop)
-makedepends=(meson intltool 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")
-sha256sums=('SKIP')
-
-pkgver() {
- cd $pkgname
- git describe --tags | sed 's/^v//;s/-/+/g'
-}
-
-build() {
- arch-meson $pkgname build
- ninja -C build
-}
-
-check() {
- meson test -C build
-}
-
-package() {
- DESTDIR="$pkgdir" meson install -C build
-}
Copied: gnome-characters/repos/extra-x86_64/PKGBUILD (from rev 348774, gnome-characters/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-03-20 21:13:56 UTC (rev 348775)
@@ -0,0 +1,43 @@
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=gnome-characters
+pkgver=3.32.0
+pkgrel=2
+pkgdesc="A character map application"
+arch=(x86_64)
+url="https://gitlab.gnome.org/GNOME/gnome-characters"
+license=(GPL2)
+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')
+
+pkgver() {
+ cd $pkgname
+ git describe --tags | sed 's/^v//;s/-/+/g'
+}
+
+prepare() {
+ cd $pkgname
+
+ # https://gitlab.gnome.org/GNOME/gnome-characters/issues/49
+ git apply -3 ../0001-searchProvider-Fix-deprecation-fixes.patch
+}
+
+build() {
+ arch-meson $pkgname build
+ ninja -C build
+}
+
+check() {
+ meson test -C build
+}
+
+package() {
+ DESTDIR="$pkgdir" meson install -C build
+}
More information about the arch-commits
mailing list