diff options
author | Saki Xi <space_raccoon@riseup.net> | 2022-11-30 14:05:21 +0100 |
---|---|---|
committer | Quentin Retornaz <gentoo@retornaz.com> | 2022-12-01 19:18:06 +0100 |
commit | 9e7b1f3cab6b925b1a12f1a7a034af7a6e24ea55 (patch) | |
tree | 3325f2f9d3d8729a9d464d955d242f682aac9155 /kde-frameworks/kdelibs4support | |
parent | Bump qca, use same patch (diff) | |
download | libressl-9e7b1f3cab6b925b1a12f1a7a034af7a6e24ea55.tar.gz libressl-9e7b1f3cab6b925b1a12f1a7a034af7a6e24ea55.tar.bz2 libressl-9e7b1f3cab6b925b1a12f1a7a034af7a6e24ea55.zip |
Include patches from OpenBSD to build with 3.6.1
Signed-off-by: Saki Xi <space_raccoon@riseup.net>
Closes: https://github.com/gentoo/libressl/pull/477
Signed-off-by: Quentin Retornaz <gentoo@retornaz.com>
Diffstat (limited to 'kde-frameworks/kdelibs4support')
10 files changed, 789 insertions, 0 deletions
diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest new file mode 100644 index 0000000..751334a --- /dev/null +++ b/kde-frameworks/kdelibs4support/Manifest @@ -0,0 +1,12 @@ +AUX kdelibs4support-5.80.0-no-kdesignerplugin.patch 5689 BLAKE2B 74771136992074f7e39eb110d7b838ed6ff3bb34ca8b44242d57359b3efc4bebde8ae615b27df31cba42d14349697ba303b3aa20b09c1d83d044cff2cd6700f0 SHA512 2a7a1c05c6ef7f440ca84eef7b65f65f92d780fa411301e2a8554115717cbe543127e1878ae5642f07f7ddcae4a62ed075468f85e7c7cdb13992b4bada270bff +AUX kdelibs4support-5.86.0-unused-dep.patch 1693 BLAKE2B b310444effa8bf0a2a203cdc7e427ade52caceabc77b1dce96cbc739443c9d8429c2f1186f3d1e5180a0b8ef6323ea805a040ded435b2a0a3abdcef0e4dceee9 SHA512 bf7637791517739ebfa296beb91f3873d21165c4760374df8972fa75f237dfefb24cac7ea7895f359dcf368a18f974005b83646f9ba3cd6891ba6181880a4a6a +AUX kdelibs4support-5.99.0-with_x11.patch 3483 BLAKE2B ab24a33b62d9221c9b6583d62273e3c641c2ceadc9db57cce6133c8a5d2351b804907c98f549d3ba957c3a2aa1a6104b85c188e87f271818c3f286572ce69487 SHA512 cb234fb1cc0f97e97a490c936b72f9121b6827f28d2ed8aa8886eb369f2ecad7be9ddf82c4cba4b158516d1e7f11b8361b8d101147fc893303642abbc3c0b0d2 +AUX kdelibs4support-kssl_certificate-0.96.0.patch 518 BLAKE2B 0fb34a66acba06cfd68cd46e7e9930c68b70e0e590048630f6cee3933144446dbe573c23c736a38db3b3a09816a8bd9a071d71b02f10d300063bd488a905fdea SHA512 d8e13f187053caedd592a76e3f1487c1e27ee164001cfa2572a6a484b57141527fa45c6826c265f056ea0824457e00b710b208e0b9a50ffa7863ff128caaed7e +AUX kdelibs4support-kssl_openssl-5.96.0.patch 5847 BLAKE2B 9c240dcf65155193c29a3eb745bc1b2e7aaa92e997668171f474e0d3f378ebd0fcc069718270815dec4c9270364be5b420bea888507c7c91a9c3f70ccd04b261 SHA512 a334c5e84b1fd262d59f21238ee6bde5d2ed0b7d3e73632b24e0859ca54abea2b270e0c79bd35e61d5ed46a94ab57d80002bf6a9c5f134ba78233d0ab9094de1 +DIST kdelibs4support-5.100.0.tar.xz 3719636 BLAKE2B 83665e6f4d6f42a30ccd3a607037f49f85719f9313c4b819a1c577e5e49608918661e9610ec6030e783ed20378d1137f0c893805f3a51b4cead074bd9b444af2 SHA512 4ba555cb329ec04857d2bb23173999673e27830346557666c4a9b5a8db1b01c39575dc148f9cdc6537ece325ee0398a5bb25315456e3c579e7b467cff48930e6 +DIST kdelibs4support-5.96.0.tar.xz 3657280 BLAKE2B 5450ad4aced1e73b68dab9ce5f858f65765b96d98b2d977a796d13f148f31e8cb6d2562713569b4694afa163e3fac2d93ee94e6bd1592710e1141e6095320761 SHA512 25d80c003b6cc661058d24e3af4b9ef43c05029375c74ea2aedd1b4cbb8a09896404d2e2cb4eca884ad091f7d26b9afebd1a0ff13c96b9d793c40880300fb59d +DIST kdelibs4support-5.99.0.tar.xz 3667732 BLAKE2B 371b9b96e1f99424d85034d20c79759b0d2a4796ed3771626c2623f9732b37d0f02451c44e9e42e78eddd211f6c4f24c3b0dfa20f21181d17124af28583299e9 SHA512 06716965e50d0adbfe57f3024045ee7f60b62f0ee9910e0ebcf92cf0592434631fae45d5be6ee4e91fdc9ca384bfedbedb9fb3c32acd09b81ce5ee37695f2676 +EBUILD kdelibs4support-5.100.0.ebuild 2759 BLAKE2B 72402920454e636ed571ee78e84c9394076d6657e3aa2b2584f27c2278371d971b0eb2b99f941dd42216d84a1e0f8f89e29ce858a7eae3e54431473c976e9bf7 SHA512 ffc34502889973cec51e2d2c98f59234c6d42789e095947e9e0f7db01ac8d81153a655a9fa46235764fc216d0a796b608b6c4b9b818de1a3e454885e2cd9d679 +EBUILD kdelibs4support-5.96.0.ebuild 2738 BLAKE2B a646845d9e016f0f4f94e2882bd72d93febf6ccb562fba65f7c6f67d180ea40fc7c5296212811c350877f7f03dfbaa10cee79b086670818a623ee142b8aef1d0 SHA512 6fc0f93a159a7e46d18de45d566bead2042201182fccdcd2591e21bda452450d2eb2f32f479764f6592701befdc6e7206c687e3b48ceffc9199e8de602253f48 +EBUILD kdelibs4support-5.99.0.ebuild 2887 BLAKE2B d391a25f9498866ae59a52b56b49be63d035418f0de7a2a92d7e1eb919a1e07e0a3735cf5eae6d6d4f8556e523d3f1cd67748c4cae605b71ff24f53b92fe6083 SHA512 3d92db0f0240d48accbe3271db53a5be1ce54b04b0493c7d0f9bda9f94f76c54f520a25a8595fbf4d131f8a6d0520b2781ae2088d1562545f1a99dd764f5694b +MISC metadata.xml 476 BLAKE2B b4f3d33a4c4782267b4627a9de144e69274b3956f55d14335f2d0b22d4da63c4e3ee3581c4e908a2a60e7c01d91c2a39b7f75b856d6edb6d19c11cc7ca2a7e6b SHA512 b1c0cd7cb7b442dc75ba5972685060012ae220c3324511c4f65511547df15cd8f159db46f954ff8bd1d443505b88ff5db30ac4927d32f4c4006eb476bfe3279d 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 <asturm@gentoo.org> +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 <asturm@gentoo.org> +--- + 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 <asturm@gentoo.org> +Date: Sun, 22 Nov 2020 00:27:55 +0100 +Subject: [PATCH 2/2] Drop Qt5Designer dependency + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + 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/files/kdelibs4support-5.99.0-with_x11.patch b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.99.0-with_x11.patch new file mode 100644 index 0000000..24bcb1b --- /dev/null +++ b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.99.0-with_x11.patch @@ -0,0 +1,98 @@ +From 026571f37c990007be3d7e536b335c19ab98009e Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Sat, 6 Aug 2022 11:16:00 +0200 +Subject: [PATCH] Add CMake option to build WITH_X11 + +We want to be able to build without X11 support even if some of the used +libraries may not work w/o X11 themselves yet or need to be built with +X11 support for other reverse dependencies. + +HAVE_X11 already exists and is set automagically so far, but using +-DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11 +as required in their cmake config. This is a behavior change as previously +it was silently disabled if X11 was not found. + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + CMakeLists.txt | 18 +++++++++++------- + src/CMakeLists.txt | 6 +++--- + tests/CMakeLists.txt | 2 +- + 3 files changed, 15 insertions(+), 11 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f577df45..378d23d4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -51,14 +51,18 @@ if(WIN32) + endif() + + if (NOT APPLE AND NOT WIN32) +- find_package(X11) ++ option(WITH_X11 "Build with X11 integration and session management" ON) ++ if(WITH_X11) ++ find_package(X11) ++ set(HAVE_X11 ${X11_FOUND}) ++ if (HAVE_X11) ++ add_feature_info("X11 Session Management (libSM)" X11_SM_FOUND "Support for session management in KApplication") ++ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras) ++ find_package(XCB REQUIRED COMPONENTS XCB) ++ endif() ++ endif() + endif() +-set(HAVE_X11 ${X11_FOUND}) +-if (HAVE_X11) +- add_feature_info("X11 Session Management (libSM)" X11_SM_FOUND "Support for session management in KApplication") +- find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras) +- find_package(XCB REQUIRED COMPONENTS XCB) +-endif () ++ + if (APPLE) + cmake_find_frameworks(CoreFoundation) + endif () +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 2096b355..4649a9d5 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -226,7 +226,7 @@ if (NOT KIO_NO_NEPOMUK) + ) + endif () + +-if (X11_FOUND) ++if (HAVE_X11) + set(libkdelibs4support_SRCS ${libkdelibs4support_SRCS} kdeui/kxerrorhandler.cpp ) + list(APPEND libkdelibs4support_OPTIONAL_LIBS Qt5::X11Extras ${X11_LIBRARIES}) + endif () +@@ -312,7 +312,7 @@ set(platformLinkLibraries) + if (APPLE) + set(platformLinkLibraries "-framework CoreFoundation -framework Carbon -lresolv") + endif() +-if (X11_FOUND) ++if (HAVE_X11) + set(platformLinkLibraries ${XCB_XCB_LIBRARY}) + endif() + +@@ -545,7 +545,7 @@ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/all_languages DESTINATION ${KDE_INSTA + install( FILES kdeui/40.colors kdeui/Oxygen.colors kdeui/Web.colors kdeui/Royal.colors kdeui/Rainbow.colors + DESTINATION ${KDE_INSTALL_CONFDIR}/colors) + +-if (NOT X11_FOUND) ++if (NOT HAVE_X11) + # install our copy of the rgb.txt named colors list on systems without X11 + install(FILES kdeui/rgb.txt DESTINATION ${KDE_INSTALL_DATADIR_KF5}/kdeui) + endif () +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 53f870ff..db4b28db 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -63,7 +63,7 @@ target_link_libraries(networkingservice KF5::KDELibs4Support) + + ###### kxerrorhandlertest ##### + +-if (X11_FOUND) ++if (HAVE_X11) + find_package(Qt5X11Extras ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) + kdelibs4support_examples( kxerrorhandlertest ) + +-- +2.35.1 + diff --git a/kde-frameworks/kdelibs4support/files/kdelibs4support-kssl_certificate-0.96.0.patch b/kde-frameworks/kdelibs4support/files/kdelibs4support-kssl_certificate-0.96.0.patch new file mode 100644 index 0000000..c139c30 --- /dev/null +++ b/kde-frameworks/kdelibs4support/files/kdelibs4support-kssl_certificate-0.96.0.patch @@ -0,0 +1,12 @@ +Index: src/kssl/ksslcertificate.cpp +--- a/src/kssl/ksslcertificate.cpp.orig ++++ b/src/kssl/ksslcertificate.cpp +@@ -1222,7 +1222,7 @@ QByteArray KSSLCertificate::toNetscape() + { + QByteArray qba; + // no equivalent in OpenSSL 1.1.0 (?), so behave as if we had no OpenSSL at all +-#if KSSL_HAVE_SSL && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) ++#if KSSL_HAVE_SSL && (OPENSSL_VERSION_NUMBER < 0x10100000L) + NETSCAPE_X509 nx; + ASN1_OCTET_STRING hdr; + QTemporaryFile ktf; diff --git a/kde-frameworks/kdelibs4support/files/kdelibs4support-kssl_openssl-5.96.0.patch b/kde-frameworks/kdelibs4support/files/kdelibs4support-kssl_openssl-5.96.0.patch new file mode 100644 index 0000000..a43267b --- /dev/null +++ b/kde-frameworks/kdelibs4support/files/kdelibs4support-kssl_openssl-5.96.0.patch @@ -0,0 +1,138 @@ +Index: src/kssl/kopenssl.cpp +--- a/src/kssl/kopenssl.cpp.orig ++++ b/src/kssl/kopenssl.cpp +@@ -269,7 +269,7 @@ static QString findMostRecentLib(QString dir, QString + QString best = 0L; + // where do we start + uint s = filter.length() - 1; +- for (QStringList::const_iterator it = l.begin(); it != l.end(); ++it) { ++ for (QStringList::iterator it = l.begin(); it != l.end(); ++it) { + QString numberpart = (*it).mid(s); + uint endmaj = numberpart.indexOf('.'); + if (endmaj == -1) { +@@ -484,7 +484,7 @@ KOpenSSLProxy::KOpenSSLProxy() + K_X509_STORE_CTX_get_current_cert = (X509 * (*)(X509_STORE_CTX *)) d->cryptoLib->resolve("X509_STORE_CTX_get_current_cert"); + K_X509_STORE_CTX_set_error = (void (*)(X509_STORE_CTX *, int)) d->cryptoLib->resolve("X509_STORE_CTX_set_error"); + K_X509_STORE_CTX_get_error = (int (*)(X509_STORE_CTX *)) d->cryptoLib->resolve("X509_STORE_CTX_get_error"); +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + K_OPENSSL_sk_free = (void (*)(STACK *)) d->cryptoLib->resolve("OPENSSL_sk_free"); + K_OPENSSL_sk_num = (int (*)(STACK *)) d->cryptoLib->resolve("OPENSSL_sk_num"); + K_OPENSSL_sk_pop = (char *(*)(STACK *)) d->cryptoLib->resolve("OPENSSL_sk_pop"); +@@ -978,7 +978,7 @@ void KOpenSSLProxy::X509_STORE_free(X509_STORE *v) + + void KOpenSSLProxy::X509_STORE_set_verify_cb(X509_STORE *store, int (*verify_cb)(int, X509_STORE_CTX *)) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + X509_STORE_set_verify_cb_func(store, verify_cb); + #else + if (K_X509_STORE_set_verify_cb) { +@@ -1043,7 +1043,7 @@ X509_NAME *KOpenSSLProxy::X509_get_issuer_name(X509 *a + + void KOpenSSLProxy::X509_get0_signature(const ASN1_BIT_STRING **psig, const X509_ALGOR **algor, const X509 *x) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + if (psig) { + *psig = x->signature; + } +@@ -1121,7 +1121,7 @@ X509 *KOpenSSLProxy::X509_dup(X509 *x509) + + ASN1_TIME *KOpenSSLProxy::X509_getm_notBefore(const X509 *x) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + return X509_get_notBefore(x); + #else + if (K_X509_getm_notBefore) { +@@ -1134,7 +1134,7 @@ ASN1_TIME *KOpenSSLProxy::X509_getm_notBefore(const X5 + + ASN1_TIME *KOpenSSLProxy::X509_getm_notAfter(const X509 *x) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + return X509_get_notAfter(x); + #else + if (K_X509_getm_notAfter) { +@@ -1412,7 +1412,7 @@ void KOpenSSLProxy::X509_STORE_CTX_set_purpose(X509_ST + + X509 *KOpenSSLProxy::X509_STORE_CTX_get_current_cert(X509_STORE_CTX *v) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + return v->current_cert; + #else + if (K_X509_STORE_CTX_get_current_cert) { +@@ -1425,7 +1425,7 @@ X509 *KOpenSSLProxy::X509_STORE_CTX_get_current_cert(X + + void KOpenSSLProxy::X509_STORE_CTX_set_error(X509_STORE_CTX *v, int error) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + v->error = error; + #else + if (K_X509_STORE_CTX_set_error) { +@@ -1436,7 +1436,7 @@ void KOpenSSLProxy::X509_STORE_CTX_set_error(X509_STOR + + int KOpenSSLProxy::X509_STORE_CTX_get_error(X509_STORE_CTX *v) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + return v->error; + #else + if (K_X509_STORE_CTX_get_error) { +@@ -1893,7 +1893,7 @@ int KOpenSSLProxy::EVP_PKEY_assign(EVP_PKEY *pkey, int + + int KOpenSSLProxy::EVP_PKEY_base_id(EVP_PKEY *pkey) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + return pkey->type; + #else + if (K_EVP_PKEY_base_id) { +@@ -1906,7 +1906,7 @@ int KOpenSSLProxy::EVP_PKEY_base_id(EVP_PKEY *pkey) + + RSA *KOpenSSLProxy::EVP_PKEY_get0_RSA(EVP_PKEY *pkey) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + return pkey->pkey.rsa; + #else + if (K_EVP_PKEY_get0_RSA) { +@@ -1919,7 +1919,7 @@ RSA *KOpenSSLProxy::EVP_PKEY_get0_RSA(EVP_PKEY *pkey) + + void KOpenSSLProxy::RSA_get0_key(RSA *rsa, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + if (n) { + *n = rsa->n; + } +@@ -1938,7 +1938,7 @@ void KOpenSSLProxy::RSA_get0_key(RSA *rsa, const BIGNU + + DSA *KOpenSSLProxy::EVP_PKEY_get0_DSA(EVP_PKEY *pkey) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + return pkey->pkey.dsa; + #else + if (K_EVP_PKEY_get0_DSA) { +@@ -1951,7 +1951,7 @@ DSA *KOpenSSLProxy::EVP_PKEY_get0_DSA(EVP_PKEY *pkey) + + void KOpenSSLProxy::DSA_get0_pqg(DSA *dsa, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + if (p) { + *p = dsa->p; + } +@@ -1970,7 +1970,7 @@ void KOpenSSLProxy::DSA_get0_pqg(DSA *dsa, const BIGNU + + void KOpenSSLProxy::DSA_get0_key(DSA *dsa, const BIGNUM **pub_key, const BIGNUM **priv_key) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + if (pub_key) { + *pub_key = dsa->pub_key; + } diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.100.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.100.0.ebuild new file mode 100644 index 0000000..c42ff79 --- /dev/null +++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.100.0.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="true" +ECM_QTHELP="false" +PVCUT=$(ver_cut 1-2) +QTMIN=5.15.5 +VIRTUALX_REQUIRED="test" +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="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 + 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}-kssl_certificate-0.96.0.patch" + "${FILESDIR}/${PN}-kssl_openssl-5.96.0.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) + ) + + ecm_src_configure +} diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.96.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.96.0.ebuild new file mode 100644 index 0000000..b46adb8 --- /dev/null +++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.96.0.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="true" +ECM_QTHELP="false" +PVCUT=$(ver_cut 1-2) +QTMIN=5.15.4 +VIRTUALX_REQUIRED="test" +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="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 + 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=( + "${FILESDIR}/${PN}-5.80.0-no-kdesignerplugin.patch" # bug 755956 + "${FILESDIR}/${PN}-5.86.0-unused-dep.patch" # bug 755956 + "${FILESDIR}/${PN}-kssl_certificate-0.96.0.patch" + "${FILESDIR}/${PN}-kssl_openssl-5.96.0.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=( + $(cmake_use_find_package X X11) + ) + + ecm_src_configure +} diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.99.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.99.0.ebuild new file mode 100644 index 0000000..383b90d --- /dev/null +++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.99.0.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="true" +ECM_QTHELP="false" +PVCUT=$(ver_cut 1-2) +QTMIN=5.15.5 +VIRTUALX_REQUIRED="test" +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="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 + 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 + # pending upstream: + # https://invent.kde.org/frameworks/kdelibs4support/-/merge_requests/21 + "${FILESDIR}/${P}-with_x11.patch" + "${FILESDIR}/${PN}-kssl_certificate-0.96.0.patch" + "${FILESDIR}/${PN}-kssl_openssl-5.96.0.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) + ) + + ecm_src_configure +} diff --git a/kde-frameworks/kdelibs4support/metadata.xml b/kde-frameworks/kdelibs4support/metadata.xml new file mode 100644 index 0000000..f0d8686 --- /dev/null +++ b/kde-frameworks/kdelibs4support/metadata.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>kde@gentoo.org</email> + <name>Gentoo KDE Project</name> + </maintainer> + <upstream> + <bugs-to>https://github.com/gentoo/libressl/issues</bugs-to> + </upstream> + <slots> + <subslots> + Must only be used by packages that are known to use private parts of the Frameworks API. + </subslots> + </slots> +</pkgmetadata> |