summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2011-09-08 22:42:51 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2011-09-08 22:42:51 +0000
commite3d236ef24b5b37ea2178b6f635592fcd73f9595 (patch)
tree25166cff1e8c7ae8fbfb958ef64709b9ee2e81e5 /dev-db/virtuoso-server
parentFix missing dependency for newer infra boxes. (diff)
downloadgentoo-2-e3d236ef24b5b37ea2178b6f635592fcd73f9595.tar.gz
gentoo-2-e3d236ef24b5b37ea2178b6f635592fcd73f9595.tar.bz2
gentoo-2-e3d236ef24b5b37ea2178b6f635592fcd73f9595.zip
Add patch for unicode regression, see kdebug 271664 for details
(Portage version: 2.1.10.14/cvs/Linux x86_64)
Diffstat (limited to 'dev-db/virtuoso-server')
-rw-r--r--dev-db/virtuoso-server/ChangeLog8
-rw-r--r--dev-db/virtuoso-server/files/virtuoso-server-6.1.3-unicode.patch21
-rw-r--r--dev-db/virtuoso-server/virtuoso-server-6.1.3-r1.ebuild83
3 files changed, 111 insertions, 1 deletions
diff --git a/dev-db/virtuoso-server/ChangeLog b/dev-db/virtuoso-server/ChangeLog
index a0979c963caa..a4e4d31a0eb9 100644
--- a/dev-db/virtuoso-server/ChangeLog
+++ b/dev-db/virtuoso-server/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-db/virtuoso-server
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-server/ChangeLog,v 1.21 2011/09/05 13:49:43 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-server/ChangeLog,v 1.22 2011/09/08 22:42:51 dilfridge Exp $
+
+*virtuoso-server-6.1.3-r1 (08 Sep 2011)
+
+ 08 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ +virtuoso-server-6.1.3-r1.ebuild, +files/virtuoso-server-6.1.3-unicode.patch:
+ Add patch for unicode regression, see kdebug 271664 for details
05 Sep 2011; Tony Vroon <chainsaw@gentoo.org> virtuoso-server-6.1.3.ebuild:
Marked stable on AMD64 based on arch testing by Ian "idella4" Delaney in bug
diff --git a/dev-db/virtuoso-server/files/virtuoso-server-6.1.3-unicode.patch b/dev-db/virtuoso-server/files/virtuoso-server-6.1.3-unicode.patch
new file mode 100644
index 000000000000..30046d2332ad
--- /dev/null
+++ b/dev-db/virtuoso-server/files/virtuoso-server-6.1.3-unicode.patch
@@ -0,0 +1,21 @@
+Index: libsrc/Wi/xqf.c
+===================================================================
+RCS file: /opldev/source/CVS-MASTER/virtuoso-opensource/libsrc/Wi/xqf.c,v
+retrieving revision 1.21.2.9
+retrieving revision 1.21.2.12
+diff -u -r1.21.2.9 -r1.21.2.12
+--- libsrc/Wi/xqf.c 3 Mar 2011 11:56:45 -0000 1.21.2.9
++++ libsrc/Wi/xqf.c 26 Aug 2011 19:34:56 -0000 1.21.2.12
+@@ -3520,6 +3552,12 @@
+ desc = xqf_str_parser_descs + desc_idx;
+ if (DV_DB_NULL == arg_dtp)
+ return NEW_DB_NULL;
++ /* if we have wide and we want typed string we do utf8, cast do to default charset so we do not do it */
++ if (DV_WIDE == arg_dtp && desc->p_dest_dtp == DV_STRING)
++ {
++ res = box_wide_as_utf8_char (arg, box_length (arg) / sizeof (wchar_t) - 1, DV_STRING);
++ goto res_ready;
++ }
+ if (DV_STRING != arg_dtp)
+ {
+ caddr_t err = NULL;
diff --git a/dev-db/virtuoso-server/virtuoso-server-6.1.3-r1.ebuild b/dev-db/virtuoso-server/virtuoso-server-6.1.3-r1.ebuild
new file mode 100644
index 000000000000..c6ce74ea68ab
--- /dev/null
+++ b/dev-db/virtuoso-server/virtuoso-server-6.1.3-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-server/virtuoso-server-6.1.3-r1.ebuild,v 1.1 2011/09/08 22:42:51 dilfridge Exp $
+
+EAPI=4
+
+inherit virtuoso
+
+DESCRIPTION="Server binaries for Virtuoso, high-performance object-relational SQL database"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="kerberos ldap readline"
+
+# Bug 305077
+#RESTRICT="test"
+
+# zeroconf support looks like broken - disabling - last checked around 5.0.12
+# mono support fetches mono source and compiles it manually - disabling for now
+# mono? ( dev-lang/mono )
+COMMON_DEPEND="
+ dev-libs/libxml2:2
+ >=dev-libs/openssl-0.9.7i:0
+ sys-libs/zlib:0
+ kerberos? ( app-crypt/mit-krb5 )
+ ldap? ( net-nds/openldap )
+ readline? ( sys-libs/readline:0 )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-devel/bison-2.3
+ >=sys-devel/flex-2.5.33
+"
+RDEPEND="${COMMON_DEPEND}
+ >=dev-db/virtuoso-odbc-${PV}:${SLOT}
+"
+
+VOS_EXTRACT="
+ libsrc/Dk
+ libsrc/Thread
+ libsrc/Tidy
+ libsrc/Wi
+ libsrc/Xml.new
+ libsrc/langfunc
+ libsrc/odbcsdk
+ libsrc/plugin
+ libsrc/util
+ binsrc/virtuoso
+ binsrc/tests
+"
+
+DOCS=(AUTHORS ChangeLog CREDITS INSTALL NEWS README)
+
+PATCHES=( "${FILESDIR}/${P}-unicode.patch" )
+
+src_prepare() {
+ sed -e '/^lib_LTLIBRARIES\s*=.*/s/lib_/noinst_/' -i binsrc/virtuoso/Makefile.am \
+ || die "failed to disable installation of static lib"
+
+ virtuoso_src_prepare
+}
+
+src_configure() {
+ myconf+="
+ $(use_enable kerberos krb)
+ $(use_enable ldap openldap)
+ $(use_with readline)
+ --disable-static
+ --disable-hslookup
+ --disable-rendezvous
+ --without-iodbc
+ "
+
+ virtuoso_src_configure
+}
+
+src_install() {
+ virtuoso_src_install
+
+ # Rename isql executables (conflicts with unixODBC)
+ mv "${ED}/usr/bin/isql" "${ED}/usr/bin/isql-v" || die
+ mv "${ED}/usr/bin/isqlw" "${ED}/usr/bin/isqlw-v" || die
+
+ keepdir /var/lib/virtuoso/db
+}