up to 5.0.0AB.8

3 files changed, 22 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 288a293c49a6..c11561a7e6ce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
 pkgbase = udefrag
 	pkgdesc = Ultradefrag 5.0 console for GNU/Linux to defragment a NTFS filesystem
-	pkgver = 5.0.0AB.7
-	pkgrel = 3
+	pkgver = 5.0.0AB.8
+	pkgrel = 1
 	url = http://jp-andre.pagesperso-orange.fr/advanced-ntfs-3g.html
 	arch = x86_64
 	license = GPL
 	makedepends = unzip
 	depends = ncurses
 	depends = ntfs-3g
-	source = http://jp-andre.pagesperso-orange.fr/ultradefrag-5.0.0AB.7.zip
+	source = http://jp-andre.pagesperso-orange.fr/ultradefrag-5.0.0AB.8.zip
 	source = udefrag.patch
-	md5sums = 20cdd938bed3efa5161aefc0ad08ba00
-	md5sums = 09eef7f045ea84e994f81cca88ae7f33
+	md5sums = e6de75d30f92d4c5e211470f6fe28be5
+	md5sums = f9813005670f6657417fb65769683257
 
 pkgname = udefrag
 
diff --git a/PKGBUILD b/PKGBUILD
index a8368ce58550..8d628df89e8e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,30 +2,29 @@
 # Contributor: 100best
 
 pkgname=udefrag
-pkgver=5.0.0AB.7
-pkgrel=3
-pkgdesc="Ultradefrag 5.0 console for GNU/Linux to defragment a NTFS
-filesystem"
+pkgver=5.0.0AB.8
+pkgrel=1
+pkgdesc="Ultradefrag 5.0 console for GNU/Linux to defragment a NTFS filesystem"
 url="http://jp-andre.pagesperso-orange.fr/advanced-ntfs-3g.html"
 arch=('x86_64')
 license=('GPL')
 makedepends=('unzip')
 depends=('ncurses' 'ntfs-3g')
-source=('http://jp-andre.pagesperso-orange.fr/ultradefrag-5.0.0AB.7.zip' 'udefrag.patch')
-md5sums=('20cdd938bed3efa5161aefc0ad08ba00'
-         '09eef7f045ea84e994f81cca88ae7f33')
+source=("http://jp-andre.pagesperso-orange.fr/ultradefrag-${pkgver}.zip" "udefrag.patch")
+md5sums=('e6de75d30f92d4c5e211470f6fe28be5'
+         'f9813005670f6657417fb65769683257')
 
 prepare() {
   patch -p 1 -i udefrag.patch
 }
 
 build() {
-  cd $srcdir/ultradefrag-5.0.0AB.7/src
+  cd $srcdir/ultradefrag-${pkgver}/src
   make
 }
 
 package() {
-  cd $srcdir/ultradefrag-5.0.0AB.7/src
+  cd $srcdir/ultradefrag-${pkgver}/src
   mkdir -p $pkgdir/usr/bin
   cp udefrag $pkgdir/usr/bin
 }
diff --git a/udefrag.patch b/udefrag.patch
index 2aefc17336d1..451701b63aa7 100644
--- a/udefrag.patch
+++ b/udefrag.patch
@@ -1,31 +1,19 @@
-diff -ura udefrag_original/ultradefrag-5.0.0AB.7/src/Makefile udefrag_patch/ultradefrag-5.0.0AB.7/src/Makefile
---- udefrag_original/ultradefrag-5.0.0AB.7/src/Makefile	2011-11-24 14:57:55.032940368 +0400
-+++ udefrag_patch/ultradefrag-5.0.0AB.7/src/Makefile	2017-08-25 16:46:09.772756287 +0300
+diff '--color=auto' -ura ultradefrag.origin/ultradefrag-5.0.0AB.8/src/Makefile ultradefrag.new/ultradefrag-5.0.0AB.8/src/Makefile
+--- ultradefrag.origin/ultradefrag-5.0.0AB.8/src/Makefile	2019-12-26 13:50:27.574429486 +0300
++++ ultradefrag.new/ultradefrag-5.0.0AB.8/src/Makefile	2019-12-26 13:50:42.364262653 +0300
 @@ -18,13 +18,14 @@
  % : %.s
- 
+
  GCC=gcc
 +GCC_VERSION=$(shell expr `$(GCC) -dumpversion`)
  LD=ld
  AR=ar
- INCL=-I/usr/sparc-include -Iinclude
- COPT=-DPPGC=1 -O2
- GCCOPT=-DPPGC=1 -O2
+ INCL=-I/usr/include -Iinclude
+ COPT=-DLXGC=1 -O2
+ GCCOPT=-DLXGC=1 -O2
  LIB1=/usr/lib64
--LIB2=/usr/lib/gcc/x86_64-redhat-linux/4.6.0
+-LIB2=/usr/lib/gcc/x86_64-redhat-linux/4.9.2
 +LIB2=/usr/lib/gcc/x86_64-pc-linux-gnu/$(GCC_VERSION)
  NTFSLIB=/lib64/libntfs-3g.so.*.0.0
- 
+
  A=console.a udefrag.a zenwinx.a wincalls.a
-diff -ura udefrag_original/ultradefrag-5.0.0AB.7/src/wincalls/ntfs-3g.c udefrag_patch/ultradefrag-5.0.0AB.7/src/wincalls/ntfs-3g.c
---- udefrag_original/ultradefrag-5.0.0AB.7/src/wincalls/ntfs-3g.c	2011-11-26 17:56:37.032940368 +0400
-+++ udefrag_patch/ultradefrag-5.0.0AB.7/src/wincalls/ntfs-3g.c	2017-08-25 16:31:08.046697138 +0300
-@@ -144,7 +144,7 @@
- 	ntfs_volume *vol;
- 
- 	if (do_nothing)
--		vol = ntfs_mount(device,MS_RDONLY);
-+		vol = ntfs_mount(device, "MS_RDONLY");
- 	else
- 		vol = ntfs_mount(device,0);
- #ifdef NVolSetNoFixupWarn