[arch-commits] Commit in i3lock-color/trunk (2 files)

[Alad Wenter]

    Date: Tuesday, March 17, 2020 @ 23:06:53
  Author: alad
Revision: 600433

upgpkg: i3lock-color 2.12.c.1-1

Modified:
  i3lock-color/trunk/PKGBUILD
Deleted:
  i3lock-color/trunk/0001-Also-pass-screen-brightness-keys-as-media-keys.patch

-----------------------------------------------------------+
 0001-Also-pass-screen-brightness-keys-as-media-keys.patch |   55 ------------
 PKGBUILD                                                  |   17 +--
 2 files changed, 8 insertions(+), 64 deletions(-)

Deleted: 0001-Also-pass-screen-brightness-keys-as-media-keys.patch
===================================================================
--- 0001-Also-pass-screen-brightness-keys-as-media-keys.patch	2020-03-17 22:58:55 UTC (rev 600432)
+++ 0001-Also-pass-screen-brightness-keys-as-media-keys.patch	2020-03-17 23:06:53 UTC (rev 600433)
@@ -1,55 +0,0 @@
-From e71a208aab9f1530be80f6405bd0596dfca35a3a Mon Sep 17 00:00:00 2001
-From: Alad Wenter <alad at archlinux.org>
-Date: Wed, 7 Aug 2019 00:47:21 +0200
-Subject: [PATCH] Also pass screen brightness keys as media keys
-
-Rebase of upstream commits:
-
- 2a6545e5bbc2d5d1f20ac71a45cabef27113d7cd # Also pass screen brightness keys as media keys 
- 2766a1380818d70b7b8ed41b6aaca1124e11c790 # Add docs about passing of media keys 
- 71cf4bda1b6f37847fae95de2f035995454743cd # Add long option for media key passing to docs 
----
- i3lock.1 | 6 ++++++
- i3lock.c | 2 ++
- 2 files changed, 8 insertions(+)
-
-diff --git a/i3lock.1 b/i3lock.1
-index 761a6bd..f388a09 100644
---- a/i3lock.1
-+++ b/i3lock.1
-@@ -28,6 +28,7 @@ i3lock-color \- improved screen locker
- .RB [\|\-u\|]
- .RB [\|\-e\|]
- .RB [\|\-f\|]
-+.RB [\|\-m\|]
- 
- .SH DESCRIPTION
- .B i3lock-color
-@@ -121,6 +122,11 @@ Note that this number is zero indexed. The ordering is dependent on libxinerama.
- Captures the screen and blurs it using the given sigma (radius).
- Images may still be overlaid over the blurred screenshot.
- 
-+.TP
-+.B \-m, \-\-pass-media-keys
-+Allow the following keys to be used while the screen is locked by passing them through:
-+XF86AudioPlay, XF86AudioPause, XF86AudioStop, XF86AudioPrev, XF86AudioNext, XF86AudioMu
-+
- .TP
- .B \-\-indicator
- Forces the indicator to always be visible, instead of only showing on activity.
-diff --git a/i3lock.c b/i3lock.c
-index d3fcee8..7926599 100644
---- a/i3lock.c
-+++ b/i3lock.c
-@@ -652,6 +652,8 @@ static void handle_key_press(xcb_key_press_event_t *event) {
-             case XKB_KEY_XF86AudioMute:
-             case XKB_KEY_XF86AudioLowerVolume:
-             case XKB_KEY_XF86AudioRaiseVolume:
-+            case XKB_KEY_XF86MonBrightnessUp:
-+            case XKB_KEY_XF86MonBrightnessDown:
-                 xcb_send_event(conn, true, screen->root, XCB_EVENT_MASK_BUTTON_PRESS, (char *)event);
-                 return;
-         }
--- 
-2.22.0
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-17 22:58:55 UTC (rev 600432)
+++ PKGBUILD	2020-03-17 23:06:53 UTC (rev 600433)
@@ -1,12 +1,12 @@
 # Maintainer: Alad Wenter <alad at archlinux.org>
 # Contributor: ibrokemypie <ibrokemypie at bastardi.net>
 pkgname=i3lock-color
-pkgver=2.12.c
+pkgver=2.12.c.1
 pkgrel=1
-_commit=60d68356db80549cb6e40a093b2f884b500aac44 # 2.12.c
+_commit=fcb46c7cd880121a5e3590659705641cf8014bcc # 2.12.c.1
 pkgdesc="improved screenlocker with color configuration support"
 arch=('x86_64')
-url=https://github.com/PandorasFox/i3lock-color
+url=https://github.com/Raymo111/i3lock-color/
 license=('MIT')
 depends=('xcb-util-image' 'pam' 'libev' 'cairo' 'libxkbcommon-x11'
          'libjpeg-turbo' 'xcb-util-xrm' 'pkgconf')
@@ -13,18 +13,17 @@
 makedepends=('git')
 provides=('i3lock')
 conflicts=('i3lock')
-source=("$pkgname-$pkgver::git+https://github.com/PandorasFox/$pkgname#commit=$_commit"
-        '0001-Also-pass-screen-brightness-keys-as-media-keys.patch')
-sha256sums=('SKIP'
-            'f09ebac78d0f021449734fe38afbc9e389a350255ba88cd5a89d86988fe639db')
+source=("$pkgname-$pkgver::git+https://github.com/PandorasFox/$pkgname#commit=$_commit")
+sha256sums=('SKIP')
 
 prepare() {
     cd "$pkgname-$pkgver"
-    patch -p1 < "$srcdir"/0001-Also-pass-screen-brightness-keys-as-media-keys.patch
+    # Add XF86Sleep to --pass-power-keys
+    git cherry-pick --no-commit dbb21b5341307f682533d517c9cc61e4b6cc6cf6
 
 	# Fix ticket FS#31544, sed line taken from gentoo
 	sed -i -e 's:login:system-auth:' pam/i3lock 
-    autoreconf -fiv	
+    autoreconf -fiv
 }
 
 build() {