From 252da660a38d1b527d0be6510a7ee8478c46d899 Mon Sep 17 00:00:00 2001 From: orbea Date: Thu, 30 May 2024 20:07:43 -0700 Subject: kde-frameworks/kdelibs4support: new package, add 5.116.0 Signed-off-by: orbea --- kde-frameworks/kdelibs4support/Manifest | 1 + .../files/kdelibs4support-5.116.0-libressl.patch | 51 ++++++++ ...kdelibs4support-5.80.0-no-kdesignerplugin.patch | 143 +++++++++++++++++++++ .../files/kdelibs4support-5.86.0-unused-dep.patch | 51 ++++++++ .../kdelibs4support/kdelibs4support-5.116.0.ebuild | 107 +++++++++++++++ kde-frameworks/kdelibs4support/metadata.xml | 16 +++ 6 files changed, 369 insertions(+) create mode 100644 kde-frameworks/kdelibs4support/Manifest create mode 100644 kde-frameworks/kdelibs4support/files/kdelibs4support-5.116.0-libressl.patch create mode 100644 kde-frameworks/kdelibs4support/files/kdelibs4support-5.80.0-no-kdesignerplugin.patch create mode 100644 kde-frameworks/kdelibs4support/files/kdelibs4support-5.86.0-unused-dep.patch create mode 100644 kde-frameworks/kdelibs4support/kdelibs4support-5.116.0.ebuild create mode 100644 kde-frameworks/kdelibs4support/metadata.xml diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest new file mode 100644 index 0000000..3cce90a --- /dev/null +++ b/kde-frameworks/kdelibs4support/Manifest @@ -0,0 +1 @@ +DIST kdelibs4support-5.116.0.tar.xz 3706116 BLAKE2B 35d8ab172c2993cd7f64b1075ddb882a78248383f23a0060889f782f3af65bf3cab9423af380b91e85236b2e8e3036040f6527a3ca7a7a8c309730e01a0d2283 SHA512 87cdc59da0fcaccc48012cf3c34ab3707c2eb159effd17e76b7c24a81feebebef3a27aa1d25dadfb0d5ee7efbc39b2fa7cafc6090476f5ec4cb8e9be616050be diff --git a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.116.0-libressl.patch b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.116.0-libressl.patch new file mode 100644 index 0000000..3215832 --- /dev/null +++ b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.116.0-libressl.patch @@ -0,0 +1,51 @@ +From: orbea +Date: Thu, 30 May 2024 19:49:51 -0700 +Subject: [PATCH] kssl: Update LibreSSL defines for 3.9.0 + +With LibreSSL 3.9.0 CRYPTO_free was updated to accept file and line +arguments. +--- + src/kssl/kopenssl.cpp | 6 +++--- + src/kssl/kopenssl.h | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +--- a/src/kssl/kopenssl.cpp ++++ b/src/kssl/kopenssl.cpp +@@ -80,7 +80,7 @@ extern "C" { + static void (*K_X509_LOOKUP_free)(X509_LOOKUP *) = nullptr; + static int (*K_X509_LOOKUP_ctrl)(X509_LOOKUP *, int, const char *, long, char **) = nullptr; + static void (*K_X509_STORE_CTX_init)(X509_STORE_CTX *, X509_STORE *, X509 *, STACK_OF(X509) *) = nullptr; +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3090000fL) + static void (*K_CRYPTO_free)(void *) = nullptr; + #else + static void (*K_CRYPTO_free)(void *, const char *, int) = nullptr; +@@ -429,7 +429,7 @@ KOpenSSLProxy::KOpenSSLProxy() + K_RAND_load_file = (int (*)(const char *, long)) d->cryptoLib->resolve("RAND_load_file"); + K_RAND_file_name = (const char *(*)(char *, size_t)) d->cryptoLib->resolve("RAND_file_name"); + K_RAND_write_file = (int (*)(const char *)) d->cryptoLib->resolve("RAND_write_file"); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3090000fL) + K_CRYPTO_free = (void (*)(void *)) d->cryptoLib->resolve("CRYPTO_free"); + #else + K_CRYPTO_free = (void (*)(void *, const char *, int)) d->cryptoLib->resolve("CRYPTO_free"); +@@ -1095,7 +1095,7 @@ void KOpenSSLProxy::X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store, + } + } + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3090000fL) + void KOpenSSLProxy::CRYPTO_free(void *x) + { + if (K_CRYPTO_free) { +--- a/src/kssl/kopenssl.h ++++ b/src/kssl/kopenssl.h +@@ -395,7 +395,7 @@ public: + /* + * CRYPTO_free - free up an internally allocated object + */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3090000fL) + void CRYPTO_free(void *x); + #else + void CRYPTO_free(void *x, const char *file, int line); diff --git a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.80.0-no-kdesignerplugin.patch b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.80.0-no-kdesignerplugin.patch new file mode 100644 index 0000000..1165a53 --- /dev/null +++ b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.80.0-no-kdesignerplugin.patch @@ -0,0 +1,143 @@ +From 720711e3a4e69bcc6447c928bea243a81a777a07 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sun, 22 Nov 2020 00:25:06 +0100 +Subject: [PATCH 1/2] Drop KDE4_ADD_WIDGET_FILES macro and KF5DesignerPlugin + dependency + +Signed-off-by: Andreas Sturmlechner +--- + CMakeLists.txt | 1 - + KF5KDELibs4SupportConfig.cmake.in | 1 - + cmake/modules/FindKDE4Internal.cmake | 4 ---- + cmake/modules/KDE4Macros.cmake | 2 -- + src/CMakeLists.txt | 19 ------------------- + src/KDEUIMacros.cmake | 25 ------------------------- + 6 files changed, 52 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a60c88a4..2a432591 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -26,7 +26,6 @@ find_package(KF5Completion ${KF_DEP_VERSION} REQUIRED) + find_package(KF5Config ${KF_DEP_VERSION} REQUIRED) + find_package(KF5ConfigWidgets ${KF_DEP_VERSION} REQUIRED) + find_package(KF5Crash ${KF_DEP_VERSION} REQUIRED) +-find_package(KF5DesignerPlugin ${KF_DEP_VERSION} REQUIRED) + find_package(KF5GlobalAccel ${KF_DEP_VERSION} REQUIRED) + find_package(KF5DocTools ${KF_DEP_VERSION} REQUIRED) + find_package(KF5Emoticons ${KF_DEP_VERSION} REQUIRED) +diff --git a/KF5KDELibs4SupportConfig.cmake.in b/KF5KDELibs4SupportConfig.cmake.in +index 3de7d530..4fe2369e 100644 +--- a/KF5KDELibs4SupportConfig.cmake.in ++++ b/KF5KDELibs4SupportConfig.cmake.in +@@ -11,7 +11,6 @@ find_dependency(KF5Archive "@KF_DEP_VERSION@") + find_dependency(KF5ConfigWidgets "@KF_DEP_VERSION@") + find_dependency(KF5CoreAddons "@KF_DEP_VERSION@") + find_dependency(KF5Crash "@KF_DEP_VERSION@") +-find_dependency(KF5DesignerPlugin "@KF_DEP_VERSION@") + find_dependency(KF5DocTools "@KF_DEP_VERSION@") + find_dependency(KF5Emoticons "@KF_DEP_VERSION@") + find_dependency(KF5GuiAddons "@KF_DEP_VERSION@") +diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake +index 7e252a70..b9636036 100644 +--- a/cmake/modules/FindKDE4Internal.cmake ++++ b/cmake/modules/FindKDE4Internal.cmake +@@ -179,10 +179,6 @@ + # Use optional USE_RELATIVE_PATH to generate the classes in the build following the given + # relative path to the file. + # +-# KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets) +-# Use this to add widget description files for the makekdewidgets code generator +-# for Qt Designer plugins. +-# + # KDE4_ADD_PLUGIN ( name [WITH_PREFIX] file1 ... fileN ) + # Create a KDE plugin (KPart, kioslave, etc.) from the given source files. + # If WITH_PREFIX is given, the resulting plugin will have the prefix "lib", otherwise it won't. +diff --git a/cmake/modules/KDE4Macros.cmake b/cmake/modules/KDE4Macros.cmake +index ca868ad9..27bb28f9 100644 +--- a/cmake/modules/KDE4Macros.cmake ++++ b/cmake/modules/KDE4Macros.cmake +@@ -10,7 +10,6 @@ + # KDE4_ADD_KDEINIT_EXECUTABLE + # KDE4_ADD_UNIT_TEST + # KDE4_ADD_EXECUTABLE +-# KDE4_ADD_WIDGET_FILES + # KDE4_UPDATE_ICONCACHE + # KDE4_INSTALL_ICONS + # KDE4_REMOVE_OBSOLETE_CMAKE_FILES +@@ -486,7 +485,6 @@ include("${KF5Auth_DIR}/KF5AuthMacros.cmake") + include("${CMAKE_CURRENT_LIST_DIR}/KDECoreMacros.cmake") + include("${CMAKE_CURRENT_LIST_DIR}/KDEUIMacros.cmake") + include("${KF5DocTools_DIR}/KF5DocToolsMacros.cmake") +-include("${KF5DesignerPlugin_DIR}/KF5DesignerPluginMacros.cmake") + + # functions deprecated, they still should work + macro (KDE4_AUTH_INSTALL_ACTIONS) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index cb8a3c2d..70829dd6 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -371,25 +371,6 @@ set_target_properties(KF5KDELibs4Support PROPERTIES + ) + + +-########## Designer plugin +- +-kf5designerplugin_add_plugin(kf5deprecatedwidgets +- kdedeprecated.widgets +- kdedeprecated.qrc +- classpreviews.cpp +-) +- +-target_link_libraries(kf5deprecatedwidgets KF5::KDELibs4Support +- Qt5::Widgets +- Qt5::Designer +- KF5::ConfigCore +- KF5::Completion +- KF5::WidgetsAddons +- KF5::Auth +- ) +- +-install(TARGETS kf5deprecatedwidgets DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/designer) +- + ########## + + add_subdirectory(pics) +diff --git a/src/KDEUIMacros.cmake b/src/KDEUIMacros.cmake +index 1570df34..e255960d 100644 +--- a/src/KDEUIMacros.cmake ++++ b/src/KDEUIMacros.cmake +@@ -163,31 +163,6 @@ macro (KDE4_INSTALL_ICONS _defaultpath ) + endmacro (KDE4_INSTALL_ICONS) + + +-set(KDEWIDGETS_MAKEKDEWIDGETS_EXECUTABLE ${KF5DESIGNERPLUGIN_GENERATOR_EXECUTABLE}) +-set(_KDE4_MAKEKDEWIDGETS_DEP ${_KF5DESIGNERPLUGIN_GENERATOR_EXECUTABLE_DEP}) +-macro (KDE4_ADD_WIDGET_FILES _sources) +- foreach (_current_FILE ${ARGN}) +- +- get_filename_component(_input ${_current_FILE} ABSOLUTE) +- get_filename_component(_basename ${_input} NAME_WE) +- set(_source ${CMAKE_CURRENT_BINARY_DIR}/${_basename}widgets.cpp) +- set(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}widgets.moc) +- +- # create source file from the .widgets file +- add_custom_command(OUTPUT ${_source} +- COMMAND ${KDEWIDGETS_MAKEKDEWIDGETS_EXECUTABLE} +- ARGS -o ${_source} ${_input} +- MAIN_DEPENDENCY ${_input} DEPENDS ${_KDE4_MAKEKDEWIDGETS_DEP}) +- +- # create moc file +- qt5_generate_moc(${_source} ${_moc} ) +- +- list(APPEND ${_sources} ${_source} ${_moc}) +- +- endforeach (_current_FILE) +- +-endmacro (KDE4_ADD_WIDGET_FILES) +- + # adds application icon to target source list + # 'appsources' - the sources of the application + # 'pngfiles' - specifies the list of icon files +-- +2.30.0 diff --git a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.86.0-unused-dep.patch b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.86.0-unused-dep.patch new file mode 100644 index 0000000..8614a84 --- /dev/null +++ b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.86.0-unused-dep.patch @@ -0,0 +1,51 @@ +From b51d32df6a89e559871469178de1c6fd8c8a2882 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sun, 22 Nov 2020 00:27:55 +0100 +Subject: [PATCH 2/2] Drop Qt5Designer dependency + +Signed-off-by: Andreas Sturmlechner +--- + CMakeLists.txt | 2 +- + cmake/modules/ECMQt4To5Porting.cmake | 1 - + cmake/modules/FindQt5Transitional.cmake | 1 - + 3 files changed, 1 insertion(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2a432591..e503999d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -20,7 +20,7 @@ include(GenerateExportHeader) + include(CMakeFindFrameworks) + + set(REQUIRED_QT_VERSION 5.15.2) +-find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network Widgets DBus Test Svg PrintSupport Designer) ++find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network Widgets DBus Test Svg PrintSupport) + + find_package(KF5Completion ${KF_DEP_VERSION} REQUIRED) + find_package(KF5Config ${KF_DEP_VERSION} REQUIRED) +diff --git a/cmake/modules/ECMQt4To5Porting.cmake b/cmake/modules/ECMQt4To5Porting.cmake +index 4204fa54..01b8f995 100644 +--- a/cmake/modules/ECMQt4To5Porting.cmake ++++ b/cmake/modules/ECMQt4To5Porting.cmake +@@ -160,7 +160,6 @@ set(_qt_modules + DBus + Network + Test +- Designer + Concurrent + Xml + UiTools +diff --git a/cmake/modules/FindQt5Transitional.cmake b/cmake/modules/FindQt5Transitional.cmake +index df354fc6..68fa6d47 100644 +--- a/cmake/modules/FindQt5Transitional.cmake ++++ b/cmake/modules/FindQt5Transitional.cmake +@@ -6,7 +6,6 @@ if (Qt5Core_FOUND) + Core + Gui + DBus +- Designer + Declarative + Script + ScriptTools +-- +2.30.0 diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.116.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.116.0.ebuild new file mode 100644 index 0000000..6f0321b --- /dev/null +++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.116.0.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="true" +ECM_HANDBOOK_DIR="docs" +ECM_QTHELP="false" +PVCUT=$(ver_cut 1-2) +QTMIN=5.15.9 +inherit ecm frameworks.kde.org + +DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5" + +LICENSE="LGPL-2+" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="networkmanager X" + +RESTRICT="test" + +COMMON_DEPEND=" + app-text/docbook-xml-dtd:4.2 + dev-libs/openssl:0 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5[ssl] + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qttest-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + =kde-frameworks/kauth-${PVCUT}*:5 + =kde-frameworks/kcodecs-${PVCUT}*:5 + =kde-frameworks/kcompletion-${PVCUT}*:5 + =kde-frameworks/kconfig-${PVCUT}*:5 + =kde-frameworks/kconfigwidgets-${PVCUT}*:5 + =kde-frameworks/kcoreaddons-${PVCUT}*:5 + =kde-frameworks/kcrash-${PVCUT}*:5 + =kde-frameworks/kdbusaddons-${PVCUT}*:5 + >=kde-frameworks/kded-${PVCUT}:5 + =kde-frameworks/kdoctools-${PVCUT}*:5 + =kde-frameworks/kemoticons-${PVCUT}*:5 + =kde-frameworks/kglobalaccel-${PVCUT}*:5 + =kde-frameworks/kguiaddons-${PVCUT}*:5 + =kde-frameworks/ki18n-${PVCUT}*:5 + =kde-frameworks/kiconthemes-${PVCUT}*:5 + =kde-frameworks/kio-${PVCUT}*:5 + =kde-frameworks/kitemviews-${PVCUT}*:5 + =kde-frameworks/kjobwidgets-${PVCUT}*:5 + =kde-frameworks/knotifications-${PVCUT}*:5[X?] + =kde-frameworks/kparts-${PVCUT}*:5 + =kde-frameworks/kservice-${PVCUT}*:5 + =kde-frameworks/ktextwidgets-${PVCUT}*:5 + =kde-frameworks/kunitconversion-${PVCUT}*:5 + =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 + =kde-frameworks/kwindowsystem-${PVCUT}*:5[X?] + =kde-frameworks/kxmlgui-${PVCUT}*:5 + =kde-frameworks/solid-${PVCUT}*:5 + virtual/libintl + networkmanager? ( net-misc/networkmanager ) + X? ( + >=dev-qt/qtx11extras-${QTMIN}:5 + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libxcb + ) +" +DEPEND="${COMMON_DEPEND} + test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 ) + X? ( x11-base/xorg-proto ) +" +RDEPEND="${COMMON_DEPEND} + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/countryflags-${PVCUT}:5 + =kde-frameworks/kinit-${PVCUT}*:5 + =kde-frameworks/kitemmodels-${PVCUT}*:5 +" +BDEPEND=" + dev-lang/perl + dev-perl/URI +" + +PATCHES=( + # downstream patches + "${FILESDIR}/${PN}-5.80.0-no-kdesignerplugin.patch" # bug 755956 + "${FILESDIR}/${PN}-5.86.0-unused-dep.patch" # bug 755956 + "${FILESDIR}/${PN}-5.116.0-libressl.patch" +) + +src_prepare() { + ecm_src_prepare + + if ! use handbook; then + sed -e "/kdoctools_install/ s/^/#DONT/" -i CMakeLists.txt || die + fi + + cmake_run_in src cmake_comment_add_subdirectory l10n +} + +src_configure() { + local mycmakeargs=( + -DWITH_X11=$(usex X) + $(cmake_use_find_package networkmanager NetworkManager) + ) + + ecm_src_configure +} diff --git a/kde-frameworks/kdelibs4support/metadata.xml b/kde-frameworks/kdelibs4support/metadata.xml new file mode 100644 index 0000000..506ecf6 --- /dev/null +++ b/kde-frameworks/kdelibs4support/metadata.xml @@ -0,0 +1,16 @@ + + + + + kde@gentoo.org + Gentoo KDE Project + + + https://bugs.kde.org/ + + + + Must only be used by packages that are known to use private parts of the Frameworks API. + + + -- cgit v1.2.3-65-gdbad