haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-04 22:18:55 +02:00
Code Issues Packages Projects Releases Wiki Activity
Files
a26720a2a312195b497f55cf53ccd4d78f81e040
haikuports/kde-frameworks/kio/patches/kio-5.45.0.patchset
Sergei Reznikov a26720a2a3 kde-frameworks: bump to 5.45.0 
* for future reference batch git rename was done using this command:
find . -maxdepth 3 -type f -name '*5.39*.recipe' | grep -v 1 | a
while read fname; do git mv $fname ${fname//5.39/5.45}; done

(don't forget to repeat for .patchset files)

* batch CHECKSUM_SHA256 update was done using this script:

cd haikuports
tar --exclude download --exclude work* -zcvf kde-frameworks-`date '+%Y-%m-%d-%H-%M-%S'`.tgz kde-frameworks/

find /home/haikuports/kde-frameworks -maxdepth 2 -name "*5.39*.recipe" | while read FNAME; do \

portVersion=5.45.0 ; source $FNAME ; echo $SOURCE_URI $FNAME ;
echo `curl -s -L $SOURCE_URI | sha256sum | head -c 64`
sed -i "s/$CHECKSUM_SHA256/`curl -s -L $SOURCE_URI | sha256sum | head -c 64`/" $FNAME ; done

* the recipes were built in this order

hp extra_cmake_modules
hp phonon
hp karchive
hp kcodecs
hp kconfig
hp kcoreaddons
hp kdbusaddons
hp kguiaddons
hp ki18n
hp kitemmodels
hp kitemviews
hp kwidgetsaddons
hp kwindowsystem
hp solid
hp sonnet
hp threadweaver
hp kauth
hp kcompletion
hp kcrash
hp kdoctools
hp kunitconversion
hp kconfigwidgets
hp kservice
hp kglobalaccel
hp kpackage
hp kemoticons
hp kiconthemes
hp kjobwidgets
hp knotifications
hp ktextwidgets
hp kxmlgui
hp kbookmarks
hp kwallet
hp kio
hp kdeclarative
hp kcmutils
hp kinit
hp knotifyconfig
hp kparts
hp kactivities
hp kded
hp kdesignerplugin
hp breeze_icons
hp kdelibs4support
hp kross
hp kdiagram
2018-04-17 18:28:59 +03:00

140 lines
4.2 KiB
Plaintext
Raw Blame History

From e6560c54376f5e68248e5e6fa323445c37edd3a6 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Mon, 16 Apr 2018 23:40:20 +0300
Subject: Fix build on Haiku
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index fe94bdd..5844ec1 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -156,6 +156,10 @@ if (UNIX)
target_link_libraries(KF5KIOCore PRIVATE KF5::Auth) #SlaveBase uses KAuth::Action
endif()
+if (HAIKU)
+ target_link_libraries(KF5KIOCore PRIVATE network)
+endif ()
+
if(ACL_FOUND)
target_link_libraries(KF5KIOCore PRIVATE ${ACL_LIBS})
endif()
diff --git a/src/core/kmountpoint.cpp b/src/core/kmountpoint.cpp
index 7981b1c..6e92a71 100644
--- a/src/core/kmountpoint.cpp
+++ b/src/core/kmountpoint.cpp
@@ -139,7 +139,7 @@ KMountPoint::~KMountPoint()
#define MOUNTTYPE(var) var->mnt_type
#define MOUNTOPTIONS(var) var->mnt_opts
#define FSNAME(var) var->mnt_fsname
-#else
+#elif !defined(__HAIKU__)
#define SETMNTENT fopen
#define ENDMNTENT fclose
#define STRUCT_MNTENT struct mnttab
@@ -414,7 +414,7 @@ KMountPoint::List KMountPoint::currentMountPoints(DetailsNeededFlags infoNeeded)
mp->d->mountPoint = QString("/");
result.append(mp);
-#elif !defined(Q_OS_ANDROID)
+#elif !defined(Q_OS_ANDROID) && !defined(Q_OS_HAIKU)
STRUCT_SETMNTENT mnttab;
if ((mnttab = SETMNTENT(MNTTAB, "r")) == nullptr) {
return result;
diff --git a/src/ioslaves/file/CMakeLists.txt b/src/ioslaves/file/CMakeLists.txt
index 9ab8ea3..dd1bf8c 100644
--- a/src/ioslaves/file/CMakeLists.txt
+++ b/src/ioslaves/file/CMakeLists.txt
@@ -29,6 +29,10 @@ if(UNIX)
target_link_libraries(kio_file Qt5::Network KF5::Auth)
endif()
+if (HAIKU)
+ target_link_libraries(kio_file gnu network)
+endif ()
+
if (HAVE_VOLMGT AND CMAKE_SYSTEM_NAME MATCHES SunOS)
target_link_libraries(kio_file -lvolmgt)
endif ()
diff --git a/src/ioslaves/file/file_unix.cpp b/src/ioslaves/file/file_unix.cpp
index 9c9a83b..f9b8482 100644
--- a/src/ioslaves/file/file_unix.cpp
+++ b/src/ioslaves/file/file_unix.cpp
@@ -55,6 +55,8 @@
#include <sys/sendfile.h>
#endif
+#undef HAVE_DIRENT_D_TYPE
+
using namespace KIO;
#define MAX_IPC_SIZE (1024*32)
diff --git a/src/ioslaves/file/kauth/CMakeLists.txt b/src/ioslaves/file/kauth/CMakeLists.txt
index 836bd21..7f523af 100644
--- a/src/ioslaves/file/kauth/CMakeLists.txt
+++ b/src/ioslaves/file/kauth/CMakeLists.txt
@@ -1,6 +1,10 @@
add_executable(file_helper filehelper.cpp fdsender.cpp)
target_link_libraries(file_helper Qt5::Network KF5::Auth KF5::I18n KF5::KIOCore)
+if (HAIKU)
+ target_link_libraries(file_helper network)
+endif ()
+
#install(TARGETS file_helper DESTINATION ${KAUTH_HELPER_INSTALL_DIR})
#kauth_install_helper_files(file_helper org.kde.kio.file root)
#kauth_install_actions(org.kde.kio.file file.actions)
diff --git a/src/ioslaves/file/sharefd_p.h b/src/ioslaves/file/sharefd_p.h
index 2050b5f..0b5e31a 100644
--- a/src/ioslaves/file/sharefd_p.h
+++ b/src/ioslaves/file/sharefd_p.h
@@ -19,6 +19,7 @@
***/
#include <sys/un.h>
+#include <cstring>
#include <iostream>
#include <unistd.h>
#include <sys/socket.h>
diff --git a/src/kpac/CMakeLists.txt b/src/kpac/CMakeLists.txt
index aebe1eb..e7755f3 100644
--- a/src/kpac/CMakeLists.txt
+++ b/src/kpac/CMakeLists.txt
@@ -48,6 +48,9 @@ if (Qt5Script_FOUND)
if (HAVE_RESOLV_LIBRARY)
target_link_libraries(kded_proxyscout resolv)
endif ()
+ if (HAIKU)
+ target_link_libraries(kded_proxyscout network)
+ endif ()
endif()
set_package_properties(Qt5Script PROPERTIES DESCRIPTION "QtScript, one of the Qt5 modules"
@@ -69,6 +72,10 @@ if (HAVE_SOCKET_LIBRARY)
target_link_libraries(kpac_dhcp_helper socket)
endif ()
+if (HAIKU)
+ target_link_libraries(kpac_dhcp_helper network)
+endif ()
+
install(TARGETS kpac_dhcp_helper DESTINATION ${KDE_INSTALL_LIBEXECDIR_KF5} )
########### install files ###############
diff --git a/src/widgets/previewjob.cpp b/src/widgets/previewjob.cpp
index cd7a05a..5c48504 100644
--- a/src/widgets/previewjob.cpp
+++ b/src/widgets/previewjob.cpp
@@ -22,7 +22,7 @@
#include "previewjob.h"
-#define WITH_SHM defined(Q_OS_UNIX) && !defined(Q_OS_ANDROID)
+#define WITH_SHM defined(Q_OS_UNIX) && !defined(Q_OS_ANDROID) && !defined(Q_OS_HAIKU)
#if WITH_SHM
#include <sys/ipc.h>
--
2.16.2
Reference in New Issue View Git Blame Copy Permalink