Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] gparted: update to 1.5.0.
@ 2023-04-07 23:06 Johnnynator
  2023-04-07 23:36 ` [PR PATCH] [Updated] " Johnnynator
  2023-04-07 23:54 ` [PR PATCH] [Merged]: " Johnnynator
  0 siblings, 2 replies; 3+ messages in thread
From: Johnnynator @ 2023-04-07 23:06 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]

There is a new pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages gparted
https://github.com/void-linux/void-packages/pull/43333

gparted: update to 1.5.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/43333.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gparted-43333.patch --]
[-- Type: text/x-diff, Size: 4196 bytes --]

From cd2eb3d40bd8663b6431f06b23cfa5d5656a1fc3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Apr 2023 00:47:48 +0200
Subject: [PATCH] gparted: update to 1.5.0.

---
 .../gparted/patches/fix_musl_basename.patch   | 58 -------------------
 srcpkgs/gparted/template                      |  9 +--
 2 files changed, 3 insertions(+), 64 deletions(-)
 delete mode 100644 srcpkgs/gparted/patches/fix_musl_basename.patch

diff --git a/srcpkgs/gparted/patches/fix_musl_basename.patch b/srcpkgs/gparted/patches/fix_musl_basename.patch
deleted file mode 100644
index 607580d8177e..000000000000
--- a/srcpkgs/gparted/patches/fix_musl_basename.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 45c00927b72319f00855c7feaf4dcf109b3e4414 Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Fri, 8 Apr 2022 08:58:46 +0000
-Subject: [PATCH] Use POSIX basename() in BCache_Info.cc (!99)
-
-Musl libc [1][2] doesn't implement the GNU variant of basename() [3][4],
-obtained via #include <string.h>.  Therefore GParted fails to build on
-such distributions:
-
-   fdebug-prefix-map=TOPDIR/build/tmp/work/cortexa57-yoe-linux-musl/gparted/1.4.0-r0/recipe-sysroot-native=-fvisibility-inlines-hidden  -c -o ../../gparted-1.4.0/src/BCache_Info.cc:52:33:
-
-    error: use of undeclared identifier 'basename'; did you mean 'g_basename'?
-            return "/dev/" + Glib::ustring(basename(buf));
-                                           ^~~~~~~~
-                                           g_basename
-
-Fix by using the POSIX implementation of basename() [5] instead,
-obtained via #include <libgen.h>, which musl libc does implement [6].
-Note that the POSIX implementation of basename() is allowed to modify
-the string passed to it.  This is okay because
-BCache_Info::get_bcache_device() is using a modifiable local character
-buffer.
-
-[1] musl libc
-    https://musl.libc.org/
-[2] Projects using musl
-    https://wiki.musl-libc.org/projects-using-musl.html
-[3] The GNU C Library, 5.10 Finding Tokens in a String
-    https://www.gnu.org/software/libc/manual/html_node/Finding-Tokens-in-a-String.html
-[4] basename(3) - Linux manual page
-    https://man7.org/linux/man-pages/man3/basename.3.html
-[5] POSIX basename()
-    https://pubs.opengroup.org/onlinepubs/009695399/functions/basename.html
-[6] musl source, basename.c
-    http://git.musl-libc.org/cgit/musl/tree/src/misc/basename.c
-
-Closes !99 - Fix undeclared identifier 'basename' build failure with
-             musl libc
----
- src/BCache_Info.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/BCache_Info.cc b/src/BCache_Info.cc
-index 129a5178..aecc9ef1 100644
---- a/src/BCache_Info.cc
-+++ b/src/BCache_Info.cc
-@@ -17,7 +17,7 @@
- 
- #include "BCache_Info.h"
- 
--#include <string.h>  // GNU version of basename()
-+#include <libgen.h>  // POSIX version of basename()
- #include <unistd.h>
- #include <glibmm/ustring.h>
- #include <glibmm/fileutils.h>
--- 
-GitLab
-
diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template
index d671afacf5b0..dd1f0c465cee 100644
--- a/srcpkgs/gparted/template
+++ b/srcpkgs/gparted/template
@@ -1,6 +1,6 @@
 # Template file for 'gparted'
 pkgname=gparted
-version=1.4.0
+version=1.5.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-libparted-dmraid"
@@ -13,11 +13,8 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-or-later"
 homepage="https://gparted.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/gparted/gparted/gparted-${version}/gparted-${version}.tar.gz"
-checksum=e5293a792e53fdbeba29c4a834113cd9603d0d639330da931a468bf3687887be
-
-# Some tests are known to fail since 1.1.0
-# This disables these:
-export GTEST_FILTER='-PipeCaptureTest.ReadEmbeddedNULCharacter:PipeCaptureTest.ReadNULByteInMiddleOfMultiByteUTF8Character:BlockSpecialTest.NamedBlockSpecialObjectBlockDevice:BlockSpecialTest.TwoNamedBlockSpecialObjectBlockDevices:BlockSpecialTest.NamedBlockSpecialObjectBySymlinkMatches'
+checksum=3c95ea26a944083ff1d9b17639b1e2ad9758df225dc751ff407b2a6aa092a8de
+disable_parallel_check=true
 
 pre_configure() {
 	sed -i "s:@bindir@/gparted %f:@bindir@/gparted-pkexec %f:g" gparted.desktop.in.in

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Updated] gparted: update to 1.5.0.
  2023-04-07 23:06 [PR PATCH] gparted: update to 1.5.0 Johnnynator
@ 2023-04-07 23:36 ` Johnnynator
  2023-04-07 23:54 ` [PR PATCH] [Merged]: " Johnnynator
  1 sibling, 0 replies; 3+ messages in thread
From: Johnnynator @ 2023-04-07 23:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1246 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages gparted
https://github.com/void-linux/void-packages/pull/43333

gparted: update to 1.5.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/43333.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gparted-43333.patch --]
[-- Type: text/x-diff, Size: 4436 bytes --]

From 4c1c28489c942b1a003d104ac47583fca87b84bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Apr 2023 00:47:48 +0200
Subject: [PATCH] gparted: update to 1.5.0.

---
 .../gparted/patches/fix_musl_basename.patch   | 58 -------------------
 srcpkgs/gparted/template                      |  9 +--
 2 files changed, 5 insertions(+), 62 deletions(-)
 delete mode 100644 srcpkgs/gparted/patches/fix_musl_basename.patch

diff --git a/srcpkgs/gparted/patches/fix_musl_basename.patch b/srcpkgs/gparted/patches/fix_musl_basename.patch
deleted file mode 100644
index 607580d8177e..000000000000
--- a/srcpkgs/gparted/patches/fix_musl_basename.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 45c00927b72319f00855c7feaf4dcf109b3e4414 Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Fri, 8 Apr 2022 08:58:46 +0000
-Subject: [PATCH] Use POSIX basename() in BCache_Info.cc (!99)
-
-Musl libc [1][2] doesn't implement the GNU variant of basename() [3][4],
-obtained via #include <string.h>.  Therefore GParted fails to build on
-such distributions:
-
-   fdebug-prefix-map=TOPDIR/build/tmp/work/cortexa57-yoe-linux-musl/gparted/1.4.0-r0/recipe-sysroot-native=-fvisibility-inlines-hidden  -c -o ../../gparted-1.4.0/src/BCache_Info.cc:52:33:
-
-    error: use of undeclared identifier 'basename'; did you mean 'g_basename'?
-            return "/dev/" + Glib::ustring(basename(buf));
-                                           ^~~~~~~~
-                                           g_basename
-
-Fix by using the POSIX implementation of basename() [5] instead,
-obtained via #include <libgen.h>, which musl libc does implement [6].
-Note that the POSIX implementation of basename() is allowed to modify
-the string passed to it.  This is okay because
-BCache_Info::get_bcache_device() is using a modifiable local character
-buffer.
-
-[1] musl libc
-    https://musl.libc.org/
-[2] Projects using musl
-    https://wiki.musl-libc.org/projects-using-musl.html
-[3] The GNU C Library, 5.10 Finding Tokens in a String
-    https://www.gnu.org/software/libc/manual/html_node/Finding-Tokens-in-a-String.html
-[4] basename(3) - Linux manual page
-    https://man7.org/linux/man-pages/man3/basename.3.html
-[5] POSIX basename()
-    https://pubs.opengroup.org/onlinepubs/009695399/functions/basename.html
-[6] musl source, basename.c
-    http://git.musl-libc.org/cgit/musl/tree/src/misc/basename.c
-
-Closes !99 - Fix undeclared identifier 'basename' build failure with
-             musl libc
----
- src/BCache_Info.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/BCache_Info.cc b/src/BCache_Info.cc
-index 129a5178..aecc9ef1 100644
---- a/src/BCache_Info.cc
-+++ b/src/BCache_Info.cc
-@@ -17,7 +17,7 @@
- 
- #include "BCache_Info.h"
- 
--#include <string.h>  // GNU version of basename()
-+#include <libgen.h>  // POSIX version of basename()
- #include <unistd.h>
- #include <glibmm/ustring.h>
- #include <glibmm/fileutils.h>
--- 
-GitLab
-
diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template
index d671afacf5b0..9b42f25a0d00 100644
--- a/srcpkgs/gparted/template
+++ b/srcpkgs/gparted/template
@@ -1,6 +1,6 @@
 # Template file for 'gparted'
 pkgname=gparted
-version=1.4.0
+version=1.5.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-libparted-dmraid"
@@ -13,11 +13,12 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-or-later"
 homepage="https://gparted.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/gparted/gparted/gparted-${version}/gparted-${version}.tar.gz"
-checksum=e5293a792e53fdbeba29c4a834113cd9603d0d639330da931a468bf3687887be
+checksum=3c95ea26a944083ff1d9b17639b1e2ad9758df225dc751ff407b2a6aa092a8de
+disable_parallel_check=true
 
-# Some tests are known to fail since 1.1.0
+# Some tests are known to fail in CI since 1.1.0
 # This disables these:
-export GTEST_FILTER='-PipeCaptureTest.ReadEmbeddedNULCharacter:PipeCaptureTest.ReadNULByteInMiddleOfMultiByteUTF8Character:BlockSpecialTest.NamedBlockSpecialObjectBlockDevice:BlockSpecialTest.TwoNamedBlockSpecialObjectBlockDevices:BlockSpecialTest.NamedBlockSpecialObjectBySymlinkMatches'
+export GTEST_FILTER='-BlockSpecialTest.NamedBlockSpecialObjectBlockDevice:BlockSpecialTest.TwoNamedBlockSpecialObjectBlockDevices:BlockSpecialTest.NamedBlockSpecialObjectBySymlinkMatches'
 
 pre_configure() {
 	sed -i "s:@bindir@/gparted %f:@bindir@/gparted-pkexec %f:g" gparted.desktop.in.in

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Merged]: gparted: update to 1.5.0.
  2023-04-07 23:06 [PR PATCH] gparted: update to 1.5.0 Johnnynator
  2023-04-07 23:36 ` [PR PATCH] [Updated] " Johnnynator
@ 2023-04-07 23:54 ` Johnnynator
  1 sibling, 0 replies; 3+ messages in thread
From: Johnnynator @ 2023-04-07 23:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1082 bytes --]

There's a merged pull request on the void-packages repository

gparted: update to 1.5.0.
https://github.com/void-linux/void-packages/pull/43333

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2023-04-07 23:54 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-07 23:06 [PR PATCH] gparted: update to 1.5.0 Johnnynator
2023-04-07 23:36 ` [PR PATCH] [Updated] " Johnnynator
2023-04-07 23:54 ` [PR PATCH] [Merged]: " Johnnynator

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).