diff --git a/srcpkgs/dhcpcd-gtk/template b/srcpkgs/dhcpcd-gtk/template index aa7bca9f6873f4..319f9d79d805ab 100644 --- a/srcpkgs/dhcpcd-gtk/template +++ b/srcpkgs/dhcpcd-gtk/template @@ -1,18 +1,18 @@ # Template file for 'dhcpcd-gtk' pkgname=dhcpcd-gtk -version=0.7.8 +version=0.8.0 revision=1 build_style=gnu-configure -configure_args="--with-gtk --with-icons --with-notification" -hostmakedepends="pkg-config" +configure_args="--with-gtk --with-icons --enable-notification" +hostmakedepends="pkg-config python3-cairosvg" makedepends="gtk+-devel libnotify-devel dbus-devel" depends="dhcpcd dhcpcd-icons desktop-file-utils" short_desc="GTK+ monitor and configuration GUI for dhcpcd" maintainer="Orphaned " 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=4170a07b8bbba65b30f8da8a15a4d776cbf17d030b666516821d450f594a9d6c +homepage="https://roy.marples.name/projects/dhcpcd-ui" +distfiles="https://github.com/NetworkConfiguration/dhcpcd-ui/releases/download/v${version}/dhcpcd-ui-${version}.tar.xz" +checksum=547c6c61704257535873c5f6638f5da68784b049a4e6f45864e80bd658c20bcd if [ "${XBPS_TARGET_LIBC}" = musl ]; then makedepends+=" musl-legacy-compat" diff --git a/srcpkgs/dhcpcd-qt/template b/srcpkgs/dhcpcd-qt/template index 547cdada5cd79f..868bd47e259860 100644 --- a/srcpkgs/dhcpcd-qt/template +++ b/srcpkgs/dhcpcd-qt/template @@ -1,34 +1,26 @@ # Template file for 'dhcpcd-qt' pkgname=dhcpcd-qt -version=0.7.8 +version=0.8.0 revision=1 build_style=gnu-configure -configure_args="--with-qt --without-dhcpcd-online --without-icons --with-notification" +build_helper=qmake +configure_args="--with-qt --without-dhcpcd-online --without-icons --enable-notification" hostmakedepends="pkg-config" makedepends="qt5-devel" depends="dhcpcd dhcpcd-icons desktop-file-utils" short_desc="Qt system tray monitor for dhcpcd" maintainer="Orphaned " 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=4170a07b8bbba65b30f8da8a15a4d776cbf17d030b666516821d450f594a9d6c +homepage="https://roy.marples.name/projects/dhcpcd-ui" +distfiles="https://github.com/NetworkConfiguration/dhcpcd-ui/releases/download/v${version}/dhcpcd-ui-${version}.tar.xz" +checksum=547c6c61704257535873c5f6638f5da68784b049a4e6f45864e80bd658c20bcd if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-devel qt5-host-tools" fi -post_configure() { - 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 's|^LIBS.*|LIBS = $(SUBLIBS) -L../libdhcpcd ../libdhcpcd/libdhcpcd.a -L"${XBPS_CROSS_BASE}/usr/lib" -lQt5Widgets -lQt5Gui -lQt5Core -lGL -lpthread|' +pre_configure() { + export QMAKE=${XBPS_WRAPPERDIR}/qmake-qt5 } pre_install() {