cosmic-greeter: Fix PAM

Signed-off-by: Peter Jung <[email protected]>
CachyOS · Sep 27, 2024 · 99c540b · 99c540b
1 parent af36e00
commit 99c540b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/cosmic/cosmic-greeter/.SRCINFO b/cosmic/cosmic-greeter/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = cosmic-greeter
 	pkgdesc = COSMIC greeter for greetd
 	pkgver = 1.0.0.alpha.2
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/pop-os/cosmic-greeter
 	arch = x86_64
 	groups = cosmic
@@ -21,7 +21,9 @@ pkgbase = cosmic-greeter
 	depends = wayland
 	source = git+https://github.com/pop-os/cosmic-greeter.git#tag=4ddb320daeea5124bf67500d73d6ead620f3d09b
 	source = cosmic-greeter-display-manager.patch
+	source = cosmic-greeter-lto.patch
 	b2sums = 2bae195d537b84f6a9e21b5bf224c7cd44bdfad11fbb952a018959ee716f0aa10e49f051e65b2211c7798c36258753b92eeb4f6f68d0848c4f1da58b67d9fa91
 	b2sums = 8b5c32a991e31cf102b1b07e06d37e979f19106b82e8cab7dc8df81789ab6b24587605aa3387254057732a268368c4074f92461f6f5125bc1cba4e62e18cef27
+	b2sums = 89ca262c95713e773662fb81e379bc2b63d2c93072b909f8f1eaaafee5289359fd729a476eb66568f893986a53e9c689dccfc4aeeeef62cb736cff466c463f7d
 
 pkgname = cosmic-greeter
diff --git a/cosmic/cosmic-greeter/PKGBUILD b/cosmic/cosmic-greeter/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=cosmic-greeter
 pkgver=1.0.0.alpha.2
-pkgrel=2
+pkgrel=3
 pkgdesc='COSMIC greeter for greetd'
 arch=(x86_64)
 url=https://github.com/pop-os/cosmic-greeter
@@ -30,18 +30,23 @@ _tag=4ddb320daeea5124bf67500d73d6ead620f3d09b
 source=(
   git+https://github.com/pop-os/cosmic-greeter.git#tag=${_tag}
   cosmic-greeter-display-manager.patch
+  cosmic-greeter-lto.patch
 )
 b2sums=('2bae195d537b84f6a9e21b5bf224c7cd44bdfad11fbb952a018959ee716f0aa10e49f051e65b2211c7798c36258753b92eeb4f6f68d0848c4f1da58b67d9fa91'
-        '8b5c32a991e31cf102b1b07e06d37e979f19106b82e8cab7dc8df81789ab6b24587605aa3387254057732a268368c4074f92461f6f5125bc1cba4e62e18cef27')
+        '8b5c32a991e31cf102b1b07e06d37e979f19106b82e8cab7dc8df81789ab6b24587605aa3387254057732a268368c4074f92461f6f5125bc1cba4e62e18cef27'
+        '89ca262c95713e773662fb81e379bc2b63d2c93072b909f8f1eaaafee5289359fd729a476eb66568f893986a53e9c689dccfc4aeeeef62cb736cff466c463f7d')
 
 prepare() {
   cd cosmic-greeter
   git lfs install --local
   git remote add network-origin ${url}
   git lfs fetch network-origin
   git lfs checkout
+  # revert pam config for now
+  git revert -n ef1253aa2393666bb2a0b0132b722f51ec7ebbf3
   cargo fetch --locked
   patch -Np1 -i ../cosmic-greeter-display-manager.patch
+  patch -Np1 -i ../cosmic-greeter-lto.patch
 }
 
 pkgver() {
@@ -51,8 +56,6 @@ pkgver() {
 
 build() {
   cd cosmic-greeter
-  export CC=clang
-  export CXX=clang++
   RUSTFLAGS+=" -C link-arg=-fuse-ld=lld"
   just build-release --frozen
 }

diff --git a/cosmic/cosmic-greeter/cosmic-greeter-lto.patch b/cosmic/cosmic-greeter/cosmic-greeter-lto.patch
@@ -0,0 +1,13 @@
+diff '--color=auto' -rupN cosmic-greeter.orig/Cargo.toml cosmic-greeter/Cargo.toml
+--- cosmic-greeter.orig/Cargo.toml	2024-09-26 18:28:04.748010656 +0200
++++ cosmic-greeter/Cargo.toml	2024-09-26 18:28:33.331673933 +0200
+@@ -62,6 +62,9 @@ opt-level = 2
+ [profile.dev.package.ttf-parser]
+ opt-level = 2
+
++[profile.release]
++lto = "thin"
++
+ [workspace]
+ members = ["cosmic-greeter-config", "daemon"]
+ resolver = "2"