megacmd: fix build

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: megacmd: fix build
From: kikadf (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Mon, 10 Feb 2025 18:08:07 +0000
Module Name:	pkgsrc-wip
Committed By:	kikadf <kikadf.01%gmail.com@localhost>
Pushed By:	kikadf
Date:		Mon Feb 10 19:07:40 2025 +0100
Changeset:	cc98f1d33380adc19e9582ff0925d077713d1ce1

Modified Files:
	megacmd/Makefile
	megacmd/PLIST
	megacmd/distinfo
	megacmd/patches/patch-CMakeLists.txt
	megacmd/patches/patch-build_cmake_modules_megacmd__libraries.cmake
	megacmd/patches/patch-sdk_cmake_config.h.in
	megacmd/patches/patch-sdk_cmake_modules_sdklib__libraries.cmake
	megacmd/patches/patch-sdk_cmake_modules_sdklib__target.cmake
	megacmd/patches/patch-sdk_include_mega_posix_megafs.h
	megacmd/patches/patch-sdk_include_megaapi__impl.h
	megacmd/patches/patch-sdk_src_posix_fs.cpp
	megacmd/patches/patch-src_megacmdcommonutils.cpp
	megacmd/patches/patch-src_megacmdcommonutils.h
	megacmd/patches/patch-src_megacmdshell_megacmdshellcommunications.cpp
Removed Files:
	megacmd/TODO

Log Message:
megacmd: fix build

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=cc98f1d33380adc19e9582ff0925d077713d1ce1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 megacmd/Makefile                                   | 17 -----
 megacmd/PLIST                                      | 72 +---------------------
 megacmd/TODO                                       |  1 -
 megacmd/distinfo                                   | 22 +++----
 megacmd/patches/patch-CMakeLists.txt               | 60 ++++++++++++++++++
 ...ch-build_cmake_modules_megacmd__libraries.cmake |  2 +
 megacmd/patches/patch-sdk_cmake_config.h.in        |  2 +
 ...patch-sdk_cmake_modules_sdklib__libraries.cmake |  2 +
 .../patch-sdk_cmake_modules_sdklib__target.cmake   |  2 +
 .../patches/patch-sdk_include_mega_posix_megafs.h  |  2 +
 megacmd/patches/patch-sdk_include_megaapi__impl.h  |  2 +
 megacmd/patches/patch-sdk_src_posix_fs.cpp         | 52 ++++++++++++++--
 megacmd/patches/patch-src_megacmdcommonutils.cpp   |  2 +
 megacmd/patches/patch-src_megacmdcommonutils.h     |  2 +
 ...src_megacmdshell_megacmdshellcommunications.cpp |  3 +-
 15 files changed, 137 insertions(+), 106 deletions(-)

diffs:
diff --git a/megacmd/Makefile b/megacmd/Makefile
index 4ccbf095d3..3b8fc4f6c2 100644
--- a/megacmd/Makefile
+++ b/megacmd/Makefile
@@ -19,9 +19,7 @@ USE_LANGUAGES+=		c c++
 USE_CXX_FEATURES+=	filesystem
 FORCE_CXX_STD=		c++17
 USE_LIBTOOL=		yes
-#USE_TOOLS+=		autoreconf autoconf automake gmake
 USE_TOOLS+=		pkg-config
-#GNU_CONFIGURE=		yes
 REPLACE_SH=		src/client/mega-*
 CXXFLAGS+=		-DCRYPTOPP_DISABLE_ASM
 
@@ -32,24 +30,10 @@ CMAKE_CONFIGURE_ARGS+=	-DUSE_FREEIMAGE=OFF
 CMAKE_CONFIGURE_ARGS+=	-DUSE_FFMPEG=OFF
 CMAKE_CONFIGURE_ARGS+=	-DUSE_PDFIUM=OFF
 
-
-#CONFIGURE_ARGS+=	--disable-examples
-#CONFIGURE_ARGS+=	--disable-java
-#CONFIGURE_ARGS+=	--disable-php
-#CONFIGURE_ARGS+=	--disable-python
-#CONFIGURE_ARGS+=	--without-termcap
-#CONFIGURE_ARGS+=	--without-libraw
-#CONFIGURE_ARGS+=	--without-libzen
-#CONFIGURE_ARGS+=	--without-rt
-#CONFIGURE_ARGS+=	--enable-gcc-hardening
-
 CHECK_PORTABILITY_SKIP+=	sdk/bindings/ios/3rdparty/*.sh
 
 INSTALLATION_DIRS+=	share/doc/megacmd
 
-#pre-configure:
-#	cd ${WRKSRC} && ${SH} autogen.sh
-
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/share/bash-completion/completions/megacmd_completion.sh \
 		${DESTDIR}${PREFIX}/share/bash-completion/completions/megacmd
@@ -60,7 +44,6 @@ post-install:
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../devel/libuv/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
-#.include "../../multimedia/libmediainfo/buildlink3.mk"
 .include "../../net/libcares/buildlink3.mk"
 .include "../../security/crypto++/buildlink3.mk"
 .include "../../security/libsodium/buildlink3.mk"
diff --git a/megacmd/PLIST b/megacmd/PLIST
index 2f7ecc7bdf..991843f21b 100644
--- a/megacmd/PLIST
+++ b/megacmd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2024/06/18 18:23:15 bsiegert Exp $
+@comment $NetBSD$
 bin/mega-attr
 bin/mega-backup
 bin/mega-cancel
@@ -52,6 +52,8 @@ bin/mega-showpcr
 bin/mega-signup
 bin/mega-speedlimit
 bin/mega-sync
+bin/mega-sync-ignore
+bin/mega-sync-issues
 bin/mega-thumbnail
 bin/mega-transfers
 bin/mega-tree
@@ -60,73 +62,5 @@ bin/mega-users
 bin/mega-version
 bin/mega-webdav
 bin/mega-whoami
-include/mega.h
-include/mega/account.h
-include/mega/attrmap.h
-include/mega/backofftimer.h
-include/mega/base64.h
-include/mega/command.h
-include/mega/config.h
-include/mega/console.h
-include/mega/crypto/cryptopp.h
-include/mega/crypto/sodium.h
-include/mega/db.h
-include/mega/db/sqlite.h
-include/mega/drivenotify.h
-include/mega/file.h
-include/mega/fileattributefetch.h
-include/mega/filefingerprint.h
-include/mega/filesystem.h
-include/mega/gfx.h
-include/mega/gfx/GfxProcCG.h
-include/mega/gfx/external.h
-include/mega/gfx/freeimage.h
-include/mega/gfx/gfx_pdfium.h
-include/mega/http.h
-include/mega/json.h
-include/mega/logging.h
-include/mega/mediafileattribute.h
-include/mega/mega_ccronexpr.h
-include/mega/mega_dict-src.h
-include/mega/mega_evt_queue.h
-include/mega/mega_evt_tls.h
-include/mega/mega_http_parser.h
-include/mega/mega_utf8proc.h
-include/mega/mega_zxcvbn.h
-include/mega/megaapp.h
-include/mega/megaclient.h
-include/mega/node.h
-include/mega/pendingcontactrequest.h
-include/mega/posix/megaconsole.h
-include/mega/posix/megaconsolewaiter.h
-include/mega/posix/megafs.h
-include/mega/posix/meganet.h
-include/mega/posix/megasys.h
-include/mega/posix/megawaiter.h
-include/mega/process.h
-include/mega/proxy.h
-include/mega/pubkeyaction.h
-include/mega/raid.h
-include/mega/request.h
-include/mega/serialize64.h
-include/mega/share.h
-include/mega/sharenodekeys.h
-include/mega/sync.h
-include/mega/thread.h
-include/mega/thread/cppthread.h
-include/mega/thread/posixthread.h
-include/mega/transfer.h
-include/mega/transferslot.h
-include/mega/treeproc.h
-include/mega/types.h
-include/mega/user.h
-include/mega/useralerts.h
-include/mega/utils.h
-include/mega/version.h
-include/mega/waiter.h
-include/megaapi.h
-include/megaapi_impl.h
-lib/libmega.la
-lib/pkgconfig/libmega.pc
 share/bash-completion/completions/megacmd
 share/doc/megacmd/README
diff --git a/megacmd/TODO b/megacmd/TODO
deleted file mode 100644
index 1bbdf02820..0000000000
--- a/megacmd/TODO
+++ /dev/null
@@ -1 +0,0 @@
-broken=	mntent
diff --git a/megacmd/distinfo b/megacmd/distinfo
index ed0f06781e..4d43e79fcd 100644
--- a/megacmd/distinfo
+++ b/megacmd/distinfo
@@ -6,14 +6,14 @@ Size (megacmd-2.0.0.tar.gz) = 2104772 bytes
 BLAKE2s (meganz-sdk-v8.3.1.tar.gz) = 4851001b7556d6a25f6d39e1e082e057b877cf68b55e85eba5b30486f1a0559c
 SHA512 (meganz-sdk-v8.3.1.tar.gz) = d80c7aa7a27f9f56405cd0bb5943135d6fb3590196c1a8f74b41ad3e94dc7704fe905342d6bdd431fc80e38eac74b0d8b11d8b8802b2c868931d0d11bb78f883
 Size (meganz-sdk-v8.3.1.tar.gz) = 4061833 bytes
-SHA1 (patch-CMakeLists.txt) = 33f2a5249d77dcdd27dfbdd00f3dbe6fd5edbef4
-SHA1 (patch-build_cmake_modules_megacmd__libraries.cmake) = 263df772001b2d8777063cde476d0fd5bc2ad7d2
-SHA1 (patch-sdk_cmake_config.h.in) = a0a57c6bed81f4bac1d8e2f7bdb5a7346c6ab88b
-SHA1 (patch-sdk_cmake_modules_sdklib__libraries.cmake) = 5a4ea8e836dcc53fc624846a7078559282894354
-SHA1 (patch-sdk_cmake_modules_sdklib__target.cmake) = 0f81cef40e98be815cbf330f40913e85dc599d90
-SHA1 (patch-sdk_include_mega_posix_megafs.h) = c6ae92478b88e30b6f42982f9d96d04d080ce493
-SHA1 (patch-sdk_include_megaapi__impl.h) = 48167afd95de234af835ec607c7a5aaa0177d183
-SHA1 (patch-sdk_src_posix_fs.cpp) = 13061c4b8d243a080646ff03ff1e92f317fc7c4a
-SHA1 (patch-src_megacmdcommonutils.cpp) = 918e58e2be4ba8989ff0c357ea56f81fce6711f7
-SHA1 (patch-src_megacmdcommonutils.h) = 2e6bfdc42f0866cbb9ff9182b6b5934a0f78b9ba
-SHA1 (patch-src_megacmdshell_megacmdshellcommunications.cpp) = 7ce41cfcfbc7c8df8f6176bc2abd6a08825fef80
+SHA1 (patch-CMakeLists.txt) = f8936fbcd4200139fec6ada0bad5644ddb54145b
+SHA1 (patch-build_cmake_modules_megacmd__libraries.cmake) = afabd22177c0437fbe1d13fdf6601832bc60cd96
+SHA1 (patch-sdk_cmake_config.h.in) = dfa1062558bb18aed61386d776316b8fb0784c48
+SHA1 (patch-sdk_cmake_modules_sdklib__libraries.cmake) = 3ee9061b49f244c9f3d9d60d9f2a6dfd672db501
+SHA1 (patch-sdk_cmake_modules_sdklib__target.cmake) = 33f5b16dc561e37f076c60fa537a4c5b8d8c992e
+SHA1 (patch-sdk_include_mega_posix_megafs.h) = 8cfcec74e870f911bbeb14bc59e853dd182d22ea
+SHA1 (patch-sdk_include_megaapi__impl.h) = ca1aea337841ba6d5cba29379a9523fc0b050c4e
+SHA1 (patch-sdk_src_posix_fs.cpp) = 61dc1ef8bc3b3f4eeec5a1fb0d92fd3bcaee9282
+SHA1 (patch-src_megacmdcommonutils.cpp) = 6128e295e1a816ad4d7ea1ec59fa963391eb3bfb
+SHA1 (patch-src_megacmdcommonutils.h) = 194d991a02e8e48c9c31c60384549c276e4ee735
+SHA1 (patch-src_megacmdshell_megacmdshellcommunications.cpp) = ff794d128ffa6e0626296a504b22f391e0fc923b
diff --git a/megacmd/patches/patch-CMakeLists.txt b/megacmd/patches/patch-CMakeLists.txt
index 5d0f4a0cdd..189679b07f 100644
--- a/megacmd/patches/patch-CMakeLists.txt
+++ b/megacmd/patches/patch-CMakeLists.txt
@@ -1,5 +1,9 @@
 $NetBSD$
 
+* Use system dependencies instead of vcpkg
+* Fix install directories
+* Install inotify conf file only on Linux
+
 --- CMakeLists.txt.orig	2025-01-30 14:04:12.000000000 +0100
 +++ CMakeLists.txt
 @@ -26,7 +26,8 @@ set(QT_CREATOR_SKIP_VCPKG_SETUP TRUE CAC
@@ -21,3 +25,59 @@ $NetBSD$
      message(STATUS "vcpkg will be cloned into ${VCPKG_ROOT}")
      execute_process(
          #TODO: have the same for windows ... or at least check if bash is available
+@@ -134,8 +135,8 @@ if(UNIX AND NOT APPLE)
+     # If CMAKE_INSTALL_PREFIX is not set, it will set rpath to /opt/....
+     # Note: using cmake --install --prefix /some/prefix will not set rpath relative to that prefix
+     # The above can be used for building packages: in which install dir is a path construction folder that will not be there in packages
+-    set(CMAKE_INSTALL_LIBDIR "opt/megacmd/lib")
+-    set(CMAKE_INSTALL_BINDIR "usr/bin") #override default "bin"
++    set(CMAKE_INSTALL_LIBDIR "lib")
++    set(CMAKE_INSTALL_BINDIR "bin") #override default "bin"
+ 
+     if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+         message(STATUS "Overriding default CMAKE_INSTALL_PREFIX to /")
+@@ -457,27 +458,31 @@ elseif(NOT WIN32)
+         PATTERN "win" EXCLUDE)
+ 
+     install(FILES "${CMAKE_CURRENT_LIST_DIR}/src/client/megacmd_completion.sh"
+-        DESTINATION "etc/bash_completion.d"
++        DESTINATION "share/bash-completion/completions"
+         )
+ 
+-    # generate 100-megacmd-inotify-limit.conf file and have it installed
+-    execute_process(COMMAND echo "fs.inotify.max_user_watches = 524288"
++    if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
++        # generate 100-megacmd-inotify-limit.conf file and have it installed
++        execute_process(COMMAND echo "fs.inotify.max_user_watches = 524288"
+                 OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/99-megacmd-inotify-limit.conf)
+-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/99-megacmd-inotify-limit.conf
+-        DESTINATION "etc/sysctl.d"
+-        )
+-
+-    #Install vcpkg dynamic libraries in locations defined by GNUInstallDirs.
+-    if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+-        SET(vcpkg_lib_folder "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/")
+-    else()
+-        SET(vcpkg_lib_folder "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/")
++        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/99-megacmd-inotify-limit.conf
++            DESTINATION "etc/sysctl.d"
++            )
+     endif()
+-    install(DIRECTORY "${vcpkg_lib_folder}"
++
++    if(VCPKG_ROOT)
++        #Install vcpkg dynamic libraries in locations defined by GNUInstallDirs.
++        if(CMAKE_BUILD_TYPE STREQUAL "Debug")
++            SET(vcpkg_lib_folder "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/")
++        else()
++            SET(vcpkg_lib_folder "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/")
++        endif()
++        install(DIRECTORY "${vcpkg_lib_folder}"
+             DESTINATION ${CMAKE_INSTALL_LIBDIR}
+             FILES_MATCHING
+             PATTERN "lib*.so*"
+             PATTERN "*dylib*" #macOS
+             PATTERN "manual-link" EXCLUDE
+             PATTERN "pkgconfig" EXCLUDE)
++    endif()
+ endif() #not WIN32
diff --git a/megacmd/patches/patch-build_cmake_modules_megacmd__libraries.cmake b/megacmd/patches/patch-build_cmake_modules_megacmd__libraries.cmake
index 51873e8cb9..6ec1336732 100644
--- a/megacmd/patches/patch-build_cmake_modules_megacmd__libraries.cmake
+++ b/megacmd/patches/patch-build_cmake_modules_megacmd__libraries.cmake
@@ -1,5 +1,7 @@
 $NetBSD$
 
+* Fix used pcre library name
+
 --- build/cmake/modules/megacmd_libraries.cmake.orig	2025-01-30 14:04:12.000000000 +0100
 +++ build/cmake/modules/megacmd_libraries.cmake
 @@ -16,7 +16,7 @@ macro(load_megacmdserver_libraries)
diff --git a/megacmd/patches/patch-sdk_cmake_config.h.in b/megacmd/patches/patch-sdk_cmake_config.h.in
index 4db4d9f363..770bf49b22 100644
--- a/megacmd/patches/patch-sdk_cmake_config.h.in
+++ b/megacmd/patches/patch-sdk_cmake_config.h.in
@@ -1,5 +1,7 @@
 $NetBSD$
 
+* Not define USE_INOTIFY on BSDs
+
 --- sdk/cmake/config.h.in.orig	2025-02-06 17:13:17.062965383 +0100
 +++ sdk/cmake/config.h.in
 @@ -229,7 +229,8 @@
diff --git a/megacmd/patches/patch-sdk_cmake_modules_sdklib__libraries.cmake b/megacmd/patches/patch-sdk_cmake_modules_sdklib__libraries.cmake
index ee741280c0..75b56e22c9 100644
--- a/megacmd/patches/patch-sdk_cmake_modules_sdklib__libraries.cmake
+++ b/megacmd/patches/patch-sdk_cmake_modules_sdklib__libraries.cmake
@@ -1,5 +1,7 @@
 $NetBSD$
 
+* Fix to find libcrypto++
+
 --- sdk/cmake/modules/sdklib_libraries.cmake.orig	2025-01-24 13:56:57.000000000 +0100
 +++ sdk/cmake/modules/sdklib_libraries.cmake
 @@ -95,7 +95,7 @@ macro(load_sdklib_libraries)
diff --git a/megacmd/patches/patch-sdk_cmake_modules_sdklib__target.cmake b/megacmd/patches/patch-sdk_cmake_modules_sdklib__target.cmake
index 1c5ed52e92..e0e45f3616 100644
--- a/megacmd/patches/patch-sdk_cmake_modules_sdklib__target.cmake
+++ b/megacmd/patches/patch-sdk_cmake_modules_sdklib__target.cmake
@@ -1,5 +1,7 @@
 $NetBSD$
 
+* On gcc-10 std::filesystem is in stdc++
+
 --- sdk/cmake/modules/sdklib_target.cmake.orig	2025-02-07 10:00:44.872621812 +0100
 +++ sdk/cmake/modules/sdklib_target.cmake
 @@ -358,7 +358,7 @@ endif()
diff --git a/megacmd/patches/patch-sdk_include_mega_posix_megafs.h b/megacmd/patches/patch-sdk_include_mega_posix_megafs.h
index 8a5b5d6aa1..582389cd98 100644
--- a/megacmd/patches/patch-sdk_include_mega_posix_megafs.h
+++ b/megacmd/patches/patch-sdk_include_mega_posix_megafs.h
@@ -1,5 +1,7 @@
 $NetBSD$
 
+* BSDFileSystemAccess for BSDs
+
 --- sdk/include/mega/posix/megafs.h.orig	2025-01-24 13:56:57.000000000 +0100
 +++ sdk/include/mega/posix/megafs.h
 @@ -192,8 +192,7 @@ private:
diff --git a/megacmd/patches/patch-sdk_include_megaapi__impl.h b/megacmd/patches/patch-sdk_include_megaapi__impl.h
index 606d83e15d..28956872d5 100644
--- a/megacmd/patches/patch-sdk_include_megaapi__impl.h
+++ b/megacmd/patches/patch-sdk_include_megaapi__impl.h
@@ -1,5 +1,7 @@
 $NetBSD$
 
+* Use BSDFileSystemAccess on BSDs
+
 --- sdk/include/megaapi_impl.h.orig	2025-02-06 18:38:02.113595808 +0100
 +++ sdk/include/megaapi_impl.h
 @@ -90,8 +90,10 @@ class MegaSemaphore : public CppSemaphor
diff --git a/megacmd/patches/patch-sdk_src_posix_fs.cpp b/megacmd/patches/patch-sdk_src_posix_fs.cpp
index aec1de111f..a0b14dc30e 100644
--- a/megacmd/patches/patch-sdk_src_posix_fs.cpp
+++ b/megacmd/patches/patch-sdk_src_posix_fs.cpp
@@ -1,6 +1,8 @@
 $NetBSD: patch-sdk_src_posix_fs.cpp,v 1.2 2024/06/18 18:23:15 bsiegert Exp $
 
-Fix build on NetBSD, use statvfs
+* Fix build on NetBSD, use statvfs
+* Don't use mntent features on BSDs
+* O_NOATIME not available on BSDs
 
 --- sdk/src/posix/fs.cpp.orig	2025-01-24 13:56:57.000000000 +0100
 +++ sdk/src/posix/fs.cpp
@@ -60,13 +62,51 @@ Fix build on NetBSD, use statvfs
          int fd = ::open(path, O_RDONLY) ;
  #else
          // for sync in particular, try to open without setting access-time
-@@ -2061,7 +2083,8 @@ ScanResult PosixFileSystemAccess::direct
-     return SCAN_SUCCESS;
+@@ -2062,6 +2084,7 @@ ScanResult PosixFileSystemAccess::direct
  }
  
--#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && \
-+    !defined(__NetBSD__) && !defined(__DragonFly__)
+ #ifndef __APPLE__
++#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
  
  // Determine which device contains the specified path.
  static std::string deviceOf(const std::string& database,
+@@ -2230,6 +2253,7 @@ static std::string deviceOf(const std::s
+     // No database has a mapping for this path.
+     return std::string();
+ }
++#endif
+ 
+ // Compute legacy filesystem fingerprint.
+ static std::uint64_t fingerprintOf(const std::string& path)
+@@ -2258,6 +2282,7 @@ static std::uint64_t fingerprintOf(const
+     return ++value;
+ }
+ 
++#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
+ // Determine the UUID of the specified device.
+ static std::string uuidOf(const std::string& device)
+ {
+@@ -2334,6 +2359,7 @@ static std::string uuidOf(const std::str
+     // Couldn't determine device's UUID.
+     return std::string();
+ }
++#endif
+ 
+ fsfp_t FileSystemAccess::fsFingerprint(const LocalPath& path) const
+ {
+@@ -2344,6 +2370,7 @@ fsfp_t FileSystemAccess::fsFingerprint(c
+     if (!fingerprint)
+         return fsfp_t();
+ 
++#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
+     // What device contains the specified path?
+     auto device = deviceOf(path.localpath);
+ 
+@@ -2360,6 +2387,7 @@ fsfp_t FileSystemAccess::fsFingerprint(c
+ 
+     LOG_warn << "Falling back to legacy filesystem fingerprint: "
+              << path;
++#endif
+ 
+     // Couldn't determine filesystem UUID.
+     return fsfp_t(fingerprint, std::string());
diff --git a/megacmd/patches/patch-src_megacmdcommonutils.cpp b/megacmd/patches/patch-src_megacmdcommonutils.cpp
index c9b882bebe..53323eea51 100644
--- a/megacmd/patches/patch-src_megacmdcommonutils.cpp
+++ b/megacmd/patches/patch-src_megacmdcommonutils.cpp
@@ -1,5 +1,7 @@
 $NetBSD$
 
+* BSDs use the functions of linux
+
 --- src/megacmdcommonutils.cpp.orig	2025-02-07 09:43:13.320748794 +0100
 +++ src/megacmdcommonutils.cpp
 @@ -1128,7 +1128,8 @@ bool isValidEmail(string email)
diff --git a/megacmd/patches/patch-src_megacmdcommonutils.h b/megacmd/patches/patch-src_megacmdcommonutils.h
index d73aa53a53..b49d088b11 100644
--- a/megacmd/patches/patch-src_megacmdcommonutils.h
+++ b/megacmd/patches/patch-src_megacmdcommonutils.h
@@ -1,5 +1,7 @@
 $NetBSD$
 
+* BSDs use the functions of linux
+
 --- src/megacmdcommonutils.h.orig	2025-02-07 09:44:39.977015171 +0100
 +++ src/megacmdcommonutils.h
 @@ -269,7 +269,8 @@ void sleepMilliSeconds(long microseconds
diff --git a/megacmd/patches/patch-src_megacmdshell_megacmdshellcommunications.cpp b/megacmd/patches/patch-src_megacmdshell_megacmdshellcommunications.cpp
index 74c213f75e..9ff49da4fc 100644
--- a/megacmd/patches/patch-src_megacmdshell_megacmdshellcommunications.cpp
+++ b/megacmd/patches/patch-src_megacmdshell_megacmdshellcommunications.cpp
@@ -1,7 +1,6 @@
 $NetBSD: patch-src_megacmdshell_megacmdshellcommunications.cpp,v 1.1 2024/06/18 18:23:15 bsiegert Exp $
 
-Fix include on BSDs
-Upstream pull req: https://github.com/meganz/MEGAcmd/pull/949
+* Fix include on BSDs
 
 --- src/megacmdshell/megacmdshellcommunications.cpp.orig	2024-05-20 12:29:43.000000000 +0000
 +++ src/megacmdshell/megacmdshellcommunications.cpp
Prev by Date: Makefile: + boron
Next by Date: gcc14-gnat-libs: minor fixes
Previous by Thread: Makefile: + boron
Next by Thread: gcc14-gnat-libs: minor fixes
Indexes:
Home | Main Index | Thread Index | Old Index