diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 17 | ||||
| -rw-r--r-- | common.patch | 56 |
3 files changed, 71 insertions, 6 deletions
@@ -1,14 +1,16 @@ pkgbase = wmcalclock pkgdesc = A Calendar clock [WindowMaker dockapp] with antialiased text pkgver = 1.25 - pkgrel = 7 + pkgrel = 8 url = http://web.archive.org/web/20121018121242/http://dockapps.windowmaker.org/file.php/id/9 arch = i686 arch = x86_64 license = GPL depends = libxpm source = http://pkgs.fedoraproject.org/repo/pkgs/wmCalClock/wmCalClock-1.25.tar.gz/md5/70c47ec1d8f8ec7e3ed7eb2d3105d371/wmCalClock-1.25.tar.gz + source = common.patch md5sums = 70c47ec1d8f8ec7e3ed7eb2d3105d371 + md5sums = 39bf956d85b204376f678191b2ceba5b pkgname = wmcalclock @@ -6,7 +6,7 @@ pkgname=wmcalclock _pkgname=wmCalClock pkgver=1.25 -pkgrel=7 +pkgrel=8 pkgdesc="A Calendar clock [WindowMaker dockapp] with antialiased text" arch=('i686' 'x86_64') depends=('libxpm') @@ -14,17 +14,24 @@ license=('GPL') #source=("http://gentoo.osuosl.org/distfiles/$_pkgname-$pkgver.tar.gz") #source=(http://dockapps.windowmaker.org/download.php/id/16/$_pkgname-$pkgver.tar.gz) #source=($_pkgname-$pkgver.tar.gz) -source=("http://pkgs.fedoraproject.org/repo/pkgs/wmCalClock/wmCalClock-1.25.tar.gz/md5/70c47ec1d8f8ec7e3ed7eb2d3105d371/wmCalClock-1.25.tar.gz") +source=("http://pkgs.fedoraproject.org/repo/pkgs/wmCalClock/wmCalClock-1.25.tar.gz/md5/70c47ec1d8f8ec7e3ed7eb2d3105d371/wmCalClock-1.25.tar.gz" + "common.patch") #url="http://dockapps.windowmaker.org/file.php/id/9" url="http://web.archive.org/web/20121018121242/http://dockapps.windowmaker.org/file.php/id/9" -md5sums=('70c47ec1d8f8ec7e3ed7eb2d3105d371') +md5sums=('70c47ec1d8f8ec7e3ed7eb2d3105d371' + '39bf956d85b204376f678191b2ceba5b') + +prepare() { + cd "$_pkgname-$pkgver/Src" + patch -Np3 -b -z .orig <../../common.patch +} build() { - cd "$srcdir/$_pkgname-$pkgver/Src" + cd "$_pkgname-$pkgver/Src" make } package() { - cd "$srcdir/$_pkgname-$pkgver/Src" + cd "$_pkgname-$pkgver/Src" install -Dm0755 wmCalClock "$pkgdir/usr/bin/wmCalClock" install -Dm0655 wmCalClock.1 "$pkgdir/usr/share/man/man1/wmCalClock.1" } diff --git a/common.patch b/common.patch new file mode 100644 index 000000000000..0825890dc415 --- /dev/null +++ b/common.patch @@ -0,0 +1,56 @@ +diff -up src/wmCalClock-1.25/Src/wmCalClock.c.orig src/wmCalClock-1.25/Src/wmCalClock.c +--- src/wmCalClock-1.25/Src/wmCalClock.c.orig 2020-07-13 01:49:36.150000000 -0600 ++++ src/wmCalClock-1.25/Src/wmCalClock.c 2020-07-13 01:52:13.430000000 -0600 +@@ -298,7 +298,7 @@ int main(int argc, char *argv[]) { + XEvent event; + int i, n, wid, extrady, extradx; + int Year, Month, DayOfWeek, DayOfMonth, OldDayOfMonth; +- int Hours, Mins, Secs, OldSecs, digit, xoff, D[10], xsize; ++ int Hours, Mins, Secs, OldSecs, digit, xoff, D[10] = {0, }, xsize; + long CurrentLocalTime; + double UT, TU, TU2, TU3, T0, gmst, jd(), hour24(); + +@@ -976,7 +976,7 @@ double hour; + */ + void ButtonPressEvent(XButtonEvent *xev){ + +- char Command[512]; ++ char Command[1032]; + + + if( HasExecute == 0) return; /* no command specified. Ignore clicks. */ +diff -up src/wmCalClock-1.25/Src/xutils.c.orig src/wmCalClock-1.25/Src/xutils.c +--- src/wmCalClock-1.25/Src/xutils.c.orig 2020-07-13 01:53:57.060000000 -0600 ++++ src/wmCalClock-1.25/Src/xutils.c 2020-07-13 01:55:53.620000000 -0600 +@@ -39,6 +39,11 @@ + #include <X11/extensions/shape.h> + #include "xutils.h" + ++Display *display; ++Window Root; ++Window iconwin, win; ++int screen; ++int DisplayDepth; + + + /* +diff -up src/wmCalClock-1.25/Src/xutils.h.orig src/wmCalClock-1.25/Src/xutils.h +--- src/wmCalClock-1.25/Src/xutils.h.orig 2020-07-13 01:55:03.920000000 -0600 ++++ src/wmCalClock-1.25/Src/xutils.h 2020-07-13 01:55:55.140000000 -0600 +@@ -18,11 +18,11 @@ typedef struct { + /* + * Global variable + */ +-Display *display; +-Window Root; +-Window iconwin, win; +-int screen; +-int DisplayDepth; ++extern Display *display; ++extern Window Root; ++extern Window iconwin, win; ++extern int screen; ++extern int DisplayDepth; + + + |