Accepting request 637370 from GNOME:Factory
- Update spec file:
+ Update build dependency versions according to meson.build.
+ No longer recommend lang package as it already supplements main
package (same effect, it's redundant).
Note that I've linked latest meson (0.47.2) to my branch project in order to make gnome-shell build. (forwarded request 636246 from 1Antoine1)
OBS-URL: https://build.opensuse.org/request/show/637370
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-shell?expand=0&rev=154
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
6a20bac1bc
14
_service
14
_service
@ -1,14 +0,0 @@
|
||||
<services>
|
||||
<service mode="disabled" name="tar_scm">
|
||||
<param name="url">https://gitlab.gnome.org/GNOME/gnome-shell.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="revision">gnome-3-28</param>
|
||||
<param name="versionformat">3.28.3+%cd.%h</param>
|
||||
<param name="changesgenerate">enable</param>
|
||||
</service>
|
||||
<service mode="disabled" name="recompress">
|
||||
<param name="file">*.tar</param>
|
||||
<param name="compression">xz</param>
|
||||
</service>
|
||||
<service mode="disabled" name="set_version" />
|
||||
</services>
|
||||
@ -1,4 +0,0 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">https://gitlab.gnome.org/GNOME/gnome-shell.git</param>
|
||||
<param name="changesrevision">2a2f3c981e110c1b6a12d7035db829b8f8f9c243</param></service></servicedata>
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:65ef8c2c3920519a5bd8403db5c177cf8f5c350745d18e557aba0bdd69d8a087
|
||||
size 1421868
|
||||
3
gnome-shell-3.30.0.tar.xz
Normal file
3
gnome-shell-3.30.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:621e297258cd3185844efde838934de305cdef25c23f998581da56367ef1f239
|
||||
size 1433516
|
||||
@ -1,78 +0,0 @@
|
||||
From c82cb918ae8d2dc0b737dc83d4669d3e4bd15ef0 Mon Sep 17 00:00:00 2001
|
||||
From: Lubomir Rintel <lkundrak@v3.sk>
|
||||
Date: Thu, 11 Jan 2018 10:50:45 +0100
|
||||
Subject: [PATCH] network: initialize the agent asynchronously
|
||||
|
||||
This also bumps the NM requirement. We actually already use API from
|
||||
1.0, but regularly hit various NetworkManager bugs with versions prior
|
||||
to 1.10.2. 1.10.4 fixes the asynchronous agent initialization.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=789811
|
||||
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/63
|
||||
---
|
||||
js/ui/components/networkAgent.js | 21 +++++++++++++--------
|
||||
meson.build | 2 +-
|
||||
2 files changed, 14 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/js/ui/components/networkAgent.js b/js/ui/components/networkAgent.js
|
||||
index 75f4203..9050b8a 100644
|
||||
--- a/js/ui/components/networkAgent.js
|
||||
+++ b/js/ui/components/networkAgent.js
|
||||
@@ -604,12 +604,17 @@ var NetworkAgent = new Lang.Class({
|
||||
|
||||
this._native.connect('new-request', this._newRequest.bind(this));
|
||||
this._native.connect('cancel-request', this._cancelRequest.bind(this));
|
||||
- try {
|
||||
- this._native.init(null);
|
||||
- } catch(e) {
|
||||
- this._native = null;
|
||||
- logError(e, 'error initializing the NetworkManager Agent');
|
||||
- }
|
||||
+
|
||||
+ this._initialized = false;
|
||||
+ this._native.init_async(GLib.PRIORITY_DEFAULT, null, (o, res) => {
|
||||
+ try {
|
||||
+ this._native.init_finish(res);
|
||||
+ this._initialized = true;
|
||||
+ } catch(e) {
|
||||
+ this._native = null;
|
||||
+ logError(e, 'error initializing the NetworkManager Agent');
|
||||
+ }
|
||||
+ });
|
||||
},
|
||||
|
||||
enable() {
|
||||
@@ -617,7 +622,7 @@ var NetworkAgent = new Lang.Class({
|
||||
return;
|
||||
|
||||
this._native.auto_register = true;
|
||||
- if (!this._native.registered)
|
||||
+ if (this._initialized && !this._native.registered)
|
||||
this._native.register_async(null, null);
|
||||
},
|
||||
|
||||
@@ -640,7 +645,7 @@ var NetworkAgent = new Lang.Class({
|
||||
return;
|
||||
|
||||
this._native.auto_register = false;
|
||||
- if (this._native.registered)
|
||||
+ if (this._initialized && this._native.registered)
|
||||
this._native.unregister_async(null, null);
|
||||
},
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index bfc2ff7..1c0b68c 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -31,7 +31,7 @@ ibus_req = '>= 1.5.2'
|
||||
|
||||
bt_req = '>= 3.9.0'
|
||||
gst_req = '>= 0.11.92'
|
||||
-nm_req = '>= 0.9.8'
|
||||
+nm_req = '>= 1.10.4'
|
||||
secret_req = '>= 0.18'
|
||||
|
||||
gnome = import('gnome')
|
||||
--
|
||||
libgit2 0.27.0
|
||||
|
||||
@ -1,3 +1,100 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 18 05:28:15 UTC 2018 - antoine.belvire@opensuse.org
|
||||
|
||||
- Update spec file:
|
||||
+ Update build dependency versions according to meson.build.
|
||||
+ No longer recommend lang package as it already supplements main
|
||||
package (same effect, it's redundant).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 6 01:58:32 UTC 2018 - luc14n0@linuxmail.org
|
||||
|
||||
- Update to version 3.30.0:
|
||||
+ Updated translations.
|
||||
- Re-enable translation-update-upstream call: the previous issue
|
||||
has been fixed.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Sep 1 23:46:08 UTC 2018 - luc14n0@linuxmail.org
|
||||
|
||||
- Update to version 3.29.92:
|
||||
+ Choose some actors to cache on the GPU (bgo#792633).
|
||||
+ inputMethod: Hide preedit text if requested
|
||||
(glgo#GNOME/gnome-shell#431).
|
||||
+ Fix forced fallback app-menus on wayland
|
||||
(glgo#GNOME/gnome-shell#276).
|
||||
+ Updated translations.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 21 13:16:10 UTC 2018 - dimstar@opensuse.org
|
||||
|
||||
- Update to version 3.29.91:
|
||||
+ Fix handling of 0/false options in ShowOSD D-Bus API
|
||||
(bgo#791669).
|
||||
+ overview: Fix handling of confirmation dialogs on wayland.
|
||||
+ Avoid some full relayout/redraws.
|
||||
+ Keep workspace switcher slid out when workspaces are in use.
|
||||
+ Ignore auto-repeat for some keybindings
|
||||
(glgo#GNOME/gnome-shell#373).
|
||||
+ Misc. bug fixes (glgo#GNOME/gnome-shell#464).
|
||||
+ Updated translations.
|
||||
- Drop gnome-shell-fix-build-new-meson47.patch: fixed upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 3 20:22:48 UTC 2018 - bjorn.lie@gmail.com
|
||||
|
||||
- Update to version 3.29.90:
|
||||
+ Add remote access indication on wayland.
|
||||
+ Fix wrong window positions in overview on wayland.
|
||||
+ Add gesture to unfullscreen a window.
|
||||
+ Add PickColor method to screenshot D-Bus interface.
|
||||
+ Consider "new-window" action when opening new windows.
|
||||
+ Make workspace switching gestures follow motion.
|
||||
+ Support audio volumes above 100%.
|
||||
+ Misc. bug fixes: glgo#GNOME/gnome-shell#424,
|
||||
glgo#GNOME/gnome-shell!132, glgo#GNOME/gnome-shell!182,
|
||||
glgo#GNOME/gnome-shell#433, glgo#GNOME/gnome-shell!179,
|
||||
bgo#786496.
|
||||
+ Updated translations.
|
||||
- Drop gnome-shell-fix-wrong-systemd-user-unit-location.patch:
|
||||
Fixed upstream.
|
||||
- Disable t-u-u, currently broken and needs fixing.
|
||||
- Add gnome-shell-fix-build-new-meson47.patch: build: Fix build
|
||||
with meson >= 47.0.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 25 03:08:14 UTC 2018 - luc14n0@linuxmail.org
|
||||
|
||||
- Update to version 3.29.4:
|
||||
+ Fix "Clear All" for calendar events
|
||||
(glgo#GNOME/gnome-shell#325).
|
||||
+ Allow cancelling direct switch operations
|
||||
(glgo#GNOME/gnome-shell#315).
|
||||
+ Support being started by systemd --user.
|
||||
+ Support key event forwarding required by some input methods
|
||||
(glgo#GNOME/gnome-shell#275).
|
||||
+ Misc. bug fixes and cleanups: bgo#663461,
|
||||
glgo#GNOME/gnome-shell#372, glgo#GNOME/gnome-shell#414.
|
||||
+ Updated translations.
|
||||
- Changes from version 3.29.3:
|
||||
+ Save creation time in screenshot metadata (bgo#790481).
|
||||
+ Improve consistency between ctrl- and middle-click on app icons
|
||||
(glgo#GNOME/gnome-shell#316).
|
||||
+ Add support for font-feature-settings CSS property
|
||||
(glgo#GNOME/gnome-shell#34).
|
||||
+ Adjust to MetaScreen removal (bgo#759538).
|
||||
+ Misc. bug fixes: glgo#GNOME/gnome-shell#298, bgo#788931,
|
||||
glgo#GNOME/gnome-shell#26, glgo#GNOME/gnome-shell#76,
|
||||
bgo#788882, bgo#791233.
|
||||
+ Updated translations.
|
||||
- Add gnome-shell-fix-wrong-systemd-user-unit-location.patch:
|
||||
provided by upstream.
|
||||
- Replace pkgconfig(libmutter-2), pkgconfig(mutter-clutter-2),
|
||||
pkgconfig(mutter-cogl-2) and pkgconfig(mutter-cogl-pango-2) with
|
||||
pkgconfig(libmutter-3), pkgconfig(mutter-clutter-3),
|
||||
pkgconfig(mutter-cogl-3) and pkgconfig(mutter-cogl-pango-3)
|
||||
BuildRequires following upstreams changes.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 24 19:56:24 UTC 2018 - bjorn.lie@gmail.com
|
||||
|
||||
@ -25,6 +122,33 @@ Mon Jul 23 18:39:09 UTC 2018 - bjorn.lie@gmail.com
|
||||
+ st-label: Unset clutter text instance on disposal.
|
||||
+ Updated translations.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 22 01:07:40 UTC 2018 - luc14n0@linuxmail.org
|
||||
|
||||
- Update to version 3.29.2:
|
||||
+ Guard against untimely keyboard map changes
|
||||
(glgo#GNOME/gnome-shell#240).
|
||||
+ Fixes:
|
||||
- Icons in search provider results
|
||||
(glgo#GNOME/gnome-shell#249).
|
||||
- Blurriness of OSD under some resolutions (bgo#782011).
|
||||
- Lagging pointer when zoomed (bgo#682013).
|
||||
+ Misc. bug fixes: glgo#GNOME/gnome-shell#244,
|
||||
glgo#GNOME/gnome-shell#136, glgo#GNOME/gnome-shell#214,
|
||||
glgo#GNOME/gnome-shell#294, bgo#787871, bgo#781471.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jun 3 02:06:15 UTC 2018 - luc14n0@linuxmail.org
|
||||
|
||||
- Update to version 3.29.1:
|
||||
+ Support icons in app-menu (bgo#760985).
|
||||
+ Misc. bug fixes: bgo#792687, glgo#GNOME/gnome-shell#221.
|
||||
+ Updated translations.
|
||||
- Drop:
|
||||
+ source service and use upstream tarball once more: the
|
||||
situation has been normalized.
|
||||
+ gnome-shell-network-initialize-async.patch: fixed upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon May 21 20:54:46 UTC 2018 - bjorn.lie@gmail.com
|
||||
|
||||
@ -100,7 +224,7 @@ Mon Mar 12 23:15:48 UTC 2018 - luc14n0@linuxmail.org
|
||||
- Update to version 3.28.0:
|
||||
+ Updated translations.
|
||||
- Add gdk-x11-3.0, gio-unix-2.0, gobject-2.0, libecal-1.2,
|
||||
libxml-2.0, mutter-cogl-2 and x11 pkgconfig modules BuilRequires
|
||||
libxml-2.0, mutter-cogl-2 and x11 pkgconfig modules BuildRequires
|
||||
to avoid implicit dependencies.
|
||||
- Drop pkgconfig(xtst) BuildRequires as mutter takes care of
|
||||
pulling it into the dep chain.
|
||||
|
||||
@ -18,14 +18,13 @@
|
||||
|
||||
%global __requires_exclude typelib\\(Meta\\)
|
||||
Name: gnome-shell
|
||||
Version: 3.28.3+20180724.2a2f3c981
|
||||
Version: 3.30.0
|
||||
Release: 0
|
||||
Summary: GNOME Shell
|
||||
License: GPL-2.0-or-later
|
||||
Group: System/GUI/GNOME
|
||||
URL: https://wiki.gnome.org/Projects/GnomeShell
|
||||
#Source0: http://download.gnome.org/sources/gnome-shell/3.28/%%{name}-%%{version}.tar.xz
|
||||
Source: %{name}-%{version}.tar.xz
|
||||
Source0: https://download.gnome.org/sources/gnome-shell/3.30/%{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.
|
||||
Source1: aboutMenu.js
|
||||
# SOURCE-FEATURE-SLE sle-background bsc#1007468 xwang@suse.com -- Add SUSE logo on lock screen for GNOME theme
|
||||
@ -38,9 +37,6 @@ Patch1: gnome-shell-private-connection.patch
|
||||
Patch2: gnome-shell-disable-ibus-when-not-installed.patch
|
||||
# PATCH-FIX-UPSTREAM gnome-shell-Avoid-loginDialog-grab-focus-when-locked.patch bsc#1058521 bgo#788169 xwang@suse.com -- Avoid login dialog grabs focus when screen locked
|
||||
Patch3: gnome-shell-Avoid-loginDialog-grab-focus-when-locked.patch
|
||||
# PATCH-FIX-UPSTREAM gnome-shell-network-initialize-async.patch bgo#789811 glgo#GNOME/gnome-shell#63 -- network: initialize the agent asynchronously
|
||||
Patch4: gnome-shell-network-initialize-async.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.
|
||||
Patch1001: gnome-shell-gdm-login-applet.patch
|
||||
@ -64,7 +60,7 @@ BuildRequires: docbook-xsl-stylesheets
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: gtk-doc
|
||||
BuildRequires: meson
|
||||
BuildRequires: meson >= 0.47.0
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: sassc
|
||||
BuildRequires: translation-update-upstream
|
||||
@ -73,15 +69,15 @@ BuildRequires: pkgconfig(atk-bridge-2.0)
|
||||
BuildRequires: pkgconfig(gcr-base-3) >= 3.7.5
|
||||
BuildRequires: pkgconfig(gdk-pixbuf-2.0)
|
||||
BuildRequires: pkgconfig(gdk-x11-3.0)
|
||||
BuildRequires: pkgconfig(gio-2.0) >= 2.53.0
|
||||
BuildRequires: pkgconfig(gio-unix-2.0) >= 2.53.0
|
||||
BuildRequires: pkgconfig(gio-2.0) >= 2.56.0
|
||||
BuildRequires: pkgconfig(gio-unix-2.0) >= 2.56.0
|
||||
BuildRequires: pkgconfig(gjs-1.0) >= 1.47.0
|
||||
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-2.0)
|
||||
BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.49.1
|
||||
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.21.3
|
||||
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.27.90
|
||||
BuildRequires: pkgconfig(gstreamer-1.0) >= 0.11.92
|
||||
BuildRequires: pkgconfig(gstreamer-base-1.0)
|
||||
BuildRequires: pkgconfig(gtk+-3.0) >= 3.15.0
|
||||
@ -93,7 +89,7 @@ BuildRequires: pkgconfig(libcroco-0.6) >= 0.6.8
|
||||
BuildRequires: pkgconfig(libecal-1.2) >= 3.5.3
|
||||
BuildRequires: pkgconfig(libedataserver-1.2) >= 3.17.2
|
||||
BuildRequires: pkgconfig(libgnome-menu-3.0) >= 3.5.3
|
||||
BuildRequires: pkgconfig(libmutter-2) >= 3.28.2
|
||||
BuildRequires: pkgconfig(libmutter-3) >= 3.30.0
|
||||
BuildRequires: pkgconfig(libnm) >= 1.10.4
|
||||
BuildRequires: pkgconfig(libpulse) >= 2.0
|
||||
BuildRequires: pkgconfig(libpulse-mainloop-glib)
|
||||
@ -102,9 +98,9 @@ BuildRequires: pkgconfig(libsoup-2.4)
|
||||
BuildRequires: pkgconfig(libstartup-notification-1.0) >= 0.11
|
||||
BuildRequires: pkgconfig(libsystemd)
|
||||
BuildRequires: pkgconfig(libxml-2.0)
|
||||
BuildRequires: pkgconfig(mutter-clutter-2) >= 3.28.0
|
||||
BuildRequires: pkgconfig(mutter-cogl-2) >= 3.28.0
|
||||
BuildRequires: pkgconfig(mutter-cogl-pango-2) >= 3.28.0
|
||||
BuildRequires: pkgconfig(mutter-clutter-3) >= 3.30.0
|
||||
BuildRequires: pkgconfig(mutter-cogl-3) >= 3.30.0
|
||||
BuildRequires: pkgconfig(mutter-cogl-pango-3) >= 3.30.0
|
||||
BuildRequires: pkgconfig(polkit-agent-1) >= 0.100
|
||||
BuildRequires: pkgconfig(x11)
|
||||
BuildRequires: python(abi) >= 3
|
||||
@ -120,7 +116,6 @@ Requires: gsettings-desktop-schemas
|
||||
# Due to now private typelib(Meta)
|
||||
Requires: mutter
|
||||
Recommends: %{name}-calendar
|
||||
Recommends: %{name}-lang
|
||||
## Finally, dependencies for session services that are needed for system icons and the user menu
|
||||
# bluetooth system icon
|
||||
# (lowered to recommends due to bsc#1067603, some setups without bluetooth might want to avoid this dependency)
|
||||
@ -178,7 +173,6 @@ into GNOME Shell calendar.
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
translation-update-upstream
|
||||
|
||||
%if !0%{?is_opensuse}
|
||||
@ -220,7 +214,7 @@ install -d %{buildroot}%{_datadir}/gnome-shell/modes
|
||||
|
||||
%files
|
||||
%license COPYING
|
||||
%doc README NEWS
|
||||
%doc README.md NEWS
|
||||
%{_bindir}/gnome-shell
|
||||
%{_bindir}/gnome-shell-extension-prefs
|
||||
%dir %{_libdir}/gnome-shell
|
||||
@ -263,16 +257,22 @@ install -d %{buildroot}%{_datadir}/gnome-shell/modes
|
||||
%dir %{_datadir}/xdg-desktop-portal
|
||||
%dir %{_datadir}/xdg-desktop-portal/portals
|
||||
%{_datadir}/xdg-desktop-portal/portals/gnome-shell.portal
|
||||
%{_userunitdir}/gnome-shell-wayland.target
|
||||
%{_userunitdir}/gnome-shell-x11.target
|
||||
%{_userunitdir}/gnome-shell.service
|
||||
%{_sysconfdir}/xdg/autostart/gnome-shell-overrides-migration.desktop
|
||||
%{_libexecdir}/gnome-shell/gnome-shell-overrides-migration.sh
|
||||
%{_datadir}/glib-2.0/schemas/00_org.gnome.shell.gschema.override
|
||||
|
||||
%files devel
|
||||
%doc HACKING MAINTAINERS
|
||||
%doc HACKING.md
|
||||
%doc %{_datadir}/gtk-doc/html
|
||||
%{_bindir}/gnome-shell-extension-tool
|
||||
%{_bindir}/gnome-shell-perf-tool
|
||||
%{_datadir}/gnome-shell/*.gir
|
||||
|
||||
%files browser-plugin
|
||||
%doc browser-plugin/README
|
||||
%doc browser-plugin/README.md
|
||||
%dir %{_libdir}/mozilla/plugins/
|
||||
%dir %{_libdir}/mozilla
|
||||
%{_libdir}/mozilla/plugins/libgnome-shell-browser-plugin.*
|
||||
|
||||
Loading…
Reference in New Issue
Block a user