Update to 0.4 beta 4

2 files changed, 18 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 117845a4fd11..65183202cd71 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = ddrescueview
 	pkgdesc = Graphical viewer for GNU ddrescue log files
-	pkgver = 0.4_alpha_3
+	pkgver = 0.4_alpha_4
 	pkgrel = 3
-	url = http://sourceforge.net/projects/ddrescueview
+	url = https://sourceforge.net/projects/ddrescueview
 	arch = i686
 	arch = x86_64
 	license = GPL
@@ -11,10 +11,9 @@ pkgbase = ddrescueview
 	depends = gtk2
 	provides = ddrescueview
 	conflicts = ddrescueview
-	source = https://downloads.sourceforge.net/project/ddrescueview/Test builds/v0.4 alpha 3/ddrescueview-source-0.4~alpha3.tar.xz
-	source = block.inspector.resize.block.input.field.patch
-	md5sums = c936b77ca781a0b7b082cf6a5e994be8
-	md5sums = 2f1fed9e38bfadf26cbc74283faa216e
+	source = https://downloads.sourceforge.net/project/ddrescueview/Test builds/v0.4 alpha 4/ddrescueview-source-0.4~alpha4.tar.xz
+	sha256sums = 8cf914da04f2004499f9af9429b38045c7148c6aff44be96fd3853c0a84d256c
+	b2sums = 81d8101b81d9fc8a3636a749356655e84ef868bf1c519392cf59851c3d6ea243905bd08f3cdc76f1db7195222f46efbd56702af0d162f8cafceb143c139d0515
 
 pkgname = ddrescueview
 
diff --git a/PKGBUILD b/PKGBUILD
index 8da3cd42836d..d938d904c1d6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,43 +2,37 @@
 
 pkgname=ddrescueview
 _pkgver=0.4
-_pkgver_alpha=3
+_pkgver_alpha=4
 pkgver=${_pkgver}_alpha_${_pkgver_alpha}
 pkgrel=3
 pkgdesc="Graphical viewer for GNU ddrescue log files"
 arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/ddrescueview"
+url="https://sourceforge.net/projects/ddrescueview"
 license=('GPL')
 provides=(ddrescueview)
 conflicts=(ddrescueview)
 depends=('gtk2')
 makedepends=('xz' 'lazarus')
-source=(  https://downloads.sourceforge.net/project/${pkgname}/Test\ builds/v${_pkgver}\ alpha\ ${_pkgver_alpha}/${pkgname}-source-${_pkgver}~alpha${_pkgver_alpha}.tar.xz
-          block.inspector.resize.block.input.field.patch)
-md5sums=('c936b77ca781a0b7b082cf6a5e994be8'
-         '2f1fed9e38bfadf26cbc74283faa216e')
-
-prepare() {
-  cd ${srcdir}
-  patch -Np0 -i block.inspector.resize.block.input.field.patch
-}
+source=(  https://downloads.sourceforge.net/project/${pkgname}/Test\ builds/v${_pkgver}\ alpha\ ${_pkgver_alpha}/${pkgname}-source-${_pkgver}~alpha${_pkgver_alpha}.tar.xz)
+sha256sums=('8cf914da04f2004499f9af9429b38045c7148c6aff44be96fd3853c0a84d256c')
+b2sums=('81d8101b81d9fc8a3636a749356655e84ef868bf1c519392cf59851c3d6ea243905bd08f3cdc76f1db7195222f46efbd56702af0d162f8cafceb143c139d0515')
 
 build() {
-  cd ${srcdir}/source
+  cd ${pkgname}-source-${_pkgver}~alpha${_pkgver_alpha}/source
 #lazbuild --lazarusdir=/usr/lib/lazarus --widgetset=gtk2 --build-all project_pea.lpi && [ -f pea ]
 #  lazbuild --lazarusdir=/usr/lib/lazarus --widgetset=gtk2 --build-all ddrescueview.lpi
   lazbuild --lazarusdir=/usr/lib/lazarus ddrescueview.lpi
 }
 
 package() {
-  cd ${srcdir}
-  
-  install -D -m 755 source/${pkgname}                   ${pkgdir}/usr/bin/${pkgname}
-  install -D -m 755 resources/linux/${pkgname}.desktop  ${pkgdir}/usr/share/applications/${pkgname}.desktop
-  install -D -m 644 resources/linux/${pkgname}.1        ${pkgdir}/usr/share/man/man1/${pkgname}.1
-  install -D -m 644 resources/linux/${pkgname}.xpm      ${pkgdir}/usr/share/pixmaps/${pkgname}.xpm 
+  cd ${pkgname}-source-${_pkgver}~alpha${_pkgver_alpha}
+
+  install -D -m 755 source/${pkgname} ${pkgdir}/usr/bin/${pkgname}
+
+  install -dm755    $pkgdir/usr/share
+  cp -r resources/linux/{applications,icons,man} $pkgdir/usr/share
+
   install -D -m 644 changelog.txt   ${pkgdir}/usr/share/doc/${pkgname}/changelog.txt
   install -D -m 644 readme.txt      ${pkgdir}/usr/share/doc/${pkgname}/readme.txt
-  
 }
 # vim:set ts=2 sw=2 et: