Hi Peter,
On Wed, Sep 30, 2020 at 04:12:35PM +0100, Peter wrote:
> Unfortunately I couldn't get the (non-cross) build to work with this patch.
> Extract from my build log ...
> 
> -----------------------------------------------------------------------------
> sh: 1: --version: not found
> Project MESSAGE: Config using pkg-config version
> sh: 1: --atleast-version: not found
> Project ERROR: Qosmic 1.6.0-4 3.1.1-3 requires at least version 3.1.1 of 
> flam3 to build.
> make[1]: *** [Makefile:571: Makefile] Error 3
> make[1]: Leaving directory '/mnt/Data/SourceCode/Debian/qosmic-1.6.0'
> dh_auto_clean: error: make -j12 distclean returned exit code 2
> make: *** [debian/rules:11: clean] Error 25
> dpkg-buildpackage: error: debian/rules clean subprocess returned exit status 2
> debuild: fatal error at line 1182:
> dpkg-buildpackage -us -uc -ui -b failed
> -----------------------------------------------------------------------------

I'm sorry. I should have tried building natively. Please find my updated
patch attached.

Helmut
--- qosmic-1.6.0.orig/qosmic.pro
+++ qosmic-1.6.0/qosmic.pro
@@ -35,9 +35,10 @@
 ## If your system doesn't support pkg-config then comment out the next line and
 ## set these values below.
 CONFIG += link_pkgconfig
+PKG_CONFIG = $$pkgConfigExecutable()
 
 link_pkgconfig {
-	message("Config using pkg-config version "$$system(pkg-config --version))
+	message("Config using pkg-config version "$$system($$PKG_CONFIG --version))
 	PKGCONFIG = flam3 lua5.2
 }
 else {
@@ -77,7 +78,7 @@
 }
 
 link_pkgconfig {
-	! system(pkg-config --atleast-version 3.1.1 flam3) {
+	! system($$PKG_CONFIG --atleast-version 3.1.1 flam3) {
 		error("Qosmic $$VERSION requires at least version 3.1.1 of flam3 to build.")
 	}
 }

Reply via email to