From 9e7609cb8e21dd2db21e92233366bfff24534c6ec9eba6f15842db15c839b1fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Sun, 7 Jan 2018 22:17:17 +0000 Subject: [PATCH 1/2] Accepting request 561891 from home:Zaitor:branches:GNOME:Factory - Update to version 3.26.2+20171218.15b1810a6: + background: don't leak wall clock when background changes. + dateMenu: - Fix possible crash with unknown locations. - Ignore malformed world-clocks settings. + dash: - Do not shadow ClutterActor's destroy(). - Make sure item labels are only destroyed once. + status/keyboard: Reset menuItems and Label objects on change. + overview: Protect ::drag-end handlers. + Updated translations. - Switch to git-checkout via source services. - Pass enable-browser-plugin=true, enable-documentation=true, enable-man=true, enable-networkmanager=yes and enable-systemd=yes to meson, ensure we build the features we want. - Following the above, add gtk-doc BuildRequires and build documentation again. - Run spec-cleaner, modernize spec. - Drop update-desktop-files BuildRequires and stop using the suse_update_desktop_file macro. - Drop conditional libaccountsservice0, libcaribou0 and libgdmgreeter1 Requires needed for no longer supported versions of openSUSE. - Add fdupes BuildRequires and pass fdupes macro, remove duplicate files. - Drop gnome-shell-wayland Obsoletes: No currently supported version of openSUSE have ever had this binary, so this is no longer needed. - Stop exporting BROWSER_PLUGIN_DIR=%%{_libdir}/browser-plugins, does not work as we are using meson buildsystem. OBS-URL: https://build.opensuse.org/request/show/561891 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=349 --- _service | 16 +++++ _servicedata | 4 ++ gnome-shell-3.26.2+20171218.15b1810a6.tar.xz | 3 + gnome-shell-3.26.2.tar.xz | 3 - gnome-shell.changes | 35 ++++++++++ gnome-shell.spec | 70 ++++++++++---------- 6 files changed, 94 insertions(+), 37 deletions(-) create mode 100644 _service create mode 100644 _servicedata create mode 100644 gnome-shell-3.26.2+20171218.15b1810a6.tar.xz delete mode 100644 gnome-shell-3.26.2.tar.xz diff --git a/_service b/_service new file mode 100644 index 0000000..10b9052 --- /dev/null +++ b/_service @@ -0,0 +1,16 @@ + + + + git://git.gnome.org/gnome-shell + git + gnome-3-26 + 3.26.2+%cd.%h + enable + + + *.tar + xz + + + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..772f0e3 --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + git://git.gnome.org/gnome-shell + 15b1810a615ec34f375395f4b93bef3eee04b85e \ No newline at end of file diff --git a/gnome-shell-3.26.2+20171218.15b1810a6.tar.xz b/gnome-shell-3.26.2+20171218.15b1810a6.tar.xz new file mode 100644 index 0000000..4956d4f --- /dev/null +++ b/gnome-shell-3.26.2+20171218.15b1810a6.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c3dc8b3f9810ef15d5f41510cf39a8b37f7f08c7fb3bb99af92ab437f5e14323 +size 1400028 diff --git a/gnome-shell-3.26.2.tar.xz b/gnome-shell-3.26.2.tar.xz deleted file mode 100644 index c02fdec..0000000 --- a/gnome-shell-3.26.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e5a87f2f838d981db9823352b90b2ce2f40d24d31ed9f062dccfa41b820e0b1c -size 1405580 diff --git a/gnome-shell.changes b/gnome-shell.changes index f13c31b..02483d5 100644 --- a/gnome-shell.changes +++ b/gnome-shell.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +Thu Jan 04 21:42:00 UTC 2018 - zaitor@opensuse.org + +- Update to version 3.26.2+20171218.15b1810a6: + + background: don't leak wall clock when background changes. + + dateMenu: + - Fix possible crash with unknown locations. + - Ignore malformed world-clocks settings. + + dash: + - Do not shadow ClutterActor's destroy(). + - Make sure item labels are only destroyed once. + + status/keyboard: Reset menuItems and Label objects on change. + + overview: Protect ::drag-end handlers. + + Updated translations. +- Switch to git-checkout via source services. +- Pass enable-browser-plugin=true, enable-documentation=true, + enable-man=true, enable-networkmanager=yes and + enable-systemd=yes to meson, ensure we build the features we + want. +- Following the above, add gtk-doc BuildRequires and build + documentation again. +- Run spec-cleaner, modernize spec. +- Drop update-desktop-files BuildRequires and stop using the + suse_update_desktop_file macro. +- Drop conditional libaccountsservice0, libcaribou0 and + libgdmgreeter1 Requires needed for no longer supported versions + of openSUSE. +- Add fdupes BuildRequires and pass fdupes macro, remove duplicate + files. +- Drop gnome-shell-wayland Obsoletes: No currently supported + version of openSUSE have ever had this binary, so this is no + longer needed. +- Stop exporting BROWSER_PLUGIN_DIR=%%{_libdir}/browser-plugins, + does not work as we are using meson buildsystem. + ------------------------------------------------------------------- Mon Nov 6 01:04:48 UTC 2017 - xwang@suse.com diff --git a/gnome-shell.spec b/gnome-shell.spec index 7327f69..fa3bc34 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -1,7 +1,7 @@ # # spec file for package gnome-shell # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -18,13 +18,15 @@ %global __requires_exclude typelib\\(Meta\\) Name: gnome-shell -Version: 3.26.2 +Version: 3.26.2+20171218.15b1810a6 Release: 0 Summary: GNOME Shell License: GPL-2.0+ Group: System/GUI/GNOME Url: https://wiki.gnome.org/Projects/GnomeShell -Source: https://download.gnome.org/sources/gnome-shell/3.26/%{name}-%{version}.tar.xz +#Source0: https://download.gnome.org/sources/gnome-shell/3.26/%%{name}-%%{version}.tar.xz +Source: %{name}-%{version}.tar.xz + # SOURCE-FEATURE-SLE aboutMenu fate#314545 dliang@suse.com -- Add an applet on login UI to display suse icon, product name, hostname. Source2: aboutMenu.js # SOURCE-FEATURE-SLE sle-background bsc#1007468 xwang@suse.com -- Add SUSE logo on lock screen for GNOME theme @@ -61,10 +63,11 @@ Patch1008: gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch # needed for directory ownership BuildRequires: dbus-1 BuildRequires: docbook-xsl-stylesheets +BuildRequires: fdupes BuildRequires: gcc-c++ +BuildRequires: gtk-doc BuildRequires: meson BuildRequires: pkgconfig -BuildRequires: update-desktop-files BuildRequires: xsltproc BuildRequires: pkgconfig(atk-bridge-2.0) BuildRequires: pkgconfig(gcr-base-3) >= 3.7.5 @@ -100,6 +103,7 @@ BuildRequires: pkgconfig(mutter-cogl-pango-1) >= 3.25.2 BuildRequires: pkgconfig(polkit-agent-1) >= 0.100 BuildRequires: pkgconfig(xtst) BuildRequires: python(abi) >= 3 + Requires: gdk-pixbuf-loader-rsvg ## Finally, dependencies for session services that are needed for system icons and the user menu # bluetooth system icon @@ -120,19 +124,11 @@ Recommends: %{name}-lang Recommends: NetworkManager-gnome # The dateTime applet in the panel launches gnome-clocks upon user request Recommends: gnome-clocks -#merged into gnome-shell in 3.19 -Obsoletes: gnome-shell-wayland # gnome-shell implements the dbus interface org.freedesktop.Notifications directly Provides: dbus(org.freedesktop.Notifications) %if !0%{?is_opensuse} BuildRequires: translation-update-upstream %endif -# 11.4 doesn't have typelib dependency -%if 0%{?suse_version} < 1210 -Requires: libaccountsservice0 -Requires: libcaribou0 -Requires: libgdmgreeter1 -%endif %description The GNOME Shell redefines user interactions with the GNOME desktop. In @@ -201,9 +197,14 @@ cp %{SOURCE3} data/theme/ %endif %build -export BROWSER_PLUGIN_DIR=%{_libdir}/browser-plugins %meson \ - --libexecdir=%{_libexecdir}/%{name} + --libexecdir=%{_libexecdir}/%{name} \ + -D enable-browser-plugin=true \ + -D enable-documentation=true \ + -D enable-man=true \ + -D enable-networkmanager=yes \ + -D enable-systemd=yes \ + %{nil} %meson_build %install @@ -212,23 +213,30 @@ export BROWSER_PLUGIN_DIR=%{_libdir}/browser-plugins install -d %{buildroot}%{_datadir}/gnome-shell/extensions # This is the directory where search providers get installed install -d %{buildroot}%{_datadir}/gnome-shell/search-providers - %find_lang %{name} %{?no_lang_C} -%suse_update_desktop_file org.gnome.Shell -%suse_update_desktop_file gnome-shell-extension-prefs # Work around race, as reported in bnc#844891 & bgo#709313. install -d %{buildroot}%{_datadir}/gnome-shell/modes +%fdupes %{buildroot}%{_prefix} %files -%defattr(-,root,root) -%doc COPYING README NEWS +%license COPYING +%doc README NEWS %{_bindir}/gnome-shell %{_bindir}/gnome-shell-extension-prefs +%dir %{_libdir}/gnome-shell +%dir %{_libexecdir}/gnome-shell %exclude %{_libexecdir}/gnome-shell/gnome-shell-calendar-server -%{_libexecdir}/gnome-shell/ -%if "%{_libdir}" != "%{_libexecdir}" -%{_libdir}/gnome-shell/ -%endif +%{_libexecdir}/gnome-shell/gnome-shell-hotplug-sniffer +%{_libexecdir}/gnome-shell/gnome-shell-perf-helper +%{_libexecdir}/gnome-shell/gnome-shell-portal-helper +%{_libdir}/gnome-shell/Gvc-1.0.typelib +%{_libdir}/gnome-shell/Shell-0.1.typelib +%{_libdir}/gnome-shell/ShellMenu-0.1.typelib +%{_libdir}/gnome-shell/St-1.0.typelib +%{_libdir}/gnome-shell/libgnome-shell-menu.so +%{_libdir}/gnome-shell/libgnome-shell.so +%{_libdir}/gnome-shell/libgvc.so +%{_libdir}/gnome-shell/libst-1.0.so %dir %{_datadir}/GConf %dir %{_datadir}/GConf/gsettings %{_datadir}/GConf/gsettings/gnome-shell-overrides.convert @@ -244,32 +252,26 @@ install -d %{buildroot}%{_datadir}/gnome-shell/modes %{_datadir}/dbus-1/services/org.gnome.Shell.PortalHelper.service %{_datadir}/glib-2.0/schemas/org.gnome.shell.gschema.xml %{_datadir}/gnome-control-center/keybindings/50-gnome-shell-system.xml -%{_datadir}/gnome-shell/ -%{_mandir}/man?/gnome-shell.* +%{_datadir}/gnome-shell/gnome-shell-theme.gresource +%{_datadir}/gnome-shell/perf-background.xml +%{_mandir}/man?/gnome-shell.?%{ext_man} %dir %{_datadir}/xdg-desktop-portal %dir %{_datadir}/xdg-desktop-portal/portals %{_datadir}/xdg-desktop-portal/portals/gnome-shell.portal %files devel -%defattr(-,root,root) +%doc %{_datadir}/gtk-doc/html %{_bindir}/gnome-shell-extension-tool %{_bindir}/gnome-shell-perf-tool -#dir %%{_datadir}/gtk-doc/html -#dir %%{_datadir}/gtk-doc/html/st -#dir %%{_datadir}/gtk-doc/html/shell -#{_datadir}/gtk-doc/html/st/ -#{_datadir}/gtk-doc/html/shell/ +%{_datadir}/gnome-shell/*.gir %files browser-plugin -%defattr(-,root,root) %doc browser-plugin/README -#%%{_libdir}/browser-plugins/libgnome-shell-browser-plugin.* %dir %{_libdir}/mozilla/plugins/ %dir %{_libdir}/mozilla %{_libdir}/mozilla/plugins/libgnome-shell-browser-plugin.* %files calendar -%defattr(-,root,root) %{_datadir}/applications/evolution-calendar.desktop %{_libexecdir}/gnome-shell/gnome-shell-calendar-server %{_datadir}/dbus-1/services/org.gnome.Shell.CalendarServer.service From 9272333dca8b43567306ddd1c6888ce52551531c942b79491c11c8970667dcdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Thu, 11 Jan 2018 15:34:53 +0000 Subject: [PATCH 2/2] Accepting request 563346 from home:Zaitor:branches:GNOME:Factory - Add gnome-shell-network-fix-visibility-VPN.patch: network: Fix visibility of VPN section (bgo#787845). - Own directories {_datadir}/gnome-shell/extensions|search-providers|modes again, seems a lot of packages depended on this beeing true. OBS-URL: https://build.opensuse.org/request/show/563346 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=350 --- gnome-shell-network-fix-visibility-VPN.patch | 36 ++++++++++++++++++++ gnome-shell.changes | 9 +++++ gnome-shell.spec | 7 ++++ 3 files changed, 52 insertions(+) create mode 100644 gnome-shell-network-fix-visibility-VPN.patch diff --git a/gnome-shell-network-fix-visibility-VPN.patch b/gnome-shell-network-fix-visibility-VPN.patch new file mode 100644 index 0000000..b84d756 --- /dev/null +++ b/gnome-shell-network-fix-visibility-VPN.patch @@ -0,0 +1,36 @@ +From f91fbd7728061d0f66777c91c0a981792e0fada7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20M=C3=BCllner?= +Date: Thu, 21 Dec 2017 16:51:28 +0100 +Subject: network: Fix visibility of VPN section + +Commit f2a9467f91b was too eager to simplify the code, and removed +the bits that hid the section in case no VPNs are set up - add them +back to fix the visibility. + +https://bugzilla.gnome.org/show_bug.cgi?id=787845 +--- + js/ui/status/network.js | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/js/ui/status/network.js b/js/ui/status/network.js +index 9575af7..ad373f6 100644 +--- a/js/ui/status/network.js ++++ b/js/ui/status/network.js +@@ -1492,6 +1492,15 @@ var NMVPNSection = new Lang.Class({ + this.parent(client); + + this.item.menu.addSettingsAction(_("VPN Settings"), 'gnome-network-panel.desktop'); ++ ++ this._sync(); ++ }, ++ ++ _sync: function() { ++ let nItems = this._connectionItems.size; ++ this.item.actor.visible = (nItems > 0); ++ ++ this.parent(); + }, + + _getDescription: function() { +-- +cgit v0.12 diff --git a/gnome-shell.changes b/gnome-shell.changes index 02483d5..b113192 100644 --- a/gnome-shell.changes +++ b/gnome-shell.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Jan 10 15:16:56 UTC 2018 - zaitor@opensuse.org + +- Add gnome-shell-network-fix-visibility-VPN.patch: network: Fix + visibility of VPN section (bgo#787845). +- Own directories + {_datadir}/gnome-shell/extensions|search-providers|modes again, + seems a lot of packages depended on this beeing true. + ------------------------------------------------------------------- Thu Jan 04 21:42:00 UTC 2018 - zaitor@opensuse.org diff --git a/gnome-shell.spec b/gnome-shell.spec index fa3bc34..50ab1ad 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -41,6 +41,8 @@ Patch2: gnome-shell-disable-ibus-when-not-installed.patch Patch3: gnome-shell-Avoid-loginDialog-grab-focus-when-locked.patch # PATCH-FIX-UPSTREAM gnome-shell-osk-dont-popup-when-not-needed.patch bgo#788188 badshah400@gmail.com -- Stop the on-screen keyboard from showing up when touchscreen use doesn't activate a text field; patch taken from upstream bug report Patch4: gnome-shell-osk-dont-popup-when-not-needed.patch +# PATCH-FIX-UPSTREAM gnome-shell-network-fix-visibility-VPN.patch bgo#787845 zaitor@opensuse.org -- network: Fix visibility of VPN section +Patch5: gnome-shell-network-fix-visibility-VPN.patch ## NOTE: Keep SLE-only patches at bottom (starting on 1000). # PATCH-FEATURE-SLE gnome-shell-gdm-login-applet.patch fate#314545 dliang@suse.com -- Add an applet on login UI to display suse icon, product name, hostname. @@ -179,6 +181,7 @@ into GNOME Shell calendar. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %if !0%{?is_opensuse} %patch1001 -p1 @@ -252,6 +255,10 @@ install -d %{buildroot}%{_datadir}/gnome-shell/modes %{_datadir}/dbus-1/services/org.gnome.Shell.PortalHelper.service %{_datadir}/glib-2.0/schemas/org.gnome.shell.gschema.xml %{_datadir}/gnome-control-center/keybindings/50-gnome-shell-system.xml +# Own these dirs for extensions, search-providers and work around a race condition +%dir %{_datadir}/gnome-shell/extensions +%dir %{_datadir}/gnome-shell/search-providers +%dir %{_datadir}/gnome-shell/modes %{_datadir}/gnome-shell/gnome-shell-theme.gresource %{_datadir}/gnome-shell/perf-background.xml %{_mandir}/man?/gnome-shell.?%{ext_man}