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

Collapse All | Expand All

(-)a/configure.ac (-5 / +5 lines)
Lines 13627-13633 then Link Here
13627
13627
13628
    QT5_CFLAGS="-I$qt5_incdir -DQT_NO_VERSION_TAGGING"
13628
    QT5_CFLAGS="-I$qt5_incdir -DQT_NO_VERSION_TAGGING"
13629
    QT5_CFLAGS=$(printf '%s' "$QT5_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
13629
    QT5_CFLAGS=$(printf '%s' "$QT5_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
13630
    QT5_LIBS="-L$qt5_libdir -lQt5Core -lQt5Gui -lQt5Widgets -lQt5Network"
13630
    QT5_LIBS="-L$qt5_libdir -lQt5Core -lQt5Gui -lQt5Widgets"
13631
    if test "$_os" = "Emscripten"; then
13631
    if test "$_os" = "Emscripten"; then
13632
        QT5_LIBS="$QT5_LIBS -lqtpcre2 -lQt5EventDispatcherSupport -lQt5FontDatabaseSupport -L${qt5_platformsdir} -lqwasm"
13632
        QT5_LIBS="$QT5_LIBS -lqtpcre2 -lQt5EventDispatcherSupport -lQt5FontDatabaseSupport -L${qt5_platformsdir} -lqwasm"
13633
    fi
13633
    fi
Lines 13867-13874 then Link Here
13867
        AC_MSG_ERROR([KF5 libraries not found.  Please specify the root of your KF5 installation by exporting KF5DIR before running "configure".])
13867
        AC_MSG_ERROR([KF5 libraries not found.  Please specify the root of your KF5 installation by exporting KF5DIR before running "configure".])
13868
    fi
13868
    fi
13869
13869
13870
    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"
13870
    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"
13871
    KF5_LIBS="-L$kf5_libdir -lKF5CoreAddons -lKF5I18n -lKF5ConfigCore -lKF5WindowSystem -lKF5KIOCore -lKF5KIOWidgets -lKF5KIOFileWidgets -L$qt5_libdir -lQt5Core -lQt5Gui -lQt5Widgets -lQt5Network"
13871
    KF5_LIBS="-L$kf5_libdir -lKF5CoreAddons -lKF5I18n -lKF5ConfigCore -lKF5WindowSystem -lKF5KIOCore -lKF5KIOWidgets -lKF5KIOFileWidgets -L$qt5_libdir -lQt5Core -lQt5Gui -lQt5Widgets"
13872
    KF5_CFLAGS=$(printf '%s' "$KF5_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
13872
    KF5_CFLAGS=$(printf '%s' "$KF5_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
13873
13873
13874
    if test "$USING_X11" = TRUE; then
13874
    if test "$USING_X11" = TRUE; then
Lines 13878-13884 then Link Here
13878
    AC_LANG_PUSH([C++])
13878
    AC_LANG_PUSH([C++])
13879
    save_CXXFLAGS=$CXXFLAGS
13879
    save_CXXFLAGS=$CXXFLAGS
13880
    CXXFLAGS="$CXXFLAGS $KF5_CFLAGS"
13880
    CXXFLAGS="$CXXFLAGS $KF5_CFLAGS"
13881
    AC_MSG_CHECKING([whether KDE is >= 5.0])
13881
    AC_MSG_CHECKING([whether KDE Frameworks is >= 5.0])
13882
       AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
13882
       AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
13883
#include <kcoreaddons_version.h>
13883
#include <kcoreaddons_version.h>
13884
13884
Lines 13886-13892 int main(int argc, char **argv) { Link Here
13886
       static_assert(KCOREADDONS_VERSION_MAJOR == 5);
13886
       static_assert(KCOREADDONS_VERSION_MAJOR == 5);
13887
       return 0;
13887
       return 0;
13888
}
13888
}
13889
       ]])],[AC_MSG_RESULT([yes])],[AC_MSG_ERROR([KDE version too old])],[])
13889
       ]])],[AC_MSG_RESULT([yes])],[AC_MSG_ERROR([KDE Frameworks version too old])],[])
13890
    CXXFLAGS=$save_CXXFLAGS
13890
    CXXFLAGS=$save_CXXFLAGS
13891
    AC_LANG_POP([C++])
13891
    AC_LANG_POP([C++])
13892
fi
13892
fi

Return to bug 942831