diff -ruNp kdelibs-4.14.6-orig/cmake/modules/FindPhonon.cmake kdelibs-4.14.6/cmake/modules/FindPhonon.cmake --- kdelibs-4.14.6-orig/cmake/modules/FindPhonon.cmake 2015-02-26 18:12:48.000000000 -0600 +++ kdelibs-4.14.6/cmake/modules/FindPhonon.cmake 2015-10-18 06:42:10.000000000 -0500 @@ -21,9 +21,16 @@ macro(_phonon_find_version) set(PHONON_VERSION "${CMAKE_MATCH_1}") endmacro(_phonon_find_version) +MESSAGE(STATUS "Looking for Phonon") +message(STATUS " -> KDE4_INCLUDE_INSTALL_DIR is ${KDE4_INCLUDE_INSTALL_DIR}") +message(STATUS " -> KDE4_LIB_INSTALL_DIR is ${KDE4_LIB_INSTALL_DIR}") +message(STATUS " -> INCLUDE_INSTALL_DIR is ${INCLUDE_INSTALL_DIR}") +message(STATUS " -> QT_LIBRARY_DIR is ${QT_LIBRARY_DIR}") +message(STATUS " -> QT_INCLUDE_DIR is ${QT_INCLUDE_DIR}") + # the dirs listed with HINTS are searched before the default sets of dirs -find_library(PHONON_LIBRARY NAMES phonon HINTS ${KDE4_LIB_INSTALL_DIR} ${QT_LIBRARY_DIR}) -find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h HINTS ${KDE4_INCLUDE_INSTALL_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} ${QT_LIBRARY_DIR}) +find_library(PHONON_LIBRARY NAMES phonon HINTS ${KDE4_LIB_INSTALL_DIR} ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) +find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h HINTS ${KDE4_INCLUDE_INSTALL_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY) set(PHONON_LIBS ${phonon_LIB_DEPENDS} ${PHONON_LIBRARY}) @@ -31,6 +38,11 @@ if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY _phonon_find_version() endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY) +MESSAGE(STATUS "Results of Search for Phonon") +MESSAGE(STATUS " -> PHONON_VERSION is ${PHONON_VERSION}") +MESSAGE(STATUS " -> PHONON_INCLUDE_DIR is ${PHONON_INCLUDE_DIR}") +MESSAGE(STATUS " -> PHONON_LIBRARY is ${PHONON_LIBRARY}") + include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Phonon DEFAULT_MSG PHONON_INCLUDE_DIR PHONON_LIBRARY) diff -ruNp kdelibs-4.14.6-orig/cmake/modules/FindQt4.cmake kdelibs-4.14.6/cmake/modules/FindQt4.cmake --- kdelibs-4.14.6-orig/cmake/modules/FindQt4.cmake 2015-02-26 18:12:48.000000000 -0600 +++ kdelibs-4.14.6/cmake/modules/FindQt4.cmake 2015-10-18 06:42:10.000000000 -0500 @@ -1168,7 +1168,14 @@ IF (QT4_QMAKE_FOUND) QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE AND QT_QTCORE_LIBRARY) SET( QT4_FOUND "YES" ) IF( NOT Qt4_FIND_QUIETLY) - MESSAGE(STATUS "Found Qt-Version ${QTVERSION} (using ${QT_QMAKE_EXECUTABLE})") + MESSAGE(STATUS "Found Qt-Version ${QTVERSION}") + MESSAGE(STATUS " -> QT_QMAKE_EXECUTABLE is ${QT_QMAKE_EXECUTABLE}") + MESSAGE(STATUS " -> QT_INCLUDE_DIR is ${QT_INCLUDE_DIR}") + MESSAGE(STATUS " -> QT_QTCORE_INCLUDE_DIR is ${QT_QTCORE_INCLUDE_DIR}") + MESSAGE(STATUS " -> QT_BINARY_DIR is ${QT_BINARY_DIR}") + MESSAGE(STATUS " -> QT_LIBRARY_DIR is ${QT_LIBRARY_DIR}") + MESSAGE(STATUS " -> QT_PLUGINS_DIR is ${QT_PLUGINS_DIR}") + MESSAGE(STATUS " -> QT_MKSPECS_DIR is ${QT_MKSPECS_DIR}") ENDIF( NOT Qt4_FIND_QUIETLY) ELSE( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE AND QT_QTCORE_LIBRARY) diff -ruNp kdelibs-4.14.6-orig/cmake/modules/FindSoprano.cmake kdelibs-4.14.6/cmake/modules/FindSoprano.cmake --- kdelibs-4.14.6-orig/cmake/modules/FindSoprano.cmake 2015-02-26 18:12:48.000000000 -0600 +++ kdelibs-4.14.6/cmake/modules/FindSoprano.cmake 2015-10-18 06:42:10.000000000 -0500 @@ -46,7 +46,7 @@ include(FindLibraryWithDebug) find_program(SOPRANO_SOPRANOCMD_EXECUTABLE - NAMES sopranocmd + NAMES sopranocmd-@KDETYPE@ HINTS ${BIN_INSTALL_DIR} ${KDE4_BIN_INSTALL_DIR} @@ -54,7 +54,7 @@ find_program(SOPRANO_SOPRANOCMD_EXECUTAB if(NOT WINCE) find_program(SOPRANO_ONTO2VOCABULARYCLASS_EXECUTABLE - NAMES onto2vocabularyclass + NAMES onto2vocabularyclass-@KDETYPE@ HINTS ${BIN_INSTALL_DIR} ${KDE4_BIN_INSTALL_DIR} diff -ruNp kdelibs-4.14.6-orig/kde4-check-sycoca.sh kdelibs-4.14.6/kde4-check-sycoca.sh --- kdelibs-4.14.6-orig/kde4-check-sycoca.sh 1969-12-31 18:00:00.000000000 -0600 +++ kdelibs-4.14.6/kde4-check-sycoca.sh 2015-10-18 06:42:10.000000000 -0500 @@ -0,0 +1,18 @@ +#!/bin/sh + +if [ `id -u` -eq 0 ] || [ `id -un | grep -c -E '^fink-bld$'` -gt 0 ]; then + # skip root and fink build account + exit 0 +fi + +FULLPREFIX="@KDEPREFIX@/opt/kde4/@KDETYPE@" +GLOBAL_SYCOCA_DIR="$FULLPREFIX/var/fink" +LOCAL_SYCOCA_DIR="$HOME/.cache/kde4-@KDETYPE@-fink" +TOUCHFILE="kbuildsycoca-updated" + +mkdir -p "$LOCAL_SYCOCA_DIR" + +if [ ! -e "$LOCAL_SYCOCA_DIR/$TOUCHFILE" ] || [ "$GLOBAL_SYCOCA_DIR/$TOUCHFILE" -nt "$LOCAL_SYCOCA_DIR/$TOUCHFILE" ];then + echo "* you've installed KDE4 (@KDETYPE@) applications since last time you ran init -- updating desktop cache" + ("$FULLPREFIX/bin/kbuildsycoca4" >"$LOCAL_SYCOCA_DIR/kbuildsycoca4.log" 2>&1 && touch "$LOCAL_SYCOCA_DIR/$TOUCHFILE") & +fi diff -ruNp kdelibs-4.14.6-orig/kde4-postinst.sh kdelibs-4.14.6/kde4-postinst.sh --- kdelibs-4.14.6-orig/kde4-postinst.sh 1969-12-31 18:00:00.000000000 -0600 +++ kdelibs-4.14.6/kde4-postinst.sh 2015-10-18 06:42:10.000000000 -0500 @@ -0,0 +1,81 @@ +#!/bin/sh + +if [ `id -u` -ne 0 ]; then + echo "you must run this as root!" + exit 1 +fi + +PREFIX="@KDEPREFIX@" +TYPE="@KDETYPE@" +FULLPREFIX="@KDEPREFIX@/opt/kde4/@KDETYPE@" +KDE4RCFILE="$FULLPREFIX/etc/kde4rc" +TEMPPATH="/tmp/kb$$" +LOGFILE="$TEMPPATH/kde4-postinst.log" + +mkdir -p "$TEMPPATH" +cd "$TEMPPATH" + +echo >$LOGFILE + +echo "== figuring out KDE directories from $KDE4RCFILE ==" >>$LOGFILE +PREFIXES=`grep '^prefixes=' "$KDE4RCFILE" | cut -d= -f2-` +orig_IFS=$IFS +IFS="," +for PRE in $PREFIXES; do + export _KDEDIRS="$_KDEDIRS:$PRE" + export _XDG_DATA_DIRS="$_XDG_DATA_DIRS:$PRE/share" + export _XDG_CONFIG_DIRS="$_XDG_CONFIG_DIRS:$PRE/etc/xdg" +done +IFS=$orig_IFS + +KDEDIRS=`echo $_KDEDIRS:$KDEDIRS | sed -e 's,^:,,' -e 's,:$,,'` +XDG_DATA_DIRS=`echo $_XDG_DATA_DIRS:$XDG_DATA_DIRS | sed -e 's,^:,,' -e 's,:$,,'` +XDG_CONFIG_DIRS=`echo $_XDG_CONFIG_DIRS:$XDG_CONFIG_DIRS | sed -e 's,^:,,' -e 's,:$,,'` +export KDEDIRS XDG_DATA_DIRS XDG_CONFIG_DIRS + +echo "KDEDIRS=$KDEDIRS" >>$LOGFILE +echo "XDG_DATA_DIRS=$XDG_DATA_DIRS" >>$LOGFILE +echo "XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS" >>$LOGFILE + +echo "== marking sycoca database as dirty ==" >>$LOGFILE 2>&1 +mkdir -p "$FULLPREFIX/var/fink" +touch "$FULLPREFIX/var/fink/kbuildsycoca-updated" + +echo "== running update-desktop-database ==" >>$LOGFILE 2>&1 +"$PREFIX/bin/update-desktop-database" --verbose `echo $KDEDIRS: | sed -e 's,:,/share/applications ,g'` >>$LOGFILE 2>&1 + +IFS=":" +for DIR in $KDEDIRS; do + if [ -d "$DIR/share/mime" ]; then + echo "== running update-mime-database on $DIR ==" >>$LOGFILE 2>&1 + "$PREFIX/bin/update-mime-database" -V "$DIR/share/mime" >>$LOGFILE 2>&1 + fi +done +IFS=$orig_IFS + +[ -z "$DO_SYMLINK_UPDATE" ] && export DO_SYMLINK_UPDATE=1 + +if [ $DO_SYMLINK_UPDATE -eq 1 ]; then + mkdir -p "$PREFIX/share/dbus-1/interfaces" + + IFS=":" + for DIR in $KDEDIRS; do + if [ -d "$DIR/share/dbus-1/interfaces" ] && [ "$DIR" != "$PREFIX" ]; then + cd "$DIR/share/dbus-1/interfaces" + for file in *.xml; do + ln -sf "$DIR/share/dbus-1/interfaces/$file" "$PREFIX/share/dbus-1/interfaces/$file" + done + fi + done + IFS=$orig_IFS + for file in "$PREFIX/share/dbus-1/interfaces"/*.xml; do + if [ ! -f "$file" ]; then + rm -rf "$file" + fi + done +fi + +echo "" +echo "== KDE4 Applications Have Been Updated ==" +echo "You should start a new shell, or run $FULLPREFIX/bin/kde4-check-sycoca.sh to update the KDE4 application database." +echo "" diff -ruNp kdelibs-4.14.6-orig/kdecore/config/kconfig.cpp kdelibs-4.14.6/kdecore/config/kconfig.cpp --- kdelibs-4.14.6-orig/kdecore/config/kconfig.cpp 2015-02-26 18:12:48.000000000 -0600 +++ kdelibs-4.14.6/kdecore/config/kconfig.cpp 2015-10-18 06:42:10.000000000 -0500 @@ -71,7 +71,7 @@ KConfigPrivate::KConfigPrivate(const KCo #ifdef Q_WS_WIN QFile::decodeName( qgetenv("WINDIR") + "/kde4rc" ); #else - QLatin1String("/etc/kde4rc"); + QLatin1String("@KDEPREFIX@/opt/kde4/@KDETYPE@/etc/kde4rc"); #endif if (!KStandardDirs::checkAccess(etc_kderc, R_OK)) { etc_kderc.clear(); diff -ruNp kdelibs-4.14.6-orig/kdecore/kernel/kkernel_mac.cpp kdelibs-4.14.6/kdecore/kernel/kkernel_mac.cpp --- kdelibs-4.14.6-orig/kdecore/kernel/kkernel_mac.cpp 2015-02-26 18:12:48.000000000 -0600 +++ kdelibs-4.14.6/kdecore/kernel/kkernel_mac.cpp 2015-10-18 06:42:10.000000000 -0500 @@ -21,7 +21,7 @@ #include -#ifdef Q_OS_MACX +#if defined(Q_OS_DARWIN) || defined(Q_OS_MAC) #include #include @@ -142,7 +142,7 @@ void mac_initialize_dbus() return; } - dbusVar = QFile::decodeName(qgetenv("DBUS_LAUNCHD_SESSION_BUS_SOCKET")); + dbusVar = QFile::decodeName(qgetenv("DBUS_FINK_SESSION_BUS_SOCKET")); if (mac_set_dbus_address(dbusVar)) { dbus_initialized = true; return; @@ -164,7 +164,7 @@ void mac_initialize_dbus() QProcess qp; qp.setTextModeEnabled(true); - qp.start(externalProc, QStringList() << QLatin1String("getenv") << QLatin1String("DBUS_LAUNCHD_SESSION_BUS_SOCKET")); + qp.start(externalProc, QStringList() << QLatin1String("load") << QLatin1String("@KDEPREFIX@/share/dbus/launchd/org.finkproject.dbus-session.plist")); if (!qp.waitForFinished(timeout)) { kDebug() << "error running" << externalProc << qp.errorString(); return; diff -ruNp kdelibs-4.14.6-orig/kimgio/CMakeLists.txt kdelibs-4.14.6/kimgio/CMakeLists.txt --- kdelibs-4.14.6-orig/kimgio/CMakeLists.txt 2015-02-26 18:12:48.000000000 -0600 +++ kdelibs-4.14.6/kimgio/CMakeLists.txt 2015-10-18 06:42:10.000000000 -0500 @@ -111,7 +111,7 @@ if(OPENEXR_FOUND) add_definitions(${OPENEXR_DEFINITIONS}) set(kimg_exr_LIB_SRCS exr.cpp) kde4_add_plugin(kimg_exr ${kimg_exr_LIB_SRCS}) - target_link_libraries(kimg_exr ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${OPENEXR_LIBRARIES} ) + target_link_libraries(kimg_exr ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${OPENEXR_LIBRARIES} z ) install(TARGETS kimg_exr DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/imageformats/ ) install( FILES exr.desktop DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins/ ) diff -ruNp kdelibs-4.14.6-orig/kross/qts/CMakeLists.txt kdelibs-4.14.6/kross/qts/CMakeLists.txt --- kdelibs-4.14.6-orig/kross/qts/CMakeLists.txt 2015-02-26 18:12:48.000000000 -0600 +++ kdelibs-4.14.6/kross/qts/CMakeLists.txt 2015-10-18 06:42:10.000000000 -0500 @@ -8,7 +8,7 @@ if (NOT CYGWIN) set_target_properties(krossqtsplugin PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION}) endif (NOT CYGWIN) -install(TARGETS krossqtsplugin DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/script) +install(TARGETS krossqtsplugin EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) ########### next target ############### --- a/kdeui/CMakeLists.txt 2017-12-05 21:07:18.000000000 -0600 +++ b/kdeui/CMakeLists.txt 2017-12-05 21:07:38.000000000 -0600 @@ -313,8 +313,6 @@ add_definitions(-DMAC_USE_OSXKEYCHAIN) else(Q_WS_MAC AND MAC_USE_OSXKEYCHAIN) set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kwallet.cpp) -else(Q_WS_MAC AND MAC_USE_OSXKEYCHAIN) - set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kwallet.cpp) endif(Q_WS_MAC AND MAC_USE_OSXKEYCHAIN) if(NOT WINCE) diff -ruN kdelibs-4.14.6-orig/kdecore/localization/klocale_kde.cpp kdelibs-4.14.6/kdecore/localization/klocale_kde.cpp --- kdelibs-4.14.6-orig/kdecore/localization/klocale_kde.cpp 2015-02-26 18:12:48.000000000 -0600 +++ kdelibs-4.14.6/kdecore/localization/klocale_kde.cpp 2019-09-13 19:33:34.000000000 -0500 @@ -2438,8 +2438,8 @@ bool KLocalePrivate::use12Clock() const { - if ((timeFormat().contains(QString::fromLatin1("%I")) > 0) || - (timeFormat().contains(QString::fromLatin1("%l")) > 0)) { + if ((timeFormat().contains(QString::fromLatin1("%I")) != NULL) || + (timeFormat().contains(QString::fromLatin1("%l")) != NULL)) { return true; } else { return false; diff -ruN kdelibs-4.14.6-orig/kio/kfile/kopenwithdialog.cpp kdelibs-4.14.6/kio/kfile/kopenwithdialog.cpp --- kdelibs-4.14.6-orig/kio/kfile/kopenwithdialog.cpp 2015-02-26 18:12:48.000000000 -0600 +++ kdelibs-4.14.6/kio/kfile/kopenwithdialog.cpp 2019-09-13 19:34:15.000000000 -0500 @@ -713,7 +713,7 @@ // ### indicate that default value was restored d->terminal->setChecked(d->curService->terminal()); QString terminalOptions = d->curService->terminalOptions(); - d->nocloseonexit->setChecked((terminalOptions.contains(QLatin1String("--noclose")) > 0)); + d->nocloseonexit->setChecked((terminalOptions.contains(QLatin1String("--noclose")) != NULL)); d->m_terminaldirty = false; // slotTerminalToggled changed it } } diff -ruN kdelibs-4.14.6-orig/kio/kfile/kpropertiesdialog.cpp kdelibs-4.14.6/kio/kfile/kpropertiesdialog.cpp --- kdelibs-4.14.6-orig/kio/kfile/kpropertiesdialog.cpp 2015-02-26 18:12:48.000000000 -0600 +++ kdelibs-4.14.6/kio/kfile/kpropertiesdialog.cpp 2019-09-13 19:35:36.000000000 -0500 @@ -3306,7 +3306,7 @@ if (preferredTerminal == "konsole") { - terminalCloseBool = (d->m_terminalOptionStr.contains( "--noclose" ) > 0); + terminalCloseBool = (d->m_terminalOptionStr.contains( "--noclose" ) != NULL); w.terminalCloseCheck->setChecked(terminalCloseBool); d->m_terminalOptionStr.remove( "--noclose"); } @@ -3427,4 +3427,3 @@ #include "kpropertiesdialog.moc" #include "kpropertiesdialog_p.moc" -