diff options
author | Martin von Gagern <Martin.vGagern@gmx.net> | 2010-03-23 14:25:00 +0100 |
---|---|---|
committer | Martin von Gagern <Martin.vGagern@gmx.net> | 2010-03-23 14:25:00 +0100 |
commit | 1c5a49baeab71f81be251fc980434eebdfc79488 (patch) | |
tree | 139ca2ed045fa6c223b8126e9e24fd9a14fd19e1 /dev-db | |
parent | Move kdesvn from dev-util to dev-vcs. (diff) | |
download | kde-sunset-1c5a49baeab71f81be251fc980434eebdfc79488.tar.gz kde-sunset-1c5a49baeab71f81be251fc980434eebdfc79488.tar.bz2 kde-sunset-1c5a49baeab71f81be251fc980434eebdfc79488.zip |
[dev-db/qt-unixODBC] Compatibility with dev-db/unixODBC-2.2.14
Diffstat (limited to 'dev-db')
-rw-r--r-- | dev-db/qt-unixODBC/ChangeLog | 9 | ||||
-rw-r--r-- | dev-db/qt-unixODBC/Manifest | 6 | ||||
-rw-r--r-- | dev-db/qt-unixODBC/files/unixODBC-2.2.14.patch | 39 | ||||
-rw-r--r-- | dev-db/qt-unixODBC/qt-unixODBC-3.3.8b-r1.ebuild | 71 | ||||
-rw-r--r-- | dev-db/qt-unixODBC/qt-unixODBC-3.3.8b.ebuild | 10 |
5 files changed, 128 insertions, 7 deletions
diff --git a/dev-db/qt-unixODBC/ChangeLog b/dev-db/qt-unixODBC/ChangeLog index 400b03ce..ec17b999 100644 --- a/dev-db/qt-unixODBC/ChangeLog +++ b/dev-db/qt-unixODBC/ChangeLog @@ -1,7 +1,14 @@ # ChangeLog for dev-db/qt-unixODBC -# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/dev-db/qt-unixODBC/ChangeLog,v 1.45 2009/04/27 20:06:56 hwoarang Exp $ +*qt-unixODBC-3.3.8b-r1 (23 Mar 2010) + + 23 Mar 2010; Martin von Gagern (MvG) <Martin.vGagern@gmx.net> + +files/unixODBC-2.2.14.patch, qt-unixODBC-3.3.8b.ebuild, + +qt-unixODBC-3.3.8b-r1.ebuild: + Restore compatibility with dev-db/unixODBC-2.2.14 + 27 Apr 2009; Markos Chandras <hwoarang@gentoo.org> -qt-unixODBC-3.3.8.ebuild: Remove masked file diff --git a/dev-db/qt-unixODBC/Manifest b/dev-db/qt-unixODBC/Manifest index 82d699ce..1e73af65 100644 --- a/dev-db/qt-unixODBC/Manifest +++ b/dev-db/qt-unixODBC/Manifest @@ -1,5 +1,7 @@ AUX qt-no-rpath.patch 352 RMD160 2b5f24c23594531976f39723a4112261f4ad296a SHA1 4b2be020cb2ca4ffa499e0e2b7ba91e71203b7db SHA256 8cc1de2b9cebf6ef5a77d9deb18e7aa83d53258503076fb262d2981c1e25b1a4 +AUX unixODBC-2.2.14.patch 1486 RMD160 373d64e0667b0dac2ef0b9ac8e76ac6d0dfaf109 SHA1 0c8ca6bce618aa32b587f4fbc94f45bec0781284 SHA256 1dddfdac0b98a3c3ebef26ec0486691441ece4e4692d9f300870077e3694d718 DIST qt-x11-free-3.3.8b.tar.gz 17313883 RMD160 4e3cbd9c5d4719b5d33e961e6595d7b215788c8b SHA1 745def6250dc7f337dbb265e20bf38dcb41fd854 SHA256 1b7a1ff62ec5a9cb7a388e2ba28fda6f960b27f27999482ebeceeadb72ac9f6e -EBUILD qt-unixODBC-3.3.8b.ebuild 2183 RMD160 370ebecd1992be74dc659dffd9f201c7d687d559 SHA1 b30b4c871f2ac6a85367d9ba9e0bcf2a0d17b143 SHA256 6489febb4fd262ef17c181e98aff644a5bc552c209dddb5afc43c13cefca394f -MISC ChangeLog 5459 RMD160 6a5fe03a487f6b2e2ba33dff1676d865d7cf873c SHA1 778147b209ae3e951a59bd67cc6c15ae4a90a838 SHA256 f5623197a74032b440aa6ab63962669a7f9694e271d43b53376126ea3883211d +EBUILD qt-unixODBC-3.3.8b-r1.ebuild 2276 RMD160 84f9b1002e5cf96180523d1d392905f5b60819d2 SHA1 92925a11b8ea990c04dd478bb71061fb0fdfd2a6 SHA256 4a086e7e11e83c0a4c5c92ca047eda8618e227db8ccb1aa913e7f2814da0c447 +EBUILD qt-unixODBC-3.3.8b.ebuild 2223 RMD160 a55422b5cce1a16106350749ec5a57c2365b4b80 SHA1 4b7eb11778886de7704ddc1bb6f04dfeaed551b4 SHA256 f567240a1b2c27e5cb8df6063a62259d85326fa872155cd70d772705a26027e8 +MISC ChangeLog 5706 RMD160 986170ff2ac2b245637c894e60dfd38c51a61e32 SHA1 f35fd2d6dc60731809529b4993c21f56ddb84fb4 SHA256 2e242fead04c6e868ee14c9b3212a204a0b07b4245e9ffed716baace7c695bd5 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448 diff --git a/dev-db/qt-unixODBC/files/unixODBC-2.2.14.patch b/dev-db/qt-unixODBC/files/unixODBC-2.2.14.patch new file mode 100644 index 00000000..1e865715 --- /dev/null +++ b/dev-db/qt-unixODBC/files/unixODBC-2.2.14.patch @@ -0,0 +1,39 @@ +unixODBC 2.2.14 defines SQLLEN and SQLULEN using the compiler typedef +declaration instead of preprocessor #define macro definition. This breaks +the checks at the head of qsql_odbc.cpp, causing the source to fall back to +older types instead, leading to compile time errors like this: + +qsql_odbc.cpp:285: error: cannot convert ‘SQLINTEGER*’ to ‘SQLLEN*’ for argument ‘6’ to +‘SQLRETURN SQLGetData(void*, SQLUSMALLINT, SQLSMALLINT, void*, SQLLEN, SQLLEN*)’ +... +qsql_odbc.cpp:1227: error: cannot convert ‘SQLINTEGER*’ to ‘SQLLEN*’ for argument ‘10’ to +‘SQLRETURN SQLBindParameter(void*, SQLUSMALLINT, SQLSMALLINT, SQLSMALLINT, SQLSMALLINT, SQLULEN, SQLSMALLINT, void*, SQLLEN, SQLLEN*)’ + +This change hard-wires the new names, breaking compatibility with older +unixODBC versions (don't know what version number ranges) in favour of +support for newer releases like 2.2.14. + +2010-03-23 Martin von Gagern + +Index: qt-x11-free-3.3.8b/src/sql/drivers/odbc/qsql_odbc.cpp +=================================================================== +--- qt-x11-free-3.3.8b.orig/src/sql/drivers/odbc/qsql_odbc.cpp ++++ qt-x11-free-3.3.8b/src/sql/drivers/odbc/qsql_odbc.cpp +@@ -61,17 +61,8 @@ + #endif + + // newer platform SDKs use SQLLEN instead of SQLINTEGER +-#ifdef SQLLEN + # define QSQLLEN SQLLEN +-#else +-# define QSQLLEN SQLINTEGER +-#endif +- +-#ifdef SQLULEN + # define QSQLULEN SQLULEN +-#else +-# define QSQLULEN SQLUINTEGER +-#endif + + + static const QSQLLEN COLNAMESIZE = 256; diff --git a/dev-db/qt-unixODBC/qt-unixODBC-3.3.8b-r1.ebuild b/dev-db/qt-unixODBC/qt-unixODBC-3.3.8b-r1.ebuild new file mode 100644 index 00000000..6601b8c1 --- /dev/null +++ b/dev-db/qt-unixODBC/qt-unixODBC-3.3.8b-r1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/qt-unixODBC/qt-unixODBC-3.3.8b.ebuild,v 1.6 2009/01/17 16:39:16 nixnut Exp $ + +inherit eutils + +SRCTYPE="free" +DESCRIPTION="QT version ${PV}" +HOMEPAGE="http://www.trolltech.com/" +SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.gz" +IUSE="" +LICENSE="|| ( QPL-1.0 GPL-2 GPL-3 )" +SLOT="3" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" + +RDEPEND="~x11-libs/qt-${PV} + dev-db/unixODBC" +DEPEND="${RDEPEND} + >=dev-db/unixODBC-2.2.14" + +S="${WORKDIR}/qt-x11-${SRCTYPE}-${PV}" + +QTBASE="/usr/qt/3" +export QTDIR=${S} +export PLATFORM=linux-g++ + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/qt-no-rpath.patch + epatch "${FILESDIR}"/unixODBC-2.2.14.patch + + cp configure configure.orig + sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure + + sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ + -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ + -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ + -e "s:\<QMAKE_CC\>.*=.*:QMAKE_CC=$(tc-getCC):" \ + -e "s:\<QMAKE_CXX\>.*=.*:QMAKE_CXX=$(tc-getCXX):" \ + -e "s:\<QMAKE_LINK\>.*=.*:QMAKE_LINK=$(tc-getCXX):" \ + -e "s:\<QMAKE_LINK_SHLIB\>.*=.*:QMAKE_LINK_SHLIB=$(tc-getCXX):" \ + "${S}"/mkspecs/${PLATFORM}/qmake.conf || die "sed to fix CFLAGS failed" +} + +src_compile() { + export QTDIR=${S} + export SYSCONF=${D}${QTBASE}/etc/settings + + # Let's just allow writing to these directories during Qt emerge + # as it makes Qt much happier. + addwrite "${QTBASE}/etc/settings" + addwrite "${HOME}/.qt" + + export YACC='byacc -d' + + ./configure -sm -thread -stl -system-libjpeg -verbose -largefile \ + -qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \ + -system-libpng -lpthread -xft -platform ${PLATFORM} -xplatform \ + ${PLATFORM} -xrender -prefix ${QTBASE} -fast ${myconf} \ + -dlopen-opengl -plugin-sql-odbc -L${QTBASE}/lib || die "configure failed" + + cd "${S}"/plugins/src/sqldrivers/odbc + emake || die "emake failed" +} + +src_install() { + insinto ${QTBASE}/plugins/sqldrivers + doins "${S}"/plugins/sqldrivers/libqsqlodbc.so || die "doins failed" +} diff --git a/dev-db/qt-unixODBC/qt-unixODBC-3.3.8b.ebuild b/dev-db/qt-unixODBC/qt-unixODBC-3.3.8b.ebuild index 3c84c97f..ee343ed4 100644 --- a/dev-db/qt-unixODBC/qt-unixODBC-3.3.8b.ebuild +++ b/dev-db/qt-unixODBC/qt-unixODBC-3.3.8b.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-db/qt-unixODBC/qt-unixODBC-3.3.8b.ebuild,v 1.6 2009/01/17 16:39:16 nixnut Exp $ @@ -13,8 +13,10 @@ LICENSE="|| ( QPL-1.0 GPL-2 GPL-3 )" SLOT="3" KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86" -DEPEND="~x11-libs/qt-${PV} +RDEPEND="~x11-libs/qt-${PV} dev-db/unixODBC" +DEPEND="${RDEPEND} + <dev-db/unixODBC-2.2.14" S="${WORKDIR}/qt-x11-${SRCTYPE}-${PV}" @@ -32,8 +34,8 @@ src_unpack() { sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ - -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ - -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ + -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ + -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ -e "s:\<QMAKE_CC\>.*=.*:QMAKE_CC=$(tc-getCC):" \ -e "s:\<QMAKE_CXX\>.*=.*:QMAKE_CXX=$(tc-getCXX):" \ -e "s:\<QMAKE_LINK\>.*=.*:QMAKE_LINK=$(tc-getCXX):" \ |