diff options
author | Michal Wojdyla | 2021-05-13 22:51:43 +0200 |
---|---|---|
committer | Michal Wojdyla | 2021-05-13 22:51:43 +0200 |
commit | 7c2b8a2c2cbed61c9c7590d3af030584a292dd53 (patch) | |
tree | 30ae394c544ed1b6edaf02aa224deda6bceb3a69 | |
parent | 6d240e6c678d957f4a34d3860b467d9970a02aa3 (diff) | |
download | aur-7c2b8a2c2cbed61c9c7590d3af030584a292dd53.tar.gz |
update to 2.1
-rw-r--r-- | .SRCINFO | 14 | ||||
-rw-r--r-- | PKGBUILD | 23 | ||||
-rw-r--r-- | gtk2.patch | 78 |
3 files changed, 14 insertions, 101 deletions
@@ -1,17 +1,15 @@ pkgbase = wmcliphist pkgdesc = A clipboard history dockable application for Window Maker - pkgver = 1.0 - pkgrel = 3 - url = http://linux.nawebu.cz/wmcliphist/ + pkgver = 2.1 + pkgrel = 1 + url = https://www.dockapps.net/wmcliphist install = wmcliphist.install arch = i686 arch = x86_64 license = GPL - depends = gtk2 - source = http://linux.nawebu.cz/wmcliphist/wmcliphist-1.0.tar.gz - source = gtk2.patch - md5sums = 81c9627c2955949669d2afa547415a10 - md5sums = c91efc33caad564242fa923ac5ad04eb + depends = gtk3 + source = https://www.dockapps.net/download/wmcliphist-2.1.tar.gz + md5sums = a608fc3f9c9a9269e640dfac38500e6f pkgname = wmcliphist @@ -3,29 +3,22 @@ # Contributor: Mario Blättermann <mariobl@gnome.org> pkgname=wmcliphist -pkgver=1.0 -pkgrel=3 +pkgver=2.1 +pkgrel=1 pkgdesc="A clipboard history dockable application for Window Maker" arch=('i686' 'x86_64') -url="http://linux.nawebu.cz/wmcliphist/" +url="https://www.dockapps.net/wmcliphist" license=('GPL') -depends=('gtk2') +depends=('gtk3') install=wmcliphist.install -source=(http://linux.nawebu.cz/$pkgname/$pkgname-$pkgver.tar.gz - gtk2.patch) -md5sums=('81c9627c2955949669d2afa547415a10' - 'c91efc33caad564242fa923ac5ad04eb') - -prepare() { - cd "$srcdir/$pkgname" - patch -Np2 -b -z .orig -i ../gtk2.patch -} +source=(https://www.dockapps.net/download/wmcliphist-$pkgver.tar.gz) +md5sums=('a608fc3f9c9a9269e640dfac38500e6f') build() { - cd "$srcdir/$pkgname" + cd "$srcdir/dockapps" make } package() { - cd "$srcdir/$pkgname" + cd "$srcdir/dockapps" install -D -m 644 wmcliphistrc $pkgdir/etc/wmcliphistrc.sample install -D -m 755 wmcliphist $pkgdir/usr/bin/wmcliphist } diff --git a/gtk2.patch b/gtk2.patch deleted file mode 100644 index aa62809a08d5..000000000000 --- a/gtk2.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff -up src/wmcliphist/foodock/foodock.c.orig src/wmcliphist/foodock/foodock.c ---- src/wmcliphist/foodock/foodock.c.orig 2014-05-16 07:16:06.000000000 -0600 -+++ src/wmcliphist/foodock/foodock.c 2014-05-16 07:21:37.000000000 -0600 -@@ -83,3 +83,23 @@ void foo_set_wmhints(GtkWidget *mw, - - XFree(wm_hints); - } -+ -+void foo_show_dockapp(GtkWidget *dockapp) { -+ Window w, p, dummy1, *dummy2; -+ unsigned int dummy3; -+ XWMHints *hints; -+ -+ XQueryTree(GDK_DISPLAY(), GDK_WINDOW_XID(dockapp->window), &dummy1, &p, &dummy2, &dummy3); -+ if (dummy2) -+ XFree(dummy2); -+ w = XCreateSimpleWindow(GDK_DISPLAY(), p, 0, 0, 1, 1, 0, 0, 0); -+ XReparentWindow(GDK_DISPLAY(), GDK_WINDOW_XID(dockapp->window), w, 0, 0); -+ gtk_widget_show(dockapp); -+ hints = XGetWMHints(GDK_DISPLAY(), GDK_WINDOW_XID(dockapp->window)); -+ hints->flags |= StateHint; -+ hints->initial_state = WithdrawnState; -+ XSetWMHints(GDK_DISPLAY(), GDK_WINDOW_XID(dockapp->window), hints); -+ XFree(hints); -+ XReparentWindow(GDK_DISPLAY(), GDK_WINDOW_XID(dockapp->window), p, 0, 0); -+ XDestroyWindow(GDK_DISPLAY(), w); -+} -diff -up src/wmcliphist/foodock/foodock.h.orig src/wmcliphist/foodock/foodock.h ---- src/wmcliphist/foodock/foodock.h.orig 2014-05-16 07:16:12.000000000 -0600 -+++ src/wmcliphist/foodock/foodock.h 2014-05-16 07:16:57.000000000 -0600 -@@ -41,3 +41,5 @@ void foo_set_wmhints(GtkWidget *mw, - GtkWidget *dw, - int margc, - char *margv[]); -+ -+void foo_show_dockapp(GtkWidget *dockapp); -diff -up src/wmcliphist/Makefile.orig src/wmcliphist/Makefile ---- src/wmcliphist/Makefile.orig 2014-05-16 07:24:18.000000000 -0600 -+++ src/wmcliphist/Makefile 2014-05-16 07:24:53.000000000 -0600 -@@ -1,6 +1,6 @@ - CC ?= gcc - PREFIX = /usr/local --INCLUDES = `pkg-config --cflags gtk+-2.0` -I. -Ifoodock -+INCLUDES = `pkg-config x11 gtk+-2.0 --cflags` -I. -Ifoodock - - # for normal use - CFLAGS += -Wall -ansi -pedantic $(INCLUDES) -@@ -12,7 +12,7 @@ DEBUG = - #CFLAGS += -Wall -g -ansi $(INCLUDES) -DFNCALL_DEBUG - #DEBUG = debug.o - --LIBS = `pkg-config --libs gtk+-2.0` -+LIBS = `pkg-config x11 gtk+-2.0 --libs` - - OBJECTS = wmcliphist.o clipboard.o gui.o rcconfig.o history.o hotkeys.o utils.o $(DEBUG) - TARGET = wmcliphist -diff -up src/wmcliphist/wmcliphist.c.orig src/wmcliphist/wmcliphist.c ---- src/wmcliphist/wmcliphist.c.orig 2014-05-16 07:15:56.000000000 -0600 -+++ src/wmcliphist/wmcliphist.c 2014-05-16 07:23:06.000000000 -0600 -@@ -345,14 +345,14 @@ main(int argc, char **argv) - GTK_SIGNAL_FUNC(button_press), - GTK_OBJECT(menu_hist)); - -- -- /* show icon */ -- gtk_widget_show(dock_app); -- gtk_widget_show(main_window); - - /* Set WMHints - after gtk_widget_show() due to changes in GTK+ 2.4 */ - foo_set_wmhints(main_window, dock_app, argc, argv); - -+ /* show icon */ -+ gtk_widget_show(dock_app); -+ foo_show_dockapp(main_window); -+ - gdk_window_shape_combine_mask(main_window->window, icon_mask, 0, 0); - gdk_window_shape_combine_mask(dock_app->window, icon_mask, 0, 0); - } |