[arch-commits] Commit in interception-dual-function-keys/trunk (2 files)

[Brett Cornwall]

    Date: Tuesday, December 29, 2020 @ 01:14:13
  Author: ainola
Revision: 796346

upgpkg: 1.3.0-1

Remove makefile patch as it's been upstreamed

Modified:
  interception-dual-function-keys/trunk/PKGBUILD
Deleted:
  interception-dual-function-keys/trunk/0001-make-Append-don-t-overwrite-user-defs.patch

--------------------------------------------------+
 0001-make-Append-don-t-overwrite-user-defs.patch |   42 ---------------------
 PKGBUILD                                         |   16 ++------
 2 files changed, 4 insertions(+), 54 deletions(-)

Deleted: 0001-make-Append-don-t-overwrite-user-defs.patch
===================================================================
--- 0001-make-Append-don-t-overwrite-user-defs.patch	2020-12-29 01:09:11 UTC (rev 796345)
+++ 0001-make-Append-don-t-overwrite-user-defs.patch	2020-12-29 01:14:13 UTC (rev 796346)
@@ -1,42 +0,0 @@
-From 02823635bf3bc149892ce75efffcc33a33e184c5 Mon Sep 17 00:00:00 2001
-From: Brett Cornwall <brett at i--b.com>
-Date: Fri, 25 Dec 2020 16:29:03 -0800
-Subject: [PATCH] make: Append, don't overwrite user defs
-
----
- config.mk | 16 +++++++---------
- 1 file changed, 7 insertions(+), 9 deletions(-)
-
-diff --git a/config.mk b/config.mk
-index 57bf7a3..619121d 100644
---- a/config.mk
-+++ b/config.mk
-@@ -1,18 +1,16 @@
--ifndef VERSION
--  VERSION = "development-version"
--endif
-+VERSION ?= "development-version"
- 
--PREFIX = /usr/local
-+PREFIX ?= /usr/local
- 
--INCS = -I/usr/include/libevdev-1.0
-+INCS += -I/usr/include/libevdev-1.0
- 
--CPPFLAGS = $(INCS) -DVERSION=\"$(VERSION)\"
-+CPPFLAGS += $(INCS) -DVERSION=\"$(VERSION)\"
- 
--COMPFLAGS = -pedantic -Wall -Wextra -O3
--CFLAGS = $(COMPFLAGS) -std=c99
-+COMPFLAGS += -pedantic -Wall -Wextra -O3
-+CFLAGS += $(COMPFLAGS) -std=c99
- CXXFLAGS = $(COMPFLAGS) -std=c++11
- 
--LDFLAGS = -rdynamic -lyaml-cpp -levdev
-+LDFLAGS += -rdynamic -lyaml-cpp -levdev
- 
- CC = cc
- CXX = c++
--- 
-2.29.2
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-29 01:09:11 UTC (rev 796345)
+++ PKGBUILD	2020-12-29 01:14:13 UTC (rev 796346)
@@ -2,24 +2,16 @@
 # Contributor: Alexander Courtis
 
 pkgname=interception-dual-function-keys
-pkgver=1.2.0
-pkgrel=2
+pkgver=1.3.0
+pkgrel=1
 pkgdesc="Interception plugin for dual-function keys: Tap for one key, hold for another"
 arch=('x86_64')
 url="https://gitlab.com/interception/linux/plugins/dual-function-keys"
 license=('MIT')
 depends=('interception-tools')
-source=("$pkgname-$pkgver.tar.gz::https://gitlab.com/interception/linux/plugins/dual-function-keys/-/archive/$pkgver/dual-function-keys-$pkgver.tar.gz"
-"0001-make-Append-don-t-overwrite-user-defs.patch")
-sha256sums=('fc64d6ddf80c1a153dd0e2180a581649f4a9d489e1718053a70b61faef98e0ca'
-            '98f9dbc96b3f71ba4969146282676946648dfc085d7722794d9bb8b0a9740d30')
+source=("$pkgname-$pkgver.tar.gz::https://gitlab.com/interception/linux/plugins/dual-function-keys/-/archive/$pkgver/dual-function-keys-$pkgver.tar.gz")
+sha256sums=('595ffcc6ff944783cdb37b4ccf2db632238ebc2727ebd568454e3d0a59330e63')
 
-prepare() {
-    cd "dual-function-keys-$pkgver"
-    # https://gitlab.com/interception/linux/plugins/dual-function-keys/-/issues/20
-    patch -p1 < ../0001-make-Append-don-t-overwrite-user-defs.patch
-}
-
 build() {
     cd "dual-function-keys-$pkgver"
     make VERSION="$pkgver"