diff options
| -rw-r--r-- | desktop/wmtime/README | 18 | ||||
| -rw-r--r-- | desktop/wmtime/de.lang | 19 | ||||
| -rw-r--r-- | desktop/wmtime/es.lang | 19 | ||||
| -rw-r--r-- | desktop/wmtime/fr.lang | 19 | ||||
| -rw-r--r-- | desktop/wmtime/wmtime.1 | 93 | ||||
| -rw-r--r-- | desktop/wmtime/wmtime.SlackBuild | 56 | ||||
| -rw-r--r-- | desktop/wmtime/wmtime.info | 10 | ||||
| -rw-r--r-- | desktop/wmtime/wmtime.rst | 78 |
8 files changed, 28 insertions, 284 deletions
diff --git a/desktop/wmtime/README b/desktop/wmtime/README index 0e80e3fa4a..dd0763c36b 100644 --- a/desktop/wmtime/README +++ b/desktop/wmtime/README @@ -3,17 +3,7 @@ wmtime (time dockapp for WindowMaker) WMTime, guess what, displays the time and date and gives you some nice additional features too... -wmtime supports several languages for displaying the days of the week -and month names. By default, "us" (aka English) is used. This can be -changed by setting LANGUAGE in the script's environment. Supported -languages are: - -de -es -fr -nl -slovene -us - -To change the language after package installation, you can adjust the -symlink at /usr/share/wmtime/language. +If you're upgrading from a previous version of wmtime and wonder what +happened to the locale support: wmtime now uses the system's locales +for the days of the week and month names. It supports more languages +than it did before, and respects LANG in the environment. diff --git a/desktop/wmtime/de.lang b/desktop/wmtime/de.lang deleted file mode 100644 index 01902dafa6..0000000000 --- a/desktop/wmtime/de.lang +++ /dev/null @@ -1,19 +0,0 @@ -SO -MO -DI -MI -DO -FR -SA -JAN -FEB -MAR -APR -MAI -JUN -JUL -AUG -SEP -OKT -NOV -DEZ diff --git a/desktop/wmtime/es.lang b/desktop/wmtime/es.lang deleted file mode 100644 index 9a52bfb38b..0000000000 --- a/desktop/wmtime/es.lang +++ /dev/null @@ -1,19 +0,0 @@ -DO -LU -MA -MI -JU -VI -SA -ENE -FEB -MAR -ABR -MAY -JUN -JUL -AGO -SEP -OCT -NOV -DIC diff --git a/desktop/wmtime/fr.lang b/desktop/wmtime/fr.lang deleted file mode 100644 index 12d9444fbc..0000000000 --- a/desktop/wmtime/fr.lang +++ /dev/null @@ -1,19 +0,0 @@ -DI -LU -MA -ME -JE -VE -SA -JAN -FEV -MAR -AVR -MAI -JUN -JUL -AOU -SEP -OCT -NOV -DEC diff --git a/desktop/wmtime/wmtime.1 b/desktop/wmtime/wmtime.1 deleted file mode 100644 index d5397a0cbd..0000000000 --- a/desktop/wmtime/wmtime.1 +++ /dev/null @@ -1,93 +0,0 @@ -.\" Man page generated from reStructuredText. -. -.TH WMTIME 1 "2017-02-11" "1.0b2" "SlackBuilds.org" -.SH NAME -wmtime \- clock/calendar dockapp for windowmaker -. -.nr rst2man-indent-level 0 -. -.de1 rstReportMargin -\\$1 \\n[an-margin] -level \\n[rst2man-indent-level] -level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] -- -\\n[rst2man-indent0] -\\n[rst2man-indent1] -\\n[rst2man-indent2] -.. -.de1 INDENT -.\" .rstReportMargin pre: -. RS \\$1 -. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin] -. nr rst2man-indent-level +1 -.\" .rstReportMargin post: -.. -.de UNINDENT -. RE -.\" indent \\n[an-margin] -.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]] -.nr rst2man-indent-level -1 -.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] -.in \\n[rst2man-indent\\n[rst2man-indent-level]]u -.. -.\" RST source for wmtime(1) man page. Convert with: -. -.\" rst2man.py wmtime.rst > wmtime.1 -. -.\" rst2man.py comes from the SBo development/docutils package. -. -.SH SYNOPSIS -.sp -wmtime [\-digital] [\-display \fIdpy\fP] [\-h] [\-v] -.SH DESCRIPTION -.sp -wmtime is a clock and calendar dockapp for windowmaker. It can display -an analog\-style clock face or a digital\-style readout. The current month, -day, and day of week are displayed also. -.sp -wmtime supports multiple languages for the weekday and month names. See -\fIFILES\fP below for details on how to change the language. -.SH OPTIONS -.INDENT 0.0 -.TP -.B \-h -Print usage message and exit. -.TP -.B \-v -Print version number and exit. -.UNINDENT -.INDENT 0.0 -.TP -.B \fB\-digital\fP -Display a digital clock face (default is analog). -.TP -.B \fB\-display\fP \fIdpy\fP -X11 display. Default is to read the DISPLAY environment variable. -.UNINDENT -.SH FILES -.INDENT 0.0 -.TP -.B /usr/share/wmtime/languages/*.lang -Language support files. Each is a text file with exactly 19 lines. The -first 7 lines are the 2\-letter weekday name abbreviations, starting -with Sunday. The other 12 lines are the 3\-letter month name abbreviations, -starting with January. Only ASCII is supported, no Unicode or extended 8859\-* -character sets. -.TP -.B /usr/share/wmtime/language -Symlink to one of the files in /usr/share/wmtime/languages/. This is the -language the application will use. The system administrator can adjust the -symlink, but there\(aqs no way for a normal user to use a different language -than the system default. -.UNINDENT -.SH COPYRIGHT -.sp -See the file /usr/doc/wmtime\-1.0b2/COPYING for license information. -.SH AUTHORS -.sp -wmtime was written by tijno and warp. -.sp -This man page written for the SlackBuilds.org project -by B. Watson, and is licensed under the WTFPL. -.\" Generated by docutils manpage writer. -. diff --git a/desktop/wmtime/wmtime.SlackBuild b/desktop/wmtime/wmtime.SlackBuild index d2cb2df416..cad9aee916 100644 --- a/desktop/wmtime/wmtime.SlackBuild +++ b/desktop/wmtime/wmtime.SlackBuild @@ -8,6 +8,10 @@ # had no license, modified version released under the WTFPL. See # http://www.wtfpl.net/txt/copying/ for details. +# 20210219 bkw: update for v1.4. This adds libdockapp as a dep, and +# greatly simplifies the locale support. Also upstream added a man page, +# so get rid of mine. + # 20170211 bkw: # - Add man page, BUILD=3 @@ -18,8 +22,8 @@ # - Add Spanish, French, German language support. PRGNAM=wmtime -VERSION=${VERSION:-1.0b2} -BUILD=${BUILD:-3} +VERSION=${VERSION:-1.4} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -54,45 +58,23 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM.app -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM.app +rm -rf $PRGNAM-$VERSION + +# The top-level dir is named dockapps-<githash>, force it to decompress to +# a sanely-named directory: +mkdir -p $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -C $PRGNAM-$VERSION --strip-components=1 +cd $PRGNAM-$VERSION + chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# make the language stuff actually work -sed -i \ - "s,fopen(\"language\",fopen(\"/usr/share/$PRGNAM/language\"," \ - $PRGNAM/$PRGNAM.c - -# much as I like the Beatles, we can't have 8 weekday names here: -sed -i '8d' languages/slovene.lang - -sed -i "s/cc -c/cc -c -fgnu89-inline $SLKCFLAGS/" $PRGNAM/Makefile -make -C $PRGNAM -mkdir -p $PKG/usr/bin $PKG/usr/share/$PRGNAM/languages -install -m0755 -s $PRGNAM/$PRGNAM $PKG/usr/bin -install -m0644 languages/* $CWD/*.lang $PKG/usr/share/$PRGNAM/languages - -LANGUAGE="${LANGUAGE:-us}" -if [ -e $PKG/usr/share/$PRGNAM/languages/$LANGUAGE.lang ]; then - ln -s languages/$LANGUAGE.lang $PKG/usr/share/$PRGNAM/language -else - echo "Invalid LANGUAGE '$LANGUAGE'. Supported values are:" 2>&1 - ls $PKG/usr/share/$PRGNAM/languages/*.lang | sed 's,.*/\([^/]*\)\.lang,\1,g' - exit 1 -fi +chmod 644 * -# man page written for this slackbuild -mkdir -p $PKG/usr/man/man1 -gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz +make CFLAGS="$SLKCFLAGS" LDFLAGS="-Wl,-s" PREFIX=/usr +make install DESTDIR=$PKG PREFIX=/usr MANDIR=/usr/man/man1 +gzip -9 $PKG/usr/man/man1/$PRGNAM.1 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a BUGS CHANGES COPYING HINTS README TODO $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CHANGES COPYING HINTS README TODO $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/desktop/wmtime/wmtime.info b/desktop/wmtime/wmtime.info index 5a3ebb4580..f60fd08502 100644 --- a/desktop/wmtime/wmtime.info +++ b/desktop/wmtime/wmtime.info @@ -1,10 +1,10 @@ PRGNAM="wmtime" -VERSION="1.0b2" -HOMEPAGE="http://web.cs.mun.ca/~gstarkes/wmaker/dockapps/time.html" -DOWNLOAD="http://web.cs.mun.ca/~gstarkes/wmaker/dockapps/files/wmtime-1.0b2.tar.gz" -MD5SUM="04c03e001aa702cf653b6b6c3f58bf87" +VERSION="1.4" +HOMEPAGE="https://www.dockapps.net/wmtime" +DOWNLOAD="https://www.dockapps.net/download/wmtime-1.4.tar.gz" +MD5SUM="b4efbb4113ad4f1252cf5488796789dd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="libdockapp" MAINTAINER="B. Watson" EMAIL="yalhcru@gmail.com" diff --git a/desktop/wmtime/wmtime.rst b/desktop/wmtime/wmtime.rst deleted file mode 100644 index b72e406838..0000000000 --- a/desktop/wmtime/wmtime.rst +++ /dev/null @@ -1,78 +0,0 @@ -.. RST source for wmtime(1) man page. Convert with: -.. rst2man.py wmtime.rst > wmtime.1 -.. rst2man.py comes from the SBo development/docutils package. - -.. |version| replace:: 1.0b2 -.. |date| date:: - -====== -wmtime -====== - --------------------------------------- -clock/calendar dockapp for windowmaker --------------------------------------- - -:Manual section: 1 -:Manual group: SlackBuilds.org -:Date: |date| -:Version: |version| - -SYNOPSIS -======== - -wmtime [-digital] [-display *dpy*] [-h] [-v] - -DESCRIPTION -=========== - -wmtime is a clock and calendar dockapp for windowmaker. It can display -an analog-style clock face or a digital-style readout. The current month, -day, and day of week are displayed also. - -wmtime supports multiple languages for the weekday and month names. See -*FILES* below for details on how to change the language. - -OPTIONS -======= - --h - Print usage message and exit. - --v - Print version number and exit. - -**-digital** - Display a digital clock face (default is analog). - -**-display** *dpy* - X11 display. Default is to read the DISPLAY environment variable. - -FILES -===== - -/usr/share/wmtime/languages/\*.lang - Language support files. Each is a text file with exactly 19 lines. The - first 7 lines are the 2-letter weekday name abbreviations, starting - with Sunday. The other 12 lines are the 3-letter month name abbreviations, - starting with January. Only ASCII is supported, no Unicode or extended 8859-* - character sets. - -/usr/share/wmtime/language - Symlink to one of the files in /usr/share/wmtime/languages/. This is the - language the application will use. The system administrator can adjust the - symlink, but there's no way for a normal user to use a different language - than the system default. - -COPYRIGHT -========= - -See the file /usr/doc/wmtime-|version|/COPYING for license information. - -AUTHORS -======= - -wmtime was written by tijno and warp. - -This man page written for the SlackBuilds.org project -by B. Watson, and is licensed under the WTFPL. |