diff options
author | hashworks | 2020-06-18 20:19:44 +0200 |
---|---|---|
committer | hashworks | 2020-06-18 20:30:45 +0200 |
commit | cbd46a3dc0ec2ad3f99d88608f0e10c8135a42a2 (patch) | |
tree | 8a98d689326f5938f3f9406d7604cf458807076f | |
parent | b3efc2ee749049b7f61713d4d5ed8ab48104f51e (diff) | |
download | aur-cbd46a3dc0ec2ad3f99d88608f0e10c8135a42a2.tar.gz |
Fix QMAKE buildflags
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 12 | ||||
-rw-r--r-- | fix_qmake_buildflags.patch | 76 |
3 files changed, 87 insertions, 5 deletions
@@ -1,7 +1,7 @@ pkgbase = prismatik pkgdesc = A controller for usb driven LED backlights pkgver = 5.11.2 - pkgrel = 1 + pkgrel = 3 url = https://github.com/woodenshark/Lightpack install = prismatik.install arch = x86_64 @@ -11,8 +11,10 @@ pkgbase = prismatik provides = lightpack source = https://github.com/woodenshark/Lightpack/archive/5.11.2/prismatik-5.11.2.tar.gz source = fix_includes.patch + source = fix_qmake_buildflags.patch sha256sums = 5f3662086965270476b8ea2c014aa0b958afb15b58b5f3000e5f7280386b3022 sha256sums = 14c688737d8ba5f128492380c21f9b78c351e59b99375fdc143df52bc2a98781 + sha256sums = 14c7f26ae080ab0449f4ad4ba4c68c0c3dacbbe63bace7da5c4faae9554c4d8f pkgname = prismatik @@ -1,8 +1,9 @@ # Maintainer: hashworks <mail@hashworks.net> +# Contributor: Thore Bödecker <foxxx0@archlinux.org> pkgname=prismatik pkgver=5.11.2 -pkgrel=1 +pkgrel=3 pkgdesc="A controller for usb driven LED backlights" arch=('x86_64') url="https://github.com/woodenshark/Lightpack" @@ -11,19 +12,22 @@ depends=('qt5-serialport' 'hicolor-icon-theme') provides=('lightpack') install=prismatik.install source=("${url}/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz" - "fix_includes.patch") + "fix_includes.patch" + "fix_qmake_buildflags.patch") sha256sums=('5f3662086965270476b8ea2c014aa0b958afb15b58b5f3000e5f7280386b3022' - '14c688737d8ba5f128492380c21f9b78c351e59b99375fdc143df52bc2a98781') + '14c688737d8ba5f128492380c21f9b78c351e59b99375fdc143df52bc2a98781' + '14c7f26ae080ab0449f4ad4ba4c68c0c3dacbbe63bace7da5c4faae9554c4d8f') prepare() { cd "Lightpack-${pkgver}" patch --forward --strip=1 --input="${srcdir}/fix_includes.patch" + patch --forward --strip=1 --input="${srcdir}/fix_qmake_buildflags.patch" cd Software - qmake -r } build() { cd "Lightpack-${pkgver}/Software" + qmake -r make } diff --git a/fix_qmake_buildflags.patch b/fix_qmake_buildflags.patch new file mode 100644 index 000000000000..5dcc6cbbd63b --- /dev/null +++ b/fix_qmake_buildflags.patch @@ -0,0 +1,76 @@ +diff -upr a/Software/grab/grab.pro b/Software/grab/grab.pro +--- a/Software/grab/grab.pro 2014-09-30 11:18:06.000000000 +0200 ++++ b/Software/grab/grab.pro 2020-06-18 19:24:09.817857700 +0200 +@@ -22,6 +22,9 @@ INCLUDEPATH += ./include \ + ../src \ + ../math/include \ + .. ++QMAKE_CFLAGS = $$(CFLAGS) ++QMAKE_CXXFLAGS = $$(CXXFLAGS) ++QMAKE_LFLAGS = $$(LDFLAGS) + + DEFINES += $${SUPPORTED_GRABBERS} + # Linux/UNIX platform +Only in b/Software/grab: Makefile +diff -upr a/Software/hooks/hooks.pro b/Software/hooks/hooks.pro +--- a/Software/hooks/hooks.pro 2014-09-30 11:18:06.000000000 +0200 ++++ b/Software/hooks/hooks.pro 2020-06-18 19:24:39.595207492 +0200 +@@ -31,6 +31,10 @@ QMAKE_CXXFLAGS_EXCEPTIONS_ON -= -mthread + + CONFIG -= rtti + ++QMAKE_CFLAGS = $$(CFLAGS) ++QMAKE_CXXFLAGS = $$(CXXFLAGS) ++QMAKE_LFLAGS = $$(LDFLAGS) ++ + DEFINES += HOOKSDLL_EXPORTS UNICODE + + CONFIG(msvc) { +Only in b/Software: lib +diff -upr a/Software/libraryinjector/libraryinjector.pro b/Software/libraryinjector/libraryinjector.pro +--- a/Software/libraryinjector/libraryinjector.pro 2014-09-30 11:18:06.000000000 +0200 ++++ b/Software/libraryinjector/libraryinjector.pro 2020-06-18 19:24:29.168301676 +0200 +@@ -10,6 +10,9 @@ DESTDIR = ../lib + TARGET = libraryinjector + TEMPLATE = lib + LIBS += -luuid -lole32 -ladvapi32 -luser32 ++QMAKE_CFLAGS = $$(CFLAGS) ++QMAKE_CXXFLAGS = $$(CXXFLAGS) ++QMAKE_LFLAGS = $$(LDFLAGS) + + DEFINES += LIBRARYINJECTOR_LIBRARY + CONFIG(msvc) { +Only in b/Software: Makefile +Only in b/Software/math: Makefile +Only in b/Software: .qmake.stash +Only in b/Software/src: bin +Only in b/Software/src: Makefile +diff -upr a/Software/src/src.pro b/Software/src/src.pro +--- a/Software/src/src.pro 2014-09-30 11:18:06.000000000 +0200 ++++ b/Software/src/src.pro 2020-06-18 19:24:54.378879801 +0200 +@@ -58,6 +58,10 @@ DEFINES += $${SUPPORTED_GRABBERS} + + LIBS += -L../lib -lgrab -lprismatik-math + ++QMAKE_CFLAGS = $$(CFLAGS) ++QMAKE_CXXFLAGS = $$(CXXFLAGS) ++QMAKE_LFLAGS = $$(LDFLAGS) ++ + unix:!macx{ + CONFIG += link_pkgconfig debug + PKGCONFIG += libusb-1.0 +Only in b/Software/src: stuff +diff -upr a/Software/tests/tests.pro b/Software/tests/tests.pro +--- a/Software/tests/tests.pro 2014-09-30 11:18:06.000000000 +0200 ++++ b/Software/tests/tests.pro 2020-06-18 19:24:59.275658721 +0200 +@@ -12,6 +12,10 @@ DESTDIR = bin + CONFIG += console + CONFIG -= app_bundle + ++QMAKE_CFLAGS = $$(CFLAGS) ++QMAKE_CXXFLAGS = $$(CXXFLAGS) ++QMAKE_LFLAGS = $$(LDFLAGS) ++ + CONFIG(gcc):QMAKE_CXXFLAGS += -std=c++11 + + # QMake and GCC produce a lot of stuff |