From: Gottox <Gottox@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] usb-modeswitch-1.6.0
Date: Mon, 04 May 2020 22:12:58 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-21623@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 316 bytes --]
There is a new pull request by Gottox against master on the void-packages repository
https://github.com/Gottox/void-packages usb-modeswitch-1.6.0
https://github.com/void-linux/void-packages/pull/21623
usb-modeswitch-1.6.0
A patch file from https://github.com/void-linux/void-packages/pull/21623.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-usb-modeswitch-1.6.0-21623.patch --]
[-- Type: text/x-diff, Size: 7104 bytes --]
From c0a08d6df6c10abfd0467830eac67bb7f56b5fbb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 4 May 2020 21:39:55 +0200
Subject: [PATCH 1/2] usb-modeswitch: update to 2.6.0.
---
.../patches/0001-fix-destdir.patch | 33 ++++++++-----------
srcpkgs/usb-modeswitch/template | 4 +--
2 files changed, 15 insertions(+), 22 deletions(-)
diff --git a/srcpkgs/usb-modeswitch/patches/0001-fix-destdir.patch b/srcpkgs/usb-modeswitch/patches/0001-fix-destdir.patch
index a1a927b2128..61dde12cdfd 100644
--- a/srcpkgs/usb-modeswitch/patches/0001-fix-destdir.patch
+++ b/srcpkgs/usb-modeswitch/patches/0001-fix-destdir.patch
@@ -1,6 +1,6 @@
---- Makefile.old 2014-05-29 20:35:46.000000000 +0200
-+++ Makefile 2014-12-08 08:45:45.067710346 +0100
-@@ -5,11 +5,11 @@ CFLAGS += -Wall
+--- Makefile.orig 2019-11-11 21:45:13.000000000 +0100
++++ Makefile 2020-05-04 21:22:53.680445703 +0200
+@@ -5,11 +5,11 @@ CFLAGS += -Wall -Wno-deprecated-dec
LIBS = `pkg-config --libs --cflags libusb-1.0`
RM = /bin/rm -f
OBJS = usb_modeswitch.c
@@ -14,34 +14,28 @@
+UDEVDIR = /lib/udev
SBINDIR = $(PREFIX)/sbin
MANDIR = $(PREFIX)/share/man/man1
- VPATH = jimtcl
-@@ -77,15 +77,15 @@ ums-clean:
+
+@@ -54,12 +54,12 @@ distclean: clean
# If not, use the dispatcher directly from the udev rule as in previous versions
- install-common: $(PROG) usb_modeswitch_dispatcher
+ install-common: $(PROG) $(DISPATCH)
- install -D --mode=755 usb_modeswitch $(SBINDIR)/usb_modeswitch
- install -D --mode=755 usb_modeswitch.sh $(UDEVDIR)/usb_modeswitch
- install -D --mode=644 usb_modeswitch.conf $(ETCDIR)/usb_modeswitch.conf
- install -D --mode=644 usb_modeswitch.1 $(MANDIR)/usb_modeswitch.1
- install -D --mode=644 usb_modeswitch_dispatcher.1 $(MANDIR)/usb_modeswitch_dispatcher.1
- install -D --mode=755 usb_modeswitch_dispatcher $(SBINDIR)/usb_modeswitch_dispatcher
-- install -d $(DESTDIR)/var/lib/usb_modeswitch
-- test -d $(UPSDIR) -a -e /sbin/initctl && install --mode=644 usb-modeswitch-upstart.conf $(UPSDIR) || test 1
-- test -d $(SYSDIR) -a \( -e /usr/bin/systemctl -o -e /bin/systemctl \) && install --mode=644 usb_modeswitch@.service $(SYSDIR) || test 1
+ install -D --mode=755 usb_modeswitch $(DESTDIR)/$(SBINDIR)/usb_modeswitch
+ install -D --mode=755 usb_modeswitch.sh $(DESTDIR)/$(UDEVDIR)/usb_modeswitch
+ install -D --mode=644 usb_modeswitch.conf $(DESTDIR)/$(ETCDIR)/usb_modeswitch.conf
+ install -D --mode=644 usb_modeswitch.1 $(DESTDIR)/$(MANDIR)/usb_modeswitch.1
+ install -D --mode=644 usb_modeswitch_dispatcher.1 $(DESTDIR)/$(MANDIR)/usb_modeswitch_dispatcher.1
+ install -D --mode=755 usb_modeswitch_dispatcher $(DESTDIR)/$(SBINDIR)/usb_modeswitch_dispatcher
-+ install -d $(DESTDIR)/var/lib/usb_modeswitch
-+ test -d $(DESTDIR)/$(UPSDIR) -a -e /sbin/initctl && install --mode=644 usb-modeswitch-upstart.conf $(DESTDIR)/$(UPSDIR) || test 1
-+ test -d $(DESTDIR)/$(SYSDIR) -a \( -e /usr/bin/systemctl -o -e /bin/systemctl \) && install --mode=644 usb_modeswitch@.service $(DESTDIR)/$(SYSDIR) || test 1
-
- install: install-script
-
-@@ -96,10 +96,10 @@ install-shared: dispatcher-shared instal
- install-static: dispatcher-static install-common
+ install -d $(DESTDIR)/var/lib/usb_modeswitch
+ test -d $(UPSDIR) -a -e /sbin/initctl && install --mode=644 usb-modeswitch-upstart.conf $(UPSDIR) || test 1
+ test -d $(SYSDIR) -a \( -e /usr/bin/systemctl -o -e /bin/systemctl \) && install --mode=644 usb_modeswitch@.service $(SYSDIR) || test 1
+@@ -73,10 +73,10 @@ install-dynlink: dispatcher-dynlink inst
+ install-statlink: dispatcher-statlink install-common
uninstall:
- $(RM) $(SBINDIR)/usb_modeswitch
@@ -49,12 +43,11 @@
- $(RM) $(UDEVDIR)/usb_modeswitch
- $(RM) $(ETCDIR)/usb_modeswitch.conf
- $(RM) $(MANDIR)/usb_modeswitch.1
-- $(RM) -R $(DESTDIR)/var/lib/usb_modeswitch
-- $(RM) $(SYSDIR)/usb_modeswitch@.service
+ $(RM) $(DESTDIR)/$(SBINDIR)/usb_modeswitch
+ $(RM) $(DESTDIR)/$(SBINDIR)/usb_modeswitch_dispatcher
+ $(RM) $(DESTDIR)/$(UDEVDIR)/usb_modeswitch
+ $(RM) $(DESTDIR)/$(ETCDIR)/usb_modeswitch.conf
+ $(RM) $(DESTDIR)/$(MANDIR)/usb_modeswitch.1
-+ $(RM) -R $(DESTDIR)/var/lib/usb_modeswitch
+ $(RM) -R $(DESTDIR)/var/lib/usb_modeswitch
+- $(RM) $(SYSDIR)/usb_modeswitch@.service
+ $(RM) $(DESTDIR)/$(SYSDIR)/usb_modeswitch@.service
diff --git a/srcpkgs/usb-modeswitch/template b/srcpkgs/usb-modeswitch/template
index b78be0361f6..10e2676769f 100644
--- a/srcpkgs/usb-modeswitch/template
+++ b/srcpkgs/usb-modeswitch/template
@@ -1,6 +1,6 @@
# Template file for 'usb-modeswitch'
pkgname=usb-modeswitch
-version=2.5.2
+version=2.6.0
revision=1
build_style=gnu-makefile
short_desc="Mode switching tool for controlling multi-mode USB devices"
@@ -12,5 +12,5 @@ depends="tcl ${pkgname}-data"
hostmakedepends="pkg-config tcl"
homepage="http://www.draisberghof.de/usb_modeswitch/"
distfiles="http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${version}.tar.bz2"
-checksum=abffac09c87eacd78e101545967dc25af7e989745b4276756d45dbf4008a2ea6
+checksum=c215236e6bada6e659fc195a31d611ea298a4bdb4d57a0d68c553b56585f8ba3
make_install_args="SBINDIR=/usr/bin UDEVDIR=/usr/lib/udev"
From f0ab06269d2a6aadcd4fea483db8e81af697061b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 4 May 2020 21:40:00 +0200
Subject: [PATCH 2/2] usb-modeswitch-data: update to 20191128.
---
srcpkgs/usb-modeswitch-data/patches/0001-fix-destdir.patch | 2 +-
srcpkgs/usb-modeswitch-data/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/usb-modeswitch-data/patches/0001-fix-destdir.patch b/srcpkgs/usb-modeswitch-data/patches/0001-fix-destdir.patch
index 5cf92235184..054bc55fdf2 100644
--- a/srcpkgs/usb-modeswitch-data/patches/0001-fix-destdir.patch
+++ b/srcpkgs/usb-modeswitch-data/patches/0001-fix-destdir.patch
@@ -3,7 +3,7 @@
@@ -1,9 +1,9 @@
PROG = usb-modeswitch-data
VERS = 20160803
- RM = /bin/rm -f
+ MV = /bin/mv -f
-PREFIX = $(DESTDIR)/usr
-ETCDIR = $(DESTDIR)/etc
-RULESDIR = $(DESTDIR)/lib/udev/rules.d
diff --git a/srcpkgs/usb-modeswitch-data/template b/srcpkgs/usb-modeswitch-data/template
index 372efa277d3..2f1ef704280 100644
--- a/srcpkgs/usb-modeswitch-data/template
+++ b/srcpkgs/usb-modeswitch-data/template
@@ -1,6 +1,6 @@
# Template file for 'usb-modeswitch-data'
pkgname=usb-modeswitch-data
-version=20170806
+version=20191128
revision=1
build_style=gnu-makefile
short_desc="Mode switching tool for controlling 'multi-mode' USB devices (data files)"
@@ -8,6 +8,6 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2"
homepage="http://www.draisberghof.de/usb_modeswitch/"
distfiles="http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${version}.tar.bz2"
-checksum=ce413ef2a50e648e9c81bc3ea6110e7324a8bf981034fc9ec4467d3562563c2c
+checksum=3f039b60791c21c7cb15c7986cac89650f076dc274798fa242231b910785eaf9
make_install_args="RULESDIR=/usr/lib/udev/rules.d"
archs=noarch
next reply other threads:[~2020-05-04 20:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-04 20:12 Gottox [this message]
2020-05-04 21:10 ` [PR PATCH] [Updated] usb-modeswitch: update to 2.6.0 Gottox
2020-05-05 11:42 ` [PR PATCH] [Merged]: " Gottox
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-21623@inbox.vuxu.org \
--to=gottox@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).