![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
From 1819d1fdadcf51a0443598a802b1a0eb46e6c7ee Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger
Date: Wed, 13 Jul 2016 18:03:58 +0200 Subject: [PATCH] build: Add necessary rpath to the private gnome-shell
Hello community, here is the log from the commit of package gnome-shell for openSUSE:Factory checked in at 2016-09-21 18:39:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-shell (Old) and /work/SRC/openSUSE:Factory/.gnome-shell.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-shell" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-shell/gnome-shell.changes 2016-09-11 00:52:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-shell.new/gnome-shell.changes 2016-09-21 18:39:56.000000000 +0200 @@ -1,0 +2,132 @@ +Mon Sep 19 22:59:37 UTC 2016 - zaitor@opensuse.org + +- Update to version 3.22.0: + + Misc. bug fixes: bgo#771391, bgo#771536, bgo#771656. + + Updated translations. + +------------------------------------------------------------------- +Tue Sep 13 20:55:50 UTC 2016 - zaitor@opensuse.org + +- Update to version 3.21.92: + + Adjust screen capture to work with multiple stage views + (bgo#770128). + + Improve handling of cycle shortcuts (bgo#771063). + + Fix windows not getting undimmed in some cases (bgo#770163, + bgo#752524). + + Disable extension version check by default (bgo#770887). + + Misc. bug fixes: bgo#770382, bgo#770888, bgo#770328. + + Updated translations. + +------------------------------------------------------------------- +Fri Sep 9 16:41:00 CST 2016 - cxiong@suse.com + +- Fix gnome-shell-gdm-login-applet.patch (boo#995296) + + Fix aboutMenu's distribution name to be more general, like openSUSE Leap + support. + +------------------------------------------------------------------- +Tue Aug 30 11:28:02 UTC 2016 - zaitor@opensuse.org + +- Update to version 3.21.91: + + Updated translations. + +------------------------------------------------------------------- +Fri Aug 19 22:16:19 UTC 2016 - zaitor@opensuse.org + +- Update to version 3.21.90.1: + + Add translator comments to .desktop files. + + recorder: Print absolute path if output file can't be opened. + + Updated translations. + +------------------------------------------------------------------- +Fri Aug 19 22:16:18 UTC 2016 - zaitor@opensuse.org + +- Update to version 3.21.90: + + Improve on-screen keyboard on wayland (bgo#765009). + + Bugs fixed: bgo#769156, bgo#769216, bgo#769074. + + Updated translations. +- Drop intltool BuildRequires following upstream changes. +- Drop gnome-shell-fix-missing-return.patch: Fixed upstream. + +------------------------------------------------------------------- +Fri Aug 19 22:16:17 UTC 2016 - zaitor@opensuse.org + +- Add global Requires exclude for the now private typelib(Meta) + from mutter. +- Following the above, add an explicit mutter Requires to ensure + pulling in mutter with the now private typelib. + +------------------------------------------------------------------- +Fri Aug 19 22:16:16 UTC 2016 - badshah400@gmail.com + +- Update to version 3.21.4: + + overview: Fix switching workspaces when scrolling on + non-primary monitors (bgo#766883, bgo#768316). + + Fix crash when using screen recorder under wayland + (bgo#767001). + + Update theme on video memory purge errors (bgo#739178). + + Free old backgrounds immediately (bgo#766353). + + Add support for system upgrades to end session dialog + (bgo#763611). + + Fix maximized windows flickering to the wrong size on restart + (bgo#761566). + + Hide ignored events in calendar as well (bgo#768538). + + calendar: Only hide dismissed occurrence of recurring event + (bgo#748226). + + Provide org.freedesktop.impl.portal.access implementation + (bgo#768669). + + Bugs fixed: bgo#767954, bgo#768317, bgo#746867, bgo#762206, + bgo#768956, bgo#768979. + + Updated translations. +- Drop gnome-shell-background-free-MetaBackground.patch: Fixed + upstream. + +------------------------------------------------------------------- +Fri Aug 19 22:16:15 UTC 2016 - dimstar@opensuse.org + +- Add gnome-shell-linking.patch: Fix linking the private mutter + libraries. +- Add gnome-commons BuildRequires and call to autoreconf, as above + patch touches the buildsystem. + +------------------------------------------------------------------- +Fri Aug 19 22:16:14 UTC 2016 - zaitor@opensuse.org + +- Update to version 3.21.3: + + Do not disable suspend action when locked (bgo#725960). + + Remember input sources MRU list (bgo#766826). + + networkAgent: Handle VPN service aliases (bgo#658484). + + Plug a memory leak (bgo#710230). + + Updated translations. + +------------------------------------------------------------------- +Fri Aug 19 22:16:13 UTC 2016 - zaitor@opensuse.org + +- Update to version 3.21.2: + + Fix sorting of hidden apps in app switcher (bgo#766238). + + Set logind's LockedHint property when locked (bgo#764773). + + Allocate framebuffers early to fix a crash on NVIDIA + (bgo#764898). + + Fix cycle-windows/cycle-group keybindings (bgo#730739). + + Switch to shared desktop schema for calendar settings + (bgo#766318). + + Misc. bug fixes: bgo#766325, bgo#758471, bgo#757556, + bgo#757019, bgo#766598. + + Updated translations. + +------------------------------------------------------------------- +Fri Aug 19 22:16:12 UTC 2016 - zaitor@opensuse.org + +- Update to version 3.21.1: + + Save screencasts in HOME if XDG_VIDEO_DIR doesn't exist + (bgo#765015). + + Don't show orientation lock when g-s-d won't rotate + (bgo#765267). + + Misc. bug fixes: bgo#722752, bgo#765061, bgo#763068, + bgo#765607, bgo#757676, bgo#760439. + + Updated translations. +- Replace pkgconfig(clutter-1.0) for pkgconfig(mutter-clutter-1.0) + and pkgconfig(mutter-cogl-pango-1.0) BuildRequires following + upstreams merge of clutter/cogl into mutter. + +------------------------------------------------------------------- Old: ---- gnome-shell-3.20.4.tar.xz gnome-shell-fix-missing-return.patch New: ---- gnome-shell-3.22.0.tar.xz gnome-shell-linking.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-shell.spec ++++++ --- /var/tmp/diff_new_pack.FGr8qn/_old 2016-09-21 18:39:58.000000000 +0200 +++ /var/tmp/diff_new_pack.FGr8qn/_new 2016-09-21 18:39:58.000000000 +0200 @@ -16,19 +16,23 @@ # +%global __requires_exclude typelib\\(Meta\\) + Name: gnome-shell -Version: 3.20.4 +Version: 3.22.0 Release: 0 Summary: GNOME Shell License: GPL-2.0+ Group: System/GUI/GNOME Url: http://live.gnome.org/GnomeShell -Source: http://download.gnome.org/sources/gnome-shell/3.20/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/gnome-shell/3.22/%{name}-%{version}.tar.xz # SOURCE-FEATURE-SLE SLE-Classic specific core extension file, see bnc#862615 Source1: SLEClassicExt.js # SOURCE-FEATURE-SLE The SLE theme, with icons/background/gnome-shell.css, works with gnome-shell-sle-theme.patch Source2: SLE-theme.tar.gz -# PATCH-FIX-UPSTREAM gnome-shell-private-connection.patch bnc#751211 bgo#646187 dimstar@opensuse.org -- create private connections if the user is not authorized +# PATCH-FIX-UPSTREAM gnome-shell-linking.patch bgo#768781 dimstar@opensuse.org -- Fix linking the various libs in private directories +Patch0: gnome-shell-linking.patch +# PATCH-NEEDS-REBASE gnome-shell-private-connection.patch bnc#751211 bgo#646187 dimstar@opensuse.org -- create private connections if the user is not authorized Was PATCH-FIX-UPSTREAM Patch1: gnome-shell-private-connection.patch # PATCH-FIX-OPENSUSE gnome-shell-disable-ibus-when-not-installed.patch bsc#987360 qzhao@suse.com -- disable ibus start when outof Chinese, Japanese, Korean area. Patch2: gnome-shell-disable-ibus-when-not-installed.patch @@ -52,25 +56,22 @@ Patch11: gs-fate318433-prevent-same-account-multi-logins.patch # PATCH-FEATURE-SLE gnome-shell-sle-theme.patch dliang@suse.com -- Use sle theme avatar Patch12: gnome-shell-sle-theme.patch -# PATCH-FIX-UPSTREAM gnome-shell-fix-missing-return.patch zaitor@opensuse.org -- Fix a missing return, patch from upstream stable git. -Patch13: gnome-shell-fix-missing-return.patch ## NOTE: Keep SLE Classic pathes at bottom. # PATCH-FEATURE-SLE gs-sle-classic-ext.patch bnc#862615 cxiong@suse.com -- add SLE Classic support Patch1000: gs-sle-classic-ext.patch - BuildRequires: docbook-xsl-stylesheets BuildRequires: gcc-c++ -BuildRequires: intltool %if !0%{?is_opensuse} BuildRequires: translation-update-upstream %endif +# Needed for patch2 +BuildRequires: gnome-common BuildRequires: update-desktop-files BuildRequires: xsltproc BuildRequires: python(abi) >= 3 # needed for directory ownership BuildRequires: dbus-1 BuildRequires: pkgconfig(atk-bridge-2.0) -BuildRequires: pkgconfig(clutter-1.0) >= 1.21.5 BuildRequires: pkgconfig(gcr-base-3) >= 3.7.5 BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gio-2.0) >= 2.45.3 @@ -78,8 +79,8 @@ BuildRequires: pkgconfig(gnome-bluetooth-1.0) >= 3.9.0 BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.7.90 BuildRequires: pkgconfig(gnome-keybindings) -BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.45.4 -BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.19.2 +BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.49.1 +BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.21.2 BuildRequires: pkgconfig(gstreamer-1.0) >= 0.11.92 BuildRequires: pkgconfig(gstreamer-base-1.0) BuildRequires: pkgconfig(gtk+-3.0) >= 3.15.0 @@ -89,7 +90,7 @@ BuildRequires: pkgconfig(libcroco-0.6) >= 0.6.8 BuildRequires: pkgconfig(libedataserver-1.2) >= 3.5.3 BuildRequires: pkgconfig(libgnome-menu-3.0) >= 3.5.3 -BuildRequires: pkgconfig(libmutter) >= 3.20.1 +BuildRequires: pkgconfig(libmutter) >= 3.22.0 BuildRequires: pkgconfig(libnm-glib) BuildRequires: pkgconfig(libnm-gtk) >= 0.9.8 BuildRequires: pkgconfig(libnm-util) >= 0.9.8 @@ -99,6 +100,8 @@ BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(libstartup-notification-1.0) >= 0.11 BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(mutter-clutter-1.0) >= 1.26.1 +BuildRequires: pkgconfig(mutter-cogl-pango-1.0) BuildRequires: pkgconfig(polkit-agent-1) >= 0.100 BuildRequires: pkgconfig(telepathy-glib) >= 0.17.5 BuildRequires: pkgconfig(telepathy-logger-0.2) >= 0.2.4 @@ -121,6 +124,8 @@ Requires: libcaribou0 Requires: libgdmgreeter1 %endif +# Due to now private typelib(Meta) +Requires: mutter Recommends: %{name}-browser-plugin Recommends: %{name}-calendar Recommends: %{name}-lang @@ -174,11 +179,14 @@ %description calendar This package adds support for Evolution Calendar, such as appointments into GNOME Shell calendar. + %lang_package %prep %setup -q -%patch1 -p1 +%patch0 -p1 +# Needs rebase +#patch1 -p1 %patch2 -p1 %if !0%{?is_opensuse} %patch3 -p1 @@ -195,7 +203,6 @@ %patch12 -p1 %endif %endif -%patch13 -p1 %if !0%{?is_opensuse} %patch1000 -p1 translation-update-upstream @@ -203,12 +210,14 @@ cp %{S:1} js/ui/ %build +# Needed for patch2 +autoreconf -fiv export BROWSER_PLUGIN_DIR=%{_libdir}/browser-plugins %configure \ --disable-static \ --libexecdir=%{_libexecdir}/%{name} \ --enable-compile-warnings=no -%__make %{?_smp_mflags} V=1 +%__make %{?_smp_mflags} %install %makeinstall @@ -269,6 +278,9 @@ %{_datadir}/gnome-shell/ %{_datadir}/icons/* %doc %{_mandir}/man?/gnome-shell.* +%dir %{_datadir}/xdg-desktop-portal +%dir %{_datadir}/xdg-desktop-portal/portals +%{_datadir}/xdg-desktop-portal/portals/gnome-shell.portal %files devel %defattr(-,root,root) ++++++ gnome-shell-3.20.4.tar.xz -> gnome-shell-3.22.0.tar.xz ++++++ ++++ 94461 lines of diff (skipped) ++++++ gnome-shell-gdm-login-applet.patch ++++++ --- /var/tmp/diff_new_pack.FGr8qn/_old 2016-09-21 18:39:59.000000000 +0200 +++ /var/tmp/diff_new_pack.FGr8qn/_new 2016-09-21 18:39:59.000000000 +0200 @@ -4,11 +4,11 @@ js/ui/sessionMode.js | 2 - 3 files changed, 74 insertions(+), 1 deletion(-) -Index: gnome-shell-3.20.1/js/ui/aboutMenu.js +Index: gnome-shell-3.20.4/js/ui/aboutMenu.js =================================================================== --- /dev/null -+++ gnome-shell-3.20.1/js/ui/aboutMenu.js -@@ -0,0 +1,106 @@ ++++ gnome-shell-3.20.4/js/ui/aboutMenu.js +@@ -0,0 +1,115 @@ +// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- + +const GLib = imports.gi.GLib; @@ -46,23 +46,32 @@ + vbox = new St.BoxLayout({vertical: true}); + hbox.add(vbox); + -+ this._os_release = Gio.File.new_for_path('/etc/os-release'); -+ let success, contents, tag; ++ ///// Section: read '/etc/os-release' to get pretty name ++ // ++ // Note: previously this is defaulted to 'SUSE Linux Enterprise', now ++ // let's use a "safer" option. ++ let sysinfo_text = 'SUSE Linux'; + try { -+ [success, contents, tag] = this._os_release.load_contents(null); -+ } catch (e) { -+ contents = 'SUSE Linux Enterprise'; ++ let success, contents, tag; ++ let _os_release = Gio.File.new_for_path('/etc/os-release'); ++ [success, contents, tag] = _os_release.load_contents(null); ++ ++ let osReleaseContentStr = contents.toString(); ++ let prettyNameReg = /^PRETTY_NAME="(.+)"/; ++ let match = null; ++ for (let line of osReleaseContentStr.split('\n')) { ++ match = prettyNameReg.exec(line); ++ if (match) { ++ sysinfo_text = match[1]; ++ } ++ } + } -+ let match = new RegExp('(.+)PRETTY_NAME=(.+)ID(.+)').exec(contents.toString().replace(/\n/g, ' ')); -+ let sysinfo_text; -+ if (!match) { -+ sysinfo_text = 'SUSE Linux Enterprise'; -+ } else { -+ sysinfo_text = match[2].toString().replace(/"/g, ' '); ++ catch (e) { ++ // NOTE soft fail, 'sysinfo_text' is the default ++ warn('ERROR: fail to read /etc/os-release'); + } + -+ this._sysinfo = new St.Label({ text: sysinfo_text, -+ can_focus: true }); ++ this._sysinfo = new St.Label({ text: sysinfo_text, can_focus: true }); + vbox.add(this._sysinfo); + this.actor.hide(); + @@ -115,10 +124,10 @@ + }, + +}); -Index: gnome-shell-3.20.1/js/ui/panel.js +Index: gnome-shell-3.20.4/js/ui/panel.js =================================================================== ---- gnome-shell-3.20.1.orig/js/ui/panel.js -+++ gnome-shell-3.20.1/js/ui/panel.js +--- gnome-shell-3.20.4.orig/js/ui/panel.js ++++ gnome-shell-3.20.4/js/ui/panel.js @@ -755,6 +755,7 @@ const AggregateMenu = new Lang.Class({ }); @@ -127,10 +136,10 @@ 'activities': ActivitiesButton, 'aggregateMenu': AggregateMenu, 'appMenu': AppMenuButton, -Index: gnome-shell-3.20.1/js/ui/sessionMode.js +Index: gnome-shell-3.20.4/js/ui/sessionMode.js =================================================================== ---- gnome-shell-3.20.1.orig/js/ui/sessionMode.js -+++ gnome-shell-3.20.1/js/ui/sessionMode.js +--- gnome-shell-3.20.4.orig/js/ui/sessionMode.js ++++ gnome-shell-3.20.4/js/ui/sessionMode.js @@ -48,7 +48,7 @@ const _modes = { unlockDialog: imports.gdm.loginDialog.LoginDialog, components: ['polkitAgent'], @@ -140,10 +149,10 @@ center: ['dateMenu'], right: ['a11yGreeter', 'keyboard', 'aggregateMenu'], }, -Index: gnome-shell-3.20.1/js/js-resources.gresource.xml +Index: gnome-shell-3.20.4/js/js-resources.gresource.xml =================================================================== ---- gnome-shell-3.20.1.orig/js/js-resources.gresource.xml -+++ gnome-shell-3.20.1/js/js-resources.gresource.xml +--- gnome-shell-3.20.4.orig/js/js-resources.gresource.xml ++++ gnome-shell-3.20.4/js/js-resources.gresource.xml @@ -25,7 +25,7 @@ <file>misc/params.js</file> <file>misc/smartcardManager.js</file> ++++++ gnome-shell-linking.patch ++++++ libraries Since mutter cloned some libraries (cogl, clutter) and installs them in a private directory, gnome-shell's libraries need to have information where to load them from. This is done using -rpath, but as libtool does not like multiple -rpath in the command line (and it adds one on its own for linking our own libs) we pass the 'libtool' variant for -rpath: -R The linking / runtime issue only surfaces when users/distros build using -Wl,--as-needed. Otherwise some of the parent libs seem to pull in the needed rpath as well. --- src/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index e9aacfe..1e59b23 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -321,14 +321,14 @@ libgnome_shell_libadd = \ gvc/libgvc.la \ $(NULL) -libgnome_shell_menu_la_LDFLAGS = $(libgnome_shell_ldflags) +libgnome_shell_menu_la_LDFLAGS = $(libgnome_shell_ldflags) -R$(MUTTER_TYPELIB_DIR) libgnome_shell_menu_la_LIBADD = $(GNOME_SHELL_LIBS) libgnome_shell_menu_la_CPPFLAGS = $(GNOME_SHELL_CFLAGS) libgnome_shell_base_la_LIBADD = $(libgnome_shell_libadd) libgnome_shell_base_la_CPPFLAGS = $(gnome_shell_cflags) -libgnome_shell_la_LDFLAGS = $(libgnome_shell_ldflags) +libgnome_shell_la_LDFLAGS = $(libgnome_shell_ldflags) -R$(MUTTER_TYPELIB_DIR) libgnome_shell_la_LIBADD = $(GNOME_SHELL_LIBS) $(MUTTER_LIBS) libgnome-shell-base.la libgnome_shell_la_CPPFLAGS = $(MUTTER_CFLAGS) $(gnome_shell_cflags) -- 2.9.0