From c5572b13d51970d6603acd131f27991cc1b66a79 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 19 Nov 2022 07:00:00 +0000 Subject: gentoo auto-resync : 19:11:2022 - 07:00:00 --- gnome-extra/libgda/Manifest | 2 + .../files/libgda-5.2.9-no-introspection.patch | 61 ++++++++ gnome-extra/libgda/libgda-5.2.9-r1.ebuild | 171 +++++++++++++++++++++ 3 files changed, 234 insertions(+) create mode 100644 gnome-extra/libgda/files/libgda-5.2.9-no-introspection.patch create mode 100644 gnome-extra/libgda/libgda-5.2.9-r1.ebuild (limited to 'gnome-extra/libgda') diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest index 0f835942362e..7857f50992b3 100644 --- a/gnome-extra/libgda/Manifest +++ b/gnome-extra/libgda/Manifest @@ -1,7 +1,9 @@ AUX libgda-4.99.1-control-center-icon-collision.patch 2266 BLAKE2B 4005c1a3d7b71f9a264321941be67bad1c339cf90fe47d749eeb88ebe0a2ef1abf20e3b6d856a0289b359a66b7f9f140d1bbf61eb83d279407270e1ff70c2b46 SHA512 ebe5db64f552b5623598d9545d09af138a80578eec99e83962a958b5bc44c1c7ae1746f71302f5f56fee0112a2bd64a0372d32bbda7ace0d9c7a648dcefd51e5 AUX libgda-4.99.1-gda-browser-doc-collision.patch 914 BLAKE2B a8dc2b9359aaf3f74939dda29cd4157c20a50b724a7648c517d4fccd1a0d696f1eb5cebc6199a775e96d2687542e5a815bb63f01684d9c68497279b7f45adc08 SHA512 578a08e1b7adb59706f28f811efe2f7b68d2b406f49bd605253a14f3b415df945a3948dd2994013429b0e31768fb7a7f382321568babe0bca0bb34ba5aa16353 AUX libgda-5.2-my_bool-error.patch 5804 BLAKE2B 85068c8d3164bb9fd6d5c26bd144cc389f3e7df28c56163dd3294fed2a1e709674031e0bb903aa8f111010d6682c7aef26692b1e16821f2a9002106eb8a250db SHA512 33a734e4f21364d4657db1347022129eef48b9b7cebd3743445963c74fb2d1b1043927c52a2e165db966df595a1b69dfcc8d9f3b2cddf328291bc7976273ecef +AUX libgda-5.2.9-no-introspection.patch 1804 BLAKE2B 6945b77b906a78ff7b4b551a47e5c61886cb3239837813cced2508d6e22848b26b8f3366290b8974edcaafae95c7c7be63f1b2bfefed846ca393c4728abe7752 SHA512 b6536539ca827d33caaa1a40af3e6f37140181c6a5f54e0f143499108ed4c89c45184f032d7808019dec6c769670f9a47aa8479541c537163b1163ea769955a4 AUX libgda-5.2.9-redefine-bool-error.patch 1223 BLAKE2B eafc8884016c98d673d4da347452a82e558a11d20143d19ce1a40926a8348af507a839010c342dad37f345efb6c7770d6ad2429ca26a310af67dd65e0166af25 SHA512 7ec9d88f7b0de2980c8e2f8a17f00eff26b279c46f938bff8dc3ba5c8e3c106bc778e65bdb078a30b9615bcf2497d4974bef4205cb51347fb50ceb6ac6ceb43c DIST libgda-5.2.9.tar.xz 12619160 BLAKE2B b82c304f6054a1de24b72e688fc03a7a9b416f14f47c95087c4901b7bce0ea5c642667feb14f1701bc62403359c752f3f5b121a697316340829af64b83fb7980 SHA512 a28324533298d42aacfce5d9f3d699314ddb5d5fe7e492433dbbe4232fb310b798d312ac08dffd4f4ebef5ceea3c6c49ef3c679ab97b5e9d1f64e3fed50b2231 +EBUILD libgda-5.2.9-r1.ebuild 4957 BLAKE2B e4300f953139b8bc4c65efa72bdf453b7fdf1142806c37b02cfcbcd648ed5c0169fde39cda5f43f78137b3174fade10d703804f3e3b5c0634084c9b5b36d2f9a SHA512 b36057bb37813a3d70b2ef1d92c44215c896ae92eabad37f28b17880dddf65ed13e97d7156c5557886aa8ff1d95c09370c782035832a53ede883e9217d338688 EBUILD libgda-5.2.9.ebuild 4682 BLAKE2B bf5408ba52ed13bb9727f31f63762d8a0cdd4d98084a5e978b3502ccd7a5edb91330223616d490c49d979cff4b16d61f8a30ecd71f0150e0f8bb6852c6ce2f5e SHA512 1220bb7b6f0e13daf9db6f2f4d7c72b2a5027b0764b339c7b0290fd354e9eeb153f549b26653aa5d5c472e4c7d664ec420bce77d855cad4d27569092856ac2a8 MISC metadata.xml 788 BLAKE2B c8e2119ecbdc25e749750336f61709ff4aaf3e6d644a249e3e10860f21e8b6ffe70fbd07bcda3a4626baf94e6ff268f0e6cf1d838d0876fbfd30b2beb1ee33b6 SHA512 655de1859ef6c2f640e294cf43d22bc59a2c519bd9a3c22f8ac16d39b7305ddae772b21838fc971576465e0b6ad31ddea9d476919aa0b08a39f7efcad48d84d8 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 + diff --git a/gnome-extra/libgda/libgda-5.2.9-r1.ebuild b/gnome-extra/libgda/libgda-5.2.9-r1.ebuild new file mode 100644 index 000000000000..e2a6eaa7b82e --- /dev/null +++ b/gnome-extra/libgda/libgda-5.2.9-r1.ebuild @@ -0,0 +1,171 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +GNOME2_EAUTORECONF="yes" + +inherit db-use gnome2 java-pkg-opt-2 vala + +DESCRIPTION="GNOME database access library" +HOMEPAGE="https://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 sourceview ssl vala" +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 ~riscv ~sparc ~x86" + +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:= ) + ssl? ( dev-libs/openssl:0= ) + >=dev-db/sqlite-3.10.2:3= + vala? ( dev-libs/libgee:0.8 ) +" + +# TODO: libgee shouldn't be needed at build with USE=-vala, but needs build system fixes - bug 674066 +DEPEND="${RDEPEND} + dev-libs/libgee:0.8 +" + +# java dep shouldn't rely on slots, bug #450004 +BDEPEND=" + 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 +} + +src_prepare() { + # They need python2 + sed -e '/SUBDIRS =/ s/trml2html//' \ + -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" + # ... and stop using bool elsewhere too + eapply "${FILESDIR}/${PN}-5.2.9-redefine-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" + # 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 + + # Fix building without introspection. + eapply "${FILESDIR}/${PN}-5.2.9-no-introspection.patch" + + gnome2_src_prepare + java-pkg-opt-2_src_prepare +} + +src_configure() { + local bdbroot bdbinc bdblib + + if use berkdb; then + bdbinc=$(db_includedir) + bdbroot=${bdbinc%/include/*} + bdbinc=${bdbinc#${bdbroot}/} + bdblib=$(get_libdir) + fi + + use vala && vala_setup + + # Upstream broken configure handling for UI library introspection and vala bindings if passing a choice with use_enable - https://gitlab.gnome.org/GNOME/libgda/issues/158 + # But if we don't pass an explicit choice, it behaves as we need (only enable them if --enable-ui AND the appropriate --enable-introspection or --enable-vala) + gnome2_src_configure \ + --with-help \ + --disable-default-binary \ + --disable-static \ + --enable-system-sqlite \ + $(use_with berkdb bdb "${bdbroot}") \ + $(use_with berkdb bdb-includedir-name "${bdbinc}") \ + $(use_with berkdb bdb-libdir-name "${bdblib}") \ + $(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_with java java $JAVA_HOME)" \ + $(use_enable json) \ + $(use_with ldap) \ + --with-ldap-libdir-name="$(get_libdir)" \ + $(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) +} + +pkg_preinst() { + gnome2_pkg_preinst + java-pkg-opt-2_pkg_preinst +} + +src_install() { + gnome2_src_install + # Use new location + if use gtk; then + mv "${ED}"/usr/share/appdata "${ED}"/usr/share/metainfo || die + fi +} -- cgit v1.2.3