From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B332F15838C for ; Fri, 26 Jan 2024 10:35:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1B729E2A01; Fri, 26 Jan 2024 10:35:23 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E7A3BE2A02 for ; Fri, 26 Jan 2024 10:35:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 03DC5343443 for ; Fri, 26 Jan 2024 10:35:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 53EAF14C8 for ; Fri, 26 Jan 2024 10:35:18 +0000 (UTC) From: "David Roman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Roman" Message-ID: <1706256945.cd5a69edc3604a6348eb3c6eeb4ddeb447c7b5ab.davidroman@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: net-misc/megasync/ X-VCS-Repository: repo/proj/guru X-VCS-Files: net-misc/megasync/Manifest net-misc/megasync/megasync-4.12.0.0.ebuild net-misc/megasync/megasync-9999.ebuild X-VCS-Directories: net-misc/megasync/ X-VCS-Committer: davidroman X-VCS-Committer-Name: David Roman X-VCS-Revision: cd5a69edc3604a6348eb3c6eeb4ddeb447c7b5ab X-VCS-Branch: master Date: Fri, 26 Jan 2024 10:35:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a77a9e2d-9013-4c11-8a4a-abe6b24cd6a0 X-Archives-Hash: ea166ff27604004fb5be0936bade43f9 commit: cd5a69edc3604a6348eb3c6eeb4ddeb447c7b5ab Author: Takuya Wakazono gmail com> AuthorDate: Fri Jan 26 08:15:45 2024 +0000 Commit: David Roman gmail com> CommitDate: Fri Jan 26 08:15:45 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cd5a69ed net-misc/megasync: add 4.12.0.0, sync live Signed-off-by: Takuya Wakazono gmail.com> net-misc/megasync/Manifest | 2 ++ ...gasync-9999.ebuild => megasync-4.12.0.0.ebuild} | 41 +++++++++++----------- net-misc/megasync/megasync-9999.ebuild | 41 +++++++++++----------- 3 files changed, 44 insertions(+), 40 deletions(-) diff --git a/net-misc/megasync/Manifest b/net-misc/megasync/Manifest index 701233efc4..bf22d45e39 100644 --- a/net-misc/megasync/Manifest +++ b/net-misc/megasync/Manifest @@ -1,2 +1,4 @@ DIST megasync-4.11.0.0.tar.gz 20313571 BLAKE2B 8c5c58912fef730bf3e4c56c5de0b2c6f4825be6c91ec19e6c5f5946a76efa5fd9f36f6afdee3d886b31a13c924dea81f7999d29fbab0bb0f1acefbe52c449f5 SHA512 ab43b83d05d56b8eb1bf66ed89801889cfb8d21d9bae86245607a1d7c36f7436fa8879f6fd94cb07c4a2e8567532b9e0919ec9e78e2ca85d8fca262b1479b482 +DIST megasync-4.12.0.0.tar.gz 25266988 BLAKE2B 0c126feb273d6d11e05a3ec3a5e7925f27bfd86e2ef23306fce4c9b2564b178dc5918b7bef9dcea33a8a5d0462e9c1e8d771c299de6e0f8ed5d4bed616ed58f9 SHA512 fd3ea7b624e66e3d4576c436d983a027e711783d41c585eedf540ba6bbf25ab9128ab4a3c0d2e6806705d54cea5e470d7339d49cc72a635385861f9efd64faf9 DIST megasync-sdk-4.11.0.0.tar.gz 3714994 BLAKE2B 6d6d217d8acb7f191c88f18bc0b2ef9b6f743502a9916841177a93452c1818cffcb8275134cc2a32162693c59af829d42249497f2ed18b66e3c0f032f0ba6780 SHA512 471102d280d02b90f41c46f5700c0d71d88f74ccf7c605c717a66ad154c84c725ce231d11779fd480b2eb81b073da0bbea00dbc149918e6519fe89694b185ef4 +DIST megasync-sdk-4.12.0.0.tar.gz 3580874 BLAKE2B 7fe63ccd998ac0fe4f6d31d4fb38041d01180044b6a36658da28b0793c2c0c9a95984a937ffa74b11449818ca63a55d7d1faef65e69ea29309d42c4d7646b2c3 SHA512 e97d5901e5445bd677b2d7c50d684dbd6975efcba43ed6618b76d9452b33f5c42eaa8279e920987cf5af63da6ad951589e644bf01814b69739e4260c651aa68b diff --git a/net-misc/megasync/megasync-9999.ebuild b/net-misc/megasync/megasync-4.12.0.0.ebuild similarity index 79% copy from net-misc/megasync/megasync-9999.ebuild copy to net-misc/megasync/megasync-4.12.0.0.ebuild index 0d4b8ab3f4..78d77b1684 100644 --- a/net-misc/megasync/megasync-9999.ebuild +++ b/net-misc/megasync/megasync-4.12.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]];then EGIT_BRANCH="master" EGIT_SUBMODULES=( '*' ) else - MEGA_SDK_REV="6d4c102940dab277974090cd4292e58f08ac6032" # commit of src/MEGASync/mega submodule + MEGA_SDK_REV="2e9307d114c379967f415211d466262162e074d4" # 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 @@ -37,14 +37,15 @@ DEPEND=" dev-libs/libsodium:= dev-libs/libuv:= dev-libs/openssl:0= + dev-qt/qtconcurrent:5 dev-qt/qtcore:5 - dev-qt/qtwidgets:5 + dev-qt/qtdbus:5 + dev-qt/qtdeclarative: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/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/libmediainfo media-libs/libraw @@ -69,18 +70,18 @@ BDEPEND=" dolphin? ( kde-frameworks/extra-cmake-modules ) " +PATCHES=( + "${FILESDIR}/${PN}-4.10.0.0_ffmpeg6.patch" + "${FILESDIR}/${PN}-4.10.0.0_fix-build.patch" +) + 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" + rmdir src/MEGASync/mega || die + mv "${WORKDIR}/sdk-${MEGA_SDK_REV}" src/MEGASync/mega || die fi - eapply "${FILESDIR}/${PN}-4.10.0.0_fix-build.patch" if use dolphin; then cmake_src_prepare @@ -88,20 +89,20 @@ src_prepare() { default fi - cd "${S}/src/MEGASync/mega" + cd "${S}/src/MEGASync/mega" || die eautoreconf } src_configure() { - cd "${S}/src/MEGASync/mega" + cd "${S}/src/MEGASync/mega" || die econf \ "--disable-curl-checks" \ "--disable-examples" \ $(use_enable threads posix-threads) \ $(use_with freeimage) - cd "${S}/src" - local myeqmakeargs=( + cd "${S}/src" || die + local myqmakeargs=( MEGA.pro CONFIG+="release" $(usex freeimage "" "CONFIG+=nofreeimage") @@ -110,8 +111,8 @@ src_configure() { $(usev thunar "SUBDIRS+=MEGAShellExtThunar") ) - eqmake5 ${myeqmakeargs[@]} - $(qt5_get_bindir)/lrelease MEGASync/MEGASync.pro + eqmake5 "${myqmakeargs[@]}" + $(qt5_get_bindir)/lrelease MEGASync/MEGASync.pro || die use dolphin && cmake_src_configure } @@ -127,8 +128,8 @@ src_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 + rm -rf "${D}"/usr/share/doc/megasync || die + rm -rf "${D}"/usr/share/icons/ubuntu-mono-dark || die use dolphin && cmake_src_install } diff --git a/net-misc/megasync/megasync-9999.ebuild b/net-misc/megasync/megasync-9999.ebuild index 0d4b8ab3f4..78d77b1684 100644 --- a/net-misc/megasync/megasync-9999.ebuild +++ b/net-misc/megasync/megasync-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]];then EGIT_BRANCH="master" EGIT_SUBMODULES=( '*' ) else - MEGA_SDK_REV="6d4c102940dab277974090cd4292e58f08ac6032" # commit of src/MEGASync/mega submodule + MEGA_SDK_REV="2e9307d114c379967f415211d466262162e074d4" # 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 @@ -37,14 +37,15 @@ DEPEND=" dev-libs/libsodium:= dev-libs/libuv:= dev-libs/openssl:0= + dev-qt/qtconcurrent:5 dev-qt/qtcore:5 - dev-qt/qtwidgets:5 + dev-qt/qtdbus:5 + dev-qt/qtdeclarative: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/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/libmediainfo media-libs/libraw @@ -69,18 +70,18 @@ BDEPEND=" dolphin? ( kde-frameworks/extra-cmake-modules ) " +PATCHES=( + "${FILESDIR}/${PN}-4.10.0.0_ffmpeg6.patch" + "${FILESDIR}/${PN}-4.10.0.0_fix-build.patch" +) + 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" + rmdir src/MEGASync/mega || die + mv "${WORKDIR}/sdk-${MEGA_SDK_REV}" src/MEGASync/mega || die fi - eapply "${FILESDIR}/${PN}-4.10.0.0_fix-build.patch" if use dolphin; then cmake_src_prepare @@ -88,20 +89,20 @@ src_prepare() { default fi - cd "${S}/src/MEGASync/mega" + cd "${S}/src/MEGASync/mega" || die eautoreconf } src_configure() { - cd "${S}/src/MEGASync/mega" + cd "${S}/src/MEGASync/mega" || die econf \ "--disable-curl-checks" \ "--disable-examples" \ $(use_enable threads posix-threads) \ $(use_with freeimage) - cd "${S}/src" - local myeqmakeargs=( + cd "${S}/src" || die + local myqmakeargs=( MEGA.pro CONFIG+="release" $(usex freeimage "" "CONFIG+=nofreeimage") @@ -110,8 +111,8 @@ src_configure() { $(usev thunar "SUBDIRS+=MEGAShellExtThunar") ) - eqmake5 ${myeqmakeargs[@]} - $(qt5_get_bindir)/lrelease MEGASync/MEGASync.pro + eqmake5 "${myqmakeargs[@]}" + $(qt5_get_bindir)/lrelease MEGASync/MEGASync.pro || die use dolphin && cmake_src_configure } @@ -127,8 +128,8 @@ src_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 + rm -rf "${D}"/usr/share/doc/megasync || die + rm -rf "${D}"/usr/share/icons/ubuntu-mono-dark || die use dolphin && cmake_src_install }