- openSUSE Commits

commit cinnamon-screensaver for openSUSE:Factory
by Source-Sync 20 Jan '25

20 Jan '25

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cinnamon-screensaver for openSUSE:Factory checked in at 2025-01-20 17:14:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cinnamon-screensaver (Old) and /work/SRC/openSUSE:Factory/.cinnamon-screensaver.new.5589 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cinnamon-screensaver" Mon Jan 20 17:14:29 2025 rev:31 rq:1238868 version:6.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/cinnamon-screensaver/cinnamon-screensaver.changes 2024-08-21 23:25:30.288306121 +0200 +++ /work/SRC/openSUSE:Factory/.cinnamon-screensaver.new.5589/cinnamon-screensaver.changes 2025-01-20 17:15:05.363466072 +0100 @@ -1,0 +2,16 @@ +Mon Jan 20 01:59:07 UTC 2025 - Marguerite Su <i(a)marguerite.su> + +- move typelib back to the right location + +------------------------------------------------------------------- +Sun Jan 12 04:10:37 UTC 2025 - Marguerite Su <i(a)marguerite.su> + +- update to 6.4.0 + * libscreensaver: fix detection of monitor hotplug + * keybindings: Ignore shift-f10 + * fix executable libraries + * Simplify authClient.py pam helper path + * unlock dialog: Allow password visibility to be toggled + * cs-backup-locker.c: Exit gracefully if incorrect arguments are given + +------------------------------------------------------------------- Old: ---- cinnamon-screensaver-6.2.0.tar.gz New: ---- cinnamon-screensaver-6.4.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cinnamon-screensaver.spec ++++++ --- /var/tmp/diff_new_pack.vaiMD8/_old 2025-01-20 17:15:05.791483691 +0100 +++ /var/tmp/diff_new_pack.vaiMD8/_new 2025-01-20 17:15:05.795483856 +0100 @@ -1,7 +1,7 @@ # # spec file for package cinnamon-screensaver # -# 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 @@ -18,7 +18,7 @@ %define appid org.cinnamon.ScreenSaver Name: cinnamon-screensaver -Version: 6.2.0 +Version: 6.4.0 Release: 0 Summary: Cinnamon screensaver and locker License: GPL-2.0-or-later @@ -32,7 +32,6 @@ BuildRequires: meson BuildRequires: pkgconfig BuildRequires: python3 >= 3.4 -BuildRequires: update-desktop-files BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(gdk-x11-3.0) BuildRequires: pkgconfig(glib-2.0) @@ -61,14 +60,6 @@ simple, sane and secure defaults, and be well integrated with the Cinnamon Desktop. -%package -n libcscreensaver-0_0_0 -Summary: Library files for %{name} - -%description -n libcscreensaver-0_0_0 -%{summary}. - -This package ships the library files for %{name}. - %package -n typelib-1_0-CScreensaver-1_0 Summary: Typelib for %{name} @@ -79,7 +70,6 @@ %package devel Summary: Development files for %{name} -Requires: libcscreensaver-0_0_0 Requires: typelib-1_0-CScreensaver-1_0 %description devel @@ -103,10 +93,13 @@ %meson_install %fdupes %{buildroot} -%suse_update_desktop_file %{appid} mkdir -p %{buildroot}%{_pam_vendordir} mv %{buildroot}%{_sysconfdir}/pam.d/%{name} %{buildroot}%{_pam_vendordir}/%{name} +mkdir -p %{buildroot}%{_libdir}/girepository-1.0 +mv %{buildroot}%{_libexecdir}/%{name}/girepository-1.0/CScreensaver-1.0.typelib \ + %{buildroot}%{_libdir}/girepository-1.0/ +rm -rf %{buildroot}%{_libexecdir}/%{name}/girepository-1.0 # Fix missing shabang chmod a+x %{buildroot}%{_datadir}/%{name}/*.py @@ -127,27 +120,22 @@ test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i} ||: done -%ldconfig_scriptlets -n libcscreensaver-0_0_0 - %files %license COPYING COPYING.LIB %doc AUTHORS README.md HACKING +%dir %{_libexecdir}/%{name} %{_bindir}/{%{name}{,-command},cinnamon-unlock-desktop} %{_datadir}/applications/%{appid}.desktop -%{_libexecdir}/{%{name}-pam-helper,cs-backup-locker} +%{_libexecdir}/%{name}/{%{name}-pam-helper,cs-backup-locker,libcscreensaver.so} %{_datadir}/%{name} %{_datadir}/dbus-1/services/%{appid}.service %{_datadir}/icons/hicolor/scalable/{actions,apps,status}/*.svg %{_pam_vendordir}/%{name} %files -n typelib-1_0-CScreensaver-1_0 +%dir %{_libdir}/girepository-1.0 %{_libdir}/girepository-1.0/CScreensaver-1.0.typelib -%files -n libcscreensaver-0_0_0 -%{_libdir}/libcscreensaver.so.* - %files devel %{_datadir}/gir-1.0/CScreensaver-1.0.gir -%{_libdir}/pkgconfig/cscreensaver.pc -%{_libdir}/libcscreensaver.so ++++++ cinnamon-screensaver-6.2.0.tar.gz -> cinnamon-screensaver-6.4.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/backup-locker/cs-backup-locker.c new/cinnamon-screensaver-6.4.0/backup-locker/cs-backup-locker.c --- old/cinnamon-screensaver-6.2.0/backup-locker/cs-backup-locker.c 2024-06-11 17:57:50.000000000 +0200 +++ new/cinnamon-screensaver-6.4.0/backup-locker/cs-backup-locker.c 2024-11-26 14:51:33.000000000 +0100 @@ -631,6 +631,11 @@ g_debug ("backup-locker: initializing"); + if (!xid_str || !term_tty_str || !session_tty_str) { + g_critical ("xid, term and session arguments are mandatory, exiting."); + exit (1); + } + gulong xid = term_tty = session_tty = 0; xid = strtoul (xid_str, NULL, 0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/backup-locker/meson.build new/cinnamon-screensaver-6.4.0/backup-locker/meson.build --- old/cinnamon-screensaver-6.2.0/backup-locker/meson.build 2024-06-11 17:57:50.000000000 +0200 +++ new/cinnamon-screensaver-6.4.0/backup-locker/meson.build 2024-11-26 14:51:33.000000000 +0100 @@ -16,7 +16,8 @@ include_directories: inc, dependencies: [x11, gtk, glib], link_with: libcscreensaver, - install_dir: libexecdir, + install_rpath: pkglibdir, + install_dir: pkglibdir, install: true ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/data/icons/hicolor/scalable/status/cinnamon-screensaver-view-conceal.svg new/cinnamon-screensaver-6.4.0/data/icons/hicolor/scalable/status/cinnamon-screensaver-view-conceal.svg --- old/cinnamon-screensaver-6.2.0/data/icons/hicolor/scalable/status/cinnamon-screensaver-view-conceal.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/cinnamon-screensaver-6.4.0/data/icons/hicolor/scalable/status/cinnamon-screensaver-view-conceal.svg 2024-11-26 14:51:33.000000000 +0100 @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + height="16px" + viewBox="0 0 16 16" + width="16px" + version="1.1" + id="svg867" + sodipodi:docname="cinnamon-screensaver-view-conceal.svg" + inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + <defs + id="defs871" /> + <sodipodi:namedview + id="namedview869" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:showpageshadow="2" + inkscape:pageopacity="0.0" + inkscape:pagecheckerboard="true" + inkscape:deskcolor="#d1d1d1" + showgrid="false" + inkscape:zoom="52.375" + inkscape:cx="6.4725537" + inkscape:cy="8" + inkscape:window-width="1920" + inkscape:window-height="980" + inkscape:window-x="1920" + inkscape:window-y="28" + inkscape:window-maximized="1" + inkscape:current-layer="svg867" /> + <path + d="m 1.53125 0.46875 l -1.0625 1.0625 l 14 14 l 1.0625 -1.0625 l -2.382812 -2.382812 c 1.265624 -1.0625 2.171874 -2.496094 2.589843 -4.097657 c -0.914062 -3.523437 -4.097656 -5.984375 -7.738281 -5.988281 c -1.367188 0.011719 -2.707031 0.371094 -3.894531 1.042969 z m 6.46875 3.53125 c 2.210938 0 4 1.789062 4 4 c -0.003906 0.800781 -0.246094 1.578125 -0.699219 2.238281 l -1.46875 -1.46875 c 0.105469 -0.242187 0.164063 -0.503906 0.167969 -0.769531 c 0 -1.105469 -0.894531 -2 -2 -2 c -0.265625 0.003906 -0.527344 0.0625 -0.769531 0.167969 l -1.46875 -1.46875 c 0.660156 -0.453125 1.4375 -0.695313 2.238281 -0.699219 z m -6.144531 0.917969 c -0.753907 0.898437 -1.296875 1.957031 -1.59375 3.09375 c 0.914062 3.523437 4.097656 5.984375 7.738281 5.988281 c 0.855469 -0.007812 1.703125 -0.152344 2.511719 -0.425781 l -1.667969 -1.667969 c -0.277344 0.058594 -0.5625 0.089844 -0.84375 0.09375 c -2.210938 0 -4 -1.789062 -4 -4 c 0.003906 -0.28125 0.035156 -0.566406 0.09375 -0.84375 z m 0 0" + fill="#2e3436" + id="path865" + style="stroke:none;fill:#ffffff;fill-opacity:0.69999999" /> +</svg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/data/icons/hicolor/scalable/status/cinnamon-screensaver-view-reveal.svg new/cinnamon-screensaver-6.4.0/data/icons/hicolor/scalable/status/cinnamon-screensaver-view-reveal.svg --- old/cinnamon-screensaver-6.2.0/data/icons/hicolor/scalable/status/cinnamon-screensaver-view-reveal.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/cinnamon-screensaver-6.4.0/data/icons/hicolor/scalable/status/cinnamon-screensaver-view-reveal.svg 2024-11-26 14:51:33.000000000 +0100 @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + height="16px" + viewBox="0 0 16 16" + width="16px" + version="1.1" + id="svg4" + sodipodi:docname="cinnamon-screensaver-view-reveal.svg" + inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + <defs + id="defs8" /> + <sodipodi:namedview + id="namedview6" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:showpageshadow="2" + inkscape:pageopacity="0.3372549" + inkscape:pagecheckerboard="true" + inkscape:deskcolor="#d1d1d1" + showgrid="false" + inkscape:zoom="52.375" + inkscape:cx="6.4725537" + inkscape:cy="8" + inkscape:window-width="1920" + inkscape:window-height="980" + inkscape:window-x="1920" + inkscape:window-y="28" + inkscape:window-maximized="1" + inkscape:current-layer="svg4" /> + <path + d="m 8 2 c -3.648438 0.003906 -6.832031 2.476562 -7.738281 6.007812 c 0.914062 3.527344 4.097656 5.988282 7.738281 5.992188 c 3.648438 -0.003906 6.832031 -2.476562 7.738281 -6.011719 c -0.914062 -3.523437 -4.097656 -5.984375 -7.738281 -5.988281 z m 0 2 c 2.210938 0 4 1.789062 4 4 s -1.789062 4 -4 4 s -4 -1.789062 -4 -4 s 1.789062 -4 4 -4 z m 0 2 c -1.105469 0 -2 0.894531 -2 2 s 0.894531 2 2 2 s 2 -0.894531 2 -2 s -0.894531 -2 -2 -2 z m 0 0" + fill="#2e3436" + id="path2" + style="fill:#ffffff;fill-opacity:0.69999999;stroke:none" /> +</svg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/data/meson.build new/cinnamon-screensaver-6.4.0/data/meson.build --- old/cinnamon-screensaver-6.2.0/data/meson.build 2024-06-11 17:57:50.000000000 +0200 +++ new/cinnamon-screensaver-6.4.0/data/meson.build 2024-11-26 14:51:33.000000000 +0100 @@ -8,8 +8,6 @@ dbus_service = configure_file( output: 'org.cinnamon.ScreenSaver.service', input: 'org.cinnamon.ScreenSaver.service.in', - # meson 0.49 - # configuration: { 'EXPANDED_BINDIR': bindir } configuration: misc_conf ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/data/org.cinnamon.ScreenSaver.service.in new/cinnamon-screensaver-6.4.0/data/org.cinnamon.ScreenSaver.service.in --- old/cinnamon-screensaver-6.2.0/data/org.cinnamon.ScreenSaver.service.in 2024-06-11 17:57:50.000000000 +0200 +++ new/cinnamon-screensaver-6.4.0/data/org.cinnamon.ScreenSaver.service.in 2024-11-26 14:51:33.000000000 +0100 @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.cinnamon.ScreenSaver -Exec=@EXPANDED_BINDIR@/cinnamon-screensaver +Exec=@bindir@/cinnamon-screensaver diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/debian/changelog new/cinnamon-screensaver-6.4.0/debian/changelog --- old/cinnamon-screensaver-6.2.0/debian/changelog 2024-06-11 17:57:50.000000000 +0200 +++ new/cinnamon-screensaver-6.4.0/debian/changelog 2024-11-26 14:51:33.000000000 +0100 @@ -1,3 +1,33 @@ +cinnamon-screensaver (6.4.0) xia; urgency=medium + + [ Michael Webster ] + * build: Use debugoptimized, remove some obsolete meson bits. + * cs-backup-locker.c: Exit gracefully if incorrect arguments are given, instead of crashing. + * Make codespell happy. + * unlock dialog: Allow password visibility to be toggled. + + [ Matt Turnbull ] + * Follow-up to 60ad855 - remove g-codegen.py now that it is unreferenced. (#458) + + [ Michael Webster ] + * Don't package private library and typelib files separately. + * Simplify authClient.py pam helper path. + + [ Fabio Fantoni ] + * fix executable libraries + * Debian packaging improvement (#459) + + [ Michael Webster ] + * keybindings: Ignore shift-f10 (alternate menu popup shortcut). + + [ Fabio Fantoni ] + * Update debian/copyright (#461) + + [ Alex Badea ] + * libscreensaver: fix detection of monitor hotplug (#463) + + -- Clement Lefebvre <root(a)linuxmint.com> Tue, 26 Nov 2024 13:50:06 +0000 + cinnamon-screensaver (6.2.0) wilma; urgency=medium [ Michael Webster ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/debian/cinnamon-screensaver-pam-helper.install new/cinnamon-screensaver-6.4.0/debian/cinnamon-screensaver-pam-helper.install --- old/cinnamon-screensaver-6.2.0/debian/cinnamon-screensaver-pam-helper.install 2024-06-11 17:57:50.000000000 +0200 +++ new/cinnamon-screensaver-6.4.0/debian/cinnamon-screensaver-pam-helper.install 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -/usr/lib/*/cinnamon-screensaver-pam-helper diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/debian/cinnamon-screensaver.install new/cinnamon-screensaver-6.4.0/debian/cinnamon-screensaver.install --- old/cinnamon-screensaver-6.2.0/debian/cinnamon-screensaver.install 2024-06-11 17:57:50.000000000 +0200 +++ new/cinnamon-screensaver-6.4.0/debian/cinnamon-screensaver.install 2024-11-26 14:51:33.000000000 +0100 @@ -1,10 +1,9 @@ etc/pam.d/cinnamon-screensaver usr/bin -usr/lib/*/cinnamon-screensaver/cinnamon-screensaver-pam-helper -usr/lib/*/cinnamon-screensaver/cs-backup-locker usr/share/applications usr/share/cinnamon-screensaver/*.css usr/share/cinnamon-screensaver/*.py usr/share/cinnamon-screensaver/*/*.py usr/share/dbus-1 usr/share/icons +usr/libexec/cinnamon-screensaver \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/debian/compat new/cinnamon-screensaver-6.4.0/debian/compat --- old/cinnamon-screensaver-6.2.0/debian/compat 2024-06-11 17:57:50.000000000 +0200 +++ new/cinnamon-screensaver-6.4.0/debian/compat 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -11 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/debian/control new/cinnamon-screensaver-6.4.0/debian/control --- old/cinnamon-screensaver-6.2.0/debian/control 2024-06-11 17:57:50.000000000 +0200 +++ new/cinnamon-screensaver-6.4.0/debian/control 2024-11-26 14:51:33.000000000 +0100 @@ -3,19 +3,19 @@ Priority: optional Maintainer: Linux Mint <root(a)linuxmint.com> Build-Depends: - debhelper (>= 11.1~), - dh-python, - gnome-pkg-tools (>= 0.10), + debhelper-compat (= 13), + dh-sequence-python3, + gnome-pkg-tools, gobject-introspection, - intltool (>= 0.40.0), + intltool, libdbus-1-dev, libgirepository1.0-dev, - libglib2.0-dev (>= 2.37.3), - libgtk-3-dev (>= 3.22), + libglib2.0-dev, + libgtk-3-dev, libpam0g-dev, libxdo-dev, libxext-dev, - meson (>= 0.40.0), + meson, python3, Standards-Version: 3.9.6 @@ -23,34 +23,32 @@ Architecture: any Pre-Depends: ${misc:Pre-Depends} Depends: - cinnamon-desktop-data (>= 3.5), - gir1.2-cinnamondesktop-3.0 (>= 4.8), + cinnamon-desktop-data (>= 6.0), + gir1.2-caribou-1.0, + gir1.2-cinnamondesktop-3.0 (>= 6.0), + gir1.2-gdk-3.0, + gir1.2-gdkpixbuf-2.0, + gir1.2-gio-2.0, gir1.2-gkbd-3.0, gir1.2-glib-2.0, + gir1.2-gobject-2.0, gir1.2-gtk-3.0, + gir1.2-pango-1.0, gir1.2-xapp-1.0, iso-flag-png, - libcscreensaver0 (= ${binary:Version}), libxdo3, python3, python3-gi, python3-gi-cairo, python3-setproctitle, - python3-xapp (>= 1.0.1), + python3-xapp, python3-xlib, x11-utils, ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}, Recommends: libpam-gnome-keyring -Breaks: - cinnamon-screensaver-pam-helper (<< 3.8), - cinnamon-screensaver-webkit-plugin (<< 3.9), - cinnamon-screensaver-x-plugin (<< 3.9) -Replaces: - cinnamon-screensaver-pam-helper (<< 3.8), - cinnamon-screensaver-webkit-plugin (<< 3.9), - cinnamon-screensaver-x-plugin (<< 3.9) +Breaks: libcscreensaver0 (<< ${source:Version}) Description: Cinnamon screen saver and locker cinnamon-screensaver is a screen saver and locker that aims to have simple, sane and secure defaults, and be well integrated with the Cinnamon desktop. @@ -61,18 +59,6 @@ Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} -Depends: libcscreensaver0 (= ${binary:Version}), ${misc:Depends} +Depends: cinnamon-screensaver (= ${binary:Version}), ${misc:Depends} Description: Cinnamon Screensaver library - debug symbols This package contains the symbols files needed to debug the Cinnamon Screensaver library. - -Package: libcscreensaver0 -Section: libs -Architecture: any -Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} -Depends: ${misc:Depends}, ${shlibs:Depends} -Description: library and introspection data used by cinnamon-screensaver - cinnamon-screensaver is a screen saver and locker that aims to have simple, - sane and secure defaults, and be well integrated with the Cinnamon desktop. - . - This package contains the library used by the screensaver. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/debian/copyright new/cinnamon-screensaver-6.4.0/debian/copyright --- old/cinnamon-screensaver-6.2.0/debian/copyright 2024-06-11 17:57:50.000000000 +0200 +++ new/cinnamon-screensaver-6.4.0/debian/copyright 2024-11-26 14:51:33.000000000 +0100 @@ -1,20 +1,21 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: cinnamon-screensaver Upstream-Contact: Linux Mint Project <root(a)linuxmint.com> Source: https://github.com/linuxmint/cinnamon-screensaver.git Files: * -Copyright: 2016, Michael Webster <miketwebster(a)gmail.com> +Copyright: 2003, Bill Nottingham <notting(a)redhat.com> + 1989-1991, Free Software Foundation, Inc + 1991-2004, Jamie Zawinski <jwz(a)jwz.org> + 2016, Michael Webster <miketwebster(a)gmail.com> + 2006, Ray Strode <rstrode(a)redhat.com> + 2002, Sun Microsystems + 2004-2006, William Jon McCann <mccann(a)jhu.edu> License: GPL-2+ -Files: COPYING.LIB -Copyright: 1951, Franklin Street - Suite 500, Boston, MA, 02110-1335, USA - 1991, Free Software Foundation, Inc -License: LGPL-2+ - Files: debian/* -Copyright: 2014-2017, Maximiliano Curia <maxy(a)debian.org> -Copyright: 2013-2017, Linux Mint Project <root(a)linuxmint.com> +Copyright: 2014-2016, Maximiliano Curia <maxy(a)debian.org> + 2013-2024, Linux Mint Project <root(a)linuxmint.com> License: LGPL-2+ Files: libcscreensaver/setuid.c @@ -25,11 +26,6 @@ 2004, William Jon McCann <mccann(a)jhu.edu> License: MIT/X11 -Files: po/Makefile.in.in -Copyright: 2004-2008, Rodney Dawes <dobey.pwns(a)gmail.com> - 1995-1997, Ulrich Drepper <drepper(a)gnu.ai.mit.edu> -License: Permissive - License: GPL-2+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -66,8 +62,3 @@ documentation. No representations are made about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. - -License: Permissive - This file may be copied and used freely without restrictions. It may - be used in projects which are not available under a GNU Public License, - but which still want to provide support for the GNU gettext functionality. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/debian/libcscreensaver0.install new/cinnamon-screensaver-6.4.0/debian/libcscreensaver0.install --- old/cinnamon-screensaver-6.2.0/debian/libcscreensaver0.install 2024-06-11 17:57:50.000000000 +0200 +++ new/cinnamon-screensaver-6.4.0/debian/libcscreensaver0.install 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -usr/lib/*/girepository-1.0/CScreensaver-1.0.typelib -usr/lib/*/libcscreensaver.so.0 -usr/lib/*/libcscreensaver.so.0.* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/debian/rules new/cinnamon-screensaver-6.4.0/debian/rules --- old/cinnamon-screensaver-6.2.0/debian/rules 2024-06-11 17:57:50.000000000 +0200 +++ new/cinnamon-screensaver-6.4.0/debian/rules 2024-11-26 14:51:33.000000000 +0100 @@ -1,26 +1,27 @@ #!/usr/bin/make -f -export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) %: - dh $@ --with=python3 + dh $@ override_dh_strip: dh_strip --dbg-package=libcscreensaver-dbg override_dh_auto_configure: dh_auto_configure -- \ - --libexecdir=lib/$(DEB_HOST_MULTIARCH)/cinnamon-screensaver \ - -D use-debian-pam=true + --libexecdir=libexec \ + --buildtype=debugoptimized \ + -D use-debian-pam=true \ + +execute_after_dh_fixperms: + : # fix executable libraries + chmod 0644 debian/cinnamon-screensaver/usr/libexec/cinnamon-screensaver/girepository-1.0/CScreensaver-1.0.typelib + chmod 0644 debian/cinnamon-screensaver/usr/libexec/cinnamon-screensaver/libcscreensaver.so # there has never been a testsuite, so don't try running it and breaking # just because there isn't one override_dh_auto_test: -# --list-missing will be default in compat 12 -override_dh_missing: - dh_missing --list-missing - override_dh_python3: dh_python3 usr/share/cinnamon-screensaver diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/libcscreensaver/cs-auth-pam.c new/cinnamon-screensaver-6.4.0/libcscreensaver/cs-auth-pam.c --- old/cinnamon-screensaver-6.2.0/libcscreensaver/cs-auth-pam.c 2024-06-11 17:57:50.000000000 +0200 +++ new/cinnamon-screensaver-6.4.0/libcscreensaver/cs-auth-pam.c 2024-11-26 14:51:33.000000000 +0100 @@ -234,7 +234,7 @@ g_idle_add ((GSourceFunc) cs_auth_queued_message_handler, &data); if (cs_auth_get_verbose ()) { - DEBUG ("cs-auth-pam (pid %i): Waiting for respose to message style %d: '%s'\n", getpid (), style, msg); + DEBUG ("cs-auth-pam (pid %i): Waiting for response to message style %d: '%s'\n", getpid (), style, msg); } /* Wait for the response @@ -244,7 +244,7 @@ g_mutex_unlock (message_handler_mutex); if (cs_auth_get_verbose ()) { - DEBUG ("cs-auth-pam (pid %i): Got respose to message style %d: interrupt:%d\n", getpid (), style, data.should_interrupt_stack); + DEBUG ("cs-auth-pam (pid %i): Got response to message style %d: interrupt:%d\n", getpid (), style, data.should_interrupt_stack); } return data.should_interrupt_stack == FALSE; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/libcscreensaver/cs-event-grabber.c new/cinnamon-screensaver-6.4.0/libcscreensaver/cs-event-grabber.c --- old/cinnamon-screensaver-6.2.0/libcscreensaver/cs-event-grabber.c 2024-06-11 17:57:50.000000000 +0200 +++ new/cinnamon-screensaver-6.4.0/libcscreensaver/cs-event-grabber.c 2024-11-26 14:51:33.000000000 +0100 @@ -538,7 +538,7 @@ is that both a keyboard grab and a mouse grab are mandatory - If we don't have a keyboard grab, then we won't be able to - read a password to unlock, so the kbd grab is manditory. + read a password to unlock, so the kbd grab is mandatory. - If we don't have a mouse grab, then we might not see mouse clicks as a signal to unblank, on-screen widgets won't work ideally, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/libcscreensaver/cs-screen-x11.c new/cinnamon-screensaver-6.4.0/libcscreensaver/cs-screen-x11.c --- old/cinnamon-screensaver-6.2.0/libcscreensaver/cs-screen-x11.c 2024-06-11 17:57:50.000000000 +0200 +++ new/cinnamon-screensaver-6.4.0/libcscreensaver/cs-screen-x11.c 2024-11-26 14:51:33.000000000 +0100 @@ -416,7 +416,7 @@ { // Check to see if the union of monitor rects is the same size as the screen - GdkRectangle total_monitors; + GdkRectangle total_monitors = {0}; gint i; gboolean same; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/libcscreensaver/g-codegen.py new/cinnamon-screensaver-6.4.0/libcscreensaver/g-codegen.py --- old/cinnamon-screensaver-6.2.0/libcscreensaver/g-codegen.py 2024-06-11 17:57:50.000000000 +0200 +++ new/cinnamon-screensaver-6.4.0/libcscreensaver/g-codegen.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ -#!/usr/bin/env python3 - -''' -FIXME - -This script is used only to call gdbus-codegen and simulate the -generation of the source code and header as different targets. - -Both are generated implicitly, so meson is not able to know how -many files are generated, so it does generate only one opaque -target that represents the two files. - -originally from: -https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/5924d72931a030b24554116a48140a661a99652b - -Please see: - https://bugzilla.gnome.org/show_bug.cgi?id=791015 - https://github.com/mesonbuild/meson/pull/2930 - https://github.com/linuxmint/xapps/commit/539ed7377cff41643608cf61ed1a8430a… -''' - -import subprocess -import sys -import os - -subprocess.call([ - 'gdbus-codegen', - '--interface-prefix=' + sys.argv[1], - '--generate-c-code=' + os.path.join(sys.argv[4], sys.argv[2]), - '--c-namespace=Cs'] + - sys.argv[3].split() + [sys.argv[5]] -) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/libcscreensaver/meson.build new/cinnamon-screensaver-6.4.0/libcscreensaver/meson.build --- old/cinnamon-screensaver-6.2.0/libcscreensaver/meson.build 2024-06-11 17:57:50.000000000 +0200 +++ new/cinnamon-screensaver-6.4.0/libcscreensaver/meson.build 2024-11-26 14:51:33.000000000 +0100 @@ -104,47 +104,11 @@ ] dbus_built = [] -# foreach dbus: dbus_files -# dbus_built += gnome.gdbus_codegen(dbus[0], '@0@.xml'.format(dbus[2]), -# namespace: 'Cs', -# annotations: dbus[1] -# ) -# endforeach - -# FIXME: Ugly workaround that simulates the generation of -# two different targets, so headers can be included -# explicitly for introspection. -# -# This can be removed once all platforms use meson >=.46 -# and replaced with gnome.gdbus_codegen -codegen = find_program('g-codegen.py') - foreach dbus: dbus_files - annotations = [] - - foreach item: dbus[1] - annotations += '--annotate' - annotations += item - endforeach - - annotations_string = ' '.join(annotations) - - generated = custom_target( - dbus[0], - input: '@0@.xml'.format(dbus[2]), - output: ['@0@.h'.format(dbus[0]), '@0@.c'.format(dbus[0])], - command: [ - codegen, - dbus[2], - dbus[0], - annotations_string, - meson.current_build_dir(), - '@INPUT@', '@OUTPUT@' - ] - ) - - dbus_built += generated[0] - dbus_built += generated[1] + dbus_built += gnome.gdbus_codegen(dbus[0], '@0@.xml'.format(dbus[2]), + namespace: 'Cs', + annotations: dbus[1] + ) endforeach # non-pam auth implementations are not implemented at this time @@ -176,24 +140,13 @@ libcscreensaver = library( 'cscreensaver', cscreensaver_sources + gir_sources, - version: '0.0.0', include_directories: inc, cpp_args: '-DG_LOG_DOMAIN="CScreensaver"', dependencies: libcscreensaver_deps, + install_dir: pkglibdir, install: true ) -pkgconfig.generate( - # TODO meson 0.46 replace libraries, name, version with positional library argument - libraries: libcscreensaver, - name: 'cscreensaver', - version: meson.project_version(), - description: 'Small utility lib used by cinnamon-screensaver v3.1+ to provide a GdkWindow filter (not currently introspectable)', - subdirs: 'cscreensaver', - # these should be their variables, but meson < 0.46 strikes again - requires: ['gobject-2.0', 'gtk+-3.0', 'gdk-3.0'] -) - cscreensaver_gir = gnome.generate_gir( libcscreensaver, sources: gir_sources, @@ -202,8 +155,8 @@ identifier_prefix: 'Cs', symbol_prefix: 'cs_', includes: 'Gtk-3.0', + install_dir_typelib: typelibdir, install: true - ) test_passwd = executable( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/libcscreensaver/org.mpris.MediaPlayer2.Player.xml new/cinnamon-screensaver-6.4.0/libcscreensaver/org.mpris.MediaPlayer2.Player.xml --- old/cinnamon-screensaver-6.2.0/libcscreensaver/org.mpris.MediaPlayer2.Player.xml 2024-06-11 17:57:50.000000000 +0200 +++ new/cinnamon-screensaver-6.4.0/libcscreensaver/org.mpris.MediaPlayer2.Player.xml 2024-11-26 14:51:33.000000000 +0100 @@ -38,7 +38,7 @@ </tp:enumvalue> <tp:enumvalue suffix="Track" value="Track"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> - The current track will start again from the begining once it has finished playing + The current track will start again from the beginning once it has finished playing </tp:docstring> </tp:enumvalue> <tp:enumvalue suffix="Playlist" value="Playlist"> @@ -328,7 +328,7 @@ May be: <ul> <li>"None" if the playback will stop when there are no more tracks to play</li> - <li>"Track" if the current track will start again from the begining once it has finished playing</li> + <li>"Track" if the current track will start again from the beginning once it has finished playing</li> <li>"Playlist" if the playback loops through a list of tracks</li> </ul> @@ -440,9 +440,9 @@ setting this property has no effect and can raise an error. - If the playback progresses in a way that is inconstistant with the + If the playback progresses in a way that is inconsistent with the <tp:member-ref>Rate</tp:member-ref> property, the - <tp:member-ref>Seeked</tp:member-ref> signal is emited. + <tp:member-ref>Seeked</tp:member-ref> signal is emitted. </tp:docstring> </property> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/meson.build new/cinnamon-screensaver-6.4.0/meson.build --- old/cinnamon-screensaver-6.2.0/meson.build 2024-06-11 17:57:50.000000000 +0200 +++ new/cinnamon-screensaver-6.4.0/meson.build 2024-11-26 14:51:33.000000000 +0100 @@ -1,4 +1,4 @@ -project('cinnamon-screensaver', 'c', version : '6.2.0', meson_version : '>=0.56.0') +project('cinnamon-screensaver', 'c', version : '6.4.0', meson_version : '>=0.56.0') cc = meson.get_compiler('c') @@ -14,6 +14,9 @@ datadir = join_paths(prefix, get_option('datadir')) pkgdatadir = join_paths(datadir, meson.project_name()) libexecdir = join_paths(prefix, get_option('libexecdir')) +pkglibdir = join_paths(libexecdir, meson.project_name()) +typelibdir = join_paths(pkglibdir, 'girepository-1.0') + libdir = join_paths(prefix, get_option('libdir')) #needed? sysconfdir = join_paths(prefix, get_option('sysconfdir')) @@ -24,10 +27,10 @@ # and 0.49 for using them in configure_file misc_conf = configuration_data() misc_conf.set('prefix', prefix) -misc_conf.set('EXPANDED_BINDIR', bindir) +misc_conf.set('bindir', bindir) misc_conf.set('datadir', datadir) misc_conf.set('pkgdatadir', pkgdatadir) -misc_conf.set('libexecdir', libexecdir) +misc_conf.set('pkglibdir', pkglibdir) misc_conf.set('libdir', libdir) misc_conf.set('PACKAGE', meson.project_name()) misc_conf.set('VERSION', meson.project_version()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/src/binfile.in new/cinnamon-screensaver-6.4.0/src/binfile.in --- old/cinnamon-screensaver-6.2.0/src/binfile.in 2024-06-11 17:57:50.000000000 +0200 +++ new/cinnamon-screensaver-6.4.0/src/binfile.in 2024-11-26 14:51:33.000000000 +0100 @@ -5,4 +5,7 @@ exit 1 fi +export GI_TYPELIB_PATH="@typelibdir@" +export LD_LIBRARY_PATH="@pkglibdir@" + exec @install_dir@/@target@ "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/src/config.py.in new/cinnamon-screensaver-6.4.0/src/config.py.in --- old/cinnamon-screensaver-6.2.0/src/config.py.in 2024-06-11 17:57:50.000000000 +0200 +++ new/cinnamon-screensaver-6.4.0/src/config.py.in 2024-11-26 14:51:33.000000000 +0100 @@ -5,7 +5,7 @@ localedir=datadir+"/locale" pkgdatadir="@pkgdatadir@" libdir="@libdir@" -libexecdir="@libexecdir@" +pkglibdir="@pkglibdir@" PACKAGE="@PACKAGE@" VERSION="@VERSION@" GETTEXT_PACKAGE="@GETTEXT_PACKAGE@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/src/manager.py new/cinnamon-screensaver-6.4.0/src/manager.py --- old/cinnamon-screensaver-6.2.0/src/manager.py 2024-06-11 17:57:50.000000000 +0200 +++ new/cinnamon-screensaver-6.4.0/src/manager.py 2024-11-26 14:51:33.000000000 +0100 @@ -278,7 +278,7 @@ term_tty, session_tty = self.get_tty_vals() argv = [ - os.path.join(config.libexecdir, "cs-backup-locker"), + os.path.join(config.pkglibdir, "cs-backup-locker"), "--xid", str(self.stage.get_window().get_xid()), "--term", term_tty, "--session", session_tty diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/src/meson.build new/cinnamon-screensaver-6.4.0/src/meson.build --- old/cinnamon-screensaver-6.2.0/src/meson.build 2024-06-11 17:57:50.000000000 +0200 +++ new/cinnamon-screensaver-6.4.0/src/meson.build 2024-11-26 14:51:33.000000000 +0100 @@ -8,17 +8,6 @@ config_py = configure_file( output: 'config.py', input: 'config.py.in', - # meson 0.49 - #configuration: { - # 'prefix': prefix, - # 'datadir': datadir, - # 'pkgdatadir': pkgdatadir, - # 'libexecdir': libexecdir, - # 'libdir': libdir, - # 'PACKAGE': meson.project_name(), - # 'VERSION': meson.project_version(), - # 'GETTEXT_PACKAGE': meson.project_name() - #} configuration: misc_conf ) @@ -62,6 +51,8 @@ prefix_info = configuration_data() prefix_info.set('install_dir', pkgdatadir) prefix_info.set('target', script[0]) + prefix_info.set('pkglibdir', pkglibdir) + prefix_info.set('typelibdir', typelibdir) bin_file = configure_file( input : 'binfile.in', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/src/pamhelper/authClient.py new/cinnamon-screensaver-6.4.0/src/pamhelper/authClient.py --- old/cinnamon-screensaver-6.2.0/src/pamhelper/authClient.py 2024-06-11 17:57:50.000000000 +0200 +++ new/cinnamon-screensaver-6.4.0/src/pamhelper/authClient.py 2024-11-26 14:51:33.000000000 +0100 @@ -40,25 +40,10 @@ try: helper_path = None - architecture = platform.machine() - paths = [config.libexecdir, "/usr/lib", "/usr/lib/cinnamon-screensaver", "/usr/libexec", "/usr/libexec/cinnamon-screensaver"] - # On x86 archs, iterate through multiple paths - # For instance, on a Mint i686 box, the path is actually /usr/lib/i386-linux-gnu - x86archs = ["i386", "i486", "i586", "i686"] - if architecture in x86archs: - for arch in x86archs: - paths += ["/usr/lib/%s" % arch, "/usr/lib/%s-linux-gnu" % arch] - elif architecture == "x86_64": - paths += ["/usr/lib/x86_64", "/usr/lib/x86_64-linux-gnu", "/usr/lib64"] - else: - paths += ["/usr/lib/%s" % architecture, "/usr/lib/%s-linux-gnu" % architecture] - - for path in paths: - full_path = os.path.join(path, "cinnamon-screensaver-pam-helper") - if os.path.exists(full_path): - helper_path = full_path - break + full_path = os.path.join(config.pkglibdir, "cinnamon-screensaver-pam-helper") + if os.path.exists(full_path): + helper_path = full_path if helper_path is None: print ("authClient: critical Error: PAM Helper could not be found!") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/src/pamhelper/meson.build new/cinnamon-screensaver-6.4.0/src/pamhelper/meson.build --- old/cinnamon-screensaver-6.2.0/src/pamhelper/meson.build 2024-06-11 17:57:50.000000000 +0200 +++ new/cinnamon-screensaver-6.4.0/src/pamhelper/meson.build 2024-11-26 14:51:33.000000000 +0100 @@ -10,6 +10,7 @@ dependencies: [gio_unix, glib], include_directories: inc, link_with: libcscreensaver, + install_rpath: pkglibdir, install: true, - install_dir: libexecdir + install_dir: pkglibdir ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/src/passwordEntry.py new/cinnamon-screensaver-6.4.0/src/passwordEntry.py --- old/cinnamon-screensaver-6.2.0/src/passwordEntry.py 2024-06-11 17:57:50.000000000 +0200 +++ new/cinnamon-screensaver-6.4.0/src/passwordEntry.py 2024-11-26 14:51:33.000000000 +0100 @@ -29,6 +29,9 @@ self.set_placeholder_text (placeholder_text) self.set_can_default(True) + self.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, "cinnamon-screensaver-view-reveal") + trackers.con_tracker_get().connect(self, "icon-press", self.on_icon_pressed) + self.placeholder_text = placeholder_text self.current_icon_name = None self.current_flag_id = 0 @@ -174,6 +177,16 @@ def on_icon_pressed(self, entry, icon_pos, event): if icon_pos == Gtk.EntryIconPosition.PRIMARY: self.keyboard_controller.next_group() + elif icon_pos == Gtk.EntryIconPosition.SECONDARY: + if self.get_input_purpose() == Gtk.InputPurpose.FREE_FORM: + self.set_visibility(False) + self.set_input_purpose(Gtk.InputPurpose.PASSWORD) + self.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, "cinnamon-screensaver-view-reveal") + else: + self.set_visibility(True) + self.set_input_purpose(Gtk.InputPurpose.FREE_FORM) + self.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, "cinnamon-screensaver-view-conceal") + self.queue_draw() def update_layout_icon(self): """ @@ -223,10 +236,6 @@ self.update_layout_icon() trackers.con_tracker_get().connect(self, - "icon-press", - self.on_icon_pressed) - - trackers.con_tracker_get().connect(self, "draw", self.on_draw) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/src/singletons.py new/cinnamon-screensaver-6.4.0/src/singletons.py --- old/cinnamon-screensaver-6.2.0/src/singletons.py 2024-06-11 17:57:50.000000000 +0200 +++ new/cinnamon-screensaver-6.4.0/src/singletons.py 2024-11-26 14:51:33.000000000 +0100 @@ -15,7 +15,7 @@ # clients that the screensaver initializes, that can never fail. The actual connection # business to the various dbus address is performed asynchronously from within each client. # The following clients can fail to establish with their respective dbus interfaces without -# competely breaking the program (or at least that's what we're after) - it just means that +# completely breaking the program (or at least that's what we're after) - it just means that # depending on what fails, you may end up without keyboard shortcut support, or a battery # widget, etc... from dbusdepot.cinnamonClient import CinnamonClient as _CinnamonClient diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/src/stage.py new/cinnamon-screensaver-6.4.0/src/stage.py --- old/cinnamon-screensaver-6.2.0/src/stage.py 2024-06-11 17:57:50.000000000 +0200 +++ new/cinnamon-screensaver-6.4.0/src/stage.py 2024-11-26 14:51:33.000000000 +0100 @@ -32,7 +32,7 @@ It is Gtk.WindowType.POPUP to avoid being managed/composited by muffin, and to prevent animation during its creation and destruction. - The Stage reponds pretty much only to the instructions of the + The Stage responds pretty much only to the instructions of the ScreensaverManager. """ __gsignals__ = { @@ -876,7 +876,7 @@ unlock_mw, unlock_nw = self.unlock_dialog.get_preferred_width() """ If, for whatever reason, we need more than 1/3 of the screen to fully display - the unlock dialog, reduce our available region width to accomodate it, reducing + the unlock dialog, reduce our available region width to accommodate it, reducing the allocation for the floating widgets as required. """ if unlock_nw > region_w: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/src/util/eventHandler.py new/cinnamon-screensaver-6.4.0/src/util/eventHandler.py --- old/cinnamon-screensaver-6.2.0/src/util/eventHandler.py 2024-06-11 17:57:50.000000000 +0200 +++ new/cinnamon-screensaver-6.4.0/src/util/eventHandler.py 2024-11-26 14:51:33.000000000 +0100 @@ -34,7 +34,7 @@ def on_motion_event(self, event): """ Any mouse movement is sent here - there is a threshold to reach when - asleep, so that inadvertant motion doesn't wake the system unintentionally. + asleep, so that inadvertent motion doesn't wake the system unintentionally. """ if status.Awake: self.on_user_activity() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/src/util/keybindings.py new/cinnamon-screensaver-6.4.0/src/util/keybindings.py --- old/cinnamon-screensaver-6.2.0/src/util/keybindings.py 2024-06-11 17:57:50.000000000 +0200 +++ new/cinnamon-screensaver-6.4.0/src/util/keybindings.py 2024-11-26 14:51:33.000000000 +0100 @@ -104,7 +104,7 @@ self.manager.cancel_unlocking() return True - if event.keyval == Gdk.KEY_Menu: + if event.keyval in (Gdk.KEY_Menu, Gdk.KEY_F10): return True if status.Awake:

1 0

commit python-python-poppler for openSUSE:Factory
by Source-Sync 20 Jan '25

20 Jan '25

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-python-poppler for openSUSE:Factory checked in at 2025-01-20 17:14:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-python-poppler (Old) and /work/SRC/openSUSE:Factory/.python-python-poppler.new.5589 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-python-poppler" Mon Jan 20 17:14:28 2025 rev:5 rq:1238866 version:0.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-python-poppler/python-python-poppler.changes 2023-08-23 14:59:54.486236200 +0200 +++ /work/SRC/openSUSE:Factory/.python-python-poppler.new.5589/python-python-poppler.changes 2025-01-20 17:15:03.615394111 +0100 @@ -1,0 +2,28 @@ +Mon Jan 20 01:36:18 UTC 2025 - Steve Kowalik <steven.kowalik(a)suse.com> + +- Add patch support-poppler-25.01.patch: + * Support Poppler 25.01 changes. + +------------------------------------------------------------------- +Mon Jan 13 01:28:43 UTC 2025 - Steve Kowalik <steven.kowalik(a)suse.com> + +- Update to 0.4.1: + * Fix non-pure build for meson-python + * Tested with Python 3.11 and Poppler 23.04.0 + * Minimal supported Python version is now 3.7 + * Tested with Python 3.11 and Poppler 23.03.0 + * Build system is now meson, and package is PEP-517 compliant + * Tested with Python 3.10 and Poppler 22.04.0 + * EmbeddedFile data() and checksum() now return bytes + * Bugfix: Fixed typos in EmbeddedFile.modification_date and + EmbeddedFile.is_valid + * Bugfix: Fixed typo in page.search + * Bugfix: Fix underscore position in two attributes of the Rotation Enum + * Bugfix: Reading pdf_version now requires unlocked document + * Bugfix: Ensure document was loaded before creating Document object +- Drop patch fix-image-argb.patch, no longer required. +- No longer use disabled service to update, we don't need to clean up + pybind11 sources, switch to the GitHub tarball to keep the testsuite. +- Refresh patch use-system-pybind11.patch to work with meson. + +------------------------------------------------------------------- Old: ---- _service _servicedata fix-image-argb.patch python-poppler-0.2.2.tar.xz New: ---- python-poppler-0.4.1.tar.gz support-poppler-25.01.patch BETA DEBUG BEGIN: Old: * Bugfix: Ensure document was loaded before creating Document object - Drop patch fix-image-argb.patch, no longer required. - No longer use disabled service to update, we don't need to clean up BETA DEBUG END: BETA DEBUG BEGIN: New: - Add patch support-poppler-25.01.patch: * Support Poppler 25.01 changes. BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-python-poppler.spec ++++++ --- /var/tmp/diff_new_pack.UlZVJ4/_old 2025-01-20 17:15:05.223460308 +0100 +++ /var/tmp/diff_new_pack.UlZVJ4/_new 2025-01-20 17:15:05.227460473 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-python-poppler # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2025 SUSE LLC # Copyright (c) 2020 LISA GmbH ,Bingen, Germany # # All modifications and additions to the file contributed by third parties @@ -17,28 +17,28 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define skip_python2 1 Name: python-python-poppler -Version: 0.2.2 +Version: 0.4.1 Release: 0 Summary: Python binding to the poppler-cpp library License: GPL-2.0-only -Group: Development/Libraries/Python URL: https://github.com/cbrunet/python-poppler -Source: python-poppler-%{version}.tar.xz -Patch: use-system-pybind11.patch -Patch1: fix-image-argb.patch -BuildRequires: %{python_module devel} +Source: https://github.com/cbrunet/python-poppler/archive/refs/tags/v%{version}.tar… +# PATCH-FEATURE-OPENSUSE Build against system pybind11 +Patch0: use-system-pybind11.patch +# PATCH-FIX-UPSTREAM gh#cbrunet/python-poppler#92 +Patch1: support-poppler-25.01.patch +BuildRequires: %{python_module devel >= 3.7} +BuildRequires: %{python_module meson-python} +BuildRequires: %{python_module pip} BuildRequires: %{python_module pybind11-devel} BuildRequires: %{python_module pytest} -BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} BuildRequires: c++_compiler -BuildRequires: cmake BuildRequires: fdupes +BuildRequires: ninja BuildRequires: pkg-config BuildRequires: python-rpm-macros -BuildRequires: python3 BuildRequires: pkgconfig(poppler) # some tests require this BuildRequires: poppler-data @@ -58,24 +58,22 @@ %prep %autosetup -p1 -n python-poppler-%version -sed -i -e "s/-j2/%{?_smp_mflags}/" setup.py +rm -rf subprojects %build export CXXFLAGS="%{optflags}" -%python_build --debug +%pyproject_wheel %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitearch} %check -# gh#cbrunet/python-poppler#39 -donttest="test_get_pdf_version_of_locked_document" -%pytest_arch tests -k "not ($donttest)" +%pytest_arch tests %files %{python_files} %license LICENSE.txt %doc README.md %{python_sitearch}/poppler -%{python_sitearch}/python_poppler-%{version}*-info +%{python_sitearch}/python_poppler-%{version}.dist-info ++++++ support-poppler-25.01.patch ++++++ From 6cc307548a490ddaf2054ead00b8e354b494e5bc Mon Sep 17 00:00:00 2001 From: Bohumir Zamecnik <bohumir.zamecnik(a)gmail.com> Date: Thu, 16 Jan 2025 16:52:41 +0700 Subject: [PATCH] Fix: Remove image.copy() argument in poppler 25.01 - from poppler changelog: "Remove rect parameter from image::copy, it was never implemented" --- src/cpp/image.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/cpp/image.cpp b/src/cpp/image.cpp index 725359b..91131f4 100644 --- a/src/cpp/image.cpp +++ b/src/cpp/image.cpp @@ -102,7 +102,11 @@ PYBIND11_MODULE(image, m) .def(py::init<int, int, image::format_enum>(), py::arg("iwidth"), py::arg("iheight"), py::arg("iformat")) .def("bytes_per_row", &image::bytes_per_row) // .def("const_data", &image::const_data) +#if HAS_VERSION(25, 1) + .def("copy", &image::copy) +#else .def("copy", &image::copy, py::arg("rect") = rect()) +#endif .def("data", &data) .def("set_data", &set_data) .def("format", &image::format) ++++++ use-system-pybind11.patch ++++++ --- /var/tmp/diff_new_pack.UlZVJ4/_old 2025-01-20 17:15:05.263461955 +0100 +++ /var/tmp/diff_new_pack.UlZVJ4/_new 2025-01-20 17:15:05.263461955 +0100 @@ -1,42 +1,18 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 936467d..0f97a75 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -6,8 +6,8 @@ list(APPEND Targets "page_renderer" "page_transition") - list(APPEND Targets "embedded_file" "destination" "toc" "font") +Index: python-poppler-0.4.1/meson.build +=================================================================== +--- python-poppler-0.4.1.orig/meson.build ++++ python-poppler-0.4.1/meson.build +@@ -13,7 +13,10 @@ poppler_dep = dependency('poppler-cpp', + python_mod = import('python') + python3 = python_mod.find_installation('python3', pure: false) +-pybind11_proj = subproject('pybind11') +-pybind11_dep = pybind11_proj.get_variable('pybind11_dep') ++pybind11_config = find_program('pybind11-config') ++pybind11_config_ret = run_command(pybind11_config, ['--includes'], check: true) ++pybind11_dep = declare_dependency( ++ include_directories: [pybind11_config_ret.stdout().split('-I')[-1].strip()], ++) --# find_package(pybind11) --add_subdirectory(pybind11) -+find_package(pybind11) -+# add_subdirectory(pybind11) - - - find_package(PkgConfig REQUIRED) -diff --git a/setup.py b/setup.py -index c1ba5f6..34f6ac3 100644 ---- a/setup.py -+++ b/setup.py -@@ -43,6 +43,7 @@ class CMakeBuild(build_ext): - cmake_args = [ - "-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=" + extdir, - "-DPYTHON_EXECUTABLE=" + sys.executable, -+ "-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON", - ] - - cfg = "Debug" if self.debug else "Release" -@@ -65,9 +66,13 @@ class CMakeBuild(build_ext): - ) - if not os.path.exists(self.build_temp): - os.makedirs(self.build_temp) -+ from pprint import pformat -+ print("Env: {}\n".format(pformat(env))) -+ print("Run: {} in {}\n".format(["cmake", ext.sourcedir] + cmake_args, self.build_temp)) - subprocess.check_call( - ["cmake", ext.sourcedir] + cmake_args, cwd=self.build_temp, env=env - ) -+ print("Run: {} in {}\n".format(["cmake", "--build", "."] + build_args, self.build_temp)) - subprocess.check_call( - ["cmake", "--build", "."] + build_args, cwd=self.build_temp - ) + subdir('src')

1 0

commit QMPlay2 for openSUSE:Factory
by Source-Sync 20 Jan '25

20 Jan '25

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package QMPlay2 for openSUSE:Factory checked in at 2025-01-20 17:14:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/QMPlay2 (Old) and /work/SRC/openSUSE:Factory/.QMPlay2.new.5589 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "QMPlay2" Mon Jan 20 17:14:24 2025 rev:91 rq:1238860 version:25.01.19 Changes: -------- --- /work/SRC/openSUSE:Factory/QMPlay2/QMPlay2.changes 2025-01-15 17:43:35.849669940 +0100 +++ /work/SRC/openSUSE:Factory/.QMPlay2.new.5589/QMPlay2.changes 2025-01-20 17:15:00.643271761 +0100 @@ -1,0 +2,14 @@ +Sun Jan 19 21:25:19 UTC 2025 - Simon Vogl <simon.vogl(a)gmx.net> + +- Update to version 25.01.19: + * store maximized state when closing from full screen, + * pass 'yt-dlp' URL argument as 'referer', + * improve still image stream detection, + * allow for local stream recording, + * show left panel in compact view, + * fix YouTube live streams, + * other minor fixes. +- Adjusted 0001-add-opensuse-customizations.patch for the new + version + +------------------------------------------------------------------- Old: ---- QMPlay2-24.12.28.1735406257.eb5b805.obscpio New: ---- QMPlay2-25.01.19.1737296694.09a3b95.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ QMPlay2.spec ++++++ --- /var/tmp/diff_new_pack.Rfwk7Y/_old 2025-01-20 17:15:01.271297614 +0100 +++ /var/tmp/diff_new_pack.Rfwk7Y/_new 2025-01-20 17:15:01.275297779 +0100 @@ -19,11 +19,11 @@ %define __builder Ninja %bcond_without qt6 -%define _mtime 1735406257 -%define _commit eb5b805 +%define _mtime 1737296694 +%define _commit 09a3b95 Name: QMPlay2 -Version: 24.12.28 +Version: 25.01.19 Release: 0 Summary: A Qt based media player, streamer and downloader License: LGPL-3.0-or-later ++++++ 0001-add-opensuse-customizations.patch ++++++ --- /var/tmp/diff_new_pack.Rfwk7Y/_old 2025-01-20 17:15:01.295298602 +0100 +++ /var/tmp/diff_new_pack.Rfwk7Y/_new 2025-01-20 17:15:01.295298602 +0100 @@ -43,12 +43,13 @@ --- a/src/gui/AboutWidget.cpp +++ b/src/gui/AboutWidget.cpp -@@ -49,6 +49,7 @@ - labelText += ", " + QGuiApplication::platformName(); +@@ -50,6 +50,8 @@ #endif labelText += ")"; -+ labelText += " This release was supplied by SUSE/openSUSE."; + labelText += " <a href='https://github.com/zaps166/QMPlay2/releases/latest'>" + tr("GitHub download page") + "</a>"; ++ labelText += " This release was supplied by SUSE/openSUSE"; ++ labelText += " and can be updated via the package manager."; QLabel *label = new QLabel(labelText); - + QLabel *iconL = new QLabel; ++++++ QMPlay2-24.12.28.1735406257.eb5b805.obscpio -> QMPlay2-25.01.19.1737296694.09a3b95.obscpio ++++++ /work/SRC/openSUSE:Factory/QMPlay2/QMPlay2-24.12.28.1735406257.eb5b805.obscpio /work/SRC/openSUSE:Factory/.QMPlay2.new.5589/QMPlay2-25.01.19.1737296694.09a3b95.obscpio differ: char 49, line 1 ++++++ QMPlay2.obsinfo ++++++ --- /var/tmp/diff_new_pack.Rfwk7Y/_old 2025-01-20 17:15:01.339300413 +0100 +++ /var/tmp/diff_new_pack.Rfwk7Y/_new 2025-01-20 17:15:01.343300578 +0100 @@ -1,5 +1,5 @@ name: QMPlay2 -version: 24.12.28.1735406257.eb5b805 -mtime: 1735406257 -commit: eb5b805ad2da5a2596289452662eb3ef2cddaaf1 +version: 25.01.19.1737296694.09a3b95 +mtime: 1737296694 +commit: 09a3b9576a173076e32dcebfc9cc2faa4bb54702 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.Rfwk7Y/_old 2025-01-20 17:15:01.371301731 +0100 +++ /var/tmp/diff_new_pack.Rfwk7Y/_new 2025-01-20 17:15:01.375301895 +0100 @@ -1,8 +1,8 @@ <services> <service name="obs_scm" mode="manual"> - <param name="versionprefix">24.12.28</param> + <param name="versionprefix">25.01.19</param> <param name="url">https://github.com/zaps166/QMPlay2.git</param> - <param name="revision">eb5b805ad2da5a2596289452662eb3ef2cddaaf1</param> + <param name="revision">09a3b9576a173076e32dcebfc9cc2faa4bb54702</param> <param name="scm">git</param> <param name="submodules">enable</param> <param name="changesgenerate">disable</param>

1 0

commit orthanc for openSUSE:Factory
by Source-Sync 20 Jan '25

20 Jan '25

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package orthanc for openSUSE:Factory checked in at 2025-01-20 17:14:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/orthanc (Old) and /work/SRC/openSUSE:Factory/.orthanc.new.5589 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "orthanc" Mon Jan 20 17:14:23 2025 rev:40 rq:1239028 version:1.12.5 Changes: -------- --- /work/SRC/openSUSE:Factory/orthanc/orthanc.changes 2024-12-22 18:05:19.086512309 +0100 +++ /work/SRC/openSUSE:Factory/.orthanc.new.5589/orthanc.changes 2025-01-20 17:14:59.235213797 +0100 @@ -1,0 +2,5 @@ +Sun Jan 19 10:42:03 UTC 2025 - Axel Braun <axel.braun(a)gmx.de> + +- changed dcmtk.diff to fix TW build error + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ orthanc.spec ++++++ --- /var/tmp/diff_new_pack.p9ER4H/_old 2025-01-20 17:14:59.907241462 +0100 +++ /var/tmp/diff_new_pack.p9ER4H/_new 2025-01-20 17:14:59.911241626 +0100 @@ -1,7 +1,7 @@ # # spec file for package orthanc # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # Copyright (c) 2019-2024 Dr. Axel Braun # # All modifications and additions to the file contributed by third parties ++++++ dcmtk.diff ++++++ --- /var/tmp/diff_new_pack.p9ER4H/_old 2025-01-20 17:15:00.003245414 +0100 +++ /var/tmp/diff_new_pack.p9ER4H/_new 2025-01-20 17:15:00.007245578 +0100 @@ -1,11 +1,12 @@ diff -U 3 -dHrN -- a/OrthancFramework/Resources/CMake/DcmtkConfiguration.cmake b/OrthancFramework/Resources/CMake/DcmtkConfiguration.cmake --- a/OrthancFramework/Resources/CMake/DcmtkConfiguration.cmake 2024-01-31 12:33:17.000000000 +0100 +++ b/OrthancFramework/Resources/CMake/DcmtkConfiguration.cmake 2024-02-07 18:49:46.121815912 +0100 -@@ -302,6 +302,7 @@ +@@ -302,6 +302,8 @@ /usr/share/libdcmtk18 /usr/share/libdcmtk19 /usr/share/libdcmtk20 + /usr/share/dcmtk-3.6.8 ++ /usr/share/dcmtk-3.6.9 /usr/local/share/dcmtk /usr/local/share/dcmtk-3.6.8 )

1 0

commit orthanc-ohif for openSUSE:Factory
by Source-Sync 20 Jan '25

20 Jan '25

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package orthanc-ohif for openSUSE:Factory checked in at 2025-01-20 17:14:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/orthanc-ohif (Old) and /work/SRC/openSUSE:Factory/.orthanc-ohif.new.5589 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "orthanc-ohif" Mon Jan 20 17:14:22 2025 rev:7 rq:1238806 version:1.5 Changes: -------- --- /work/SRC/openSUSE:Factory/orthanc-ohif/orthanc-ohif.changes 2024-12-09 21:12:52.344231325 +0100 +++ /work/SRC/openSUSE:Factory/.orthanc-ohif.new.5589/orthanc-ohif.changes 2025-01-20 17:14:57.395138048 +0100 @@ -1,0 +2,11 @@ +Sun Jan 19 10:06:41 UTC 2025 - Axel Braun <axel.braun(a)gmx.de> + +- version 1.5 + * Updated OHIF to 3.9.2 + * In "dicom-web" data source, fixed the default "app-config.js" + configuration to enable display of PDFs. + * Updated cached "dicom-json" version to 2. This implies that, when using + the "dicom-json" source, the cached metadata will have to be recomputed + the first time you open a study. + +------------------------------------------------------------------- Old: ---- OrthancOHIF-1.4.tar.gz New: ---- OrthancOHIF-1.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ orthanc-ohif.spec ++++++ --- /var/tmp/diff_new_pack.fAINQr/_old 2025-01-20 17:14:58.655189920 +0100 +++ /var/tmp/diff_new_pack.fAINQr/_new 2025-01-20 17:14:58.663190249 +0100 @@ -1,7 +1,7 @@ # # spec file for package orthanc-ohif # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # Copyright (c) 2023-2024 Dr. Axel Braun <DocB(a)opensuse.org> # # All modifications and additions to the file contributed by third parties @@ -22,7 +22,7 @@ Summary: OHIF plugin for Orthanc License: GPL-3.0-or-later Group: Productivity/Graphics/Viewers -Version: 1.4 +Version: 1.5 Release: 0 URL: https://orthanc-server.com Source0: https://orthanc.uclouvain.be/downloads/sources/%{name}/OrthancOHIF-%{versio… ++++++ OrthancOHIF-1.4.tar.gz -> OrthancOHIF-1.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.4/.hg_archival.txt new/OrthancOHIF-1.5/.hg_archival.txt --- old/OrthancOHIF-1.4/.hg_archival.txt 2024-11-26 17:51:13.000000000 +0100 +++ new/OrthancOHIF-1.5/.hg_archival.txt 2025-01-17 18:27:32.000000000 +0100 @@ -1,6 +1,6 @@ repo: 39585ba26f209c4a9d12ece8e4eda1c466775a94 -node: 9f36196247d74b9d979911dd3c966d5917c749c5 -branch: OrthancOHIF-1.4 +node: dfdd30fe1c0303a19a4846f1310a902b1a11259b +branch: OrthancOHIF-1.5 latesttag: null -latesttagdistance: 58 -changessincelatesttag: 58 +latesttagdistance: 67 +changessincelatesttag: 67 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.4/.hgignore new/OrthancOHIF-1.5/.hgignore --- old/OrthancOHIF-1.4/.hgignore 2024-11-26 17:51:13.000000000 +0100 +++ new/OrthancOHIF-1.5/.hgignore 2025-01-17 18:27:32.000000000 +0100 @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2023-2024 Sebastien Jodogne, UCLouvain, Belgium +# SPDX-FileCopyrightText: 2023-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # SPDX-License-Identifier: CC0-1.0 syntax: glob diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.4/.reuse/dep5 new/OrthancOHIF-1.5/.reuse/dep5 --- old/OrthancOHIF-1.4/.reuse/dep5 2024-11-26 17:51:13.000000000 +0100 +++ new/OrthancOHIF-1.5/.reuse/dep5 2025-01-17 18:27:32.000000000 +0100 @@ -4,15 +4,15 @@ Source: https://orthanc.uclouvain.be/ Files: NEWS README TODO CITATION.cff -Copyright: 2023-2024 Sebastien Jodogne, UCLouvain, Belgium, and 2018-2024 Open Health Imaging Foundation +Copyright: 2023-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium, and 2018-2025 Open Health Imaging Foundation License: GPL-3.0-or-later Files: Resources/Orthanc/CMake/* Resources/Orthanc/Toolchains/* -Copyright: 2012-2016 Sebastien Jodogne <s.jodogne(a)gmail.com>, University Hospital of Liege (Belgium), and 2017-2024 Osimis S.A. (Belgium), and 2021-2024 UCLouvain (Belgium) +Copyright: 2012-2016 Sebastien Jodogne <s.jodogne(a)gmail.com>, University Hospital of Liege (Belgium), and 2017-2023 Osimis S.A. (Belgium), and 2021-2025 ICTEAM UCLouvain (Belgium) License: LGPL-3.0-or-later Files: Resources/Orthanc/Plugins/* -Copyright: 2012-2016 Sebastien Jodogne <s.jodogne(a)gmail.com>, University Hospital of Liege (Belgium), and 2017-2024 Osimis S.A. (Belgium), and 2021-2024 UCLouvain (Belgium) +Copyright: 2012-2016 Sebastien Jodogne <s.jodogne(a)gmail.com>, University Hospital of Liege (Belgium), and 2017-2023 Osimis S.A. (Belgium), and 2021-2025 ICTEAM UCLouvain (Belgium) License: GPL-3.0-or-later Files: Resources/Orthanc/Sdk-1.0.0/orthanc/OrthancCPlugin.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.4/CITATION.cff new/OrthancOHIF-1.5/CITATION.cff --- old/OrthancOHIF-1.4/CITATION.cff 2024-11-26 17:51:13.000000000 +0100 +++ new/OrthancOHIF-1.5/CITATION.cff 2025-01-17 18:27:32.000000000 +0100 @@ -10,5 +10,5 @@ doi: "10.1007/s10278-018-0082-y" license: "GPL-3.0-or-later" repository-code: "https://orthanc.uclouvain.be/hg/orthanc/" -version: 1.12.4 -date-released: 2024-06-05 +version: 1.12.5 +date-released: 2024-12-17 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.4/CMakeLists.txt new/OrthancOHIF-1.5/CMakeLists.txt --- old/OrthancOHIF-1.4/CMakeLists.txt 2024-11-26 17:51:13.000000000 +0100 +++ new/OrthancOHIF-1.5/CMakeLists.txt 2025-01-17 18:27:32.000000000 +0100 @@ -1,9 +1,9 @@ -# SPDX-FileCopyrightText: 2023-2024 Sebastien Jodogne, UCLouvain, Belgium +# SPDX-FileCopyrightText: 2023-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # SPDX-License-Identifier: GPL-3.0-or-later # OHIF plugin for Orthanc -# Copyright (C) 2023-2024 Sebastien Jodogne, UCLouvain, Belgium +# Copyright (C) 2023-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -22,17 +22,17 @@ cmake_minimum_required(VERSION 2.8) project(OrthancOHIF) -set(ORTHANC_OHIF_VERSION "1.4") +set(ORTHANC_OHIF_VERSION "1.5") if (ORTHANC_OHIF_VERSION STREQUAL "mainline") set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline") set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg") else() - set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.12.4") + set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.12.5") set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web") endif() -set(METADATA_VERSION 1) +set(METADATA_VERSION 2) ##################################################################### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.4/NEWS new/OrthancOHIF-1.5/NEWS --- old/OrthancOHIF-1.4/NEWS 2024-11-26 17:51:13.000000000 +0100 +++ new/OrthancOHIF-1.5/NEWS 2025-01-17 18:27:32.000000000 +0100 @@ -2,6 +2,17 @@ =============================== +Version 1.5 (2025-01-17) +======================== + +* Updated OHIF to 3.9.2 +* In "dicom-web" data source, fixed the default "app-config.js" + configuration to enable display of PDFs. +* Updated cached "dicom-json" version to 2. This implies that, when using + the "dicom-json" source, the cached metadata will have to be recomputed + the first time you open a study. + + Version 1.4 (2024-11-26) ======================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.4/Resources/ClearMetadataCache.py new/OrthancOHIF-1.5/Resources/ClearMetadataCache.py --- old/OrthancOHIF-1.4/Resources/ClearMetadataCache.py 2024-11-26 17:51:13.000000000 +0100 +++ new/OrthancOHIF-1.5/Resources/ClearMetadataCache.py 2025-01-17 18:27:32.000000000 +0100 @@ -1,10 +1,10 @@ #!/usr/bin/env python3 -# SPDX-FileCopyrightText: 2023-2024 Sebastien Jodogne, UCLouvain, Belgium +# SPDX-FileCopyrightText: 2023-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # SPDX-License-Identifier: GPL-3.0-or-later # OHIF plugin for Orthanc -# Copyright (C) 2023-2024 Sebastien Jodogne, UCLouvain, Belgium +# Copyright (C) 2023-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU General Public License as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.4/Resources/CreateOHIFDist/Dockerfile new/OrthancOHIF-1.5/Resources/CreateOHIFDist/Dockerfile --- old/OrthancOHIF-1.4/Resources/CreateOHIFDist/Dockerfile 2024-11-26 17:51:13.000000000 +0100 +++ new/OrthancOHIF-1.5/Resources/CreateOHIFDist/Dockerfile 2025-01-17 18:27:32.000000000 +0100 @@ -1,8 +1,8 @@ -# SPDX-FileCopyrightText: 2023-2024 Sebastien Jodogne, UCLouvain, Belgium +# SPDX-FileCopyrightText: 2023-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # SPDX-License-Identifier: GPL-3.0-or-later # OHIF plugin for Orthanc -# Copyright (C) 2023-2024 Sebastien Jodogne, UCLouvain, Belgium +# Copyright (C) 2023-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU General Public License as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.4/Resources/CreateOHIFDist/build.sh new/OrthancOHIF-1.5/Resources/CreateOHIFDist/build.sh --- old/OrthancOHIF-1.4/Resources/CreateOHIFDist/build.sh 2024-11-26 17:51:13.000000000 +0100 +++ new/OrthancOHIF-1.5/Resources/CreateOHIFDist/build.sh 2025-01-17 18:27:32.000000000 +0100 @@ -1,10 +1,10 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2023-2024 Sebastien Jodogne, UCLouvain, Belgium +# SPDX-FileCopyrightText: 2023-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # SPDX-License-Identifier: GPL-3.0-or-later # OHIF plugin for Orthanc -# Copyright (C) 2023-2024 Sebastien Jodogne, UCLouvain, Belgium +# Copyright (C) 2023-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU General Public License as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.4/Resources/CreateOHIFDist.sh new/OrthancOHIF-1.5/Resources/CreateOHIFDist.sh --- old/OrthancOHIF-1.4/Resources/CreateOHIFDist.sh 2024-11-26 17:51:13.000000000 +0100 +++ new/OrthancOHIF-1.5/Resources/CreateOHIFDist.sh 2025-01-17 18:27:32.000000000 +0100 @@ -1,10 +1,10 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2023-2024 Sebastien Jodogne, UCLouvain, Belgium +# SPDX-FileCopyrightText: 2023-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # SPDX-License-Identifier: GPL-3.0-or-later # OHIF plugin for Orthanc -# Copyright (C) 2023-2024 Sebastien Jodogne, UCLouvain, Belgium +# Copyright (C) 2023-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -28,7 +28,7 @@ set -ex if [ "$1" = "" ]; then - PACKAGE=Viewers-3.9.1 + PACKAGE=Viewers-3.9.2 else PACKAGE=$1 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.4/Resources/EmbedStaticAssets.py new/OrthancOHIF-1.5/Resources/EmbedStaticAssets.py --- old/OrthancOHIF-1.4/Resources/EmbedStaticAssets.py 2024-11-26 17:51:13.000000000 +0100 +++ new/OrthancOHIF-1.5/Resources/EmbedStaticAssets.py 2025-01-17 18:27:32.000000000 +0100 @@ -1,10 +1,10 @@ #!/usr/bin/python3 -# SPDX-FileCopyrightText: 2023-2024 Sebastien Jodogne, UCLouvain, Belgium +# SPDX-FileCopyrightText: 2023-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # SPDX-License-Identifier: GPL-3.0-or-later # OHIF plugin for Orthanc -# Copyright (C) 2023-2024 Sebastien Jodogne, UCLouvain, Belgium +# Copyright (C) 2023-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU General Public License as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.4/Resources/Orthanc/CMake/AutoGeneratedCode.cmake new/OrthancOHIF-1.5/Resources/Orthanc/CMake/AutoGeneratedCode.cmake --- old/OrthancOHIF-1.4/Resources/Orthanc/CMake/AutoGeneratedCode.cmake 2024-11-26 17:51:13.000000000 +0100 +++ new/OrthancOHIF-1.5/Resources/Orthanc/CMake/AutoGeneratedCode.cmake 2025-01-17 18:27:32.000000000 +0100 @@ -2,8 +2,8 @@ # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium # Copyright (C) 2017-2023 Osimis S.A., Belgium -# Copyright (C) 2024-2024 Orthanc Team SRL, Belgium -# Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium +# Copyright (C) 2024-2025 Orthanc Team SRL, Belgium +# Copyright (C) 2021-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public License diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.4/Resources/Orthanc/CMake/Compiler.cmake new/OrthancOHIF-1.5/Resources/Orthanc/CMake/Compiler.cmake --- old/OrthancOHIF-1.4/Resources/Orthanc/CMake/Compiler.cmake 2024-11-26 17:51:13.000000000 +0100 +++ new/OrthancOHIF-1.5/Resources/Orthanc/CMake/Compiler.cmake 2025-01-17 18:27:32.000000000 +0100 @@ -2,8 +2,8 @@ # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium # Copyright (C) 2017-2023 Osimis S.A., Belgium -# Copyright (C) 2024-2024 Orthanc Team SRL, Belgium -# Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium +# Copyright (C) 2024-2025 Orthanc Team SRL, Belgium +# Copyright (C) 2021-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public License diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.4/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake new/OrthancOHIF-1.5/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake --- old/OrthancOHIF-1.4/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake 2024-11-26 17:51:13.000000000 +0100 +++ new/OrthancOHIF-1.5/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake 2025-01-17 18:27:32.000000000 +0100 @@ -2,8 +2,8 @@ # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium # Copyright (C) 2017-2023 Osimis S.A., Belgium -# Copyright (C) 2024-2024 Orthanc Team SRL, Belgium -# Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium +# Copyright (C) 2024-2025 Orthanc Team SRL, Belgium +# Copyright (C) 2021-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public License @@ -165,6 +165,8 @@ set(ORTHANC_FRAMEWORK_MD5 "975f5bf2142c22cb1777b4f6a0a614c5") elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.12.4") set(ORTHANC_FRAMEWORK_MD5 "1e61779ea4a7cd705720bdcfed8a6a73") + elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.12.5") + set(ORTHANC_FRAMEWORK_MD5 "5bb69f092981fdcfc11dec0a0f9a7db3") # Below this point are development snapshots that were used to # release some plugin, before an official release of the Orthanc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.4/Resources/Orthanc/CMake/DownloadPackage.cmake new/OrthancOHIF-1.5/Resources/Orthanc/CMake/DownloadPackage.cmake --- old/OrthancOHIF-1.4/Resources/Orthanc/CMake/DownloadPackage.cmake 2024-11-26 17:51:13.000000000 +0100 +++ new/OrthancOHIF-1.5/Resources/Orthanc/CMake/DownloadPackage.cmake 2025-01-17 18:27:32.000000000 +0100 @@ -2,8 +2,8 @@ # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium # Copyright (C) 2017-2023 Osimis S.A., Belgium -# Copyright (C) 2024-2024 Orthanc Team SRL, Belgium -# Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium +# Copyright (C) 2024-2025 Orthanc Team SRL, Belgium +# Copyright (C) 2021-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public License diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.4/Resources/Orthanc/CMake/EmbedResources.py new/OrthancOHIF-1.5/Resources/Orthanc/CMake/EmbedResources.py --- old/OrthancOHIF-1.4/Resources/Orthanc/CMake/EmbedResources.py 2024-11-26 17:51:13.000000000 +0100 +++ new/OrthancOHIF-1.5/Resources/Orthanc/CMake/EmbedResources.py 2025-01-17 18:27:32.000000000 +0100 @@ -4,8 +4,8 @@ # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium # Copyright (C) 2017-2023 Osimis S.A., Belgium -# Copyright (C) 2024-2024 Orthanc Team SRL, Belgium -# Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium +# Copyright (C) 2024-2025 Orthanc Team SRL, Belgium +# Copyright (C) 2021-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public License diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.4/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp new/OrthancOHIF-1.5/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp --- old/OrthancOHIF-1.4/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp 2024-11-26 17:51:13.000000000 +0100 +++ new/OrthancOHIF-1.5/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp 2025-01-17 18:27:32.000000000 +0100 @@ -3,8 +3,8 @@ * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium * Copyright (C) 2017-2023 Osimis S.A., Belgium - * Copyright (C) 2024-2024 Orthanc Team SRL, Belgium - * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium + * Copyright (C) 2024-2025 Orthanc Team SRL, Belgium + * Copyright (C) 2021-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium * * This program is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -334,9 +334,9 @@ std::vector<const char*> headersValues_; public: - explicit PluginHttpHeaders(const std::map<std::string, std::string>& httpHeaders) + explicit PluginHttpHeaders(const HttpHeaders& httpHeaders) { - for (std::map<std::string, std::string>::const_iterator + for (HttpHeaders::const_iterator it = httpHeaders.begin(); it != httpHeaders.end(); ++it) { headersKeys_.push_back(it->first.c_str()); @@ -361,7 +361,7 @@ }; bool MemoryBuffer::RestApiGet(const std::string& uri, - const std::map<std::string, std::string>& httpHeaders, + const HttpHeaders& httpHeaders, bool applyPlugins) { Clear(); @@ -400,7 +400,7 @@ bool MemoryBuffer::RestApiPost(const std::string& uri, const void* body, size_t bodySize, - const std::map<std::string, std::string>& httpHeaders, + const HttpHeaders& httpHeaders, bool applyPlugins) { MemoryBuffer answerHeaders; @@ -422,7 +422,7 @@ bool MemoryBuffer::RestApiPost(const std::string& uri, const Json::Value& body, - const std::map<std::string, std::string>& httpHeaders, + const HttpHeaders& httpHeaders, bool applyPlugins) { std::string s; @@ -1490,7 +1490,7 @@ bool RestApiGetString(std::string& result, const std::string& uri, - const std::map<std::string, std::string>& httpHeaders, + const HttpHeaders& httpHeaders, bool applyPlugins) { MemoryBuffer answer; @@ -1508,7 +1508,7 @@ bool RestApiGet(Json::Value& result, const std::string& uri, - const std::map<std::string, std::string>& httpHeaders, + const HttpHeaders& httpHeaders, bool applyPlugins) { MemoryBuffer answer; @@ -1598,7 +1598,7 @@ bool RestApiPost(Json::Value& result, const std::string& uri, const Json::Value& body, - const std::map<std::string, std::string>& httpHeaders, + const HttpHeaders& httpHeaders, bool applyPlugins) { MemoryBuffer answer; @@ -1963,7 +1963,7 @@ bool OrthancPeers::DoGet(MemoryBuffer& target, size_t index, const std::string& uri, - const std::map<std::string, std::string>& headers) const + const HttpHeaders& headers) const { if (index >= index_.size()) { @@ -1994,7 +1994,7 @@ bool OrthancPeers::DoGet(MemoryBuffer& target, const std::string& name, const std::string& uri, - const std::map<std::string, std::string>& headers) const + const HttpHeaders& headers) const { size_t index; return (LookupName(index, name) && @@ -2005,7 +2005,7 @@ bool OrthancPeers::DoGet(Json::Value& target, size_t index, const std::string& uri, - const std::map<std::string, std::string>& headers) const + const HttpHeaders& headers) const { MemoryBuffer buffer; @@ -2024,7 +2024,7 @@ bool OrthancPeers::DoGet(Json::Value& target, const std::string& name, const std::string& uri, - const std::map<std::string, std::string>& headers) const + const HttpHeaders& headers) const { MemoryBuffer buffer; @@ -2044,7 +2044,7 @@ const std::string& name, const std::string& uri, const std::string& body, - const std::map<std::string, std::string>& headers) const + const HttpHeaders& headers) const { size_t index; return (LookupName(index, name) && @@ -2056,7 +2056,7 @@ size_t index, const std::string& uri, const std::string& body, - const std::map<std::string, std::string>& headers) const + const HttpHeaders& headers) const { MemoryBuffer buffer; @@ -2076,7 +2076,7 @@ const std::string& name, const std::string& uri, const std::string& body, - const std::map<std::string, std::string>& headers) const + const HttpHeaders& headers) const { MemoryBuffer buffer; @@ -2096,7 +2096,7 @@ size_t index, const std::string& uri, const std::string& body, - const std::map<std::string, std::string>& headers) const + const HttpHeaders& headers) const { if (index >= index_.size()) { @@ -2133,7 +2133,7 @@ bool OrthancPeers::DoPut(size_t index, const std::string& uri, const std::string& body, - const std::map<std::string, std::string>& headers) const + const HttpHeaders& headers) const { if (index >= index_.size()) { @@ -2169,7 +2169,7 @@ bool OrthancPeers::DoPut(const std::string& name, const std::string& uri, const std::string& body, - const std::map<std::string, std::string>& headers) const + const HttpHeaders& headers) const { size_t index; return (LookupName(index, name) && @@ -2179,7 +2179,7 @@ bool OrthancPeers::DoDelete(size_t index, const std::string& uri, - const std::map<std::string, std::string>& headers) const + const HttpHeaders& headers) const { if (index >= index_.size()) { @@ -2208,7 +2208,7 @@ bool OrthancPeers::DoDelete(const std::string& name, const std::string& uri, - const std::map<std::string, std::string>& headers) const + const HttpHeaders& headers) const { size_t index; return (LookupName(index, name) && @@ -2923,12 +2923,12 @@ std::vector<const char*> headersValues_; public: - HeadersWrapper(const HttpClient::HttpHeaders& headers) + HeadersWrapper(const HttpHeaders& headers) { headersKeys_.reserve(headers.size()); headersValues_.reserve(headers.size()); - for (HttpClient::HttpHeaders::const_iterator it = headers.begin(); it != headers.end(); ++it) + for (HttpHeaders::const_iterator it = headers.begin(); it != headers.end(); ++it) { headersKeys_.push_back(it->first.c_str()); headersValues_.push_back(it->second.c_str()); @@ -3076,11 +3076,11 @@ class MemoryAnswer : public HttpClient::IAnswer { private: - HttpClient::HttpHeaders headers_; - ChunkedBuffer body_; + HttpHeaders headers_; + ChunkedBuffer body_; public: - const HttpClient::HttpHeaders& GetHeaders() const + const HttpHeaders& GetHeaders() const { return headers_; } @@ -3168,6 +3168,35 @@ #endif + static void DecodeHttpHeaders(HttpHeaders& target, + const MemoryBuffer& source) + { + Json::Value v; + source.ToJson(v); + + if (v.type() != Json::objectValue) + { + ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); + } + + Json::Value::Members members = v.getMemberNames(); + target.clear(); + + for (size_t i = 0; i < members.size(); i++) + { + const Json::Value& h = v[members[i]]; + if (h.type() != Json::stringValue) + { + ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); + } + else + { + target[members[i]] = h.asString(); + } + } + } + + void HttpClient::ExecuteWithoutStream(uint16_t& httpStatus, HttpHeaders& answerHeaders, std::string& answerBody, @@ -3208,30 +3237,7 @@ ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(error); } - Json::Value v; - answerHeadersBuffer.ToJson(v); - - if (v.type() != Json::objectValue) - { - ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); - } - - Json::Value::Members members = v.getMemberNames(); - answerHeaders.clear(); - - for (size_t i = 0; i < members.size(); i++) - { - const Json::Value& h = v[members[i]]; - if (h.type() != Json::stringValue) - { - ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); - } - else - { - answerHeaders[members[i]] = h.asString(); - } - } - + DecodeHttpHeaders(answerHeaders, answerHeadersBuffer); answerBodyBuffer.ToString(answerBody); } @@ -4061,7 +4067,7 @@ } #endif - void GetHttpHeaders(std::map<std::string, std::string>& result, const OrthancPluginHttpRequest* request) + void GetHttpHeaders(HttpHeaders& result, const OrthancPluginHttpRequest* request) { result.clear(); @@ -4114,4 +4120,135 @@ SetPluginProperty(pluginIdentifier, _OrthancPluginProperty_OrthancExplorer, javascript); #endif } + + +#if HAS_ORTHANC_PLUGIN_GENERIC_CALL_REST_API == 1 + RestApiClient::RestApiClient() : + method_(OrthancPluginHttpMethod_Get), + path_("/"), + afterPlugins_(false), + httpStatus_(0) + { + } +#endif + + +#if HAS_ORTHANC_PLUGIN_GENERIC_CALL_REST_API == 1 + void RestApiClient::AddRequestHeader(const std::string& key, + const std::string& value) + { + if (requestHeaders_.find(key) == requestHeaders_.end()) + { + requestHeaders_[key] = value; + } + else + { + ORTHANC_PLUGINS_THROW_EXCEPTION(BadSequenceOfCalls); + } + } +#endif + + +#if HAS_ORTHANC_PLUGIN_GENERIC_CALL_REST_API == 1 + bool RestApiClient::Execute() + { + if (requestBody_.size() > 0xffffffffu) + { + ORTHANC_PLUGINS_LOG_ERROR("Cannot handle body size > 4GB"); + ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); + } + + PluginHttpHeaders converted(requestHeaders_); + + MemoryBuffer body; + MemoryBuffer headers; + + OrthancPluginErrorCode code = OrthancPluginCallRestApi(GetGlobalContext(), *body, *headers, &httpStatus_, method_, path_.c_str(), + requestHeaders_.size(), converted.GetKeys(), converted.GetValues(), + requestBody_.c_str(), requestBody_.size(), afterPlugins_ ? 1 : 0); + + answerHeaders_.clear(); + answerBody_.clear(); + + if (code == OrthancPluginErrorCode_Success) + { + if (httpStatus_ == 0) + { + ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); + } + + DecodeHttpHeaders(answerHeaders_, headers); + body.ToString(answerBody_); + return true; + } + else + { + if (code == OrthancPluginErrorCode_UnknownResource || + code == OrthancPluginErrorCode_InexistentItem) + { + httpStatus_ = 404; + return false; + } + else + { + ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(code); + } + } + } +#endif + + +#if HAS_ORTHANC_PLUGIN_GENERIC_CALL_REST_API == 1 + uint16_t RestApiClient::GetHttpStatus() const + { + if (httpStatus_ == 0) + { + ORTHANC_PLUGINS_THROW_EXCEPTION(BadSequenceOfCalls); + } + else + { + return httpStatus_; + } + } +#endif + + +#if HAS_ORTHANC_PLUGIN_GENERIC_CALL_REST_API == 1 + bool RestApiClient::LookupAnswerHeader(std::string& value, + const std::string& key) const + { + if (httpStatus_ == 0) + { + ORTHANC_PLUGINS_THROW_EXCEPTION(BadSequenceOfCalls); + } + else + { + HttpHeaders::const_iterator found = answerHeaders_.find(key); + if (found == answerHeaders_.end()) + { + return false; + } + else + { + value = found->second; + return true; + } + } + } +#endif + + +#if HAS_ORTHANC_PLUGIN_GENERIC_CALL_REST_API == 1 + const std::string& RestApiClient::GetAnswerBody() const + { + if (httpStatus_ == 0) + { + ORTHANC_PLUGINS_THROW_EXCEPTION(BadSequenceOfCalls); + } + else + { + return answerBody_; + } + } +#endif } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.4/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h new/OrthancOHIF-1.5/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h --- old/OrthancOHIF-1.4/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h 2024-11-26 17:51:13.000000000 +0100 +++ new/OrthancOHIF-1.5/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h 2025-01-17 18:27:32.000000000 +0100 @@ -3,8 +3,8 @@ * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium * Copyright (C) 2017-2023 Osimis S.A., Belgium - * Copyright (C) 2024-2024 Orthanc Team SRL, Belgium - * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium + * Copyright (C) 2024-2025 Orthanc Team SRL, Belgium + * Copyright (C) 2021-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium * * This program is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -170,6 +170,8 @@ namespace OrthancPlugins { + typedef std::map<std::string, std::string> HttpHeaders; + typedef void (*RestCallback) (OrthancPluginRestOutput* output, const char* url, const OrthancPluginHttpRequest* request); @@ -257,7 +259,7 @@ bool applyPlugins); bool RestApiGet(const std::string& uri, - const std::map<std::string, std::string>& httpHeaders, + const HttpHeaders& httpHeaders, bool applyPlugins); bool RestApiPost(const std::string& uri, @@ -277,13 +279,13 @@ #if HAS_ORTHANC_PLUGIN_GENERIC_CALL_REST_API == 1 bool RestApiPost(const std::string& uri, const Json::Value& body, - const std::map<std::string, std::string>& httpHeaders, + const HttpHeaders& httpHeaders, bool applyPlugins); bool RestApiPost(const std::string& uri, const void* body, size_t bodySize, - const std::map<std::string, std::string>& httpHeaders, + const HttpHeaders& httpHeaders, bool applyPlugins); #endif @@ -581,7 +583,7 @@ bool RestApiGet(Json::Value& result, const std::string& uri, - const std::map<std::string, std::string>& httpHeaders, + const HttpHeaders& httpHeaders, bool applyPlugins); bool RestApiGetString(std::string& result, @@ -590,7 +592,7 @@ bool RestApiGetString(std::string& result, const std::string& uri, - const std::map<std::string, std::string>& httpHeaders, + const HttpHeaders& httpHeaders, bool applyPlugins); bool RestApiPost(std::string& result, @@ -609,7 +611,7 @@ bool RestApiPost(Json::Value& result, const std::string& uri, const Json::Value& body, - const std::map<std::string, std::string>& httpHeaders, + const HttpHeaders& httpHeaders, bool applyPlugins); #endif @@ -829,64 +831,64 @@ bool DoGet(MemoryBuffer& target, size_t index, const std::string& uri, - const std::map<std::string, std::string>& headers) const; + const HttpHeaders& headers) const; bool DoGet(MemoryBuffer& target, const std::string& name, const std::string& uri, - const std::map<std::string, std::string>& headers) const; + const HttpHeaders& headers) const; bool DoGet(Json::Value& target, size_t index, const std::string& uri, - const std::map<std::string, std::string>& headers) const; + const HttpHeaders& headers) const; bool DoGet(Json::Value& target, const std::string& name, const std::string& uri, - const std::map<std::string, std::string>& headers) const; + const HttpHeaders& headers) const; bool DoPost(MemoryBuffer& target, size_t index, const std::string& uri, const std::string& body, - const std::map<std::string, std::string>& headers) const; + const HttpHeaders& headers) const; bool DoPost(MemoryBuffer& target, const std::string& name, const std::string& uri, const std::string& body, - const std::map<std::string, std::string>& headers) const; + const HttpHeaders& headers) const; bool DoPost(Json::Value& target, size_t index, const std::string& uri, const std::string& body, - const std::map<std::string, std::string>& headers) const; + const HttpHeaders& headers) const; bool DoPost(Json::Value& target, const std::string& name, const std::string& uri, const std::string& body, - const std::map<std::string, std::string>& headers) const; + const HttpHeaders& headers) const; bool DoPut(size_t index, const std::string& uri, const std::string& body, - const std::map<std::string, std::string>& headers) const; + const HttpHeaders& headers) const; bool DoPut(const std::string& name, const std::string& uri, const std::string& body, - const std::map<std::string, std::string>& headers) const; + const HttpHeaders& headers) const; bool DoDelete(size_t index, const std::string& uri, - const std::map<std::string, std::string>& headers) const; + const HttpHeaders& headers) const; bool DoDelete(const std::string& name, const std::string& uri, - const std::map<std::string, std::string>& headers) const; + const HttpHeaders& headers) const; }; #endif @@ -996,8 +998,6 @@ class HttpClient : public boost::noncopyable { public: - typedef std::map<std::string, std::string> HttpHeaders; - class IRequestBody : public boost::noncopyable { public: @@ -1397,7 +1397,7 @@ }; // helper method to convert Http headers from the plugin SDK to a std::map -void GetHttpHeaders(std::map<std::string, std::string>& result, const OrthancPluginHttpRequest* request); +void GetHttpHeaders(HttpHeaders& result, const OrthancPluginHttpRequest* request); #if HAS_ORTHANC_PLUGIN_WEBDAV == 1 class IWebDavCollection : public boost::noncopyable @@ -1508,4 +1508,88 @@ void ExtendOrthancExplorer(const std::string& pluginIdentifier, const std::string& javascript); + + +#if HAS_ORTHANC_PLUGIN_GENERIC_CALL_REST_API == 1 + class RestApiClient : public boost::noncopyable + { + private: + // Request + OrthancPluginHttpMethod method_; + std::string path_; + HttpHeaders requestHeaders_; + std::string requestBody_; + bool afterPlugins_; + + // Answer + uint16_t httpStatus_; + HttpHeaders answerHeaders_; + std::string answerBody_; + + public: + RestApiClient(); + + void SetMethod(OrthancPluginHttpMethod method) + { + method_ = method; + } + + OrthancPluginHttpMethod GetMethod() const + { + return method_; + } + + void SetPath(const std::string& path) + { + path_ = path; + } + + const std::string& GetPath() const + { + return path_; + } + + void AddRequestHeader(const std::string& key, + const std::string& value); + + const HttpHeaders& GetRequestHeaders() const + { + return requestHeaders_; + } + + void SetRequestBody(const std::string& body) + { + requestBody_ = body; + } + + void SwapRequestBody(std::string& body) + { + requestBody_.swap(body); + } + + void SetAfterPlugins(bool afterPlugins) + { + afterPlugins_ = afterPlugins; + } + + bool IsAfterPlugins() const + { + return afterPlugins_; + } + + const std::string& GetRequestBody() const + { + return requestBody_; + } + + bool Execute(); + + uint16_t GetHttpStatus() const; + + bool LookupAnswerHeader(std::string& value, + const std::string& key) const; + + const std::string& GetAnswerBody() const; + }; +#endif } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.4/Resources/Orthanc/Plugins/OrthancPluginException.h new/OrthancOHIF-1.5/Resources/Orthanc/Plugins/OrthancPluginException.h --- old/OrthancOHIF-1.4/Resources/Orthanc/Plugins/OrthancPluginException.h 2024-11-26 17:51:13.000000000 +0100 +++ new/OrthancOHIF-1.5/Resources/Orthanc/Plugins/OrthancPluginException.h 2025-01-17 18:27:32.000000000 +0100 @@ -3,8 +3,8 @@ * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium * Copyright (C) 2017-2023 Osimis S.A., Belgium - * Copyright (C) 2024-2024 Orthanc Team SRL, Belgium - * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium + * Copyright (C) 2024-2025 Orthanc Team SRL, Belgium + * Copyright (C) 2021-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium * * This program is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.4/Resources/Orthanc/Plugins/OrthancPluginsExports.cmake new/OrthancOHIF-1.5/Resources/Orthanc/Plugins/OrthancPluginsExports.cmake --- old/OrthancOHIF-1.4/Resources/Orthanc/Plugins/OrthancPluginsExports.cmake 2024-11-26 17:51:13.000000000 +0100 +++ new/OrthancOHIF-1.5/Resources/Orthanc/Plugins/OrthancPluginsExports.cmake 2025-01-17 18:27:32.000000000 +0100 @@ -2,8 +2,8 @@ # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium # Copyright (C) 2017-2023 Osimis S.A., Belgium -# Copyright (C) 2024-2024 Orthanc Team SRL, Belgium -# Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium +# Copyright (C) 2024-2025 Orthanc Team SRL, Belgium +# Copyright (C) 2021-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU General Public License as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.4/Resources/Orthanc/Toolchains/LinuxStandardBaseToolchain.cmake new/OrthancOHIF-1.5/Resources/Orthanc/Toolchains/LinuxStandardBaseToolchain.cmake --- old/OrthancOHIF-1.4/Resources/Orthanc/Toolchains/LinuxStandardBaseToolchain.cmake 2024-11-26 17:51:13.000000000 +0100 +++ new/OrthancOHIF-1.5/Resources/Orthanc/Toolchains/LinuxStandardBaseToolchain.cmake 2025-01-17 18:27:32.000000000 +0100 @@ -2,8 +2,8 @@ # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium # Copyright (C) 2017-2023 Osimis S.A., Belgium -# Copyright (C) 2024-2024 Orthanc Team SRL, Belgium -# Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium +# Copyright (C) 2024-2025 Orthanc Team SRL, Belgium +# Copyright (C) 2021-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public License diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.4/Resources/Orthanc/Toolchains/MinGW-W64-Toolchain32.cmake new/OrthancOHIF-1.5/Resources/Orthanc/Toolchains/MinGW-W64-Toolchain32.cmake --- old/OrthancOHIF-1.4/Resources/Orthanc/Toolchains/MinGW-W64-Toolchain32.cmake 2024-11-26 17:51:13.000000000 +0100 +++ new/OrthancOHIF-1.5/Resources/Orthanc/Toolchains/MinGW-W64-Toolchain32.cmake 2025-01-17 18:27:32.000000000 +0100 @@ -2,8 +2,8 @@ # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium # Copyright (C) 2017-2023 Osimis S.A., Belgium -# Copyright (C) 2024-2024 Orthanc Team SRL, Belgium -# Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium +# Copyright (C) 2024-2025 Orthanc Team SRL, Belgium +# Copyright (C) 2021-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public License diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.4/Resources/Orthanc/Toolchains/MinGW-W64-Toolchain64.cmake new/OrthancOHIF-1.5/Resources/Orthanc/Toolchains/MinGW-W64-Toolchain64.cmake --- old/OrthancOHIF-1.4/Resources/Orthanc/Toolchains/MinGW-W64-Toolchain64.cmake 2024-11-26 17:51:13.000000000 +0100 +++ new/OrthancOHIF-1.5/Resources/Orthanc/Toolchains/MinGW-W64-Toolchain64.cmake 2025-01-17 18:27:32.000000000 +0100 @@ -2,8 +2,8 @@ # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium # Copyright (C) 2017-2023 Osimis S.A., Belgium -# Copyright (C) 2024-2024 Orthanc Team SRL, Belgium -# Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium +# Copyright (C) 2024-2025 Orthanc Team SRL, Belgium +# Copyright (C) 2021-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public License diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.4/Resources/Orthanc/Toolchains/MinGWToolchain.cmake new/OrthancOHIF-1.5/Resources/Orthanc/Toolchains/MinGWToolchain.cmake --- old/OrthancOHIF-1.4/Resources/Orthanc/Toolchains/MinGWToolchain.cmake 2024-11-26 17:51:13.000000000 +0100 +++ new/OrthancOHIF-1.5/Resources/Orthanc/Toolchains/MinGWToolchain.cmake 2025-01-17 18:27:32.000000000 +0100 @@ -2,8 +2,8 @@ # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium # Copyright (C) 2017-2023 Osimis S.A., Belgium -# Copyright (C) 2024-2024 Orthanc Team SRL, Belgium -# Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium +# Copyright (C) 2024-2025 Orthanc Team SRL, Belgium +# Copyright (C) 2021-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public License diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.4/Resources/SyncOrthancFolder.py new/OrthancOHIF-1.5/Resources/SyncOrthancFolder.py --- old/OrthancOHIF-1.4/Resources/SyncOrthancFolder.py 2024-11-26 17:51:13.000000000 +0100 +++ new/OrthancOHIF-1.5/Resources/SyncOrthancFolder.py 2025-01-17 18:27:32.000000000 +0100 @@ -1,10 +1,10 @@ #!/usr/bin/python3 -# SPDX-FileCopyrightText: 2023-2024 Sebastien Jodogne, UCLouvain, Belgium +# SPDX-FileCopyrightText: 2023-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # SPDX-License-Identifier: GPL-3.0-or-later # OHIF plugin for Orthanc -# Copyright (C) 2023-2024 Sebastien Jodogne, UCLouvain, Belgium +# Copyright (C) 2023-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU General Public License as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.4/Sources/OrthancExplorer.js new/OrthancOHIF-1.5/Sources/OrthancExplorer.js --- old/OrthancOHIF-1.4/Sources/OrthancExplorer.js 2024-11-26 17:51:13.000000000 +0100 +++ new/OrthancOHIF-1.5/Sources/OrthancExplorer.js 2025-01-17 18:27:32.000000000 +0100 @@ -1,11 +1,11 @@ /** - * SPDX-FileCopyrightText: 2023-2024 Sebastien Jodogne, UCLouvain, Belgium + * SPDX-FileCopyrightText: 2023-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium * SPDX-License-Identifier: GPL-3.0-or-later */ /** * OHIF plugin for Orthanc - * Copyright (C) 2023-2024 Sebastien Jodogne, UCLouvain, Belgium + * Copyright (C) 2023-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium * * This program is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.4/Sources/Plugin.cpp new/OrthancOHIF-1.5/Sources/Plugin.cpp --- old/OrthancOHIF-1.4/Sources/Plugin.cpp 2024-11-26 17:51:13.000000000 +0100 +++ new/OrthancOHIF-1.5/Sources/Plugin.cpp 2025-01-17 18:27:32.000000000 +0100 @@ -1,11 +1,11 @@ /** - * SPDX-FileCopyrightText: 2023-2024 Sebastien Jodogne, UCLouvain, Belgium + * SPDX-FileCopyrightText: 2023-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium * SPDX-License-Identifier: GPL-3.0-or-later */ /** * OHIF plugin for Orthanc - * Copyright (C) 2023-2024 Sebastien Jodogne, UCLouvain, Belgium + * Copyright (C) 2023-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium * * This program is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.4/Sources/app-config-system.js new/OrthancOHIF-1.5/Sources/app-config-system.js --- old/OrthancOHIF-1.4/Sources/app-config-system.js 2024-11-26 17:51:13.000000000 +0100 +++ new/OrthancOHIF-1.5/Sources/app-config-system.js 2025-01-17 18:27:32.000000000 +0100 @@ -1,6 +1,6 @@ /** - * SPDX-FileCopyrightText: 2023-2024 Sebastien Jodogne, UCLouvain, Belgium, - * and 2018-2024 Open Health Imaging Foundation + * SPDX-FileCopyrightText: 2023-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium, + * and 2018-2025 Open Health Imaging Foundation * SPDX-License-Identifier: MIT */ @@ -27,8 +27,11 @@ supportsFuzzyMatching: false, supportsWildcard: true, staticWado: true, - singlepart: 'bulkdata,pdf,video', - acceptHeader: [ 'multipart/related; type=application/octet-stream; transfer-syntax=*'] + singlepart: 'bulkdata', + acceptHeader: [ 'multipart/related; type=application/octet-stream; transfer-syntax=*'], + bulkDataURI: { // to remove once 3.9.2+ is released (https://github.com/OHIF/Viewers/issues/4256) + enabled: true + } } } ]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.4/Sources/app-config-user.js new/OrthancOHIF-1.5/Sources/app-config-user.js --- old/OrthancOHIF-1.4/Sources/app-config-user.js 2024-11-26 17:51:13.000000000 +0100 +++ new/OrthancOHIF-1.5/Sources/app-config-user.js 2025-01-17 18:27:32.000000000 +0100 @@ -1,6 +1,6 @@ /** - * SPDX-FileCopyrightText: 2023-2024 Sebastien Jodogne, UCLouvain, Belgium, - * and 2018-2024 Open Health Imaging Foundation + * SPDX-FileCopyrightText: 2023-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium, + * and 2018-2025 Open Health Imaging Foundation * SPDX-License-Identifier: MIT */ ++++++ dist.zip ++++++ /work/SRC/openSUSE:Factory/orthanc-ohif/dist.zip /work/SRC/openSUSE:Factory/.orthanc-ohif.new.5589/dist.zip differ: char 11, line 2

1 0

commit libxslt for openSUSE:Factory
by Source-Sync 20 Jan '25

20 Jan '25

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libxslt for openSUSE:Factory checked in at 2025-01-20 17:14:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libxslt (Old) and /work/SRC/openSUSE:Factory/.libxslt.new.5589 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libxslt" Mon Jan 20 17:14:09 2025 rev:71 rq:1238664 version:1.1.42 Changes: -------- --- /work/SRC/openSUSE:Factory/libxslt/libxslt.changes 2024-10-29 14:31:51.453329787 +0100 +++ /work/SRC/openSUSE:Factory/.libxslt.new.5589/libxslt.changes 2025-01-20 17:14:28.829962138 +0100 @@ -1,0 +2,64 @@ +Sat Jan 18 10:20:18 UTC 2025 - Pedro Monreal <pmonreal(a)suse.com> + +- Remove the test_bad regression test that fails with old libxml2 + as suggested by upstream devs: + * https://gitlab.gnome.org/GNOME/libxslt/-/issues/126 + +------------------------------------------------------------------- +Sat Jan 18 10:00:30 UTC 2025 - Pedro Monreal <pmonreal(a)suse.com> + +- Allow building with older libxml2 versions: + * tests: Make runtest compile with older libxml2 versions + * https://gitlab.gnome.org/GNOME/libxslt/issues/125 + * Add libxslt-test-compile-with-older-libxml2-versions.patch + +------------------------------------------------------------------- +Fri Jan 17 15:53:19 UTC 2025 - Pedro Monreal <pmonreal(a)suse.com> + +- Update to 1.1.42: + * Regressions: + - extensions: Readd call to xmlCheckFilename with older libxml2 + * Improvments: + - utils: Don't use deprecated xmlCharEncodingHandler member + - transform: Handle filesystem paths after libxml2 changes + - locale: Work around issue with FreeBSD's strxfrm_l + * Build systems: + - cmake: Add LIBXSLT_WITH_PROGRAMS option (Don Olmstead) + - cmake: Fix HAVE_GCRYPT check + +- Update to 1.1.41: + * Removals: + - autotools: Stop installing libxslt.m4 + - autotools: Remove RPM build + * Improvements: + - libxslt: Set _FILE_OFFSET_BITS to 64 + - xsltproc: Remove unneeded includes + - include: Don't define ATTRIBUTE_UNUSED in public header + - xsltproc: Make "-" read from stdin + * Build systems: + - cmake: Adjust paths for UNIX or UNIX-like target systems (Daniel E) + * Tests: + - cmake: Link testplugin with libxml2 + - tests: Link testplugin with libxml2 + - tests: Fix expected error after libxml2 change + - runtest: Switch to xmlFormatError + - fuzz: Avoid accessing internal struct members + +- Update to 1.1.40: + * Removals: + - xsltproc: remove maxparserdepth option (Mike Dalessio) + * Improvements: + - functions: xmlXPtrNewContext is deprecated + - xsltproc: Stop calling xmlMemoryDump + - xsltproc: Prefer XML_PARSE_NONET over xmlNoNetEntityLoader + - functions: Fix build if libxml2 modules are disabled + - extensions: Don't call deprecated xmlCheckFilename + - documents: Don't set ctxt->directory + - exslt: Fix EXSLT functions without parameters + * Build systems: + - build: Remove mem-debug option + * Remove patches upstream: + - gcc14-runtest-no-const.patch + - 0001-tests-Fix-build-with-older-libxml2.patch + +------------------------------------------------------------------- Old: ---- 0001-tests-Fix-build-with-older-libxml2.patch gcc14-runtest-no-const.patch libxslt-1.1.39.tar.xz New: ---- libxslt-1.1.42.tar.xz libxslt-test-compile-with-older-libxml2-versions.patch BETA DEBUG BEGIN: Old: - gcc14-runtest-no-const.patch - 0001-tests-Fix-build-with-older-libxml2.patch Old: * Remove patches upstream: - gcc14-runtest-no-const.patch - 0001-tests-Fix-build-with-older-libxml2.patch BETA DEBUG END: BETA DEBUG BEGIN: New: * https://gitlab.gnome.org/GNOME/libxslt/issues/125 * Add libxslt-test-compile-with-older-libxml2-versions.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxslt.spec ++++++ --- /var/tmp/diff_new_pack.7fJOda/_old 2025-01-20 17:14:29.361984040 +0100 +++ /var/tmp/diff_new_pack.7fJOda/_new 2025-01-20 17:14:29.365984204 +0100 @@ -1,7 +1,7 @@ # # spec file for package libxslt # -# 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 @@ -20,7 +20,7 @@ %define libexver 0 Name: libxslt -Version: 1.1.39 +Version: 1.1.42 Release: 0 Summary: XSL Transformation Library License: GPL-2.0-or-later AND MIT @@ -40,11 +40,10 @@ # Initialize the random seed to ensure libxslt's math.random() function # produces unpredictable outputs. Patch1: libxslt-random-seed.patch -# PATCH-FIX_UPSTREAM -- gcc14-runtest-no-const.patch -Patch2: gcc14-runtest-no-const.patch -# PATCH-FIX-UPSTREAM -- 0001-tests-Fix-build-with-older-libxml2.patch -Patch3: 0001-tests-Fix-build-with-older-libxml2.patch -Patch4: libxslt-reproducible.patch +Patch2: libxslt-reproducible.patch +# PATCH-FIX-UPSTREAM -- libxslt-test-compile-with-older-libxml2-versions.patch +# https://gitlab.gnome.org/GNOME/libxslt/-/issues/125 +Patch3: libxslt-test-compile-with-older-libxml2-versions.patch # ### SUSE patches starts on 1000 # PATCH-FIX-SUSE @@ -133,6 +132,7 @@ %make_build %check +find -type f -name "test_bad*" -delete -print %make_build check %install @@ -176,7 +176,6 @@ %{_libdir}/cmake/libxslt/FindGcrypt.cmake %{_libdir}/cmake/libxslt/libxslt-config.cmake %{_includedir}/* -%{_datadir}/aclocal/* %{_bindir}/xslt-config %{_mandir}/man1/xslt-config.1%{?ext_man} %{_mandir}/man3/* ++++++ libxslt-1.1.39.tar.xz -> libxslt-1.1.42.tar.xz ++++++ ++++ 2496 lines of diff (skipped) ++++++ libxslt-test-compile-with-older-libxml2-versions.patch ++++++ From bf59c338121b8b45d66ba6ecea69ad498015c396 Mon Sep 17 00:00:00 2001 From: Nick Wellnhofer <wellnhofer(a)aevum.de> Date: Tue, 12 Nov 2024 13:28:55 +0100 Subject: [PATCH] tests: Make runtest compile with older libxml2 versions This partly reverts commit ce3ad4f93c7637a454ad7db501158110a0813f05. Fixes #125. --- tests/runtest.c | 244 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 244 insertions(+) diff --git a/tests/runtest.c b/tests/runtest.c index be6ccb0e..7360615d 100644 --- a/tests/runtest.c +++ b/tests/runtest.c @@ -190,11 +190,255 @@ testErrorHandler(void *ctx ATTRIBUTE_UNUSED, const char *msg, ...) { testErrors[testErrorsSize] = 0; } +#if LIBXML_VERSION < 21300 + +/** + * xmlParserPrintFileContext: + * @input: an xmlParserInputPtr input + * + * Displays current context within the input content for error tracking + */ + +static void +xmlParserPrintFileContextInternal(xmlParserInputPtr input , + xmlGenericErrorFunc chanl, void *data ) { + const xmlChar *cur, *base; + unsigned int n, col; /* GCC warns if signed, because compared with sizeof() */ + xmlChar content[81]; /* space for 80 chars + line terminator */ + xmlChar *ctnt; + + if (input == NULL) return; + cur = input->cur; + base = input->base; + /* skip backwards over any end-of-lines */ + while ((cur > base) && ((*(cur) == '\n') || (*(cur) == '\r'))) { + cur--; + } + n = 0; + /* search backwards for beginning-of-line (to max buff size) */ + while ((n++ < (sizeof(content)-1)) && (cur > base) && + (*(cur) != '\n') && (*(cur) != '\r')) + cur--; + if ((*(cur) == '\n') || (*(cur) == '\r')) cur++; + /* calculate the error position in terms of the current position */ + col = input->cur - cur; + /* search forward for end-of-line (to max buff size) */ + n = 0; + ctnt = content; + /* copy selected text to our buffer */ + while ((*cur != 0) && (*(cur) != '\n') && + (*(cur) != '\r') && (n < sizeof(content)-1)) { + *ctnt++ = *cur++; + n++; + } + *ctnt = 0; + /* print out the selected text */ + chanl(data ,"%s\n", content); + /* create blank line with problem pointer */ + n = 0; + ctnt = content; + /* (leave buffer space for pointer + line terminator) */ + while ((n<col) && (n++ < sizeof(content)-2) && (*ctnt != 0)) { + if (*(ctnt) != '\t') + *(ctnt) = ' '; + ctnt++; + } + *ctnt++ = '^'; + *ctnt = 0; + chanl(data ,"%s\n", content); +} + +static void +testStructuredErrorHandler(void *ctx ATTRIBUTE_UNUSED, const xmlError *err) { + char *file = NULL; + int line = 0; + int code = -1; + int domain; + void *data = NULL; + const char *str; + const xmlChar *name = NULL; + xmlNodePtr node; + xmlErrorLevel level; + xmlParserInputPtr input = NULL; + xmlParserInputPtr cur = NULL; + xmlParserCtxtPtr ctxt = NULL; + + if (err == NULL) + return; + + file = err->file; + line = err->line; + code = err->code; + domain = err->domain; + level = err->level; + node = err->node; + if ((domain == XML_FROM_PARSER) || (domain == XML_FROM_HTML) || + (domain == XML_FROM_DTD) || (domain == XML_FROM_NAMESPACE) || + (domain == XML_FROM_IO) || (domain == XML_FROM_VALID)) { + ctxt = err->ctxt; + } + str = err->message; + + if (code == XML_ERR_OK) + return; + + if ((node != NULL) && (node->type == XML_ELEMENT_NODE)) + name = node->name; + + /* + * Maintain the compatibility with the legacy error handling + */ + if (ctxt != NULL) { + input = ctxt->input; + if ((input != NULL) && (input->filename == NULL) && + (ctxt->inputNr > 1)) { + cur = input; + input = ctxt->inputTab[ctxt->inputNr - 2]; + } + if (input != NULL) { + if (input->filename) + testErrorHandler(data, "%s:%d: ", input->filename, input->line); + else if ((line != 0) && (domain == XML_FROM_PARSER)) + testErrorHandler(data, "Entity: line %d: ", input->line); + } + } else { + if (file != NULL) + testErrorHandler(data, "%s:%d: ", file, line); + else if ((line != 0) && (domain == XML_FROM_PARSER)) + testErrorHandler(data, "Entity: line %d: ", line); + } + if (name != NULL) { + testErrorHandler(data, "element %s: ", name); + } + if (code == XML_ERR_OK) + return; + switch (domain) { + case XML_FROM_PARSER: + testErrorHandler(data, "parser "); + break; + case XML_FROM_NAMESPACE: + testErrorHandler(data, "namespace "); + break; + case XML_FROM_DTD: + case XML_FROM_VALID: + testErrorHandler(data, "validity "); + break; + case XML_FROM_HTML: + testErrorHandler(data, "HTML parser "); + break; + case XML_FROM_MEMORY: + testErrorHandler(data, "memory "); + break; + case XML_FROM_OUTPUT: + testErrorHandler(data, "output "); + break; + case XML_FROM_IO: + testErrorHandler(data, "I/O "); + break; + case XML_FROM_XINCLUDE: + testErrorHandler(data, "XInclude "); + break; + case XML_FROM_XPATH: + testErrorHandler(data, "XPath "); + break; + case XML_FROM_XPOINTER: + testErrorHandler(data, "parser "); + break; + case XML_FROM_REGEXP: + testErrorHandler(data, "regexp "); + break; + case XML_FROM_MODULE: + testErrorHandler(data, "module "); + break; + case XML_FROM_SCHEMASV: + testErrorHandler(data, "Schemas validity "); + break; + case XML_FROM_SCHEMASP: + testErrorHandler(data, "Schemas parser "); + break; + case XML_FROM_RELAXNGP: + testErrorHandler(data, "Relax-NG parser "); + break; + case XML_FROM_RELAXNGV: + testErrorHandler(data, "Relax-NG validity "); + break; + case XML_FROM_CATALOG: + testErrorHandler(data, "Catalog "); + break; + case XML_FROM_C14N: + testErrorHandler(data, "C14N "); + break; + case XML_FROM_XSLT: + testErrorHandler(data, "XSLT "); + break; + default: + break; + } + if (code == XML_ERR_OK) + return; + switch (level) { + case XML_ERR_NONE: + testErrorHandler(data, ": "); + break; + case XML_ERR_WARNING: + testErrorHandler(data, "warning : "); + break; + case XML_ERR_ERROR: + testErrorHandler(data, "error : "); + break; + case XML_ERR_FATAL: + testErrorHandler(data, "error : "); + break; + } + if (code == XML_ERR_OK) + return; + if (str != NULL) { + int len; + len = xmlStrlen((const xmlChar *)str); + if ((len > 0) && (str[len - 1] != '\n')) + testErrorHandler(data, "%s\n", str); + else + testErrorHandler(data, "%s", str); + } else { + testErrorHandler(data, "%s\n", "out of memory error"); + } + if (code == XML_ERR_OK) + return; + + if (ctxt != NULL) { + xmlParserPrintFileContextInternal(input, testErrorHandler, data); + if (cur != NULL) { + if (cur->filename) + testErrorHandler(data, "%s:%d: \n", cur->filename, cur->line); + else if ((line != 0) && (domain == XML_FROM_PARSER)) + testErrorHandler(data, "Entity: line %d: \n", cur->line); + xmlParserPrintFileContextInternal(cur, testErrorHandler, data); + } + } + if ((domain == XML_FROM_XPATH) && (err->str1 != NULL) && + (err->int1 < 100) && + (err->int1 < xmlStrlen((const xmlChar *)err->str1))) { + xmlChar buf[150]; + int i; + + testErrorHandler(data, "%s\n", err->str1); + for (i=0;i < err->int1;i++) + buf[i] = ' '; + buf[i++] = '^'; + buf[i] = 0; + testErrorHandler(data, "%s\n", buf); + } +} + +#else /* LIBXML_VERSION */ + static void testStructuredErrorHandler(void *ctx ATTRIBUTE_UNUSED, const xmlError *err) { xmlFormatError(err, testErrorHandler, NULL); } +#endif /* LIBXML_VERSION */ + static void initializeLibxml2(void) { xmlInitParser(); -- GitLab

1 0

commit python-breathe for openSUSE:Factory
by Source-Sync 20 Jan '25

20 Jan '25

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-breathe for openSUSE:Factory checked in at 2025-01-20 17:14:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-breathe (Old) and /work/SRC/openSUSE:Factory/.python-breathe.new.5589 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-breathe" Mon Jan 20 17:14:08 2025 rev:25 rq:1238662 version:4.35.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-breathe/python-breathe.changes 2024-07-22 17:14:04.791865109 +0200 +++ /work/SRC/openSUSE:Factory/.python-breathe.new.5589/python-breathe.changes 2025-01-20 17:14:28.113932662 +0100 @@ -1,0 +2,6 @@ +Sat Jan 18 10:37:41 UTC 2025 - Matej Cepl <mcepl(a)cepl.eu> + +- Add support-sphinx-7.4.patch (gh#breathe-doc/breathe!1007) + fixing tests with Sphinx 7.4. + +------------------------------------------------------------------- New: ---- support-sphinx-7.4.patch BETA DEBUG BEGIN: New: - Add support-sphinx-7.4.patch (gh#breathe-doc/breathe!1007) fixing tests with Sphinx 7.4. BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-breathe.spec ++++++ --- /var/tmp/diff_new_pack.w0pYJG/_old 2025-01-20 17:14:28.609953081 +0100 +++ /var/tmp/diff_new_pack.w0pYJG/_new 2025-01-20 17:14:28.609953081 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-breathe # -# 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 @@ -16,7 +16,6 @@ # -%define modname breathe %{?sle15_python_module_pythons} Name: python-breathe Version: 4.35.0 @@ -24,8 +23,11 @@ Summary: Sphinx Doxygen renderer License: BSD-3-Clause URL: https://github.com/michaeljones/breathe -Source: https://github.com/michaeljones/%{modname}/archive/v%{version}.tar.gz#/%{mo… +Source: https://github.com/michaeljones/breathe/archive/v%{version}.tar.gz#/breathe… Patch0: support-sphinx-7.2.patch +# PATCH-FIX-UPSTREAM support-sphinx-7.4.patch gh#breathe-doc/breathe!1007 mcepl(a)suse.com +# fix the test suite +Patch1: support-sphinx-7.4.patch BuildRequires: %{python_module Sphinx >= 4.0} BuildRequires: %{python_module docutils >= 0.12} BuildRequires: %{python_module pip} @@ -54,8 +56,7 @@ %pyproject_wheel %check -# Tests fail because of gh#breathe-doc/breathe#987 -# %%pytest +%pytest %install %pyproject_install @@ -73,5 +74,5 @@ %license LICENSE %python_alternative %{_bindir}/breathe-apidoc %{python_sitelib}/breathe -%{python_sitelib}/breathe-%{version}.dist-info +%{python_sitelib}/breathe-%{version}*-info ++++++ support-sphinx-7.4.patch ++++++ From 44c113677bbb5c5292f6e69fb9f614334eedcb3e Mon Sep 17 00:00:00 2001 From: "Eric T. Johnson" <yut23(a)users.noreply.github.com> Date: Thu, 16 Jan 2025 11:49:54 -0500 Subject: [PATCH] Fix tests for Sphinx 7.4 (#1007) --- breathe/file_state_cache.py | 2 ++ breathe/process.py | 2 ++ tests/test_renderer.py | 9 +++++---- 3 files changed, 9 insertions(+), 4 deletions(-) --- a/breathe/file_state_cache.py +++ b/breathe/file_state_cache.py @@ -1,3 +1,5 @@ +from __future__ import annotations + from sphinx.application import Sphinx from sphinx.environment import BuildEnvironment --- a/breathe/process.py +++ b/breathe/process.py @@ -1,3 +1,5 @@ +from __future__ import annotations + from breathe.project import AutoProjectInfo, ProjectInfoFactory import os --- a/tests/test_renderer.py +++ b/tests/test_renderer.py @@ -40,7 +40,7 @@ def app(test_params, app_params, make_ap except AttributeError: # old version of Sphinx kwargs["srcdir"].makedirs(exist_ok=True) - (kwargs["srcdir"] / "conf.py").write_text("") + (kwargs["srcdir"] / "conf.py").write_text("", encoding="ascii") app_ = make_app(*args, **kwargs) yield app_ @@ -129,7 +129,7 @@ class MockState: env.temp_data["docname"] = "mock-doc" env.temp_data["breathe_project_info_factory"] = ProjectInfoFactory(app) env.temp_data["breathe_parser_factory"] = DoxygenParserFactory(app) - settings = frontend.OptionParser(components=(parsers.rst.Parser,)).get_default_values() + settings = frontend.get_default_settings(parsers.rst.Parser) settings.env = env self.document = utils.new_document("", settings) @@ -172,13 +172,14 @@ class MockMaskFactory: class MockContext: def __init__(self, app, node_stack, domain=None, options=[]): + from docutils.statemachine import StringList self.domain = domain self.node_stack = node_stack self.directive_args = [ None, # name None, # arguments options, # options - None, # content + StringList([], items=[]), # content None, # lineno None, # content_offset None, # block_text @@ -564,7 +565,7 @@ def get_matches(datafile): from xml.dom import minidom argsstrings = [] - with open(os.path.join(os.path.dirname(__file__), "data", datafile)) as fid: + with open(os.path.join(os.path.dirname(__file__), "data", datafile), encoding="utf-8") as fid: xml = fid.read() doc = minidom.parseString(xml)

1 0

commit kernel-source-longterm for openSUSE:Factory
by Source-Sync 20 Jan '25

20 Jan '25

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kernel-source-longterm for openSUSE:Factory checked in at 2025-01-20 17:14:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-source-longterm (Old) and /work/SRC/openSUSE:Factory/.kernel-source-longterm.new.5589 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kernel-source-longterm" Mon Jan 20 17:14:07 2025 rev:52 rq:1238638 version:6.6.72 Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-source-longterm/kernel-longterm.changes 2025-01-14 16:21:14.302509662 +0100 +++ /work/SRC/openSUSE:Factory/.kernel-source-longterm.new.5589/kernel-longterm.changes 2025-01-20 17:14:24.397779682 +0100 @@ -1,0 +2,232 @@ +Fri Jan 17 14:52:33 CET 2025 - rfrohl(a)suse.com + +- Linux 6.6.72 (bsc#1218260). +- drm/mediatek: Only touch DISP_REG_OVL_PITCH_MSB if AFBC is + supported (bsc#1218260). +- riscv: Fix text patching when IPI are used (bsc#1218260). +- mm: hugetlb: independent PMD page table shared count + (bsc#1218260). +- mm/hugetlb: enforce that PMD PT sharing has split PMD PT locks + (bsc#1218260). +- fs/Kconfig: make hugetlbfs a menuconfig (bsc#1218260). +- pgtable: fix s390 ptdesc field comments (bsc#1218260). +- workqueue: Do not warn when cancelling WQ_MEM_RECLAIM work + from !WQ_MEM_RECLAIM worker (bsc#1218260). +- workqueue: Update lock debugging code (bsc#1218260). +- workqueue: Add rcu lock check at the end of work item execution + (bsc#1218260). +- pmdomain: imx: gpcv2: fix an OF node reference leak in + imx_gpcv2_probe() (bsc#1218260). +- pmdomain: imx: gpcv2: Simplify with scoped for each OF child + loop (bsc#1218260). +- arm64: dts: rockchip: add hevc power domain clock to rk3328 + (bsc#1218260). +- block, bfq: fix waker_bfqq UAF after bfq_split_bfqq() + (bsc#1218260). +- hwmon: (drivetemp) Fix driver producing garbage data when SCSI + errors occur (bsc#1218260). +- ARM: dts: imxrt1050: Fix clocks for mmc (bsc#1218260). +- io_uring/eventfd: ensure io_eventfd_signal() defers another + RCU period (bsc#1218260). +- riscv: kprobes: Fix incorrect address calculation (bsc#1218260). +- iio: adc: ad7124: Disable all channels at probe time + (bsc#1218260). +- iio: inkern: call iio_device_put() only on mapped devices + (bsc#1218260). +- iio: adc: at91: call input_free_device() on allocated iio_dev + (bsc#1218260). +- iio: adc: ti-ads124s08: Use gpiod_set_value_cansleep() + (bsc#1218260). +- iio: gyro: fxas21002c: Fix missing data update in trigger + handler (bsc#1218260). +- iio: adc: ti-ads8688: fix information leak in triggered buffer + (bsc#1218260). +- iio: adc: rockchip_saradc: fix information leak in triggered + buffer (bsc#1218260). +- iio: imu: kmx61: fix information leak in triggered buffer + (bsc#1218260). +- iio: light: vcnl4035: fix information leak in triggered buffer + (bsc#1218260). +- iio: dummy: iio_simply_dummy_buffer: fix information leak in + triggered buffer (bsc#1218260). +- iio: pressure: zpa2326: fix information leak in triggered buffer + (bsc#1218260). +- usb: gadget: configfs: Ignore trailing LF for user strings to + cdev (bsc#1218260). +- usb: gadget: f_fs: Remove WARN_ON in functionfs_bind + (bsc#1218260). +- usb: typec: tcpm/tcpci_maxim: fix error code in + max_contaminant_read_resistance_kohm() (bsc#1218260). +- usb: gadget: f_uac2: Fix incorrect setting of bNumEndpoints + (bsc#1218260). +- usb: chipidea: ci_hdrc_imx: decrement device's refcount in + .remove() and in the error path of .probe() (bsc#1218260). +- usb: gadget: midi2: Reverse-select at the right place + (bsc#1218260). +- usb: fix reference leak in usb_new_device() (bsc#1218260). +- USB: core: Disable LPM only for non-suspended ports + (bsc#1218260). +- USB: usblp: return error when setting unsupported protocol + (bsc#1218260). +- usb: dwc3-am62: Disable autosuspend during remove (bsc#1218260). +- x86/fpu: Ensure shadow stack is active before "getting" + registers (bsc#1218260). +- usb: gadget: u_serial: Disable ep before setting port to null + to fix the crash caused by port being null (bsc#1218260). +- tty: serial: 8250: Fix another runtime PM usage counter + underflow (bsc#1218260). +- misc: microchip: pci1xxxx: Resolve return code mismatch during + GPIO set config (bsc#1218260). +- misc: microchip: pci1xxxx: Resolve kernel panic during GPIO + IRQ handling (bsc#1218260). +- topology: Keep the cpumask unchanged when printing cpumap + (bsc#1218260). +- usb: dwc3: gadget: fix writing NYET threshold (bsc#1218260). +- USB: serial: cp210x: add Phoenix Contact UPS Device + (bsc#1218260). +- usb-storage: Add max sectors quirk for Nokia 208 (bsc#1218260). +- staging: iio: ad9832: Correct phase range check (bsc#1218260). +- staging: iio: ad9834: Correct phase range check (bsc#1218260). +- USB: serial: option: add Neoway N723-EA support (bsc#1218260). +- USB: serial: option: add MeiG Smart SRM815 (bsc#1218260). +- dm-verity FEC: Fix RS FEC repair for roots unaligned to block + size (take 2) (bsc#1218260). +- f2fs: fix null-ptr-deref in f2fs_submit_page_bio() + (bsc#1218260). +- io_uring/timeout: fix multishot updates (bsc#1218260). +- drm/amd/display: increase MAX_SURFACES to the value supported + by hw (bsc#1218260). +- drm/amdkfd: fixed page fault when enable MES shader debugger + (bsc#1218260). +- ACPI: resource: Add Asus Vivobook X1504VAP to + irq1_level_low_skip_override[] (bsc#1218260). +- ACPI: resource: Add TongFang GM5HG0A to + irq1_edge_low_force_override[] (bsc#1218260). +- riscv: Fix sleeping in invalid context in die() (bsc#1218260). +- smb: client: sync the root session and superblock context + passwords before automounting (bsc#1218260). +- thermal: of: fix OF node leak in of_thermal_zone_find() + (bsc#1218260). +- drm/amd/display: Add check for granularity in dml ceil/floor + helpers (bsc#1218260). +- ksmbd: Implement new SMB3 POSIX type (bsc#1218260). +- sctp: sysctl: plpmtud_probe_interval: avoid using + current->nsproxy (bsc#1218260). +- sctp: sysctl: udp_port: avoid using current->nsproxy + (bsc#1218260). +- sctp: sysctl: auth_enable: avoid using current->nsproxy + (bsc#1218260). +- sctp: sysctl: rto_min/max: avoid using current->nsproxy + (bsc#1218260). +- sctp: sysctl: cookie_hmac_alg: avoid using current->nsproxy + (bsc#1218260). +- mptcp: sysctl: sched: avoid using current->nsproxy + (bsc#1218260). +- dm-ebs: don't set the flag DM_TARGET_PASSES_INTEGRITY + (bsc#1218260). +- scsi: ufs: qcom: Power off the PHY if it was already powered + on in ufs_qcom_power_up_sequence() (bsc#1218260). +- dm thin: make get_first_thin use rcu-safe list first function + (bsc#1218260). +- riscv: mm: Fix the out of bound issue of vmemmap address + (bsc#1218260). +- cpuidle: riscv-sbi: fix device node release in early exit of + for_each_possible_cpu (bsc#1218260). +- ksmbd: fix unexpectedly changed path in + ksmbd_vfs_kern_path_locked (bsc#1218260). +- platform/x86/amd/pmc: Only disable IRQ1 wakeup where i8042 + actually enabled it (bsc#1218260). +- afs: Fix the maximum cell name length (bsc#1218260). +- ksmbd: fix a missing return value check bug (bsc#1218260). +- drm/mediatek: Add return value check when reading DPCD + (bsc#1218260). +- drm/mediatek: Fix mode valid issue for dp (bsc#1218260). +- drm/mediatek: Fix YCbCr422 color format issue for DP + (bsc#1218260). +- drm/mediatek: stop selecting foreign drivers (bsc#1218260). +- drm/mediatek: Set private->all_drm_private[i]->drm to NULL if + mtk_drm_bind returns err (bsc#1218260). +- net/mlx5: Fix variable not being completed when function returns + (bsc#1218260). +- net: stmmac: dwmac-tegra: Read iommu stream id from device tree + (bsc#1218260). +- sched: sch_cake: add bounds checks to host bulk flow fairness + counts (bsc#1218260). +- netfilter: conntrack: clamp maximum hashtable size to INT_MAX + (bsc#1218260). +- netfilter: nf_tables: imbalance in flowtable binding + (bsc#1218260). +- iio: imu: inv_icm42600: fix timestamps after suspend if sensor + is on (bsc#1218260). +- x86/mm/numa: Use NUMA_NO_NODE when calling memblock_set_node() + (bsc#1218260). +- memblock tests: fix implicit declaration of function + 'numa_valid_node' (bsc#1218260). +- riscv: Fix early ftrace nop patching (bsc#1218260). +- tcp: Annotate data-race around sk->sk_mark in tcp_v4_send_reset + (bsc#1218260). +- Bluetooth: btnxpuart: Fix driver sending truncated data + (bsc#1218260). +- Bluetooth: MGMT: Fix Add Device to responding before completing + (bsc#1218260). +- Bluetooth: hci_sync: Fix not setting Random Address when + required (bsc#1218260). +- eth: gve: use appropriate helper to set xdp_features + (bsc#1218260). +- ipvlan: Fix use-after-free in ipvlan_get_iflink() (bsc#1218260). +- tls: Fix tls_sw_sendmsg error handling (bsc#1218260). +- igc: return early when failing to read EECD register + (bsc#1218260). +- igc: field get conversion (bsc#1218260). +- ice: fix incorrect PHY settings for 100 GB/s (bsc#1218260). +- cxgb4: Avoid removal of uninserted tid (bsc#1218260). +- bnxt_en: Fix possible memory leak when hwrm_req_replace fails + (bsc#1218260). +- pds_core: limit loop over fw name list (bsc#1218260). +- btrfs: avoid NULL pointer dereference if no valid extent tree + (bsc#1218260). +- net: libwx: fix firmware mailbox abnormal return (bsc#1218260). +- net_sched: cls_flow: validate TCA_FLOW_RSHIFT attribute + (bsc#1218260). +- tcp/dccp: allow a connection when sk_max_ack_backlog is zero + (bsc#1218260). +- tcp/dccp: complete lockless accesses to sk->sk_max_ack_backlog + (bsc#1218260). +- net: 802: LLC+SNAP OID:PID lookup on start of skb data + (bsc#1218260). +- ieee802154: ca8210: Add missing check for kfifo_alloc() in + ca8210_probe() (bsc#1218260). +- selftests/alsa: Fix circular dependency involving global-timer + (bsc#1218260). +- ASoC: mediatek: disable buffer pre-allocation (bsc#1218260). +- ASoC: rt722: add delay time to wait for the calibration + procedure (bsc#1218260). +- erofs: fix PSI memstall accounting (bsc#1218260). +- erofs: handle overlapped pclusters out of crafted images + properly (bsc#1218260). +- ovl: support encoding fid from inode with no alias + (bsc#1218260). +- ovl: pass realinode to ovl_encode_real_fh() instead of + realdentry (bsc#1218260). +- ovl: do not encode lower fh with upper sb_writers held + (bsc#1218260). +- exfat: fix the infinite loop in __exfat_free_cluster() + (bsc#1218260). +- exfat: fix the infinite loop in exfat_readdir() (bsc#1218260). +- dm array: fix cursor index when skipping across block boundaries + (bsc#1218260). +- dm array: fix unreleased btree blocks on closing a faulty + array cursor (bsc#1218260). +- dm array: fix releasing a faulty array block twice in + dm_array_cursor_end (bsc#1218260). +- jbd2: flush filesystem device before updating tail sequence + (bsc#1218260). +- jbd2: increase IO priority for writing revoke records + (bsc#1218260). +- memblock: use numa_valid_node() helper to check for invalid + node ID (bsc#1218260). +- memblock: make memblock_set_node() also warn about use of + MAX_NUMNODES (bsc#1218260). +- commit fa56c45 + +------------------------------------------------------------------- @@ -14,7 +245,0 @@ -Fri Jan 10 10:55:58 CET 2025 - rfrohl(a)suse.com - -- blacklist.conf: missing dependencies for successful build: 8cd63406d081 - 8cd63406d081 trace/ring-buffer: Do not use TP_printk() formatting for boot mapped buffers -- commit 0d8b205 - -------------------------------------------------------------------- @@ -28,8 +252,0 @@ -Fri Jan 10 09:21:42 CET 2025 - rfrohl(a)suse.com - -- blacklist.conf: add git-fixes candidates - e0eec24e2e19 memblock: make memblock_set_node() also warn about use of MAX_NUMNODES - 9a884bdb6e95 iio: magnetometer: fix if () scoped_guard() formatting -- commit 3fbad4d - -------------------------------------------------------------------- @@ -1630,8 +1846,0 @@ -Mon Dec 9 20:12:46 CET 2024 - rfrohl(a)suse.com - -- blacklist.conf: 4c006734898a and 6a057072ddd1 - 6a057072ddd1 drm/amd/display: Fix null check for pipe_ctx->plane_state in dcn20_program_pipe - 4c006734898a x86/xen: fix memblock_reserve() usage on PVH -- commit 11cb128 - -------------------------------------------------------------------- @@ -3301,6 +3509,0 @@ -Fri Nov 8 23:49:50 CET 2024 - rfrohl(a)suse.com - -- blacklist.conf: block: fix queue limits checks in blk_rq_map_user_bvec for real -- commit 8a5d4b8 - -------------------------------------------------------------------- @@ -6454,14 +6656,0 @@ -Mon Sep 16 11:14:58 CEST 2024 - rfrohl(a)suse.com - -- Revert "blacklist.conf: tracing/osnoise: Fix build when timerlat is not enabled (git-fixes)" - This reverts commit c728bebd134dbd6ab795f5b556e3e4ff4810da75. -- commit 8011326 - -------------------------------------------------------------------- -Thu Sep 12 13:18:33 CEST 2024 - rfrohl(a)suse.com - -- blacklist.conf: tracing/osnoise: Fix build when timerlat is not enabled (git-fixes) - Blacklisting this for now as it is not yet upstream. -- commit c728beb - -------------------------------------------------------------------- @@ -11458,6 +11646,0 @@ -Mon Jun 17 10:38:40 CEST 2024 - rfrohl(a)suse.com - -- Updated blacklist.conf for 6.6.34 (bsc#1218260). -- commit 69bfff0 - -------------------------------------------------------------------- @@ -14045,6 +14227,0 @@ -Sat Apr 27 21:31:36 CEST 2024 - rfrohl(a)suse.com - -- Updated blacklist.conf for 6.6.29 (bsc#1218260). -- commit 68badd0 - -------------------------------------------------------------------- @@ -15227,6 +15403,0 @@ -Thu Apr 4 21:57:48 CEST 2024 - rfrohl(a)suse.com - ++++ 142 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kernel-source-longterm/kernel-longterm.changes ++++ and /work/SRC/openSUSE:Factory/.kernel-source-longterm.new.5589/kernel-longterm.changes kernel-source-longterm.changes: same change kernel-syms-longterm.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-longterm.spec ++++++ --- /var/tmp/diff_new_pack.0vyCon/_old 2025-01-20 17:14:27.033888201 +0100 +++ /var/tmp/diff_new_pack.0vyCon/_new 2025-01-20 17:14:27.037888365 +0100 @@ -18,8 +18,8 @@ %define srcversion 6.6 -%define patchversion 6.6.71 -%define git_commit 846f31fa700b72594f4abe2fd49616cdb903b053 +%define patchversion 6.6.72 +%define git_commit b034d951b8a78852c99b7cf62cbb37a2f9395c8b %define variant -longterm%{nil} %define compress_modules zstd %define compress_vmlinux xz @@ -113,9 +113,9 @@ Summary: The Linux Kernel License: GPL-2.0-only Group: System/Kernel -Version: 6.6.71 +Version: 6.6.72 %if 0%{?is_kotd} -Release: <RELEASE>.g846f31f +Release: <RELEASE>.gb034d95 %else Release: 0 %endif ++++++ kernel-source-longterm.spec ++++++ --- /var/tmp/diff_new_pack.0vyCon/_old 2025-01-20 17:14:27.069889683 +0100 +++ /var/tmp/diff_new_pack.0vyCon/_new 2025-01-20 17:14:27.073889848 +0100 @@ -17,8 +17,8 @@ %define srcversion 6.6 -%define patchversion 6.6.71 -%define git_commit 846f31fa700b72594f4abe2fd49616cdb903b053 +%define patchversion 6.6.72 +%define git_commit b034d951b8a78852c99b7cf62cbb37a2f9395c8b %define variant -longterm%{nil} %include %_sourcedir/kernel-spec-macros @@ -31,9 +31,9 @@ %endif Name: kernel-source-longterm -Version: 6.6.71 +Version: 6.6.72 %if 0%{?is_kotd} -Release: <RELEASE>.g846f31f +Release: <RELEASE>.gb034d95 %else Release: 0 %endif ++++++ kernel-syms-longterm.spec ++++++ --- /var/tmp/diff_new_pack.0vyCon/_old 2025-01-20 17:14:27.109891330 +0100 +++ /var/tmp/diff_new_pack.0vyCon/_new 2025-01-20 17:14:27.109891330 +0100 @@ -16,7 +16,7 @@ # -%define git_commit 846f31fa700b72594f4abe2fd49616cdb903b053 +%define git_commit b034d951b8a78852c99b7cf62cbb37a2f9395c8b %define variant -longterm%{nil} %include %_sourcedir/kernel-spec-macros @@ -25,10 +25,10 @@ Summary: Kernel Symbol Versions (modversions) License: GPL-2.0-only Group: Development/Sources -Version: 6.6.71 +Version: 6.6.72 %if %using_buildservice %if 0%{?is_kotd} -Release: <RELEASE>.g846f31f +Release: <RELEASE>.gb034d95 %else Release: 0 %endif ++++++ patches.kernel.org.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kernel-source-longterm/patches.kernel.org.tar.bz2 /work/SRC/openSUSE:Factory/.kernel-source-longterm.new.5589/patches.kernel.org.tar.bz2 differ: char 11, line 1 ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.0vyCon/_old 2025-01-20 17:14:27.857922124 +0100 +++ /var/tmp/diff_new_pack.0vyCon/_new 2025-01-20 17:14:27.865922452 +0100 @@ -14119,6 +14119,136 @@ patches.kernel.org/6.6.71-002-Revert-x86-crash-wrap-crash-dumping-code-into… patches.kernel.org/6.6.71-003-x86-hyperv-Fix-hv-tsc-page-based-sched_clock-… patches.kernel.org/6.6.71-004-Linux-6.6.71.patch + patches.kernel.org/6.6.72-001-memblock-make-memblock_set_node-also-warn-abo… + patches.kernel.org/6.6.72-002-memblock-use-numa_valid_node-helper-to-check-… + patches.kernel.org/6.6.72-003-jbd2-increase-IO-priority-for-writing-revoke-… + patches.kernel.org/6.6.72-004-jbd2-flush-filesystem-device-before-updating-… + patches.kernel.org/6.6.72-005-dm-array-fix-releasing-a-faulty-array-block-t… + patches.kernel.org/6.6.72-006-dm-array-fix-unreleased-btree-blocks-on-closi… + patches.kernel.org/6.6.72-007-dm-array-fix-cursor-index-when-skipping-acros… + patches.kernel.org/6.6.72-008-exfat-fix-the-infinite-loop-in-exfat_readdir.… + patches.kernel.org/6.6.72-009-exfat-fix-the-infinite-loop-in-__exfat_free_c… + patches.kernel.org/6.6.72-010-ovl-do-not-encode-lower-fh-with-upper-sb_writ… + patches.kernel.org/6.6.72-011-ovl-pass-realinode-to-ovl_encode_real_fh-inst… + patches.kernel.org/6.6.72-012-ovl-support-encoding-fid-from-inode-with-no-a… + patches.kernel.org/6.6.72-013-erofs-handle-overlapped-pclusters-out-of-craf… + patches.kernel.org/6.6.72-014-erofs-fix-PSI-memstall-accounting.patch + patches.kernel.org/6.6.72-015-ASoC-rt722-add-delay-time-to-wait-for-the-cal… + patches.kernel.org/6.6.72-016-ASoC-mediatek-disable-buffer-pre-allocation.p… + patches.kernel.org/6.6.72-017-selftests-alsa-Fix-circular-dependency-involv… + patches.kernel.org/6.6.72-018-ieee802154-ca8210-Add-missing-check-for-kfifo… + patches.kernel.org/6.6.72-019-net-802-LLC-SNAP-OID-PID-lookup-on-start-of-s… + patches.kernel.org/6.6.72-020-tcp-dccp-complete-lockless-accesses-to-sk-sk_… + patches.kernel.org/6.6.72-021-tcp-dccp-allow-a-connection-when-sk_max_ack_b… + patches.kernel.org/6.6.72-022-net_sched-cls_flow-validate-TCA_FLOW_RSHIFT-a… + patches.kernel.org/6.6.72-023-net-libwx-fix-firmware-mailbox-abnormal-retur… + patches.kernel.org/6.6.72-024-btrfs-avoid-NULL-pointer-dereference-if-no-va… + patches.kernel.org/6.6.72-025-pds_core-limit-loop-over-fw-name-list.patch + patches.kernel.org/6.6.72-026-bnxt_en-Fix-possible-memory-leak-when-hwrm_re… + patches.kernel.org/6.6.72-027-cxgb4-Avoid-removal-of-uninserted-tid.patch + patches.kernel.org/6.6.72-028-ice-fix-incorrect-PHY-settings-for-100-GB-s.p… + patches.kernel.org/6.6.72-029-igc-field-get-conversion.patch + patches.kernel.org/6.6.72-030-igc-return-early-when-failing-to-read-EECD-re… + patches.kernel.org/6.6.72-031-tls-Fix-tls_sw_sendmsg-error-handling.patch + patches.kernel.org/6.6.72-032-ipvlan-Fix-use-after-free-in-ipvlan_get_iflin… + patches.kernel.org/6.6.72-033-eth-gve-use-appropriate-helper-to-set-xdp_fea… + patches.kernel.org/6.6.72-034-Bluetooth-hci_sync-Fix-not-setting-Random-Add… + patches.kernel.org/6.6.72-035-Bluetooth-MGMT-Fix-Add-Device-to-responding-b… + patches.kernel.org/6.6.72-036-Bluetooth-btnxpuart-Fix-driver-sending-trunca… + patches.kernel.org/6.6.72-037-tcp-Annotate-data-race-around-sk-sk_mark-in-t… + patches.kernel.org/6.6.72-038-riscv-Fix-early-ftrace-nop-patching.patch + patches.kernel.org/6.6.72-039-memblock-tests-fix-implicit-declaration-of-fu… + patches.kernel.org/6.6.72-040-x86-mm-numa-Use-NUMA_NO_NODE-when-calling-mem… + patches.kernel.org/6.6.72-041-iio-imu-inv_icm42600-fix-timestamps-after-sus… + patches.kernel.org/6.6.72-042-netfilter-nf_tables-imbalance-in-flowtable-bi… + patches.kernel.org/6.6.72-043-netfilter-conntrack-clamp-maximum-hashtable-s… + patches.kernel.org/6.6.72-044-sched-sch_cake-add-bounds-checks-to-host-bulk… + patches.kernel.org/6.6.72-045-net-stmmac-dwmac-tegra-Read-iommu-stream-id-f… + patches.kernel.org/6.6.72-046-net-mlx5-Fix-variable-not-being-completed-whe… + patches.kernel.org/6.6.72-047-drm-mediatek-Set-private-all_drm_private-i-dr… + patches.kernel.org/6.6.72-048-drm-mediatek-stop-selecting-foreign-drivers.p… + patches.kernel.org/6.6.72-049-drm-mediatek-Fix-YCbCr422-color-format-issue-… + patches.kernel.org/6.6.72-050-drm-mediatek-Fix-mode-valid-issue-for-dp.patch + patches.kernel.org/6.6.72-051-drm-mediatek-Add-return-value-check-when-read… + patches.kernel.org/6.6.72-052-ksmbd-fix-a-missing-return-value-check-bug.pa… + patches.kernel.org/6.6.72-053-afs-Fix-the-maximum-cell-name-length.patch + patches.kernel.org/6.6.72-054-platform-x86-amd-pmc-Only-disable-IRQ1-wakeup… + patches.kernel.org/6.6.72-055-ksmbd-fix-unexpectedly-changed-path-in-ksmbd_… + patches.kernel.org/6.6.72-056-cpuidle-riscv-sbi-fix-device-node-release-in-… + patches.kernel.org/6.6.72-057-riscv-mm-Fix-the-out-of-bound-issue-of-vmemma… + patches.kernel.org/6.6.72-058-dm-thin-make-get_first_thin-use-rcu-safe-list… + patches.kernel.org/6.6.72-059-scsi-ufs-qcom-Power-off-the-PHY-if-it-was-alr… + patches.kernel.org/6.6.72-060-dm-ebs-don-t-set-the-flag-DM_TARGET_PASSES_IN… + patches.kernel.org/6.6.72-061-mptcp-sysctl-sched-avoid-using-current-nsprox… + patches.kernel.org/6.6.72-062-sctp-sysctl-cookie_hmac_alg-avoid-using-curre… + patches.kernel.org/6.6.72-063-sctp-sysctl-rto_min-max-avoid-using-current-n… + patches.kernel.org/6.6.72-064-sctp-sysctl-auth_enable-avoid-using-current-n… + patches.kernel.org/6.6.72-065-sctp-sysctl-udp_port-avoid-using-current-nspr… + patches.kernel.org/6.6.72-066-sctp-sysctl-plpmtud_probe_interval-avoid-usin… + patches.kernel.org/6.6.72-067-ksmbd-Implement-new-SMB3-POSIX-type.patch + patches.kernel.org/6.6.72-068-drm-amd-display-Add-check-for-granularity-in-… + patches.kernel.org/6.6.72-069-thermal-of-fix-OF-node-leak-in-of_thermal_zon… + patches.kernel.org/6.6.72-070-smb-client-sync-the-root-session-and-superblo… + patches.kernel.org/6.6.72-071-riscv-Fix-sleeping-in-invalid-context-in-die.… + patches.kernel.org/6.6.72-072-ACPI-resource-Add-TongFang-GM5HG0A-to-irq1_ed… + patches.kernel.org/6.6.72-073-ACPI-resource-Add-Asus-Vivobook-X1504VAP-to-i… + patches.kernel.org/6.6.72-074-drm-amdkfd-fixed-page-fault-when-enable-MES-s… + patches.kernel.org/6.6.72-075-drm-amd-display-increase-MAX_SURFACES-to-the-… + patches.kernel.org/6.6.72-076-io_uring-timeout-fix-multishot-updates.patch + patches.kernel.org/6.6.72-077-f2fs-fix-null-ptr-deref-in-f2fs_submit_page_b… + patches.kernel.org/6.6.72-078-dm-verity-FEC-Fix-RS-FEC-repair-for-roots-una… + patches.kernel.org/6.6.72-079-USB-serial-option-add-MeiG-Smart-SRM815.patch + patches.kernel.org/6.6.72-080-USB-serial-option-add-Neoway-N723-EA-support.… + patches.kernel.org/6.6.72-081-staging-iio-ad9834-Correct-phase-range-check.… + patches.kernel.org/6.6.72-082-staging-iio-ad9832-Correct-phase-range-check.… + patches.kernel.org/6.6.72-083-usb-storage-Add-max-sectors-quirk-for-Nokia-2… + patches.kernel.org/6.6.72-084-USB-serial-cp210x-add-Phoenix-Contact-UPS-Dev… + patches.kernel.org/6.6.72-085-usb-dwc3-gadget-fix-writing-NYET-threshold.pa… + patches.kernel.org/6.6.72-086-topology-Keep-the-cpumask-unchanged-when-prin… + patches.kernel.org/6.6.72-087-misc-microchip-pci1xxxx-Resolve-kernel-panic-… + patches.kernel.org/6.6.72-088-misc-microchip-pci1xxxx-Resolve-return-code-m… + patches.kernel.org/6.6.72-089-tty-serial-8250-Fix-another-runtime-PM-usage-… + patches.kernel.org/6.6.72-090-usb-gadget-u_serial-Disable-ep-before-setting… + patches.kernel.org/6.6.72-091-x86-fpu-Ensure-shadow-stack-is-active-before-… + patches.kernel.org/6.6.72-092-usb-dwc3-am62-Disable-autosuspend-during-remo… + patches.kernel.org/6.6.72-093-USB-usblp-return-error-when-setting-unsupport… + patches.kernel.org/6.6.72-094-USB-core-Disable-LPM-only-for-non-suspended-p… + patches.kernel.org/6.6.72-095-usb-fix-reference-leak-in-usb_new_device.patch + patches.kernel.org/6.6.72-096-usb-gadget-midi2-Reverse-select-at-the-right-… + patches.kernel.org/6.6.72-097-usb-chipidea-ci_hdrc_imx-decrement-device-s-r… + patches.kernel.org/6.6.72-098-usb-gadget-f_uac2-Fix-incorrect-setting-of-bN… + patches.kernel.org/6.6.72-099-usb-typec-tcpm-tcpci_maxim-fix-error-code-in-… + patches.kernel.org/6.6.72-100-usb-gadget-f_fs-Remove-WARN_ON-in-functionfs_… + patches.kernel.org/6.6.72-101-usb-gadget-configfs-Ignore-trailing-LF-for-us… + patches.kernel.org/6.6.72-102-iio-pressure-zpa2326-fix-information-leak-in-… + patches.kernel.org/6.6.72-103-iio-dummy-iio_simply_dummy_buffer-fix-informa… + patches.kernel.org/6.6.72-104-iio-light-vcnl4035-fix-information-leak-in-tr… + patches.kernel.org/6.6.72-105-iio-imu-kmx61-fix-information-leak-in-trigger… + patches.kernel.org/6.6.72-106-iio-adc-rockchip_saradc-fix-information-leak-… + patches.kernel.org/6.6.72-107-iio-adc-ti-ads8688-fix-information-leak-in-tr… + patches.kernel.org/6.6.72-108-iio-gyro-fxas21002c-Fix-missing-data-update-i… + patches.kernel.org/6.6.72-109-iio-adc-ti-ads124s08-Use-gpiod_set_value_cans… + patches.kernel.org/6.6.72-110-iio-adc-at91-call-input_free_device-on-alloca… + patches.kernel.org/6.6.72-111-iio-inkern-call-iio_device_put-only-on-mapped… + patches.kernel.org/6.6.72-112-iio-adc-ad7124-Disable-all-channels-at-probe-… + patches.kernel.org/6.6.72-113-riscv-kprobes-Fix-incorrect-address-calculati… + patches.kernel.org/6.6.72-114-io_uring-eventfd-ensure-io_eventfd_signal-def… + patches.kernel.org/6.6.72-115-ARM-dts-imxrt1050-Fix-clocks-for-mmc.patch + patches.kernel.org/6.6.72-116-hwmon-drivetemp-Fix-driver-producing-garbage-… + patches.kernel.org/6.6.72-117-block-bfq-fix-waker_bfqq-UAF-after-bfq_split_… + patches.kernel.org/6.6.72-118-arm64-dts-rockchip-add-hevc-power-domain-cloc… + patches.kernel.org/6.6.72-119-pmdomain-imx-gpcv2-Simplify-with-scoped-for-e… + patches.kernel.org/6.6.72-120-pmdomain-imx-gpcv2-fix-an-OF-node-reference-l… + patches.kernel.org/6.6.72-121-workqueue-Add-rcu-lock-check-at-the-end-of-wo… + patches.kernel.org/6.6.72-122-workqueue-Update-lock-debugging-code.patch + patches.kernel.org/6.6.72-123-workqueue-Do-not-warn-when-cancelling-WQ_MEM_… + patches.kernel.org/6.6.72-124-pgtable-fix-s390-ptdesc-field-comments.patch + patches.kernel.org/6.6.72-125-fs-Kconfig-make-hugetlbfs-a-menuconfig.patch + patches.kernel.org/6.6.72-126-mm-hugetlb-enforce-that-PMD-PT-sharing-has-sp… + patches.kernel.org/6.6.72-127-mm-hugetlb-independent-PMD-page-table-shared-… + patches.kernel.org/6.6.72-128-riscv-Fix-text-patching-when-IPI-are-used.pat… + patches.kernel.org/6.6.72-129-drm-mediatek-Only-touch-DISP_REG_OVL_PITCH_MS… + patches.kernel.org/6.6.72-130-Linux-6.6.72.patch ######################################################## # Build fixes that apply to the vanilla kernel too. ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.0vyCon/_old 2025-01-20 17:14:27.893923606 +0100 +++ /var/tmp/diff_new_pack.0vyCon/_new 2025-01-20 17:14:27.897923770 +0100 @@ -1,4 +1,4 @@ -2025-01-10 15:04:59 +0000 -GIT Revision: 846f31fa700b72594f4abe2fd49616cdb903b053 +2025-01-17 16:18:34 +0000 +GIT Revision: b034d951b8a78852c99b7cf62cbb37a2f9395c8b GIT Branch: slowroll

1 0

commit python-executing for openSUSE:Factory
by Source-Sync 20 Jan '25

20 Jan '25

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-executing for openSUSE:Factory checked in at 2025-01-20 17:14:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-executing (Old) and /work/SRC/openSUSE:Factory/.python-executing.new.5589 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-executing" Mon Jan 20 17:14:03 2025 rev:13 rq:1238543 version:2.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-executing/python-executing.changes 2024-10-23 21:08:21.633913986 +0200 +++ /work/SRC/openSUSE:Factory/.python-executing.new.5589/python-executing.changes 2025-01-20 17:14:08.161111285 +0100 @@ -1,0 +2,5 @@ +Fri Jan 17 16:19:38 UTC 2025 - Markéta Machová <mmachova(a)suse.com> + +- Add pytest.patch to fix compatibility with new pytest + +------------------------------------------------------------------- New: ---- pytest.patch BETA DEBUG BEGIN: New: - Add pytest.patch to fix compatibility with new pytest BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-executing.spec ++++++ --- /var/tmp/diff_new_pack.kbWQaw/_old 2025-01-20 17:14:08.689133022 +0100 +++ /var/tmp/diff_new_pack.kbWQaw/_new 2025-01-20 17:14:08.689133022 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-executing # -# 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 @@ -34,6 +34,8 @@ Source: https://files.pythonhosted.org/packages/source/e/executing/executing-%{vers… # PATCH-FIX-UPSTREAM https://github.com/alexmojaki/executing/pull/86 fix: backward compatibility fix for changed source positions in 3.12.6 Patch0: new-python-312.patch +# PATCH-FIX-UPSTREAM https://github.com/alexmojaki/executing/pull/94 fix: check for pytest compatibility +Patch1: pytest.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools_scm >= 4.0.0} ++++++ pytest.patch ++++++ From 0edb6ca3d733d8cb3fd1ddc7994bde61991ac4c2 Mon Sep 17 00:00:00 2001 From: Frank Hoffmann <44680962+15r10nk(a)users.noreply.github.com> Date: Sun, 12 Jan 2025 17:03:09 +0100 Subject: [PATCH] fix: check for pytest compatibility (#94) --- executing/__init__.py | 5 ++++- executing/_pytest_utils.py | 16 ++++++++++++++++ tests/conftest.py | 25 +++++++++++++++++++++++++ tests/test_main.py | 5 ----- tests/test_pytest.py | 5 +++++ 5 files changed, 50 insertions(+), 6 deletions(-) create mode 100644 executing/_pytest_utils.py create mode 100644 tests/conftest.py diff --git a/executing/__init__.py b/executing/__init__.py index b645197..e5181a5 100644 --- a/executing/__init__.py +++ b/executing/__init__.py @@ -10,6 +10,9 @@ from collections import namedtuple _VersionInfo = namedtuple('_VersionInfo', ('major', 'minor', 'micro')) from .executing import Source, Executing, only, NotOneValueFound, cache, future_flags + +from ._pytest_utils import is_pytest_compatible + try: from .version import __version__ # type: ignore[import] if "dev" in __version__: @@ -22,4 +25,4 @@ __version_info__ = _VersionInfo(*map(int, __version__.split('.'))) -__all__ = ["Source"] +__all__ = ["Source","is_pytest_compatible"] diff --git a/executing/_pytest_utils.py b/executing/_pytest_utils.py new file mode 100644 index 0000000..fab8693 --- /dev/null +++ b/executing/_pytest_utils.py @@ -0,0 +1,16 @@ +import sys + + + +def is_pytest_compatible() -> bool: + """ returns true if executing can be used for expressions inside assert statements which are rewritten by pytest + """ + if sys.version_info < (3, 11): + return False + + try: + import pytest + except ImportError: + return False + + return pytest.version_tuple >= (8, 3, 4) diff --git a/tests/conftest.py b/tests/conftest.py new file mode 100644 index 0000000..5108348 --- /dev/null +++ b/tests/conftest.py @@ -0,0 +1,25 @@ + + +from typing import Optional, Sequence, Union +from executing._pytest_utils import is_pytest_compatible +import _pytest.assertion.rewrite as rewrite +import importlib.machinery +import types + +if not is_pytest_compatible(): + original_find_spec = rewrite.AssertionRewritingHook.find_spec + + + def find_spec( + self, + name: str, + path: Optional[Sequence[Union[str, bytes]]] = None, + target: Optional[types.ModuleType] = None, + ) -> Optional[importlib.machinery.ModuleSpec]: + + if name == "tests.test_main": + return None + return original_find_spec(self, name, path, target) + + + rewrite.AssertionRewritingHook.find_spec = find_spec diff --git a/tests/test_main.py b/tests/test_main.py index a3f92ee..e3bc9d6 100644 --- a/tests/test_main.py +++ b/tests/test_main.py @@ -1,9 +1,4 @@ # -*- coding: utf-8 -*- -""" - -assert rewriting will break executing -PYTEST_DONT_REWRITE -""" from __future__ import print_function, division import ast import contextlib diff --git a/tests/test_pytest.py b/tests/test_pytest.py index 281598d..5cbe0a2 100644 --- a/tests/test_pytest.py +++ b/tests/test_pytest.py @@ -6,6 +6,7 @@ from time import sleep import asttokens +from executing._pytest_utils import is_pytest_compatible import pytest from littleutils import SimpleNamespace @@ -124,6 +125,10 @@ def check_manual_linecache(filename): def test_exception_catching(): frame = inspect.currentframe() + if is_pytest_compatible(): + assert isinstance(Source.executing(frame).node,ast.Call) + return + executing.executing.TESTING = True # this is already the case in all other tests # Sanity check that this operation usually raises an exception. # This actually depends on executing not working in the presence of pytest.

1 0

commit discord for openSUSE:Factory:NonFree
by Source-Sync 20 Jan '25

20 Jan '25

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package discord for openSUSE:Factory:NonFree checked in at 2025-01-20 17:13:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory:NonFree/discord (Old) and /work/SRC/openSUSE:Factory:NonFree/.discord.new.5589 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "discord" Mon Jan 20 17:13:32 2025 rev:76 rq:1238730 version:0.0.80 Changes: -------- --- /work/SRC/openSUSE:Factory:NonFree/discord/discord.changes 2025-01-14 16:20:33.140806502 +0100 +++ /work/SRC/openSUSE:Factory:NonFree/.discord.new.5589/discord.changes 2025-01-20 17:13:33.879711039 +0100 @@ -1,0 +2,6 @@ +Tue Jan 14 21:35:08 UTC 2025 - Wojciech Kazubski <wk(a)ire.pw.edu.pl> + +- Update to version 0.0.80 + * No upstream release notes + +------------------------------------------------------------------- Old: ---- discord-0.0.79.tar.gz New: ---- discord-0.0.80.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ discord.spec ++++++ --- /var/tmp/diff_new_pack.cY39mJ/_old 2025-01-20 17:13:35.611779499 +0100 +++ /var/tmp/diff_new_pack.cY39mJ/_new 2025-01-20 17:13:35.611779499 +0100 @@ -25,7 +25,7 @@ # This is to enable build with patent encoumbered codecs. Not allowed in OBS %bcond_with x264 Name: discord -Version: 0.0.79 +Version: 0.0.80 Release: 0 Summary: Voice and Text Chat for Gamers License: SUSE-NonFree ++++++ discord-0.0.79.tar.gz -> discord-0.0.80.tar.gz ++++++ /work/SRC/openSUSE:Factory:NonFree/discord/discord-0.0.79.tar.gz /work/SRC/openSUSE:Factory:NonFree/.discord.new.5589/discord-0.0.80.tar.gz differ: char 12, line 1

1 0