diff --git a/gucharmap-9.0.2.tar.xz b/gucharmap-9.0.2.tar.xz deleted file mode 100644 index 6b3fff3..0000000 --- a/gucharmap-9.0.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:723ea92c8e877beae3986432b8e002807c6c2d1140590dff1c5bff34bb6ed265 -size 1023120 diff --git a/gucharmap-9.0.3.tar.xz b/gucharmap-9.0.3.tar.xz new file mode 100644 index 0000000..c8555f3 --- /dev/null +++ b/gucharmap-9.0.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:badb002c4d15dca7f3e42b9995ac41dba51490a28709bfefb5a8523fd948f918 +size 1029244 diff --git a/gucharmap-no-force-light-theme.patch b/gucharmap-no-force-light-theme.patch deleted file mode 100644 index a2940a8..0000000 --- a/gucharmap-no-force-light-theme.patch +++ /dev/null @@ -1,36 +0,0 @@ -From a5b046870b62393bb10ed649072c00a0c88d5e1e Mon Sep 17 00:00:00 2001 -From: Christian Persch -Date: Tue, 15 Nov 2016 21:10:00 +0100 -Subject: charmap: Conditionalise forcing the light theme on gtk < 3.22 - -Apparently this is fixed on gtk+ 3.22, so only force the variant -to 'light' on < 3.22. - -https://bugzilla.gnome.org/show_bug.cgi?id=741939#c28 ---- - gucharmap/main.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/gucharmap/main.c b/gucharmap/main.c -index 877398b..a07403f 100644 ---- a/gucharmap/main.c -+++ b/gucharmap/main.c -@@ -275,8 +275,12 @@ main (int argc, char **argv) - - g_application_register (G_APPLICATION (application), NULL, NULL); - -- /* Gucharmap doesn't work right with the dark theme, see #741939 */ -- g_object_set (gtk_settings_get_default (), "gtk-application-prefer-dark-theme", FALSE, NULL); -+ /* Gucharmap doesn't work right with the dark theme, see #741939. -+ * Apparently this got fixed in gtk+ some time before 3.22, so -+ * only work around this on older versions. -+ */ -+ if (gtk_check_version (3, 22, 0) != NULL /* < 3.22.0 */) -+ g_object_set (gtk_settings_get_default (), "gtk-application-prefer-dark-theme", FALSE, NULL); - - window = gucharmap_window_new (application); - --- -cgit v0.12 - - diff --git a/gucharmap.changes b/gucharmap.changes index 36016d1..4ccd64f 100644 --- a/gucharmap.changes +++ b/gucharmap.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Mar 21 10:53:13 UTC 2017 - dimstar@opensuse.org + +- Update to version 9.0.3: + + Bugs fixed: bgo#539093, bgo#741939#c28, bgo#777829. + + Updated translations. +- Drop gucharmap-no-force-light-theme.patch: fixed upstream. + ------------------------------------------------------------------- Tue Jan 24 19:58:39 UTC 2017 - zaitor@opensuse.org diff --git a/gucharmap.spec b/gucharmap.spec index de85a21..de66ddf 100644 --- a/gucharmap.spec +++ b/gucharmap.spec @@ -22,15 +22,13 @@ %define pc_api 2.90 Name: gucharmap -Version: 9.0.2 +Version: 9.0.3 Release: 0 Summary: A Featureful Unicode Character Map License: GPL-3.0+ and LGPL-2.1+ Group: System/GUI/GNOME Url: http://gucharmap.sourceforge.net/ Source: http://download.gnome.org/sources/gucharmap/9.0/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM gucharmap-no-force-light-theme.patch zaitor@opensuse.org -- No longer force the light theme -Patch0: gucharmap-no-force-light-theme.patch BuildRequires: appdata-tools BuildRequires: fdupes BuildRequires: gettext @@ -88,7 +86,6 @@ to develop applications that require these. %lang_package %prep %setup -q -%patch0 -p1 %if !0%{?is_opensuse} translation-update-upstream %endif @@ -127,7 +124,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%doc COPYING ChangeLog NEWS README TODO +%doc COPYING ChangeLog NEWS %{_bindir}/charmap %{_bindir}/gnome-character-map %{_bindir}/gucharmap @@ -135,8 +132,8 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/glib-2.0/schemas/org.gnome.Charmap.enums.xml %{_datadir}/glib-2.0/schemas/org.gnome.Charmap.gschema.xml %doc %{_datadir}/help/C/gucharmap/ -%dir %{_datadir}/appdata -%{_datadir}/appdata/gucharmap.appdata.xml +%dir %{_datadir}/metainfo +%{_datadir}/metainfo/gucharmap.appdata.xml %files -n libgucharmap%{so_api}-%{so_gucharmap} %defattr(-,root,root)