* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/files/, gnome-extra/libgda/
@ 2016-10-08 9:51 Pacho Ramos
0 siblings, 0 replies; 4+ messages in thread
From: Pacho Ramos @ 2016-10-08 9:51 UTC (permalink / raw
To: gentoo-commits
commit: ff6e5e947d763336a125b9e4ad0fd42e822aa61b
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 8 08:46:18 2016 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Oct 8 09:50:06 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff6e5e94
gnome-extra/libgda: Upstream patches to fix vala detection and allow the usage of newer slots.
Package-Manager: portage-2.3.1
.../libgda/files/libgda-5.2.4-vala-check.patch | 35 ++++
| 182 +++++++++++++++++++++
2 files changed, 217 insertions(+)
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
new file mode 100644
index 00000000..c586d49
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-5.2.4-vala-check.patch
@@ -0,0 +1,35 @@
+From e72c59062f39e89569524f4556cbddb8d00119f4 Mon Sep 17 00:00:00 2001
+From: Vivien Malerba <malerba@gnome-db.org>
+Date: Sun, 7 Feb 2016 20:49:07 +0100
+Subject: Re-correction for bug #761424
+
+Automatic detection of API version
+---
+ configure.ac | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 152f676..9898a32 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -571,13 +571,13 @@ fi
+ vala_api="No Vala bindings will be generated"
+ if test "x$enable_vala" = "xyes"
+ then
+- AM_PROG_VALAC([0.26.0])
++ AM_PROG_VALAC()
+ if test "x$VALA_API_VERSION" = "x"
+ then
+- VAPIGEN_CHECK([0.26.0],[0.26],,no)
+- vala_api="0.26 (Default)"
++ VAPIGEN_CHECK(,,,no)
++ vala_api="`pkg-config --modversion vapigen` (Default)"
+ else
+- VAPIGEN_CHECK([0.26.0],$VALA_API_VERSION,,no)
++ VAPIGEN_CHECK(,$VALA_API_VERSION,,no)
+ vala_api=$VALA_API_VERSION
+ fi
+ else
+--
+cgit v0.12
+
--git a/gnome-extra/libgda/libgda-5.2.4-r2.ebuild b/gnome-extra/libgda/libgda-5.2.4-r2.ebuild
new file mode 100644
index 00000000..5210527
--- /dev/null
+++ b/gnome-extra/libgda/libgda-5.2.4-r2.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python-single-r1 vala
+
+DESCRIPTION="GNOME database access library"
+HOMEPAGE="http://www.gnome-db.org/"
+LICENSE="GPL-2+ LGPL-2+"
+
+IUSE="berkdb canvas debug firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres reports sourceview ssl vala"
+REQUIRED_USE="
+ reports? ( ${PYTHON_REQUIRED_USE} )
+ canvas? ( gtk )
+ graphviz? ( gtk )
+ sourceview? ( gtk )
+ vala? ( introspection )
+"
+# firebird license is not GPL compatible
+
+SLOT="5/4" # subslot = libgda-5.0 soname version
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="
+ app-text/iso-codes
+ >=dev-libs/glib-2.32:2
+ >=dev-libs/libxml2-2
+ dev-libs/libxslt
+ sys-libs/readline:0=
+ sys-libs/ncurses:0=
+ berkdb? ( sys-libs/db:* )
+ firebird? ( dev-db/firebird )
+ gnome-keyring? ( app-crypt/libsecret )
+ gtk? (
+ >=x11-libs/gtk+-3.0.0:3
+ canvas? ( x11-libs/goocanvas:2.0= )
+ sourceview? ( x11-libs/gtksourceview:3.0 )
+ graphviz? ( media-gfx/graphviz )
+ )
+ http? ( >=net-libs/libsoup-2.24:2.4 )
+ introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+ json? ( dev-libs/json-glib )
+ ldap? ( net-nds/openldap:= )
+ mdb? ( >app-office/mdbtools-0.5:= )
+ mysql? ( virtual/mysql:= )
+ postgres? ( dev-db/postgresql:= )
+ reports? (
+ ${PYTHON_DEPS}
+ dev-java/fop
+ dev-python/reportlab )
+ ssl? ( dev-libs/openssl:= )
+ >=dev-db/sqlite-3.6.22:3=
+ vala? ( dev-libs/libgee:0.8 )
+"
+
+# java dep shouldn't rely on slots, bug #450004
+DEPEND="${RDEPEND}
+ >=app-text/gnome-doc-utils-0.9
+ app-text/yelp-tools
+ dev-util/gtk-doc-am
+ >=dev-util/intltool-0.40.6
+ virtual/pkgconfig
+ java? ( >=virtual/jdk-1.6 )
+ vala? ( $(vala_depend) )
+"
+
+# FIXME: lots of tests failing. Check if they still fail in 5.1.2
+# firebird support bindist-restricted because it is not GPL compatible
+RESTRICT="
+ test
+ firebird? ( bindist )
+"
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ use reports && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ # Fix compilation with -Werror=format-security (from 'master')
+ eapply "${FILESDIR}"/${PN}-5.2.4-format-security.patch
+
+ # Support JRE 1.8 (from Fedora)
+ eapply "${FILESDIR}"/${PN}-5.2.4-jre18.patch
+
+ # Fix vala test,
+ # https://bugzilla.gnome.org/show_bug.cgi?id=761424
+ eapply "${FILESDIR}"/${PN}-5.2.4-vala-check.patch
+
+ use berkdb && append-cppflags "-I$(db_includedir)"
+
+ use reports ||
+ sed -e '/SUBDIRS =/ s/trml2html//' \
+ -e '/SUBDIRS =/ s/trml2pdf//' \
+ -i libgda-report/RML/Makefile.{am,in} || die
+
+ # Prevent file collisions with libgda:4
+ eapply "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
+ eapply "${FILESDIR}/${PN}-4.99.1-control-center-icon-collision.patch"
+ # Move files with mv (since epatch can't handle rename diffs) and
+ # update pre-generated gtk-doc files (for non-git versions of libgda)
+ local f
+ for f in tools/browser/doc/gda-browser* ; do
+ mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
+ done
+ for f in tools/browser/doc/html/gda-browser.devhelp* ; do
+ sed -e 's:name="gda-browser":name="gda-browser-5.0":' \
+ -i ${f} || die "sed ${f} failed"
+ mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
+ done
+ for f in control-center/data/*_gda-control-center.png ; do
+ mv ${f} ${f/_gda-control-center.png/_gda-control-center-5.0.png} ||
+ die "mv ${f} failed"
+ done
+
+ eautoreconf
+ gnome2_src_prepare
+ java-pkg-opt-2_src_prepare
+ use vala && vala_src_prepare
+}
+
+src_configure() {
+ local myconf=( )
+ if use introspection ; then
+ myconf+=( $(use_enable gtk gdaui-gi) )
+ else
+ myconf+=( --disable-gdaui-gi )
+ fi
+ if use vala ; then
+ myconf+=( $(use_enable gtk gdaui-vala) )
+ else
+ myconf+=( --disable-gdaui-vala )
+ fi
+
+ gnome2_src_configure \
+ --with-help \
+ --disable-default-binary \
+ --disable-static \
+ --enable-system-sqlite \
+ $(use_with berkdb bdb /usr) \
+ $(use_with canvas goocanvas) \
+ $(use_enable debug) \
+ $(use_with firebird firebird /usr) \
+ $(use_with gnome-keyring libsecret) \
+ $(use_with graphviz) \
+ $(use_with gtk ui) \
+ $(use_with http libsoup) \
+ $(use_enable introspection) \
+ $(use_enable introspection gda-gi) \
+ "$(use_with java java $JAVA_HOME)" \
+ $(use_enable json) \
+ $(use_with ldap) \
+ $(use_with mdb mdb /usr) \
+ $(use_with mysql mysql /usr) \
+ $(use_with oci8 oracle) \
+ $(use_with postgres postgres /usr) \
+ $(use_enable ssl crypto) \
+ $(use_with sourceview gtksourceview) \
+ $(use_enable vala) \
+ $(use_enable vala vala-extensions) \
+ ${myconf[@]}
+}
+
+pkg_preinst() {
+ gnome2_pkg_preinst
+ java-pkg-opt-2_pkg_preinst
+}
+
+src_install() {
+ gnome2_src_install
+ if use reports; then
+ for t in trml2{html,pdf}; do
+ python_scriptinto /usr/share/libgda-5.0/gda_${t}
+ python_doscript libgda-report/RML/${t}/${t}.py
+ done
+ fi
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/files/, gnome-extra/libgda/
@ 2019-05-18 21:24 Mart Raudsepp
0 siblings, 0 replies; 4+ messages in thread
From: Mart Raudsepp @ 2019-05-18 21:24 UTC (permalink / raw
To: gentoo-commits
commit: 0c4a13140429bfc8212ecab61fdd64898ef85c86
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat May 18 21:07:00 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat May 18 21:24:23 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c4a1314
gnome-extra/libgda: remove old
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
| 1 -
.../libgda/files/libgda-5.2.4-vala-check.patch | 35 ----
| 182 ---------------------
| 182 ---------------------
4 files changed, 400 deletions(-)
--git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index ab2677fd061..bf631978e8b 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -1,2 +1 @@
-DIST libgda-5.2.4.tar.xz 12320228 BLAKE2B 567b82934e9fe05abdd7405f17c3e8db1a335698236aed069c66037bb387f34adfc41eae7663d8cedb1ba97d2b54afda15280d745c574e5b28cb1856ff8376b1 SHA512 90449795a64136389c26ee4bbdbd5c1330d441e6c11ff15eff83d0ee39c4ce3abd686222aaa468995496ba1417c0fbc963898107f1806d80648cdc939d3c87cc
DIST libgda-5.2.8.tar.xz 12506208 BLAKE2B 7174aa862f04ec6c73fe98560914ee307afe75b9713adad70fa7dedf97fd4ddb79c98ad1e9a8919218f7453014d8e71e42730e168fae7c6ca0dc58ae99b0558e SHA512 6512d08df072dfc10837b71b2369ab538fa8bf0cdac51ecbb738a138f5b765f030fc7a88b14232eaab2724af8e749898da146bb63969983d3bcfeb11bc22aece
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
deleted file mode 100644
index c586d49356d..00000000000
--- a/gnome-extra/libgda/files/libgda-5.2.4-vala-check.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From e72c59062f39e89569524f4556cbddb8d00119f4 Mon Sep 17 00:00:00 2001
-From: Vivien Malerba <malerba@gnome-db.org>
-Date: Sun, 7 Feb 2016 20:49:07 +0100
-Subject: Re-correction for bug #761424
-
-Automatic detection of API version
----
- configure.ac | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 152f676..9898a32 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -571,13 +571,13 @@ fi
- vala_api="No Vala bindings will be generated"
- if test "x$enable_vala" = "xyes"
- then
-- AM_PROG_VALAC([0.26.0])
-+ AM_PROG_VALAC()
- if test "x$VALA_API_VERSION" = "x"
- then
-- VAPIGEN_CHECK([0.26.0],[0.26],,no)
-- vala_api="0.26 (Default)"
-+ VAPIGEN_CHECK(,,,no)
-+ vala_api="`pkg-config --modversion vapigen` (Default)"
- else
-- VAPIGEN_CHECK([0.26.0],$VALA_API_VERSION,,no)
-+ VAPIGEN_CHECK(,$VALA_API_VERSION,,no)
- vala_api=$VALA_API_VERSION
- fi
- else
---
-cgit v0.12
-
diff --git a/gnome-extra/libgda/libgda-5.2.4-r2.ebuild b/gnome-extra/libgda/libgda-5.2.4-r2.ebuild
deleted file mode 100644
index b45f3537357..00000000000
--- a/gnome-extra/libgda/libgda-5.2.4-r2.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python-single-r1 vala
-
-DESCRIPTION="GNOME database access library"
-HOMEPAGE="http://www.gnome-db.org/"
-LICENSE="GPL-2+ LGPL-2+"
-
-IUSE="berkdb canvas debug firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres reports sourceview ssl vala"
-REQUIRED_USE="
- reports? ( ${PYTHON_REQUIRED_USE} )
- canvas? ( gtk )
- graphviz? ( gtk )
- sourceview? ( gtk )
- vala? ( introspection )
-"
-# firebird license is not GPL compatible
-
-SLOT="5/4" # subslot = libgda-5.0 soname version
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-RDEPEND="
- app-text/iso-codes
- >=dev-libs/glib-2.32:2
- >=dev-libs/libxml2-2
- dev-libs/libxslt
- sys-libs/readline:0=
- sys-libs/ncurses:0=
- berkdb? ( sys-libs/db:* )
- firebird? ( dev-db/firebird )
- gnome-keyring? ( app-crypt/libsecret )
- gtk? (
- >=x11-libs/gtk+-3.0.0:3
- canvas? ( x11-libs/goocanvas:2.0= )
- sourceview? ( x11-libs/gtksourceview:3.0 )
- graphviz? ( media-gfx/graphviz )
- )
- http? ( >=net-libs/libsoup-2.24:2.4 )
- introspection? ( >=dev-libs/gobject-introspection-1.30:= )
- json? ( dev-libs/json-glib )
- ldap? ( net-nds/openldap:= )
- mdb? ( >app-office/mdbtools-0.5:= )
- mysql? ( virtual/mysql:= )
- postgres? ( dev-db/postgresql:= )
- reports? (
- ${PYTHON_DEPS}
- dev-java/fop
- dev-python/reportlab )
- ssl? ( <dev-libs/openssl-1.1:0= )
- >=dev-db/sqlite-3.6.22:3=
- vala? ( dev-libs/libgee:0.8 )
-"
-
-# java dep shouldn't rely on slots, bug #450004
-DEPEND="${RDEPEND}
- >=app-text/gnome-doc-utils-0.9
- app-text/yelp-tools
- dev-util/glib-utils
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.40.6
- virtual/pkgconfig
- java? ( >=virtual/jdk-1.6 )
- vala? ( $(vala_depend) )
-"
-
-# FIXME: lots of tests failing. Check if they still fail in 5.1.2
-# firebird support bindist-restricted because it is not GPL compatible
-RESTRICT="
- test
- firebird? ( bindist )
-"
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- use reports && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Fix compilation with -Werror=format-security (from 'master')
- eapply "${FILESDIR}"/${PN}-5.2.4-format-security.patch
-
- # Support JRE 1.8 (from Fedora)
- eapply "${FILESDIR}"/${PN}-5.2.4-jre18.patch
-
- # Fix vala test,
- # https://bugzilla.gnome.org/show_bug.cgi?id=761424
- eapply "${FILESDIR}"/${PN}-5.2.4-vala-check.patch
-
- use berkdb && append-cppflags "-I$(db_includedir)"
-
- use reports ||
- sed -e '/SUBDIRS =/ s/trml2html//' \
- -e '/SUBDIRS =/ s/trml2pdf//' \
- -i libgda-report/RML/Makefile.{am,in} || die
-
- # Prevent file collisions with libgda:4
- eapply "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
- eapply "${FILESDIR}/${PN}-4.99.1-control-center-icon-collision.patch"
- # Move files with mv (since epatch can't handle rename diffs) and
- # update pre-generated gtk-doc files (for non-git versions of libgda)
- local f
- for f in tools/browser/doc/gda-browser* ; do
- mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
- done
- for f in tools/browser/doc/html/gda-browser.devhelp* ; do
- sed -e 's:name="gda-browser":name="gda-browser-5.0":' \
- -i ${f} || die "sed ${f} failed"
- mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
- done
- for f in control-center/data/*_gda-control-center.png ; do
- mv ${f} ${f/_gda-control-center.png/_gda-control-center-5.0.png} ||
- die "mv ${f} failed"
- done
-
- eautoreconf
- gnome2_src_prepare
- java-pkg-opt-2_src_prepare
- use vala && vala_src_prepare
-}
-
-src_configure() {
- local myconf=( )
- if use introspection ; then
- myconf+=( $(use_enable gtk gdaui-gi) )
- else
- myconf+=( --disable-gdaui-gi )
- fi
- if use vala ; then
- myconf+=( $(use_enable gtk gdaui-vala) )
- else
- myconf+=( --disable-gdaui-vala )
- fi
-
- gnome2_src_configure \
- --with-help \
- --disable-default-binary \
- --disable-static \
- --enable-system-sqlite \
- $(use_with berkdb bdb /usr) \
- $(use_with canvas goocanvas) \
- $(use_enable debug) \
- $(use_with firebird firebird /usr) \
- $(use_with gnome-keyring libsecret) \
- $(use_with graphviz) \
- $(use_with gtk ui) \
- $(use_with http libsoup) \
- $(use_enable introspection) \
- $(use_enable introspection gda-gi) \
- "$(use_with java java $JAVA_HOME)" \
- $(use_enable json) \
- $(use_with ldap) \
- $(use_with mdb mdb /usr) \
- $(use_with mysql mysql /usr) \
- $(use_with oci8 oracle) \
- $(use_with postgres postgres /usr) \
- $(use_enable ssl crypto) \
- $(use_with sourceview gtksourceview) \
- $(use_enable vala) \
- $(use_enable vala vala-extensions) \
- ${myconf[@]}
-}
-
-pkg_preinst() {
- gnome2_pkg_preinst
- java-pkg-opt-2_pkg_preinst
-}
-
-src_install() {
- gnome2_src_install
- if use reports; then
- for t in trml2{html,pdf}; do
- python_scriptinto /usr/share/libgda-5.0/gda_${t}
- python_doscript libgda-report/RML/${t}/${t}.py
- done
- fi
-}
diff --git a/gnome-extra/libgda/libgda-5.2.4-r3.ebuild b/gnome-extra/libgda/libgda-5.2.4-r3.ebuild
deleted file mode 100644
index 17ea3fb66a1..00000000000
--- a/gnome-extra/libgda/libgda-5.2.4-r3.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python-single-r1 vala
-
-DESCRIPTION="GNOME database access library"
-HOMEPAGE="http://www.gnome-db.org/"
-LICENSE="GPL-2+ LGPL-2+"
-
-IUSE="berkdb canvas debug firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres reports sourceview ssl vala"
-REQUIRED_USE="
- reports? ( ${PYTHON_REQUIRED_USE} )
- canvas? ( gtk )
- graphviz? ( gtk )
- sourceview? ( gtk )
- vala? ( introspection )
-"
-# firebird license is not GPL compatible
-
-SLOT="5/4" # subslot = libgda-5.0 soname version
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-RDEPEND="
- app-text/iso-codes
- >=dev-libs/glib-2.32:2
- >=dev-libs/libxml2-2
- dev-libs/libxslt
- sys-libs/readline:0=
- sys-libs/ncurses:0=
- berkdb? ( sys-libs/db:* )
- firebird? ( dev-db/firebird )
- gnome-keyring? ( app-crypt/libsecret )
- gtk? (
- >=x11-libs/gtk+-3.0.0:3
- canvas? ( x11-libs/goocanvas:2.0= )
- sourceview? ( x11-libs/gtksourceview:3.0 )
- graphviz? ( media-gfx/graphviz )
- )
- http? ( >=net-libs/libsoup-2.24:2.4 )
- introspection? ( >=dev-libs/gobject-introspection-1.30:= )
- json? ( dev-libs/json-glib )
- ldap? ( net-nds/openldap:= )
- mdb? ( >app-office/mdbtools-0.5:= )
- mysql? ( dev-db/mysql-connector-c:0= )
- postgres? ( dev-db/postgresql:= )
- reports? (
- ${PYTHON_DEPS}
- dev-java/fop
- dev-python/reportlab )
- ssl? ( <dev-libs/openssl-1.1:0= )
- >=dev-db/sqlite-3.6.22:3=
- vala? ( dev-libs/libgee:0.8 )
-"
-
-# java dep shouldn't rely on slots, bug #450004
-DEPEND="${RDEPEND}
- >=app-text/gnome-doc-utils-0.9
- app-text/yelp-tools
- dev-util/glib-utils
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.40.6
- virtual/pkgconfig
- java? ( >=virtual/jdk-1.6 )
- vala? ( $(vala_depend) )
-"
-
-# FIXME: lots of tests failing. Check if they still fail in 5.1.2
-# firebird support bindist-restricted because it is not GPL compatible
-RESTRICT="
- test
- firebird? ( bindist )
-"
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- use reports && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Fix compilation with -Werror=format-security (from 'master')
- eapply "${FILESDIR}"/${PN}-5.2.4-format-security.patch
-
- # Support JRE 1.8 (from Fedora)
- eapply "${FILESDIR}"/${PN}-5.2.4-jre18.patch
-
- # Fix vala test,
- # https://bugzilla.gnome.org/show_bug.cgi?id=761424
- eapply "${FILESDIR}"/${PN}-5.2.4-vala-check.patch
-
- use berkdb && append-cppflags "-I$(db_includedir)"
-
- use reports ||
- sed -e '/SUBDIRS =/ s/trml2html//' \
- -e '/SUBDIRS =/ s/trml2pdf//' \
- -i libgda-report/RML/Makefile.{am,in} || die
-
- # Prevent file collisions with libgda:4
- eapply "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
- eapply "${FILESDIR}/${PN}-4.99.1-control-center-icon-collision.patch"
- # Move files with mv (since epatch can't handle rename diffs) and
- # update pre-generated gtk-doc files (for non-git versions of libgda)
- local f
- for f in tools/browser/doc/gda-browser* ; do
- mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
- done
- for f in tools/browser/doc/html/gda-browser.devhelp* ; do
- sed -e 's:name="gda-browser":name="gda-browser-5.0":' \
- -i ${f} || die "sed ${f} failed"
- mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
- done
- for f in control-center/data/*_gda-control-center.png ; do
- mv ${f} ${f/_gda-control-center.png/_gda-control-center-5.0.png} ||
- die "mv ${f} failed"
- done
-
- eautoreconf
- gnome2_src_prepare
- java-pkg-opt-2_src_prepare
- use vala && vala_src_prepare
-}
-
-src_configure() {
- local myconf=( )
- if use introspection ; then
- myconf+=( $(use_enable gtk gdaui-gi) )
- else
- myconf+=( --disable-gdaui-gi )
- fi
- if use vala ; then
- myconf+=( $(use_enable gtk gdaui-vala) )
- else
- myconf+=( --disable-gdaui-vala )
- fi
-
- gnome2_src_configure \
- --with-help \
- --disable-default-binary \
- --disable-static \
- --enable-system-sqlite \
- $(use_with berkdb bdb /usr) \
- $(use_with canvas goocanvas) \
- $(use_enable debug) \
- $(use_with firebird firebird /usr) \
- $(use_with gnome-keyring libsecret) \
- $(use_with graphviz) \
- $(use_with gtk ui) \
- $(use_with http libsoup) \
- $(use_enable introspection) \
- $(use_enable introspection gda-gi) \
- "$(use_with java java $JAVA_HOME)" \
- $(use_enable json) \
- $(use_with ldap) \
- $(use_with mdb mdb /usr) \
- $(use_with mysql mysql /usr) \
- $(use_with oci8 oracle) \
- $(use_with postgres postgres /usr) \
- $(use_enable ssl crypto) \
- $(use_with sourceview gtksourceview) \
- $(use_enable vala) \
- $(use_enable vala vala-extensions) \
- ${myconf[@]}
-}
-
-pkg_preinst() {
- gnome2_pkg_preinst
- java-pkg-opt-2_pkg_preinst
-}
-
-src_install() {
- gnome2_src_install
- if use reports; then
- for t in trml2{html,pdf}; do
- python_scriptinto /usr/share/libgda-5.0/gda_${t}
- python_doscript libgda-report/RML/${t}/${t}.py
- done
- fi
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/files/, gnome-extra/libgda/
@ 2021-09-25 2:50 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-09-25 2:50 UTC (permalink / raw
To: gentoo-commits
commit: 1a2c12ba5c70d6887856c59e6c1b4e2633f9a441
Author: shimataro <shimataro <AT> zelkova <DOT> cc>
AuthorDate: Wed Sep 22 21:19:37 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 25 02:45:57 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a2c12ba
gnome-extra/libgda: fix build with newer MySQL
Thanks-to: Attila Tóth <atoth <AT> atoth.sote.hu>
Closes: https://bugs.gentoo.org/692672
Signed-off-by: shimataro <shimataro <AT> zelkova.cc>
Closes: https://github.com/gentoo/gentoo/pull/22367
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../libgda/files/libgda-5.2-my_bool-error.patch | 136 +++++++++++++++++++++
| 3 +
2 files changed, 139 insertions(+)
diff --git a/gnome-extra/libgda/files/libgda-5.2-my_bool-error.patch b/gnome-extra/libgda/files/libgda-5.2-my_bool-error.patch
new file mode 100644
index 00000000000..9e696ef1c4d
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-5.2-my_bool-error.patch
@@ -0,0 +1,136 @@
+https://bugs.gentoo.org/692672
+
+--- a/providers/mysql/gda-mysql-provider.c
++++ b/providers/mysql/gda-mysql-provider.c
+@@ -1835,7 +1835,7 @@ real_prepare (GdaServerProvider *provider, GdaConnection *cnc, GdaStatement *stm
+ return FALSE;
+ }
+
+- my_bool update_max_length = 1;
++ _Bool update_max_length = 1;
+ if (mysql_stmt_attr_set (mysql_stmt, STMT_ATTR_UPDATE_MAX_LENGTH, (const void *) &update_max_length)) {
+ _gda_mysql_make_error (cnc, NULL, mysql_stmt, error);
+ mysql_stmt_close (mysql_stmt);
+@@ -1941,7 +1941,7 @@ prepare_stmt_simple (MysqlConnectionData *cdata,
+ return FALSE;
+ }
+
+- my_bool update_max_length = 1;
++ _Bool update_max_length = 1;
+ if (mysql_stmt_attr_set (mysql_stmt, STMT_ATTR_UPDATE_MAX_LENGTH, (const void *) &update_max_length)) {
+ _gda_mysql_make_error (cdata->cnc, NULL, mysql_stmt, error);
+ mysql_stmt_close (mysql_stmt);
+@@ -2327,7 +2327,7 @@ gda_mysql_provider_statement_execute (GdaServerProvider *provider,
+ if (allow_noparam) {
+ /* bind param to NULL */
+ mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
+- mysql_bind_param[i].is_null = (my_bool*)1;
++ mysql_bind_param[i].is_null = (_Bool *) 1;
+ empty_rs = TRUE;
+ continue;
+ }
+@@ -2347,7 +2347,7 @@ gda_mysql_provider_statement_execute (GdaServerProvider *provider,
+ if (allow_noparam) {
+ /* bind param to NULL */
+ mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
+- mysql_bind_param[i].is_null = (my_bool*)1;
++ mysql_bind_param[i].is_null = (_Bool *) 1;
+ empty_rs = TRUE;
+ continue;
+ }
+@@ -2399,7 +2399,7 @@ gda_mysql_provider_statement_execute (GdaServerProvider *provider,
+ GdaStatement *rstmt;
+ if (! gda_rewrite_statement_for_null_parameters (stmt, params, &rstmt, error)) {
+ mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
+- mysql_bind_param[i].is_null = (my_bool*)1;
++ mysql_bind_param[i].is_null = (_Bool *) 1;
+ }
+ else if (!rstmt)
+ return NULL;
+@@ -2459,7 +2459,7 @@ gda_mysql_provider_statement_execute (GdaServerProvider *provider,
+ ts = (GdaTimestamp*) gda_value_get_timestamp (value);
+ if (!ts) {
+ mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
+- mysql_bind_param[i].is_null = (my_bool*)1;
++ mysql_bind_param[i].is_null = (_Bool *) 1;
+ }
+ else {
+ gboolean tofree = FALSE;
+@@ -2495,7 +2495,7 @@ gda_mysql_provider_statement_execute (GdaServerProvider *provider,
+ ts = (GdaTime*) gda_value_get_time (value);
+ if (!ts) {
+ mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
+- mysql_bind_param[i].is_null = (my_bool*)1;
++ mysql_bind_param[i].is_null = (_Bool *) 1;
+ }
+ else {
+ gboolean tofree = FALSE;
+@@ -2528,7 +2528,7 @@ gda_mysql_provider_statement_execute (GdaServerProvider *provider,
+ ts = (GDate*) g_value_get_boxed (value);
+ if (!ts) {
+ mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
+- mysql_bind_param[i].is_null = (my_bool*)1;
++ mysql_bind_param[i].is_null = (_Bool *) 1;
+ }
+ else {
+ MYSQL_TIME *mtime;
+@@ -2548,7 +2548,7 @@ gda_mysql_provider_statement_execute (GdaServerProvider *provider,
+ str = g_value_get_string (value);
+ if (!str) {
+ mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
+- mysql_bind_param[i].is_null = (my_bool*)1;
++ mysql_bind_param[i].is_null = (_Bool *) 1;
+ }
+ else {
+ mysql_bind_param[i].buffer_type= MYSQL_TYPE_STRING;
+@@ -2624,7 +2624,7 @@ gda_mysql_provider_statement_execute (GdaServerProvider *provider,
+ bin = ((GdaBinary*) blob);
+ if (!bin) {
+ mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
+- mysql_bind_param[i].is_null = (my_bool*)1;
++ mysql_bind_param[i].is_null = (_Bool *) 1;
+ }
+ else {
+ gchar *str = NULL;
+@@ -2665,7 +2665,7 @@ gda_mysql_provider_statement_execute (GdaServerProvider *provider,
+ bin = gda_value_get_binary (value);
+ if (!bin) {
+ mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
+- mysql_bind_param[i].is_null = (my_bool*)1;
++ mysql_bind_param[i].is_null = (_Bool *) 1;
+ }
+ else {
+ mysql_bind_param[i].buffer_type= MYSQL_TYPE_BLOB;
+--- a/providers/mysql/gda-mysql-recordset.c
++++ b/providers/mysql/gda-mysql-recordset.c
+@@ -627,7 +627,7 @@ gda_mysql_recordset_new (GdaConnection *cnc,
+ /* binding results with types */
+ mysql_bind_result[i].buffer_type = field->type;
+ mysql_bind_result[i].is_unsigned = field->flags & UNSIGNED_FLAG ? TRUE : FALSE;
+- mysql_bind_result[i].is_null = g_malloc0 (sizeof (my_bool));
++ mysql_bind_result[i].is_null = g_malloc0 (sizeof (_Bool));
+
+ switch (mysql_bind_result[i].buffer_type) {
+ case MYSQL_TYPE_TINY:
+@@ -753,7 +753,7 @@ new_row_from_mysql_stmt (GdaMysqlRecordset *imodel, G_GNUC_UNUSED gint rownum, G
+
+ gint col;
+ for (col = 0; col < ((GdaDataSelect *) imodel)->prep_stmt->ncols; ++col) {
+- my_bool truncated;
++ _Bool truncated;
+ mysql_bind_result[col].error = &truncated;
+ mysql_stmt_fetch_column (imodel->priv->mysql_stmt, &(mysql_bind_result[col]),
+ (unsigned int)col, 0);
+@@ -784,10 +784,10 @@ new_row_from_mysql_stmt (GdaMysqlRecordset *imodel, G_GNUC_UNUSED gint rownum, G
+
+ /*g_print ("%s: #%d : TYPE=%d, GTYPE=%s\n", __func__, i, mysql_bind_result[i].buffer_type, g_type_name (type));*/
+
+- my_bool is_null = FALSE;
++ _Bool is_null = FALSE;
+ unsigned long length;
+
+- memmove (&is_null, mysql_bind_result[i].is_null, sizeof (my_bool));
++ memmove (&is_null, mysql_bind_result[i].is_null, sizeof (_Bool));
+ if (is_null) {
+ gda_value_set_null (value);
+ continue;
--git a/gnome-extra/libgda/libgda-5.2.9.ebuild b/gnome-extra/libgda/libgda-5.2.9.ebuild
index ac392e8d05d..135738d0063 100644
--- a/gnome-extra/libgda/libgda-5.2.9.ebuild
+++ b/gnome-extra/libgda/libgda-5.2.9.ebuild
@@ -84,6 +84,9 @@ src_prepare() {
-e '/SUBDIRS =/ s/trml2pdf//' \
-i libgda-report/RML/Makefile.{am,in} || die
+ # replace my_bool with _Bool
+ eapply "${FILESDIR}/${PN}-5.2-my_bool-error.patch"
+
# Prevent file collisions with libgda:4
eapply "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
eapply "${FILESDIR}/${PN}-4.99.1-control-center-icon-collision.patch"
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/files/, gnome-extra/libgda/
@ 2022-11-19 1:44 Matt Turner
0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2022-11-19 1:44 UTC (permalink / raw
To: gentoo-commits
commit: e7c9a7e4b48154186e15366dca4e788754721d0a
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 13 14:14:34 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 01:44:19 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7c9a7e4
gnome-extra/libgda: Apply patch to fix building without introspection
This has been submitted upstream but not merged yet.
Closes: https://bugs.gentoo.org/810046
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/28254
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
.../files/libgda-5.2.9-no-introspection.patch | 61 ++++++++++++++++++++++
| 3 ++
2 files changed, 64 insertions(+)
diff --git a/gnome-extra/libgda/files/libgda-5.2.9-no-introspection.patch b/gnome-extra/libgda/files/libgda-5.2.9-no-introspection.patch
new file mode 100644
index 000000000000..806a4a1c69e1
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-5.2.9-no-introspection.patch
@@ -0,0 +1,61 @@
+From df00d64aae3a5751fda757623936d4863bf88f58 Mon Sep 17 00:00:00 2001
+From: matoro <82255-matoro@users.noreply.gitlab.gnome.org>
+Date: Wed, 22 Jun 2022 10:29:48 -0400
+Subject: [PATCH] Fixed behavior for --{enable,disable}-introspection
+
+This now works to compile using --disable-introspection even if
+gobject-introspection is not installed at all
+---
+ configure.ac | 30 +++++++-----------------------
+ 1 file changed, 7 insertions(+), 23 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b9e973617..b610fc953 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -476,35 +476,19 @@ AC_SUBST(JSON_GLIB_LIBS)
+ dnl *********************************
+ dnl Check for GObject Introspection
+ dnl *********************************
+-GOBJECT_INTROSPECTION_CHECK([1.30.0])
+-
+-AC_ARG_ENABLE([gdaui-gi],
+- AS_HELP_STRING([--disable-gdaui-gi[=@<:@yes/no@:>@]], [Disable GObject Introspection for libgda-ui [default=no]]),
+- [
+- if test x$enableval = xyes
+- then
+- disable_gdaui_gi=no
+- else
+- disable_gdaui_gi=yes
+- fi
+- ],[
+- disable_gdaui_gi=no
+- ])
+-
+-if test x$found_introspection != xyes
++m4_ifdef([GOBJECT_INTROSPECTION_CHECK], [GOBJECT_INTROSPECTION_CHECK([1.30.0])])
++if test "x$found_introspection" != "xyes"
+ then
+- disable_gda_gi=yes
+- disable_gdaui_gi=yes
++ disable_gda_gi=yes
++ disable_gdaui_gi=yes
+ fi
+
+-AM_CONDITIONAL(ENABLE_GDA_GI, [test x$disable_gda_gi != xyes])
+-
+-if test x$have_ui != xyes
++if test "x$have_ui" != "xyes"
+ then
+ disable_gdaui_gi=yes
+ fi
+-
+-AM_CONDITIONAL(ENABLE_GDAUI_GI, [test x$disable_gdaui_gi != xyes])
++AM_CONDITIONAL(ENABLE_GDA_GI, [test "$disable_gda_gi" != "yes"])
++AM_CONDITIONAL(ENABLE_GDAUI_GI, [test "$disable_gdaui_gi" != "yes"])
+
+ dnl ******************************
+ dnl Check for Vala Compiler
+--
+GitLab
+
--git a/gnome-extra/libgda/libgda-5.2.9-r1.ebuild b/gnome-extra/libgda/libgda-5.2.9-r1.ebuild
index 1aca92fcec07..e2a6eaa7b82e 100644
--- a/gnome-extra/libgda/libgda-5.2.9-r1.ebuild
+++ b/gnome-extra/libgda/libgda-5.2.9-r1.ebuild
@@ -107,6 +107,9 @@ src_prepare() {
die "mv ${f} failed"
done
+ # Fix building without introspection.
+ eapply "${FILESDIR}/${PN}-5.2.9-no-introspection.patch"
+
gnome2_src_prepare
java-pkg-opt-2_src_prepare
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-11-19 1:44 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-08 9:51 [gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/files/, gnome-extra/libgda/ Pacho Ramos
-- strict thread matches above, loose matches on Subject: below --
2019-05-18 21:24 Mart Raudsepp
2021-09-25 2:50 Sam James
2022-11-19 1:44 Matt Turner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox