Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] iscan{,-data} update
@ 2020-11-22  2:22 sgn
  2020-11-22  2:40 ` [PR PATCH] [Updated] " sgn
  2020-11-23  0:29 ` [PR PATCH] [Merged]: " sgn
  0 siblings, 2 replies; 3+ messages in thread
From: sgn @ 2020-11-22  2:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 322 bytes --]

There is a new 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: 3208 bytes --]

From 92f88024e01abf022b1f663ba6f9dba77fd97663 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 | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/iscan/template b/srcpkgs/iscan/template
index 41ed3dc7fa7..0c15472dde6 100644
--- a/srcpkgs/iscan/template
+++ b/srcpkgs/iscan/template
@@ -1,8 +1,8 @@
 # Template file for 'iscan'
 pkgname=iscan
-version=2.30.3
-revision=3
-_srcrev=1
+version=2.30.4
+revision=1
+_srcrev=2
 repository=nonfree
 build_style=gnu-configure
 configure_args="--enable-frontend --enable-jpeg --enable-tiff --enable-png --enable-gimp"
@@ -11,11 +11,11 @@ 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"
+license="GPL-2.0-or-later, custom:EPSON"
 homepage="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
 short_desc="EPSON Image Scan! front-end"
 distfiles="http://support.epson.net/linux/src/scanner/iscan/${pkgname}_${version}-${_srcrev}.tar.gz"
-checksum=91a6cc1571e5ec34cee067eabb35f13838e71dfeda416310ecb5b5030d49de67
+checksum=597b9913de42d7a27f95bc82e533cbe778121ba13e3a03bc037f8d09a43447d5
 archs="i686 x86_64"
 
 post_configure() {
@@ -24,7 +24,7 @@ post_configure() {
 }
 
 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 a5b6126015b67628acd7b12c3dde1e9eb93d8898 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 | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/iscan-data/template b/srcpkgs/iscan-data/template
index 2953cb34344..93cdd1ab040 100644
--- a/srcpkgs/iscan-data/template
+++ b/srcpkgs/iscan-data/template
@@ -1,9 +1,8 @@
 # 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"
@@ -11,4 +10,4 @@ license="GPL-2"
 homepage="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
 short_desc="EPSON Image Scan! data files"
 distfiles="http://support.epson.net/linux/src/scanner/iscan/iscan-data_${version}-${_srcrev}.tar.gz"
-checksum=61ef9496568c8709cce7687de0d47e4b132a00fa6a398fcbb6f06f8fdf31755f
+checksum=6a62bc6e84257714785d99316a017b8444207e3dcf56d35d0ce13f292d855824

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Updated] iscan{,-data} update
  2020-11-22  2:22 [PR PATCH] iscan{,-data} update sgn
@ 2020-11-22  2:40 ` sgn
  2020-11-23  0:29 ` [PR PATCH] [Merged]: " sgn
  1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2020-11-22  2:40 UTC (permalink / raw)
  To: ml

[-- 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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Merged]: iscan{,-data} update
  2020-11-22  2:22 [PR PATCH] iscan{,-data} update sgn
  2020-11-22  2:40 ` [PR PATCH] [Updated] " sgn
@ 2020-11-23  0:29 ` sgn
  1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2020-11-23  0:29 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 174 bytes --]

There's a merged pull request on the void-packages repository

iscan{,-data} update
https://github.com/void-linux/void-packages/pull/26592

Description:
Old source has gone.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-11-23  0:29 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-22  2:22 [PR PATCH] iscan{,-data} update sgn
2020-11-22  2:40 ` [PR PATCH] [Updated] " sgn
2020-11-23  0:29 ` [PR PATCH] [Merged]: " sgn

Github messages for voidlinux

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://inbox.vuxu.org/voidlinux-github

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 voidlinux-github voidlinux-github/ http://inbox.vuxu.org/voidlinux-github \
		voidlinux-github@inbox.vuxu.org
	public-inbox-index voidlinux-github

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git