[gentoo-commits] repo/proj/guru:dev commit in: net-misc/megasync/files/, net-misc/megasync/

2023-11-22 Thread Takuya Wakazono
commit: 59e8bfb0ef3006bb24904a4349aed1ce3c385d92
Author: Takuya Wakazono  gmail  com>
AuthorDate: Thu Nov 23 05:53:43 2023 +
Commit: Takuya Wakazono  gmail  com>
CommitDate: Thu Nov 23 05:53:43 2023 +
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..00
--- 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.69408 
+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.69408 +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..00
--- 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..00
--- 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} ==  ]];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 )
- 

[gentoo-commits] repo/proj/guru:dev commit in: net-misc/megasync/files/, net-misc/megasync/

2023-11-07 Thread Takuya Wakazono
commit: 5db66eaa13af265e6e3cb1ab459d3431f7b595bd
Author: Takuya Wakazono  gmail  com>
AuthorDate: Tue Nov  7 14:01:38 2023 +
Commit: Takuya Wakazono  gmail  com>
CommitDate: Tue Nov  7 14:01:38 2023 +
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  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=(



[gentoo-commits] repo/proj/guru:dev commit in: net-misc/megasync/files/, net-misc/megasync/

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

net-misc/megasync: 4.5.0.0 and 

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  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-.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 0..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.69408 
+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.69408 +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 0..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} ==  ]];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
 }