public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:dev commit in: net-misc/megasync/files/, net-misc/megasync/
@ 2024-07-12 17:56 Takuya Wakazono
  0 siblings, 0 replies; 8+ messages in thread
From: Takuya Wakazono @ 2024-07-12 17:56 UTC (permalink / raw
  To: gentoo-commits

commit:     66b1ec0cd4f881d69cf83773e8fa8177fcca9a69
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Fri Jul 12 17:28:40 2024 +0000
Commit:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Fri Jul 12 17:55:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=66b1ec0c

net-misc/megasync: add 5.3.0.0

Set myself as a primary maintainer since the original maintainer lacks
time to maintain this.

Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>

 net-misc/megasync/Manifest                         |   2 +
 .../files/megasync-5.3.0.0-fix-install-dir.patch   |  27 ++++
 .../files/megasync-5.3.0.0-link-zlib.patch         |  12 ++
 .../megasync-5.3.0.0-rename-libcryptopp.patch      |  11 ++
 net-misc/megasync/megasync-5.3.0.0.ebuild          | 172 +++++++++++++++++++++
 net-misc/megasync/megasync-9999.ebuild             | 139 ++++++++++-------
 net-misc/megasync/metadata.xml                     |  20 +--
 7 files changed, 321 insertions(+), 62 deletions(-)

diff --git a/net-misc/megasync/Manifest b/net-misc/megasync/Manifest
index 0fbd27795..432a384e0 100644
--- a/net-misc/megasync/Manifest
+++ b/net-misc/megasync/Manifest
@@ -1,2 +1,4 @@
 DIST megasync-5.2.1.0.tar.gz 23819376 BLAKE2B 249471d14f146b0bbe4c97690c1832d63f06005b2dcc6f334a9fe2a33672d0b1bce3b738270d28a1674804320f53b25e3533548ed4a6f1af01ce91e24d138e32 SHA512 f667e73a8e6527cb79608584d486aeb9a8ebde4b6f3bc10f560030ee725575622c561fe75a217e8d9d97ddf204fd94ce258cc2b70a200baead7a5e44ab285aa8
+DIST megasync-5.3.0.0.tar.gz 24307650 BLAKE2B 4b4253f40abea54856d869ba5094d18dd7239f3c7a9d25611e1a053d370e943f29f3cbb4a672b559b1908600f6eafea586ec65e8a24cceb44a592337ff5e0f8a SHA512 61a4e0bf351816113bca23328dfe1872a031f6457368127dd1ec55f5147d22059e3cbb8998497398dbf706050eb228e09b41ed6300262a89c3abf71e1152f0e7
 DIST megasync-sdk-5.2.1.0.tar.gz 3809248 BLAKE2B acf9be7b3d0faf843e394b717cb75ee703aadfdf2b79a6ea06eccb49d6d179ef8b2f3d430edce4bc37e6e53a45f1eab3865c433d015cf8d8412d6b037edbd81a SHA512 2c65c53050dcd7757a1015200d4e25ca260e833105e577c6506d36efa280c5e5e511e8b5ea029a6efac09f36ffd6bfdb49b71417d32457d42397de83240451ec
+DIST megasync-sdk-5.3.0.0.tar.gz 4146154 BLAKE2B 7b73f4475958f0d2ad341638f0f5c7ab1c9570f38ecceb7393268b4307cd4052a6ba5b358fabf3138ba7ad6e503c18c4314204d2a4c8c2d19846e4093889b24e SHA512 8b301cf8654112893bb79e3ce8f9f2c7ee27bafcc68df6f4bceb88bb54a2f5168cedf34bd262dfeb0ef0c67b46c9420259d7f0f13bc067f9ae7799cc09d28abc

diff --git a/net-misc/megasync/files/megasync-5.3.0.0-fix-install-dir.patch b/net-misc/megasync/files/megasync-5.3.0.0-fix-install-dir.patch
new file mode 100644
index 000000000..a5f86e3e7
--- /dev/null
+++ b/net-misc/megasync/files/megasync-5.3.0.0-fix-install-dir.patch
@@ -0,0 +1,27 @@
+--- a/contrib/cmake/modules/desktopapp_configuration.cmake
++++ b/contrib/cmake/modules/desktopapp_configuration.cmake
+@@ -29,8 +29,6 @@ if(UNIX AND NOT APPLE)
+     # Note: using cmake --install --prefix /some/prefix will keep the RPATH as configured above.
+     #       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/megasync/lib") # override default "lib" from GNUInstallDirs
+-    set(CMAKE_INSTALL_BINDIR "usr/bin") # override default "bin" from GNUInstallDirs
+ 
+     # Override CMAKE_INSTALL_PREFIX
+     if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) # In consecutive runs it will always be undef/false
+--- a/src/MEGASync/CMakeLists.txt
++++ b/src/MEGASync/CMakeLists.txt
+@@ -142,13 +142,6 @@ if (UNIX AND NOT APPLE)
+ 
+     set(vcpkg_lib_folder "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/$<$<CONFIG:Debug>:debug/>lib/")
+ 
+-    install(DIRECTORY "${vcpkg_lib_folder}"
+-        TYPE LIB # In CMAKE_INSTALL_LIBDIR directory
+-        FILES_MATCHING
+-        PATTERN "*.so*"
+-        PATTERN "manual-link" EXCLUDE
+-        PATTERN "pkgconfig" EXCLUDE
+-    )
+ 
+     if(DEPLOY_QT_LIBRARIES)
+         include(desktopapp_deploy_qt)

diff --git a/net-misc/megasync/files/megasync-5.3.0.0-link-zlib.patch b/net-misc/megasync/files/megasync-5.3.0.0-link-zlib.patch
new file mode 100644
index 000000000..49db675fd
--- /dev/null
+++ b/net-misc/megasync/files/megasync-5.3.0.0-link-zlib.patch
@@ -0,0 +1,12 @@
+--- a/src/MEGASync/control/control.cmake
++++ b/src/MEGASync/control/control.cmake
+@@ -71,6 +71,9 @@ set(DESKTOP_APP_CONTROL_SOURCES
+     control/StatsEventHandler.cpp
+ )
+ 
++find_package(ZLIB REQUIRED)
++target_link_libraries(MEGAsync PRIVATE ZLIB::ZLIB)
++
+ target_sources(MEGAsync
+     PRIVATE
+     ${DESKTOP_APP_CONTROL_HEADERS}

diff --git a/net-misc/megasync/files/megasync-5.3.0.0-rename-libcryptopp.patch b/net-misc/megasync/files/megasync-5.3.0.0-rename-libcryptopp.patch
new file mode 100644
index 000000000..0688c4475
--- /dev/null
+++ b/net-misc/megasync/files/megasync-5.3.0.0-rename-libcryptopp.patch
@@ -0,0 +1,11 @@
+--- a/src/MEGASync/mega/contrib/cmake/modules/sdklib_libraries.cmake
++++ b/src/MEGASync/mega/contrib/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/net-misc/megasync/megasync-5.3.0.0.ebuild b/net-misc/megasync/megasync-5.3.0.0.ebuild
new file mode 100644
index 000000000..c93022217
--- /dev/null
+++ b/net-misc/megasync/megasync-5.3.0.0.ebuild
@@ -0,0 +1,172 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic qmake-utils xdg
+
+DESCRIPTION="The official Qt-based program for syncing your MEGA account in your PC"
+HOMEPAGE="
+	https://mega.io
+	https://github.com/meganz/MEGAsync
+"
+
+if [[ ${PV} == 9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/meganz/MEGAsync"
+	EGIT_BRANCH="master"
+	EGIT_SUBMODULES=( '*' )
+else
+	MEGA_SDK_REV="eb8dba09149e1aad0210c3591f3ef6e50022f714" # commit of src/MEGASync/mega submodule
+	MEGA_TAG_SUFFIX="Linux"
+	SRC_URI="
+		https://github.com/meganz/MEGAsync/archive/v${PV}_${MEGA_TAG_SUFFIX}.tar.gz -> ${P}.tar.gz
+		https://github.com/meganz/sdk/archive/${MEGA_SDK_REV}.tar.gz -> ${PN}-sdk-${PV}.tar.gz
+	"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}"/MEGAsync-${PV}_${MEGA_TAG_SUFFIX}
+fi
+
+LICENSE="MEGA"
+SLOT="0"
+IUSE="dolphin mediainfo nautilus nemo thumbnail thunar"
+
+DEPEND="
+	dev-db/sqlite:3
+	dev-libs/crypto++:=
+	dev-libs/icu:=
+	dev-libs/libsodium:=
+	dev-libs/libuv:=
+	dev-libs/openssl:0=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtimageformats:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	net-dns/c-ares:=
+	net-misc/curl[ssl]
+	sys-libs/zlib
+	x11-libs/libxcb:=
+	dolphin? (
+		kde-apps/dolphin:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+		kde-frameworks/kwidgetsaddons:5
+	)
+	mediainfo? (
+		media-libs/libmediainfo
+		media-libs/libzen
+	)
+	nautilus? (
+		dev-libs/glib:2
+		>=gnome-base/nautilus-43
+	)
+	nemo? (
+		dev-libs/glib:2
+		gnome-extra/nemo
+	)
+	thumbnail? (
+		media-libs/freeimage
+		media-video/ffmpeg:=
+	)
+	thunar? ( xfce-base/thunar:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	dolphin? ( kde-frameworks/extra-cmake-modules )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.10.0.0_ffmpeg6.patch"
+	"${FILESDIR}/${PN}-4.10.0.0_fix-build.patch"
+	"${FILESDIR}/${PN}-5.3.0.0-link-zlib.patch"
+	"${FILESDIR}/${PN}-5.3.0.0-fix-install-dir.patch"
+	"${FILESDIR}/${PN}-5.3.0.0-rename-libcryptopp.patch"
+)
+
+BUILD_DIR_DOLPHIN="${S}_dolphin"
+
+dolphin_run() {
+	if use dolphin; then
+		cd "${S}/src/MEGAShellExtDolphin" || die
+		BUILD_DIR="${BUILD_DIR_DOLPHIN}" CMAKE_USE_DIR="${S}/src/MEGAShellExtDolphin" "$@"
+	fi
+}
+
+nautilus_run() {
+	if use nautilus; then
+		cd "${S}/src/MEGAShellExtNautilus" || die
+		"$@"
+	fi
+}
+
+nemo_run() {
+	if use nemo; then
+		cd "${S}/src/MEGAShellExtNemo" || die
+		"$@"
+	fi
+}
+
+thunar_run() {
+	if use thunar; then
+		cd "${S}/src/MEGAShellExtThunar" || die
+		"$@"
+	fi
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999 ]]; then
+		rmdir src/MEGASync/mega || die
+		mv "${WORKDIR}/sdk-${MEGA_SDK_REV}" src/MEGASync/mega || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# https://github.com/meganz/sdk/issues/2679
+	append-cppflags -DNDEBUG
+
+	local mycmakeargs=(
+		# build internal libs as static
+		-DBUILD_SHARED_LIBS=OFF
+		-DCMAKE_MODULE_PATH="${S}/src/MEGASync/mega/contrib/cmake/modules/packages"
+		-DENABLE_DESKTOP_UPDATE_GEN=OFF
+		-DUSE_FFMPEG=$(usex thumbnail)
+		-DUSE_FREEIMAGE=$(usex thumbnail)
+		-DUSE_MEDIAINFO=$(usex mediainfo)
+		-DUSE_PDFIUM=OFF
+		-DUSE_READLINE=OFF
+	)
+	cmake_src_configure
+
+	unset mycmakeargs
+	dolphin_run cmake_src_configure
+	nautilus_run eqmake5
+	nemo_run eqmake5
+	thunar_run eqmake5
+}
+
+src_compile() {
+	cmake_src_compile
+
+	dolphin_run cmake_src_compile
+	nautilus_run emake
+	nemo_run emake
+	thunar_run emake
+}
+
+src_install() {
+	cmake_src_install
+
+	dolphin_run cmake_src_install
+	nautilus_run emake INSTALL_ROOT="${D}" install
+	nemo_run emake INSTALL_ROOT="${D}" install
+	thunar_run emake INSTALL_ROOT="${D}" install
+}

diff --git a/net-misc/megasync/megasync-9999.ebuild b/net-misc/megasync/megasync-9999.ebuild
index f9b4f301f..c93022217 100644
--- a/net-misc/megasync/megasync-9999.ebuild
+++ b/net-misc/megasync/megasync-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools cmake qmake-utils xdg
+inherit cmake flag-o-matic qmake-utils xdg
 
 DESCRIPTION="The official Qt-based program for syncing your MEGA account in your PC"
 HOMEPAGE="
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]];then
 	EGIT_BRANCH="master"
 	EGIT_SUBMODULES=( '*' )
 else
-	MEGA_SDK_REV="f71b60452a5d6c32bebc5125a13977a335d78e71" # commit of src/MEGASync/mega submodule
+	MEGA_SDK_REV="eb8dba09149e1aad0210c3591f3ef6e50022f714" # commit of src/MEGASync/mega submodule
 	MEGA_TAG_SUFFIX="Linux"
 	SRC_URI="
 		https://github.com/meganz/MEGAsync/archive/v${PV}_${MEGA_TAG_SUFFIX}.tar.gz -> ${P}.tar.gz
@@ -29,7 +29,7 @@ fi
 
 LICENSE="MEGA"
 SLOT="0"
-IUSE="dolphin freeimage nautilus nemo thunar"
+IUSE="dolphin mediainfo nautilus nemo thumbnail thunar"
 
 DEPEND="
 	dev-db/sqlite:3
@@ -48,26 +48,35 @@ DEPEND="
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
-	media-libs/libmediainfo
-	media-libs/libraw
-	media-libs/libzen
 	net-dns/c-ares:=
-	net-misc/curl[ssl,curl_ssl_openssl(-)]
+	net-misc/curl[ssl]
 	sys-libs/zlib
 	x11-libs/libxcb:=
-	dolphin? ( kde-apps/dolphin )
-	freeimage? (
+	dolphin? (
+		kde-apps/dolphin:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+		kde-frameworks/kwidgetsaddons:5
+	)
+	mediainfo? (
+		media-libs/libmediainfo
+		media-libs/libzen
+	)
+	nautilus? (
+		dev-libs/glib:2
+		>=gnome-base/nautilus-43
+	)
+	nemo? (
+		dev-libs/glib:2
+		gnome-extra/nemo
+	)
+	thumbnail? (
 		media-libs/freeimage
 		media-video/ffmpeg:=
 	)
-	nautilus? ( >=gnome-base/nautilus-43 )
-	nemo? ( gnome-extra/nemo )
-	thunar? ( xfce-base/thunar )
-"
-RDEPEND="
-	${DEPEND}
-	x11-themes/hicolor-icon-theme
+	thunar? ( xfce-base/thunar:= )
 "
+RDEPEND="${DEPEND}"
 BDEPEND="
 	dev-qt/linguist-tools:5
 	dolphin? ( kde-frameworks/extra-cmake-modules )
@@ -76,9 +85,40 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-4.10.0.0_ffmpeg6.patch"
 	"${FILESDIR}/${PN}-4.10.0.0_fix-build.patch"
+	"${FILESDIR}/${PN}-5.3.0.0-link-zlib.patch"
+	"${FILESDIR}/${PN}-5.3.0.0-fix-install-dir.patch"
+	"${FILESDIR}/${PN}-5.3.0.0-rename-libcryptopp.patch"
 )
 
-CMAKE_USE_DIR="${S}/src/MEGAShellExtDolphin"
+BUILD_DIR_DOLPHIN="${S}_dolphin"
+
+dolphin_run() {
+	if use dolphin; then
+		cd "${S}/src/MEGAShellExtDolphin" || die
+		BUILD_DIR="${BUILD_DIR_DOLPHIN}" CMAKE_USE_DIR="${S}/src/MEGAShellExtDolphin" "$@"
+	fi
+}
+
+nautilus_run() {
+	if use nautilus; then
+		cd "${S}/src/MEGAShellExtNautilus" || die
+		"$@"
+	fi
+}
+
+nemo_run() {
+	if use nemo; then
+		cd "${S}/src/MEGAShellExtNemo" || die
+		"$@"
+	fi
+}
+
+thunar_run() {
+	if use thunar; then
+		cd "${S}/src/MEGAShellExtThunar" || die
+		"$@"
+	fi
+}
 
 src_prepare() {
 	if [[ ${PV} != 9999 ]]; then
@@ -86,52 +126,47 @@ src_prepare() {
 		mv "${WORKDIR}/sdk-${MEGA_SDK_REV}" src/MEGASync/mega || die
 	fi
 
-	if use dolphin; then
-		cmake_src_prepare
-	else
-		default
-	fi
-
-	cd "${S}/src/MEGASync/mega" || die
-	eautoreconf
+	cmake_src_prepare
 }
 
 src_configure() {
-	cd "${S}/src/MEGASync/mega" || die
-	econf \
-		"--disable-curl-checks" \
-		"--disable-examples" \
-		$(use_with freeimage)
-
-	cd "${S}/src" || die
-	local myqmakeargs=(
-		MEGA.pro
-		CONFIG+="release"
-		$(usex freeimage "" "CONFIG+=nofreeimage")
-		$(usev nautilus "SUBDIRS+=MEGAShellExtNautilus")
-		$(usev nemo "SUBDIRS+=MEGAShellExtNemo")
-		$(usev thunar "SUBDIRS+=MEGAShellExtThunar")
+	# https://github.com/meganz/sdk/issues/2679
+	append-cppflags -DNDEBUG
+
+	local mycmakeargs=(
+		# build internal libs as static
+		-DBUILD_SHARED_LIBS=OFF
+		-DCMAKE_MODULE_PATH="${S}/src/MEGASync/mega/contrib/cmake/modules/packages"
+		-DENABLE_DESKTOP_UPDATE_GEN=OFF
+		-DUSE_FFMPEG=$(usex thumbnail)
+		-DUSE_FREEIMAGE=$(usex thumbnail)
+		-DUSE_MEDIAINFO=$(usex mediainfo)
+		-DUSE_PDFIUM=OFF
+		-DUSE_READLINE=OFF
 	)
+	cmake_src_configure
 
-	eqmake5 "${myqmakeargs[@]}"
-	$(qt5_get_bindir)/lrelease MEGASync/MEGASync.pro || die
-
-	use dolphin && cmake_src_configure
+	unset mycmakeargs
+	dolphin_run cmake_src_configure
+	nautilus_run eqmake5
+	nemo_run eqmake5
+	thunar_run eqmake5
 }
 
 src_compile() {
-	emake -C src
+	cmake_src_compile
 
-	use dolphin && cmake_src_compile
+	dolphin_run cmake_src_compile
+	nautilus_run emake
+	nemo_run emake
+	thunar_run emake
 }
 
 src_install() {
-	emake -C src INSTALL_ROOT="${D}" install
-	dobin "src/MEGASync/${PN}"
-	dodoc CREDITS.md README.md
-
-	rm -rf "${D}"/usr/share/doc/megasync || die
-	rm -rf "${D}"/usr/share/icons/ubuntu-mono-dark || die
+	cmake_src_install
 
-	use dolphin && cmake_src_install
+	dolphin_run cmake_src_install
+	nautilus_run emake INSTALL_ROOT="${D}" install
+	nemo_run emake INSTALL_ROOT="${D}" install
+	thunar_run emake INSTALL_ROOT="${D}" install
 }

diff --git a/net-misc/megasync/metadata.xml b/net-misc/megasync/metadata.xml
index 063ed9ae0..aa423a992 100644
--- a/net-misc/megasync/metadata.xml
+++ b/net-misc/megasync/metadata.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>samuelbernardo.mail@gmail.com</email>
-		<name>Samuel Bernardo</name>
-		<description>megasync client from mega.nz</description>
-	</maintainer>
 	<maintainer type="person">
 		<email>pastalian46@gmail.com</email>
 		<name>Takuya Wakazono</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>samuelbernardo.mail@gmail.com</email>
+		<name>Samuel Bernardo</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">meganz/MEGAsync</remote-id>
 	</upstream>
 	<use>
-		<flag name='dolphin'>Upload your files to your Mega account from Dolphin file manager.</flag>
-		<flag name='nautilus'>Upload your files to your Mega account from nautilus.</flag>
-		<flag name='nemo'>Upload your files to your Mega account from Nemo.</flag>
-		<flag name='thunar'>Upload your files to your Mega account from Thunar.</flag>
-		<flag name='freeimage'>Use freeimage to manage graphic images format.</flag>
+		<flag name='dolphin'>Build a plugin for Dolphin</flag>
+		<flag name='mediainfo'>Use <pkg>media-libs/libmediainfo</pkg> to determine media properties</flag>
+		<flag name='nautilus'>Build a plugin for nautilus</flag>
+		<flag name='nemo'>Build a plugin for Nemo</flag>
+		<flag name='thumbnail'>Enable support for thumbnail generation</flag>
+		<flag name='thunar'>Build a plugin for Thunar</flag>
 	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-misc/megasync/files/, net-misc/megasync/
@ 2025-03-05 14:23 Takuya Wakazono
  0 siblings, 0 replies; 8+ messages in thread
From: Takuya Wakazono @ 2025-03-05 14:23 UTC (permalink / raw
  To: gentoo-commits

commit:     ac20f906ca4e178bca0fc21c765282e333a83655
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Wed Mar  5 13:46:42 2025 +0000
Commit:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Wed Mar  5 14:22:04 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ac20f906

net-misc/megasync: fix build with clang

Closes: https://bugs.gentoo.org/950311
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>

 net-misc/megasync/files/megasync-5.8.0.2-clang.patch | 17 +++++++++++++++++
 net-misc/megasync/megasync-5.8.0.2.ebuild            |  1 +
 2 files changed, 18 insertions(+)

diff --git a/net-misc/megasync/files/megasync-5.8.0.2-clang.patch b/net-misc/megasync/files/megasync-5.8.0.2-clang.patch
new file mode 100644
index 000000000..6ab8f59c3
--- /dev/null
+++ b/net-misc/megasync/files/megasync-5.8.0.2-clang.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/950311
+https://github.com/meganz/MEGAsync/issues/1055
+Fix build with clang by removing broken and unused constructor.
+--- a/src/MEGASync/control/ProtectedQueue.h
++++ b/src/MEGASync/control/ProtectedQueue.h
+@@ -13,11 +13,6 @@ public:
+     ProtectedQueue(){}
+     virtual ~ProtectedQueue(){}
+ 
+-    ProtectedQueue(const ProtectedQueue& other)
+-    {
+-        std::lock_guard<std::mutex> guard( other.mMutex );
+-        mQueue = other.mQueue;
+-    }
+ 
+     ProtectedQueue& operator= (ProtectedQueue& other)
+     {

diff --git a/net-misc/megasync/megasync-5.8.0.2.ebuild b/net-misc/megasync/megasync-5.8.0.2.ebuild
index a501f051e..9e9b70b9f 100644
--- a/net-misc/megasync/megasync-5.8.0.2.ebuild
+++ b/net-misc/megasync/megasync-5.8.0.2.ebuild
@@ -83,6 +83,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.7.0.0-fix-install-dir.patch"
 	"${FILESDIR}/${PN}-5.7.0.0-link-zlib.patch"
 	"${FILESDIR}/${PN}-5.7.0.0-rename-libcryptopp.patch"
+	"${FILESDIR}/${PN}-5.8.0.2-clang.patch"
 )
 
 nemo_run() {


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-misc/megasync/files/, net-misc/megasync/
@ 2025-02-06 13:04 Takuya Wakazono
  0 siblings, 0 replies; 8+ messages in thread
From: Takuya Wakazono @ 2025-02-06 13:04 UTC (permalink / raw
  To: gentoo-commits

commit:     e0cccf7d9ec47820139420cefacd7d90337868be
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Thu Feb  6 13:02:00 2025 +0000
Commit:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Thu Feb  6 13:02:00 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e0cccf7d

net-misc/megasync: drop 5.7.0.0, 5.7.1.0

Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>

 net-misc/megasync/Manifest                         |   4 -
 .../files/megasync-5.3.0.0-fix-install-dir.patch   |  27 ----
 .../files/megasync-5.3.0.0-link-zlib.patch         |  12 --
 .../megasync-5.3.0.0-rename-libcryptopp.patch      |  11 --
 net-misc/megasync/megasync-5.7.0.0.ebuild          | 147 ---------------------
 net-misc/megasync/megasync-5.7.1.0.ebuild          | 147 ---------------------
 6 files changed, 348 deletions(-)

diff --git a/net-misc/megasync/Manifest b/net-misc/megasync/Manifest
index fb2b5ac25..6db624562 100644
--- a/net-misc/megasync/Manifest
+++ b/net-misc/megasync/Manifest
@@ -1,6 +1,2 @@
-DIST megasync-5.7.0.0.tar.gz 23204780 BLAKE2B 5d17808e366e2d3f538168d0580b2a68d077e95d45346f377eb5172d10d06db948fa021e3d1dc39b0d4967cba5b540a843028a571457adea53adcf9770e4e190 SHA512 b7db94bd372d9fd94fa987dc8a370129f23bcb2ff885862544e1a154de71af12459e8af7cbc25fecde5f3c074c81eac079d53dcdcef90e3f0ae8638bced7c868
-DIST megasync-5.7.1.0.tar.gz 23206352 BLAKE2B 9a15e169657461df07a801ec2ace7370213c2ca17bd67bbad0003ed3cfdf0fbf12ac2535e07324a4ca3d6a44d3a8bab1ca1f98b707cdf9288fab14145770c2d8 SHA512 99e5c9dd412d8adc5232ace6385f1377cf7fd8f166164a0bb54981412a3a1f06c30269679ea92fd932ceb7393764e7265bb61aa49e4bc952f0e3cc300a404fb0
 DIST megasync-5.8.0.2.tar.gz 23480049 BLAKE2B e1324a5cafb8056d5f2feac1de789afce35e86638c9985fd2f785c174d7594478f4861f120a0655cece5a84a45826863d3758b2d4e1cc5e4454550281a73dfb7 SHA512 0a6c6a1feb5908fce1969410ece944d9d663dae1ed37a22b69830d7c1825861f7b9d59d3c18802202306cf7e898b500d7b2fbc481263be5f2363b3cf2d63818e
-DIST megasync-sdk-5.7.0.0.tar.gz 4042090 BLAKE2B 326688d633dfd08a160a799a426d29c84515d5971a7b6644ee7624b9ffd092e21f2f0e3f31a55bdfb766623bea60a9867c3c412a4ccd08b629391abdd0056dba SHA512 9c0562f072c00d42b9e53e66f123990dac76ec0dccef6b32985468da75d79105e9e6ed2aad084f8110bc1d89efed21488bf71303872bbd876cd5260fac7caf7e
-DIST megasync-sdk-5.7.1.0.tar.gz 4042434 BLAKE2B bb0ba4e0e44f335ca9089ee7521bd856f6bb3485abdd7c5bf905c2581fd409099e784bdeb90c4fcbe82048231376118ebd791f9b8a5846dabc3ad37a346021e3 SHA512 9dce611c1f1e1edfa20684f88d5206a2c3810acedb42d2cb92c5d287c0feda6dfee5a450e222d6f59b97081f76a2cb56aa62859b32929101f7f61056973a3c95
 DIST megasync-sdk-5.8.0.2.tar.gz 4064275 BLAKE2B 831823ba513202a972f90ba183958fe8db4012514239b908da4ce49558b194f31ba01e0ffe378fe8ce3ba8e857daa2347a4d4ae1fd0793dc8f4b1f769a49108a SHA512 92a0b5a30b3839f657531dad6298d88c5e08204be28a23086ab3dd5a3f3b3ff83cd42a72df38a803afcddce855a1d2ecaeee82e7d5becae9510f25fc88e9c536

diff --git a/net-misc/megasync/files/megasync-5.3.0.0-fix-install-dir.patch b/net-misc/megasync/files/megasync-5.3.0.0-fix-install-dir.patch
deleted file mode 100644
index a5f86e3e7..000000000
--- a/net-misc/megasync/files/megasync-5.3.0.0-fix-install-dir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/contrib/cmake/modules/desktopapp_configuration.cmake
-+++ b/contrib/cmake/modules/desktopapp_configuration.cmake
-@@ -29,8 +29,6 @@ if(UNIX AND NOT APPLE)
-     # Note: using cmake --install --prefix /some/prefix will keep the RPATH as configured above.
-     #       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/megasync/lib") # override default "lib" from GNUInstallDirs
--    set(CMAKE_INSTALL_BINDIR "usr/bin") # override default "bin" from GNUInstallDirs
- 
-     # Override CMAKE_INSTALL_PREFIX
-     if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) # In consecutive runs it will always be undef/false
---- a/src/MEGASync/CMakeLists.txt
-+++ b/src/MEGASync/CMakeLists.txt
-@@ -142,13 +142,6 @@ if (UNIX AND NOT APPLE)
- 
-     set(vcpkg_lib_folder "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/$<$<CONFIG:Debug>:debug/>lib/")
- 
--    install(DIRECTORY "${vcpkg_lib_folder}"
--        TYPE LIB # In CMAKE_INSTALL_LIBDIR directory
--        FILES_MATCHING
--        PATTERN "*.so*"
--        PATTERN "manual-link" EXCLUDE
--        PATTERN "pkgconfig" EXCLUDE
--    )
- 
-     if(DEPLOY_QT_LIBRARIES)
-         include(desktopapp_deploy_qt)

diff --git a/net-misc/megasync/files/megasync-5.3.0.0-link-zlib.patch b/net-misc/megasync/files/megasync-5.3.0.0-link-zlib.patch
deleted file mode 100644
index 49db675fd..000000000
--- a/net-misc/megasync/files/megasync-5.3.0.0-link-zlib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/MEGASync/control/control.cmake
-+++ b/src/MEGASync/control/control.cmake
-@@ -71,6 +71,9 @@ set(DESKTOP_APP_CONTROL_SOURCES
-     control/StatsEventHandler.cpp
- )
- 
-+find_package(ZLIB REQUIRED)
-+target_link_libraries(MEGAsync PRIVATE ZLIB::ZLIB)
-+
- target_sources(MEGAsync
-     PRIVATE
-     ${DESKTOP_APP_CONTROL_HEADERS}

diff --git a/net-misc/megasync/files/megasync-5.3.0.0-rename-libcryptopp.patch b/net-misc/megasync/files/megasync-5.3.0.0-rename-libcryptopp.patch
deleted file mode 100644
index 0688c4475..000000000
--- a/net-misc/megasync/files/megasync-5.3.0.0-rename-libcryptopp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/MEGASync/mega/contrib/cmake/modules/sdklib_libraries.cmake
-+++ b/src/MEGASync/mega/contrib/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/net-misc/megasync/megasync-5.7.0.0.ebuild b/net-misc/megasync/megasync-5.7.0.0.ebuild
deleted file mode 100644
index f9664b2b8..000000000
--- a/net-misc/megasync/megasync-5.7.0.0.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic qmake-utils xdg
-
-DESCRIPTION="The official Qt-based program for syncing your MEGA account in your PC"
-HOMEPAGE="
-	https://mega.io
-	https://github.com/meganz/MEGAsync
-"
-
-MEGA_SDK_REV="81f2d1cde975859ff264c66b808cfa855f79ae82" # commit of src/MEGASync/mega submodule
-MEGA_TAG_SUFFIX="Win"
-SRC_URI="
-	https://github.com/meganz/MEGAsync/archive/v${PV}_${MEGA_TAG_SUFFIX}.tar.gz -> ${P}.tar.gz
-	https://github.com/meganz/sdk/archive/${MEGA_SDK_REV}.tar.gz -> ${PN}-sdk-${PV}.tar.gz
-"
-S="${WORKDIR}"/MEGAsync-${PV}_${MEGA_TAG_SUFFIX}
-
-LICENSE="MEGA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mediainfo nautilus nemo thumbnail thunar"
-
-DEPEND="
-	dev-db/sqlite:3
-	dev-libs/crypto++:=
-	dev-libs/icu:=
-	dev-libs/libsodium:=
-	dev-libs/libuv:=
-	dev-libs/openssl:0=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtimageformats:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	net-dns/c-ares:=
-	net-misc/curl[ssl]
-	sys-libs/zlib
-	x11-libs/libxcb:=
-	mediainfo? (
-		media-libs/libmediainfo
-		media-libs/libzen
-	)
-	nautilus? (
-		dev-libs/glib:2
-		>=gnome-base/nautilus-43
-	)
-	nemo? (
-		dev-libs/glib:2
-		gnome-extra/nemo
-	)
-	thumbnail? (
-		media-libs/freeimage
-		media-video/ffmpeg:=
-	)
-	thunar? (
-		dev-libs/glib:2
-		xfce-base/thunar:=
-	)
-"
-RDEPEND="
-	${DEPEND}
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtquickcontrols2:5
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.10.0.0_ffmpeg6.patch"
-	"${FILESDIR}/${PN}-5.6.0.0-remove-clang-format.patch"
-	"${FILESDIR}/${P}-disable-forced-options.patch"
-	"${FILESDIR}/${P}-fix-install-dir.patch"
-	"${FILESDIR}/${P}-link-zlib.patch"
-	"${FILESDIR}/${P}-rename-libcryptopp.patch"
-)
-
-nemo_run() {
-	if use nemo; then
-		cd "${S}/src/MEGAShellExtNemo" || die
-		"$@"
-	fi
-}
-
-thunar_run() {
-	if use thunar; then
-		cd "${S}/src/MEGAShellExtThunar" || die
-		"$@"
-	fi
-}
-
-src_prepare() {
-	rmdir src/MEGASync/mega || die
-	mv "${WORKDIR}/sdk-${MEGA_SDK_REV}" src/MEGASync/mega || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# https://github.com/meganz/sdk/issues/2679
-	append-cppflags -DNDEBUG
-
-	local mycmakeargs=(
-		# build internal libs as static
-		-DBUILD_SHARED_LIBS=OFF
-		-DCMAKE_MODULE_PATH="${S}/src/MEGASync/mega/cmake/modules/packages"
-		-DENABLE_DESKTOP_APP_WERROR=OFF
-		-DENABLE_DESKTOP_UPDATE_GEN=OFF
-		-DENABLE_DESIGN_TOKENS_IMPORTER=OFF
-		-DENABLE_ISOLATED_GFX=$(usex thumbnail)
-		-DENABLE_LINUX_EXT=$(usex nautilus)
-		-DUSE_FFMPEG=$(usex thumbnail)
-		-DUSE_FREEIMAGE=$(usex thumbnail)
-		-DUSE_MEDIAINFO=$(usex mediainfo)
-		-DUSE_PDFIUM=OFF
-		-DUSE_READLINE=OFF
-	)
-	cmake_src_configure
-
-	unset mycmakeargs
-	nemo_run eqmake5 DEFINES=no_desktop
-	thunar_run eqmake5
-}
-
-src_compile() {
-	cmake_src_compile
-
-	nemo_run emake
-	thunar_run emake
-}
-
-src_install() {
-	cmake_src_install
-
-	nemo_run emake INSTALL_ROOT="${D}" install
-	thunar_run emake INSTALL_ROOT="${D}" install
-}

diff --git a/net-misc/megasync/megasync-5.7.1.0.ebuild b/net-misc/megasync/megasync-5.7.1.0.ebuild
deleted file mode 100644
index f9a3d0981..000000000
--- a/net-misc/megasync/megasync-5.7.1.0.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic qmake-utils xdg
-
-DESCRIPTION="The official Qt-based program for syncing your MEGA account in your PC"
-HOMEPAGE="
-	https://mega.io
-	https://github.com/meganz/MEGAsync
-"
-
-MEGA_SDK_REV="d6a5d2078d1e51394dab205a48bff58d2b130d6b" # commit of src/MEGASync/mega submodule
-MEGA_TAG_SUFFIX="Win"
-SRC_URI="
-	https://github.com/meganz/MEGAsync/archive/v${PV}_${MEGA_TAG_SUFFIX}.tar.gz -> ${P}.tar.gz
-	https://github.com/meganz/sdk/archive/${MEGA_SDK_REV}.tar.gz -> ${PN}-sdk-${PV}.tar.gz
-"
-S="${WORKDIR}"/MEGAsync-${PV}_${MEGA_TAG_SUFFIX}
-
-LICENSE="MEGA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mediainfo nautilus nemo thumbnail thunar"
-
-DEPEND="
-	dev-db/sqlite:3
-	dev-libs/crypto++:=
-	dev-libs/icu:=
-	dev-libs/libsodium:=
-	dev-libs/libuv:=
-	dev-libs/openssl:0=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtimageformats:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	net-dns/c-ares:=
-	net-misc/curl[ssl]
-	sys-libs/zlib
-	x11-libs/libxcb:=
-	mediainfo? (
-		media-libs/libmediainfo
-		media-libs/libzen
-	)
-	nautilus? (
-		dev-libs/glib:2
-		>=gnome-base/nautilus-43
-	)
-	nemo? (
-		dev-libs/glib:2
-		gnome-extra/nemo
-	)
-	thumbnail? (
-		media-libs/freeimage
-		media-video/ffmpeg:=
-	)
-	thunar? (
-		dev-libs/glib:2
-		xfce-base/thunar:=
-	)
-"
-RDEPEND="
-	${DEPEND}
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtquickcontrols2:5
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.10.0.0_ffmpeg6.patch"
-	"${FILESDIR}/${PN}-5.6.0.0-remove-clang-format.patch"
-	"${FILESDIR}/${PN}-5.7.0.0-disable-forced-options.patch"
-	"${FILESDIR}/${PN}-5.7.0.0-fix-install-dir.patch"
-	"${FILESDIR}/${PN}-5.7.0.0-link-zlib.patch"
-	"${FILESDIR}/${PN}-5.7.0.0-rename-libcryptopp.patch"
-)
-
-nemo_run() {
-	if use nemo; then
-		cd "${S}/src/MEGAShellExtNemo" || die
-		"$@"
-	fi
-}
-
-thunar_run() {
-	if use thunar; then
-		cd "${S}/src/MEGAShellExtThunar" || die
-		"$@"
-	fi
-}
-
-src_prepare() {
-	rmdir src/MEGASync/mega || die
-	mv "${WORKDIR}/sdk-${MEGA_SDK_REV}" src/MEGASync/mega || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# https://github.com/meganz/sdk/issues/2679
-	append-cppflags -DNDEBUG
-
-	local mycmakeargs=(
-		# build internal libs as static
-		-DBUILD_SHARED_LIBS=OFF
-		-DCMAKE_MODULE_PATH="${S}/src/MEGASync/mega/cmake/modules/packages"
-		-DENABLE_DESKTOP_APP_WERROR=OFF
-		-DENABLE_DESKTOP_UPDATE_GEN=OFF
-		-DENABLE_DESIGN_TOKENS_IMPORTER=OFF
-		-DENABLE_ISOLATED_GFX=$(usex thumbnail)
-		-DENABLE_LINUX_EXT=$(usex nautilus)
-		-DUSE_FFMPEG=$(usex thumbnail)
-		-DUSE_FREEIMAGE=$(usex thumbnail)
-		-DUSE_MEDIAINFO=$(usex mediainfo)
-		-DUSE_PDFIUM=OFF
-		-DUSE_READLINE=OFF
-	)
-	cmake_src_configure
-
-	unset mycmakeargs
-	nemo_run eqmake5 DEFINES=no_desktop
-	thunar_run eqmake5
-}
-
-src_compile() {
-	cmake_src_compile
-
-	nemo_run emake
-	thunar_run emake
-}
-
-src_install() {
-	cmake_src_install
-
-	nemo_run emake INSTALL_ROOT="${D}" install
-	thunar_run emake INSTALL_ROOT="${D}" install
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-misc/megasync/files/, net-misc/megasync/
@ 2025-01-02 13:47 Takuya Wakazono
  0 siblings, 0 replies; 8+ messages in thread
From: Takuya Wakazono @ 2025-01-02 13:47 UTC (permalink / raw
  To: gentoo-commits

commit:     9b0b966ecd05b7244a0c6d5c2cb34f0770452e50
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Thu Jan  2 12:00:35 2025 +0000
Commit:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Thu Jan  2 13:46:59 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9b0b966e

net-misc/megasync: add 5.7.0.0

Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>

 net-misc/megasync/Manifest                         |   2 +
 .../megasync-5.7.0.0-disable-forced-options.patch  |  11 ++
 .../files/megasync-5.7.0.0-fix-install-dir.patch   |  27 ++++
 .../files/megasync-5.7.0.0-link-zlib.patch         |  30 +++++
 .../megasync-5.7.0.0-rename-libcryptopp.patch      |  11 ++
 net-misc/megasync/megasync-5.7.0.0.ebuild          | 147 +++++++++++++++++++++
 6 files changed, 228 insertions(+)

diff --git a/net-misc/megasync/Manifest b/net-misc/megasync/Manifest
index 8bb3a95e6..8d9c87330 100644
--- a/net-misc/megasync/Manifest
+++ b/net-misc/megasync/Manifest
@@ -1,4 +1,6 @@
 DIST megasync-5.6.0.0.tar.gz 24712966 BLAKE2B 644e2ccbb2d7e60e9b15278d0e75c46ed102bab436e33a46dfac5068d9e527f4d9e1fbf109f286200b07d02efc08a986c0c263f4ce588fa286dcfc5eb73310d2 SHA512 49105e145cb3af2628044eb0161efdb4c2b75d844d955fe65b54171d77b887e0b77c543911a9a39501fe2200f43fbcdf3f0f1b78fe5868fa8a1968e7e9e02aca
 DIST megasync-5.6.1.0.tar.gz 24712997 BLAKE2B 0e1a80c3c4f934f0b9274beba0883a72ab41bb9dc71284109cf2dd17660adc30ace4e82258ff403d1f95e5edab3aedf309632c2e172b0c727bdfedf06379d09e SHA512 f62b8890eefd4b0f66eeaf99e98a04369da36daea1b3011888c16408578a6e10f3bbe5d584b18a249776ceff9184b77506a809fd1bba95b8f6671a8bf10a1dc1
+DIST megasync-5.7.0.0.tar.gz 23204780 BLAKE2B 5d17808e366e2d3f538168d0580b2a68d077e95d45346f377eb5172d10d06db948fa021e3d1dc39b0d4967cba5b540a843028a571457adea53adcf9770e4e190 SHA512 b7db94bd372d9fd94fa987dc8a370129f23bcb2ff885862544e1a154de71af12459e8af7cbc25fecde5f3c074c81eac079d53dcdcef90e3f0ae8638bced7c868
 DIST megasync-sdk-5.6.0.0.tar.gz 4231209 BLAKE2B 47e2bfe98879101c295e98556c21189a9e0223ed98c21558c6270534d0f58270e41a44eef7a2889caeb1c3256fd00e5d10c51c53c58c96e48efe29b56bb54d06 SHA512 4cf7bd84421a4399fe4269bac16916b5164755f2241c19a78b1c371dac342332c6e7e440942bac31370eeb840a6a71645fd26e1c98a8ff095a1ab8d10ca694e8
 DIST megasync-sdk-5.6.1.0.tar.gz 4231187 BLAKE2B 4e0640281b451d9de18f63be3cca832717fe3ea387d91ace63a7db9d63ea51dfdd54342912885b3a7bde475b93beb524c9a44da9d2106d157df4a6b13b470104 SHA512 f630c3232e3b7b5ac5d9fab0f2d3c8ea6acbd98bb27fdc948d150e91b9edf5ffda575a52544fe5af0e6a023fa53ffe3dc1632e06c823956928e7edb0637f2932
+DIST megasync-sdk-5.7.0.0.tar.gz 4042090 BLAKE2B 326688d633dfd08a160a799a426d29c84515d5971a7b6644ee7624b9ffd092e21f2f0e3f31a55bdfb766623bea60a9867c3c412a4ccd08b629391abdd0056dba SHA512 9c0562f072c00d42b9e53e66f123990dac76ec0dccef6b32985468da75d79105e9e6ed2aad084f8110bc1d89efed21488bf71303872bbd876cd5260fac7caf7e

diff --git a/net-misc/megasync/files/megasync-5.7.0.0-disable-forced-options.patch b/net-misc/megasync/files/megasync-5.7.0.0-disable-forced-options.patch
new file mode 100644
index 000000000..8fcccf701
--- /dev/null
+++ b/net-misc/megasync/files/megasync-5.7.0.0-disable-forced-options.patch
@@ -0,0 +1,11 @@
+Disable forced options to reduce graphics-related dependencies.
+--- a/cmake/modules/desktopapp_options.cmake
++++ b/cmake/modules/desktopapp_options.cmake
+@@ -27,7 +27,6 @@ if (ENABLE_DESKTOP_APP)
+     set(USE_LIBUV ON) # Used by the Qt Desktop App: Includes the library and turns on internal web and ftp server functionality in the SDK.
+     set(ENABLE_LOG_PERFORMANCE ON)
+     set(ENABLE_QT_BINDINGS ON)
+-    set(ENABLE_ISOLATED_GFX ON)
+ endif()
+ 
+ include(sdklib_options)

diff --git a/net-misc/megasync/files/megasync-5.7.0.0-fix-install-dir.patch b/net-misc/megasync/files/megasync-5.7.0.0-fix-install-dir.patch
new file mode 100644
index 000000000..558e3660f
--- /dev/null
+++ b/net-misc/megasync/files/megasync-5.7.0.0-fix-install-dir.patch
@@ -0,0 +1,27 @@
+--- a/cmake/modules/desktopapp_configuration.cmake
++++ b/cmake/modules/desktopapp_configuration.cmake
+@@ -29,8 +29,6 @@ if(UNIX AND NOT APPLE)
+     # Note: using cmake --install --prefix /some/prefix will keep the RPATH as configured above.
+     #       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/megasync/lib") # override default "lib" from GNUInstallDirs
+-    set(CMAKE_INSTALL_BINDIR "usr/bin") # override default "bin" from GNUInstallDirs
+ 
+     # Override CMAKE_INSTALL_PREFIX
+     if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) # In consecutive runs it will always be undef/false
+--- a/src/MEGASync/CMakeLists.txt
++++ b/src/MEGASync/CMakeLists.txt
+@@ -142,13 +142,6 @@ if (UNIX AND NOT APPLE)
+ 
+     set(vcpkg_lib_folder "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/$<$<CONFIG:Debug>:debug/>lib/")
+ 
+-    install(DIRECTORY "${vcpkg_lib_folder}"
+-        TYPE LIB # In CMAKE_INSTALL_LIBDIR directory
+-        FILES_MATCHING
+-        PATTERN "*.so*"
+-        PATTERN "manual-link" EXCLUDE
+-        PATTERN "pkgconfig" EXCLUDE
+-    )
+ 
+     if(DEPLOY_QT_LIBRARIES)
+         include(desktopapp_deploy_qt)

diff --git a/net-misc/megasync/files/megasync-5.7.0.0-link-zlib.patch b/net-misc/megasync/files/megasync-5.7.0.0-link-zlib.patch
new file mode 100644
index 000000000..66231b5cc
--- /dev/null
+++ b/net-misc/megasync/files/megasync-5.7.0.0-link-zlib.patch
@@ -0,0 +1,30 @@
+Add missing zlib links.
+```
+/usr/lib/gcc/x86_64-pc-linux-gnu/15/../../../../x86_64-pc-linux-gnu/bin/ld: src/MEGASync/mega/tools/gfxworker/liblibgfxworker.a(logger.cpp.o): undefined reference to symbol 'gzputs'
+```
+--- a/src/MEGASync/control/control.cmake
++++ b/src/MEGASync/control/control.cmake
+@@ -71,6 +71,9 @@ set(DESKTOP_APP_CONTROL_SOURCES
+     control/StatsEventHandler.cpp
+ )
+ 
++find_package(ZLIB REQUIRED)
++target_link_libraries(MEGAsync PRIVATE ZLIB::ZLIB)
++
+ target_sources(MEGAsync
+     PRIVATE
+     ${DESKTOP_APP_CONTROL_HEADERS}
+--- a/src/MEGASync/mega/tools/gfxworker/CMakeLists.txt
++++ b/src/MEGASync/mega/tools/gfxworker/CMakeLists.txt
+@@ -70,9 +70,11 @@ add_executable(gfxworker
+     src/main.cpp
+ )
+ 
++find_package(ZLIB REQUIRED)
+ target_link_libraries(gfxworker
+     PRIVATE
+     libgfxworker
++    ZLIB::ZLIB
+ )
+ 
+ # Adjust compilation flags for warnings and errors for gfxworker

diff --git a/net-misc/megasync/files/megasync-5.7.0.0-rename-libcryptopp.patch b/net-misc/megasync/files/megasync-5.7.0.0-rename-libcryptopp.patch
new file mode 100644
index 000000000..4bb2ffd4b
--- /dev/null
+++ b/net-misc/megasync/files/megasync-5.7.0.0-rename-libcryptopp.patch
@@ -0,0 +1,11 @@
+--- a/src/MEGASync/mega/cmake/modules/sdklib_libraries.cmake
++++ b/src/MEGASync/mega/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/net-misc/megasync/megasync-5.7.0.0.ebuild b/net-misc/megasync/megasync-5.7.0.0.ebuild
new file mode 100644
index 000000000..f9664b2b8
--- /dev/null
+++ b/net-misc/megasync/megasync-5.7.0.0.ebuild
@@ -0,0 +1,147 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic qmake-utils xdg
+
+DESCRIPTION="The official Qt-based program for syncing your MEGA account in your PC"
+HOMEPAGE="
+	https://mega.io
+	https://github.com/meganz/MEGAsync
+"
+
+MEGA_SDK_REV="81f2d1cde975859ff264c66b808cfa855f79ae82" # commit of src/MEGASync/mega submodule
+MEGA_TAG_SUFFIX="Win"
+SRC_URI="
+	https://github.com/meganz/MEGAsync/archive/v${PV}_${MEGA_TAG_SUFFIX}.tar.gz -> ${P}.tar.gz
+	https://github.com/meganz/sdk/archive/${MEGA_SDK_REV}.tar.gz -> ${PN}-sdk-${PV}.tar.gz
+"
+S="${WORKDIR}"/MEGAsync-${PV}_${MEGA_TAG_SUFFIX}
+
+LICENSE="MEGA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mediainfo nautilus nemo thumbnail thunar"
+
+DEPEND="
+	dev-db/sqlite:3
+	dev-libs/crypto++:=
+	dev-libs/icu:=
+	dev-libs/libsodium:=
+	dev-libs/libuv:=
+	dev-libs/openssl:0=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtimageformats:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	net-dns/c-ares:=
+	net-misc/curl[ssl]
+	sys-libs/zlib
+	x11-libs/libxcb:=
+	mediainfo? (
+		media-libs/libmediainfo
+		media-libs/libzen
+	)
+	nautilus? (
+		dev-libs/glib:2
+		>=gnome-base/nautilus-43
+	)
+	nemo? (
+		dev-libs/glib:2
+		gnome-extra/nemo
+	)
+	thumbnail? (
+		media-libs/freeimage
+		media-video/ffmpeg:=
+	)
+	thunar? (
+		dev-libs/glib:2
+		xfce-base/thunar:=
+	)
+"
+RDEPEND="
+	${DEPEND}
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtquickcontrols2:5
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.10.0.0_ffmpeg6.patch"
+	"${FILESDIR}/${PN}-5.6.0.0-remove-clang-format.patch"
+	"${FILESDIR}/${P}-disable-forced-options.patch"
+	"${FILESDIR}/${P}-fix-install-dir.patch"
+	"${FILESDIR}/${P}-link-zlib.patch"
+	"${FILESDIR}/${P}-rename-libcryptopp.patch"
+)
+
+nemo_run() {
+	if use nemo; then
+		cd "${S}/src/MEGAShellExtNemo" || die
+		"$@"
+	fi
+}
+
+thunar_run() {
+	if use thunar; then
+		cd "${S}/src/MEGAShellExtThunar" || die
+		"$@"
+	fi
+}
+
+src_prepare() {
+	rmdir src/MEGASync/mega || die
+	mv "${WORKDIR}/sdk-${MEGA_SDK_REV}" src/MEGASync/mega || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# https://github.com/meganz/sdk/issues/2679
+	append-cppflags -DNDEBUG
+
+	local mycmakeargs=(
+		# build internal libs as static
+		-DBUILD_SHARED_LIBS=OFF
+		-DCMAKE_MODULE_PATH="${S}/src/MEGASync/mega/cmake/modules/packages"
+		-DENABLE_DESKTOP_APP_WERROR=OFF
+		-DENABLE_DESKTOP_UPDATE_GEN=OFF
+		-DENABLE_DESIGN_TOKENS_IMPORTER=OFF
+		-DENABLE_ISOLATED_GFX=$(usex thumbnail)
+		-DENABLE_LINUX_EXT=$(usex nautilus)
+		-DUSE_FFMPEG=$(usex thumbnail)
+		-DUSE_FREEIMAGE=$(usex thumbnail)
+		-DUSE_MEDIAINFO=$(usex mediainfo)
+		-DUSE_PDFIUM=OFF
+		-DUSE_READLINE=OFF
+	)
+	cmake_src_configure
+
+	unset mycmakeargs
+	nemo_run eqmake5 DEFINES=no_desktop
+	thunar_run eqmake5
+}
+
+src_compile() {
+	cmake_src_compile
+
+	nemo_run emake
+	thunar_run emake
+}
+
+src_install() {
+	cmake_src_install
+
+	nemo_run emake INSTALL_ROOT="${D}" install
+	thunar_run emake INSTALL_ROOT="${D}" install
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-misc/megasync/files/, net-misc/megasync/
@ 2024-10-03 16:08 Takuya Wakazono
  0 siblings, 0 replies; 8+ messages in thread
From: Takuya Wakazono @ 2024-10-03 16:08 UTC (permalink / raw
  To: gentoo-commits

commit:     54795f8f05ce653cbe3a60541578d613e55fb943
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Thu Oct  3 16:05:44 2024 +0000
Commit:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Thu Oct  3 16:05:44 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=54795f8f

net-misc/megasync: drop 5.4.1.0

Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>

 net-misc/megasync/Manifest                         |   2 -
 .../files/megasync-4.10.0.0_fix-build.patch        |  45 ------
 net-misc/megasync/megasync-5.4.1.0.ebuild          | 157 ---------------------
 3 files changed, 204 deletions(-)

diff --git a/net-misc/megasync/Manifest b/net-misc/megasync/Manifest
index f8beac786..f544ffa62 100644
--- a/net-misc/megasync/Manifest
+++ b/net-misc/megasync/Manifest
@@ -1,4 +1,2 @@
-DIST megasync-5.4.1.0.tar.gz 24718226 BLAKE2B ab89ed026efc0e28ef5c21554db259e74199d12d1194ecf358ad658b0ecee5a7c421ce374e3ba54a752e813c38b535034c04e9749b1f9d876a7df88951d2250a SHA512 d908308135cdd717555002d58c4faa1917bd049a0a2f99ae0b487f2ccfda6d7a00c9dee72aae52210079e656f3031bf3cf414020090e4a6b600e3cef5af11901
 DIST megasync-5.5.0.0.tar.gz 24651476 BLAKE2B 6a62b9c27329864e53bc80a98018c6ccbc4a858518ef497a0825b251bd9458888e3b7f1c5ff09488971aa11d927bb173e14289f035db439b9e0340bd9add8a79 SHA512 4a62fadff5f472391b7ee1b0bf525878c1030bbb0e8d88e4f79571b61d5f9e86769d2ee8081638b0b0110ee59b9b9de1ad39cfdb87f36887286a8543aafcfd02
-DIST megasync-sdk-5.4.1.0.tar.gz 4248625 BLAKE2B 96e76e6e421b2f4b7423d5870f0cfcf89bbec6392191e84b2ee7daa0ac4a6a9c6c9599773bd124ce5189abf7a80db981c0f260eec18be8ef7825bba5422123f4 SHA512 740dad61901775ef2e93861c4a42e9e20a779c7189084ed8336cb06d64a3743638e7ca499279b71d2e8bf68d225a3a6397fdfff1a89c18d413ab44eec489c7ea
 DIST megasync-sdk-5.5.0.0.tar.gz 4206234 BLAKE2B 08da742a9dd7d89ebbdb7b0b45dc1c174819b605734a87ab28bb9f1dae4108162110e4d7c820e2427e7b63250cd0550daab20e514eaa33543e47f7d7ea44d1ec SHA512 20a87e4440d2d161335f268389b58c353d9dd6bb1f0b2423c403b1f7202cc927776d3225f4e174b238b03a062d998f65a3ded931fb7f8718275934529015a74c

diff --git a/net-misc/megasync/files/megasync-4.10.0.0_fix-build.patch b/net-misc/megasync/files/megasync-4.10.0.0_fix-build.patch
deleted file mode 100644
index 2fa2e3aac..000000000
--- a/net-misc/megasync/files/megasync-4.10.0.0_fix-build.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/src/MEGAShellExtNautilus/MEGAShellExtNautilus.pro b/src/MEGAShellExtNautilus/MEGAShellExtNautilus.pro
-index 06cbb08cd..7ca767132 100644
---- a/src/MEGAShellExtNautilus/MEGAShellExtNautilus.pro
-+++ b/src/MEGAShellExtNautilus/MEGAShellExtNautilus.pro
-@@ -52,5 +52,4 @@ INSTALLS += emblems32  emblems64
- !contains(DEFINES, no_desktop) {
-     update_cache.commands = gtk-update-icon-cache -f -t $${HICOLOR} || true
-     update_cache.path = $${HICOLOR}
--    INSTALLS += update_cache
- }
-diff --git a/src/MEGAShellExtNemo/MEGAShellExtNemo.pro b/src/MEGAShellExtNemo/MEGAShellExtNemo.pro
-index 33668b4ee..061e0d445 100644
---- a/src/MEGAShellExtNemo/MEGAShellExtNemo.pro
-+++ b/src/MEGAShellExtNemo/MEGAShellExtNemo.pro
-@@ -43,5 +43,4 @@ INSTALLS += emblems32  emblems64
- !contains(DEFINES, no_desktop) {
-     update_cache.commands = gtk-update-icon-cache -f -t $${HICOLOR} || true
-     update_cache.path = $$PWD
--    INSTALLS += update_cache
- }
-diff --git a/src/MEGASync/google_breakpad/google_breakpad.pri b/src/MEGASync/google_breakpad/google_breakpad.pri
-index 122268aba..cd141a5f9 100644
---- a/src/MEGASync/google_breakpad/google_breakpad.pri
-+++ b/src/MEGASync/google_breakpad/google_breakpad.pri
-@@ -43,8 +43,6 @@ unix:!macx {
-   SOURCES += $$PWD/common/linux/elfutils.cc
-   SOURCES += $$PWD/common/string_conversion.cc
-   SOURCES += $$PWD/common/convert_UTF.c
--
--  QMAKE_CXXFLAGS+=-g
- }
- 
- win32 {
-diff --git a/src/MEGASync/platform/platform.pri b/src/MEGASync/platform/platform.pri
-index 99f4dbd4f..ef5553508 100644
---- a/src/MEGASync/platform/platform.pri
-+++ b/src/MEGASync/platform/platform.pri
-@@ -89,7 +89,6 @@ unix:!macx {
-         # desktop
-         desktop.path = $$DESKTOP_DESTDIR/share/applications
-         desktop.files = $$PWD/linux/data/megasync.desktop
--        desktop.commands = update-desktop-database &> /dev/null || true
-         INSTALLS += desktop
- 
-         HICOLOR = $$DESKTOP_DESTDIR/share/icons/hicolor

diff --git a/net-misc/megasync/megasync-5.4.1.0.ebuild b/net-misc/megasync/megasync-5.4.1.0.ebuild
deleted file mode 100644
index 950e804d2..000000000
--- a/net-misc/megasync/megasync-5.4.1.0.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic qmake-utils xdg
-
-DESCRIPTION="The official Qt-based program for syncing your MEGA account in your PC"
-HOMEPAGE="
-	https://mega.io
-	https://github.com/meganz/MEGAsync
-"
-
-if [[ ${PV} == 9999 ]];then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/meganz/MEGAsync"
-	EGIT_BRANCH="master"
-	EGIT_SUBMODULES=( '*' )
-else
-	MEGA_SDK_REV="159dcc4a61d43dfdf5997cf8113755fbe2452bd7" # commit of src/MEGASync/mega submodule
-	MEGA_TAG_SUFFIX="Linux"
-	SRC_URI="
-		https://github.com/meganz/MEGAsync/archive/v${PV}_${MEGA_TAG_SUFFIX}.tar.gz -> ${P}.tar.gz
-		https://github.com/meganz/sdk/archive/${MEGA_SDK_REV}.tar.gz -> ${PN}-sdk-${PV}.tar.gz
-	"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}"/MEGAsync-${PV}_${MEGA_TAG_SUFFIX}
-fi
-
-LICENSE="MEGA"
-SLOT="0"
-IUSE="mediainfo nautilus nemo thumbnail thunar"
-
-DEPEND="
-	dev-db/sqlite:3
-	dev-libs/crypto++:=
-	dev-libs/icu:=
-	dev-libs/libsodium:=
-	dev-libs/libuv:=
-	dev-libs/openssl:0=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtimageformats:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	net-dns/c-ares:=
-	net-misc/curl[ssl]
-	sys-libs/zlib
-	x11-libs/libxcb:=
-	mediainfo? (
-		media-libs/libmediainfo
-		media-libs/libzen
-	)
-	nautilus? (
-		dev-libs/glib:2
-		>=gnome-base/nautilus-43
-	)
-	nemo? (
-		dev-libs/glib:2
-		gnome-extra/nemo
-	)
-	thumbnail? (
-		media-libs/freeimage
-		media-video/ffmpeg:=
-	)
-	thunar? ( xfce-base/thunar:= )
-"
-RDEPEND="
-	${DEPEND}
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtquickcontrols2:5
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.10.0.0_ffmpeg6.patch"
-	"${FILESDIR}/${PN}-4.10.0.0_fix-build.patch"
-	"${FILESDIR}/${PN}-5.3.0.0-link-zlib.patch"
-	"${FILESDIR}/${PN}-5.3.0.0-fix-install-dir.patch"
-	"${FILESDIR}/${PN}-5.3.0.0-rename-libcryptopp.patch"
-)
-
-nautilus_run() {
-	if use nautilus; then
-		cd "${S}/src/MEGAShellExtNautilus" || die
-		"$@"
-	fi
-}
-
-nemo_run() {
-	if use nemo; then
-		cd "${S}/src/MEGAShellExtNemo" || die
-		"$@"
-	fi
-}
-
-thunar_run() {
-	if use thunar; then
-		cd "${S}/src/MEGAShellExtThunar" || die
-		"$@"
-	fi
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999 ]]; then
-		rmdir src/MEGASync/mega || die
-		mv "${WORKDIR}/sdk-${MEGA_SDK_REV}" src/MEGASync/mega || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# https://github.com/meganz/sdk/issues/2679
-	append-cppflags -DNDEBUG
-
-	local mycmakeargs=(
-		# build internal libs as static
-		-DBUILD_SHARED_LIBS=OFF
-		-DCMAKE_MODULE_PATH="${S}/src/MEGASync/mega/contrib/cmake/modules/packages"
-		-DENABLE_DESKTOP_UPDATE_GEN=OFF
-		-DUSE_FFMPEG=$(usex thumbnail)
-		-DUSE_FREEIMAGE=$(usex thumbnail)
-		-DUSE_MEDIAINFO=$(usex mediainfo)
-		-DUSE_PDFIUM=OFF
-		-DUSE_READLINE=OFF
-	)
-	cmake_src_configure
-
-	unset mycmakeargs
-	nautilus_run eqmake5
-	nemo_run eqmake5
-	thunar_run eqmake5
-}
-
-src_compile() {
-	cmake_src_compile
-
-	nautilus_run emake
-	nemo_run emake
-	thunar_run emake
-}
-
-src_install() {
-	cmake_src_install
-
-	nautilus_run emake INSTALL_ROOT="${D}" install
-	nemo_run emake INSTALL_ROOT="${D}" install
-	thunar_run emake INSTALL_ROOT="${D}" install
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-misc/megasync/files/, net-misc/megasync/
@ 2023-11-23  6:09 Takuya Wakazono
  0 siblings, 0 replies; 8+ messages in thread
From: Takuya Wakazono @ 2023-11-23  6:09 UTC (permalink / raw
  To: gentoo-commits

commit:     59e8bfb0ef3006bb24904a4349aed1ce3c385d92
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Thu Nov 23 05:53:43 2023 +0000
Commit:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Thu Nov 23 05:53:43 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=59e8bfb0

net-misc/megasync: drop 4.10.0.0

Closes: https://bugs.gentoo.org/791916
Closes: https://bugs.gentoo.org/791919
Closes: https://bugs.gentoo.org/791922
Closes: https://bugs.gentoo.org/800647
Closes: https://bugs.gentoo.org/833316
Closes: https://bugs.gentoo.org/860318
Closes: https://bugs.gentoo.org/898154
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>

 .../megasync/files/megasync-4.5.0.0_ffmpeg.patch   |  24 ----
 .../megasync/files/megasync-4.5.0.0_pdfium.patch   |  16 ---
 net-misc/megasync/megasync-4.10.0.0.ebuild         | 149 ---------------------
 net-misc/megasync/metadata.xml                     |   1 -
 4 files changed, 190 deletions(-)

diff --git a/net-misc/megasync/files/megasync-4.5.0.0_ffmpeg.patch b/net-misc/megasync/files/megasync-4.5.0.0_ffmpeg.patch
deleted file mode 100644
index a30d4a1eff..0000000000
--- a/net-misc/megasync/files/megasync-4.5.0.0_ffmpeg.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur a/src/MEGASync/mega/src/gfx/freeimage.cpp b/src/MEGASync/mega/src/gfx/freeimage.cpp
---- a/src/MEGASync/mega/src/gfx/freeimage.cpp	2021-05-23 02:28:08.694081111 +0100
-+++ b/src/MEGASync/mega/src/gfx/freeimage.cpp	2021-05-23 02:29:56.189964969 +0100
-@@ -188,7 +188,7 @@
- 
-     // Force seeking to key frames
-     formatContext->seek2any = false;
--    videoStream->skip_to_keyframe = true;
-+    //videoStream->skip_to_keyframe = true;
-     if (decoder->capabilities & CAP_TRUNCATED)
-     {
-         codecContext.flags |= CAP_TRUNCATED;
-diff -Naur a/src/MEGASync/mega/src/gfx/qt.cpp b/src/MEGASync/mega/src/gfx/qt.cpp
---- a/src/MEGASync/mega/src/gfx/qt.cpp	2021-05-23 02:28:08.694081111 +0100
-+++ b/src/MEGASync/mega/src/gfx/qt.cpp	2021-05-23 02:29:36.172545153 +0100
-@@ -1209,7 +1209,7 @@
- 
-     // Force seeking to key frames
-     formatContext->seek2any = false;
--    videoStream->skip_to_keyframe = true;
-+    //videoStream->skip_to_keyframe = true;
-     if (decoder->capabilities & CAP_TRUNCATED)
-     {
-         codecContext.flags |= CAP_TRUNCATED;

diff --git a/net-misc/megasync/files/megasync-4.5.0.0_pdfium.patch b/net-misc/megasync/files/megasync-4.5.0.0_pdfium.patch
deleted file mode 100644
index 141ab30576..0000000000
--- a/net-misc/megasync/files/megasync-4.5.0.0_pdfium.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/bindings/qt/sdk.pri b/bindings/qt/sdk.pri
-index 83ddc2e2f..46aa06d33 100644
---- a/bindings/qt/sdk.pri
-+++ b/bindings/qt/sdk.pri
-@@ -255,6 +255,11 @@ CONFIG(USE_PDFIUM) {
-                 DEFINES += HAVE_PDFIUM
-                 LIBS += -lpdfium
-             }
-+            else:exists(/usr/include/pdfium/fpdfview.h) {
-+                DEFINES += HAVE_PDFIUM
-+                INCLUDEPATH += /usr/include/pdfium
-+                LIBS += -lpdfium
-+            }
-         }
-         else {#win/mac
-             DEFINES += HAVE_PDFIUM

diff --git a/net-misc/megasync/megasync-4.10.0.0.ebuild b/net-misc/megasync/megasync-4.10.0.0.ebuild
deleted file mode 100644
index 27222f3a63..0000000000
--- a/net-misc/megasync/megasync-4.10.0.0.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools cmake qmake-utils xdg
-
-DESCRIPTION="The official Qt-based program for syncing your MEGA account in your PC"
-HOMEPAGE="
-	https://mega.io
-	https://github.com/meganz/MEGAsync
-"
-
-if [[ ${PV} == 9999 ]];then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/meganz/MEGAsync"
-	EGIT_BRANCH="master"
-	EGIT_SUBMODULES=( '*' )
-else
-	MEGA_SDK_REV="91d14ae6b024339dd4e15acb367ac20fb24633ac" # commit of src/MEGASync/mega submodule
-	MEGA_TAG_SUFFIX="Win"
-	SRC_URI="
-		https://github.com/meganz/MEGAsync/archive/v${PV}_${MEGA_TAG_SUFFIX}.tar.gz -> ${P}.tar.gz
-		https://github.com/meganz/sdk/archive/${MEGA_SDK_REV}.tar.gz -> ${PN}-sdk-${PV}.tar.gz
-	"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}"/MEGAsync-${PV}_${MEGA_TAG_SUFFIX}
-fi
-
-LICENSE="MEGA"
-SLOT="0"
-IUSE="+cryptopp +curl +sqlite +zlib dolphin examples freeimage java nautilus nemo php python readline threads thunar"
-
-RDEPEND="
-	app-arch/xz-utils
-	dev-libs/libgcrypt
-	dev-libs/libsodium
-	dev-libs/libuv
-	dev-libs/openssl:0=
-	media-libs/libpng
-	net-dns/c-ares
-	x11-themes/hicolor-icon-theme
-	cryptopp? ( dev-libs/crypto++ )
-	curl? ( net-misc/curl[ssl,curl_ssl_openssl(-)] )
-	dolphin? ( kde-apps/dolphin )
-	freeimage? ( media-libs/freeimage )
-	nautilus? ( >=gnome-base/nautilus-43 )
-	nemo? ( gnome-extra/nemo )
-	readline? ( sys-libs/readline:0 )
-	sqlite? ( dev-db/sqlite:3 )
-	thunar? ( xfce-base/thunar )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="
-	${RDEPEND}
-	media-libs/libmediainfo
-	media-libs/libraw
-	dev-qt/qtcore:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtgui:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtdbus:5
-	dev-qt/qtimageformats:5
-	dev-qt/qtsvg:5
-	dev-qt/qtx11extras:5
-"
-BDEPEND="
-	dev-lang/swig
-	dev-qt/linguist-tools
-	dolphin? ( kde-frameworks/extra-cmake-modules )
-"
-
-CMAKE_USE_DIR="${S}/src/MEGAShellExtDolphin"
-
-src_prepare() {
-	if [[ ${PV} != 9999 ]]; then
-		rmdir src/MEGASync/mega
-		mv "${WORKDIR}/sdk-${MEGA_SDK_REV}" src/MEGASync/mega
-	fi
-
-	if has_version ">=media-video/ffmpeg-6.0"; then
-		eapply "${FILESDIR}/${PN}-4.10.0.0_ffmpeg6.patch"
-	fi
-	eapply "${FILESDIR}/${PN}-4.10.0.0_fix-build.patch"
-
-	if use dolphin; then
-		cmake_src_prepare
-	else
-		default
-	fi
-
-	cd "${S}/src/MEGASync/mega"
-	eautoreconf
-}
-
-src_configure() {
-	cd "${S}/src/MEGASync/mega"
-	econf \
-		"--disable-silent-rules" \
-		"--disable-curl-checks" \
-		"--disable-megaapi" \
-		$(use_with zlib) \
-		$(use_with sqlite) \
-		$(use_with cryptopp) \
-		"--with-cares" \
-		$(use_with curl) \
-		"--without-termcap" \
-		$(use_enable threads posix-threads) \
-		"--with-sodium" \
-		$(use_with freeimage) \
-		$(use_with readline) \
-		$(use_enable examples) \
-		$(use_enable java) \
-		$(use_enable php) \
-		$(use_enable python)
-
-	cd "${S}/src"
-	local myeqmakeargs=(
-		MEGA.pro
-		CONFIG+="release"
-		$(usex freeimage "" "CONFIG+=nofreeimage")
-		$(usev nautilus "SUBDIRS+=MEGAShellExtNautilus")
-		$(usev nemo "SUBDIRS+=MEGAShellExtNemo")
-		$(usev thunar "SUBDIRS+=MEGAShellExtThunar")
-	)
-
-	eqmake5 ${myeqmakeargs[@]}
-	$(qt5_get_bindir)/lrelease MEGASync/MEGASync.pro
-
-	use dolphin && cmake_src_configure
-}
-
-src_compile() {
-	emake -C src
-
-	use dolphin && cmake_src_compile
-}
-
-src_install() {
-	emake -C src INSTALL_ROOT="${D}" install
-	dobin "src/MEGASync/${PN}"
-	dodoc CREDITS.md README.md
-
-	rm -rf "${D}"/usr/share/doc/megasync
-	rm -rf "${D}"/usr/share/icons/ubuntu-mono-dark
-
-	use dolphin && cmake_src_install
-}

diff --git a/net-misc/megasync/metadata.xml b/net-misc/megasync/metadata.xml
index 011305ed0d..063ed9ae04 100644
--- a/net-misc/megasync/metadata.xml
+++ b/net-misc/megasync/metadata.xml
@@ -18,7 +18,6 @@
 		<flag name='nautilus'>Upload your files to your Mega account from nautilus.</flag>
 		<flag name='nemo'>Upload your files to your Mega account from Nemo.</flag>
 		<flag name='thunar'>Upload your files to your Mega account from Thunar.</flag>
-		<flag name='cryptopp'>Compile with Crypto++ Library.</flag>
 		<flag name='freeimage'>Use freeimage to manage graphic images format.</flag>
 	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-misc/megasync/files/, net-misc/megasync/
@ 2023-11-07 14:03 Takuya Wakazono
  0 siblings, 0 replies; 8+ messages in thread
From: Takuya Wakazono @ 2023-11-07 14:03 UTC (permalink / raw
  To: gentoo-commits

commit:     5db66eaa13af265e6e3cb1ab459d3431f7b595bd
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Tue Nov  7 14:01:38 2023 +0000
Commit:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Tue Nov  7 14:01:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5db66eaa

net-misc/megasync: strip unnecessary CXXFLAGS

Closes: https://bugs.gentoo.org/916992
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>

 net-misc/megasync/files/megasync-4.10.0.0_fix-build.patch | 13 +++++++++++++
 net-misc/megasync/megasync-4.10.0.0.ebuild                |  3 +--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/net-misc/megasync/files/megasync-4.10.0.0_fix-build.patch b/net-misc/megasync/files/megasync-4.10.0.0_fix-build.patch
index dfb6b9f3b1..2fa2e3aac2 100644
--- a/net-misc/megasync/files/megasync-4.10.0.0_fix-build.patch
+++ b/net-misc/megasync/files/megasync-4.10.0.0_fix-build.patch
@@ -18,6 +18,19 @@ index 33668b4ee..061e0d445 100644
      update_cache.path = $$PWD
 -    INSTALLS += update_cache
  }
+diff --git a/src/MEGASync/google_breakpad/google_breakpad.pri b/src/MEGASync/google_breakpad/google_breakpad.pri
+index 122268aba..cd141a5f9 100644
+--- a/src/MEGASync/google_breakpad/google_breakpad.pri
++++ b/src/MEGASync/google_breakpad/google_breakpad.pri
+@@ -43,8 +43,6 @@ unix:!macx {
+   SOURCES += $$PWD/common/linux/elfutils.cc
+   SOURCES += $$PWD/common/string_conversion.cc
+   SOURCES += $$PWD/common/convert_UTF.c
+-
+-  QMAKE_CXXFLAGS+=-g
+ }
+ 
+ win32 {
 diff --git a/src/MEGASync/platform/platform.pri b/src/MEGASync/platform/platform.pri
 index 99f4dbd4f..ef5553508 100644
 --- a/src/MEGASync/platform/platform.pri

diff --git a/net-misc/megasync/megasync-4.10.0.0.ebuild b/net-misc/megasync/megasync-4.10.0.0.ebuild
index e71a988b03..27222f3a63 100644
--- a/net-misc/megasync/megasync-4.10.0.0.ebuild
+++ b/net-misc/megasync/megasync-4.10.0.0.ebuild
@@ -113,8 +113,7 @@ src_configure() {
 		$(use_enable examples) \
 		$(use_enable java) \
 		$(use_enable php) \
-		$(use_enable python) \
-		"--enable-gcc-hardening"
+		$(use_enable python)
 
 	cd "${S}/src"
 	local myeqmakeargs=(


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-misc/megasync/files/, net-misc/megasync/
@ 2021-05-24 10:38 Samuel Bernardo
  0 siblings, 0 replies; 8+ messages in thread
From: Samuel Bernardo @ 2021-05-24 10:38 UTC (permalink / raw
  To: gentoo-commits

commit:     917e847bf4d5c4f60544b3638bc16e0975b20e27
Author:     Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com>
AuthorDate: Mon May 24 10:37:27 2021 +0000
Commit:     Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com>
CommitDate: Mon May 24 10:38:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=917e847b

net-misc/megasync: 4.5.0.0 and 9999

Correct pending upstream bugs and set the correct sdk commit.
Some additional improvements in ebuild.

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Samuel Bernardo <samuelbernardo.mail <AT> gmail.com>

 .../megasync/files/megasync-4.5.0.0_ffmpeg.patch   | 24 +++++++++++++++
 .../megasync/files/megasync-4.5.0.0_pdfium.patch   | 16 ++++++++++
 net-misc/megasync/megasync-4.5.0.0.ebuild          | 20 +++++++++----
 net-misc/megasync/megasync-9999.ebuild             | 34 +++++++++++++++++-----
 4 files changed, 81 insertions(+), 13 deletions(-)

diff --git a/net-misc/megasync/files/megasync-4.5.0.0_ffmpeg.patch b/net-misc/megasync/files/megasync-4.5.0.0_ffmpeg.patch
new file mode 100644
index 000000000..a30d4a1ef
--- /dev/null
+++ b/net-misc/megasync/files/megasync-4.5.0.0_ffmpeg.patch
@@ -0,0 +1,24 @@
+diff -Naur a/src/MEGASync/mega/src/gfx/freeimage.cpp b/src/MEGASync/mega/src/gfx/freeimage.cpp
+--- a/src/MEGASync/mega/src/gfx/freeimage.cpp	2021-05-23 02:28:08.694081111 +0100
++++ b/src/MEGASync/mega/src/gfx/freeimage.cpp	2021-05-23 02:29:56.189964969 +0100
+@@ -188,7 +188,7 @@
+ 
+     // Force seeking to key frames
+     formatContext->seek2any = false;
+-    videoStream->skip_to_keyframe = true;
++    //videoStream->skip_to_keyframe = true;
+     if (decoder->capabilities & CAP_TRUNCATED)
+     {
+         codecContext.flags |= CAP_TRUNCATED;
+diff -Naur a/src/MEGASync/mega/src/gfx/qt.cpp b/src/MEGASync/mega/src/gfx/qt.cpp
+--- a/src/MEGASync/mega/src/gfx/qt.cpp	2021-05-23 02:28:08.694081111 +0100
++++ b/src/MEGASync/mega/src/gfx/qt.cpp	2021-05-23 02:29:36.172545153 +0100
+@@ -1209,7 +1209,7 @@
+ 
+     // Force seeking to key frames
+     formatContext->seek2any = false;
+-    videoStream->skip_to_keyframe = true;
++    //videoStream->skip_to_keyframe = true;
+     if (decoder->capabilities & CAP_TRUNCATED)
+     {
+         codecContext.flags |= CAP_TRUNCATED;

diff --git a/net-misc/megasync/files/megasync-4.5.0.0_pdfium.patch b/net-misc/megasync/files/megasync-4.5.0.0_pdfium.patch
new file mode 100644
index 000000000..141ab3057
--- /dev/null
+++ b/net-misc/megasync/files/megasync-4.5.0.0_pdfium.patch
@@ -0,0 +1,16 @@
+diff --git a/bindings/qt/sdk.pri b/bindings/qt/sdk.pri
+index 83ddc2e2f..46aa06d33 100644
+--- a/bindings/qt/sdk.pri
++++ b/bindings/qt/sdk.pri
+@@ -255,6 +255,11 @@ CONFIG(USE_PDFIUM) {
+                 DEFINES += HAVE_PDFIUM
+                 LIBS += -lpdfium
+             }
++            else:exists(/usr/include/pdfium/fpdfview.h) {
++                DEFINES += HAVE_PDFIUM
++                INCLUDEPATH += /usr/include/pdfium
++                LIBS += -lpdfium
++            }
+         }
+         else {#win/mac
+             DEFINES += HAVE_PDFIUM

diff --git a/net-misc/megasync/megasync-4.5.0.0.ebuild b/net-misc/megasync/megasync-4.5.0.0.ebuild
index 604202807..54c24108f 100644
--- a/net-misc/megasync/megasync-4.5.0.0.ebuild
+++ b/net-misc/megasync/megasync-4.5.0.0.ebuild
@@ -14,14 +14,16 @@ HOMEPAGE="
 if [[ ${PV} == 9999 ]];then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/meganz/MEGAsync"
+	EGIT_BRANCH="master"
+	EGIT_SUBMODULES=( '*' )
 else
-	MEGA_SDK_REV="37b346c2e119559e40c08f43e1a8f54353e7ad59" # commit of src/MEGASync/mega submodule
+	MEGA_SDK_REV="c11a688d578e16dc25d4c94fee7995730be1aa50" # commit of src/MEGASync/mega submodule
 	SRC_URI="
 		https://github.com/meganz/MEGAsync/archive/v${PV}_Win.tar.gz -> ${P}.tar.gz
 		https://github.com/meganz/sdk/archive/${MEGA_SDK_REV}.tar.gz -> ${PN}-sdk-${PV}.tar.gz
 	"
 	KEYWORDS="~amd64 ~x86"
-	# 4.3.8.0 has no dedicated linux tag
+	# 4.5.0.0 has no dedicated linux tag
 	S="${WORKDIR}"/MEGAsync-${PV}_Win
 fi
 
@@ -76,6 +78,14 @@ src_prepare() {
 		rmdir src/MEGASync/mega
 		mv "${WORKDIR}"/sdk-${MEGA_SDK_REV} src/MEGASync/mega
 	fi
+	if [ -e "${FILESDIR}/${P}_pdfium.patch" ]; then
+		cd "${S}/src/MEGASync/mega"
+		eapply -Np1 "${FILESDIR}/${P}_pdfium.patch"
+		cd "${S}"
+	fi
+	if has_version ">=media-video/ffmpeg-4.4" && [ -e "${FILESDIR}/${P}_ffmpeg.patch" ]; then
+		eapply "${FILESDIR}/${P}_ffmpeg.patch"
+	fi
 	if use dolphin; then
 		# use the kde5 CMakeLists instead of the kde 4 version
 		mv src/MEGAShellExtDolphin/CMakeLists_kde5.txt src/MEGAShellExtDolphin/CMakeLists.txt || die
@@ -83,12 +93,12 @@ src_prepare() {
 	else
 		default
 	fi
-	cd src/MEGASync/mega
+	cd "${S}/src/MEGASync/mega"
 	eautoreconf
 }
 
 src_configure() {
-	cd src/MEGASync/mega
+	cd "${S}/src/MEGASync/mega"
 	econf \
 		"--disable-silent-rules" \
 		"--disable-curl-checks" \
@@ -109,7 +119,7 @@ src_configure() {
 		$(use_enable python) \
 		"--enable-chat" \
 		"--enable-gcc-hardening"
-	cd ../..
+	cd "${S}/src"
 
 	local myeqmakeargs=(
 		MEGA.pro

diff --git a/net-misc/megasync/megasync-9999.ebuild b/net-misc/megasync/megasync-9999.ebuild
index 5447073f4..54c24108f 100644
--- a/net-misc/megasync/megasync-9999.ebuild
+++ b/net-misc/megasync/megasync-9999.ebuild
@@ -14,14 +14,17 @@ HOMEPAGE="
 if [[ ${PV} == 9999 ]];then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/meganz/MEGAsync"
+	EGIT_BRANCH="master"
+	EGIT_SUBMODULES=( '*' )
 else
-	MEGA_SDK_REV="ba4834cb6c22f4e996f328db3aa5b82ef20eed3e" # commit of src/MEGASync/mega submodule
+	MEGA_SDK_REV="c11a688d578e16dc25d4c94fee7995730be1aa50" # commit of src/MEGASync/mega submodule
 	SRC_URI="
-		https://github.com/meganz/MEGAsync/archive/v${PV}.0_Linux.tar.gz -> ${P}.tar.gz
+		https://github.com/meganz/MEGAsync/archive/v${PV}_Win.tar.gz -> ${P}.tar.gz
 		https://github.com/meganz/sdk/archive/${MEGA_SDK_REV}.tar.gz -> ${PN}-sdk-${PV}.tar.gz
 	"
 	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}"/MEGAsync-${PV}.0_Linux
+	# 4.5.0.0 has no dedicated linux tag
+	S="${WORKDIR}"/MEGAsync-${PV}_Win
 fi
 
 LICENSE="MEGA"
@@ -62,25 +65,40 @@ DEPEND="
 	dev-qt/qtx11extras:5
 "
 BDEPEND="
-	app-doc/doxygen
 	dev-lang/swig
 	dev-qt/linguist-tools
 "
 
 DOCS=( CREDITS.md README.md )
 
+CMAKE_USE_DIR="${S}/src/MEGAShellExtDolphin"
+
 src_prepare() {
 	if [[ ${PV} != 9999 ]]; then
 		rmdir src/MEGASync/mega
 		mv "${WORKDIR}"/sdk-${MEGA_SDK_REV} src/MEGASync/mega
 	fi
-	default
-	cd src/MEGASync/mega
+	if [ -e "${FILESDIR}/${P}_pdfium.patch" ]; then
+		cd "${S}/src/MEGASync/mega"
+		eapply -Np1 "${FILESDIR}/${P}_pdfium.patch"
+		cd "${S}"
+	fi
+	if has_version ">=media-video/ffmpeg-4.4" && [ -e "${FILESDIR}/${P}_ffmpeg.patch" ]; then
+		eapply "${FILESDIR}/${P}_ffmpeg.patch"
+	fi
+	if use dolphin; then
+		# use the kde5 CMakeLists instead of the kde 4 version
+		mv src/MEGAShellExtDolphin/CMakeLists_kde5.txt src/MEGAShellExtDolphin/CMakeLists.txt || die
+		cmake_src_prepare
+	else
+		default
+	fi
+	cd "${S}/src/MEGASync/mega"
 	eautoreconf
 }
 
 src_configure() {
-	cd src/MEGASync/mega
+	cd "${S}/src/MEGASync/mega"
 	econf \
 		"--disable-silent-rules" \
 		"--disable-curl-checks" \
@@ -101,7 +119,7 @@ src_configure() {
 		$(use_enable python) \
 		"--enable-chat" \
 		"--enable-gcc-hardening"
-	cd ../..
+	cd "${S}/src"
 
 	local myeqmakeargs=(
 		MEGA.pro


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2025-03-05 14:23 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-12 17:56 [gentoo-commits] repo/proj/guru:dev commit in: net-misc/megasync/files/, net-misc/megasync/ Takuya Wakazono
  -- strict thread matches above, loose matches on Subject: below --
2025-03-05 14:23 Takuya Wakazono
2025-02-06 13:04 Takuya Wakazono
2025-01-02 13:47 Takuya Wakazono
2024-10-03 16:08 Takuya Wakazono
2023-11-23  6:09 Takuya Wakazono
2023-11-07 14:03 Takuya Wakazono
2021-05-24 10:38 Samuel Bernardo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox