* [PR PATCH] octoxbps: update to 0.4.0 and add new dependency
@ 2024-10-29 1:11 toadwastoast
2024-10-29 2:22 ` [PR PATCH] [Updated] " toadwastoast
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: toadwastoast @ 2024-10-29 1:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 810 bytes --]
There is a new pull request by toadwastoast against master on the void-packages repository
https://github.com/toadwastoast/void-packages octoxbps-0.4.0
https://github.com/void-linux/void-packages/pull/52824
octoxbps: update to 0.4.0 and add new dependency
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64 (cross)
- armv7l-musl (cross)
- armv6l (cross)
Had to package qt-sudo since now necessary on octoxbps.
A patch file from https://github.com/void-linux/void-packages/pull/52824.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-octoxbps-0.4.0-52824.patch --]
[-- Type: text/x-diff, Size: 3555 bytes --]
From 2cbd1e0061b82b3f2e703f7fe770a3e40e56bee0 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 28 Oct 2024 22:05:08 -0300
Subject: [PATCH 1/2] octoxbps: update to 0.4.0
---
srcpkgs/octoxbps/template | 25 +++++++++++--------------
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/octoxbps/template b/srcpkgs/octoxbps/template
index 2c084fc503c8c0..368329f7eff92f 100644
--- a/srcpkgs/octoxbps/template
+++ b/srcpkgs/octoxbps/template
@@ -1,31 +1,28 @@
# 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 <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://tintaescura.com/projects/octopi/"
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() {
+ cd ${wrksrc}
+ 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 +31,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
}
From 3646e770ac1def7a83b6ddc9d44d330f88cd24e6 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 28 Oct 2024 22:05:44 -0300
Subject: [PATCH 2/2] New package: qt-sudo-2.0.1
---
srcpkgs/qt-sudo/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/qt-sudo/template
diff --git a/srcpkgs/qt-sudo/template b/srcpkgs/qt-sudo/template
new file mode 100644
index 00000000000000..043e0bbe402c1b
--- /dev/null
+++ b/srcpkgs/qt-sudo/template
@@ -0,0 +1,15 @@
+# Template file for 'qt-sudo'
+pkgname=qt-sudo
+version=2.0.1
+revision=1
+build_style=qmake
+build_helper=qmake6
+hostmakedepends="qt6-base qt6-tools"
+makedepends="qt6-base-devel"
+short_desc="Clone of LXQt sudo tool, without LXQt libs"
+maintainer="toadwastoast <toadwastoast@proton.me>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/aarnt/qt-sudo"
+distfiles="https://github.com/aarnt/qt-sudo/archive/v${version}.tar.gz"
+checksum=d97f38b37f2f8e4411506bed361090415a5617ebd794a9de7d9b4bb606ece3a1
+
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] octoxbps: update to 0.4.0 and add new dependency
2024-10-29 1:11 [PR PATCH] octoxbps: update to 0.4.0 and add new dependency toadwastoast
@ 2024-10-29 2:22 ` toadwastoast
2024-10-29 2:32 ` toadwastoast
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: toadwastoast @ 2024-10-29 2:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 820 bytes --]
There is an updated pull request by toadwastoast against master on the void-packages repository
https://github.com/toadwastoast/void-packages octoxbps-0.4.0
https://github.com/void-linux/void-packages/pull/52824
octoxbps: update to 0.4.0 and add new dependency
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64 (cross)
- armv7l-musl (cross)
- armv6l (cross)
Had to package qt-sudo since it's now necessary on octoxbps.
A patch file from https://github.com/void-linux/void-packages/pull/52824.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-octoxbps-0.4.0-52824.patch --]
[-- Type: text/x-diff, Size: 4237 bytes --]
From 2cbd1e0061b82b3f2e703f7fe770a3e40e56bee0 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 28 Oct 2024 22:05:08 -0300
Subject: [PATCH 1/3] octoxbps: update to 0.4.0
---
srcpkgs/octoxbps/template | 25 +++++++++++--------------
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/octoxbps/template b/srcpkgs/octoxbps/template
index 2c084fc503c8c0..368329f7eff92f 100644
--- a/srcpkgs/octoxbps/template
+++ b/srcpkgs/octoxbps/template
@@ -1,31 +1,28 @@
# 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 <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://tintaescura.com/projects/octopi/"
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() {
+ cd ${wrksrc}
+ 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 +31,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
}
From 3646e770ac1def7a83b6ddc9d44d330f88cd24e6 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 28 Oct 2024 22:05:44 -0300
Subject: [PATCH 2/3] New package: qt-sudo-2.0.1
---
srcpkgs/qt-sudo/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/qt-sudo/template
diff --git a/srcpkgs/qt-sudo/template b/srcpkgs/qt-sudo/template
new file mode 100644
index 00000000000000..043e0bbe402c1b
--- /dev/null
+++ b/srcpkgs/qt-sudo/template
@@ -0,0 +1,15 @@
+# Template file for 'qt-sudo'
+pkgname=qt-sudo
+version=2.0.1
+revision=1
+build_style=qmake
+build_helper=qmake6
+hostmakedepends="qt6-base qt6-tools"
+makedepends="qt6-base-devel"
+short_desc="Clone of LXQt sudo tool, without LXQt libs"
+maintainer="toadwastoast <toadwastoast@proton.me>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/aarnt/qt-sudo"
+distfiles="https://github.com/aarnt/qt-sudo/archive/v${version}.tar.gz"
+checksum=d97f38b37f2f8e4411506bed361090415a5617ebd794a9de7d9b4bb606ece3a1
+
From c0c23f4f9873316a0935de566cc0113d210b3d17 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 28 Oct 2024 23:21:00 -0300
Subject: [PATCH 3/3] New package: qt-sudo-2.0.1
---
srcpkgs/qt-sudo/template | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/qt-sudo/template b/srcpkgs/qt-sudo/template
index 043e0bbe402c1b..cf2fbc463e4ca7 100644
--- a/srcpkgs/qt-sudo/template
+++ b/srcpkgs/qt-sudo/template
@@ -12,4 +12,3 @@ license="GPL-2.0-or-later"
homepage="https://github.com/aarnt/qt-sudo"
distfiles="https://github.com/aarnt/qt-sudo/archive/v${version}.tar.gz"
checksum=d97f38b37f2f8e4411506bed361090415a5617ebd794a9de7d9b4bb606ece3a1
-
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] octoxbps: update to 0.4.0 and add new dependency
2024-10-29 1:11 [PR PATCH] octoxbps: update to 0.4.0 and add new dependency toadwastoast
2024-10-29 2:22 ` [PR PATCH] [Updated] " toadwastoast
@ 2024-10-29 2:32 ` toadwastoast
2024-10-29 10:06 ` [PR REVIEW] " chrysos349
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: toadwastoast @ 2024-10-29 2:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 820 bytes --]
There is an updated pull request by toadwastoast against master on the void-packages repository
https://github.com/toadwastoast/void-packages octoxbps-0.4.0
https://github.com/void-linux/void-packages/pull/52824
octoxbps: update to 0.4.0 and add new dependency
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64 (cross)
- armv7l-musl (cross)
- armv6l (cross)
Had to package qt-sudo since it's now necessary on octoxbps.
A patch file from https://github.com/void-linux/void-packages/pull/52824.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-octoxbps-0.4.0-52824.patch --]
[-- Type: text/x-diff, Size: 3552 bytes --]
From b692580ac8ce52019dcabe5dbb597c667580fadd Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 28 Oct 2024 23:30:24 -0300
Subject: [PATCH 1/2] octoxbps: update to 0.4.0
---
srcpkgs/octoxbps/template | 25 +++++++++++--------------
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/octoxbps/template b/srcpkgs/octoxbps/template
index 2c084fc503c8c0..368329f7eff92f 100644
--- a/srcpkgs/octoxbps/template
+++ b/srcpkgs/octoxbps/template
@@ -1,31 +1,28 @@
# 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 <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://tintaescura.com/projects/octopi/"
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() {
+ cd ${wrksrc}
+ 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 +31,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
}
From 152246dec6da49e5bdc28d4289c785005c8aa2ee Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 28 Oct 2024 23:30:50 -0300
Subject: [PATCH 2/2] New package: qt-sudo-2.0.1
---
srcpkgs/qt-sudo/template | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/qt-sudo/template
diff --git a/srcpkgs/qt-sudo/template b/srcpkgs/qt-sudo/template
new file mode 100644
index 00000000000000..cf2fbc463e4ca7
--- /dev/null
+++ b/srcpkgs/qt-sudo/template
@@ -0,0 +1,14 @@
+# Template file for 'qt-sudo'
+pkgname=qt-sudo
+version=2.0.1
+revision=1
+build_style=qmake
+build_helper=qmake6
+hostmakedepends="qt6-base qt6-tools"
+makedepends="qt6-base-devel"
+short_desc="Clone of LXQt sudo tool, without LXQt libs"
+maintainer="toadwastoast <toadwastoast@proton.me>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/aarnt/qt-sudo"
+distfiles="https://github.com/aarnt/qt-sudo/archive/v${version}.tar.gz"
+checksum=d97f38b37f2f8e4411506bed361090415a5617ebd794a9de7d9b4bb606ece3a1
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR REVIEW] octoxbps: update to 0.4.0 and add new dependency
2024-10-29 1:11 [PR PATCH] octoxbps: update to 0.4.0 and add new dependency toadwastoast
2024-10-29 2:22 ` [PR PATCH] [Updated] " toadwastoast
2024-10-29 2:32 ` toadwastoast
@ 2024-10-29 10:06 ` chrysos349
2024-10-29 12:06 ` [PR PATCH] [Updated] " toadwastoast
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: chrysos349 @ 2024-10-29 10:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 216 bytes --]
New review comment by chrysos349 on void-packages repository
https://github.com/void-linux/void-packages/pull/52824#discussion_r1820487886
Comment:
change `homepage` to `https://tintaescura.com/projects/octoxbps/`
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] octoxbps: update to 0.4.0 and add new dependency
2024-10-29 1:11 [PR PATCH] octoxbps: update to 0.4.0 and add new dependency toadwastoast
` (2 preceding siblings ...)
2024-10-29 10:06 ` [PR REVIEW] " chrysos349
@ 2024-10-29 12:06 ` toadwastoast
2024-11-01 0:18 ` [PR REVIEW] " classabbyamp
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: toadwastoast @ 2024-10-29 12:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 820 bytes --]
There is an updated pull request by toadwastoast against master on the void-packages repository
https://github.com/toadwastoast/void-packages octoxbps-0.4.0
https://github.com/void-linux/void-packages/pull/52824
octoxbps: update to 0.4.0 and add new dependency
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64 (cross)
- armv7l-musl (cross)
- armv6l (cross)
Had to package qt-sudo since it's now necessary on octoxbps.
A patch file from https://github.com/void-linux/void-packages/pull/52824.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-octoxbps-0.4.0-52824.patch --]
[-- Type: text/x-diff, Size: 3609 bytes --]
From ce3c499781b862445ed0145c4190545837d75af6 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Tue, 29 Oct 2024 09:04:34 -0300
Subject: [PATCH 1/2] octoxbps: update to 0.4.0
---
srcpkgs/octoxbps/template | 27 ++++++++++++---------------
1 file changed, 12 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/octoxbps/template b/srcpkgs/octoxbps/template
index 2c084fc503c8c0..7752d6fc0215a5 100644
--- a/srcpkgs/octoxbps/template
+++ b/srcpkgs/octoxbps/template
@@ -1,31 +1,28 @@
# 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 <beefcurtains@voidlinux.org>"
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() {
+ cd ${wrksrc}
+ 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 +31,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
}
From d2d8045d1c8b7e588ac7d7f38a7276bf966c420d Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Tue, 29 Oct 2024 09:05:02 -0300
Subject: [PATCH 2/2] New package: qt-sudo-2.0.1
---
srcpkgs/qt-sudo/template | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/qt-sudo/template
diff --git a/srcpkgs/qt-sudo/template b/srcpkgs/qt-sudo/template
new file mode 100644
index 00000000000000..cf2fbc463e4ca7
--- /dev/null
+++ b/srcpkgs/qt-sudo/template
@@ -0,0 +1,14 @@
+# Template file for 'qt-sudo'
+pkgname=qt-sudo
+version=2.0.1
+revision=1
+build_style=qmake
+build_helper=qmake6
+hostmakedepends="qt6-base qt6-tools"
+makedepends="qt6-base-devel"
+short_desc="Clone of LXQt sudo tool, without LXQt libs"
+maintainer="toadwastoast <toadwastoast@proton.me>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/aarnt/qt-sudo"
+distfiles="https://github.com/aarnt/qt-sudo/archive/v${version}.tar.gz"
+checksum=d97f38b37f2f8e4411506bed361090415a5617ebd794a9de7d9b4bb606ece3a1
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR REVIEW] octoxbps: update to 0.4.0 and add new dependency
2024-10-29 1:11 [PR PATCH] octoxbps: update to 0.4.0 and add new dependency toadwastoast
` (3 preceding siblings ...)
2024-10-29 12:06 ` [PR PATCH] [Updated] " toadwastoast
@ 2024-11-01 0:18 ` classabbyamp
2024-11-01 0:56 ` [PR PATCH] [Updated] " toadwastoast
2024-11-01 1:34 ` [PR PATCH] [Merged]: " classabbyamp
6 siblings, 0 replies; 8+ messages in thread
From: classabbyamp @ 2024-11-01 0:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 196 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/52824#discussion_r1825302344
Comment:
pwd is already wrksrc
```suggestion
```
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] octoxbps: update to 0.4.0 and add new dependency
2024-10-29 1:11 [PR PATCH] octoxbps: update to 0.4.0 and add new dependency toadwastoast
` (4 preceding siblings ...)
2024-11-01 0:18 ` [PR REVIEW] " classabbyamp
@ 2024-11-01 0:56 ` toadwastoast
2024-11-01 1:34 ` [PR PATCH] [Merged]: " classabbyamp
6 siblings, 0 replies; 8+ messages in thread
From: toadwastoast @ 2024-11-01 0:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 820 bytes --]
There is an updated pull request by toadwastoast against master on the void-packages repository
https://github.com/toadwastoast/void-packages octoxbps-0.4.0
https://github.com/void-linux/void-packages/pull/52824
octoxbps: update to 0.4.0 and add new dependency
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64 (cross)
- armv7l-musl (cross)
- armv6l (cross)
Had to package qt-sudo since it's now necessary on octoxbps.
A patch file from https://github.com/void-linux/void-packages/pull/52824.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-octoxbps-0.4.0-52824.patch --]
[-- Type: text/x-diff, Size: 3593 bytes --]
From 7a7115e6636bd52a6edf61bb2088dc46c411cd10 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 31 Oct 2024 21:54:44 -0300
Subject: [PATCH 1/2] 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 2c084fc503c8c0..814dba11dc0962 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 <beefcurtains@voidlinux.org>"
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
}
From 0a31172d4054447a6ce6602a4a6c0847bcfcd18d Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 31 Oct 2024 21:55:10 -0300
Subject: [PATCH 2/2] New package: qt-sudo-2.0.1
---
srcpkgs/qt-sudo/template | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/qt-sudo/template
diff --git a/srcpkgs/qt-sudo/template b/srcpkgs/qt-sudo/template
new file mode 100644
index 00000000000000..cf2fbc463e4ca7
--- /dev/null
+++ b/srcpkgs/qt-sudo/template
@@ -0,0 +1,14 @@
+# Template file for 'qt-sudo'
+pkgname=qt-sudo
+version=2.0.1
+revision=1
+build_style=qmake
+build_helper=qmake6
+hostmakedepends="qt6-base qt6-tools"
+makedepends="qt6-base-devel"
+short_desc="Clone of LXQt sudo tool, without LXQt libs"
+maintainer="toadwastoast <toadwastoast@proton.me>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/aarnt/qt-sudo"
+distfiles="https://github.com/aarnt/qt-sudo/archive/v${version}.tar.gz"
+checksum=d97f38b37f2f8e4411506bed361090415a5617ebd794a9de7d9b4bb606ece3a1
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Merged]: octoxbps: update to 0.4.0 and add new dependency
2024-10-29 1:11 [PR PATCH] octoxbps: update to 0.4.0 and add new dependency toadwastoast
` (5 preceding siblings ...)
2024-11-01 0:56 ` [PR PATCH] [Updated] " toadwastoast
@ 2024-11-01 1:34 ` classabbyamp
6 siblings, 0 replies; 8+ messages in thread
From: classabbyamp @ 2024-11-01 1:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 647 bytes --]
There's a merged pull request on the void-packages repository
octoxbps: update to 0.4.0 and add new dependency
https://github.com/void-linux/void-packages/pull/52824
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64 (cross)
- armv7l-musl (cross)
- armv6l (cross)
Had to package qt-sudo since it's now necessary on octoxbps.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-11-01 1:34 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-10-29 1:11 [PR PATCH] octoxbps: update to 0.4.0 and add new dependency toadwastoast
2024-10-29 2:22 ` [PR PATCH] [Updated] " toadwastoast
2024-10-29 2:32 ` toadwastoast
2024-10-29 10:06 ` [PR REVIEW] " chrysos349
2024-10-29 12:06 ` [PR PATCH] [Updated] " toadwastoast
2024-11-01 0:18 ` [PR REVIEW] " classabbyamp
2024-11-01 0:56 ` [PR PATCH] [Updated] " toadwastoast
2024-11-01 1:34 ` [PR PATCH] [Merged]: " classabbyamp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).