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 AD3D9158099 for ; Thu, 23 Nov 2023 06:09:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AAD3C2BC020; Thu, 23 Nov 2023 06:09:06 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8B8482BC020 for ; Thu, 23 Nov 2023 06:09:06 +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 97EED33BE00 for ; Thu, 23 Nov 2023 06:09:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 31D5C13BB for ; Thu, 23 Nov 2023 06:09:04 +0000 (UTC) From: "Takuya Wakazono" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Takuya Wakazono" Message-ID: <1700718823.59e8bfb0ef3006bb24904a4349aed1ce3c385d92.pastalian46@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: net-misc/megasync/files/, net-misc/megasync/ X-VCS-Repository: repo/proj/guru X-VCS-Files: net-misc/megasync/files/megasync-4.5.0.0_ffmpeg.patch net-misc/megasync/files/megasync-4.5.0.0_pdfium.patch net-misc/megasync/megasync-4.10.0.0.ebuild net-misc/megasync/metadata.xml X-VCS-Directories: net-misc/megasync/files/ net-misc/megasync/ X-VCS-Committer: pastalian46 X-VCS-Committer-Name: Takuya Wakazono X-VCS-Revision: 59e8bfb0ef3006bb24904a4349aed1ce3c385d92 X-VCS-Branch: dev Date: Thu, 23 Nov 2023 06:09:04 +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: 8e0a0f92-5103-47d1-b212-89300a11f3a8 X-Archives-Hash: 42408493dc7940153f982ea5af736851 commit: 59e8bfb0ef3006bb24904a4349aed1ce3c385d92 Author: Takuya Wakazono gmail com> AuthorDate: Thu Nov 23 05:53:43 2023 +0000 Commit: Takuya Wakazono gmail 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 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 @@ Upload your files to your Mega account from nautilus. Upload your files to your Mega account from Nemo. Upload your files to your Mega account from Thunar. - Compile with Crypto++ Library. Use freeimage to manage graphic images format.