Compare commits

..

4 Commits
master ... f20

Author SHA1 Message Date
Rui Matos
a7ec84a834 Resolves: rhbz#1150199 - many kbd layouts not selectable 2014-10-21 15:37:55 +02:00
Rui Matos
cf205c9301 Resolves: rhbz#1008965 - mouse cursor sometimes disappears on login 2013-11-26 12:04:45 +01:00
Matthias Clasen
a475284b14 3.10.2 2013-11-21 06:32:14 -05:00
Richard Hughes
6f8b18e1f3 Update to 3.10.1 2013-10-15 22:20:34 +01:00
7 changed files with 518 additions and 423 deletions

78
.gitignore vendored
View File

@ -58,80 +58,4 @@ gnome-desktop-2.90.4.tar.bz2
/gnome-desktop-3.9.92.tar.xz
/gnome-desktop-3.10.0.tar.xz
/gnome-desktop-3.10.1.tar.xz
/gnome-desktop-3.11.1.tar.xz
/gnome-desktop-3.11.2.tar.xz
/gnome-desktop-3.11.4.tar.xz
/gnome-desktop-3.11.5.tar.xz
/gnome-desktop-3.11.90.tar.xz
/gnome-desktop-3.11.91.tar.xz
/gnome-desktop-3.12.0.tar.xz
/gnome-desktop-3.12.1.tar.xz
/gnome-desktop-3.13.1.tar.xz
/gnome-desktop-3.13.2.tar.xz
/gnome-desktop-3.13.3.tar.xz
/gnome-desktop-3.13.4.tar.xz
/gnome-desktop-3.13.90.tar.xz
/gnome-desktop-3.13.91.tar.xz
/gnome-desktop-3.13.92.tar.xz
/gnome-desktop-3.14.0.tar.xz
/gnome-desktop-3.14.1.tar.xz
/gnome-desktop-3.14.2.tar.xz
/gnome-desktop-3.15.2.tar.xz
/gnome-desktop-3.15.2.1.tar.xz
/gnome-desktop-3.15.3.tar.xz
/gnome-desktop-3.15.4.tar.xz
/gnome-desktop-3.15.90.tar.xz
/gnome-desktop-3.15.91.tar.xz
/gnome-desktop-3.15.92.tar.xz
/gnome-desktop-3.16.0.tar.xz
/gnome-desktop-3.16.1.tar.xz
/gnome-desktop-3.16.2.tar.xz
/gnome-desktop-3.17.2.tar.xz
/gnome-desktop-3.17.3.tar.xz
/gnome-desktop-3.17.4.tar.xz
/gnome-desktop-3.17.90.tar.xz
/gnome-desktop-3.17.91.tar.xz
/gnome-desktop-3.17.92.tar.xz
/gnome-desktop-3.18.0.tar.xz
/gnome-desktop-3.18.1.tar.xz
/gnome-desktop-3.19.1.tar.xz
/gnome-desktop-3.19.2.tar.xz
/gnome-desktop-3.19.3.tar.xz
/gnome-desktop-3.19.90.tar.xz
/gnome-desktop-3.19.91.tar.xz
/gnome-desktop-3.19.92.tar.xz
/gnome-desktop-3.19.93.tar.xz
/gnome-desktop-3.20.0.tar.xz
/gnome-desktop-3.20.1.tar.xz
/gnome-desktop-3.21.1.tar.xz
/gnome-desktop-3.21.2.tar.xz
/gnome-desktop-3.21.3.tar.xz
/gnome-desktop-3.21.4.tar.xz
/gnome-desktop-3.21.90.tar.xz
/gnome-desktop-3.21.92.tar.xz
/gnome-desktop-3.22.0.tar.xz
/gnome-desktop-3.22.1.tar.xz
/gnome-desktop-3.23.1.tar.xz
/gnome-desktop-3.23.2.tar.xz
/gnome-desktop-3.23.3.tar.xz
/gnome-desktop-3.23.90.tar.xz
/gnome-desktop-3.23.91.tar.xz
/gnome-desktop-3.23.92.tar.xz
/gnome-desktop-3.24.0.tar.xz
/gnome-desktop-3.24.1.tar.xz
/gnome-desktop-3.24.2.tar.xz
/gnome-desktop-3.25.2.tar.xz
/gnome-desktop-3.25.3.tar.xz
/gnome-desktop-3.25.4.tar.xz
/gnome-desktop-3.25.90.tar.xz
/gnome-desktop-3.25.91.1.tar.xz
/gnome-desktop-3.25.92.tar.xz
/gnome-desktop-3.26.0.tar.xz
/gnome-desktop-3.26.1.tar.xz
/gnome-desktop-3.26.2.tar.xz
/gnome-desktop-3.27.90.tar.xz
/gnome-desktop-3.27.92.tar.xz
/gnome-desktop-3.28.0.tar.xz
/gnome-desktop-3.28.1.tar.xz
/gnome-desktop-3.28.2.tar.xz
/gnome-desktop-3.29.90.1.tar.xz
/gnome-desktop-3.10.2.tar.xz

View File

@ -0,0 +1,26 @@
From 5d478332677df7e428f82d4de0fe9ae4368d9554 Mon Sep 17 00:00:00 2001
From: Rui Matos <tiagomatos@gmail.com>
Date: Tue, 14 May 2013 13:24:09 +0200
Subject: [PATCH] default-input-sources: Switch ja_JP default to ibus-kkc
This should be the default ibus engine for Japanese in F19.
---
libgnome-desktop/default-input-sources.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libgnome-desktop/default-input-sources.h b/libgnome-desktop/default-input-sources.h
index c38e339..bb0b8b8 100644
--- a/libgnome-desktop/default-input-sources.h
+++ b/libgnome-desktop/default-input-sources.h
@@ -30,7 +30,7 @@ static DefaultInputSource default_input_sources[] =
{ "he_IL", "xkb", "il" },
{ "hi_IN", "ibus", "m17n:hi:inscript" },
{ "it_IT", "xkb", "it" },
- { "ja_JP", "ibus", "anthy" },
+ { "ja_JP", "ibus", "kkc" },
{ "kn_IN", "ibus", "m17n:kn:kgp" },
{ "ko_KR", "ibus", "hangul" },
{ "mai_IN", "ibus", "m17n:mai:inscript" },
--
1.8.1.4

View File

@ -0,0 +1,44 @@
From 4999cfd5fb9ff3bedef2c6bafc0b34832a94b029 Mon Sep 17 00:00:00 2001
From: Rui Matos <tiagomatos@gmail.com>
Date: Thu, 28 Aug 2014 19:16:05 +0200
Subject: [PATCH 1/2] gnome-xkb-info: Fix adding layouts to language and
country tables
Layout->xkb_name isn't unique so we can't use it as a key in the hash
table. Layout->id is the unique identifier that we should be using,
otherwise some layouts would never get added.
https://bugzilla.gnome.org/show_bug.cgi?id=729210
---
libgnome-desktop/gnome-xkb-info.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libgnome-desktop/gnome-xkb-info.c b/libgnome-desktop/gnome-xkb-info.c
index eec1224..0cd089f 100644
--- a/libgnome-desktop/gnome-xkb-info.c
+++ b/libgnome-desktop/gnome-xkb-info.c
@@ -367,7 +367,7 @@ add_layout_to_table (GHashTable *table,
{
GHashTable *set;
- if (!layout->xkb_name)
+ if (!layout->id)
return;
set = g_hash_table_lookup (table, key);
@@ -378,10 +378,10 @@ add_layout_to_table (GHashTable *table,
}
else
{
- if (g_hash_table_contains (set, layout->xkb_name))
+ if (g_hash_table_contains (set, layout->id))
return;
}
- g_hash_table_replace (set, layout->xkb_name, layout);
+ g_hash_table_replace (set, layout->id, layout);
}
static void
--
1.9.0

View File

@ -0,0 +1,200 @@
From f4402b64fd34b886a9d7e8c1e0833e4c3f7dcfe3 Mon Sep 17 00:00:00 2001
From: Rui Matos <tiagomatos@gmail.com>
Date: Tue, 26 Nov 2013 00:55:23 +0100
Subject: [PATCH] idle-monitor: Check if a monitor exists before creating a
proxy for it
The fact that we know about a given device doesn't mean that mutter
also knows about it nor that it has created an idle monitor object on
the bus for it.
To fix this race, instead of immediately trying to create a proxy for
the bus object, we instantiate an object manager and ask it whether
the object we want already exists and if it doesn't we wait
(indefinitely) until it shows up.
https://bugzilla.gnome.org/show_bug.cgi?id=706229
---
libgnome-desktop/gnome-idle-monitor.c | 109 +++++++++++++++++++++++-----------
1 file changed, 73 insertions(+), 36 deletions(-)
diff --git a/libgnome-desktop/gnome-idle-monitor.c b/libgnome-desktop/gnome-idle-monitor.c
index 6af1343..539c99b 100644
--- a/libgnome-desktop/gnome-idle-monitor.c
+++ b/libgnome-desktop/gnome-idle-monitor.c
@@ -40,10 +40,12 @@ struct _GnomeIdleMonitorPrivate
{
GCancellable *cancellable;
MetaDBusIdleMonitor *proxy;
+ MetaDBusObjectManagerClient *om;
int name_watch_id;
GHashTable *watches;
GHashTable *watches_by_upstream_id;
GdkDevice *device;
+ gchar *path;
};
typedef struct
@@ -163,8 +165,10 @@ gnome_idle_monitor_dispose (GObject *object)
}
g_clear_object (&monitor->priv->proxy);
+ g_clear_object (&monitor->priv->om);
g_clear_pointer (&monitor->priv->watches, g_hash_table_destroy);
g_clear_object (&monitor->priv->device);
+ g_clear_pointer (&monitor->priv->path, g_free);
G_OBJECT_CLASS (gnome_idle_monitor_parent_class)->dispose (object);
}
@@ -198,6 +202,15 @@ gnome_idle_monitor_set_property (GObject *object,
{
case PROP_DEVICE:
monitor->priv->device = g_value_dup_object (value);
+
+ g_free (monitor->priv->path);
+ if (monitor->priv->device) {
+ monitor->priv->path = g_strdup_printf ("/org/gnome/Mutter/IdleMonitor/Device%d",
+ gdk_x11_device_get_id (monitor->priv->device));
+ } else {
+ monitor->priv->path = g_strdup ("/org/gnome/Mutter/IdleMonitor/Core");
+ }
+
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -220,57 +233,74 @@ add_known_watch (gpointer key,
}
static void
-on_proxy_acquired (GObject *object,
- GAsyncResult *result,
- gpointer user_data)
+connect_proxy (GDBusObject *object,
+ GnomeIdleMonitor *monitor)
{
- GnomeIdleMonitor *monitor = user_data;
- GError *error;
MetaDBusIdleMonitor *proxy;
- error = NULL;
- proxy = meta_dbus_idle_monitor_proxy_new_finish (result, &error);
+ proxy = meta_dbus_object_get_idle_monitor (META_DBUS_OBJECT (object));
if (!proxy) {
- if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
- g_error_free (error);
- return;
- }
-
- g_warning ("Failed to acquire idle monitor proxy: %s", error->message);
- g_error_free (error);
+ g_critical ("Unable to get idle monitor from object at %s",
+ g_dbus_object_get_object_path (object));
return;
}
monitor->priv->proxy = proxy;
-
g_signal_connect_object (proxy, "watch-fired", G_CALLBACK (on_watch_fired), monitor, 0);
g_hash_table_foreach (monitor->priv->watches, add_known_watch, monitor);
}
static void
-connect_proxy (GnomeIdleMonitor *monitor,
- GDBusConnection *connection,
- const char *unique_name)
-{
- char *path;
- int device_id;
-
- if (monitor->priv->device) {
- /* FIXME! Gdk! WTF? */
- device_id = gdk_x11_device_get_id (monitor->priv->device);
- path = g_strdup_printf ("/org/gnome/Mutter/IdleMonitor/Device%d", device_id);
- } else {
- path = g_strdup ("/org/gnome/Mutter/IdleMonitor/Core");
+on_object_added (GDBusObjectManager *manager,
+ GDBusObject *object,
+ gpointer user_data)
+{
+ GnomeIdleMonitor *monitor = user_data;
+
+ if (!g_str_equal (monitor->priv->path, g_dbus_object_get_object_path (object)))
+ return;
+
+ connect_proxy (object, monitor);
+
+ g_signal_handlers_disconnect_by_func (manager, on_object_added, user_data);
+}
+
+static void
+get_proxy (GnomeIdleMonitor *monitor)
+{
+ GDBusObject *object;
+
+ object = g_dbus_object_manager_get_object (G_DBUS_OBJECT_MANAGER (monitor->priv->om),
+ monitor->priv->path);
+ if (object) {
+ connect_proxy (object, monitor);
+ g_object_unref (object);
+ return;
}
- meta_dbus_idle_monitor_proxy_new (connection,
- G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
- unique_name, path,
- monitor->priv->cancellable,
- on_proxy_acquired,
- monitor);
+ g_signal_connect_object (monitor->priv->om, "object-added",
+ G_CALLBACK (on_object_added), monitor, 0);
+}
+
+static void
+on_object_manager_ready (GObject *source,
+ GAsyncResult *res,
+ gpointer user_data)
+{
+ GnomeIdleMonitor *monitor = user_data;
+ GDBusObjectManager *om;
+ GError *error = NULL;
+
+ om = meta_dbus_object_manager_client_new_finish (res, &error);
+ if (!om) {
+ if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+ g_warning ("Failed to acquire idle monitor object manager: %s", error->message);
+ g_error_free (error);
+ return;
+ }
- g_free (path);
+ monitor->priv->om = META_DBUS_OBJECT_MANAGER_CLIENT (om);
+ get_proxy (monitor);
}
static void
@@ -281,7 +311,13 @@ on_name_appeared (GDBusConnection *connection,
{
GnomeIdleMonitor *monitor = user_data;
- connect_proxy (monitor, connection, name_owner);
+ meta_dbus_object_manager_client_new (connection,
+ G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE,
+ name_owner,
+ "/org/gnome/Mutter/IdleMonitor",
+ monitor->priv->cancellable,
+ on_object_manager_ready,
+ monitor);
}
static void
@@ -305,6 +341,7 @@ on_name_vanished (GDBusConnection *connection,
g_hash_table_foreach (monitor->priv->watches, clear_watch, monitor);
g_clear_object (&monitor->priv->proxy);
+ g_clear_object (&monitor->priv->om);
}
static gboolean
--
1.8.3.1

View File

@ -0,0 +1,179 @@
From 959146efdd88f20270384ee1186189310de13b1d Mon Sep 17 00:00:00 2001
From: Rui Matos <tiagomatos@gmail.com>
Date: Mon, 18 Nov 2013 15:42:02 +0100
Subject: [PATCH 2/2] gnome-xkb-info: Apply main layout locale metadata to
variants
If a variant doesn't specify language/country metadata then we should
file it under its main layout's language/country.
https://bugzilla.gnome.org/show_bug.cgi?id=711291
---
libgnome-desktop/gnome-xkb-info.c | 100 ++++++++++++++++++++++++++++----------
1 file changed, 74 insertions(+), 26 deletions(-)
diff --git a/libgnome-desktop/gnome-xkb-info.c b/libgnome-desktop/gnome-xkb-info.c
index 0cd089f..480836d 100644
--- a/libgnome-desktop/gnome-xkb-info.c
+++ b/libgnome-desktop/gnome-xkb-info.c
@@ -56,6 +56,8 @@ struct _Layout
gchar *description;
gboolean is_variant;
const Layout *main_layout;
+ GSList *iso639Ids;
+ GSList *iso3166Ids;
};
typedef struct _XkbOption XkbOption;
@@ -104,6 +106,8 @@ free_layout (gpointer data)
g_free (layout->xkb_name);
g_free (layout->short_desc);
g_free (layout->description);
+ g_slist_free_full (layout->iso639Ids, g_free);
+ g_slist_free_full (layout->iso3166Ids, g_free);
g_slice_free (Layout, layout);
}
@@ -385,6 +389,60 @@ add_layout_to_table (GHashTable *table,
}
static void
+add_layout_to_locale_tables (Layout *layout,
+ GHashTable *layouts_by_language,
+ GHashTable *layouts_by_country)
+{
+ GSList *l, *lang_codes, *country_codes;
+ gchar *language, *country;
+
+ lang_codes = layout->iso639Ids;
+ country_codes = layout->iso3166Ids;
+
+ if (layout->is_variant)
+ {
+ if (!lang_codes)
+ lang_codes = layout->main_layout->iso639Ids;
+ if (!country_codes)
+ country_codes = layout->main_layout->iso3166Ids;
+ }
+
+ for (l = lang_codes; l; l = l->next)
+ {
+ language = gnome_get_language_from_code ((gchar *) l->data, NULL);
+ if (language)
+ {
+ add_layout_to_table (layouts_by_language, language, layout);
+ g_free (language);
+ }
+ }
+
+ for (l = country_codes; l; l = l->next)
+ {
+ country = gnome_get_country_from_code ((gchar *) l->data, NULL);
+ if (country)
+ {
+ add_layout_to_table (layouts_by_country, country, layout);
+ g_free (country);
+ }
+ }
+}
+
+static void
+add_iso639 (Layout *layout,
+ gchar *id)
+{
+ layout->iso639Ids = g_slist_prepend (layout->iso639Ids, id);
+}
+
+static void
+add_iso3166 (Layout *layout,
+ gchar *id)
+{
+ layout->iso3166Ids = g_slist_prepend (layout->iso3166Ids, id);
+}
+
+static void
parse_end_element (GMarkupParseContext *context,
const gchar *element_name,
gpointer data,
@@ -412,6 +470,9 @@ parse_end_element (GMarkupParseContext *context,
g_hash_table_replace (priv->layouts_table,
priv->current_parser_layout->id,
priv->current_parser_layout);
+ add_layout_to_locale_tables (priv->current_parser_layout,
+ priv->layouts_by_language,
+ priv->layouts_by_country);
priv->current_parser_layout = NULL;
}
else if (strcmp (element_name, "variant") == 0)
@@ -431,12 +492,13 @@ parse_end_element (GMarkupParseContext *context,
g_hash_table_replace (priv->layouts_table,
priv->current_parser_variant->id,
priv->current_parser_variant);
+ add_layout_to_locale_tables (priv->current_parser_variant,
+ priv->layouts_by_language,
+ priv->layouts_by_country);
priv->current_parser_variant = NULL;
}
else if (strcmp (element_name, "iso639Id") == 0)
{
- gchar *language;
-
if (!priv->current_parser_iso639Id)
{
g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
@@ -444,23 +506,15 @@ parse_end_element (GMarkupParseContext *context,
return;
}
- language = gnome_get_language_from_code (priv->current_parser_iso639Id, NULL);
- if (language)
- {
- if (priv->current_parser_variant)
- add_layout_to_table (priv->layouts_by_language, language, priv->current_parser_variant);
- else if (priv->current_parser_layout)
- add_layout_to_table (priv->layouts_by_language, language, priv->current_parser_layout);
-
- g_free (language);
- }
+ if (priv->current_parser_variant)
+ add_iso639 (priv->current_parser_variant, priv->current_parser_iso639Id);
+ else if (priv->current_parser_layout)
+ add_iso639 (priv->current_parser_layout, priv->current_parser_iso639Id);
- g_clear_pointer (&priv->current_parser_iso639Id, g_free);
+ priv->current_parser_iso639Id = NULL;
}
else if (strcmp (element_name, "iso3166Id") == 0)
{
- gchar *country;
-
if (!priv->current_parser_iso3166Id)
{
g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
@@ -468,18 +522,12 @@ parse_end_element (GMarkupParseContext *context,
return;
}
- country = gnome_get_country_from_code (priv->current_parser_iso3166Id, NULL);
- if (country)
- {
- if (priv->current_parser_variant)
- add_layout_to_table (priv->layouts_by_country, country, priv->current_parser_variant);
- else if (priv->current_parser_layout)
- add_layout_to_table (priv->layouts_by_country, country, priv->current_parser_layout);
-
- g_free (country);
- }
+ if (priv->current_parser_variant)
+ add_iso3166 (priv->current_parser_variant, priv->current_parser_iso3166Id);
+ else if (priv->current_parser_layout)
+ add_iso3166 (priv->current_parser_layout, priv->current_parser_iso3166Id);
- g_clear_pointer (&priv->current_parser_iso3166Id, g_free);
+ priv->current_parser_iso3166Id = NULL;
}
else if (strcmp (element_name, "group") == 0)
{
--
1.9.0

View File

@ -1,96 +1,101 @@
%global gdk_pixbuf2_version 2.36.5
%global gtk3_version 3.3.6
%global glib2_version 2.53.0
%global gtk_doc_version 1.14
%global gsettings_desktop_schemas_version 3.27.0
%global po_package gnome-desktop-3.0
%define gtk3_version 3.3.6
%define glib2_version 2.35.0
%define gtk_doc_version 1.9
%define gsettings_desktop_schemas_version 3.5.91
%define po_package gnome-desktop-3.0
Name: gnome-desktop3
Version: 3.29.90.1
Release: 1%{?dist}
Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
Name: gnome-desktop3
Version: 3.10.2
Release: 3%{?dist}
URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-desktop/3.10/gnome-desktop-%{version}.tar.xz
Patch0: 0001-default-input-sources-Switch-ja_JP-default-to-ibus-k.patch
Patch1: 0001-idle-monitor-Check-if-a-monitor-exists-before-creati.patch
Patch2: 0001-gnome-xkb-info-Fix-adding-layouts-to-language-and-co.patch
Patch3: 0002-gnome-xkb-info-Apply-main-layout-locale-metadata-to-.patch
License: GPLv2+ and LGPLv2+
URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-desktop/3.29/gnome-desktop-%{version}.tar.xz
Group: System Environment/Libraries
BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= %{gdk_pixbuf2_version}
BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version}
BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= %{gsettings_desktop_schemas_version}
BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
BuildRequires: pkgconfig(iso-codes)
BuildRequires: pkgconfig(libseccomp)
BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(xkeyboard-config)
BuildRequires: gettext
BuildRequires: gtk-doc >= %{gtk_doc_version}
BuildRequires: intltool
BuildRequires: itstool
Requires: bubblewrap
Requires: gdk-pixbuf2%{?_isa} >= %{gdk_pixbuf2_version}
Requires: glib2%{?_isa} >= %{glib2_version}
# Make sure that gnome-themes-standard gets pulled in for upgrades
Requires: gnome-themes-standard
# needed for GnomeWallClock
Requires: gsettings-desktop-schemas >= %{gsettings_desktop_schemas_version}
Requires: redhat-menus
# Make sure to update libgnome schema when changing this
Requires: system-backgrounds-gnome
# Make sure that gnome-themes-standard gets pulled in for upgrades
Requires: gnome-themes-standard
BuildRequires: gnome-common
BuildRequires: gtk3-devel >= %{gtk3_version}
BuildRequires: gobject-introspection-devel
BuildRequires: gsettings-desktop-schemas-devel >= %{gsettings_desktop_schemas_version}
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: libxkbfile-devel
BuildRequires: xkeyboard-config-devel
BuildRequires: gettext
BuildRequires: gtk-doc >= %{gtk_doc_version}
BuildRequires: automake autoconf libtool intltool
BuildRequires: itstool
BuildRequires: iso-codes-devel
# GnomeIdleMonitor API change breaks older gnome-shell versions
Conflicts: gnome-shell < 3.7.90
%if 0%{?fedora}
# From rhughes-f20-gnome-3-12 copr
Obsoletes: compat-gnome-desktop310 < 3.12
%endif
%description
The %{name} package contains an internal library
The gnome-desktop package contains an internal library
(libgnomedesktop) used to implement some portions of the GNOME
desktop, and also some data files and other shared components of the
GNOME user environment.
%package devel
Summary: Libraries and headers for %{name}
Summary: Libraries and headers for libgnome-desktop
License: LGPLv2+
Requires: %{name}%{?_isa} = %{version}-%{release}
Group: Development/Libraries
Requires: %name = %{version}-%{release}
Requires: gtk3-devel >= %{gtk3_version}
Requires: glib2-devel >= %{glib2_version}
Requires: startup-notification-devel >= %{startup_notification_version}
%description devel
Libraries and header files for the GNOME-internal private library
libgnomedesktop.
%package tests
Summary: Tests for the %{name} package
Requires: %{name}%{?_isa} = %{version}-%{release}
%description tests
The %{name}-tests package contains tests that can be used to verify
the functionality of the installed %{name} package.
%prep
%autosetup -p1 -n gnome-desktop-%{version}
%setup -q -n gnome-desktop-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
%configure --enable-installed-tests
%configure --with-pnp-ids-path="/usr/share/hwdata/pnp.ids"
make %{?_smp_mflags}
%install
%make_install
make install DESTDIR=$RPM_BUILD_ROOT
# stuff we don't want
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
%find_lang %{po_package} --all-name --with-gnome
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files -f %{po_package}.lang
%doc AUTHORS NEWS README
%license COPYING COPYING.LIB
%doc AUTHORS COPYING COPYING.LIB NEWS README
%{_datadir}/gnome/gnome-version.xml
%{_libexecdir}/gnome-rr-debug
# LGPL
%{_libdir}/libgnome-desktop-3.so.17{,.*}
%{_libdir}/lib*.so.*
%{_libdir}/girepository-1.0/GnomeDesktop-3.0.typelib
%files devel
@ -102,300 +107,17 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%dir %{_datadir}/gtk-doc/html/
%doc %{_datadir}/gtk-doc/html/gnome-desktop3/
%files tests
%{_libexecdir}/installed-tests/gnome-desktop
%{_datadir}/installed-tests
%changelog
* Sun Aug 12 2018 Kalev Lember <klember@redhat.com> - 3.29.90.1-1
- Update to 3.29.90.1
* Tue Oct 21 2014 Rui Matos <rmatos@redhat.com> - 3.10.2-3
- Resolves: rhbz#1150199 - many kbd layouts not selectable
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.28.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Tue Nov 26 2013 Rui Matos <rmatos@redhat.com> - 3.10.2-2
- Resolves: rhbz#1008965 - mouse cursor sometimes disappears on login
* Thu May 10 2018 Kalev Lember <klember@redhat.com> - 3.28.2-1
- Update to 3.28.2
* Thu Nov 21 2013 Matthias Clasen <mclasen@redhat.com> - 3.10.2-1.fc20
- Update to 3.10.2
* Wed Apr 11 2018 Kalev Lember <klember@redhat.com> - 3.28.1-1
- Update to 3.28.1
* Mon Mar 12 2018 Kalev Lember <klember@redhat.com> - 3.28.0-1
- Update to 3.28.0
* Sun Mar 11 2018 Kalev Lember <klember@redhat.com> - 3.27.92-1
- Update to 3.27.92
- Remove ldconfig scriptlets
* Sat Feb 10 2018 Bastien Nocera <bnocera@redhat.com> - 3.27.90-1
+ gnome-desktop3-3.27.90-1
- Update to 3.27.90
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.26.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Wed Nov 01 2017 Kalev Lember <klember@redhat.com> - 3.26.2-1
- Update to 3.26.2
* Fri Oct 06 2017 Kalev Lember <klember@redhat.com> - 3.26.1-1
- Update to 3.26.1
* Mon Sep 11 2017 Kalev Lember <klember@redhat.com> - 3.26.0-1
- Update to 3.26.0
* Thu Sep 07 2017 Kalev Lember <klember@redhat.com> - 3.25.92-1
- Update to 3.25.92
* Thu Aug 24 2017 Bastien Nocera <bnocera@redhat.com> - 3.25.91.1-1
+ gnome-desktop3-3.25.91.1-1
- Update to 3.25.91.1
* Wed Aug 09 2017 Bastien Nocera <bnocera@redhat.com> - 3.25.90-1
+ gnome-desktop3-3.25.90-1
- Update to 3.25.90
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.25.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.25.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Thu Jul 20 2017 Kalev Lember <klember@redhat.com> - 3.25.4-1
- Update to 3.25.4
* Sun Jun 25 2017 Kalev Lember <klember@redhat.com> - 3.25.3-1
- Update to 3.25.3
* Mon Jun 12 2017 Kalev Lember <klember@redhat.com> - 3.25.2-1
- Update to 3.25.2
- Set minimum required glib2 version
* Tue May 09 2017 Kalev Lember <klember@redhat.com> - 3.24.2-1
- Update to 3.24.2
* Tue Apr 11 2017 Kalev Lember <klember@redhat.com> - 3.24.1-1
- Update to 3.24.1
* Tue Mar 21 2017 Kalev Lember <klember@redhat.com> - 3.24.0-1
- Update to 3.24.0
* Thu Mar 16 2017 Kalev Lember <klember@redhat.com> - 3.23.92-1
- Update to 3.23.92
* Mon Feb 27 2017 Richard Hughes <rhughes@redhat.com> - 3.23.91-1
- Update to 3.23.91
* Tue Feb 14 2017 Richard Hughes <rhughes@redhat.com> - 3.23.90-1
- Update to 3.23.90
* Mon Feb 13 2017 Richard Hughes <rhughes@redhat.com> - 3.23.3-1
- Update to 3.23.3
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.23.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Thu Dec 01 2016 Kalev Lember <klember@redhat.com> - 3.23.2-1
- Update to 3.23.2
* Sun Oct 30 2016 Kalev Lember <klember@redhat.com> - 3.23.1-1
- Update to 3.23.1
* Wed Oct 12 2016 Kalev Lember <klember@redhat.com> - 3.22.1-1
- Update to 3.22.1
* Mon Sep 19 2016 Kalev Lember <klember@redhat.com> - 3.22.0-1
- Update to 3.22.0
* Wed Sep 14 2016 Kalev Lember <klember@redhat.com> - 3.21.92-1
- Update to 3.21.92
- Don't set group tags
* Thu Aug 18 2016 Kalev Lember <klember@redhat.com> - 3.21.90-1
- Update to 3.21.90
* Tue Jul 26 2016 Kalev Lember <klember@redhat.com> - 3.21.4-1
- Update to 3.21.4
* Wed Jun 22 2016 Richard Hughes <rhughes@redhat.com> - 3.21.3-1
- Update to 3.21.3
* Mon Jun 13 2016 Kalev Lember <klember@redhat.com> - 3.21.2-1
- Update to 3.21.2
* Tue May 03 2016 Kalev Lember <klember@redhat.com> - 3.21.1-1
- Update to 3.21.1
* Wed Apr 27 2016 Owen Taylor <otaylor@redhat.com> - 3.20.1-2
- Remove dependency on system-backgrounds-gnome; this made sense when
gnome-desktop contained the GConf schemas, but now the background
settings live in gsettings-desktop-schemas and are overridden to
point to a Fedora background with a file we drop in from
desktop-backgrounds-gnome.
* Wed Apr 13 2016 Kalev Lember <klember@redhat.com> - 3.20.1-1
- Update to 3.20.1
* Tue Mar 22 2016 Kalev Lember <klember@redhat.com> - 3.20.0-1
- Update to 3.20.0
* Thu Mar 17 2016 Kalev Lember <klember@redhat.com> - 3.19.93-1
- Update to 3.19.93
* Mon Mar 14 2016 Kalev Lember <klember@redhat.com> - 3.19.92-1
- Update to 3.19.92
* Fri Mar 04 2016 Richard Hughes <rhughes@redhat.com> - 3.19.91-1
- Update to 3.19.91
* Tue Feb 16 2016 Richard Hughes <rhughes@redhat.com> - 3.19.90-1
- Update to 3.19.90
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.19.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Wed Dec 16 2015 Kalev Lember <klember@redhat.com> - 3.19.3-1
- Update to 3.19.3
* Tue Nov 24 2015 Kalev Lember <klember@redhat.com> - 3.19.2-1
- Update to 3.19.2
* Wed Oct 28 2015 Kalev Lember <klember@redhat.com> - 3.19.1-1
- Update to 3.19.1
* Tue Oct 13 2015 Kalev Lember <klember@redhat.com> - 3.18.1-1
- Update to 3.18.1
* Mon Sep 21 2015 Kalev Lember <klember@redhat.com> - 3.18.0-1
- Update to 3.18.0
* Tue Sep 15 2015 Kalev Lember <klember@redhat.com> - 3.17.92-1
- Update to 3.17.92
* Thu Sep 03 2015 Kalev Lember <klember@redhat.com> - 3.17.91-1
- Update to 3.17.91
* Tue Aug 18 2015 Kalev Lember <klember@redhat.com> - 3.17.90-1
- Update to 3.17.90
- Use make_install macro
* Tue Jul 21 2015 David King <amigadave@amigadave.com> - 3.17.4-1
- Update to 3.17.4
- Preserve timestamps during install
* Wed Jun 24 2015 David King <amigadave@amigadave.com> - 3.17.3-1
- Update to 3.17.3
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.17.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sun May 31 2015 Kalev Lember <kalevlember@gmail.com> - 3.17.2-1
- Update to 3.17.2
* Tue May 12 2015 Kalev Lember <kalevlember@gmail.com> - 3.16.2-1
- Update to 3.16.2
* Wed Apr 15 2015 Kalev Lember <kalevlember@gmail.com> - 3.16.1-1
- Update to 3.16.1
* Mon Mar 23 2015 Kalev Lember <kalevlember@gmail.com> - 3.16.0-1
- Update to 3.16.0
* Tue Mar 17 2015 Kalev Lember <kalevlember@gmail.com> - 3.15.92-1
- Update to 3.15.92
* Mon Mar 02 2015 Kalev Lember <kalevlember@gmail.com> - 3.15.91-1
- Update to 3.15.91
* Mon Feb 16 2015 David King <amigadave@amigadave.com> - 3.15.90-1
- Update to 3.15.90
- Use license macro for COPYING and COPYING.LIB
- Use pkgconfig for BuildRequires
* Thu Jan 22 2015 Richard Hughes <rhughes@redhat.com> - 3.15.4-1
- Update to 3.15.4
* Thu Dec 18 2014 Richard Hughes <rhughes@redhat.com> - 3.15.3-1
- Update to 3.15.3
* Fri Dec 05 2014 Kalev Lember <kalevlember@gmail.com> - 3.15.2.1-1
- Update to 3.15.2.1
* Tue Nov 25 2014 Kalev Lember <kalevlember@gmail.com> - 3.15.2-1
- Update to 3.15.2
* Sun Nov 16 2014 Kalev Lember <kalevlember@gmail.com> - 3.14.2-2
- Obsolete compat-gnome-desktop310 from rhughes-f20-gnome-3-12 copr
* Wed Nov 12 2014 Kalev Lember <kalevlember@gmail.com> - 3.14.2-1
- Update to 3.14.2
* Wed Nov 12 2014 Vadim Rutkovsky <vrutkovs@redhat.com> - 3.14.1-2
- Build installed tests
* Tue Oct 14 2014 Kalev Lember <kalevlember@gmail.com> - 3.14.1-1
- Update to 3.14.1
* Tue Sep 23 2014 Kalev Lember <kalevlember@gmail.com> - 3.14.0-2
- Drop redhat-menus dependency
* Mon Sep 22 2014 Kalev Lember <kalevlember@gmail.com> - 3.14.0-1
- Update to 3.14.0
* Tue Sep 16 2014 Kalev Lember <kalevlember@gmail.com> - 3.13.92-1
- Update to 3.13.92
* Wed Sep 03 2014 Kalev Lember <kalevlember@gmail.com> - 3.13.91-1
- Update to 3.13.91
* Thu Aug 21 2014 Kalev Lember <kalevlember@gmail.com> - 3.13.90-1
- Update to 3.13.90
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.13.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Wed Jul 23 2014 Kalev Lember <kalevlember@gmail.com> - 3.13.4-1
- Update to 3.13.4
* Tue Jul 22 2014 Kalev Lember <kalevlember@gmail.com> - 3.13.3-2
- Rebuilt for gobject-introspection 1.41.4
* Fri Jun 27 2014 Richard Hughes <rhughes@redhat.com> - 3.13.3-1
- Update to 3.13.3
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.13.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Wed May 28 2014 Kalev Lember <kalevlember@gmail.com> - 3.13.2-1
- Update to 3.13.2
* Fri May 02 2014 Kalev Lember <kalevlember@gmail.com> - 3.13.1-1
- Update to 3.13.1
* Wed Apr 16 2014 Kalev Lember <kalevlember@gmail.com> - 3.12.1-1
- Update to 3.12.1
- Tighten -devel deps with %%{_isa}
* Mon Mar 24 2014 Richard Hughes <rhughes@redhat.com> - 3.12.0-1
- Update to 3.12.0
* Tue Mar 18 2014 Richard Hughes <rhughes@redhat.com> - 3.11.91-1
- Update to 3.11.91
* Wed Feb 19 2014 Richard Hughes <rhughes@redhat.com> - 3.11.90-1
- Update to 3.11.90
* Tue Feb 04 2014 Richard Hughes <rhughes@redhat.com> - 3.11.5-1
- Update to 3.11.5
* Thu Jan 16 2014 Richard Hughes <rhughes@redhat.com> - 3.11.4-1
- Update to 3.11.4
* Mon Nov 25 2013 Richard Hughes <rhughes@redhat.com> - 3.11.2-1
- Update to 3.11.2
* Fri Nov 01 2013 Kalev Lember <kalevlember@gmail.com> - 3.11.1-1
- Update to 3.11.1
* Mon Oct 28 2013 Richard Hughes <rhughes@redhat.com> - 3.10.1-1
* Tue Oct 15 2013 Richard Hughes <rhughes@redhat.com> - 3.10.1-1
- Update to 3.10.1
* Tue Sep 24 2013 Kalev Lember <kalevlember@gmail.com> - 3.10.0-1
@ -514,7 +236,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
* Mon Mar 19 2012 Richard Hughes <rhughes@redhat.com> 3.3.92-1
- Update to 3.3.92
* Tue Feb 7 2012 Matthias Clasen <mclasen@redhat.com> - 3.3.5-1
* Tue Feb 6 2012 Matthias Clasen <mclasen@redhat.com> - 3.3.5-1
- Update to 3.3.5
* Tue Jan 17 2012 Matthias Clasen <mclasen@redhat.com> - 3.3.4-1
@ -553,7 +275,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
* Fri Sep 9 2011 Matthias Clasen <mclasen@redhat.com> - 3.1.91-2
- Require gsettings-desktop-schemas
* Mon Sep 5 2011 Matthias Clasen <mclasen@redhat.com> - 3.1.91-1
* Tue Sep 5 2011 Matthias Clasen <mclasen@redhat.com> - 3.1.91-1
- Update to 3.1.91
* Tue Aug 30 2011 Matthias Clasen <mclasen@redhat.com> - 3.1.90.1-1

View File

@ -1 +1 @@
SHA512 (gnome-desktop-3.29.90.1.tar.xz) = a5d9920ea9d74dff6ea7fde8096b744f600ca4a91b5019948838fa189d8060e348072339b1ad7cd9c53a2b93d601c122f25923f56b1d00190271eec7046e7e4e
f610e6a0c0fe288100ea8e78c01ed0ca gnome-desktop-3.10.2.tar.xz