Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
119 changes: 0 additions & 119 deletions srcpkgs/MEGAcmd/patches/autotools.patch

This file was deleted.

106 changes: 106 additions & 0 deletions srcpkgs/MEGAcmd/patches/cmd_cmake.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 116ed62e..fa7b6484 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,6 @@
# CMakeLists.txt file to build the MEGAcmd
cmake_minimum_required(VERSION 3.16)

-find_package(Git REQUIRED)
execute_process(
COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/sdk
@@ -25,6 +24,7 @@ set(QT_CREATOR_SKIP_VCPKG_SETUP TRUE CACHE BOOL "")
## Modules location
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
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/sdk/cmake/modules/packages)

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")

@@ -39,7 +39,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
@@ -346,6 +346,7 @@ if (ENABLE_MEGACMD_TESTS)
)
target_include_directories(mega-cmd-tests-integration PUBLIC ${ProjectDir}/src ${ProjectDir}/tests/common)
target_link_libraries(mega-cmd-tests-integration PUBLIC LMegacmdServer LMegacmdClient LMegacmdTestsCommon)
+ target_link_libraries(mega-cmd-tests-integration PUBLIC gmock gtest)
if(APPLE)
target_link_libraries(mega-cmd-tests-integration PRIVATE "-framework Security" )
endif()
@@ -361,6 +362,7 @@ if (ENABLE_MEGACMD_TESTS)
"${ProjectDir}/tests/unit/UtilsTests.cpp"
"${ProjectDir}/tests/unit/main.cpp"
)
+ target_link_libraries(mega-cmd-tests-unit PUBLIC gmock gtest)

if(APPLE)
target_link_libraries(mega-cmd-tests-unit PRIVATE "-framework Security" )
@@ -472,17 +474,19 @@ elseif(NOT WIN32)
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/")
- 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/build/cmake/modules/megacmd_configuration.cmake b/build/cmake/modules/megacmd_configuration.cmake
index 74e25cf0..6162d8fa 100644
--- a/build/cmake/modules/megacmd_configuration.cmake
+++ b/build/cmake/modules/megacmd_configuration.cmake
@@ -24,5 +24,5 @@ else()
check_include_file(inttypes.h HAVE_INTTYPES_H)
check_include_file(dirent.h HAVE_DIRENT_H)
check_include_file(glob.h HAVE_GLOB_H)
- check_function_exists(aio_write, HAVE_AIO_RT)
+ check_function_exists(aio_write HAVE_AIO_RT)
endif()
diff --git a/build/cmake/modules/megacmd_libraries.cmake b/build/cmake/modules/megacmd_libraries.cmake
index aa3c2d73..9d1ad7b1 100644
--- a/build/cmake/modules/megacmd_libraries.cmake
+++ b/build/cmake/modules/megacmd_libraries.cmake
@@ -15,11 +15,13 @@ macro(load_megacmdserver_libraries)
else() # No VCPKG usage. Use pkg-config
find_package(PkgConfig REQUIRED) # For libraries loaded using pkg-config

- if(USE_PCRE) #TODO: UNTESTED!
- pkg_check_modules(pcre REQUIRED IMPORTED_TARGET libpcre)
- target_link_libraries(LMegacmdServer PRIVATE PkgConfig::pcre)
- set(USE_PCRE 1)
- endif()
+ # if(USE_PCRE) #TODO: UNTESTED!
+ # pkg_check_modules(pcre REQUIRED IMPORTED_TARGET libpcre)
+ # target_link_libraries(LMegacmdServer PRIVATE PkgConfig::pcre)
+ # set(USE_PCRE 1)
+ # endif()
+
+ target_link_libraries(LMegacmdServer PRIVATE z pcrecpp)
endif()

endmacro()
10 changes: 0 additions & 10 deletions srcpkgs/MEGAcmd/patches/megaexec.patch

This file was deleted.

12 changes: 12 additions & 0 deletions srcpkgs/MEGAcmd/patches/musl.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/src/updater/MegaUpdater.cpp b/src/updater/MegaUpdater.cpp
index 8c443f1b..99e325ff 100644
--- a/src/updater/MegaUpdater.cpp
+++ b/src/updater/MegaUpdater.cpp
@@ -11,6 +11,7 @@
#include <sys/file.h> //flock
#include <errno.h>
#include <unistd.h>
+#include <fcntl.h>
#endif

#include <iostream>
37 changes: 37 additions & 0 deletions srcpkgs/MEGAcmd/patches/sdk_cmake.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
diff --git a/cmake/modules/configuration.cmake b/cmake/modules/configuration.cmake
index ef72c04ab..fdce4550a 100644
--- a/cmake/modules/configuration.cmake
+++ b/cmake/modules/configuration.cmake
@@ -38,7 +38,7 @@ else()
include(CheckSymbolExists)
check_symbol_exists(glob glob.h HAVE_GLOB_H)

- check_function_exists(aio_write, HAVE_AIO_RT)
+ check_function_exists(aio_write HAVE_AIO_RT)

# Check if our toolchain supports TI emulation mode.
try_compile(SUPPORTS_TI_EMULATION_MODE
diff --git a/cmake/modules/sdklib_libraries.cmake b/cmake/modules/sdklib_libraries.cmake
index d50b12eca..846328035 100644
--- a/cmake/modules/sdklib_libraries.cmake
+++ b/cmake/modules/sdklib_libraries.cmake
@@ -98,7 +98,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)
@@ -110,8 +110,8 @@ macro(load_sdklib_libraries)
pkg_check_modules(curl REQUIRED IMPORTED_TARGET libcurl)
target_link_libraries(SDKlib PRIVATE PkgConfig::curl)

- find_package(ICU COMPONENTS uc data REQUIRED)
- target_link_libraries(SDKlib PRIVATE ICU::uc ICU::data)
+ find_package(ICU COMPONENTS i18n uc data REQUIRED)
+ target_link_libraries(SDKlib PRIVATE ICU::i18n ICU::uc ICU::data)

if(USE_OPENSSL)
find_package(OpenSSL REQUIRED)
1 change: 1 addition & 0 deletions srcpkgs/MEGAcmd/patches/sdk_cmake.patch.args
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-Np1 -d sdk
54 changes: 40 additions & 14 deletions srcpkgs/MEGAcmd/template
Original file line number Diff line number Diff line change
@@ -1,27 +1,53 @@
# Template file for 'MEGAcmd'
pkgname=MEGAcmd
version=1.4.0
revision=2
build_style=gnu-configure
hostmakedepends="autoconf-archive autogen gettext automake libtool pkg-config"
makedepends="MEGAsdk-devel readline-devel pcre-devel"
version=2.5.2
revision=1
_sdk_commit="fae76a36d60484657fbdf442b7b917ccc4fbad77"
build_style=cmake
configure_args="-DCMAKE_INSTALL_PREFIX=/ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DVCPKG_ROOT=''
-DFULL_REQS=OFF -DUSE_FFMPEG=ON -DENABLE_MEDIA_FILE_METADATA=ON
-DENABLE_MEGACMD_TESTS=ON"
hostmakedepends="pkg-config"
makedepends="libsodium-devel openssl-devel sqlite-devel libcurl-devel icu-devel
freeimage-devel libuv-devel readline-devel pcre-devel crypto++-devel
libmediainfo-devel ffmpeg-devel zlib-devel gtest-devel"
short_desc="Command Line Interactive and Scriptable Application to access MEGA"
maintainer="Orphaned <orphan@voidlinux.org>"
maintainer="otolias <p17anto2@gmail.com>"
license="BSD-2-Clause, GPL-3.0-or-later"
homepage="https://github.com/meganz/MEGAcmd"
distfiles="https://github.com/meganz/MEGAcmd/archive/${version}_Linux.tar.gz"
checksum=2a3626a9f1d22303fe2123f984a8ecf3779d6d59ac6c67c1bf43c2423dcb832d
distfiles="https://github.com/meganz/MEGAcmd/archive/${version}_Linux.tar.gz
https://github.com/meganz/sdk/archive/${_sdk_commit}.tar.gz"
checksum="a088c001e9116357fcac92cd0b3d62fb53cc24ce546eb0fb4cc83c53df5eed7c
3df9f194e2f18b64d51b325c50f852e694d232380bfc83e03f96bf6281db91eb"
replaces="megacmd>=0"
CXXFLAGS=-std=c++17

if [ "$CROSS_BUILD" ]; then
configure_args="--with-libtool-sysroot=${XBPS_CROSS_BASE}"
fi
CXXFLAGS="-fpermissive"

pre_configure() {
./autogen.sh
case "$XBPS_TARGET_WORDSIZE" in
32) makedepends+=" fuse3-devel" ;;
64) makedepends+=" fuse-devel" ;;
esac

skip_extraction="${_sdk_commit}.tar.gz"

post_extract() {
vsrcextract -C sdk/ "${_sdk_commit}.tar.gz"
}

do_check() {
./build/mega-cmd-tests-unit
}

post_install() {
# Remove test binaries
rm ${DESTDIR}/usr/bin/mega-cmd-tests-integration
rm ${DESTDIR}/usr/bin/mega-cmd-tests-unit

vmkdir usr/lib/sysctl.d
mv ${DESTDIR}/etc/sysctl.d/99-megacmd-inotify-limit.conf ${DESTDIR}/usr/lib/sysctl.d/

vcompletion ${DESTDIR}/etc/bash_completion.d/megacmd_completion.sh bash mega-cmd
rm -r ${DESTDIR}/etc/bash_completion.d

vlicense LICENSE
}