diff options
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/qt/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-libs/qt/Manifest | 38 | ||||
| -rw-r--r-- | x11-libs/qt/files/digest-qt-3.3.3-r1 | 1 | ||||
| -rw-r--r-- | x11-libs/qt/qt-3.3.3-r1.ebuild | 89 |
4 files changed, 87 insertions, 46 deletions
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index 5bbe9656dfc8..5ab10d7aa615 100644 --- a/x11-libs/qt/ChangeLog +++ b/x11-libs/qt/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.176 2004/12/02 12:07:42 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.177 2004/12/22 11:20:57 usata Exp $ + + 07 Dec 2004; Mamoru KOMACHI <usata@gentoo.org> qt-3.3.3-r1.ebuild: + Added to ~ppc-macos; bug #63440. 02 Dec 2004; Caleb Tennis <caleb@gentoo.org> : Change CC to (tc-getCC) diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest index b2d12c0559ba..b961a626c2fa 100644 --- a/x11-libs/qt/Manifest +++ b/x11-libs/qt/Manifest @@ -1,29 +1,29 @@ -MD5 8bdc13d5192872eaedc9944172606824 qt-3.3.3-r1.ebuild 6628 -MD5 a5c51d879fff01b6f6b8128088bbe3c4 qt-3.3.2.ebuild 6893 -MD5 f769105ec9340901a442a9e9880f504d qt-2.3.2-r1.ebuild 2287 -MD5 5d82c6565d0f7cd22378670d038b92fb qt-3.3.1-r2.ebuild 5743 MD5 8157a1e523e76f007a0ec25c7df6b625 ChangeLog 29631 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156 -MD5 569f680d545c45974e9b33297ffae90e qt-3.3.3.ebuild 6893 +MD5 f769105ec9340901a442a9e9880f504d qt-2.3.2-r1.ebuild 2287 +MD5 65628a10d37af49fff20946f46f67a2c qt-3.3.3-r1.ebuild 8036 MD5 143e75d55f6c24c66ab5d8f89bb7e4c7 qt-3.2.3-r1.ebuild 5154 +MD5 a5c51d879fff01b6f6b8128088bbe3c4 qt-3.3.2.ebuild 6893 +MD5 5d82c6565d0f7cd22378670d038b92fb qt-3.3.1-r2.ebuild 5743 +MD5 569f680d545c45974e9b33297ffae90e qt-3.3.3.ebuild 6893 +MD5 24486c56d654be71e66b7c01b143c9a9 files/digest-qt-3.2.3-r1 72 +MD5 494ea57bec4dcfe3a4ca65e413d81791 files/digest-qt-3.3.3 165 +MD5 8c01ee8bb9af451f93082717ed8f4c49 files/qfontdatabase_x11.diff 1147 +MD5 057679471a1149cfba2cabd7a1fd2b55 files/qt-3.2.3-qfontdatabase-i18n-20031024.patch 10536 MD5 9ac22fe721162a565a7507763f785ab5 files/qt-3.2.3-qpsprinter-useFreeType2-20031128.patch 9972 +MD5 687ac003fc61501eda26cb2cf068cb2a files/qt-3.2.3-scriptForChar-20031128.patch 18095 +MD5 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294 MD5 c7f65a0625242eccf159e2b8ee74976d files/45qt3 109 +MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16 MD5 7a287bc7609ad2420f70af6d4c58302f files/50qt2 63 -MD5 698d5ff434cbace76297754f49699b7e files/digest-qt-3.3.2 165 -MD5 494ea57bec4dcfe3a4ca65e413d81791 files/digest-qt-3.3.3 165 -MD5 9bd231bda8dcf1508a797c80002bfaa3 files/qt-3.3.1-qclipboard-fix.patch 2878 -MD5 24486c56d654be71e66b7c01b143c9a9 files/digest-qt-3.2.3-r1 72 -MD5 87c645dbad7233316ff3340847a59f22 files/digest-qt-3.3.1-r2 72 -MD5 96842a84a7834f8bca5dfc0d272137f1 files/digest-qt-3.3.3-r1 165 -MD5 33d20a19eba2cb13a7eb156d4eea10db files/qt-3.3.2-mips-relax-branches.patch 688 -MD5 2df2442dc59faeb8b545a81d2523cf28 files/qt-3.3.3-immodule-r123-event-inversion-20040909.diff 327 -MD5 687ac003fc61501eda26cb2cf068cb2a files/qt-3.2.3-scriptForChar-20031128.patch 18095 -MD5 8c01ee8bb9af451f93082717ed8f4c49 files/qfontdatabase_x11.diff 1147 -MD5 33d20a19eba2cb13a7eb156d4eea10db files/qt-3.3.1-mips-relax-branches.patch 688 MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16 -MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16 MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r1 65 -MD5 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294 +MD5 33d20a19eba2cb13a7eb156d4eea10db files/qt-3.3.2-mips-relax-branches.patch 688 MD5 dd5958e335d63c95fc1e5051aa5224ca files/qt-3.3.2-immodule-20040819.patch 1761 +MD5 77ee6484af384828441336443499ec0e files/digest-qt-3.3.3-r1 238 +MD5 2df2442dc59faeb8b545a81d2523cf28 files/qt-3.3.3-immodule-r123-event-inversion-20040909.diff 327 MD5 471c09f2792eec732d715a983b7f7244 files/qt-3.3.3-immodule-20040819-event-inversion-20040908.diff 4150 -MD5 057679471a1149cfba2cabd7a1fd2b55 files/qt-3.2.3-qfontdatabase-i18n-20031024.patch 10536 +MD5 87c645dbad7233316ff3340847a59f22 files/digest-qt-3.3.1-r2 72 +MD5 698d5ff434cbace76297754f49699b7e files/digest-qt-3.3.2 165 +MD5 33d20a19eba2cb13a7eb156d4eea10db files/qt-3.3.1-mips-relax-branches.patch 688 +MD5 9bd231bda8dcf1508a797c80002bfaa3 files/qt-3.3.1-qclipboard-fix.patch 2878 diff --git a/x11-libs/qt/files/digest-qt-3.3.3-r1 b/x11-libs/qt/files/digest-qt-3.3.3-r1 index e770b8989a20..caaa95d83463 100644 --- a/x11-libs/qt/files/digest-qt-3.3.3-r1 +++ b/x11-libs/qt/files/digest-qt-3.3.3-r1 @@ -1,2 +1,3 @@ MD5 3e0a0c8429b0a974b39b5f535ddff01c qt-x11-free-3.3.3.tar.bz2 14424812 MD5 1053683f0d27854babc2a03db7360e23 qt-x11-immodule-unified-qt3.3.3-20040910.diff.gz 135277 +MD5 5ba58ddd3bf3d9c6f717b2366d1a5743 qt-3.3.3-darwin-fink.patch.gz 22581 diff --git a/x11-libs/qt/qt-3.3.3-r1.ebuild b/x11-libs/qt/qt-3.3.3-r1.ebuild index c41054cbfc0b..9ff7a0464d7e 100644 --- a/x11-libs/qt/qt-3.3.3-r1.ebuild +++ b/x11-libs/qt/qt-3.3.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.3-r1.ebuild,v 1.7 2004/11/08 21:46:29 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.3-r1.ebuild,v 1.8 2004/12/22 11:20:57 usata Exp $ inherit eutils flag-o-matic @@ -12,11 +12,12 @@ IMMQT_P="qt-x11-immodule-unified-qt3.3.3-20040910" SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2 immqt? ( http://freedesktop.org/Software/ImmoduleQtDownload/${IMMQT_P}.diff.gz ) - immqt-bc? ( http://freedesktop.org/Software/ImmoduleQtDownload/${IMMQT_P}.diff.gz )" + immqt-bc? ( http://freedesktop.org/Software/ImmoduleQtDownload/${IMMQT_P}.diff.gz ) + ppc-macos? ( http://dev.gentoo.org/~usata/distfiles/${P}-darwin-fink.patch.gz )" LICENSE="|| ( QPL-1.0 GPL-2 )" SLOT="3" -KEYWORDS="~x86 ~alpha ~ppc ~amd64 ~sparc ~hppa ~mips ~ppc64 ~ia64" +KEYWORDS="~x86 ~alpha ~ppc ~amd64 ~sparc ~hppa ~mips ~ppc64 ~ia64 ~ppc-macos" IUSE="cups debug doc firebird gif icc ipv6 mysql nas odbc opengl postgres sqlite xinerama zlib immqt immqt-bc" DEPEND="virtual/x11 virtual/xft @@ -43,7 +44,6 @@ S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV} QTBASE=/usr/qt/3 export QTDIR=${S} -export PLATFORM=linux-g++ pkg_setup() { if use immqt ; then @@ -53,6 +53,15 @@ pkg_setup() { ewarn "Be aware." ewarn fi + + if useq ppc-macos ; then + export PLATFORM=darwin-g++ + export DYLD_LIBRARY_PATH="${QTDIR}/lib:/usr/X11R6/lib:${DYLD_LIBRARY_PATH}" + export INSTALL_ROOT="" + else + export PLATFORM=linux-g++ + #use icc && export PLATFORM=linux-icc + fi } src_unpack() { @@ -71,16 +80,19 @@ src_unpack() { sh make-symlinks.sh || die "make symlinks failed" fi - cd mkspecs/linux-g++ + if use ppc-macos ; then + gzcat ${FILESDIR}/${P}-darwin-fink.patch.gz | sed -e "s:@QTBASE@:${QTBASE}:g" > ${T}/${P}-darwin-fink.patch + epatch ${T}/${P}-darwin-fink.patch + fi + + cd mkspecs/${PLATFORM} # set c/xxflags and ldflags strip-flags 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}:" \ - qmake.conf + qmake.conf || die cd ${S} - -# use icc && export PLATFORM=linux-icc } src_compile() { @@ -108,6 +120,13 @@ src_compile() { use immqt-bc && myconf="${myconf} -inputmethod" use immqt && myconf="${myconf} -inputmethod -inputmethod-ext" + if use ppc-macos ; then + myconf="${myconf} -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-cups -lresolv -shared" + myconf="${myconf} -I/usr/X11R6/include -L/usr/X11R6/lib" + myconf="${myconf} -L${S}/lib -I${S}/include" + sed -i -e "s,#define QT_AOUT_UNDERSCORE,," mkspecs/${PLATFORM}/qplatformdefs.h || die + fi + export YACC='byacc -d' ./configure -sm -thread -stl -system-libjpeg -verbose -largefile \ @@ -119,6 +138,7 @@ src_compile() { export QTDIR=${S} emake src-qmake src-moc sub-src || die + DYLD_LIBRARY_PATH="${S}/lib:/usr/X11R6/lib:${DYLD_LIBRARY_PATH}" \ LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" emake sub-tools || die } @@ -136,27 +156,38 @@ src_install() { dobin bin/* # libraries + if use ppc-macos; then + # dolib is broken on BSD because of missing readlink(1) + dodir ${QTBASE}/$(get_libdir) + cp -fR lib/*.{dylib,la,a} ${D}/${QTBASE}/$(get_libdir) || die - dolib lib/libqt-mt.so.3.3.3 lib/libqui.so.1.0.0 - dolib lib/lib{editor,qassistantclient,designercore}.a lib/libqt-mt.la - - cd ${D}/${QTBASE}/$(get_libdir) - for x in libqui.so ; do - ln -s $x.1.0.0 $x.1.0 - ln -s $x.1.0 $x.1 - ln -s $x.1 $x - done + cd ${D}/${QTBASE}/$(get_libdir) + for lib in libqt-mt* ; do + ln -s ${lib} ${lib/-mt/} + done + else + dolib lib/lib{editor,qassistantclient,designercore}.a + dolib lib/libqt-mt.la + dolib lib/libqt-mt.so.3.3.3 lib/libqui.so.1.0.0 + cd ${D}/${QTBASE}/$(get_libdir) + + for x in libqui.so ; do + ln -s $x.1.0.0 $x.1.0 + ln -s $x.1.0 $x.1 + ln -s $x.1 $x + done - # version symlinks - 3.3.3->3.3->3->.so - ln -s libqt-mt.so.3.3.3 libqt-mt.so.3.3 - ln -s libqt-mt.so.3.3 libqt-mt.so.3 - ln -s libqt-mt.so.3 libqt-mt.so + # version symlinks - 3.3.3->3.3->3->.so + ln -s libqt-mt.so.3.3.3 libqt-mt.so.3.3 + ln -s libqt-mt.so.3.3 libqt-mt.so.3 + ln -s libqt-mt.so.3 libqt-mt.so - # libqt -> libqt-mt symlinks - ln -s libqt-mt.so.3.3.3 libqt.so.3.3.3 - ln -s libqt-mt.so.3.3 libqt.so.3.3 - ln -s libqt-mt.so.3 libqt.so.3 - ln -s libqt-mt.so libqt.so + # libqt -> libqt-mt symlinks + ln -s libqt-mt.so.3.3.3 libqt.so.3.3.3 + ln -s libqt-mt.so.3.3 libqt.so.3.3 + ln -s libqt-mt.so.3 libqt.so.3 + ln -s libqt-mt.so libqt.so + fi # includes cd ${S} @@ -216,6 +247,12 @@ src_install() { sed -e "s:${S}:${QTBASE}:g" \ ${S}/.qmake.cache > ${D}${QTBASE}/.qmake.cache + if use ppc-macos ; then + dosed "s:linux-g++:${PLATFORM}:" /etc/env.d/45qt3 \ + "s:\$(QTBASE):\$(QTDIR):g" ${QTBASE}/mkspecs/${PLATFORM}/qmake.conf \ + "s:${S}:${QTBASE}:g" ${QTBASE}/mkspecs/${PLATFORM}/qmake.conf ${QTBASE}/lib/libqt-mt.la || die + fi + # plugins cd ${S} plugins=`find plugins -name "lib*.so" -print` |