diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-06-21 17:50:24 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-06-21 17:50:24 +0100 |
commit | feb0daf81d888e9160f9f94502de09b66f2a63fd (patch) | |
tree | b6e5c40ce2abef3da27ed50a023153f475e0ddef /x11-misc/xdiskusage/files | |
parent | 9452a6e87b6c2c70513bc47a2470bf9f1168920e (diff) |
gentoo resync : 21.06.2020
Diffstat (limited to 'x11-misc/xdiskusage/files')
-rw-r--r-- | x11-misc/xdiskusage/files/xdiskusage-1.52-flags-order.patch | 49 | ||||
-rw-r--r-- | x11-misc/xdiskusage/files/xdiskusage-1.52-pathbuf.patch | 11 |
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)); |