Upgrade to qt-4.8.5 (for stellarium)

diff --git a/config/packages-list b/config/packages-list
index 933048b..e910ef6 100644 (file)
--- a/config/packages-list
+++ b/config/packages-list
@@ -306,7 +306,7 @@ PATCH_PACKAGE="patch-2.7.1"
 PCIUTILS="pciutils-3.1.10"
 MENU_CACHE="menu-cache-0.3.3"
 LIBFM="libfm-1.1.0"
-PCMANFM="pcmanfm-1.1.0"
+PCMANFM="pcmanfm-1.1.2"
 PCRE="pcre-8.31"
 PERL="perl-5.14.2"
 PERL_MOD_PDL="PDL-2.4.9"
@@ -337,7 +337,7 @@ PYGOBJECT="pygobject-2.28.6"
 PYGTK="pygtk-2.24.0"
 PYTHON="Python-2.7.3"
 
-QT="qt-everywhere-opensource-src-4.7.1"
+QT="qt-everywhere-opensource-src-4.8.5"
 
 RALENTI="ralenti-0.1"
 READLINE="readline-6.2"

diff --git a/stage5/packages-update b/stage5/packages-update
index 19b6548..fd423f2 100755 (executable)
--- a/stage5/packages-update
+++ b/stage5/packages-update
@@ -144,7 +144,8 @@ fpkg ${KEYUTILS} "http://people.redhat.com/~dhowells/keyutils"
 fpkg -f "${ECRYPTFS_UTILS}.orig" ${ECRYPTFS_UTILS} \
     "https://launchpad.net/ecryptfs/trunk/$(get_pkg_ver_underscore ${ECRYPTFS_UTILS})/+download"
 
-fpkg -e "tar.gz" ${QT} "http://get.qt.nokia.com/qt/source"
+fpkg -e "tar.gz" ${QT} "http://download.qt-project.org/official_releases/qt/$(get_pkg_ver2 ${QT})/$(get_pkg_ver ${QT})"
+
 fpkg -e "tar.gz" ${LUA} "http://www.lua.org/ftp"
 fpkg -e "tar.xz" -m sf ${VLC}
 fpkg -e "tar.gz" ${SDL} "http://www.libsdl.org/release"

diff --git a/stage5/pkg/qt b/stage5/pkg/qt
index 0bbcc03..60319e9 100644 (file)
--- a/stage5/pkg/qt
+++ b/stage5/pkg/qt
@@ -2,11 +2,32 @@
 
 hvconfig_pre()
 {
+    cd ${LFS_TMP}/${PACKAGE}
+
+    sed -i -e "/#if/d" -e "/#error/d" -e "/#endif/d" \
+        config.tests/unix/libmng/libmng.cpp
+    sed -i '/CONFIG -/ a\isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..' \
+        src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro
+
     CONFIGURE_OPTS="\
-        -prefix /opt/qt \
-        -opensource \
-        -nomake examples \
-        -nomake demos"
+        -prefix /opt/qt      \
+        -no-qt3support       \
+        -no-webkit           \
+        -no-xmlpatterns      \
+        -confirm-license     \
+        -opensource          \
+        -release             \
+        -dbus-linked         \
+        -openssl-linked      \
+        -system-sqlite       \
+        -plugin-sql-sqlite   \
+        -no-phonon           \
+        -no-phonon-backend   \
+        -no-nis              \
+        -no-openvg           \
+        -nomake demos        \
+        -nomake examples     \
+        -optimized-qmake"
 }
 
 hvbuild_post()