diff options
Diffstat (limited to 'slackware64-current/source/l/qt')
4 files changed, 14 insertions, 18 deletions
diff --git a/slackware64-current/source/l/qt/qt-everywhere-opensource-src-4.8.4.tar.xz b/slackware64-current/source/l/qt/qt-everywhere-opensource-src-4.8.4.tar.xz new file mode 100644 index 000000000..ee489fa18 --- /dev/null +++ b/slackware64-current/source/l/qt/qt-everywhere-opensource-src-4.8.4.tar.xz @@ -0,0 +1 @@ +766021eb6aa163ece82dfbb4bed733c5941f136f diff --git a/slackware64-current/source/l/qt/qt.SlackBuild b/slackware64-current/source/l/qt/qt.SlackBuild index b361aaee4..d3cb01454 100755 --- a/slackware64-current/source/l/qt/qt.SlackBuild +++ b/slackware64-current/source/l/qt/qt.SlackBuild @@ -37,11 +37,11 @@ # wget http://qt.gitorious.org/qt/kde-qt/archive-tarball/4.6.2-patched # # Modifications 2010, 2011, 2012 Eric Hameleers, Eindhoven, NL -# qt 4.7.3, 4.7.4, 4.8.0, 4.8.1, 4.8.2 are built from original nokia sources. +# qt 4.7.3, 4.7.4, 4.8.0, 4.8.1, 4.8.2, 4.8.4 are built from original nokia sources. PKGNAM=qt VERSION=$(ls qt-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -BUILD=${BUILD:-4} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j7} @@ -113,20 +113,6 @@ zcat $CWD/qt.ld-gold.patch.gz | patch -p1 --verbose || exit 1 # Stupid idea - remove it: zcat $CWD/qt.webkit-no_Werror.patch.gz | patch -p1 --verbose || exit 1 -# Fix cursor position bug within tables: -zcat $CWD/qt.ca89c49.cursor.position.diff.gz | patch -p1 --verbose || exit 1 - -# Fix assistant crash: -zcat $CWD/qt.assistant.memcpy-crash.diff.gz | patch -p0 --verbose || exit 1 - -# Fix webkit compiling with recent glib: -zcat $CWD/qt.webkit.glib.diff.gz | patch -p1 --verbose || exit 1 - -# Some patches from upstream: -zcat $CWD/QElfParser-fix-type-of-sh_size.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/QTBUG-14724_close_orphaned_file_descriptors_after_printing.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/QTBUG-21900_Buttons_in_Qt_applications_not_clickable_when_run_under_gnome-shell.patch.gz | patch -p1 --verbose || exit 1 - export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" export OPENSOURCE_CXXFLAGS="$SLKCFLAGS" @@ -145,6 +131,7 @@ export OPENSOURCE_CXXFLAGS="$SLKCFLAGS" -no-phonon \ -nomake examples \ -nomake demos \ + -nomake docs \ -no-separate-debug-info \ -no-pch # No-precompiled-headers is ccache-friendly. @@ -219,6 +206,14 @@ mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig done ) +# Install Qt's private headers - at least Gentoo and Fedora are adding these +# and some software has (inevitably) started depending on them: +# We're using `rsync -R` as easy way to preserve relative path names: +rsync -aR \ + include/Qt{Core,Declarative,Gui,Script}/private \ + src/{corelib,declarative,gui,script}/*/*_p.h \ + ${PKG}/usr/lib${LIBDIRSUFFIX}/qt/ + # Add menu entries for all those hidden but great Qt applications: # Qt logo: convert $PKG/usr/lib$LIBDIRSUFFIX/qt/doc/src/images/qt-logo.png -resize 48x48 $PKG/usr/share/icons/hicolor/48x48/apps/qt-logo.png diff --git a/slackware64-current/source/l/qt/qt.webkit-no_Werror.patch.gz b/slackware64-current/source/l/qt/qt.webkit-no_Werror.patch.gz index bd7d2605f..effc0526b 100644 --- a/slackware64-current/source/l/qt/qt.webkit-no_Werror.patch.gz +++ b/slackware64-current/source/l/qt/qt.webkit-no_Werror.patch.gz @@ -1 +1 @@ -3380324d74585348e2c4a785c542f7ff3af36fbe +b96fc1ceb640c46f91bee8ac8f46e5f8019a816a diff --git a/slackware64-current/source/l/qt/slack-desc b/slackware64-current/source/l/qt/slack-desc index f511d8991..0a42d4a32 100644 --- a/slackware64-current/source/l/qt/slack-desc +++ b/slackware64-current/source/l/qt/slack-desc @@ -11,7 +11,7 @@ qt: qt: Qt is a complete and well-developed object-oriented framework for qt: developing graphical user interface (GUI) applications using C++. qt: -qt: Homepage: http://qt.nokia.com +qt: Homepage: http://qt-project.org/ qt: qt: qt: |