From 64796fcd464179d6a4784919ab012dc12ad53071 Mon Sep 17 00:00:00 2001 From: Dave Love Date: Dec 04 2018 12:22:50 +0000 Subject: - Adapt to el8, with qt5 --- diff --git a/cube-qt5.patch b/cube-qt5.patch new file mode 100644 index 0000000..4e1c875 --- /dev/null +++ b/cube-qt5.patch @@ -0,0 +1,25 @@ +--- cubegui-4.4.2/build-config/m4/autotroll.m4~ 2018-08-23 08:35:25.524414715 +0100 ++++ cubegui-4.4.2/build-config/m4/autotroll.m4 2018-11-29 14:56:33.916712194 +0000 +@@ -140,7 +140,7 @@ + dnl Memo: AC_ARG_WITH(package, help-string, [if-given], [if-not-given]) + AC_ARG_WITH([qt], + [AS_HELP_STRING([--with-qt], +- [Path to Qt @<:@Look in PATH, /usr/local/Trolltech, /usr/lib[|32|64]/qt[|4], /usr/local/qt[|4] and /opt/qt[|4]@:>@])], ++ [Path to Qt @<:@Look in PATH, /usr/local/Trolltech, /usr/lib[|32|64]/qt[|4|5], /usr/local/qt[|4] and /opt/qt[|4]@:>@])], + [QT_PATH=`echo $withval | sed -e 's,/lib/\?$,,g' | sed -e 's,/bin/\?$,,g' | sed -e 's,/bin/qmake\(-qt4\)\?$,,g'| sed -e 's,/bin/qmake\(-qt5\)\?$,,g'`/bin; qtdir=`dirname $withval`; QT_SUFFIX=`echo $withval | grep "qmake" | sed -e "s,$qtdir\/,,g" | sed -e "s,qmake,,g"`]) + + dnl Memo: AC_ARG_WITH(package, help-string, [if-given], [if-not-given]) +@@ -204,6 +204,12 @@ + test -d /usr/lib64/qt4 \ + && tmp_qt_paths="$tmp_qt_paths:/usr/lib64/qt4/bin" + ++ test -d /usr/lib64/qt5 \ ++ && tmp_qt_paths="$tmp_qt_paths:/usr/lib64/qt5/bin" ++ ++ test -d /usr/lib/qt5 \ ++ && tmp_qt_paths="$tmp_qt_paths:/usr/lib/qt5/bin" ++ + test -d /usr/lib64/qt \ + && tmp_qt_paths="$tmp_qt_paths:/usr/lib64/qt/bin" + +