public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andrew Ammerlaan" <andrewammerlaan@riseup.net>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:master commit in: net-misc/megasync/
Date: Sun,  3 Jan 2021 13:58:37 +0000 (UTC)	[thread overview]
Message-ID: <1609682282.9785f55f12125d23055c0e31cdcf2c0f03b53fc4.andrewammerlaan@gentoo> (raw)

commit:     9785f55f12125d23055c0e31cdcf2c0f03b53fc4
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Sun Jan  3 13:58:02 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sun Jan  3 13:58:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9785f55f

net-misc/megasync: fix unable to find cmakelists.txt

- also fix dep on doxygen

Closes: https://bugs.gentoo.org/763057
Bug: https://bugs.gentoo.org/763138
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 net-misc/megasync/megasync-4.3.8.0.ebuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/net-misc/megasync/megasync-4.3.8.0.ebuild b/net-misc/megasync/megasync-4.3.8.0.ebuild
index 3edb24ae..2a65f6c8 100644
--- a/net-misc/megasync/megasync-4.3.8.0.ebuild
+++ b/net-misc/megasync/megasync-4.3.8.0.ebuild
@@ -63,19 +63,22 @@ DEPEND="
 	dev-qt/qtsvg: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
 	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


WARNING: multiple messages have this Message-ID (diff)
From: "Andrew Ammerlaan" <andrewammerlaan@riseup.net>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: net-misc/megasync/
Date: Sun,  3 Jan 2021 13:58:30 +0000 (UTC)	[thread overview]
Message-ID: <1609682282.9785f55f12125d23055c0e31cdcf2c0f03b53fc4.andrewammerlaan@gentoo> (raw)
Message-ID: <20210103135830.9VMLxXJ-euGbxekLl9MrbYuv5wirIffGRIrn13bRWqI@z> (raw)

commit:     9785f55f12125d23055c0e31cdcf2c0f03b53fc4
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Sun Jan  3 13:58:02 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sun Jan  3 13:58:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9785f55f

net-misc/megasync: fix unable to find cmakelists.txt

- also fix dep on doxygen

Closes: https://bugs.gentoo.org/763057
Bug: https://bugs.gentoo.org/763138
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 net-misc/megasync/megasync-4.3.8.0.ebuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/net-misc/megasync/megasync-4.3.8.0.ebuild b/net-misc/megasync/megasync-4.3.8.0.ebuild
index 3edb24ae..2a65f6c8 100644
--- a/net-misc/megasync/megasync-4.3.8.0.ebuild
+++ b/net-misc/megasync/megasync-4.3.8.0.ebuild
@@ -63,19 +63,22 @@ DEPEND="
 	dev-qt/qtsvg: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
 	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


             reply	other threads:[~2021-01-03 13:58 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-03 13:58 Andrew Ammerlaan [this message]
2021-01-03 13:58 ` [gentoo-commits] repo/proj/guru:dev commit in: net-misc/megasync/ Andrew Ammerlaan
  -- strict thread matches above, loose matches on Subject: below --
2024-11-21 14:11 [gentoo-commits] repo/proj/guru:master " Julien Roy
2024-11-21 14:11 Julien Roy
2024-10-31 11:33 David Roman
2024-10-04 10:24 Rui Huang
2024-09-21  8:47 David Roman
2024-08-20 20:46 David Roman
2024-08-20 20:46 David Roman
2024-07-27 17:46 David Roman
2024-07-27 17:46 David Roman
2024-07-14  0:34 David Roman
2024-05-07 14:26 Florian Schmaus
2024-05-07 14:26 Florian Schmaus
2024-03-25 16:13 Julien Roy
2024-03-19 10:20 Julien Roy
2024-03-19 10:20 Julien Roy
2024-01-29 10:48 David Roman
2024-01-29 10:48 David Roman
2024-01-26 10:35 David Roman
2024-01-26 10:35 David Roman
2023-11-24 17:20 David Roman
2023-11-24 17:20 David Roman
2023-11-20 14:14 David Roman
2023-11-16 16:02 David Roman
2023-11-16 10:05 David Roman
2023-11-16 10:05 David Roman
2021-05-24 22:25 Haelwenn Monnier
2021-05-22 12:16 Andrew Ammerlaan
2021-05-06  9:55 Andrew Ammerlaan
2021-05-03 10:11 Andrew Ammerlaan
2021-01-25  8:53 Andrew Ammerlaan
2021-01-03 13:58 Andrew Ammerlaan
2021-01-02 16:57 Andrew Ammerlaan
2021-01-01 13:14 Andrew Ammerlaan
2020-12-11  8:36 Andrew Ammerlaan
2020-12-11  8:36 Andrew Ammerlaan
2020-11-08 12:34 Andrew Ammerlaan
2020-11-08 11:13 Andrew Ammerlaan
2020-11-08 11:13 Andrew Ammerlaan
2020-11-08 11:13 Andrew Ammerlaan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1609682282.9785f55f12125d23055c0e31cdcf2c0f03b53fc4.andrewammerlaan@gentoo \
    --to=andrewammerlaan@riseup.net \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox