Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=68a5a91a6f6d2ebf00f95c52d6954b13e42f0ba3
commit 68a5a91a6f6d2ebf00f95c52d6954b13e42f0ba3 Author: crazy <[email protected]> Date: Sun Jan 22 15:01:32 2017 +0100 qt4-4.8.7-5-x86_64 * removed diff --git a/source/xlib-extra/qt4/FrugalBuild b/source/xlib-extra/qt4/FrugalBuild deleted file mode 100644 index 6ed0925..0000000 --- a/source/xlib-extra/qt4/FrugalBuild +++ /dev/null @@ -1,697 +0,0 @@ -# Compiling Time: 40.04 SBU -# Maintainer: Marius Cirsta <[email protected]> - - -USE_DEMOS=${USE_DEMOS:-"n"} -USE_DETECTDEPENDS=${USE_DETECTDEPENDS:-"n"} - -pkgname=qt4 -_F_archive_name=qt-everywhere-opensource-src -pkgver=4.8.7 -pkgrel=5 -pkgdesc="The QT4 GUI toolkit." -url="http://qt.nokia.com/products/"; -depends=() -makedepends+=('libxft' 'libxcursor' \ - 'libxtst' 'cups>=1.3.11-4' 'bison' \ - 'flex' 'openssl>=1.0.0' 'x11-protos'\ - 'pkgconfig' 'libxdamage' 'gtk+2>=2.10.0-2'\ - 'clang' 'x11-protos') -groups=('xlib-extra') -archs=('i686' 'x86_64') -options+=('scriptlet' 'nodocs') -up2date="Flastverdir http://download.qt.io/official_releases/qt/4.8/"; -source=(http://download.qt.io/official_releases/qt/4.8/${pkgver}/$_F_archive_name-$pkgver.tar.gz \ - frugalware.patch \ - glib-honor-ExcludeSocketNotifiers-flag.patch \ - l-qclipboard_delay.patch \ - l-qclipboard_fix_recursive.patch \ - moc-boost-workaround.patch \ - alsa-fix.patch) -sha1sums=('76aef40335c0701e5be7bb3a9101df5d22fe3666' \ - '39b67a38c74acc9bba9940cbb39af73fef030edb' \ - '6ae0966c0d738ac52e6f5c4bebb1a852d3ace312' \ - '234f44abc7866840bb456a81f895f0750f50d31f' \ - 'd67a6a06333941b76c7225d3b9986c5baca35073' \ - '10178d1771c09db0a0ed717a6338e5a1ccebe692' \ - '81366072342c5d702112718b8f9681a38b962ba5') - -export LD_LIBRARY_PATH=$Fsrcdir/$_F_archive_name-$pkgver/lib:${LD_LIBRARY_PATH} -export YACC='yacc -d' - -# NOTE: almost all subgroups need be moved to main .. but not yet - -# To detected dependecies with makepkg -a -if Fuse DETECTDEPENDS; then - makedepends=("${makedepends[@]}" "$pkgname=$pkgver") -fi - -# Subpackage versions checking -LIBQT3SUPPORTDEP="libqt3support>=$pkgver-$pkgrel" -LIBQTCLUCENEDEP="libqtclucene>=$pkgver-$pkgrel" -LIBQTCOREDEP="libqtcore>=$pkgver-$pkgrel" -LIBQTDBUSDEP="libqtdbus>=$pkgver-$pkgrel" -LIBQTDECLARATIVE="libqtdeclarative>=$pkgver-$pkgrel" -LIBQTDESIGNERDEP="libqtdesigner>=$pkgver-$pkgrel" -LIBQTGUIDEP="libqtgui>=$pkgver-$pkgrel" -LIBQTHELPDEP="libqthelp>=$pkgver-$pkgrel" -LIBQTOPENGLDEP="libqtopengl>=$pkgver-$pkgrel" -LIBQTNETWORKDEP="libqtnetwork>=$pkgver-$pkgrel" -LIBQTSCRIPTDEP="libqtscript>=$pkgver-$pkgrel" -LIBQTSQLDEP="libqtsql>=$pkgver-$pkgrel" -LIBQTSVGDEP="libqtsvg>=$pkgver-$pkgrel" -LIBQTTESTDEP="libqttest>=$pkgver-$pkgrel" -LIBQTUITOOLSDEP="libqtuitools>=$pkgver-$pkgrel" -LIBQTWEBKITDEP="libqtwebkit>=$pkgver-$pkgrel" -LIBQTXMLDEP="libqtxml>=$pkgver-$pkgrel" -LIBQTXMLPATTERNSDEP="libqtxmlpatterns>=$pkgver-$pkgrel" - -if false; then -# Subpackage template -subpkgs=("${subpkgs[@]}" "") -subdescs=("${subdescs[@]}" '') -subdepends=("${subdepends[@]}" "") -subrodepends=("${subrodepends[@]}" "") -subgroups=("${subgroups[@]}" '') -subarchs=("${subarchs[@]}" 'i686 x86_64') -subconflicts=("${subconflicts[@]}" '') -subreplaces=("${subreplaces[@]}" '') -subprovides=("${subprovides[@]}" '') -fi - -subpkgs=("${subpkgs[@]}" "libqt3support") -subdescs=("${subdescs[@]}" 'Qt4 Qt3support Library') -subdepends=("${subdepends[@]}" "") -subrodepends=("${subrodepends[@]}" "$LIBQTGUIDEP $LIBQTNETWORKDEP $LIBQTSQLDEP $LIBQTXMLDEP") -subgroups=("${subgroups[@]}" 'xlib-extra qt4-libs') -subarchs=("${subarchs[@]}" 'i686 x86_64') -subconflicts=("${subconflicts[@]}" '') -subreplaces=("${subreplaces[@]}" '') -subprovides=("${subprovides[@]}" '') - -subpkgs=("${subpkgs[@]}" "libqtclucene") -subdescs=("${subdescs[@]}" 'Qt4 CLucene Library') -subdepends=("${subdepends[@]}" "") -subrodepends=("${subrodepends[@]}" "$LIBQTCOREDEP") -subgroups=("${subgroups[@]}" 'xlib-extra qt4-libs') -subarchs=("${subarchs[@]}" 'i686 x86_64') -subconflicts=("${subconflicts[@]}" '') -subreplaces=("${subreplaces[@]}" '') -subprovides=("${subprovides[@]}" '') - -subpkgs=("${subpkgs[@]}" "libqtcore") -subdescs=("${subdescs[@]}" 'Qt4 Core Library') -subdepends=("${subdepends[@]}" "glib2 libstdc++ zlib") -subrodepends=("${subrodepends[@]}" "qt4-data") -subgroups=("${subgroups[@]}" 'lib-extra qt4-libs') -subarchs=("${subarchs[@]}" 'i686 x86_64') -subconflicts=("${subconflicts[@]}" '') -subreplaces=("${subreplaces[@]}" '') -subprovides=("${subprovides[@]}" '') - -Fconfopts+=" -dbus" -subpkgs=("${subpkgs[@]}" "libqtdbus") -subdescs=("${subdescs[@]}" 'Qt4 DBus Library') -subdepends=("${subdepends[@]}" "dbus>=0.93") -subrodepends=("${subrodepends[@]}" "$LIBQTXMLDEP") -subgroups=("${subgroups[@]}" 'lib-extra qt4-libs') -subarchs=("${subarchs[@]}" 'i686 x86_64') -subconflicts=("${subconflicts[@]}" 'qt4-qdbus') -subreplaces=("${subreplaces[@]}" 'qt4-qdbus') -subprovides=("${subprovides[@]}" 'qt4-qdbus') - -subpkgs=("${subpkgs[@]}" "libqtdeclarative") -subdescs=("${subdescs[@]}" 'Qt4 Declarative Library') -subdepends=("${subdepends[@]}" "") -subrodepends=("${subrodepends[@]}" "$LIBQTGUIDEP $LIBQTSCRIPTDEP $LIBQTXMLDEP") -subgroups=("${subgroups[@]}" 'xlib-extra qt4-libs') -subarchs=("${subarchs[@]}" 'i686 x86_64') -subconflicts=("${subconflicts[@]}" '') -subreplaces=("${subreplaces[@]}" '') -subprovides=("${subprovides[@]}" '') - -subpkgs=("${subpkgs[@]}" "libqtdesigner") -subdescs=("${subdescs[@]}" 'Qt4 Designer Library') -subdepends=("${subdepends[@]}" "") -subrodepends=("${subrodepends[@]}" "$LIBQTGUIDEP $LIBQTSCRIPTDEP $LIBQTXMLDEP") -subgroups=("${subgroups[@]}" 'xlib-extra qt4-libs') -subarchs=("${subarchs[@]}" 'i686 x86_64') -subconflicts=("${subconflicts[@]}" 'libqtdesignercomponents') -subreplaces=("${subreplaces[@]}" 'libqtdesignercomponents') -subprovides=("${subprovides[@]}" 'libqtdesignercomponents') - -subpkgs=("${subpkgs[@]}" "libqtgui") -subdescs=("${subdescs[@]}" 'Qt4 Gui Library') -subdepends=("${subdepends[@]}" "libjpeg>=8a libpng>=1.4.1 libmng>=2.0.3 libtiff libsm fontconfig libxcursor libxrandr libxi libxinerama libxt") -subrodepends=("${subrodepends[@]}" "$LIBQTCOREDEP $LIBQTSVGDEP") -subgroups=("${subgroups[@]}" 'xlib-extra qt4-libs') -subarchs=("${subarchs[@]}" 'i686 x86_64') -subconflicts=("${subconflicts[@]}" '') -subreplaces=("${subreplaces[@]}" '') -subprovides=("${subprovides[@]}" '') - -subpkgs=("${subpkgs[@]}" "libqthelp") -subdescs=("${subdescs[@]}" 'Qt4 Help Library') -subdepends=("${subdepends[@]}" "") -subrodepends=("${subrodepends[@]}" "$LIBQTCLUCENEDEP $LIBQTGUIDEP $LIBQTSQLDEP $LIBQTXMLDEP") -subgroups=("${subgroups[@]}" 'xlib-extra qt4-libs') -subarchs=("${subarchs[@]}" 'i686 x86_64') -subconflicts=("${subconflicts[@]}" '') -subreplaces=("${subreplaces[@]}" '') -subprovides=("${subprovides[@]}" '') - -subpkgs=("${subpkgs[@]}" "libqtmultimedia") -subdescs=("${subdescs[@]}" 'Qt4 Multimedia Library') -subdepends=("${subdepends[@]}" "alsa-lib") -subrodepends=("${subrodepends[@]}" "$LIBQTGUIDEP") -subgroups=("${subgroups[@]}" 'xlib-extra qt4-libs') -subarchs=("${subarchs[@]}" 'i686 x86_64') -subconflicts=("${subconflicts[@]}" '') -subreplaces=("${subreplaces[@]}" '') -subprovides=("${subprovides[@]}" '') - -subpkgs=("${subpkgs[@]}" "libqtnetwork") -subdescs=("${subdescs[@]}" 'Qt4 Network Library') -subdepends=("${subdepends[@]}" "") -subrodepends=("${subrodepends[@]}" "$LIBQTCOREDEP") -subgroups=("${subgroups[@]}" 'lib-extra qt4-libs') -subarchs=("${subarchs[@]}" 'i686 x86_64') -subconflicts=("${subconflicts[@]}" '') -subreplaces=("${subreplaces[@]}" '') -subprovides=("${subprovides[@]}" '') - -subpkgs=("${subpkgs[@]}" "libqtopengl") -subdescs=("${subdescs[@]}" 'Qt4 OpenGL Library') -subdepends=("${subdepends[@]}" "libgl libglu libxrender") -subrodepends=("${subrodepends[@]}" "$LIBQTGUIDEP") -subgroups=("${subgroups[@]}" 'xlib-extra qt4-libs') -subarchs=("${subarchs[@]}" 'i686 x86_64') -subconflicts=("${subconflicts[@]}" '') -subreplaces=("${subreplaces[@]}" '') -subprovides=("${subprovides[@]}" '') - -subpkgs=("${subpkgs[@]}" "libqtscript") -subdescs=("${subdescs[@]}" 'Qt4 Script Library') -subdepends=("${subdepends[@]}" "") -subrodepends=("${subrodepends[@]}" "$LIBQTCOREDEP") -subgroups=("${subgroups[@]}" 'lib-extra qt4-libs') -subarchs=("${subarchs[@]}" 'i686 x86_64') -subconflicts=("${subconflicts[@]}" '') -subreplaces=("${subreplaces[@]}" '') -subprovides=("${subprovides[@]}" '') - -subpkgs=("${subpkgs[@]}" "libqtscripttools") -subdescs=("${subdescs[@]}" 'Qt4 ScriptTools Library') -subdepends=("${subdepends[@]}" "") -subrodepends=("${subrodepends[@]}" "$LIBQTGUIDEP $LIBQTSCRIPTDEP") -subgroups=("${subgroups[@]}" 'xlib-extra qt4-libs') -subarchs=("${subarchs[@]}" 'i686 x86_64') -subconflicts=("${subconflicts[@]}" '') -subreplaces=("${subreplaces[@]}" '') -subprovides=("${subprovides[@]}" '') - -subpkgs=("${subpkgs[@]}" "libqtsql") -subdescs=("${subdescs[@]}" 'Qt4 Sql Library') -subdepends=("${subdepends[@]}" "") -subrodepends=("${subrodepends[@]}" "$LIBQTCOREDEP") -subgroups=("${subgroups[@]}" 'lib-extra qt4-libs') -subarchs=("${subarchs[@]}" 'i686 x86_64') -subconflicts=("${subconflicts[@]}" '') -subreplaces=("${subreplaces[@]}" '') -subprovides=("${subprovides[@]}" '') - -subpkgs=("${subpkgs[@]}" "libqtsvg") -subdescs=("${subdescs[@]}" 'Qt4 Svg Library') -subdepends=("${subdepends[@]}" "") -subrodepends=("${subrodepends[@]}" "$LIBQTGUIDEP") -subgroups=("${subgroups[@]}" 'xlib-extra qt4-libs') -subarchs=("${subarchs[@]}" 'i686 x86_64') -subconflicts=("${subconflicts[@]}" '') -subreplaces=("${subreplaces[@]}" '') -subprovides=("${subprovides[@]}" '') - -subpkgs=("${subpkgs[@]}" "libqttest") -subdescs=("${subdescs[@]}" 'Qt4 Unit Testing Library') -subdepends=("${subdepends[@]}" "") -subrodepends=("${subrodepends[@]}" "$LIBQTCOREDEP") -subgroups=("${subgroups[@]}" 'lib-extra qt4-libs') -subarchs=("${subarchs[@]}" 'i686 x86_64') -subconflicts=("${subconflicts[@]}" '') -subreplaces=("${subreplaces[@]}" '') -subprovides=("${subprovides[@]}" '') - -subpkgs=("${subpkgs[@]}" "libqtuitools") -subdescs=("${subdescs[@]}" 'Qt4 UiTools Library') -subdepends=("${subdepends[@]}" "libgcc libice libxrender libxext") -subrodepends=("${subrodepends[@]}" "$LIBQTGUIDEP $LIBQTXMLDEP") -subgroups=("${subgroups[@]}" 'xlib-extra qt4-libs') -subarchs=("${subarchs[@]}" 'i686 x86_64') -subconflicts=("${subconflicts[@]}" '') -subreplaces=("${subreplaces[@]}" '') -subprovides=("${subprovides[@]}" '') - -subpkgs=("${subpkgs[@]}" "libqtwebkit") -subdescs=("${subdescs[@]}" 'Qt4 WebKit Library') -subdepends=("${subdepends[@]}" "sqlite3 util-linux") -subrodepends=("${subrodepends[@]}" "$LIBQTXMLPATTERNSDEP") -subgroups=("${subgroups[@]}" 'xlib-extra qt4-libs') -subarchs=("${subarchs[@]}" 'i686 x86_64') -subconflicts=("${subconflicts[@]}" '') -subreplaces=("${subreplaces[@]}" '') -subprovides=("${subprovides[@]}" '') - -subpkgs=("${subpkgs[@]}" "libqtxml") -subdescs=("${subdescs[@]}" 'Qt4 Xml Library') -subdepends=("${subdepends[@]}" "") -subrodepends=("${subrodepends[@]}" "$LIBQTCOREDEP") -subgroups=("${subgroups[@]}" 'lib-extra qt4-libs') -subarchs=("${subarchs[@]}" 'i686 x86_64') -subconflicts=("${subconflicts[@]}" '') -subreplaces=("${subreplaces[@]}" '') -subprovides=("${subprovides[@]}" '') - -subpkgs=("${subpkgs[@]}" "libqtxmlpatterns") -subdescs=("${subdescs[@]}" 'Qt4 XmlPatterns Library') -subdepends=("${subdepends[@]}" "") -subrodepends=("${subrodepends[@]}" "$LIBQTNETWORKDEP") -subgroups=("${subgroups[@]}" 'lib-extra qt4-libs') -subarchs=("${subarchs[@]}" 'i686 x86_64') -subconflicts=("${subconflicts[@]}" '') -subreplaces=("${subreplaces[@]}" '') -subprovides=("${subprovides[@]}" '') - -subpkgs=("${subpkgs[@]}" "$pkgname-assistant") -subdescs=("${subdescs[@]}" 'Qt4 Document Browser') -subdepends=("${subdepends[@]}" "") -subrodepends=("${subrodepends[@]}" "$LIBQTHELPDEP $LIBQTNETWORKDEP") -subgroups=("${subgroups[@]}" 'xapps-extra') -subarchs=("${subarchs[@]}" 'i686 x86_64') -subconflicts=("${subconflicts[@]}" '') -subreplaces=("${subreplaces[@]}" '') -subprovides=("${subprovides[@]}" '') - -subpkgs=("${subpkgs[@]}" "$pkgname-designer") -subdescs=("${subdescs[@]}" 'Qt4 Interface Designer') -subdepends=("${subdepends[@]}" "") -subrodepends=("${subrodepends[@]}" "$LIBQT3SUPPORTDEP $LIBQTDESIGNERDEP $LIBQTSCRIPTDEP $LIBQTWEBKITDEP") -subgroups=("${subgroups[@]}" 'xapps-extra') -subarchs=("${subarchs[@]}" 'i686 x86_64') -subconflicts=("${subconflicts[@]}" '') -subreplaces=("${subreplaces[@]}" '') -subprovides=("${subprovides[@]}" '') - -subpkgs=("${subpkgs[@]}" "$pkgname-linguist") -subdescs=("${subdescs[@]}" 'Qt4 Translation Tool') -subdepends=("${subdepends[@]}" "libx11") -subrodepends=("${subrodepends[@]}" "$LIBQTNETWORKDEP $LIBQTUITOOLSDEP") -subgroups=("${subgroups[@]}" 'xapps-extra') -subarchs=("${subarchs[@]}" 'i686 x86_64') -subconflicts=("${subconflicts[@]}" '') -subreplaces=("${subreplaces[@]}" '') -subprovides=("${subprovides[@]}" '') - -subpkgs=("${subpkgs[@]}" "$pkgname-tools") -subdescs=("${subdescs[@]}" 'Qt4 Tools') -subdepends=("${subdepends[@]}" "util-linux") -subrodepends=("${subrodepends[@]}" "$LIBQT3SUPPORTDEP") -subgroups=("${subgroups[@]}" 'xapps-extra') -subarchs=("${subarchs[@]}" 'i686 x86_64') -subconflicts=("${subconflicts[@]}" '') -subreplaces=("${subreplaces[@]}" 'kdbus') -subprovides=("${subprovides[@]}" '') - -for i in "${subpkgs[@]}"; do - private_headers_deps=("${private_headers_deps[@]}" "${i}=$pkgver") -done - -subpkgs=("${subpkgs[@]}" "$pkgname-private-headers") -subdescs=("${subdescs[@]}" 'Qt private headers for development') -subdepends=("${subdepends[@]}" "") -subrodepends=("${subrodepends[@]}" "${private_headers_deps[*]}") -subgroups=("${subgroups[@]}" 'xlib-extra qt4-libs') -subarchs=("${subarchs[@]}" 'i686 x86_64') -subconflicts=("${subconflicts[@]}" '') -subreplaces=("${subreplaces[@]}" '') -subprovides=("${subprovides[@]}" '') - -# Extra plugins - -subpkgs=("${subpkgs[@]}" "$pkgname-plugin-graphicssystems") -subdescs=("${subdescs[@]}" 'Qt4 GraphicsSystems Plugin') -subdepends=("${subdepends[@]}" "") -subrodepends=("${subrodepends[@]}" "$LIBQTOPENGLDEP") -subgroups=("${subgroups[@]}" 'xlib-extra qt4-libs') -subarchs=("${subarchs[@]}" 'i686 x86_64') -subconflicts=("${subconflicts[@]}" '') -subreplaces=("${subreplaces[@]}" '') -subprovides=("${subprovides[@]}" '') - -Fconfopts+=" -plugin-sql-mysql" -subpkgs=("${subpkgs[@]}" "$pkgname-plugin-mysql") -subdescs=("${subdescs[@]}" 'Qt4 MySql plugin') -subdepends=("${subdepends[@]}" "libmysqlclient>=5.5.10") -makedepends=("${makedepends[@]}" 'mysql') -subrodepends=("${subrodepends[@]}" "$LIBQTSQLDEP") -subgroups=("${subgroups[@]}" 'lib-extra qt4-libs') -subarchs=("${subarchs[@]}" 'i686 x86_64') -subconflicts=("${subconflicts[@]}" '') -subreplaces=("${subreplaces[@]}" '') -subprovides=("${subprovides[@]}" '') - -Fconfopts+=" -plugin-sql-odbc" -subpkgs=("${subpkgs[@]}" "$pkgname-plugin-odbc") -subdescs=("${subdescs[@]}" 'Qt4 ODBC plugin') -subdepends=("${subdepends[@]}" "unixodbc>=2.3.1") -subrodepends=("${subrodepends[@]}" "$LIBQTSQLDEP") -subgroups=("${subgroups[@]}" 'lib-extra qt4-libs') -subarchs=("${subarchs[@]}" 'i686 x86_64') -subconflicts=("${subconflicts[@]}" '') -subreplaces=("${subreplaces[@]}" '') -subprovides=("${subprovides[@]}" '') - -subpkgs=("${subpkgs[@]}" "$pkgname-plugin-psql") -subdescs=("${subdescs[@]}" 'Qt4 PSQL plugin') -subdepends=("${subdepends[@]}" "libpq>=8.2 readline") -makedepends=("${makedepends[@]}" 'postgresql') -subrodepends=("${subrodepends[@]}" "$LIBQTSQLDEP") -subgroups=("${subgroups[@]}" 'lib-extra qt4-libs') -subarchs=("${subarchs[@]}" 'i686 x86_64') -subconflicts=("${subconflicts[@]}" '') -subreplaces=("${subreplaces[@]}" '') -subprovides=("${subprovides[@]}" '') - -subpkgs=("${subpkgs[@]}" "$pkgname-plugin-script-qtdbus") -subdescs=("${subdescs[@]}" 'Qt4 Dbus Script Plugin') -subdepends=("${subdepends[@]}" "") -subrodepends=("${subrodepends[@]}" "$LIBQTDBUSDEP $LIBQTGUIDEP $LIBQTSCRIPTDEP") -subgroups=("${subgroups[@]}" 'xlib-extra qt4-libs') -subarchs=("${subarchs[@]}" 'i686 x86_64') -subconflicts=("${subconflicts[@]}" '') -subreplaces=("${subreplaces[@]}" '') -subprovides=("${subprovides[@]}" '') - -Fconfopts+=" -plugin-sql-sqlite -system-sqlite" -subpkgs=("${subpkgs[@]}" "$pkgname-plugin-sqlite3") -subdescs=("${subdescs[@]}" 'Qt4 SQlite3 plugin') -subdepends=("${subdepends[@]}" "sqlite3") -subrodepends=("${subrodepends[@]}" "$LIBQTSQLDEP") -subgroups=("${subgroups[@]}" 'lib-extra qt4-libs') -subarchs=("${subarchs[@]}" 'i686 x86_64') -subconflicts=("${subconflicts[@]}" '') -subreplaces=("${subreplaces[@]}" '') -subprovides=("${subprovides[@]}" '') - -# Optionnal packages - -if Fuse $USE_DEMOS; then -Fconfopts+=" -demosdir /usr/share/doc/$pkgname/demos -examplesdir /usr/share/doc/$pkgname/examples" -subpkgs=("${subpkgs[@]}" "$pkgname-demos") -subdescs=("${subdescs[@]}" 'Qt4 Demo and Example Programs.') -subdepends=("${subdepends[@]}" "libxdamage") -subrodepends=("${subrodepends[@]}" "$LIBQTDESIGNERDEP $LIBQTDBUSDEP $LIBQTHELPDEP $LIBQTOPENGLDEP $LIBQTSCRIPTDEP $LIBQTUITOOLSDEP $LIBQT3SUPPORTDEP $LIBQTSVGDEP $LIBQTTESTDEP $LIBQTWEBKITDEP") -subgroups=("${subgroups[@]}" 'xapps-extra') -subarchs=("${subarchs[@]}" 'i686 x86_64') -subconflicts=("${subconflicts[@]}" '') -subreplaces=("${subreplaces[@]}" '') -subprovides=("${subprovides[@]}" '') -else -Fconfopts+=" -nomake demos -nomake examples" -fi - -## this is here till I've fixed all reverse depends so we not break all apps using qt4 by now -rodepends=("${subpkgs[@]}") - -build() -{ - export CC='clang' - export CXX='clang++' - - clean_junk() - { - ## TODO: GOD! , write an patch for this and send upstream ... - find $Fdestdir/usr/lib -type f -name '*prl' -print -exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" {} \; - if [ -d "$Fdestdir/usr/lib/pkgconfig" ]; then - Fsed "-L$startdir/src/$_F_archive_name-$pkgver/lib" "-L/usr/lib" $Fdestdir/usr/lib/pkgconfig/*.pc - Fsed "$startdir/src/$_F_archive_name-$pkgver/bin/moc" "/usr/bin/moc" $Fdestdir/usr/lib/pkgconfig/*.pc - Fsed "$startdir/src/$_F_archive_name-$pkgver/bin/uic" "/usr/bin/uic" $Fdestdir/usr/lib/pkgconfig/*.pc - Fsed "-pthread" "" $Fdestdir/usr/lib/pkgconfig/*.pc - Fsed "-L/usr/X11R6/lib64" "" $Fdestdir/usr/lib/pkgconfig/*.pc - Fsed "-L/usr/lib" "" $Fdestdir/usr/lib/pkgconfig/*.pc - Fsed "Libs.private:" "Libs.private: -L/usr/lib -pthread" $Fdestdir/usr/lib/pkgconfig/*.pc - Fsed " " " " $Fdestdir/usr/lib/pkgconfig/*.pc - Fsed " " " " $Fdestdir/usr/lib/pkgconfig/*.pc - fi - if ls "$Fdestdir"/usr/lib/*.prl 2>/dev/null 1>/dev/null; then - Fsed "-L$startdir/src/$_F_archive_name-$pkgver/lib" "-L/usr/lib" $Fdestdir/usr/lib/*.prl - Fsed "-pthread" "" $Fdestdir/usr/lib/*.prl - Fsed "-L/usr/x11R6/lib64" "" $Fdestdir/usr/lib/*.prl - Fsed "-L/usr/lib" "" $Fdestdir/usr/lib/*.prl - Fsed "QMAKE_PRL_LIBS =" "QMAKE_PRL_LIBS = -L/usr/lib -pthread" $Fdestdir/usr/lib/*.prl - Fsed " " " " $Fdestdir/usr/lib/*.prl - Fsed " " " " $Fdestdir/usr/lib/*.prl - fi - if ls "$Fdestdir"/usr/lib/*.la 2>/dev/null 1>/dev/null; then - Fsed "-L$startdir/src/$_F_archive_name-$pkgver/lib" "-L/usr/lib" $Fdestdir/usr/lib/*.la - Fsed "-pthread" "" $Fdestdir/usr/lib/*.la - Fsed "-L/usr/x11R6/lib64" "" $Fdestdir/usr/lib/*.la - fi - } - - do_split() - { - do_install "$1" - Fsplit "$2" /usr - } - - do_libincdirsplit() - { - local pkgname="$1" incdirpath="$2" - - # FIXME: can be improved, these are exact copy, and can be Fln to reduce memory - for include in $Fdestdir/$incdirpath/*; do - include="usr/include/Qt/$(basename $include)" - if [ -e "$Fdestdir/$include" ]; then - Fsplit $pkgname $include - fi - done - Fsplit $pkgname $incdirpath - } - - do_libsplit() - { - local pkgname="lib${1,,}" - - Fsplit $pkgname "usr/lib/lib$1.*" - Fsplit $pkgname "usr/lib/pkgconfig/$1.*" - do_libincdirsplit $pkgname usr/include/$1 - } - - do_privateheaderssplit() - { - mkdir -p "$startdir/pkg.$pkgname-private-headers/usr/include/$1/private" || Fdie - find "$2" -name "*_p.h" -exec install -m644 {} \ - "$startdir/pkg.$pkgname-private-headers/usr/include/$1/private" \; || Fdie - } - - Fcd - Fpatchall - - ## REALLY DO NOT REMOVE THESE NOR THE frugalware.patch _WE_ DO WANT TO BUILD WITH - ## fw LD/C/CXX FLAGS and fw PATHS right ? we do not have /usr/X11R.. NOR DO WE - ## WANT *MULTILIB* STUFF!! - Fsed "FW_CFLAGS" "${CFLAGS} -Wno-deprecated" mkspecs/common/gcc-base.conf - Fsed "FW_LDFLAGS" "${LDFLAGS} -Wl,--as-needed" mkspecs/common/gcc-base.conf - - ## find out if we use ccache and use it .. Qt is tupit and won't get the ENV vars :| - if [ "$NOCCACHE" = "0" -a -d /usr/lib/ccache/bin ]; then - Fsed "gcc" "ccache gcc" mkspecs/common/g++.conf - Fsed "g++" "ccache g++" mkspecs/common/g++.conf - fi - - # Build shared Uitools - Fsed 'staticlib' 'dll' tools/designer/src/uitools/uitools.pro - - [[ "${CARCH}" = "i686" ]] && Fconfopts+=" -no-sse2" - Fconfopts+=" -no-sse3 -no-sse4.1 -no-sse4.2 -no-ssse3 -no-avx" - - Fexec ./configure $Fconfopts \ - -v -confirm-license \ - -opensource -release \ - -prefix /usr \ - -datadir /usr/share/$pkgname \ - -docdir /usr/share/doc/$pkgname \ - -libdir /usr/lib \ - -plugindir /usr/lib/$pkgname/plugins \ - -sysconfdir /etc/$pkgname \ - -translationdir /usr/share/$pkgname/translations \ - -fast -shared -reduce-relocations -no-rpath -no-separate-debug-info \ - -opengl -no-phonon -no-phonon-backend -webkit \ - -system-libpng -system-libjpeg -system-libmng -system-libtiff -system-zlib \ - -cups -glib -gtkstyle -nis -pch -stl -sm -no-openvg -no-sql-sqlite2 || Fdie - - - make || Fdie - if [ "$NOCCACHE" = "0" -a -d /usr/lib/ccache/bin ]; then - Fsed "ccache" '' mkspecs/common/g++.conf - fi - make INSTALL_ROOT=$Fdestdir install || Fdie - clean_junk - - ## delete things we don't want / need - Frm usr/include/Qt{,Core}/{qatomic,qfunctions}_{macosx,symbian,vxworks,windows,windowsce}.h - Frm usr/share/$pkgname/mkspecs/{,common/,feature/}{aix*,*bsd*,cygwin*,darwin*,hpux*,hurd*,irix*,mac*,sco*,solaris*,symbian*,tru64*,unixware*,vxworks*,win32*,wince*} - Frm usr/share/$pkgname/mkspecs/linux-{ecc*,icc*,kcc*,lsb*,pgcc,cxx*} - Frm usr/share/$pkgname/mkspecs/unsupported - ## test will be deleted for now - Frm usr/tests - - # Early splits. - Fsplit libqthelp /usr/share/$pkgname/translations/qt_help_\*.qm - Fsplit $pkgname-tools "/usr/bin/qdbusviewer" - - # Main splits. - do_libsplit Qt3Support - Fsplit libqt3support /usr/bin/{qt3to4,uic3} - Fsplit libqt3support /usr/lib/$pkgname/plugins/accessible/libqtaccessiblecompatwidgets.so - Fsplit libqt3support /usr/lib/$pkgname/plugins/designer/libqt3supportwidgets.so - Fsplit libqt3support /usr/share/$pkgname/q3porting.xml - - Fsplit libqtclucene /usr/lib/libQtCLucene.\* - Fsplit libqtclucene /usr/lib/pkgconfig/QtCLucene.\* - - do_libsplit QtCore - Fsplit libqtcore /usr/bin/{moc,qmake,rcc,uic} - Fsplit libqtcore /usr/lib/$pkgname/plugins/codecs - Fsplit libqtcore /usr/share/$pkgname/mkspecs - Fsplit libqtcore /usr/share/$pkgname/translations/qt_\*.qm - - do_libsplit QtDBus - Fsplit libqtdbus /usr/bin/qdbus\* - - do_libsplit QtDeclarative - Fsplit libqtdeclarative /usr/imports/ - Fsplit libqtdeclarative /usr/lib/$pkgname/plugins/designer/libqdeclarativeview.so - Fsplit libqtdeclarative /usr/lib/$pkgname/plugins/qmltooling - - do_libsplit QtDesigner - Fsplit libqtdesigner /usr/lib/libQtDesignerComponents.\* - Fsplit libqtdesigner /usr/lib/pkgconfig/QtDesignerComponents.\* - - do_libsplit QtGui - - do_libsplit QtHelp - - do_libsplit QtMultimedia - - do_libsplit QtNetwork - Fsplit libqtnetwork /usr/lib/$pkgname/plugins/bearer/ - - do_libsplit QtOpenGL - - do_libsplit QtScript - - do_libsplit QtScriptTools - - do_libsplit QtSql - - do_libsplit QtSvg - Fsplit libqtsvg /usr/lib/$pkgname/plugins/iconengines/libqsvgicon.so - Fsplit libqtsvg /usr/lib/$pkgname/plugins/imageformats/libqsvg.so - - do_libsplit QtTest - - do_libsplit QtUiTools - - # Remove these lines if the problem with QtWebKit leaking crap into - # its pkgconfig files is ever fixed - sed -i 's|-L\.\./JavaScriptCore/release||g' $Fdestdir/usr/lib/{pkgconfig/QtWebKit.pc,libQtWebKit.la} || Fdie - sed -i 's|-ljscore||g' $Fdestdir/usr/lib/{pkgconfig/QtWebKit.pc,libQtWebKit.la} || Fdie - sed -i 's|-L\.\./\.\./WebCore/release||g' $Fdestdir/usr/lib/{pkgconfig/QtWebKit.pc,libQtWebKit.la} || Fdie - sed -i 's|-L\.\./\.\./JavaScriptCore/release||g' $Fdestdir/usr/lib/{pkgconfig/QtWebKit.pc,libQtWebKit.la} || Fdie - sed -i 's|-lwebcore||g' $Fdestdir/usr/lib/{pkgconfig/QtWebKit.pc,libQtWebKit.la} || Fdie - - do_libsplit QtWebKit - Fsplit libqtwebkit /usr/lib/$pkgname/plugins/designer/libqwebview.so - - do_libsplit QtXml - - do_libsplit QtXmlPatterns - Fsplit libqtxmlpatterns /usr/bin/xmlpatterns\* - - Fsplit $pkgname-assistant /usr/bin/{assistant,qcollectiongenerator,qhelpconverter,qhelpgenerator} - Fsplit $pkgname-assistant /usr/share/$pkgname/translations/assistant_\*.qm - - if Fuse $USE_DEMOS; then - Fsplit $pkgname-demos /usr/bin/qtdemo - Fsplit $pkgname-demos /usr/lib/$pkgname/plugins/designer/{libarthurplugin,libcontainerextension,libcustomwidgetplugin,libtaskmenuextension,libworldtimeclockplugin}.so - Fsplit $pkgname-demos /usr/share/doc/$pkgname/{demos,examples} - fi - - Fsplit $pkgname-designer /usr/bin/designer - Fsplit $pkgname-designer /usr/share/$pkgname/translations/designer_\*.qm - - Fsplit $pkgname-linguist /usr/bin/{lconvert,linguist,lrelease,lupdate} - Fsplit $pkgname-linguist /usr/share/$pkgname/phrasebooks/ - Fsplit $pkgname-linguist /usr/share/$pkgname/translations/linguist_\*.qm - - Fsplit $pkgname-plugin-graphicssystems /usr/lib/$pkgname/plugins/graphicssystems/libqglgraphicssystem.so - - Fsplit $pkgname-plugin-mysql /usr/lib/$pkgname/plugins/sqldrivers/libqsqlmysql.so - - Fsplit $pkgname-plugin-odbc /usr/lib/$pkgname/plugins/sqldrivers/libqsqlodbc.so - - Fsplit $pkgname-plugin-psql /usr/lib/$pkgname/plugins/sqldrivers/libqsqlpsql.so - - Fsplit $pkgname-plugin-script-qtdbus /usr/lib/$pkgname/plugins/script/libqtscriptdbus.so - - Fsplit $pkgname-plugin-sqlite3 /usr/lib/$pkgname/plugins/sqldrivers/libqsqlite.so - - Fsplit $pkgname-tools /usr/bin/\* - Fsplit $pkgname-tools /usr/lib/$pkgname/plugins/graphicssystems/libqtracegraphicssystem.so - Fsplit $pkgname-tools /usr/share/$pkgname/translations/qtconfig_\*.qm - - #Late split - Fsplit libqtgui /usr/lib/$pkgname/plugins/{accessible,imageformats,inputmethods}/\* - - # Copy private headers to a subpkg - do_privateheaderssplit Qt3Support src/qt3support/ - do_privateheaderssplit QtCore src/corelib/ - do_privateheaderssplit QtDBus src/dbus/ - do_privateheaderssplit QtDeclarative src/declarative/ - do_privateheaderssplit QtDesigner tools/designer/ - do_privateheaderssplit QtGui src/gui/ - do_privateheaderssplit QtHelp tools/assistant/ - do_privateheaderssplit QtMultimedia src/multimedia/ - do_privateheaderssplit QtNetwork src/network/ - do_privateheaderssplit QtOpenGL src/opengl/ - do_privateheaderssplit QtScript src/script/ - do_privateheaderssplit QtScriptTools src/scripttools/ - do_privateheaderssplit QtSql src/sql/ - do_privateheaderssplit QtSvg src/svg/ - do_privateheaderssplit QtTest src/testlib/ - do_privateheaderssplit QtUiTools tools/designer/src/uitools/ - do_privateheaderssplit QtWebKit src/3rdparty/webkit/ - do_privateheaderssplit QtXmlPatterns src/xmlpatterns/ - do_privateheaderssplit phonon src/3rdparty/phonon/ - - ## no is not a typo - make INSTALL_ROOT=$Fdestdir install || Fdie - Fcleandestdir "${subpkgs[@]}" - - # ermm no docs here 90MB he?:) - Frm usr/share/doc/$pkgname - - # and remove stuff we removed before QtCore split - Frm usr/include/Qt{,Core}/{qatomic,qfunctions}_{macosx,symbian,vxworks,windows,windowsce}.h - Frm usr/share/$pkgname/mkspecs - ## test will be deleted for now - Frm usr/tests - - # Remove qfvb translation files since qt insist installing it even when enabled - Frm /usr/share/$pkgname/translations/qvfb_\*.qm - - ## NOTE: now a pacman-g2 -Ql -p qt4-$pkgver*fpm will tell if we forgot something :) -} - -# optimization OK - diff --git a/source/xlib-extra/qt4/alsa-fix.patch b/source/xlib-extra/qt4/alsa-fix.patch deleted file mode 100644 index 986476d..0000000 --- a/source/xlib-extra/qt4/alsa-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur qt-everywhere-opensource-src-4.8.7/config.tests/unix/alsa/alsatest.cpp qt-everywhere-opensource-src-4.8.7-alsa/config.tests/unix/alsa/alsatest.cpp ---- qt-everywhere-opensource-src-4.8.7/config.tests/unix/alsa/alsatest.cpp 2015-05-07 16:14:42.000000000 +0200 -+++ qt-everywhere-opensource-src-4.8.7-alsa/config.tests/unix/alsa/alsatest.cpp 2016-03-23 11:53:28.891766299 +0100 -@@ -40,7 +40,7 @@ - ****************************************************************************/ - - #include <alsa/asoundlib.h> --#if(!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10)) -+#if(!(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 10))) - #error "Alsa version found too old, require >= 1.0.10" - #endif - diff --git a/source/xlib-extra/qt4/frugalware.patch b/source/xlib-extra/qt4/frugalware.patch deleted file mode 100644 index 1092f0f..0000000 --- a/source/xlib-extra/qt4/frugalware.patch +++ /dev/null @@ -1,75 +0,0 @@ ---- qt-everywhere-opensource-src-4.8.0/mkspecs/common/gcc-base.conf 2011-12-08 05:06:02.000000000 +0000 -+++ qt-new/mkspecs/common/gcc-base.conf 2011-12-19 00:05:33.000000000 +0000 -@@ -35,7 +35,7 @@ - QMAKE_CFLAGS_DEPS += -M - QMAKE_CFLAGS_WARN_ON += -Wall -W - QMAKE_CFLAGS_WARN_OFF += -w --QMAKE_CFLAGS_RELEASE += -O2 -+QMAKE_CFLAGS_RELEASE += FW_CFLAGS - QMAKE_CFLAGS_DEBUG += -g - QMAKE_CFLAGS_SHLIB += -fPIC - QMAKE_CFLAGS_STATIC_LIB += -fPIC -@@ -56,5 +56,5 @@ - QMAKE_LFLAGS += - QMAKE_LFLAGS_DEBUG += - QMAKE_LFLAGS_APP += --QMAKE_LFLAGS_RELEASE += -+QMAKE_LFLAGS_RELEASE += FW_LDFLAGS - ---- qt-everywhere-opensource-src-4.8.0/mkspecs/common/linux.conf 2011-12-08 05:06:02.000000000 +0000 -+++ qt-new/mkspecs/common/linux.conf 2011-12-19 00:15:26.000000000 +0000 -@@ -7,12 +7,12 @@ - - QMAKE_INCDIR = - QMAKE_LIBDIR = --QMAKE_INCDIR_X11 = /usr/X11R6/include --QMAKE_LIBDIR_X11 = /usr/X11R6/lib -+QMAKE_INCDIR_X11 = /usr/include -+QMAKE_LIBDIR_X11 = /usr/lib - QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] - QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] --QMAKE_INCDIR_OPENGL = /usr/X11R6/include --QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib -+QMAKE_INCDIR_OPENGL = /usr/include -+QMAKE_LIBDIR_OPENGL = /usr/lib - QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL - QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL - QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL - ---- qt-everywhere-opensource-src-4.8.0/mkspecs/linux-g++-32/qmake.conf 2011-12-08 05:06:02.000000000 +0000 -+++ qt-new/mkspecs/linux-g++-32/qmake.conf 2011-12-19 00:24:01.000000000 +0000 -@@ -9,8 +9,8 @@ - QT += core gui - QMAKE_INCREMENTAL_STYLE = sublib - --QMAKE_CFLAGS = -m32 --QMAKE_LFLAGS = -m32 -+QMAKE_CFLAGS = -+QMAKE_LFLAGS = - - include(../common/linux.conf) - include(../common/gcc-base-unix.conf) - - ---- qt-everywhere-opensource-src-4.8.0/mkspecs/linux-g++-64/qmake.conf 2011-12-08 05:06:02.000000000 +0000 -+++ qt-new/mkspecs/linux-g++-64/qmake.conf 2011-12-19 00:28:12.000000000 +0000 -@@ -12,15 +12,15 @@ - QT += core gui - QMAKE_INCREMENTAL_STYLE = sublib - --QMAKE_CFLAGS = -m64 --QMAKE_LFLAGS = -m64 -+QMAKE_CFLAGS = -+QMAKE_LFLAGS = - - include(../common/linux.conf) - include(../common/gcc-base-unix.conf) - include(../common/g++-unix.conf) - - --QMAKE_LIBDIR_X11 = /usr/X11R6/lib64 --QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib64 -+QMAKE_LIBDIR_X11 = -+QMAKE_LIBDIR_OPENGL = - - load(qt_config) diff --git a/source/xlib-extra/qt4/glib-honor-ExcludeSocketNotifiers-flag.patch b/source/xlib-extra/qt4/glib-honor-ExcludeSocketNotifiers-flag.patch deleted file mode 100644 index 6949bbf..0000000 --- a/source/xlib-extra/qt4/glib-honor-ExcludeSocketNotifiers-flag.patch +++ /dev/null @@ -1,63 +0,0 @@ -Author: Jan-Marek Glogowski <[email protected]> -Date: Thu Mar 06 18:44:43 2014 +0100 - - Honor QEventLoop::ExcludeSocketNotifiers in glib event loop. - - Implements QEventLoop::ExcludeSocketNotifiers in the same way - QEventLoop::X11ExcludeTimers is already implemented for the glib - event loop. - ---- qt4-x11-4.8.1.orig/src/corelib/kernel/qeventdispatcher_glib.cpp -+++ qt4-x11-4.8.1/src/corelib/kernel/qeventdispatcher_glib.cpp -@@ -65,6 +65,7 @@ struct GPollFDWithQSocketNotifier - struct GSocketNotifierSource - { - GSource source; -+ QEventLoop::ProcessEventsFlags processEventsFlags; - QList<GPollFDWithQSocketNotifier *> pollfds; - }; - -@@ -80,6 +81,9 @@ static gboolean socketNotifierSourceChec - GSocketNotifierSource *src = reinterpret_cast<GSocketNotifierSource *>(source); - - bool pending = false; -+ if (src->processEventsFlags & QEventLoop::ExcludeSocketNotifiers) -+ return pending; -+ - for (int i = 0; !pending && i < src->pollfds.count(); ++i) { - GPollFDWithQSocketNotifier *p = src->pollfds.at(i); - -@@ -103,6 +107,9 @@ static gboolean socketNotifierSourceDisp - QEvent event(QEvent::SockAct); - - GSocketNotifierSource *src = reinterpret_cast<GSocketNotifierSource *>(source); -+ if (src->processEventsFlags & QEventLoop::ExcludeSocketNotifiers) -+ return true; -+ - for (int i = 0; i < src->pollfds.count(); ++i) { - GPollFDWithQSocketNotifier *p = src->pollfds.at(i); - -@@ -330,6 +337,7 @@ QEventDispatcherGlibPrivate::QEventDispa - reinterpret_cast<GSocketNotifierSource *>(g_source_new(&socketNotifierSourceFuncs, - sizeof(GSocketNotifierSource))); - (void) new (&socketNotifierSource->pollfds) QList<GPollFDWithQSocketNotifier *>(); -+ socketNotifierSource->processEventsFlags = QEventLoop::AllEvents; - g_source_set_can_recurse(&socketNotifierSource->source, true); - g_source_attach(&socketNotifierSource->source, mainContext); - -@@ -415,6 +423,7 @@ bool QEventDispatcherGlib::processEvents - // tell postEventSourcePrepare() and timerSource about any new flags - QEventLoop::ProcessEventsFlags savedFlags = d->timerSource->processEventsFlags; - d->timerSource->processEventsFlags = flags; -+ d->socketNotifierSource->processEventsFlags = flags; - - if (!(flags & QEventLoop::EventLoopExec)) { - // force timers to be sent at normal priority -@@ -426,6 +435,7 @@ bool QEventDispatcherGlib::processEvents - result = g_main_context_iteration(d->mainContext, canWait); - - d->timerSource->processEventsFlags = savedFlags; -+ d->socketNotifierSource->processEventsFlags = savedFlags; - - if (canWait) - emit awake(); diff --git a/source/xlib-extra/qt4/l-qclipboard_delay.patch b/source/xlib-extra/qt4/l-qclipboard_delay.patch deleted file mode 100644 index 22643e8..0000000 --- a/source/xlib-extra/qt4/l-qclipboard_delay.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- src/gui/kernel/qclipboard_x11.cpp.sav 2014-04-25 09:52:03.855693228 +0200 -+++ src/gui/kernel/qclipboard_x11.cpp 2014-04-25 09:51:58.038693777 +0200 -@@ -548,7 +548,8 @@ bool QX11Data::clipboardWaitForEvent(Win - return false; - - XSync(X11->display, false); -- usleep(50000); -+ if (!XPending(X11->display)) -+ usleep(5000); - - now.start(); - diff --git a/source/xlib-extra/qt4/l-qclipboard_fix_recursive.patch b/source/xlib-extra/qt4/l-qclipboard_fix_recursive.patch deleted file mode 100644 index 6d3bf2f..0000000 --- a/source/xlib-extra/qt4/l-qclipboard_fix_recursive.patch +++ /dev/null @@ -1,94 +0,0 @@ ---- src/corelib/kernel/qeventdispatcher_glib.cpp.sav 2014-03-28 15:26:37.000000000 +0100 -+++ src/corelib/kernel/qeventdispatcher_glib.cpp 2014-04-24 09:44:09.358659204 +0200 -@@ -255,22 +255,30 @@ struct GPostEventSource - GSource source; - QAtomicInt serialNumber; - int lastSerialNumber; -+ QEventLoop::ProcessEventsFlags processEventsFlags; - QEventDispatcherGlibPrivate *d; - }; - - static gboolean postEventSourcePrepare(GSource *s, gint *timeout) - { -+ GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s); - QThreadData *data = QThreadData::current(); - if (!data) - return false; - -+ QEventLoop::ProcessEventsFlags excludeAllFlags -+ = QEventLoop::ExcludeUserInputEvents -+ | QEventLoop::ExcludeSocketNotifiers -+ | QEventLoop::X11ExcludeTimers; -+ if ((source->processEventsFlags & excludeAllFlags) == excludeAllFlags) -+ return false; -+ - gint dummy; - if (!timeout) - timeout = &dummy; - const bool canWait = data->canWaitLocked(); - *timeout = canWait ? -1 : 0; - -- GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s); - return (!canWait - || (source->serialNumber != source->lastSerialNumber)); - } -@@ -284,8 +292,14 @@ static gboolean postEventSourceDispatch( - { - GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s); - source->lastSerialNumber = source->serialNumber; -- QCoreApplication::sendPostedEvents(); -- source->d->runTimersOnceWithNormalPriority(); -+ QEventLoop::ProcessEventsFlags excludeAllFlags -+ = QEventLoop::ExcludeUserInputEvents -+ | QEventLoop::ExcludeSocketNotifiers -+ | QEventLoop::X11ExcludeTimers; -+ if ((source->processEventsFlags & excludeAllFlags) != excludeAllFlags) { -+ QCoreApplication::sendPostedEvents(); -+ source->d->runTimersOnceWithNormalPriority(); -+ } - return true; // i dunno, george... - } - -@@ -329,6 +343,7 @@ QEventDispatcherGlibPrivate::QEventDispa - postEventSource = reinterpret_cast<GPostEventSource *>(g_source_new(&postEventSourceFuncs, - sizeof(GPostEventSource))); - postEventSource->serialNumber = 1; -+ postEventSource->processEventsFlags = QEventLoop::AllEvents; - postEventSource->d = this; - g_source_set_can_recurse(&postEventSource->source, true); - g_source_attach(&postEventSource->source, mainContext); -@@ -423,6 +438,7 @@ bool QEventDispatcherGlib::processEvents - - // tell postEventSourcePrepare() and timerSource about any new flags - QEventLoop::ProcessEventsFlags savedFlags = d->timerSource->processEventsFlags; -+ d->postEventSource->processEventsFlags = flags; - d->timerSource->processEventsFlags = flags; - d->socketNotifierSource->processEventsFlags = flags; - -@@ -435,6 +451,7 @@ bool QEventDispatcherGlib::processEvents - while (!result && canWait) - result = g_main_context_iteration(d->mainContext, canWait); - -+ d->postEventSource->processEventsFlags = savedFlags; - d->timerSource->processEventsFlags = savedFlags; - d->socketNotifierSource->processEventsFlags = savedFlags; - ---- src/corelib/kernel/qeventdispatcher_unix.cpp.sav 2013-06-07 07:16:52.000000000 +0200 -+++ src/corelib/kernel/qeventdispatcher_unix.cpp 2014-04-24 09:43:06.927589535 +0200 -@@ -905,7 +905,15 @@ bool QEventDispatcherUNIX::processEvents - - // we are awake, broadcast it - emit awake(); -- QCoreApplicationPrivate::sendPostedEvents(0, 0, d->threadData); -+ -+ QEventLoop::ProcessEventsFlags excludeAllFlags -+ = QEventLoop::ExcludeUserInputEvents -+ | QEventLoop::ExcludeSocketNotifiers -+ | QEventLoop::X11ExcludeTimers; -+ if ((flags & excludeAllFlags) == excludeAllFlags) -+ return false; -+ if(( flags & excludeAllFlags ) != excludeAllFlags ) -+ QCoreApplicationPrivate::sendPostedEvents(0, 0, d->threadData); - - int nevents = 0; - const bool canWait = (d->threadData->canWaitLocked() diff --git a/source/xlib-extra/qt4/moc-boost-workaround.patch b/source/xlib-extra/qt4/moc-boost-workaround.patch deleted file mode 100644 index 027f806..0000000 --- a/source/xlib-extra/qt4/moc-boost-workaround.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -upr qt-everywhere-opensource-src-4.8.6.orig/src/tools/moc/main.cpp qt-everywhere-opensource-src-4.8.6/src/tools/moc/main.cpp ---- qt-everywhere-opensource-src-4.8.6.orig/src/tools/moc/main.cpp 2014-04-10 21:37:12.000000000 +0300 -+++ qt-everywhere-opensource-src-4.8.6/src/tools/moc/main.cpp 2014-11-06 02:24:44.287305916 +0200 -@@ -190,6 +190,8 @@ int runMoc(int _argc, char **_argv) - - // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829 - pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; -+ pp.macros["BOOST_LEXICAL_CAST_INCLUDED"]; -+ pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"]; - - QByteArray filename; - QByteArray output; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
