From: Johnnynator <Johnnynator@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] texstudio: workaround linking issues when cross compiling
Date: Mon, 06 Apr 2020 22:40:41 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-20707@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 356 bytes --]
There is a new pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages texstudio
https://github.com/void-linux/void-packages/pull/20707
texstudio: workaround linking issues when cross compiling
None
A patch file from https://github.com/void-linux/void-packages/pull/20707.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-texstudio-20707.patch --]
[-- Type: text/x-diff, Size: 1626 bytes --]
From 0b232363295a0f49b8a9f65ea82726b91e649b6f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 6 Apr 2020 22:40:16 +0200
Subject: [PATCH] texstudio: workaround linking issues when cross compiling
---
srcpkgs/texstudio/patches/phonon-cross.patch | 12 ++++++++++++
srcpkgs/texstudio/template | 1 -
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/texstudio/patches/phonon-cross.patch
diff --git a/srcpkgs/texstudio/patches/phonon-cross.patch b/srcpkgs/texstudio/patches/phonon-cross.patch
new file mode 100644
index 00000000000..8b151ee8dfa
--- /dev/null
+++ b/srcpkgs/texstudio/patches/phonon-cross.patch
@@ -0,0 +1,12 @@
+--- texstudio.pro 2019-05-18 18:23:33.000000000 +0200
++++ - 2020-04-06 22:35:28.379953691 +0200
+@@ -28,7 +28,8 @@
+ }
+ !isEmpty(PHONON){
+ greaterThan(QT_MAJOR_VERSION, 4) { #Qt5
+- QT += phonon4qt5
++ CONFIG += link_pkgconfig
++ PKGCONFIG += phonon4qt5
+ } else { #Qt4
+ QT += phonon
+ }
diff --git a/srcpkgs/texstudio/template b/srcpkgs/texstudio/template
index 7560a768558..88df5425e15 100644
--- a/srcpkgs/texstudio/template
+++ b/srcpkgs/texstudio/template
@@ -16,7 +16,6 @@ license="GPL-2.0-or-later"
homepage="https://texstudio.org/"
distfiles="https://github.com/texstudio-org/texstudio/archive/${version}.tar.gz"
checksum=a14b8912bfd15d982cfbe5f00deed37ca85fb6e38d3aa0c2dac23b4ecaab0984
-nocross="/usr/lib/libphonon4qt5.so: error adding symbols: file in wrong format"
build_options="phonon poppler"
desc_option_phonon="build with phonon support"
next reply other threads:[~2020-04-06 20:40 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-06 20:40 Johnnynator [this message]
2020-04-10 9:07 ` [PR PATCH] [Merged]: " Johnnynator
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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-20707@inbox.vuxu.org \
--to=johnnynator@users.noreply.github.com \
--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).