From owner-svn-ports-head@freebsd.org Fri Feb 12 16:41:06 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8FE51529CC1; Fri, 12 Feb 2021 16:41:06 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DcfQB3bMDz3L8q; Fri, 12 Feb 2021 16:41:06 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6E21B26EBD; Fri, 12 Feb 2021 16:41:06 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11CGf67v090639; Fri, 12 Feb 2021 16:41:06 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11CGf5vC090635; Fri, 12 Feb 2021 16:41:05 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <202102121641.11CGf5vC090635@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Fri, 12 Feb 2021 16:41:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r565031 - in head/sysutils/kio-fuse: . files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: in head/sysutils/kio-fuse: . files X-SVN-Commit-Revision: 565031 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Feb 2021 16:41:06 -0000 Author: adridg Date: Fri Feb 12 16:41:05 2021 New Revision: 565031 URL: https://svnweb.freebsd.org/changeset/ports/565031 Log: Update sysutils/kio-fuse to latest upstream release kio-fuse does some FUSE magic to pass remote KIO paths (e.g. when browsing SMB or ftp from Dolphin) to non-KIO-aware applications (e.g. opening a text file with vi). This 5.0.0 release has been out for a while and is functionally equivalent to the previous one; now, however, there's real release tarballs and everything. Existing patches have been re-built for this release and then submitted upstream, which is why they now have git-hashes. Added: head/sysutils/kio-fuse/files/patch-git-a98b95f49cd34be7da6371c74b871b8b1f7e734b (contents, props changed) head/sysutils/kio-fuse/files/patch-git-daed23c4d7b944e486308d5f71fd48854a32cb2d (contents, props changed) Deleted: head/sysutils/kio-fuse/files/patch-CMakeLists.txt head/sysutils/kio-fuse/files/patch-kiofusevfs.cpp Modified: head/sysutils/kio-fuse/Makefile head/sysutils/kio-fuse/distinfo Modified: head/sysutils/kio-fuse/Makefile ============================================================================== --- head/sysutils/kio-fuse/Makefile Fri Feb 12 16:17:20 2021 (r565030) +++ head/sysutils/kio-fuse/Makefile Fri Feb 12 16:41:05 2021 (r565031) @@ -1,9 +1,9 @@ # $FreeBSD$ PORTNAME= kio-fuse -DISTVERSIONPREFIX= v -DISTVERSION= 4.95.0 +DISTVERSION= 5.0.0 CATEGORIES= sysutils kde +MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= FUSE Interface for KIO @@ -11,12 +11,10 @@ COMMENT= FUSE Interface for KIO LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSES/GPL-3.0-or-later.txt -USES= cmake compiler:c++11-lang fuse:3 kde:5 pkgconfig qt:5 +USES= cmake compiler:c++11-lang fuse:3 kde:5 pkgconfig qt:5 tar:xz USE_KDE= config coreaddons kio service USE_QT= concurrent core dbus network \ buildtools_build qmake_build -USE_GITHUB= yes -GH_ACCOUNT= kde PLIST_FILES= lib/libexec/kio-fuse \ share/dbus-1/services/org.kde.KIOFuse.service Modified: head/sysutils/kio-fuse/distinfo ============================================================================== --- head/sysutils/kio-fuse/distinfo Fri Feb 12 16:17:20 2021 (r565030) +++ head/sysutils/kio-fuse/distinfo Fri Feb 12 16:41:05 2021 (r565031) @@ -1,3 +1,3 @@ -TIMESTAMP = 1590496835 -SHA256 (kde-kio-fuse-v4.95.0_GH0.tar.gz) = 803b4bff364dec9854d760e003031afd7c6cf816b2a9fad013aab8a4535db4a7 -SIZE (kde-kio-fuse-v4.95.0_GH0.tar.gz) = 50928 +TIMESTAMP = 1613124184 +SHA256 (kio-fuse-5.0.0.tar.xz) = 308ec02dce2fe9004ada9fdc13f49d243bdab98a24e997f2aae818bb27f08721 +SIZE (kio-fuse-5.0.0.tar.xz) = 46672 Added: head/sysutils/kio-fuse/files/patch-git-a98b95f49cd34be7da6371c74b871b8b1f7e734b ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/kio-fuse/files/patch-git-a98b95f49cd34be7da6371c74b871b8b1f7e734b Fri Feb 12 16:41:05 2021 (r565031) @@ -0,0 +1,25 @@ +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; Added: head/sysutils/kio-fuse/files/patch-git-daed23c4d7b944e486308d5f71fd48854a32cb2d ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/kio-fuse/files/patch-git-daed23c4d7b944e486308d5f71fd48854a32cb2d Fri Feb 12 16:41:05 2021 (r565031) @@ -0,0 +1,32 @@ +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)