From a7527e2a4b5d6cc40bfceb46a5d93ec94f4ffc7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Tue, 15 Jun 2021 00:59:57 +0200 Subject: [PATCH] Update to 40.2 Resolves: #1971431 --- .gitignore | 1 + 0001-Update-style.patch | 4 +- add-extra-extensions.patch | 79 ++++++++++++++++++------------------- gnome-shell-extensions.spec | 8 +++- sources | 2 +- 5 files changed, 49 insertions(+), 45 deletions(-) diff --git a/.gitignore b/.gitignore index 761264f..e36f46f 100644 --- a/.gitignore +++ b/.gitignore @@ -145,3 +145,4 @@ /gnome-shell-extensions-40.rc.tar.xz /gnome-shell-extensions-40.0.tar.xz /gnome-shell-extensions-40.1.tar.xz +/gnome-shell-extensions-40.2.tar.xz diff --git a/0001-Update-style.patch b/0001-Update-style.patch index 9730bcc..c5a9e3f 100644 --- a/0001-Update-style.patch +++ b/0001-Update-style.patch @@ -25,12 +25,12 @@ index 1f46507..ad638b2 100644 .system-status-icon { icon-size: $base_icon_size; diff --git a/data/gnome-classic.css b/data/gnome-classic.css -index f4826de..ad71bf6 100644 +index 52e5367..3be81e9 100644 --- a/data/gnome-classic.css +++ b/data/gnome-classic.css @@ -1234,6 +1234,9 @@ StScrollBar { box-shadow: none; } - #panel .panel-button:hover.clock-display .clock, #panel .panel-button:active.clock-display .clock, #panel .panel-button:overview.clock-display .clock, #panel .panel-button:focus.clock-display .clock, #panel .panel-button:checked.clock-display .clock { + #panel .panel-button.clock-display:hover .clock, #panel .panel-button.clock-display:active .clock, #panel .panel-button.clock-display:overview .clock, #panel .panel-button.clock-display:focus .clock, #panel .panel-button.clock-display:checked .clock { box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.2); } + #panel .panel-button .panel-logo-icon { + padding-right: .4em; diff --git a/add-extra-extensions.patch b/add-extra-extensions.patch index f972e9e..83c44a6 100644 --- a/add-extra-extensions.patch +++ b/add-extra-extensions.patch @@ -1,4 +1,4 @@ -From 226a3d59624d71867d9efd3350f2756d189b7f8a Mon Sep 17 00:00:00 2001 +From 6c3fe0983d2b2101ea2a416564245a458070a508 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 20 May 2015 17:44:50 +0200 Subject: [PATCH 1/5] Add top-icons extension @@ -152,7 +152,7 @@ index 00000000..25134b65 @@ -0,0 +1 @@ +/* This extensions requires no special styling */ diff --git a/meson.build b/meson.build -index 91cb683c..c0097f82 100644 +index 413645f9..e69b23b4 100644 --- a/meson.build +++ b/meson.build @@ -45,6 +45,7 @@ all_extensions = default_extensions @@ -167,7 +167,7 @@ index 91cb683c..c0097f82 100644 2.31.1 -From 3b4a5aa8bd35858a693c3b5c86c8b4afc2d5f0ee Mon Sep 17 00:00:00 2001 +From 0305fcfabe55b73b82efcc1e8d93df9cc62fa2c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 20 May 2015 18:05:41 +0200 Subject: [PATCH 2/5] Add dash-to-dock extension @@ -239,7 +239,7 @@ Subject: [PATCH 2/5] Add dash-to-dock extension po/nb.po | 509 +++- po/nl.po | 663 +++- po/pl.po | 565 +++- - po/pt.po | 515 +++- + po/pt.po | 520 +++- po/pt_BR.po | 519 +++- po/ru.po | 634 +++- po/sk.po | 456 ++- @@ -249,7 +249,7 @@ Subject: [PATCH 2/5] Add dash-to-dock extension po/tr.po | 554 +++- po/zh_CN.po | 643 +++- po/zh_TW.po | 559 +++- - 76 files changed, 40473 insertions(+), 110 deletions(-) + 76 files changed, 40473 insertions(+), 115 deletions(-) create mode 100644 extensions/dash-to-dock/Settings.ui create mode 100644 extensions/dash-to-dock/appIconIndicators.js create mode 100644 extensions/dash-to-dock/appIcons.js @@ -29865,7 +29865,7 @@ index 00000000..8cb14b88 +}); \ No newline at end of file diff --git a/meson.build b/meson.build -index c0097f82..2abcdeee 100644 +index e69b23b4..9214e251 100644 --- a/meson.build +++ b/meson.build @@ -44,6 +44,7 @@ default_extensions += [ @@ -38552,7 +38552,7 @@ index bcfe2d6a..a97366b6 100644 +#~ msgid "Adaptive" +#~ msgstr "Adaptacyjna" diff --git a/po/pt.po b/po/pt.po -index c1e8ad94..11b20794 100644 +index 87270e01..99d446f9 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,3 +1,4 @@ @@ -38560,9 +38560,9 @@ index c1e8ad94..11b20794 100644 # gnome-shell-extensions' Portuguese translation. # Copyright © 2011 gnome-shell-extensions # This file is distributed under the same license as the gnome-shell-extensions package. -@@ -8,8 +9,16 @@ - # Bruno Ramalhete , 2015. - # José Vieira , 2020. +@@ -10,8 +11,16 @@ + # Hugo Carvalho , 2021. + # Juliano de Souza Camargo , 2021. # +# #-#-#-#-# pt.po (Dash to Dock) #-#-#-#-# +# SOME DESCRIPTIVE TITLE. @@ -38577,10 +38577,15 @@ index c1e8ad94..11b20794 100644 "Project-Id-Version: 3.14\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/" "issues\n" -@@ -24,6 +33,18 @@ msgstr "" +@@ -26,11 +35,18 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1)\n" - "X-Generator: Gtranslator 3.36.0\n" + "X-Generator: Gtranslator 40.0\n" "X-Project-Style: gnome\n" +-"X-DL-Team: pt\n" +-"X-DL-Module: gnome-shell-extensions\n" +-"X-DL-Branch: gnome-40\n" +-"X-DL-Domain: po\n" +-"X-DL-State: Translating\n" +"#-#-#-#-# pt.po (Dash to Dock) #-#-#-#-#\n" +"Project-Id-Version: Dash to Dock\n" +"Report-Msgid-Bugs-To: \n" @@ -38594,9 +38599,9 @@ index c1e8ad94..11b20794 100644 +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.2.1\n" - #: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3 + #: data/gnome-classic.desktop.in:3 msgid "GNOME Classic" -@@ -162,7 +183,7 @@ msgstr "Fechar" +@@ -164,7 +180,7 @@ msgstr "Fechar" msgid "Unminimize" msgstr "Desminimizar" @@ -38605,7 +38610,7 @@ index c1e8ad94..11b20794 100644 msgid "Minimize" msgstr "Minimizar" -@@ -278,6 +299,492 @@ msgstr "Área de trabalho %d" +@@ -272,6 +288,492 @@ msgstr "Área de trabalho %d" msgid "Add Workspace" msgstr "Adicionar área de trabalho" @@ -39098,7 +39103,7 @@ index c1e8ad94..11b20794 100644 #~ msgid "Attach modal dialog to the parent window" #~ msgstr "Anexar diálogo modal à janela mãe" -@@ -397,12 +904,6 @@ msgstr "Adicionar área de trabalho" +@@ -391,12 +893,6 @@ msgstr "Adicionar área de trabalho" #~ msgid "Normal" #~ msgstr "Normal" @@ -44396,7 +44401,7 @@ index 6a40e212..14e60ccb 100644 2.31.1 -From a93fedb3011ffa57c77bfd9be23641f7a17db6ae Mon Sep 17 00:00:00 2001 +From 7dd1d83a1e0bd5d65ac6988922ef43fa34039409 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 20 May 2015 18:55:47 +0200 Subject: [PATCH 3/5] Add panel-favorites extension @@ -44724,7 +44729,7 @@ index 00000000..120adacb + -y-offset: 6px; +} diff --git a/meson.build b/meson.build -index 2abcdeee..fa2d31e5 100644 +index 9214e251..008eebd8 100644 --- a/meson.build +++ b/meson.build @@ -46,6 +46,7 @@ all_extensions += [ @@ -44739,7 +44744,7 @@ index 2abcdeee..fa2d31e5 100644 2.31.1 -From cb0de66ce28e49c2b6c95f88631ddfbcbf10f4d8 Mon Sep 17 00:00:00 2001 +From 89aeccb423a3aa633e768721142f5c85c6328519 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Fri, 4 Mar 2016 17:07:21 +0100 Subject: [PATCH 4/5] Add updates-dialog extension @@ -45342,7 +45347,7 @@ index 00000000..25134b65 @@ -0,0 +1 @@ +/* This extensions requires no special styling */ diff --git a/meson.build b/meson.build -index fa2d31e5..ad448a99 100644 +index 008eebd8..fff2d5e0 100644 --- a/meson.build +++ b/meson.build @@ -48,6 +48,7 @@ all_extensions += [ @@ -45370,7 +45375,7 @@ index 0ed12762..10b1d517 100644 2.31.1 -From 15691bedd694799d13f9e2e6ab716c221c8898be Mon Sep 17 00:00:00 2001 +From 44dd0e329e30912f9c478ad13831448b5528d692 Mon Sep 17 00:00:00 2001 From: Carlos Soriano Date: Mon, 13 Aug 2018 17:28:41 +0200 Subject: [PATCH 5/5] Add desktop icons extension @@ -45451,7 +45456,7 @@ Subject: [PATCH 5/5] Add desktop icons extension po/nl.po | 224 +++- po/oc.po | 233 ++++- po/pl.po | 222 +++- - po/pt.po | 242 ++++- + po/pt.po | 237 ++++- po/pt_BR.po | 260 ++++- po/ro.po | 220 +++- po/ru.po | 199 ++++ @@ -45463,7 +45468,7 @@ Subject: [PATCH 5/5] Add desktop icons extension po/uk.po | 247 ++++- po/zh_CN.po | 229 ++++- po/zh_TW.po | 241 ++++- - 87 files changed, 18672 insertions(+), 242 deletions(-) + 87 files changed, 18670 insertions(+), 239 deletions(-) create mode 100644 extensions/desktop-icons/createFolderDialog.js create mode 100755 extensions/desktop-icons/createThumbnail.js create mode 100644 extensions/desktop-icons/dbusUtils.js @@ -56916,7 +56921,7 @@ index 00000000..a468f4ab + } +} diff --git a/meson.build b/meson.build -index ad448a99..b95dfc30 100644 +index fff2d5e0..043b719c 100644 --- a/meson.build +++ b/meson.build @@ -28,6 +28,7 @@ uuid_suffix = '@gnome-shell-extensions.gcampax.github.com' @@ -63213,7 +63218,7 @@ index a97366b6..7b26d43f 100644 #~ msgstr "Wyświetla kropkę dla każdego okna programu" diff --git a/po/pt.po b/po/pt.po -index 11b20794..afd0c037 100644 +index 99d446f9..0ae7be05 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,4 +1,5 @@ @@ -63222,7 +63227,7 @@ index 11b20794..afd0c037 100644 # gnome-shell-extensions' Portuguese translation. # Copyright © 2011 gnome-shell-extensions # This file is distributed under the same license as the gnome-shell-extensions package. -@@ -15,10 +16,17 @@ +@@ -17,10 +18,17 @@ # This file is distributed under the same license as the PACKAGE package. # Carlos Alberto Junior Spohr Poletto , 2012. # @@ -63240,7 +63245,7 @@ index 11b20794..afd0c037 100644 "Project-Id-Version: 3.14\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/" "issues\n" -@@ -45,6 +53,20 @@ msgstr "" +@@ -47,6 +55,20 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 2.2.1\n" @@ -63259,17 +63264,11 @@ index 11b20794..afd0c037 100644 +"Last-Translator: Hugo Carvalho \n" +"X-Generator: Poedit 2.4.1\n" - #: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3 + #: data/gnome-classic.desktop.in:3 msgid "GNOME Classic" -@@ -85,11 +107,14 @@ msgstr "Adicionar regra" - - #. TRANSLATORS: %s is the filesystem name - #: extensions/drive-menu/extension.js:112 --#: extensions/places-menu/placeDisplay.js:233 --#, javascript-format --#| msgid "Ejecting drive '%s' failed:" -+#: extensions/places-menu/placeDisplay.js:233 desktopIconsUtil.js:162 -+#, fuzzy, javascript-format +@@ -89,7 +111,11 @@ msgstr "Adicionar regra" + #: extensions/places-menu/placeDisplay.js:233 + #, javascript-format msgid "Ejecting drive “%s” failed:" -msgstr "Falha ao ejetar a unidade '%s':" +msgstr "" @@ -63280,7 +63279,7 @@ index 11b20794..afd0c037 100644 #: extensions/drive-menu/extension.js:128 msgid "Removable devices" -@@ -150,9 +175,14 @@ msgstr "Falha ao montar unidade para “%s”" +@@ -148,9 +174,14 @@ msgstr "Falha ao montar unidade para “%s”" msgid "Computer" msgstr "Computador" @@ -63297,7 +63296,7 @@ index 11b20794..afd0c037 100644 #: extensions/places-menu/placeDisplay.js:404 msgid "Browse Network" -@@ -785,6 +815,203 @@ msgstr "Mostrar tempo limite (s)" +@@ -774,6 +805,203 @@ msgstr "Mostrar tempo limite (s)" msgid "Pressure threshold" msgstr "Limite de pressão" @@ -63501,7 +63500,7 @@ index 11b20794..afd0c037 100644 #~ msgid "Attach modal dialog to the parent window" #~ msgstr "Anexar diálogo modal à janela mãe" -@@ -909,6 +1136,3 @@ msgstr "Limite de pressão" +@@ -898,6 +1126,3 @@ msgstr "Limite de pressão" #~ msgid "Display" #~ msgstr "Apresentar" diff --git a/gnome-shell-extensions.spec b/gnome-shell-extensions.spec index bcf639d..8ba7046 100644 --- a/gnome-shell-extensions.spec +++ b/gnome-shell-extensions.spec @@ -6,8 +6,8 @@ %global tarball_version %%(echo %{version} | tr '~' '.') Name: gnome-shell-extensions -Version: 40.1 -Release: 4%{?dist} +Version: 40.2 +Release: 1%{?dist} Summary: Modify and extend GNOME Shell functionality and behavior License: GPLv2+ @@ -349,6 +349,10 @@ workspaces. %changelog +* Tue Jun 15 2021 Florian Müllner - 40.2-1 +- Update to 40.2 + Resolves: #1971431 + * Thu Jun 03 2021 Florian Müllner - 40.1-4 - Don't use status icon wm_class as top bar role Resolves: #1967259 diff --git a/sources b/sources index e5457ca..1550b93 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-shell-extensions-40.1.tar.xz) = e537312c0790b6e54b3eebb0df189f65f093e81ec7cf1cde886df747188765775fc4616e98bff0157b543bac26c51a5c7006f1505f4554fea00972f790e781f1 +SHA512 (gnome-shell-extensions-40.2.tar.xz) = f02a02a8410e77e8c8b0a764bb7949727974e9a4c0125ac2b6e68c1b20b663ef2de82ddaaed882dd5ffb3a6fd9898b372b6201d53da33f11677c32e82272d2aa