diff options
| -rw-r--r-- | gnome-extra/libgda/ChangeLog | 11 | ||||
| -rw-r--r-- | gnome-extra/libgda/Manifest | 12 | ||||
| -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.4.ebuild | 168 |
5 files changed, 229 insertions, 5 deletions
diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog index 4673c2705668..7be17a583386 100644 --- a/gnome-extra/libgda/ChangeLog +++ b/gnome-extra/libgda/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for gnome-extra/libgda # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.231 2015/04/18 08:08:07 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.232 2015/06/20 09:59:11 pacho Exp $ + +*libgda-5.2.4 (20 Jun 2015) + + 20 Jun 2015; Pacho Ramos <pacho@gentoo.org> + +files/libgda-5.2.4-format-security.patch, +files/libgda-5.2.4-jre18.patch, + +libgda-5.2.4.ebuild: + Version bump, fix java detection (#450004 by Juergen Rose and Tom Wijsman + (TomWij)), enable vala (#507022 by Markus Moll), fix compilation with format- + security (#517610 by Agostino Sarubbo) 18 Apr 2015; Pacho Ramos <pacho@gentoo.org> libgda-5.2.2.ebuild: yelp-tools needed at build time (#514320) diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest index 473363b02fef..893ab89b5379 100644 --- a/gnome-extra/libgda/Manifest +++ b/gnome-extra/libgda/Manifest @@ -3,14 +3,18 @@ Hash: SHA256 AUX libgda-4.99.1-control-center-icon-collision.patch 2266 SHA256 dc52049ea4706fc8a8a91bc7c572abc275a312f7e0df15cf1b82c73ef8e4f63e SHA512 ebe5db64f552b5623598d9545d09af138a80578eec99e83962a958b5bc44c1c7ae1746f71302f5f56fee0112a2bd64a0372d32bbda7ace0d9c7a648dcefd51e5 WHIRLPOOL f766d52e6c9591b4a7040105f0765df63412da92e7aa60aa4921cedf2f05ba60a732d72f443358ab78735c9dd44e51ce8e12ca5c3892b9e077f04b0772412650 AUX libgda-4.99.1-gda-browser-doc-collision.patch 914 SHA256 d89d44e62a1a483cd77f13c723f0541f39a71a5f0651197d3e25d1093567d78c SHA512 578a08e1b7adb59706f28f811efe2f7b68d2b406f49bd605253a14f3b415df945a3948dd2994013429b0e31768fb7a7f382321568babe0bca0bb34ba5aa16353 WHIRLPOOL c4f2b570f5fb486a4f1a6d3575e0849a13c78fcc1d05d2b64d4cb15f0af83a54bb8d184ec14ce501ee7e7dcc10f4b3a6c32c1d458e312c13716bde7752ff71c6 +AUX libgda-5.2.4-format-security.patch 1003 SHA256 231c32dfe355f391ca4aed49ab7116aa7ddf0d9dd91b7512e80f6e18d4152f22 SHA512 b723fff823b4de0ed79883d8b2c9e44e3ae26bac919992afe2eb055aaac972ee188bc28865497e3b6b0e613e8b7977061151e489fef31c99b5ce783928e9f42f WHIRLPOOL 585afe80cd23f7616931d6a52e238075ac9c07186e2ebde54f233b3e371c83f014bbb52071334f7d8d55575c9b0f823d1e22a8016ee8494b513c274bc3717395 +AUX libgda-5.2.4-jre18.patch 450 SHA256 37fd175e18d41348473d9596c2a1bd299df9d6c4a2f45997dd2a3449d58c7d06 SHA512 4280b18ac16a1831aac433a2dc64f0713f8668b31d18465877861e0c0e2dd5eb2bc2aa70cdf0d742da4b6c48f2b7ec7bd7f109de99436f84c5d155c2dc4fed94 WHIRLPOOL 323077d5eae83bc90fd348a05ca9a1b9f608a9ae64faafea0edaeb851983fdc96ff485a0723fd2a253d9381d11c6d28bdad7487b942cff63a6d4431238b4866c DIST libgda-5.2.2.tar.xz 12173216 SHA256 c9b8b1c32f1011e47b73c5dcf36649aaef2f1edaa5f5d75be20d9caadc2bc3e4 SHA512 b09ef364c3357a58b17508a39ee53ef462baa54bb3c8af580d23fd2771b034355092ecdb7ef29b29dd08533394a702f12b838732c712fb6b3a04b6b201cd3c74 WHIRLPOOL 463efc5825be741d55ab6741d250f537537d59c71d926c20c7202f384e5c7c9b2bcc49419a796df4bfa5e9248f59bcf12aa8331495c3aae7d56408f295c0693f +DIST libgda-5.2.4.tar.xz 12320228 SHA256 2cee38dd583ccbaa5bdf6c01ca5f88cc08758b9b144938a51a478eb2684b765e SHA512 90449795a64136389c26ee4bbdbd5c1330d441e6c11ff15eff83d0ee39c4ce3abd686222aaa468995496ba1417c0fbc963898107f1806d80648cdc939d3c87cc WHIRLPOOL fee9884ed9edb48603f0ce924316f00d2f38d490147d8c48e512cfd8f1282bd555f1767a56160afc2781b84c1a33466f42a12d4c5115e70af481c54c037bf519 EBUILD libgda-5.2.2.ebuild 4416 SHA256 8641c744ed90309b62fb750405415d681474b0ad9fe09b234614090c49a6eef8 SHA512 5b011f02a21e34b76c758dadd5f412c6fec3c048df1241c5e9caddd33e62ede44321a29ee17de027188023b450c99ba2c102dc9308b7dc89014aedda0ee47e73 WHIRLPOOL 597712d5a45b8858b2e2404d340e61b47de29f49bfab4e38a4e5336013f26c27f287a7ab0fc8191ca4f36123854b798366df2ae3b90831bc1a05cf6d323df196 -MISC ChangeLog 35540 SHA256 0aa7c9675168fc5b55f089a62cf2fc600ae805489e4ce1c81bf58147646ed3fa SHA512 3706a48b10e937233349fe26297fc580b5dd2b5dd0a0789355fb5ff9caece18c06ab8e7ada82dc8d0b2e6fd5c1236ab083fbf98d25e7eca89a63509c05581541 WHIRLPOOL 289b8b15904fadc84e42bd3d3a5ed43476bfb58812409740b24e51315500498d508f4d6c2ea92b4de701161e0896b093bafa3d0e9dff9d9fb66be10111cd71ab +EBUILD libgda-5.2.4.ebuild 4782 SHA256 93e3c6adc8107db3da13f4c292a19336880e527f62521229fca63a83d294e33e SHA512 fd2186f001bc363405d82647a4381b7f5657b8fba95185a65bfa8a61ddc4b6ce34ee1f36b12cca9609f58a5de9616f3c9ae96c81630bbb4d6f4b7a5cc519ad65 WHIRLPOOL db4a36c59f1633905d672a485e61fa8a74da7aff995fc10a9e370ebf3b656c8147811118d8eca7b593777ef3c9711fb89da061e00e3a38a5b19b7414fa171b77 +MISC ChangeLog 35915 SHA256 a751966673c79522db69674a5c9edca0e8937aec557857454bb7052bf37e9e5c SHA512 dcb586fe2a74cb560e89ba0c903387b43df2365e73850ccb84ef9f6771c9ed60234ee2aa35048639dfc725a56c96de87b3ca1d8f7a014bea0c23cf92b89117bc WHIRLPOOL fcbf587b2ea03d9463b56aae182f09bab26a340d1de912ea478f7636f1c444bf99027a6ffff408b9218cc4495efe33453bb00a1a0499275df266e9b470bcb6b5 MISC metadata.xml 789 SHA256 770f18dd27266375e46ff02e6ee17b0303db4760ef53c459f09d2d77d06b0129 SHA512 4592ec75b9815bb7ce7901578acd1157722f09ff588d564bfa2b974c34849c54fabfb063661264b9690640cef1f822e276460412318c08cee236267450036074 WHIRLPOOL c4f3cef6b1f8d64d8d998e15cbefc9cbed1f93a816bb115605badad9974fd9e7338dad7cd3ba25522f1e9b40fd9986ab5958636533044cfe9f785e2a2ed0505f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlUyEOgACgkQCaWpQKGI+9T5lgCdF4qETzpaqzNm84aA+mYjd/yc -SMQAn1W/3P1CyeSWy2cS3Tww8Cz0DAiv -=p2LV +iEYEAREIAAYFAlWFOXEACgkQCaWpQKGI+9RZbgCfaIoPMVGV9c3iq5ans8Nx8RSD +NloAn3vdnsq5jG7w4I3P+S40dnsBRFaU +=j7Zs -----END PGP SIGNATURE----- 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 new file mode 100644 index 000000000000..81c7804c512c --- /dev/null +++ b/gnome-extra/libgda/files/libgda-5.2.4-format-security.patch @@ -0,0 +1,29 @@ +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 new file mode 100644 index 000000000000..f66fa8f95846 --- /dev/null +++ b/gnome-extra/libgda/files/libgda-5.2.4-jre18.patch @@ -0,0 +1,14 @@ +--- 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.4.ebuild b/gnome-extra/libgda/libgda-5.2.4.ebuild new file mode 100644 index 000000000000..b8d5407cc5be --- /dev/null +++ b/gnome-extra/libgda/libgda-5.2.4.ebuild @@ -0,0 +1,168 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-5.2.4.ebuild,v 1.1 2015/06/20 09:59:11 pacho Exp $ + +EAPI="5" +GNOME2_LA_PUNT="yes" +GCONF_DEBUG="yes" +PYTHON_COMPAT=( python2_7 ) +VALA_MIN_API_VERSION="0.26" +VALA_MAX_API_VERSION="0.26" # configure explicitly checks for that version +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 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 ) +" +# 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:= + sys-libs/ncurses:= + 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') + epatch "${FILESDIR}"/${PN}-5.2.4-format-security.patch + + # Support JRE 1.8 (from Fedora) + epatch "${FILESDIR}"/${PN}-5.2.4-jre18.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 + epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch" + epatch "${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() { + gnome2_src_configure \ + --with-help \ + --disable-default-binary \ + --disable-static \ + --enable-system-sqlite \ + $(use_with berkdb bdb /usr) \ + $(use_with canvas goocanvas) \ + $(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) \ + $(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) \ + $(use_enable vala gda-gi) \ + $(use_enable vala gdaui-gi) \ + $(use_enable vala gdaui-vala) +} + +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 +} |