- openSUSE Commits

commit python-pytest-asyncio for openSUSE:Factory
by Source-Sync 06 Jan '25

06 Jan '25

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-pytest-asyncio for openSUSE:Factory checked in at 2025-01-06 16:05:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pytest-asyncio (Old) and /work/SRC/openSUSE:Factory/.python-pytest-asyncio.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-pytest-asyncio" Mon Jan 6 16:05:05 2025 rev:24 rq:1234718 version:0.25.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pytest-asyncio/python-pytest-asyncio.changes 2024-11-28 22:42:38.345683749 +0100 +++ /work/SRC/openSUSE:Factory/.python-pytest-asyncio.new.1881/python-pytest-asyncio.changes 2025-01-06 16:05:29.850460201 +0100 @@ -1,0 +2,25 @@ +Fri Jan 3 09:12:39 UTC 2025 - Johannes Kastl <opensuse_buildservice(a)ojkastl.de> + +- update to 0.25.1: + * Fixes an issue that caused a broken event loop when a + function-scoped test was executed in between two tests with + wider loop scope #950 + * Improves test collection speed in auto mode #1020 + * Corrects the warning that is emitted upon redefining the + event_loop fixture + +------------------------------------------------------------------- +Fri Jan 3 09:10:08 UTC 2025 - Johannes Kastl <opensuse_buildservice(a)ojkastl.de> + +- Update to 0.25.0: + * Deprecated: Added warning when asyncio test requests async + @pytest.fixture in strict mode. This will become an error in a + future version of flake8-asyncio. #979 + * Updates the error message about pytest.mark.asyncio's scope + keyword argument to say loop_scope instead. #1004 + * Verbose log displays correct parameter name: + asyncio_default_fixture_loop_scope #990 + * Propagates contextvars set in async fixtures to other fixtures + and tests on Python 3.11 and above. #1008 + +------------------------------------------------------------------- Old: ---- pytest-asyncio-0.24.0.tar.gz New: ---- pytest-asyncio-0.25.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pytest-asyncio.spec ++++++ --- /var/tmp/diff_new_pack.t1eEoZ/_old 2025-01-06 16:05:30.530488425 +0100 +++ /var/tmp/diff_new_pack.t1eEoZ/_new 2025-01-06 16:05:30.530488425 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-pytest-asyncio # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,7 +26,7 @@ %endif %{?sle15_python_module_pythons} Name: python-pytest-asyncio%{psuffix} -Version: 0.24.0 +Version: 0.25.1 Release: 0 Summary: Pytest support for asyncio License: Apache-2.0 ++++++ pytest-asyncio-0.24.0.tar.gz -> pytest-asyncio-0.25.1.tar.gz ++++++ ++++ 3136 lines of diff (skipped)

1 0

commit doxygen for openSUSE:Factory
by Source-Sync 06 Jan '25

06 Jan '25

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package doxygen for openSUSE:Factory checked in at 2025-01-06 16:05:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/doxygen (Old) and /work/SRC/openSUSE:Factory/.doxygen.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "doxygen" Mon Jan 6 16:05:03 2025 rev:103 rq:1234687 version:1.13.1 Changes: -------- --- /work/SRC/openSUSE:Factory/doxygen/doxygen.changes 2024-09-06 17:18:13.059075304 +0200 +++ /work/SRC/openSUSE:Factory/.doxygen.new.1881/doxygen.changes 2025-01-06 16:05:28.166390303 +0100 @@ -1,0 +2,30 @@ +Thu Jan 2 16:50:30 UTC 2025 - Christoph G <foss(a)grueninger.de> + +- update to Doxygen 1.13.1 + * As of doxygen version 1.13.1 and layout version 2.0, Doxygen + will insert defaults for elements that are missing in the user + defined layout file. + * Add WARN_LAYOUT_FILE option to toggle warnings in layout file + +------------------------------------------------------------------- +Sun Dec 29 21:23:11 UTC 2024 - Christoph G <foss(a)grueninger.de> + +- update to Doxygen 1.13.0 + * Using README.md as directory description via new option + IMPLICIT_DIR_DOCS. + * Add CSS class for @p command [view] + * Add class attribute to the @qualifier command in the HTML output + * New option HIDE_UNDOC_NAMESPACES which can be used to hide + undocumented namespaces (similar to HIDE_UNDOC_CLASSES) + * New option PLANTUMLFILE_DIRS and command \plantumlfile to + include plantuml files (similar to DOT_DIRS, and \dotfile) + * New option AUTOLINK_IGNORE_WORDS to specific a set of words + that should not be linked + * Update available emojis + * Added strip and nostrip options to \include and \snippet to + either strip or keep doxygen comments + * Added helper script to live edit & view a doxygen comment + block, see addon/doxycommentviewer in the repo + * Extending autobrief end characters with ? and ! + +------------------------------------------------------------------- Old: ---- doxygen-1.12.0.src.tar.gz New: ---- doxygen-1.13.1.src.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ doxygen.spec ++++++ --- /var/tmp/diff_new_pack.JJRuKz/_old 2025-01-06 16:05:29.078428157 +0100 +++ /var/tmp/diff_new_pack.JJRuKz/_new 2025-01-06 16:05:29.078428157 +0100 @@ -1,7 +1,7 @@ # # spec file for package doxygen # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ %endif Name: doxygen -Version: 1.12.0 +Version: 1.13.1 Release: 0 Summary: Automated C, C++, and Java Documentation Generator # qtools are used for building and they are GPL-3.0 licensed ++++++ doxywizard.spec ++++++ --- /var/tmp/diff_new_pack.JJRuKz/_old 2025-01-06 16:05:29.102429154 +0100 +++ /var/tmp/diff_new_pack.JJRuKz/_new 2025-01-06 16:05:29.102429154 +0100 @@ -1,7 +1,7 @@ # # spec file for package doxywizard # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: doxywizard -Version: 1.12.0 +Version: 1.13.1 Release: 0 Summary: Graphical User Interface for Doxygen # qtools are used for building and they are GPL-3.0 licensed ++++++ doxygen-1.12.0.src.tar.gz -> doxygen-1.13.1.src.tar.gz ++++++ /work/SRC/openSUSE:Factory/doxygen/doxygen-1.12.0.src.tar.gz /work/SRC/openSUSE:Factory/.doxygen.new.1881/doxygen-1.13.1.src.tar.gz differ: char 5, line 1

1 0

commit iputils for openSUSE:Factory
by Source-Sync 06 Jan '25

06 Jan '25

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package iputils for openSUSE:Factory checked in at 2025-01-06 16:05:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/iputils (Old) and /work/SRC/openSUSE:Factory/.iputils.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "iputils" Mon Jan 6 16:05:00 2025 rev:71 rq:1234611 version:20240905 Changes: -------- --- /work/SRC/openSUSE:Factory/iputils/iputils.changes 2024-09-06 17:18:14.331128157 +0200 +++ /work/SRC/openSUSE:Factory/.iputils.new.1881/iputils.changes 2025-01-06 16:05:19.062012422 +0100 @@ -1,0 +2,6 @@ +Thu Jan 2 17:33:13 UTC 2025 - Petr Vorel <pvorel(a)suse.cz> + +- Backport ping man page fix + 0001-Fix-ping-man-page-syntax-error.patch + +------------------------------------------------------------------- New: ---- 0001-Fix-ping-man-page-syntax-error.patch BETA DEBUG BEGIN: New:- Backport ping man page fix 0001-Fix-ping-man-page-syntax-error.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iputils.spec ++++++ --- /var/tmp/diff_new_pack.1ccJt8/_old 2025-01-06 16:05:19.834044465 +0100 +++ /var/tmp/diff_new_pack.1ccJt8/_new 2025-01-06 16:05:19.838044632 +0100 @@ -1,7 +1,7 @@ # # spec file for package iputils # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,7 @@ Group: Productivity/Networking/Other URL: https://github.com/iputils/iputils Source0: https://github.com/iputils/iputils/releases/download/%{version}/iputils-%{v… +Patch0: 0001-Fix-ping-man-page-syntax-error.patch BuildRequires: docbook5-xsl-stylesheets BuildRequires: docbook_5 BuildRequires: iproute2 ++++++ 0001-Fix-ping-man-page-syntax-error.patch ++++++ From e8c9d6d7aebd16b0617f00d128cbcd24c9a1094d Mon Sep 17 00:00:00 2001 From: Nicolai Dagestad <nicolai(a)dagestad.fr> Date: Mon, 18 Nov 2024 16:27:36 +0100 Subject: [PATCH] Fix ping man page syntax error Missing <para> tag caused broken formating (markup '.SH "EXIT STATUS"' was displayed as text). Also convert space to tabs (consistency). Fixes: 6fc68b1 ("ping: Allow to disable with environment variable") Closes: https://github.com/iputils/iputils/pull/568 Reviewed-by: Petr Vorel <pvorel(a)suse.cz> Signed-off-by: Nicolai Dagestad <nicolai(a)dagestad.fr> [ pvorel: commit message ] Signed-off-by: Petr Vorel <pvorel(a)suse.cz> [ Upstream status: https://github.com/iputils/iputils/commit/e8c9d6d7aebd16b0617f00d128cbcd24c… ] --- doc/ping.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/ping.xml b/doc/ping.xml index 3efa07c..b1ad335 100644 --- a/doc/ping.xml +++ b/doc/ping.xml @@ -790,9 +790,9 @@ xml:id="man.ping"> <info> <title>ENVIRONMENT</title> </info> - <emphasis remap="I">IPUTILS_PING_PTR_LOOKUP</emphasis> environment - variable set to 0 disable reverse DNS resolution (PTR lookup) by default. - It will be overrided by <option>-H</option> or <option>-n</option> option. + <para><emphasis remap="I">IPUTILS_PING_PTR_LOOKUP</emphasis> environment + variable set to 0 disable reverse DNS resolution (PTR lookup) by default. + It will be overrided by <option>-H</option> or <option>-n</option> option.</para> </refsection> <refsection xml:id="exit_status"> -- 2.47.1

1 0

commit python-attrs for openSUSE:Factory
by Source-Sync 06 Jan '25

06 Jan '25

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-attrs for openSUSE:Factory checked in at 2025-01-06 16:04:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-attrs (Old) and /work/SRC/openSUSE:Factory/.python-attrs.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-attrs" Mon Jan 6 16:04:53 2025 rev:26 rq:1234568 version:24.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-attrs/python-attrs.changes 2024-11-07 16:23:49.664764280 +0100 +++ /work/SRC/openSUSE:Factory/.python-attrs.new.1881/python-attrs.changes 2025-01-06 16:05:07.657539793 +0100 @@ -1,0 +2,17 @@ +Thu Jan 2 14:12:53 UTC 2025 - Dirk Müller <dmueller(a)suse.com> + +- update to 24.3.0: + * Python 3.7 has been dropped. + * Introduce `attrs.NothingType`, for annotating types + consistent with `attrs.NOTHING`. + * Allow mutating `__suppress_context__` and `__notes__` on + frozen exceptions. + * `attrs.converters.optional()` works again when taking + `attrs.converters.pipe()` or another Converter as its + argument. + * *attrs* instances now support `copy.replace()`. + * `attrs.validators.instance_of()`'s type hints now allow for + union types. + * For example: `instance_of(str | int)` + +------------------------------------------------------------------- Old: ---- attrs-24.2.0.tar.gz New: ---- attrs-24.3.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-attrs.spec ++++++ --- /var/tmp/diff_new_pack.YfI56T/_old 2025-01-06 16:05:08.393570175 +0100 +++ /var/tmp/diff_new_pack.YfI56T/_new 2025-01-06 16:05:08.397570340 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-attrs # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,13 +26,14 @@ %endif %{?sle15_python_module_pythons} Name: python-attrs%{psuffix} -Version: 24.2.0 +Version: 24.3.0 Release: 0 Summary: Attributes without boilerplate License: MIT Group: Development/Languages/Python URL: https://github.com/hynek/attrs/ Source: https://files.pythonhosted.org/packages/source/a/attrs/attrs-%{version}.tar… +BuildRequires: %{python_module base >= 3.8} BuildRequires: %{python_module hatch-fancy-pypi-readme} BuildRequires: %{python_module hatch-vcs} BuildRequires: %{python_module hatchling} ++++++ attrs-24.2.0.tar.gz -> attrs-24.3.0.tar.gz ++++++ ++++ 2827 lines of diff (skipped)

1 0

commit sof-firmware for openSUSE:Factory
by Source-Sync 06 Jan '25

06 Jan '25

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sof-firmware for openSUSE:Factory checked in at 2025-01-06 16:04:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sof-firmware (Old) and /work/SRC/openSUSE:Factory/.sof-firmware.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sof-firmware" Mon Jan 6 16:04:51 2025 rev:34 rq:1234538 version:2024.09.2 Changes: -------- --- /work/SRC/openSUSE:Factory/sof-firmware/sof-firmware.changes 2024-11-13 15:27:38.975679162 +0100 +++ /work/SRC/openSUSE:Factory/.sof-firmware.new.1881/sof-firmware.changes 2025-01-06 16:05:05.801463180 +0100 @@ -1,0 +2,6 @@ +Thu Jan 2 10:42:13 UTC 2025 - Takashi Iwai <tiwai(a)suse.com> + +- update to v2024.09.02: (jsc#PED-9993 jsc#PED-10202) + * Updated DSP topology files for SOF2.11.3 + +------------------------------------------------------------------- @@ -4 +10 @@ -- update to v2024.09.1: +- update to v2024.09.1: (jsc#PED-9993 jsc#PED-10202) @@ -13 +19 @@ -- update to v2024.09: +- update to v2024.09: (jsc#PED-9993 jsc#PED-10202) @@ -21 +27 @@ -- update to 2024.06: +- update to 2024.06: (bsc#1230236) Old: ---- sof-bin-2024.09.1.tar.gz New: ---- sof-bin-2024.09.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sof-firmware.spec ++++++ --- /var/tmp/diff_new_pack.gZhdXY/_old 2025-01-06 16:05:06.753502477 +0100 +++ /var/tmp/diff_new_pack.gZhdXY/_new 2025-01-06 16:05:06.757502643 +0100 @@ -1,7 +1,7 @@ # # spec file for package sof-firmware # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ Summary: Firmware data files for SOF Drivers License: BSD-3-Clause Group: Hardware/Other -Version: 2024.09.1 +Version: 2024.09.2 Release: 0 URL: https://www.sofproject.org/ BuildRequires: fdupes ++++++ sof-bin-2024.09.1.tar.gz -> sof-bin-2024.09.2.tar.gz ++++++ /work/SRC/openSUSE:Factory/sof-firmware/sof-bin-2024.09.1.tar.gz /work/SRC/openSUSE:Factory/.sof-firmware.new.1881/sof-bin-2024.09.2.tar.gz differ: char 39, line 1

1 0

commit glslang for openSUSE:Factory
by Source-Sync 06 Jan '25

06 Jan '25

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package glslang for openSUSE:Factory checked in at 2025-01-06 16:04:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glslang (Old) and /work/SRC/openSUSE:Factory/.glslang.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "glslang" Mon Jan 6 16:04:49 2025 rev:55 rq:1234527 version:15.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/glslang/glslang.changes 2024-12-18 20:08:44.981794720 +0100 +++ /work/SRC/openSUSE:Factory/.glslang.new.1881/glslang.changes 2025-01-06 16:05:02.037307806 +0100 @@ -1,0 +2,7 @@ +Thu Jan 2 08:54:06 UTC 2025 - Ralf Habacker <ralf.habacker(a)freenet.de> + +- Fix building vsgXChange and other packages by adding the + missing runtime dependency to the development package + for SPIRV-Tools-opt + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glslang.spec ++++++ --- /var/tmp/diff_new_pack.yoypAi/_old 2025-01-06 16:05:02.673334059 +0100 +++ /var/tmp/diff_new_pack.yoypAi/_new 2025-01-06 16:05:02.673334059 +0100 @@ -55,6 +55,7 @@ %package devel Summary: OpenGL and OpenGL ES shader front end and validator Group: Development/Libraries/C and C++ +Requires: cmake(SPIRV-Tools-opt) Requires: %lname = %version %description devel ++++++ _scmsync.obsinfo ++++++ --- /var/tmp/diff_new_pack.yoypAi/_old 2025-01-06 16:05:02.705335380 +0100 +++ /var/tmp/diff_new_pack.yoypAi/_new 2025-01-06 16:05:02.709335545 +0100 @@ -1,5 +1,5 @@ -mtime: 1734378911 -commit: 00d092be3e4a07aa8ded4e33004ad55e30ba4c2e6ea165be3626c97b0fbe6d08 +mtime: 1735808627 +commit: e310b3d9d4e725681112f622f1a812f46473cd52eb90b98061fb72c294474474 url: https://src.opensuse.org/jengelh/glslang revision: master ++++++ build.specials.obscpio ++++++ diff: old/*: No such file or directory diff: new/*: No such file or directory

1 0

commit xinit for openSUSE:Factory
by Source-Sync 06 Jan '25

06 Jan '25

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xinit for openSUSE:Factory checked in at 2025-01-06 16:04:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xinit (Old) and /work/SRC/openSUSE:Factory/.xinit.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xinit" Mon Jan 6 16:04:41 2025 rev:32 rq:1235079 version:1.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/xinit/xinit.changes 2024-07-05 19:49:36.722915251 +0200 +++ /work/SRC/openSUSE:Factory/.xinit.new.1881/xinit.changes 2025-01-06 16:04:53.804967997 +0100 @@ -1,0 +2,25 @@ +Sun Jan 5 21:33:42 UTC 2025 - Stefan Dirsch <sndirsch(a)suse.com> + +- Update to version 1.4.3 + * Reindent startx after !6 + * Remove Xdmx from suggested Xserver list + * Mark global variables as static since there's only one source file + * Clear -Wunused-parameter warnings from clang + * Use ptrdiff_t to store results of pointer subtraction + * Use asprintf() if available + * Don't exit with failure on SIGTERM regardless. + * darwin: Remove bashism from 10-tmpdirs script + * Modernized shell scripts + * startx: Assign XSERVERRC to correct userserverrc + * add closing quote to /dev/random mcookie hex +- adjusted xinit-suse.patch +- refreshed xinit-client-session.patch +- refreshed xinit-tolerant-hostname-changes.patch + +------------------------------------------------------------------- +Mon Dec 23 16:55:44 UTC 2024 - Dominique Leuenberger <dimstar(a)opensuse.org> + +- Properly comment %patch 5 out: '#' still expands the macro, which + makes build fail with rpm 4.20. Use %dnl instead. + +------------------------------------------------------------------- Old: ---- xinit-1.4.2.tar.xz New: ---- xinit-1.4.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xinit.spec ++++++ --- /var/tmp/diff_new_pack.dfAxEk/_old 2025-01-06 16:04:54.512997222 +0100 +++ /var/tmp/diff_new_pack.dfAxEk/_new 2025-01-06 16:04:54.512997222 +0100 @@ -1,7 +1,7 @@ # # spec file for package xinit # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ %define UsrEtcMove 1 %endif Name: xinit -Version: 1.4.2 +Version: 1.4.3 Release: 0 Summary: X Window System initializer License: MIT @@ -72,7 +72,7 @@ %patch -P 2 -p1 %patch -P 3 -p1 ### patch is applied later in %install section -#%patch -P 5 -p0 +%dnl %patch -P 5 -p0 # needed for patch0 autoreconf -fi ++++++ xinit-1.4.2.tar.xz -> xinit-1.4.3.tar.xz ++++++ ++++ 8087 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.4.2/ChangeLog new/xinit-1.4.3/ChangeLog --- old/xinit-1.4.2/ChangeLog 2022-12-03 23:18:52.000000000 +0100 +++ new/xinit-1.4.3/ChangeLog 2025-01-05 19:26:09.000000000 +0100 @@ -1,3 +1,161 @@ +commit 79d1a902f93fe75e31c0bfb95e949293e6213992 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sun Jan 5 10:20:39 2025 -0800 + + xinit 1.4.3 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 6ad6378928dd1eec2a3e159f92b53b68ce3884ba +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Dec 7 10:27:28 2024 -0800 + + Use asprintf() if available + + If we can use it, then we avoid a couple of clang warnings: + xinit.c:534:20: warning: implicit conversion changes signedness: + 'int' to 'size_t' (aka 'unsigned long') [-Wsign-conversion] + len = numn + 1; + ~ ~~~~~^~~ + xinit.c:540:40: warning: implicit conversion changes signedness: + 'int' to 'unsigned long' [-Wsign-conversion] + len = strlen(windowpath) + 1 + numn + 1; + ~ ^~~~ + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xinit/-/merge_requests/20> + +commit 0420d0b58b34217e496caa7dfa904bd833c00133 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Dec 7 10:03:33 2024 -0800 + + Use ptrdiff_t to store results of pointer subtraction + + Clears warnings from clang of: + xinit.c:174:34: warning: implicit conversion loses integer precision: + 'long' to 'int' [-Wshorten-64-to-32] + start_of_client_args = (cptr - client); + ~ ~~~~~^~~~~~~~ + xinit.c:203:34: warning: implicit conversion loses integer precision: + 'long' to 'int' [-Wshorten-64-to-32] + start_of_server_args = (sptr - server); + ~ ~~~~~^~~~~~~~ + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xinit/-/merge_requests/20> + +commit 35de4b9d29a78e0f95539c0540b8b173cae71766 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Dec 7 09:55:49 2024 -0800 + + Clear -Wunused-parameter warnings from clang + + Add _X_UNUSED to parameters required by callback definitions which we + don't acutally use. + + Clears clang warnings of: + + xinit.c:129:15: warning: unused parameter 'sig' [-Wunused-parameter] + sigIgnore(int sig) + ^ + xinit.c:581:20: warning: unused parameter 'dpy' [-Wunused-parameter] + ignorexio(Display *dpy) + ^ + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xinit/-/merge_requests/20> + +commit 8a9c76dd35d5f824669ea2c7268cd7b4684c8687 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Dec 7 09:50:10 2024 -0800 + + Mark global variables as static since there's only one source file + + Clears 8 warnings from clang of the form: + + xinit.c:61:13: warning: no previous extern declaration for non-static + variable 'bindir' [-Wmissing-variable-declarations] + const char *bindir = BINDIR; + ^ + xinit.c:61:7: note: declare 'static' if the variable is not intended + to be used outside of this translation unit + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xinit/-/merge_requests/20> + +commit 2f62c78b5714c95d03c0b1271b9b83b550af50b3 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Tue Aug 27 16:45:36 2024 -0700 + + Remove Xdmx from suggested Xserver list + + It's not included in the xorg-server-21.x releases. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xinit/-/merge_requests/19> + +commit 8252e334c5cc381d5a32bc4d3d47bae1bfc94fe0 +Author: jopamo <p(a)1g4.org> +Date: Tue Jun 25 20:06:53 2024 -0400 + + add closing quote to /dev/random mcookie hex + + Fixes: b8517b6 ("Modernized shell scripts") + Part-of: <https://gitlab.freedesktop.org/xorg/app/xinit/-/merge_requests/18> + +commit 671da781805728fdea68efa5609906f6e0d0a3fe +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sun Jun 16 11:52:00 2024 -0700 + + Reindent startx after !6 + + Converting cpp-level ifdefs to shell-level ifs left confusing indentation + levels, this fixes that. + + Fixes: b8517b6 ("Modernized shell scripts") + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xinit/-/merge_requests/17> + +commit b8517b646839969548e5c1f1ac0045f0254da774 +Author: Marc Pervaz Boocha <mboocha(a)sudomsg.xyz> +Date: Wed Nov 17 22:43:35 2021 +0530 + + Modernized shell scripts + + Fixes #14 + Makes Progress to #15 + + Signed-off-by: Marc Pervaz Boocha <mboocha(a)sudomsg.xyz> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xinit/-/merge_requests/6> + +commit 354d1386d18631630447f47e6f2fd7f93e55feab +Author: Geert Hendrickx <geert(a)hendrickx.be> +Date: Sun Jun 16 18:17:21 2024 +0000 + + Don't exit with failure on SIGTERM regardless. + +commit 0fb9f76d3f0205298b0d98c5b0a9a09c4e418388 +Author: ayekat <takeya(a)bluewin.ch> +Date: Thu Jan 12 22:06:50 2023 +0100 + + startx: Assign XSERVERRC to correct userserverrc + + Also fix same mistake in the startx manpage. + + Signed-off-by: ayekat <takeya(a)bluewin.ch> + +commit 3172dc7e15b7a249555ca12e24f4a787164a7f8a +Author: Jeremy Huddleston Sequoia <jeremyhu(a)apple.com> +Date: Wed Jan 11 21:33:11 2023 -0800 + + darwin: Remove bashism from 10-tmpdirs script + + possible bashism in 10-tmpdirs line 57 (should be >word 2>&1): + if ${MKTEMP} -d ${dir} >& /dev/null ; then + + Fixes: https://github.com/XQuartz/XQuartz/issues/316 + Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu(a)apple.com> + commit f9786fb5a7e526035699f3d4d6661468ab20e689 Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> Date: Sat Dec 3 14:05:44 2022 -0800 @@ -1471,7 +1629,7 @@ when the structure of the component changes. Do not edit defaults. commit d243b9943879ec2790d65785805aefdfbb64a378 -Author: Rémi Cardona <remi(a)gentoo.org> +Author: Rémi Cardona <remi(a)gentoo.org> Date: Sat Nov 14 14:51:59 2009 +0100 xinit 1.2.0 @@ -1517,7 +1675,7 @@ Tested-by: Jon TURNEY <jon.turney(a)dronecode.org.uk> commit c2a5751175b11d3206805468aae1ddecd02c4a98 -Author: Rémi Cardona <remi(a)gentoo.org> +Author: Rémi Cardona <remi(a)gentoo.org> Date: Sat Oct 3 11:50:12 2009 +0200 make XINITDIR configurable at build-time, default is unchanged @@ -2501,7 +2659,7 @@ correctly commit d731a249d0c1c7f9eb77828c0d6e79cfdaf75589 -Author: Søren Sandmann Pedersen <sandmann(a)daimi.au.dk> +Author: Søren Sandmann Pedersen <sandmann(a)daimi.au.dk> Date: Tue Jul 5 21:12:01 2005 +0000 Build system for xinit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.4.2/compile new/xinit-1.4.3/compile --- old/xinit-1.4.2/compile 2022-12-03 23:18:47.000000000 +0100 +++ new/xinit-1.4.3/compile 2025-01-05 19:26:02.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2021 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # Written by Tom Tromey <tromey(a)cygnus.com>. # # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.4.2/config.h.in new/xinit-1.4.3/config.h.in --- old/xinit-1.4.2/config.h.in 2022-12-03 23:18:46.000000000 +0100 +++ new/xinit-1.4.3/config.h.in 2025-01-05 19:26:01.000000000 +0100 @@ -3,9 +3,15 @@ /* Prefix to use for launchd identifiers */ #undef BUNDLE_ID_PREFIX +/* Define to 1 if you have the `asprintf' function. */ +#undef HAVE_ASPRINTF + /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H +/* Define to 1 if you have the <minix/config.h> header file. */ +#undef HAVE_MINIX_CONFIG_H + /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H @@ -30,6 +36,9 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the <wchar.h> header file. */ +#undef HAVE_WCHAR_H + /* Name of package */ #undef PACKAGE @@ -65,5 +74,93 @@ backward compatibility; new code need not use it. */ #undef STDC_HEADERS +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# undef _DARWIN_C_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# undef _HPUX_ALT_XOPEN_SOCKET_API +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +# undef _MINIX +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# undef _NETBSD_SOURCE +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# undef _OPENBSD_SOURCE +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +# undef _POSIX_SOURCE +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +# undef _POSIX_1_SOURCE +#endif +/* Enable POSIX-compatible threading on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# undef __STDC_WANT_IEC_60559_BFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# undef __STDC_WANT_IEC_60559_DFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# undef __STDC_WANT_IEC_60559_TYPES_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# undef __STDC_WANT_LIB_EXT2__ +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# undef __STDC_WANT_MATH_SPEC_FUNCS__ +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +# undef _XOPEN_SOURCE +#endif + + /* Version number of package */ #undef VERSION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.4.2/configure.ac new/xinit-1.4.3/configure.ac --- old/xinit-1.4.2/configure.ac 2022-12-03 23:18:43.000000000 +0100 +++ new/xinit-1.4.3/configure.ac 2025-01-05 19:25:56.000000000 +0100 @@ -22,10 +22,11 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xinit], [1.4.2], +AC_INIT([xinit], [1.4.3], [https://gitlab.freedesktop.org/xorg/app/xinit/-/issues] [xinit]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) +AC_USE_SYSTEM_EXTENSIONS # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-xz]) @@ -125,8 +126,11 @@ AM_CONDITIONAL(LAUNCHD, [test "x$LAUNCHD" = "xyes"]) AM_CONDITIONAL(LAUNCHAGENT_XSERVER, [test "x$launchagentxserver" != "xno"]) +# Checks for library functions. +AC_CHECK_FUNCS([asprintf]) + # Checks for pkg-config packages -PKG_CHECK_MODULES(XINIT, x11 xproto >= 7.0.17) +PKG_CHECK_MODULES(XINIT, x11 xproto >= 7.0.22) case $host_os in *bsd*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.4.2/launchd/privileged_startx/10-tmpdirs.cpp new/xinit-1.4.3/launchd/privileged_startx/10-tmpdirs.cpp --- old/xinit-1.4.2/launchd/privileged_startx/10-tmpdirs.cpp 2022-12-03 23:18:43.000000000 +0100 +++ new/xinit-1.4.3/launchd/privileged_startx/10-tmpdirs.cpp 2025-01-05 19:25:56.000000000 +0100 @@ -54,7 +54,7 @@ # Use mktemp rather than mkdir to avoid possible security issue # if $dir exists and is a symlink (ie protect against a race # against the above check) - if ${MKTEMP} -d ${dir} >& /dev/null ; then + if ${MKTEMP} -d ${dir} > /dev/null 2>&1 ; then chmod 1777 $dir chown root:wheel $dir success=1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.4.2/man/startx.man new/xinit-1.4.3/man/startx.man --- old/xinit-1.4.2/man/startx.man 2022-12-03 23:18:43.000000000 +0100 +++ new/xinit-1.4.3/man/startx.man 2025-01-05 19:25:56.000000000 +0100 @@ -177,7 +177,7 @@ .TP 25 XSERVERRC This variable should contain the location of an xserver file. If unset, -.I $(HOME)/.xinitrc +.I $(HOME)/.xserverrc or .I __xinitdir__/xserverrc will be used. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.4.2/missing new/xinit-1.4.3/missing --- old/xinit-1.4.2/missing 2022-12-03 23:18:47.000000000 +0100 +++ new/xinit-1.4.3/missing 2025-01-05 19:26:02.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2021 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.4.2/startx.cpp new/xinit-1.4.3/startx.cpp --- old/xinit-1.4.2/startx.cpp 2022-12-03 23:18:43.000000000 +0100 +++ new/xinit-1.4.3/startx.cpp 2025-01-05 19:25:56.000000000 +0100 @@ -12,50 +12,58 @@ XCOMM Site administrators are STRONGLY urged to write nicer versions. XCOMM +xinitdir=XINITDIR +xterm=XTERM +xserver=XSERVER +xinit=XINIT +bundle_id_prefix=BUNDLE_ID_PREFIX +xauth=XAUTH +bindir=__bindir__ +libexecdir=__libexecdir__ +mk_cookie=MK_COOKIE +has_cookie_maker=HAS_COOKIE_MAKER + unset SESSION_MANAGER -#ifdef __APPLE__ +if [ "$(uname -s)" = "Darwin" ] ; then -XCOMM Check for /usr/bin/X11 and BINDIR in the path, if not add them. -XCOMM This allows startx to be placed in a place like /usr/bin or /usr/local/bin -XCOMM and people may use X without changing their PATH. -XCOMM Note that we put our own bin directory at the front of the path, and -XCOMM the standard system path at the back, since if you are using the Xorg -XCOMM server there's a pretty good chance you want to bias the Xorg clients -XCOMM over the old system's clients. + XCOMM Check for /usr/bin/X11 and BINDIR in the path, if not add them. + XCOMM This allows startx to be placed in a place like /usr/bin or /usr/local/bin + XCOMM and people may use X without changing their PATH. + XCOMM Note that we put our own bin directory at the front of the path, and + XCOMM the standard system path at the back, since if you are using the Xorg + XCOMM server there's a pretty good chance you want to bias the Xorg clients + XCOMM over the old system's clients. -XCOMM First our compiled path -bindir=__bindir__ + case $PATH in + *:$bindir | *:$bindir:* | $bindir:*) ;; + *) PATH=$bindir:$PATH ;; + esac -case $PATH in - *:$bindir | *:$bindir:* | $bindir:*) ;; - *) PATH=$bindir:$PATH ;; -esac + XCOMM Now the "old" compiled path + oldbindir=/usr/X11R6/bin -XCOMM Now the "old" compiled path -oldbindir=/usr/X11R6/bin + if [ -d "$oldbindir" ] ; then + case $PATH in + *:$oldbindir | *:$oldbindir:* | $oldbindir:*) ;; + *) PATH=$PATH:$oldbindir ;; + esac + fi -if [ -d "$oldbindir" ] ; then - case $PATH in - *:$oldbindir | *:$oldbindir:* | $oldbindir:*) ;; - *) PATH=$PATH:$oldbindir ;; - esac + XCOMM Bourne shell does not automatically export modified environment variables + XCOMM so export the new PATH just in case the user changes the shell + export PATH fi -XCOMM Bourne shell does not automatically export modified environment variables -XCOMM so export the new PATH just in case the user changes the shell -export PATH -#endif - userclientrc=$HOME/.xinitrc [ -f "${XINITRC}" ] && userclientrc="${XINITRC}" sysclientrc=XINITDIR/xinitrc userserverrc=$HOME/.xserverrc -[ -f "${XSERVERRC}" ] && userclientrc="${XSERVERRC}" -sysserverrc=XINITDIR/xserverrc -defaultclient=XTERM -defaultserver=XSERVER +[ -f "${XSERVERRC}" ] && userserverrc="${XSERVERRC}" +sysserverrc=$xinitdir/xserverrc +defaultclient=$xterm +defaultserver=$xserver defaultclientargs="" defaultserverargs="" defaultdisplay="" @@ -63,73 +71,74 @@ serverargs="" vtarg="" -#ifdef __APPLE__ -if [ "x$X11_PREFS_DOMAIN" = x ] ; then - export X11_PREFS_DOMAIN=BUNDLE_ID_PREFIX".X11" -fi +if [ "$(uname -s)" = "Darwin" ] ; then -XCOMM Initialize defaults (this will cut down on "safe" error messages) -if ! defaults read $X11_PREFS_DOMAIN cache_fonts > /dev/null 2>&1 ; then - defaults write $X11_PREFS_DOMAIN cache_fonts -bool true -fi + if [ "$X11_PREFS_DOMAIN" = "" ] ; then + export X11_PREFS_DOMAIN=$bundle_id_prefix".X11" + fi -if ! defaults read $X11_PREFS_DOMAIN no_auth > /dev/null 2>&1 ; then - defaults write $X11_PREFS_DOMAIN no_auth -bool false -fi + XCOMM Initialize defaults (this will cut down on "safe" error messages) + if ! defaults read $X11_PREFS_DOMAIN cache_fonts > /dev/null 2>&1 ; then + defaults write $X11_PREFS_DOMAIN cache_fonts -bool true + fi -if ! defaults read $X11_PREFS_DOMAIN nolisten_tcp > /dev/null 2>&1 ; then - defaults write $X11_PREFS_DOMAIN nolisten_tcp -bool true -fi + if ! defaults read $X11_PREFS_DOMAIN no_auth > /dev/null 2>&1 ; then + defaults write $X11_PREFS_DOMAIN no_auth -bool false + fi -if ! defaults read $X11_PREFS_DOMAIN enable_iglx > /dev/null 2>&1 ; then - defaults write $X11_PREFS_DOMAIN enable_iglx -bool false -fi + if ! defaults read $X11_PREFS_DOMAIN nolisten_tcp > /dev/null 2>&1 ; then + defaults write $X11_PREFS_DOMAIN nolisten_tcp -bool true + fi -XCOMM First, start caching fonts -if [ x`defaults read $X11_PREFS_DOMAIN cache_fonts` = x1 ] ; then - if [ -x $bindir/font_cache ] ; then - $bindir/font_cache - elif [ -x $bindir/font_cache.sh ] ; then - $bindir/font_cache.sh - elif [ -x $bindir/fc-cache ] ; then - $bindir/fc-cache + if ! defaults read $X11_PREFS_DOMAIN enable_iglx > /dev/null 2>&1 ; then + defaults write $X11_PREFS_DOMAIN enable_iglx -bool false + fi + + XCOMM First, start caching fonts + if [ "$(defaults read $X11_PREFS_DOMAIN cache_fonts)" = 1 ] ; then + if [ -x $bindir/font_cache ] ; then + $bindir/font_cache + elif [ -x $bindir/font_cache.sh ] ; then + $bindir/font_cache.sh + elif [ -x $bindir/fc-cache ] ; then + $bindir/fc-cache + fi fi -fi -if [ -x __libexecdir__/privileged_startx ] ; then + if [ -x $libexecdir/privileged_startx ] ; then XCOMM Don't push this into the background because it can cause XCOMM a race to create /tmp/.X11-unix - __libexecdir__/privileged_startx -fi + $libexecdir/privileged_startx + fi -if [ x`defaults read $X11_PREFS_DOMAIN no_auth` = x0 ] ; then - enable_xauth=1 -else - enable_xauth=0 -fi + if [ "$(defaults read $X11_PREFS_DOMAIN no_auth)" = 0 ] ; then + enable_xauth=1 + else + enable_xauth=0 + fi -if [ x`defaults read $X11_PREFS_DOMAIN nolisten_tcp` = x1 ] ; then - defaultserverargs="$defaultserverargs -nolisten tcp" -else - defaultserverargs="$defaultserverargs -listen tcp" -fi + if [ "$(defaults read $X11_PREFS_DOMAIN nolisten_tcp)" = 1 ] ; then + defaultserverargs="$defaultserverargs -nolisten tcp" + else + defaultserverargs="$defaultserverargs -listen tcp" + fi -if [ x`defaults read $X11_PREFS_DOMAIN enable_iglx` = x1 ] ; then - defaultserverargs="$defaultserverargs +iglx +extension GLX" -else - defaultserverargs="$defaultserverargs -iglx" -fi + if [ "$(defaults read $X11_PREFS_DOMAIN enable_iglx)" = 1 ] ; then + defaultserverargs="$defaultserverargs +iglx +extension GLX" + else + defaultserverargs="$defaultserverargs -iglx" + fi -XCOMM The second check is the real one. The first is to hopefully avoid -XCOMM needless syslog spamming. -if defaults read $X11_PREFS_DOMAIN 2> /dev/null | grep -q 'dpi' && defaults read $X11_PREFS_DOMAIN dpi > /dev/null 2>&1 ; then - defaultserverargs="$defaultserverargs -dpi `defaults read $X11_PREFS_DOMAIN dpi`" -fi + XCOMM The second check is the real one. The first is to hopefully avoid + XCOMM needless syslog spamming. + if defaults read $X11_PREFS_DOMAIN 2> /dev/null | grep -q 'dpi' && defaults read $X11_PREFS_DOMAIN dpi > /dev/null 2>&1 ; then + defaultserverargs="$defaultserverargs -dpi $(defaults read $X11_PREFS_DOMAIN dpi)" + fi -#else -enable_xauth=1 -#endif +else + enable_xauth=1 +fi XCOMM Automatically determine an unused $DISPLAY d=0 @@ -141,18 +150,18 @@ unset d whoseargs="client" -while [ x"$1" != x ]; do +while [ "$1" != "" ]; do case "$1" in XCOMM '' required to prevent cpp from treating "/*" as a C comment. /''*|\./''*) if [ "$whoseargs" = "client" ]; then - if [ x"$client" = x ] && [ x"$clientargs" = x ]; then + if [ "$client" = "" ] && [ "$clientargs" = "" ]; then client="$1" else clientargs="$clientargs $1" fi else - if [ x"$server" = x ] && [ x"$serverargs" = x ]; then + if [ "$server" = "" ] && [ "$serverargs" = "" ]; then server="$1" else serverargs="$serverargs $1" @@ -167,7 +176,7 @@ clientargs="$clientargs $1" else XCOMM display must be the FIRST server argument - if [ x"$serverargs" = x ] && @@ + if [ "$serverargs" = "" ] && @@ expr "$1" : ':[0-9][0-9]*$' > /dev/null 2>&1; then display="$1" else @@ -180,11 +189,11 @@ done XCOMM process client arguments -if [ x"$client" = x ]; then +if [ "$client" = "" ]; then client=$defaultclient XCOMM For compatibility reasons, only use startxrc if there were no client command line arguments - if [ x"$clientargs" = x ]; then + if [ "$clientargs" = "" ]; then if [ -f "$userclientrc" ]; then client=$userclientrc elif [ -f "$sysclientrc" ]; then @@ -194,15 +203,15 @@ fi XCOMM if no client arguments, use defaults -if [ x"$clientargs" = x ]; then +if [ "$clientargs" = "" ]; then clientargs=$defaultclientargs fi XCOMM process server arguments -if [ x"$server" = x ]; then +if [ "$server" = "" ]; then server=$defaultserver -#ifdef __linux__ +if [ "$(uname -s)" = "Linux" ] ; then XCOMM When starting the defaultserver start X on the current tty to avoid XCOMM the startx session being seen as inactive: XCOMM "https://bugzilla.redhat.com/show_bug.cgi?id=806491" @@ -211,10 +220,10 @@ tty_num=${tty#/dev/tty} vtarg="vt$tty_num -keeptty" fi -#endif +fi XCOMM For compatibility reasons, only use xserverrc if there were no server command line arguments - if [ x"$serverargs" = x -a x"$display" = x ]; then + if [ "$serverargs" = "" ] && [ "$display" = "" ]; then if [ -f "$userserverrc" ]; then server=$userserverrc elif [ -f "$sysserverrc" ]; then @@ -224,7 +233,7 @@ fi XCOMM if no server arguments, use defaults -if [ x"$serverargs" = x ]; then +if [ "$serverargs" = "" ]; then serverargs=$defaultserverargs fi @@ -240,12 +249,12 @@ fi XCOMM if no display, use default -if [ x"$display" = x ]; then +if [ "$display" = "" ]; then display=$defaultdisplay fi -if [ x"$enable_xauth" = x1 ] ; then - if [ x"$XAUTHORITY" = x ]; then +if [ "$enable_xauth" = 1 ] ; then + if [ "$XAUTHORITY" = "" ]; then XAUTHORITY=$HOME/.Xauthority export XAUTHORITY fi @@ -253,19 +262,19 @@ removelist= XCOMM set up default Xauth info for this machine - hostname=`uname -n` + hostname="$(uname -n)" authdisplay=${display:-:0} -#if defined(HAS_COOKIE_MAKER) && defined(MK_COOKIE) - mcookie=`MK_COOKIE` -#else - if [ -r /dev/urandom ]; then - mcookie=`dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"` + if [ -n "$has_cookie_maker" ] && [ -n "$mk_cookie" ] ; then + mcookie=$($mk_cookie) else - mcookie=`dd if=/dev/random bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"` + if [ -r /dev/urandom ]; then + mcookie=$(dd if=dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\") + else + mcookie=$(dd if=/dev/random bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\") + fi fi -#endif - if test x"$mcookie" = x; then + if [ "$mcookie" = "" ]; then echo "Couldn't create cookie" exit 1 fi @@ -277,61 +286,65 @@ xauth -q -f "$xserverauthfile" << EOF add :$dummy . $mcookie EOF -#if defined(__APPLE__) || defined(__CYGWIN__) - xserverauthfilequoted=$(echo ${xserverauthfile} | sed "s/'/'\\\\''/g") - serverargs=${serverargs}" -auth '"${xserverauthfilequoted}"'" -#else - serverargs=${serverargs}" -auth "${xserverauthfile} -#endif + + case "$(uname -s)" in + CYGWIN*|Darwin) + xserverauthfilequoted=$(echo ${xserverauthfile} | sed "s/'/'\\\\''/g") + serverargs=${serverargs}" -auth '"${xserverauthfilequoted}"'" + ;; + *) + serverargs=${serverargs}" -auth "${xserverauthfile} + ;; + esac XCOMM now add the same credentials to the client authority file XCOMM if '$displayname' already exists do not overwrite it as another XCOMM server may need it. Add them to the '$xserverauthfile' instead. for displayname in $authdisplay $hostname$authdisplay; do - authcookie=`XAUTH list "$displayname" @@ - | sed -n "s/.*$displayname[[:space:]*].*[[:space:]*]//p"` 2>/dev/null; + authcookie=$(xauth list "$displayname" @@ + | sed -n 's/.*'"$displayname"'[[:space:]*].*[[:space:]*]//p' 2>/dev/null); if [ "z${authcookie}" = "z" ] ; then - XAUTH -q << EOF + $xauth -q << EOF add $displayname . $mcookie EOF removelist="$displayname $removelist" else dummy=$(($dummy+1)); - XAUTH -q -f "$xserverauthfile" << EOF + $xauth -q -f "$xserverauthfile" << EOF add :$dummy . $authcookie EOF fi done fi -#if defined(__APPLE__) || defined(__CYGWIN__) -eval XINIT \"$client\" $clientargs -- \"$server\" $display $serverargs -#else -XINIT "$client" $clientargs -- "$server" $display $serverargs -#endif +case "$(uname -s)" in +CYGWIN_NT*|Darwin) + eval $xinit \"$client\" $clientargs -- \"$server\" $display $serverargs + ;; +*) + $xinit "$client" $clientargs -- "$server" $display $serverargs + ;; +esac retval=$? -if [ x"$enable_xauth" = x1 ] ; then - if [ x"$removelist" != x ]; then - XAUTH remove $removelist +if [ "$enable_xauth" = 1 ] ; then + if [ "$removelist" != "" ]; then + $xauth remove $removelist fi - if [ x"$xserverauthfile" != x ]; then + if [ "$xserverauthfile" != "" ]; then rm -f "$xserverauthfile" fi fi -/* - * various machines need special cleaning up - */ -#ifdef __linux__ -if command -v deallocvt > /dev/null 2>&1; then - deallocvt -fi -#endif - -#if defined(sun) -kbd_mode -a -#endif +XCOMM various machines need special cleaning up +if [ "$(uname -s)" = "Linux" ]; then + if command -v deallocvt > /dev/null 2>&1; then + deallocvt + fi +fi + +if [ "$(uname -s)" = "SunOS" ]; then + kbd_mode -a +fi exit $retval - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.4.2/xinit.c new/xinit-1.4.3/xinit.c --- old/xinit-1.4.2/xinit.c 2022-12-03 23:18:43.000000000 +0100 +++ new/xinit-1.4.3/xinit.c 2025-01-05 19:25:56.000000000 +0100 @@ -31,8 +31,10 @@ #include <X11/Xlib.h> #include <X11/Xos.h> #include <X11/Xatom.h> +#include <X11/Xfuncproto.h> #include <stdio.h> #include <ctype.h> +#include <stddef.h> #include <stdint.h> #include <signal.h> @@ -58,8 +60,8 @@ #define SHELL "sh" #endif -const char *bindir = BINDIR; -const char * const server_names[] = { +static const char *bindir = BINDIR; +static const char * const server_names[] = { #ifdef __APPLE__ "Xquartz Mac OSX Quartz displays.", #else @@ -74,18 +76,17 @@ "Xnest X server nested in a window on another X server", "Xephyr kdrive-based nested X server", "Xvnc X server accessed over VNC's RFB protocol", - "Xdmx Distributed Multi-head X server", NULL}; #ifndef XINITRC #define XINITRC ".xinitrc" #endif -char xinitrcbuf[256]; +static char xinitrcbuf[256]; #ifndef XSERVERRC #define XSERVERRC ".xserverrc" #endif -char xserverrcbuf[256]; +static char xserverrcbuf[256]; #define TRUE 1 #define FALSE 0 @@ -100,10 +101,10 @@ static char *displayNum = NULL; static char *program = NULL; static Display *xd = NULL; /* server connection */ -int status; -pid_t serverpid = -1; -pid_t clientpid = -1; -volatile int gotSignal = 0; +static int status; +static pid_t serverpid = -1; +static pid_t clientpid = -1; +static volatile int gotSignal = 0; static void Execute(char **vec); static Bool waitforserver(void); @@ -127,7 +128,7 @@ } static void -sigIgnore(int sig) +sigIgnore(_X_UNUSED int sig) { } @@ -151,7 +152,7 @@ register char **ptr; pid_t pid; int client_given = 0, server_given = 0; - int start_of_client_args, start_of_server_args; + ptrdiff_t start_of_client_args, start_of_server_args; struct sigaction sa, si; #ifdef __APPLE__ #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 @@ -314,11 +315,6 @@ shutdown(); - if (gotSignal != 0) { - Errorx("unexpected signal %d", gotSignal); - exit(EXIT_FAILURE); - } - if (serverpid < 0) Fatalx("server error"); if (clientpid < 0) @@ -488,9 +484,12 @@ const char *windowpath; char *newwindowpath; unsigned long num; +#ifndef HAVE_ASPRINTF char nums[10]; int numn; size_t len; +#endif + prop = XInternAtom(xd, "XFree86_VT", False); if (prop == None) { Errorx("Unable to intern XFree86_VT atom"); @@ -534,6 +533,15 @@ } XFree(buf); windowpath = getenv("WINDOWPATH"); +#ifdef HAVE_ASPRINTF + if (!windowpath) { + if (asprintf(&newwindowpath, "%lu", num) < 0) + return; + } else { + if (asprintf(&newwindowpath, "%s:%lu", windowpath, num) < 0) + return; + } +#else numn = snprintf(nums, sizeof(nums), "%lu", num); if (!windowpath) { len = numn + 1; @@ -549,6 +557,7 @@ snprintf(newwindowpath, len, "%s:%s", windowpath, nums); } +#endif /* HAVE_ASPRINTF */ if (setenv("WINDOWPATH", newwindowpath, TRUE) == -1) Error("unable to set WINDOWPATH"); @@ -584,7 +593,7 @@ static jmp_buf close_env; static int -ignorexio(Display *dpy) +ignorexio(_X_UNUSED Display *dpy) { Errorx("connection to X server lost"); longjmp(close_env, 1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.4.2/xinitrc.cpp new/xinit-1.4.3/xinitrc.cpp --- old/xinit-1.4.2/xinitrc.cpp 2022-12-03 23:18:43.000000000 +0100 +++ new/xinit-1.4.3/xinitrc.cpp 2025-01-05 19:25:56.000000000 +0100 @@ -1,55 +1,54 @@ XCOMM!SHELL_CMD +xrdb=XRDB +xinitdir=XINITDIR +xclock=XCLOCK +xterm=XTERM +twm=TWM +xmodmap=XMODMAP + userresources=$HOME/.Xresources usermodmap=$HOME/.Xmodmap -sysresources=XINITDIR/.Xresources -sysmodmap=XINITDIR/.Xmodmap +sysresources=$xinitdir/.Xresources +sysmodmap=$xinitdir/.Xmodmap XCOMM merge in defaults and keymaps if [ -f $sysresources ]; then -#ifdef __APPLE__ if [ -x /usr/bin/cpp ] ; then - XRDB -merge $sysresources + $xrdb -merge $sysresources else - XRDB -nocpp -merge $sysresources + $xrdb -nocpp -merge $sysresources fi -#else - XRDB -merge $sysresources -#endif fi if [ -f $sysmodmap ]; then - XMODMAP $sysmodmap + $xmodmap $sysmodmap fi if [ -f "$userresources" ]; then -#ifdef __APPLE__ if [ -x /usr/bin/cpp ] ; then - XRDB -merge "$userresources" + $xrdb -merge "$userresources" else - XRDB -nocpp -merge "$userresources" + $xrdb -nocpp -merge "$userresources" fi -#else - XRDB -merge "$userresources" -#endif fi if [ -f "$usermodmap" ]; then - XMODMAP "$usermodmap" + $xmodmap "$usermodmap" fi XCOMM start some nice programs -if [ -d XINITDIR/xinitrc.d ] ; then - for f in XINITDIR/xinitrc.d/?*.sh ; do +if [ -d $xinitdir/xinitrc.d ] ; then + for f in "$xinitdir/xinitrc.d"/?*.sh ; do [ -x "$f" ] && . "$f" done unset f fi -TWM & -XCLOCK -geometry 50x50-1+1 & -XTERM -geometry 80x50+494+51 & -XTERM -geometry 80x20+494-0 & -exec XTERM -geometry 80x66+0+0 -name login +$twm & +$xclock -geometry 50x50-1+1 & +$xterm -geometry 80x50+494+51 & +$xterm -geometry 80x20+494-0 & +exec $xterm -geometry 80x66+0+0 -name login ++++++ xinit-client-session.patch ++++++ --- /var/tmp/diff_new_pack.dfAxEk/_old 2025-01-06 16:04:54.653003002 +0100 +++ /var/tmp/diff_new_pack.dfAxEk/_new 2025-01-06 16:04:54.657003167 +0100 @@ -1,8 +1,8 @@ -Index: xinit-1.3.4/xinit.c +Index: xinit-1.4.3/xinit.c =================================================================== ---- xinit-1.3.4.orig/xinit.c -+++ xinit-1.3.4/xinit.c -@@ -89,6 +89,7 @@ char xserverrcbuf[256]; +--- xinit-1.4.3.orig/xinit.c ++++ xinit-1.4.3/xinit.c +@@ -90,6 +90,7 @@ static char xserverrcbuf[256]; #define TRUE 1 #define FALSE 0 @@ -10,7 +10,7 @@ static char *default_server = "X"; static char *default_display = ":0"; /* choose most efficient */ -@@ -560,6 +561,8 @@ startClient(char *client_argv[]) +@@ -570,6 +571,8 @@ startClient(char *client_argv[]) { clientpid = fork(); if (clientpid == 0) { @@ -19,7 +19,7 @@ set_environment(); setWindowPath(); -@@ -567,7 +570,17 @@ startClient(char *client_argv[]) +@@ -577,7 +580,17 @@ startClient(char *client_argv[]) Error("cannot change uid"); _exit(EXIT_FAILURE); } ++++++ xinit-suse.patch ++++++ --- /var/tmp/diff_new_pack.dfAxEk/_old 2025-01-06 16:04:54.669003662 +0100 +++ /var/tmp/diff_new_pack.dfAxEk/_new 2025-01-06 16:04:54.673003827 +0100 @@ -1,8 +1,8 @@ -Index: xinit-1.4.0/startx.cpp +Index: xinit-1.4.3/startx.cpp =================================================================== ---- xinit-1.4.0.orig/startx.cpp 2018-03-10 02:46:03.000000000 +0100 -+++ xinit-1.4.0/startx.cpp 2018-07-11 13:16:21.864694488 +0200 -@@ -50,11 +50,103 @@ +--- xinit-1.4.3.orig/startx.cpp ++++ xinit-1.4.3/startx.cpp +@@ -59,11 +59,103 @@ userclientrc=$HOME/.xinitrc [ -f "${XINITRC}" ] && userclientrc="${XINITRC}" sysclientrc=XINITDIR/xinitrc @@ -97,53 +97,54 @@ +. /etc/sysconfig/displaymanager + userserverrc=$HOME/.xserverrc - [ -f "${XSERVERRC}" ] && userclientrc="${XSERVERRC}" - sysserverrc=XINITDIR/xserverrc - defaultclient=XTERM + [ -f "${XSERVERRC}" ] && userserverrc="${XSERVERRC}" + sysserverrc=$xinitdir/xserverrc + defaultclient=$xterm +XCOMM set X Server accordingly (Xorg/Xgl) - defaultserver=XSERVER + defaultserver=$xserver +test -n "$DISPLAYMANAGER_XSERVER" && defaultserver=/usr/bin/$DISPLAYMANAGER_XSERVER defaultclientargs="" defaultserverargs="" defaultdisplay="" -@@ -312,6 +404,9 @@ - fi +@@ -317,6 +409,10 @@ EOF done fi + +XCOMM handle TCP port 6000 +test "$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" != "yes" && \ + serverargs="$serverargs -nolisten tcp" - - #if defined(__APPLE__) || defined(__CYGWIN__) - eval XINIT \"$client\" $clientargs -- \"$server\" $display $serverargs -@@ -320,6 +415,12 @@ - #endif ++ + case "$(uname -s)" in + CYGWIN_NT*|Darwin) + eval $xinit \"$client\" $clientargs -- \"$server\" $display $serverargs +@@ -327,6 +423,12 @@ CYGWIN_NT*|Darwin) + esac retval=$? +if [ "$retval" != 0 -a ! -u "/usr/bin/Xorg" ]; then -+ echo "-------------------------------------------------------------------------------------------" -+ echo "xinit failed. /usr/bin/Xorg is not setuid, maybe that's the reason?" -+ echo "If so either use a display manager (strongly recommended) or adjust /etc/permissions.local and run \"chkstat --system --set\" afterwards" ++ echo "-------------------------------------------------------------------------------------------" ++ echo "xinit failed. /usr/bin/Xorg is not setuid, maybe that's the reason?" ++ echo "If so either use a display manager (strongly recommended) or adjust /etc/permissions.local and run \"chkstat --system --set\" afterwards" +fi + - if [ x"$enable_xauth" = x1 ] ; then - if [ x"$removelist" != x ]; then - XAUTH remove $removelist -Index: xinit-1.4.0/xinitrc.cpp + if [ "$enable_xauth" = 1 ] ; then + if [ "$removelist" != "" ]; then + $xauth remove $removelist +Index: xinit-1.4.3/xinitrc.cpp =================================================================== ---- xinit-1.4.0.orig/xinitrc.cpp 2018-03-10 02:46:03.000000000 +0100 -+++ xinit-1.4.0/xinitrc.cpp 2018-07-11 13:13:23.808686361 +0200 -@@ -48,8 +48,10 @@ +--- xinit-1.4.3.orig/xinitrc.cpp ++++ xinit-1.4.3/xinitrc.cpp +@@ -47,8 +47,10 @@ if [ -d $xinitdir/xinitrc.d ] ; then unset f fi --TWM & +-$twm & +if [ -x /usr/X11R6/bin/fvwm -o -x /usr/bin/fvwm]; then + exec fvwm +fi - XCLOCK -geometry 50x50-1+1 & - XTERM -geometry 80x50+494+51 & - XTERM -geometry 80x20+494-0 & --exec XTERM -geometry 80x66+0+0 -name login -+exec TWM + $xclock -geometry 50x50-1+1 & + $xterm -geometry 80x50+494+51 & + $xterm -geometry 80x20+494-0 & +-exec $xterm -geometry 80x66+0+0 -name login ++exec $twm ++++++ xinit-tolerant-hostname-changes.patch ++++++ --- /var/tmp/diff_new_pack.dfAxEk/_old 2025-01-06 16:04:54.689004487 +0100 +++ /var/tmp/diff_new_pack.dfAxEk/_new 2025-01-06 16:04:54.689004487 +0100 @@ -1,13 +1,13 @@ -Index: xinit-1.3.4/startx.cpp +Index: xinit-1.4.3/startx.cpp =================================================================== ---- xinit-1.3.4.orig/startx.cpp -+++ xinit-1.3.4/startx.cpp -@@ -407,6 +407,7 @@ fi +--- xinit-1.4.3.orig/startx.cpp ++++ xinit-1.4.3/startx.cpp +@@ -412,6 +412,7 @@ fi XCOMM handle TCP port 6000 test "$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" != "yes" && \ serverargs="$serverargs -nolisten tcp" +export XAUTHLOCALHOSTNAME=`hostname` - #if defined(__APPLE__) || defined(__CYGWIN__) - eval XINIT \"$client\" $clientargs -- \"$server\" $display $serverargs + case "$(uname -s)" in + CYGWIN_NT*|Darwin)

1 0

commit m17n-db for openSUSE:Factory
by Source-Sync 06 Jan '25

06 Jan '25

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package m17n-db for openSUSE:Factory checked in at 2025-01-06 16:04:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/m17n-db (Old) and /work/SRC/openSUSE:Factory/.m17n-db.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "m17n-db" Mon Jan 6 16:04:39 2025 rev:32 rq:1234987 version:1.8.9 Changes: -------- --- /work/SRC/openSUSE:Factory/m17n-db/m17n-db.changes 2023-11-14 21:41:41.657647583 +0100 +++ /work/SRC/openSUSE:Factory/.m17n-db.new.1881/m17n-db.changes 2025-01-06 16:04:52.096897492 +0100 @@ -1,0 +2,8 @@ +Sun Jan 5 06:37:57 UTC 2025 - Marguerite Su <i(a)marguerite.su> + +- update to 1.8.9 + * mr-gamabhana.mim + * ar-translit.mim: Use Shift+t(T) in ar-translit.mim to + input the Arabic tatweel + +------------------------------------------------------------------- Old: ---- m17n-db-1.8.5.tar.gz New: ---- m17n-db-1.8.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ m17n-db.spec ++++++ --- /var/tmp/diff_new_pack.RXLECH/_old 2025-01-06 16:04:52.864929194 +0100 +++ /var/tmp/diff_new_pack.RXLECH/_new 2025-01-06 16:04:52.868929360 +0100 @@ -1,7 +1,7 @@ # # spec file for package m17n-db # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: m17n-db -Version: 1.8.5 +Version: 1.8.9 Release: 0 Summary: Database Needed by the m17n Library m17n-lib License: GPL-2.0-or-later AND LGPL-2.1-or-later AND SUSE-Public-Domain AND MIT ++++++ m17n-db-1.8.5.tar.gz -> m17n-db-1.8.9.tar.gz ++++++ ++++ 62939 lines of diff (skipped)

1 0

commit c-ares for openSUSE:Factory
by Source-Sync 06 Jan '25

06 Jan '25

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package c-ares for openSUSE:Factory checked in at 2025-01-06 16:04:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/c-ares (Old) and /work/SRC/openSUSE:Factory/.c-ares.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "c-ares" Mon Jan 6 16:04:31 2025 rev:26 rq:1234807 version:1.34.4 Changes: -------- --- /work/SRC/openSUSE:Factory/c-ares/c-ares.changes 2025-01-02 19:19:25.799534745 +0100 +++ /work/SRC/openSUSE:Factory/.c-ares.new.1881/c-ares.changes 2025-01-06 16:04:34.748181385 +0100 @@ -1,0 +2,6 @@ +Fri Jan 3 22:36:24 UTC 2025 - Adam Majer <adam.majer(a)suse.de> + +- skip-test.patch replaced with upstream unit test fix + a531524a3d085fcd9a5e25d5f6cbdb953082c2b9.patch + +------------------------------------------------------------------- Old: ---- skip-test.patch New: ---- a531524a3d085fcd9a5e25d5f6cbdb953082c2b9.patch BETA DEBUG BEGIN: Old: - skip-test.patch replaced with upstream unit test fix a531524a3d085fcd9a5e25d5f6cbdb953082c2b9.patch BETA DEBUG END: BETA DEBUG BEGIN: New:- skip-test.patch replaced with upstream unit test fix a531524a3d085fcd9a5e25d5f6cbdb953082c2b9.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ c-ares.spec ++++++ --- /var/tmp/diff_new_pack.L3nHRR/_old 2025-01-06 16:04:35.924229928 +0100 +++ /var/tmp/diff_new_pack.L3nHRR/_new 2025-01-06 16:04:35.924229928 +0100 @@ -36,8 +36,7 @@ Source3: c-ares.keyring Source4: baselibs.conf Source5: series -# forwarded: https://github.com/c-ares/c-ares/issues/953 -Patch1: skip-test.patch +Patch1: a531524a3d085fcd9a5e25d5f6cbdb953082c2b9.patch BuildRequires: c++_compiler BuildRequires: cmake # Needed for getservbyport_r function to work properly. ++++++ _scmsync.obsinfo ++++++ --- /var/tmp/diff_new_pack.L3nHRR/_old 2025-01-06 16:04:35.964231580 +0100 +++ /var/tmp/diff_new_pack.L3nHRR/_new 2025-01-06 16:04:35.968231745 +0100 @@ -1,5 +1,5 @@ -mtime: 1735561922 -commit: 966d0cfb8f0a94ec018ac57cd9bb2201406bb22f1427e9b358a023b44b451702 +mtime: 1735943824 +commit: 642897f8dd9ec9c30bf8b91bfd64940334473fc5dc81a41f82074bc1ea11d8db url: https://src.opensuse.org/adamm/c-ares.git -revision: 966d0cfb8f0a94ec018ac57cd9bb2201406bb22f1427e9b358a023b44b451702 +revision: 642897f8dd9ec9c30bf8b91bfd64940334473fc5dc81a41f82074bc1ea11d8db ++++++ a531524a3d085fcd9a5e25d5f6cbdb953082c2b9.patch ++++++ commit a531524a3d085fcd9a5e25d5f6cbdb953082c2b9 Author: Brad House <brad(a)brad-house.com> Date: Fri Jan 3 12:55:54 2025 -0500 tests: Convert some live tests to Mock tests (#954) In Issue #953 `GetTCPSock` and `VerifySocketFunctionCallback` tests might rely on the fact that `connect()` doesn't return an immediate failure. If `connect()` returned `EWOULDBLOCK`/`EAGAIN` the test would succeed, but on systems that check on the call for available routes or listening servers on localhost the `connect()` function would return an immediate failure. These functions were not actually tagged with a `Live` prefix so they would run even callers exclude Live tests. These are testing functions that shouldn't be limited to live scenarios so we need to move them to the Mock frameworks and test appropriately. Fixes #953 Signed-off-by: Brad House (@bradh352) diff --git a/test/ares-test-live.cc b/test/ares-test-live.cc index e23dadfe..557c485e 100644 --- a/test/ares-test-live.cc +++ b/test/ares-test-live.cc @@ -669,115 +669,7 @@ VIRT_NONVIRT_TEST_F(DefaultChannelTest, LiveGetNameInfoAllocFail) { EXPECT_EQ(ARES_ENOMEM, result.status_); } -VIRT_NONVIRT_TEST_F(DefaultChannelTest, GetSock) { - ares_socket_t socks[3] = {ARES_SOCKET_BAD, ARES_SOCKET_BAD, ARES_SOCKET_BAD}; - int bitmask = ares_getsock(channel_, socks, 3); - EXPECT_EQ(0, bitmask); - bitmask = ares_getsock(channel_, nullptr, 0); - EXPECT_EQ(0, bitmask); - - // Ask again with a pending query. - HostResult result; - ares_gethostbyname(channel_, "www.google.com.", AF_INET, HostCallback, &result); - bitmask = ares_getsock(channel_, socks, 3); - EXPECT_NE(0, bitmask); - - size_t sock_cnt = 0; - for (size_t i=0; i<3; i++) { - if (ARES_GETSOCK_READABLE(bitmask, i) || ARES_GETSOCK_WRITABLE(bitmask, i)) { - EXPECT_NE(ARES_SOCKET_BAD, socks[i]); - if (socks[i] != ARES_SOCKET_BAD) - sock_cnt++; - } - } - EXPECT_NE((size_t)0, sock_cnt); - - bitmask = ares_getsock(channel_, nullptr, 0); - EXPECT_EQ(0, bitmask); - - Process(); -} - -TEST_F(LibraryTest, GetTCPSock) { - ares_channel_t *channel; - struct ares_options opts; - memset(&opts, 0, sizeof(opts)); - opts.tcp_port = 53; - opts.flags = ARES_FLAG_USEVC; - int optmask = ARES_OPT_TCP_PORT | ARES_OPT_FLAGS; - EXPECT_EQ(ARES_SUCCESS, ares_init_options(&channel, &opts, optmask)); - EXPECT_NE(nullptr, channel); - - ares_socket_t socks[3] = {ARES_SOCKET_BAD, ARES_SOCKET_BAD, ARES_SOCKET_BAD}; - int bitmask = ares_getsock(channel, socks, 3); - EXPECT_EQ(0, bitmask); - bitmask = ares_getsock(channel, nullptr, 0); - EXPECT_EQ(0, bitmask); - - // Ask again with a pending query. - HostResult result; - ares_gethostbyname(channel, "www.google.com.", AF_INET, HostCallback, &result); - bitmask = ares_getsock(channel, socks, 3); - EXPECT_NE(0, bitmask); - - size_t sock_cnt = 0; - for (size_t i=0; i<3; i++) { - if (ARES_GETSOCK_READABLE(bitmask, i) || ARES_GETSOCK_WRITABLE(bitmask, i)) { - EXPECT_NE(ARES_SOCKET_BAD, socks[i]); - if (socks[i] != ARES_SOCKET_BAD) - sock_cnt++; - } - } - EXPECT_NE((size_t)0, sock_cnt); - - bitmask = ares_getsock(channel, nullptr, 0); - EXPECT_EQ(0, bitmask); - - ProcessWork(channel, NoExtraFDs, nullptr); - ares_destroy(channel); -} - -TEST_F(DefaultChannelTest, VerifySocketFunctionCallback) { - VirtualizeIO vio(channel_); - - auto my_functions = VirtualizeIO::default_functions; - size_t count = 0; - - my_functions.asocket = [](int af, int type, int protocol, void * p) -> ares_socket_t { - EXPECT_NE(nullptr, p); - (*reinterpret_cast<size_t *>(p))++; - return ::socket(af, type, protocol); - }; - - ares_set_socket_functions(channel_, &my_functions, &count); - - { - count = 0; - HostResult result; - ares_gethostbyname(channel_, "www.google.com.", AF_INET, HostCallback, &result); - Process(); - - EXPECT_TRUE(result.done_); - EXPECT_NE((size_t)0, count); - } - - { - count = 0; - ares_channel_t *copy; - EXPECT_EQ(ARES_SUCCESS, ares_dup(&copy, channel_)); - - HostResult result; - ares_gethostbyname(copy, "www.google.com.", AF_INET, HostCallback, &result); - - ProcessWork(copy, NoExtraFDs, nullptr); - - EXPECT_TRUE(result.done_); - ares_destroy(copy); - EXPECT_NE((size_t)0, count); - } - -} TEST_F(DefaultChannelTest, LiveSetServers) { struct ares_addr_node server1; diff --git a/test/ares-test-mock.cc b/test/ares-test-mock.cc index 8c74c05f..ebae7140 100644 --- a/test/ares-test-mock.cc +++ b/test/ares-test-mock.cc @@ -1662,6 +1662,135 @@ TEST_P(MockChannelTest, GetHostByAddrDestroy) { EXPECT_EQ(0, result.timeouts_); } +TEST_P(MockUDPChannelTest, GetSock) { + DNSPacket reply; + reply.set_response().set_aa() + .add_question(new DNSQuestion("www.google.com", T_A)) + .add_answer(new DNSARR("www.google.com", 0x0100, {0x01, 0x02, 0x03, 0x04})); + ON_CALL(server_, OnRequest("www.google.com", T_A)) + .WillByDefault(SetReply(&server_, &reply)); + + ares_socket_t socks[3] = {ARES_SOCKET_BAD, ARES_SOCKET_BAD, ARES_SOCKET_BAD}; + int bitmask; + + bitmask = ares_getsock(channel_, socks, 3); + EXPECT_EQ(0, bitmask); + bitmask = ares_getsock(channel_, nullptr, 0); + EXPECT_EQ(0, bitmask); + + // Ask again with a pending query. + HostResult result; + ares_gethostbyname(channel_, "www.google.com.", AF_INET, HostCallback, &result); + bitmask = ares_getsock(channel_, socks, 3); + EXPECT_NE(0, bitmask); + + size_t sock_cnt = 0; + for (size_t i=0; i<3; i++) { + if (ARES_GETSOCK_READABLE(bitmask, i) || ARES_GETSOCK_WRITABLE(bitmask, i)) { + EXPECT_NE(ARES_SOCKET_BAD, socks[i]); + if (socks[i] != ARES_SOCKET_BAD) + sock_cnt++; + } + } + EXPECT_NE((size_t)0, sock_cnt); + + Process(); + + bitmask = ares_getsock(channel_, nullptr, 0); + EXPECT_EQ(0, bitmask); +} + +TEST_P(MockTCPChannelTest, GetSock) { + DNSPacket reply; + reply.set_response().set_aa() + .add_question(new DNSQuestion("www.google.com", T_A)) + .add_answer(new DNSARR("www.google.com", 0x0100, {0x01, 0x02, 0x03, 0x04})); + ON_CALL(server_, OnRequest("www.google.com", T_A)) + .WillByDefault(SetReply(&server_, &reply)); + + ares_socket_t socks[3] = {ARES_SOCKET_BAD, ARES_SOCKET_BAD, ARES_SOCKET_BAD}; + int bitmask; + + bitmask = ares_getsock(channel_, socks, 3); + EXPECT_EQ(0, bitmask); + bitmask = ares_getsock(channel_, nullptr, 0); + EXPECT_EQ(0, bitmask); + + // Ask again with a pending query. + HostResult result; + ares_gethostbyname(channel_, "www.google.com.", AF_INET, HostCallback, &result); + bitmask = ares_getsock(channel_, socks, 3); + EXPECT_NE(0, bitmask); + + size_t sock_cnt = 0; + for (size_t i=0; i<3; i++) { + if (ARES_GETSOCK_READABLE(bitmask, i) || ARES_GETSOCK_WRITABLE(bitmask, i)) { + EXPECT_NE(ARES_SOCKET_BAD, socks[i]); + if (socks[i] != ARES_SOCKET_BAD) + sock_cnt++; + } + } + EXPECT_NE((size_t)0, sock_cnt); + + Process(); + + bitmask = ares_getsock(channel_, nullptr, 0); + EXPECT_EQ(0, bitmask); +} + + +TEST_P(MockChannelTest, VerifySocketFunctionCallback) { + ares_socket_functions sock_funcs; + memset(&sock_funcs, 0, sizeof(sock_funcs)); + + DNSPacket reply; + reply.set_response().set_aa() + .add_question(new DNSQuestion("www.google.com", T_A)) + .add_answer(new DNSARR("www.google.com", 0x0100, {0x01, 0x02, 0x03, 0x04})); + ON_CALL(server_, OnRequest("www.google.com", T_A)) + .WillByDefault(SetReply(&server_, &reply)); + + size_t count = 0; + + sock_funcs.asocket = [](int af, int type, int protocol, void * p) -> ares_socket_t { + EXPECT_NE(nullptr, p); + (*reinterpret_cast<size_t *>(p))++; + return ::socket(af, type, protocol); + }; + + ares_set_socket_functions(channel_, &sock_funcs, &count); + + { + count = 0; + HostResult result; + ares_gethostbyname(channel_, "www.google.com.", AF_INET, HostCallback, &result); + Process(); + + EXPECT_TRUE(result.done_); + EXPECT_EQ(ARES_SUCCESS, result.status_); + EXPECT_EQ(0, result.timeouts_); + EXPECT_NE((size_t)0, count); + } + + { + count = 0; + ares_channel_t *copy; + EXPECT_EQ(ARES_SUCCESS, ares_dup(&copy, channel_)); + + HostResult result; + ares_gethostbyname(copy, "www.google.com.", AF_INET, HostCallback, &result); + + ProcessAltChannel(copy); + + EXPECT_TRUE(result.done_); + ares_destroy(copy); + EXPECT_NE((size_t)0, count); + EXPECT_EQ(ARES_SUCCESS, result.status_); + EXPECT_EQ(0, result.timeouts_); + } + +} + static const unsigned char * fetch_server_cookie(const ares_dns_record_t *dnsrec, size_t *len) { diff --git a/test/ares-test.cc b/test/ares-test.cc index 99ab0a00..f383ecbe 100644 --- a/test/ares-test.cc +++ b/test/ares-test.cc @@ -888,14 +888,18 @@ void MockChannelOptsTest::ProcessFD(ares_socket_t fd) { } } -void MockChannelOptsTest::Process(unsigned int cancel_ms) { +void MockChannelOptsTest::ProcessAltChannel(ares_channel_t *chan, unsigned int cancel_ms) { using namespace std::placeholders; - ProcessWork(channel_, + ProcessWork(chan, std::bind(&MockChannelOptsTest::fds, this), std::bind(&MockChannelOptsTest::ProcessFD, this, _1), cancel_ms); } +void MockChannelOptsTest::Process(unsigned int cancel_ms) { + ProcessAltChannel(channel_, cancel_ms); +} + void MockEventThreadOptsTest::Process(unsigned int cancel_ms) { std::set<ares_socket_t> fds; diff --git a/test/ares-test.h b/test/ares-test.h index 61275921..77baa902 100644 --- a/test/ares-test.h +++ b/test/ares-test.h @@ -328,6 +328,7 @@ public: // Process all pending work on ares-owned and mock-server-owned file // descriptors. + void ProcessAltChannel(ares_channel_t *chan, unsigned int cancel_ms = 0); void Process(unsigned int cancel_ms = 0); protected: ++++++ build.specials.obscpio ++++++ diff: old/*: No such file or directory diff: new/*: No such file or directory

1 0

commit kitinerary for openSUSE:Factory
by Source-Sync 06 Jan '25

06 Jan '25

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kitinerary for openSUSE:Factory checked in at 2025-01-06 16:04:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kitinerary (Old) and /work/SRC/openSUSE:Factory/.kitinerary.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kitinerary" Mon Jan 6 16:04:29 2025 rev:80 rq:1234794 version:24.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kitinerary/kitinerary.changes 2024-12-13 22:27:06.105955919 +0100 +++ /work/SRC/openSUSE:Factory/.kitinerary.new.1881/kitinerary.changes 2025-01-06 16:04:33.184116824 +0100 @@ -1,0 +2,6 @@ +Fri Jan 3 21:10:11 UTC 2025 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Add bcb009f56f8f1c9c0d1612a0ec9f581907b51534.patch -- Fix + compilation against Poppler 25.01. + +------------------------------------------------------------------- New: ---- bcb009f56f8f1c9c0d1612a0ec9f581907b51534.patch BETA DEBUG BEGIN: New: - Add bcb009f56f8f1c9c0d1612a0ec9f581907b51534.patch -- Fix compilation against Poppler 25.01. BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kitinerary.spec ++++++ --- /var/tmp/diff_new_pack.i3WL8R/_old 2025-01-06 16:04:33.844144068 +0100 +++ /var/tmp/diff_new_pack.i3WL8R/_new 2025-01-06 16:04:33.844144068 +0100 @@ -1,7 +1,7 @@ # # spec file for package kitinerary # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,6 +32,8 @@ Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{ve… Source2: applications.keyring %endif +# PATCH-FIX-UPSTREAM bcb009f56f8f1c9c0d1612a0ec9f581907b51534.patch -- Fix compilation against Poppler 25.01 +Patch0: https://github.com/KDE/kitinerary/commit/bcb009f56f8f1c9c0d1612a0ec9f581907… BuildRequires: doxygen BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} BuildRequires: libphonenumber-devel ++++++ bcb009f56f8f1c9c0d1612a0ec9f581907b51534.patch ++++++ From bcb009f56f8f1c9c0d1612a0ec9f581907b51534 Mon Sep 17 00:00:00 2001 From: Volker Krause <vkrause(a)kde.org> Date: Sat, 21 Dec 2024 16:44:37 +0100 Subject: [PATCH] Fix compilation against Poppler 25.01 --- src/lib/pdf/pdfdocument.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/lib/pdf/pdfdocument.cpp b/src/lib/pdf/pdfdocument.cpp index f829e645..1eb0d61e 100644 --- a/src/lib/pdf/pdfdocument.cpp +++ b/src/lib/pdf/pdfdocument.cpp @@ -40,9 +40,14 @@ void PdfPagePrivate::load() m_doc->m_popplerDoc->processLinks(&device, m_pageNum + 1); device.finalize(); const auto pageRect = m_doc->m_popplerDoc->getPage(m_pageNum + 1)->getCropBox(); +#if KPOPPLER_VERSION < QT_VERSION_CHECK(25, 1, 0) std::unique_ptr<GooString> s(device.getText(pageRect->x1, pageRect->y1, pageRect->x2, pageRect->y2)); - m_text = QString::fromUtf8(s->c_str()); +#else + const auto s = device.getText(pageRect->x1, pageRect->y1, pageRect->x2, pageRect->y2); + m_text = QString::fromUtf8(s.c_str()); +#endif + m_images = std::move(device.m_images); for (auto it = m_images.begin(); it != m_images.end(); ++it) { (*it).d->m_page = this; @@ -107,8 +112,13 @@ QString PdfPage::textInRect(double left, double top, double right, double bottom TextOutputDev device(nullptr, false, 0, false, false); d->m_doc->m_popplerDoc->displayPageSlice(&device, d->m_pageNum + 1, 72, 72, 0, false, true, false, -1, -1, -1, -1); +#if KPOPPLER_VERSION <QT_VERSION_CHECK(25, 1, 0) std::unique_ptr<GooString> s(device.getText(l, t, r, b)); return QString::fromUtf8(s->c_str()); +#else + const auto s = device.getText(l, t, r, b); + return QString::fromUtf8(s.c_str()); +#endif } int PdfPage::imageCount() const

1 0