Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 939472 | Differences between
and this patch

Collapse All | Expand All

(-)a/configure.ac (-6 / +5 lines)
Lines 13213-13219 then Link Here
13213
13213
13214
    QT5_CFLAGS="-I$qt5_incdir -DQT_NO_VERSION_TAGGING"
13214
    QT5_CFLAGS="-I$qt5_incdir -DQT_NO_VERSION_TAGGING"
13215
    QT5_CFLAGS=$(printf '%s' "$QT5_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
13215
    QT5_CFLAGS=$(printf '%s' "$QT5_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
13216
    QT5_LIBS="-L$qt5_libdir -lQt5Core -lQt5Gui -lQt5Widgets -lQt5Network"
13216
    QT5_LIBS="-L$qt5_libdir -lQt5Core -lQt5Gui -lQt5Widgets"
13217
    if test "$_os" = "Emscripten"; then
13217
    if test "$_os" = "Emscripten"; then
13218
        QT5_LIBS="$QT5_LIBS -lqtpcre2 -lQt5EventDispatcherSupport -lQt5FontDatabaseSupport -L${qt5_platformsdir} -lqwasm"
13218
        QT5_LIBS="$QT5_LIBS -lqtpcre2 -lQt5EventDispatcherSupport -lQt5FontDatabaseSupport -L${qt5_platformsdir} -lqwasm"
13219
    fi
13219
    fi
Lines 13442-13449 then Link Here
13442
        AC_MSG_ERROR([KF5 libraries not found.  Please specify the root of your KF5 installation by exporting KF5DIR before running "configure".])
13442
        AC_MSG_ERROR([KF5 libraries not found.  Please specify the root of your KF5 installation by exporting KF5DIR before running "configure".])
13443
    fi
13443
    fi
13444
13444
13445
    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_NO_VERSION_TAGGING"
13445
    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 -DQT_NO_VERSION_TAGGING"
13446
    KF5_LIBS="-L$kf5_libdir -lKF5CoreAddons -lKF5I18n -lKF5ConfigCore -lKF5WindowSystem -lKF5KIOCore -lKF5KIOWidgets -lKF5KIOFileWidgets -L$qt5_libdir -lQt5Core -lQt5Gui -lQt5Widgets -lQt5Network"
13446
    KF5_LIBS="-L$kf5_libdir -lKF5CoreAddons -lKF5I18n -lKF5ConfigCore -lKF5WindowSystem -lKF5KIOCore -lKF5KIOWidgets -lKF5KIOFileWidgets -L$qt5_libdir -lQt5Core -lQt5Gui -lQt5Widgets"
13447
    KF5_CFLAGS=$(printf '%s' "$KF5_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
13447
    KF5_CFLAGS=$(printf '%s' "$KF5_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
13448
13448
13449
    if test "$USING_X11" = TRUE; then
13449
    if test "$USING_X11" = TRUE; then
Lines 13453-13459 then Link Here
13453
    AC_LANG_PUSH([C++])
13453
    AC_LANG_PUSH([C++])
13454
    save_CXXFLAGS=$CXXFLAGS
13454
    save_CXXFLAGS=$CXXFLAGS
13455
    CXXFLAGS="$CXXFLAGS $KF5_CFLAGS"
13455
    CXXFLAGS="$CXXFLAGS $KF5_CFLAGS"
13456
    AC_MSG_CHECKING([whether KDE is >= 5.0])
13456
    AC_MSG_CHECKING([whether KDE Frameworks is >= 5.0])
13457
       AC_RUN_IFELSE([AC_LANG_SOURCE([[
13457
       AC_RUN_IFELSE([AC_LANG_SOURCE([[
13458
#include <kcoreaddons_version.h>
13458
#include <kcoreaddons_version.h>
13459
13459
Lines 13461-13467 int main(int argc, char **argv) { Link Here
13461
       if (KCOREADDONS_VERSION_MAJOR == 5 && KCOREADDONS_VERSION_MINOR >= 0) return 0;
13461
       if (KCOREADDONS_VERSION_MAJOR == 5 && KCOREADDONS_VERSION_MINOR >= 0) return 0;
13462
       else return 1;
13462
       else return 1;
13463
}
13463
}
13464
       ]])],[AC_MSG_RESULT([yes])],[AC_MSG_ERROR([KDE version too old])],[])
13464
       ]])],[AC_MSG_RESULT([yes])],[AC_MSG_ERROR([KDE Frameworks version too old])],[])
13465
    CXXFLAGS=$save_CXXFLAGS
13465
    CXXFLAGS=$save_CXXFLAGS
13466
    AC_LANG_POP([C++])
13466
    AC_LANG_POP([C++])
13467
fi
13467
fi
13468
- 

Return to bug 939472