Github messages for voidlinux
 help / color / mirror / Atom feed
From: fosslinux <fosslinux@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] projectM: fix GUI applications for cross.
Date: Sun, 11 Oct 2020 02:47:58 +0200	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25502@inbox.vuxu.org> (raw)

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

There is a new pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages projectM-cross-icons
https://github.com/void-linux/void-packages/pull/25502

projectM: fix GUI applications for cross.
The template had a note:
`TODO: find out why these files aren't generated for the cross build`,
regarding the desktop files and icons that weren't being installed.
This was actually because the GUI application's weren't being built
at all! The build system could not find QT. Force enabling these
applications and doing qt shenanigans, including `build_helper=qmake`,
fixes these issues.

A patch file from https://github.com/void-linux/void-packages/pull/25502.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-projectM-cross-icons-25502.patch --]
[-- Type: text/x-diff, Size: 1966 bytes --]

From 98336609a7cab7b2c3df2836efe56cccc638debb Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 11 Oct 2020 11:45:45 +1100
Subject: [PATCH] projectM: fix GUI applications for cross.

The template had a note:
`TODO: find out why these files aren't generated for the cross build`,
regarding the desktop files and icons that weren't being installed.
This was actually because the GUI application's weren't being built
at all! The build system could not find QT. Force enabling these
applications and doing qt shenanigans, including `build_helper=qmake`,
fixes these issues.
---
 srcpkgs/projectM/template | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/projectM/template b/srcpkgs/projectM/template
index d7e5c0fa547..6d9fc6a0a94 100644
--- a/srcpkgs/projectM/template
+++ b/srcpkgs/projectM/template
@@ -1,10 +1,13 @@
 # Template file for 'projectM'
 pkgname=projectM
 version=3.1.7
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--datadir=/usr/libexec"
-hostmakedepends="pkg-config qt5-host-tools automake libtool which"
+build_helper=qmake
+configure_args="--datadir=/usr/libexec --enable-qt --enable-pulseaudio
+ --enable-jack --enable-sdl"
+hostmakedepends="pkg-config qt5-host-tools automake libtool which qt5-qmake
+ qt5-tools-devel"
 makedepends="pulseaudio-devel alsa-lib-devel glew-devel ftgl-devel libXext-devel
  SDL2-devel gtkglext-devel jack-devel qt5-tools-devel libvisual-devel glm
  MesaLib-devel glu-devel"
@@ -21,11 +24,9 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 fi
 
 post_install() {
-	if [ ! "$CROSS_BUILD" ]; then
-		# fix location of desktop files
-		# TODO: find out why these files aren't generated for the cross build
-		mv $DESTDIR/usr/libexec/{applications,icons} $DESTDIR/usr/share
-	fi
+	# fix location of desktop files
+	vmkdir usr/share
+	mv $DESTDIR/usr/libexec/{applications,icons} $DESTDIR/usr/share
 }
 
 projectM-devel_package() {

             reply	other threads:[~2020-10-11  0:48 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-11  0:47 fosslinux [this message]
2020-10-15  5:17 ` [PR PATCH] [Merged]: " ericonr

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-25502@inbox.vuxu.org \
    --to=fosslinux@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).