diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-01-02 14:45:16 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-01-02 14:45:16 +0000 |
commit | a70f42c65202d88c203c40910fef8f96f333d1ee (patch) | |
tree | de550ee3deb79c550ae1aba7fcce118d5d4dbc31 /x11-plugins/wmload | |
parent | 721254b86a09bdedd5eefd0de7899c90ea2ead1a (diff) |
gentoo resync : 02.01.2018
Diffstat (limited to 'x11-plugins/wmload')
-rw-r--r-- | x11-plugins/wmload/Manifest | 3 | ||||
-rw-r--r-- | x11-plugins/wmload/files/wmload-0.9.2-prefix.patch | 11 | ||||
-rw-r--r-- | x11-plugins/wmload/files/wmload-ComplexProgramTargetNoMan.patch | 8 | ||||
-rw-r--r-- | x11-plugins/wmload/files/wmload.solaris.patch | 141 |
4 files changed, 0 insertions, 163 deletions
diff --git a/x11-plugins/wmload/Manifest b/x11-plugins/wmload/Manifest index 4fedab6ceac3..cf3f047d52f3 100644 --- a/x11-plugins/wmload/Manifest +++ b/x11-plugins/wmload/Manifest @@ -1,8 +1,5 @@ -AUX wmload-0.9.2-prefix.patch 222 BLAKE2B 20e44e91cecc160ce3ce70e429a333004b57ee26158d9675edd9f9c8dc352514e918f8fab3bd45182504293792d2ca16bbb1f294ec74f8124644324ce79cce8b SHA512 c92f3782728ccca5440cac7b750f5312c4e9c3942230974a6ea88e72388764f08add2a03bf382a8855a56e683f98531281e37423d39eafab2eef82aac49995aa AUX wmload-0.9.6-solaris.patch 3036 BLAKE2B 46982b6bad9e2b5a731ff5d90ee5ccac730a7645876d390b0dce664548740549624fdbec064e760401dfa18c5bbeedb5271d58b007428710815b92704996b751 SHA512 8884d0f742cfa6536f436bc4656d1e6d44eb6f4de076a9f68c0d8bb6ab66bc93a8e972094593e367347a580f53d56697e2dbe98810257532e08f99111597f07c -AUX wmload-ComplexProgramTargetNoMan.patch 224 BLAKE2B e592218a8c052ac63143e11889b55cd1321abd1c90151b166d4216bdb51a4a671a7b5b7235025135de069de781632e4d2dc08cba5aeb1c008148f930fa84bd6f SHA512 41753993f6cce969284c0093506d125d7b6b7508968a98a248e8c06cc0941fcd9daf2e1d31782aa58e21ce18a3ed8a03131fddee9f048c93c3b4d97560625cd5 AUX wmload.desktop 155 BLAKE2B 50461febd5980fce4d55231c958b1959066b791cd99c807ed9c82a96c6d833d930f3c9ee90148c3a99efbed789399669363129f26fb5d676e092eb610ac48489 SHA512 260b0370bbd730ce89f7452e1c8d8ccdacee047aa025ea4e832405534e9a0418983e1724fa01ab143e7d978906708697ea338d1f831a8de5c3a790f0f238395b -AUX wmload.solaris.patch 3494 BLAKE2B 99e48775cac95c5d06c07cb82dab8d752f0251d53447df5f924f0a8314385d9b0a37361a06e8b136771b4949bc8f3c7049525bb0818b5a2685259812ac1beaf3 SHA512 9b65b4578168f3bc3b0e3bccff94097fb301e6763fecae712b58b3d21a994ceb8fbc8f39d640959374e19e2cfa71e3eab38d4eaf18c421bdf28c7113db1212f0 DIST wmload-0.9.7.tar.gz 17648 BLAKE2B 418b18390035eec14fdd2d715519aff0807c7c5171448818e113ebe27ba908c5416baaa2e605daf3701c7acac6cde6d76c2b26a85f8cae18efd95b000d0e510a SHA512 5d08f34013c23c85de88adbfeca31e8399f0f9ce5573845aa50c1f4a06488d729de637b1d0f8b5739194b30ba8e085d40022926a3a8328d3cdab462f9e649801 EBUILD wmload-0.9.7.ebuild 789 BLAKE2B 75f80c22ad031132fb148e0e6969e6cbc3b1198580d7ac5ecdd1ffae0c362d2414620d1492dc163ebdc4e3ecb2b6f5eb10bc71fd60d34c9ab1d0e55a20b24655 SHA512 7c6056e4ed1bc456392acfe89e18b1d3851e0c81b18601271469e4086eb1fd7dbb21e867f1cdf6d21237fedbfa36864060871fafcd81e16381f9b23fe07f55dc MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d diff --git a/x11-plugins/wmload/files/wmload-0.9.2-prefix.patch b/x11-plugins/wmload/files/wmload-0.9.2-prefix.patch deleted file mode 100644 index 3ec43c570df0..000000000000 --- a/x11-plugins/wmload/files/wmload-0.9.2-prefix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Imakefile -+++ Imakefile -@@ -2,7 +2,7 @@ - DESTDIR = /usr/local - BINDIR = /bin - --XPMLIB = -L/usr/lib/X11 -lXpm -lm -+XPMLIB = `pkg-config xpm --libs` -lm - DEPLIBS = $(DEPXLIB) - - LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) diff --git a/x11-plugins/wmload/files/wmload-ComplexProgramTargetNoMan.patch b/x11-plugins/wmload/files/wmload-ComplexProgramTargetNoMan.patch deleted file mode 100644 index 8d3d25d6fa3c..000000000000 --- a/x11-plugins/wmload/files/wmload-ComplexProgramTargetNoMan.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- wmload-0.9.2/Imakefile~ Sat Dec 1 21:53:52 2001 -+++ wmload-0.9.2/Imakefile Sat Dec 1 21:53:52 2001 -@@ -14,4 +14,4 @@ - SRCS = wmload.c - OBJS = wmload.o - --ComplexProgramTarget(wmload) -+ComplexProgramTargetNoMan(wmload) diff --git a/x11-plugins/wmload/files/wmload.solaris.patch b/x11-plugins/wmload/files/wmload.solaris.patch deleted file mode 100644 index 788d4190aba0..000000000000 --- a/x11-plugins/wmload/files/wmload.solaris.patch +++ /dev/null @@ -1,141 +0,0 @@ -* original: http://www.rampant.org/~dp/software/wmload.solaris.patch - ---- wmload.c -+++ wmload.c -@@ -6,6 +6,11 @@ - #include <math.h> - #include <fcntl.h> - #include <X11/Xatom.h> -+#ifdef sun -+#include <sys/types.h> -+#include <sys/sysinfo.h> -+#include <kstat.h> -+#endif - - #include "back.xpm" - #include "mask2.xbm" -@@ -214,7 +219,7 @@ - NormalGC = XCreateGC(dpy, Root, gcm, &gcv); - - if (ONLYSHAPE) { /* try to make shaped window here */ -- pixmask = XCreateBitmapFromData(dpy, win, mask2_bits, mask2_width, -+ pixmask = XCreateBitmapFromData(dpy, win, (char *)mask2_bits, mask2_width, - mask2_height); - XShapeCombineMask(dpy, win, ShapeBounding, 0, 0, pixmask, ShapeSet); - XShapeCombineMask(dpy, iconwin, ShapeBounding, 0, 0, pixmask, ShapeSet); -@@ -410,6 +415,107 @@ - return (char *)p; - } - -+#ifdef sun -+ -+static kstat_ctl_t *kc; -+static kstat_t **cpu_ksp_list; -+static int ncpus; -+ -+void -+cpu_stats_init() -+{ -+ int i = 0; -+ kstat_t *ksp; -+ static int kstats_ready = 0; -+ -+ if (!kstats_ready) { -+ if ((kc = kstat_open()) == NULL) { -+ fprintf(stderr,"wmload: can't open /dev/kstat\n"); -+ exit (1); -+ } -+ kstats_ready = 1; -+ } -+ -+ for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) { -+ if (strcmp(ksp->ks_module, "cpu_stat") == 0) -+ i++; -+ } -+ -+ if (cpu_ksp_list) { -+ free(cpu_ksp_list); -+ } -+ cpu_ksp_list = (kstat_t **) calloc(i * sizeof (kstat_t *), 1); -+ ncpus = i; -+ -+ /* -+ * stash the ksp for each CPU. -+ */ -+ i = 0; -+ for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) { -+ if (strcmp(ksp->ks_module, "cpu_stat") == 0) { -+ cpu_ksp_list[i] = ksp; -+ i++; -+ } -+ } -+} -+ -+int -+get_cpu_stats() -+{ -+ int i; -+ cpu_stat_t stat; -+ static int firsttime = 1; -+ -+ if (firsttime) { -+ firsttime = 0; -+ return (1); /* force code to go initialize kstat stuff */ -+ } -+ -+ /* -+ * Read each cpu's data. If the chain has changed (a state change -+ * has happened, maybe a new cpu was added to the system), then -+ * return 1. This will cause the code to reinitialize the cpu_ksp_list -+ * array. word. -+ */ -+ cp_time[0] = cp_time[1] = cp_time[2] = cp_time[3] = 0; -+ for (i = 0; i < ncpus; i++) { -+ if (kstat_read(kc, cpu_ksp_list[i], (void *) &stat) == -1) -+ return (1); -+ cp_time[0] += stat.cpu_sysinfo.cpu[CPU_USER]; /* user */ -+ cp_time[1] += stat.cpu_sysinfo.cpu[CPU_WAIT]; /* "nice" */ -+ cp_time[2] += stat.cpu_sysinfo.cpu[CPU_KERNEL]; /* sys */ -+ cp_time[3] += stat.cpu_sysinfo.cpu[CPU_IDLE]; /* idle ("free")*/ -+ } -+ return (0); -+} -+ -+void GetLoad(int Maximum, int *usr, int *nice, int *sys, int *free) -+{ -+ int total; -+ -+ while (get_cpu_stats() != 0) { -+ cpu_stats_init(); -+ } -+ -+ *usr = cp_time[0] - last[0]; -+ *nice = cp_time[1] - last[1]; -+ *sys = cp_time[2] - last[2]; -+ *free = cp_time[3] - last[3]; -+ -+ /* printf("[%d %d %d %d]\n", *usr, *nice, *sys, *free); */ -+ -+ total = *usr + *nice + *sys + *free; -+ last[0] = cp_time[0]; -+ last[1] = cp_time[1]; -+ last[2] = cp_time[2]; -+ last[3] = cp_time[3]; -+ -+ *usr = rint(Maximum * (float)(*usr) /total); -+ *nice =rint(Maximum * (float)(*nice) /total); -+ *sys = rint(Maximum * (float)(*sys) /total); -+ *free = rint(Maximum * (float)(*free) /total); -+} -+#else /* sun */ - void GetLoad(int Maximum, int *usr, int *nice, int *sys, int *free) - { - char buffer[100];/*[4096+1];*/ -@@ -445,6 +551,7 @@ - *sys = rint(Maximum * (float)(*sys) /total); - *free = rint(Maximum * (float)(*free) /total); - } -+#endif - - void InsertLoad() - { |