From 66383a44f966b24988f75085f29668d4474dbded Mon Sep 17 00:00:00 2001 From: Dan Armak Date: Fri, 1 Jul 2005 15:47:41 +0000 Subject: fix 14178 just as for the main qt ebuild: refer to separate ebuild for odbc plugin Package-Manager: portage-2.0.51.22-r1 --- x11-libs/qt-embedded/ChangeLog | 9 +- x11-libs/qt-embedded/Manifest | 6 +- .../qt-embedded/files/digest-qt-embedded-3.3.4-r1 | 1 + x11-libs/qt-embedded/qt-embedded-3.3.4-r1.ebuild | 146 +++++++++++++++++++++ 4 files changed, 159 insertions(+), 3 deletions(-) create mode 100644 x11-libs/qt-embedded/files/digest-qt-embedded-3.3.4-r1 create mode 100644 x11-libs/qt-embedded/qt-embedded-3.3.4-r1.ebuild (limited to 'x11-libs/qt-embedded') diff --git a/x11-libs/qt-embedded/ChangeLog b/x11-libs/qt-embedded/ChangeLog index c7721a92a386..aca164be2b7c 100644 --- a/x11-libs/qt-embedded/ChangeLog +++ b/x11-libs/qt-embedded/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-libs/qt-embedded # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-embedded/ChangeLog,v 1.16 2005/03/07 10:17:38 greg_g Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-embedded/ChangeLog,v 1.17 2005/07/01 15:47:41 danarmak Exp $ + +*qt-embedded-3.3.4-r1 (01 Jul 2005) + + 01 Jul 2005; Dan Armak +qt-embedded-3.3.4-r1.ebuild: + Fixed bug 14178 (circular dependency with dev-db/unixODBC). The qt odbc + plugin now lives in the separate ebuild dev-db/qt-unixODBC. This ebuild has + a PDEPEND on that one if USE odbc is enabled. 07 Mar 2005; Gregorio Guidi -files/47qt-embedded3, -files/50qt-embeddeddir3, -files/tools-Makefile, -qt-embedded-3.0.5.ebuild, diff --git a/x11-libs/qt-embedded/Manifest b/x11-libs/qt-embedded/Manifest index d5b64e715f86..6da2418644cb 100644 --- a/x11-libs/qt-embedded/Manifest +++ b/x11-libs/qt-embedded/Manifest @@ -1,4 +1,6 @@ -MD5 512150b47a904b0240101e319856aab1 metadata.xml 156 -MD5 9dc7de70220cb55f52c5e5b0fa337d30 ChangeLog 2808 MD5 de40c84660b36924feec01725a4975ba qt-embedded-3.3.4.ebuild 4809 +MD5 771c79ee04f05d21aaa9f854f0baf4a5 qt-embedded-3.3.4-r1.ebuild 4757 +MD5 be7ec97d02e86ffb3f73db5731806575 ChangeLog 3125 +MD5 512150b47a904b0240101e319856aab1 metadata.xml 156 MD5 e94af6ef3445834da6a0b225f5753f75 files/digest-qt-embedded-3.3.4 77 +MD5 e94af6ef3445834da6a0b225f5753f75 files/digest-qt-embedded-3.3.4-r1 77 diff --git a/x11-libs/qt-embedded/files/digest-qt-embedded-3.3.4-r1 b/x11-libs/qt-embedded/files/digest-qt-embedded-3.3.4-r1 new file mode 100644 index 000000000000..c359fee6a4e7 --- /dev/null +++ b/x11-libs/qt-embedded/files/digest-qt-embedded-3.3.4-r1 @@ -0,0 +1 @@ +MD5 bb456d9fba432b29422ce5338c44eadc qt-embedded-free-3.3.4.tar.bz2 19714149 diff --git a/x11-libs/qt-embedded/qt-embedded-3.3.4-r1.ebuild b/x11-libs/qt-embedded/qt-embedded-3.3.4-r1.ebuild new file mode 100644 index 000000000000..bf7d0449dbb4 --- /dev/null +++ b/x11-libs/qt-embedded/qt-embedded-3.3.4-r1.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-embedded/qt-embedded-3.3.4-r1.ebuild,v 1.1 2005/07/01 15:47:41 danarmak Exp $ + +DESCRIPTION="Embedded Linux port of Qt" +HOMEPAGE="http://www.trolltech.com/products/embedded/" +SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-embedded-free-${PV}.tar.bz2" +LICENSE="|| ( QPL-1.0 GPL-2 )" + +SLOT="3" +KEYWORDS="~x86 ~amd64 ~ppc" +IUSE="cups debug doc firebird gif ipv6 mysql nis odbc opengl postgres sqlite" + +DEPEND="media-libs/libpng + media-libs/jpeg + media-libs/libmng + media-libs/lcms + sys-libs/zlib + cups? ( net-print/cups ) + firebird? ( dev-db/firebird ) + mysql? ( dev-db/mysql ) + opengl? ( virtual/opengl virtual/glu ) + postgres? ( dev-db/postgresql )" +PDEPEND="odbc? ( ~dev-db/qt-unixODBC-$PV )" + +S=${WORKDIR}/qt-embedded-free-${PV} + +QTBASE=/usr/qt/3-embedded + +pkg_setup() { + ewarn "Note: this ebuild provides a Qt/Embedded setup that is suitable for testing," + ewarn "but definitely not tailored for real embedded systems." + ewarn "I advise you select your own featureset (e.g. by editing this ebuild)" + ewarn "if building for such a system." + + export QTDIR=${S} + + # values for 'PLATFORM' (host system) can be found in mkspecs/ + # values for 'XPLATFORM' (target system) can be found in mkspecs/qws/ + if use x86; then + export PLATFORM="linux-g++" + export XPLATFORM="qws/linux-x86-g++" + elif use amd64; then + export PLATFORM="linux-g++-64" + export XPLATFORM="qws/linux-x86-g++" + elif use ppc; then + export PLATFORM="linux-g++" + export XPLATFORM="qws/linux-generic-g++" + else + die "Unknown platform" + fi +} + +src_unpack() { + unpack ${A} + cd ${S} + + sed -i -e 's:read acceptance:acceptance=yes:' configure + + # avoid using -rpath + find mkspecs/ -name qmake.conf -exec sed -i -e "s:QMAKE_RPATH.*:QMAKE_RPATH =:" {} \; +} + +src_compile() { + addwrite "${QTBASE}/etc/settings" + + use gif && myconf="${myconf} -qt-gif" || myconf="${myconf} -no-gif" + use cups && myconf="${myconf} -cups" || myconf="${myconf} -no-cups" + use nis && myconf="${myconf} -nis" || myconf="${myconf} -no-nis" + use ipv6 && myconf="${myconf} -ipv6" || myconf="${myconf} -no-ipv6" + use opengl || myconf="${myconf} -disable-opengl" + use mysql && myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/lib/mysql" || myconf="${myconf} -no-sql-mysql" + use postgres && myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server" || myconf="${myconf} -no-sql-psql" + use firebird && myconf="${myconf} -plugin-sql-ibase" || myconf="${myconf} -no-sql-ibase" + use sqlite && myconf="${myconf} -plugin-sql-sqlite" || myconf="${myconf} -no-sql-sqlite" + use debug && myconf="${myconf} -debug" || myconf="${myconf} -release -no-g++-exceptions" + + ./configure ${myconf} -shared -depths 8,16,24,32 -system-zlib -thread -stl \ + -freetype -qvfb -plugin-imgfmt-{jpeg,mng,png} -system-lib{jpeg,mng,png} \ + -prefix ${QTBASE} -platform ${PLATFORM} -xplatform ${XPLATFORM} \ + -embedded -no-sql-odbc || die + + export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" + + cd ${S} && emake symlinks src-qmake src-moc sub-src || die "make failed" + + # the designer is not compiled when using -embedded, but we need the uic + cd ${S}/tools/designer/uic && emake || die "making uic failed" + + cd ${S} && emake sub-tools || die "making tools failed" + + if use doc; then + cd ${S} && emake sub-tutorial sub-examples || die "making examples failed" + fi +} + +src_install() { + INSTALL_ROOT=${D} emake install + + # fix .prl files + find ${D}/${QTBASE}/lib* -name "*.prl" -exec sed -i -e "s:${S}:${QTBASE}:g" {} \; + + # remove broken link + rm -f ${D}/${QTBASE}/mkspecs/${PLATFORM}/${PLATFORM} + + # fonts + insinto ${QTBASE}/lib/fonts + doins ${S}/lib/fonts/* + + # environment variables + cat < ${T}/47qt-embedded3 +PATH=${QTBASE}/bin +ROOTPATH=${QTBASE}/bin +LDPATH=${QTBASE}/lib +EOF + insinto /etc/env.d + doins ${T}/47qt-embedded3 + + # qmake cache file + sed -i -e "s:${S}:${QTBASE}:" .qmake.cache + insinto ${QTBASE} + doins .qmake.cache + + # documentation + if use doc; then + find examples tutorial -name Makefile -exec sed -i -e "s:${S}:${QTBASE}:g" {} \; + + cp -r ${S}/tutorial ${D}/${QTBASE} + cp -r ${S}/examples ${D}/${QTBASE} + fi + + # default target link (overriden by QMAKESPEC env var) + rm -f "${D}/${QTBASE}/mkspecs/default" + ln -s "${XPLATFORM}" "${D}/${QTBASE}/mkspecs/default" +} + +pkg_postinst() { + echo + einfo "If you want to compile and run a test application using" + einfo "QT/Embedded instead of standard Qt, you must properly" + einfo "set the QTDIR and QMAKESPEC variables, e.g.:" + einfo "" + einfo " export QTDIR=${QTBASE}" + einfo " export QMAKESPEC=${QTBASE}/mkspecs/${XPLATFORM}" + echo +} -- cgit v1.2.3-65-gdbad