mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 19:50:05 +02:00
KDE frameworks, bump to 6.25.0 part6 (#13944)
This commit is contained in:
@@ -4,11 +4,11 @@ It's comprises two parts: a library used by the C++ part of your application \
|
||||
to intergrate QML with KDE Frameworks specific features, and a series of QML \
|
||||
imports that offer bindings to some of the Frameworks."
|
||||
HOMEPAGE="https://invent.kde.org/frameworks/kdeclarative"
|
||||
COPYRIGHT="2010-2025 KDE Organisation"
|
||||
COPYRIGHT="2010-2026 KDE Organisation"
|
||||
LICENSE="GNU LGPL v2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kdeclarative-${portVersion}.tar.xz"
|
||||
CHECKSUM_SHA256="0c71a9a08f447b20fa06be836d059b2cd4791e972e279d99464e2dd0dbff7a90"
|
||||
CHECKSUM_SHA256="7692ccdffd55826976e916927b59aeb2d24a77b16af967fb265e9fe0cde387fa"
|
||||
SOURCE_DIR="kdeclarative-$portVersion"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
@@ -20,11 +20,11 @@ ensure that it has not missed any update files. kconf_update keeps track of \
|
||||
which update files have been processed already in the config-file \
|
||||
kconf_updaterc. It only performs a certain update once."
|
||||
HOMEPAGE="https://invent.kde.org/frameworks/kded"
|
||||
COPYRIGHT="2010-2025 KDE Organisation"
|
||||
COPYRIGHT="2010-2026 KDE Organisation"
|
||||
LICENSE="GNU LGPL v2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kded-${portVersion}.tar.xz"
|
||||
CHECKSUM_SHA256="9c5a04227bf63f36c878b7e6925476c8c805acbdb543b8a6c14c35de46a0bc02"
|
||||
CHECKSUM_SHA256="030cc827c37b490a2181e120cd831b73c9a7683a87cf55d0d5b334059f78c590"
|
||||
SOURCE_DIR="kded-$portVersion"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
89
kde-frameworks/kdesu/kdesu-5.115.0.recipe
Normal file
89
kde-frameworks/kdesu/kdesu-5.115.0.recipe
Normal file
@@ -0,0 +1,89 @@
|
||||
SUMMARY="User interface for running shell commands with root privileges"
|
||||
DESCRIPTION="KDESU provides functionality for building GUI front ends for (password asking) \
|
||||
console mode programs. For example, kdesu and kdessh use it to interface with su and ssh \
|
||||
respectively."
|
||||
HOMEPAGE="https://invent.kde.org/frameworks/kdesu"
|
||||
COPYRIGHT="2010-2024 KDE Organisation"
|
||||
LICENSE="GNU LGPL v2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="$HOMEPAGE/-/archive/v$portVersion/kdesu-v$portVersion.tar.bz2"
|
||||
CHECKSUM_SHA256="5e163e989e0d13851f059ce9315475df6bb83b4b1b887038867d121af1fc637f"
|
||||
SOURCE_DIR="kdesu-v$portVersion"
|
||||
PATCHES="kdesu-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
libVersion="$portVersion"
|
||||
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
|
||||
|
||||
PROVIDES="
|
||||
kdesu$secondaryArchSuffix = $portVersion
|
||||
lib:libKF5Su$secondaryArchSuffix = $libVersionCompat
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libKF5ConfigCore$secondaryArchSuffix
|
||||
lib:libKF5CoreAddons$secondaryArchSuffix
|
||||
lib:libKF5I18n$secondaryArchSuffix
|
||||
lib:libKF5Pty$secondaryArchSuffix
|
||||
lib:libQt5Core$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
kdesu${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libKF5Su$secondaryArchSuffix = $libVersionCompat
|
||||
"
|
||||
REQUIRES_devel="
|
||||
kdesu$secondaryArchSuffix == $portVersion base
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
extra_cmake_modules$secondaryArchSuffix >= $portVersion
|
||||
devel:libKF5ConfigCore$secondaryArchSuffix == $portVersion
|
||||
devel:libKF5CoreAddons$secondaryArchSuffix == $portVersion
|
||||
devel:libKF5I18n$secondaryArchSuffix == $portVersion
|
||||
devel:libKF5Pty$secondaryArchSuffix == $portVersion
|
||||
devel:libQt5Core$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:cmake
|
||||
cmd:g++$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:msgfmt
|
||||
cmd:msgmerge
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
cmd:qdbuscpp2xml$secondaryArchSuffix >= 5
|
||||
"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
cmake -Bbuild -S. $cmakeDirArgs \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt5/mkspecs \
|
||||
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
|
||||
-DBUILD_TESTING=OFF \
|
||||
-DKDESU_USE_SUDO_DEFAULT=OFF
|
||||
make -C build $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make -C build install
|
||||
|
||||
prepareInstalledDevelLib \
|
||||
libKF5Su
|
||||
|
||||
packageEntries devel \
|
||||
$developDir \
|
||||
$dataDir/Qt5/mkspecs \
|
||||
$libDir/cmake
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
# 50% tests passed, 1 tests failed out of 2
|
||||
export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}"
|
||||
make -C build test
|
||||
}
|
||||
@@ -3,13 +3,13 @@ DESCRIPTION="KDESU provides functionality for building GUI front ends for (passw
|
||||
console mode programs. For example, kdesu and kdessh use it to interface with su and \
|
||||
ssh respectively."
|
||||
HOMEPAGE="https://invent.kde.org/frameworks/kdesu"
|
||||
COPYRIGHT="2010-2025 KDE Organisation"
|
||||
COPYRIGHT="2010-2026 KDE Organisation"
|
||||
LICENSE="GNU LGPL v2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kdesu-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="02f92edf906a397b05554ff4bd671cd7f5ac6c2cef56732541a2c27cc03d209f"
|
||||
CHECKSUM_SHA256="09ad4bf5fe7abae40884f8b645b22948cd00f418c7d643a0b5d505a02ef6f634"
|
||||
SOURCE_DIR="kdesu-$portVersion"
|
||||
PATCHES="kdesu-$portVersion.patchset"
|
||||
PATCHES="kdesu6-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
105
kde-frameworks/kdesu/patches/kdesu-5.115.0.patchset
Normal file
105
kde-frameworks/kdesu/patches/kdesu-5.115.0.patchset
Normal file
@@ -0,0 +1,105 @@
|
||||
From 1b0ffaca707005b8ef321bb9d9ec31212be49fe3 Mon Sep 17 00:00:00 2001
|
||||
From: Begasus <begasus@gmail.com>
|
||||
Date: Thu, 11 Jan 2024 12:36:21 +0100
|
||||
Subject: build fixes
|
||||
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index e166889..93d4c57 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -69,6 +69,7 @@ target_link_libraries(KF5Su
|
||||
PRIVATE
|
||||
KF5::CoreAddons # KUser::loginName
|
||||
KF5::ConfigCore # KConfigGroup
|
||||
+ network
|
||||
)
|
||||
|
||||
|
||||
diff --git a/src/client.cpp b/src/client.cpp
|
||||
index 2bc2d09..7105f7d 100644
|
||||
--- a/src/client.cpp
|
||||
+++ b/src/client.cpp
|
||||
@@ -38,7 +38,7 @@ public:
|
||||
QByteArray sock;
|
||||
};
|
||||
|
||||
-#ifndef SUN_LEN
|
||||
+#if !defined(SUN_LEN) && !defined(Q_OS_HAIKU)
|
||||
#define SUN_LEN(ptr) ((QT_SOCKLEN_T)(((struct sockaddr_un *)0)->sun_path) + strlen((ptr)->sun_path))
|
||||
#endif
|
||||
|
||||
@@ -94,7 +94,7 @@ int KDEsuClient::connect()
|
||||
addr.sun_family = AF_UNIX;
|
||||
strcpy(addr.sun_path, d->sock.constData());
|
||||
|
||||
- if (QT_SOCKET_CONNECT(d->sockfd, (struct sockaddr *)&addr, SUN_LEN(&addr)) < 0) {
|
||||
+ if (QT_SOCKET_CONNECT(d->sockfd, (struct sockaddr *)&addr, sizeof(&addr)) < 0) {
|
||||
qCWarning(KSU_LOG) << "[" << __FILE__ << ":" << __LINE__ << "] "
|
||||
<< "connect():" << strerror(errno);
|
||||
close(d->sockfd);
|
||||
diff --git a/src/kdesud/CMakeLists.txt b/src/kdesud/CMakeLists.txt
|
||||
index a545e59..437d4ad 100644
|
||||
--- a/src/kdesud/CMakeLists.txt
|
||||
+++ b/src/kdesud/CMakeLists.txt
|
||||
@@ -25,7 +25,7 @@ ecm_qt_declare_logging_category(kdesud
|
||||
EXPORT KSU
|
||||
)
|
||||
|
||||
-target_link_libraries(kdesud KF5::Su KF5::I18n ${X11_LIBRARIES})
|
||||
+target_link_libraries(kdesud KF5::Su KF5::I18n ${X11_LIBRARIES} network)
|
||||
if(HAVE_X11)
|
||||
target_include_directories(kdesud PRIVATE ${X11_X11_INCLUDE_PATH})
|
||||
endif()
|
||||
diff --git a/src/kdesud/kdesud.cpp b/src/kdesud/kdesud.cpp
|
||||
index 0d16772..53c1b13 100644
|
||||
--- a/src/kdesud/kdesud.cpp
|
||||
+++ b/src/kdesud/kdesud.cpp
|
||||
@@ -60,7 +60,7 @@
|
||||
|
||||
#include <dirent.h>
|
||||
|
||||
-#if !HAVE_CLOSE_RANGE
|
||||
+#if !HAVE_CLOSE_RANGE && !defined(Q_OS_HAIKU)
|
||||
#include <sys/syscall.h> // close_range syscall
|
||||
#endif
|
||||
|
||||
@@ -258,11 +258,13 @@ int create_socket()
|
||||
}
|
||||
}
|
||||
|
||||
+#ifndef Q_OS_HAIKU
|
||||
sockfd = socket(PF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
|
||||
if (sockfd < 0) {
|
||||
qCCritical(KSUD_LOG) << "socket(): " << ERR << "\n";
|
||||
return -1;
|
||||
}
|
||||
+#endif
|
||||
|
||||
// Ensure socket closed on error
|
||||
struct fd_ScopeGuard {
|
||||
@@ -378,9 +380,11 @@ int main(int argc, char *argv[])
|
||||
exit(1);
|
||||
}
|
||||
|
||||
+#ifndef Q_OS_HAIKU
|
||||
if (sockfd != 3) {
|
||||
sockfd = dup3(sockfd, 3, O_CLOEXEC);
|
||||
}
|
||||
+#endif
|
||||
if (sockfd < 0) {
|
||||
qCCritical(KSUD_LOG) << "Failed to set sockfd to fd 3" << ERR << "\n";
|
||||
kdesud_cleanup();
|
||||
@@ -415,7 +419,9 @@ int main(int argc, char *argv[])
|
||||
repo = new Repository;
|
||||
QVector<ConnectionHandler *> handler;
|
||||
|
||||
+#ifndef Q_OS_HAIKU
|
||||
pipe2(pipeOfDeath, O_CLOEXEC);
|
||||
+#endif
|
||||
maxfd = qMax(maxfd, pipeOfDeath[0]);
|
||||
|
||||
// Signal handlers
|
||||
--
|
||||
2.42.1
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 1865e943a5341bc4bec856073fc2f18c7e096ecf Mon Sep 17 00:00:00 2001
|
||||
From 3396df64dbaf0632fcb50d2f4988220d7ca5e3da Mon Sep 17 00:00:00 2001
|
||||
From: Schrijvers Luc <begasus@gmail.com>
|
||||
Date: Thu, 7 Mar 2024 17:55:01 +0100
|
||||
Subject: Build fixes
|
||||
@@ -76,10 +76,10 @@ index d8cedf2..6a1c00e 100644
|
||||
|
||||
// Signal handlers
|
||||
--
|
||||
2.48.1
|
||||
2.52.0
|
||||
|
||||
|
||||
From dd6ead32da8443f809adb6ea13a0c43e0153af55 Mon Sep 17 00:00:00 2001
|
||||
From b15c97cce234d924eb90983564740d820aac975d Mon Sep 17 00:00:00 2001
|
||||
From: Schrijvers Luc <begasus@gmail.com>
|
||||
Date: Tue, 12 Nov 2024 10:07:00 +0100
|
||||
Subject: Link with libnetwork
|
||||
@@ -118,5 +118,5 @@ index e80a772..395b0c3 100644
|
||||
target_include_directories(kdesud PRIVATE ${X11_X11_INCLUDE_PATH})
|
||||
endif()
|
||||
--
|
||||
2.48.1
|
||||
2.52.0
|
||||
|
||||
@@ -4,11 +4,11 @@ Protocol (DNS-SD), the layer of Zeroconf that allows network services, such \
|
||||
as printers, to be discovered without any user intervention or centralized \
|
||||
infrastructure."
|
||||
HOMEPAGE="https://invent.kde.org/frameworks/kdnssd"
|
||||
COPYRIGHT="2010-2025 KDE Organisation"
|
||||
COPYRIGHT="2010-2026 KDE Organisation"
|
||||
LICENSE="GNU LGPL v2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kdnssd-${portVersion}.tar.xz"
|
||||
CHECKSUM_SHA256="9a4e9e653c6670b4681516ceade3d2664d577f5e6f0173d7bb9bbe5dd009c271"
|
||||
CHECKSUM_SHA256="865175616c5169d25f0783798e0a7918a418180c33828e461c1608e6121d3634"
|
||||
SOURCE_DIR="kdnssd-$portVersion"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
@@ -2,11 +2,11 @@ SUMMARY="Dates for holidays and other special events"
|
||||
DESCRIPTION="This library provides a C++ API that determines holiday and \
|
||||
other special events for a geographical region."
|
||||
HOMEPAGE="https://invent.kde.org/frameworks/kholidays"
|
||||
COPYRIGHT="2010-2025 KDE Organisation"
|
||||
COPYRIGHT="2010-2026 KDE Organisation"
|
||||
LICENSE="GNU LGPL v2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kholidays-${portVersion}.tar.xz"
|
||||
CHECKSUM_SHA256="7876116dc022fe722294305cd58dde53fd21bcd664188ad26aceed63e55ddc86"
|
||||
CHECKSUM_SHA256="13c345422f802bd157aaea18b2ccb5270eb5e3de44915bcce70f1a4234e1497b"
|
||||
SOURCE_DIR="kholidays-$portVersion"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
@@ -53,7 +53,9 @@ BUILD_REQUIRES="
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
kde_qdoc_common
|
||||
cmd:bison
|
||||
cmd:cmake
|
||||
cmd:flex
|
||||
cmd:g++$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:msgfmt$secondaryArchSuffix
|
||||
@@ -3,11 +3,11 @@ DESCRIPTION="This framework provides additional image format plugins for QtGui.
|
||||
As such it is not required for the compilation of any other software, but may \
|
||||
be a runtime requirement for Qt-based software to support certain image formats."
|
||||
HOMEPAGE="https://invent.kde.org/frameworks/kimageformats"
|
||||
COPYRIGHT="2010-2025 KDE Organisation"
|
||||
COPYRIGHT="2010-2026 KDE Organisation"
|
||||
LICENSE="GNU LGPL v2"
|
||||
REVISION="3"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kimageformats-${portVersion}.tar.xz"
|
||||
CHECKSUM_SHA256="fc825326aa6b8c1321947ff523d3d006eef4c65fde40f379c6900d06967fae1c"
|
||||
CHECKSUM_SHA256="dfa0e9b16a288a8f94233afcbaffc87c1c5ddc037aca643943aab5a67685f26b"
|
||||
SOURCE_DIR="kimageformats-$portVersion"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
@@ -2,11 +2,11 @@ SUMMARY="Configuration dialog for desktop notificationsr"
|
||||
DESCRIPTION="KNotifyConfig provides a configuration dialog for desktop \
|
||||
notifications which can be embedded in your application."
|
||||
HOMEPAGE="https://invent.kde.org/frameworks/knotifyconfig"
|
||||
COPYRIGHT="2010-2025 KDE Organisation"
|
||||
COPYRIGHT="2010-2026 KDE Organisation"
|
||||
LICENSE="GNU LGPL v2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/knotifyconfig-${portVersion}.tar.xz"
|
||||
CHECKSUM_SHA256="cd1933ba68630139cd1bf456f085b33e0c354fd0f1f0e4c46822b09eb5c5c31f"
|
||||
CHECKSUM_SHA256="8dc37406d8f13193216201752ece968cbd38da5a76780ad78575d11b47b440ea"
|
||||
SOURCE_DIR="knotifyconfig-$portVersion"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
@@ -5,11 +5,11 @@ by person while still exposing all the data.
|
||||
Furthermore, KPeople will also provide facilities to integrate the data provided \
|
||||
in user interfaces by providing QML and Qt Widgets components."
|
||||
HOMEPAGE="https://invent.kde.org/frameworks/kpeople"
|
||||
COPYRIGHT="2010-2025 KDE Organisation"
|
||||
COPYRIGHT="2010-2026 KDE Organisation"
|
||||
LICENSE="GNU LGPL v2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kpeople-${portVersion}.tar.xz"
|
||||
CHECKSUM_SHA256="540fc643997c4a1c4d07e6c3c5bb2bc5e11f5ad6102e0957f943422aa922f731"
|
||||
CHECKSUM_SHA256="8bece583572330449dfa735b589b1df276759dbbb3a1f3a4d134c5677e2bf558"
|
||||
SOURCE_DIR="kpeople-$portVersion"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
@@ -5,11 +5,11 @@ The idea behind KPlotWidget is that you only have to specify information in 'dat
|
||||
units'; i.e., the natural units of the data being plotted.
|
||||
KPlotWidget automatically converts everything to screen pixel units."
|
||||
HOMEPAGE="https://invent.kde.org/frameworks/kplotting"
|
||||
COPYRIGHT="2010-2025 KDE Organisation"
|
||||
COPYRIGHT="2010-2026 KDE Organisation"
|
||||
LICENSE="GNU LGPL v2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kplotting-${portVersion}.tar.xz"
|
||||
CHECKSUM_SHA256="5203347d5439a33d1c2c331c5ae21fbc329404aa7c01692b2c1c48b9508d8292"
|
||||
CHECKSUM_SHA256="9fbd4775c9b1f56a24d90ee47cd0ad57c816fbbf60e3aaeba6e2b631f7b3fc9b"
|
||||
SOURCE_DIR="kplotting-$portVersion"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
@@ -5,11 +5,11 @@ display of high-volume data (often referred to as plotters).
|
||||
The charts use a system called distance fields for their accelerated rendering, which provides \
|
||||
ways of using the GPU for rendering 2D shapes without loss of quality."
|
||||
HOMEPAGE="https://invent.kde.org/frameworks/kquickcharts"
|
||||
COPYRIGHT="2010-2025 KDE Organisation"
|
||||
COPYRIGHT="2010-2026 KDE Organisation"
|
||||
LICENSE="GNU LGPL v2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kquickcharts-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="50f0470e961f95fab75cb4ae888bdd4239b462f187d725a476ef1ba0ce6af435"
|
||||
CHECKSUM_SHA256="146598a1e107e8480631b3001fd39d264e81dd5af6a315dec71524465d099244"
|
||||
SOURCE_DIR="kquickcharts-$portVersion"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
Reference in New Issue
Block a user