[Pkg-wmaker-commits] [wmbubble] 171/207: Delete debian/patches.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Mon Aug 24 04:18:29 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmbubble.
commit 639d25e483a844728ce74a50208e291c56d0e44b
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date: Mon Jul 28 17:23:08 2014 -0500
Delete debian/patches.
---
.../patches/add-init_stuff-to-sys_include.h.patch | 20 -----
debian/patches/fix-compiler-flags.patch | 27 ------
debian/patches/fixes-for-kfreebsd.patch | 99 ----------------------
debian/patches/series | 3 -
4 files changed, 149 deletions(-)
diff --git a/debian/patches/add-init_stuff-to-sys_include.h.patch b/debian/patches/add-init_stuff-to-sys_include.h.patch
deleted file mode 100644
index 370c575..0000000
--- a/debian/patches/add-init_stuff-to-sys_include.h.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Add init_stuff to sys_include.h for kFreeBSD.
- A function init_stuff() is defined in sys_freebsd.c which is not defined
- in any of the other sys_*.c files. It is only called from bubblemon.c when
- the FreeBSD kernel is being used, but is not declared in sys_include.h,
- resulting in a implicit-declaration build warning. This patch fixes this
- issue by adding the appropriate lines to sys_include.h.
-Author: Doug Torrance <dtorrance at monmouthcollege.edu>
-Last-Update: <2014-07-27>
-
---- wmbubble-1.50.orig/include/sys_include.h
-+++ wmbubble-1.50/include/sys_include.h
-@@ -24,4 +24,8 @@ int system_cpu(void); /* return total C
- void system_memory(void); /* set memory related values in BubbleMonData */
- void system_loadavg(void); /* get current load average and put into
- bm->loadavg[].{i,f} */
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+int init_stuff();
-+#endif
-+
- #endif /* _SYS_INCLUDE_H_ */
diff --git a/debian/patches/fix-compiler-flags.patch b/debian/patches/fix-compiler-flags.patch
deleted file mode 100644
index 9a916ef..0000000
--- a/debian/patches/fix-compiler-flags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Fix compiler flags
- Fix Makefile so that CFLAGS is not overwritten. Compile with
- CPPFLAGS and LDFLAGS.
-
-Author: Doug Torrance <dtorrance at monmouthcollege.edu>
-Last-Update: 2014-06-21
-
---- wmbubble-1.50.orig/Makefile
-+++ wmbubble-1.50/Makefile
-@@ -4,7 +4,7 @@ PREFIX = /usr/local
- # default build flags
- # CFLAGS = -ansi -Wall -ggdb
- # optimization cflags
--CFLAGS = -ansi -Wall -O3
-+CFLAGS += -ansi -Wall -O3
- # profiling cflags
- # CFLAGS = -ansi -Wall -O3 -pg -DPRO=50000
- # test coverage cflags
-@@ -69,7 +69,7 @@ endif
- all: wmbubble
-
- wmbubble: $(OBJS)
-- $(CC) $(CFLAGS) -o wmbubble $(OBJS) $(LIBS)
-+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o wmbubble $(OBJS) $(LIBS)
-
- bubblemon.o: bubblemon.c wmx11pixmap.h include/bubblemon.h \
- include/sys_include.h include/numbers-2.h include/ducks.h \
diff --git a/debian/patches/fixes-for-kfreebsd.patch b/debian/patches/fixes-for-kfreebsd.patch
deleted file mode 100644
index f2d7301..0000000
--- a/debian/patches/fixes-for-kfreebsd.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-Description: Fixes for Debian GNU/kFreeBSD
-Author: Doug Torrance <dtorrance at monmouthcollege.edu>
- This patch adds several fixes to make wmbubble work on Debian GNU/kFreeBSD.
- In particular:
- - recognize GNU/kFreeBSD as an option in the Makefile
- - call init_stuff if __FreeBSD_kernel__ is defined instead of just __FreeBSD__
- - use sysctl instead of kvm_read for system_cpu; inspired by FreeBSD patch for
- wmcube-gdk by KOIE Hidetaka (http://lists.freebsd.org/pipermail/
- freebsd-ports-bugs/2008-January/135006.html)
-Last-Update: 2014-06-21
-
-Index: wmbubble/Makefile
-===================================================================
---- wmbubble.orig/Makefile 2014-06-21 00:23:06.000000000 -0600
-+++ wmbubble/Makefile 2014-06-21 00:23:06.000000000 -0600
-@@ -28,6 +28,13 @@
- INSTALL = -c -g kmem -m 2755 -o root
- endif
-
-+ifeq ($(OS), GNU/kFreeBSD)
-+ OBJS += sys_freebsd.o
-+ LIBS = -lX11 -lkvm -lm
-+ INSTALL = -c -g kmem -m 2755 -o root
-+ CFLAGS += -D_BSD_SOURCE
-+endif
-+
- # special things for NetBSD
- ifeq ($(OS), NetBSD)
- OBJS += sys_netbsd.o
-Index: wmbubble/bubblemon.c
-===================================================================
---- wmbubble.orig/bubblemon.c 2014-06-21 00:23:06.000000000 -0600
-+++ wmbubble/bubblemon.c 2014-06-21 00:23:06.000000000 -0600
-@@ -404,7 +404,7 @@
-
- argv++; argc--; /* Otherwise we'll make more of ourselves on a left click */
-
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- if (init_stuff())
- exit(-1);
- #endif
-Index: wmbubble/sys_freebsd.c
-===================================================================
---- wmbubble.orig/sys_freebsd.c 2014-06-21 00:23:06.000000000 -0600
-+++ wmbubble/sys_freebsd.c 2014-06-21 00:23:06.000000000 -0600
-@@ -37,7 +37,6 @@
-
- static kvm_t *kd = NULL;
- static struct nlist nlst[] = {
-- {"_cp_time", 0},
- {"_cnt", 0},
- {"_bufspace", 0},
- {0, 0}
-@@ -67,7 +66,7 @@
-
- kvm_nlist(kd, nlst);
-
-- if (nlst[0].n_type == 0 || nlst[1].n_type == 0 || nlst[2].n_type == 0) {
-+ if (nlst[0].n_type == 0 || nlst[1].n_type == 0) {
- puts("Error extracting symbols");
- return 2;
- }
-@@ -93,9 +92,19 @@
- unsigned long int cpu_time[CPUSTATES];
- int i;
-
-- if (kvm_read(kd, nlst[0].n_value, &cpu_time, sizeof(cpu_time))
-- != sizeof(cpu_time))
-- return 0;
-+ static int mib[2];
-+ size_t len = 2;
-+
-+ size_t size;
-+
-+ if (sysctlnametomib("kern.cp_time", mib, &len) < 0)
-+ return 0;
-+
-+ size = sizeof (cpu_time);
-+
-+
-+ if (sysctl(mib, 2, &cpu_time, &size, NULL, 0) < 0)
-+ return 0;
-
- load = cpu_time[CP_USER] + cpu_time[CP_SYS] + cpu_time[CP_NICE];
- total = load + cpu_time[CP_IDLE];
-@@ -133,10 +142,10 @@
- static time_t last_time_swap = 0;
- time_t curr_time;
-
-- if (kvm_read(kd, nlst[1].n_value, &sum, sizeof(sum)) != sizeof(sum))
-+ if (kvm_read(kd, nlst[0].n_value, &sum, sizeof(sum)) != sizeof(sum))
- return; /* _cnt */
-
-- if (kvm_read(kd, nlst[2].n_value, &bufspace, sizeof(bufspace)) !=
-+ if (kvm_read(kd, nlst[1].n_value, &bufspace, sizeof(bufspace)) !=
- sizeof(bufspace))
- return; /* _bufspace */
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 3c11191..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-fixes-for-kfreebsd.patch
-fix-compiler-flags.patch
-add-init_stuff-to-sys_include.h.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbubble.git
More information about the Pkg-wmaker-commits
mailing list