Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] texstudio: workaround linking issues when cross compiling
@ 2020-04-06 20:40 Johnnynator
  2020-04-10  9:07 ` [PR PATCH] [Merged]: " Johnnynator
  0 siblings, 1 reply; 2+ messages in thread
From: Johnnynator @ 2020-04-06 20:40 UTC (permalink / raw)
  To: ml

[-- 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"

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PR PATCH] [Merged]: texstudio: workaround linking issues when cross compiling
  2020-04-06 20:40 [PR PATCH] texstudio: workaround linking issues when cross compiling Johnnynator
@ 2020-04-10  9:07 ` Johnnynator
  0 siblings, 0 replies; 2+ messages in thread
From: Johnnynator @ 2020-04-10  9:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 195 bytes --]

There's a merged pull request on the void-packages repository

texstudio: workaround linking issues when cross compiling
https://github.com/void-linux/void-packages/pull/20707

Description:
None

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-04-10  9:07 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-06 20:40 [PR PATCH] texstudio: workaround linking issues when cross compiling Johnnynator
2020-04-10  9:07 ` [PR PATCH] [Merged]: " Johnnynator

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).