Update to 3.18.1

This commit is contained in:
Kalev Lember 2015-10-11 12:14:25 +02:00
parent 5fb951e049
commit a7b96cba9e
7 changed files with 12 additions and 127 deletions

1
.gitignore vendored
View File

@ -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

View File

@ -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 <klember@redhat.com>
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

View File

@ -1,21 +0,0 @@
From 18e332c77647410eeaa010c9b0eeda6e65669850 Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@gnome.org>
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

View File

@ -1,30 +0,0 @@
From f1e6094152b4906c9ce2e8398572e65202e7ff3b Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@gnome.org>
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

View File

@ -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 <klember@redhat.com> - 3.18.1-1
- Update to 3.18.1
* Fri Oct 09 2015 Michael Catanzaro <mcatanzaro@gnome.org> - 3.18.0-3
- Disable the search provider by default.

View File

@ -1 +1 @@
8698faf07d7d94e870d62fe264b133db gnome-characters-3.18.0.tar.xz
bc3a4b2039cae12327d6d02467f6efcc gnome-characters-3.18.1.tar.xz

View File

@ -1,65 +0,0 @@
From 2817e1e6431f0b88aad3f63a3881afc37340dcc1 Mon Sep 17 00:00:00 2001
From: Jakub Steiner <jimmac@gmail.com>
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 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='gnome-characters-symbolic.svg' height='16' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:osb='http://www.openswatchbook.org/uri/2009/osb' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:svg='http://www.w3.org/2000/svg' version='1.1' inkscape:version='0.91 r13725' width='15.999999' xmlns='http://www.w3.org/2000/svg'>
+ <metadata id='metadata90'>
+ <rdf:RDF>
+ <cc:Work rdf:about=''>
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage'/>
+ <dc:title>Gnome Symbolic Icon Theme</dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <sodipodi:namedview inkscape:bbox-nodes='true' inkscape:bbox-paths='true' bordercolor='#666666' borderopacity='1' inkscape:current-layer='layer9' inkscape:cx='-74.683942' inkscape:cy='-9.27543' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='false' inkscape:object-paths='false' objecttolerance='10' pagecolor='#555753' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='false' showguides='true' inkscape:snap-bbox='false' inkscape:snap-bbox-edge-midpoints='true' inkscape:snap-bbox-midpoints='true' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-nodes='true' inkscape:snap-others='true' inkscape:snap-to-guides='true' inkscape:window-height='1376' inkscape:window-maximized='1' inkscape:window-width='2560' inkscape:window-x='0' inkscape:window-y='27' inkscape:zoom='2.8284271'>
+ <inkscape:grid empspacing='2' enabled='true' id='grid4866' originx='-202' originy='-322' snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid' visible='true'/>
+ </sodipodi:namedview>
+ <title id='title9167'>Gnome Symbolic Icon Theme</title>
+ <defs id='defs7386'>
+ <linearGradient id='linearGradient7212' osb:paint='solid'>
+ <stop id='stop7214' offset='0' style='stop-color:#000000;stop-opacity:1;'/>
+ </linearGradient>
+ </defs>
+ <g inkscape:groupmode='layer' id='layer9' inkscape:label='apps' style='display:inline' transform='translate(-443.0002,105)'>
+
+ <path inkscape:connector-curvature='0' d='m 446.70248,-104 c -1.53288,0 -2.71875,1.31948 -2.71875,2.84375 l 0,8.34375 c 0,1.52427 1.18587,2.84375 2.71875,2.84375 l 8.57897,0 c 1.53288,0 2.75,-1.31948 2.75,-2.84375 l 0,-8.34375 c 0,-1.52427 -1.21712,-2.84375 -2.75,-2.84375 z m 0.78125,1.03125 c 3.52668,0.25598 5.31717,0.13378 7.04772,0 0.75419,-0.0583 1.53125,0.61584 1.53125,1.4375 l 0,7.375 c 0,0.66541 -0.53119,1.09567 -1.1875,1.1875 -2.83642,0.39685 -4.75306,0.44007 -7.67272,0 -0.65529,-0.0988 -1.1875,-0.52209 -1.1875,-1.1875 l 0,-7.34375 c 0,-0.82166 0.71429,-1.52351 1.46875,-1.46875 z' id='rect11749-5-9-2-7' sodipodi:nodetypes='ssssssssssssssssss' style='color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:&apos;Bitstream Vera Sans&apos;;-inkscape-font-specification:&apos;Bitstream Vera Sans&apos;;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate'/>
+ <path inkscape:connector-curvature='0' d='m 453.56445,-99.023438 -2.93945,0.04492 0.0156,1 2.87891,-0.04297 c 0.2004,0.01729 0.33082,0.07546 0.39649,0.134765 0.0669,0.06044 0.10546,0.121098 0.10546,0.292969 l -0.008,0.603516 -2.49609,0 0.0371,0.002 c -0.46556,-0.03512 -0.89235,0.142747 -1.16407,0.429687 -0.27171,0.28694 -0.40289,0.656006 -0.41601,1.023438 -0.0131,0.367432 0.0913,0.74931 0.35156,1.052734 0.2603,0.303425 0.68726,0.496532 1.16211,0.482422 l 3.48242,0 0.0508,-3.589844 0,-0.0039 c 0,-0.402649 -0.15996,-0.786245 -0.43554,-1.035156 -0.27559,-0.248912 -0.63064,-0.364312 -0.99805,-0.392578 l -0.0234,-0.002 z m -2.08398,3.033204 0.0176,0 2.5,0 -0.0137,0.990234 -2.51954,0 -0.008,0 c -0.22008,0.0065 -0.30136,-0.05152 -0.37109,-0.132812 -0.0697,-0.08129 -0.11659,-0.219716 -0.11133,-0.367188 0.005,-0.147472 0.062,-0.288109 0.14062,-0.371094 0.0786,-0.08298 0.16508,-0.134241 0.36524,-0.11914 z' id='path11643' style='color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate'/>
+ <path inkscape:connector-curvature='0' d='m 454.3418,-101.97461 -3,1 0.3164,0.94922 3,-1 -0.3164,-0.94922 z' id='path11645' style='color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate'/>
+ </g>
+</svg>
--
cgit v0.10.2