1 |
commit: fbbdab8fc5e58fa23e21855e8feecbe9ce33097e |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Aug 4 19:06:19 2016 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Aug 4 19:15:33 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbbdab8f |
7 |
|
8 |
app-misc/workrave: Version bump, autoconf-archive needed (#580460 by Jeremy Stephens). |
9 |
|
10 |
Package-Manager: portage-2.3.0 |
11 |
|
12 |
app-misc/workrave/Manifest | 1 + |
13 |
.../files/workrave-1.10.15-gsettings.patch | 31 ++++++ |
14 |
.../workrave-1.10.6-automagic-gstreamer.patch | 4 +- |
15 |
app-misc/workrave/workrave-1.10.15.ebuild | 109 +++++++++++++++++++++ |
16 |
4 files changed, 143 insertions(+), 2 deletions(-) |
17 |
|
18 |
diff --git a/app-misc/workrave/Manifest b/app-misc/workrave/Manifest |
19 |
index cba7c27..c1c939b 100644 |
20 |
--- a/app-misc/workrave/Manifest |
21 |
+++ b/app-misc/workrave/Manifest |
22 |
@@ -1 +1,2 @@ |
23 |
+DIST workrave-1.10.15.tar.gz 6375380 SHA256 fa05bedbb32baae9d22ef2b1ac25e90bc9f1363ce588b396190b0240559f471c SHA512 e741f5d0748ffaba9c8e69bcbd67f7b371424423ec8cea81d082462e8c33751c3e322301ae0749037668dc53cab28b19ec2b162f98eb7afbbd5ab85bae33cf7e WHIRLPOOL 02c9f25f06ae0753f7edc418ade789c82bf39736b975e755265a86b2677842098efc966530cf9063401e2e63d9f1670e4fd4ba5d9b635d05faa5cc71b9146afa |
24 |
DIST workrave-1.10.8.tar.gz 6370506 SHA256 15e0c87c2172dc249031d97d4020ee4a47ea9073aa26dc06a4b15e91abf88479 SHA512 67c3725627b42c5b32a61eb4e62e45b4a802806217ddb311ee2b610d281f9c521f69cc4da0db5ded63c99691d9f5c272493a911ba504f335508ac64945cd7403 WHIRLPOOL 9fe2c6dbd2abacc76190dac94ed334bb8ecad1dfb714afa6fee69cbbeae3981f960113dce52b54fb6935bacb29d7ad3939b4aba6ef6323b93d05b56b166edb7e |
25 |
|
26 |
diff --git a/app-misc/workrave/files/workrave-1.10.15-gsettings.patch b/app-misc/workrave/files/workrave-1.10.15-gsettings.patch |
27 |
new file mode 100644 |
28 |
index 0000000..6203761 |
29 |
--- /dev/null |
30 |
+++ b/app-misc/workrave/files/workrave-1.10.15-gsettings.patch |
31 |
@@ -0,0 +1,31 @@ |
32 |
+From e0516ff9a2a49b3fa5698ab1902b2579609c45b5 Mon Sep 17 00:00:00 2001 |
33 |
+From: Sebastian Wagner <sebix@×××××.at> |
34 |
+Date: Fri, 13 May 2016 23:32:35 +0200 |
35 |
+Subject: [PATCH] Fix ifdef in GSettings hh, so gconf headers work |
36 |
+ |
37 |
+Signed-off-by: Sebastian Wagner <sebix@×××××.at> |
38 |
+--- |
39 |
+ backend/src/GSettingsConfigurator.hh | 6 +++--- |
40 |
+ 1 file changed, 3 insertions(+), 3 deletions(-) |
41 |
+ |
42 |
+diff --git a/backend/src/GSettingsConfigurator.hh b/backend/src/GSettingsConfigurator.hh |
43 |
+index 9b8c5d6..3974396 100644 |
44 |
+--- a/backend/src/GSettingsConfigurator.hh |
45 |
++++ b/backend/src/GSettingsConfigurator.hh |
46 |
+@@ -17,8 +17,8 @@ |
47 |
+ // along with this program. If not, see <http://www.gnu.org/licenses/>. |
48 |
+ // |
49 |
+ |
50 |
+-#ifndef GCONFCONFIGURATOR_HH |
51 |
+-#define GCONFCONFIGURATOR_HH |
52 |
++#ifndef GSETTINGSCONFIGURATOR_HH |
53 |
++#define GSETTINGSCONFIGURATOR_HH |
54 |
+ |
55 |
+ #include <string> |
56 |
+ #include <map> |
57 |
+@@ -69,4 +69,4 @@ private: |
58 |
+ }; |
59 |
+ |
60 |
+ |
61 |
+-#endif // GCONFCONFIGURATOR_HH |
62 |
++#endif // GGSETTINGSCONFIGURATOR_HH |
63 |
|
64 |
diff --git a/app-misc/workrave/files/workrave-1.10.6-automagic-gstreamer.patch b/app-misc/workrave/files/workrave-1.10.6-automagic-gstreamer.patch |
65 |
index 37e43db..76c2e67 100644 |
66 |
--- a/app-misc/workrave/files/workrave-1.10.6-automagic-gstreamer.patch |
67 |
+++ b/app-misc/workrave/files/workrave-1.10.6-automagic-gstreamer.patch |
68 |
@@ -1,5 +1,5 @@ |
69 |
---- configure.ac.old 2015-10-24 10:11:47.469290574 +0200 |
70 |
-+++ configure.ac 2015-10-24 10:14:35.918680898 +0200 |
71 |
+--- a/configure.ac.old 2015-10-24 10:11:47.469290574 +0200 |
72 |
++++ b/configure.ac 2015-10-24 10:14:35.918680898 +0200 |
73 |
@@ -884,20 +884,12 @@ |
74 |
if test "x$enable_gstreamer" != "xno"; |
75 |
then |
76 |
|
77 |
diff --git a/app-misc/workrave/workrave-1.10.15.ebuild b/app-misc/workrave/workrave-1.10.15.ebuild |
78 |
new file mode 100644 |
79 |
index 0000000..07ffa76 |
80 |
--- /dev/null |
81 |
+++ b/app-misc/workrave/workrave-1.10.15.ebuild |
82 |
@@ -0,0 +1,109 @@ |
83 |
+# Copyright 1999-2016 Gentoo Foundation |
84 |
+# Distributed under the terms of the GNU General Public License v2 |
85 |
+# $Id$ |
86 |
+ |
87 |
+EAPI=6 |
88 |
+PYTHON_COMPAT=( python2_7 ) |
89 |
+ |
90 |
+inherit autotools gnome2 python-single-r1 versionator vcs-snapshot |
91 |
+ |
92 |
+DESCRIPTION="Helpful utility to attack Repetitive Strain Injury (RSI)" |
93 |
+HOMEPAGE="http://www.workrave.org/" |
94 |
+MY_PV=$(replace_all_version_separators '_') |
95 |
+SRC_URI="https://github.com/rcaelers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" |
96 |
+ |
97 |
+LICENSE="GPL-3+" |
98 |
+SLOT="0" |
99 |
+KEYWORDS="~amd64 ~ppc ~x86" |
100 |
+ |
101 |
+# dbus support looks to be used only for trying to use panel applets on gnome3! |
102 |
+IUSE="ayatana doc gnome gstreamer introspection mate nls pulseaudio test xfce" |
103 |
+REQUIRED_USE="ayatana? ( introspection )" |
104 |
+ |
105 |
+RDEPEND=" |
106 |
+ >=dev-libs/glib-2.28.0:2 |
107 |
+ >=x11-libs/gtk+-3.0:3[introspection?] |
108 |
+ >=dev-cpp/gtkmm-3.0.0:3.0 |
109 |
+ >=dev-cpp/glibmm-2.28.0:2 |
110 |
+ >=dev-libs/libsigc++-2.2.4.2:2 |
111 |
+ ayatana? ( |
112 |
+ >=dev-libs/libdbusmenu-0.4[gtk3,introspection] |
113 |
+ >=dev-libs/libindicator-0.4:3 ) |
114 |
+ gnome? ( >=gnome-base/gnome-shell-3.6.2 ) |
115 |
+ gstreamer? ( |
116 |
+ media-libs/gstreamer:1.0[introspection?] |
117 |
+ media-libs/gst-plugins-base:1.0[introspection?] |
118 |
+ media-plugins/gst-plugins-meta:1.0 ) |
119 |
+ introspection? ( dev-libs/gobject-introspection:= ) |
120 |
+ mate? ( mate-base/mate-applets ) |
121 |
+ pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) |
122 |
+ xfce? ( |
123 |
+ >=x11-libs/gtk+-2.6.0:2[introspection?] |
124 |
+ >=xfce-base/xfce4-panel-4.4 ) |
125 |
+ x11-libs/libXScrnSaver |
126 |
+ x11-libs/libSM |
127 |
+ x11-libs/libX11 |
128 |
+ x11-libs/libXtst |
129 |
+ x11-libs/libXt |
130 |
+ x11-libs/libXmu |
131 |
+" |
132 |
+# dbus? ( |
133 |
+# >=sys-apps/dbus-1.2 |
134 |
+# dev-libs/dbus-glib ) |
135 |
+ |
136 |
+DEPEND="${RDEPEND} |
137 |
+ dev-python/cheetah |
138 |
+ >=dev-util/intltool-0.40.0 |
139 |
+ sys-devel/autoconf-archive |
140 |
+ x11-proto/xproto |
141 |
+ x11-proto/inputproto |
142 |
+ x11-proto/recordproto |
143 |
+ virtual/pkgconfig |
144 |
+ doc? ( |
145 |
+ app-text/docbook-sgml-utils |
146 |
+ app-text/xmlto ) |
147 |
+ nls? ( >=sys-devel/gettext-0.17 ) |
148 |
+" |
149 |
+ |
150 |
+pkg_setup() { |
151 |
+ python-single-r1_pkg_setup |
152 |
+} |
153 |
+ |
154 |
+src_unpack() { |
155 |
+ vcs-snapshot_src_unpack |
156 |
+} |
157 |
+ |
158 |
+src_prepare() { |
159 |
+ # Fix gstreamer slot automagic dependency, bug #563584 |
160 |
+ # http://issues.workrave.org/show_bug.cgi?id=1179 |
161 |
+ eapply "${FILESDIR}"/${PN}-1.10.6-automagic-gstreamer.patch |
162 |
+ |
163 |
+ # Fix build issue, fixed in next release. |
164 |
+ eapply "${FILESDIR}"/${P}-gsettings.patch |
165 |
+ |
166 |
+ eautoreconf |
167 |
+ gnome2_src_prepare |
168 |
+} |
169 |
+ |
170 |
+src_configure() { |
171 |
+ # gnet ("distribution") is dead for ages and other distributions stopped |
172 |
+ # relying on it for such time too. |
173 |
+ gnome2_src_configure \ |
174 |
+ --disable-dbus \ |
175 |
+ --disable-distribution \ |
176 |
+ --enable-exercises \ |
177 |
+ --disable-experimental \ |
178 |
+ --disable-gnome2 \ |
179 |
+ --disable-static \ |
180 |
+ --disable-xml \ |
181 |
+ $(use_enable ayatana indicator) \ |
182 |
+ $(use_enable doc manual) \ |
183 |
+ $(use_enable gnome gnome3) \ |
184 |
+ $(use_enable gstreamer) \ |
185 |
+ $(use_enable introspection) \ |
186 |
+ $(use_enable mate) \ |
187 |
+ $(use_enable nls) \ |
188 |
+ $(use_enable pulseaudio pulse) \ |
189 |
+ $(use_enable test tests) \ |
190 |
+ $(use_enable xfce) |
191 |
+} |