[gentoo-commits] repo/gentoo:master commit in: x11-misc/xdiskusage/, x11-misc/xdiskusage/files/

[gentoo-commits] repo/gentoo:master commit in: x11-misc/xdiskusage/, x11-misc/xdiskusage/files/

[Jeroen Roovers]

commit:     25f47f8c9c486cf4bf9fed5baf8f030edbfbdb6a
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 19 11:54:44 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 11:58:45 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25f47f8c

x11-misc/xdiskusage: Version 1.52

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 x11-misc/xdiskusage/Manifest                       |  1 +
 .../files/xdiskusage-1.52-flags-order.patch        | 49 ++++++++++++++++++++++
 .../xdiskusage/files/xdiskusage-1.52-pathbuf.patch | 11 +++++
 x11-misc/xdiskusage/xdiskusage-1.52.ebuild         | 37 ++++++++++++++++
 4 files changed, 98 insertions(+)

diff --git a/x11-misc/xdiskusage/Manifest b/x11-misc/xdiskusage/Manifest
index 88724c0b3f7..c28097819c7 100644
--- a/x11-misc/xdiskusage/Manifest
+++ b/x11-misc/xdiskusage/Manifest
@@ -1 +1,2 @@
 DIST xdiskusage-1.51.tgz 54248 BLAKE2B a1e41eef4e3d303c7bc02cb485ab2ca33bb03c57f9713459b68621a611751f5af35be9918bbef86294e70ddcc8e2fb678b5dfa9baa237954a46fd12120bbf96f SHA512 73335bbd5dc3e1f753efb84e7921fe7568f83daae7c4026c8b23fbacc4257b885de56f4dc8f682b03663a56f7def1227b8a4b6abf419aff8ecdd26ae51d4885a
+DIST xdiskusage-1.52.tgz 54458 BLAKE2B 6e91402c4e43e1dfafbd2e689282aea1305ac309a491fd410b16502b2176cfe9a8b17a7379eef5ddea074cc550e7801d91c13db0a7b119b3ab48f32f786f0e5b SHA512 d561f84ca2c8ff73a9abe8c6e34baed430aaa6c6793064b2aa5856249dd4b309d50c3f6b19824a8c948aa8a71f7a3056771937fdce3f3fcb8f2fc8b0f39cdf54

diff --git a/x11-misc/xdiskusage/files/xdiskusage-1.52-flags-order.patch b/x11-misc/xdiskusage/files/xdiskusage-1.52-flags-order.patch
new file mode 100644
index 00000000000..6d0e204e8b5
--- /dev/null
+++ b/x11-misc/xdiskusage/files/xdiskusage-1.52-flags-order.patch
@@ -0,0 +1,49 @@
+--- a/Makefile
++++ b/Makefile
+@@ -17,7 +17,7 @@
+ all:	$(PROGRAM)
+ 
+ $(PROGRAM) : $(OBJECTS)
+-	$(CXX) -o $(PROGRAM) $(OBJECTS) `fltk-config --ldflags` $(CXXFLAGS) $(LDFLAGS)
++	$(CXX) -o $(PROGRAM) $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) `fltk-config --ldflags`
+ 
+ configure: configure.in
+ 	autoconf
+@@ -29,9 +29,9 @@
+ .SUFFIXES : .fl .do .C .c .H
+ 
+ .C.o :
+-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $<
++	$(CXX) $(CXXFLAGS) `fltk-config --cxxflags` -c $<
+ .C :
+-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $<
++	$(CXX) $(CXXFLAGS) `fltk-config --cxxflags` -c $<
+ .fl.C :
+ 	-fluid -c $<
+ .fl.H :
+@@ -42,7 +42,7 @@
+ 	@touch makedepend
+ 
+ depend:
+-	$(MAKEDEPEND) -I.. $(CPPFLAGS) $(CXXFILES) $(CFILES) > makedepend
++	$(MAKEDEPEND) -I.. $(CXXFLAGS) `fltk-config --cxxflags` $(CXXFILES) $(CFILES) > makedepend
+ makedepend:
+ 	touch makedepend
+ include makedepend
+@@ -73,13 +73,13 @@
+ OBJECTS_D = $(CXXFILES:.C=.do) $(CFILES:.c=.do)
+ 
+ .C.do :
+-	$(CXX) $(CPPFLAGS) $(CXXFLAGS_D) -c -o $@ $<
++	$(CXX) $(CXXFLAGS) `fltk-config --cxxflags` $(CXXFLAGS_D) -c -o $@ $<
+ .c.do :
+ 	$(CC) $(CFLAGS_D) -c -o $@ $<
+ 
+ $(PROGRAM_D) : $(OBJECTS_D)
+-	$(CXX) -o $(PROGRAM_D) $(OBJECTS_D) `fltk-config --ldflags` $(CXXFLAGS_D) $(LDFLAGS)
++	$(CXX) -o $(PROGRAM_D) $(CXXFLAGS_D) $(LDFLAGS) $(OBJECTS_D) `fltk-config --ldflags`
+ 
+ # Used to make the version that is gzipped and uploaded to web site
+ static : $(OBJECTS)
+-	$(CXX) -o $(PROGRAM) $(OBJECTS) `fltk-config --ldstaticflags` $(CXXFLAGS) $(LDFLAGS)
++	$(CXX) -o $(PROGRAM) $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) `fltk-config --ldstaticflags`

diff --git a/x11-misc/xdiskusage/files/xdiskusage-1.52-pathbuf.patch b/x11-misc/xdiskusage/files/xdiskusage-1.52-pathbuf.patch
new file mode 100644
index 00000000000..a78372c050c
--- /dev/null
+++ b/x11-misc/xdiskusage/files/xdiskusage-1.52-pathbuf.patch
@@ -0,0 +1,11 @@
+--- a/xdiskusage.C
++++ b/xdiskusage.C
+@@ -458,7 +458,7 @@
+   } else {
+     if (!disk) {
+       // follow all symbolic links...
+-      strncpy(pathbuf, path, 1024);
++      strncpy(pathbuf, path, 1024 -1);
+       for (int i=0; i<10; i++) {
+ 	char *p = (char*)fl_filename_name(pathbuf);
+ 	int j = readlink(pathbuf, p, 1024-(p-pathbuf));

diff --git a/x11-misc/xdiskusage/xdiskusage-1.52.ebuild b/x11-misc/xdiskusage/xdiskusage-1.52.ebuild
new file mode 100644
index 00000000000..7449a2fa676
--- /dev/null
+++ b/x11-misc/xdiskusage/xdiskusage-1.52.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="user-friendly program to show you what is using up all your disk space"
+HOMEPAGE="http://xdiskusage.sourceforge.net/"
+SRC_URI="http://xdiskusage.sourceforge.net/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	>=x11-libs/fltk-1.3:1
+"
+BDEPEND="
+	${RDEPEND}
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.52-flags-order.patch
+	"${FILESDIR}"/${PN}-1.52-pathbuf.patch
+)
+
+src_compile() {
+	# override FLAGS set by configure
+	emake CXXFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc README
+}