* Re: octoxbps: update to 0.3.1
2023-09-20 20:17 [PR PATCH] octoxbps: update to 0.3.1 zen0bit
@ 2023-09-20 20:45 ` paper42
2023-09-20 21:23 ` zen0bit
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: paper42 @ 2023-09-20 20:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 243 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/46164#issuecomment-1728402118
Comment:
> I tested the changes in this PR: **briefly**
According to CI, it doesn't seem like this was tested
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: octoxbps: update to 0.3.1
2023-09-20 20:17 [PR PATCH] octoxbps: update to 0.3.1 zen0bit
2023-09-20 20:45 ` paper42
@ 2023-09-20 21:23 ` zen0bit
2023-09-20 21:27 ` [PR PATCH] [Updated] " zen0bit
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: zen0bit @ 2023-09-20 21:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 186 bytes --]
New comment by zen0bit on void-packages repository
https://github.com/void-linux/void-packages/pull/46164#issuecomment-1728446074
Comment:
Sorry I pushed from wrong place...
My bad
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PR PATCH] [Updated] octoxbps: update to 0.3.1
2023-09-20 20:17 [PR PATCH] octoxbps: update to 0.3.1 zen0bit
2023-09-20 20:45 ` paper42
2023-09-20 21:23 ` zen0bit
@ 2023-09-20 21:27 ` zen0bit
2023-09-20 21:58 ` zen0bit
2023-09-23 11:55 ` [PR PATCH] [Merged]: " sgn
4 siblings, 0 replies; 6+ messages in thread
From: zen0bit @ 2023-09-20 21:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 477 bytes --]
There is an updated pull request by zen0bit against master on the void-packages repository
https://github.com/oSoWoSo/VUR octoxbps
https://github.com/void-linux/void-packages/pull/46164
octoxbps: update to 0.3.1
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x64 glibc)
A patch file from https://github.com/void-linux/void-packages/pull/46164.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-octoxbps-46164.patch --]
[-- Type: text/x-diff, Size: 3450 bytes --]
From 9d0927f8bc2add1821666def836df63aff3fed9c Mon Sep 17 00:00:00 2001
From: zenobit <zen@osowoso.xyz>
Date: Wed, 20 Sep 2023 21:14:59 +0200
Subject: [PATCH] octoxbps: update to 0.3.1
---
...tion-of-Void-Linux-in-getLinuxDistro.patch | 42 -------------------
srcpkgs/octoxbps/template | 6 +--
2 files changed, 3 insertions(+), 45 deletions(-)
delete mode 100644 srcpkgs/octoxbps/patches/0001-Fix-detection-of-Void-Linux-in-getLinuxDistro.patch
diff --git a/srcpkgs/octoxbps/patches/0001-Fix-detection-of-Void-Linux-in-getLinuxDistro.patch b/srcpkgs/octoxbps/patches/0001-Fix-detection-of-Void-Linux-in-getLinuxDistro.patch
deleted file mode 100644
index 9941fc6da8c21..0000000000000
--- a/srcpkgs/octoxbps/patches/0001-Fix-detection-of-Void-Linux-in-getLinuxDistro.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 41e0ba546e85f812d89899a3034d67256ec5f23c Mon Sep 17 00:00:00 2001
-From: chili-b <dexter.gaonshatford@gmail.com>
-Date: Sat, 19 Mar 2022 15:33:41 -0400
-Subject: [PATCH] Fix detection of Void Linux in getLinuxDistro
-
-Before this change, OctoXBPS detects Void Linux based on whether or not
-the string, `PRETTY_NAME="void"`, occurs in the file, `/etc/os-release`.
-As of March 15 2022, the contents of `/etc/os-release` have been changed
-and `PRETTY_NAME="Void Linux"` replaces the previous value.
-(see https://github.com/void-linux/void-packages/commit/1dfc401d1237120e8e936627e7e28d2441916e80)
-
-With this change, Void Linux is detected based on the value of `ID` in
-`/etc/os-release` which is less subject to change.
-
-This change is important because OctoXBPS only checks for the existence
-of the local package db if it detects that it is running on either Void
-Linux or Trident Linux. If OctoXBPS does not detect that it is running
-on either distribution (which it doesn't without this change), it will
-prompt for elevated privileges in order to synchronize the local package
-database with the remote database using `xbps-install -Syy` every time
-it is started, regardless of whether or not there are remote changes
-that need to be synced.
----
- src/unixcommand.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/unixcommand.cpp b/src/unixcommand.cpp
-index 8a88a2f..1762c4b 100644
---- a/src/unixcommand.cpp
-+++ b/src/unixcommand.cpp
-@@ -709,7 +709,7 @@ LinuxDistro UnixCommand::getLinuxDistro()
-
- QString contents = file.readAll();
-
-- if (contents.contains("PRETTY_NAME=\"void\""))
-+ if (contents.contains("ID=\"void\""))
- {
- ret = ectn_VOID;
- }
---
-2.35.1
-
diff --git a/srcpkgs/octoxbps/template b/srcpkgs/octoxbps/template
index 4e783fe79738b..e7f7cb0e167cb 100644
--- a/srcpkgs/octoxbps/template
+++ b/srcpkgs/octoxbps/template
@@ -1,7 +1,7 @@
# Template file for 'octoxbps'
pkgname=octoxbps
-version=0.3.0
-revision=4
+version=0.3.1
+revision=1
build_style=qmake
hostmakedepends="qt5-qmake pkg-config qt5-host-tools"
makedepends="qt5-declarative-devel qtermwidget-devel"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
homepage="https://github.com/aarnt/octoxbps"
changelog="https://raw.githubusercontent.com/aarnt/octoxbps/master/CHANGELOG"
distfiles="https://github.com/aarnt/octoxbps/archive/v${version}.tar.gz"
-checksum=3c3e1b58c7211a5ef4aac1b1a2f9d71891404b41963f683efccc0f43165c8313
+checksum=0ec95b8f79a1536cb7b7d2e0ac56175972a3ca77fb0ba67a7e190f592644a088
post_configure() {
local qmake_args
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PR PATCH] [Updated] octoxbps: update to 0.3.1
2023-09-20 20:17 [PR PATCH] octoxbps: update to 0.3.1 zen0bit
` (2 preceding siblings ...)
2023-09-20 21:27 ` [PR PATCH] [Updated] " zen0bit
@ 2023-09-20 21:58 ` zen0bit
2023-09-23 11:55 ` [PR PATCH] [Merged]: " sgn
4 siblings, 0 replies; 6+ messages in thread
From: zen0bit @ 2023-09-20 21:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 477 bytes --]
There is an updated pull request by zen0bit against master on the void-packages repository
https://github.com/oSoWoSo/VUR octoxbps
https://github.com/void-linux/void-packages/pull/46164
octoxbps: update to 0.3.1
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x64 glibc)
A patch file from https://github.com/void-linux/void-packages/pull/46164.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-octoxbps-46164.patch --]
[-- Type: text/x-diff, Size: 3450 bytes --]
From bf31dd1c0109f9204fec56c58205c5de6eb721dc Mon Sep 17 00:00:00 2001
From: zenobit <zen@osowoso.xyz>
Date: Wed, 20 Sep 2023 22:10:28 +0200
Subject: [PATCH] octoxbps: update to 0.3.1
---
...tion-of-Void-Linux-in-getLinuxDistro.patch | 42 -------------------
srcpkgs/octoxbps/template | 6 +--
2 files changed, 3 insertions(+), 45 deletions(-)
delete mode 100644 srcpkgs/octoxbps/patches/0001-Fix-detection-of-Void-Linux-in-getLinuxDistro.patch
diff --git a/srcpkgs/octoxbps/patches/0001-Fix-detection-of-Void-Linux-in-getLinuxDistro.patch b/srcpkgs/octoxbps/patches/0001-Fix-detection-of-Void-Linux-in-getLinuxDistro.patch
deleted file mode 100644
index 9941fc6da8c21..0000000000000
--- a/srcpkgs/octoxbps/patches/0001-Fix-detection-of-Void-Linux-in-getLinuxDistro.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 41e0ba546e85f812d89899a3034d67256ec5f23c Mon Sep 17 00:00:00 2001
-From: chili-b <dexter.gaonshatford@gmail.com>
-Date: Sat, 19 Mar 2022 15:33:41 -0400
-Subject: [PATCH] Fix detection of Void Linux in getLinuxDistro
-
-Before this change, OctoXBPS detects Void Linux based on whether or not
-the string, `PRETTY_NAME="void"`, occurs in the file, `/etc/os-release`.
-As of March 15 2022, the contents of `/etc/os-release` have been changed
-and `PRETTY_NAME="Void Linux"` replaces the previous value.
-(see https://github.com/void-linux/void-packages/commit/1dfc401d1237120e8e936627e7e28d2441916e80)
-
-With this change, Void Linux is detected based on the value of `ID` in
-`/etc/os-release` which is less subject to change.
-
-This change is important because OctoXBPS only checks for the existence
-of the local package db if it detects that it is running on either Void
-Linux or Trident Linux. If OctoXBPS does not detect that it is running
-on either distribution (which it doesn't without this change), it will
-prompt for elevated privileges in order to synchronize the local package
-database with the remote database using `xbps-install -Syy` every time
-it is started, regardless of whether or not there are remote changes
-that need to be synced.
----
- src/unixcommand.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/unixcommand.cpp b/src/unixcommand.cpp
-index 8a88a2f..1762c4b 100644
---- a/src/unixcommand.cpp
-+++ b/src/unixcommand.cpp
-@@ -709,7 +709,7 @@ LinuxDistro UnixCommand::getLinuxDistro()
-
- QString contents = file.readAll();
-
-- if (contents.contains("PRETTY_NAME=\"void\""))
-+ if (contents.contains("ID=\"void\""))
- {
- ret = ectn_VOID;
- }
---
-2.35.1
-
diff --git a/srcpkgs/octoxbps/template b/srcpkgs/octoxbps/template
index 4e783fe79738b..e7f7cb0e167cb 100644
--- a/srcpkgs/octoxbps/template
+++ b/srcpkgs/octoxbps/template
@@ -1,7 +1,7 @@
# Template file for 'octoxbps'
pkgname=octoxbps
-version=0.3.0
-revision=4
+version=0.3.1
+revision=1
build_style=qmake
hostmakedepends="qt5-qmake pkg-config qt5-host-tools"
makedepends="qt5-declarative-devel qtermwidget-devel"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
homepage="https://github.com/aarnt/octoxbps"
changelog="https://raw.githubusercontent.com/aarnt/octoxbps/master/CHANGELOG"
distfiles="https://github.com/aarnt/octoxbps/archive/v${version}.tar.gz"
-checksum=3c3e1b58c7211a5ef4aac1b1a2f9d71891404b41963f683efccc0f43165c8313
+checksum=0ec95b8f79a1536cb7b7d2e0ac56175972a3ca77fb0ba67a7e190f592644a088
post_configure() {
local qmake_args
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PR PATCH] [Merged]: octoxbps: update to 0.3.1
2023-09-20 20:17 [PR PATCH] octoxbps: update to 0.3.1 zen0bit
` (3 preceding siblings ...)
2023-09-20 21:58 ` zen0bit
@ 2023-09-23 11:55 ` sgn
4 siblings, 0 replies; 6+ messages in thread
From: sgn @ 2023-09-23 11:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 330 bytes --]
There's a merged pull request on the void-packages repository
octoxbps: update to 0.3.1
https://github.com/void-linux/void-packages/pull/46164
Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x64 glibc)
^ permalink raw reply [flat|nested] 6+ messages in thread