summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2020-06-19 13:54:44 +0200
committerJeroen Roovers <jer@gentoo.org>2020-06-19 13:58:45 +0200
commit25f47f8c9c486cf4bf9fed5baf8f030edbfbdb6a (patch)
treee22f0855f26132ed1dc327d93e63d0c8a0bdefc2 /x11-misc/xdiskusage/files
parenteclass/tests/distutils-r1.sh: update dep values (diff)
downloadgentoo-25f47f8c9c486cf4bf9fed5baf8f030edbfbdb6a.tar.gz
gentoo-25f47f8c9c486cf4bf9fed5baf8f030edbfbdb6a.tar.bz2
gentoo-25f47f8c9c486cf4bf9fed5baf8f030edbfbdb6a.zip
x11-misc/xdiskusage: Version 1.52
Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Jeroen Roovers <jer@gentoo.org>
Diffstat (limited to 'x11-misc/xdiskusage/files')
-rw-r--r--x11-misc/xdiskusage/files/xdiskusage-1.52-flags-order.patch49
-rw-r--r--x11-misc/xdiskusage/files/xdiskusage-1.52-pathbuf.patch11
2 files changed, 60 insertions, 0 deletions
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 000000000000..6d0e204e8b52
--- /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 000000000000..a78372c050c4
--- /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));