[arch-commits] Commit in easystroke/repos (6 files)

Bartłomiej Piotrowski bpiotrowski at archlinux.org
Sat Oct 8 11:55:35 UTC 2016


    Date: Saturday, October 8, 2016 @ 11:55:34
  Author: bpiotrowski
Revision: 191633

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 191632, easystroke/trunk/PKGBUILD)
  easystroke/repos/community-staging-i686/replace-sigc-group-with-lambda.patch
    (from rev 191632, easystroke/trunk/replace-sigc-group-with-lambda.patch)
  easystroke/repos/community-staging-x86_64/
  easystroke/repos/community-staging-x86_64/PKGBUILD
    (from rev 191632, easystroke/trunk/PKGBUILD)
  easystroke/repos/community-staging-x86_64/replace-sigc-group-with-lambda.patch
    (from rev 191632, easystroke/trunk/replace-sigc-group-with-lambda.patch)

---------------------------------------------------------------+
 community-staging-i686/PKGBUILD                               |   39 +++++++++
 community-staging-i686/replace-sigc-group-with-lambda.patch   |   40 ++++++++++
 community-staging-x86_64/PKGBUILD                             |   39 +++++++++
 community-staging-x86_64/replace-sigc-group-with-lambda.patch |   40 ++++++++++
 4 files changed, 158 insertions(+)

Copied: easystroke/repos/community-staging-i686/PKGBUILD (from rev 191632, easystroke/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD	                        (rev 0)
+++ community-staging-i686/PKGBUILD	2016-10-08 11:55:34 UTC (rev 191633)
@@ -0,0 +1,39 @@
+# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
+# Contributor: Kevin Sullivan <ksullivan at archlinux.us>
+
+pkgname=easystroke
+pkgver=0.6.0
+pkgrel=13
+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"
+        'replace-sigc-group-with-lambda.patch')
+md5sums=('3b4f25d02a6b5ac57a8b7a06545869db'
+         '4a27e1336df773e2f1cd67788477cc3b')
+
+prepare() {
+  cd "${pkgname}-${pkgver}"
+  # 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/replace-sigc-group-with-lambda.patch (from rev 191632, 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	2016-10-08 11:55:34 UTC (rev 191633)
@@ -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 191632, easystroke/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2016-10-08 11:55:34 UTC (rev 191633)
@@ -0,0 +1,39 @@
+# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
+# Contributor: Kevin Sullivan <ksullivan at archlinux.us>
+
+pkgname=easystroke
+pkgver=0.6.0
+pkgrel=13
+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"
+        'replace-sigc-group-with-lambda.patch')
+md5sums=('3b4f25d02a6b5ac57a8b7a06545869db'
+         '4a27e1336df773e2f1cd67788477cc3b')
+
+prepare() {
+  cd "${pkgname}-${pkgver}"
+  # 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/replace-sigc-group-with-lambda.patch (from rev 191632, 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	2016-10-08 11:55:34 UTC (rev 191633)
@@ -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 $<



More information about the arch-commits mailing list