Merge branch 'qt-symbian-installation'

6 files changed, 217 insertions, 38 deletions

diff --git a/app-mobilephone/runonphone/Manifest b/app-mobilephone/runonphone/Manifest
index d15ddfe..27ae7f9 100644
--- a/app-mobilephone/runonphone/Manifest
+++ b/app-mobilephone/runonphone/Manifest
@@ -1 +1,2 @@
-EBUILD runonphone-4.7.0.ebuild 769 RMD160 4a04c1d52cdf9e57cd2e31ab6e7fb1054d53aff3 SHA1 83acac4e9b03f45f641e32911fc858c1508f4639 SHA256 3beff1ae4b4bc95e9464168f1fd195f129f74a023d59daa8535737fc343068dd
+DIST qt-everywhere-opensource-src-4.7.1.tar.gz 211768512 RMD160 de6998948eb9f51a9193b9020ba80cfd52d50899 SHA1 fcf764d39d982c7f84703821582bd10c3192e341 SHA256 8cb5277c41f824cfc6dcee0e95e0bf23a9ad2c8d18d245105137481d092b124a
+EBUILD runonphone-4.7.1.ebuild 823 RMD160 cb3f0f64cc287cae844f3f9556083a1a8b3e7347 SHA1 e3ddbb3e339e2ecf5dd66b92f2af22e4f181519f SHA256 6a39d2c2939f50a92ec70b02f75c92c913785b096217f820fb3f653f4d788716
diff --git a/app-mobilephone/runonphone/runonphone-4.7.0.ebuild b/app-mobilephone/runonphone/runonphone-4.7.1.ebuild
index 49d3827..99dc0e1 100644
--- a/app-mobilephone/runonphone/runonphone-4.7.0.ebuild
+++ b/app-mobilephone/runonphone/runonphone-4.7.1.ebuild
@@ -3,15 +3,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils git
+inherit eutils
 
 DESCRIPTION="Tool to automatically install and run applications on Symbian phones"
 HOMEPAGE="http://qt.nokia.com/"
 
-SRC_URI=""
-EGIT_REPO_URI="git://gitorious.org/qt/qt.git"
-EGIT_BRANCH=4.7
-EGIT_COMMIT=4.7
+MY_PV=${PV/_/-}
+SRC_URI="http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${MY_PV}.tar.gz"
 LICENSE="LGPL-2.1 GPL-3"
 
 SLOT="0"
@@ -20,15 +18,13 @@ IUSE=""
 DEPEND=">=x11-libs/qt-core-4.6.0"
 
 src_compile() {
-        cd tools/runonphone
+        cd qt-everywhere-opensource-src-${MY_PV}/tools/runonphone
 	qmake || die "qmake failed"
         emake || die "emake failed"
-        cd ../..
 }
 
 src_install() {
-        cd tools/runonphone
+        cd qt-everywhere-opensource-src-${MY_PV}/tools/runonphone
         exeinto /usr/bin
 	doexe runonphone || die "install failed"
-        cd ../..
 }
diff --git a/dev-libs/qt-symbian-libs/Manifest b/dev-libs/qt-symbian-libs/Manifest
index 4416b12..a6d9fb4 100644
--- a/dev-libs/qt-symbian-libs/Manifest
+++ b/dev-libs/qt-symbian-libs/Manifest
@@ -1,2 +1,4 @@
-DIST qt-symbian-libs-4.7.0.tar.bz2 608685 RMD160 c8ec933f5d6839371791b49be988735c8b57df35 SHA1 81b6dad01a4ac0f19866161ff56979aed2cc092b SHA256 5ebb06bd08cbddbb92b47374ab2ce9b8fefafd33c0125255440425eb34872b19
-EBUILD qt-symbian-libs-4.7.0.ebuild 548 RMD160 53e27711874e4c3598cb8ebcedadd2367bc91eae SHA1 f9b5871fa0085c27e6b3ba56ace47f95481e7f2a SHA256 56ab4bac74fa9fc77c68411af21dd082421d3433414fcf73a752d0555fd0047e
+AUX installing_headers_should_not_require_building.patch 996 RMD160 f5f5b72b28864f6c81693324c632375ab09ef00f SHA1 f6ea078a12bcb8fff816d2f9cedf6e8ee66874d2 SHA256 a5abccf01064ae52a72ff3505f69f0953477e7985d75bed69be9251fdc0ac15f
+DIST qt-everywhere-opensource-src-4.7.1.tar.gz 211768512 RMD160 de6998948eb9f51a9193b9020ba80cfd52d50899 SHA1 fcf764d39d982c7f84703821582bd10c3192e341 SHA256 8cb5277c41f824cfc6dcee0e95e0bf23a9ad2c8d18d245105137481d092b124a
+DIST qt-symbian-libs-4.7.1.tar.bz2 11535921 RMD160 bd2b1a87e3de71186cef4dd8c96fb7b1282fd23b SHA1 7946f364121a09b2179855e081f5b543dd491c34 SHA256 91445a93973d1b48b8dd1f43a27da87ff0db4ca9ddce858e35ca6b41a58d20ef
+EBUILD qt-symbian-libs-4.7.1.ebuild 7928 RMD160 c94330f9ebae21e9ba77851e7025518d361d6535 SHA1 c825e7c6b74a56faf99a1903b60988ed34483108 SHA256 21d020495be1674b407c471e700bddfb273a68295d060b4a182488ea8711b71a
diff --git a/dev-libs/qt-symbian-libs/files/installing_headers_should_not_require_building.patch b/dev-libs/qt-symbian-libs/files/installing_headers_should_not_require_building.patch
new file mode 100644
index 0000000..ef5cf0a
--- /dev/null
+++ b/dev-libs/qt-symbian-libs/files/installing_headers_should_not_require_building.patch
@@ -0,0 +1,29 @@
+diff --git a/src/qt_install.pri b/src/qt_install.pri
+index f906e92..8a5c8d7 100644
+--- a/src/qt_install.pri
++++ b/src/qt_install.pri
+@@ -20,20 +20,24 @@ qt_install_headers {
+     } else {
+         flat_headers.files = $$INSTALL_HEADERS
+         flat_headers.path = $$[QT_INSTALL_HEADERS]/Qt
++        flat_headers.CONFIG += no_build
+         INSTALLS += flat_headers
+ 
+         class_headers.path = $$[QT_INSTALL_HEADERS]/$$TARGET
+     }
+     class_headers.files = $$SYNCQT.HEADER_CLASSES
++    class_headers.CONFIG += no_build
+     INSTALLS += class_headers
+ 
+     targ_headers.files = $$INSTALL_HEADERS
+     targ_headers.path = $$[QT_INSTALL_HEADERS]/$$TARGET
++    targ_headers.CONFIG += no_build
+     INSTALLS += targ_headers
+ 
+     contains(QT_CONFIG,private_tests) {
+         private_headers.files = $$SYNCQT.PRIVATE_HEADER_FILES
+         private_headers.path = $$[QT_INSTALL_HEADERS]/$$TARGET/private
++        private_headers.CONFIG += no_build
+         INSTALLS += private_headers
+     }
+ }
diff --git a/dev-libs/qt-symbian-libs/qt-symbian-libs-4.7.0.ebuild b/dev-libs/qt-symbian-libs/qt-symbian-libs-4.7.0.ebuild
deleted file mode 100644
index a561d29..0000000
--- a/dev-libs/qt-symbian-libs/qt-symbian-libs-4.7.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Copyright 2010 Nokia Corporation and/or its subsidiary(-ies)
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils
-
-DESCRIPTION="Symbian development libraries of Qt from Nokia"
-HOMEPAGE="http://qt.nokia.com/"
-
-SRC_URI="http://pepper.troll.no/s60prereleases/${P}.tar.bz2"
-LICENSE="LGPL-2.1 GPL-3"
-
-RESTRICT="binchecks mirror strip"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-DEPEND=">=dev-libs/s60-sdk-5.0"
-
-src_compile() {
-	true
-}
-
-src_install() {
-	cp -rv * "${D}"
-}
diff --git a/dev-libs/qt-symbian-libs/qt-symbian-libs-4.7.1.ebuild b/dev-libs/qt-symbian-libs/qt-symbian-libs-4.7.1.ebuild
new file mode 100644
index 0000000..90533b4
--- /dev/null
+++ b/dev-libs/qt-symbian-libs/qt-symbian-libs-4.7.1.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Copyright 2010 Nokia Corporation and/or its subsidiary(-ies)
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit eutils qt4-build
+
+DESCRIPTION="Symbian development libraries of Qt from Nokia"
+HOMEPAGE="http://qt.nokia.com/"
+
+SRC_URI="http://pepper.troll.no/s60prereleases/${P}.tar.bz2 http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.1.tar.gz"
+LICENSE="LGPL-2.1 GPL-3"
+
+RESTRICT="binchecks"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+# We don't need the strict module checking that the Linux version of Qt does,
+# since we install all module headers at once.
+E_RDEPEND=""
+E_IUSE=""
+DEPEND=">=dev-libs/s60-sdk-5.0
+        >=sys-devel/gcce-4.4.172
+        app-mobilephone/runonphone"
+
+QT4_EXTRACT_DIRECTORIES="src tools/shared/symbian tools/shared/windows"
+QT4_TARGET_DIRECTORIES="src/tools"
+
+QA_PRESTRIPPED="
+                /usr/share/qt4/qt-symbian/lib/qmlparticlesplugin.dso
+                /usr/share/qt4/qt-symbian/lib/QtScript{00040701}.dso
+                /usr/share/qt4/qt-symbian/lib/qjpeg{00040701}.dso
+                /usr/share/qt4/qt-symbian/lib/qsymbianbearer_3_1{00040701}.dso
+                /usr/share/qt4/qt-symbian/lib/QtWebKit.dso
+                /usr/share/qt4/qt-symbian/lib/qmlwebkitplugin{000a0000}.dso
+                /usr/share/qt4/qt-symbian/lib/qsymbianbearer_3_2.dso
+                /usr/share/qt4/qt-symbian/lib/qcncodecs.dso
+                /usr/share/qt4/qt-symbian/lib/qmng.dso
+                /usr/share/qt4/qt-symbian/lib/qsymbianbearer.dso
+                /usr/share/qt4/qt-symbian/lib/QtMultimedia{00040701}.dso
+                /usr/share/qt4/qt-symbian/lib/qico.dso
+                /usr/share/qt4/qt-symbian/lib/QtXmlPatterns.dso
+                /usr/share/qt4/qt-symbian/lib/QtSql.dso
+                /usr/share/qt4/qt-symbian/lib/qmlfolderlistmodelplugin{00040701}.dso
+                /usr/share/qt4/qt-symbian/lib/qsymbianbearer_3_1.dso
+                /usr/share/qt4/qt-symbian/lib/QtNetwork.dso
+                /usr/share/qt4/qt-symbian/lib/qgif{00040701}.dso
+                /usr/share/qt4/qt-symbian/lib/QtCore.dso
+                /usr/share/qt4/qt-symbian/lib/QtGui{00040701}.dso
+                /usr/share/qt4/qt-symbian/lib/qcncodecs{00040701}.dso
+                /usr/share/qt4/qt-symbian/lib/QtNetwork{00040701}.dso
+                /usr/share/qt4/qt-symbian/lib/qtiff.dso
+                /usr/share/qt4/qt-symbian/lib/qsvgicon{00040701}.dso
+                /usr/share/qt4/qt-symbian/lib/QtMultimedia.dso
+                /usr/share/qt4/qt-symbian/lib/qmlfolderlistmodelplugin.dso
+                /usr/share/qt4/qt-symbian/lib/qkrcodecs{00040701}.dso
+                /usr/share/qt4/qt-symbian/lib/qkrcodecs.dso
+                /usr/share/qt4/qt-symbian/lib/QtDeclarative{00040701}.dso
+                /usr/share/qt4/qt-symbian/lib/QtGui.dso
+                /usr/share/qt4/qt-symbian/lib/qmlgesturesplugin{00040701}.dso
+                /usr/share/qt4/qt-symbian/lib/QtXml{00040701}.dso
+                /usr/share/qt4/qt-symbian/lib/QtSvg{00040701}.dso
+                /usr/share/qt4/qt-symbian/lib/qsvg.dso
+                /usr/share/qt4/qt-symbian/lib/qjpcodecs.dso
+                /usr/share/qt4/qt-symbian/lib/qtwcodecs{00040701}.dso
+                /usr/share/qt4/qt-symbian/lib/qsvgicon.dso
+                /usr/share/qt4/qt-symbian/lib/phonon.dso
+                /usr/share/qt4/qt-symbian/lib/qico{00040701}.dso
+                /usr/share/qt4/qt-symbian/lib/QtScript.dso
+                /usr/share/qt4/qt-symbian/lib/QtSql{00040701}.dso
+                /usr/share/qt4/qt-symbian/lib/QtXmlPatterns{00040701}.dso
+                /usr/share/qt4/qt-symbian/lib/qmlgesturesplugin.dso
+                /usr/share/qt4/qt-symbian/lib/qjpcodecs{00040701}.dso
+                /usr/share/qt4/qt-symbian/lib/QtDeclarative.dso
+                /usr/share/qt4/qt-symbian/lib/QtTest{00040701}.dso
+                /usr/share/qt4/qt-symbian/lib/QtXml.dso
+                /usr/share/qt4/qt-symbian/lib/phonon_mmf.dso
+                /usr/share/qt4/qt-symbian/lib/qtracegraphicssystem.dso
+                /usr/share/qt4/qt-symbian/lib/qjpeg.dso
+                /usr/share/qt4/qt-symbian/lib/qmlwebkitplugin.dso
+                /usr/share/qt4/qt-symbian/lib/QtCore{00040701}.dso
+                /usr/share/qt4/qt-symbian/lib/qtwcodecs.dso
+                /usr/share/qt4/qt-symbian/lib/qsvg{00040701}.dso
+                /usr/share/qt4/qt-symbian/lib/qsymbianbearer{00040701}.dso
+                /usr/share/qt4/qt-symbian/lib/qmng{00040701}.dso
+                /usr/share/qt4/qt-symbian/lib/qgif.dso
+                /usr/share/qt4/qt-symbian/lib/qtiff{00040701}.dso
+                /usr/share/qt4/qt-symbian/lib/qmlparticlesplugin{00040701}.dso
+                /usr/share/qt4/qt-symbian/lib/phonon_mmf{00040701}.dso
+                /usr/share/qt4/qt-symbian/lib/QtWebKit{00040701}.dso
+                /usr/share/qt4/qt-symbian/lib/qsymbianbearer_3_2{00040701}.dso
+                /usr/share/qt4/qt-symbian/lib/phonon{00040400}.dso
+                /usr/share/qt4/qt-symbian/lib/qtracegraphicssystem{00040701}.dso
+                /usr/share/qt4/qt-symbian/lib/qtmain.lib
+                /usr/share/qt4/qt-symbian/lib/QtSvg.dso
+                /usr/share/qt4/qt-symbian/lib/QtTest.dso"
+
+src_unpack() {
+    qt4-build_src_unpack
+    unpack ${P}.tar.bz2
+}
+
+symbianqtenv() {
+    setqtenv
+    export PATH=$PATH:/usr/s60-sdk/epoc32/tools
+    export EPOCROOT=/usr/s60-sdk
+    export HOME=${T}/home
+}
+
+src_prepare() {
+    mkdir -p ${T}/home
+    symbianqtenv
+
+    # Wine tries to open sound devices.
+    addpredict /dev/snd
+
+    # Generate wine config
+    rcomp >& /dev/null
+    # Fix uidcrc.exe bug.
+    cp $EPOCROOT/epoc32/tools/uidcrc.exe `find $HOME/.wine -ipath '*windows/system32'`
+
+    epatch "${FILESDIR}/installing_headers_should_not_require_building.patch"
+}
+
+src_configure() {
+    symbianqtenv
+    local conf_cmd
+    if use amd64; then
+        qtArch=linux-g++-64
+    else
+        qtArch=linux-g++
+    fi
+    # GCCE can't build webkit, but we still enable it so that one can use the precompiled library.
+    conf_cmd="./configure -platform ${qtArch} -xplatform symbian/linux-gcce -prefix /usr/share/qt4/qt-symbian -confirm-license -opensource -fast -verbose -webkit"
+    echo $conf_cmd
+    $conf_cmd || die "Configure failed"
+    echo CONFIG+=no_build >> .qmake.cache
+}
+
+src_install() {
+    symbianqtenv
+
+    dodir /usr/share/qt4/qt-symbian
+    dodir /usr/share/qt4/qt-symbian/include
+
+    cp -r mkspecs ${D}/usr/share/qt4/qt-symbian || die "Copy failed"
+    # These need to be carried out with -j1, otherwise the nonatomic check for directory,
+    # followed by creation of directory, might overlap and fail.
+    for i in corelib xml xmlpatterns gui sql network svg script scripttools opengl multimedia testlib 3rdparty/webkit/WebCore; do
+        emake INSTALL_ROOT="${D}" -j1 -C src/$i install_flat_headers install_class_headers install_targ_headers || die "emake install failed"
+    done
+    # A few exceptions not following the norm.
+    emake INSTALL_ROOT="${D}" -j1 -C src/openvg install_flat_headers install_targ_headers || die "emake install failed"
+    emake INSTALL_ROOT="${D}" -j1 -C src/phonon install_class_headers install_targ_headers || die "emake install failed"
+
+    exeinto /usr/share/qt4/qt-symbian/bin
+    for i in createpackage createpackage.pl elf2e32_qtwrapper moc patch_capabilities patch_capabilities.pl qmake rcc uic; do
+        doexe ${S}/bin/$i || die "doexe failed"
+        dosym ../share/qt4/qt-symbian/bin/$i /usr/bin/$i-symbian || die "dosym failed"
+    done
+
+    mkdir -p ${D}/usr/share/qt4/qt-symbian/src/s60installs || die "mkdir failed"
+    cp src/s60installs/selfsigned.* ${D}/usr/share/qt4/qt-symbian/src/s60installs || die "cp failed"
+
+    cd ..
+    cp -r lib ${D}/usr/share/qt4/qt-symbian
+}
+
+#src_compile() {
+#	true
+#}
+
+#src_install() {
+#	cp -rv * "${D}"
+#}