From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Update MEGA*
Date: Fri, 13 Sep 2019 22:02:00 +0200 [thread overview]
Message-ID: <20190913200200.gmZqo85rlYYIOjC6rsRoE2n2mmAWexHRzPTj_YAXwEo@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-14439@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 307 bytes --]
There is an updated pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages MEGA
https://github.com/void-linux/void-packages/pull/14439
Update MEGA*
A patch file from https://github.com/void-linux/void-packages/pull/14439.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-MEGA-14439.patch --]
[-- Type: text/x-diff, Size: 8684 bytes --]
From 4f6a19250d8b1d6bc2b5529b19071ca71a92352e Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Fri, 13 Sep 2019 21:50:34 +0300
Subject: [PATCH 1/3] MEGAsdk: update to 3.6.2a.
---
common/shlibs | 2 +-
srcpkgs/MEGAsdk/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 09df4f3ceca..dccdfc5ecf4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2952,7 +2952,7 @@ libvted-3.so.0 libvted-3.7.0_2
libpeasd-3.so.0 libpeasd-3.7.0_2
libgstreamerd-3.so.0 libgstreamerd-3.7.0_2
libgtkdgl-3.so.0 libgtkdgl-3.7.0_2
-libmega.so.30504 MEGAsdk-3.5.4_1
+libmega.so.30602 MEGAsdk-3.6.2a_1
libopenglrecorder.so.0 libopenglrecorder-0.1.0_1
libgpod.so.4 libgpod-0.8.3_1
libi2c.so.0 i2c-tools-4.0_1
diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template
index a7a9977393e..864b70a7adc 100644
--- a/srcpkgs/MEGAsdk/template
+++ b/srcpkgs/MEGAsdk/template
@@ -1,6 +1,6 @@
# Template file for 'MEGAsdk'
pkgname=MEGAsdk
-version=3.5.4
+version=3.6.2a
revision=1
wrksrc="sdk-${version}"
build_style=gnu-configure
@@ -16,7 +16,7 @@ maintainer="John <johnz@posteo.net>"
license="BSD-2-Clause"
homepage="https://mega.nz"
distfiles="https://github.com/meganz/sdk/archive/v${version}.tar.gz"
-checksum=7fc81a64a77829bbc8dd316aac2159890a556dfdeade527a1386482e6dee26ee
+checksum=22d910bcd799f30a499fe748cc2b3917e9e213558b1d5fba07b3f3908a833897
replaces="libmega>=0"
build_options="libuv mediainfo"
From 1ee8f69e451e460a3162c100d33c1681a0867ed9 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Fri, 13 Sep 2019 22:34:24 +0300
Subject: [PATCH 2/3] MEGAsync: update to 4.2.4.0.
---
srcpkgs/MEGAsync/patches/breakpad.patch | 16 ++++++++++++++++
srcpkgs/MEGAsync/template | 10 +++++-----
2 files changed, 21 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/MEGAsync/patches/breakpad.patch
diff --git a/srcpkgs/MEGAsync/patches/breakpad.patch b/srcpkgs/MEGAsync/patches/breakpad.patch
new file mode 100644
index 00000000000..36495af4460
--- /dev/null
+++ b/srcpkgs/MEGAsync/patches/breakpad.patch
@@ -0,0 +1,16 @@
+--- src/MEGASync/google_breakpad/client/linux/handler/exception_handler.cc 2019-09-13 22:27:23.351723073 +0300
++++ - 2019-09-13 22:33:08.244312688 +0300
+@@ -104,11 +104,13 @@
+ #define PR_SET_PTRACER 0x59616d61
+ #endif
+
++#if defined(__GLIBC__) && __GLIBC__ < 2 && __GLIBC_MINOR__ < 30
+ // A wrapper for the tgkill syscall: send a signal to a specific thread.
+ static int tgkill(pid_t tgid, pid_t tid, int sig) {
+ return syscall(__NR_tgkill, tgid, tid, sig);
+ return 0;
+ }
++#endif
+
+ namespace google_breakpad {
+
diff --git a/srcpkgs/MEGAsync/template b/srcpkgs/MEGAsync/template
index 913e8fe7dee..4a70a48ad8e 100644
--- a/srcpkgs/MEGAsync/template
+++ b/srcpkgs/MEGAsync/template
@@ -1,11 +1,11 @@
# Template file for 'MEGAsync'
pkgname=MEGAsync
-version=4.1.1.0
+version=4.2.4.0
revision=1
-wrksrc="${pkgname}-${version}_Linux"
+wrksrc="${pkgname}-${version}_Win"
build_wrksrc=src
build_style=qmake
-configure_args='"CONFIG-=with_tools"'
+configure_args='"CONFIG+=FULLREQUIREMENTS"'
hostmakedepends="libtool qt5-qmake qt5-host-tools"
makedepends="qt5-tools-devel qt5-devel qt5-svg-devel MEGAsdk-devel MEGAsdk-qt
libraw-devel libgomp-devel"
@@ -13,8 +13,8 @@ short_desc="Automated syncing with MEGA Cloud Drive"
maintainer="John <johnz@posteo.net>"
license="custom"
homepage="https://mega.co.nz"
-distfiles="https://github.com/meganz/MEGAsync/archive/v${version}_Linux.tar.gz"
-checksum=5f43a3f402c10519e2f59c8c2a70c55affd3eb1a323767127929fb5f4baa429c
+distfiles="https://github.com/meganz/MEGAsync/archive/v${version}_Win.tar.gz"
+checksum=5fd90c93677085a2f73faa6a5a3548fcd29fc9f3203f6ddbcac7f170b580f239
restricted=yes
nocross=yes
From 91a27da0b2a4fa6294c0bb87e6e69e056b007056 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Fri, 13 Sep 2019 22:53:35 +0300
Subject: [PATCH 3/3] MEGAcmd: update to 1.1.0.
---
srcpkgs/MEGAcmd/patches/include.am.patch | 22 ----------------
srcpkgs/MEGAcmd/patches/musl.patch | 13 ----------
srcpkgs/MEGAcmd/template | 33 ++++++++++++------------
3 files changed, 17 insertions(+), 51 deletions(-)
delete mode 100644 srcpkgs/MEGAcmd/patches/include.am.patch
delete mode 100644 srcpkgs/MEGAcmd/patches/musl.patch
diff --git a/srcpkgs/MEGAcmd/patches/include.am.patch b/srcpkgs/MEGAcmd/patches/include.am.patch
deleted file mode 100644
index 45e1a9fcdd5..00000000000
--- a/srcpkgs/MEGAcmd/patches/include.am.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/include.am.orig 2017-12-01 23:56:36.199044786 +0100
-+++ src/include.am 2017-12-01 23:56:54.073045467 +0100
-@@ -7,7 +7,7 @@
-
- MEGACMD = mega-cmd mega-exec mega-cmd-server
- bin_PROGRAMS += $(MEGACMD)
--$(MEGACMD): $(MEGA_LIBS)
-+$(MEGACMD):
- noinst_HEADERS += src/comunicationsmanager.h src/configurationmanager.h src/megacmd.h src/megacmdlogger.h src/megacmdsandbox.h src/megacmdutils.h src/listeners.h src/megacmdexecuter.h src/megacmdversion.h src/megacmdplatform.h src/comunicationsmanagerportsockets.h
- megacmdcompletiondir = $(sysconfdir)/bash_completion.d/
- megacmdcompletion_DATA = src/client/megacmd_completion.sh
---- src/include.am 2018-12-06 14:42:18.308589868 +0100
-+++ - 2018-12-06 14:45:15.075785487 +0100
-@@ -9,7 +9,7 @@
- bin_PROGRAMS += $(MEGACMD)
- $(MEGACMD):
- noinst_HEADERS += src/comunicationsmanager.h src/configurationmanager.h src/megacmd.h src/megacmdlogger.h src/megacmdsandbox.h src/megacmdutils.h src/listeners.h src/megacmdexecuter.h src/megacmdversion.h src/megacmdplatform.h src/comunicationsmanagerportsockets.h
--megacmdcompletiondir = $(sysconfdir)/bash_completion.d/
-+megacmdcompletiondir = $(datarootdir)/bash-completion/completions
- megacmdcompletion_DATA = src/client/megacmd_completion.sh
- megacmdscripts_bindir = $(bindir)
-
diff --git a/srcpkgs/MEGAcmd/patches/musl.patch b/srcpkgs/MEGAcmd/patches/musl.patch
deleted file mode 100644
index 3e0a395fb19..00000000000
--- a/srcpkgs/MEGAcmd/patches/musl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/configurationmanager.h 2018-10-03 16:27:51.311763612 +0200
-+++ - 2018-10-03 16:29:44.035272722 +0200
-@@ -23,6 +23,10 @@
- #include <map>
- #include <set>
-
-+#ifndef _WIN32
-+#include <sys/file.h> // LOCK_EX and LOCK_NB
-+#endif
-+
- #define CONFIGURATIONSTOREDBYVERSION -2
- class ConfigurationManager
- {
diff --git a/srcpkgs/MEGAcmd/template b/srcpkgs/MEGAcmd/template
index 2345b3972b8..1517b24f3c2 100644
--- a/srcpkgs/MEGAcmd/template
+++ b/srcpkgs/MEGAcmd/template
@@ -1,17 +1,24 @@
# Template file for 'MEGAcmd'
pkgname=MEGAcmd
-version=1.0.0
-revision=11
+version=1.1.0
+revision=1
+_sdk_rev=2c7713d2cdd75c0b9e143d93e43f03d0fa3ba9e5
+wrksrc="${pkgname}-${version}_Linux"
build_style=gnu-configure
make_build_args='LIBTOOLFLAGS="--tag=CXX"'
hostmakedepends="autoconf-archive autogen gettext automake libtool pkg-config"
-makedepends="MEGAsdk-devel readline-devel pcre-devel"
+makedepends="readline-devel pcre-devel
+ libcurl-devel c-ares-devel libressl-devel crypto++-devel
+ zlib-devel sqlite-devel freeimage-devel libsodium-devel fuse-devel
+ libuv-devel"
short_desc="Command Line Interactive and Scriptable Application to access MEGA"
maintainer="John <johnz@posteo.net>"
license="BSD-2-Clause, GPL-3.0-or-later"
homepage="https://github.com/meganz/MEGAcmd"
-distfiles="https://github.com/meganz/MEGAcmd/archive/${version}.tar.gz"
-checksum=1200363bee2f387a2287e286b38d15b1a01079967e20b8c489815cc7c8d9ff63
+distfiles="https://github.com/meganz/MEGAcmd/archive/${version}_Linux.tar.gz
+ https://github.com/meganz/sdk/archive/${_sdk_rev}.tar.gz"
+checksum="8064a21b1d1436537ab9ccc98f1f411f9496aace000584bea87d95f8e7b3a550
+ 8bcf3437f187c4ede543e12f92abcaa3a2390eada680022d80758e1e3fd7b753"
replaces="megacmd>=0"
if [ "$CROSS_BUILD" ]; then
@@ -19,17 +26,9 @@ if [ "$CROSS_BUILD" ]; then
fi
post_extract() {
- sed \
- -e '/SUBDIRS.*sdk/d' \
- -e '/sdk\/m4/d' \
- -e 's:LMEGAINC=.*:PKG_CHECK_MODULES([MEGA],[libmega])\nLMEGAINC=${MEGA_CFLAGS}:' \
- -i Makefile.am configure.ac
- sed \
- -e 's:\$(top_builddir)/sdk/src/libmega\.la:$(MEGA_LIBS):' \
- -e 's:mega_cmd_LDADD = .*:&$(MEGA_LIBS):' \
- -e 's:^mega_exec_CXXFLAGS.*:&\nmega_exec_LDADD=$(MEGA_LIBS):' \
- -e 's:sdk/include/mega/[^ ]\+\.h::g' \
- -e '/sdk\/src\/[^ ]\+\.cpp/d' \
+ rmdir sdk
+ mv ../sdk-${_sdk_rev} sdk
+ vsed -e 's%$(sysconfdir)/bash_completion.d/%$(datarootdir)/bash-completion/completions%g' \
-i src/include.am
}
@@ -39,4 +38,6 @@ pre_configure() {
post_install() {
vlicense LICENSE
+ rm -rf ${DESTDIR}/usr/include
+ rm -rf ${DESTDIR}/usr/lib/pkgconfig
}
next prev parent reply other threads:[~2019-09-13 20:02 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-13 19:36 [PR PATCH] " voidlinux-github
2019-09-13 19:55 ` [PR PATCH] [Updated] " voidlinux-github
2019-09-13 19:55 ` voidlinux-github
2019-09-13 20:02 ` voidlinux-github
2019-09-13 20:02 ` voidlinux-github [this message]
2019-09-15 8:31 ` voidlinux-github
2019-09-15 8:31 ` voidlinux-github
2019-09-15 9:51 ` voidlinux-github
2019-09-15 9:51 ` voidlinux-github
2019-09-15 11:04 ` [PR PATCH] [Merged]: " voidlinux-github
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=20190913200200.gmZqo85rlYYIOjC6rsRoE2n2mmAWexHRzPTj_YAXwEo@z \
--to=voidlinux-github@inbox.vuxu.org \
--cc=ml@inbox.vuxu.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;
as well as URLs for NNTP newsgroup(s).