diff options
author | steve finkel | 2022-10-24 22:41:55 -0400 |
---|---|---|
committer | steve finkel | 2022-10-24 22:41:55 -0400 |
commit | 1c1eac0c1b97fa5d2465b633d3fe1294c9ae9030 (patch) | |
tree | 6b1be31dc0cd063170374742fe40e4d4d6fea854 | |
parent | ff175bfeb413ae5c9bca42dc15d10626095bccb0 (diff) | |
download | aur-easystroke.tar.gz |
removed old patches
-rw-r--r-- | easystroke-0.6.0-gcc7-build-fix.patch | 40 | ||||
-rw-r--r-- | replace-sigc-group-with-lambda.patch | 40 |
2 files changed, 0 insertions, 80 deletions
diff --git a/easystroke-0.6.0-gcc7-build-fix.patch b/easystroke-0.6.0-gcc7-build-fix.patch deleted file mode 100644 index b66bcb4edf0a..000000000000 --- a/easystroke-0.6.0-gcc7-build-fix.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 9e2c32390c5c253aade3bb703e51841748d2c37e Mon Sep 17 00:00:00 2001 -From: Jonathan Wakely <jwakely@redhat.com> -Date: Sat, 28 Jan 2017 01:26:00 +0000 -Subject: [PATCH] Remove abs(float) function that clashes with std::abs(float) - -Depending on which C++ standard library headers have been included there -might an abs(float) function already declared in the global namespace, -so the definition in this file conflicts with it. This cause a build -failure with GCC 7, which conforms more closely to the C++ standard with -respect to overloads of abs. - -Including <cmath> and adding a using-declaration for std::abs ensures -that the standard std::abs(float) function is available. This solution -should be portable to all compilers. ---- - handler.cc | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/handler.cc b/handler.cc -index 8830ea2..685b1ff 100644 ---- a/handler.cc -+++ b/handler.cc -@@ -23,6 +23,8 @@ - #include <X11/extensions/XTest.h> - #include <X11/XKBlib.h> - #include <X11/Xproto.h> -+#include <cmath> // std::abs(float) -+using std::abs; - - XState *xstate = nullptr; - -@@ -533,8 +535,6 @@ class WaitForPongHandler : public Handler, protected Timeout { - virtual Grabber::State grab_mode() { return parent->grab_mode(); } - }; - --static inline float abs(float x) { return x > 0 ? x : -x; } -- - class AbstractScrollHandler : public Handler { - bool have_x, have_y; - float last_x, last_y; diff --git a/replace-sigc-group-with-lambda.patch b/replace-sigc-group-with-lambda.patch deleted file mode 100644 index 837af387b1d4..000000000000 --- a/replace-sigc-group-with-lambda.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -uprb easystroke-0.6.0.orig/actions.cc easystroke-0.6.0/actions.cc ---- easystroke-0.6.0.orig/actions.cc 2013-03-27 17:52:38.000000000 +0200 -+++ easystroke-0.6.0/actions.cc 2015-12-07 22:07:17.720041171 +0200 -@@ -51,10 +51,11 @@ void TreeViewMulti::on_drag_begin(const - 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 -uprb easystroke-0.6.0.orig/Makefile easystroke-0.6.0/Makefile ---- easystroke-0.6.0.orig/Makefile 2013-03-27 17:52:38.000000000 +0200 -+++ easystroke-0.6.0/Makefile 2015-12-07 21:54:47.926776791 +0200 -@@ -21,8 +21,7 @@ LOCALEDIR= $(PREFIX)/share/locale - DFLAGS = - OFLAGS = -O2 - AOFLAGS = -O3 --STROKEFLAGS = -Wall -std=c99 $(DFLAGS) --CXXFLAGS = -Wall $(DFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" `pkg-config gtkmm-3.0 dbus-glib-1 --cflags` -+CXXFLAGS = -Wall $(DFLAGS) -std=c++11 -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) - -@@ -63,7 +62,7 @@ $(BINARY): $(OFILES) - $(CXX) $(LDFLAGS) -o $@ $(OFILES) $(LIBS) - - stroke.o: stroke.c -- $(CC) $(STROKEFLAGS) $(AOFLAGS) -MT $@ -MMD -MP -MF $*.Po -o $@ -c $< -+ $(CC) $(CFLAGS) $(AOFLAGS) -MT $@ -MMD -MP -MF $*.Po -o $@ -c $< - - %.o: %.c - $(CC) $(CFLAGS) $(OFLAGS) -MT $@ -MMD -MP -MF $*.Po -o $@ -c $< |