-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
gwenhywfar: update to 5.10.2, remove -gtk
gwenhywfar-gtk: remove package, GTK2 no longer supported
- Loading branch information
Showing
5 changed files
with
48 additions
and
54 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,28 +1,31 @@ | ||
--- a/m4/ax_have_qt.m4 2020-01-16 19:40:22.927813462 +0100 | ||
+++ b/m4/ax_have_qt.m4 2020-01-16 19:42:12.106436543 +0100 | ||
@@ -74,6 +74,12 @@ | ||
diff --git a/m4/ax_have_qt.m4 b/m4/ax_have_qt.m4 | ||
index f035a81852..b43f8c2387 100644 | ||
--- a/m4/ax_have_qt.m4 | ||
+++ b/m4/ax_have_qt.m4 | ||
@@ -74,6 +74,13 @@ AC_DEFUN([AX_HAVE_QT], | ||
[QT_QMAKE="$withval"], | ||
[QT_QMAKE="qmake"] | ||
) | ||
+ | ||
+ AC_ARG_WITH(qt5-config, | ||
+ [ --with-qt5-config=FILE uses given qt configuration], | ||
+ [QT_CONFIGURATION="$withval"], | ||
+ [QT_CONFIGURATION="$withval"], | ||
+ [QT_CONFIGURATION=""] | ||
+ ) | ||
+ | ||
+ | ||
AC_MSG_CHECKING(for Qt) | ||
# If we have Qt5 or later in the path, we're golden | ||
ver=`$QT_QMAKE --version | grep -o "Qt version ."` | ||
@@ -122,7 +128,11 @@ | ||
@@ -96,7 +103,11 @@ percent.target = % | ||
percent.commands = @echo -n "\$(\$(@))\ " | ||
QMAKE_EXTRA_TARGETS += percent | ||
EOF | ||
- $QT_QMAKE $am_have_qt_pro -o $am_have_qt_makefile | ||
+ if test -z $QT_CONFIGURATION; then | ||
+ $QT_QMAKE $am_have_qt_pro -o $am_have_qt_makefile | ||
+ $QT_QMAKE $am_have_qt_pro -o $am_have_qt_makefile | ||
+ else | ||
+ $QT_QMAKE $am_have_qt_pro -o $am_have_qt_makefile -qtconf $QT_CONFIGURATION | ||
+ $QT_QMAKE $am_have_qt_pro -o $am_have_qt_makefile -qtconf $QT_CONFIGURATION | ||
+ fi | ||
QT_CXXFLAGS=`make -s -f $am_have_qt_makefile CXXFLAGS INCPATH` | ||
QT_LIBS=`make -s -f $am_have_qt_makefile LIBS` | ||
QT_CXXFLAGS=`cd $am_have_qt_dir; make -s -f $am_have_qt_makefile CXXFLAGS INCPATH` | ||
QT_LIBS=`cd $am_have_qt_dir; make -s -f $am_have_qt_makefile LIBS` | ||
rm $am_have_qt_pro $am_have_qt_makefile |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters