[arch-commits] Commit in light-locker/trunk (2 files)

[Maxime Gauduin]

    Date: Monday, February 24, 2020 @ 13:28:31
  Author: alucryd
Revision: 580458

FS#65445: make upower an optdep

Modified:
  light-locker/trunk/PKGBUILD
Deleted:
  light-locker/trunk/light-locker-libsystemd-login.patch

-------------------------------------+
 PKGBUILD                            |   21 +++++++++++----
 light-locker-libsystemd-login.patch |   47 ----------------------------------
 2 files changed, 16 insertions(+), 52 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-24 13:18:20 UTC (rev 580457)
+++ PKGBUILD	2020-02-24 13:28:31 UTC (rev 580458)
@@ -2,18 +2,27 @@
 
 pkgname=light-locker
 pkgver=1.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A simple session locker for LightDM'
 arch=(x86_64)
 url=https://github.com/the-cavalry/light-locker
 license=(GPL2)
 depends=(
+  cairo
   dbus-glib
-  gtk3
-  lightdm
-  libsystemd
+  glibc
+  libdbus-1.so
+  libgdk-3.so
+  libgio-2.0.so
+  libglib-2.0.so
+  libgobject-2.0.so
+  libgtk-3.so
+  libpango-1.0.so
+  libpangocairo-1.0.so
+  libsystemd.so
+  libx11
+  libxext
   libxss
-  upower
 )
 makedepends=(
   git
@@ -20,8 +29,10 @@
   gnome-common
   intltool
   meson
+  upower
   xorgproto
 )
+optdepends=('upower: Power management support')
 source=(git+https://github.com/the-cavalry/light-locker.git#tag=7a96e9f87dc95c794cd45fd0378a62f45308ea87)
 sha256sums=(SKIP)
 

Deleted: light-locker-libsystemd-login.patch
===================================================================
--- light-locker-libsystemd-login.patch	2020-02-24 13:18:20 UTC (rev 580457)
+++ light-locker-libsystemd-login.patch	2020-02-24 13:28:31 UTC (rev 580458)
@@ -1,47 +0,0 @@
-diff -rupN light-locker-1.6.0.orig/configure light-locker-1.6.0/configure
---- light-locker-1.6.0.orig/configure	2016-04-29 20:03:27.914972019 +0200
-+++ light-locker-1.6.0/configure	2016-04-29 20:04:32.217760286 +0200
-@@ -17558,12 +17558,12 @@ if test -n "$SYSTEMD_CFLAGS"; then
-     pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS"
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "libsystemd-login") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-login" 2>/dev/null`
-+  pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd" 2>/dev/null`
- 		      test "x$?" != "x0" && pkg_failed=yes
- else
-   pkg_failed=yes
-@@ -17575,12 +17575,12 @@ if test -n "$SYSTEMD_LIBS"; then
-     pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS"
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "libsystemd-login") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd-login" 2>/dev/null`
-+  pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd" 2>/dev/null`
- 		      test "x$?" != "x0" && pkg_failed=yes
- else
-   pkg_failed=yes
-@@ -17601,9 +17601,9 @@ else
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-login" 2>&1`
-+	        SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd" 2>&1`
-         else
--	        SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-login" 2>&1`
-+	        SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd" 2>&1`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$SYSTEMD_PKG_ERRORS" >&5