[arch-commits] Commit in xdiskusage/trunk (PKGBUILD build-fix.patch)

[Kyle Keen]

    Date: Saturday, June 20, 2020 @ 23:14:03
  Author: kkeen
Revision: 648688

upgpkg: xdiskusage 1.52-1

Modified:
  xdiskusage/trunk/PKGBUILD
Deleted:
  xdiskusage/trunk/build-fix.patch

-----------------+
 PKGBUILD        |   18 ++++---------
 build-fix.patch |   71 ------------------------------------------------------
 2 files changed, 6 insertions(+), 83 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-20 23:11:42 UTC (rev 648687)
+++ PKGBUILD	2020-06-20 23:14:03 UTC (rev 648688)
@@ -1,10 +1,11 @@
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Kyle Keen <keenerd at gmail.com>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 # Contributor: Jason Chu <jason at archlinux.org>
 
 pkgname=xdiskusage
-pkgver=1.51
-pkgrel=3
+pkgver=1.52
+pkgrel=1
 pkgdesc="A user-friendly program to show you what is using up all your disk space"
 arch=('x86_64')
 depends=('fltk')
@@ -12,16 +13,9 @@
 license=('GPL')
 url="http://xdiskusage.sourceforge.net"
 options=(!emptydirs)
-source=(http://xdiskusage.sourceforge.net/$pkgname-$pkgver.tgz
-	'build-fix.patch')
-md5sums=('91ab7415a0dc8d53742eb9a9cc809cfd'
-         '570eb00cb0999231620b67889325a81f')
+source=("http://xdiskusage.sourceforge.net/$pkgname-$pkgver.tgz")
+md5sums=('8663caf205aeda34b45bf13cfa87b212')
 
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-#  patch -Np1 -i "$srcdir/build-fix.patch"
-}
-
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr

Deleted: build-fix.patch
===================================================================
--- build-fix.patch	2020-06-20 23:11:42 UTC (rev 648687)
+++ build-fix.patch	2020-06-20 23:14:03 UTC (rev 648688)
@@ -1,71 +0,0 @@
-diff -wbBur xdiskusage-1.48/makeinclude.in xdiskusage-1.48.my/makeinclude.in
---- xdiskusage-1.48/makeinclude.in	2004-05-05 10:07:57.000000000 +0400
-+++ xdiskusage-1.48.my/makeinclude.in	2014-04-23 20:58:15.136751299 +0400
-@@ -21,6 +21,6 @@
- CXXFLAGS_D	=@CXXFLAGS_D@
- 
- # libraries to link with:
--LDLIBS	=@LIBS@ -lfltk -lXinerama -lGL -lGLU -lX11 -lXext @X_EXTRA_LIBS@ -lm
-+LDLIBS	=@LIBS@ -lfltk -lXinerama -lXft -lX11 -lXext -lXi @X_EXTRA_LIBS@ -lm
- 
- INSTALL	=@INSTALL@
-diff -wbBur xdiskusage-1.48/xdiskusage.C xdiskusage-1.48.my/xdiskusage.C
---- xdiskusage-1.48/xdiskusage.C	2004-09-21 09:23:14.000000000 +0400
-+++ xdiskusage-1.48.my/xdiskusage.C	2014-04-23 21:00:50.696749510 +0400
-@@ -223,6 +223,19 @@
-   return 1;
- }
- 
-+// returns true if stdin is /dev/null
-+// To fix Debian bug #276193
-+// Technically could be possible that returns "true" and is not "true",
-+// because same device ID is used across file systems. But is the best
-+// solutions that I have
-+int isstdinnull() {
-+        struct stat ststdin,stnull;
-+        stat("/dev/null",&stnull);
-+        fstat(0,&ststdin);
-+
-+        return (ststdin.st_rdev==stnull.st_rdev);
-+}
-+
- int main(int argc, char**argv) {
- #if FL_MAJOR_VERSION < 2
-   // Make fltk look more like KDE/Windoze:
-@@ -253,7 +266,7 @@
-       OutputWindow* d = OutputWindow::make(argv[n++]);
-       if (d) d->show(argc,argv);
-     }
--  } else if (!isatty(0)) {
-+  } else if (!isatty(0) && !isstdinnull()) {
-     // test for pipe, if so read stdin:
-     OutputWindow* d = OutputWindow::make(0);
-     if (d) d->show(argc,argv);
-@@ -392,8 +405,7 @@
-       strncpy(pathbuf, path, 1024);
-       for (int i=0; i<10; i++) {
- 	char *p = (char*)fl_filename_name(pathbuf);
--	int i = readlink(pathbuf, p, 1024-(p-pathbuf));
--	if (i < 0) {
-+	if (readlink(pathbuf, p, 1024-(p-pathbuf)) < 0) {
- 	  if (errno != EINVAL) {
- 	    strcat(pathbuf, ": no such file");
- 	    fl_alert(pathbuf);
-@@ -988,7 +1000,7 @@
- void OutputWindow::sort_cb(Fl_Widget* o, void*v) {
-   OutputWindow* d = (OutputWindow*)(o->window());
-   int (*compare)(const Node*, const Node*);
--  switch ((int)v) {
-+  switch ((long long)v) {
-   case 's': compare = largestfirst; break;
-   case 'r': compare = smallestfirst; break;
-   case 'a': compare = alphabetical; break;
-@@ -1001,7 +1013,7 @@
- 
- void OutputWindow::columns_cb(Fl_Widget* o, void*v) {
-   OutputWindow* d = (OutputWindow*)(o->window());
--  int n = (int)v;
-+  int n = (long long)v;
-   ::ncols = n;
-   if (n == d->ncols) return;
-   if (d->current_depth > d->root_depth+n-1) {