diff options
Diffstat (limited to 'gnome-extra')
| -rw-r--r-- | gnome-extra/libgda/Manifest | 1 | ||||
| -rw-r--r-- | gnome-extra/libgda/files/libgda-5.2.4-format-security.patch | 29 | ||||
| -rw-r--r-- | gnome-extra/libgda/files/libgda-5.2.4-jre18.patch | 14 | ||||
| -rw-r--r-- | gnome-extra/libgda/libgda-5.2.8-r1.ebuild | 152 |
4 files changed, 0 insertions, 196 deletions
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest index 7802d82407fa..710824eaacbd 100644 --- a/gnome-extra/libgda/Manifest +++ b/gnome-extra/libgda/Manifest @@ -1,2 +1 @@ -DIST libgda-5.2.8.tar.xz 12506208 BLAKE2B 7174aa862f04ec6c73fe98560914ee307afe75b9713adad70fa7dedf97fd4ddb79c98ad1e9a8919218f7453014d8e71e42730e168fae7c6ca0dc58ae99b0558e SHA512 6512d08df072dfc10837b71b2369ab538fa8bf0cdac51ecbb738a138f5b765f030fc7a88b14232eaab2724af8e749898da146bb63969983d3bcfeb11bc22aece DIST libgda-5.2.9.tar.xz 12619160 BLAKE2B b82c304f6054a1de24b72e688fc03a7a9b416f14f47c95087c4901b7bce0ea5c642667feb14f1701bc62403359c752f3f5b121a697316340829af64b83fb7980 SHA512 a28324533298d42aacfce5d9f3d699314ddb5d5fe7e492433dbbe4232fb310b798d312ac08dffd4f4ebef5ceea3c6c49ef3c679ab97b5e9d1f64e3fed50b2231 diff --git a/gnome-extra/libgda/files/libgda-5.2.4-format-security.patch b/gnome-extra/libgda/files/libgda-5.2.4-format-security.patch deleted file mode 100644 index 81c7804c512c..000000000000 --- a/gnome-extra/libgda/files/libgda-5.2.4-format-security.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 68af249e1c36cbac2e39903b0fc357e3ad2bf1ee Mon Sep 17 00:00:00 2001 -From: Vivien Malerba <malerba@gnome-db.org> -Date: Wed, 16 Apr 2014 14:59:50 +0200 -Subject: [PATCH] Markup message correction - ---- - libgda-ui/demos/ddl_queries.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/libgda-ui/demos/ddl_queries.c b/libgda-ui/demos/ddl_queries.c -index a47630f..4b29377 100644 ---- a/libgda-ui/demos/ddl_queries.c -+++ b/libgda-ui/demos/ddl_queries.c -@@ -475,9 +475,9 @@ show_sql (G_GNUC_UNUSED GtkButton *button, DemoData *data) - else - msg = g_strdup_printf ("<b>SQL:</b>\n%s", sql); - -- dlg = gtk_message_dialog_new_with_markup (GTK_WINDOW (data->top_window), -- GTK_DIALOG_MODAL, -- msg_type, GTK_BUTTONS_CLOSE, msg); -+ dlg = gtk_message_dialog_new (GTK_WINDOW (data->top_window), -+ GTK_DIALOG_MODAL, msg_type, GTK_BUTTONS_CLOSE, NULL); -+ gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (dlg), msg); - g_free (sql); - g_free (msg); - --- -1.9.0 - diff --git a/gnome-extra/libgda/files/libgda-5.2.4-jre18.patch b/gnome-extra/libgda/files/libgda-5.2.4-jre18.patch deleted file mode 100644 index f66fa8f95846..000000000000 --- a/gnome-extra/libgda/files/libgda-5.2.4-jre18.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- libgda-5.2.2/configure.orig 2014-05-17 14:58:33.206028742 +0200 -+++ libgda-5.2.2/configure 2014-05-17 14:58:45.937790443 +0200 -@@ -23200,6 +23259,11 @@ - JTYPE="Sun JRE 1.7" - JFLAGS="-Xlint:unchecked -Xlint:deprecation" - ;; -+ JRE1.8.*) -+ try_java=true -+ JTYPE="Sun JRE 1.8" -+ JFLAGS="-Xlint:unchecked -Xlint:deprecation" -+ ;; - JREgcj-4*) - try_java=true - JTYPE="GCJ" diff --git a/gnome-extra/libgda/libgda-5.2.8-r1.ebuild b/gnome-extra/libgda/libgda-5.2.8-r1.ebuild deleted file mode 100644 index 082aba06ff1d..000000000000 --- a/gnome-extra/libgda/libgda-5.2.8-r1.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" -GNOME2_EAUTORECONF="yes" -VALA_USE_DEPEND="vapigen" - -inherit db-use eutils flag-o-matic 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 ~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 ) -" - -# java dep shouldn't rely on slots, bug #450004 -# 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 - >=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 -} - -src_prepare() { - # Fix compilation with -Werror=format-security (from 'master') - eapply "${FILESDIR}"/${PN}-5.2.4-format-security.patch - - use berkdb && append-cppflags "-I$(db_includedir)" - - # They need python2 - 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 - - gnome2_src_prepare - java-pkg-opt-2_src_prepare - use vala && vala_src_prepare - - # Support JRE 1.8 (from Fedora) - patches configure, so applied AFTER gnome2_src_prepare runs eautoreconf - eapply "${FILESDIR}"/${PN}-5.2.4-jre18.patch - -} - -src_configure() { - # 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 /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_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 -} |