Changeset View
Changeset View
Standalone View
Standalone View
files/0001-Fix-KDE-build.patch
| From 4e8dbdd16e5c60103fe52a1253cca6daa4603869 Mon Sep 17 00:00:00 2001 | From dcc9c8e695557e4684852a48aa046a2014e38c2e Mon Sep 17 00:00:00 2001 | ||||
| From: Fabio Forni <fabio@redaril.me> | From: Justin Zobel <justin.zobel@gmail.com> | ||||
| Date: Mon, 10 Jun 2019 14:51:37 +0200 | Date: Sat, 17 Aug 2019 13:23:55 +0930 | ||||
| Subject: [PATCH] Fix KDE build | Subject: [PATCH] [PATCH] Fix KDE build | ||||
| --- | --- | ||||
| configure.ac | 2 -- | configure.ac | 2 -- | ||||
| 1 file changed, 2 deletions(-) | 1 file changed, 2 deletions(-) | ||||
| diff --git a/configure.ac b/configure.ac | diff --git a/configure.ac b/configure.ac | ||||
| index fc5216d..6aa0e6f 100644 | index d0e6759b1..169a8ddc1 100644 | ||||
| --- a/configure.ac | --- a/configure.ac | ||||
| +++ b/configure.ac | +++ b/configure.ac | ||||
| @@ -11293,7 +11293,6 @@ then | @@ -11329,7 +11329,6 @@ then | ||||
| fi | fi | ||||
| QT5_CFLAGS="-I$qt5_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT" | QT5_CFLAGS="-I$qt5_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT -DQT_NO_VERSION_TAGGING" | ||||
| - QT5_CFLAGS=$(printf '%s' "$QT5_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") | - QT5_CFLAGS=$(printf '%s' "$QT5_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") | ||||
| QT5_LIBS="-L$qt5_libdir -lQt5Core -lQt5Gui -lQt5Widgets -lQt5Network" | QT5_LIBS="-L$qt5_libdir -lQt5Core -lQt5Gui -lQt5Widgets -lQt5Network" | ||||
| dnl Check for Meta Object Compiler | if test "$USING_X11" = TRUE; then | ||||
| @@ -11390,7 +11389,6 @@ then | @@ -11428,7 +11427,6 @@ then | ||||
| KF5_CFLAGS="-I$kf5_incdir -I$kf5_incdir/KCoreAddons -I$kf5_incdir/KI18n -I$kf5_incdir/KConfigCore -I$kf5_incdir/KWindowSystem -I$kf5_incdir/KIOCore -I$kf5_incdir/KIOWidgets -I$kf5_incdir/KIOFileWidgets -I$qt5_incdir -I$qt5_incdir/QtCore -I$qt5_incdir/QtGui -I$qt5_incdir/QtWidgets -I$qt5_incdir/QtNetwork -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT $KF5_XCB_CFLAGS" | KF5_CFLAGS="-I$kf5_incdir -I$kf5_incdir/KCoreAddons -I$kf5_incdir/KI18n -I$kf5_incdir/KConfigCore -I$kf5_incdir/KWindowSystem -I$kf5_incdir/KIOCore -I$kf5_incdir/KIOWidgets -I$kf5_incdir/KIOFileWidgets -I$qt5_incdir -I$qt5_incdir/QtCore -I$qt5_incdir/QtGui -I$qt5_incdir/QtWidgets -I$qt5_incdir/QtNetwork -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT -DQT_NO_VERSION_TAGGING" | ||||
| KF5_LIBS="-L$kf5_libdir -lKF5CoreAddons -lKF5I18n -lKF5ConfigCore -lKF5WindowSystem -lKF5KIOCore -lKF5KIOWidgets -lKF5KIOFileWidgets -L$qt5_libdir -lQt5Core -lQt5Gui -lQt5Widgets -lQt5Network $KF5_XCB_LIBS" | KF5_LIBS="-L$kf5_libdir -lKF5CoreAddons -lKF5I18n -lKF5ConfigCore -lKF5WindowSystem -lKF5KIOCore -lKF5KIOWidgets -lKF5KIOFileWidgets -L$qt5_libdir -lQt5Core -lQt5Gui -lQt5Widgets -lQt5Network" | ||||
| - KF5_CFLAGS=$(printf '%s' "$KF5_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") | - KF5_CFLAGS=$(printf '%s' "$KF5_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") | ||||
| if test "$USING_X11" = TRUE; then | if test "$USING_X11" = TRUE; then | ||||
| KF5_LIBS="$KF5_LIBS -lQt5X11Extras" | KF5_LIBS="$KF5_LIBS -lQt5X11Extras" | ||||
| -- | -- | ||||
| 2.21.0 | 2.22.1 | ||||
Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.