mirror of
https://github.com/yann64/haikuports.git
synced 2026-03-19 01:46:00 +01:00
kdelibs4support: bump version
This commit is contained in:
@@ -13,12 +13,12 @@ may not work correctly unless any libraries and other software using the \
|
||||
KDELibs 4 Support framework are installed to the same location as \
|
||||
KDELibs4Support, although it may be sufficient to set the KDEDIRS environment \
|
||||
variable correctly."
|
||||
HOMEPAGE="https://github.com/KDE/kdelibs4support/"
|
||||
COPYRIGHT="2010-2022 KDE Organisation"
|
||||
HOMEPAGE="https://invent.kde.org/frameworks/kdelibs4support/"
|
||||
COPYRIGHT="2010-2024 KDE Organisation"
|
||||
LICENSE="GNU LGPL v2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/KDE/kdelibs4support/archive/v$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="50993143715399e8b06b745b391688ae465c465072ad3116705c0f1a349321dc"
|
||||
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/portingAids/kdelibs4support-${portVersion}.tar.xz"
|
||||
CHECKSUM_SHA256="72a2fa16c9044fffa7548f349e5e19f16996787673e6bd978fdca260e5512f14"
|
||||
PATCHES="kdelibs4support-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
@@ -43,6 +43,7 @@ PROVIDES="
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libgettextpo$secondaryArchSuffix
|
||||
lib:libKF5Auth$secondaryArchSuffix
|
||||
lib:libKF5Bookmarks$secondaryArchSuffix
|
||||
lib:libKF5Codecs$secondaryArchSuffix
|
||||
@@ -94,6 +95,7 @@ BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
extra_cmake_modules$secondaryArchSuffix >= $portVersion
|
||||
uri
|
||||
devel:libgettextlib$secondaryArchSuffix
|
||||
devel:libkdeinit5_kded5$secondaryArchSuffix == $portVersion
|
||||
devel:libKF5Auth$secondaryArchSuffix == $portVersion
|
||||
devel:libKF5Bookmarks$secondaryArchSuffix == $portVersion
|
||||
@@ -141,7 +143,7 @@ BUILD_PREREQUIRES="
|
||||
cmd:lrelease$secondaryArchSuffix >= 5
|
||||
cmd:make
|
||||
cmd:perl
|
||||
cmd:python2
|
||||
cmd:python3.10
|
||||
"
|
||||
|
||||
PATCH()
|
||||
@@ -159,10 +161,12 @@ BUILD()
|
||||
|
||||
cmake .. $cmakeDirArgs \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_CXX_FLAGS="-D_DEFAULT_SOURCE" \
|
||||
-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 \
|
||||
-DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt5 \
|
||||
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
|
||||
-DBUILD_TESTING:BOOL=OFF
|
||||
-DBUILD_TESTING:BOOL=OFF \
|
||||
-DWITH_X11:BOOL=OFF
|
||||
|
||||
make $jobArgs
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
From f206f7652261b63a088deffc9f68a81cb6dc4a6d Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sat, 7 Oct 2017 18:33:13 +1000
|
||||
Subject: Fix haiku build
|
||||
|
||||
|
||||
diff --git a/src/ConfigureChecks.cmake b/src/ConfigureChecks.cmake
|
||||
index 9edbff7..fc2a48d 100644
|
||||
--- a/src/ConfigureChecks.cmake
|
||||
+++ b/src/ConfigureChecks.cmake
|
||||
@@ -45,6 +45,10 @@ endif(NOT APPLE)
|
||||
|
||||
check_function_exists(inet_pton HAVE_INET_PTON)
|
||||
check_function_exists(inet_ntop HAVE_INET_NTOP)
|
||||
+if(HAIKU)
|
||||
+ set(HAVE_INET_PTON 1)
|
||||
+ set(HAVE_INET_NTOP 1)
|
||||
+endif()
|
||||
check_function_exists(getprotobyname_r HAVE_GETPROTOBYNAME_R)
|
||||
check_function_exists(poll HAVE_POLL)
|
||||
check_function_exists(getservbyname_r HAVE_GETSERVBYNAME_R)
|
||||
--
|
||||
2.43.2
|
||||
|
||||
|
||||
From 4b3b0e27c6c5cc10ca03ff4b741b1a74b75db0e1 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Mon, 26 Feb 2024 23:29:36 +1000
|
||||
Subject: Link with libnetwork
|
||||
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 4649a9d..98382a8 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -312,6 +312,9 @@ set(platformLinkLibraries)
|
||||
if (APPLE)
|
||||
set(platformLinkLibraries "-framework CoreFoundation -framework Carbon -lresolv")
|
||||
endif()
|
||||
+if (HAIKU)
|
||||
+ set(platformLinkLibraries network)
|
||||
+endif()
|
||||
if (HAVE_X11)
|
||||
set(platformLinkLibraries ${XCB_XCB_LIBRARY})
|
||||
endif()
|
||||
--
|
||||
2.43.2
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
From f67f57c372d42179d8ac9ab2edd883329c83129e Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sat, 7 Oct 2017 18:33:13 +1000
|
||||
Subject: Fix haiku build
|
||||
|
||||
|
||||
diff --git a/src/ConfigureChecks.cmake b/src/ConfigureChecks.cmake
|
||||
index 9edbff7..fc2a48d 100644
|
||||
--- a/src/ConfigureChecks.cmake
|
||||
+++ b/src/ConfigureChecks.cmake
|
||||
@@ -45,6 +45,10 @@ endif(NOT APPLE)
|
||||
|
||||
check_function_exists(inet_pton HAVE_INET_PTON)
|
||||
check_function_exists(inet_ntop HAVE_INET_NTOP)
|
||||
+if(HAIKU)
|
||||
+ set(HAVE_INET_PTON 1)
|
||||
+ set(HAVE_INET_NTOP 1)
|
||||
+endif()
|
||||
check_function_exists(getprotobyname_r HAVE_GETPROTOBYNAME_R)
|
||||
check_function_exists(poll HAVE_POLL)
|
||||
check_function_exists(getservbyname_r HAVE_GETSERVBYNAME_R)
|
||||
--
|
||||
2.13.1
|
||||
|
||||
Reference in New Issue
Block a user