From 4e72fc02b4bca3cf64116349c03b6b71d553838c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sun, 24 Apr 2016 11:27:09 +0200 Subject: [PATCH] qt5: fix alsa detection + add tslib --- srcpkgs/qt5/patches/fix-alsa-lib-detection.patch | 11 +++++++++++ srcpkgs/qt5/template | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/qt5/patches/fix-alsa-lib-detection.patch diff --git a/srcpkgs/qt5/patches/fix-alsa-lib-detection.patch b/srcpkgs/qt5/patches/fix-alsa-lib-detection.patch new file mode 100644 index 0000000000..2d2d02a485 --- /dev/null +++ b/srcpkgs/qt5/patches/fix-alsa-lib-detection.patch @@ -0,0 +1,11 @@ +--- qtbase/config.tests/unix/alsa/alsatest.cpp 2016-03-03 12:35:22.000000000 +0100 ++++ qtbase/config.tests/unix/alsa/alsatest.cpp 2016-04-24 11:21:33.168021766 +0200 +@@ -32,7 +32,7 @@ + ****************************************************************************/ + + #include +-#if(!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10)) ++#if(!(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0) || (SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10))) + #error "Alsa version found too old, require >= 1.0.10" + #endif + diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template index fb7c8c6d67..cbe4a1b528 100644 --- a/srcpkgs/qt5/template +++ b/srcpkgs/qt5/template @@ -23,7 +23,7 @@ makedepends=" mtdev-devel freetds-devel libmysqlclient-devel postgresql-libs-devel pulseaudio-devel libbluetooth-devel gst-plugins-base1-devel libxslt-devel pciutils-devel nss-devel libcap-devel libinput-devel libproxy-devel - libxcb-devel libxkbcommon-devel wayland-devel" + libxcb-devel libxkbcommon-devel tslib-devel wayland-devel" depends="qtchooser" replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0 qt5-webkit-devel<5.6.0" @@ -108,7 +108,7 @@ do_configure() { -openssl-linked -dbus-linked \ -silent -no-pch -no-strip -optimized-qmake \ -system-libjpeg -system-libpng -system-zlib \ - -system-sqlite -system-harfbuzz" + -system-sqlite -system-harfbuzz -v" case "$XBPS_TARGET_MACHINE" in arm*|*-musl) # -reduce-relocations is experimental; may cause linker errors ;;