sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (c65a42cddb5cf089defc9b1c37516af37f1392b3)
- From: Treeve Jelbert <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
- Subject: [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (c65a42cddb5cf089defc9b1c37516af37f1392b3)
- Date: Sat, 28 Dec 2024 17:19:29 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:
kernels/sysfsutils/DETAILS | 8
kernels/sysfsutils/HISTORY | 5
kernels/sysfsutils/PRE_BUILD | 2
openprinting/pdfio/DETAILS | 2
openprinting/pdfio/HISTORY | 3
video/mythtv/DETAILS | 6
video/mythtv/HISTORY | 4
video/mythtv/PRE_BUILD | 8
video/mythtv/qt510-configure-v2.patch | 115 ------------
video/mythtv/qt510-libs.patch | 314
----------------------------------
video/mythtv/qt510-plugins.patch | 84 ---------
video/mythtv/qt510-programs.patch | 242 --------------------------
12 files changed, 21 insertions(+), 772 deletions(-)
New commits:
commit c65a42cddb5cf089defc9b1c37516af37f1392b3
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
pdfio: => 1.4.0
commit 7369041570a8b38a220d4d7746aa648e8bcc361b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
sysfsutils: => 2.1.1
commit 646224663427e484324d288f810c851d3d86dce8
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
mythtv: => 34.0
diff --git a/kernels/sysfsutils/DETAILS b/kernels/sysfsutils/DETAILS
index 30a340e..54a25e8 100755
--- a/kernels/sysfsutils/DETAILS
+++ b/kernels/sysfsutils/DETAILS
@@ -1,10 +1,10 @@
SPELL=sysfsutils
- VERSION=2.1.0
+ VERSION=2.1.1
+
SOURCE_HASH=sha512:7e1c8535be3c29dec8e23e8b6e8d3ec794bbdc696f161fa38731844c82cc1d37ff04f94c8b0ec0cf8da7147fc696dad0086262641984fa67378ffd2f162dc358
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-
SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/linux-diag/$SOURCE
-
SOURCE_HASH=sha512:485902d98b41a69343cb037883d0c0a1de8a1a4aed657cd4528fe10bc845ac51629657dff01deef042e57c9bd9243095e23fc931d06d74db31b03c5f0a18cf07
- WEB_SITE=http://linux-diag.sourceforge.net/
+ WEB_SITE=https://github.com/linux-ras/sysfsutils
+ SOURCE_URL[0]=$WEB_SITE/archive/refs/tags/v$VERSION.tar.gz
ENTERED=20031122
LICENSE[0]="GPL"
LICENSE[1]="LGPL"
diff --git a/kernels/sysfsutils/HISTORY b/kernels/sysfsutils/HISTORY
index 9adb4bd..86de2ac 100644
--- a/kernels/sysfsutils/HISTORY
+++ b/kernels/sysfsutils/HISTORY
@@ -1,3 +1,8 @@
+2024-12-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.1.1
+ now at github
+ * PRE_BUILD: updated
+
2019-05-25 Ismael Luceno <ismael AT sourcemage.org>
* PRE_BUILD: Fixed build against musl
diff --git a/kernels/sysfsutils/PRE_BUILD b/kernels/sysfsutils/PRE_BUILD
index 3c8cac2..cde1ced 100755
--- a/kernels/sysfsutils/PRE_BUILD
+++ b/kernels/sysfsutils/PRE_BUILD
@@ -1,3 +1,3 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-sedit 's!maybe_os in$!& linux-musl*|\\!' config.sub
+autoreconf -fsi
diff --git a/openprinting/pdfio/DETAILS b/openprinting/pdfio/DETAILS
index f0ba77d..e1e5dd4 100755
--- a/openprinting/pdfio/DETAILS
+++ b/openprinting/pdfio/DETAILS
@@ -1,5 +1,5 @@
SPELL=pdfio
- VERSION=1.3.2
+ VERSION=1.4.0
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$SPELL-$VERSION
diff --git a/openprinting/pdfio/HISTORY b/openprinting/pdfio/HISTORY
index a7987e0..6542814 100644
--- a/openprinting/pdfio/HISTORY
+++ b/openprinting/pdfio/HISTORY
@@ -1,3 +1,6 @@
+2024-12-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.4.0
+
2024-10-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.3.2
diff --git a/video/mythtv/DETAILS b/video/mythtv/DETAILS
index 4be0868..c0968e4 100755
--- a/video/mythtv/DETAILS
+++ b/video/mythtv/DETAILS
@@ -1,10 +1,10 @@
SPELL=mythtv
- VERSION=29.0
-
SOURCE_HASH=sha512:43e54a5db19a77cf1410fca0d41378d5e40db0ad2ee51d59a9ba5a3ae4d65bdfcbbcf6b2ddcb5b6d67a12d076af8f3ddaf2f80117cfd26e93439f5182b35b8d4
+ VERSION=34.0
+
SOURCE_HASH=sha512:1c2362ecf60460e92ace22302203ae3acb1b552041ab04c61be4f02aae13cfc925935fe28a1ba52fcedd92bacbb0e7592e902f3b084591ffb9c975d2753375e3
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_URL[0]=https://www.mythtv.org/download/mythtv/${VERSION%.?}
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-fixes-${VERSION%.?}
- WEB_SITE=http://www.mythtv.org
+ WEB_SITE=https://www.mythtv.org
ENTERED=20040727
LICENSE[0]=GPL
DOCS="$DOCS keys.txt"
diff --git a/video/mythtv/HISTORY b/video/mythtv/HISTORY
index bbf611a..52a4cd3 100644
--- a/video/mythtv/HISTORY
+++ b/video/mythtv/HISTORY
@@ -1,3 +1,7 @@
+2024-12-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 34.0
+ * qt510-* PRE_BUILD: deleted
+
2020-03-16 Treeve Jelbert <treeve AT sourcemage.org>
* BUILD: tweak
diff --git a/video/mythtv/PRE_BUILD b/video/mythtv/PRE_BUILD
deleted file mode 100755
index d83d827..0000000
--- a/video/mythtv/PRE_BUILD
+++ /dev/null
@@ -1,8 +0,0 @@
-default_pre_build &&
-cd "${SOURCE_DIRECTORY}" &&
-
-for patch in qt510-configure-v2.patch qt510-libs.patch qt510-plugins.patch
qt510-programs.patch
-do
- message "${MESSAGE_COLOR}Applying ${patch} to build against Qt 5.10+
...${DEFAULT_COLOR}" &&
- patch -p1 < "${SCRIPT_DIRECTORY}"/${patch}
-done
diff --git a/video/mythtv/qt510-configure-v2.patch
b/video/mythtv/qt510-configure-v2.patch
deleted file mode 100644
index d0740e6..0000000
--- a/video/mythtv/qt510-configure-v2.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-diff --git a/mythplugins/configure b/mythplugins/configure
-index 9ba22c8956..3b6cc3f914 100755
---- a/mythplugins/configure
-+++ b/mythplugins/configure
-@@ -527,14 +527,6 @@ EOF
- die "Sanity test failed."
- fi
-
--is_qmake5(){
-- $1 --version 2>&1 | egrep -q -e "Qt version 5\.[0-9]\.[0-9]"
--}
--
--is_qmake4(){
-- $1 --version 2>&1 | egrep -q -e "Qt version 4\.[8-9]\.[0-9]"
--}
--
- # bring in mythtv config
- if [ -e $prefix/include/mythtv/mythconfig.mak ] ; then
- rm mythconfig.mak 2> /dev/null
-@@ -570,30 +562,40 @@ OPENGLES=$(cat mythconfig.mak | grep -e
"^HAVE_GLES2_GL2_H=yes")
- EXTRALIBS=$(cat mythconfig.mak | grep -e "^EXTRALIBS=")
- EXTRALIBS=${EXTRALIBS#EXTRALIBS=}
-
-+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="qmake-qt5 /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
$qmake qmake-qt4"
-+ 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="$qmake qmake-qt5 /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
qmake-qt4"
-+ 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 is_qmake5 $i; then
-- found_qmake=$i
-- break;
-- elif is_qmake4 $i; then
-- found_qmake=$i
-- break;
-+ if test -e $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
-+ break;
-+ else
-+ echo "found qmake at $i but version failed"
-+ echo "got version: " `$i --version`
-+ fi
- fi
- done
- if [ x"$found_qmake" = "x" ]; then
-- die "qmake for Qt4.8 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
-
--
- # rely on what was discover during MythTV configure
- if enabled opengl && test "$OPENGLV" != "CONFIG_OPENGL_VIDEO=yes"; then
- disable opengl
-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/video/mythtv/qt510-libs.patch b/video/mythtv/qt510-libs.patch
deleted file mode 100644
index 30c7a9bd..0000000
--- a/video/mythtv/qt510-libs.patch
+++ /dev/null
@@ -1,314 +0,0 @@
-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/video/mythtv/qt510-plugins.patch
b/video/mythtv/qt510-plugins.patch
deleted file mode 100644
index 3178be2..0000000
--- a/video/mythtv/qt510-plugins.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff --git a/mythplugins/mythbrowser/mythbrowser/mythbrowser.pro
b/mythplugins/mythbrowser/mythbrowser/mythbrowser.pro
-index 693e621b08..c7a39b5545 100644
---- a/mythplugins/mythbrowser/mythbrowser/mythbrowser.pro
-+++ b/mythplugins/mythbrowser/mythbrowser/mythbrowser.pro
-@@ -5,8 +5,7 @@ include (../../programs-libs.pro )
- LIBS += -lmythtv-$$LIBVERSION
-
- QT += network xml sql opengl
--contains(QT_VERSION, ^4\\.[0-9]\\..*) : QT += webkit
--contains(QT_VERSION, ^5\\.[0-9]\\..*) : QT += widgets webkitwidgets
-+QT += widgets webkitwidgets
-
- TEMPLATE = lib
- CONFIG += thread opengl plugin warn_on
-diff --git a/mythplugins/mythmusic/mythmusic/mythmusic.pro
b/mythplugins/mythmusic/mythmusic/mythmusic.pro
-index 0703da590f..88b35c3782 100644
---- a/mythplugins/mythmusic/mythmusic/mythmusic.pro
-+++ b/mythplugins/mythmusic/mythmusic/mythmusic.pro
-@@ -4,8 +4,7 @@ include ( ../../programs-libs.pro )
- include (config.pro)
-
- QT += xml sql opengl network
--contains(QT_VERSION, ^4\\.[0-9]\\..*) : QT += webkit
--contains(QT_VERSION, ^5\\.[0-9]\\..*) : QT += widgets webkitwidgets
-+QT += widgets webkitwidgets
-
- !exists( config.pro ) {
- error(Missing config.pro: please run the configure script)
-diff --git a/mythplugins/mythnetvision/mythnetvision/mythnetvision.pro
b/mythplugins/mythnetvision/mythnetvision/mythnetvision.pro
-index 2bf47ec5ee..a2f343ecef 100644
---- a/mythplugins/mythnetvision/mythnetvision/mythnetvision.pro
-+++ b/mythplugins/mythnetvision/mythnetvision/mythnetvision.pro
-@@ -3,9 +3,7 @@ include ( ../../settings.pro )
- include ( ../../programs-libs.pro )
-
- QT += network sql xml
--contains(QT_VERSION, ^5\\.[0-9]\\..*) {
- QT += widgets
--}
-
- TEMPLATE = lib
- CONFIG += plugin thread warn_on debug
-diff --git a/mythplugins/mythnews/mythnews/mythnews.pro
b/mythplugins/mythnews/mythnews/mythnews.pro
-index d2bff02684..b757dffe07 100644
---- a/mythplugins/mythnews/mythnews/mythnews.pro
-+++ b/mythplugins/mythnews/mythnews/mythnews.pro
-@@ -3,9 +3,7 @@ include ( ../../settings.pro )
- include ( ../../programs-libs.pro )
-
- QT += network sql xml
--contains(QT_VERSION, ^5\\.[0-9]\\..*) {
- QT += widgets
--}
-
- TEMPLATE = lib
- CONFIG += plugin thread warn_on debug
-diff --git a/mythplugins/mythweather/mythweather/mythweather.pro
b/mythplugins/mythweather/mythweather/mythweather.pro
-index ab0654b92d..3fb32a5c7c 100644
---- a/mythplugins/mythweather/mythweather/mythweather.pro
-+++ b/mythplugins/mythweather/mythweather/mythweather.pro
-@@ -3,9 +3,7 @@ include ( ../../settings.pro )
- include ( ../../programs-libs.pro )
-
- QT += sql xml network
--contains(QT_VERSION, ^5\\.[0-9]\\..*) {
- QT += widgets
--}
-
- TEMPLATE = lib
- CONFIG += plugin thread
-diff --git a/mythplugins/mythzoneminder/mythzoneminder/mythzoneminder.pro
b/mythplugins/mythzoneminder/mythzoneminder/mythzoneminder.pro
-index e9b418c3d7..803be487ea 100644
---- a/mythplugins/mythzoneminder/mythzoneminder/mythzoneminder.pro
-+++ b/mythplugins/mythzoneminder/mythzoneminder/mythzoneminder.pro
-@@ -3,9 +3,7 @@ include ( ../../settings.pro )
- include ( ../../programs-libs.pro )
-
- QT += network
--contains(QT_VERSION, ^5\\.[0-9]\\..*) {
- QT += widgets
--}
-
- TEMPLATE = lib
- CONFIG += plugin thread
diff --git a/video/mythtv/qt510-programs.patch
b/video/mythtv/qt510-programs.patch
deleted file mode 100644
index e38cf00..0000000
--- a/video/mythtv/qt510-programs.patch
+++ /dev/null
@@ -1,242 +0,0 @@
-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
- [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (c65a42cddb5cf089defc9b1c37516af37f1392b3), Treeve Jelbert, 12/28/2024
Archive powered by MHonArc 2.6.24.