[PR PATCH] onboard: fix SyntaxWarning in install

[PR PATCH] onboard: fix SyntaxWarning in install

[0x5c]

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

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

https://github.com/0x5c/void-packages obboard-fix
https://github.com/void-linux/void-packages/pull/36398

onboard: fix SyntaxWarning in install
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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/36398.patch is attached

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

From df855f842ab8d29125d14b736163ba677de124ae Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Mon, 28 Mar 2022 19:24:43 -0400
Subject: [PATCH] onboard: fix SyntaxWarning in install

---
 srcpkgs/onboard/patches/fix-brokenformat.patch | 15 +++++++++++++++
 srcpkgs/onboard/template                       |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/onboard/patches/fix-brokenformat.patch

diff --git a/srcpkgs/onboard/patches/fix-brokenformat.patch b/srcpkgs/onboard/patches/fix-brokenformat.patch
new file mode 100644
index 000000000000..e5d200208a93
--- /dev/null
+++ b/srcpkgs/onboard/patches/fix-brokenformat.patch
@@ -0,0 +1,15 @@
+Fix for https://bugs.launchpad.net/onboard/+bug/1948723
+
+
+--
+--- a/Onboard/LayoutLoaderSVG.py
++++ b/Onboard/LayoutLoaderSVG.py
+@@ -445,7 +445,7 @@
+             except KeyError as ex:
+                 (strerror) = ex
+                 raise Exceptions.LayoutFileError("Unrecognized modifier %s in" \
+-                    "definition of %s" (strerror, full_id))
++                    "definition of %s" % (strerror, full_id))
+ 
+         value = attributes.get("action")
+         if value:
diff --git a/srcpkgs/onboard/template b/srcpkgs/onboard/template
index c147bf58a65c..8a3e7565ae50 100644
--- a/srcpkgs/onboard/template
+++ b/srcpkgs/onboard/template
@@ -1,7 +1,7 @@
 # Template file for 'onboard'
 pkgname=onboard
 version=1.4.1
-revision=9
+revision=10
 build_style=python3-module
 hostmakedepends="intltool pkg-config python3-distutils-extra"
 makedepends="dconf-devel eudev-libudev-devel gtk+3-devel hunspell-devel

Re: onboard: fix SyntaxWarning in install

[0x5c]

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

New comment by 0x5c on void-packages repository

https://github.com/void-linux/void-packages/pull/36398#issuecomment-1081253962

Comment:
oh fun, looks like I need to patch out distutils to make the tests work

Re: onboard: fix SyntaxWarning in install

[0x5c]

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

New comment by 0x5c on void-packages repository

https://github.com/void-linux/void-packages/pull/36398#issuecomment-1081253962

Comment:
oh fun, ~~looks like I need to patch out distutils to make the tests work~~
edit: will still patchout distutils, but the tests are failing because it's trying to run `killall`

Re: [PR PATCH] [Updated] onboard: fix SyntaxWarning in install

[0x5c]

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

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

https://github.com/0x5c/void-packages obboard-fix
https://github.com/void-linux/void-packages/pull/36398

onboard: fix SyntaxWarning in install
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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/36398.patch is attached

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

From 053b72f1b64e86bdbc5aa6d15fbf2491951fa402 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Tue, 29 Mar 2022 05:26:18 -0400
Subject: [PATCH] onboard: fix SyntaxWarnings and disable tests

- A missing % operator was breaking a c-style format string, causing a
    SyntaxWarning to be trown twice at package install time (during
    byte-compilation).
- The tests were failing since they try to run 'killall' before executing
    onboard in xautomation(7), both not being possible in xbps-src.
---
 srcpkgs/onboard/patches/fix-brokenformat.patch | 15 +++++++++++++++
 srcpkgs/onboard/template                       |  4 +++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/onboard/patches/fix-brokenformat.patch

diff --git a/srcpkgs/onboard/patches/fix-brokenformat.patch b/srcpkgs/onboard/patches/fix-brokenformat.patch
new file mode 100644
index 000000000000..e5d200208a93
--- /dev/null
+++ b/srcpkgs/onboard/patches/fix-brokenformat.patch
@@ -0,0 +1,15 @@
+Fix for https://bugs.launchpad.net/onboard/+bug/1948723
+
+
+--
+--- a/Onboard/LayoutLoaderSVG.py
++++ b/Onboard/LayoutLoaderSVG.py
+@@ -445,7 +445,7 @@
+             except KeyError as ex:
+                 (strerror) = ex
+                 raise Exceptions.LayoutFileError("Unrecognized modifier %s in" \
+-                    "definition of %s" (strerror, full_id))
++                    "definition of %s" % (strerror, full_id))
+ 
+         value = attributes.get("action")
+         if value:
diff --git a/srcpkgs/onboard/template b/srcpkgs/onboard/template
index c147bf58a65c..b138fae61897 100644
--- a/srcpkgs/onboard/template
+++ b/srcpkgs/onboard/template
@@ -1,7 +1,7 @@
 # Template file for 'onboard'
 pkgname=onboard
 version=1.4.1
-revision=9
+revision=10
 build_style=python3-module
 hostmakedepends="intltool pkg-config python3-distutils-extra"
 makedepends="dconf-devel eudev-libudev-devel gtk+3-devel hunspell-devel
@@ -14,3 +14,5 @@ license="GPL-3.0-or-later"
 homepage="https://launchpad.net/onboard"
 distfiles="https://launchpad.net/${pkgname}/${version%.*}/${version}/+download/${pkgname}-${version}.tar.gz"
 checksum=01cae1ac5b1ef1ab985bd2d2d79ded6fc99ee04b1535cc1bb191e43a231a3865
+# Tries to run onboard in tests, using xautomation(7)
+make_check=no

Re: onboard: fix SyntaxWarnings and disable tests

[0x5c]

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

New comment by 0x5c on void-packages repository

https://github.com/void-linux/void-packages/pull/36398#issuecomment-1081643763

Comment:
I ended up deciding against swapping out distutils since onboard uses semi-custom distutils extensions from `python-distutils-extra`

Re: onboard: fix SyntaxWarnings and disable tests

[0x5c]

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

New comment by 0x5c on void-packages repository

https://github.com/void-linux/void-packages/pull/36398#issuecomment-1081643763

Comment:
I ended up deciding against swapping out distutils since onboard uses semi-custom distutils extensions from `python-distutils-extra`, and I don't have the energy to address that with patches.

Re: [PR PATCH] [Merged]: onboard: fix SyntaxWarnings and disable tests

[the-maldridge]

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

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

onboard: fix SyntaxWarnings and disable tests
https://github.com/void-linux/void-packages/pull/36398

Description:
- A missing % operator was breaking a c-style format string, causing a
    SyntaxWarning to be trown twice at package install time (during
    byte-compilation).
- The tests were failing since they try to run 'killall' before executing
    onboard in xautomation(7), both not being possible in xbps-src.

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

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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
-->