From: Michael Weber Date: Wed, 12 Aug 2015 22:15:49 +0000 (+0200) Subject: x11-plugins/wmcliphist: drop old. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f0a2781603337462b36dbe5deb8ce0f6a30ab7bf;p=gentoo.git x11-plugins/wmcliphist: drop old. Package-Manager: portage-2.2.20.1 --- diff --git a/x11-plugins/wmcliphist/Manifest b/x11-plugins/wmcliphist/Manifest index 501f4b35c99d..9c8fb89a5020 100644 --- a/x11-plugins/wmcliphist/Manifest +++ b/x11-plugins/wmcliphist/Manifest @@ -1,3 +1 @@ -DIST wmcliphist-0.6.tar.gz 88733 SHA256 a775bea29c11ff06fb7eb43cc21aa2e3aff57a692b1edafbb6ba8ecf417f4148 -DIST wmcliphist-1.0.tar.gz 268821 SHA256 b33a4f2c1f5bf4b177fbc9bc5a4e4fdf31d78097ebd33ea76691025b43908028 SHA512 672135e9a6b8316ade8d3febffe9e25d3cec8f9960edd126c160e1013a33d40ca170905440683756dac14a84198d4ee0bcfa637afa789b4f8591b9a7807dd602 WHIRLPOOL da26e268b50c89a7c6fce0179e1dc288970bee583354ddb4a0eb3543b7136e8da1aa14a5e2134a8e58d958acfd95c370b019875464d7b25011e356c73fc9dd21 DIST wmcliphist-2.1.tar.gz 61459 SHA256 5be1e2ba82b8059a7ede9a111e6aad7c25170d9df2b6d23e2ed7b17e1e63564c SHA512 92ffe45fce7da09cffb769e4c97a36309fe2d373f514708e5bffc7877324080d3116e30f84de7a9addc648c38d43c678e4e2fccae451d93a02a57e7f9e319e03 WHIRLPOOL d54930581e597298e49f1db5dd22e0ec18a8947ac8eb53d8a58504e7eeff90fe2c31a57d67f3a7db1a777ac053951de3bb324a67660147f37f441e9c61cf05ed diff --git a/x11-plugins/wmcliphist/files/wmcliphist-0.6-Makefile.patch b/x11-plugins/wmcliphist/files/wmcliphist-0.6-Makefile.patch deleted file mode 100644 index 61e2d7db86ac..000000000000 --- a/x11-plugins/wmcliphist/files/wmcliphist-0.6-Makefile.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -ur wmcliphist-0.6.orig/Makefile wmcliphist-0.6/Makefile ---- wmcliphist-0.6.orig/Makefile 2003-06-24 01:35:45.000000000 +0300 -+++ wmcliphist-0.6/Makefile 2008-03-12 16:13:34.000000000 +0200 -@@ -1,22 +1,18 @@ --CC = gcc -- --INCLUDES = `gtk-config --cflags` -I. -Ifoodock -g -- --DESTDIR = "/usr/local/bin" -+CC ?= gcc -+PREFIX = /usr -+INCLUDES = `pkg-config --cflags gtk+-2.0` -I. -Ifoodock - - # for normal use --CFLAGS = -Wall -O2 -ansi -pedantic $(INCLUDES) -+CFLAGS += -Wall -ansi -pedantic $(INCLUDES) - DEBUG = - - # for debuggind purposes - # ISO doesn't support macros with variable number of arguments so -pedantic - # must not be used --#CFLAGS = -Wall -g -ansi $(INCLUDES) -DFNCALL_DEBUG -+#CFLAGS += -Wall -g -ansi $(INCLUDES) -DFNCALL_DEBUG - #DEBUG = debug.o - -- --LFLAGS = `gtk-config --libs` -- -+LIBS = `pkg-config --libs gtk+-2.0` - - OBJECTS = wmcliphist.o clipboard.o gui.o rcconfig.o history.o hotkeys.o $(DEBUG) - TARGET = wmcliphist -@@ -27,7 +23,7 @@ - lclint $(INCLUDES) +posixlib *.c >lclint.log - - wmcliphist: $(OBJECTS) foodock/foodock.o -- $(CC) $(LFLAGS) -o $@ $(OBJECTS) foodock/foodock.o -+ $(CC) $(LDFLAGS) $(OBJECTS) foodock/foodock.o $(LIBS) -o $@ - - wmcliphist.o: wmcliphist.c wmcliphist.h \ - icon/ico_60x60_black.xpm icon/ico_60x60_gray.xpm \ -@@ -54,4 +50,4 @@ - @(cd foodock && make clean) - - install: -- cp wmcliphist $(DESTDIR) -+ cp wmcliphist $(DESTDIR)$(PREFIX)/bin diff --git a/x11-plugins/wmcliphist/files/wmcliphist-0.6-fix-docking.patch b/x11-plugins/wmcliphist/files/wmcliphist-0.6-fix-docking.patch deleted file mode 100644 index 3e50600f51d8..000000000000 --- a/x11-plugins/wmcliphist/files/wmcliphist-0.6-fix-docking.patch +++ /dev/null @@ -1,107 +0,0 @@ -diff -ru orig/wmcliphist-0.6/foodock/foodock.c wmcliphist-0.6/foodock/foodock.c ---- orig/wmcliphist-0.6/foodock/foodock.c 2001-03-16 01:59:46.000000000 +0100 -+++ wmcliphist-0.6/foodock/foodock.c 2007-08-12 16:34:44.818138390 +0200 -@@ -21,6 +21,8 @@ - * before calling foo_create_main_icon_window. Returned event box - * will be realized by foo_create_main_icon_window. You should to show - * icon window as well as main window before gtk_main(). -+ * -+ * Call foo_set_wmhints() after both windows are shown (gtk_widget_show()). - * - * Input: - * mw Pointer to main window -@@ -34,20 +36,37 @@ - char *margv[]) { - - GtkWidget *foobox; /* This will become icon box */ -- Window xmw; -- XWMHints *wm_hints; -- -- xmw = GDK_WINDOW_XWINDOW(mw->window); - - foobox = gtk_event_box_new(); - gtk_widget_set_usize(foobox, s, s); - gtk_container_add (GTK_CONTAINER (mw), foobox); - gtk_widget_realize(foobox); -- -+ -+ return foobox; -+} -+ -+/* -+ * Set WMHints on the dockapp (icon) window. Needs to be called after -+ * the main window is shown, due to changes in GTK+ 2.4. -+ * -+ * Input: -+ * mw Pointer to main window -+ * dw Pointer to icon (dockapp) window -+ * margc, margv argc and argv of main program for XSetCommand -+ */ -+void foo_set_wmhints(GtkWidget *mw, -+ GtkWidget *dw, -+ int margc, -+ char *margv[]) { -+ Window xmw; -+ XWMHints *wm_hints; -+ -+ xmw = GDK_WINDOW_XWINDOW(mw->window); -+ - /* Time for game with Xlib */ - wm_hints = XAllocWMHints(); - wm_hints->window_group = xmw; -- wm_hints->icon_window = GDK_WINDOW_XWINDOW(foobox->window); -+ wm_hints->icon_window = GDK_WINDOW_XWINDOW(dw->window); - wm_hints->icon_x = 0; - wm_hints->icon_y = 0; - wm_hints->initial_state = WithdrawnState; -@@ -60,6 +79,4 @@ - XSetCommand(GDK_DISPLAY(), xmw, margv, margc); - - XFree(wm_hints); -- -- return foobox; - } -diff -ru orig/wmcliphist-0.6/foodock/foodock.h wmcliphist-0.6/foodock/foodock.h ---- orig/wmcliphist-0.6/foodock/foodock.h 2001-03-16 01:59:52.000000000 +0100 -+++ wmcliphist-0.6/foodock/foodock.h 2007-08-12 16:34:40.317881934 +0200 -@@ -15,6 +15,8 @@ - * before calling foo_create_main_icon_window. Returned event box - * will be realized by foo_create_main_icon_window. You should to show - * icon window as well as main window before gtk_main(). -+ * -+ * Call foo_set_wmhints() after both windows are shown (gtk_widget_show()). - * - * Input: - * mw Pointer to main window -@@ -25,3 +27,17 @@ - unsigned int size, - int main_argc, - char *main_argv[]); -+ -+/* -+ * Set WMHints on the dockapp (icon) window. Needs to be called after -+ * the main window is shown, due to changes in GTK+ 2.4. -+ * -+ * Input: -+ * mw Pointer to main window -+ * dw Pointer to icon (dockapp) window -+ * margc, margv argc and argv of main program for XSetCommand -+ */ -+void foo_set_wmhints(GtkWidget *mw, -+ GtkWidget *dw, -+ int margc, -+ char *margv[]); -diff -ru orig/wmcliphist-0.6/wmcliphist.c wmcliphist-0.6/wmcliphist.c ---- orig/wmcliphist-0.6/wmcliphist.c 2003-06-23 23:24:24.000000000 +0200 -+++ wmcliphist-0.6/wmcliphist.c 2007-08-12 16:31:20.806512430 +0200 -@@ -333,6 +333,10 @@ - /* 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); -+ - gdk_window_shape_combine_mask(main_window->window, icon_mask, 0, 0); - gdk_window_shape_combine_mask(dock_app->window, icon_mask, 0, 0); - diff --git a/x11-plugins/wmcliphist/wmcliphist-0.6-r1.ebuild b/x11-plugins/wmcliphist/wmcliphist-0.6-r1.ebuild deleted file mode 100644 index 9ac2df6c71d8..000000000000 --- a/x11-plugins/wmcliphist/wmcliphist-0.6-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils toolchain-funcs - -DESCRIPTION="Dockable clipboard history application for Window Maker" -HOMEPAGE="http://linux.nawebu.cz/wmcliphist" -SRC_URI="http://linux.nawebu.cz/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc sparc x86" -IUSE="" - -RDEPEND="x11-libs/gtk+:2" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-Makefile.patch \ - "${FILESDIR}"/${P}-fix-docking.patch -} - -src_compile() { - tc-export CC - emake -} - -src_install() { - dobin ${PN} - dodoc ChangeLog README - newdoc .${PN}rc ${PN}rc.sample -} diff --git a/x11-plugins/wmcliphist/wmcliphist-1.0.ebuild b/x11-plugins/wmcliphist/wmcliphist-1.0.ebuild deleted file mode 100644 index 6df22dae4eef..000000000000 --- a/x11-plugins/wmcliphist/wmcliphist-1.0.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils toolchain-funcs - -DESCRIPTION="Dockable clipboard history application for Window Maker" -HOMEPAGE="http://linux.nawebu.cz/wmcliphist" -SRC_URI="http://linux.nawebu.cz/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="" - -RDEPEND="x11-libs/gtk+:2" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S=${WORKDIR}/${PN} - -src_compile() { - tc-export CC - emake -} - -src_install() { - dobin ${PN} - dodoc ChangeLog README - newdoc ${PN}rc ${PN}rc.sample -}