diff options
| -rw-r--r-- | desktop/wmclock/README | 3 | ||||
| -rw-r--r-- | desktop/wmclock/wmclock.SlackBuild | 10 | ||||
| -rw-r--r-- | desktop/wmclock/wmclock.info | 10 | ||||
| -rw-r--r-- | desktop/wmclock/wmclock_nopolling.patch | 77 |
4 files changed, 9 insertions, 91 deletions
diff --git a/desktop/wmclock/README b/desktop/wmclock/README index 8cbc6514a7..fc33f80b8e 100644 --- a/desktop/wmclock/README +++ b/desktop/wmclock/README @@ -10,11 +10,12 @@ languages: breton czech danish dutch english french french2 german hungarian indonesian italian norwegian portuguese russian slovene spanish swedish ukrainian +polish croatian To set the default language, set LANGUAGE to one of the above in the environment before running wmclock.SlackBuild, e.g. -# LANGUAGE=french ./wmclock.SlackBuild +$ LANGUAGE=french ./wmclock.SlackBuild This only sets the default; the other languages can still be used via the -monthxpm and -weekdayxpm command line options (see the wmclock man diff --git a/desktop/wmclock/wmclock.SlackBuild b/desktop/wmclock/wmclock.SlackBuild index 12d36f7fef..c6bcca9a33 100644 --- a/desktop/wmclock/wmclock.SlackBuild +++ b/desktop/wmclock/wmclock.SlackBuild @@ -5,16 +5,14 @@ # Written by B. Watson (yalhcru@gmail.com) PRGNAM=wmclock -VERSION=${VERSION:-1.0.12.2} +VERSION=${VERSION:-1.0.13} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -49,16 +47,12 @@ cd $PRGNAM-$VERSION chown -R root:root . chmod -R a-s,u+w,go+r-w . -# Patch to reduce CPU usage (from the author's website) -# Note: -p0, not the usual -p1! -patch -p0 < $CWD/wmclock_nopolling.patch - # Set the default language with LANGUAGE=<language> in the environment # Default is english. It's still possible to display in other # languages using the -monthxpm and -weekdayxpm options. # Language choices: -# breton czech danish dutch english french french2 german hungarian indonesian +# breton czech danish dutch english french french2 german hungarian indonesian # italian norwegian portuguese russian slovene spanish swedish ukrainian LANGUAGE=${LANGUAGE:-english} diff --git a/desktop/wmclock/wmclock.info b/desktop/wmclock/wmclock.info index 36db9edc89..4f45241335 100644 --- a/desktop/wmclock/wmclock.info +++ b/desktop/wmclock/wmclock.info @@ -1,10 +1,10 @@ PRGNAM="wmclock" -VERSION="1.0.12.2" -HOMEPAGE="http://liquidmeme.org/WindowMaker/wmclock/" -DOWNLOAD="http://liquidmeme.org/WindowMaker/wmclock/wmclock-1.0.12.2.tar.gz" -MD5SUM="97f6e82f55f216ba724859d4652586b4" +VERSION="1.0.13" +HOMEPAGE="http://www.bluestop.org/wmclock/" +DOWNLOAD="http://www.bluestop.org/wmclock/wmclock-1.0.13.tar.gz" +MD5SUM="e0ce24c2fe700351b1e917dd63dff7f0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="B. Watson" EMAIL="yalhcru@gmail.com" -APPROVED="rworkman" +APPROVED="Erik Hanson" diff --git a/desktop/wmclock/wmclock_nopolling.patch b/desktop/wmclock/wmclock_nopolling.patch deleted file mode 100644 index a5a338f784..0000000000 --- a/desktop/wmclock/wmclock_nopolling.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- wmclock.c.orig 2008-09-28 17:41:49.000000000 +0200 -+++ wmclock.c 2008-09-28 20:33:59.000000000 +0200 -@@ -20,6 +20,7 @@ - * with the software or the use or other dealings in the software. - */ - -+#include <sys/select.h> - #include <sys/types.h> - #include <sys/wait.h> - #include <sys/time.h> -@@ -141,7 +142,8 @@ - Display *dpy; - Window rootWindow; - int screen; --/* int xFd; */ -+int xFd; -+fd_set xFdSet; - int displayDepth; - XSizeHints sizeHints; - XWMHints wmHints; -@@ -801,6 +803,7 @@ - XTextProperty wmName; - XClassHint classHint; - Pixmap shapeMask; -+ struct timeval nextEvent; - - /* Parse command line options */ - progName = extractProgName(argv[0]); -@@ -849,7 +852,7 @@ - screen = DefaultScreen(dpy); - rootWindow = RootWindow(dpy, screen); - displayDepth = DefaultDepth(dpy, screen); -- /* xFd = XConnectionNumber(dpy); */ -+ xFd = XConnectionNumber(dpy); - - /* Icon Daten nach XImage konvertieren */ - GetXpms(); -@@ -1049,14 +1052,32 @@ - poll((struct poll *) 0, (size_t) 0, 50); /* 5/100 sec */ - } - #else -- if (enableYearDisplay) -- { -- usleep(200000L); /* 1/5 sec */ -- } -+ //We compute the date of next event, in order to avoid polling -+ if (enableBlinking) -+ { -+ gettimeofday(&nextEvent,NULL); -+ nextEvent.tv_sec = 0; -+ nextEvent.tv_usec = 1000000-nextEvent.tv_usec; -+ } - else -- { -- usleep(50000L); /* 5/100 sec */ -- } -+ { -+ if (enableYearDisplay) -+ { -+ nextEvent.tv_sec = 86400-actualTime%86400; -+ nextEvent.tv_usec = 0; -+ } -+ else -+ { -+ nextEvent.tv_sec = 60-actualTime%60; -+ nextEvent.tv_usec = 0; -+ } -+ } -+ printf("xFd %d\n", xFd); -+ FD_ZERO(&xFdSet); -+ FD_SET(xFd,&xFdSet); -+ printf("debut select %d\n", nextEvent.tv_sec); -+ select(FD_SETSIZE,&xFdSet,NULL,NULL,&nextEvent); -+ printf("fin select\n"); - #endif - } - return(0); |