From nobody Wed Apr 26 15:48:44 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q63F92Xd5z46gKd; Wed, 26 Apr 2023 15:48:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q63F91qYwz3MTF; Wed, 26 Apr 2023 15:48:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682524125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6MzyQGsOXGSlCvYodvmAHvT+AwDbgyN62EHe/Wg1XXU=; b=xG/uSRS5RYi2WSRLQMh6Q5whaTt7lEcPq0uLyMvNrxTwIQMFmvOJ6jNQCC22AZJUWApC+0 cyOE82Nc+rxMF9D+yQ1ZeXegKqo1/9skOndrlyMNw4S7XYIRcvuwGx0pB5qvkBS7+xAxzb pCN4xulR0VoUlEj+n1zy6qpV9uaICb8Kt5mj2wZ1nKN6KqwhWViXiK4/pmJDtGHv9Vrcb2 AW/R7MnOksAMZOckE/vnyZel7iE9layOjCZ13QGYtt/+cS9KCVFf21nzLKPK/LwJlUzvSt oXwV3jDCG9U/AjmC85TflDZ5+w1bQShCtdvQnJ+Flw80IbaTgkk0PDwq2u5uTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682524125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6MzyQGsOXGSlCvYodvmAHvT+AwDbgyN62EHe/Wg1XXU=; b=tsIeUVT3/Zi9vw8YKUZyDU9GJWt7TMQLcf7V4XFAYZhWblwnyGi99v9SGT9XfBuySH5l11 e4Sics47Lg2PPH4F9q+GXPofJpmNirBIeCF5w5P6PU4JaRnqVS4NJZ1K6ogJAwZtsoUyUS FbnfyCVgGIGnJOUJ7DHn4QUNgykIgx1GSy7i4r2sPgcGMWjBN0uZKCak5kC66vkHz+UqNU OseLMNQCh3ZrdgLHtZ1wbx/hrs//eukOtAVuYy0WYHJagoN9P162TIv5WD6kDBKs66NaZN W8WLny3lEel5XdhR7KevrGR0kDEg4yCUJqYTBZ3ShKgBtZcrRf7nGUtWZ4dt1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682524125; a=rsa-sha256; cv=none; b=oVU2nNa6syBT6Vlc4woY0vFck8zyC2MVaz3soQns18QoS6WRzbb1rraThqEwtM92SVFIyf IviRyOmgvqZlUZqhozp/9vi6awWCV/SyxVL8K5NW9DmjOvAhWInMc0ZA0HRKH1stiHsfMZ jI3Moih+4Z1rEEVGyz4MXjUtJRrh32rd2T2sw25g7ncp0wdL5J/ckB3BFPRw0nkk5eAiAU ZlzbdInzq2tN6ymZTMObBP30wuJxqQvLGLMF9D1Cq9XBH7rKUi8HjxaC6HL4Hb0nZrdK+n 0+XCqmxWVsbsbSbjogt5xUJX7aC/wxTG274YF2d8ZADQPMvj5UzD0ssNTSbm6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q63F90tKyzgDx; Wed, 26 Apr 2023 15:48:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33QFmjN4036207; Wed, 26 Apr 2023 15:48:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33QFmixs036206; Wed, 26 Apr 2023 15:48:44 GMT (envelope-from git) Date: Wed, 26 Apr 2023 15:48:44 GMT Message-Id: <202304261548.33QFmixs036206@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joseph Mingrone Subject: git: 7a247c8525a4 - main - x11-clocks/wmitime: Revive port List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7a247c8525a453f25a1d771e79fafdde09978776 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=7a247c8525a453f25a1d771e79fafdde09978776 commit 7a247c8525a453f25a1d771e79fafdde09978776 Author: Pierre Pronchery AuthorDate: 2023-04-26 15:29:37 +0000 Commit: Joseph Mingrone CommitDate: 2023-04-26 15:46:31 +0000 x11-clocks/wmitime: Revive port WMitime is yet another clock dock app which shows standard time, date, as well as the new Internet time. WWW: https://www.dockapps.net/wmitime Reviewed by: jrm Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39833 --- MOVED | 1 - x11-clocks/Makefile | 1 + x11-clocks/wmitime/Makefile | 24 +++++++++++ x11-clocks/wmitime/distinfo | 3 ++ x11-clocks/wmitime/files/patch-wmitime.c | 69 ++++++++++++++++++++++++++++++++ x11-clocks/wmitime/pkg-descr | 2 + x11-clocks/wmitime/pkg-plist | 3 ++ 7 files changed, 102 insertions(+), 1 deletion(-) diff --git a/MOVED b/MOVED index 536a56792050..c61b4195d202 100644 --- a/MOVED +++ b/MOVED @@ -6100,7 +6100,6 @@ security/sudosh||2014-07-01|Has expired: Funcition replaced by sudo -s security/sudosh2||2014-07-01|Has expired: Funcition replaced by sudo -s lang/pike76|lang/pike78|2014-07-01|Has expired: Outdated: Users should switch to lang/pike78 archivers/rpm|archivers/rpm4|2014-07-03|rpm3 is long EOLed, rpm4 is the default rpm archivers for most of linux distributions -x11-clocks/wmitime||2014-07-04|Has expired x11/xorg-edit||2014-07-04|Has expired: Depends on older version of wxGTK net/ttbudget||2014-07-06|Has expired: does not build, mastersite disapperead, not staged sysutil/psgconf||2014-07-06|Removed: abandonware diff --git a/x11-clocks/Makefile b/x11-clocks/Makefile index 95991bc42623..f3c02109318b 100644 --- a/x11-clocks/Makefile +++ b/x11-clocks/Makefile @@ -36,6 +36,7 @@ SUBDIR += wmclock SUBDIR += wmclockmon SUBDIR += wmfishtime + SUBDIR += wmitime SUBDIR += wmtime SUBDIR += wmtimer SUBDIR += xalarm diff --git a/x11-clocks/wmitime/Makefile b/x11-clocks/wmitime/Makefile new file mode 100644 index 000000000000..0dd6465c7b48 --- /dev/null +++ b/x11-clocks/wmitime/Makefile @@ -0,0 +1,24 @@ +PORTNAME= wmitime +PORTVERSION= 0.5 +CATEGORIES= x11-clocks windowmaker +MASTER_SITES= https://www.dockapps.net/download/ + +MAINTAINER= khorben@defora.org +COMMENT= Docking clock app also showing the new Internet time +WWW= https://www.dockapps.net/wmitime + +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + +LIB_DEPENDS= libdockapp.so:x11-wm/libdockapp + +USES= gmake iconv localbase:ldflags xorg +USE_XORG= x11 xext xpm + +MAKE_ARGS= CFLAGS="-O2 -Wall ${CFLAGS}" \ + MANDIR="${PREFIX}/man/man1" +ALL_TARGET= wmitime + +WRKSRC= ${WRKDIR}/dockapps-26db447 + +.include diff --git a/x11-clocks/wmitime/distinfo b/x11-clocks/wmitime/distinfo new file mode 100644 index 000000000000..5c5f348abeb7 --- /dev/null +++ b/x11-clocks/wmitime/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1682443844 +SHA256 (wmitime-0.5.tar.gz) = a183e208d8babf97e8a40e37e7a5a8b1e1371ca547d7896f314f808516f45e6d +SIZE (wmitime-0.5.tar.gz) = 15099 diff --git a/x11-clocks/wmitime/files/patch-wmitime.c b/x11-clocks/wmitime/files/patch-wmitime.c new file mode 100644 index 000000000000..dc4beb240c28 --- /dev/null +++ b/x11-clocks/wmitime/files/patch-wmitime.c @@ -0,0 +1,69 @@ +--- wmitime.c.orig 2015-08-22 01:42:17 UTC ++++ wmitime.c +@@ -248,7 +248,7 @@ void DrawInetTime(void) + + /* Compute Inet Time */ + iTime=(clk->tm_hour*3600+clk->tm_min*60+clk->tm_sec); +- iTime=iTime+((timezone-1)+3600); ++ iTime=iTime+((1-clk->tm_gmtoff)+3600); + if (clk->tm_isdst) + iTime-=3600; + iTime=(iTime*1000)/86400; +@@ -283,11 +283,11 @@ void DrawStdTime(void) + if (i==0) + i=12; + +- sprintf(blitstr, "%2i:%02i:%02i", i, clk->tm_min, clk->tm_sec); ++ snprintf(blitstr, sizeof(blitstr), "%2i:%02i:%02i", i, clk->tm_min, clk->tm_sec); + } + else + { +- sprintf(blitstr, "%02i:%02i:%02i", i, clk->tm_min, clk->tm_sec); ++ snprintf(blitstr, sizeof(blitstr), "%02i:%02i:%02i", i, clk->tm_min, clk->tm_sec); + } + + +@@ -344,7 +344,7 @@ void DrawDate(void) + inbytesleft = sizeof OrigBlitStr; + outbytesleft = sizeof BlitStr; + +- sprintf(OrigBlitStr, "%s", nl_langinfo(ABDAY_1 + clk->tm_wday)); ++ snprintf(OrigBlitStr, sizeof(OrigBlitStr), "%s", nl_langinfo(ABDAY_1 + clk->tm_wday)); + iconv(cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft); + BlitStr[2] = 0; + BlitString( BlitStr, 6, 50); +@@ -354,14 +354,14 @@ void DrawDate(void) + inbytesleft = sizeof OrigBlitStr; + outbytesleft = sizeof BlitStr; + +- sprintf(OrigBlitStr, "%s", nl_langinfo(ABMON_1 + clk->tm_mon)); ++ snprintf(OrigBlitStr, sizeof(OrigBlitStr), "%s", nl_langinfo(ABMON_1 + clk->tm_mon)); + iconv(cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft); + BlitStr[3] = 0; + BlitString( BlitStr, 40, 50); + + iconv_close(cd); + +- sprintf(BlitStr, "%02i", clk->tm_mday); ++ snprintf(BlitStr, sizeof(BlitStr), "%02i", clk->tm_mday); + BlitString( BlitStr, 25, 50); + } + +@@ -374,7 +374,7 @@ void DrawInetWheel(void) + + /* Calculate Wheel Position... */ + iTime=(clk->tm_hour*3600+clk->tm_min*60+clk->tm_sec); +- iTime=iTime+((timezone-1)+3600); ++ iTime=iTime+((1-clk->tm_gmtoff)+3600); + if (clk->tm_isdst) + iTime-=3600; + iTime=(iTime*1000)/8640; +@@ -566,7 +566,7 @@ void BlitNum(int num, int x, int y) + char buf[1024]; + int newx=x; + +- sprintf(buf, "%03i", num); ++ snprintf(buf, sizeof(buf), "%03i", num); + + BlitString(buf, newx, y); + } diff --git a/x11-clocks/wmitime/pkg-descr b/x11-clocks/wmitime/pkg-descr new file mode 100644 index 000000000000..f4f496cdb577 --- /dev/null +++ b/x11-clocks/wmitime/pkg-descr @@ -0,0 +1,2 @@ +WMitime is yet another clock dock app which shows standard time, date, as well +as the new Internet time. diff --git a/x11-clocks/wmitime/pkg-plist b/x11-clocks/wmitime/pkg-plist new file mode 100644 index 000000000000..cca30973f4f9 --- /dev/null +++ b/x11-clocks/wmitime/pkg-plist @@ -0,0 +1,3 @@ +bin/wmitime +man/man1/wmitime.1.gz +share/applications/wmitime.desktop