endlessm · dylanmccall · Nov 6, 2022 · Nov 6, 2022 · Nov 13, 2022 · Nov 18, 2022
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -68,11 +68,11 @@ workflow:
                  'C Development Tools and Libraries' &&
 
       ./.gitlab-ci/install-meson-project.sh \
+        --subdir subprojects/extensions-tool/ \
+        --prepare ./generate-translations.sh \
         -Dman=false \
         https://gitlab.gnome.org/GNOME/gnome-shell.git \
-        main \
-        subprojects/extensions-tool/ \
-        ./generate-translations.sh &&
+        main &&
 
       dnf clean all
 

diff --git a/.gitlab-ci/check-potfiles.sh b/.gitlab-ci/check-potfiles.sh
@@ -2,13 +2,17 @@
 
 srcdirs="src subprojects/extensions-tool"
 uidirs="js subprojects/extensions-app"
+desktopdirs="data subprojects/extensions-app/ subprojects/extensions-tool"
 
 # find source files that contain gettext keywords
 files=$(grep -lR --include='*.c' '\(gettext\|[^I_)]_\)(' $srcdirs)
 
 # find ui files that contain translatable string
 files="$files "$(grep -lRi --include='*.ui' 'translatable="[ty1]' $uidirs)
 
+# find .desktop files
+files="$files "$(find $desktopdirs -name '*.desktop*')
+
 # filter out excluded files
 if [ -f po/POTFILES.skip ]; then
   files=$(for f in $files; do ! grep -q ^$f po/POTFILES.skip && echo $f; done)

diff --git a/.gitlab-ci/checkout-mutter.sh b/.gitlab-ci/checkout-mutter.sh
@@ -41,8 +41,9 @@ if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ]; then
 fi
 
 if [ -z "$mutter_target" ]; then
+  ref_remote=${CI_PROJECT_URL//gnome-shell/mutter}
   echo -n Looking for $CI_COMMIT_REF_NAME on remote ...
-  if fetch origin $CI_COMMIT_REF_NAME; then
+  if fetch $ref_remote $CI_COMMIT_REF_NAME; then
     echo \ found
     mutter_target=FETCH_HEAD
   else

diff --git a/.gitlab-ci/install-meson-project.sh b/.gitlab-ci/install-meson-project.sh
@@ -2,33 +2,81 @@
 
 set -e
 
-if [[ $# -lt 4 ]]; then
-  echo Usage: $0 [options] [repo-url] [commit] [subdir]
-  echo  Options:
-  echo    -Dkey=val
-  exit 1
-fi
+usage() {
+  cat <<-EOF
+	Usage: $(basename $0) [OPTION…] REPO_URL COMMIT
+
+	Check out and install a meson project
+
+	Options:
+	  -Dkey=val      Option to pass on to meson
+	  --subdir       Build subdirectory instead of whole project
+	  --prepare      Script to run before build
+
+	  -h, --help     Display this help
+
+	EOF
+}
+
+TEMP=$(getopt \
+  --name=$(basename $0) \
+  --options='D:h' \
+  --longoptions='subdir:' \
+  --longoptions='prepare:' \
+  --longoptions='help' \
+  -- "$@")
+
+eval set -- "$TEMP"
+unset TEMP
 
 MESON_OPTIONS=()
+SUBDIR=.
+PREPARE=:
+
+while true; do
+  case "$1" in
+    -D)
+      MESON_OPTIONS+=( -D$2 )
+      shift 2
+    ;;
 
-while [[ $1 =~ ^-D ]]; do
-  MESON_OPTIONS+=( "$1" )
-  shift
+    --subdir)
+      SUBDIR=$2
+      shift 2
+    ;;
+
+    --prepare)
+      PREPARE=$2
+      shift 2
+    ;;
+
+    -h|--help)
+      usage
+      exit 0
+    ;;
+
+    --)
+      shift
+      break
+    ;;
+  esac
 done
 
+if [[ $# -lt 2 ]]; then
+  usage
+  exit 1
+fi
+
 REPO_URL="$1"
 COMMIT="$2"
-SUBDIR="$3"
-PREPARE="$4"
 
-REPO_DIR="$(basename ${REPO_URL%.git})"
+CHECKOUT_DIR=$(mktemp --directory)
+trap "rm -rf $CHECKOUT_DIR" EXIT
 
-git clone --depth 1 "$REPO_URL" -b "$COMMIT"
-pushd "$REPO_DIR"
-pushd "$SUBDIR"
+git clone --depth 1 "$REPO_URL" -b "$COMMIT" "$CHECKOUT_DIR"
+
+pushd "$CHECKOUT_DIR/$SUBDIR"
 sh -c "$PREPARE"
-meson --prefix=/usr _build "${MESON_OPTIONS[@]}"
+meson setup --prefix=/usr _build "${MESON_OPTIONS[@]}"
 meson install -C _build
 popd
-popd
-rm -rf "$REPO_DIR"
diff --git a/.tx/config b/.tx/config
@@ -0,0 +1,8 @@
+[main]
+host = https://www.transifex.com
+
+[o:endless-os:p:gnome-shell:r:all]
+source_file = po/gnome-shell.pot
+source_lang = en
+file_filter = po/<lang>.po
+type = PO
diff --git a/NEWS b/NEWS
@@ -1,3 +1,126 @@
+43.9
+====
+* Fix exposing window previews on lock screen via keyboard shortcuts
+  [Florian; !2944]
+* Improve handling of latched vs. locked modes in OSK [Carlos; !2945]
+* Reverse slider direction in RTL locales [Khalid; !2943]
+* Misc. bug fixes and cleanups [xiaofan; !2947]
+
+Contributors:
+  Carlos Garnacho, Florian Müllner, Khalid Abu Shawarib, xiaofan
+
+Translators:
+  Daniel Rusek [cs]
+
+43.8
+====
+* Fix accessibility of quick settings sliders [Lukáš; !2762]
+* Allow notification dismissal with backspace [Chris; !2435]
+* Misc. bug fixes and cleanups [Florian, Takao, Carlos, Brendan, Daniel, Jonas;
+  !2814, !2842, !2849, !2668, !2666, !2876, !2729, !2828, !2904]
+
+Contributors:
+  Takao Fujiwara, Carlos Garnacho, Chris Heywood, Florian Müllner,
+  Lukáš Tyrychtr, Daniel van Vugt, Brendan William, Jonas Ådahl
+
+Translators:
+  Danial Behzadi [fa]
+
+43.7
+====
+* Fix cursor offset when using magnifier [Андрей; !2780]
+* Fix missing workspace borders after wallpaper changes [Florian; !2801]
+* Misc. bug fixes and cleanups [Florian; !2796]
+
+Contributors:
+  Florian Müllner, Андрей Гриценко
+
+43.6
+====
+* Fix stuck authentication dialog in remote sessions [Joan; !2761]
+* Fix IM popup getting stuck on engine changes [Daniel; !2774]
+* Fixed crash [Carlos; !2756]
+* Misc. bug fixes and cleanups [Zacharie; !2770]
+
+Contributors:
+  Daniel Drake, Zacharie DUBRULLE, Carlos Garnacho, Joan Torres
+
+Translators:
+  Leônidas Araújo [pt_BR]
+
+43.5
+====
+* Fix window screenshots with pointer [Ivan; !2710, !2702]
+* Fix notifications getting stuck indefinitely [msizanoen1; !2736]
+* Fix keynav of menu-less buttons [Florian; !2734]
+* Fix corner cases when matching apps on StartupWmClass [Marco; !2721]
+* Fix occasional misalignment of search results [Sebastian; !2744]
+* Fix regression in content-type sniffing on autorun [Balló; !2745]
+* Misc. bug fixes and cleanups [Will, Daniel, Florian, Jonas, Marco, Sebastian;
+  !2689, !2693, !2696, !2699, !2730, !2739, !2738, !2712]
+
+Contributors:
+  Jonas Dreßler, Balló György, Sebastian Keller, Ivan Molodetskikh, msizanoen1,
+  Florian Müllner, Will Thompson, Marco Trevisan (Treviño), Daniel van Vugt
+
+Translators:
+  Nart Tlisha [ab], Boyuan Yang [zh_CN]
+
+43.4
+====
+* Plugged leak [Sebastian; !2652]
+* Misc. bug fixes and cleanups [Jonas, Sebastian; !2318, !2667]
+
+Contributors:
+  Jonas Dreßler, Sebastian Keller
+
+Translators:
+  Anders Jonsson [sv], Sabri Ünal [tr], Jiri Grönroos [fi],
+  Ekaterine Papava [ka], Hugo Carvalho [pt], Yuri Chornoivan [uk],
+  Kukuh Syafaat [id], Martin [sl], Tim Sabsch [de], Piotr Drąg [pl],
+  Aurimas Černius [lt], Мирослав Николић [sr], Balázs Úr [hu], Alan Paris [fr]
+
+43.3
+====
+* Ensure quick settings toggles align with the pixel grid [Sebastian; !2577]
+* Lower OOM score of gnome-shell process [Jian-Hong; !2582]
+* Fix incomplete device list in volume menus [Florian; !2616]
+* Fixed crash [Florian; !2622]
+* Plugged leak [Sebastian; !2637]
+* Misc. bug fixes and cleanups [Jonas Å., Florian, Jonas D., Alessandro, Heiko,
+  Takao, Carlos, Sebastian; !2578, !2571, !2594, !2606, !2604, !2399, !2613,
+  !2496, !2625, !2552, !2634, !2514]
+
+Contributors:
+  Alessandro Bono, Jonas Dreßler, Takao Fujiwara, Carlos Garnacho, Balló György,
+  Heiko Hösch, Sebastian Keller, Florian Müllner, Jian-Hong Pan, Olga Smirnova,
+  Jonas Ådahl
+
+Translators:
+  Olga Smirnova [ie], Ekaterine Papava [ka], Aleksandr Melman [ru],
+  Nart Tlisha [ab], Bruce Cowan [en_GB], Hugo Carvalho [pt]
+
+43.2
+====
+* Fix screencast UI being erroneously disabled [Florian; !2533]
+* Properly apply saved shortcuts inhibition permissions [Florian; !2548]
+* Fix IM candidate popup getting closed when switching pages [Carlos; !2497]
+* Fix unresponsive screen area when quick settings are opened [Carlos; !2535]
+* Ensure completions are disabled when hiding on-screen keyboard [Carlos; !2543]
+* Fix missing name in wired network quick settings button [Florian; !2529]
+* Don't let wayland popovers block overview [Florian; !2549]
+* Fix repeated entries in volume device menu [Florian; !2558]
+* Fix input source switching with focus on password entry [Carlos; !2534]
+* Misc. bug fixes and cleanups [Alessandro, Florian, Jonas; !2536, !2545, !2546,
+  !2547, !2532, !1349]
+
+Contributors:
+  Alessandro Bono, Carlos Garnacho, Florian Müllner, Jonas Ådahl
+
+Translators:
+  Aleksandr Melman [ru], Dušan Kazik [sk], Vasil Pupkin [be],
+  Sveinn í Felli [is], Nart Tlisha [ab]
+
 43.1
 ====
 * Fix default keyboard layout during initial setup [Carlos; !2487, !2495]

diff --git a/data/40-gdm.rules b/data/40-gdm.rules
@@ -0,0 +1,8 @@
+polkit.addRule(function(action, subject) {
+        if (action.id == "org.freedesktop.accounts.user-administration" &&
+            (subject.user == "gdm" || subject.user == "Debian-gdm") &&
+            subject.local &&
+            subject.active) {
+                return polkit.Result.YES;
+        }
+});
diff --git a/data/dbus-interfaces/com.endlessm.Payg1.xml b/data/dbus-interfaces/com.endlessm.Payg1.xml
@@ -0,0 +1,22 @@
+<node>
+  <interface name="com.endlessm.Payg1">
+    <method name="AddCode">
+      <arg type="s" direction="in" name="code"/>
+      <arg type="x" direction="out" name="time_added"/>
+    </method>
+    <method name="ClearCode" />
+    <signal name="Expired" />
+    <signal name="ImpendingShutdown">
+      <arg type="i" name="seconds_remaining"/>
+      <arg type="s" name="shutdown_reason"/>
+    </signal>
+    <property name="ExpiryTime" type="t" access="read"/>
+    <property name="Enabled" type="b" access="read"/>
+    <property name="RateLimitEndTime" type="t" access="read"/>
+    <property name="AccountID" type="s" access="read"/>
+    <property name="CodeFormat" type="s" access="read"/>
+    <property name="CodeFormatPrefix" type="s" access="read"/>
+    <property name="CodeFormatSuffix" type="s" access="read"/>
+    <property name="CodeLength" type="u" access="read"/>
+  </interface>
+</node>
diff --git a/data/gnome-shell-dbus-interfaces.gresource.xml b/data/gnome-shell-dbus-interfaces.gresource.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/gnome/shell/dbus-interfaces">
+    <file preprocess="xml-stripblanks">com.endlessm.Payg1.xml</file>
     <file preprocess="xml-stripblanks">net.hadess.PowerProfiles.xml</file>
     <file preprocess="xml-stripblanks">net.hadess.SensorProxy.xml</file>
     <file preprocess="xml-stripblanks">net.reactivated.Fprint.Device.xml</file>

diff --git a/data/gnome-shell-overrides-migration.desktop.in b/data/gnome-shell-overrides-migration.desktop.in
diff --git a/data/gnome-shell-overrides-reset.desktop.in b/data/gnome-shell-overrides-reset.desktop.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Application
+Name=GNOME settings overrides reset
+NoDisplay=true
+Exec=@libexecdir@/gnome-shell-overrides-reset.sh
diff --git a/data/gnome-shell-theme.gresource.xml b/data/gnome-shell-theme.gresource.xml
@@ -21,5 +21,10 @@
     <file>toggle-on-hc.svg</file>
     <file>toggle-on-light.svg</file>
     <file>workspace-placeholder.svg</file>
+
+    <!-- Endless-specific resources beyond this point -->
+
+    <file>payg-near-expiration-symbolic.svg</file>
+    <file>payg-normal-symbolic.svg</file>
   </gresource>
 </gresources>
diff --git a/data/meson.build b/data/meson.build
@@ -97,13 +97,13 @@ schema = configure_file(
 )
 install_data('00_org.gnome.shell.gschema.override', install_dir: schemadir)
 
-overrides_migration_conf = configuration_data()
-overrides_migration_conf.set('libexecdir', libexecdir)
-overrides_migration = configure_file(
-  input: 'gnome-shell-overrides-migration.desktop.in',
-  output: 'gnome-shell-overrides-migration.desktop',
-  configuration: overrides_migration_conf,
-  install_dir: autostartdir
+overrides_reset_conf = configuration_data()
+overrides_reset_conf.set('libexecdir', libexecdir)
+overrides_reset = configure_file(
+  input: 'gnome-shell-overrides-reset.desktop.in',
+  output: 'gnome-shell-overrides-reset.desktop',
+  configuration: overrides_reset_conf,
+  install_dir: autostartdir,
 )
 
 if have_systemd
@@ -136,3 +136,6 @@ custom_target('compile-schemas',
   output: 'gschemas.compiled',
   command: [find_program('glib-compile-schemas'), meson.current_build_dir()],
   build_by_default: true)
+
+install_data('40-gdm.rules', install_dir: polkitrulesdir)
+install_data('vendor-customer-support.ini', install_dir: pkgdatadir)
diff --git a/data/[email protected] b/data/[email protected]
@@ -32,3 +32,6 @@ ExecStopPost=-/bin/sh -c 'test "$SERVICE_RESULT" != "exec-condition" && systemct
 Restart=no
 # Kill any stubborn child processes after this long
 TimeoutStopSec=5
+
+# Lower down gnome-shell's OOM score to avoid being killed by OOM-killer too early
+OOMScoreAdjust=-1000
diff --git a/data/[email protected] b/data/[email protected]
@@ -37,3 +37,6 @@ Restart=always
 RestartSec=0ms
 # Kill any stubborn child processes after this long
 TimeoutStopSec=5
+
+# Lower down gnome-shell's OOM score to avoid being killed by OOM-killer too early
+OOMScoreAdjust=-1000