[arch-commits] Commit in light-locker/repos/community-x86_64 (4 files)

Maxime Gauduin alucryd at archlinux.org
Sun Feb 9 11:02:28 UTC 2020


    Date: Sunday, February 9, 2020 @ 11:02:27
  Author: alucryd
Revision: 565274

archrelease: copy trunk to community-x86_64

Added:
  light-locker/repos/community-x86_64/PKGBUILD
    (from rev 565273, light-locker/trunk/PKGBUILD)
  light-locker/repos/community-x86_64/light-locker-libsystemd-login.patch
    (from rev 565273, light-locker/trunk/light-locker-libsystemd-login.patch)
Deleted:
  light-locker/repos/community-x86_64/PKGBUILD
  light-locker/repos/community-x86_64/light-locker-libsystemd-login.patch

-------------------------------------+
 PKGBUILD                            |   91 +++++++++++++++-----------------
 light-locker-libsystemd-login.patch |   94 +++++++++++++++++-----------------
 2 files changed, 90 insertions(+), 95 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-09 11:02:21 UTC (rev 565273)
+++ PKGBUILD	2020-02-09 11:02:27 UTC (rev 565274)
@@ -1,48 +0,0 @@
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-
-pkgname=light-locker
-pkgver=1.8.0
-pkgrel=3
-pkgdesc='A simple session locker for LightDM'
-arch=('x86_64')
-url='https://github.com/the-cavalry/light-locker'
-license=('GPL2')
-depends=('dbus-glib' 'gtk3' 'lightdm' 'libxss')
-makedepends=('gnome-common' 'intltool' 'xorgproto')
-source=("https://github.com/the-cavalry/light-locker/releases/download/v${pkgver}/light-locker-${pkgver}.tar.bz2"
-        'light-locker-libsystemd-login.patch')
-sha256sums=('3c76106f40a8efe67b462061e4c798e3e501b54356c8cdc1b67a3022d9d7dba1'
-            'd5a4e9a97b491c17aa059863020ed5cbfaaf0c79e05130d36a58959438c85cf3')
-
-prepare() {
-  cd light-locker-${pkgver}
-
-#  patch -Np1 -i ../light-locker-libsystemd-login.patch
-}
-
-build () {
-  cd light-locker-${pkgver}
-
-  ./configure \
-    --prefix='/usr' \
-    --localstatedir='/var' \
-    --sysconfdir='/etc' \
-    --with-x \
-    --with-dpms-ext \
-    --with-mit-ext \
-    --with-xf86gamma-ext \
-    --with-systemd \
-    --without-console-kit \
-    --without-upower \
-    --disable-schemas-compile \
-    --disable-static
-  make
-}
-
-package() {
-  cd light-locker-${pkgver}
-
-  make DESTDIR="${pkgdir}" install
-}
-
-# vim: ts=2 sw=2 et:

Copied: light-locker/repos/community-x86_64/PKGBUILD (from rev 565273, light-locker/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-02-09 11:02:27 UTC (rev 565274)
@@ -0,0 +1,43 @@
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+
+pkgname=light-locker
+pkgver=1.9.0
+pkgrel=1
+pkgdesc='A simple session locker for LightDM'
+arch=(x86_64)
+url=https://github.com/the-cavalry/light-locker
+license=(GPL2)
+depends=(
+  dbus-glib
+  gtk3
+  lightdm
+  libsystemd
+  libxss
+  upower
+)
+makedepends=(
+  git
+  gnome-common
+  intltool
+  meson
+  xorgproto
+)
+source=(git+https://github.com/the-cavalry/light-locker.git#tag=7a96e9f87dc95c794cd45fd0378a62f45308ea87)
+sha256sums=(SKIP)
+
+pkgver() {
+  cd light-locker
+
+  git describe --tags | sed 's/^v//'
+}
+
+build () {
+  arch-meson light-locker build
+  ninja -C build
+}
+
+package() {
+  DESTDIR="${pkgdir}" ninja -C build install
+}
+
+# vim: ts=2 sw=2 et:

Deleted: light-locker-libsystemd-login.patch
===================================================================
--- light-locker-libsystemd-login.patch	2020-02-09 11:02:21 UTC (rev 565273)
+++ light-locker-libsystemd-login.patch	2020-02-09 11:02:27 UTC (rev 565274)
@@ -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

Copied: light-locker/repos/community-x86_64/light-locker-libsystemd-login.patch (from rev 565273, light-locker/trunk/light-locker-libsystemd-login.patch)
===================================================================
--- light-locker-libsystemd-login.patch	                        (rev 0)
+++ light-locker-libsystemd-login.patch	2020-02-09 11:02:27 UTC (rev 565274)
@@ -0,0 +1,47 @@
+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



More information about the arch-commits mailing list