commit: 181294051372ed37637b16d3c8aacfcd8d7bbdfe
Author: Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com>
AuthorDate: Sun May 23 01:38:31 2021 +0000
Commit: Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com>
CommitDate: Sun May 23 01:38:31 2021 +0000
URL: https://gitweb.gentoo.org/repo/user/ssnb.git/commit/?id=18129405
Clean and update megasync to latest version
Signed-off-by: Samuel Bernardo <samuelbernardo.mail <AT> gmail.com>
net-misc/megasync/Manifest | 13 +-
.../megasync/files/MEGAsync-3.1.4.0_Linux.patch | 27 -----
.../megasync/files/MEGAsync-3.5.3.0_Linux.patch | 27 -----
.../megasync/files/megasync-3.6.5-ffmpeg.patch | 12 --
.../megasync/files/megasync-3.6.6-ffmpeg.patch | 12 --
net-misc/megasync/files/megasync-3.6.6-gnome.patch | 12 --
.../megasync/files/megasync-4.5.0.0_ffmpeg.patch | 24 ++++
.../megasync/files/megasync-4.5.0.0_pdfium.patch | 16 +++
net-misc/megasync/files/megasync-glibc2.26.patch | 123 -------------------
net-misc/megasync/megasync-4.3.5.ebuild | 134 ---------------------
...sync-4.3.7.0.ebuild => megasync-4.5.0.0.ebuild} | 49 ++++----
net-misc/megasync/megasync-9999.ebuild | 57 ++++++---
12 files changed, 113 insertions(+), 393 deletions(-)
diff --git a/net-misc/megasync/Manifest b/net-misc/megasync/Manifest
index c5b09ac..9bb5f46 100644
--- a/net-misc/megasync/Manifest
+++ b/net-misc/megasync/Manifest
@@ -1,10 +1,5 @@
-AUX MEGAsync-3.1.4.0_Linux.patch 1035 BLAKE2B
f68751902e0ec9f0276f08d1d0ba4c88ce3fd7a16f75f36644b60becc0299f80d7abe0b998d0d0f18440be172ceb3637fce7ad3fde443c51fa4aa0c1a772b124
SHA512
afd9b11a8dcdc3240d3c3850dfccafce64078c95ae4fa44ef0f3fbd71aabb4fa129f46bbde470d916719174a19674ba3f14cf9cde1166f7c5e09e56feb9f943e
-AUX MEGAsync-3.5.3.0_Linux.patch 1035 BLAKE2B
f68751902e0ec9f0276f08d1d0ba4c88ce3fd7a16f75f36644b60becc0299f80d7abe0b998d0d0f18440be172ceb3637fce7ad3fde443c51fa4aa0c1a772b124
SHA512
afd9b11a8dcdc3240d3c3850dfccafce64078c95ae4fa44ef0f3fbd71aabb4fa129f46bbde470d916719174a19674ba3f14cf9cde1166f7c5e09e56feb9f943e
-AUX megasync-3.6.5-ffmpeg.patch 566 BLAKE2B
c1e8bd4b5c4c2c6fd6cc2316e7372443672ff1b25fbc3332ffc60f524396b7f784669da26506dbf683962a7f3da63809b57ec7696be8cef0d6c720fdb924999b
SHA512
741df967aece39bdd3b17b105bcad390d6cf817c1e4db9bf13d460ccc972af8ff6696f72a0253f2adea76526d7346474e65df18bfd485194e7ff8a479274c655
-AUX megasync-3.6.6-ffmpeg.patch 566 BLAKE2B
c1e8bd4b5c4c2c6fd6cc2316e7372443672ff1b25fbc3332ffc60f524396b7f784669da26506dbf683962a7f3da63809b57ec7696be8cef0d6c720fdb924999b
SHA512
741df967aece39bdd3b17b105bcad390d6cf817c1e4db9bf13d460ccc972af8ff6696f72a0253f2adea76526d7346474e65df18bfd485194e7ff8a479274c655
-AUX megasync-3.6.6-gnome.patch 446 BLAKE2B
5ceab726168f53f82b10c96b9a5761b21903b9d602cd6c9e0b9fb0f6d06eedefb3542668dce1381689ed947989f0ca2e70bc25e9cc15d526ac197c104219b5c2
SHA512
02427cf7d156e541986bc1c2b1a4dc67fffcb2a68d24fe8d1cec443ca84e230515e6650e741192b6be1ebfc57aaf02a71dc4443e8086087264cfeeaf612d278e
-AUX megasync-glibc2.26.patch 5958 BLAKE2B
990b5ddc9300979e9a059c285b05ef691566e2ec33ab40de76e9f5c251dc8c2f94ddc936eb13772c413c42b0d1122596f2e47805766fe6512ec09050f6b22111
SHA512
f8348b61028f34714dabe83fe88e5820686a35e1fa52206451152a97a286557168666142121936304d60aa18dae16d4474c3c3278274b62cc06d42587fc7016e
-EBUILD megasync-4.3.5.ebuild 3149 BLAKE2B
1ece4f721d19279292624b517afe94e95c390c48e83de98b68e4a9f8e78535d8bef8579ecad38d221668da2205a9877539ffe61e1a5e9028e5ac63377989a7dc
SHA512
9a8539c2a0084338086fe080f12cc085fe181ad9bbdf92d23aff829f6ea25bb669745c7bd0e58552175dc2af81a0f70e65a704d2bc1fb79ca8ee6e193236ffa3
-EBUILD megasync-4.3.7.0.ebuild 3226 BLAKE2B
d20875c506b6a80a50163491d92b2b4e615705296a8092d80d953166a6695aa11ac13c005d74a21d92d6bc06926456d41f9b2bbf03e0104fe4123156b191d480
SHA512
53d531f490e8fe9bc140a0207b52537f0bd0fbc6ee2340daf69caabe1cca178fa6c1f441d0c6e03623b152697a6f1dd1b0d8185812431b3536e35927877985c7
-EBUILD megasync-9999.ebuild 2665 BLAKE2B
98e1cb77713c7943a765ad01aaade91ba3ecd9bad78d8caccd90f4c117dd5426c4428c573aa1681e46c8293174ffd2ffb6547462a9ffbcd713b25cf37e57acaa
SHA512
639505ab1183a3bd445daaae2dd3e9653f8237f8c05398561b01ca2521dda1da47608aba47e7bbc1afe75cc28161f83d8243d55e6ddd03296e1a99fad45df7a3
+AUX megasync-4.5.0.0_ffmpeg.patch 1062 BLAKE2B
12a4d861a628773c10de804b3c86c2bad022b3ed91f4823df184839105108283302269d0e40c0939ea3889e46154abecec6ccfa27cad4945ab2913bc06150883
SHA512
fa71543bbf4ab9d11410294820d1a9e454733028367bfa4b6bc2b8e53bab0563dba8c1d569daba0bc8e74a9c4aa46f1268a486826a0c7ba84ef62bb1e31c8598
+AUX megasync-4.5.0.0_pdfium.patch 543 BLAKE2B
f01314b9a238d4ba723ab8eb1dd4470cf377cc8a24d8ae89744512b8774aab404b3671a3d82960e7bca90d8cf22d72136ab0d0e3e3e5ba8bb4cb8f40155d0e46
SHA512
948c1dc61b553cdec7bcd6278cd4033e7ed464ee42d54be56341047f103d285d226b69dc40ef37f447e43bd0648511b0b0c1a87a243041503ef6af161acfb566
+EBUILD megasync-4.5.0.0.ebuild 3258 BLAKE2B
9a895f35f8707d9f562b0f9d13b9e843f414a8695f3b6547bff9443e76249d1de524c0e0ad7f0f003eea758f2bd4b8742d88cf88862b86947a9e42699ea79041
SHA512
9d61aded8899b2f2bf86a471b9df77c7ac92458bd93f107fe0ed2c055d4b2cf8a32fb11d18bd7902157789d375d2f7d2938468b303a63d0512bc8c1984064280
+EBUILD megasync-9999.ebuild 3378 BLAKE2B
27ff80b94ff831925a787695af9add365f30952d1eb079d5b50e5dd1c6455579e394da5576def9333bcec5f9eb5191fcd6279e9b56c30873a444503aa48358b1
SHA512
6f594260c08a5167fdfb6af09100bd8f3d84aa05a671b25ade51ced31e35b58ec3b8d4a5a6a3f509457cfe603e0c13b72402c37525ad60e2434df766c8d9d921
MISC metadata.xml 736 BLAKE2B
607426e8fd147aca3e0d4d14bafa37f3741720596f32d745d6c9b001d15f44fe766a34ff1cc44be4dd05415d5255574e54865c212e9d388563f6682d18282077
SHA512
63dd47f49a21469c1491830a509c23d09daff2bc526780b970f7fc02ca63ca7e2ae14f5c43acfbc990e1b14736759cf366268e8a8a6df85fdb77b5c36819bdc0
diff --git a/net-misc/megasync/files/MEGAsync-3.1.4.0_Linux.patch
b/net-misc/megasync/files/MEGAsync-3.1.4.0_Linux.patch
deleted file mode 100644
index 527892c..0000000
--- a/net-misc/megasync/files/MEGAsync-3.1.4.0_Linux.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/MEGAShellExtDolphin/megasync-plugin.h 2017-07-24 03:22:14.894701134
+0100
-+++ src/MEGAShellExtDolphin/megasync-plugin.h 2017-07-24 03:29:22.518056652
+0100
-@@ -5,7 +5,7 @@
- #ifndef WITH_KF5
- #include <kabstractfileitemactionplugin.h>
- #else
--#include <KIOWidgets/kabstractfileitemactionplugin.h>
-+#include <KF5/KIOWidgets/kabstractfileitemactionplugin.h>
- #endif
- #include <QLocalSocket>
-
---- src/MEGAShellExtDolphin/megasync-plugin.cpp 2017-07-24
03:22:28.616295121 +0100
-+++ src/MEGAShellExtDolphin/megasync-plugin.cpp 2017-07-24
03:31:02.382106210 +0100
-@@ -13,10 +13,10 @@
- #else
- #include <KPluginFactory>
- #include <KPluginLoader>
--#include <KIOWidgets/kabstractfileitemactionplugin.h>
-+#include <KF5/KIOWidgets/kabstractfileitemactionplugin.h>
- #include <QtNetwork/QLocalSocket>
--#include <KIOCore/kfileitem.h>
--#include <KIOCore/KFileItemListProperties>
-+#include <KF5/KIOCore/kfileitem.h>
-+#include <KF5/KIOCore/KFileItemListProperties>
- #include <QtWidgets/QAction>
- #include <QtCore/QDir>
- #include <QtCore/QTimer>
diff --git a/net-misc/megasync/files/MEGAsync-3.5.3.0_Linux.patch
b/net-misc/megasync/files/MEGAsync-3.5.3.0_Linux.patch
deleted file mode 100644
index 527892c..0000000
--- a/net-misc/megasync/files/MEGAsync-3.5.3.0_Linux.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/MEGAShellExtDolphin/megasync-plugin.h 2017-07-24 03:22:14.894701134
+0100
-+++ src/MEGAShellExtDolphin/megasync-plugin.h 2017-07-24 03:29:22.518056652
+0100
-@@ -5,7 +5,7 @@
- #ifndef WITH_KF5
- #include <kabstractfileitemactionplugin.h>
- #else
--#include <KIOWidgets/kabstractfileitemactionplugin.h>
-+#include <KF5/KIOWidgets/kabstractfileitemactionplugin.h>
- #endif
- #include <QLocalSocket>
-
---- src/MEGAShellExtDolphin/megasync-plugin.cpp 2017-07-24
03:22:28.616295121 +0100
-+++ src/MEGAShellExtDolphin/megasync-plugin.cpp 2017-07-24
03:31:02.382106210 +0100
-@@ -13,10 +13,10 @@
- #else
- #include <KPluginFactory>
- #include <KPluginLoader>
--#include <KIOWidgets/kabstractfileitemactionplugin.h>
-+#include <KF5/KIOWidgets/kabstractfileitemactionplugin.h>
- #include <QtNetwork/QLocalSocket>
--#include <KIOCore/kfileitem.h>
--#include <KIOCore/KFileItemListProperties>
-+#include <KF5/KIOCore/kfileitem.h>
-+#include <KF5/KIOCore/KFileItemListProperties>
- #include <QtWidgets/QAction>
- #include <QtCore/QDir>
- #include <QtCore/QTimer>
diff --git a/net-misc/megasync/files/megasync-3.6.5-ffmpeg.patch
b/net-misc/megasync/files/megasync-3.6.5-ffmpeg.patch
deleted file mode 100644
index 7306a15..0000000
--- a/net-misc/megasync/files/megasync-3.6.5-ffmpeg.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/src/MEGASync/MEGASync.pro b/src/MEGASync/MEGASync.pro
---- a/src/MEGASync/MEGASync.pro 2018-05-19 18:48:04.753947715 +0100
-+++ b/src/MEGASync/MEGASync.pro 2018-05-19 19:48:13.055865813 +0100
-@@ -57,7 +57,7 @@
- CONFIG += USE_MEDIAINFO
-
- unix:!macx {
--
exists(/usr/include/ffmpeg-mega)|exists(mega/bindings/qt/3rdparty/include/ffmpeg)|packagesExist(ffmpeg)
{
-+
exists(/usr/include/ffmpeg-mega)|exists(mega/bindings/qt/3rdparty/include/ffmpeg)|packagesExist(ffmpeg)|packagesExist(libavcodec)
{
- CONFIG += USE_FFMPEG
- }
- }
diff --git a/net-misc/megasync/files/megasync-3.6.6-ffmpeg.patch
b/net-misc/megasync/files/megasync-3.6.6-ffmpeg.patch
deleted file mode 100644
index 7306a15..0000000
--- a/net-misc/megasync/files/megasync-3.6.6-ffmpeg.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/src/MEGASync/MEGASync.pro b/src/MEGASync/MEGASync.pro
---- a/src/MEGASync/MEGASync.pro 2018-05-19 18:48:04.753947715 +0100
-+++ b/src/MEGASync/MEGASync.pro 2018-05-19 19:48:13.055865813 +0100
-@@ -57,7 +57,7 @@
- CONFIG += USE_MEDIAINFO
-
- unix:!macx {
--
exists(/usr/include/ffmpeg-mega)|exists(mega/bindings/qt/3rdparty/include/ffmpeg)|packagesExist(ffmpeg)
{
-+
exists(/usr/include/ffmpeg-mega)|exists(mega/bindings/qt/3rdparty/include/ffmpeg)|packagesExist(ffmpeg)|packagesExist(libavcodec)
{
- CONFIG += USE_FFMPEG
- }
- }
diff --git a/net-misc/megasync/files/megasync-3.6.6-gnome.patch
b/net-misc/megasync/files/megasync-3.6.6-gnome.patch
deleted file mode 100644
index de1f19d..0000000
--- a/net-misc/megasync/files/megasync-3.6.6-gnome.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/src/MEGASync/MegaApplication.cpp
b/src/MEGASync/MegaApplication.cpp
---- a/src/MEGASync/MegaApplication.cpp 2018-06-26 23:07:10.698536478 +0100
-+++ b/src/MEGASync/MegaApplication.cpp 2018-06-26 23:12:13.287919683 +0100
-@@ -165,7 +165,7 @@
- #endif
-
- #if QT_VERSION < 0x050A00
-- QApplication::setDesktopSettingsAware(false);
-+ //QApplication::setDesktopSettingsAware(false);
- #endif
- #endif
- MegaApplication app(argc, argv);
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 0000000..a30d4a1
--- /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 0000000..141ab30
--- /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/files/megasync-glibc2.26.patch
b/net-misc/megasync/files/megasync-glibc2.26.patch
deleted file mode 100644
index c739ae9..0000000
--- a/net-misc/megasync/files/megasync-glibc2.26.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-diff -Naur
a/src/MEGASync/google_breakpad/client/linux/handler/exception_handler.cc
b/src/MEGASync/google_breakpad/client/linux/handler/exception_handler.cc
---- a/src/MEGASync/google_breakpad/client/linux/handler/exception_handler.cc
2017-11-19 14:46:02.366790151 +0000
-+++ b/src/MEGASync/google_breakpad/client/linux/handler/exception_handler.cc
2017-11-19 14:52:43.760546710 +0000
-@@ -397,12 +397,12 @@
- }
- CrashContext context;
- memcpy(&context.siginfo, info, sizeof(siginfo_t));
-- memcpy(&context.context, uc, sizeof(struct ucontext));
-+ memcpy(&context.context, uc, sizeof(ucontext_t));
- #if !defined(__ARM_EABI__) && !defined(__mips__)
- // FP state is not part of user ABI on ARM Linux.
-- // In case of MIPS Linux FP state is already part of struct ucontext
-+ // In case of MIPS Linux FP state is already part of ucontext_t
- // and 'float_state' is not a member of CrashContext.
-- struct ucontext *uc_ptr = (struct ucontext*)uc;
-+ ucontext_t *uc_ptr = (ucontext_t*)uc;
- if (uc_ptr->uc_mcontext.fpregs) {
- memcpy(&context.float_state,
- uc_ptr->uc_mcontext.fpregs,
-@@ -421,12 +421,13 @@
- // This is a public interface to HandleSignal that allows the client to
- // generate a crash dump. This function may run in a compromised context.
- bool ExceptionHandler::SimulateSignalDelivery(int sig) {
-- siginfo_t siginfo = {0, 0, 0, {0}};
-+ siginfo_t siginfo;
-+ memset(&siginfo, 0, sizeof(siginfo_t));
- // Mimic a trusted signal to allow tracing the process (see
- // ExceptionHandler::HandleSignal().
- siginfo.si_code = SI_USER;
- siginfo.si_pid = getpid();
-- struct ucontext context;
-+ ucontext_t context;
- getcontext(&context);
- return HandleSignal(sig, &siginfo, &context);
- }
-diff -Naur
a/src/MEGASync/google_breakpad/client/linux/handler/exception_handler.h
b/src/MEGASync/google_breakpad/client/linux/handler/exception_handler.h
---- a/src/MEGASync/google_breakpad/client/linux/handler/exception_handler.h
2017-11-19 14:46:02.366790151 +0000
-+++ b/src/MEGASync/google_breakpad/client/linux/handler/exception_handler.h
2017-11-19 14:51:28.364846717 +0000
-@@ -189,10 +189,10 @@
- struct CrashContext {
- siginfo_t siginfo;
- pid_t tid; // the crashing thread.
-- struct ucontext context;
-+ ucontext_t context;
- #if !defined(__ARM_EABI__) && !defined(__mips__)
- // #ifdef this out because FP state is not part of user ABI for Linux ARM.
-- // In case of MIPS Linux FP state is already part of struct ucontext
-+ // In case of MIPS Linux FP state is already part of ucontext_t
- // so 'float_state' is not required.
- struct _libc_fpstate float_state;
- #endif
-diff -Naur
a/src/MEGASync/google_breakpad/client/linux/minidump_writer/minidump_writer.cc
b/src/MEGASync/google_breakpad/client/linux/minidump_writer/minidump_writer.cc
----
a/src/MEGASync/google_breakpad/client/linux/minidump_writer/minidump_writer.cc
2017-11-19 14:46:02.369790060 +0000
-+++
b/src/MEGASync/google_breakpad/client/linux/minidump_writer/minidump_writer.cc
2017-11-19 14:51:28.353847052 +0000
-@@ -1725,7 +1725,7 @@
- const int fd_; // File descriptor where the minidum should be written.
- const char* path_; // Path to the file where the minidum should be written.
-
-- const struct ucontext* const ucontext_; // also from the signal handler
-+ const ucontext_t* const ucontext_; // also from the signal handler
- const struct _libc_fpstate* const float_state_; // ditto
- LinuxDumper* dumper_;
- MinidumpFileWriter minidump_writer_;
-diff -Naur
a/src/MEGASync/google_breakpad/common/android/include/sys/ucontext.h
b/src/MEGASync/google_breakpad/common/android/include/sys/ucontext.h
---- a/src/MEGASync/google_breakpad/common/android/include/sys/ucontext.h
2017-11-19 14:46:02.394789297 +0000
-+++ b/src/MEGASync/google_breakpad/common/android/include/sys/ucontext.h
2017-11-19 14:51:28.333847662 +0000
-@@ -53,9 +53,9 @@
- // The ARM kernel uses a 64-bit signal mask.
- typedef uint32_t kernel_sigmask_t[2];
-
--typedef struct ucontext {
-+typedef ucontext_t {
- uint32_t uc_flags;
-- struct ucontext* uc_link;
-+ ucontext_t* uc_link;
- stack_t uc_stack;
- mcontext_t uc_mcontext;
- kernel_sigmask_t uc_sigmask;
-@@ -117,9 +117,9 @@
- // The i386 kernel uses a 64-bit signal mask.
- typedef uint32_t kernel_sigmask_t[2];
-
--typedef struct ucontext {
-+typedef ucontext_t {
- uint32_t uc_flags;
-- struct ucontext* uc_link;
-+ ucontext_t* uc_link;
- stack_t uc_stack;
- mcontext_t uc_mcontext;
- kernel_sigmask_t uc_sigmask;
-@@ -152,9 +152,9 @@
- // The MIPS kernel uses a 128-bit signal mask.
- typedef uint32_t kernel_sigmask_t[4];
-
--typedef struct ucontext {
-+typedef ucontext_t {
- uint32_t uc_flags;
-- struct ucontext* uc_link;
-+ ucontext_t* uc_link;
- stack_t uc_stack;
- mcontext_t uc_mcontext;
- kernel_sigmask_t uc_sigmask;
-diff -Naur
a/src/MEGASync/google_breakpad/client/linux/minidump_writer/minidump_writer.cc
b/src/MEGASync/google_breakpad/client/linux/minidump_writer/minidump_writer.cc
----
a/src/MEGASync/google_breakpad/client/linux/minidump_writer/minidump_writer.cc
2017-11-19 15:03:10.536413558 +0000
-+++
b/src/MEGASync/google_breakpad/client/linux/minidump_writer/minidump_writer.cc
2017-11-19 15:16:27.828131605 +0000
-@@ -177,7 +177,7 @@
- // Juggle an x86 ucontext into minidump format
- // out: the minidump structure
- // info: the collection of register structures.
--void CPUFillFromUContext(MDRawContextX86 *out, const ucontext *uc,
-+void CPUFillFromUContext(MDRawContextX86 *out, const ucontext_t *uc,
- const struct _libc_fpstate* fp) {
- const greg_t* regs = uc->uc_mcontext.gregs;
-
-@@ -277,7 +277,7 @@
- my_memcpy(&out->flt_save.xmm_registers, &info.fpregs.xmm_space, 16 * 16);
- }
-
--void CPUFillFromUContext(MDRawContextAMD64 *out, const ucontext *uc,
-+void CPUFillFromUContext(MDRawContextAMD64 *out, const ucontext_t *uc,
- const struct _libc_fpstate* fpregs) {
- const greg_t* regs = uc->uc_mcontext.gregs;
-
diff --git a/net-misc/megasync/megasync-4.3.5.ebuild
b/net-misc/megasync/megasync-4.3.5.ebuild
deleted file mode 100644
index aa7d2f2..0000000
--- a/net-misc/megasync/megasync-4.3.5.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=7
-
-inherit eutils multilib qmake-utils autotools git-r3 desktop cmake-multilib
-
-DESCRIPTION="A Qt-based program for syncing your MEGA account in your PC. This
is the official app."
-HOMEPAGE="http://mega.co.nz";
-RTAG="_Linux"
-if [[ ${PV} == *9999* ]];then
- EGIT_REPO_URI="https://github.com/meganz/MEGAsync";
- KEYWORDS=""
- EGIT_SUBMODULES=( '*' )
-else
- EGIT_REPO_URI="https://github.com/meganz/MEGAsync";
- EGIT_COMMIT="v${PV}.0${RTAG}"
- EGIT_SUBMODULES=( '*' )
- KEYWORDS="~x86 ~amd64"
-fi
-
-LICENSE="MEGA"
-SLOT="0"
-IUSE="dolphin nautilus thunar +cryptopp +sqlite +zlib +curl freeimage readline
examples threads java php python gnome"
-
-DEPEND="
- dev-lang/swig
- app-doc/doxygen
- media-libs/libmediainfo
- media-libs/libraw
- dev-qt/qtcore:5
- dev-qt/linguist-tools
- 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"
-RDEPEND="${DEPEND}
- x11-themes/hicolor-icon-theme
- dev-libs/openssl
- dev-libs/libgcrypt
- media-libs/libpng
- net-dns/c-ares
- cryptopp? ( dev-libs/crypto++ )
- app-arch/xz-utils
- dev-libs/libuv
- sqlite? ( dev-db/sqlite:3 )
- dev-libs/libsodium
- zlib? ( sys-libs/zlib )
- curl? ( net-misc/curl[ssl,curl_ssl_openssl] )
- freeimage? ( media-libs/freeimage )
- readline? ( sys-libs/readline:0 )
- dolphin? ( kde-apps/dolphin )
- nautilus? ( >=gnome-base/nautilus-3 )
- thunar? ( xfce-base/thunar )
- "
-
-PATCHES=( )
-
-if [[ ${PV} != *9999* ]];then
- src_prepare(){
- if [ -e "${FILESDIR}/MEGAsync-${PV}.0_Linux.patch" ]; then
- EPATCH_OPTS="-p0" epatch
"${FILESDIR}/MEGAsync-${PV}.0_Linux.patch"
- fi
- if [ ! -z ${PATCHES} ]; then
- epatch ${PATCHES}
- fi
- if use gnome; then
- if [ -e "${FILESDIR}${P}-gnome.patch" ]; then
- epatch "${FILESDIR}/${P}-gnome.patch"
- fi
- fi
- eapply_user
- cd src/MEGASync/mega
- eautoreconf
- }
-fi
-
-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) \
- "--enable-chat" \
- "--enable-gcc-hardening"
- cd ../..
- local myeqmakeargs=(
- MEGA.pro
- CONFIG+="release"
- )
- eqmake5 ${myeqmakeargs[@]}
- use dolphin && cmake-utils_src_configure
- $(qt5_get_bindir)/lrelease MEGASync/MEGASync.pro
-}
-
-src_compile(){
- emake -C src INSTALL_ROOT="${D}" || die
- use dolphin && cmake-utils_src_compile
-}
-
-src_install(){
- use dolphin && cmake-utils_src_install
- local DOCS=( CREDITS.md README.md )
- einstalldocs
- insinto usr/share/licenses/${PN}
- doins LICENCE.md installer/terms.txt
- cd src/MEGASync
- dobin ${PN}
- cd platform/linux/data
- insinto usr/share/applications
- doins ${PN}.desktop
- cd icons/hicolor
- for size in 16x16 32x32 48x48 128x128 256x256;do
- doicon -s $size $size/apps/mega.png
- done
-}
diff --git a/net-misc/megasync/megasync-4.3.7.0.ebuild
b/net-misc/megasync/megasync-4.5.0.0.ebuild
similarity index 78%
rename from net-misc/megasync/megasync-4.3.7.0.ebuild
rename to net-misc/megasync/megasync-4.5.0.0.ebuild
index 5890701..335b82f 100644
--- a/net-misc/megasync/megasync-4.3.7.0.ebuild
+++ b/net-misc/megasync/megasync-4.5.0.0.ebuild
@@ -1,40 +1,43 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
EAPI=7
inherit autotools desktop qmake-utils xdg cmake git-r3
DESCRIPTION="The official Qt-based program for syncing your MEGA account in
your PC"
-HOMEPAGE="http://mega.co.nz";
-RTAG="_Linux"
+HOMEPAGE="
+ https://mega.io
+ https://github.com/meganz/MEGAsync
+"
+
+RTAG="_Win"
EGIT_REPO_URI="https://github.com/meganz/MEGAsync";
-EGIT_COMMIT="v${PV}${RTAG}"
+if [[ ${PV} == 9999 ]]; then
+ EGIT_BRANCH="master"
+else
+ EGIT_COMMIT="v${PV}${RTAG}"
+fi
EGIT_SUBMODULES=( '*' )
KEYWORDS="~x86 ~amd64"
LICENSE="MEGA"
SLOT="0"
-IUSE="+cryptopp +curl +sqlite +zlib dolphin examples freeimage java libressl
nautilus php python readline threads thunar"
+IUSE="+cryptopp +curl +sqlite +zlib dolphin examples freeimage java nautilus
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? (
- !libressl? ( net-misc/curl[ssl,curl_ssl_openssl] )
- libressl? ( net-misc/curl[ssl,curl_ssl_libressl] )
- )
+ curl? ( net-misc/curl[ssl,curl_ssl_openssl(-)] )
dolphin? ( kde-apps/dolphin )
freeimage? ( media-libs/freeimage )
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
nautilus? ( >=gnome-base/nautilus-3 )
readline? ( sys-libs/readline:0 )
sqlite? ( dev-db/sqlite:3 )
@@ -53,6 +56,7 @@ DEPEND="
dev-qt/qtdbus:5
dev-qt/qtimageformats:5
dev-qt/qtsvg:5
+ dev-qt/qtx11extras:5
"
BDEPEND="
dev-lang/swig
@@ -66,24 +70,27 @@ PATCHES=( )
CMAKE_USE_DIR="${S}/src/MEGAShellExtDolphin"
src_prepare() {
- if [ -e "${FILESDIR}/MEGAsync-${PV}.0_Linux.patch" ]; then
- EPATCH_OPTS="-p0" epatch
"${FILESDIR}/MEGAsync-${PV}.0_Linux.patch"
+ if [ -e "${FILESDIR}/${P}_pdfium.patch" ]; then
+ cd "${S}/src/MEGASync/mega"
+ eapply -Np1 "${FILESDIR}/${P}_pdfium.patch"
+ cd "${S}"
fi
- if [ ! -z ${PATCHES} ]; then
- epatch ${PATCHES}
+ 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
- eapply_user
- 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" \
@@ -104,7 +111,7 @@ src_configure() {
$(use_enable python) \
"--enable-chat" \
"--enable-gcc-hardening"
- cd ../..
+ cd "${S}/src"
local myeqmakeargs=(
MEGA.pro
@@ -122,13 +129,11 @@ src_compile() {
}
src_install() {
- local DOCS=( CREDITS.md README.md )
use dolphin && cmake_src_install
einstalldocs
dobin src/MEGASync/${PN}
insinto usr/share/licenses/${PN}
doins LICENCE.md installer/terms.txt
- dobin src/MEGASync/${PN}
domenu src/MEGASync/platform/linux/data/${PN}.desktop
cd src/MEGASync/platform/linux/data/icons/hicolor
for size in 16x16 32x32 48x48 128x128 256x256;do
diff --git a/net-misc/megasync/megasync-9999.ebuild
b/net-misc/megasync/megasync-9999.ebuild
index 8029bd4..79795f7 100644
--- a/net-misc/megasync/megasync-9999.ebuild
+++ b/net-misc/megasync/megasync-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,33 +6,38 @@ EAPI=7
inherit autotools desktop qmake-utils xdg cmake git-r3
DESCRIPTION="The official Qt-based program for syncing your MEGA account in
your PC"
-HOMEPAGE="http://mega.co.nz";
+HOMEPAGE="
+ https://mega.io
+ https://github.com/meganz/MEGAsync
+"
+RTAG="_Win"
EGIT_REPO_URI="https://github.com/meganz/MEGAsync";
-KEYWORDS=""
+if [[ ${PV} == 9999 ]]; then
+ EGIT_BRANCH="master"
+else
+ EGIT_COMMIT="v${PV}${RTAG}"
+fi
EGIT_SUBMODULES=( '*' )
+KEYWORDS="~x86 ~amd64"
LICENSE="MEGA"
SLOT="0"
-IUSE="+cryptopp +curl +sqlite +zlib dolphin examples freeimage java libressl
nautilus php python readline threads thunar"
+IUSE="+cryptopp +curl +sqlite +zlib dolphin examples freeimage java nautilus
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? (
- !libressl? ( net-misc/curl[ssl,curl_ssl_openssl] )
- libressl? ( net-misc/curl[ssl,curl_ssl_libressl] )
- )
+ curl? ( net-misc/curl[ssl,curl_ssl_openssl(-)] )
dolphin? ( kde-apps/dolphin )
freeimage? ( media-libs/freeimage )
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
nautilus? ( >=gnome-base/nautilus-3 )
readline? ( sys-libs/readline:0 )
sqlite? ( dev-db/sqlite:3 )
@@ -51,23 +56,44 @@ DEPEND="
dev-qt/qtdbus:5
dev-qt/qtimageformats:5
dev-qt/qtsvg:5
+ dev-qt/qtx11extras:5
"
BDEPEND="
- app-doc/doxygen
dev-lang/swig
dev-qt/linguist-tools
"
DOCS=( CREDITS.md README.md )
+PATCHES=( )
+
+CMAKE_USE_DIR="${S}/src/MEGAShellExtDolphin"
+
src_prepare() {
- default
- cd src/MEGASync/mega
+ if [ -e "${FILESDIR}/MEGAsync-${PV}.0_Linux.patch" ]; then
+ eapply -p0 "${FILESDIR}/MEGAsync-${PV}.0_Linux.patch"
+ 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
+ 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" \
@@ -88,7 +114,7 @@ src_configure() {
$(use_enable python) \
"--enable-chat" \
"--enable-gcc-hardening"
- cd ../..
+ cd "${S}/src"
local myeqmakeargs=(
MEGA.pro
@@ -117,3 +143,4 @@ src_install() {
doicon -s $size $size/apps/mega.png
done
}
+
