1 |
commit: ff6e5e947d763336a125b9e4ad0fd42e822aa61b |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 8 08:46:18 2016 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 8 09:50:06 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff6e5e94 |
7 |
|
8 |
gnome-extra/libgda: Upstream patches to fix vala detection and allow the usage of newer slots. |
9 |
|
10 |
Package-Manager: portage-2.3.1 |
11 |
|
12 |
.../libgda/files/libgda-5.2.4-vala-check.patch | 35 ++++ |
13 |
gnome-extra/libgda/libgda-5.2.4-r2.ebuild | 182 +++++++++++++++++++++ |
14 |
2 files changed, 217 insertions(+) |
15 |
|
16 |
diff --git a/gnome-extra/libgda/files/libgda-5.2.4-vala-check.patch b/gnome-extra/libgda/files/libgda-5.2.4-vala-check.patch |
17 |
new file mode 100644 |
18 |
index 00000000..c586d49 |
19 |
--- /dev/null |
20 |
+++ b/gnome-extra/libgda/files/libgda-5.2.4-vala-check.patch |
21 |
@@ -0,0 +1,35 @@ |
22 |
+From e72c59062f39e89569524f4556cbddb8d00119f4 Mon Sep 17 00:00:00 2001 |
23 |
+From: Vivien Malerba <malerba@××××××××.org> |
24 |
+Date: Sun, 7 Feb 2016 20:49:07 +0100 |
25 |
+Subject: Re-correction for bug #761424 |
26 |
+ |
27 |
+Automatic detection of API version |
28 |
+--- |
29 |
+ configure.ac | 8 ++++---- |
30 |
+ 1 file changed, 4 insertions(+), 4 deletions(-) |
31 |
+ |
32 |
+diff --git a/configure.ac b/configure.ac |
33 |
+index 152f676..9898a32 100644 |
34 |
+--- a/configure.ac |
35 |
++++ b/configure.ac |
36 |
+@@ -571,13 +571,13 @@ fi |
37 |
+ vala_api="No Vala bindings will be generated" |
38 |
+ if test "x$enable_vala" = "xyes" |
39 |
+ then |
40 |
+- AM_PROG_VALAC([0.26.0]) |
41 |
++ AM_PROG_VALAC() |
42 |
+ if test "x$VALA_API_VERSION" = "x" |
43 |
+ then |
44 |
+- VAPIGEN_CHECK([0.26.0],[0.26],,no) |
45 |
+- vala_api="0.26 (Default)" |
46 |
++ VAPIGEN_CHECK(,,,no) |
47 |
++ vala_api="`pkg-config --modversion vapigen` (Default)" |
48 |
+ else |
49 |
+- VAPIGEN_CHECK([0.26.0],$VALA_API_VERSION,,no) |
50 |
++ VAPIGEN_CHECK(,$VALA_API_VERSION,,no) |
51 |
+ vala_api=$VALA_API_VERSION |
52 |
+ fi |
53 |
+ else |
54 |
+-- |
55 |
+cgit v0.12 |
56 |
+ |
57 |
|
58 |
diff --git a/gnome-extra/libgda/libgda-5.2.4-r2.ebuild b/gnome-extra/libgda/libgda-5.2.4-r2.ebuild |
59 |
new file mode 100644 |
60 |
index 00000000..5210527 |
61 |
--- /dev/null |
62 |
+++ b/gnome-extra/libgda/libgda-5.2.4-r2.ebuild |
63 |
@@ -0,0 +1,182 @@ |
64 |
+# Copyright 1999-2016 Gentoo Foundation |
65 |
+# Distributed under the terms of the GNU General Public License v2 |
66 |
+# $Id$ |
67 |
+ |
68 |
+EAPI=6 |
69 |
+GNOME2_LA_PUNT="yes" |
70 |
+PYTHON_COMPAT=( python2_7 ) |
71 |
+VALA_USE_DEPEND="vapigen" |
72 |
+ |
73 |
+inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python-single-r1 vala |
74 |
+ |
75 |
+DESCRIPTION="GNOME database access library" |
76 |
+HOMEPAGE="http://www.gnome-db.org/" |
77 |
+LICENSE="GPL-2+ LGPL-2+" |
78 |
+ |
79 |
+IUSE="berkdb canvas debug firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres reports sourceview ssl vala" |
80 |
+REQUIRED_USE=" |
81 |
+ reports? ( ${PYTHON_REQUIRED_USE} ) |
82 |
+ canvas? ( gtk ) |
83 |
+ graphviz? ( gtk ) |
84 |
+ sourceview? ( gtk ) |
85 |
+ vala? ( introspection ) |
86 |
+" |
87 |
+# firebird license is not GPL compatible |
88 |
+ |
89 |
+SLOT="5/4" # subslot = libgda-5.0 soname version |
90 |
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
91 |
+ |
92 |
+RDEPEND=" |
93 |
+ app-text/iso-codes |
94 |
+ >=dev-libs/glib-2.32:2 |
95 |
+ >=dev-libs/libxml2-2 |
96 |
+ dev-libs/libxslt |
97 |
+ sys-libs/readline:0= |
98 |
+ sys-libs/ncurses:0= |
99 |
+ berkdb? ( sys-libs/db:* ) |
100 |
+ firebird? ( dev-db/firebird ) |
101 |
+ gnome-keyring? ( app-crypt/libsecret ) |
102 |
+ gtk? ( |
103 |
+ >=x11-libs/gtk+-3.0.0:3 |
104 |
+ canvas? ( x11-libs/goocanvas:2.0= ) |
105 |
+ sourceview? ( x11-libs/gtksourceview:3.0 ) |
106 |
+ graphviz? ( media-gfx/graphviz ) |
107 |
+ ) |
108 |
+ http? ( >=net-libs/libsoup-2.24:2.4 ) |
109 |
+ introspection? ( >=dev-libs/gobject-introspection-1.30:= ) |
110 |
+ json? ( dev-libs/json-glib ) |
111 |
+ ldap? ( net-nds/openldap:= ) |
112 |
+ mdb? ( >app-office/mdbtools-0.5:= ) |
113 |
+ mysql? ( virtual/mysql:= ) |
114 |
+ postgres? ( dev-db/postgresql:= ) |
115 |
+ reports? ( |
116 |
+ ${PYTHON_DEPS} |
117 |
+ dev-java/fop |
118 |
+ dev-python/reportlab ) |
119 |
+ ssl? ( dev-libs/openssl:= ) |
120 |
+ >=dev-db/sqlite-3.6.22:3= |
121 |
+ vala? ( dev-libs/libgee:0.8 ) |
122 |
+" |
123 |
+ |
124 |
+# java dep shouldn't rely on slots, bug #450004 |
125 |
+DEPEND="${RDEPEND} |
126 |
+ >=app-text/gnome-doc-utils-0.9 |
127 |
+ app-text/yelp-tools |
128 |
+ dev-util/gtk-doc-am |
129 |
+ >=dev-util/intltool-0.40.6 |
130 |
+ virtual/pkgconfig |
131 |
+ java? ( >=virtual/jdk-1.6 ) |
132 |
+ vala? ( $(vala_depend) ) |
133 |
+" |
134 |
+ |
135 |
+# FIXME: lots of tests failing. Check if they still fail in 5.1.2 |
136 |
+# firebird support bindist-restricted because it is not GPL compatible |
137 |
+RESTRICT=" |
138 |
+ test |
139 |
+ firebird? ( bindist ) |
140 |
+" |
141 |
+ |
142 |
+pkg_setup() { |
143 |
+ java-pkg-opt-2_pkg_setup |
144 |
+ use reports && python-single-r1_pkg_setup |
145 |
+} |
146 |
+ |
147 |
+src_prepare() { |
148 |
+ # Fix compilation with -Werror=format-security (from 'master') |
149 |
+ eapply "${FILESDIR}"/${PN}-5.2.4-format-security.patch |
150 |
+ |
151 |
+ # Support JRE 1.8 (from Fedora) |
152 |
+ eapply "${FILESDIR}"/${PN}-5.2.4-jre18.patch |
153 |
+ |
154 |
+ # Fix vala test, |
155 |
+ # https://bugzilla.gnome.org/show_bug.cgi?id=761424 |
156 |
+ eapply "${FILESDIR}"/${PN}-5.2.4-vala-check.patch |
157 |
+ |
158 |
+ use berkdb && append-cppflags "-I$(db_includedir)" |
159 |
+ |
160 |
+ use reports || |
161 |
+ sed -e '/SUBDIRS =/ s/trml2html//' \ |
162 |
+ -e '/SUBDIRS =/ s/trml2pdf//' \ |
163 |
+ -i libgda-report/RML/Makefile.{am,in} || die |
164 |
+ |
165 |
+ # Prevent file collisions with libgda:4 |
166 |
+ eapply "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch" |
167 |
+ eapply "${FILESDIR}/${PN}-4.99.1-control-center-icon-collision.patch" |
168 |
+ # Move files with mv (since epatch can't handle rename diffs) and |
169 |
+ # update pre-generated gtk-doc files (for non-git versions of libgda) |
170 |
+ local f |
171 |
+ for f in tools/browser/doc/gda-browser* ; do |
172 |
+ mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed" |
173 |
+ done |
174 |
+ for f in tools/browser/doc/html/gda-browser.devhelp* ; do |
175 |
+ sed -e 's:name="gda-browser":name="gda-browser-5.0":' \ |
176 |
+ -i ${f} || die "sed ${f} failed" |
177 |
+ mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed" |
178 |
+ done |
179 |
+ for f in control-center/data/*_gda-control-center.png ; do |
180 |
+ mv ${f} ${f/_gda-control-center.png/_gda-control-center-5.0.png} || |
181 |
+ die "mv ${f} failed" |
182 |
+ done |
183 |
+ |
184 |
+ eautoreconf |
185 |
+ gnome2_src_prepare |
186 |
+ java-pkg-opt-2_src_prepare |
187 |
+ use vala && vala_src_prepare |
188 |
+} |
189 |
+ |
190 |
+src_configure() { |
191 |
+ local myconf=( ) |
192 |
+ if use introspection ; then |
193 |
+ myconf+=( $(use_enable gtk gdaui-gi) ) |
194 |
+ else |
195 |
+ myconf+=( --disable-gdaui-gi ) |
196 |
+ fi |
197 |
+ if use vala ; then |
198 |
+ myconf+=( $(use_enable gtk gdaui-vala) ) |
199 |
+ else |
200 |
+ myconf+=( --disable-gdaui-vala ) |
201 |
+ fi |
202 |
+ |
203 |
+ gnome2_src_configure \ |
204 |
+ --with-help \ |
205 |
+ --disable-default-binary \ |
206 |
+ --disable-static \ |
207 |
+ --enable-system-sqlite \ |
208 |
+ $(use_with berkdb bdb /usr) \ |
209 |
+ $(use_with canvas goocanvas) \ |
210 |
+ $(use_enable debug) \ |
211 |
+ $(use_with firebird firebird /usr) \ |
212 |
+ $(use_with gnome-keyring libsecret) \ |
213 |
+ $(use_with graphviz) \ |
214 |
+ $(use_with gtk ui) \ |
215 |
+ $(use_with http libsoup) \ |
216 |
+ $(use_enable introspection) \ |
217 |
+ $(use_enable introspection gda-gi) \ |
218 |
+ "$(use_with java java $JAVA_HOME)" \ |
219 |
+ $(use_enable json) \ |
220 |
+ $(use_with ldap) \ |
221 |
+ $(use_with mdb mdb /usr) \ |
222 |
+ $(use_with mysql mysql /usr) \ |
223 |
+ $(use_with oci8 oracle) \ |
224 |
+ $(use_with postgres postgres /usr) \ |
225 |
+ $(use_enable ssl crypto) \ |
226 |
+ $(use_with sourceview gtksourceview) \ |
227 |
+ $(use_enable vala) \ |
228 |
+ $(use_enable vala vala-extensions) \ |
229 |
+ ${myconf[@]} |
230 |
+} |
231 |
+ |
232 |
+pkg_preinst() { |
233 |
+ gnome2_pkg_preinst |
234 |
+ java-pkg-opt-2_pkg_preinst |
235 |
+} |
236 |
+ |
237 |
+src_install() { |
238 |
+ gnome2_src_install |
239 |
+ if use reports; then |
240 |
+ for t in trml2{html,pdf}; do |
241 |
+ python_scriptinto /usr/share/libgda-5.0/gda_${t} |
242 |
+ python_doscript libgda-report/RML/${t}/${t}.py |
243 |
+ done |
244 |
+ fi |
245 |
+} |