[PR PATCH] dhcpcd-qt: unmark nocross

[PR PATCH] dhcpcd-qt: unmark nocross

[ndowens]

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

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

https://github.com/ndowens/void-packages dhcpcd-qt
https://github.com/void-linux/void-packages/pull/27207

dhcpcd-qt: unmark nocross


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dhcpcd-qt-27207.patch --]
[-- Type: text/x-diff, Size: 1439 bytes --]

From 46be812ea6778a97fef18020321748e0b9068f11 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Wed, 16 Dec 2020 16:44:03 -0600
Subject: [PATCH] dhcpcd-qt: unmark nocross

---
 srcpkgs/dhcpcd-qt/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dhcpcd-qt/template b/srcpkgs/dhcpcd-qt/template
index a7b58dbcfe8..9e8ed14d4bd 100644
--- a/srcpkgs/dhcpcd-qt/template
+++ b/srcpkgs/dhcpcd-qt/template
@@ -14,21 +14,22 @@ license="BSD-2-Clause"
 homepage="http://roy.marples.name/projects/dhcpcd-ui"
 distfiles="http://roy.marples.name/downloads/dhcpcd/dhcpcd-ui-${version}.tar.xz"
 checksum=81d448f82c9aa88ff85e4bc3cead5e4c7f3ea08e57c713dff9996fb5ba2c42b0
-nocross="https://api.travis-ci.org/v3/job/621373375/log.txt"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel qt5-host-tools"
 fi
 
 post_configure() {
-	sed -i src/dhcpcd-qt/Makefile \
+	vsed -i src/dhcpcd-qt/Makefile \
 		-e "s;^\(CC .*=\).*;\1 ${CC};" \
 		-e "s;^\(CXX .*=\).*;\1 ${CXX};" \
+		-e "s;g++ -;${CXX} -;" \
 		-e "s;^\(CFLAGS.*=.*\);& ${CFLAGS};" \
 		-e "s;^\(CXXFLAGS.*=.*\);& ${CXXFLAGS};" \
 		-e "s;^\(LFLAGS.*=.*\);& ${LDFLAGS};" \
 		-e "s;^\(LINK .*=\).*;\1 ${CXX};" \
-		-e "/STRIP/d"
+		-e "/STRIP/d" \
+		-e 's|^LIBS.*|LIBS = $(SUBLIBS) -L../libdhcpcd ../libdhcpcd/libdhcpcd.a -L"${XBPS_CROSS_BASE}/usr/lib" -lQt5Widgets -lQt5Gui -lQt5Core -lGL -lpthread|'
 }
 
 pre_install() {

Re: [PR PATCH] [Merged]: dhcpcd-qt: unmark nocross

[ericonr]

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

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

dhcpcd-qt: unmark nocross
https://github.com/void-linux/void-packages/pull/27207

Description: