From e8382229a46788bdf001699220c5b16211ca0a4e Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Sun, 3 Nov 2019 07:42:21 +0100 Subject: [PATCH] abGate: use qmake build-helper --- srcpkgs/abGate/patches/Makefile.patch | 26 -------------------------- srcpkgs/abGate/template | 5 +++++ 2 files changed, 5 insertions(+), 26 deletions(-) delete mode 100644 srcpkgs/abGate/patches/Makefile.patch diff --git a/srcpkgs/abGate/patches/Makefile.patch b/srcpkgs/abGate/patches/Makefile.patch deleted file mode 100644 index eb30dae273c..00000000000 --- a/srcpkgs/abGate/patches/Makefile.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- Makefile 2018-06-27 09:47:49.602920765 +0000 -+++ - 2018-06-27 09:48:44.684191018 +0000 -@@ -10,7 +10,7 @@ - cp $^ $(BUNDLE) - - abGateQt/libabGateQt.so: -- cd abGateQt; qmake; make -+ cd abGateQt; qmake-qt5 QMAKE_CC=$(CC) QMAKE_CXX=$(CXX) QMAKE_LINK=$(CXX); make CC=$(CC) CXX=$(CXX) LINK=$(CXX) - - gate.so: gate.cpp - g++ $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) -g -O3 -shared -fPIC -DPIC -Wl,--as-needed gate.cpp `pkg-config --cflags --libs lv2` -o gate.so ---- Makefile 2018-06-27 09:50:25.705750049 +0000 -+++ - 2018-06-27 09:50:52.610670910 +0000 -@@ -13,10 +13,10 @@ - cd abGateQt; qmake-qt5 QMAKE_CC="$(CC)" QMAKE_CXX="$(CXX)" QMAKE_LINK="$(CXX)"; make CC="$(CC)" CXX="$(CXX)" LINK="$(CXX)" - - gate.so: gate.cpp -- g++ $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) -g -O3 -shared -fPIC -DPIC -Wl,--as-needed gate.cpp `pkg-config --cflags --libs lv2` -o gate.so -+ $(CXX) $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) -g -O3 -shared -fPIC -DPIC -Wl,--as-needed gate.cpp `pkg-config --cflags --libs lv2` -o gate.so - - gate_gui.so: gate_gui.cpp main_window.cpp main_window.h knob.cpp knob.h toggle.cpp toggle.h preset_widget.cpp preset_widget.h presets.cpp presets.h preset.cpp preset.h gate_const.h plugin_configuration.h -- g++ $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) -g -O3 -shared -fPIC -DPIC -Wl,--as-needed gate_gui.cpp main_window.cpp knob.cpp toggle.cpp preset_widget.cpp presets.cpp preset.cpp `pkg-config --cflags gtkmm-2.4 --libs lv2 gthread-2.0` -o gate_gui.so -+ $(CXX) $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) -g -O3 -shared -fPIC -DPIC -Wl,--as-needed gate_gui.cpp main_window.cpp knob.cpp toggle.cpp preset_widget.cpp presets.cpp preset.cpp `pkg-config --cflags gtkmm-2.4 --libs lv2 gthread-2.0` -o gate_gui.so - - all: $(BUNDLE) - diff --git a/srcpkgs/abGate/template b/srcpkgs/abGate/template index 92f2a400d49..be374ec81c6 100644 --- a/srcpkgs/abGate/template +++ b/srcpkgs/abGate/template @@ -3,6 +3,7 @@ pkgname=abGate version=1.1.9 revision=1 build_style=gnu-makefile +build_helper=qmake hostmakedepends="pkg-config qt5-qmake qt5-host-tools" makedepends="qt5-devel gtkmm2-devel lv2" depends="lv2" @@ -16,3 +17,7 @@ checksum=898b50cce44dffedd82ec0e6d6d043a9d26534fbf07898d099575ea4c1057721 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-devel" fi + +pre_build() { + vsed -i -e 's/g++/$(CXX)/' Makefile +}