From 1cdc77150de0159761ae9eca52c5fecf7ce99309 Mon Sep 17 00:00:00 2001 From: toadwastoast Date: Thu, 31 Oct 2024 21:54:44 -0300 Subject: [PATCH] octoxbps: update to 0.4.0 --- srcpkgs/octoxbps/template | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/srcpkgs/octoxbps/template b/srcpkgs/octoxbps/template index 2c084fc503c..814dba11dc0 100644 --- a/srcpkgs/octoxbps/template +++ b/srcpkgs/octoxbps/template @@ -1,31 +1,27 @@ # Template file for 'octoxbps' pkgname=octoxbps -version=0.3.3 +version=0.4.0 revision=1 build_style=qmake -hostmakedepends="qt5-qmake pkg-config qt5-host-tools" -makedepends="qt5-declarative-devel qtermwidget-devel" -depends="curl" +build_helper=qmake6 +hostmakedepends="pkg-config qt6-tools qt6-base" +makedepends=" qt6-declarative-devel qtermwidget-qt6-devel qt6-qt5compat-devel" +depends="curl qt-sudo" short_desc="Qt-based XBPS front-end" maintainer="beefcurtains " license="GPL-2.0-or-later" -homepage="https://tintaescura.com/projects/octopi/" +homepage="https://tintaescura.com/projects/octoxbps/" changelog="https://raw.githubusercontent.com/aarnt/octoxbps/master/CHANGELOG" distfiles="https://github.com/aarnt/octoxbps/archive/v${version}.tar.gz" -checksum=bf00fca7416b9ecad5e8c6e85d8e3215e8c4ef73c23a2b2c3cbe6773491ff4d5 +checksum=9c01d6a97511e3cecea32d094482e14b40ff3e1ede6576eb45a7e75dd8f39920 post_configure() { + sed -i 's/usr\/local/usr/g' src/constants.h local qmake_args if [ "$CROSS_BUILD" ]; then qmake_args="-qtconf ${wrksrc}/qt.conf" fi - cd ${wrksrc}/notifier && qmake-qt5 ${configure_args} \ - QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX QMAKE_LINK_C=$CC \ - QMAKE_CFLAGS="${CFLAGS}" \ - QMAKE_CXXFLAGS="${CXXFLAGS}" \ - QMAKE_LFLAGS="${LDFLAGS}" \ - ${qmake_args} - cd ${wrksrc}/sudo && qmake-qt5 ${configure_args} \ + cd ${wrksrc}/notifier && qmake-qt6 ${configure_args} \ QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX QMAKE_LINK_C=$CC \ QMAKE_CFLAGS="${CFLAGS}" \ QMAKE_CXXFLAGS="${CXXFLAGS}" \ @@ -34,13 +30,13 @@ post_configure() { } do_build() { - for _dir in ${wrksrc} ${wrksrc}/notifier ${wrksrc}/sudo; do + for _dir in ${wrksrc} ${wrksrc}/notifier; do cd $_dir && make ${makejobs} ${make_build_args} ${make_build_target} CC="$CC" CXX="$CXX" LINK="$CXX" done } do_install() { - for _dir in ${wrksrc} ${wrksrc}/notifier ${wrksrc}/sudo; do + for _dir in ${wrksrc} ${wrksrc}/notifier; do cd $_dir && make INSTALL_ROOT=${DESTDIR} install done }