diff --git a/.gitignore b/.gitignore index 2631070..e69ba97 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /gnome-characters-3.17.90.tar.xz /gnome-characters-3.17.91.tar.xz /gnome-characters-3.18.0.tar.xz +/gnome-characters-3.18.1.tar.xz diff --git a/0001-Fix-syntax-error-in-desktop-file-keywords-Arabic-tra.patch b/0001-Fix-syntax-error-in-desktop-file-keywords-Arabic-tra.patch index b80e02d..a4804b8 100644 --- a/0001-Fix-syntax-error-in-desktop-file-keywords-Arabic-tra.patch +++ b/0001-Fix-syntax-error-in-desktop-file-keywords-Arabic-tra.patch @@ -1,6 +1,6 @@ -From 7b98efc89c36cda12867aff597fd75c15715a331 Mon Sep 17 00:00:00 2001 +From ce9c527f322f484ca650b25fb82ccfde48795272 Mon Sep 17 00:00:00 2001 From: Kalev Lember -Date: Mon, 31 Aug 2015 09:45:44 +0200 +Date: Sun, 11 Oct 2015 12:17:58 +0200 Subject: [PATCH] Fix syntax error in desktop file keywords Arabic translation --- @@ -8,10 +8,10 @@ Subject: [PATCH] Fix syntax error in desktop file keywords Arabic translation 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ar.po b/po/ar.po -index b24a0af..11701af 100644 +index 36080c3..9687d38 100644 --- a/po/ar.po +++ b/po/ar.po -@@ -82,7 +82,7 @@ msgstr "تطبيق للبحث عن المحارف غير المألوفة وإد +@@ -86,7 +86,7 @@ msgstr "تطبيق للبحث عن المحارف غير المألوفة و إ #: ../data/org.gnome.Characters.desktop.in.h:3 msgid "characters;unicode;" @@ -21,5 +21,5 @@ index b24a0af..11701af 100644 #: ../data/org.gnome.Characters.gschema.xml.h:1 msgid "Font to display characters" -- -2.4.3 +2.5.0 diff --git a/desktop-category.patch b/desktop-category.patch deleted file mode 100644 index d6b9171..0000000 --- a/desktop-category.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 18e332c77647410eeaa010c9b0eeda6e65669850 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Wed, 23 Sep 2015 10:25:13 -0500 -Subject: Put Characters in the Utilities folder - -https://lists.fedoraproject.org/pipermail/desktop/2015-September/012912.html - -diff --git a/data/org.gnome.Characters.desktop.in b/data/org.gnome.Characters.desktop.in -index df84e4f..72903b3 100644 ---- a/data/org.gnome.Characters.desktop.in -+++ b/data/org.gnome.Characters.desktop.in -@@ -6,5 +6,5 @@ Icon=gnome-characters - Exec=gapplication launch org.gnome.Characters - DBusActivatable=true - StartupNotify=true --Categories=GNOME;GTK;Utility; -+Categories=GNOME;GTK;Utility;X-GNOME-Utilities; - _Keywords=characters;unicode; --- -cgit v0.10.2 - diff --git a/disable-search-provider.patch b/disable-search-provider.patch deleted file mode 100644 index 023ef8f..0000000 --- a/disable-search-provider.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f1e6094152b4906c9ce2e8398572e65202e7ff3b Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Fri, 9 Oct 2015 16:01:27 -0500 -Subject: [PATCH] Revert "Default the search provider to enabled" - -This reverts commit 9b1f2bcdfa293e2efdb94ecf2a719ece7dcd605e. - -You probably don't want strange Unicode characters appearing in the -overview on top of more relevant results. We can reenable this when we -have some way to specify that a search provider should be shown last -(currently gsettings-desktop-schemas only allows to specify providers to -be shown first), or tighten up the search results to use prefixes only, -or both.... ---- - data/org.gnome.Characters.search-provider.ini | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/org.gnome.Characters.search-provider.ini b/data/org.gnome.Characters.search-provider.ini -index 034cf14..0c132f9 100644 ---- a/data/org.gnome.Characters.search-provider.ini -+++ b/data/org.gnome.Characters.search-provider.ini -@@ -3,4 +3,4 @@ DesktopId=org.gnome.Characters.desktop - BusName=org.gnome.Characters.BackgroundService - ObjectPath=/org/gnome/Characters/BackgroundService - Version=2 --DefaultDisabled=false -+DefaultDisabled=true --- -2.4.3 - diff --git a/gnome-characters.spec b/gnome-characters.spec index c935e38..58542c9 100644 --- a/gnome-characters.spec +++ b/gnome-characters.spec @@ -1,8 +1,8 @@ %global appname org.gnome.Characters Name: gnome-characters -Version: 3.18.0 -Release: 3%{?dist} +Version: 3.18.1 +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. @@ -11,9 +11,6 @@ URL: https://wiki.gnome.org/Design/Apps/CharacterMap Source0: https://download.gnome.org/sources/gnome-characters/3.18/%{name}-%{version}.tar.xz # Backported from upstream Patch0: 0001-Fix-syntax-error-in-desktop-file-keywords-Arabic-tra.patch -Patch1: desktop-category.patch -Patch2: symbolic-icon.patch -Patch3: disable-search-provider.patch # This package uses GtkWidget template, which was added in Gjs 1.43.3. BuildRequires: gjs-devel >= 1.43.3, gtk3-devel, intltool, desktop-file-utils @@ -87,6 +84,9 @@ gtk-update-icon-cache %{_datadir}/icons/gnome &>/dev/null || : %changelog +* Sun Oct 11 2015 Kalev Lember - 3.18.1-1 +- Update to 3.18.1 + * Fri Oct 09 2015 Michael Catanzaro - 3.18.0-3 - Disable the search provider by default. diff --git a/sources b/sources index 6f0dbdb..1501104 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8698faf07d7d94e870d62fe264b133db gnome-characters-3.18.0.tar.xz +bc3a4b2039cae12327d6d02467f6efcc gnome-characters-3.18.1.tar.xz diff --git a/symbolic-icon.patch b/symbolic-icon.patch deleted file mode 100644 index 4d5442f..0000000 --- a/symbolic-icon.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 2817e1e6431f0b88aad3f63a3881afc37340dcc1 Mon Sep 17 00:00:00 2001 -From: Jakub Steiner -Date: Wed, 23 Sep 2015 17:59:21 +0200 -Subject: icons: provide a symbolic app icon - -https://bugzilla.gnome.org/show_bug.cgi?id=755474 - -diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am -index 0abcf45..38b7ed1 100644 ---- a/data/icons/Makefile.am -+++ b/data/icons/Makefile.am -@@ -12,12 +12,13 @@ nobase_icon_DATA = \ - hicolor/22x22/apps/gnome-characters.png \ - hicolor/32x32/apps/gnome-characters.png \ - hicolor/48x48/apps/gnome-characters.png \ -- hicolor/256x256/apps/gnome-characters.png -+ hicolor/256x256/apps/gnome-characters.png \ -+ hicolor/symbolic/apps/gnome-characters-symbolic.svg - - EXTRA_DIST = $(nobase_icon_DATA) hicolor/gnome-characters.svg \ - characters-stencils.svg render-symbolic.rb - --gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor; gtk-update-icon-cache -f -t $(datadir)/icons/HighContrast -+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor - - install-data-hook: update-icon-cache - uninstall-hook: update-icon-cache -diff --git a/data/icons/hicolor/symbolic/apps/gnome-characters-symbolic.svg b/data/icons/hicolor/symbolic/apps/gnome-characters-symbolic.svg -new file mode 100644 -index 0000000..9cc37ce ---- /dev/null -+++ b/data/icons/hicolor/symbolic/apps/gnome-characters-symbolic.svg -@@ -0,0 +1,29 @@ -+ -+ -+ -+ -+ -+ -+ -+ image/svg+xml -+ -+ Gnome Symbolic Icon Theme -+ -+ -+ -+ -+ -+ -+ Gnome Symbolic Icon Theme -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ --- -cgit v0.10.2 -