mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-05 06:39:06 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
3b09246714
vcpkg/ports/kf5kio/fix_libiconv.patch

203 lines
6.8 KiB
Diff
Raw Normal View History

[kf5kio] new port (#19779) * Add kf5kio port [WIP] * Fixed kf5kio for windows * [kf5*] update to 5.75.0 * [kf5kio] fix clang errors on macOS * [kf5kio] add missing dependencies * [kf5kio] use current spec * [kf5kio] install tools, don't remove them * [kf5kio] install data to standard /share location * [kf5kio] only remove what's needed * [kf5kio] wrap paths in quotes * [kf5kio] use semVer * [kf5kio] update versions * [kf5kio] update to 5.84.0 * [kf5kio] fix libiconv for static builds * [kf5kio] libiconv patches only for windows static builds * [kf5kio] update versions * [kf5kio] fix copying tools on Windows * [kf5kio] add PACKAGE_NAME to vcpkg_cmake_config_fixup * [kf5kio] update versions * [kf5kio] update versions * [kf5kio] add comment with a link to a PR * [kf5kio] update versions * [kf5kio] fix CMake Config for static builds * [kf5kio] update versions * [kf5kio] disable notifications if not explicitly enabled * [kf5kio] add kf5wallet feature * [kf5kio] update versions * [kf5kio] knotifications is non-Windows and non-Android * [kf5kio] update versions * [kf5io] re-enable parallel configure * [kf5io] use generic, non-semver versioning * [kf5kio] update versions * [kf5kio] remove the 5.75 version info Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Kuntal Majumder <hellozee@disroot.org> Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
2021-10-12 01:17:16 +08:00
diff --git a/src/ioslaves/file/CMakeLists.txt b/src/ioslaves/file/CMakeLists.txt
index 20fca30..bcd795e 100644
--- a/src/ioslaves/file/CMakeLists.txt
+++ b/src/ioslaves/file/CMakeLists.txt
@@ -33,7 +33,9 @@ ecm_qt_export_logging_category(
EXPORT KIO
)
-target_link_libraries(kio_file KF5::KIOCore KF5::I18n KF5::ConfigCore Qt5::DBus Qt5::Network)
+find_package(Iconv REQUIRED)
+include_directories(${Iconv_INCLUDE_DIRS})
+target_link_libraries(kio_file KF5::KIOCore KF5::I18n KF5::ConfigCore Qt5::DBus Qt5::Network ${Iconv_LIBRARIES})
if(UNIX)
target_link_libraries(kio_file Qt5::Network KF5::AuthCore)
diff --git a/src/ioslaves/ftp/CMakeLists.txt b/src/ioslaves/ftp/CMakeLists.txt
index b9602fa..e80f7ce 100644
--- a/src/ioslaves/ftp/CMakeLists.txt
+++ b/src/ioslaves/ftp/CMakeLists.txt
@@ -21,6 +21,8 @@ ecm_qt_export_logging_category(
EXPORT KIO
)
-target_link_libraries(kio_ftp Qt5::Network KF5::KIOCore KF5::I18n KF5::ConfigCore)
+find_package(Iconv REQUIRED)
+include_directories(${Iconv_INCLUDE_DIRS})
+target_link_libraries(kio_ftp Qt5::Network KF5::KIOCore KF5::I18n KF5::ConfigCore ${Iconv_LIBRARIES})
install(TARGETS kio_ftp DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kio)
diff --git a/src/ioslaves/http/CMakeLists.txt b/src/ioslaves/http/CMakeLists.txt
index 51bd392..db43701 100644
--- a/src/ioslaves/http/CMakeLists.txt
+++ b/src/ioslaves/http/CMakeLists.txt
@@ -37,11 +37,15 @@ target_sources(kio_http_cache_cleaner PRIVATE
http_cache_cleaner.cpp
)
+find_package(Iconv REQUIRED)
+include_directories(${Iconv_INCLUDE_DIRS})
target_link_libraries(kio_http_cache_cleaner
Qt5::DBus
Qt5::Network # QLocalSocket
KF5::KIOCore # KProtocolManager
- KF5::I18n)
+ KF5::I18n
+ ${Iconv_LIBRARIES}
+)
install(TARGETS kio_http_cache_cleaner DESTINATION ${KDE_INSTALL_LIBEXECDIR_KF5} )
@@ -96,6 +100,7 @@ target_link_libraries(kio_http
KF5::KIONTLM
KF5::Archive
KF5::I18n
+ ${Iconv_LIBRARIES}
)
if(GSSAPI_FOUND)
target_link_libraries(kio_http ${GSSAPI_LIBS} )
diff --git a/src/ioslaves/http/kcookiejar/CMakeLists.txt b/src/ioslaves/http/kcookiejar/CMakeLists.txt
index 0f770ae..2600d2d 100644
--- a/src/ioslaves/http/kcookiejar/CMakeLists.txt
+++ b/src/ioslaves/http/kcookiejar/CMakeLists.txt
@@ -13,10 +13,13 @@ target_sources(kcookiejar5 PRIVATE
main.cpp
)
+find_package(Iconv REQUIRED)
+include_directories(${Iconv_INCLUDE_DIRS})
target_link_libraries( kcookiejar5
Qt5::DBus
KF5::I18n
KF5::WidgetsAddons
+ ${Iconv_LIBRARIES}
)
install(TARGETS kcookiejar5 ${KF5_INSTALL_TARGETS_DEFAULT_ARGS} )
@@ -55,6 +58,7 @@ target_link_libraries(kded_kcookiejar
KF5::DBusAddons
KF5::I18n
KF5::WidgetsAddons
+ ${Iconv_LIBRARIES}
)
########### install files ###############
diff --git a/src/ioslaves/remote/CMakeLists.txt b/src/ioslaves/remote/CMakeLists.txt
index 36a97cf..9319a61 100644
--- a/src/ioslaves/remote/CMakeLists.txt
+++ b/src/ioslaves/remote/CMakeLists.txt
@@ -21,4 +21,6 @@ ecm_qt_declare_logging_category(kio_remote
EXPORT KIO
)
-target_link_libraries(kio_remote KF5::KIOCore KF5::I18n KF5::ConfigCore Qt5::Network)
+find_package(Iconv REQUIRED)
+include_directories(${Iconv_INCLUDE_DIRS})
+target_link_libraries(kio_remote KF5::KIOCore KF5::I18n KF5::ConfigCore Qt5::Network ${Iconv_LIBRARIES})
diff --git a/src/ioslaves/remote/kdedmodule/CMakeLists.txt b/src/ioslaves/remote/kdedmodule/CMakeLists.txt
index 4e40d21..7ba0d91 100644
--- a/src/ioslaves/remote/kdedmodule/CMakeLists.txt
+++ b/src/ioslaves/remote/kdedmodule/CMakeLists.txt
@@ -1,7 +1,9 @@
add_library(remotedirnotify MODULE remotedirnotify.cpp remotedirnotifymodule.cpp ../debug.cpp)
kcoreaddons_desktop_to_json(remotedirnotify remotedirnotify.desktop)
-target_link_libraries(remotedirnotify KF5::DBusAddons KF5::KIOCore)
+find_package(Iconv REQUIRED)
+include_directories(${Iconv_INCLUDE_DIRS})
+target_link_libraries(remotedirnotify KF5::DBusAddons KF5::KIOCore ${Iconv_LIBRARIES})
# Rename target to allow co-installability with plasma-workspace <= 5.9
set_target_properties(remotedirnotify PROPERTIES OUTPUT_NAME "remotenotifier")
diff --git a/src/ioslaves/telnet/CMakeLists.txt b/src/ioslaves/telnet/CMakeLists.txt
index ffee12c..0b03c21 100644
--- a/src/ioslaves/telnet/CMakeLists.txt
+++ b/src/ioslaves/telnet/CMakeLists.txt
@@ -2,10 +2,13 @@
add_executable(ktelnetservice5 ktelnetservice.cpp)
ecm_mark_nongui_executable(ktelnetservice5)
+find_package(Iconv REQUIRED)
+include_directories(${Iconv_INCLUDE_DIRS})
target_link_libraries(ktelnetservice5
Qt5::Widgets
KF5::I18n
KF5::KIOGui
+ ${Iconv_LIBRARIES}
)
install(TARGETS ktelnetservice5 ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/src/ioslaves/trash/CMakeLists.txt b/src/ioslaves/trash/CMakeLists.txt
index 80489d9..364ecb4 100644
--- a/src/ioslaves/trash/CMakeLists.txt
+++ b/src/ioslaves/trash/CMakeLists.txt
@@ -55,6 +55,8 @@ else()
)
endif()
+find_package(Iconv REQUIRED)
+include_directories(${Iconv_INCLUDE_DIRS})
target_link_libraries(kio_trash
KF5::ConfigCore
KF5::Solid
@@ -63,6 +65,7 @@ target_link_libraries(kio_trash
Qt5::Network
KF5::I18n
KF5::ConfigCore
+ ${Iconv_LIBRARIES}
)
if(APPLE)
target_link_libraries(kio_trash "-framework DiskArbitration -framework CoreFoundation")
@@ -84,6 +87,7 @@ target_link_libraries(ktrash5
KF5::KIOCore
KF5::I18n
KF5::ConfigCore
+ ${Iconv_LIBRARIES}
)
install(TARGETS ktrash5 ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/src/kioexec/CMakeLists.txt b/src/kioexec/CMakeLists.txt
index 92eeafe..8ae8742 100644
--- a/src/kioexec/CMakeLists.txt
+++ b/src/kioexec/CMakeLists.txt
@@ -19,7 +19,9 @@ ecm_qt_declare_logging_category(kioexecd
EXPORT KIO
)
-target_link_libraries(kioexecd KF5::I18n KF5::DBusAddons KF5::WidgetsAddons KF5::KIOCore)
+find_package(Iconv REQUIRED)
+include_directories(${Iconv_INCLUDE_DIRS})
+target_link_libraries(kioexecd KF5::I18n KF5::DBusAddons KF5::WidgetsAddons KF5::KIOCore ${Iconv_LIBRARIES})
kdbusaddons_generate_dbus_service_file(kiod5 org.kde.kioexecd ${KDE_INSTALL_FULL_LIBEXECDIR_KF5})
@@ -45,6 +47,7 @@ target_link_libraries(kioexec
KF5::WidgetsAddons # KMessageBox
KF5::WindowSystem # KStartupInfo
KF5::DBusAddons # KDBusService
+ ${Iconv_LIBRARIES}
)
if (HAVE_X11)
diff --git a/src/kpasswdserver/CMakeLists.txt b/src/kpasswdserver/CMakeLists.txt
index c268e03..c1a562a 100644
--- a/src/kpasswdserver/CMakeLists.txt
+++ b/src/kpasswdserver/CMakeLists.txt
@@ -39,6 +39,8 @@ ecm_qt_export_logging_category(
EXPORT KIO
)
+find_package(Iconv REQUIRED)
+include_directories(${Iconv_INCLUDE_DIRS})
target_link_libraries(kiod_kpasswdserver
KF5::DBusAddons # KDED Module
Qt5::DBus
@@ -46,6 +48,7 @@ target_link_libraries(kiod_kpasswdserver
KF5::WidgetsAddons # KPasswordDialog
KF5::I18n
KF5::WindowSystem
+ ${Iconv_LIBRARIES}
${WALLET_LIB}
)
Reference in New Issue Copy Permalink