update to v29.1 & trial with making AUR dependencies optional

author: Taijian 2018-02-01 16:24:24 +0100
committer: Taijian 2018-02-01 16:24:24 +0100
commit: 7d9ea43baab1e9eea8a991a501800882daa373b2 (patch)
tree: 059723c14094f89b2221b54b2b726bbcaa978078
parent: 6fc7cd114ce62f835e9acb81fbb492d5385d8528 (diff)
download: aur-7d9ea43baab1e9eea8a991a501800882daa373b2.tar.gz
3 files changed, 40 insertions, 647 deletions
diff --git a/.SRCINFO b/.SRCINFO
index eb2efb1629a3..ae7a1f38ea28 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,51 +1,50 @@
 pkgbase = mythtv
 	pkgdesc = A Homebrew PVR project
-	pkgver = 29.0
-	pkgrel = 7
+	pkgver = 29.1
+	pkgrel = 1
 	epoch = 1
 	url = https://www.mythtv.org/
 	install = mythtv.install
 	arch = x86_64
 	license = GPL
-	makedepends = libcec
-	makedepends = libxml2
-	makedepends = mesa
-	makedepends = openssl
+	makedepends = git
+	makedepends = help2man
 	makedepends = yasm
+	makedepends = libmariadbclient
+	makedepends = libxml2
+	makedepends = libcec
 	makedepends = x264
-	makedepends = gdb
 	makedepends = libcdio
 	makedepends = lirc
 	makedepends = perl-io-socket-inet6
 	makedepends = perl-libwww
-	makedepends = mariadb-clients
-	depends = fftw
+	makedepends = mysql-python
+	makedepends = perl-dbd-mysql
+	makedepends = python2-lxml
 	depends = libass
+	depends = qt5-script
 	depends = libavc1394
-	depends = libiec61883
+	depends = fftw
+	depends = exiv2
+	depends = taglib
 	depends = libva
-	depends = libxinerama
-	depends = libpulse
+	depends = libiec61883
+	depends = python2
+	depends = qt5-webkit
+	depends = x265
+	depends = libx264
 	depends = jack
-	depends = mysql-python
 	depends = libvpx
-	depends = perl-dbd-mysql
-	depends = exiv2
 	depends = libvdpau
-	depends = libx264
 	depends = lame
-	depends = x265
-	depends = perl-net-upnp
-	depends = python2-lxml
-	depends = qt5-webkit
-	depends = qt5-script
-	depends = taglib
-	depends = urlgrabber
+	depends = libxinerama
+	depends = libpulse
 	depends = libxrandr
 	optdepends = glew: for GPU commercial flagging
 	optdepends = libcec: for consumer electronics control capabilities
 	optdepends = libxml2: to read blu-ray metadata
-	optdepends = openssl: for AirTunes (RAOP) support
+	optdepends = perl-net-upnp: UPnP backend
+	optdepends = urlgrabber: Downloading files
 	optdepends = python-future: for metadata-lookup / cover art
 	optdepends = python-requests: for metadata-lookup / cover art
 	optdepends = python-requests-cache: for metadata-lookup / cover art
@@ -53,16 +52,14 @@ pkgbase = mythtv
 	conflicts = mythplugins-mythvideo
 	replaces = myththemes
 	replaces = mythplugins-mythvideo
-	source = mythtv-29.0.tar.gz::https://github.com/MythTV/mythtv/archive/v29.0.tar.gz
+	source = mythtv-29.1.tar.gz::https://github.com/MythTV/mythtv/archive/v29.1.tar.gz
 	source = mythbackend.service
 	source = 99-mythbackend.rules
 	source = mythtv.install
-	source = qt510.patch
-	sha512sums = 6d79d943b95b1816b4fce52f3de3e01ebcdcc2779f852ec8cf5e3a81f8be4c730a254ff78b52e36ac522ff99b125501f0cba33a2d4c01571552e09fb4dba18c2
+	sha512sums = 0ac0dc2061ac6165d2a5eb14a4cd984d5d79aadc3452f3df5c02c86ba057285a29b20f29fed4381c5867aaee7b0088797f588e69a0d9d225be2edac600c885fd
 	sha512sums = 41533da5d8ef694d8c12f60d956673d9e49fb6781ae58d6bfd0bf31e4f380fddb508f9cad3b91264a3ad55853c24c6932bdf83bb5b711c34c0836d71b46be02c
 	sha512sums = fc02c190f01dbfb803b87ea0a6cdf408ce7706dc1ed74fba939931c129fdeb5dab1105caf9f71f029843a4d74db888084f92173c3be240d8492454633311f7c8
 	sha512sums = db78be27826be44e97d8680aa860f2e85c94e017aa649d183ee5d71310c95e31669330d3b4496c52143892f238300e57ae88ab0a737ca135ab6f2ce361814e36
-	sha512sums = 5070b4e8ad5ebd4208a3e8393ebabb55118615c2966cb1ba585e94084c4ad643dc5644bfca9267eb81e6c27be16b088e541aa8118a43cbebaf9d28c52e15a35c
 
 pkgname = mythtv
 
diff --git a/PKGBUILD b/PKGBUILD
index dba232a4a624..54c081b5a01d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,44 +6,41 @@
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=mythtv
-pkgver=29.0
-pkgrel=7
+pkgver=29.1
+pkgrel=1
 epoch=1
 pkgdesc="A Homebrew PVR project"
 arch=('x86_64')
 url="https://www.mythtv.org/"
 license=('GPL')
-depends=('fftw' 'libass' 'libavc1394' 'libiec61883' 'libva' 'libxinerama' 'libpulse' 'jack'
-         'mysql-python' 'libvpx' 'perl-dbd-mysql' 'exiv2' 'libvdpau' 'libx264' 'lame' 'x265'
-         'perl-net-upnp' 'python2-lxml' 'qt5-webkit' 'qt5-script' 'taglib' 'urlgrabber' 'libxrandr')
-makedepends=('libcec' 'libxml2' 'mesa' 'openssl' 'yasm' 'x264' 'gdb' 'libcdio' 'lirc'
-			 'perl-io-socket-inet6' 'perl-libwww' 'mariadb-clients')
+depends=('libass' 'qt5-script' 'libavc1394' 'fftw' 'exiv2' 'taglib' 'libva' 'libiec61883' 'python2'
+		 'qt5-webkit' 'x265' 'libx264' 'jack' 'libvpx' 'libvdpau' 'lame' 'libxinerama' 'libpulse' 'libxrandr')
+# 'ttf-liberation' 
+makedepends=('git' 'help2man' 'yasm' 'libmariadbclient' 'libxml2' 'libcec' 'x264' 'libcdio' 'lirc' 'perl-io-socket-inet6' 'perl-libwww' 'mysql-python'
+             'perl-dbd-mysql' 'python2-lxml')
 optdepends=('glew: for GPU commercial flagging'
             'libcec: for consumer electronics control capabilities'
             'libxml2: to read blu-ray metadata'
-            'openssl: for AirTunes (RAOP) support'
-			'python-future: for metadata-lookup / cover art'
-			'python-requests: for metadata-lookup / cover art'
-			'python-requests-cache: for metadata-lookup / cover art')
+            'perl-net-upnp: UPnP backend'
+            'urlgrabber: Downloading files'
+            'python-future: for metadata-lookup / cover art'
+            'python-requests: for metadata-lookup / cover art'
+            'python-requests-cache: for metadata-lookup / cover art')
 conflicts=('myththemes' 'mythplugins-mythvideo')
 replaces=('myththemes' 'mythplugins-mythvideo')
 install='mythtv.install'
 source=("$pkgname-$pkgver.tar.gz::https://github.com/MythTV/$pkgname/archive/v$pkgver.tar.gz"
         'mythbackend.service'
 		'99-mythbackend.rules'
-		'mythtv.install'
-		'qt510.patch')
-sha512sums=('6d79d943b95b1816b4fce52f3de3e01ebcdcc2779f852ec8cf5e3a81f8be4c730a254ff78b52e36ac522ff99b125501f0cba33a2d4c01571552e09fb4dba18c2'
+		'mythtv.install')
+sha512sums=('0ac0dc2061ac6165d2a5eb14a4cd984d5d79aadc3452f3df5c02c86ba057285a29b20f29fed4381c5867aaee7b0088797f588e69a0d9d225be2edac600c885fd'
             '41533da5d8ef694d8c12f60d956673d9e49fb6781ae58d6bfd0bf31e4f380fddb508f9cad3b91264a3ad55853c24c6932bdf83bb5b711c34c0836d71b46be02c'
             'fc02c190f01dbfb803b87ea0a6cdf408ce7706dc1ed74fba939931c129fdeb5dab1105caf9f71f029843a4d74db888084f92173c3be240d8492454633311f7c8'
-			'db78be27826be44e97d8680aa860f2e85c94e017aa649d183ee5d71310c95e31669330d3b4496c52143892f238300e57ae88ab0a737ca135ab6f2ce361814e36'
-            '5070b4e8ad5ebd4208a3e8393ebabb55118615c2966cb1ba585e94084c4ad643dc5644bfca9267eb81e6c27be16b088e541aa8118a43cbebaf9d28c52e15a35c')
+			'db78be27826be44e97d8680aa860f2e85c94e017aa649d183ee5d71310c95e31669330d3b4496c52143892f238300e57ae88ab0a737ca135ab6f2ce361814e36')
 
 prepare() {
   cd $pkgname-$pkgver/$pkgname
 
-  patch -Np2 -i ../../qt510.patch
-
   find 'bindings/python' 'contrib' 'programs/scripts' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
 }
 
diff --git a/qt510.patch b/qt510.patch
deleted file mode 100644
index 89c1e3201150..000000000000
--- a/qt510.patch
+++ /dev/null
@@ -1,601 +0,0 @@
-diff --git a/mythtv/configure b/mythtv/configure
-index 8b7ba2ed6f..32fbe2bf60 100755
---- a/mythtv/configure
-+++ b/mythtv/configure
-@@ -6099,21 +6099,26 @@ enable_weak_pic() {
- 
- enabled pic && enable_weak_pic
- 
--is_qmake5(){
--    $1 --version 2>&1 | egrep -q -e "Qt version 5\.[2-9]\.[0-9]"
-+version2string(){
-+    # accepts version as in 1.10.4 and turns it into 0001.0010.0004.0000.0000 which can be compared as a string
-+    echo $1 | awk -F. '{ printf("%04d.%04d.%04d.%04d.%04d", $1, $2, $3, $4, $5); };'
- }
- 
-+# Minimum supported Qt version
-+qt_minimum_version="5.2"
-+
- # qmake-qt5 /usr/lib64/qt5/bin/qmake /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
- if [ x"$qmake" = "xqmake" ]; then
--    CHECK_QMAKE=`which qmake-qt5 2>&1`" /usr/lib64/qt5/bin/qmake /usr/lib/x86_64-linux-gnu/qt5/bin/qmake /usr/lib/i386-linux-gnu/qt5/bin/qmake /usr/lib/arm-linux-gnueabihf/qt5/bin/qmake /usr/local/lib/qt5/bin/qmake `which $qmake 2>&1`"
-+    CHECK_QMAKE=`which -a qmake-qt5 2>/dev/null`" /usr/lib64/qt5/bin/qmake /usr/lib/x86_64-linux-gnu/qt5/bin/qmake /usr/lib/i386-linux-gnu/qt5/bin/qmake /usr/lib/arm-linux-gnueabihf/qt5/bin/qmake /usr/local/lib/qt5/bin/qmake `which -a $qmake 2>/dev/null`"
- else
--    CHECK_QMAKE=`which $qmake 2>&1`" "`which qmake-qt5 2>&1`" /usr/lib64/qt5/bin/qmake /usr/lib/x86_64-linux-gnu/qt5/bin/qmake /usr/lib/i386-linux-gnu/qt5/bin/qmake /usr/lib/arm-linux-gnueabihf/qt5/bin/qmake /usr/local/lib/qt5/bin/qmake"
-+    CHECK_QMAKE=`which -a $qmake 2>/dev/null`" "`which -a qmake-qt5 2>/dev/null`" /usr/lib64/qt5/bin/qmake /usr/lib/x86_64-linux-gnu/qt5/bin/qmake /usr/lib/i386-linux-gnu/qt5/bin/qmake /usr/lib/arm-linux-gnueabihf/qt5/bin/qmake /usr/local/lib/qt5/bin/qmake"
- fi
- # try to find a qt5 qmake to use
- found_qmake=''
- for i in $CHECK_QMAKE; do
-     if test -e $i ; then
--        if is_qmake5 $i; then
-+        qmake_version=`$i --version | sed -n  "s/.*Qt version \([0-9]*\.[0-9]*\.[0-9]*\) .*/\1/p"`
-+        if ! [ $(version2string $qmake_version) \< $(version2string $qt_minimum_version) ]; then
-             found_qmake=$i
-             check_cxxflags -DQT_DISABLE_DEPRECATED_BEFORE=0x050000
-             break;
-@@ -6124,7 +6129,7 @@ for i in $CHECK_QMAKE; do
-     fi
- done
- if [ x"$found_qmake" = "x" ]; then
--    die "qmake for Qt5.2 or newer not found.\nPlease specify the correct qmake with --qmake="
-+    die "qmake for Qt version $qt_minimum_version or newer not found.  Please specify the correct qmake with --qmake="
- else
-     qmake=$found_qmake
- fi
-diff --git a/mythtv/libs/libmyth/libmyth.pro b/mythtv/libs/libmyth/libmyth.pro
-index 24ec735b18..1fd5cc01c0 100644
---- a/mythtv/libs/libmyth/libmyth.pro
-+++ b/mythtv/libs/libmyth/libmyth.pro
-@@ -1,10 +1,8 @@
- include ( ../../settings.pro )
- 
- QT += network xml sql script
--contains(QT_VERSION, ^5\\.[0-9]\\..*) {
- QT += widgets
- android: QT += androidextras
--}
- 
- TEMPLATE = lib
- TARGET = myth-$$LIBVERSION
-@@ -177,11 +175,7 @@ unix:!cygwin {
-     SOURCES += mediamonitor-unix.cpp
-     HEADERS += mediamonitor-unix.h
-     !android {
--    contains(QT_VERSION, ^5\\.[0-9]\\..*) {
-         using_qtdbus: QT += dbus
--    } else {
--        using_qtdbus: CONFIG += qdbus
--    }
-     }
- }
- 
-diff --git a/mythtv/libs/libmyth/test/test_audioconvert/test_audioconvert.pro b/mythtv/libs/libmyth/test/test_audioconvert/test_audioconvert.pro
-index 9e73a8ca23..d0d77e8027 100644
---- a/mythtv/libs/libmyth/test/test_audioconvert/test_audioconvert.pro
-+++ b/mythtv/libs/libmyth/test/test_audioconvert/test_audioconvert.pro
-@@ -1,13 +1,7 @@
- include ( ../../../../settings.pro )
- 
- QT += xml sql network
--
--contains(QT_VERSION, ^4\\.[0-9]\\..*) {
--CONFIG += qtestlib
--}
--contains(QT_VERSION, ^5\\.[0-9]\\..*) {
- QT += testlib
--}
- 
- TEMPLATE = app
- TARGET = test_audioconvert
-diff --git a/mythtv/libs/libmyth/test/test_audioutils/test_audioutils.pro b/mythtv/libs/libmyth/test/test_audioutils/test_audioutils.pro
-index 3d62f741cb..df659aeb19 100644
---- a/mythtv/libs/libmyth/test/test_audioutils/test_audioutils.pro
-+++ b/mythtv/libs/libmyth/test/test_audioutils/test_audioutils.pro
-@@ -1,13 +1,7 @@
- include ( ../../../../settings.pro )
- 
- QT += xml sql network
--
--contains(QT_VERSION, ^4\\.[0-9]\\..*) {
--CONFIG += qtestlib
--}
--contains(QT_VERSION, ^5\\.[0-9]\\..*) {
- QT += testlib
--}
- 
- TEMPLATE = app
- TARGET = test_audioutils
-diff --git a/mythtv/libs/libmyth/test/test_programinfo/test_programinfo.pro b/mythtv/libs/libmyth/test/test_programinfo/test_programinfo.pro
-index bfd9d24287..e59584844d 100644
---- a/mythtv/libs/libmyth/test/test_programinfo/test_programinfo.pro
-+++ b/mythtv/libs/libmyth/test/test_programinfo/test_programinfo.pro
-@@ -1,13 +1,7 @@
- include ( ../../../../settings.pro )
- 
- QT += xml sql network
--
--contains(QT_VERSION, ^4\\.[0-9]\\..*) {
--CONFIG += qtestlib
--}
--contains(QT_VERSION, ^5\\.[0-9]\\..*) {
- QT += testlib
--}
- 
- TEMPLATE = app
- TARGET = test_programinfo
-diff --git a/mythtv/libs/libmythbase/libmythbase.pro b/mythtv/libs/libmythbase/libmythbase.pro
-index aa7ac151db..444abea063 100644
---- a/mythtv/libs/libmythbase/libmythbase.pro
-+++ b/mythtv/libs/libmythbase/libmythbase.pro
-@@ -153,10 +153,7 @@ win32-msvc* {
- }
- 
- QT += xml sql network
--
--contains(QT_VERSION, ^5\\.[0-9]\\..*) {
- QT += widgets
--}
- 
- include ( ../libs-targetfix.pro )
- 
-diff --git a/mythtv/libs/libmythbase/test/test_mythsystem/test_mythsystem.pro b/mythtv/libs/libmythbase/test/test_mythsystem/test_mythsystem.pro
-index fee4e38226..159dcb28f3 100644
---- a/mythtv/libs/libmythbase/test/test_mythsystem/test_mythsystem.pro
-+++ b/mythtv/libs/libmythbase/test/test_mythsystem/test_mythsystem.pro
-@@ -1,13 +1,7 @@
- include ( ../../../../settings.pro )
- 
- QT += xml sql network
--
--contains(QT_VERSION, ^4\\.[0-9]\\..*) {
--CONFIG += qtestlib
--}
--contains(QT_VERSION, ^5\\.[0-9]\\..*) {
- QT += testlib
--}
- 
- TEMPLATE = app
- TARGET = test_mythsystem
-diff --git a/mythtv/libs/libmythbase/test/test_mythsystemlegacy/test_mythsystemlegacy.pro b/mythtv/libs/libmythbase/test/test_mythsystemlegacy/test_mythsystemlegacy.pro
-index b116e7a5ae..d97c6c8112 100644
---- a/mythtv/libs/libmythbase/test/test_mythsystemlegacy/test_mythsystemlegacy.pro
-+++ b/mythtv/libs/libmythbase/test/test_mythsystemlegacy/test_mythsystemlegacy.pro
-@@ -1,13 +1,7 @@
- include ( ../../../../settings.pro )
- 
- QT += xml sql network
--
--contains(QT_VERSION, ^4\\.[0-9]\\..*) {
--CONFIG += qtestlib
--}
--contains(QT_VERSION, ^5\\.[0-9]\\..*) {
- QT += testlib
--}
- 
- TEMPLATE = app
- TARGET = test_mythsystemlegacy
-diff --git a/mythtv/libs/libmythbase/test/test_mythtimer/test_mythtimer.pro b/mythtv/libs/libmythbase/test/test_mythtimer/test_mythtimer.pro
-index d0e332b74d..91c6a3f773 100644
---- a/mythtv/libs/libmythbase/test/test_mythtimer/test_mythtimer.pro
-+++ b/mythtv/libs/libmythbase/test/test_mythtimer/test_mythtimer.pro
-@@ -1,11 +1,6 @@
- include ( ../../../../settings.pro )
- 
--contains(QT_VERSION, ^4\\.[0-9]\\..*) {
--CONFIG += qtestlib
--}
--contains(QT_VERSION, ^5\\.[0-9]\\..*) {
- QT += testlib
--}
- 
- TEMPLATE = app
- TARGET = test_mythtimer
-diff --git a/mythtv/libs/libmythbase/test/test_template/test_template.pro b/mythtv/libs/libmythbase/test/test_template/test_template.pro
-index 2cf0a3e615..c8229039b7 100644
---- a/mythtv/libs/libmythbase/test/test_template/test_template.pro
-+++ b/mythtv/libs/libmythbase/test/test_template/test_template.pro
-@@ -1,13 +1,7 @@
- include ( ../../../../settings.pro )
- 
- QT += xml sql network
--
--contains(QT_VERSION, ^4\\.[0-9]\\..*) {
--CONFIG += qtestlib
--}
--contains(QT_VERSION, ^5\\.[0-9]\\..*) {
- QT += testlib
--}
- 
- TEMPLATE = app
- TARGET = test_template
-diff --git a/mythtv/libs/libmythmetadata/libmythmetadata.pro b/mythtv/libs/libmythmetadata/libmythmetadata.pro
-index d06405c930..695900c985 100644
---- a/mythtv/libs/libmythmetadata/libmythmetadata.pro
-+++ b/mythtv/libs/libmythmetadata/libmythmetadata.pro
-@@ -1,9 +1,7 @@
- include ( ../../settings.pro )
- 
- QT += network xml sql
--contains(QT_VERSION, ^5\\.[0-9]\\..*) {
- QT += widgets
--}
- 
- TEMPLATE = lib
- TARGET = mythmetadata-$$LIBVERSION
-diff --git a/mythtv/libs/libmythmetadata/test/test_videometadata/test_videometadata.pro b/mythtv/libs/libmythmetadata/test/test_videometadata/test_videometadata.pro
-index 218378d363..cc283b73c0 100644
---- a/mythtv/libs/libmythmetadata/test/test_videometadata/test_videometadata.pro
-+++ b/mythtv/libs/libmythmetadata/test/test_videometadata/test_videometadata.pro
-@@ -1,13 +1,7 @@
- include ( ../../../../settings.pro )
- 
- QT += xml sql network
--
--contains(QT_VERSION, ^4\\.[0-9]\\..*) {
--CONFIG += qtestlib
--}
--contains(QT_VERSION, ^5\\.[0-9]\\..*) {
- QT += testlib
--}
- 
- TEMPLATE = app
- TARGET = test_videometadata
-diff --git a/mythtv/libs/libmythprotoserver/libmythprotoserver.pro b/mythtv/libs/libmythprotoserver/libmythprotoserver.pro
-index d9c5643ec8..a1d2446cc1 100644
---- a/mythtv/libs/libmythprotoserver/libmythprotoserver.pro
-+++ b/mythtv/libs/libmythprotoserver/libmythprotoserver.pro
-@@ -1,9 +1,7 @@
- include ( ../../settings.pro )
- 
- QT += network sql
--contains(QT_VERSION, ^5\\.[0-9]\\..*) {
- QT += widgets
--}
- 
- TEMPLATE = lib
- TARGET = mythprotoserver-$$LIBVERSION
-diff --git a/mythtv/libs/libmythtv/libmythtv.pro b/mythtv/libs/libmythtv/libmythtv.pro
-index 77dd7917a0..b88964a3ea 100644
---- a/mythtv/libs/libmythtv/libmythtv.pro
-+++ b/mythtv/libs/libmythtv/libmythtv.pro
-@@ -1,9 +1,7 @@
- include ( ../../settings.pro )
- 
- QT += network xml sql
--contains(QT_VERSION, ^5\\.[0-9]\\..*) {
- QT += widgets
--}
- 
- TEMPLATE = lib
- TARGET = mythtv-$$LIBVERSION
-diff --git a/mythtv/libs/libmythtv/test/test_copyframes/test_copyframes.pro b/mythtv/libs/libmythtv/test/test_copyframes/test_copyframes.pro
-index b365d57cd3..15a39d0986 100644
---- a/mythtv/libs/libmythtv/test/test_copyframes/test_copyframes.pro
-+++ b/mythtv/libs/libmythtv/test/test_copyframes/test_copyframes.pro
-@@ -1,13 +1,7 @@
- include ( ../../../../settings.pro )
- 
- QT += xml sql network
--
--contains(QT_VERSION, ^4\\.[0-9]\\..*) {
--CONFIG += qtestlib
--}
--contains(QT_VERSION, ^5\\.[0-9]\\..*) {
- QT += testlib
--}
- 
- TEMPLATE = app
- TARGET = test_copyframes
-diff --git a/mythtv/libs/libmythtv/test/test_eitfixups/test_eitfixups.pro b/mythtv/libs/libmythtv/test/test_eitfixups/test_eitfixups.pro
-index 6e8881b4eb..a6be44cc62 100644
---- a/mythtv/libs/libmythtv/test/test_eitfixups/test_eitfixups.pro
-+++ b/mythtv/libs/libmythtv/test/test_eitfixups/test_eitfixups.pro
-@@ -1,13 +1,7 @@
- include ( ../../../../settings.pro )
- 
- QT += xml sql network
--
--contains(QT_VERSION, ^4\\.[0-9]\\..*) {
--CONFIG += qtestlib
--}
--contains(QT_VERSION, ^5\\.[0-9]\\..*) {
- QT += testlib
--}
- 
- TEMPLATE = app
- TARGET = test_eitfixups
-diff --git a/mythtv/libs/libmythtv/test/test_iptvrecorder/test_iptvrecorder.pro b/mythtv/libs/libmythtv/test/test_iptvrecorder/test_iptvrecorder.pro
-index c051d80319..bbc9e89a46 100644
---- a/mythtv/libs/libmythtv/test/test_iptvrecorder/test_iptvrecorder.pro
-+++ b/mythtv/libs/libmythtv/test/test_iptvrecorder/test_iptvrecorder.pro
-@@ -1,13 +1,7 @@
- include ( ../../../../settings.pro )
- 
- QT += xml sql network
--
--contains(QT_VERSION, ^4\\.[0-9]\\..*) {
--CONFIG += qtestlib
--}
--contains(QT_VERSION, ^5\\.[0-9]\\..*) {
- QT += testlib
--}
- 
- TEMPLATE = app
- TARGET = test_iptvrecorder
-diff --git a/mythtv/libs/libmythtv/test/test_mpegtables/test_mpegtables.pro b/mythtv/libs/libmythtv/test/test_mpegtables/test_mpegtables.pro
-index 62f3124bb5..b280b0eaa7 100644
---- a/mythtv/libs/libmythtv/test/test_mpegtables/test_mpegtables.pro
-+++ b/mythtv/libs/libmythtv/test/test_mpegtables/test_mpegtables.pro
-@@ -1,13 +1,7 @@
- include ( ../../../../settings.pro )
- 
- QT += xml sql network
--
--contains(QT_VERSION, ^4\\.[0-9]\\..*) {
--CONFIG += qtestlib
--}
--contains(QT_VERSION, ^5\\.[0-9]\\..*) {
- QT += testlib
--}
- 
- TEMPLATE = app
- TARGET = test_mpegtables
-diff --git a/mythtv/libs/libmythui/libmythui.pro b/mythtv/libs/libmythui/libmythui.pro
-index 6b534ad2c2..092098dd4a 100644
---- a/mythtv/libs/libmythui/libmythui.pro
-+++ b/mythtv/libs/libmythui/libmythui.pro
-@@ -1,10 +1,7 @@
- include ( ../../settings.pro )
- 
- QT += xml sql network opengl
--contains(QT_VERSION, ^4\\.[0-9]\\..*) {
--QT += webkit
--}
--contains(QT_VERSION, ^5\\.[0-9]\\..*):using_qtwebkit {
-+using_qtwebkit {
- QT += widgets
- QT += webkitwidgets
- android: QT += androidextras
-diff --git a/mythtv/programs/mythavtest/mythavtest.pro b/mythtv/programs/mythavtest/mythavtest.pro
-index b993647179..35ed274fd9 100644
---- a/mythtv/programs/mythavtest/mythavtest.pro
-+++ b/mythtv/programs/mythavtest/mythavtest.pro
-@@ -3,9 +3,7 @@ include ( ../../version.pro )
- include ( ../programs-libs.pro )
- 
- QT += network xml sql
--contains(QT_VERSION, ^5\\.[0-9]\\..*) {
- QT += widgets
--}
- 
- TEMPLATE = app
- CONFIG += thread
-diff --git a/mythtv/programs/mythbackend/mythbackend.pro b/mythtv/programs/mythbackend/mythbackend.pro
-index ab59bcbbe1..5e54d3bfeb 100644
---- a/mythtv/programs/mythbackend/mythbackend.pro
-+++ b/mythtv/programs/mythbackend/mythbackend.pro
-@@ -10,9 +10,7 @@ mingw | win32-msvc* {
-    # need the following for QUrl::addQueryItem
-    DEFINES += QT_DISABLE_DEPRECATED_BEFORE
- }
--contains(QT_VERSION, ^5\\.[0-9]\\..*) {
- QT += widgets
--}
- 
- TEMPLATE = app
- CONFIG += thread
-diff --git a/mythtv/programs/mythccextractor/mythccextractor.pro b/mythtv/programs/mythccextractor/mythccextractor.pro
-index fbe8c2e50a..a0e70a9ef7 100644
---- a/mythtv/programs/mythccextractor/mythccextractor.pro
-+++ b/mythtv/programs/mythccextractor/mythccextractor.pro
-@@ -2,9 +2,7 @@ include (../../settings.pro)
- include ( ../programs-libs.pro )
- 
- QT += sql network
--contains(QT_VERSION, ^5\\.[0-9]\\..*) {
- QT += widgets
--}
- 
- TEMPLATE = app
- CONFIG += thread
-diff --git a/mythtv/programs/mythcommflag/mythcommflag.pro b/mythtv/programs/mythcommflag/mythcommflag.pro
-index 997966e295..a3fde4f4bd 100644
---- a/mythtv/programs/mythcommflag/mythcommflag.pro
-+++ b/mythtv/programs/mythcommflag/mythcommflag.pro
-@@ -2,9 +2,7 @@ include (../../settings.pro)
- include (../../version.pro)
- include ( ../programs-libs.pro )
- 
--contains(QT_VERSION, ^5\\.[0-9]\\..*) {
- QT += widgets
--}
- 
- TEMPLATE = app
- CONFIG += thread
-diff --git a/mythtv/programs/mythfilerecorder/mythfilerecorder.pro b/mythtv/programs/mythfilerecorder/mythfilerecorder.pro
-index 73300742f1..ba568e091a 100644
---- a/mythtv/programs/mythfilerecorder/mythfilerecorder.pro
-+++ b/mythtv/programs/mythfilerecorder/mythfilerecorder.pro
-@@ -3,9 +3,7 @@ include (../../version.pro)
- include ( ../programs-libs.pro )
- 
- QT += network xml sql script
--contains(QT_VERSION, ^5\\.[0-9]\\..*) {
- QT += widgets
--}
- 
- TEMPLATE = app
- CONFIG += thread
-diff --git a/mythtv/programs/mythfilldatabase/mythfilldatabase.pro b/mythtv/programs/mythfilldatabase/mythfilldatabase.pro
-index 52e6e0a256..0f4f944cf7 100644
---- a/mythtv/programs/mythfilldatabase/mythfilldatabase.pro
-+++ b/mythtv/programs/mythfilldatabase/mythfilldatabase.pro
-@@ -3,9 +3,7 @@ include ( ../../version.pro )
- include ( ../programs-libs.pro )
- 
- QT += network xml sql
--contains(QT_VERSION, ^5\\.[0-9]\\..*) {
- QT += widgets
--}
- 
- TEMPLATE = app
- CONFIG += thread
-diff --git a/mythtv/programs/mythfrontend/mythfrontend.pro b/mythtv/programs/mythfrontend/mythfrontend.pro
-index 744fe1f2bb..2e5f313243 100644
---- a/mythtv/programs/mythfrontend/mythfrontend.pro
-+++ b/mythtv/programs/mythfrontend/mythfrontend.pro
-@@ -7,11 +7,7 @@ mingw | win32-msvc* {
-    # script debugger currently only enabled for WIN32 builds
-    QT += scripttools
- }
--contains(QT_VERSION, ^4\\.[0-9]\\..*) {
--QT += webkit
--using_qtdbus: CONFIG += qdbus
--}
--contains(QT_VERSION, ^5\\.[0-9]\\..*):using_qtwebkit {
-+using_qtwebkit {
- QT += widgets
- QT += webkitwidgets
- using_qtdbus: QT += dbus
-diff --git a/mythtv/programs/mythjobqueue/mythjobqueue.pro b/mythtv/programs/mythjobqueue/mythjobqueue.pro
-index 9405ab597f..389eec7843 100644
---- a/mythtv/programs/mythjobqueue/mythjobqueue.pro
-+++ b/mythtv/programs/mythjobqueue/mythjobqueue.pro
-@@ -3,9 +3,7 @@ include ( ../../version.pro)
- include ( ../programs-libs.pro)
- 
- QT += sql network
--contains(QT_VERSION, ^5\\.[0-9]\\..*) {
- QT += widgets
--}
- 
- CONFIG -= opengl
- 
-diff --git a/mythtv/programs/mythlcdserver/mythlcdserver.pro b/mythtv/programs/mythlcdserver/mythlcdserver.pro
-index fd0a98bf91..766715ee61 100644
---- a/mythtv/programs/mythlcdserver/mythlcdserver.pro
-+++ b/mythtv/programs/mythlcdserver/mythlcdserver.pro
-@@ -3,9 +3,8 @@ include ( ../../version.pro )
- include ( ../programs-libs.pro )
- 
- QT += network xml sql
--contains(QT_VERSION, ^5\\.[0-9]\\..*) {
- QT += widgets
--}
-+
- using_opengl:QT += opengl
- 
- TEMPLATE = app
-diff --git a/mythtv/programs/mythlogserver/mythlogserver.pro b/mythtv/programs/mythlogserver/mythlogserver.pro
-index fbe8c2e50a..a0e70a9ef7 100644
---- a/mythtv/programs/mythlogserver/mythlogserver.pro
-+++ b/mythtv/programs/mythlogserver/mythlogserver.pro
-@@ -2,9 +2,7 @@ include (../../settings.pro)
- include ( ../programs-libs.pro )
- 
- QT += sql network
--contains(QT_VERSION, ^5\\.[0-9]\\..*) {
- QT += widgets
--}
- 
- TEMPLATE = app
- CONFIG += thread
-diff --git a/mythtv/programs/mythmediaserver/mythmediaserver.pro b/mythtv/programs/mythmediaserver/mythmediaserver.pro
-index 2f9a804939..e042941fba 100644
---- a/mythtv/programs/mythmediaserver/mythmediaserver.pro
-+++ b/mythtv/programs/mythmediaserver/mythmediaserver.pro
-@@ -3,9 +3,7 @@ include ( ../../version.pro )
- include ( ../programs-libs.pro )
- 
- QT += network sql
--contains(QT_VERSION, ^5\\.[0-9]\\..*) {
- QT += widgets
--}
- 
- TEMPLATE = app
- CONFIG += thread
-diff --git a/mythtv/programs/mythpreviewgen/mythpreviewgen.pro b/mythtv/programs/mythpreviewgen/mythpreviewgen.pro
-index d21797ede9..3d085385ba 100644
---- a/mythtv/programs/mythpreviewgen/mythpreviewgen.pro
-+++ b/mythtv/programs/mythpreviewgen/mythpreviewgen.pro
-@@ -3,9 +3,7 @@ include ( ../../version.pro )
- include ( ../programs-libs.pro )
- 
- QT += network sql
--contains(QT_VERSION, ^5\\.[0-9]\\..*) {
- QT += widgets
--}
- 
- TEMPLATE = app
- CONFIG += thread
-diff --git a/mythtv/programs/mythscreenwizard/mythscreenwizard.pro b/mythtv/programs/mythscreenwizard/mythscreenwizard.pro
-index 42c4669620..5a4d08d417 100644
---- a/mythtv/programs/mythscreenwizard/mythscreenwizard.pro
-+++ b/mythtv/programs/mythscreenwizard/mythscreenwizard.pro
-@@ -3,9 +3,7 @@ include ( ../../version.pro)
- include ( ../programs-libs.pro)
- 
- QT += sql network
--contains(QT_VERSION, ^5\\.[0-9]\\..*) {
- QT += widgets
--}
- 
- TEMPLATE = app
- CONFIG += thread
-diff --git a/mythtv/programs/mythtranscode/mythtranscode.pro b/mythtv/programs/mythtranscode/mythtranscode.pro
-index 4d4c3bcbcb..1f66fade2b 100644
---- a/mythtv/programs/mythtranscode/mythtranscode.pro
-+++ b/mythtv/programs/mythtranscode/mythtranscode.pro
-@@ -3,9 +3,7 @@ include ( ../../version.pro)
- include ( ../programs-libs.pro)
- 
- QT += network xml sql
--contains(QT_VERSION, ^5\\.[0-9]\\..*) {
- QT += widgets
--}
- 
- TEMPLATE = app
- CONFIG += thread
-diff --git a/mythtv/programs/mythtv-setup/mythtv-setup.pro b/mythtv/programs/mythtv-setup/mythtv-setup.pro
-index 24a9255fb7..9ef3f1c61a 100644
---- a/mythtv/programs/mythtv-setup/mythtv-setup.pro
-+++ b/mythtv/programs/mythtv-setup/mythtv-setup.pro
-@@ -3,9 +3,7 @@ include ( ../../version.pro )
- include ( ../programs-libs.pro )
- 
- QT += network xml sql
--contains(QT_VERSION, ^5\\.[0-9]\\..*) {
- QT += widgets
--}
- 
- INCLUDEPATH += ../../libs/libmythtv/channelscan
- DEPENDPATH += ../../libs/libmythtv/channelscan
-diff --git a/mythtv/programs/mythutil/mythutil.pro b/mythtv/programs/mythutil/mythutil.pro
-index ab8897f17c..0ad14ef856 100644
---- a/mythtv/programs/mythutil/mythutil.pro
-+++ b/mythtv/programs/mythutil/mythutil.pro
-@@ -3,9 +3,7 @@ include ( ../../version.pro )
- include ( ../programs-libs.pro )
- 
- QT += network sql xml
--contains(QT_VERSION, ^5\\.[0-9]\\..*) {
- QT += widgets
--}
- 
- TEMPLATE = app
- CONFIG += thread
-diff --git a/mythtv/programs/mythwelcome/mythwelcome.pro b/mythtv/programs/mythwelcome/mythwelcome.pro
-index edddbf18a6..fa83a39852 100644
---- a/mythtv/programs/mythwelcome/mythwelcome.pro
-+++ b/mythtv/programs/mythwelcome/mythwelcome.pro
-@@ -3,9 +3,7 @@ include (../../version.pro)
- include (../programs-libs.pro)
- 
- QT += xml sql network
--contains(QT_VERSION, ^5\\.[0-9]\\..*) {
- QT += widgets
--}
- 
- TEMPLATE = app
- CONFIG += thread
author	Taijian	2018-02-01 16:24:24 +0100
committer	Taijian	2018-02-01 16:24:24 +0100
commit	7d9ea43baab1e9eea8a991a501800882daa373b2 (patch)
tree	059723c14094f89b2221b54b2b726bbcaa978078
parent	6fc7cd114ce62f835e9acb81fbb492d5385d8528 (diff)
download	aur-7d9ea43baab1e9eea8a991a501800882daa373b2.tar.gz