diff --git a/gnome-classic-s390-not-require-g-s-d_wacom.patch b/gnome-classic-s390-not-require-g-s-d_wacom.patch index 248888e..d04c9ad 100644 --- a/gnome-classic-s390-not-require-g-s-d_wacom.patch +++ b/gnome-classic-s390-not-require-g-s-d_wacom.patch @@ -1,9 +1,9 @@ -Index: gnome-shell-extensions-3.32.0/data/gnome-classic.session.desktop.in +Index: gnome-shell-extensions-3.34.1/data/gnome-classic.session.desktop.in =================================================================== ---- gnome-shell-extensions-3.32.0.orig/data/gnome-classic.session.desktop.in -+++ gnome-shell-extensions-3.32.0/data/gnome-classic.session.desktop.in +--- gnome-shell-extensions-3.34.1.orig/data/gnome-classic.session.desktop.in 2019-12-02 10:17:20.012181181 +0100 ++++ gnome-shell-extensions-3.34.1/data/gnome-classic.session.desktop.in 2019-12-02 10:17:37.176181929 +0100 @@ -1,3 +1,3 @@ [GNOME Session] Name=GNOME Classic --RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings; -+RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.XSettings; +-RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings; ++RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.XSettings; diff --git a/gnome-shell-extensions.changes b/gnome-shell-extensions.changes index df4a039..d4910fb 100644 --- a/gnome-shell-extensions.changes +++ b/gnome-shell-extensions.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Dec 10 00:58:50 UTC 2019 - Xiaoguang Wang + +- Update gse-sle-classic-ext.patch: Adapt version 3.34.1 + (bsc#1158496). +- Remove file sle-classic-xorg.desktop: now sle-classic only works + on X, we don't need this file anymore. + +------------------------------------------------------------------- +Mon Dec 2 09:17:46 UTC 2019 - Frederic Crozat + +- Rebase patch gnome-classic-s390-not-require-g-s-d_wacom.patch. + ------------------------------------------------------------------- Thu Oct 17 07:44:40 UTC 2019 - Xiaoguang Wang diff --git a/gnome-shell-extensions.spec b/gnome-shell-extensions.spec index fdc7c65..5505db4 100644 --- a/gnome-shell-extensions.spec +++ b/gnome-shell-extensions.spec @@ -1,7 +1,7 @@ # # spec file for package gnome-shell-extensions # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # Copyright (c) 2011 Dominique Leuenberger, Amsterdam, The Netherlands # # All modifications and additions to the file contributed by third parties @@ -29,7 +29,6 @@ Source0: https://download.gnome.org/sources/gnome-shell-extensions/3.34/% Source1: README.SUSE Source2: sle-classic.desktop Source3: SLE-theme.tar.gz -Source4: sle-classic-xorg.desktop Source5: sle-classic.json Source6: sle-classic@suse.com.tar.gz Source7: 00_org.gnome.shell.extensions.sle-classic.gschema.override @@ -148,7 +147,6 @@ install -d %{buildroot}/%{_datadir}/gnome-shell/extensions/sle-classic@suse.com cp sle-classic@suse.com/* %{buildroot}/%{_datadir}/gnome-shell/extensions/sle-classic@suse.com install -m0644 %{SOURCE7} %{buildroot}/%{_datadir}/glib-2.0/schemas/00_org.gnome.shell.extensions.sle-classic.gschema.override %if !0%{?is_opensuse} -install -m0644 %{SOURCE4} %{buildroot}/%{_datadir}/xsessions/sle-classic-xorg.desktop tar -xzvf %{SOURCE3} install -d %{buildroot}%{_datadir}/gnome-shell/theme cp SLE-theme/theme/* %{buildroot}%{_datadir}/gnome-shell/theme @@ -214,7 +212,6 @@ ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_ %dir %{_datadir}/wayland-sessions %{_datadir}/gnome-shell/theme/sle-background.png %{_datadir}/xsessions/default.desktop -%{_datadir}/xsessions/sle-classic-xorg.desktop %{_datadir}/wayland-sessions/default.desktop %ghost %{_sysconfdir}/alternatives/default-xsession.desktop %ghost %{_sysconfdir}/alternatives/default-waylandsession.desktop diff --git a/gse-sle-classic-ext.patch b/gse-sle-classic-ext.patch index c88ec3a..23a7198 100644 --- a/gse-sle-classic-ext.patch +++ b/gse-sle-classic-ext.patch @@ -12,7 +12,63 @@ Index: gnome-shell-extensions-3.34.1/extensions/window-list/extension.js function _minimizeOrActivateWindow(window) { let focusWindow = global.display.focus_window; -@@ -1141,19 +1144,45 @@ class Extension { +@@ -691,11 +694,13 @@ const WindowList = GObject.registerClass + let box = new St.BoxLayout({ x_expand: true, y_expand: true }); + this.add_actor(box); + +- let toggle = new WindowPickerToggle(); +- box.add_actor(toggle); ++ if (!isSLEClassicMode()) { ++ let toggle = new WindowPickerToggle(); ++ box.add_actor(toggle); + +- toggle.connect('notify::checked', +- this._updateWindowListVisibility.bind(this)); ++ toggle.connect('notify::checked', ++ this._updateWindowListVisibility.bind(this)); ++ } + + let layout = new Clutter.BoxLayout({ homogeneous: true }); + this._windowList = new St.Widget({ +@@ -837,7 +842,8 @@ const WindowList = GObject.registerClass + let workspacesOnMonitor = this._monitor === Main.layoutManager.primaryMonitor || + !this._mutterSettings.get_boolean('workspaces-only-on-primary'); + +- this._workspaceIndicator.visible = hasWorkspaces && workspacesOnMonitor; ++ if (this._workspaceIndicator != null) ++ this._workspaceIndicator.visible = hasWorkspaces && workspacesOnMonitor; + } + + _updateWindowListVisibility() { +@@ -873,6 +879,9 @@ const WindowList = GObject.registerClass + } + + _getMaxWindowListWidth() { ++ if (this._workspaceIndicator == null) ++ return this.width; ++ + let indicatorsBox = this._workspaceIndicator.get_parent(); + return this.width - indicatorsBox.get_preferred_width(-1)[1]; + } +@@ -1082,7 +1091,8 @@ const WindowList = GObject.registerClass + this._mutterSettings.disconnect(this._workspacesOnlyOnPrimaryChangedId); + this._mutterSettings.disconnect(this._dynamicWorkspacesChangedId); + +- this._workspaceIndicator.destroy(); ++ if (this._workspaceIndicator != null) ++ this._workspaceIndicator.destroy(); + + Main.ctrlAltTabManager.removeGroup(this); + +@@ -1122,6 +1132,7 @@ class Extension { + constructor() { + this._windowLists = null; + this._hideOverviewOrig = Main.overview.hide; ++ this._isSLEClassic = isSLEClassicMode(); + } + + enable() { +@@ -1141,19 +1152,47 @@ class Extension { this._hideOverviewOrig.call(Main.overview); }; @@ -45,11 +101,13 @@ Index: gnome-shell-extensions-3.34.1/extensions/window-list/extension.js - if (showOnAllMonitors || monitor === Main.layoutManager.primaryMonitor) + if (isSLEClassicMode()){ + let list = new WindowList(false, Main.layoutManager.primaryMonitor); ++ list._workspaceIndicator.destroy(); ++ list._workspaceIndicator = null; + Main.layoutManager.removeChrome(list); + + let [box] = list.get_children(); + box.remove_child(list._windowList); -+ Main.panel._centerBox.add(list._windowList, {expand: true, x_align: St.Align.START}); ++ Main.panel._centerBox.add_child(list._windowList); + + this._windowLists.push(list); + } else { @@ -62,19 +120,23 @@ Index: gnome-shell-extensions-3.34.1/extensions/window-list/extension.js } disable() { -@@ -1167,6 +1196,7 @@ class Extension { +@@ -1167,6 +1206,11 @@ class Extension { this._monitorsChangedId = 0; this._windowLists.forEach(windowList => { -+ Main.panel._centerBox.remove_child(windowList._windowList); ++ if (this._isSLEClassic) { ++ Main.panel._centerBox.remove_child(windowList._windowList); ++ let [box] = windowList.get_children(); ++ box.add_child(windowList._windowList); ++ } windowList.hide(); windowList.destroy(); }); -@@ -1175,6 +1205,11 @@ class Extension { +@@ -1175,6 +1219,11 @@ class Extension { Main.windowPicker.destroy(); delete Main.windowPicker; -+ if (isSLEClassicMode()) { ++ if (this._isSLEClassic) { + Main.overview.disconnect(this.overviewShowingId); + Main.overview.disconnect(this.overviewHidingId); + } diff --git a/sle-classic-xorg.desktop b/sle-classic-xorg.desktop deleted file mode 100644 index e0a8897..0000000 --- a/sle-classic-xorg.desktop +++ /dev/null @@ -1,142 +0,0 @@ -[Desktop Entry] -Name=SLE Classic on Xorg -Name[af]=SLE Klassiek Xorg -Name[an]=SLE clasico Xorg -Name[ar]=جنوم تقليدية -Name[as]=SLE ক্লাচিক -Name[bg]=Класически SLE Xorg -Name[bn_IN]=SLE ক্লাসিক -Name[bs]=Klasični SLE Xorg -Name[ca]=SLE clàssic Xorg -Name[ca@valencia]=SLE clàssic Xorg -Name[cs]=SLE klasik Xorg -Name[da]=SLE Classic on Xorg -Name[de]=SLE Classic on Xorg -Name[el]=SLE Classic on Xorg -Name[en_GB]=SLE Classic on Xorg -Name[eo]=SLE-klasika Xorg -Name[es]=SLE clásico Xorg -Name[et]=Klassikaline SLE Xorg -Name[eu]=SLE Klasikoa Xorg -Name[fa]=گنوم کلاسیک -Name[fi]=Perinteinen Gnome -Name[fr]=SLE Classique Xorg -Name[fur]=SLE Classic on Xorg -Name[gd]=SLE clasaigeach Xorg -Name[gl]=SLE clasico Xorg -Name[gu]=SLE ક્લાસિક -Name[he]=SLE קלסי -Name[hi]=SLE क्लासिक -Name[hu]=Klasszikus SLE Xorg -Name[id]=SLE Klasik Xorg -Name[is]=SLE Klassík Xorg -Name[it]=SLE classico Xorg -Name[ja]=SLE クラシック Xorg -Name[kk]=Классикалық SLE Xorg -Name[km]=SLE Classic on Xorg -Name[kn]=SLE ಕ್ಲಾಸಿಕ್ -Name[ko]=그놈 클래식 -Name[lt]=Klasikinis SLE Xorg -Name[lv]=Klasiskais SLE Xorg -Name[ml]=ഗ്നോം ക്ലാസ്സിക്‍ -Name[mr]=SLE क्लासिक -Name[ms]=SLE Klasik -Name[nb]=Klassisk SLE -Name[ne]=जिनोम क्लासिक -Name[nl]=Gnome klassiek -Name[oc]=SLE Classic on Xorg -Name[or]=SLE କ୍ଲାସିକ -Name[pa]=ਗਨੋਮ ਕਲਾਸਿਕ -Name[pl]=Klasyczne SLE Xorg -Name[pt]=SLE clássico Xorg -Name[pt_BR]=SLE Clássico Xorg -Name[ro]=SLE Clasic Xorg -Name[ru]=Классический SLE -Name[sk]=Klasické prostredie SLE -Name[sl]=Običajno namizje SLE -Name[sr]=Класичан Гном -Name[sr@latin]=Klasičan Gnom -Name[sv]=SLE Klassisk Xorg -Name[ta]=SLE கிளாஸிக் -Name[te]=గ్నోమ్ క్లాసిక్ -Name[tg]=SLE-и классикӣ -Name[th]=SLE คลาสสิก -Name[tr]=SLE Klasik -Name[uk]=Класичний SLE -Name[vi]=SLE cổ điển -Name[zh_CN]=运行于 Xorg 的 SLE 经典模式 -Name[zh_HK]=SLE Classic Xorg -Name[zh_TW]=SLE Classic Xorg -Comment=This session logs you into SLE Classic -Comment[af]=Hierdie sessie laat mens aanmeld by SLE Klassiek -Comment[an]=Ista sesión encieta lo SLE clasico -Comment[ar]=تولجك هذه الجلسة في جنوم التقليدية -Comment[as]=এই অধিবেশনে আপোনাক SLE ক্লাচিকলৈ লগ কৰে -Comment[bg]=Работната среда изглежда като класическия SLE (2.x) -Comment[bn_IN]=এই সেশন অাপনাকে SLE ক্লাসিকে লগ করায় -Comment[bs]=Ova sesija vas prijavljuje na klasični SLE -Comment[ca]=Aquesta sessió us permet utilitzar el SLE clàssic -Comment[ca@valencia]=Esta sessió vos permet utilitzar el SLE clàssic -Comment[cs]=Toto sezení vás přihlásí do SLE klasik -Comment[da]=Denne session logger dig ind i SLE Classic -Comment[de]=Diese Sitzung meldet Sie in SLE Classic an -Comment[el]=Αυτή η συνεδρία σας συνδέει στο SLE Classic -Comment[en_GB]=This session logs you into SLE Classic -Comment[eo]=Ĉi seanco ensalutas vin SLE-klasiken -Comment[es]=Esta sesión inicia SLE clásico -Comment[et]=See on klassikalise SLE seanss -Comment[eu]=Saio honek SLE Klasikoa hasten du -Comment[fa]=این نشست شما را به گنوم کلاسیک وارد می‌کند -Comment[fi]=Tämä istunto kirjaa sinut perinteiseen Gnomeen -Comment[fr]=Cette session vous connnecte à SLE Classique -Comment[fur]=Cheste session a si invie cun SLE classic -Comment[gd]=Clàraidh an seisean seo a-steach gu SLE clasaigeach thu -Comment[gl]=Esta sesión iniciarao en SLE clásico -Comment[gu]=આ સત્ર તમને SLE ક્લાસિકમાં પ્રવેશ આપે છે -Comment[he]=הפעלה זו מכניסה אותך למצב הקלסי של SLE -Comment[hi]=यह सत्र गनोम क्लासिक में आपको लॉगइन करेगा -Comment[hu]=Bejelentkezés a klasszikus SLE környezetbe -Comment[id]=Sesi ini memasukkan Anda ke SLE Klasik -Comment[is]=Þessi seta skráir þig inn í klassískt SLE -Comment[it]=Questa sessione si avvia con SLE classico -Comment[ja]=SLE クラシックモードでログインします -Comment[kk]=Бұл сессия арқылы классикалық SLE ішіне кіресіз -Comment[km]=សម័យ​នេះ​នឹង​ឲ្យ​អ្នក​ចូល SLE Classic -Comment[kn]=ಈ ಅಧಿವೇಶನವು ನಿಮ್ಮನ್ನು SLE ಕ್ಲಾಸಿಕ್‌ಗೆ ಪ್ರವೇಶಿಸುವಂತೆ ಮಾಡುತ್ತದೆ -Comment[ko]=이 세션을 사용하면 그놈 클래식에 로그인합니다 -Comment[lt]=Šis seansas prijungs jus prie klasikinio SLE -Comment[lv]=Šī sesija ieraksta jūs klasiskajā SLE vidē -Comment[ml]=ഈ പ്രവര്‍ത്തനവേള നിങ്ങളെ ഗ്നോം ക്ലാസ്സിക്കിലേക്കു് കയറ്റുന്നു -Comment[mr]=हे सत्र तुम्हाला SLE क्लासिक सत्रामध्ये प्रवेश करून देतो -Comment[ms]=Sesi ini log masukkan anda ke SLE Klasik -Comment[nb]=Denne økten logger inn i klassisk SLE -Comment[ne]=यो सेसन जिनोम क्लासिकमा लगईन हुन्छ -Comment[nl]=Deze sessie meldt u aan bij Gnome klassiek -Comment[oc]=Aquesta session vos connècta a SLE Classic -Comment[or]=ଏହି ଅଧିବେଶନ ଆପଣଙ୍କୁ SLE କ୍ଲାସିକରେ ଲଗ କରାଇଥାଏ -Comment[pa]=ਇਹ ਸ਼ੈਸ਼ਨ ਤੁਹਾਨੂੰ ਗਨੋਮ ਕਲਾਸਿਕ ਵਿੱਚ ਲਾਗ ਕਰਦਾ ਹੈ -Comment[pl]=Ta sesja loguje do klasycznego środowiska SLE -Comment[pt]=Esta sessão liga-o ao SLE clássico -Comment[pt_BR]=Essa sessão se inicia como SLE Clássico -Comment[ro]=Această sesiune vă autentifică în SLE Clasic -Comment[ru]=Данный сеанс использует классический рабочий стол SLE -Comment[sk]=Táto relácia vás prihlási do klasického prostredia SLE -Comment[sl]=Seja omogoča prijavo v običajno namizje SLE. -Comment[sr]=Ова сесија вас пријављује у класичан Гном -Comment[sr@latin]=Ova sesija vas prijavljuje u klasičan Gnom -Comment[sv]=Denna session loggar in dig till SLE Klassisk -Comment[ta]=இந்த அமர்வு உங்களை SLE கிளாஸிக்கில் புகுபதிவு செய்யும் -Comment[te]=ఈ సెషన్ గ్నోమ్‌ క్లాసిక్ లోనికి లాగ్ చేస్తుంది -Comment[tg]=Ин ҷаласа шуморо ба SLE-и классикӣ ворид мекунад -Comment[th]=วาระนี้จะนำคุณเข้าสู่ระบบ SLE คลาสสิก -Comment[tr]=Bu oturum, SLE Klasik sürümüne giriş yapmanızı sağlar. -Comment[uk]=Це — сеанс входу в класичний SLE -Comment[vi]=Phiên làm việc này đăng nhập bạn vào SLE Cổ điển -Comment[zh_CN]=该会话将登录到“SLE 经典模式” -Comment[zh_HK]=這個作業階段讓你登入 SLE Classic -Comment[zh_TW]=這個作業階段讓您登入 SLE Classic -Exec=env GNOME_SHELL_SESSION_MODE=sle-classic gnome-session --session gnome-classic -TryExec=gnome-session -Icon= -Type=Application -DesktopNames=sle-Classic;GNOME