pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
megacmd: update to 2.0.0, broken yet
Module Name: pkgsrc-wip
Committed By: kikadf <kikadf.01%gmail.com@localhost>
Pushed By: kikadf
Date: Fri Feb 7 13:37:03 2025 +0100
Changeset: c6abbbd08653a8f8412dc139ded8e8c38b2e40f4
Modified Files:
megacmd/Makefile
megacmd/distinfo
megacmd/patches/patch-sdk_include_mega_posix_megafs.h
megacmd/patches/patch-sdk_src_posix_fs.cpp
Added Files:
megacmd/TODO
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_megaapi__impl.h
megacmd/patches/patch-src_megacmdcommonutils.cpp
megacmd/patches/patch-src_megacmdcommonutils.h
Removed Files:
megacmd/patches/patch-Makefile.am
megacmd/patches/patch-configure.ac
megacmd/patches/patch-sdk_Makefile.am
megacmd/patches/patch-sdk_configure.ac
megacmd/patches/patch-sdk_include_mega_http.h
megacmd/patches/patch-sdk_include_mega_posix_megasys.h
megacmd/patches/patch-sdk_src_http.cpp
megacmd/patches/patch-sdk_src_include.am
megacmd/patches/patch-src_include.am
Log Message:
megacmd: update to 2.0.0, broken yet
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c6abbbd08653a8f8412dc139ded8e8c38b2e40f4
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
megacmd/Makefile | 46 ++++---
megacmd/TODO | 1 +
megacmd/distinfo | 33 +++--
megacmd/patches/patch-CMakeLists.txt | 23 ++++
megacmd/patches/patch-Makefile.am | 22 ---
...ch-build_cmake_modules_megacmd__libraries.cmake | 13 ++
megacmd/patches/patch-configure.ac | 38 ------
megacmd/patches/patch-sdk_Makefile.am | 22 ---
megacmd/patches/patch-sdk_cmake_config.h.in | 14 ++
...patch-sdk_cmake_modules_sdklib__libraries.cmake | 13 ++
.../patch-sdk_cmake_modules_sdklib__target.cmake | 13 ++
megacmd/patches/patch-sdk_configure.ac | 149 ---------------------
megacmd/patches/patch-sdk_include_mega_http.h | 16 ---
.../patches/patch-sdk_include_mega_posix_megafs.h | 45 +++++--
.../patches/patch-sdk_include_mega_posix_megasys.h | 17 ---
megacmd/patches/patch-sdk_include_megaapi__impl.h | 16 +++
megacmd/patches/patch-sdk_src_http.cpp | 20 ---
megacmd/patches/patch-sdk_src_include.am | 24 ----
megacmd/patches/patch-sdk_src_posix_fs.cpp | 66 ++++++++-
megacmd/patches/patch-src_include.am | 15 ---
megacmd/patches/patch-src_megacmdcommonutils.cpp | 14 ++
megacmd/patches/patch-src_megacmdcommonutils.h | 14 ++
22 files changed, 255 insertions(+), 379 deletions(-)
diffs:
diff --git a/megacmd/Makefile b/megacmd/Makefile
index a4f63a406b..4ccbf095d3 100644
--- a/megacmd/Makefile
+++ b/megacmd/Makefile
@@ -1,12 +1,11 @@
# $NetBSD: Makefile,v 1.9 2025/01/27 12:09:02 wiz Exp $
-DISTNAME= megacmd-1.7.0
-PKGREVISION= 4
+DISTNAME= megacmd-2.0.0
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_GITHUB:=meganz/}
GITHUB_PROJECT= MEGAcmd
GITHUB_TAG= ${PKGVERSION_NOREV}_Linux
-SDK_VERSION= v4.31.0b
+SDK_VERSION= v8.3.1
GITHUB_SUBMODULES= meganz sdk ${SDK_VERSION} sdk
@@ -20,31 +19,36 @@ USE_LANGUAGES+= c c++
USE_CXX_FEATURES+= filesystem
FORCE_CXX_STD= c++17
USE_LIBTOOL= yes
-USE_TOOLS+= autoreconf autoconf automake gmake
-GNU_CONFIGURE= yes
+#USE_TOOLS+= autoreconf autoconf automake gmake
+USE_TOOLS+= pkg-config
+#GNU_CONFIGURE= yes
REPLACE_SH= src/client/mega-*
CXXFLAGS+= -DCRYPTOPP_DISABLE_ASM
-CONFIGURE_ARGS+= --disable-examples
-CONFIGURE_ARGS+= --disable-java
-CONFIGURE_ARGS+= --disable-php
-CONFIGURE_ARGS+= --disable-python
-CONFIGURE_ARGS+= --disable-chat
-CONFIGURE_ARGS+= --without-freeimage
-CONFIGURE_ARGS+= --without-termcap
-CONFIGURE_ARGS+= --without-ffmpeg
-CONFIGURE_ARGS+= --without-libraw
-CONFIGURE_ARGS+= --without-libzen
-CONFIGURE_ARGS+= --without-libmediainfo
-CONFIGURE_ARGS+= --without-rt
-CONFIGURE_ARGS+= --enable-gcc-hardening
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DFULL_REQS=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_MEDIAINFO=OFF
+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
+#pre-configure:
+# cd ${WRKSRC} && ${SH} autogen.sh
post-install:
${MV} ${DESTDIR}${PREFIX}/share/bash-completion/completions/megacmd_completion.sh \
@@ -52,9 +56,11 @@ post-install:
${INSTALL_DATA} ${FILESDIR}/README ${DESTDIR}${PREFIX}/share/doc/megacmd
.include "../../databases/sqlite3/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
.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/TODO b/megacmd/TODO
new file mode 100644
index 0000000000..1bbdf02820
--- /dev/null
+++ b/megacmd/TODO
@@ -0,0 +1 @@
+broken= mntent
diff --git a/megacmd/distinfo b/megacmd/distinfo
index 15e6ea5217..ed0f06781e 100644
--- a/megacmd/distinfo
+++ b/megacmd/distinfo
@@ -1,20 +1,19 @@
$NetBSD: distinfo,v 1.2 2024/06/18 18:23:15 bsiegert Exp $
-BLAKE2s (megacmd-1.7.0.tar.gz) = 3b0008daa28b220ae909c491aebce7fd32a595607744acf7f7b0a6cef3a956c0
-SHA512 (megacmd-1.7.0.tar.gz) = 9e29a318d062a7d01d2a7e7e7655ef3adf079f2ff64c2eee3c035816821f9c981411f3676c8749a6fc51c44fad06a1428b1db0d6b61f32be5e222553bd9bb0dd
-Size (megacmd-1.7.0.tar.gz) = 2124305 bytes
-BLAKE2s (meganz-sdk-v4.31.0b.tar.gz) = ca471a7fc6fbcb3a5cea04aff2bfedcd77d33ca6cfd741f3954381f9bfc1af94
-SHA512 (meganz-sdk-v4.31.0b.tar.gz) = 525fbdb7bb4bb6e02cc0268a788f744258e41bb39e78c33c3ac1d21c54ad78a630775aa4440529cc3faa4c0679db0a72161f856c49e15d721487a748a0a08969
-Size (meganz-sdk-v4.31.0b.tar.gz) = 3592431 bytes
-SHA1 (patch-Makefile.am) = 68b2a67c0b3ddac4b247fc6e0f6dd7ab068d90bd
-SHA1 (patch-configure.ac) = e05d9a14c7190f450bbb7264fa3641a8b50b3c7f
-SHA1 (patch-sdk_Makefile.am) = 3b83578498bf2917116bc18b31adf09f0c46d9b8
-SHA1 (patch-sdk_configure.ac) = ed55c46f0614a5acc5ea3edc69934fb72f5afd46
-SHA1 (patch-sdk_include_mega_http.h) = a3845e17a6bb5ea9985f1a7de152f1c43a1767ec
-SHA1 (patch-sdk_include_mega_posix_megafs.h) = cee06d1b594588a9fb2c07828d436c74188022e5
-SHA1 (patch-sdk_include_mega_posix_megasys.h) = 02b6259c8932163dee52baeec5e1e07003288279
-SHA1 (patch-sdk_src_http.cpp) = 85b1ef20d4f512e38e336cb4ca2cfbe74372e040
-SHA1 (patch-sdk_src_include.am) = 93eae44fc1fa3ec6f621c7aba8266d63ec835ad7
-SHA1 (patch-sdk_src_posix_fs.cpp) = fdf5129f54a65d3bc52e9a6c6b2e76fdc40026e2
-SHA1 (patch-src_include.am) = 6a7d0dc05a23463066fa74434af1af18f18e0885
+BLAKE2s (megacmd-2.0.0.tar.gz) = 46f5f94b6cb1af5dbdb8afb595608f88a14727f33c7aea46a0604fb8c3037b86
+SHA512 (megacmd-2.0.0.tar.gz) = a0ff37c33de492f0751d27f46bd83f506314f43985a247e1fe0de7683f3a8bfc059d05441816147acbda95b349b4d39e56cdac5f3893b697cda4f77efb197ce4
+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
diff --git a/megacmd/patches/patch-CMakeLists.txt b/megacmd/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000000..5d0f4a0cdd
--- /dev/null
+++ b/megacmd/patches/patch-CMakeLists.txt
@@ -0,0 +1,23 @@
+$NetBSD$
+
+--- 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
+ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/build/cmake/modules) # Modules from MEGAcmd
+ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/sdk/cmake/modules) # Modules from MEGAsdk
+
+-set(VCPKG_ROOT "${CMAKE_CURRENT_LIST_DIR}/../vcpkg" CACHE PATH "If set, it will build and use the VCPKG packages defined in the manifest file")
++#set(VCPKG_ROOT "${CMAKE_CURRENT_LIST_DIR}/../vcpkg" CACHE PATH "If set, it will build and use the VCPKG packages defined in the manifest file")
++set(VCPKG_ROOT "" CACHE PATH "If set, it will build and use the VCPKG packages defined in the manifest file")
+
+ include(detect_host_architecture)
+
+@@ -39,7 +40,7 @@ execute_process(
+ )
+ endif()
+
+-if((NOT WIN32 OR BASH_VERSION_RESULT EQUAL 0) AND NOT EXISTS ${VCPKG_ROOT})
++if(VCPKG_ROOT AND (NOT WIN32 OR BASH_VERSION_RESULT EQUAL 0) AND NOT EXISTS ${VCPKG_ROOT})
+ 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
diff --git a/megacmd/patches/patch-Makefile.am b/megacmd/patches/patch-Makefile.am
deleted file mode 100644
index faa9b68de3..0000000000
--- a/megacmd/patches/patch-Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-Makefile.am,v 1.2 2024/06/18 18:23:15 bsiegert Exp $
-
-Add --tag=CXX libtool flag on NetBSD and Dragonfly.
-Upstream pull req: https://github.com/meganz/MEGAcmd/pull/949
-
---- Makefile.am.orig 2024-05-20 12:29:43.000000000 +0000
-+++ Makefile.am
-@@ -39,6 +39,14 @@ if LINUX
- AM_LIBTOOLFLAGS="--tag=CXX"
- endif
-
-+if DRAGONFLY
-+AM_LIBTOOLFLAGS="--tag=CXX"
-+endif
-+
-+if NETBSD
-+AM_LIBTOOLFLAGS="--tag=CXX"
-+endif
-+
- VERSION_INFO=$(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-
- CLEANFILES=
diff --git a/megacmd/patches/patch-build_cmake_modules_megacmd__libraries.cmake b/megacmd/patches/patch-build_cmake_modules_megacmd__libraries.cmake
new file mode 100644
index 0000000000..51873e8cb9
--- /dev/null
+++ b/megacmd/patches/patch-build_cmake_modules_megacmd__libraries.cmake
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- 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)
+ find_package(PkgConfig REQUIRED) # For libraries loaded using pkg-config
+
+ if(USE_PCRE) #TODO: UNTESTED!
+- pkg_check_modules(pcre REQUIRED IMPORTED_TARGET libpcre)
++ pkg_check_modules(pcre REQUIRED IMPORTED_TARGET libpcrecpp)
+ target_link_libraries(LMegacmdServer PRIVATE PkgConfig::pcre)
+ set(USE_PCRE 1)
+ endif()
diff --git a/megacmd/patches/patch-configure.ac b/megacmd/patches/patch-configure.ac
deleted file mode 100644
index dcf3682fa1..0000000000
--- a/megacmd/patches/patch-configure.ac
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.1 2024/06/18 18:23:15 bsiegert Exp $
-
-Add NetBSD and DragonFly support to configure script.
-Upstream pull req: https://github.com/meganz/MEGAcmd/pull/949
-
---- configure.ac.orig 2024-05-20 12:29:43.000000000 +0000
-+++ configure.ac
-@@ -209,6 +209,8 @@ WIN32=no
- DARWIN=no
- ANDROID=no
- LINUX=no
-+DRAGONFLY=no
-+NETBSD=no
- AC_MSG_CHECKING([if building for Win32 platform])
- case $host in
- *-*-cygwin*)
-@@ -231,6 +233,12 @@ case $host in
- *-linux*)
- LINUX=yes
- ;;
-+ *-dragonfly*)
-+ DRAGONFLY=yes
-+ ;;
-+ *-netbsd*)
-+ NETBSD=yes
-+ ;;
- *)
- LIBS_EXTRA=""
- ;;
-@@ -240,6 +248,8 @@ AM_CONDITIONAL([WIN32], [test "${WIN32}"
- AM_CONDITIONAL([DARWIN], [test "${DARWIN}" = "yes"])
- AM_CONDITIONAL([ANDROID], [test "${ANDROID}" = "yes"])
- AM_CONDITIONAL([LINUX], [test "${LINUX}" = "yes"])
-+AM_CONDITIONAL([DRAGONFLY], [test "${DRAGONFLY}" = "yes"])
-+AM_CONDITIONAL([NETBSD], [test "${NETBSD}" = "yes"])
-
- SAVE_LDFLAGS=$LDFLAGS
- SAVE_CXXFLAGS=$CXXFLAGS
diff --git a/megacmd/patches/patch-sdk_Makefile.am b/megacmd/patches/patch-sdk_Makefile.am
deleted file mode 100644
index f55a9fcb34..0000000000
--- a/megacmd/patches/patch-sdk_Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-sdk_Makefile.am,v 1.2 2024/06/18 18:23:15 bsiegert Exp $
-
-Add --tag=CXX libtool flag on NetBSD and DragonFly
-Upstream pull req: https://github.com/meganz/sdk/pull/2663
-
---- sdk/Makefile.am.orig 2024-05-17 14:19:43.000000000 +0000
-+++ sdk/Makefile.am
-@@ -46,6 +46,14 @@ if LINUX
- AM_LIBTOOLFLAGS="--tag=CXX"
- endif
-
-+if DRAGONFLY
-+AM_LIBTOOLFLAGS="--tag=CXX"
-+endif
-+
-+if NETBSD
-+AM_LIBTOOLFLAGS="--tag=CXX"
-+endif
-+
- VERSION_INFO=$(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-
- CLEANFILES=
diff --git a/megacmd/patches/patch-sdk_cmake_config.h.in b/megacmd/patches/patch-sdk_cmake_config.h.in
new file mode 100644
index 0000000000..4db4d9f363
--- /dev/null
+++ b/megacmd/patches/patch-sdk_cmake_config.h.in
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- sdk/cmake/config.h.in.orig 2025-02-06 17:13:17.062965383 +0100
++++ sdk/cmake/config.h.in
+@@ -229,7 +229,8 @@
+ #define USE_DB 0
+
+ /* Use inotify API */
+-#if !defined(__APPLE__) && !defined(_WIN32)
++#if !defined(__APPLE__) && !defined(_WIN32) && !defined(__FreeBSD__) && \
++ !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
+ #define USE_INOTIFY 1
+ #endif
+
diff --git a/megacmd/patches/patch-sdk_cmake_modules_sdklib__libraries.cmake b/megacmd/patches/patch-sdk_cmake_modules_sdklib__libraries.cmake
new file mode 100644
index 0000000000..ee741280c0
--- /dev/null
+++ b/megacmd/patches/patch-sdk_cmake_modules_sdklib__libraries.cmake
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- 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)
+
+ find_package(PkgConfig REQUIRED) # For libraries loaded using pkg-config
+
+- pkg_check_modules(cryptopp REQUIRED IMPORTED_TARGET libcrypto++)
++ pkg_check_modules(cryptopp REQUIRED IMPORTED_TARGET libcryptopp)
+ target_link_libraries(SDKlib PUBLIC PkgConfig::cryptopp) # TODO: Private for SDK core
+
+ pkg_check_modules(sodium REQUIRED IMPORTED_TARGET libsodium)
diff --git a/megacmd/patches/patch-sdk_cmake_modules_sdklib__target.cmake b/megacmd/patches/patch-sdk_cmake_modules_sdklib__target.cmake
new file mode 100644
index 0000000000..1c5ed52e92
--- /dev/null
+++ b/megacmd/patches/patch-sdk_cmake_modules_sdklib__target.cmake
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- 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()
+ load_sdklib_libraries()
+
+ # System libraries
+-if((NOT (WIN32 OR APPLE OR ANDROID)) AND CMAKE_CXX_STANDARD LESS_EQUAL 17)
++if((NOT (WIN32 OR APPLE OR ANDROID OR UNIX)) AND CMAKE_CXX_STANDARD LESS_EQUAL 17)
+ # Needed for std::experimental::filesystem
+ # Needed for c++17 and std::filesystem for some compilers. Not needed starting in gcc9, but harmless.
+ target_link_libraries(SDKlib PRIVATE stdc++fs)
diff --git a/megacmd/patches/patch-sdk_configure.ac b/megacmd/patches/patch-sdk_configure.ac
deleted file mode 100644
index 57669e433b..0000000000
--- a/megacmd/patches/patch-sdk_configure.ac
+++ /dev/null
@@ -1,149 +0,0 @@
-$NetBSD: patch-sdk_configure.ac,v 1.2 2024/06/18 18:23:15 bsiegert Exp $
-
-Add NetBSD and DragonFly support.
-Upstream pull req: https://github.com/meganz/sdk/pull/2663
-
-Add --with-rt=... configure option, syncing with aio_write
-doesn't work on NetBSD, workaround build without rt support.
-Upstream pull req: https://github.com/meganz/sdk/pull/2665
-
---- sdk/configure.ac.orig 2024-05-17 14:19:43.000000000 +0000
-+++ sdk/configure.ac
-@@ -208,6 +208,8 @@ WIN32=no
- DARWIN=no
- ANDROID=no
- LINUX=no
-+DRAGONFLY=no
-+NETBSD=no
- AC_MSG_CHECKING([platform options])
- case $host in
- *-*-cygwin*)
-@@ -238,6 +240,12 @@ case $host in
- *-linux*)
- LINUX=yes
- ;;
-+ *-dragonfly*)
-+ DRAGONFLY=yes
-+ ;;
-+ *-netbsd*)
-+ NETBSD=yes
-+ ;;
- *)
- LIBS_EXTRA=""
- ;;
-@@ -247,6 +255,8 @@ AM_CONDITIONAL([WIN32], [test "${WIN32}"
- AM_CONDITIONAL([DARWIN], [test "${DARWIN}" = "yes"])
- AM_CONDITIONAL([ANDROID], [test "${ANDROID}" = "yes"])
- AM_CONDITIONAL([LINUX], [test "${LINUX}" = "yes"])
-+AM_CONDITIONAL([DRAGONFLY], [test "${DRAGONFLY}" = "yes"])
-+AM_CONDITIONAL([NETBSD], [test "${NETBSD}" = "yes"])
-
- AC_SUBST(LIBS_EXTRA)
-
-@@ -1369,6 +1379,7 @@ AM_CONDITIONAL([USE_LIBMEDIAINFO], [test
- #
- openssl=false
- cares=false
-+rt=undef
- if test "x$WIN32" = "xno" ; then
-
- AC_ARG_WITH([poll],
-@@ -1381,12 +1392,71 @@ if test "x$WIN32" = "xno" ; then
- LDFLAGS="-pthread $LDFLAGS"
- fi
-
-- # librt #TODO: allow --with-rt=...
-- AC_CHECK_LIB([rt], [aio_write], [
-- SAVE_LDFLAGS="-lrt $SAVE_LDFLAGS"
-- LDFLAGS="-lrt $LDFLAGS"
-- AC_DEFINE(HAVE_AIO_RT, [1], [Define to indicate AIO presence in librt])
-- ],
-+ # librt
-+ AC_MSG_CHECKING(for rt)
-+ AC_ARG_WITH([rt],
-+ AS_HELP_STRING(--with-rt=PATH, base of Real-time Library installation),
-+ [
-+ case $with_rt in
-+ no)
-+ AC_MSG_RESULT([no])
-+
-+ rt=false
-+ ;;
-+ yes)
-+ AC_CHECK_HEADERS([aio.h], [],
-+ AC_MSG_ERROR([aio.h header not found or not usable])
-+ )
-+ AC_CHECK_LIB(rt, [aio_write], [LIBRT_LIBS="$LIBRT_LIBS -lrt"],
-+ AC_MSG_ERROR([Could not find rt library!])
-+ )
-+
-+ AC_SUBST(LIBRT_LIBS)
-+ rt=true
-+ ;;
-+ *)
-+ # determine if library is installed
-+ if test -d "$with_rt/lib"; then
-+ LDFLAGS="-L$with_rt/lib $LDFLAGS"
-+ CXXFLAGS="-I$with_rt/include $CXXFLAGS"
-+
-+ AC_CHECK_HEADERS([aio.h], [
-+ LIBRT_LDFLAGS="-L$with_rt/lib"
-+ LIBRT_CXXFLAGS="-I$with_rt/include"],
-+ AC_MSG_ERROR([aio.h header not found or not usable])
-+ )
-+
-+ AC_CHECK_LIB(rt, [aio_write], [LIBRT_LIBS="$LIBRT_LIBS -lrt"],
-+ AC_MSG_ERROR([Could not find rt library!])
-+ )
-+ else
-+ AC_MSG_ERROR([Could not find rt library in "$with_rt/lib"!])
-+ fi
-+
-+ AC_SUBST(LIBRT_LDFLAGS)
-+ AC_SUBST(LIBRT_CXXFLAGS)
-+ AC_SUBST(LIBRT_LIBS)
-+ rt=true
-+
-+ #restore
-+ LDFLAGS=$SAVE_LDFLAGS
-+ CXXFLAGS=$SAVE_CXXFLAGS
-+ ;;
-+ esac
-+ ],
-+ [
-+ AC_MSG_RESULT([--with-rt not specified])
-+
-+ AC_CHECK_HEADERS([aio.h], [],
-+ AC_MSG_ERROR([aio.h header not found or not usable])
-+ )
-+ AC_CHECK_LIB(rt, [aio_write], [LIBRT_LIBS="$LIBRT_LIBS -lrt"],
-+ AC_MSG_NOTICE([Could not find librt])
-+ )
-+
-+ AC_SUBST(LIBRT_LIBS)
-+ rt=true
-+ ]
- )
-
- # OpenSSL
-@@ -1617,6 +1687,12 @@ if test "x$WIN32" = "xno" ; then
- fi
-
- # define on all platforms
-+AM_CONDITIONAL(HAVE_RT, test x$rt = xtrue)
-+if test "x$rt" = "xtrue" ; then
-+ AC_DEFINE(HAVE_AIO_RT, [1], [Define to indicate AIO presence in librt])
-+fi
-+
-+# define on all platforms
- AM_CONDITIONAL(HAVE_OPENSSL, test x$openssl = xtrue)
- if test "x$openssl" = "xtrue" ; then
- AC_DEFINE(USE_OPENSSL, [1], [Define to use OpenSSL])
-@@ -2308,6 +2384,7 @@ AC_MSG_NOTICE([Configured to build Mega
- PCRE: $PCRE_CXXFLAGS $PCRE_LDFLAGS $PCRE_LIBS
- LIBUV: $LIBUV_CXXFLAGS $LIBUV_LDFLAGS $LIBUV_LIBS
- LIBRAW: $LIBRAW_CXXFLAGS $LIBRAW_LDFLAGS $LIBRAW_LIBS
-+ LIBRT: $LIBRT_CXXFLAGS $LIBRT_LDFLAGS $LIBRT_LIBS
- LIBMEDIAINFO: $LIBMEDIAINFO_CXXFLAGS $LIBMEDIAINFO_LDFLAGS $LIBMEDIAINFO_LIBS
- FFMPEG: $FFMPEG_CXXFLAGS $FFMPEG_LDFLAGS $FFMPEG_LIBS
-
diff --git a/megacmd/patches/patch-sdk_include_mega_http.h b/megacmd/patches/patch-sdk_include_mega_http.h
deleted file mode 100644
index 5f54538713..0000000000
--- a/megacmd/patches/patch-sdk_include_mega_http.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-sdk_include_mega_http.h,v 1.1 2024/06/18 18:23:15 bsiegert Exp $
-
-Add support to other BSDs.
-Upstream pull req: https://github.com/meganz/sdk/pull/2662
-
---- sdk/include/mega/http.h.orig 2024-05-17 14:19:43.000000000 +0000
-+++ sdk/include/mega/http.h
-@@ -42,7 +42,7 @@
- #pragma warning(pop)
- #endif
-
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- #include <netinet/in.h>
- #endif
-
diff --git a/megacmd/patches/patch-sdk_include_mega_posix_megafs.h b/megacmd/patches/patch-sdk_include_mega_posix_megafs.h
index 173977c6b7..8a5b5d6aa1 100644
--- a/megacmd/patches/patch-sdk_include_mega_posix_megafs.h
+++ b/megacmd/patches/patch-sdk_include_mega_posix_megafs.h
@@ -1,16 +1,33 @@
-$NetBSD: patch-sdk_include_mega_posix_megafs.h,v 1.1 2024/06/18 18:23:15 bsiegert Exp $
+$NetBSD$
-Add support to other BSDs.
-Upstream pull req: https://github.com/meganz/sdk/pull/2662
-
---- sdk/include/mega/posix/megafs.h.orig 2024-05-17 14:19:43.000000000 +0000
+--- sdk/include/mega/posix/megafs.h.orig 2025-01-24 13:56:57.000000000 +0100
+++ sdk/include/mega/posix/megafs.h
-@@ -32,7 +32,7 @@
- #define O_DIRECT 0
- #include <sys/param.h>
- #include <sys/mount.h>
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- #include <sys/mount.h>
- #else
- #include <sys/vfs.h>
+@@ -192,8 +192,7 @@ private:
+
+ };
+
+-#ifdef __linux__
+-
++#if defined(__linux__)
+ #define FSACCESS_CLASS LinuxFileSystemAccess
+
+ class LinuxFileSystemAccess
+@@ -260,6 +259,18 @@ private:
+
+ #endif // ENABLE_SYNC
+
++#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
++#define FSACCESS_CLASS BSDFileSystemAccess
++
++class BSDFileSystemAccess
++ : public PosixFileSystemAccess
++{
++public:
++ ~BSDFileSystemAccess();
++ void addevents(Waiter* waiter, int flags) override;
++ int checkevents(Waiter* waiter) override;
++};
++
+ #endif // __linux__
+
+ } // namespace
diff --git a/megacmd/patches/patch-sdk_include_mega_posix_megasys.h b/megacmd/patches/patch-sdk_include_mega_posix_megasys.h
deleted file mode 100644
index ac15d903d6..0000000000
--- a/megacmd/patches/patch-sdk_include_mega_posix_megasys.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-sdk_include_mega_posix_megasys.h,v 1.1 2024/06/18 18:23:15 bsiegert Exp $
-
-Add support to other BSDs.
-Upstream pull req: https://github.com/meganz/sdk/pull/2662
-
---- sdk/include/mega/posix/megasys.h.orig 2024-05-17 14:19:43.000000000 +0000
-+++ sdk/include/mega/posix/megasys.h
-@@ -99,7 +99,8 @@
- #include <endian.h>
- #endif
-
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__minix)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__minix) || \
-+ defined(__OpenBSD__)
- #include <sys/endian.h>
- #endif
-
diff --git a/megacmd/patches/patch-sdk_include_megaapi__impl.h b/megacmd/patches/patch-sdk_include_megaapi__impl.h
new file mode 100644
index 0000000000..606d83e15d
--- /dev/null
+++ b/megacmd/patches/patch-sdk_include_megaapi__impl.h
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- 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
+ class MegaWaiter : public PosixWaiter {};
+ #ifdef __APPLE__
+ class MegaFileSystemAccess : public MacFileSystemAccess {};
+- #else
++ #elif defined(__linux__)
+ class MegaFileSystemAccess : public LinuxFileSystemAccess {};
++ #else
++ class MegaFileSystemAccess : public BSDFileSystemAccess {};
+ #endif
+ #endif
+
diff --git a/megacmd/patches/patch-sdk_src_http.cpp b/megacmd/patches/patch-sdk_src_http.cpp
deleted file mode 100644
index f8377f55b7..0000000000
--- a/megacmd/patches/patch-sdk_src_http.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-sdk_src_http.cpp,v 1.2 2024/06/18 18:23:15 bsiegert Exp $
-
-NetBSD and OpenBSD don't support AI_V4MAPPED.
-Upstream pull req: https://github.com/meganz/sdk/pull/2664
-
---- sdk/src/http.cpp.orig 2024-05-17 14:19:43.000000000 +0000
-+++ sdk/src/http.cpp
-@@ -270,8 +270,12 @@ void HttpIO::getMEGADNSservers(string *d
- hints.ai_family = AF_UNSPEC;
-
- #ifndef __MINGW32__
-+#if defined(__NetBSD__) || defined(__OpenBSD__)
-+ hints.ai_flags = AI_ADDRCONFIG;
-+#else
- hints.ai_flags = AI_V4MAPPED | AI_ADDRCONFIG;
- #endif
-+#endif
-
- if (!getaddrinfo("ns.mega.co.nz", NULL, &hints, &aiList))
- {
diff --git a/megacmd/patches/patch-sdk_src_include.am b/megacmd/patches/patch-sdk_src_include.am
deleted file mode 100644
index 4745e359ab..0000000000
--- a/megacmd/patches/patch-sdk_src_include.am
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-sdk_src_include.am,v 1.1 2024/06/18 18:23:15 bsiegert Exp $
-
-Handle LIBRT_* flags
-Upstream pull req: https://github.com/meganz/sdk/pull/2665
-
---- sdk/src/include.am.orig 2024-05-17 14:19:43.000000000 +0000
-+++ sdk/src/include.am
-@@ -5,14 +5,14 @@ lib_LTLIBRARIES = src/libmega.la
- if WIN32
- src_libmega_la_CXXFLAGS = -D_WIN32=1 -Iinclude/ -Iinclude/mega/win32 $(LIBS_EXTRA) $(ZLIB_CXXFLAGS) $(LIBUV_CXXFLAGS) $(LIBRAW_CXXFLAGS) $(LIBMEDIAINFO_CXXFLAGS) $(FFMPEG_CXXFLAGS) $(CRYPTO_CXXFLAGS) $(SODIUM_CXXFLAGS) $(DB_CXXFLAGS) $(CXXFLAGS) $(WINHTTP_CXXFLAGS) $(FI_CXXFLAGS) $(PDF_CXXFLAGS) $(ICU_CXXFLAGS) $(PCRE_CXXFLAGS)
- else
--src_libmega_la_CXXFLAGS = $(CARES_FLAGS) $(LIBCURL_FLAGS) $(ZLIB_CXXFLAGS) $(LIBUV_CXXFLAGS) $(LIBRAW_CXXFLAGS) $(LIBMEDIAINFO_CXXFLAGS) $(FFMPEG_CXXFLAGS) $(CRYPTO_CXXFLAGS) $(SODIUM_CXXFLAGS) $(DB_CXXFLAGS) $(FI_CXXFLAGS) $(PDF_CXXFLAGS) $(ICU_CXXFLAGS) $(LIBSSL_FLAGS) $(PCRE_CXXFLAGS)
-+src_libmega_la_CXXFLAGS = $(CARES_FLAGS) $(LIBCURL_FLAGS) $(ZLIB_CXXFLAGS) $(LIBUV_CXXFLAGS) $(LIBRAW_CXXFLAGS) $(LIBRT_CXXFLAGS) $(LIBMEDIAINFO_CXXFLAGS) $(FFMPEG_CXXFLAGS) $(CRYPTO_CXXFLAGS) $(SODIUM_CXXFLAGS) $(DB_CXXFLAGS) $(FI_CXXFLAGS) $(PDF_CXXFLAGS) $(ICU_CXXFLAGS) $(LIBSSL_FLAGS) $(PCRE_CXXFLAGS)
- endif
-
- # Libs
- if WIN32
- src_libmega_la_LIBADD = $(LIBS_EXTRA) $(FFMPEG_LDFLAGS) $(FFMPEG_LIBS) $(LIBUV_LDFLAGS) $(LIBUV_LIBS) $(LIBRAW_LDFLAGS) $(LIBRAW_LIBS) $(LIBMEDIAINFO_LDFLAGS) $(LIBMEDIAINFO_LIBS) $(ZLIB_LDFLAGS) $(ZLIB_LIBS) $(CRYPTO_LDFLAGS) $(CRYPTO_LIBS) $(SODIUM_LDFLAGS) $(SODIUM_LIBS) $(DB_LDFLAGS) $(DB_LIBS) $(WINHTTP_LDFLAGS) $(WINHTTP_LIBS) $(FI_LDFLAGS) $(FI_LIBS) $(PDF_LDFLAGS) $(PDF_LIBS) $(ICU_LDFLAGS) $(ICU_LIBS) $(PCRE_LDFLAGS) $(PCRE_LIBS)
- else
--src_libmega_la_LIBADD = $(CARES_LDFLAGS) $(CARES_LIBS) $(LIBCURL_LIBS) $(FFMPEG_LDFLAGS) $(FFMPEG_LIBS) $(LIBUV_LDFLAGS) $(LIBUV_LIBS) $(LIBRAW_LDFLAGS) $(LIBRAW_LIBS) $(LIBMEDIAINFO_LDFLAGS) $(LIBMEDIAINFO_LIBS) $(ZLIB_LDFLAGS) $(ZLIB_LIBS) $(CRYPTO_LDFLAGS) $(CRYPTO_LIBS) $(SODIUM_LDFLAGS) $(SODIUM_LIBS) $(DB_LDFLAGS) $(DB_LIBS) $(FI_LDFLAGS) $(FI_LIBS) $(PDF_LDFLAGS) $(PDF_LIBS) $(ICU_LDFLAGS) $(ICU_LIBS) $(LIBSSL_LDFLAGS) $(LIBSSL_LIBS) $(PCRE_LDFLAGS) $(PCRE_LIBS)
-+src_libmega_la_LIBADD = $(CARES_LDFLAGS) $(CARES_LIBS) $(LIBCURL_LIBS) $(FFMPEG_LDFLAGS) $(FFMPEG_LIBS) $(LIBUV_LDFLAGS) $(LIBUV_LIBS) $(LIBRAW_LDFLAGS) $(LIBRAW_LIBS) $(LIBRT_LDFLAGS) $(LIBRT_LIBS) $(LIBMEDIAINFO_LDFLAGS) $(LIBMEDIAINFO_LIBS) $(ZLIB_LDFLAGS) $(ZLIB_LIBS) $(CRYPTO_LDFLAGS) $(CRYPTO_LIBS) $(SODIUM_LDFLAGS) $(SODIUM_LIBS) $(DB_LDFLAGS) $(DB_LIBS) $(FI_LDFLAGS) $(FI_LIBS) $(PDF_LDFLAGS) $(PDF_LIBS) $(ICU_LDFLAGS) $(ICU_LIBS) $(LIBSSL_LDFLAGS) $(LIBSSL_LIBS) $(PCRE_LDFLAGS) $(PCRE_LIBS)
- endif
-
- # add library version
diff --git a/megacmd/patches/patch-sdk_src_posix_fs.cpp b/megacmd/patches/patch-sdk_src_posix_fs.cpp
index 79f164b895..aec1de111f 100644
--- a/megacmd/patches/patch-sdk_src_posix_fs.cpp
+++ b/megacmd/patches/patch-sdk_src_posix_fs.cpp
@@ -2,15 +2,71 @@ $NetBSD: patch-sdk_src_posix_fs.cpp,v 1.2 2024/06/18 18:23:15 bsiegert Exp $
Fix build on NetBSD, use statvfs
---- sdk/src/posix/fs.cpp.orig 2024-05-17 14:19:43.000000000 +0000
+--- sdk/src/posix/fs.cpp.orig 2025-01-24 13:56:57.000000000 +0100
+++ sdk/src/posix/fs.cpp
-@@ -27,6 +27,9 @@
- #include <sys/utsname.h>
+@@ -22,7 +22,8 @@
+ * You should have received a copy of the license along with this
+ * program.
+ */
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && \
++ !defined(__NetBSD__) && !defined(__DragonFly__)
+ #include <mntent.h>
+ #endif // ! __APPLE__
+
+@@ -32,6 +33,9 @@
#include <sys/ioctl.h>
+ #include <sys/resource.h>
#include <sys/statvfs.h>
+#if defined(__NetBSD__)
+#define statfs statvfs
+#endif
- #include <sys/resource.h>
+ #include <sys/types.h>
+ #include <sys/utsname.h>
#ifdef TARGET_OS_MAC
- #include "mega/osx/osxutils.h"
+@@ -876,6 +880,24 @@ bool PosixFileSystemAccess::cwd_static(L
+ return true;
+ }
+
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
++
++BSDFileSystemAccess::~BSDFileSystemAccess()
++{
++ // do nothing, as no notifiers
++}
++
++void BSDFileSystemAccess::addevents([[maybe_unused]] Waiter* waiter, int /*flags*/)
++{
++ // do nothing
++}
++
++int BSDFileSystemAccess::checkevents(Waiter*)
++{
++ return 0;
++}
++
++#endif
+ // wake up from filesystem updates
+
+ #ifdef __linux__
+@@ -1802,8 +1824,8 @@ private:
+ // open with O_NOATIME if possible
+ int open(const char *path)
+ {
+-#ifdef TARGET_OS_IPHONE
+- // building for iOS, there is no O_NOATIME flag
++#ifndef O_NOATIME
++ // building for iOS and BSDs, there is no O_NOATIME flag
+ 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;
+ }
+
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && \
++ !defined(__NetBSD__) && !defined(__DragonFly__)
+
+ // Determine which device contains the specified path.
+ static std::string deviceOf(const std::string& database,
diff --git a/megacmd/patches/patch-src_include.am b/megacmd/patches/patch-src_include.am
deleted file mode 100644
index 9d90511675..0000000000
--- a/megacmd/patches/patch-src_include.am
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_include.am,v 1.2 2024/06/18 18:23:15 bsiegert Exp $
-
-Fix bash-completion path
-
---- src/include.am.orig 2024-05-20 12:29:43.000000000 +0000
-+++ src/include.am
-@@ -16,7 +16,7 @@ bin_PROGRAMS += $(MEGACMD) $(TESTS)
- $(MEGACMD): $(top_builddir)/sdk/src/libmega.la
-
- #scripst (to install and where)
--megacmdcompletiondir = $(sysconfdir)/bash_completion.d/
-+megacmdcompletiondir = $(datadir)/bash-completion/completions/
- megacmdcompletion_DATA = src/client/megacmd_completion.sh
- megacmdscripts_bindir = $(bindir)
- megacmdscripts_bin_SCRIPTS = src/client/mega-attr src/client/mega-cd src/client/mega-confirm src/client/mega-cp src/client/mega-debug src/client/mega-du src/client/mega-df src/client/mega-proxy src/client/mega-export src/client/mega-find src/client/mega-get src/client/mega-help src/client/mega-https src/client/mega-webdav src/client/mega-permissions src/client/mega-deleteversions src/client/mega-transfers src/client/mega-import src/client/mega-invite src/client/mega-ipc src/client/mega-killsession src/client/mega-lcd src/client/mega-log src/client/mega-login src/client/mega-logout src/client/mega-lpwd src/client/mega-ls src/client/mega-backup src/client/mega-mkdir src/client/mega-mount src/client/mega-mv src/client/mega-passwd src/client/mega-preview src/client/mega-put src/client/mega-speedlimit src/client/mega-pwd src/client/mega-quit src/client/mega-reload src/client/mega-rm src/client/mega-session src/client/mega-share src/client/mega-showpcr src/client/mega-signup src/
client/mega-sync src/client/mega-exclude src/client/mega-thumbnail src/client/mega-userattr src/client/mega-users src/client/mega-version src/client/mega-whoami src/client/mega-cat src/client/mega-tree src/client/mega-mediainfo src/client/mega-graphics src/client/mega-ftp src/client/mega-cancel src/client/mega-confirmcancel src/client/mega-errorcode
diff --git a/megacmd/patches/patch-src_megacmdcommonutils.cpp b/megacmd/patches/patch-src_megacmdcommonutils.cpp
new file mode 100644
index 0000000000..c9b882bebe
--- /dev/null
+++ b/megacmd/patches/patch-src_megacmdcommonutils.cpp
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- src/megacmdcommonutils.cpp.orig 2025-02-07 09:43:13.320748794 +0100
++++ src/megacmdcommonutils.cpp
+@@ -1128,7 +1128,8 @@ bool isValidEmail(string email)
+ || (email.find("@") > email.find_last_of(".")));
+ }
+
+-#ifdef __linux__
++#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || \
++ defined(__NetBSD__) || defined(__DragonFly__)
+ std::string getCurrentExecPath()
+ {
+ std::string path = ".";
diff --git a/megacmd/patches/patch-src_megacmdcommonutils.h b/megacmd/patches/patch-src_megacmdcommonutils.h
new file mode 100644
index 0000000000..d73aa53a53
--- /dev/null
+++ b/megacmd/patches/patch-src_megacmdcommonutils.h
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- src/megacmdcommonutils.h.orig 2025-02-07 09:44:39.977015171 +0100
++++ src/megacmdcommonutils.h
+@@ -269,7 +269,8 @@ void sleepMilliSeconds(long microseconds
+
+ bool isValidEmail(std::string email);
+
+-#ifdef __linux__
++#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || \
++ defined(__NetBSD__) || defined(__DragonFly__)
+ std::string getCurrentExecPath();
+ #endif
+
Home |
Main Index |
Thread Index |
Old Index