From: zen0bit <zen0bit@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] octoxbps: update to 0.3.1
Date: Wed, 20 Sep 2023 23:27:30 +0200 [thread overview]
Message-ID: <20230920212730.Q4TW0rROk_hAN3T79vuDmaN4jeXm2mH5sTigKGCXYRA@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46164@inbox.vuxu.org>
[-- 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
next prev parent reply other threads:[~2023-09-20 21:27 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-20 20:17 [PR PATCH] " zen0bit
2023-09-20 20:45 ` paper42
2023-09-20 21:23 ` zen0bit
2023-09-20 21:27 ` zen0bit [this message]
2023-09-20 21:58 ` [PR PATCH] [Updated] " zen0bit
2023-09-23 11:55 ` [PR PATCH] [Merged]: " sgn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230920212730.Q4TW0rROk_hAN3T79vuDmaN4jeXm2mH5sTigKGCXYRA@z \
--to=zen0bit@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).