From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- gnome-extra/libgda/Manifest | 10 ++ ...bgda-4.99.1-control-center-icon-collision.patch | 55 +++++++ .../libgda-4.99.1-gda-browser-doc-collision.patch | 28 ++++ .../files/libgda-5.2.4-format-security.patch | 29 ++++ gnome-extra/libgda/files/libgda-5.2.4-jre18.patch | 14 ++ .../libgda/files/libgda-5.2.4-vala-check.patch | 35 ++++ gnome-extra/libgda/libgda-5.2.4-r2.ebuild | 181 +++++++++++++++++++++ gnome-extra/libgda/metadata.xml | 17 ++ 8 files changed, 369 insertions(+) create mode 100644 gnome-extra/libgda/Manifest create mode 100644 gnome-extra/libgda/files/libgda-4.99.1-control-center-icon-collision.patch create mode 100644 gnome-extra/libgda/files/libgda-4.99.1-gda-browser-doc-collision.patch create mode 100644 gnome-extra/libgda/files/libgda-5.2.4-format-security.patch create mode 100644 gnome-extra/libgda/files/libgda-5.2.4-jre18.patch create mode 100644 gnome-extra/libgda/files/libgda-5.2.4-vala-check.patch create mode 100644 gnome-extra/libgda/libgda-5.2.4-r2.ebuild create mode 100644 gnome-extra/libgda/metadata.xml (limited to 'gnome-extra/libgda') diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest new file mode 100644 index 000000000000..a10a963ad2c6 --- /dev/null +++ b/gnome-extra/libgda/Manifest @@ -0,0 +1,10 @@ +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 +AUX libgda-5.2.4-vala-check.patch 920 SHA256 c75ee112cb6542988446aeb5051482adef4f2f46d1b9324f3f4a75d46275109f SHA512 dba082bdae037d4b9e021085166c4b5e8791c461cfbd9b0668731651b07f931bae8405b8b7d3c7f0cf51ddbfa23b03a265abd8ab3603e90933e0c99a299b53a0 WHIRLPOOL 6c1f667061b904487b45735cb42b5d62efa1a066f143972159f0a05f6f1fd423129a8985e3580223a3e1f44bb116d81077b9433ba012220bdd442ce45d1031bf +DIST libgda-5.2.4.tar.xz 12320228 SHA256 2cee38dd583ccbaa5bdf6c01ca5f88cc08758b9b144938a51a478eb2684b765e SHA512 90449795a64136389c26ee4bbdbd5c1330d441e6c11ff15eff83d0ee39c4ce3abd686222aaa468995496ba1417c0fbc963898107f1806d80648cdc939d3c87cc WHIRLPOOL fee9884ed9edb48603f0ce924316f00d2f38d490147d8c48e512cfd8f1282bd555f1767a56160afc2781b84c1a33466f42a12d4c5115e70af481c54c037bf519 +EBUILD libgda-5.2.4-r2.ebuild 4925 SHA256 a1aa9c8ae47ee6dbb2c231ddba16b04c6b8c3d943b2e9fe56614a0931ad909a9 SHA512 c03a97df0b0aeeeba44410c367e5bff172ac3b66c7baf1ca030d96243fcf7ef3a538c16c9cb60a20b136bb81e2a9d907b539fb72778833e83af6d4811fd23487 WHIRLPOOL 012b912cb329641bf276d3296995dec06caae879de7032c736d82515c8593896cd9a0c089b762165f9f31521a85be03077db9fa2f66e8ed630c55160407fcc29 +MISC ChangeLog 4507 SHA256 08a030d79dd58e1f8fa67935df6483b242915a120c23e82d39dc49ddd66fdacb SHA512 ea0b87f528cc4812daf43f5c24155dd84b7b13ff488cdb85f40940057a0023dabbadb1550d2000520df442e7347a1c9c26852e35f41cbd33d2775c1d0f8b0bec WHIRLPOOL 202618bfa667e8d4163168dd333095610a4e1cbb943d9e69b5e76209c939462381ed21ed24fcae943140f0356be6c8deedaed6c655be371dd07a3e7089f6a644 +MISC ChangeLog-2015 35915 SHA256 a751966673c79522db69674a5c9edca0e8937aec557857454bb7052bf37e9e5c SHA512 dcb586fe2a74cb560e89ba0c903387b43df2365e73850ccb84ef9f6771c9ed60234ee2aa35048639dfc725a56c96de87b3ca1d8f7a014bea0c23cf92b89117bc WHIRLPOOL fcbf587b2ea03d9463b56aae182f09bab26a340d1de912ea478f7636f1c444bf99027a6ffff408b9218cc4495efe33453bb00a1a0499275df266e9b470bcb6b5 +MISC metadata.xml 782 SHA256 cae0c8e9079cd10a8cfd47360a51a88b4abacd62f908a8b2a57480e9f691d6e1 SHA512 4878da46ea580bdc1063c6937a5b5e437bf29bd6132cb6867c103253ef96b20a80f46dab6b8016cea3bfefc186d8e36d4a400980fe5da47ce5f7e877944a4ecb WHIRLPOOL d457f9874d2dae45b767ff38ce30dfa01e5224ab54c10a83c82a2911e59b3505d84461d6e4ce12ccf61b815a64f9862876993f4b7707763d15f59c89739b5fc7 diff --git a/gnome-extra/libgda/files/libgda-4.99.1-control-center-icon-collision.patch b/gnome-extra/libgda/files/libgda-4.99.1-control-center-icon-collision.patch new file mode 100644 index 000000000000..fe814a730490 --- /dev/null +++ b/gnome-extra/libgda/files/libgda-4.99.1-control-center-icon-collision.patch @@ -0,0 +1,55 @@ +From 6ec47f4cf542ad9f7c4d30d557e4813b5c6f31d5 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev +Date: Sat, 4 Jun 2011 05:45:35 -0400 +Subject: [PATCH] Prevent file collision with gda-control-center-4.0's icons + +--- + control-center/data/Makefile.am | 12 ++++++------ + ... hicolor_apps_16x16_gda-control-center-5.0.png} | Bin 833 -> 833 bytes + ... hicolor_apps_22x22_gda-control-center-5.0.png} | Bin 1157 -> 1157 bytes + ... hicolor_apps_24x24_gda-control-center-5.0.png} | Bin 1144 -> 1144 bytes + ...icolor_apps_256x256_gda-control-center-5.0.png} | Bin 33543 -> 33543 bytes + ... hicolor_apps_32x32_gda-control-center-5.0.png} | Bin 1867 -> 1867 bytes + ... hicolor_apps_48x48_gda-control-center-5.0.png} | Bin 3144 -> 3144 bytes + control-center/gda-control-center-5.0.desktop.in | 2 +- + 8 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/control-center/data/Makefile.am b/control-center/data/Makefile.am +index 03fa362..862ec88 100644 +--- a/control-center/data/Makefile.am ++++ b/control-center/data/Makefile.am +@@ -5,12 +5,12 @@ public_icons_themes = \ + $(NULL) + + public_icons = \ +- hicolor_apps_16x16_gda-control-center.png \ +- hicolor_apps_22x22_gda-control-center.png \ +- hicolor_apps_24x24_gda-control-center.png \ +- hicolor_apps_256x256_gda-control-center.png \ +- hicolor_apps_32x32_gda-control-center.png \ +- hicolor_apps_48x48_gda-control-center.png \ ++ hicolor_apps_16x16_gda-control-center-5.0.png \ ++ hicolor_apps_22x22_gda-control-center-5.0.png \ ++ hicolor_apps_24x24_gda-control-center-5.0.png \ ++ hicolor_apps_256x256_gda-control-center-5.0.png \ ++ hicolor_apps_32x32_gda-control-center-5.0.png \ ++ hicolor_apps_48x48_gda-control-center-5.0.png \ + $(NULL) + + private_icons = \ +diff --git a/control-center/gda-control-center-5.0.desktop.in b/control-center/gda-control-center-5.0.desktop.in +index 6fd5b58..429787d 100644 +--- a/control-center/gda-control-center-5.0.desktop.in ++++ b/control-center/gda-control-center-5.0.desktop.in +@@ -1,7 +1,7 @@ + [Desktop Entry] + _Name=Database access control center + _Comment=Configure your database access environment +-Icon=gda-control-center ++Icon=gda-control-center-5.0 + Exec=gda-control-center-5.0 + Terminal=false + Type=Application +-- +1.7.5.3 + diff --git a/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-doc-collision.patch b/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-doc-collision.patch new file mode 100644 index 000000000000..2fd31ab7d1de --- /dev/null +++ b/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-doc-collision.patch @@ -0,0 +1,28 @@ +From bfb0d952d111929174c3326dbc69ab65a808a235 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev +Date: Sat, 4 Jun 2011 05:59:46 -0400 +Subject: [PATCH] Prevent file collision with gda-browser-4.0's gtk-doc files + +--- + tools/browser/doc/Makefile.am | 2 +- + ...browser-docs.sgml => gda-browser-5.0-docs.sgml} | 0 + ...r-sections.txt => gda-browser-5.0-sections.txt} | 0 + .../{gda-browser.types => gda-browser-5.0.types} | 0 + 4 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/tools/browser/doc/Makefile.am b/tools/browser/doc/Makefile.am +index 971fa79..cf6637a 100644 +--- a/tools/browser/doc/Makefile.am ++++ b/tools/browser/doc/Makefile.am +@@ -3,7 +3,7 @@ + AUTOMAKE_OPTIONS = 1.6 + + # The name of the module. +-DOC_MODULE=gda-browser ++DOC_MODULE=gda-browser-5.0 + + # The top-level SGML file. + DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml +-- +1.7.5.3 + 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 +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 ("SQL:\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/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 000000000000..c586d49356d0 --- /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 +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 new file mode 100644 index 000000000000..478c37175488 --- /dev/null +++ b/gnome-extra/libgda/libgda-5.2.4-r2.ebuild @@ -0,0 +1,181 @@ +# Copyright 1999-2017 Gentoo Foundation +# 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:= ) + >=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 +} diff --git a/gnome-extra/libgda/metadata.xml b/gnome-extra/libgda/metadata.xml new file mode 100644 index 000000000000..aae12a8f52cf --- /dev/null +++ b/gnome-extra/libgda/metadata.xml @@ -0,0 +1,17 @@ + + + + + gnome@gentoo.org + Gentoo GNOME Desktop + + + Enable support for x11-libs/goocanvas + Enable embedded net-libs/libsoup based server + Enable support for JSON format + Enable support for Microsoft Access database using + app-office/mdbtools + Install tools for generating graphical reports + Enable support for x11-libs/gtksourceview + + -- cgit v1.2.3