subject:"\[gentoo\-commits\] repo\/proj\/guru\:master commit in\: net\-misc\/megasync\/, net\-misc\/megasync\/files\/"

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

2023-11-08 Thread Haelwenn Monnier

commit: 5db66eaa13af265e6e3cb1ab459d3431f7b595bd
Author: Takuya Wakazono  gmail  com>
AuthorDate: Tue Nov  7 14:01:38 2023 +
Commit: Haelwenn Monnier  hacktivis  me>
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:master commit in: net-misc/megasync/, net-misc/megasync/files/

2023-11-06 Thread David Roman

commit: 16dfc71df33b7e3b827379c13e0ec9f5bb471538
Author: Takuya Wakazono  gmail  com>
AuthorDate: Sun Nov  5 04:58:01 2023 +
Commit: David Roman  gmail  com>
CommitDate: Sun Nov  5 04:58:01 2023 +
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  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 00..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} !=  ]]; 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

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

2021-05-24 Thread Andrew Ammerlaan

commit: 917e847bf4d5c4f60544b3638bc16e0975b20e27
Author: Samuel Bernardo  gmail  com>
AuthorDate: Mon May 24 10:37:27 2021 +
Commit: Andrew Ammerlaan  gentoo  org>
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
 }

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

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

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

3 matches

Site Navigation

Mail list logo

Footer information