octoxbps: update to 0.3.0.

srcpkgs/octoxbps/files/octoxbps.desktop

@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=OctoXBPS
-Comment=GUI frontend for XBPS
-Comment[de]=GUI Programm für XBPS 
-Exec=octoxbps
-Icon=octoxbps
-Terminal=false
-Type=Application
-Categories=System;Settings;

srcpkgs/octoxbps/patches/fix-qt5.11.patch

@@ -1,10 +0,0 @@
---- src/transactiondialog.h	2016-11-23 15:49:29.000000000 +0100
-+++ src/transactiondialog.h	2018-12-31 15:46:57.094377701 +0100
-@@ -22,6 +22,7 @@
- 
- #include "ui_transactiondialog.h"
- #include <QDialog>
-+#include <QRegularExpression>
- 
- //const int ctn_RUN_IN_TERMINAL(328);
- class QPushButton;

srcpkgs/octoxbps/patches/no-force.patch

@@ -1,75 +0,0 @@
-This patch is also offered to upstream: https://github.com/aarnt/octoxbps/pull/3
-
---- src/xbpsexec.cpp
-+++ src/xbpsexec.cpp
-@@ -594,10 +594,10 @@
-  */
- void XBPSExec::doInstall(const QString &listOfPackages)
- {
--  QString command = "xbps-install -f -y " + listOfPackages;
-+  QString command = "xbps-install -y " + listOfPackages;
- 
-   m_lastCommandList.clear();
--  m_lastCommandList.append("xbps-install -f " + listOfPackages + ";");
-+  m_lastCommandList.append("xbps-install " + listOfPackages + ";");
-   m_lastCommandList.append("echo -e;");
-   m_lastCommandList.append("read -n 1 -p \"" + StrConstants::getPressAnyKey() + "\"");
- 
-@@ -611,7 +611,7 @@
- void XBPSExec::doInstallInTerminal(const QString &listOfPackages)
- {
-   m_lastCommandList.clear();
--  m_lastCommandList.append("xbps-install -f " + listOfPackages + ";");
-+  m_lastCommandList.append("xbps-install " + listOfPackages + ";");
-   m_lastCommandList.append("echo -e;");
-   m_lastCommandList.append("read -n 1 -p \"" + StrConstants::getPressAnyKey() + "\"");
- 
-@@ -654,10 +654,10 @@
-  */
- void XBPSExec::doRemove(const QString &listOfPackages)
- {
--  QString command = "xbps-remove -R -f -y " + listOfPackages;
-+  QString command = "xbps-remove -R -y " + listOfPackages;
- 
-   m_lastCommandList.clear();
--  m_lastCommandList.append("xbps-remove -R -f " + listOfPackages + ";");
-+  m_lastCommandList.append("xbps-remove -R " + listOfPackages + ";");
-   m_lastCommandList.append("echo -e;");
-   m_lastCommandList.append("read -n 1 -p \"" + StrConstants::getPressAnyKey() + "\"");
- 
-@@ -671,7 +671,7 @@
- void XBPSExec::doRemoveInTerminal(const QString &listOfPackages)
- {
-   m_lastCommandList.clear();
--  m_lastCommandList.append("xbps-remove -R -f " + listOfPackages + ";");
-+  m_lastCommandList.append("xbps-remove -R " + listOfPackages + ";");
-   m_lastCommandList.append("echo -e;");
-   m_lastCommandList.append("read -n 1 -p \"" + StrConstants::getPressAnyKey() + "\"");
- 
-@@ -684,12 +684,12 @@
-  */
- void XBPSExec::doRemoveAndInstall(const QString &listOfPackagestoRemove, const QString &listOfPackagestoInstall)
- {
--  QString command = "xbps-remove -R -f -y " + listOfPackagestoRemove +
--      "; xbps-install -f " + listOfPackagestoInstall;
-+  QString command = "xbps-remove -R -y " + listOfPackagestoRemove +
-+      "; xbps-install " + listOfPackagestoInstall;
- 
-   m_lastCommandList.clear();
--  m_lastCommandList.append("xbps-remove -R -f " + listOfPackagestoRemove + ";");
--  m_lastCommandList.append("xbps-install -f " + listOfPackagestoInstall + ";");
-+  m_lastCommandList.append("xbps-remove -R " + listOfPackagestoRemove + ";");
-+  m_lastCommandList.append("xbps-install " + listOfPackagestoInstall + ";");
-   m_lastCommandList.append("echo -e;");
-   m_lastCommandList.append("read -n 1 -p \"" + StrConstants::getPressAnyKey() + "\"");
- 
-@@ -703,8 +703,8 @@
- void XBPSExec::doRemoveAndInstallInTerminal(const QString &listOfPackagestoRemove, const QString &listOfPackagestoInstall)
- {
-   m_lastCommandList.clear();
--  m_lastCommandList.append("xbps-remove -R -f " + listOfPackagestoRemove + ";");
--  m_lastCommandList.append("xbps-install -f " + listOfPackagestoInstall + ";");
-+  m_lastCommandList.append("xbps-remove -R " + listOfPackagestoRemove + ";");
-+  m_lastCommandList.append("xbps-install " + listOfPackagestoInstall + ";");
-   m_lastCommandList.append("echo -e;");
-   m_lastCommandList.append("read -n 1 -p \"" + StrConstants::getPressAnyKey() + "\"");

srcpkgs/octoxbps/template

@@ -1,17 +1,18 @@
 # Template file for 'octoxbps'
 pkgname=octoxbps
-version=0.2.2
+version=0.3.0
-revision=3
+revision=1
 build_style=qmake
-hostmakedepends="qt5-qmake"
+hostmakedepends="qt5-qmake pkg-config"
-makedepends="qt5-declarative-devel"
+makedepends="qt5-declarative-devel qtermwidget-devel"
-depends="curl"
+depends="curl sudo"
 short_desc="Qt-based XBPS front-end"
 maintainer="beefcurtains <beefcurtains@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/aarnt/octoxbps"
-distfiles="${homepage}/archive/v${version}.tar.gz"
+changelog="https://raw.githubusercontent.com/aarnt/octoxbps/master/CHANGELOG"
-checksum=6f7643bb07960d8c8f60ce70dc495f866ae60a4d6d8160a7f108f79bf53d2d22
+distfiles="https://github.com/aarnt/octoxbps/archive/v${version}.tar.gz"
+checksum=3c3e1b58c7211a5ef4aac1b1a2f9d71891404b41963f683efccc0f43165c8313
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-declarative-devel"
@@ -22,9 +23,13 @@ post_configure() {
 	if [ "$CROSS_BUILD" ]; then
 		qmake_args="-qtconf ${wrksrc}/qt.conf"
 	fi
-	cd ${wrksrc}/notifier/octoxbps-notifier && qmake-qt5 ${configure_args} \
+	cd ${wrksrc}/notifier && qmake-qt5 ${configure_args} \
-		PREFIX=/usr \
+		QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX QMAKE_LINK_C=$CC \
-		LIB=/usr/lib \
+		QMAKE_CFLAGS="${CFLAGS}" \
+		QMAKE_CXXFLAGS="${CXXFLAGS}" \
+		QMAKE_LFLAGS="${LDFLAGS}" \
+		${qmake_args}
+	cd ${wrksrc}/sudo && qmake-qt5 ${configure_args} \
 		QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX QMAKE_LINK_C=$CC \
 		QMAKE_CFLAGS="${CFLAGS}" \
 		QMAKE_CXXFLAGS="${CXXFLAGS}" \
@@ -33,20 +38,13 @@ post_configure() {
 }
 
 do_build() {
-	for _dir in ${wrksrc} ${wrksrc}/notifier/octoxbps-notifier; do
+	for _dir in ${wrksrc} ${wrksrc}/notifier ${wrksrc}/sudo; do
 		cd $_dir && make ${makejobs} ${make_build_args} ${make_build_target} CC="$CC" CXX="$CXX" LINK="$CXX"
 	done
 }
 
 do_install() {
-	vbin bin/octoxbps
+	for _dir in ${wrksrc} ${wrksrc}/notifier ${wrksrc}/sudo; do
-	vbin notifier/bin/octoxbps-notifier
+		cd $_dir && make INSTALL_ROOT=${DESTDIR} install
-	vmkdir usr/share/applications
-	vinstall ${FILESDIR}/octoxbps.desktop 644 usr/share/applications
-	local size
-	for size in 32 48 64 128 256; do
-		vinstall ${FILESDIR}/octoxbps-${size}.png 644 \
-			usr/share/icons/hicolor/${size}x${size}/apps octoxbps.png
 	done
-	vinstall ${FILESDIR}/octoxbps-128.png 644 usr/share/pixmaps octoxbps.png
 }