commit: efd262b739de4af21888d873c99e45e53cf7ba0f Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Jul 2 13:11:27 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Jul 2 13:11:41 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efd262b7
x11-misc/easystroke: treeclean Bug: https://bugs.gentoo.org/832953 Bug: https://bugs.gentoo.org/653366 Bug: https://bugs.gentoo.org/831011 Signed-off-by: Sam James <sam <AT> gentoo.org> profiles/package.mask | 5 -- x11-misc/easystroke/Manifest | 1 - x11-misc/easystroke/easystroke-0.6.0-r3.ebuild | 69 ---------------------- .../easystroke/files/easystroke-0.6.0-abs.patch | 45 -------------- .../easystroke-0.6.0-buttons-scroll-send.patch | 43 -------------- .../files/easystroke-0.6.0-cellrendertextish.patch | 20 ------- .../easystroke/files/easystroke-0.6.0-cxx11.patch | 17 ------ .../files/easystroke-0.6.0-desktop.patch | 11 ---- .../easystroke/files/easystroke-0.6.0-gentoo.patch | 41 ------------- ...asystroke-0.6.0-reinstate-signal-handlers.patch | 42 ------------- x11-misc/easystroke/metadata.xml | 8 --- 11 files changed, 302 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index c8dab6f7b5f3..add2eb649f10 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -406,11 +406,6 @@ net-p2p/arti <sci-electronics/kicad-templates-6.0.2 <app-doc/kicad-doc-6.0.2 -# Jonas Stein <[email protected]> (2022-02-08) -# Not maintained, open bugs, upstream outdated. -# Removal after 2022-07-01. Bug #832953. -x11-misc/easystroke - # Eray Aslan <[email protected]> (2022-01-24) # Mask experimental software =mail-mta/postfix-3.8* diff --git a/x11-misc/easystroke/Manifest b/x11-misc/easystroke/Manifest deleted file mode 100644 index 86b94c17967f..000000000000 --- a/x11-misc/easystroke/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST easystroke-0.6.0.tar.gz 121358 BLAKE2B 9a4bec134f44620b10e1af9959ac4d82cb0a7ae8ea1e33ebfdafd2bb8367b7f431e48be4386803dc498b30f11a51b448570331d544fe089523ae710ffa8625ce SHA512 a74cbdfd2b56e6b20d895297e80fb63f3d8ac938235ecf7067f984d087004af22a5ea0116ae20b948e238b02a06b14044a7025d65840f0c8d00542332387c921 diff --git a/x11-misc/easystroke/easystroke-0.6.0-r3.ebuild b/x11-misc/easystroke/easystroke-0.6.0-r3.ebuild deleted file mode 100644 index ea582bd59c8c..000000000000 --- a/x11-misc/easystroke/easystroke-0.6.0-r3.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils flag-o-matic toolchain-funcs - -DESCRIPTION="a gesture-recognition application for X11" -HOMEPAGE="https://sourceforge.net/apps/trac/easystroke/"; -SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND=" - dev-cpp/gtkmm:3.0 - dev-libs/boost:= - dev-libs/dbus-glib - dev-libs/glib:2 - x11-base/xorg-server - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libXtst -" -DEPEND=" - ${RDEPEND} - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}"/${P}-cellrendertextish.patch - "${FILESDIR}"/${P}-desktop.patch - "${FILESDIR}"/${P}-gentoo.patch - "${FILESDIR}"/${P}-reinstate-signal-handlers.patch - "${FILESDIR}"/${P}-buttons-scroll-send.patch - "${FILESDIR}"/${P}-cxx11.patch - "${FILESDIR}"/${P}-abs.patch -) - -src_prepare() { - default - - tc-export CC CXX PKG_CONFIG - - if ! [[ -z ${LINGUAS} ]]; then - strip-linguas -i po/ - - local es_lingua lang - for es_lingua in $( printf "%s\n" po/*.po ); do - lang=${es_lingua/po\/} - has ${lang/.po/} ${LINGUAS} || rm ${es_lingua} - done - fi -} - -src_compile() { - append-cxxflags -std=c++11 - emake \ - AOFLAGS='' \ - LDFLAGS="${LDFLAGS}" \ - PREFIX=/usr -} - -src_install() { - emake DESTDIR="${D}" PREFIX=/usr install -} diff --git a/x11-misc/easystroke/files/easystroke-0.6.0-abs.patch b/x11-misc/easystroke/files/easystroke-0.6.0-abs.patch deleted file mode 100644 index 9b4ab63828db..000000000000 --- a/x11-misc/easystroke/files/easystroke-0.6.0-abs.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- a/handler.cc -+++ b/handler.cc -@@ -533,7 +533,7 @@ - virtual Grabber::State grab_mode() { return parent->grab_mode(); } - }; - --static inline float abs(float x) { return x > 0 ? x : -x; } -+static inline float easystroke_abs(float x) { return x > 0 ? x : -x; } - - class AbstractScrollHandler : public Handler { - bool have_x, have_y; -@@ -559,7 +559,7 @@ - xstate->fake_click(b2); - } - static float curve(float v) { -- return v * exp(log(abs(v))/3); -+ return v * exp(log(easystroke_abs(v))/3); - } - protected: - void move_back() { -@@ -597,8 +597,8 @@ - offset_x += factor * curve(dx/dt)*dt/20.0; - offset_y += factor * curve(dy/dt)*dt/10.0; - int b1 = 0, n1 = 0, b2 = 0, n2 = 0; -- if (abs(offset_x) > 1.0) { -- n1 = (int)floor(abs(offset_x)); -+ if (easystroke_abs(offset_x) > 1.0) { -+ n1 = (int)floor(easystroke_abs(offset_x)); - if (offset_x > 0) { - b1 = 7; - offset_x -= n1; -@@ -607,10 +607,10 @@ - offset_x += n1; - } - } -- if (abs(offset_y) > 1.0) { -- if (abs(offset_y) < 1.0) -+ if (easystroke_abs(offset_y) > 1.0) { -+ if (easystroke_abs(offset_y) < 1.0) - return; -- n2 = (int)floor(abs(offset_y)); -+ n2 = (int)floor(easystroke_abs(offset_y)); - if (offset_y > 0) { - b2 = 5; - offset_y -= n2; diff --git a/x11-misc/easystroke/files/easystroke-0.6.0-buttons-scroll-send.patch b/x11-misc/easystroke/files/easystroke-0.6.0-buttons-scroll-send.patch deleted file mode 100644 index 27bfa4cfee66..000000000000 --- a/x11-misc/easystroke/files/easystroke-0.6.0-buttons-scroll-send.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 5388934e722308cd314d65e362ddfaf6e5ab6c94 Mon Sep 17 00:00:00 2001 -From: Thomas Jaeger <[email protected]> -Date: Sat, 13 Apr 2013 14:10:35 -0400 -Subject: Make buttons and scroll work properly with 'send' - ---- - handler.cc | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/handler.cc b/handler.cc -index f47aae3..c1bd279 100644 ---- a/handler.cc -+++ b/handler.cc -@@ -545,7 +545,7 @@ class AbstractScrollHandler : public Handler { - - protected: - AbstractScrollHandler() : last_t(0), offset_x(0.0), offset_y(0.0) { -- if (!prefs.move_back.get() || xstate->current_dev->absolute) -+ if (!prefs.move_back.get() || (xstate->current_dev && xstate->current_dev->absolute)) - return; - Window dummy1, dummy2; - int dummy3, dummy4; -@@ -563,7 +563,7 @@ protected: - } - protected: - void move_back() { -- if (!prefs.move_back.get() || xstate->current_dev->absolute) -+ if (!prefs.move_back.get() || (xstate->current_dev && xstate->current_dev->absolute)) - return; - XTestFakeMotionEvent(dpy, DefaultScreen(dpy), orig_x, orig_y, 0); - } -@@ -1115,6 +1115,8 @@ XState::XState() : current_dev(NULL), in_proximity(false), accepted(true) { - - void XState::run_action(RAction act) { - RModifiers mods = act->prepare(); -+ IF_BUTTON(act, b) -+ return handler->replace_child(new ButtonHandler(mods, b)); - if (IS_IGNORE(act)) - return handler->replace_child(new IgnoreHandler(mods)); - if (IS_SCROLL(act)) --- -1.8.4 - diff --git a/x11-misc/easystroke/files/easystroke-0.6.0-cellrendertextish.patch b/x11-misc/easystroke/files/easystroke-0.6.0-cellrendertextish.patch deleted file mode 100644 index 8664ed736bae..000000000000 --- a/x11-misc/easystroke/files/easystroke-0.6.0-cellrendertextish.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/cellrenderertextish.c -+++ b/cellrenderertextish.c -@@ -599,7 +599,7 @@ - _g_free0 (self->priv->path); - self->priv->path = _tmp3_; - g_signal_connect_object ((GtkCellEditable*) self, "editing-done", (GCallback) _cell_editable_accel_on_editing_done_gtk_cell_editable_editing_done, self, 0); -- _tmp4_ = _ ("Key combination..."); -+ _tmp4_ = ("Key combination..."); - _tmp5_ = (GtkLabel*) gtk_label_new (_tmp4_); - g_object_ref_sink (_tmp5_); - label = _tmp5_; -@@ -907,7 +907,7 @@ - const gchar* _tmp10_; - const gchar* _tmp11_ = NULL; - _tmp10_ = item; -- _tmp11_ = _ (_tmp10_); -+ _tmp11_ = (_tmp10_); - gtk_combo_box_text_append_text ((GtkComboBoxText*) self, _tmp11_); - _g_free0 (item); - } diff --git a/x11-misc/easystroke/files/easystroke-0.6.0-cxx11.patch b/x11-misc/easystroke/files/easystroke-0.6.0-cxx11.patch deleted file mode 100644 index 8619e8e9fbdc..000000000000 --- a/x11-misc/easystroke/files/easystroke-0.6.0-cxx11.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/actions.cc -+++ b/actions.cc -@@ -51,10 +51,11 @@ - context->set_icon(pb, pb->get_width(), pb->get_height()); - } - --bool negate(bool b) { return !b; } -- - TreeViewMulti::TreeViewMulti() : Gtk::TreeView(), pending(false) { -- get_selection()->set_select_function(sigc::group(&negate, sigc::ref(pending))); -+ get_selection()->set_select_function( -+ [this](Glib::RefPtr<Gtk::TreeModel> const&, Gtk::TreeModel::Path const&, bool) { -+ return !pending; -+ }); - } - - enum Type { COMMAND, KEY, TEXT, SCROLL, IGNORE, BUTTON, MISC }; diff --git a/x11-misc/easystroke/files/easystroke-0.6.0-desktop.patch b/x11-misc/easystroke/files/easystroke-0.6.0-desktop.patch deleted file mode 100644 index c9a75a2c4b78..000000000000 --- a/x11-misc/easystroke/files/easystroke-0.6.0-desktop.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/easystroke.desktop.in -+++ b/easystroke.desktop.in -@@ -6,7 +6,7 @@ - Exec=easystroke - Icon=easystroke - Categories=GTK;Utility;Accessibility; --Actions=About;Enable;Disable;Quit -+Actions=About;Enable;Disable;Quit; - _Comment=Control your desktop using mouse gestures - - [Desktop Action About] diff --git a/x11-misc/easystroke/files/easystroke-0.6.0-gentoo.patch b/x11-misc/easystroke/files/easystroke-0.6.0-gentoo.patch deleted file mode 100644 index ee95b21486c1..000000000000 --- a/x11-misc/easystroke/files/easystroke-0.6.0-gentoo.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -19,14 +19,14 @@ - MENUDIR = $(PREFIX)/share/applications - LOCALEDIR= $(PREFIX)/share/locale - DFLAGS = --OFLAGS = -O2 --AOFLAGS = -O3 -+#OFLAGS = -O2 -+#AOFLAGS = -O3 - STROKEFLAGS = -Wall -std=c99 $(DFLAGS) --CXXFLAGS = -Wall $(DFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" `pkg-config gtkmm-3.0 dbus-glib-1 --cflags` --CFLAGS = -Wall $(DFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" `pkg-config gtk+-3.0 --cflags` -DGETTEXT_PACKAGE='"easystroke"' --LDFLAGS = $(DFLAGS) -+CXXFLAGS += -Wall $(DFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" $(shell $(PKG_CONFIG) gtkmm-3.0 dbus-glib-1 --cflags) -+CFLAGS += -Wall $(DFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" $(shell $(PKG_CONFIG) gtk+-3.0 --cflags) -DGETTEXT_PACKAGE='"easystroke"' -+#LDFLAGS = $(DFLAGS) - --LIBS = $(DFLAGS) -lboost_serialization -lX11 -lXext -lXi -lXfixes -lXtst `pkg-config gtkmm-3.0 dbus-glib-1 --libs` -+LIBS = $(DFLAGS) -lboost_serialization -lX11 -lXext -lXi -lXfixes -lXtst $(shell $(PKG_CONFIG) gtkmm-3.0 dbus-glib-1 --libs) - - BINARY = easystroke - ICON = easystroke.svg -@@ -60,7 +60,7 @@ - include $(DEPFILES) - - $(BINARY): $(OFILES) -- $(CXX) $(LDFLAGS) -o $@ $(OFILES) $(LIBS) -+ $(CXX) $(CFLAGS) $(LDFLAGS) -o $@ $(OFILES) $(LIBS) - - stroke.o: stroke.c - $(CC) $(STROKEFLAGS) $(AOFLAGS) -MT $@ -MMD -MP -MF $*.Po -o $@ -c $< -@@ -119,7 +119,7 @@ - help2man -N -n "X11 gesture recognition application" ./$(BINARY) > $@ - - install: all -- install -Ds $(BINARY) $(DESTDIR)$(BINDIR)/$(BINARY) -+ install -D $(BINARY) $(DESTDIR)$(BINDIR)/$(BINARY) - install -D -m 644 $(ICON) $(DESTDIR)$(ICONDIR)/$(ICON) - install -D -m 644 $(MENU) $(DESTDIR)$(MENUDIR)/$(MENU) - for f in $(MOFILES); do \ diff --git a/x11-misc/easystroke/files/easystroke-0.6.0-reinstate-signal-handlers.patch b/x11-misc/easystroke/files/easystroke-0.6.0-reinstate-signal-handlers.patch deleted file mode 100644 index 2e96346459a8..000000000000 --- a/x11-misc/easystroke/files/easystroke-0.6.0-reinstate-signal-handlers.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 7bda4bd9c705413598ee9b534884bc7f23704932 Mon Sep 17 00:00:00 2001 -From: Thomas Jaeger <[email protected]> -Date: Thu, 20 Jun 2013 01:45:20 -0400 -Subject: Reinstate signal handlers that got lost in the gtk3 transition - -Also, fix a segfault when handling SIGINT. ---- - main.cc | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/main.cc b/main.cc -index 55d0b3c..8cd9c56 100644 ---- a/main.cc -+++ b/main.cc -@@ -161,7 +161,12 @@ void quit() { - xstate->bail_out(); - dead = true; - win->hide(); -- xstate->queue(sigc::ptr_fun(&Gtk::Main::quit)); -+ Glib::RefPtr<Gio::Application> app = Gio::Application::get_default(); -+ xstate->queue(sigc::mem_fun(*app.operator->(), &Gio::Application::quit)); -+} -+ -+void sig_int(int) { -+ quit(); - } - - class App : public Gtk::Application, Base { -@@ -371,6 +376,10 @@ void App::on_activate() { - - create_config_dir(); - unsetenv("DESKTOP_AUTOSTART_ID"); -+ -+ signal(SIGINT, &sig_int); -+ signal(SIGCHLD, SIG_IGN); -+ - dpy = XOpenDisplay(NULL); - if (!dpy) { - printf(_("Couldn't open display.\n")); --- -1.8.4 - diff --git a/x11-misc/easystroke/metadata.xml b/x11-misc/easystroke/metadata.xml deleted file mode 100644 index 4119740a57f8..000000000000 --- a/x11-misc/easystroke/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="sourceforge">easystroke</remote-id> - </upstream> -</pkgmetadata>
