Upgrade to 2.2.0, using cmake

3 files changed, 58 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ad3bb5b31f2a..57f7cd9fe3ba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = diffimg
 	pkgdesc = Simple image comparison tool
-	pkgver = 2.0.1
+	pkgver = 2.2.0
 	pkgrel = 1
 	url = http://sourceforge.net/projects/diffimg/
 	install = diffimg.install
@@ -8,15 +8,16 @@ pkgbase = diffimg
 	arch = x86_64
 	license = GPL2
 	makedepends = qt4
-	makedepends = qwt
+	makedepends = qwt-qt4
 	makedepends = opencv
+	makedepends = cmake
 	depends = qt4
-	depends = qwt
+	depends = qwt-qt4
 	depends = opencv
-	source = http://sourceforge.net/projects/diffimg/files/2.0.1/diffimg-2.0.1.zip
+	optdepends = freeimage
+	source = http://sourceforge.net/projects/diffimg/files/2.2.0/Diffimg-2.2.0-src.zip
 	source = diffimg.desktop
-	md5sums = 1b60f8d121761b8b77fe152a3fbd5639
-	md5sums = 1f924268b20847374b6b260f2b7f1f7d
+	md5sums = e97610c4a265524297bc20268870556a
+	md5sums = 98d6aae50942ef908313515bdd9b02f4
 
 pkgname = diffimg
-
diff --git a/PKGBUILD b/PKGBUILD
index 745835332178..4899df31c046 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,48 +1,75 @@
-# Maintainer: Piotr Rogoża <rogoza dot piotr at gmail dot com>
+# Maintainer: fuan_k <rrkay at posteo dot net>
+# Contributor: Piotr Rogoża <rogoza dot piotr at gmail dot com>
 # Contributor: Nathan O <ndowens.aur at gmail dot com>
 # vim:set ts=2 sw=2 et ft=sh tw=100: expandtab
 
 pkgname=diffimg
-_pkgname=DiffImg
-pkgver=2.0.1
+_pkgname=Diffimg
+_newpkgname=Diffimg-xbee # possible future name?
+pkgver=2.2.0
 pkgrel=1
 pkgdesc="Simple image comparison tool"
 arch=('i686' 'x86_64')
 license=('GPL2')
-depends=(qt4 qwt opencv)
-makedepends=(qt4 qwt opencv)
+depends=(qt4 qwt-qt4 opencv)
+optdepends=(freeimage)
+makedepends=(qt4 qwt-qt4 opencv cmake)
 url='http://sourceforge.net/projects/diffimg/'
 source=(
-"http://sourceforge.net/projects/diffimg/files/${pkgver}/diffimg-${pkgver}.zip"
+"http://sourceforge.net/projects/diffimg/files/${pkgver}/${_pkgname}-${pkgver}-src.zip"
 diffimg.desktop
 )
 install='diffimg.install'
+md5sums=('e97610c4a265524297bc20268870556a'
+        '98d6aae50942ef908313515bdd9b02f4')
 
-build() {
-  cd "$srcdir"/$pkgname-$pkgver
+prepare(){
+  cd "${srcdir}"/${_pkgname}-${pkgver}-src
   sed -i -e 's/\r//' \
     -e 's/|/-print0 |/' \
     -e "s#dos2unix#-0 sed -i 's|\\\r||'#" \
     tounix.sh
-  sh ./tounix.sh
+  chmod +x tounix.sh
+  ./tounix.sh
 
   cd ./build
-  qmake-qt4 -recursive INSTALL_PREFIX=/usr diffimg.pro
+  sed -i -e 's;\"\/usr\/include\/qwt\";\"\/usr\/include\/qwt\-qt4\";g' CMakeLists.txt
+  sed -i -e '178s;qwt;qwt\-qt4;g' CMakeLists.txt
+  sed -i -e '180s;qwt;qwt\-qt4;g' CMakeLists.txt
+}
+
+build() {
+  cd ${_pkgname}-${pkgver}-src/build
+  #qmake-qt4 -recursive INSTALL_PREFIX=/usr diffimg.pro
+  cmake -DCMAKE_INSTALL_PREFIX=${pkgdir}/usr .
+  #cmake -DCMAKE_INSTALL_PREFIX="${pkgdir}" . #for makechrootpkg -r $CHROOT -- ief
+  cmake .
   make
 }
 
 package() {
-  cd "$srcdir"/$pkgname-$pkgver
-  install -Dm644 ../$pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
+  cd ${_pkgname}-${pkgver}-src
+  install -Dm644 ../${pkgname}.desktop "${pkgdir}"/usr/share/applications/${_pkgname}.desktop
 
   cd ./build
-  make INSTALL_ROOT="${pkgdir}" install
+  #make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+  #make INSTALL_ROOT="${pkgdir}" install
+
+  make prefix="${pkgdir}" install
+
+  # remove cmake's generated file
+  rm "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+
+  # fix name conflicts with graphviz/diffimg
+  #install -Dm755 ./usr/bin/${pkgname} "${pkgdir}"/usr/bin/${_pkgname}
+  mv "${pkgdir}/usr/bin/${pkgname}" "${pkgdir}/usr/bin/${_pkgname}"
+
+  install -Dm644 "${pkgdir}/usr/share/man/man1/${pkgname}.1.gz" "${pkgdir}"/usr/share/man/man1/${_pkgname}.1.gz
+  mv "${pkgdir}/usr/share/man/man1/${pkgname}.1.gz" "${pkgdir}/usr/share/man/man1/${_pkgname}.1.gz"
+
+  install -Dm644 ../res/diffimg.ico "$pkgdir"/usr/share/pixmaps/${_pkgname}/${_pkgname}.ico
+  install -Dm644 ../res/diffimg.png "${pkgdir}"/usr/share/pixmaps/${_pkgname}/${_pkgname}.png
+  mv "${pkgdir}/usr/share/pixmaps/diffimg.png" "${pkgdir}/usr/share/pixmaps/${_pkgname}/${_pkgname}.png"
 
-#  install -dm755 "$pkgdir"/usr/share/icons
-#  ln -s ../pixmaps/res/diffimg.ico "$pkgdir"/usr/share/icons/diffimg.ico
-  # fix conflicts with graphviz
-  mv "$pkgdir"/usr/bin/$pkgname "$pkgdir"/usr/bin/${_pkgname}
-  mv "$pkgdir"/usr/share/man/man1/$pkgname.1.gz "$pkgdir"/usr/share/man/man1/${_pkgname}.1.gz
 }
-md5sums=('1b60f8d121761b8b77fe152a3fbd5639'
-         '1f924268b20847374b6b260f2b7f1f7d')
+
diff --git a/diffimg.desktop b/diffimg.desktop
index e12f7277d76e..cd5c39336335 100644
--- a/diffimg.desktop
+++ b/diffimg.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Application
-Name=DiffImg
+Name=Diffimg
 Comment=Simple image comparison tool
-Exec=DiffImg
-Icon=/usr/share/pixmaps/res/diffimg.ico
+Exec=Diffimg
+Icon=/usr/share/pixmaps/Diffimg/Diffimg.ico
 Terminal=false
 StartupNotify=false
 Categories=Application;Graphics