rpm/gucharmap
SHA256
1
0
Fork 0
forked from pool/gucharmap
Code Pull Requests Activity

Accepting request 459782 from GNOME:Next

Browse Source 
Scripted push of project GNOME:Next

OBS-URL: https://build.opensuse.org/request/show/459782
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gucharmap?expand=0&rev=133
This commit is contained in:
Bjørn Lie 2017-02-22 20:34:28 +00:00 committed by Git OBS Bridge
parent ca26a0a7f4
commit 23481a4392
3 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
gucharmap-no-force-light-theme.patch Normal file
View File

@ -0,0 +1,36 @@
From a5b046870b62393bb10ed649072c00a0c88d5e1e Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@gnome.org>
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

6
gucharmap.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jan 24 19:58:39 UTC 2017 - zaitor@opensuse.org
- Add gucharmap-no-force-light-theme.patch: No longer force light
theme variant, patch from upstream git.
-------------------------------------------------------------------
Wed Nov 9 14:34:56 UTC 2016 - dimstar@opensuse.org

5
gucharmap.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package gucharmap
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -29,6 +29,8 @@ 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
@ -86,6 +88,7 @@ to develop applications that require these.
%lang_package
%prep
%setup -q
%patch0 -p1
%if !0%{?is_opensuse}
translation-update-upstream
%endif