[Pkg-wmaker-commits] [wmtop] 03/03: debian/patches: Remove directory; patches applied upstream or made unnecessary due to switch to autotools.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Mon Feb 8 15:08:47 UTC 2016
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmtop.
commit e8dc977431da68192ccf385d8a9361990c814cf8
Author: Doug Torrance <dtorrance at piedmont.edu>
Date: Mon Feb 8 10:08:10 2016 -0500
debian/patches: Remove directory; patches applied upstream or made
unnecessary due to switch to autotools.
---
debian/patches/comment_strip_of_binary.patch | 16 ---
debian/patches/fix_incorrect_memory_usage.patch | 39 -------
debian/patches/fix_install.patch | 23 -----
debian/patches/fix_manpage.patch | 34 -------
debian/patches/honor_buildflags.patch | 19 ----
debian/patches/remove_inline_keywords.patch | 130 ------------------------
debian/patches/series | 6 --
7 files changed, 267 deletions(-)
diff --git a/debian/patches/comment_strip_of_binary.patch b/debian/patches/comment_strip_of_binary.patch
deleted file mode 100644
index 35acf07..0000000
--- a/debian/patches/comment_strip_of_binary.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: comment strip of binary from upstream Makefile
-Author: tony mancill <tmancill at debian.org>
-Bug-Debian: http://bugs.debian.org/438278
-Last-Update: 2015-07-13
-
---- a/Makefile
-+++ b/Makefile
-@@ -38,7 +38,7 @@
- rm -f *~
-
- install: wmtop
-- strip wmtop
-+ #strip wmtop
- cp -f wmtop $(PREFIX)/bin/
- chmod 755 $(PREFIX)/bin/wmtop
- cp -f wmtop.1 $(PREFIX)/man/man1
diff --git a/debian/patches/fix_incorrect_memory_usage.patch b/debian/patches/fix_incorrect_memory_usage.patch
deleted file mode 100644
index bae1576..0000000
--- a/debian/patches/fix_incorrect_memory_usage.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: reports incorrect memory usage on Linux 2.6
- On Linux 2.6, "wmtop -m" reports incorrect memory usage (it reports every
- process using infinite memory). This patch fixes the problem:
-Author: Dwayne C. Litzenberger <dlitz at dlitz.net>
-Bug-Debian: http://bugs.debian.org/224732
-Last-Update: 2015-07-13
-
---- a/wmtop.c
-+++ b/wmtop.c
-@@ -843,7 +843,7 @@
- #if defined(LINUX)
- int calc_mem_total() {
- int ps;
-- char line[512];
-+ char line[1024];
- char *ptr;
- int rc;
-
-@@ -853,13 +853,16 @@
- if (rc<0)
- return 0;
-
-- if ((ptr = strstr(line, "Mem:")) == NULL) {
-- return 0;
-- } else {
-+ if ((ptr = strstr(line, "Mem:")) != NULL) {
- ptr += 4;
- return atoi(ptr);
-+ } else if ((ptr = strstr(line, "MemTotal:")) != NULL) {
-+ /* The "Mem:" line has been removed in Linux 2.6 */
-+ ptr += 9;
-+ return atoi(ptr) << 10; /* MemTotal is given in kiB */
-+ } else {
-+ return 0;
- }
--
- }
- #endif /* defined(LINUX) */
-
diff --git a/debian/patches/fix_install.patch b/debian/patches/fix_install.patch
deleted file mode 100644
index 327e128..0000000
--- a/debian/patches/fix_install.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Fix install.
- Honor DESTDIR environment variable, create installation directories, and
- install manpage according to FHS.
-Author: Doug Torrance <dtorrance at piedmont.edu>
-Last-Update: 2015-07-13
-
---- a/Makefile
-+++ b/Makefile
-@@ -39,8 +39,10 @@
-
- install: wmtop
- #strip wmtop
-- cp -f wmtop $(PREFIX)/bin/
-- chmod 755 $(PREFIX)/bin/wmtop
-- cp -f wmtop.1 $(PREFIX)/man/man1
-- chmod 644 $(PREFIX)/man/man1/wmtop.1
-+ mkdir -p $(DESTDIR)$(PREFIX)/bin
-+ cp -f wmtop $(DESTDIR)$(PREFIX)/bin/
-+ chmod 755 $(DESTDIR)$(PREFIX)/bin/wmtop
-+ mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1
-+ cp -f wmtop.1 $(DESTDIR)$(PREFIX)/share/man/man1
-+ chmod 644 $(DESTDIR)$(PREFIX)/share/man/man1/wmtop.1
- @echo "wmtop Installation finished..."
diff --git a/debian/patches/fix_manpage.patch b/debian/patches/fix_manpage.patch
deleted file mode 100644
index 9fdd3b1..0000000
--- a/debian/patches/fix_manpage.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: Escapes minus signs and fixes spelling error.
-Author: Sandro Tosi <matrixhasu at gmail.com>
-Author: Doug Torrance <dtorrance at piedmont.edu>
-Last-Update: 2015-07-13
-
---- a/wmtop.1
-+++ b/wmtop.1
-@@ -11,7 +11,7 @@
- [\-c command]
- [\-U]
- [\-x regexp]
--[-m]
-+[\-m]
-
-
- .SH DESCRIPTION
-@@ -22,7 +22,7 @@
-
- .SH OPTIONS
- While running a left click alternates between CPU and memory
--display. A right click launches the appliction specfied at the
-+display. A right click launches the application specfied at the
- command line. Middle clicking changes between displaying all
- and user only processes.
- .TP
-@@ -64,7 +64,7 @@
- Monitor only users processes, exclude WindowMaker dock apps and
- pop up xps when double clicked:
- .IP
--wmtop -c xps -U -x '^wm'
-+wmtop \-c xps \-U \-x '^wm'
- .LP
- where we assume dock apps all have names starting with 'wm'.
-
diff --git a/debian/patches/honor_buildflags.patch b/debian/patches/honor_buildflags.patch
deleted file mode 100644
index 07ca19d..0000000
--- a/debian/patches/honor_buildflags.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Honor CPPFLAGS, CFLAGS, and LDFLAGS.
-Author: Doug Torrance <dtorrance at piedmont.edu>
-Last-Update: 2015-07-13
-
---- a/Makefile
-+++ b/Makefile
-@@ -22,10 +22,10 @@
- $(MAKE) OS=LINUX all
-
- .c.o:
-- $(CC) $(FLAGS) $(INCS) -c $< -o $*.o
-+ $(CC) -D$(OS) $(CPPFLAGS) $(CFLAGS) -c $< -o $*.o
-
- wmtop: $(OBJS) wmtop.o
-- $(CC) $(FLAGS) -o wmtop $(OBJS) $(LIBDIR) $(LIBS)
-+ $(CC) $(LDFLAGS) -o wmtop $(OBJS) $(LIBDIR) $(LIBS)
- @echo Now you can do a '"make install"'
-
- all: wmtop
diff --git a/debian/patches/remove_inline_keywords.patch b/debian/patches/remove_inline_keywords.patch
deleted file mode 100644
index db2b892..0000000
--- a/debian/patches/remove_inline_keywords.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-Description: Remove inline keywords; allows builds using gcc5.
-Origin: http://repo.or.cz/w/dockapps.git/commitdiff/7d77c17
-Bug-Debian: http://bugs.debian.org/793136
-Last-Update: 2015-07-21
-
---- a/wmgeneral/list.c
-+++ b/wmgeneral/list.c
-@@ -38,7 +38,7 @@
-
- /* Return a cons cell produced from (head . tail) */
-
--INLINE LinkedList*
-+LinkedList*
- list_cons(void* head, LinkedList* tail)
- {
- LinkedList* cell;
-@@ -51,7 +51,7 @@
-
- /* Return the length of a list, list_length(NULL) returns zero */
-
--INLINE int
-+int
- list_length(LinkedList* list)
- {
- int i = 0;
-@@ -66,7 +66,7 @@
- /* Return the Nth element of LIST, where N count from zero. If N
- larger than the list length, NULL is returned */
-
--INLINE void*
-+void*
- list_nth(int index, LinkedList* list)
- {
- while(index-- != 0)
-@@ -81,7 +81,7 @@
-
- /* Remove the element at the head by replacing it by its successor */
-
--INLINE void
-+void
- list_remove_head(LinkedList** list)
- {
- if (!*list) return;
-@@ -101,7 +101,7 @@
-
- /* Remove the element with `car' set to ELEMENT */
- /*
--INLINE void
-+void
- list_remove_elem(LinkedList** list, void* elem)
- {
- while (*list)
-@@ -112,7 +112,7 @@
- }
- }*/
-
--INLINE LinkedList *
-+LinkedList *
- list_remove_elem(LinkedList* list, void* elem)
- {
- LinkedList *tmp;
-@@ -132,7 +132,7 @@
-
- /* Return element that has ELEM as car */
-
--INLINE LinkedList*
-+LinkedList*
- list_find(LinkedList* list, void* elem)
- {
- while(list)
-@@ -146,7 +146,7 @@
-
- /* Free list (backwards recursive) */
-
--INLINE void
-+void
- list_free(LinkedList* list)
- {
- if(list)
-@@ -158,7 +158,7 @@
-
- /* Map FUNCTION over all elements in LIST */
-
--INLINE void
-+void
- list_mapcar(LinkedList* list, void(*function)(void*))
- {
- while(list)
---- a/wmgeneral/list.h
-+++ b/wmgeneral/list.h
-@@ -29,31 +29,25 @@
- #ifndef __LIST_H_
- #define __LIST_H_
-
--#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
--# define INLINE inline
--#else
--# define INLINE
--#endif
--
- typedef struct LinkedList {
- void *head;
- struct LinkedList *tail;
- } LinkedList;
-
--INLINE LinkedList* list_cons(void* head, LinkedList* tail);
-+LinkedList* list_cons(void* head, LinkedList* tail);
-
--INLINE int list_length(LinkedList* list);
-+int list_length(LinkedList* list);
-
--INLINE void* list_nth(int index, LinkedList* list);
-+void* list_nth(int index, LinkedList* list);
-
--INLINE void list_remove_head(LinkedList** list);
-+void list_remove_head(LinkedList** list);
-
--INLINE LinkedList *list_remove_elem(LinkedList* list, void* elem);
-+LinkedList *list_remove_elem(LinkedList* list, void* elem);
-
--INLINE void list_mapcar(LinkedList* list, void(*function)(void*));
-+void list_mapcar(LinkedList* list, void(*function)(void*));
-
--INLINE LinkedList*list_find(LinkedList* list, void* elem);
-+LinkedList*list_find(LinkedList* list, void* elem);
-
--INLINE void list_free(LinkedList* list);
-+void list_free(LinkedList* list);
-
- #endif
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 4f198c8..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,6 +0,0 @@
-fix_incorrect_memory_usage.patch
-comment_strip_of_binary.patch
-fix_manpage.patch
-fix_install.patch
-honor_buildflags.patch
-remove_inline_keywords.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmtop.git
More information about the Pkg-wmaker-commits
mailing list