* New version,

* `PKGBUILD` adaptions.

3 files changed, 41 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1e69a64d55a4..d4ec969e0031 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,15 @@
-# Generated by mksrcinfo v8
-# Fri Jun 29 08:12:05 UTC 2018
 pkgbase = twaindsm
 	pkgdesc = TWAIN Data Source Manager
-	pkgver = 2.4.2
+	pkgver = 2.5.0
 	pkgrel = 1
-	url = http://twain.org/
+	url = https://github.com/twain/twain-dsm/
 	arch = i686
 	arch = x86_64
 	license = LGPL2.1
 	makedepends = cmake
 	depends = gcc-libs
-	source = https://github.com/twain/twain-dsm/raw/master/Releases/dsm_020402/tarball/twaindsm_2.4.2.orig.tar.gz
-	source = no-werror.patch
-	md5sums = 8f9c9b9a13a3225c6e5828a0561a826f
-	md5sums = 7880d330686bffad0c00b6a2731be338
+	options = emptydirs
+	source = twaindsm-2.5.0.tar.gz::https://github.com/twain/twain-dsm/archive/refs/tags/v2.5.0.tar.gz
+	sha256sums = 89b226f1197c34fc6dff213c5bf656964460045517f886976a45417932de2f10
 
 pkgname = twaindsm
-
diff --git a/PKGBUILD b/PKGBUILD
index d29993813ff0..57a37ef9531c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,51 @@
-# Maintainer: Jakob Gahde <j5lx@fmail.co.uk>
+# Maintainer: dreieck
+# Contributor: Jakob Gahde <j5lx@fmail.co.uk>
 
 pkgname=twaindsm
-pkgver=2.4.2
+pkgver=2.5.0
 pkgrel=1
 pkgdesc="TWAIN Data Source Manager"
-arch=('i686' 'x86_64')
-url="http://twain.org/"
+arch=(
+  'i686'
+  'x86_64'
+)
+# url='http://twain.org/'
+url='https://github.com/twain/twain-dsm/'
 license=('LGPL2.1')
 depends=('gcc-libs')
 makedepends=('cmake')
-source=("https://github.com/twain/twain-dsm/raw/master/Releases/dsm_020402/tarball/twaindsm_${pkgver}.orig.tar.gz"
-        "no-werror.patch")
-md5sums=('8f9c9b9a13a3225c6e5828a0561a826f'
-         '7880d330686bffad0c00b6a2731be338')
+source=(
+  "twaindsm-${pkgver}.tar.gz::https://github.com/twain/twain-dsm/archive/refs/tags/v${pkgver}.tar.gz"
+)
+sha256sums=(
+  '89b226f1197c34fc6dff213c5bf656964460045517f886976a45417932de2f10'  # twaindsm-${pkgver}.tar.gz
+)
+options+=('emptydirs')
 
 prepare() {
-  cd "${srcdir}/TWAIN_DSM/src"
+  cd "${srcdir}/twain-dsm-${pkgver}/TWAIN_DSM/src"
 
   # Someone thought it was a good idea to distribute CMake build artifacts
   rm -rf CMakeCache.txt CMakeFiles
-
-  patch -Np3 < "${srcdir}/no-werror.patch"
 }
 
 build() {
-  cd "${srcdir}/TWAIN_DSM/src"
+  cd "${srcdir}/twain-dsm-${pkgver}/TWAIN_DSM/src"
 
   test -d build && rm -rf build
   mkdir build
   cd build
 
-  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ..
+  cmake \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    ..
+
   make
 }
 
 package() {
-  cd "${srcdir}/TWAIN_DSM/src/build"
+  cd "${srcdir}/twain-dsm-${pkgver}/TWAIN_DSM/src/build"
 
   make install DESTDIR="${pkgdir}"
 
@@ -43,10 +53,19 @@ package() {
   # a good idea to put everything in /usr/local on Linux. So in order to comply
   # with the spec while still having everything in Arch's usual filesystem
   # hierarchy, we are going to create a few symlinks.
-  install -dm755 "${pkgdir}/usr/lib/twain"
-  install -dm755 "${pkgdir}/usr/local/lib"
+  install -d -m755 -v "${pkgdir}/usr/lib/twain"
+  install -d -m755 -v "${pkgdir}/usr/local/lib"
   for i in "${pkgdir}/usr/lib/libtwaindsm.so"*; do
     ln -s "/usr/lib/$(basename "${i}")" "${pkgdir}/usr/local/lib/$(basename "${i}")"
-  done;
+  done
   ln -s "/usr/lib/twain" "${pkgdir}/usr/local/lib/twain"
+
+
+  cd "${srcdir}/twain-dsm-${pkgver}/TWAIN_DSM"
+
+  install -D -m644 -v license.txt "${pkgdir}/usr/share/licenses/${pkgname}/license_LGPL2.1.txt"
+
+  for _docfile in ChangeLog.txt README.txt TODO.txt twaindsm.spec; do
+    install -D -m644 -v "${_docfile}" "${pkgdir}/usr/share/doc/${pkgname}/${_docfile}"
+  done
 }
diff --git a/no-werror.patch b/no-werror.patch
deleted file mode 100644
index e951e0e292a2..000000000000
--- a/no-werror.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -aur package.pristine/TWAIN_DSM/src/CMakeLists.txt package.new/TWAIN_DSM/src/CMakeLists.txt
---- package.pristine/TWAIN_DSM/src/CMakeLists.txt	2016-05-28 17:58:21.374985878 +0200
-+++ package.new/TWAIN_DSM/src/CMakeLists.txt	2016-05-28 17:59:16.161254474 +0200
-@@ -14,9 +14,9 @@
- #add definitions, compiler switches, etc.
- IF(APPLE)
- 	SET(CMAKE_OSX_ARCHITECTURES "i386;x86_64")
--	ADD_DEFINITIONS(-Wall -Wextra -Werror -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -fexceptions -fPIC)
-+	ADD_DEFINITIONS(-Wall -Wextra -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -fexceptions -fPIC)
- ELSE()
--	ADD_DEFINITIONS(-Wall -Wextra -Werror)
-+	ADD_DEFINITIONS(-Wall -Wextra)
- ENDIF()
- 
- #let's not be sharing our symbols...