Update to 44.1

3 files changed, 47 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8250684224d5..0a44aa100b24 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,47 +1,45 @@
 pkgbase = gdm-prime
 	pkgdesc = Display manager and login screen - patched with Prime support for Optimus laptops
-	pkgver = 43.0
+	pkgver = 44.1
 	pkgrel = 1
 	url = https://wiki.gnome.org/Projects/GDM
 	arch = x86_64
 	license = GPL
 	checkdepends = check
-	makedepends = yelp-tools
-	makedepends = gobject-introspection
-	makedepends = git
 	makedepends = docbook-xsl
+	makedepends = git
+	makedepends = gobject-introspection
 	makedepends = meson
-	depends = gnome-shell
+	makedepends = plymouth
+	makedepends = yelp-tools
 	depends = gnome-session
+	depends = gnome-shell
+	depends = libcanberra
+	depends = libxdmcp
+	depends = systemd
 	depends = upower
-	depends = xorg-xrdb
 	depends = xorg-server
 	depends = xorg-xhost
-	depends = libxdmcp
-	depends = systemd
-	depends = libcanberra
-	options = debug
-	source = git+https://gitlab.gnome.org/GNOME/gdm.git#commit=afa6f2ef3d34048cd7a3e1a1ec478be2ff464806
+	depends = xorg-xrdb
+	source = git+https://gitlab.gnome.org/GNOME/gdm.git#commit=b622872c5f24960c18900ebf14b5233b8701a8f9
 	source = 0001-Xsession-Don-t-start-ssh-agent-by-default.patch
-	source = 0002-pam-arch-Remove-user_readenv-1-from-pam_env.patch
-	source = 0003-nvidia-prime.patch
+	source = 0002-nvidia-prime.patch
 	sha256sums = SKIP
 	sha256sums = 39a7e1189d423dd428ace9baac77ba0442c6706a861d3c3db9eb3a6643e223f8
-	sha256sums = 7e42077a89a6fcf8b02244b01127af7000a10ed55e09e385eb6fac5aef421c07
 	sha256sums = a1fb80c69454492390e4b7edac0efe55b2178c7031051d3eab99ed8c14d3e0e4
 
 pkgname = gdm-prime
 	install = gdm-prime.install
 	groups = gnome
-	depends = gnome-shell
 	depends = gnome-session
+	depends = gnome-shell
+	depends = libcanberra
+	depends = libxdmcp
+	depends = systemd
 	depends = upower
-	depends = xorg-xrdb
 	depends = xorg-server
 	depends = xorg-xhost
-	depends = libxdmcp
-	depends = systemd
-	depends = libcanberra
+	depends = xorg-xrdb
 	depends = libgdm
 	optdepends = fprintd: fingerprint authentication
 	provides = gdm
diff --git a/0003-nvidia-prime.patch b/0002-nvidia-prime.patch
index b4b804864ae0..b4b804864ae0 100644
--- a/0003-nvidia-prime.patch
+++ b/0002-nvidia-prime.patch
diff --git a/PKGBUILD b/PKGBUILD
index 2cad7902423e..8c4a38285db5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,25 +4,40 @@
 
 pkgbase=gdm-prime
 pkgname=(gdm-prime libgdm-prime)
-pkgver=43.0
+pkgver=44.1
 pkgrel=1
 pkgdesc="Display manager and login screen - patched with Prime support for Optimus laptops"
 url="https://wiki.gnome.org/Projects/GDM"
 arch=(x86_64)
 license=(GPL)
-depends=(gnome-shell gnome-session upower xorg-xrdb xorg-server xorg-xhost
-         libxdmcp systemd libcanberra)
-makedepends=(yelp-tools gobject-introspection git docbook-xsl meson)
+depends=(
+  gnome-session
+  gnome-shell
+  libcanberra
+  libxdmcp
+  systemd
+  upower
+  xorg-server
+  xorg-xhost
+  xorg-xrdb
+)
+makedepends=(
+  docbook-xsl
+  git
+  gobject-introspection
+  meson
+  plymouth
+  yelp-tools
+)
 checkdepends=(check)
-options=(debug)
-_commit=afa6f2ef3d34048cd7a3e1a1ec478be2ff464806  # tags/43.0^0
-source=("git+https://gitlab.gnome.org/GNOME/gdm.git#commit=$_commit"
-        0001-Xsession-Don-t-start-ssh-agent-by-default.patch
-        0002-pam-arch-Remove-user_readenv-1-from-pam_env.patch
-        0003-nvidia-prime.patch)
+_commit=b622872c5f24960c18900ebf14b5233b8701a8f9  # tags/44.1^0
+source=(
+  "git+https://gitlab.gnome.org/GNOME/gdm.git#commit=$_commit"
+  0001-Xsession-Don-t-start-ssh-agent-by-default.patch
+  0002-nvidia-prime.patch
+)
 sha256sums=('SKIP'
             '39a7e1189d423dd428ace9baac77ba0442c6706a861d3c3db9eb3a6643e223f8'
-            '7e42077a89a6fcf8b02244b01127af7000a10ed55e09e385eb6fac5aef421c07'
             'a1fb80c69454492390e4b7edac0efe55b2178c7031051d3eab99ed8c14d3e0e4')
 
 pkgver() {
@@ -33,13 +48,13 @@ pkgver() {
 prepare() {
   cd gdm
 
+  # https://gitlab.gnome.org/GNOME/gdm/-/issues/730
+  git cherry-pick -n b29510dbc51ccf71a7c0ed656d21634a83766c0c
+
   # Don't start ssh-agent by default
   git apply -3 ../0001-Xsession-Don-t-start-ssh-agent-by-default.patch
 
-  # https://bugs.archlinux.org/task/68945
-  git apply -3 ../0002-pam-arch-Remove-user_readenv-1-from-pam_env.patch
-
-  git apply -3 ../0003-nvidia-prime.patch
+  git apply -3 ../0002-nvidia-prime.patch
 }
 
 build() {
@@ -49,7 +64,6 @@ build() {
     -D default-path="/usr/local/bin:/usr/local/sbin:/usr/bin"
     -D gdm-xsession=true
     -D ipv6=true
-    -D plymouth=disabled
     -D run-dir=/run/gdm
     -D selinux=disabled
   )