Fixed building from AUR3 version

3 files changed, 58 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index adf65fbc901f..8622d854e010 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = cdcat
 	pkgdesc = CD/DVD/Media catalog software (Qt based)
 	pkgver = 2.3.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://cdcat.sourceforge.net/
 	install = cdcat.install
 	arch = i686
@@ -15,9 +15,11 @@ pkgbase = cdcat
 	depends = p7zip
 	depends = crypto++
 	source = http://downloads.sourceforge.net/project/cdcat/cdcat/cdcat-2.3.1/cdcat-2.3.1.tar.bz2
+	source = byte_type.patch
 	source = cdcat.desktop
-	md5sums = b7b4ea3e213620c1126c64125b93e63a
-	md5sums = 919c7e03e085a1af5a1e4d30075e30a7
+	sha256sums = 7cb1bbd7646faf93359acda5835f510766c82e612bca577282571f13a8d5f01c
+	sha256sums = baa15e406f3620dfe031e56b55c97bf2e20261c7fde54e1df4232871ddce8782
+	sha256sums = c4ab593a72fc6c06c1e8ff4b52d86fb433308053083d4bfd611a53a54c251c67
 
 pkgname = cdcat
 
diff --git a/PKGBUILD b/PKGBUILD
index 38dc9e5ea02a..933e1ed74ea0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,55 +1,64 @@
-# Maintainer: yugrotavele <yugrotavele at archlinux dot us>
-# Contributor: speps <speps at aur dot archlinux dot org>
+# Maintainer : doragasu <doragasu at hotmail dot com>
 # Contributor: Wes Brewer <brewerw@gmail.com>
+# Contributor: original submitter speps <speps at aur dot archlinux dot org>
 
 pkgname=cdcat
 pkgver=2.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="CD/DVD/Media catalog software (Qt based)"
 arch=('i686' 'x86_64')
 url="http://cdcat.sourceforge.net/"
 license=('GPL')
 depends=('qt4' 'libtar' 'lib7zip' 'p7zip' 'crypto++')
 makedepends=('libmediainfo' 'libexif')
-install="$pkgname.install"
+install=$pkgname.install
 source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2"
+        "byte_type.patch"
         "$pkgname.desktop")
-md5sums=('b7b4ea3e213620c1126c64125b93e63a'
-         '919c7e03e085a1af5a1e4d30075e30a7')
+sha256sums=('7cb1bbd7646faf93359acda5835f510766c82e612bca577282571f13a8d5f01c'
+        'baa15e406f3620dfe031e56b55c97bf2e20261c7fde54e1df4232871ddce8782'
+        'c4ab593a72fc6c06c1e8ff4b52d86fb433308053083d4bfd611a53a54c251c67')
 
-build() {
-  cd $pkgname-$pkgver/src
+prepare() {
+    cd $pkgname-$pkgver/src
+
+# Correcty byte type
+    patch -p2 < ../../byte_type.patch
 
-  # strip local path
-  sed -i "s|/local||g" $pkgname.pro
+# strip local path
+    sed -i "s|/local||g" $pkgname.pro
 
-  # use cryptopp instead of crypto++
-  sed -i 's/crypto++/cryptopp/g' `grep -rl crypto++`
+# use cryptopp instead of crypto++
+    sed -i 's/crypto++/cryptopp/g' `grep -rl crypto++`
+}
 
-  qmake-qt4 $pkgname.pro && make
+build() {
+    cd $pkgname-$pkgver/src
+    qmake-qt4 $pkgname.pro && make
 }
 
 package() {
-  cd $pkgname-$pkgver/src
-  make INSTALL_ROOT="$pkgdir" install
+    cd $pkgname-$pkgver/src
+    make INSTALL_ROOT="$pkgdir" install
 
-  # desktop file
-  install -Dm644 "$srcdir/$pkgname.desktop" \
+# desktop file
+    install -Dm644 "$srcdir/$pkgname.desktop" \
     "$pkgdir/usr/share/applications/$pkgname.desktop"
 
-  # icons
-  for _s in 16x16 22x22 32x32 48x48 64x64; do
-    install -Dm644 ../${pkgname}_logo_$_s.png \
-      "$pkgdir/usr/share/icons/hicolor/$_s/apps/$pkgname.png"
-  done
-  install -Dm644 ../${pkgname}_logo.svg \
-    "$pkgdir/usr/share/icons/hicolor/scalable/apps/$pkgname.png"
-
-  # translations
-  cd lang
-  for _f in *.ts; do
-    _tdir="$pkgdir/usr/share/locale/${_f:6:2}/LC_MESSAGES"
-    install -d "$_tdir"
-    lrelease-qt4 -silent -qm "$_tdir/${_f/ts/qm}" $_f
-  done
+# icons
+    for _s in 16x16 22x22 32x32 48x48 64x64; do
+        install -Dm644 ../${pkgname}_logo_$_s.png \
+            "$pkgdir/usr/share/icons/hicolor/$_s/apps/$pkgname.png"
+    done
+    install -Dm644 ../${pkgname}_logo.svg \
+        "$pkgdir/usr/share/icons/hicolor/scalable/apps/$pkgname.png"
+
+# translations
+        cd lang
+        for _f in *.ts; do
+            _tdir="$pkgdir/usr/share/locale/${_f:6:2}/LC_MESSAGES"
+            install -d "$_tdir"
+            lrelease-qt4 -silent -qm "$_tdir/${_f/ts/qm}" $_f
+        done
 }
+
diff --git a/byte_type.patch b/byte_type.patch
new file mode 100644
index 000000000000..d415a7889b10
--- /dev/null
+++ b/byte_type.patch
@@ -0,0 +1,12 @@
+diff -ruN cdcat-2.3.1/src/wdbfile.h cdcat-2.3.1.work/src/wdbfile.h
+--- cdcat-2.3.1/src/wdbfile.h	2013-08-26 09:37:10.000000000 +0200
++++ cdcat-2.3.1.work/src/wdbfile.h	2018-08-31 23:04:21.256755328 +0200
+@@ -31,7 +31,7 @@
+ 
+ static CryptoPP::SecByteBlock crypto_key(CryptoPP::Blowfish::BLOCKSIZE);
+ 
+-static byte iv[CryptoPP::Blowfish::BLOCKSIZE];
++static Byte iv[CryptoPP::Blowfish::BLOCKSIZE];
+ 
+ 
+ int generate_cryptokey(QString password);