diff --git a/desktop-category.patch b/desktop-category.patch new file mode 100644 index 0000000..d6b9171 --- /dev/null +++ b/desktop-category.patch @@ -0,0 +1,21 @@ +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/gnome-characters.spec b/gnome-characters.spec index 5041c71..0a0a70e 100644 --- a/gnome-characters.spec +++ b/gnome-characters.spec @@ -2,7 +2,7 @@ Name: gnome-characters Version: 3.18.0 -Release: 1%{?dist} +Release: 2%{?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,6 +11,8 @@ 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 # 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 @@ -31,8 +33,7 @@ characters. %prep -%setup -q -%patch0 -p1 +%autosetup -p1 %build @@ -78,12 +79,16 @@ gtk-update-icon-cache %{_datadir}/icons/gnome &>/dev/null || : %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/icons/hicolor/scalable/categories/characters*.svg +%{_datadir}/icons/hicolor/*/apps/%{name}-symbolic.svg %{_datadir}/%{appname} %{_datadir}/gnome-shell/search-providers/%{appname}.search-provider.ini %{_libdir}/%{appname} %changelog +* Tue Sep 29 2015 Michael Catanzaro - 3.18.0-2 +- Add symbolic icon and X-GNOME-Utilities desktop category. + * Mon Sep 21 2015 Kalev Lember - 3.18.0-1 - Update to 3.18.0 diff --git a/symbolic-icon.patch b/symbolic-icon.patch new file mode 100644 index 0000000..4d5442f --- /dev/null +++ b/symbolic-icon.patch @@ -0,0 +1,65 @@ +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 +