From 8c593644bfc8d6a825a1e8aa08e1d9cd9d9a7ea806e8a79f141549be442da905 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 17 Oct 2017 21:26:55 +0000 Subject: [PATCH 1/2] Accepting request 534337 from home:zhengqiang:branches:GNOME:Factory - Update gnome-shell-add-app-to-desktop.patch, allow app shortcut added to desktop could be executed with default attribute "trusted" (bsc#1055240). OBS-URL: https://build.opensuse.org/request/show/534337 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell-extensions?expand=0&rev=144 --- gnome-shell-add-app-to-desktop.patch | 18 ++++++++++++------ gnome-shell-extensions.changes | 7 +++++++ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/gnome-shell-add-app-to-desktop.patch b/gnome-shell-add-app-to-desktop.patch index c4a071a..7e8aa64 100644 --- a/gnome-shell-add-app-to-desktop.patch +++ b/gnome-shell-add-app-to-desktop.patch @@ -1,7 +1,7 @@ -Index: gnome-shell-extensions-3.24.2/extensions/apps-menu/extension.js -=================================================================== ---- gnome-shell-extensions-3.24.2.orig/extensions/apps-menu/extension.js -+++ gnome-shell-extensions-3.24.2/extensions/apps-menu/extension.js +diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js +index 2f4002a..ed51e0c 100644 +--- a/extensions/apps-menu/extension.js ++++ b/extensions/apps-menu/extension.js @@ -7,6 +7,8 @@ const Lang = imports.lang; const Shell = imports.gi.Shell; const St = imports.gi.St; @@ -11,7 +11,7 @@ Index: gnome-shell-extensions-3.24.2/extensions/apps-menu/extension.js const Main = imports.ui.main; const Meta = imports.gi.Meta; const PanelMenu = imports.ui.panelMenu; -@@ -68,9 +70,20 @@ const ApplicationMenuItem = new Lang.Cla +@@ -68,9 +70,20 @@ const ApplicationMenuItem = new Lang.Class({ let textureCache = St.TextureCache.get_default(); let iconThemeChangedId = textureCache.connect('icon-theme-changed', Lang.bind(this, this._updateIcon)); @@ -32,7 +32,7 @@ Index: gnome-shell-extensions-3.24.2/extensions/apps-menu/extension.js })); this._updateIcon(); -@@ -92,6 +105,100 @@ const ApplicationMenuItem = new Lang.Cla +@@ -92,6 +105,106 @@ const ApplicationMenuItem = new Lang.Class({ }); }, @@ -110,6 +110,12 @@ Index: gnome-shell-extensions-3.24.2/extensions/apps-menu/extension.js + let destFile = Gio.File.new_for_path(destDirPath + '/' + sourceFile.get_basename()); + if (sourceFile.copy(destFile, Gio.FileCopyFlags.OVERWRITE, + null, null, null)) { ++ // In order to make the general monitor recognize the setting of metadata, ++ // this function call should before the setting of unix mode. ++ destFile.set_attribute_string("metadata::trusted", ++ "yes", ++ Gio.FileQueryInfoFlags.NOFOLLOW_SYMLINKS, ++ null); + destFile.set_attribute_uint32( + Gio.FILE_ATTRIBUTE_UNIX_MODE, parseInt("0755", 8), + Gio.FileQueryInfoFlags.NOFOLLOW_SYMLINKS, diff --git a/gnome-shell-extensions.changes b/gnome-shell-extensions.changes index 1d59363..1d4994a 100644 --- a/gnome-shell-extensions.changes +++ b/gnome-shell-extensions.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Oct 17 06:38:09 UTC 2017 - qzheng@suse.com + +- Update gnome-shell-add-app-to-desktop.patch, allow app + shortcut added to desktop could be executed with default + attribute "trusted" (bsc#1055240). + ------------------------------------------------------------------- Mon Oct 9 06:30:17 UTC 2017 - xwang@suse.com From 2c22c2467cc37bb50f06f221f2f96a262acea60e8f0f8b7305b3f56a2ddc4381 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 20 Oct 2017 14:36:27 +0000 Subject: [PATCH 2/2] Accepting request 535094 from home:xiaoguang_wang:branches:GNOME:Factory - Add sle-classic-xorg.desktop file. Allow user to open X session or wayland session (bsc#1062909). - Add default.desktop file in '{_datadir}/wayland-sessions/' Make default.desktop session working on wayland (bsc#1062196). - Update gnome-shell-add-app-to-desktop.patch, allow app shortcut added to desktop could be executed with default OBS-URL: https://build.opensuse.org/request/show/535094 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell-extensions?expand=0&rev=145 --- gnome-shell-extensions.changes | 12 ++- gnome-shell-extensions.spec | 11 +++ sle-classic-xorg.desktop | 142 +++++++++++++++++++++++++++++++++ 3 files changed, 163 insertions(+), 2 deletions(-) create mode 100644 sle-classic-xorg.desktop diff --git a/gnome-shell-extensions.changes b/gnome-shell-extensions.changes index 1d4994a..e42e709 100644 --- a/gnome-shell-extensions.changes +++ b/gnome-shell-extensions.changes @@ -1,8 +1,16 @@ +------------------------------------------------------------------- +Wed Oct 18 02:59:02 UTC 2017 - xwang@suse.com + +- Add sle-classic-xorg.desktop file. + Allow user to open X session or wayland session (bsc#1062909). +- Add default.desktop file in '{_datadir}/wayland-sessions/' + Make default.desktop session working on wayland (bsc#1062196). + ------------------------------------------------------------------- Tue Oct 17 06:38:09 UTC 2017 - qzheng@suse.com -- Update gnome-shell-add-app-to-desktop.patch, allow app - shortcut added to desktop could be executed with default +- Update gnome-shell-add-app-to-desktop.patch, allow app + shortcut added to desktop could be executed with default attribute "trusted" (bsc#1055240). ------------------------------------------------------------------- diff --git a/gnome-shell-extensions.spec b/gnome-shell-extensions.spec index 1ece91f..55b6afb 100644 --- a/gnome-shell-extensions.spec +++ b/gnome-shell-extensions.spec @@ -29,6 +29,7 @@ Source: http://download.gnome.org/sources/gnome-shell-extensions/3.26/%{ Source1: README.SUSE Source2: sle-classic.desktop Source3: SLE-theme.tar.gz +Source4: sle-classic-xorg.desktop # PATCH-FEATURE-SLE gnome-shell-add-app-to-desktop.patch bnc#870580 dliang@suse.com -- allow adding app shortcut to desktop easily. Patch1: gnome-shell-add-app-to-desktop.patch # PATCH-FEATURE-SLE sle-classic-favorites-menu-at-end.patch bnc#890989 cxiong@suse.com -- put the favorites at the end of the app catogories for accessibility reason -- cxiong@suse.com bnc#890989 @@ -126,6 +127,7 @@ make %{?_smp_mflags} %find_lang %{name} %{?no_lang_C} %if !0%{?is_opensuse} install -m0644 %{SOURCE2} %{buildroot}/%{_datadir}/xsessions/sle-classic.desktop +install -m0644 %{SOURCE4} %{buildroot}/%{_datadir}/xsessions/sle-classic-xorg.desktop install -d -m755 %{buildroot}%{_datadir}/wayland-sessions install -m0644 %{SOURCE2} %{buildroot}/%{_datadir}/wayland-sessions/sle-classic.desktop # Install SLE theme @@ -137,16 +139,22 @@ cp SLE-theme/theme/* %{buildroot}%{_datadir}/gnome-shell/theme mkdir -p %{buildroot}%{_sysconfdir}/alternatives touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadir}/xsessions/default.desktop +touch %{buildroot}%{_sysconfdir}/alternatives/default-waylandsession.desktop +ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_datadir}/wayland-sessions/default.desktop %endif %if !0%{?is_opensuse} %post -n gnome-shell-classic %{_sbindir}/update-alternatives --install %{_datadir}/xsessions/default.desktop \ default-xsession.desktop %{_datadir}/xsessions/sle-classic.desktop 30 +%{_sbindir}/update-alternatives --install %{_datadir}/wayland-sessions/default.desktop \ + default-waylandsession.desktop %{_datadir}/wayland-sessions/sle-classic.desktop 30 %postun -n gnome-shell-classic [ -f %{_datadir}/xsessions/sle-classic.desktop ] || %{_sbindir}/update-alternatives \ --remove default-xsession.desktop %{_datadir}/xsessions/sle-classic.desktop +[ -f %{_datadir}/wayland-sessions/sle-classic.desktop ] || %{_sbindir}/update-alternatives \ + --remove default-waylandsession.desktop %{_datadir}/wayland-sessions/sle-classic.desktop %endif %files common @@ -182,10 +190,13 @@ ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadi %if !0%{?is_opensuse} %{_datadir}/xsessions/default.desktop %{_datadir}/xsessions/sle-classic.desktop +%{_datadir}/xsessions/sle-classic-xorg.desktop %dir %{_datadir}/wayland-sessions +%{_datadir}/wayland-sessions/default.desktop %{_datadir}/wayland-sessions/sle-classic.desktop %{_datadir}/gnome-shell/theme/sle-background.png %ghost %{_sysconfdir}/alternatives/default-xsession.desktop +%ghost %{_sysconfdir}/alternatives/default-waylandsession.desktop %endif %files common-lang -f %{name}.lang diff --git a/sle-classic-xorg.desktop b/sle-classic-xorg.desktop new file mode 100644 index 0000000..14ae52f --- /dev/null +++ b/sle-classic-xorg.desktop @@ -0,0 +1,142 @@ +[Desktop Entry] +Name=SLE Classic on Xorg +Name[af]=SLE Klassiek +Name[an]=SLE clasico +Name[ar]=جنوم تقليدية +Name[as]=SLE ক্লাচিক +Name[bg]=Класически SLE +Name[bn_IN]=SLE ক্লাসিক +Name[bs]=Klasični SLE +Name[ca]=SLE clàssic +Name[ca@valencia]=SLE clàssic +Name[cs]=SLE klasik +Name[da]=SLE Classic +Name[de]=SLE Classic +Name[el]=SLE Classic +Name[en_GB]=SLE Classic +Name[eo]=SLE-klasika +Name[es]=SLE clásico +Name[et]=Klassikaline SLE +Name[eu]=SLE Klasikoa +Name[fa]=گنوم کلاسیک +Name[fi]=Perinteinen Gnome +Name[fr]=SLE Classique +Name[fur]=SLE Classic +Name[gd]=SLE clasaigeach +Name[gl]=SLE clasico +Name[gu]=SLE ક્લાસિક +Name[he]=SLE קלסי +Name[hi]=SLE क्लासिक +Name[hu]=Klasszikus SLE +Name[id]=SLE Klasik +Name[is]=SLE Klassík +Name[it]=SLE classico +Name[ja]=SLE クラシック +Name[kk]=Классикалық SLE +Name[km]=SLE Classic +Name[kn]=SLE ಕ್ಲಾಸಿಕ್ +Name[ko]=그놈 클래식 +Name[lt]=Klasikinis SLE +Name[lv]=Klasiskais SLE +Name[ml]=ഗ്നോം ക്ലാസ്സിക്‍ +Name[mr]=SLE क्लासिक +Name[ms]=SLE Klasik +Name[nb]=Klassisk SLE +Name[ne]=जिनोम क्लासिक +Name[nl]=Gnome klassiek +Name[oc]=SLE Classic +Name[or]=SLE କ୍ଲାସିକ +Name[pa]=ਗਨੋਮ ਕਲਾਸਿਕ +Name[pl]=Klasyczne SLE +Name[pt]=SLE clássico +Name[pt_BR]=SLE Clássico +Name[ro]=SLE Clasic +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 +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]=SLE 经典模式 +Name[zh_HK]=SLE Classic +Name[zh_TW]=SLE Classic +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=classic SLE_CLASSIC_MODE=1 gnome-session --session gnome-classic +TryExec=gnome-session +Icon= +Type=Application +DesktopNames=GNOME-Classic;GNOME