June 2022 - openSUSE Commits - openSUSE Mailing Lists

commit memleax for openSUSE:Factory
by Source-Sync 29 Jun '22

29 Jun '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package memleax for openSUSE:Factory checked in at 2022-06-29 16:01:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/memleax (Old) and /work/SRC/openSUSE:Factory/.memleax.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "memleax" Wed Jun 29 16:01:25 2022 rev:3 rq:985609 version:1.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/memleax/memleax.changes 2022-06-27 11:26:01.262631474 +0200 +++ /work/SRC/openSUSE:Factory/.memleax.new.1548/memleax.changes 2022-06-29 16:02:42.064729950 +0200 @@ -1,0 +2,6 @@ +Mon Jun 27 08:00:47 UTC 2022 - Jan Engelhardt <jengelh(a)inai.de> + +- configure.ac has a whitelist rather than a blacklist, so use + ExclusiveArch rather than ExcludeArch. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ memleax.spec ++++++ --- /var/tmp/diff_new_pack.xr4lFh/_old 2022-06-29 16:02:42.396730392 +0200 +++ /var/tmp/diff_new_pack.xr4lFh/_new 2022-06-29 16:02:42.400730397 +0200 @@ -26,7 +26,7 @@ BuildRequires: libdw-devel BuildRequires: libelf-devel BuildRequires: libunwind-devel -ExcludeArch: s390x +ExclusiveArch: %ix86 x86_64 %arm aarch64 %description Memleax is capable of debugging memory leak of a running process by

1 0

commit vorta for openSUSE:Factory
by Source-Sync 29 Jun '22

29 Jun '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package vorta for openSUSE:Factory checked in at 2022-06-29 16:01:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vorta (Old) and /work/SRC/openSUSE:Factory/.vorta.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vorta" Wed Jun 29 16:01:23 2022 rev:19 rq:985608 version:0.8.7 Changes: -------- --- /work/SRC/openSUSE:Factory/vorta/vorta.changes 2022-05-25 20:35:41.668322441 +0200 +++ /work/SRC/openSUSE:Factory/.vorta.new.1548/vorta.changes 2022-06-29 16:02:40.416727756 +0200 @@ -1,0 +2,22 @@ +Wed Jun 22 05:54:02 UTC 2022 - Jaime Marqu��nez Ferr��ndiz <jaime.marquinez.ferrandiz(a)fastmail.net> + +- Update to 0.8.7 + * Deal with new archive_progress key (#1353) + * Raise ValueError in case of unknown change type in diff json. By @real-yfprojects (#1350) + * Fix unlink action when repo combobox is empty. By @real-yfprojects (#1342) + * Show date of next backup. By @tal66 (#1319) +- Update to 0.8.6 + * Remove call to QTranslator.language() in get_locale. (#1316) +- Update to 0.8.5 + * Fix macOS Archive settings form sizing (#1311) + * Fix copying the current repo to the clipboard. By @real-yfprojects (#1313) + * Determine source files for translations dynamically. By @real-yfprojects (#1309) + * Remove leftovers in repo selector (#1308) + * Pause scheduling temporarily on failures. By @real-yfprojects (#1299) + * Only schedule backup after a manual run, improve labels. @real-yfprojects (#1302) + * Select and delete multiple archives. By @real-yfprojects (#1307) + * Preserve last creation log per profile for scheduler. By @real-yfprojects (#1296) + * Don't schedule if no repo is set. By @real-yfprojects (#1288) + * Hotfix for right-click archive menu. By @real-yfprojects (#1285) + +------------------------------------------------------------------- Old: ---- v0.8.4.tar.gz New: ---- v0.8.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vorta.spec ++++++ --- /var/tmp/diff_new_pack.ehk6AE/_old 2022-06-29 16:02:40.804728273 +0200 +++ /var/tmp/diff_new_pack.ehk6AE/_new 2022-06-29 16:02:40.808728278 +0200 @@ -17,7 +17,7 @@ Name: vorta -Version: 0.8.4 +Version: 0.8.7 Release: 0 Summary: Desktop Backup Client based on BorgBackup License: GPL-3.0-only ++++++ v0.8.4.tar.gz -> v0.8.7.tar.gz ++++++ ++++ 1857 lines of diff (skipped)

1 0

commit k9s for openSUSE:Factory
by Source-Sync 29 Jun '22

29 Jun '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package k9s for openSUSE:Factory checked in at 2022-06-29 16:01:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/k9s (Old) and /work/SRC/openSUSE:Factory/.k9s.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "k9s" Wed Jun 29 16:01:24 2022 rev:18 rq:985753 version:0.25.20 Changes: -------- --- /work/SRC/openSUSE:Factory/k9s/k9s.changes 2022-01-09 22:50:01.823276353 +0100 +++ /work/SRC/openSUSE:Factory/.k9s.new.1548/k9s.changes 2022-06-29 16:02:41.184728779 +0200 @@ -1,0 +2,30 @@ +Tue Jun 28 15:46:51 UTC 2022 - kastl(a)b1-systems.de + +- Update to version 0.25.20: + * K9s release v0.25.20 (#1621) + * Issue #1620 popeye view shows duplicate pdb + * Issue #1616 Age in nodes view are n/a + +------------------------------------------------------------------- +Tue Jun 28 06:37:48 UTC 2022 - Johannes Kastl <kastl(a)b1-systems.de> + +- BuildRequire go1.18, as upstream says in go.mod + +------------------------------------------------------------------- +Tue Jun 28 06:30:05 UTC 2022 - kastl(a)b1-systems.de + +- Update to version 0.25.19: + * update deps + * K9s release v0.25.19 (#1610) + * Fix typo in FastForwards annotation name (#1600) + * Capitalise true/false when checking suspension (#1601) + * Allow all deletion propagation policies (#1553) + * fix: correct typo (#1566) + * Add Helm values support (#1518) + * Add locking favorite namespaces (#1449) (#1519) + * plugin to allow default chart values retrieval (#1539) + * fix view details secret fullscreen padding to 0 (#1493) + * Fix the flux plugin to use the context of the currently running instance (#1366) + * Fix Typo (#1422) + +------------------------------------------------------------------- Old: ---- k9s-0.25.18.tar.gz New: ---- k9s-0.25.20.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ k9s.spec ++++++ --- /var/tmp/diff_new_pack.qn5rZE/_old 2022-06-29 16:02:41.848729662 +0200 +++ /var/tmp/diff_new_pack.qn5rZE/_new 2022-06-29 16:02:41.856729673 +0200 @@ -17,14 +17,14 @@ Name: k9s -Version: 0.25.18 +Version: 0.25.20 Release: 0 Summary: Curses based terminal UI for Kubernetes clusters License: Apache-2.0 URL: https://github.com/derailed/k9s Source: %{name}-%{version}.tar.gz Source1: vendor.tar.gz -BuildRequires: golang(API) = 1.16 +BuildRequires: golang(API) = 1.18 ExcludeArch: s390 ExcludeArch: %{ix86} ++++++ _service ++++++ --- /var/tmp/diff_new_pack.qn5rZE/_old 2022-06-29 16:02:41.892729721 +0200 +++ /var/tmp/diff_new_pack.qn5rZE/_new 2022-06-29 16:02:41.892729721 +0200 @@ -3,7 +3,7 @@ <param name="url">https://github.com/derailed/k9s.git</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="revision">v0.25.18</param> + <param name="revision">v0.25.20</param> <param name="versionformat">@PARENT_TAG@</param> <param name="changesgenerate">enable</param> <param name="versionrewrite-pattern">v(.*)</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.qn5rZE/_old 2022-06-29 16:02:41.912729748 +0200 +++ /var/tmp/diff_new_pack.qn5rZE/_new 2022-06-29 16:02:41.916729753 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/derailed/k9s.git</param> - <param name="changesrevision">6085039f83cd5e8528c898cc1538f5b3287ce117</param></service></servicedata> + <param name="changesrevision">373fd4587b69d5e97eea1319b86cbb68f82a266e</param></service></servicedata> (No newline at EOF) ++++++ k9s-0.25.18.tar.gz -> k9s-0.25.20.tar.gz ++++++ /work/SRC/openSUSE:Factory/k9s/k9s-0.25.18.tar.gz /work/SRC/openSUSE:Factory/.k9s.new.1548/k9s-0.25.20.tar.gz differ: char 12, line 1 ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/k9s/vendor.tar.gz /work/SRC/openSUSE:Factory/.k9s.new.1548/vendor.tar.gz differ: char 4, line 1

1 0

commit par_text for openSUSE:Factory
by Source-Sync 29 Jun '22

29 Jun '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package par_text for openSUSE:Factory checked in at 2022-06-29 16:01:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/par_text (Old) and /work/SRC/openSUSE:Factory/.par_text.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "par_text" Wed Jun 29 16:01:19 2022 rev:2 rq:985599 version:1.53.0+git.1584347654.eb0590f Changes: -------- --- /work/SRC/openSUSE:Factory/par_text/par_text.changes 2020-09-22 21:11:08.255927074 +0200 +++ /work/SRC/openSUSE:Factory/.par_text.new.1548/par_text.changes 2022-06-29 16:02:38.068724631 +0200 @@ -1,0 +2,7 @@ +Tue Jun 28 10:12:55 UTC 2022 - Matej Cepl <mcepl(a)suse.com> + +- Add par-1.53-i18n.1.patch (which is port of + http://sysmic.org/dl/par/par-1.52-i18n.4.patch to the current master). + Suggested fix for bt#amc-nicemice/par#6. + +------------------------------------------------------------------- New: ---- par-1.53-i18n.1.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ par_text.spec ++++++ --- /var/tmp/diff_new_pack.qSqWzW/_old 2022-06-29 16:02:38.640725392 +0200 +++ /var/tmp/diff_new_pack.qSqWzW/_new 2022-06-29 16:02:38.644725397 +0200 @@ -1,7 +1,7 @@ # # spec file for package par_text # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,13 @@ Group: Productivity/Text/Convertors URL: http://www.nicemice.net/par/ Source0: par-%{version}.tar.gz +# PATCH-FEATURE-UPSTREAM par-1.53-i18n.1.patch bt#amc-nicemice/par#6 mcepl(a)suse.com +# Adds support for multibyte characters +# Originally from http://sysmic.org/dl/par/par-1.52-i18n.4.patch, but +# the site is inaccessible, so this is from +# https://web.archive.org/web/20211124085854/http://sysmic.org/dl/par/par-1.5… +# and adjusted to the current code. +Patch0: par-1.53-i18n.1.patch # I hope that these two packages are so specialised, they # shouldn't be on one system. Conflicts: par ++++++ par-1.53-i18n.1.patch ++++++ ++++ 1756 lines (skipped)

1 0

commit heimer for openSUSE:Factory
by Source-Sync 29 Jun '22

29 Jun '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package heimer for openSUSE:Factory checked in at 2022-06-29 16:01:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/heimer (Old) and /work/SRC/openSUSE:Factory/.heimer.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "heimer" Wed Jun 29 16:01:18 2022 rev:3 rq:985587 version:3.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/heimer/heimer.changes 2022-05-24 20:32:11.434963510 +0200 +++ /work/SRC/openSUSE:Factory/.heimer.new.1548/heimer.changes 2022-06-29 16:02:37.296723603 +0200 @@ -1,0 +2,13 @@ +Tue Jun 28 12:23:46 UTC 2022 - Michael Vetter <mvetter(a)suse.com> + +- Update to 3.4.0: + * Fetch the newest version and show in status bar if newer + version available + * Fix GitHub Issue #210: Option to set shadow offset and disable shadows + + Adds effects tab to the settings dialog + + Shadow offset and blur radius can now be set + * Fix GitHub Issue #211: Color defaults + + Default colors can now be set via the default settings tab + * Make it possible to tune shadow colors via the effects tab + +------------------------------------------------------------------- Old: ---- 3.3.0.tar.gz New: ---- 3.4.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ heimer.spec ++++++ --- /var/tmp/diff_new_pack.2EJ0Sb/_old 2022-06-29 16:02:37.676724109 +0200 +++ /var/tmp/diff_new_pack.2EJ0Sb/_new 2022-06-29 16:02:37.680724114 +0200 @@ -18,7 +18,7 @@ Name: heimer -Version: 3.3.0 +Version: 3.4.0 Release: 0 Summary: Mind map, diagram, and note-taking tool License: CC-BY-SA-3.0 AND GPL-3.0-only @@ -33,6 +33,7 @@ BuildRequires: pkgconfig BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Network) BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5Test) BuildRequires: pkgconfig(Qt5Xml) ++++++ 3.3.0.tar.gz -> 3.4.0.tar.gz ++++++ ++++ 11548 lines of diff (skipped)

1 0

commit postgis for openSUSE:Factory
by Source-Sync 29 Jun '22

29 Jun '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package postgis for openSUSE:Factory checked in at 2022-06-29 16:01:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/postgis (Old) and /work/SRC/openSUSE:Factory/.postgis.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "postgis" Wed Jun 29 16:01:17 2022 rev:2 rq:985570 version:3.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/postgis/postgis.changes 2022-03-15 19:05:38.888977739 +0100 +++ /work/SRC/openSUSE:Factory/.postgis.new.1548/postgis.changes 2022-06-29 16:02:36.588722661 +0200 @@ -1,0 +2,6 @@ +Tue Jun 28 10:50:10 UTC 2022 - Marcus Rueckert <mrueckert(a)suse.de> + +- no longer pull clang-devel and llvm-devel directory the correct + version will be pulled via %{pg_name}-llvmjit-devel + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ postgis.spec ++++++ --- /var/tmp/diff_new_pack.sZZ430/_old 2022-06-29 16:02:37.104723347 +0200 +++ /var/tmp/diff_new_pack.sZZ430/_new 2022-06-29 16:02:37.108723353 +0200 @@ -32,8 +32,6 @@ Patch0: patch-tests-results.patch BuildRequires: %{pg_name}-server-devel BuildRequires: %{pg_name}-llvmjit-devel -BuildRequires: clang-devel -BuildRequires: llvm-devel BuildRequires: cgal-devel BuildRequires: cunit-devel BuildRequires: fdupes

1 0

commit xfce4-branding-openSUSE for openSUSE:Factory
by Source-Sync 29 Jun '22

29 Jun '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xfce4-branding-openSUSE for openSUSE:Factory checked in at 2022-06-29 16:01:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfce4-branding-openSUSE (Old) and /work/SRC/openSUSE:Factory/.xfce4-branding-openSUSE.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xfce4-branding-openSUSE" Wed Jun 29 16:01:17 2022 rev:88 rq:985560 version:4.16.1+git0.77ba799 Changes: -------- --- /work/SRC/openSUSE:Factory/xfce4-branding-openSUSE/xfce4-branding-openSUSE.changes 2021-06-21 20:36:13.170664578 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-branding-openSUSE.new.1548/xfce4-branding-openSUSE.changes 2022-06-29 16:02:35.644721403 +0200 @@ -1,0 +2,11 @@ +Tue Jun 28 09:48:20 UTC 2022 - maurizio.galli(a)gmail.com + +- Update to version 4.16.1+git0.77ba799: + * Changed icon theme to adwaita-xfce as it obsoletes openSUSE-xfce + * Modified gtk theme naming to follow upstream name change + * Update default xfwm4 theme to follow upstream name change + * Switch notication bubble theme to Default + * Update README.md + * Switch sources to https://code.opensuse.org/xfce/xfce4-branding-openSUSE + +------------------------------------------------------------------- Old: ---- xfce4-branding-openSUSE-4.16.0+git7.8b06717.tar.xz New: ---- xfce4-branding-openSUSE-4.16.1+git0.77ba799.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.3rcnqI/_old 2022-06-29 16:02:36.268722234 +0200 +++ /var/tmp/diff_new_pack.3rcnqI/_new 2022-06-29 16:02:36.276722245 +0200 @@ -1,7 +1,7 @@ # # spec file for package xfce4-branding-openSUSE # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,7 +32,7 @@ %define thunar_volman_version %(rpm -q --queryformat '%%{VERSION}' thunar-volman) Name: xfce4-branding-openSUSE -Version: 4.16.0+git7.8b06717 +Version: 4.16.1+git0.77ba799 Release: 0 Summary: openSUSE Branding of the Xfce Desktop Environment License: CC-BY-SA-3.0 AND GPL-2.0-or-later @@ -47,14 +47,13 @@ Requires: libgio-2_0-0 # for regenerating xfce-mimeapps.list BuildRequires: desktop-file-utils +BuildRequires: adwaita-xfce-icon-theme BuildRequires: gtk2-metatheme-greybird-geeko BuildRequires: gtk3-metatheme-greybird-geeko BuildRequires: hack-fonts BuildRequires: metatheme-greybird-geeko-common BuildRequires: noto-coloremoji-fonts BuildRequires: noto-sans-fonts -BuildRequires: openSUSE-xfce-icon-theme -BuildRequires: openSUSE-xfce-icon-theme BuildRequires: thunar-volman BuildRequires: xfce4-notifyd BuildRequires: xfce4-panel @@ -94,10 +93,10 @@ Requires: libgio-2_0-0 # for regenerating xfce-mimeapps.list Requires: desktop-file-utils +Requires: adwaita-xfce-icon-theme Requires: gtk2-metatheme-greybird-geeko Requires: gtk3-metatheme-greybird-geeko Requires: metatheme-greybird-geeko-common -Requires: openSUSE-xfce-icon-theme Requires: thunar-volman Conflicts: otherproviders(xfce4-session-branding) Provides: xfce4-session-branding = %{xfce4_session_version} @@ -110,6 +109,8 @@ Summary: openSUSE Branding of xfce4-settings License: CC-BY-SA-3.0 AND GPL-2.0-or-later Group: System/GUI/XFCE +Requires: adwaita-xfce-icon-theme +Requires: adwaita-xfce-icon-theme Requires: desktop-data-openSUSE Requires: gtk2-metatheme-adwaita Requires: gtk2-metatheme-greybird-geeko @@ -119,8 +120,6 @@ Requires: metatheme-greybird-geeko-common Requires: noto-coloremoji-fonts Requires: noto-sans-fonts -Requires: openSUSE-xfce-icon-theme -Requires: openSUSE-xfce-icon-theme Conflicts: otherproviders(xfce4-settings-branding) Provides: xfce4-settings-branding = %{xfce4_settings_version} Supplements: packageand(xfce4-settings:branding-openSUSE) ++++++ _service ++++++ --- /var/tmp/diff_new_pack.3rcnqI/_old 2022-06-29 16:02:36.316722298 +0200 +++ /var/tmp/diff_new_pack.3rcnqI/_new 2022-06-29 16:02:36.316722298 +0200 @@ -1,9 +1,9 @@ <?xml version="1.0"?> <services> <service name="obs_scm" mode="localonly"> - <param name="url">https://github.com/openSUSE/xfce4-branding-openSUSE.git</param> + <param name="url">https://code.opensuse.org/xfce/xfce4-branding-openSUSE.git</param> <param name="scm">git</param> - <param name="revision">4.16</param> + <param name="revision">4.16.1</param> <param name="versionformat">@PARENT_TAG@+git@TAG_OFFSET@.%h</param> <param name="changesgenerate">enable</param> <param name="changesauthor">maurizio.galli(a)gmail.com</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.3rcnqI/_old 2022-06-29 16:02:36.340722330 +0200 +++ /var/tmp/diff_new_pack.3rcnqI/_new 2022-06-29 16:02:36.344722336 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> - <param name="url">https://github.com/openSUSE/xfce4-branding-openSUSE.git</param> - <param name="changesrevision">8b06717a6039ca3a7dc937774bdb62196b261e69</param></service></servicedata> + <param name="url">https://code.opensuse.org/xfce/xfce4-branding-openSUSE.git</param> + <param name="changesrevision">77ba79923522d3a6726f8d8092be0ad3d8669431</param></service></servicedata> (No newline at EOF) ++++++ xfce4-branding-openSUSE-4.16.0+git7.8b06717.tar.xz -> xfce4-branding-openSUSE-4.16.1+git0.77ba799.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.16.0+git7.8b06717/README.md new/xfce4-branding-openSUSE-4.16.1+git0.77ba799/README.md --- old/xfce4-branding-openSUSE-4.16.0+git7.8b06717/README.md 2021-06-21 02:23:34.000000000 +0200 +++ new/xfce4-branding-openSUSE-4.16.1+git0.77ba799/README.md 2022-06-27 15:52:08.000000000 +0200 @@ -10,29 +10,28 @@ ----------------------------------------------------------------------- -Working with this repo in GitHub +Working with this repo in Pagure ------------------------------------ On github concepts: origin links to your forked repository and we standardized the name of the original to upstream by convention. First, create a fork of the repo, following this guide: -https://help.github.com/articles/fork-a-repo +https://docs.pagure.org/pagure/usage/forks.html Then clone your fork to your PC: - git clone https://github.com/$YOUR_GITHUB_ACCOUNT/xfce4-branding-openSUSE.git - + git clone https://code.opensuse.org/forks/$YOUR_PAGURE_ACCOUNT/xfce/xfce4-branding-op… and add the original repository as remote: cd xfce4-branding-openSUSE - git remote add upstream https://github.com/openSUSE/xfce4-branding-openSUSE.git + git remote add upstream https://code.opensuse.org/xfce/xfce4-branding-openSUSE.git Fetch the original content and checkout/merge the branch you want to work on: git fetch upstream - git checkout -b 4.14 - git merge upstream 4.14 + git checkout -b main + git merge upstream main Now you can work with your local branch as you normally would. @@ -45,11 +44,11 @@ This will update your repository fork. Then you can create a pull request, as described here: -https://help.github.com/articles/creating-a-pull-request +https://docs.pagure.org/pagure/usage/pull_requests.html If you want to sync with upstream changes, do a: git fetch upstream - git merge upstream 4.14 + git merge upstream main (this is doing manually what git pull will do when set up) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.16.0+git7.8b06717/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml new/xfce4-branding-openSUSE-4.16.1+git0.77ba799/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml --- old/xfce4-branding-openSUSE-4.16.0+git7.8b06717/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml 2021-06-21 02:23:34.000000000 +0200 +++ new/xfce4-branding-openSUSE-4.16.1+git0.77ba799/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml 2022-06-27 15:52:08.000000000 +0200 @@ -2,6 +2,6 @@ <channel name="xfce4-notifyd" version="1.0"> <property name="notify-location" type="uint" value="3"/> - <property name="theme" type="string" value="Greybird-Geeko-Dark"/> + <property name="theme" type="string" value="Default"/> <property name="initial-opacity" type="double" value="0.920000"/> </channel> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.16.0+git7.8b06717/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml new/xfce4-branding-openSUSE-4.16.1+git0.77ba799/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml --- old/xfce4-branding-openSUSE-4.16.0+git7.8b06717/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml 2021-06-21 02:23:34.000000000 +0200 +++ new/xfce4-branding-openSUSE-4.16.1+git0.77ba799/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml 2022-06-27 15:52:08.000000000 +0200 @@ -2,7 +2,7 @@ <channel name="xfwm4" version="1.0"> <property name="general" type="empty"> - <property name="theme" type="string" value="Greybird-Geeko-Light"/> + <property name="theme" type="string" value="Greybird-geeko"/> <property name="title_font" type="string" value="Noto Sans Semi-Bold 11"/> <property name="double_click_time" type="int" value="400"/> <property name="use_compositing" type="bool" value="true"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.16.0+git7.8b06717/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml new/xfce4-branding-openSUSE-4.16.1+git0.77ba799/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml --- old/xfce4-branding-openSUSE-4.16.0+git7.8b06717/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml 2021-06-21 02:23:34.000000000 +0200 +++ new/xfce4-branding-openSUSE-4.16.1+git0.77ba799/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml 2022-06-27 15:52:08.000000000 +0200 @@ -6,8 +6,8 @@ <?xml version="1.0" encoding="UTF-8"?> <channel name="xsettings" version="1.0"> <property name="Net" type="empty"> - <property name="ThemeName" type="string" value="Greybird-Geeko-Light"/> - <property name="IconThemeName" type="string" value="openSUSE-Xfce"/> + <property name="ThemeName" type="string" value="Greybird-geeko"/> + <property name="IconThemeName" type="string" value="adwaita-xfce"/> <property name="DoubleClickTime" type="int" value="400"/> <property name="DoubleClickDistance" type="int" value="5"/> <property name="DndDragThreshold" type="int" value="8"/> ++++++ xfce4-branding-openSUSE.obsinfo ++++++ --- /var/tmp/diff_new_pack.3rcnqI/_old 2022-06-29 16:02:36.448722474 +0200 +++ /var/tmp/diff_new_pack.3rcnqI/_new 2022-06-29 16:02:36.452722480 +0200 @@ -1,6 +1,5 @@ name: xfce4-branding-openSUSE -version: 4.16.0+git7.8b06717 -mtime: 1624235014 -commit: 8b06717a6039ca3a7dc937774bdb62196b261e69 - +version: 4.16.1+git0.77ba799 +mtime: 1656337928 +commit: 77ba79923522d3a6726f8d8092be0ad3d8669431

1 0

commit libqt5-qtwebview for openSUSE:Factory
by Source-Sync 29 Jun '22

29 Jun '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libqt5-qtwebview for openSUSE:Factory checked in at 2022-06-29 16:01:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtwebview (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtwebview.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt5-qtwebview" Wed Jun 29 16:01:15 2022 rev:19 rq:985501 version:5.15.5+kde0 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtwebview/libqt5-qtwebview.changes 2021-06-26 21:25:36.839355261 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtwebview.new.1548/libqt5-qtwebview.changes 2022-06-29 16:02:33.224718183 +0200 @@ -1,0 +2,13 @@ +Mon Jun 27 13:10:55 UTC 2022 - Fabian Vogt <fabian(a)ritter-vogt.de> + +- Update to version 5.15.5+kde0, rebased upstream: + * Revert "Update commercial license headers" + * Do the pre-initialization steps after the plugin paths are set + * Update commercial license headers + * Add export-ignore for .gitignore to .gitattributes + * Add gitignore file + * Sync with window visibilty due to offscreen windows in use + * Only generate the qrc file and add qmldir to it if we are static +- Drop 0001-Revert-Bump-version.patch, it's versioned correctly now + +------------------------------------------------------------------- Old: ---- 0001-Revert-Bump-version.patch qtwebview-everywhere-src-5.15.2+kde2.obscpio New: ---- qtwebview-everywhere-src-5.15.5+kde0.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtwebview.spec ++++++ --- /var/tmp/diff_new_pack.YvJ1rx/_old 2022-06-29 16:02:33.808718960 +0200 +++ /var/tmp/diff_new_pack.YvJ1rx/_new 2022-06-29 16:02:33.812718965 +0200 @@ -19,19 +19,17 @@ %define qt5_snapshot 1 %define libname libQt5WebView5 %define base_name libqt5 -%define real_version 5.15.2 -%define so_version 5.15.2 +%define real_version 5.15.5 +%define so_version 5.15.5 %define tar_version qtwebview-everywhere-src-%{version} Name: libqt5-qtwebview -Version: 5.15.2+kde2 +Version: 5.15.5+kde0 Release: 0 Summary: Qt 5 WebView Library License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) Group: Development/Libraries/X11 URL: https://www.qt.io Source: %{tar_version}.tar.xz -# PATCH-FIX-OPENSUSE -Patch1: 0001-Revert-Bump-version.patch BuildRequires: libQt5Core-private-headers-devel >= %{real_version} BuildRequires: libqt5-qtwebengine-private-headers-devel >= %{real_version} BuildRequires: pkgconfig ++++++ _service ++++++ --- /var/tmp/diff_new_pack.YvJ1rx/_old 2022-06-29 16:02:33.852719019 +0200 +++ /var/tmp/diff_new_pack.YvJ1rx/_new 2022-06-29 16:02:33.852719019 +0200 @@ -1,12 +1,12 @@ <services> <service name="obs_scm" mode="disabled"> <param name="changesgenerate">enable</param> - <param name="versionformat">5.15.2+kde@TAG_OFFSET@</param> + <param name="versionformat">5.15.5+kde@TAG_OFFSET@</param> <param name="url">https://invent.kde.org/qt/qt/qtwebview.git</param> <param name="scm">git</param> <param name="filename">qtwebview-everywhere-src</param> <param name="revision">kde/5.15</param> - <param name="parent-tag">v5.15.2</param> + <param name="parent-tag">v5.15.5-lts-lgpl</param> <param name="changesgenerate">enable</param> </service> <service name="set_version" mode="disabled"/> ++++++ qtwebview-everywhere-src-5.15.2+kde2.obscpio -> qtwebview-everywhere-src-5.15.5+kde0.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-5.15.2+kde2/.gitattributes new/qtwebview-everywhere-src-5.15.5+kde0/.gitattributes --- old/qtwebview-everywhere-src-5.15.2+kde2/.gitattributes 2020-10-28 12:48:59.000000000 +0100 +++ new/qtwebview-everywhere-src-5.15.5+kde0/.gitattributes 2022-06-02 21:59:24.000000000 +0200 @@ -1,2 +1,3 @@ .tag export-subst +.gitignore export-ignore .gitattributes export-ignore diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-5.15.2+kde2/.gitignore new/qtwebview-everywhere-src-5.15.5+kde0/.gitignore --- old/qtwebview-everywhere-src-5.15.2+kde2/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebview-everywhere-src-5.15.5+kde0/.gitignore 2022-06-02 21:59:24.000000000 +0200 @@ -0,0 +1,4 @@ +Makefile +.qmake.cache +.qmake.super +*.pro.user* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-5.15.2+kde2/.qmake.conf new/qtwebview-everywhere-src-5.15.5+kde0/.qmake.conf --- old/qtwebview-everywhere-src-5.15.2+kde2/.qmake.conf 2020-10-28 12:48:59.000000000 +0100 +++ new/qtwebview-everywhere-src-5.15.5+kde0/.qmake.conf 2022-06-02 21:59:24.000000000 +0200 @@ -2,4 +2,4 @@ DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.15.3 +MODULE_VERSION = 5.15.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-5.15.2+kde2/examples/webview/minibrowser/doc/src/minibrowser.qdoc new/qtwebview-everywhere-src-5.15.5+kde0/examples/webview/minibrowser/doc/src/minibrowser.qdoc --- old/qtwebview-everywhere-src-5.15.2+kde2/examples/webview/minibrowser/doc/src/minibrowser.qdoc 2020-10-28 12:48:59.000000000 +0100 +++ new/qtwebview-everywhere-src-5.15.5+kde0/examples/webview/minibrowser/doc/src/minibrowser.qdoc 2022-06-02 21:59:24.000000000 +0200 @@ -37,8 +37,8 @@ couple of controls to navigate through the browsing history. \note When using the Qt WebView module it is necessary to call QtWebView::initialize() - before creating the QGuiApplication instance. Calling QtWebView::initialize() will - ensure that the necessary pre-setup steps are run. + immediately before creating the QGuiApplication instance. Calling QtWebView::initialize() + will ensure that the necessary pre-setup steps are run. \snippet minibrowser/main.cpp 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-5.15.2+kde2/src/imports/.gitignore new/qtwebview-everywhere-src-5.15.5+kde0/src/imports/.gitignore --- old/qtwebview-everywhere-src-5.15.2+kde2/src/imports/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebview-everywhere-src-5.15.5+kde0/src/imports/.gitignore 2022-06-02 21:59:24.000000000 +0200 @@ -0,0 +1,2 @@ +# Created during builds: +/qmldir diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-5.15.2+kde2/src/imports/imports.pro new/qtwebview-everywhere-src-5.15.5+kde0/src/imports/imports.pro --- old/qtwebview-everywhere-src-5.15.2+kde2/src/imports/imports.pro 2020-10-28 12:48:59.000000000 +0100 +++ new/qtwebview-everywhere-src-5.15.5+kde0/src/imports/imports.pro 2022-06-02 21:59:24.000000000 +0200 @@ -21,6 +21,8 @@ "</qresource>" \ "</RCC>" -write_file($$OUT_PWD/qmake_QtWebView.qrc, webview_qrc)|error() -RESOURCES = $$OUT_PWD/qmake_QtWebView.qrc +static { + write_file($$OUT_PWD/qmake_QtWebView.qrc, webview_qrc)|error() + RESOURCES = $$OUT_PWD/qmake_QtWebView.qrc +} OTHER_FILES += qmldir diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-5.15.2+kde2/src/webview/qquickviewcontroller.cpp new/qtwebview-everywhere-src-5.15.5+kde0/src/webview/qquickviewcontroller.cpp --- old/qtwebview-everywhere-src-5.15.2+kde2/src/webview/qquickviewcontroller.cpp 2020-10-28 12:48:59.000000000 +0100 +++ new/qtwebview-everywhere-src-5.15.5+kde0/src/webview/qquickviewcontroller.cpp 2022-06-02 21:59:24.000000000 +0200 @@ -260,7 +260,9 @@ connect(window, &QWindow::yChanged, this, &QQuickViewController::scheduleUpdatePolish); connect(window, &QQuickWindow::sceneGraphInitialized, this, &QQuickViewController::scheduleUpdatePolish); connect(window, &QQuickWindow::sceneGraphInvalidated, this, &QQuickViewController::onSceneGraphInvalidated); - connect(window, &QWindow::visibleChanged, this, [this](bool visible) { m_view->setVisible(visible); }); + connect(window, &QWindow::visibilityChanged, this, [this](QWindow::Visibility visibility) + { m_view->setVisible(visibility != QWindow::Hidden); }); + m_view->setVisible(window->visibility() != QWindow::Hidden); m_view->setParentView(window); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-5.15.2+kde2/src/webview/qtwebviewfunctions.cpp new/qtwebview-everywhere-src-5.15.5+kde0/src/webview/qtwebviewfunctions.cpp --- old/qtwebview-everywhere-src-5.15.2+kde2/src/webview/qtwebviewfunctions.cpp 2020-10-28 12:48:59.000000000 +0100 +++ new/qtwebview-everywhere-src-5.15.5+kde0/src/webview/qtwebviewfunctions.cpp 2022-06-02 21:59:24.000000000 +0200 @@ -38,6 +38,7 @@ #include "qwebviewfactory_p.h" #include "qwebviewplugin_p.h" +#include <QtCore/qcoreapplication.h> QT_BEGIN_NAMESPACE @@ -48,26 +49,42 @@ \inheaderfile QtWebView */ +// This is a separate function so we can be sure that in non-static cases it can be registered +// as a pre hook for QCoreApplication, ensuring this is called after the plugin paths have +// been set to their defaults. For static builds then this will be called explicitly when +// QtWebView::initialize() is called by the application + +static void initializeImpl() +{ + if (QWebViewFactory::requiresExtraInitializationSteps()) { + // There might be plugins available, but their dependencies might not be met, + // so make sure we have a valid plugin before using it. + // Note: A warning will be printed later if we're unable to load the plugin. + QWebViewPlugin *plugin = QWebViewFactory::getPlugin(); + if (plugin) + plugin->prepare(); + } +} + +#ifndef QT_STATIC +Q_COREAPP_STARTUP_FUNCTION(initializeImpl); +#endif + /*! \fn void QtWebView::initialize() \keyword qtwebview-initialize This function initializes resources or sets options that are required by the different back-ends. - \note The \c initialize() function needs to be called immediately after the QGuiApplication + \note The \c initialize() function needs to be called immediately before the QGuiApplication instance is created. */ void QtWebView::initialize() { - if (QWebViewFactory::requiresExtraInitializationSteps()) { - // There might be plugins available, but their dependencies might not be met, - // so make sure we have a valid plugin before using it. - // Note: A warning will be printed later if we're unable to load the plugin. - QWebViewPlugin *plugin = QWebViewFactory::getPlugin(); - if (plugin) - plugin->prepare(); - } +#ifdef QT_STATIC + initializeImpl(); +#endif } QT_END_NAMESPACE ++++++ qtwebview-everywhere-src.obsinfo ++++++ --- /var/tmp/diff_new_pack.YvJ1rx/_old 2022-06-29 16:02:34.008719227 +0200 +++ /var/tmp/diff_new_pack.YvJ1rx/_new 2022-06-29 16:02:34.012719232 +0200 @@ -1,6 +1,5 @@ name: qtwebview-everywhere-src -version: 5.15.2+kde2 -mtime: 1603885739 -commit: 920de5f1cd9f9001cfef1bfd2c19e6720793362f - +version: 5.15.5+kde0 +mtime: 1654199964 +commit: 429096eb954672d3727a3e8cc83832bc79cf7967

1 0

commit libqt5-qttranslations for openSUSE:Factory
by Source-Sync 29 Jun '22

29 Jun '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libqt5-qttranslations for openSUSE:Factory checked in at 2022-06-29 16:01:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qttranslations (Old) and /work/SRC/openSUSE:Factory/.libqt5-qttranslations.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt5-qttranslations" Wed Jun 29 16:01:14 2022 rev:40 rq:985496 version:5.15.5+kde2 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qttranslations/libqt5-qttranslations.changes 2021-10-20 20:24:46.205396068 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qttranslations.new.1548/libqt5-qttranslations.changes 2022-06-29 16:02:31.656716096 +0200 @@ -1,0 +2,8 @@ +Mon Jun 27 13:10:38 UTC 2022 - Fabian Vogt <fabian(a)ritter-vogt.de> + +- Update to version 5.15.5+kde2, rebased upstream: + * Revert "Update commercial license headers" + * Update commercial license headers +- Drop 0001-Revert-Bump-version.patch, it's versioned correctly now + +------------------------------------------------------------------- Old: ---- 0001-Revert-Bump-version.patch qttranslations-everywhere-src-5.15.2+kde22.obscpio New: ---- qttranslations-everywhere-src-5.15.5+kde2.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qttranslations.spec ++++++ --- /var/tmp/diff_new_pack.hrDjrD/_old 2022-06-29 16:02:32.992717874 +0200 +++ /var/tmp/diff_new_pack.hrDjrD/_new 2022-06-29 16:02:33.000717885 +0200 @@ -18,19 +18,17 @@ %define qt5_snapshot 1 %define base_name libqt5 -%define real_version 5.15.2 -%define so_version 5.15.2 +%define real_version 5.15.5 +%define so_version 5.15.5 %define tar_version qttranslations-everywhere-src-%{version} Name: libqt5-qttranslations -Version: 5.15.2+kde22 +Version: 5.15.5+kde2 Release: 0 Summary: Qt 5 translations License: GPL-3.0-only WITH Qt-GPL-exception-1.0 Group: Development/Libraries/X11 URL: https://www.qt.io Source: %{tar_version}.tar.xz -# PATCH-FIX-OPENSUSE -Patch1: 0001-Revert-Bump-version.patch BuildRequires: libqt5-qttools-devel >= %{real_version} BuildRequires: xz %if %{qt5_snapshot} ++++++ _service ++++++ --- /var/tmp/diff_new_pack.hrDjrD/_old 2022-06-29 16:02:33.032717927 +0200 +++ /var/tmp/diff_new_pack.hrDjrD/_new 2022-06-29 16:02:33.036717933 +0200 @@ -1,12 +1,12 @@ <services> <service name="obs_scm" mode="disabled"> <param name="changesgenerate">enable</param> - <param name="versionformat">5.15.2+kde@TAG_OFFSET@</param> + <param name="versionformat">5.15.5+kde@TAG_OFFSET@</param> <param name="url">https://invent.kde.org/qt/qt/qttranslations.git</param> <param name="scm">git</param> <param name="filename">qttranslations-everywhere-src</param> <param name="revision">kde/5.15</param> - <param name="parent-tag">v5.15.2</param> + <param name="parent-tag">v5.15.5-lts-lgpl</param> <param name="changesgenerate">enable</param> </service> <service name="set_version" mode="disabled"/> ++++++ qttranslations-everywhere-src-5.15.2+kde22.obscpio -> qttranslations-everywhere-src-5.15.5+kde2.obscpio ++++++ /work/SRC/openSUSE:Factory/libqt5-qttranslations/qttranslations-everywhere-src-5.15.2+kde22.obscpio /work/SRC/openSUSE:Factory/.libqt5-qttranslations.new.1548/qttranslations-everywhere-src-5.15.5+kde2.obscpio differ: char 48, line 1 ++++++ qttranslations-everywhere-src.obsinfo ++++++ --- /var/tmp/diff_new_pack.hrDjrD/_old 2022-06-29 16:02:33.088718002 +0200 +++ /var/tmp/diff_new_pack.hrDjrD/_new 2022-06-29 16:02:33.092718006 +0200 @@ -1,6 +1,5 @@ name: qttranslations-everywhere-src -version: 5.15.2+kde22 -mtime: 1633521196 -commit: 8fbbdf21f127197f97b58c7d80d2fa2a59135638 - +version: 5.15.5+kde2 +mtime: 1655461586 +commit: 0e92fc4f19928387c341533ef3d259efaa752c0f

1 0

commit libqt5-qtserialbus for openSUSE:Factory
by Source-Sync 29 Jun '22

29 Jun '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libqt5-qtserialbus for openSUSE:Factory checked in at 2022-06-29 16:01:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtserialbus (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtserialbus.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt5-qtserialbus" Wed Jun 29 16:01:14 2022 rev:22 rq:985491 version:5.15.5+kde0 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtserialbus/libqt5-qtserialbus.changes 2021-06-26 21:25:26.115341100 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtserialbus.new.1548/libqt5-qtserialbus.changes 2022-06-29 16:02:30.512714573 +0200 @@ -1,0 +2,12 @@ +Mon Jun 27 13:10:23 UTC 2022 - Fabian Vogt <fabian(a)ritter-vogt.de> + +- Update to version 5.15.5+kde0, rebased upstream: + * Revert "Update commercial license headers" + * Fix 5.15 compile error + * Fix Modbus custom command response processing + * Fix Modbus custom command size calculation + * SocketCAN: Fix returning bitrate setting result + * Update commercial license headers +- Drop 0001-Revert-Bump-version.patch, it's versioned correctly now + +------------------------------------------------------------------- Old: ---- 0001-Revert-Bump-version.patch qtserialbus-everywhere-src-5.15.2+kde2.obscpio New: ---- qtserialbus-everywhere-src-5.15.5+kde0.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtserialbus.spec ++++++ --- /var/tmp/diff_new_pack.CQWbB1/_old 2022-06-29 16:02:31.196715483 +0200 +++ /var/tmp/diff_new_pack.CQWbB1/_new 2022-06-29 16:02:31.204715494 +0200 @@ -19,20 +19,18 @@ %define qt5_snapshot 1 Name: libqt5-qtserialbus -Version: 5.15.2+kde2 +Version: 5.15.5+kde0 Release: 0 Summary: Qt 5 Serial Bus Addon License: LGPL-3.0-only OR GPL-2.0-or-later Group: Development/Libraries/X11 Url: https://www.qt.io %define base_name libqt5 -%define real_version 5.15.2 -%define so_version 5.15.2 +%define real_version 5.15.5 +%define so_version 5.15.5 %define tar_version qtserialbus-everywhere-src-%{version} Source: %{tar_version}.tar.xz Source1: baselibs.conf -# PATCH-FIX-OPENSUSE -Patch1: 0001-Revert-Bump-version.patch BuildRequires: fdupes BuildRequires: libQt5Core-private-headers-devel >= %{real_version} BuildRequires: libQt5DBus-devel >= %{real_version} ++++++ _service ++++++ --- /var/tmp/diff_new_pack.CQWbB1/_old 2022-06-29 16:02:31.244715547 +0200 +++ /var/tmp/diff_new_pack.CQWbB1/_new 2022-06-29 16:02:31.248715553 +0200 @@ -1,12 +1,12 @@ <services> <service name="obs_scm" mode="disabled"> <param name="changesgenerate">enable</param> - <param name="versionformat">5.15.2+kde@TAG_OFFSET@</param> + <param name="versionformat">5.15.5+kde@TAG_OFFSET@</param> <param name="url">https://invent.kde.org/qt/qt/qtserialbus.git</param> <param name="scm">git</param> <param name="filename">qtserialbus-everywhere-src</param> <param name="revision">kde/5.15</param> - <param name="parent-tag">v5.15.2</param> + <param name="parent-tag">v5.15.5-lts-lgpl</param> <param name="changesgenerate">enable</param> </service> <service name="set_version" mode="disabled"/> ++++++ qtserialbus-everywhere-src-5.15.2+kde2.obscpio -> qtserialbus-everywhere-src-5.15.5+kde0.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.15.2+kde2/.gitignore new/qtserialbus-everywhere-src-5.15.5+kde0/.gitignore --- old/qtserialbus-everywhere-src-5.15.2+kde2/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-5.15.5+kde0/.gitignore 2022-06-02 22:27:49.000000000 +0200 @@ -0,0 +1,53 @@ +config.log +Makefile* +*.pro.user +.qmake.cache +*.obj +config.tests/language/language +config.tests/socketcan/socketcan +config.tests/socketcan_fd/socketcan_fd +examples/serialbus/modbus/adueditor/adueditor +examples/serialbus/modbus/master/modbusmaster +examples/serialbus/modbus/slave/modbusslave +*.moc +*.uic +*.pch +.rcc +src/serialbus/doc/snippets/serialbus_cppsnippet +src/serialbus/QtSerialBus.version* +examples/serialbus/can/can +tests/auto/qcanbus/tst_qcanbus +tests/auto/qcanbusdevice/tst_qcanbusdevice +tests/auto/qcanbusframe/tst_qcanbusframe +tests/auto/qmodbusadu/tst_qmodbusadu +tests/auto/qmodbusclient/tst_qmodbusclient +tests/auto/qmodbuscommevent/tst_qmodbuscommevent +tests/auto/qmodbusdataunit/tst_qmodbusdataunit +tests/auto/qmodbusdevice/tst_qmodbusdevice +tests/auto/qmodbusdeviceidentification/tst_qmodbusdeviceidentification +tests/auto/qmodbuspdu/tst_qmodbuspdu +tests/auto/qmodbusreply/tst_qmodbusreply +tests/auto/qmodbusrtuserialmaster/tst_qmodbusrtuserialmaster +tests/auto/qmodbusserver/tst_qmodbusserver +*_resource.rc +*.exe +*.ipch +*_wrapper.bat +*_wrapper.sh +qtserialbus-config.pri + +# Visual Studio generated files +*.ib_pdb_index +*.idb +*.ilk +*.pdb +*.sln +*.suo +*.vcproj +*vcproj.*.*.user +*.ncb +*.vcxproj +*.vcxproj.filters +*.vcxproj.user +*.sdf +*.opensdf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.15.2+kde2/.qmake.conf new/qtserialbus-everywhere-src-5.15.5+kde0/.qmake.conf --- old/qtserialbus-everywhere-src-5.15.2+kde2/.qmake.conf 2020-10-28 08:43:31.000000000 +0100 +++ new/qtserialbus-everywhere-src-5.15.5+kde0/.qmake.conf 2022-06-02 22:27:49.000000000 +0200 @@ -2,4 +2,4 @@ CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.15.3 +MODULE_VERSION = 5.15.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.15.2+kde2/0001-Revert-Bump-version.patch new/qtserialbus-everywhere-src-5.15.5+kde0/0001-Revert-Bump-version.patch --- old/qtserialbus-everywhere-src-5.15.2+kde2/0001-Revert-Bump-version.patch 2020-10-28 08:43:31.000000000 +0100 +++ new/qtserialbus-everywhere-src-5.15.5+kde0/0001-Revert-Bump-version.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -From f3e916c2c910b10571c6d5ea926e5de11cda2ca5 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt <fvogt(a)suse.de> -Date: Tue, 22 Jun 2021 21:23:27 +0200 -Subject: [PATCH] Revert "Bump version" - -This reverts commit 8bc2ee81eb399a22cd2641aaab169c632dc94fe2. ---- - .qmake.conf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/.qmake.conf b/.qmake.conf -index 3dea105..23f20e2 100644 ---- a/.qmake.conf -+++ b/.qmake.conf -@@ -2,4 +2,4 @@ load(qt_build_config) - CONFIG += warning_clean - DEFINES += QT_NO_FOREACH - --MODULE_VERSION = 5.15.3 -+MODULE_VERSION = 5.15.2 --- -2.20.1 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.15.2+kde2/src/plugins/canbus/socketcan/socketcanbackend.cpp new/qtserialbus-everywhere-src-5.15.5+kde0/src/plugins/canbus/socketcan/socketcanbackend.cpp --- old/qtserialbus-everywhere-src-5.15.2+kde2/src/plugins/canbus/socketcan/socketcanbackend.cpp 2020-10-28 08:43:31.000000000 +0100 +++ new/qtserialbus-everywhere-src-5.15.5+kde0/src/plugins/canbus/socketcan/socketcanbackend.cpp 2022-06-02 22:27:49.000000000 +0200 @@ -349,7 +349,7 @@ case QCanBusDevice::BitRateKey: { const quint32 bitRate = value.toUInt(); - libSocketCan->setBitrate(canSocketName, bitRate); + success = libSocketCan->setBitrate(canSocketName, bitRate); break; } default: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.15.2+kde2/src/serialbus/qmodbusclient.cpp new/qtserialbus-everywhere-src-5.15.5+kde0/src/serialbus/qmodbusclient.cpp --- old/qtserialbus-everywhere-src-5.15.2+kde2/src/serialbus/qmodbusclient.cpp 2020-10-28 08:43:31.000000000 +0100 +++ new/qtserialbus-everywhere-src-5.15.5+kde0/src/serialbus/qmodbusclient.cpp 2022-06-02 22:27:49.000000000 +0200 @@ -361,7 +361,7 @@ return; } - if (element.reply->type() != QModbusReply::Common) { + if (element.reply->type() == QModbusReply::Broadcast) { element.reply->setFinished(true); return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.15.2+kde2/src/serialbus/qmodbuspdu.cpp new/qtserialbus-everywhere-src-5.15.5+kde0/src/serialbus/qmodbuspdu.cpp --- old/qtserialbus-everywhere-src-5.15.2+kde2/src/serialbus/qmodbuspdu.cpp 2020-10-28 08:43:31.000000000 +0100 +++ new/qtserialbus-everywhere-src-5.15.5+kde0/src/serialbus/qmodbuspdu.cpp 2022-06-02 22:27:49.000000000 +0200 @@ -48,13 +48,23 @@ using ResSizeCalc = QHash<quint8, QModbusResponse::CalcFuncPtr>; Q_GLOBAL_STATIC(ResSizeCalc, responseSizeCalculators); -namespace Private { +struct QModbusPduPrivate +{ + QModbusPduPrivate() = delete; + Q_DISABLE_COPY_MOVE(QModbusPduPrivate) enum struct Type { Request, Response }; +/*! + \internal + + Returns the minimum data size in bytes for the given \a pdu and the + Modbus PDU \a type. If the PDU's function code is invalid, undefined + or unknown, the return value will be \c {-1}. +*/ static int minimumDataSize(const QModbusPdu &pdu, Type type) { if (pdu.isException()) @@ -103,44 +113,53 @@ return -1; } -static QDataStream &pduFromStream(QDataStream &stream, QModbusPdu &pdu, Type type) -{ - quint8 codeByte = 0; - if (stream.readRawData(reinterpret_cast<char *>(&codeByte), sizeof(quint8)) != sizeof(quint8)) - return stream; - QModbusPdu::FunctionCode code = QModbusPdu::FunctionCode(codeByte); - pdu.setFunctionCode(code); +/*! + \internal - auto needsAdditionalRead = [](QModbusPdu &pdu, int size) -> bool { - if (size < 0) - pdu.setFunctionCode(QModbusResponse::Invalid); - if (size <= 0) - return false; - return true; - }; + Extracts a Modbus PDU from a \a stream into the given \a pdu based on \a type. +*/ +static QDataStream &pduFromStream(QDataStream &stream, Type type, QModbusPdu *pdu) +{ + struct RAII { + RAII(QModbusPdu *ptr = nullptr) + : tmp(ptr) {} + QModbusPdu *tmp{ nullptr }; + ~RAII() { if (tmp) *tmp = {}; } + } raii = { pdu }; - const bool isResponse = (type == Type::Response); - int size = isResponse ? QModbusResponse::minimumDataSize(pdu) - : QModbusRequest::minimumDataSize(pdu); - if (!needsAdditionalRead(pdu, size)) + QModbusPdu::FunctionCode code = QModbusPdu::FunctionCode::Invalid; + if (stream.readRawData(reinterpret_cast<char *>(&code), sizeof(quint8)) != sizeof(quint8)) return stream; + pdu->setFunctionCode(code); - QByteArray data(size, Qt::Uninitialized); - if (stream.device()->peek(data.data(), data.size()) != size) + if (code == QModbusPdu::Invalid || code == QModbusPdu::UndefinedFunctionCode) // shortcut return stream; - pdu.setData(data); - size = isResponse ? QModbusResponse::calculateDataSize(pdu) - : QModbusRequest::calculateDataSize(pdu); - if (!needsAdditionalRead(pdu, size)) + constexpr const int MaxPduDataSize = 252; // in bytes + + // The calculateDataSize(...) function might need some data inside the + // given PDU argument to be able to figure out the right data size (e.g. + // WriteMultipleCoils contains some kind of "header"). So fake fill the PDU + // with the maximum available data but no more than the allowed max PDU + // data size. + QByteArray data(MaxPduDataSize, Qt::Uninitialized); + int read = stream.device()->peek(data.data(), MaxPduDataSize); + if (read < 0) return stream; + data.resize(read); + pdu->setData(data); + + const bool isResponse = (type == Type::Response); + int size = isResponse ? QModbusResponse::calculateDataSize(*pdu) + : QModbusRequest::calculateDataSize(*pdu); + if (isResponse && (code == QModbusPdu::EncapsulatedInterfaceTransport)) { quint8 meiType; - pdu.decodeData(&meiType); + pdu->decodeData(&meiType); if (meiType == EncapsulatedInterfaceTransport::ReadDeviceIdentification) { int left = size, offset = 0; - while ((left > 0) && (size <= 252)) { // The maximum PDU data size is 252 bytes. + while ((left > 0) && (size <= MaxPduDataSize)) { data.resize(size); const int read = stream.readRawData(data.data() + offset, size - offset); if ((read < 0) || (read != (size - offset))) { @@ -152,35 +171,31 @@ left = QModbusResponse::calculateDataSize(QModbusResponse(code, data)) - offset; size += left; } - if ((stream.status() == QDataStream::Ok) && (size <= 252)) { - pdu.setData(data); + if ((stream.status() == QDataStream::Ok) && (size <= MaxPduDataSize)) { + raii = {}; + pdu->setData(data); return stream; // early return to avoid second read } } else { data.resize(int(stream.device()->size() - 1)); // One byte for the function code. } - } else if (pdu.functionCode() == QModbusPdu::Diagnostics) { + } else if (pdu->functionCode() == QModbusPdu::Diagnostics) { quint16 subCode; - pdu.decodeData(&subCode); + pdu->decodeData(&subCode); if (subCode == Diagnostics::ReturnQueryData) data.resize(int(stream.device()->size() - 1)); // One byte for the function code. } - // reset what we have so far, next read might fail as well - pdu.setData(QByteArray()); - pdu.setFunctionCode(QModbusPdu::Invalid); - - if (data.size() <= 252) { // The maximum PDU data size is 252 bytes. + if (data.size() <= MaxPduDataSize) { data.resize(size); if (stream.readRawData(data.data(), data.size()) == size) { - pdu.setData(data); - pdu.setFunctionCode(code); + raii = {}; + pdu->setData(data); } } return stream; } - -} // namespace Private +}; /*! \class QModbusPdu @@ -533,7 +548,7 @@ */ int QModbusRequest::minimumDataSize(const QModbusRequest &request) { - return Private::minimumDataSize(request, Private::Type::Request); + return QModbusPduPrivate::minimumDataSize(request, QModbusPduPrivate::Type::Request); } /*! @@ -555,7 +570,7 @@ return 1; int size = -1; - int minimum = Private::minimumDataSize(request, Private::Type::Request); + int minimum = QModbusPduPrivate::minimumDataSize(request, QModbusPduPrivate::Type::Request); if (minimum < 0) return size; @@ -620,7 +635,7 @@ */ QDataStream &operator>>(QDataStream &stream, QModbusRequest &pdu) { - return Private::pduFromStream(stream, pdu, Private::Type::Request); + return QModbusPduPrivate::pduFromStream(stream, QModbusPduPrivate::Type::Request, &pdu); } /*! @@ -689,7 +704,7 @@ */ int QModbusResponse::minimumDataSize(const QModbusResponse &response) { - return Private::minimumDataSize(response, Private::Type::Response); + return QModbusPduPrivate::minimumDataSize(response, QModbusPduPrivate::Type::Response); } /*! @@ -711,7 +726,7 @@ return 1; int size = -1; - int minimum = Private::minimumDataSize(response, Private::Type::Response); + int minimum = QModbusPduPrivate::minimumDataSize(response, QModbusPduPrivate::Type::Response); if (minimum < 0) return size; @@ -806,7 +821,7 @@ */ QDataStream &operator>>(QDataStream &stream, QModbusResponse &pdu) { - return Private::pduFromStream(stream, pdu, Private::Type::Response); + return QModbusPduPrivate::pduFromStream(stream, QModbusPduPrivate::Type::Response, &pdu); } /*! diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.15.2+kde2/src/serialbus/qmodbuspdu.h new/qtserialbus-everywhere-src-5.15.5+kde0/src/serialbus/qmodbuspdu.h --- old/qtserialbus-everywhere-src-5.15.2+kde2/src/serialbus/qmodbuspdu.h 2020-10-28 08:43:31.000000000 +0100 +++ new/qtserialbus-everywhere-src-5.15.5+kde0/src/serialbus/qmodbuspdu.h 2022-06-02 22:27:49.000000000 +0200 @@ -183,6 +183,7 @@ FunctionCode m_code = Invalid; QByteArray m_data; friend class QModbusSerialAdu; + friend struct QModbusPduPrivate; }; Q_SERIALBUS_EXPORT QDebug operator<<(QDebug debug, const QModbusPdu &pdu); Q_SERIALBUS_EXPORT QDataStream &operator<<(QDataStream &stream, const QModbusPdu &pdu); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.15.2+kde2/src/serialbus/qmodbusreply.cpp new/qtserialbus-everywhere-src-5.15.5+kde0/src/serialbus/qmodbusreply.cpp --- old/qtserialbus-everywhere-src-5.15.2+kde2/src/serialbus/qmodbusreply.cpp 2020-10-28 08:43:31.000000000 +0100 +++ new/qtserialbus-everywhere-src-5.15.5+kde0/src/serialbus/qmodbusreply.cpp 2022-06-02 22:27:49.000000000 +0200 @@ -147,15 +147,17 @@ If the request has not finished, has failed with an error or was a write request then the returned \l QModbusDataUnit instance is invalid. - \note If the \l type() of the reply is \l QModbusReply::Raw, the return - value will always be invalid. + \note If the \l type() of the reply is \l QModbusReply::Broadcast, the + return value will always be invalid. If the l type() of the reply is + \l QModbusReply::Raw, the return value might be invalid depending on the + implementation of \l QModbusClient::processPrivateResponse(). - \sa type(), rawResult() + \sa type(), rawResult(), QModbusClient::processPrivateResponse() */ QModbusDataUnit QModbusReply::result() const { Q_D(const QModbusReply); - if (type() == QModbusReply::Common) + if (type() != QModbusReply::Broadcast) return d->m_unit; return QModbusDataUnit(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.15.2+kde2/tests/auto/qmodbusreply/tst_qmodbusreply.cpp new/qtserialbus-everywhere-src-5.15.5+kde0/tests/auto/qmodbusreply/tst_qmodbusreply.cpp --- old/qtserialbus-everywhere-src-5.15.2+kde2/tests/auto/qmodbusreply/tst_qmodbusreply.cpp 2020-10-28 08:43:31.000000000 +0100 +++ new/qtserialbus-everywhere-src-5.15.5+kde0/tests/auto/qmodbusreply/tst_qmodbusreply.cpp 2022-06-02 22:27:49.000000000 +0200 @@ -213,7 +213,7 @@ replyRawTest.setRawResult(response); QCOMPARE(finishedSpy.count(), 0); QCOMPARE(errorSpyRaw.count(), 0); - QCOMPARE(replyRawTest.result().isValid(), false); + QCOMPARE(replyRawTest.result().isValid(), true); QCOMPARE(replyRawTest.rawResult().isValid(), true); tmp = replyRawTest.rawResult(); ++++++ qtserialbus-everywhere-src.obsinfo ++++++ --- /var/tmp/diff_new_pack.CQWbB1/_old 2022-06-29 16:02:31.524715920 +0200 +++ /var/tmp/diff_new_pack.CQWbB1/_new 2022-06-29 16:02:31.524715920 +0200 @@ -1,6 +1,5 @@ name: qtserialbus-everywhere-src -version: 5.15.2+kde2 -mtime: 1603871011 -commit: 8884c5e43df846deac5a0c7c290eeb633d6bfe32 - +version: 5.15.5+kde0 +mtime: 1654201669 +commit: b6e22f07fb529736c9362d81de7f5c632bd1f439

1 0