sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

sysutils/kio-fuse: Update to 5.1.0

Browse source
This commit is contained in:
Jason E. Hale 2024-01-13 23:16:48 -05:00
parent 16feaa08e7
commit 085d19d9fe
5 changed files with 24 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sysutils/kio-fuse/Makefile
View file

@ -1,8 +1,7 @@
PORTNAME= kio-fuse
DISTVERSION= 5.0.1
PORTREVISION= 1
DISTVERSION= 5.1.0
CATEGORIES= sysutils kde
MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION}
MASTER_SITES= KDE/stable/${PORTNAME}
MAINTAINER= kde@FreeBSD.org
COMMENT= FUSE Interface for KIO

6
sysutils/kio-fuse/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1616667702
SHA256 (kio-fuse-5.0.1.tar.xz) = 66679a8bf68fe60e19f31449f4110d4cf822915b3d245af3c0cd0056081466dd
SIZE (kio-fuse-5.0.1.tar.xz) = 47596
TIMESTAMP = 1705202711
SHA256 (kio-fuse-5.1.0.tar.xz) = 7d104581227d5a19b424b33f4168d181556b1015d6df2218e01a88d64449e94b
SIZE (kio-fuse-5.1.0.tar.xz) = 48820

19
sysutils/kio-fuse/files/patch-CMakeLists.txt Normal file
View file

@ -0,0 +1,19 @@
--- CMakeLists.txt.orig 2024-01-14 03:25:35 UTC
+++ CMakeLists.txt
@@ -72,10 +72,12 @@ ecm_generate_dbus_service_file(
DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR}
)
-if(DEFINED KDE_INSTALL_SYSTEMDUSERUNITDIR)
- ecm_install_configured_files(INPUT kio-fuse.service.in DESTINATION ${KDE_INSTALL_SYSTEMDUSERUNITDIR})
-else()
- ecm_install_configured_files(INPUT kio-fuse.service.in DESTINATION ${SYSTEMD_USER_UNIT_INSTALL_DIR})
+if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+ if(DEFINED KDE_INSTALL_SYSTEMDUSERUNITDIR)
+ ecm_install_configured_files(INPUT kio-fuse.service.in DESTINATION ${KDE_INSTALL_SYSTEMDUSERUNITDIR})
+ else()
+ ecm_install_configured_files(INPUT kio-fuse.service.in DESTINATION ${SYSTEMD_USER_UNIT_INSTALL_DIR})
+ endif()
endif()
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)

25
sysutils/kio-fuse/files/patch-git-a98b95f49cd34be7da6371c74b871b8b1f7e734b
View file

@ -1,25 +0,0 @@
diff --git kiofusevfs.cpp kiofusevfs.cpp
index 875da6f..b9c449f 100644
--- kiofusevfs.cpp
+++ kiofusevfs.cpp
@@ -2401,7 +2401,19 @@ int KIOFuseVFS::kioErrorToFuseError(const int kioError) {
case KIO::ERR_CANNOT_RENAME_PARTIAL : return EIO;
case KIO::ERR_NEED_PASSWD : return EACCES;
case KIO::ERR_CANNOT_SYMLINK : return EIO;
- case KIO::ERR_NO_CONTENT : return ENODATA;
+ case KIO::ERR_NO_CONTENT :
+#ifdef ENODATA
+ /* ENODATA is defined by GNU libc, and C++ tr1 seems to have
+ * it as well, as does Boost: these consistently define it
+ * to the value 9919. There is no guarantee the underlying
+ * FUSE implementation understands that if ENODATA doesn't
+ * exist in libc, though -- in that case, fall back to
+ * the more generic EIO.
+ */
+ return ENODATA;
+#else
+ return EIO;
+#endif
case KIO::ERR_DISK_FULL : return ENOSPC;
case KIO::ERR_IDENTICAL_FILES : return EEXIST;
case KIO::ERR_SLAVE_DEFINED : return EIO;

32
sysutils/kio-fuse/files/patch-git-daed23c4d7b944e486308d5f71fd48854a32cb2d
View file

@ -1,32 +0,0 @@
diff --git CMakeLists.txt CMakeLists.txt
index cceec6c..4e97588 100644
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -59,7 +59,11 @@ target_include_directories(kio-fuse PRIVATE ${FUSE3_INCLUDE_DIRS})
target_compile_definitions(kio-fuse PRIVATE FUSE_USE_VERSION=31 ${FUSE3_CFLAGS_OTHER})
target_link_libraries(kio-fuse PRIVATE Qt5::Core KF5::KIOCore ${FUSE3_LIBRARIES} ${FUSE3_LDFLAGS})
install(TARGETS kio-fuse DESTINATION ${KDE_INSTALL_FULL_LIBEXECDIR})
-install(FILES kio-fuse-tmpfiles.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/tmpfiles.d)
+if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+ # We could argue that this needs a separate "if(LINUX_WITH_TMPFILES_D)".
+ # or a "if(LINUX_WITH_SYSTEMD)".
+ install(FILES kio-fuse-tmpfiles.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/tmpfiles.d)
+endif()
# Once KF5 5.73 is required
#
@@ -80,7 +84,12 @@ SystemdService=kio-fuse.service
")
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.KIOFuse.service DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR})
-configure_file(kio-fuse.service.in ${CMAKE_CURRENT_BINARY_DIR}/kio-fuse.service)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kio-fuse.service DESTINATION ${SYSTEMD_USER_UNIT_INSTALL_DIR})
+if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+ # We could argue that this needs a separate "if(LINUX_WITH_SYSTEMD)",
+ # but the ECM macro (see above) is expected to do the right thing
+ # when KF5 5.73 is required.
+ configure_file(kio-fuse.service.in ${CMAKE_CURRENT_BINARY_DIR}/kio-fuse.service)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kio-fuse.service DESTINATION ${SYSTEMD_USER_UNIT_INSTALL_DIR})
+endif()
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)