Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/easystroke/, x11-misc/easystroke/files/
Date: Thu, 31 Dec 2015 11:34:08
Message-Id: 1451561630.632f38845a2fb3d05467baf7dadd6107f3ce75b8.pacho@gentoo
1 commit: 632f38845a2fb3d05467baf7dadd6107f3ce75b8
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 31 11:33:40 2015 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 31 11:33:50 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=632f3884
7
8 x11-misc/easystroke: Fix building with latest glibmm/libsigc++ with ArchLinux patch (#569606)
9
10 Package-Manager: portage-2.2.26
11
12 x11-misc/easystroke/easystroke-0.6.0-r2.ebuild | 65 ++++++++++++++++++++++
13 .../easystroke/files/easystroke-0.6.0-cxx11.patch | 18 ++++++
14 2 files changed, 83 insertions(+)
15
16 diff --git a/x11-misc/easystroke/easystroke-0.6.0-r2.ebuild b/x11-misc/easystroke/easystroke-0.6.0-r2.ebuild
17 new file mode 100644
18 index 0000000..ef52536
19 --- /dev/null
20 +++ b/x11-misc/easystroke/easystroke-0.6.0-r2.ebuild
21 @@ -0,0 +1,65 @@
22 +# Copyright 1999-2015 Gentoo Foundation
23 +# Distributed under the terms of the GNU General Public License v2
24 +# $Id$
25 +
26 +EAPI=5
27 +inherit eutils flag-o-matic toolchain-funcs
28 +
29 +DESCRIPTION="a gesture-recognition application for X11"
30 +HOMEPAGE="http://sourceforge.net/apps/trac/easystroke/"
31 +SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
32 +
33 +LICENSE="ISC"
34 +SLOT="0"
35 +KEYWORDS="~amd64"
36 +
37 +RDEPEND="
38 + dev-cpp/gtkmm:3.0
39 + dev-libs/boost
40 + dev-libs/dbus-glib
41 + dev-libs/glib:2
42 + x11-base/xorg-server
43 + x11-libs/libX11
44 + x11-libs/libXext
45 + x11-libs/libXfixes
46 + x11-libs/libXi
47 + x11-libs/libXtst
48 +"
49 +DEPEND="
50 + ${RDEPEND}
51 + dev-util/intltool
52 + sys-devel/gettext
53 +"
54 +
55 +src_prepare() {
56 + epatch "${FILESDIR}"/${P}-cellrendertextish.patch
57 + epatch "${FILESDIR}"/${P}-desktop.patch
58 + epatch "${FILESDIR}"/${P}-gentoo.patch
59 + epatch "${FILESDIR}"/${P}-reinstate-signal-handlers.patch
60 + epatch "${FILESDIR}"/${P}-buttons-scroll-send.patch
61 + epatch "${FILESDIR}"/${P}-cxx11.patch
62 +
63 + tc-export CC CXX PKG_CONFIG
64 +
65 + if ! [[ -z ${LINGUAS} ]]; then
66 + strip-linguas -i po/
67 +
68 + local es_lingua lang
69 + for es_lingua in $( printf "%s\n" po/*.po ); do
70 + lang=${es_lingua/po\/}
71 + has ${lang/.po/} ${LINGUAS} || rm ${es_lingua}
72 + done
73 + fi
74 +}
75 +
76 +src_compile() {
77 + append-cxxflags -std=c++11
78 + emake \
79 + AOFLAGS='' \
80 + LDFLAGS="${LDFLAGS}" \
81 + PREFIX=/usr
82 +}
83 +
84 +src_install() {
85 + emake DESTDIR="${D}" PREFIX=/usr install
86 +}
87
88 diff --git a/x11-misc/easystroke/files/easystroke-0.6.0-cxx11.patch b/x11-misc/easystroke/files/easystroke-0.6.0-cxx11.patch
89 new file mode 100644
90 index 0000000..b628d1b
91 --- /dev/null
92 +++ b/x11-misc/easystroke/files/easystroke-0.6.0-cxx11.patch
93 @@ -0,0 +1,18 @@
94 +diff -uprb easystroke-0.6.0.orig/actions.cc easystroke-0.6.0/actions.cc
95 +--- easystroke-0.6.0.orig/actions.cc 2013-03-27 17:52:38.000000000 +0200
96 ++++ easystroke-0.6.0/actions.cc 2015-12-07 22:07:17.720041171 +0200
97 +@@ -51,10 +51,11 @@ void TreeViewMulti::on_drag_begin(const
98 + context->set_icon(pb, pb->get_width(), pb->get_height());
99 + }
100 +
101 +-bool negate(bool b) { return !b; }
102 +-
103 + TreeViewMulti::TreeViewMulti() : Gtk::TreeView(), pending(false) {
104 +- get_selection()->set_select_function(sigc::group(&negate, sigc::ref(pending)));
105 ++ get_selection()->set_select_function(
106 ++ [this](Glib::RefPtr<Gtk::TreeModel> const&, Gtk::TreeModel::Path const&, bool) {
107 ++ return !pending;
108 ++ });
109 + }
110 +
111 + enum Type { COMMAND, KEY, TEXT, SCROLL, IGNORE, BUTTON, MISC };