Source: onboard
Version: 1.4.1-5
Followup-For: Bug #1057442
Tags: patch
Dear Maintainer,
I think it is okay to remove `-Wdeclaration-after-statement` option
which to support Arch linux build from code comment.
please notice here also, even if the issue is fixed, the package will be
build failed again when running tests:
```
...
dh_auto_test -O--buildsystem=pybuild
I: pybuild base:310: cd /<<PKGBUILDDIR>>/.pybuild/cpython3_3.12_onboard/build; python3.12 -m unittest discover -v
/<<PKGBUILDDIR>>/.pybuild/cpython3_3.12_onboard/build/Onboard/utils.py:151: SyntaxWarning: invalid escape sequence '\d'
"""
/<<PKGBUILDDIR>>/.pybuild/cpython3_3.12_onboard/build/Onboard/utils.py:220: SyntaxWarning: invalid escape sequence '\s'
pattern = re.compile('>\n\s+([^<>\s].*?)\n\s+</', re.DOTALL)
/<<PKGBUILDDIR>>/.pybuild/cpython3_3.12_onboard/build/Onboard/utils.py:221: SyntaxWarning: invalid escape sequence '\g'
pretty_xml = pattern.sub('>\g<1></', ugly_xml)
/<<PKGBUILDDIR>>/.pybuild/cpython3_3.12_onboard/build/Onboard/utils.py:356: SyntaxWarning: invalid escape sequence '\:'
"""
/<<PKGBUILDDIR>>/.pybuild/cpython3_3.12_onboard/build/Onboard/utils.py:1542: SyntaxWarning: invalid escape sequence '\w'
"""(?:
Onboard (unittest.loader._FailedTest.Onboard) ... ERROR
======================================================================
ERROR: Onboard (unittest.loader._FailedTest.Onboard)
----------------------------------------------------------------------
ImportError: Failed to import test module: Onboard
Traceback (most recent call last):
File "/usr/lib/python3.12/unittest/loader.py", line 427, in _find_test_path
package = self._get_module_from_name(name)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/usr/lib/python3.12/unittest/loader.py", line 337, in _get_module_from_name
__import__(name)
File "/<<PKGBUILDDIR>>/.pybuild/cpython3_3.12_onboard/build/Onboard/__init__.py", line 23, in <module>
from Onboard.utils import Translation
File "/<<PKGBUILDDIR>>/.pybuild/cpython3_3.12_onboard/build/Onboard/utils.py", line 933, in <module>
import cairo
File "/usr/lib/python3/dist-packages/cairo/__init__.py", line 1, in <module>
from ._cairo import * # noqa: F401,F403
^^^^^^^^^^^^^^^^^^^^^
ModuleNotFoundError: No module named 'cairo._cairo'
----------------------------------------------------------------------
Ran 1 test in 0.000s
FAILED (errors=1)
E: pybuild pybuild:395: test: plugin distutils failed with: exit code=1: cd /<<PKGBUILDDIR>>/.pybuild/cpython3_3.12_onboard/build; python3.12 -m unittest discover -v
I: pybuild base:310: cd /<<PKGBUILDDIR>>/.pybuild/cpython3_3.11_onboard/build; python3.11 -m unittest discover -v
----------------------------------------------------------------------
Ran 0 tests in 0.000s
OK
```
I do think this is one issue from python-cairo even depend on the
latest version[0]. But if look back its buildd log[1] these tests are
also not executed correctly. I am not sure how to deal with this and if
skip test explicit it willl be okay.
[0]: https://tracker.debian.org/news/1483436/accepted-pycairo-1251-1-source-into-unstable/
[1]: https://buildd.debian.org/status/fetch.php?pkg=onboard&arch=amd64&ver=1.4.1-5%2Bb8&stamp=1701806362&raw=0
--
Regards,
--
Bo YU
diff -Nru onboard-1.4.1/debian/changelog onboard-1.4.1/debian/changelog
--- onboard-1.4.1/debian/changelog 2020-01-09 18:26:40.000000000 +0800
+++ onboard-1.4.1/debian/changelog 2023-12-06 16:57:59.000000000 +0800
@@ -1,3 +1,11 @@
+onboard (1.4.1-5.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix ftbfs on python3.12. (Closes: #1057442)
+ * Add override_dh_auto_test to skip test explicit.
+
+ -- Bo YU <tsu.yubo@gmail.com> Wed, 06 Dec 2023 16:57:59 +0800
+
onboard (1.4.1-5) unstable; urgency=medium
[ Mike Gabriel ]
diff -Nru onboard-1.4.1/debian/patches/1004-fix-ftbfs-python3-12.patch onboard-1.4.1/debian/patches/1004-fix-ftbfs-python3-12.patch
--- onboard-1.4.1/debian/patches/1004-fix-ftbfs-python3-12.patch 1970-01-01 07:30:00.000000000 +0730
+++ onboard-1.4.1/debian/patches/1004-fix-ftbfs-python3-12.patch 2023-12-06 16:57:59.000000000 +0800
@@ -0,0 +1,17 @@
+Description: Drop Wdeclaration-after-statement
+ this is for Arch linux from upstream, so not need forward it
+Last-Update: 2023-12-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/setup.py
++++ b/setup.py
+@@ -229,8 +229,7 @@
+ define_macros = defines,
+ extra_compile_args = [
+ "-Wsign-compare",
+- "-Wdeclaration-after-statement",
+- "-Werror=declaration-after-statement"],
++ "-Wdeclaration-after-statement"],
+
+ **pkgconfig('gdk-3.0', 'x11', 'xi', 'xtst', 'xkbfile',
+ 'dconf', 'libcanberra', 'hunspell',
diff -Nru onboard-1.4.1/debian/patches/series onboard-1.4.1/debian/patches/series
--- onboard-1.4.1/debian/patches/series 2020-01-09 18:25:08.000000000 +0800
+++ onboard-1.4.1/debian/patches/series 2023-12-06 16:25:43.000000000 +0800
@@ -2,3 +2,4 @@
1002_build-against-Ayatana-AppIndicator.patch
0001-Replace-invalid-UTF-8-characters-in-ACPI-events.patch
1003_disable_onboard_on_gnome.patch
+1004-fix-ftbfs-python3-12.patch
diff -Nru onboard-1.4.1/debian/rules onboard-1.4.1/debian/rules
--- onboard-1.4.1/debian/rules 2020-01-09 18:26:40.000000000 +0800
+++ onboard-1.4.1/debian/rules 2023-12-06 16:42:10.000000000 +0800
@@ -15,6 +15,8 @@
rm -rf Onboard/osk*.so
rm -rf Onboard/pypredict/lm*.so
+override_dh_auto_test:
+
override_dh_install:
rm -f debian/tmp/usr/share/onboard/COPYING
rm -f debian/tmp/usr/share/onboard/COPYING.GPL3
Attachment:
signature.asc
Description: PGP signature