From e226cbc79ae2231b7168ee8a340645b2d9c28d27 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 01 2017 03:46:33 +0000 Subject: import gnome-desktop3-3.22.2-2.el7 --- diff --git a/.gitignore b/.gitignore index 54f5bf7..76cdcb3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/gnome-desktop-3.14.2.tar.xz +SOURCES/gnome-desktop-3.22.2.tar.xz diff --git a/.gnome-desktop3.metadata b/.gnome-desktop3.metadata index ecff003..be4e2c9 100644 --- a/.gnome-desktop3.metadata +++ b/.gnome-desktop3.metadata @@ -1 +1 @@ -0daf5d1eb4dad57480919913937a15f8899e0653 SOURCES/gnome-desktop-3.14.2.tar.xz +6f85c986d2074f8aca75fd7f6ab0fd21e74b65c4 SOURCES/gnome-desktop-3.22.2.tar.xz diff --git a/SOURCES/0001-default-input-sources-Change-default-for-zh_TW-to-ib.patch b/SOURCES/0001-default-input-sources-Change-default-for-zh_TW-to-ib.patch new file mode 100644 index 0000000..2c19906 --- /dev/null +++ b/SOURCES/0001-default-input-sources-Change-default-for-zh_TW-to-ib.patch @@ -0,0 +1,28 @@ +From a42a5d0806b8a70112d0daabd26bd20b281eb472 Mon Sep 17 00:00:00 2001 +From: Peng Wu +Date: Mon, 19 Dec 2016 17:09:19 +0800 +Subject: [PATCH] default-input-sources: Change default for zh_TW to + ibus-libzhuyin + +https://bugzilla.redhat.com/show_bug.cgi?id=1405946 + +https://bugzilla.gnome.org/show_bug.cgi?id=772674 +--- + 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 b743657..bbb83e3 100644 +--- a/libgnome-desktop/default-input-sources.h ++++ b/libgnome-desktop/default-input-sources.h +@@ -53,6 +53,6 @@ static DefaultInputSource default_input_sources[] = + { "ur_IN", "ibus", "m17n:ur:phonetic" }, + { "zh_CN", "ibus", "libpinyin" }, + { "zh_HK", "ibus", "cangjie" }, +- { "zh_TW", "ibus", "chewing" }, ++ { "zh_TW", "ibus", "libzhuyin" }, + { NULL, NULL, NULL } + }; +-- +2.9.3 + diff --git a/SOURCES/0001-wallclock-Prevent-a-crash.patch b/SOURCES/0001-wallclock-Prevent-a-crash.patch new file mode 100644 index 0000000..98849c2 --- /dev/null +++ b/SOURCES/0001-wallclock-Prevent-a-crash.patch @@ -0,0 +1,26 @@ +From c0df0733ccd71b32eae65ba04364f512b07f9c43 Mon Sep 17 00:00:00 2001 +From: Rui Matos +Date: Wed, 19 Apr 2017 19:16:29 +0200 +Subject: [PATCH] wallclock: Prevent a crash + +https://bugzilla.gnome.org/show_bug.cgi?id=780861 +--- + libgnome-desktop/gnome-wall-clock.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libgnome-desktop/gnome-wall-clock.c b/libgnome-desktop/gnome-wall-clock.c +index 1cd67a8..2b6b7c5 100644 +--- a/libgnome-desktop/gnome-wall-clock.c ++++ b/libgnome-desktop/gnome-wall-clock.c +@@ -85,7 +85,7 @@ gnome_wall_clock_init (GnomeWallClock *self) + g_signal_connect (self->priv->tz_monitor, "changed", G_CALLBACK (on_tz_changed), self); + + self->priv->desktop_settings = g_settings_new ("org.gnome.desktop.interface"); +- g_signal_connect (self->priv->desktop_settings, "changed", G_CALLBACK (on_schema_change), self); ++ g_signal_connect_object (self->priv->desktop_settings, "changed", G_CALLBACK (on_schema_change), self, 0); + + ampm = nl_langinfo (AM_STR); + if (ampm != NULL && *ampm != '\0') +-- +2.9.3 + diff --git a/SPECS/gnome-desktop3.spec b/SPECS/gnome-desktop3.spec index 144bad7..89dcb81 100644 --- a/SPECS/gnome-desktop3.spec +++ b/SPECS/gnome-desktop3.spec @@ -1,76 +1,86 @@ -%define gtk3_version 3.3.6 -%define glib2_version 2.38.0 -%define gtk_doc_version 1.9 -%define gsettings_desktop_schemas_version 3.5.91 -%define po_package gnome-desktop-3.0 +%global gdk_pixbuf2_version 2.33.0 +%global gtk3_version 3.3.6 +%global glib2_version 2.44.0 +%global gtk_doc_version 1.14 +%global gsettings_desktop_schemas_version 3.5.91 +%global po_package gnome-desktop-3.0 -Summary: Shared code among gnome-panel, gnome-session, nautilus, etc Name: gnome-desktop3 -Version: 3.14.2 +Version: 3.22.2 Release: 2%{?dist} -URL: http://www.gnome.org -Source0: http://download.gnome.org/sources/gnome-desktop/3.14/gnome-desktop-%{version}.tar.xz -Patch0: 0001-default-input-sources-Switch-ja_JP-default-to-ibus-k.patch +Summary: Shared code among gnome-panel, gnome-session, nautilus, etc License: GPLv2+ and LGPLv2+ -Group: System Environment/Libraries - -# needed for GnomeWallClock -Requires: gsettings-desktop-schemas >= %{gsettings_desktop_schemas_version} - -# 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 +URL: http://www.gnome.org +Source0: http://download.gnome.org/sources/gnome-desktop/3.22/gnome-desktop-%{version}.tar.xz +Patch0: 0001-default-input-sources-Switch-ja_JP-default-to-ibus-k.patch +Patch1: 0001-default-input-sources-Change-default-for-zh_TW-to-ib.patch +Patch2: 0001-wallclock-Prevent-a-crash.patch 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: pkgconfig(gdk-pixbuf-2.0) >= %{gdk_pixbuf2_version} +BuildRequires: pkgconfig(gio-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(libudev) +BuildRequires: pkgconfig(xkeyboard-config) BuildRequires: gettext BuildRequires: gtk-doc >= %{gtk_doc_version} BuildRequires: automake autoconf libtool intltool BuildRequires: itstool -BuildRequires: iso-codes-devel + +Requires: gdk-pixbuf2%{?_isa} >= %{gdk_pixbuf2_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} # 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 gnome-desktop package contains an internal library +The %{name} 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 libgnome-desktop +Summary: Libraries and headers for %{name} License: LGPLv2+ -Group: Development/Libraries -Requires: %name = %{version}-%{release} - -Requires: gtk3-devel >= %{gtk3_version} -Requires: glib2-devel >= %{glib2_version} -Requires: startup-notification-devel >= %{startup_notification_version} +Requires: %{name}%{?_isa} = %{version}-%{release} %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 %setup -q -n gnome-desktop-%{version} %patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build -%configure --with-pnp-ids-path="/usr/share/hwdata/pnp.ids" +%configure --enable-installed-tests make %{?_smp_mflags} %install -make install DESTDIR=$RPM_BUILD_ROOT +%make_install # stuff we don't want rm -f $RPM_BUILD_ROOT%{_libdir}/*.la @@ -82,7 +92,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %postun -p /sbin/ldconfig %files -f %{po_package}.lang -%doc AUTHORS COPYING COPYING.LIB NEWS README +%doc AUTHORS NEWS README +%license COPYING COPYING.LIB %{_datadir}/gnome/gnome-version.xml %{_libexecdir}/gnome-rr-debug # LGPL @@ -98,7 +109,19 @@ 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 +* Wed Apr 19 2017 Rui Matos - 3.22.2-2 +- Fix a crash + Resolves: #1437059 + +* Tue Nov 15 2016 Kalev Lember - 3.22.2-1 +- Update to 3.22.2 +- Resolves: #1386887 + * Wed Nov 12 2014 Kalev Lember - 3.14.2-1 - Update to 3.14.2 - Resolves: #1174444