diff --git a/gnome-desktop-3.24.2.tar.xz b/gnome-desktop-3.24.2.tar.xz deleted file mode 100644 index 7dd2a9a..0000000 --- a/gnome-desktop-3.24.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8fa1de66a6a75963bffc79b01a60434c71237d44c51beca09c0f714a032d785e -size 1064808 diff --git a/gnome-desktop-3.26.0.tar.xz b/gnome-desktop-3.26.0.tar.xz new file mode 100644 index 0000000..e96d7e8 --- /dev/null +++ b/gnome-desktop-3.26.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8a99a084ea06fba20f5c547822dd8e36758676714729c7ae7b44ae3deca57be2 +size 1066368 diff --git a/gnome-desktop-no-usr-merge.patch b/gnome-desktop-no-usr-merge.patch new file mode 100644 index 0000000..5b77f05 --- /dev/null +++ b/gnome-desktop-no-usr-merge.patch @@ -0,0 +1,35 @@ +From 9761561a3bc9dc8665e5f5aca7f7177429f87be2 Mon Sep 17 00:00:00 2001 +From: Dominique Leuenberger +Date: Sat, 2 Sep 2017 00:05:23 +0200 +Subject: [PATCH] thumbnailer: also add /lib(64)? to bwrap's link-mounted + directory list + +As not all distros have libs moves from /lib(64)? to /usr/lib(64), we need +to also bind-mount those directories, or the thumbnailers will fail to load +the required libraries. + +https://bugzilla.gnome.org/show_bug.cgi?id=787072 +--- + libgnome-desktop/gnome-desktop-thumbnail-script.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libgnome-desktop/gnome-desktop-thumbnail-script.c b/libgnome-desktop/gnome-desktop-thumbnail-script.c +index 52dbf7b8..89ad5c3b 100644 +--- a/libgnome-desktop/gnome-desktop-thumbnail-script.c ++++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c +@@ -506,10 +506,10 @@ add_bwrap (GPtrArray *array, + add_args (array, + "bwrap", + "--ro-bind", "/usr", "/usr", ++ "--ro-bind", "/lib", "/lib", ++ "--ro-bind", "/lib64", "/lib64", + "--proc", "/proc", + "--dev", "/dev", +- "--symlink", "usr/lib", "/lib", +- "--symlink", "usr/lib64", "/lib64", + "--symlink", "usr/bin", "/bin", + "--symlink", "usr/sbin", "/sbin", + "--chdir", "/", +-- +2.14.0 + diff --git a/gnome-desktop-switch-Japanese-default-input-to-mozc.patch b/gnome-desktop-switch-Japanese-default-input-to-mozc.patch new file mode 100644 index 0000000..56d06f2 --- /dev/null +++ b/gnome-desktop-switch-Japanese-default-input-to-mozc.patch @@ -0,0 +1,12 @@ +diff -Nura gnome-desktop-3.24.2/libgnome-desktop/default-input-sources.h gnome-desktop-3.24.2_new/libgnome-desktop/default-input-sources.h +--- gnome-desktop-3.24.2/libgnome-desktop/default-input-sources.h 2017-02-13 22:54:01.000000000 +0000 ++++ gnome-desktop-3.24.2_new/libgnome-desktop/default-input-sources.h 2017-08-28 09:03:25.800295122 +0000 +@@ -33,7 +33,7 @@ + { "he_IL", "xkb", "il" }, + { "hi_IN", "ibus", "m17n:hi:inscript" }, + { "it_IT", "xkb", "it" }, +- { "ja_JP", "ibus", "anthy" }, ++ { "ja_JP", "ibus", "Japanese (Mozc)" }, + { "kn_IN", "ibus", "m17n:kn:kgp" }, + { "ko_KR", "ibus", "hangul" }, + { "mai_IN", "ibus", "m17n:mai:inscript" }, diff --git a/gnome-desktop.changes b/gnome-desktop.changes index 541c821..38cd6fe 100644 --- a/gnome-desktop.changes +++ b/gnome-desktop.changes @@ -1,3 +1,89 @@ +------------------------------------------------------------------- +Mon Sep 11 19:58:43 UTC 2017 - jengelh@inai.de + +- Update package summaries. + Avoid running fdupes across hardlink boundaries. + +------------------------------------------------------------------- +Mon Sep 11 17:36:00 UTC 2017 - zaitor@opensuse.org + +- Update to version 3.26.0: + + Updated translations. + +------------------------------------------------------------------- +Wed Sep 6 22:57:49 UTC 2017 - dimstar@opensuse.org + +- Update to version 3.25.92: + + Fix multiple bugs in thumbnailing. + + Disable gvfs in thumbnailer sandboxes. + + Updated translations. + +------------------------------------------------------------------- +Sat Sep 2 09:19:41 UTC 2017 - qzhao@suse.com + +- Add gnome-desktop-switch-Japanese-default-input-to-mozc.patch: + Switch new user's default input engine from "anthy" to "mozc" in + gnome-desktop with Japanese language and ibus input frame-work + (bnc#1029083, boo#1056289). + +------------------------------------------------------------------- +Fri Sep 1 21:57:22 UTC 2017 - dimstar@opensuse.org + +- Add gnome-desktop-no-usr-merge.patch: Also link /lib and /lib64 + into the bubblewrap container, as we do not (yet) have all the + libs in /usr. +- Add bubblewrap dependency to libgnome-desktop-3-12. + +------------------------------------------------------------------- +Wed Aug 23 12:37:42 UTC 2017 - zaitor@opensuse.org + +- Update to version 3.25.91.1: + + Fix multiple bugs in sandboxed thumbnailer handling, including + performance, and left-over files in /tmp. + + Fix a memory leak in the display handling code. + + Fix a compile-time error on x32. +- Changes from version 3.25.90.1: + + Improve error reporting in thumbnailers. + + Fix crashes in thumbnailers (bgo#785963). + +------------------------------------------------------------------- +Mon Aug 7 21:00:08 UTC 2017 - zaitor@opensuse.org + +- Update to version 3.25.90: + + Thumbnailers are now sandboxed (bgo#7744970, bgo#785197). + + Fix a crash in xkb info handling (bgo#785320). + + Updated translations. +- Add pkgconfig(libseccomp) BuildRequires: New dependency. + +------------------------------------------------------------------- +Thu Jul 20 17:02:40 UTC 2017 - zaitor@opensuse.org + +- Update to version 3.25.4: + + Fix uninitialized memory in the thumbnailer (bgo#784915). + + Add default input source for fr_BE. + +------------------------------------------------------------------- +Tue Jun 20 08:44:42 UTC 2017 - dimstar@opensuse.org + +- Update to version 3.25.3: + + gnome-bg: Handle exif orientations (bgo#516177). + + Updated translations. + +------------------------------------------------------------------- +Tue May 23 12:41:09 UTC 2017 - zaitor@opensuse.org + +- Update to version 3.25.2: + + thumbnail: Update documentation. + +------------------------------------------------------------------- +Sat May 20 14:33:25 UTC 2017 - zaitor@opensuse.org + +- Update to version 3.25.1: + + wallclock: + - Don't update needlessly (bgo#780861). + - am/pm is always available now (bgo#780877). + + Updated translations. + ------------------------------------------------------------------- Wed May 10 19:27:59 UTC 2017 - zaitor@opensuse.org diff --git a/gnome-desktop.spec b/gnome-desktop.spec index 6556329..3d839b5 100644 --- a/gnome-desktop.spec +++ b/gnome-desktop.spec @@ -17,16 +17,19 @@ %define IS_DEFAULT_GNOME_DESKTOP 1 - Name: gnome-desktop -Version: 3.24.2 +Version: 3.26.0 Release: 0 Summary: The GNOME Desktop API Library License: LGPL-2.1+ Group: System/GUI/GNOME Url: http://www.gnome.org -Source: http://download.gnome.org/sources/gnome-desktop/3.24/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/gnome-desktop/3.26/%{name}-%{version}.tar.xz Source99: baselibs.conf +# PATCH-FIX-UPSTREAM gnome-desktop-no-usr-merge.patch bgo#787072 dimstar@opensuse.org -- Also consider /lib(64)? for the bubblewrap +Patch0: gnome-desktop-no-usr-merge.patch +# PATFH-FIX-OPENSUSE gnome-desktop-switch-Japanese-default-input-to-mozc.patch bnc#1029083 boo#1056289 qzhao@suse.com -- Switch new user's default input engine from "anthy" to "mozc" in gnome-desktop with Japanese language and ibus input frame-work condition. +Patch1: gnome-desktop-switch-Japanese-default-input-to-mozc.patch BuildRequires: fdupes BuildRequires: gobject-introspection-devel BuildRequires: intltool @@ -35,10 +38,11 @@ BuildRequires: translation-update-upstream %endif BuildRequires: yelp-tools BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.36.5 -BuildRequires: pkgconfig(glib-2.0) >= 2.38.0 +BuildRequires: pkgconfig(glib-2.0) >= 2.53.0 BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.5.91 BuildRequires: pkgconfig(gtk+-3.0) >= 3.3.6 BuildRequires: pkgconfig(iso-codes) +BuildRequires: pkgconfig(libseccomp) BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xkbfile) @@ -47,13 +51,11 @@ BuildRequires: pkgconfig(xkeyboard-config) BuildRequires: gnome-common BuildRequires: gtk-doc %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This package contains the desktop-wide files. %if %IS_DEFAULT_GNOME_DESKTOP || 0%{?BUILD_FROM_VCS} - %package -n gnome-version Summary: GNOME version Group: System/GUI/GNOME @@ -63,7 +65,7 @@ This package contains information on the version of GNOME that is installed. %endif %package -n libgnome-desktop-3_0-common -Summary: The GNOME Desktop API Library -- Common data files +Summary: Common data files for the GNOME Desktop API library Group: System/Libraries %description -n libgnome-desktop-3_0-common @@ -75,10 +77,12 @@ This package contains data files used by libgnome-dekstop. %package -n libgnome-desktop-3-12 Summary: The GNOME Desktop API Library -Group: System/GUI/GNOME +Group: System/Libraries Requires: gsettings-desktop-schemas # Data files for libgnome-desktop, split in an own package for SLPP compliancy Requires: libgnome-desktop-3_0-common >= %{version} +# the library calls out to bwrap in order to fire up thumbnailers in a secure container +Requires: bubblewrap Recommends: %{name}-lang Provides: %{name} = %{version} %if %IS_DEFAULT_GNOME_DESKTOP @@ -91,7 +95,7 @@ on the desktop, but that cannot live in the platform for various reasons. %package -n typelib-1_0-GnomeDesktop-3_0 -Summary: The GNOME Desktop API Library -- Introspection bindings +Summary: Introspection bindings for the GNOME Desktop API library Group: System/Libraries %description -n typelib-1_0-GnomeDesktop-3_0 @@ -103,12 +107,12 @@ This package provides the GObject Introspection bindings for libgnome-desktop. %package -n libgnome-desktop-3-devel -Summary: The GNOME Desktop API Library -- Development Files +Summary: Development files for the GNOME Desktop API library Group: Development/Libraries/GNOME Requires: libgnome-desktop-3-12 = %{version} -Requires: typelib-1_0-GnomeDesktop-3_0 = %{version} # Needed as /usr/include/gnome-desktop-3.0/libgnome-desktop/gnome-xkb-info.h includes X11/extensions/XKBrules.h Requires: libxkbfile-devel +Requires: typelib-1_0-GnomeDesktop-3_0 = %{version} %if %IS_DEFAULT_GNOME_DESKTOP Provides: %{name}-devel = %{version} Obsoletes: %{name}-devel < %{version} @@ -122,8 +126,11 @@ on the desktop, but that cannot live in the platform for various reasons. %lang_package + %prep %setup -q +%patch0 -p1 +%patch1 -p1 %if !0%{?is_opensuse} translation-update-upstream %endif @@ -151,11 +158,8 @@ make %{?_smp_mflags} %if ! (%IS_DEFAULT_GNOME_DESKTOP || 0%{?BUILD_FROM_VCS}) rm %{buildroot}%{_datadir}/gnome/gnome-version.xml %endif -%{__rm} -vf %{buildroot}%{_libdir}/*.la -%fdupes %{buildroot} - -%clean -rm -rf %{buildroot} +rm -vf %{buildroot}%{_libdir}/*.la +%fdupes %{buildroot}/%{_prefix} %post -n libgnome-desktop-3-12 -p /sbin/ldconfig @@ -188,7 +192,6 @@ rm -rf %{buildroot} %files lang -f %{name}-3.0.lang %if %IS_DEFAULT_GNOME_DESKTOP || 0%{?BUILD_FROM_VCS} - %files -n gnome-version %defattr (-, root, root) %dir %{_datadir}/gnome