* [gentoo-commits] repo/proj/guru:master commit in: net-misc/megasync/, net-misc/megasync/files/
@ 2021-05-24 11:06 Andrew Ammerlaan
0 siblings, 0 replies; 5+ messages in thread
From: Andrew Ammerlaan @ 2021-05-24 11:06 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: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
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] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-misc/megasync/, net-misc/megasync/files/
@ 2023-11-06 14:18 David Roman
0 siblings, 0 replies; 5+ messages in thread
From: David Roman @ 2023-11-06 14:18 UTC (permalink / raw
To: gentoo-commits
commit: 16dfc71df33b7e3b827379c13e0ec9f5bb471538
Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Sun Nov 5 04:58:01 2023 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Sun Nov 5 04:58:01 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=16dfc71d
net-misc/megasync: fix USE flags for file manager
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>
.../files/megasync-4.10.0.0_fix-build.patch | 32 +++++++++++++++
net-misc/megasync/megasync-4.10.0.0.ebuild | 46 +++++++++++-----------
net-misc/megasync/metadata.xml | 1 +
3 files changed, 57 insertions(+), 22 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
new file mode 100644
index 0000000000..dfb6b9f3b1
--- /dev/null
+++ b/net-misc/megasync/files/megasync-4.10.0.0_fix-build.patch
@@ -0,0 +1,32 @@
+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/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-4.10.0.0.ebuild b/net-misc/megasync/megasync-4.10.0.0.ebuild
index 9eb43c9724..e71a988b03 100644
--- a/net-misc/megasync/megasync-4.10.0.0.ebuild
+++ b/net-misc/megasync/megasync-4.10.0.0.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit autotools desktop qmake-utils xdg cmake
+inherit autotools cmake qmake-utils xdg
DESCRIPTION="The official Qt-based program for syncing your MEGA account in your PC"
HOMEPAGE="
@@ -29,7 +29,7 @@ fi
LICENSE="MEGA"
SLOT="0"
-IUSE="+cryptopp +curl +sqlite +zlib dolphin examples freeimage java nautilus php python readline threads thunar"
+IUSE="+cryptopp +curl +sqlite +zlib dolphin examples freeimage java nautilus nemo php python readline threads thunar"
RDEPEND="
app-arch/xz-utils
@@ -44,7 +44,8 @@ RDEPEND="
curl? ( net-misc/curl[ssl,curl_ssl_openssl(-)] )
dolphin? ( kde-apps/dolphin )
freeimage? ( media-libs/freeimage )
- nautilus? ( >=gnome-base/nautilus-3 )
+ nautilus? ( >=gnome-base/nautilus-43 )
+ nemo? ( gnome-extra/nemo )
readline? ( sys-libs/readline:0 )
sqlite? ( dev-db/sqlite:3 )
thunar? ( xfce-base/thunar )
@@ -67,30 +68,28 @@ DEPEND="
BDEPEND="
dev-lang/swig
dev-qt/linguist-tools
+ dolphin? ( kde-frameworks/extra-cmake-modules )
"
-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
+ mv "${WORKDIR}/sdk-${MEGA_SDK_REV}" src/MEGASync/mega
fi
- cd "${S}/src/MEGASync/mega"
- eapply -Np1 "${FILESDIR}/${PN}-4.5.0.0_pdfium.patch"
- cd "${S}"
+
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
- # 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
}
@@ -116,33 +115,36 @@ src_configure() {
$(use_enable php) \
$(use_enable python) \
"--enable-gcc-hardening"
- cd "${S}/src"
+ 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[@]}
- use dolphin && cmake_src_configure
$(qt5_get_bindir)/lrelease MEGASync/MEGASync.pro
+
+ use dolphin && cmake_src_configure
}
src_compile() {
- emake -C src INSTALL_ROOT=. || die
+ emake -C src
+
use dolphin && cmake_src_compile
}
src_install() {
- use dolphin && cmake_src_install
- einstalldocs
+ emake -C src INSTALL_ROOT="${D}" install
+ dobin "src/MEGASync/${PN}"
+ dodoc CREDITS.md README.md
- dobin src/MEGASync/${PN}
- domenu src/MEGASync/platform/linux/data/${PN}.desktop
+ rm -rf "${D}"/usr/share/doc/megasync
+ rm -rf "${D}"/usr/share/icons/ubuntu-mono-dark
- cd src/MEGASync/platform/linux/data/icons/hicolor
- for size in 16x16 32x32 48x48 128x128 256x256;do
- doicon -s $size $size/apps/mega.png
- done
+ use dolphin && cmake_src_install
}
diff --git a/net-misc/megasync/metadata.xml b/net-misc/megasync/metadata.xml
index 45ac224f44..548893d860 100644
--- a/net-misc/megasync/metadata.xml
+++ b/net-misc/megasync/metadata.xml
@@ -12,6 +12,7 @@
<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='cryptopp'>Compile with Crypto++ Library.</flag>
<flag name='freeimage'>Use freeimage to manage graphic images format.</flag>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-misc/megasync/, net-misc/megasync/files/
@ 2023-11-09 3:11 Haelwenn Monnier
0 siblings, 0 replies; 5+ messages in thread
From: Haelwenn Monnier @ 2023-11-09 3:11 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: Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
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] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-misc/megasync/, net-misc/megasync/files/
@ 2024-10-04 10:24 Rui Huang
0 siblings, 0 replies; 5+ messages in thread
From: Rui Huang @ 2024-10-04 10:24 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: Rui Huang <vowstar <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] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-misc/megasync/, net-misc/megasync/files/
@ 2024-10-31 11:33 David Roman
0 siblings, 0 replies; 5+ messages in thread
From: David Roman @ 2024-10-31 11:33 UTC (permalink / raw
To: gentoo-commits
commit: efc3b58dc509ffcf60ab2ac96d3cace5c5bec9ec
Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Wed Oct 30 13:37:43 2024 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Wed Oct 30 13:37:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=efc3b58d
net-misc/megasync: add 5.6.0.0
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>
net-misc/megasync/Manifest | 2 +
.../megasync-5.6.0.0-remove-clang-format.patch | 9 ++
net-misc/megasync/megasync-5.6.0.0.ebuild | 144 +++++++++++++++++++++
3 files changed, 155 insertions(+)
diff --git a/net-misc/megasync/Manifest b/net-misc/megasync/Manifest
index f544ffa62..ee9a884e6 100644
--- a/net-misc/megasync/Manifest
+++ b/net-misc/megasync/Manifest
@@ -1,2 +1,4 @@
DIST megasync-5.5.0.0.tar.gz 24651476 BLAKE2B 6a62b9c27329864e53bc80a98018c6ccbc4a858518ef497a0825b251bd9458888e3b7f1c5ff09488971aa11d927bb173e14289f035db439b9e0340bd9add8a79 SHA512 4a62fadff5f472391b7ee1b0bf525878c1030bbb0e8d88e4f79571b61d5f9e86769d2ee8081638b0b0110ee59b9b9de1ad39cfdb87f36887286a8543aafcfd02
+DIST megasync-5.6.0.0.tar.gz 24712966 BLAKE2B 644e2ccbb2d7e60e9b15278d0e75c46ed102bab436e33a46dfac5068d9e527f4d9e1fbf109f286200b07d02efc08a986c0c263f4ce588fa286dcfc5eb73310d2 SHA512 49105e145cb3af2628044eb0161efdb4c2b75d844d955fe65b54171d77b887e0b77c543911a9a39501fe2200f43fbcdf3f0f1b78fe5868fa8a1968e7e9e02aca
DIST megasync-sdk-5.5.0.0.tar.gz 4206234 BLAKE2B 08da742a9dd7d89ebbdb7b0b45dc1c174819b605734a87ab28bb9f1dae4108162110e4d7c820e2427e7b63250cd0550daab20e514eaa33543e47f7d7ea44d1ec SHA512 20a87e4440d2d161335f268389b58c353d9dd6bb1f0b2423c403b1f7202cc927776d3225f4e174b238b03a062d998f65a3ded931fb7f8718275934529015a74c
+DIST megasync-sdk-5.6.0.0.tar.gz 4231209 BLAKE2B 47e2bfe98879101c295e98556c21189a9e0223ed98c21558c6270534d0f58270e41a44eef7a2889caeb1c3256fd00e5d10c51c53c58c96e48efe29b56bb54d06 SHA512 4cf7bd84421a4399fe4269bac16916b5164755f2241c19a78b1c371dac342332c6e7e440942bac31370eeb840a6a71645fd26e1c98a8ff095a1ab8d10ca694e8
diff --git a/net-misc/megasync/files/megasync-5.6.0.0-remove-clang-format.patch b/net-misc/megasync/files/megasync-5.6.0.0-remove-clang-format.patch
new file mode 100644
index 000000000..bc70e9480
--- /dev/null
+++ b/net-misc/megasync/files/megasync-5.6.0.0-remove-clang-format.patch
@@ -0,0 +1,9 @@
+We don't need to run clang-format to build the app.
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -63,5 +63,3 @@ include(desktopapp_configuration)
+ # Load the MEGA targets
+ add_subdirectory(src)
+
+-include(get_clang_format)
+-get_clang_format()
diff --git a/net-misc/megasync/megasync-5.6.0.0.ebuild b/net-misc/megasync/megasync-5.6.0.0.ebuild
new file mode 100644
index 000000000..817496d5c
--- /dev/null
+++ b/net-misc/megasync/megasync-5.6.0.0.ebuild
@@ -0,0 +1,144 @@
+# 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
+"
+
+MEGA_SDK_REV="60732886854198bbe11ebef897e93b36757f0913" # 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
+"
+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? ( 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.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"
+ "${FILESDIR}/${P}-remove-clang-format.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() {
+ 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_APP_WERROR=OFF
+ -DENABLE_DESKTOP_UPDATE_GEN=OFF
+ -DENABLE_DESIGN_TOKENS_IMPORTER=OFF
+ -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
+ 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] 5+ messages in thread
end of thread, other threads:[~2024-10-31 11:33 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-06 14:18 [gentoo-commits] repo/proj/guru:master commit in: net-misc/megasync/, net-misc/megasync/files/ David Roman
-- strict thread matches above, loose matches on Subject: below --
2024-10-31 11:33 David Roman
2024-10-04 10:24 Rui Huang
2023-11-09 3:11 Haelwenn Monnier
2021-05-24 11:06 Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox