twaindsm 2.4.2-1: New version

3 files changed, 16 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0648bcdf5741..1e69a64d55a4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,18 @@
 # Generated by mksrcinfo v8
-# Fri May  5 19:33:30 UTC 2017
+# Fri Jun 29 08:12:05 UTC 2018
 pkgbase = twaindsm
 	pkgdesc = TWAIN Data Source Manager
-	pkgver = 2.3.1
-	pkgrel = 2
+	pkgver = 2.4.2
+	pkgrel = 1
 	url = http://twain.org/
 	arch = i686
 	arch = x86_64
 	license = LGPL2.1
 	makedepends = cmake
 	depends = gcc-libs
-	source = https://github.com/twain/twain-dsm/archive/76a9a900e032dfe630a4a48aa1b40430c98c2fb3.tar.gz
-	source = standard-lib-dir.patch
+	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 = 729e4b75769e18810582a29ba4972828
-	md5sums = 54b8caf90da42d6d3fc60dd89f097544
+	md5sums = 8f9c9b9a13a3225c6e5828a0561a826f
 	md5sums = 7880d330686bffad0c00b6a2731be338
 
 pkgname = twaindsm
diff --git a/PKGBUILD b/PKGBUILD
index fbe3092864bc..d29993813ff0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,30 @@
 # Maintainer: Jakob Gahde <j5lx@fmail.co.uk>
 
 pkgname=twaindsm
-pkgver=2.3.1
-_gitref=76a9a900e032dfe630a4a48aa1b40430c98c2fb3
-pkgrel=2
+pkgver=2.4.2
+pkgrel=1
 pkgdesc="TWAIN Data Source Manager"
 arch=('i686' 'x86_64')
 url="http://twain.org/"
 license=('LGPL2.1')
 depends=('gcc-libs')
 makedepends=('cmake')
-source=("https://github.com/twain/twain-dsm/archive/${_gitref}.tar.gz"
-        "standard-lib-dir.patch"
+source=("https://github.com/twain/twain-dsm/raw/master/Releases/dsm_020402/tarball/twaindsm_${pkgver}.orig.tar.gz"
         "no-werror.patch")
-md5sums=('729e4b75769e18810582a29ba4972828'
-         '54b8caf90da42d6d3fc60dd89f097544'
+md5sums=('8f9c9b9a13a3225c6e5828a0561a826f'
          '7880d330686bffad0c00b6a2731be338')
 
 prepare() {
-  cd "${srcdir}/twain-dsm-${_gitref}"
+  cd "${srcdir}/TWAIN_DSM/src"
 
-  patch -Np1 < "${srcdir}/standard-lib-dir.patch"
-  patch -Np1 < "${srcdir}/no-werror.patch"
+  # 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-${_gitref}/TWAIN_DSM/src"
+  cd "${srcdir}/TWAIN_DSM/src"
 
   test -d build && rm -rf build
   mkdir build
@@ -36,7 +35,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/twain-dsm-${_gitref}/TWAIN_DSM/src/build"
+  cd "${srcdir}/TWAIN_DSM/src/build"
 
   make install DESTDIR="${pkgdir}"
 
diff --git a/standard-lib-dir.patch b/standard-lib-dir.patch
deleted file mode 100644
index 1abf208586a3..000000000000
--- a/standard-lib-dir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur package.pristine/TWAIN_DSM/src/dsm.h package.new/TWAIN_DSM/src/dsm.h
---- package.pristine/TWAIN_DSM/src/dsm.h	2016-05-28 19:19:53.266289508 +0200
-+++ package.new/TWAIN_DSM/src/dsm.h	2016-05-28 19:21:41.208842006 +0200
-@@ -324,7 +324,7 @@
-     #if (TWNDSM_OS == TWNDSM_OS_MACOSX)

-       #define kTWAIN_DS_DIR "/Library/Image Capture/TWAIN Data Sources"

-     #else

--      #define kTWAIN_DS_DIR "/usr/local/lib/twain"

-+      #define kTWAIN_DS_DIR "/usr/lib/twain"

-     #endif

-   #endif

-   typedef unsigned int UINT;