Date: Friday, May 19, 2017 @ 17:51:38 Author: lfleischer Revision: 228595
archrelease: copy trunk to community-staging-i686, community-staging-x86_64 Added: easystroke/repos/community-staging-i686/ easystroke/repos/community-staging-i686/PKGBUILD (from rev 228594, easystroke/trunk/PKGBUILD) easystroke/repos/community-staging-i686/easystroke-0.6.0-gcc7-build-fix.patch (from rev 228594, easystroke/trunk/easystroke-0.6.0-gcc7-build-fix.patch) easystroke/repos/community-staging-i686/replace-sigc-group-with-lambda.patch (from rev 228594, easystroke/trunk/replace-sigc-group-with-lambda.patch) easystroke/repos/community-staging-x86_64/ easystroke/repos/community-staging-x86_64/PKGBUILD (from rev 228594, easystroke/trunk/PKGBUILD) easystroke/repos/community-staging-x86_64/easystroke-0.6.0-gcc7-build-fix.patch (from rev 228594, easystroke/trunk/easystroke-0.6.0-gcc7-build-fix.patch) easystroke/repos/community-staging-x86_64/replace-sigc-group-with-lambda.patch (from rev 228594, easystroke/trunk/replace-sigc-group-with-lambda.patch) ----------------------------------------------------------------+ community-staging-i686/PKGBUILD | 45 ++++++++++ community-staging-i686/easystroke-0.6.0-gcc7-build-fix.patch | 40 ++++++++ community-staging-i686/replace-sigc-group-with-lambda.patch | 40 ++++++++ community-staging-x86_64/PKGBUILD | 45 ++++++++++ community-staging-x86_64/easystroke-0.6.0-gcc7-build-fix.patch | 40 ++++++++ community-staging-x86_64/replace-sigc-group-with-lambda.patch | 40 ++++++++ 6 files changed, 250 insertions(+) Copied: easystroke/repos/community-staging-i686/PKGBUILD (from rev 228594, easystroke/trunk/PKGBUILD) =================================================================== --- community-staging-i686/PKGBUILD (rev 0) +++ community-staging-i686/PKGBUILD 2017-05-19 17:51:38 UTC (rev 228595) @@ -0,0 +1,45 @@ +# Maintainer: Lukas Fleischer <lfleisc...@archlinux.org> +# Contributor: Kevin Sullivan <ksulli...@archlinux.us> + +pkgname=easystroke +pkgver=0.6.0 +pkgrel=15 +pkgdesc='Use mouse gestures to initiate commands and hotkeys.' +arch=('i686' 'x86_64') +url='http://easystroke.sourceforge.net/' +license=('custom:ISC') +depends=('gtkmm3' 'boost-libs' 'libxtst' 'dbus-glib' 'xorg-server') +makedepends=('boost' 'inputproto' 'intltool' 'gettext' 'xorg-server-devel' 'help2man') +source=("http://downloads.sourceforge.net/easystroke/${pkgname}-${pkgver}.tar.gz" + 'easystroke-0.6.0-gcc7-build-fix.patch' + 'replace-sigc-group-with-lambda.patch') +md5sums=('3b4f25d02a6b5ac57a8b7a06545869db' + '4b0cb9354798cfab1ce21d04bb1ff002' + '4a27e1336df773e2f1cd67788477cc3b') + +prepare() { + cd "${pkgname}-${pkgver}" + + # Fix compilation with GCC 7. + patch -Np1 -i ../easystroke-0.6.0-gcc7-build-fix.patch + + # fix build with libsigc++ 2.6; also build in C++11 mode + # (not sure if the lambda is correct, but seems to work) + patch -Np1 -i ../replace-sigc-group-with-lambda.patch +} + +build() { + cd "${pkgname}-${pkgver}" + + make + make man +} + +package() { + cd "${pkgname}-${pkgver}" + + make PREFIX=/usr DESTDIR="${pkgdir}" install + + install -Dm0644 "${pkgname}.1" "${pkgdir}/usr/share/man/man1/${pkgname}.1" + install -Dm0644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} Copied: easystroke/repos/community-staging-i686/easystroke-0.6.0-gcc7-build-fix.patch (from rev 228594, easystroke/trunk/easystroke-0.6.0-gcc7-build-fix.patch) =================================================================== --- community-staging-i686/easystroke-0.6.0-gcc7-build-fix.patch (rev 0) +++ community-staging-i686/easystroke-0.6.0-gcc7-build-fix.patch 2017-05-19 17:51:38 UTC (rev 228595) @@ -0,0 +1,40 @@ +From 9e2c32390c5c253aade3bb703e51841748d2c37e Mon Sep 17 00:00:00 2001 +From: Jonathan Wakely <jwak...@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; Copied: easystroke/repos/community-staging-i686/replace-sigc-group-with-lambda.patch (from rev 228594, easystroke/trunk/replace-sigc-group-with-lambda.patch) =================================================================== --- community-staging-i686/replace-sigc-group-with-lambda.patch (rev 0) +++ community-staging-i686/replace-sigc-group-with-lambda.patch 2017-05-19 17:51:38 UTC (rev 228595) @@ -0,0 +1,40 @@ +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 $< Copied: easystroke/repos/community-staging-x86_64/PKGBUILD (from rev 228594, easystroke/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2017-05-19 17:51:38 UTC (rev 228595) @@ -0,0 +1,45 @@ +# Maintainer: Lukas Fleischer <lfleisc...@archlinux.org> +# Contributor: Kevin Sullivan <ksulli...@archlinux.us> + +pkgname=easystroke +pkgver=0.6.0 +pkgrel=15 +pkgdesc='Use mouse gestures to initiate commands and hotkeys.' +arch=('i686' 'x86_64') +url='http://easystroke.sourceforge.net/' +license=('custom:ISC') +depends=('gtkmm3' 'boost-libs' 'libxtst' 'dbus-glib' 'xorg-server') +makedepends=('boost' 'inputproto' 'intltool' 'gettext' 'xorg-server-devel' 'help2man') +source=("http://downloads.sourceforge.net/easystroke/${pkgname}-${pkgver}.tar.gz" + 'easystroke-0.6.0-gcc7-build-fix.patch' + 'replace-sigc-group-with-lambda.patch') +md5sums=('3b4f25d02a6b5ac57a8b7a06545869db' + '4b0cb9354798cfab1ce21d04bb1ff002' + '4a27e1336df773e2f1cd67788477cc3b') + +prepare() { + cd "${pkgname}-${pkgver}" + + # Fix compilation with GCC 7. + patch -Np1 -i ../easystroke-0.6.0-gcc7-build-fix.patch + + # fix build with libsigc++ 2.6; also build in C++11 mode + # (not sure if the lambda is correct, but seems to work) + patch -Np1 -i ../replace-sigc-group-with-lambda.patch +} + +build() { + cd "${pkgname}-${pkgver}" + + make + make man +} + +package() { + cd "${pkgname}-${pkgver}" + + make PREFIX=/usr DESTDIR="${pkgdir}" install + + install -Dm0644 "${pkgname}.1" "${pkgdir}/usr/share/man/man1/${pkgname}.1" + install -Dm0644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} Copied: easystroke/repos/community-staging-x86_64/easystroke-0.6.0-gcc7-build-fix.patch (from rev 228594, easystroke/trunk/easystroke-0.6.0-gcc7-build-fix.patch) =================================================================== --- community-staging-x86_64/easystroke-0.6.0-gcc7-build-fix.patch (rev 0) +++ community-staging-x86_64/easystroke-0.6.0-gcc7-build-fix.patch 2017-05-19 17:51:38 UTC (rev 228595) @@ -0,0 +1,40 @@ +From 9e2c32390c5c253aade3bb703e51841748d2c37e Mon Sep 17 00:00:00 2001 +From: Jonathan Wakely <jwak...@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; Copied: easystroke/repos/community-staging-x86_64/replace-sigc-group-with-lambda.patch (from rev 228594, easystroke/trunk/replace-sigc-group-with-lambda.patch) =================================================================== --- community-staging-x86_64/replace-sigc-group-with-lambda.patch (rev 0) +++ community-staging-x86_64/replace-sigc-group-with-lambda.patch 2017-05-19 17:51:38 UTC (rev 228595) @@ -0,0 +1,40 @@ +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 $<