From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] iscan{,-data} update
Date: Sun, 22 Nov 2020 03:40:11 +0100 [thread overview]
Message-ID: <20201122024011.lOqpNTd4YRxEX1rgERxfJVAH4L1iNgGifjg53r-hPk4@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26592@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 327 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages iscan-update
https://github.com/void-linux/void-packages/pull/26592
iscan{,-data} update
Old source has gone.
A patch file from https://github.com/void-linux/void-packages/pull/26592.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-iscan-update-26592.patch --]
[-- Type: text/x-diff, Size: 3703 bytes --]
From 97a6b7a225000115138aa4b1191b101b1d402014 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:15:10 +0700
Subject: [PATCH 1/2] iscan: update to 2.30.4.
---
srcpkgs/iscan/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/iscan/template b/srcpkgs/iscan/template
index 41ed3dc7fa7..18c0d969766 100644
--- a/srcpkgs/iscan/template
+++ b/srcpkgs/iscan/template
@@ -1,30 +1,30 @@
# Template file for 'iscan'
pkgname=iscan
-version=2.30.3
-revision=3
-_srcrev=1
-repository=nonfree
+version=2.30.4
+revision=1
+_srcrev=2
+archs="i686 x86_64"
build_style=gnu-configure
configure_args="--enable-frontend --enable-jpeg --enable-tiff --enable-png --enable-gimp"
-LDFLAGS="-ldl -lpng16"
-maintainer="Orphaned <orphan@voidlinux.org>"
hostmakedepends="pkg-config"
makedepends="gtk+-devel gimp-devel libxml2-devel libjpeg-turbo-devel tiff-devel libltdl-devel libpng-devel sane-devel libusb-devel"
depends="sane-epkowa"
-license="GPL-2, AVASYSPL"
-homepage="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
short_desc="EPSON Image Scan! front-end"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later, custom:EPSON"
+homepage="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
distfiles="http://support.epson.net/linux/src/scanner/iscan/${pkgname}_${version}-${_srcrev}.tar.gz"
-checksum=91a6cc1571e5ec34cee067eabb35f13838e71dfeda416310ecb5b5030d49de67
-archs="i686 x86_64"
+checksum=597b9913de42d7a27f95bc82e533cbe778121ba13e3a03bc037f8d09a43447d5
+repository=nonfree
+LDFLAGS="-ldl -lpng16"
post_configure() {
# fix wrongly created link
- sed -i -e 's/\(libesmod-$${arch}\)$(PACKAGE_CXX_ABI)/\1.c2/' non-free/Makefile
+ vsed -i -e 's/\(libesmod-$${arch}\)$(PACKAGE_CXX_ABI)/\1.c2/' non-free/Makefile
}
post_install() {
- vlicense non-free/AVASYSPL.en.txt
+ vlicense non-free/COPYING.EPSON.en.txt
vmkdir usr/lib/gimp/2.0/plug-ins
ln -s /usr/bin/iscan ${DESTDIR}/usr/lib/gimp/2.0/plug-ins
vinstall iscan.desktop 644 usr/share/applications
@@ -32,7 +32,7 @@ post_install() {
sane-epkowa_package() {
short_desc="SANE backend for EPSON scanners"
- license="GPL-2"
+ license="GPL-2.0-or-later"
unset repository
depends="sane iscan-data"
conf_files="/etc/sane.d/epkowa.conf"
From 283910c79d0643caa183721317d7cc50adb4c63d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:15:13 +0700
Subject: [PATCH 2/2] iscan-data: update to 1.39.2.
---
srcpkgs/iscan-data/template | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/iscan-data/template b/srcpkgs/iscan-data/template
index 2953cb34344..b5e90ed990c 100644
--- a/srcpkgs/iscan-data/template
+++ b/srcpkgs/iscan-data/template
@@ -1,14 +1,13 @@
# Template file for 'iscan-data'
pkgname=iscan-data
-version=1.39.0
-revision=2
+version=1.39.2
+revision=1
_srcrev=1
-archs=noarch
build_style=gnu-configure
-maintainer="Orphaned <orphan@voidlinux.org>"
hostmakedepends="libxslt"
-license="GPL-2"
-homepage="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
short_desc="EPSON Image Scan! data files"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
distfiles="http://support.epson.net/linux/src/scanner/iscan/iscan-data_${version}-${_srcrev}.tar.gz"
-checksum=61ef9496568c8709cce7687de0d47e4b132a00fa6a398fcbb6f06f8fdf31755f
+checksum=6a62bc6e84257714785d99316a017b8444207e3dcf56d35d0ce13f292d855824
next prev parent reply other threads:[~2020-11-22 2:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-22 2:22 [PR PATCH] " sgn
2020-11-22 2:40 ` sgn [this message]
2020-11-23 0:29 ` [PR PATCH] [Merged]: " sgn
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=20201122024011.lOqpNTd4YRxEX1rgERxfJVAH4L1iNgGifjg53r-hPk4@z \
--to=sgn@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).