March 2023 - openSUSE Commits - openSUSE Mailing Lists

commit gromox for openSUSE:Factory
by Source-Sync 31 Mar '23

31 Mar '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gromox for openSUSE:Factory checked in at 2023-03-31 21:15:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gromox (Old) and /work/SRC/openSUSE:Factory/.gromox.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gromox" Fri Mar 31 21:15:39 2023 rev:11 rq:1075718 version:2.7 Changes: -------- --- /work/SRC/openSUSE:Factory/gromox/gromox.changes 2023-03-21 17:44:25.546661836 +0100 +++ /work/SRC/openSUSE:Factory/.gromox.new.31432/gromox.changes 2023-03-31 21:15:40.978429175 +0200 @@ -1,0 +2,13 @@ +Fri Mar 24 01:13:00 UTC 2023 - Jan Engelhardt <jengelh(a)inai.de> + +- Update to release 2.7 + * exmdb_provider: default to mbox_contention_reject=0 + * zcore: make mapi_message_imtoinet operate on message instances, + not messages + * oxcmail: do not fail exporting DSNs with unresolvable addresses + * oxcical: do not fail exporting calendar objects with + unresolvable addresses +- Delete 0001-build-resolve-compile-error-with-gcc-13.patch, + 0001-snapshot-safer-parsing-of-snapshot.cfg.patch (merged) + +------------------------------------------------------------------- Old: ---- 0001-build-resolve-compile-error-with-gcc-13.patch 0001-snapshot-safer-parsing-of-snapshot.cfg.patch gromox-2.6.tar.asc gromox-2.6.tar.zst New: ---- gromox-2.7.tar.asc gromox-2.7.tar.zst ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gromox.spec ++++++ --- /var/tmp/diff_new_pack.hlbIBt/_old 2023-03-31 21:15:41.762432819 +0200 +++ /var/tmp/diff_new_pack.hlbIBt/_new 2023-03-31 21:15:41.766432837 +0200 @@ -19,7 +19,7 @@ %define _libexecdir %_prefix/libexec Name: gromox -Version: 2.6 +Version: 2.7 Release: 0 Summary: Groupware server backend with RPC, IMAP,POP3, PHP-MAPI support License: AGPL-3.0-or-later AND GPL-2.0-only AND GPL-3.0-or-later @@ -28,8 +28,6 @@ Source: https://github.com/grommunio/gromox/releases/download/%name-%version/%name-… Source2: https://github.com/grommunio/gromox/releases/download/%name-%version/%name-… Source8: %name.keyring -Patch1: 0001-snapshot-safer-parsing-of-snapshot.cfg.patch -Patch2: 0001-build-resolve-compile-error-with-gcc-13.patch BuildRequires: automake >= 1.11 BuildRequires: fdupes BuildRequires: gcc-c++

1 0

commit gnu_parallel for openSUSE:Factory
by Source-Sync 31 Mar '23

31 Mar '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gnu_parallel for openSUSE:Factory checked in at 2023-03-31 21:15:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnu_parallel (Old) and /work/SRC/openSUSE:Factory/.gnu_parallel.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnu_parallel" Fri Mar 31 21:15:38 2023 rev:85 rq:1075710 version:20230322 Changes: -------- --- /work/SRC/openSUSE:Factory/gnu_parallel/gnu_parallel.changes 2023-02-01 17:01:38.428977457 +0100 +++ /work/SRC/openSUSE:Factory/.gnu_parallel.new.31432/gnu_parallel.changes 2023-03-31 21:15:38.762418875 +0200 @@ -1,0 +2,8 @@ +Thu Mar 30 22:51:08 UTC 2023 - Jan Engelhardt <jengelh(a)inai.de> + +- Update to release 20230322 + * Better support for wide characters in --latest-line + * Support for rsync 3.2.7 + * parallel: --files0 is --files but \0 separated + +------------------------------------------------------------------- Old: ---- parallel-20230122.tar.bz2 parallel-20230122.tar.bz2.sig New: ---- parallel-20230322.tar.bz2 parallel-20230322.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnu_parallel.spec ++++++ --- /var/tmp/diff_new_pack.uKbBVC/_old 2023-03-31 21:15:39.518422389 +0200 +++ /var/tmp/diff_new_pack.uKbBVC/_new 2023-03-31 21:15:39.522422407 +0200 @@ -17,7 +17,7 @@ Name: gnu_parallel -Version: 20230122 +Version: 20230322 Release: 0 Summary: Shell tool for executing jobs in parallel License: GPL-3.0-or-later ++++++ parallel-20230122.tar.bz2 -> parallel-20230322.tar.bz2 ++++++ ++++ 3662 lines of diff (skipped) ++++++ parallel-20230122.tar.bz2.sig -> parallel-20230322.tar.bz2.sig ++++++ --- /work/SRC/openSUSE:Factory/gnu_parallel/parallel-20230122.tar.bz2.sig 2023-02-01 17:01:38.484977744 +0100 +++ /work/SRC/openSUSE:Factory/.gnu_parallel.new.31432/parallel-20230322.tar.bz2.sig 2023-03-31 21:15:38.818419135 +0200 @@ -2,7 +2,7 @@ # To check the signature run: # echo | gpg -# gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve parallel-20230122.tar.bz2.sig +# gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve parallel-20230322.tar.bz2.sig echo | gpg 2>/dev/null gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve $0 @@ -10,32 +10,32 @@ -----BEGIN PGP SIGNATURE----- -iQUHBAABCgAdFiEEzaAaQgjE90UGEH570atFFoiIiIgFAmPNdO0ACgkQ0atFFoiI -iIiWHCaePXUKIa5nhCgE6aH0GmAAobDNc/RFGoxMIW1XrQVBgJF8OconEWLsa5sK -gcjc7ISvaqW6/Y178aX32cCp432yuHknlGBMZzjQGD8xsv5wDaNQrMgd514s8XqJ -LMwJKVoRP/9xSOOAe6PSoLMv//QJs0v/za/qnNzqx7SmW4s1tF1ms7UD28toF0c+ -aJHki3ryTU6dtkRObnzu172R27QgQDPswdozYIlkmmNjK+XaLKap7YCGNrRcveKN -d4FGQw+5qVpYTYwma2Py9nqB40eUrGl1LS2OmNyAAmTl0iH3aQ+M+ppPIYN4Zjhl -kSb7si7CxSXi91jk+Rtgu+UryXE2PZ+KLq7rFH25/5D2hyAjZAVe4yfMZZqkqsWs -t+REgR5KrbgfDXs5IjvhZ0h3jVJ7rJhm3bM2/hY+pR6nizw7xU7xxbzR0DE/pdbQ -irsbi6IR7zpbJyru9XR9mY9Bie0gCvW9ms8bmbik/aiehTjpj16L0R+xW9MniSSF -0a0V72JF15r/5zq3yap9BhUqcAONci1I4ZweiQ9QfDDqLCxPoiSp0flfxf8yD6Z5 -c+4DzMjXXMXGqrOWHsc/cfmmw0ycjvaI9sK7ZDV/nQ3z8UwiyiCZHnBzm/1PNd2r -u8GIw6mChiBGhGim+sjj4TAUTmbntOpslkM7SUdQKPqSGGSDVwT9tHTI0nq0A9T0 -JiKAzRO0BUvH95pmLQL/BPXvaNgVLeSTnYD0fTtAO8PYot3GXnry9Am+5Rsr/kFz -i3sC1WiMifYvnyFydSW6XrJmw8gjJPq8BwAdZGQoyyLJl1MT/cB3mvsa7C5A0n8u -FJ4j2wlTLv1FNOTR8itJ8vBYYKEYYVT8cNqIJg2LmQ7+6GmU7HGNV58WUVTUFZHE -P1I0BL3BE/pWaY9XzcVsvD19QPUo6pEUnCZtfewO969hsHn2x/gEtnnVxlFJkVZe -t4XkYCVsn8zLceUZAABJqwjsT05KNE5Mo35TSkhQ1+gl1cwJl2iFjAHVHRYl+rsQ -3UtK+Z/CXebcPiwe22NKQT6gBcYJsQx80LGysLv7gUNY8z97puZjVFcGx5wLNXJq -xAj+FaLM7/Wc5Gkh+Z52Z86apxJ8EnzaoT6k8wE3l4JqTd1NfFs44wURjTWoE8zp -JCt8ctGwp6YpoCbjee5IdNq+wAQOVW8S0zrshO4rdMH2tBCBUI/z+Dc+Xyd7Swd0 -t5/5H2I3fKWMaHqRKHBWuLTmJYkBFx0XWgIrUHxEYixhb1wuc8H389eEd8vEXGdv -uR9TmJeJ/z2C6QF6D084F4vW169pyIZ1XoTEmBJg3Drmev5qIshfoHV/gQEfLUvF -iUj43gPXZhbtSmGn/Ksqvy75O4Gr4ykhcnv8B9ZKCYUUQXVoAvtkS3qj2dhYprJq -TPjUMMzr7M97NEYuekSx+cuY2Zbqb3vk2v+hA3i8K+OKymDVGhBpzX+FFGUF3HDU -u7fizYiJtlJxgghKXj++AwmIvXkc+MDXH0SFiNihdKRR5FjLrvMWPnACVLv8pQlH -f8hk/+KK2esNBXk0rbFB0oKcH4fcgI6mUCdGx2yl2ANynPvUhc+41P0QZ4o9uXqB -ZVP7+d2H9h3sGGpOPSRaciljYFdPluh2MohmjqjWWZ5u18JYsCE1SAF5 -=50ei +iQUHBAABCgAdFiEEzaAaQgjE90UGEH570atFFoiIiIgFAmQbhUsACgkQ0atFFoiI +iIiZRyafVZrV0/Dx//9PxDENNF0aPXYhZODF40SS0NZbXFWSJMZCp73UYtXglEFY +LLaVQfZIVnrPWGE7f1AY9n++6nZ30jKO35Xf7v0KQX0knqGAtENC2JgoDPTViwf3 +yQo+clXuGk5+4Vr/Dy040yH9TL4SnmeUsRuN3GI2lr7RUV+fJgywAipcGC0niQRC +RRkFmtE2mUfP7pNI3AGOUxLoH1vamZH4Ptp3yr32Lag8AixmrU7fP2POvm4ZtyoO +ZoX1jHb7KP8Jo1xXZrRWnoSaL6Z3qo3ktKQdw7//NNXQpNSuH3tW7hhzcOzfndu0 +QRRlVv9AvFyLH2vvn1HAALyQBaES7YFz3+qiMqdIKg7GzCXJkKxCxmvMAUMAv1Jp +BapuS3pQ3Ha2z1ZierRpxSNrCQWGHN95ho0ery1I0F6MU/W77JakfP7dzq/OrsYf +gMc9ndY3gNjbfip39e+O3ZUvoolh7hxQYvu4Rvjg3hdtg9QMuMA+6EokbZ39uJWt +cuDNz6fQSZjRmNcAJsFjLsdlIwSvaWEZzBIs/4FFfCR4EEvuIEYWniua1+MV7Tjo +SWko84vqj8RZT8YJp++qGcziFAvmeyQcv4vg3N0Dt1LBJzlwFETbbE8cEaPBiD0C +A3kItmxIdN1cweAm4t364Hki+2FyrNzhwP8LsadzO72hlcIHwBZ7WxwVJCtuVOgz +5TSeyJr3gMAT1Y8uSQ/GtUXUGCXsHKUCrqgvyGk8djFOqOPFKOKOBfQ7VyukyEeK +qn6ayp32yFoTmQyQVsX+wdTJ+2syIQYnYUCd4hhDiZu48KQ5UZxlk9wtxUH7WpTw +YXl6LsciTuRm/TlMPIUo5hfLHd0XTNfNOOBjSRtoOG2+VaLiYuy93hkwZtt3nQ6e +29TPWYt5S4w7E+vFgqihUD3NA5CoUFBQ5PAehmushLZhlJQuyYkCLhtZ0m6zeN/m +M8I+gJyD8Q0i5XnU9eLQSbILs3AprCZogX0vPMk+4gojsilFYhgQaCq2S6QjA8QY +1CLhjlmAQZi8W62IXl/e36LHBDIJHtapur4XIlTGGi0Ff9F/iiJ/w1oXXlEVVqo7 +uBBpkng4IdCmpjc/ZMVl0mZ3CHWgb6T3KYUxqm1JjP8fXlC9CBNa3X+Ic8Pc/w1+ +KF6sfbemVJ+0I73f4yxi7YNavVpwvuEwsV2n06Im0S9VkDT/UuY+UR5Zx9Xn8270 +eoY++fqmCTGUl5uY4RMi/WfgysgNTSV1dREFSFchlJ8CvAXq+Q+5nK/ezLb5m2p9 +l04x6FMQmvYTUIj4IOF8lMDJi6o/vj34MpT8SjcdLb+Qn2tBsnVB2FaKqadVejxk +5p2ExndD/Oq25T9H8Md3IoRYbGRZNVpeB2YJE9AfQLTwx+mxvroDGHCT/PHHonYT +yST8ONHikVt0YFpmojHR5u/Bn497hJ/RyvZYD0s5mHW6CNNoasGnBhIjiHTxS8VV +PMuMFBRt6kEBByr1BfSbjN8SFsDLze0W6/aimUpsiqx+So+qmvPQf1msWp4uyBC9 +Qn97RsW9/4Gy5l9xfnL61vXfRlGQTkols3o9FrAw/HkwkeoVSy98Rc6FCLCgXsCJ +LorGi/bGYmQSMbsIUwn96Z+LeCqrMFK4lI70mRKbioDHjiGiP5ihH7+i +=wfd/ -----END PGP SIGNATURE----- ++++++ parallel-remove-nag-screen.patch ++++++ --- /var/tmp/diff_new_pack.uKbBVC/_old 2023-03-31 21:15:40.742428078 +0200 +++ /var/tmp/diff_new_pack.uKbBVC/_new 2023-03-31 21:15:40.746428096 +0200 @@ -12,41 +12,41 @@ src/sem | 2 ++ 2 files changed, 4 insertions(+) -Index: parallel-20221122/src/parallel +Index: parallel-20230322/src/parallel =================================================================== ---- parallel-20221122.orig/src/parallel -+++ parallel-20221122/src/parallel -@@ -2508,6 +2508,7 @@ sub parse_options(@) { - } - } - -+if (0) { - # Funding a free software project is hard. GNU Parallel is no - # exception. On top of that it seems the less visible a project - # is, the harder it is to get funding. And the nature of GNU -@@ -2581,6 +2582,7 @@ sub parse_options(@) { - # line. This is because _YOU_ actively make it harder to justify - # spending time developing GNU Parallel. +--- parallel-20230322.orig/src/parallel ++++ parallel-20230322/src/parallel +@@ -2575,6 +2575,7 @@ sub parse_options(@) { + # out, and if it works, you should post it on the email + # list. Ideas that will cost work and which have not been tested + # are, however, unlikely to be prioritized. ++ if (0) { + # + # Please note that GPL version 3 gives you the right to fork GNU + # Parallel under a new name, but it does not give you the right to +@@ -2614,6 +2615,7 @@ sub parse_options(@) { + # accept to be added to a public hall of shame by removing the + # line. That includes you, Andreas and George. +} parse_halt(); if($ENV{'PARALLEL_ENV'}) { -Index: parallel-20221122/src/sem +Index: parallel-20230322/src/sem =================================================================== ---- parallel-20221122.orig/src/sem -+++ parallel-20221122/src/sem -@@ -2508,6 +2508,7 @@ sub parse_options(@) { - } - } - -+if (0) { - # Funding a free software project is hard. GNU Parallel is no - # exception. On top of that it seems the less visible a project - # is, the harder it is to get funding. And the nature of GNU -@@ -2581,6 +2582,7 @@ sub parse_options(@) { - # line. This is because _YOU_ actively make it harder to justify - # spending time developing GNU Parallel. +--- parallel-20230322.orig/src/sem ++++ parallel-20230322/src/sem +@@ -2600,6 +2600,7 @@ sub parse_options(@) { + # runs. If that is too much trouble for you, why not use one of + # the alternatives instead? + # See a list in: 'man parallel_alternatives' ++ if (0) { + # + # If you want GNU Parallel to be maintained in the future you + # should keep this line. +@@ -2614,6 +2615,7 @@ sub parse_options(@) { + # accept to be added to a public hall of shame by removing the + # line. That includes you, Andreas and George. +} parse_halt();

1 0

commit ccls for openSUSE:Factory
by Source-Sync 31 Mar '23

31 Mar '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ccls for openSUSE:Factory checked in at 2023-03-31 21:15:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ccls (Old) and /work/SRC/openSUSE:Factory/.ccls.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ccls" Fri Mar 31 21:15:36 2023 rev:17 rq:1075714 version:0.20220729 Changes: -------- --- /work/SRC/openSUSE:Factory/ccls/ccls.changes 2022-08-01 21:33:16.578151761 +0200 +++ /work/SRC/openSUSE:Factory/.ccls.new.31432/ccls.changes 2023-03-31 21:15:37.854414655 +0200 @@ -1,0 +2,9 @@ +Thu Mar 30 21:52:42 UTC 2023 - Aaron Puchert <aaronpuchert(a)alice-dsl.net> + +- Backport upstream patch llvm16-optional-deprecation.patch to fix + build with LLVM 16. +- Relax runtime requirements with Clang 16 and newer: the resource + directory doesn't depend on the patch-level version anymore. +- Relax build requirements. + +------------------------------------------------------------------- New: ---- llvm16-optional-deprecation.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ccls.spec ++++++ --- /var/tmp/diff_new_pack.XvbjsW/_old 2023-03-31 21:15:38.502417667 +0200 +++ /var/tmp/diff_new_pack.XvbjsW/_new 2023-03-31 21:15:38.510417704 +0200 @@ -1,7 +1,7 @@ # # spec file for package ccls # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,6 +26,7 @@ Group: Development/Tools/IDE URL: https://github.com/MaskRay/ccls Source0: %{URL}/archive/%{version}/%{name}-%{version}.tar.gz +Patch0: %{URL}/commit/6dc564f2a8608fff778a7d7e8ed0d5acd8d61e6b.patch#/llvm16-optional-deprecation.patch BuildRequires: clang-devel >= 7.0 BuildRequires: cmake >= 3.8 BuildRequires: llvm-devel >= 7.0 @@ -37,7 +38,14 @@ Provides: bundled(siphash) # ccls hardcodes the paths to clang's resource dir and we thus must ensure that # it is always shipped with the same clang version that was used to build it -%{requires_eq clang} +%if %{pkg_vcmp clang-devel >= 16.0.0} +# With Clang 16, the resource directory depends on the major version only and +# doesn't change with patch-level updates. +Requires: libclang-cpp%{_llvm_sonum} +%else +# Previously the full version was used, so we need to require that same version. +%{requires_eq libclang-cpp%{_llvm_sonum}} +%endif # gcc > 7.0 is called gcc7- in Leap 15.2 and 15.3 %if 0%{?sle_version} >= 150200 BuildRequires: gcc7-c++ >= 7.2 @@ -73,7 +81,6 @@ %else -DCLANG_LINK_CLANG_DYLIB=OFF %endif -# ccls currently consumes ~1GB of memory during compilation per thread %cmake_build %install ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.XvbjsW/_old 2023-03-31 21:15:38.538417834 +0200 +++ /var/tmp/diff_new_pack.XvbjsW/_new 2023-03-31 21:15:38.546417871 +0200 @@ -2,7 +2,7 @@ <constraints> <hardware> <memoryperjob> - <size unit="M">1000</size> + <size unit="M">700</size> </memoryperjob> </hardware> </constraints> ++++++ llvm16-optional-deprecation.patch ++++++ From 6dc564f2a8608fff778a7d7e8ed0d5acd8d61e6b Mon Sep 17 00:00:00 2001 From: Fangrui Song <i(a)maskray.me> Date: Sat, 17 Dec 2022 20:04:54 -0800 Subject: [PATCH] Adapt llvm::Optional deprecation --- src/indexer.cc | 4 +++- src/project.cc | 11 +++++++---- src/sema_manager.cc | 4 +++- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/indexer.cc b/src/indexer.cc index d5fe7da2c..83b77a201 100644 --- a/src/indexer.cc +++ b/src/indexer.cc @@ -1097,7 +1097,9 @@ class IndexPPCallbacks : public PPCallbacks { void InclusionDirective(SourceLocation hashLoc, const Token &tok, StringRef included, bool isAngled, CharSourceRange filenameRange, -#if LLVM_VERSION_MAJOR >= 15 // llvmorg-15-init-7692-gd79ad2f1dbc2 +#if LLVM_VERSION_MAJOR >= 16 // llvmorg-16-init-15080-g854c10f8d185 + OptionalFileEntryRef fileRef, +#elif LLVM_VERSION_MAJOR >= 15 // llvmorg-15-init-7692-gd79ad2f1dbc2 llvm::Optional<FileEntryRef> fileRef, #else const FileEntry *file, diff --git a/src/project.cc b/src/project.cc index c02bd6b67..b1b7f557c 100644 --- a/src/project.cc +++ b/src/project.cc @@ -391,11 +391,14 @@ void Project::loadDirectory(const std::string &root, Project::Folder &folder) { fwrite(input.c_str(), input.size(), 1, fout); fclose(fout); } - std::array<Optional<StringRef>, 3> redir{StringRef(stdinPath), - StringRef(path), StringRef()}; +#if LLVM_VERSION_MAJOR >= 16 // llvmorg-16-init-12589-ge748db0f7f09 + std::array<std::optional<StringRef>, 3> +#else + std::array<Optional<StringRef>, 3> +#endif + redir{StringRef(stdinPath), StringRef(path), StringRef()}; std::vector<StringRef> args{g_config->compilationDatabaseCommand, root}; - if (sys::ExecuteAndWait(args[0], args, llvm::None, redir, 0, 0, &err_msg) < - 0) { + if (sys::ExecuteAndWait(args[0], args, {}, redir, 0, 0, &err_msg) < 0) { LOG_S(ERROR) << "failed to execute " << args[0].str() << " " << args[1].str() << ": " << err_msg; return; diff --git a/src/sema_manager.cc b/src/sema_manager.cc index a7b6f8cab..14f303b5f 100644 --- a/src/sema_manager.cc +++ b/src/sema_manager.cc @@ -179,7 +179,9 @@ class StoreInclude : public PPCallbacks { void InclusionDirective(SourceLocation hashLoc, const Token &includeTok, StringRef fileName, bool isAngled, CharSourceRange filenameRange, -#if LLVM_VERSION_MAJOR >= 15 // llvmorg-15-init-7692-gd79ad2f1dbc2 +#if LLVM_VERSION_MAJOR >= 16 // llvmorg-16-init-15080-g854c10f8d185 + OptionalFileEntryRef fileRef, +#elif LLVM_VERSION_MAJOR >= 15 // llvmorg-15-init-7692-gd79ad2f1dbc2 llvm::Optional<FileEntryRef> fileRef, #else const FileEntry *file,

1 0

commit QMPlay2 for openSUSE:Factory
by Source-Sync 31 Mar '23

31 Mar '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package QMPlay2 for openSUSE:Factory checked in at 2023-03-31 21:15:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/QMPlay2 (Old) and /work/SRC/openSUSE:Factory/.QMPlay2.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "QMPlay2" Fri Mar 31 21:15:31 2023 rev:72 rq:1075704 version:23.02.05 Changes: -------- --- /work/SRC/openSUSE:Factory/QMPlay2/QMPlay2.changes 2023-03-22 22:32:41.738813227 +0100 +++ /work/SRC/openSUSE:Factory/.QMPlay2.new.31432/QMPlay2.changes 2023-03-31 21:15:31.906387010 +0200 @@ -1,0 +2,6 @@ +Tue Mar 30 19:24:18 UTC 2023 - Simon Vogl <simon.vogl(a)gmx.net> + +- Add 0001-fix-overlay-focus.patch to ensure the correct + QMPlay2 window is always focussed + +------------------------------------------------------------------- New: ---- 0001-fix-overlay-focus.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ QMPlay2.spec ++++++ --- /var/tmp/diff_new_pack.ZxjRWU/_old 2023-03-31 21:15:32.514389836 +0200 +++ /var/tmp/diff_new_pack.ZxjRWU/_new 2023-03-31 21:15:32.522389873 +0200 @@ -32,6 +32,8 @@ Patch2: 0001-fix-mono-playback.patch # PATCH-FIX-UPSTREAM Patch3: 0001-fix-broken-yt-dlp.patch +# PATCH-FIX-UPSTREAM +Patch4: 0001-fix-overlay-focus.patch BuildRequires: clang BuildRequires: cmake >= 3.16 BuildRequires: llvm-gold ++++++ 0001-fix-overlay-focus.patch ++++++ From c2aabe13bcf6c9f67f8bce3496dfd0cffb4d794e Thu Mar 30 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Szczygie=C5=82?= <spaz16(a)wp.pl> Date: Thu, 30 Mar 2023 21:24:18 +0200 Subject: [PATCH] Apply always on top to settings window Amends: c2aabe13bcf6c9f67f8bce3496dfd0cffb4d794e --- src/gui/MainWidget.cpp | 3 +++ src/gui/SettingsWidget.cpp | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gui/MainWidget.cpp b/src/gui/MainWidget.cpp index b61316b7..b5831cd9 100644 --- a/src/gui/MainWidget.cpp +++ b/src/gui/MainWidget.cpp @@ -1330,6 +1330,9 @@ void MainWidget::showSettings(const QString &moduleName) page = 0; settingsW = new SettingsWidget(page, moduleName, QMPlay2GUI.videoAdjustment); + if (windowFlags() & Qt::WindowStaysOnTopHint) + settingsW->setWindowFlag(Qt::WindowStaysOnTopHint); + settingsW->show(); connect(settingsW, SIGNAL(settingsChanged(int, bool, bool)), &playC, SLOT(settingsChanged(int, bool, bool))); connect(settingsW, SIGNAL(setWheelStep(int)), seekS, SLOT(setWheelStep(int))); connect(settingsW, SIGNAL(setVolMax(int)), volW, SLOT(setMaximumVolume(int))); diff --git a/src/gui/SettingsWidget.cpp b/src/gui/SettingsWidget.cpp index cdbba84c..410a7969 100644 --- a/src/gui/SettingsWidget.cpp +++ b/src/gui/SettingsWidget.cpp @@ -711,8 +711,6 @@ SettingsWidget::SettingsWidget(int page, const QString &moduleName, QWidget *vid connect(tabW, SIGNAL(currentChanged(int)), this, SLOT(tabCh(int))); tabW->setCurrentIndex(page); - - show(); } SettingsWidget::~SettingsWidget() {

1 0

commit gzdoom for openSUSE:Factory
by Source-Sync 31 Mar '23

31 Mar '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gzdoom for openSUSE:Factory checked in at 2023-03-31 21:15:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gzdoom (Old) and /work/SRC/openSUSE:Factory/.gzdoom.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gzdoom" Fri Mar 31 21:15:28 2023 rev:31 rq:1075701 version:4.10.0 Changes: -------- --- /work/SRC/openSUSE:Factory/gzdoom/gzdoom.changes 2023-02-08 17:20:31.626012062 +0100 +++ /work/SRC/openSUSE:Factory/.gzdoom.new.31432/gzdoom.changes 2023-03-31 21:15:30.710381452 +0200 @@ -1,0 +2,5 @@ +Thu Mar 30 22:02:53 UTC 2023 - Jan Engelhardt <jengelh(a)inai.de> + +- Add gcc13.diff + +------------------------------------------------------------------- New: ---- gcc13.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gzdoom.spec ++++++ --- /var/tmp/diff_new_pack.qyI43O/_old 2023-03-31 21:15:31.594385560 +0200 +++ /var/tmp/diff_new_pack.qyI43O/_new 2023-03-31 21:15:31.606385616 +0200 @@ -32,6 +32,7 @@ Patch6: gzdoom-discord.patch Patch8: 0001-removed-some-32bit-only-CMake-code.patch Patch9: 0001-Revert-use-static_assert-to-make-32-bit-builds-fail.patch +Patch10: gcc13.diff BuildRequires: cmake >= 2.8.7 BuildRequires: discord-rpc-devel BuildRequires: gcc-c++ ++++++ gcc13.diff ++++++ From: Jan Engelhardt Date: 2023-03-30 23:52:45.534338531 +0200 Upstream: https://github.com/ZDoom/gzdoom/pull/2040 This is the g4.10.0 version of the change. diff --git a/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h b/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h index fd4472286..db0b94f4e 100644 --- a/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h +++ b/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h @@ -104,6 +104,8 @@ Documentation of all members: vk_mem_alloc.h - [Source repository on GitHub](https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator) */ +#include <stdio.h> + #ifdef __cplusplus extern "C" { #endif

1 0

commit ruby-build for openSUSE:Factory
by Source-Sync 31 Mar '23

31 Mar '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ruby-build for openSUSE:Factory checked in at 2023-03-31 21:15:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ruby-build (Old) and /work/SRC/openSUSE:Factory/.ruby-build.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ruby-build" Fri Mar 31 21:15:27 2023 rev:27 rq:1075685 version:20230330 Changes: -------- --- /work/SRC/openSUSE:Factory/ruby-build/ruby-build.changes 2023-03-14 18:16:42.327751296 +0100 +++ /work/SRC/openSUSE:Factory/.ruby-build.new.31432/ruby-build.changes 2023-03-31 21:15:29.790377175 +0200 @@ -1,0 +2,10 @@ +Thu Mar 30 19:50:45 UTC 2023 - Lukas M��ller <expeehaa(a)outlook.com> + +- Update to version 20230330. + Changelog: https://github.com/rbenv/ruby-build/releases/tag/v20230330 + * Add definitions for Ruby 2.7.8, 3.0.6, 3.1.4, 3.2.2 by @jas14 in #2174 + * Upgrade from OpenSSL 3.0 to OpenSSL 3.1 by @mislav in #2175 + * Avoid shellcheck CI job commenting on every PR by @mislav in #2176 + * Remove AWS access key ID from version control by @mislav in #2163 + +------------------------------------------------------------------- Old: ---- ruby-build-20230309.tar.gz New: ---- ruby-build-20230330.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ruby-build.spec ++++++ --- /var/tmp/diff_new_pack.T1Qj4p/_old 2023-03-31 21:15:30.318379630 +0200 +++ /var/tmp/diff_new_pack.T1Qj4p/_new 2023-03-31 21:15:30.322379648 +0200 @@ -24,7 +24,7 @@ %endif Name: ruby-build -Version: 20230309 +Version: 20230330 Release: 0 BuildArch: noarch License: MIT ++++++ ruby-build-20230309.tar.gz -> ruby-build-20230330.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-build-20230309/.github/workflows/differential-shellcheck.yml new/ruby-build-20230330/.github/workflows/differential-shellcheck.yml --- old/ruby-build-20230309/.github/workflows/differential-shellcheck.yml 2023-03-09 02:38:37.000000000 +0100 +++ new/ruby-build-20230330/.github/workflows/differential-shellcheck.yml 2023-03-30 18:01:50.000000000 +0200 @@ -3,6 +3,8 @@ name: Differential ShellCheck on: + push: + branches: [master] pull_request: branches: [master] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-build-20230309/.github/workflows/mirror.yml new/ruby-build-20230330/.github/workflows/mirror.yml --- old/ruby-build-20230309/.github/workflows/mirror.yml 2023-03-09 02:38:37.000000000 +0100 +++ new/ruby-build-20230330/.github/workflows/mirror.yml 2023-03-30 18:01:50.000000000 +0200 @@ -19,12 +19,12 @@ steps: - uses: actions/checkout@v3 with: - fetch-depth: 0 + fetch-depth: 100 - name: Update download mirror run: script/mirror update "${BEFORE_REF}.." env: BEFORE_REF: ${{ github.event.before }}${{ github.event.inputs.beforeRef }} - AMAZON_S3_BUCKET: ruby-build-mirror - AWS_ACCESS_KEY_ID: AKIAJKAUQVHU6X4CODDQ + AMAZON_S3_BUCKET: ${{ vars.AWS_S3_BUCKET }} + AWS_ACCESS_KEY_ID: ${{ vars.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.MIRROR_UPLOAD_SECRET }} - AWS_REGION: us-east-1 + AWS_REGION: ${{ vars.AWS_REGION }} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-build-20230309/bin/ruby-build new/ruby-build-20230330/bin/ruby-build --- old/ruby-build-20230309/bin/ruby-build 2023-03-09 02:38:37.000000000 +0100 +++ new/ruby-build-20230330/bin/ruby-build 2023-03-30 18:01:50.000000000 +0200 @@ -14,7 +14,7 @@ # --version Show version of ruby-build # -RUBY_BUILD_VERSION="20230309" +RUBY_BUILD_VERSION="20230330" OLDIFS="$IFS" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-build-20230309/share/ruby-build/2.7.8 new/ruby-build-20230330/share/ruby-build/2.7.8 --- old/ruby-build-20230309/share/ruby-build/2.7.8 1970-01-01 01:00:00.000000000 +0100 +++ new/ruby-build-20230330/share/ruby-build/2.7.8 2023-03-30 18:01:50.000000000 +0200 @@ -0,0 +1,2 @@ +install_package "openssl-1.1.1t" "https://www.openssl.org/source/openssl-1.1.1t.tar.gz#8dee9b24bdb1dcbf0c3d1e…" openssl --if needs_openssl_101_111 +install_package "ruby-2.7.8" "https://cache.ruby-lang.org/pub/ruby/2.7/ruby-2.7.8.tar.gz#c2dab63cbc8f2a05…" ldflags_dirs enable_shared standard verify_openssl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-build-20230309/share/ruby-build/3.0.6 new/ruby-build-20230330/share/ruby-build/3.0.6 --- old/ruby-build-20230309/share/ruby-build/3.0.6 1970-01-01 01:00:00.000000000 +0100 +++ new/ruby-build-20230330/share/ruby-build/3.0.6 2023-03-30 18:01:50.000000000 +0200 @@ -0,0 +1,2 @@ +install_package "openssl-1.1.1t" "https://www.openssl.org/source/openssl-1.1.1t.tar.gz#8dee9b24bdb1dcbf0c3d1e…" openssl --if needs_openssl_101_111 +install_package "ruby-3.0.6" "https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.6.tar.gz#6e6cbd490030d791…" ldflags_dirs enable_shared standard verify_openssl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-build-20230309/share/ruby-build/3.1.0 new/ruby-build-20230330/share/ruby-build/3.1.0 --- old/ruby-build-20230309/share/ruby-build/3.1.0 2023-03-09 02:38:37.000000000 +0100 +++ new/ruby-build-20230330/share/ruby-build/3.1.0 2023-03-30 18:01:50.000000000 +0200 @@ -1,2 +1,2 @@ -install_package "openssl-3.0.8" "https://www.openssl.org/source/openssl-3.0.8.tar.gz#6c13d2bf38fdf31eac3ce2a…" openssl --if needs_openssl_102_300 +install_package "openssl-3.1.0" "https://www.openssl.org/source/openssl-3.1.0.tar.gz#aaa925ad9828745c4cad9d9…" openssl --if needs_openssl_102_300 install_package "ruby-3.1.0" "https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.0.tar.gz#50a0504c6edcb4d6…" ldflags_dirs enable_shared standard verify_openssl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-build-20230309/share/ruby-build/3.1.0-dev new/ruby-build-20230330/share/ruby-build/3.1.0-dev --- old/ruby-build-20230309/share/ruby-build/3.1.0-dev 2023-03-09 02:38:37.000000000 +0100 +++ new/ruby-build-20230330/share/ruby-build/3.1.0-dev 2023-03-30 18:01:50.000000000 +0200 @@ -1,2 +1,2 @@ -install_package "openssl-3.0.8" "https://www.openssl.org/source/openssl-3.0.8.tar.gz#6c13d2bf38fdf31eac3ce2a…" openssl --if needs_openssl_102_300 +install_package "openssl-3.1.0" "https://www.openssl.org/source/openssl-3.1.0.tar.gz#aaa925ad9828745c4cad9d9…" openssl --if needs_openssl_102_300 install_git "ruby-3.1.0-dev" "https://github.com/ruby/ruby.git" "ruby_3_1" ldflags_dirs autoconf standard_build standard_install_with_bundled_gems verify_openssl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-build-20230309/share/ruby-build/3.1.0-preview1 new/ruby-build-20230330/share/ruby-build/3.1.0-preview1 --- old/ruby-build-20230309/share/ruby-build/3.1.0-preview1 2023-03-09 02:38:37.000000000 +0100 +++ new/ruby-build-20230330/share/ruby-build/3.1.0-preview1 2023-03-30 18:01:50.000000000 +0200 @@ -1,2 +1,2 @@ -install_package "openssl-3.0.8" "https://www.openssl.org/source/openssl-3.0.8.tar.gz#6c13d2bf38fdf31eac3ce2a…" openssl --if needs_openssl_102_300 +install_package "openssl-3.1.0" "https://www.openssl.org/source/openssl-3.1.0.tar.gz#aaa925ad9828745c4cad9d9…" openssl --if needs_openssl_102_300 install_package "ruby-3.1.0-preview1" "https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.0-preview1.tar.gz#540f49f…" ldflags_dirs enable_shared standard verify_openssl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-build-20230309/share/ruby-build/3.1.1 new/ruby-build-20230330/share/ruby-build/3.1.1 --- old/ruby-build-20230309/share/ruby-build/3.1.1 2023-03-09 02:38:37.000000000 +0100 +++ new/ruby-build-20230330/share/ruby-build/3.1.1 2023-03-30 18:01:50.000000000 +0200 @@ -1,2 +1,2 @@ -install_package "openssl-3.0.8" "https://www.openssl.org/source/openssl-3.0.8.tar.gz#6c13d2bf38fdf31eac3ce2a…" openssl --if needs_openssl_102_300 +install_package "openssl-3.1.0" "https://www.openssl.org/source/openssl-3.1.0.tar.gz#aaa925ad9828745c4cad9d9…" openssl --if needs_openssl_102_300 install_package "ruby-3.1.1" "https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.1.tar.gz#fe6e4782de974439…" ldflags_dirs enable_shared standard verify_openssl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-build-20230309/share/ruby-build/3.1.2 new/ruby-build-20230330/share/ruby-build/3.1.2 --- old/ruby-build-20230309/share/ruby-build/3.1.2 2023-03-09 02:38:37.000000000 +0100 +++ new/ruby-build-20230330/share/ruby-build/3.1.2 2023-03-30 18:01:50.000000000 +0200 @@ -1,2 +1,2 @@ -install_package "openssl-3.0.8" "https://www.openssl.org/source/openssl-3.0.8.tar.gz#6c13d2bf38fdf31eac3ce2a…" openssl --if needs_openssl_102_300 +install_package "openssl-3.1.0" "https://www.openssl.org/source/openssl-3.1.0.tar.gz#aaa925ad9828745c4cad9d9…" openssl --if needs_openssl_102_300 install_package "ruby-3.1.2" "https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.2.tar.gz#61843112389f02b7…" ldflags_dirs enable_shared standard verify_openssl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-build-20230309/share/ruby-build/3.1.3 new/ruby-build-20230330/share/ruby-build/3.1.3 --- old/ruby-build-20230309/share/ruby-build/3.1.3 2023-03-09 02:38:37.000000000 +0100 +++ new/ruby-build-20230330/share/ruby-build/3.1.3 2023-03-30 18:01:50.000000000 +0200 @@ -1,2 +1,2 @@ -install_package "openssl-3.0.8" "https://www.openssl.org/source/openssl-3.0.8.tar.gz#6c13d2bf38fdf31eac3ce2a…" openssl --if needs_openssl_102_300 +install_package "openssl-3.1.0" "https://www.openssl.org/source/openssl-3.1.0.tar.gz#aaa925ad9828745c4cad9d9…" openssl --if needs_openssl_102_300 install_package "ruby-3.1.3" "https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.3.tar.gz#5ea498a35f4cd158…" ldflags_dirs enable_shared standard verify_openssl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-build-20230309/share/ruby-build/3.1.4 new/ruby-build-20230330/share/ruby-build/3.1.4 --- old/ruby-build-20230309/share/ruby-build/3.1.4 1970-01-01 01:00:00.000000000 +0100 +++ new/ruby-build-20230330/share/ruby-build/3.1.4 2023-03-30 18:01:50.000000000 +0200 @@ -0,0 +1,2 @@ +install_package "openssl-3.1.0" "https://www.openssl.org/source/openssl-3.1.0.tar.gz#aaa925ad9828745c4cad9d9…" openssl --if needs_openssl_102_300 +install_package "ruby-3.1.4" "https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.4.tar.gz#a3d55879a0dfab1d…" ldflags_dirs enable_shared standard verify_openssl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-build-20230309/share/ruby-build/3.2.0 new/ruby-build-20230330/share/ruby-build/3.2.0 --- old/ruby-build-20230309/share/ruby-build/3.2.0 2023-03-09 02:38:37.000000000 +0100 +++ new/ruby-build-20230330/share/ruby-build/3.2.0 2023-03-30 18:01:50.000000000 +0200 @@ -1,2 +1,2 @@ -install_package "openssl-3.0.8" "https://www.openssl.org/source/openssl-3.0.8.tar.gz#6c13d2bf38fdf31eac3ce2a…" openssl --if needs_openssl_102_300 +install_package "openssl-3.1.0" "https://www.openssl.org/source/openssl-3.1.0.tar.gz#aaa925ad9828745c4cad9d9…" openssl --if needs_openssl_102_300 install_package "ruby-3.2.0" "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.0.tar.gz#daaa78e1360b2783…" ldflags_dirs enable_shared standard verify_openssl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-build-20230309/share/ruby-build/3.2.0-dev new/ruby-build-20230330/share/ruby-build/3.2.0-dev --- old/ruby-build-20230309/share/ruby-build/3.2.0-dev 2023-03-09 02:38:37.000000000 +0100 +++ new/ruby-build-20230330/share/ruby-build/3.2.0-dev 2023-03-30 18:01:50.000000000 +0200 @@ -1,2 +1,2 @@ -install_package "openssl-3.0.8" "https://www.openssl.org/source/openssl-3.0.8.tar.gz#6c13d2bf38fdf31eac3ce2a…" openssl --if needs_openssl_102_300 +install_package "openssl-3.1.0" "https://www.openssl.org/source/openssl-3.1.0.tar.gz#aaa925ad9828745c4cad9d9…" openssl --if needs_openssl_102_300 install_git "ruby-3.2.0-dev" "https://github.com/ruby/ruby.git" "ruby_3_2" ldflags_dirs autoconf standard_build standard_install_with_bundled_gems verify_openssl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-build-20230309/share/ruby-build/3.2.0-preview1 new/ruby-build-20230330/share/ruby-build/3.2.0-preview1 --- old/ruby-build-20230309/share/ruby-build/3.2.0-preview1 2023-03-09 02:38:37.000000000 +0100 +++ new/ruby-build-20230330/share/ruby-build/3.2.0-preview1 2023-03-30 18:01:50.000000000 +0200 @@ -1,2 +1,2 @@ -install_package "openssl-3.0.8" "https://www.openssl.org/source/openssl-3.0.8.tar.gz#6c13d2bf38fdf31eac3ce2a…" openssl --if needs_openssl_102_300 +install_package "openssl-3.1.0" "https://www.openssl.org/source/openssl-3.1.0.tar.gz#aaa925ad9828745c4cad9d9…" openssl --if needs_openssl_102_300 install_package "ruby-3.2.0-preview1" "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.0-preview1.tar.gz#6946b96…" ldflags_dirs enable_shared standard verify_openssl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-build-20230309/share/ruby-build/3.2.0-preview2 new/ruby-build-20230330/share/ruby-build/3.2.0-preview2 --- old/ruby-build-20230309/share/ruby-build/3.2.0-preview2 2023-03-09 02:38:37.000000000 +0100 +++ new/ruby-build-20230330/share/ruby-build/3.2.0-preview2 2023-03-30 18:01:50.000000000 +0200 @@ -1,2 +1,2 @@ -install_package "openssl-3.0.8" "https://www.openssl.org/source/openssl-3.0.8.tar.gz#6c13d2bf38fdf31eac3ce2a…" openssl --if needs_openssl_102_300 +install_package "openssl-3.1.0" "https://www.openssl.org/source/openssl-3.1.0.tar.gz#aaa925ad9828745c4cad9d9…" openssl --if needs_openssl_102_300 install_package "ruby-3.2.0-preview2" "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.0-preview2.tar.gz#8a78fd7…" ldflags_dirs enable_shared standard verify_openssl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-build-20230309/share/ruby-build/3.2.0-preview3 new/ruby-build-20230330/share/ruby-build/3.2.0-preview3 --- old/ruby-build-20230309/share/ruby-build/3.2.0-preview3 2023-03-09 02:38:37.000000000 +0100 +++ new/ruby-build-20230330/share/ruby-build/3.2.0-preview3 2023-03-30 18:01:50.000000000 +0200 @@ -1,2 +1,2 @@ -install_package "openssl-3.0.8" "https://www.openssl.org/source/openssl-3.0.8.tar.gz#6c13d2bf38fdf31eac3ce2a…" openssl --if needs_openssl_102_300 +install_package "openssl-3.1.0" "https://www.openssl.org/source/openssl-3.1.0.tar.gz#aaa925ad9828745c4cad9d9…" openssl --if needs_openssl_102_300 install_package "ruby-3.2.0-preview3" "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.0-preview3.tar.gz#c041d14…" ldflags_dirs enable_shared standard verify_openssl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-build-20230309/share/ruby-build/3.2.0-rc1 new/ruby-build-20230330/share/ruby-build/3.2.0-rc1 --- old/ruby-build-20230309/share/ruby-build/3.2.0-rc1 2023-03-09 02:38:37.000000000 +0100 +++ new/ruby-build-20230330/share/ruby-build/3.2.0-rc1 2023-03-30 18:01:50.000000000 +0200 @@ -1,2 +1,2 @@ -install_package "openssl-3.0.8" "https://www.openssl.org/source/openssl-3.0.8.tar.gz#6c13d2bf38fdf31eac3ce2a…" openssl --if needs_openssl_102_300 +install_package "openssl-3.1.0" "https://www.openssl.org/source/openssl-3.1.0.tar.gz#aaa925ad9828745c4cad9d9…" openssl --if needs_openssl_102_300 install_package "ruby-3.2.0-rc1" "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.0-rc1.tar.gz#3bb9760c1ac1…" ldflags_dirs enable_shared standard verify_openssl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-build-20230309/share/ruby-build/3.2.1 new/ruby-build-20230330/share/ruby-build/3.2.1 --- old/ruby-build-20230309/share/ruby-build/3.2.1 2023-03-09 02:38:37.000000000 +0100 +++ new/ruby-build-20230330/share/ruby-build/3.2.1 2023-03-30 18:01:50.000000000 +0200 @@ -1,2 +1,2 @@ -install_package "openssl-3.0.8" "https://www.openssl.org/source/openssl-3.0.8.tar.gz#6c13d2bf38fdf31eac3ce2a…" openssl --if needs_openssl_102_300 +install_package "openssl-3.1.0" "https://www.openssl.org/source/openssl-3.1.0.tar.gz#aaa925ad9828745c4cad9d9…" openssl --if needs_openssl_102_300 install_package "ruby-3.2.1" "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.1.tar.gz#13d67901660ee321…" ldflags_dirs enable_shared standard verify_openssl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-build-20230309/share/ruby-build/3.2.2 new/ruby-build-20230330/share/ruby-build/3.2.2 --- old/ruby-build-20230309/share/ruby-build/3.2.2 1970-01-01 01:00:00.000000000 +0100 +++ new/ruby-build-20230330/share/ruby-build/3.2.2 2023-03-30 18:01:50.000000000 +0200 @@ -0,0 +1,2 @@ +install_package "openssl-3.1.0" "https://www.openssl.org/source/openssl-3.1.0.tar.gz#aaa925ad9828745c4cad9d9…" openssl --if needs_openssl_102_300 +install_package "ruby-3.2.2" "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.2.tar.gz#96c57558871a6748…" ldflags_dirs enable_shared standard verify_openssl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-build-20230309/share/ruby-build/3.3.0-dev new/ruby-build-20230330/share/ruby-build/3.3.0-dev --- old/ruby-build-20230309/share/ruby-build/3.3.0-dev 2023-03-09 02:38:37.000000000 +0100 +++ new/ruby-build-20230330/share/ruby-build/3.3.0-dev 2023-03-30 18:01:50.000000000 +0200 @@ -1,2 +1,2 @@ -install_package "openssl-3.0.8" "https://www.openssl.org/source/openssl-3.0.8.tar.gz#6c13d2bf38fdf31eac3ce2a…" openssl --if needs_openssl_102_300 +install_package "openssl-3.1.0" "https://www.openssl.org/source/openssl-3.1.0.tar.gz#aaa925ad9828745c4cad9d9…" openssl --if needs_openssl_102_300 install_git "ruby-master" "https://github.com/ruby/ruby.git" "master" ldflags_dirs autoconf standard_build standard_install_with_bundled_gems verify_openssl

1 0

commit mame for openSUSE:Factory
by Source-Sync 31 Mar '23

31 Mar '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mame for openSUSE:Factory checked in at 2023-03-31 21:15:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mame (Old) and /work/SRC/openSUSE:Factory/.mame.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mame" Fri Mar 31 21:15:20 2023 rev:3 rq:1075623 version:0.252 Changes: -------- --- /work/SRC/openSUSE:Factory/mame/mame.changes 2022-10-03 13:45:59.285511260 +0200 +++ /work/SRC/openSUSE:Factory/.mame.new.31432/mame.changes 2023-03-31 21:15:25.650357934 +0200 @@ -1,0 +2,10 @@ +Thu Mar 30 18:15:32 UTC 2023 - �� <ilya(a)ilya.cf> + +- Updated to 0.252 + * Refreshed spec-file via spec-cleaner and manual optimizations. + * Changed file use_thin_archives.patch. + * Added files: mame-fortify.patch and mame-bgfx.patch. + * Disabled LTO for all. + * https://mametesters.org/changelog_page.php + +------------------------------------------------------------------- @@ -736 +745,0 @@ - Old: ---- mame-mame0248.tar.gz whatsnew_0248.txt New: ---- mame-bgfx.patch mame-fortify.patch mame-mame0252.tar.gz whatsnew_0252.txt ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mame.spec ++++++ --- /var/tmp/diff_new_pack.0EQMP3/_old 2023-03-31 21:15:28.854372825 +0200 +++ /var/tmp/diff_new_pack.0EQMP3/_new 2023-03-31 21:15:28.870372900 +0200 @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,50 +17,20 @@ %global flavor @BUILD_FLAVOR@%{nil} - -# disable lto for some archs -%ifarch aarch64 %arm ppc64 ppc64le %ix86 -%define _lto_cflags %{nil} -%endif - %if %{__isa_bits} == 64 %ifnarch aarch64 %define is_64bit 1 %endif %endif - -%if "%{flavor}" == "" -ExclusiveArch: do_not_build -%endif - %if "%{flavor}" == "mame" || "%{flavor}" == "" %define pkgsuffix %{nil} %else %define pkgsuffix -%{flavor} %endif - -%define fver 248 - -# Build mame-mess by default -# ASIO: https://github.com/mamedev/mame/issues/5721 -%if 0%{?suse_version} >= 1550 || ( 0%{?sle_version} >= 150300 && 0%{?is_opensuse} ) -%bcond_with system_asio -%else -%bcond_without system_asio -%endif - +%define fver 252 Name: mame%{?pkgsuffix} -Version: 0.%fver +Version: 0.%{fver} Release: 0 -%if "%{flavor}" != "mess" -Summary: Multiple Arcade Machine Emulator -License: BSD-3-Clause AND GPL-2.0-or-later AND LGPL-2.1-or-later -Group: System/Emulators/Other -%else -Summary: Multi Emulator Super System -License: BSD-3-Clause AND GPL-2.0-or-later AND LGPL-2.1-or-later -Group: System/Emulators/Other -%endif URL: https://mamedev.org/ Source0: https://github.com/mamedev/mame/archive/mame0%{fver}.tar.gz#/mame-mame0%{fv… Source1: https://github.com/mamedev/mame/releases/download/mame0%{fver}/whatsnew_0%{… @@ -76,62 +46,54 @@ Patch1: fix-922619.patch # PATCH-FIX-OPENSUSE fix_lua_misspelling.patch -- introduced in mame 0.238 Patch2: fix_lua_misspelling.patch +Patch3: mame-fortify.patch +Patch4: mame-bgfx.patch BuildRequires: binutils-gold BuildRequires: fdupes +BuildRequires: gcc-c++ BuildRequires: memory-constraints BuildRequires: pkgconfig -BuildRequires: python3-xml BuildRequires: update-desktop-files BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(RapidJSON) BuildRequires: pkgconfig(SDL2_ttf) BuildRequires: pkgconfig(alsa) -BuildRequires: pkgconfig(fontconfig) -BuildRequires: pkgconfig(sdl2) -BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xi) -BuildRequires: pkgconfig(xinerama) -Requires(post): desktop-file-utils -Requires(postun):desktop-file-utils -BuildRequires: gcc-c++ -BuildRequires: libexpat-devel -BuildRequires: libjpeg8-devel -BuildRequires: lua53-devel -BuildRequires: portmidi-devel -BuildRequires: utf8proc-devel -BuildRequires: pkgconfig(RapidJSON) +BuildRequires: pkgconfig(asio) +BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(flac) +BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(glm) +BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(libpulse) +BuildRequires: pkgconfig(libutf8proc) +BuildRequires: pkgconfig(lua5.3) BuildRequires: pkgconfig(portaudio-2.0) +BuildRequires: pkgconfig(portmidi) BuildRequires: pkgconfig(pugixml) +BuildRequires: pkgconfig(sdl2) BuildRequires: pkgconfig(sqlite3) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xi) +BuildRequires: pkgconfig(xinerama) BuildRequires: pkgconfig(zlib) -%if %{with system_asio} -BuildRequires: asio-devel -%endif Requires: mame-data = %{version} +Requires(post): desktop-file-utils +Requires(postun): desktop-file-utils Suggests: mame-tools = %{version} - -%if "%{flavor}" == "mame" -# sdlmame was last used at version 0.142 -Provides: sdlmame = %{version} -Obsoletes: sdlmame < %{version} -# ume was last used at version 0.159 -Provides: ume = %{version} -Obsoletes: ume < %{version} +%if "%{flavor}" == "" +ExclusiveArch: do_not_build %endif - -%if "%{flavor}" == "mess" -# sdlmess was last used at version 0.142 -Provides: sdlmess = %{version} -Obsoletes: sdlmess < %{version} -# mess was last used at version 0.159 -Provides: mess = %{version} -Obsoletes: mess < %{version} +%if "%{flavor}" != "mess" +Summary: Multiple Arcade Machine Emulator +License: BSD-3-Clause AND GPL-2.0-or-later AND LGPL-2.1-or-later +Group: System/Emulators/Other +%else +Summary: Multi Emulator Super System +License: BSD-3-Clause AND GPL-2.0-or-later AND LGPL-2.1-or-later +Group: System/Emulators/Other %endif - %if "%{flavor}" != "mess" %description MAME is an emulator designed to recreate the hardware of arcade game @@ -140,7 +102,6 @@ software is usable serves primarily to validate the accuracy of the documentation. %else - %description This is the MESS only build of MAME; it has been compiled without Arcade built in. @@ -151,7 +112,6 @@ %package -n mame-tools Summary: MAME Tools -# mess-tools was last used at version 0.159 Group: System/Emulators/Other Provides: mess-tools = %{version} Obsoletes: mess-tools < %{version} @@ -172,10 +132,27 @@ * languages %prep -%setup -q -n mame-mame0%{fver} -%patch0 -%patch1 -p1 -%patch2 -p1 +%autosetup -p1 -n mame-mame0%{fver} + +rm -r \ + 3rdparty/asio \ + 3rdparty/compat \ + 3rdparty/dxsdk \ + 3rdparty/expat \ + 3rdparty/glm \ + 3rdparty/libflac \ + 3rdparty/libjpeg \ + 3rdparty/portaudio \ + 3rdparty/portmidi \ + 3rdparty/pugixml \ + 3rdparty/rapidjson \ + 3rdparty/SDL2 \ + 3rdparty/SDL2-override \ + 3rdparty/sqlite3 \ + 3rdparty/tap-windows6 \ + 3rdparty/utf8proc \ + 3rdparty/zlib \ + docs/themes cp %{SOURCE1} whatsnew-%{version}.txt # Fix rpmlint warning "wrong-file-end-of-line-encoding" @@ -197,6 +174,8 @@ sed -i "s@\. -s@\. %{myoptflags}@" 3rdparty/genie/build/gmake.linux/genie.make %build +# https://github.com/mamedev/mame/issues/7046 +%define _lto_cflags %{nil} # Limit build to avoid oom %ifarch ppc64 ppc64le %define limitbuild 5000 @@ -222,6 +201,7 @@ OPTIMIZE=3 \ PYTHON=python3 \ PYTHON_EXECUTABLE=python3 \ + USE_SYSTEM_LIB_ASIO=1 \ USE_SYSTEM_LIB_EXPAT=1 \ USE_SYSTEM_LIB_ZLIB=1 \ USE_SYSTEM_LIB_JPEG=1 \ @@ -234,9 +214,6 @@ USE_SYSTEM_LIB_GLM=1 \ USE_SYSTEM_LIB_RAPIDJSON=1 \ USE_SYSTEM_LIB_PUGIXML=1 \ - %if %{with system_asio} - USE_SYSTEM_LIB_ASIO=1 \ - %endif " # Bootstrap genie, scripts file has been patched %make_build OPT_FLAGS="%{myoptflags}" $COMMON_FLAGS genie @@ -258,62 +235,59 @@ %install %if "%{flavor}" == "mame" # Install emulator binaries and manpages -install -Dpm 0755 mamearcade %{buildroot}%{_bindir}/mame -install -Dpm 0644 docs/man/mame.6 %{buildroot}%{_mandir}/man6/mame.6 -install -Dpm 0644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/mame.png +install -Dpm0755 mamearcade %{buildroot}%{_bindir}/mame +install -Dpm0644 docs/man/mame.6 %{buildroot}%{_mandir}/man6/mame.6 +install -Dpm0644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/mame.png # Install config file mkdir -p %{buildroot}%{_sysconfdir}/skel/.mame -install -Dpm 0644 mame.ini %{buildroot}%{_sysconfdir}/skel/.mame/mame.ini +install -Dpm0644 mame.ini %{buildroot}%{_sysconfdir}/skel/.mame/mame.ini %suse_update_desktop_file -c mame 'MAME' 'Multiple Arcade Machine Emulator' mame mame Game Emulator -install -Dpm 0644 %{SOURCE102} %{buildroot}%{_datadir}/metainfo/mame.appdata.xml +install -Dpm0644 %{SOURCE102} %{buildroot}%{_datadir}/metainfo/mame.appdata.xml %endif %if "%{flavor}" == "mess" # Install emulator binaries and manpages -install -Dpm 0755 mamemess %{buildroot}%{_bindir}/mame-mess -install -Dpm 0644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/mame-mess.png +install -Dpm0755 mamemess %{buildroot}%{_bindir}/mame-mess +install -Dpm0644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/mame-mess.png # Install config file mkdir -p %{buildroot}%{_sysconfdir}/skel/.mess -install -Dpm 0644 mame.ini %{buildroot}%{_sysconfdir}/skel/.mess/mess.ini +install -Dpm0644 mame.ini %{buildroot}%{_sysconfdir}/skel/.mess/mess.ini sed -i -- 's/.mame;/.mess;/g' %{buildroot}%{_sysconfdir}/skel/.mess/mess.ini %suse_update_desktop_file -c mame-mess 'MESS' 'Multi Emulator Super System' mame-mess mame-mess Game Emulator -install -Dpm 0644 %{SOURCE104} %{buildroot}%{_datadir}/metainfo/mame-mess.appdata.xml +install -Dpm0644 %{SOURCE104} %{buildroot}%{_datadir}/metainfo/mame-mess.appdata.xml %endif # Tool binaries and manpages %if "%{flavor}" == "tools-data" -install -dm 0755 %{buildroot}%{_bindir} -install -pm 0755 castool chdman floptool imgtool jedutil ldresample \ - ldverify romcmp unidasm %{buildroot}%{_bindir}/ +install -dm0755 %{buildroot}%{_bindir} +install -pm0755 castool chdman floptool imgtool jedutil ldresample ldverify romcmp unidasm %{buildroot}%{_bindir}/ for mame_tool in nltool nlwav pngcmp regrep split srcclean do - install -pm 0755 $mame_tool %{buildroot}%{_bindir}/mame-${mame_tool} + install -pm0755 $mame_tool %{buildroot}%{_bindir}/mame-${mame_tool} done -install -dm 0755 %{buildroot}%{_mandir}/man1 +install -dm0755 %{buildroot}%{_mandir}/man1 pushd docs/man/ -install -pm 0644 castool.1 chdman.1 floptool.1 imgtool.1 jedutil.1 \ - ldresample.1 ldverify.1 romcmp.1 %{buildroot}%{_mandir}/man1/ +install -pm0644 castool.1 chdman.1 floptool.1 imgtool.1 jedutil.1 ldresample.1 ldverify.1 romcmp.1 %{buildroot}%{_mandir}/man1/ popd # Install data required by mame %define emu_data_dir %{buildroot}%{_datadir}/mame -for dir in artwork chds bgfx cheats crosshair ctrlr fonts hash \ - keymaps language plugins roms samples opengl_shaders +for dir in artwork chds bgfx cheats crosshair ctrlr fonts hash keymaps language plugins roms samples opengl_shaders do - install -dm 0755 %{emu_data_dir}/${dir} + install -dpm0755 %{emu_data_dir}/${dir} done -install -dm 0755 %{emu_data_dir}/bgfx/shaders -install -dm 0755 %{buildroot}%{_datadir}/pixmaps +install -dpm0755 %{emu_data_dir}/bgfx/shaders +install -dpm0755 %{buildroot}%{_datadir}/pixmaps -install -pm 0644 hash/* %{emu_data_dir}/hash/ -install -pm 0644 uismall.bdf %{emu_data_dir}/uismall.bdf -install -pm 0644 keymaps/README.md %{emu_data_dir}/keymaps/ -install -pm 0644 keymaps/*LINUX.map %{emu_data_dir}/keymaps/ +install -pm0644 hash/* %{emu_data_dir}/hash/ +install -pm0644 uismall.bdf %{emu_data_dir}/uismall.bdf +install -pm0644 keymaps/README.md %{emu_data_dir}/keymaps/ +install -pm0644 keymaps/*LINUX.map %{emu_data_dir}/keymaps/ cp -ar language %{emu_data_dir}/ find %{emu_data_dir}/language/ -name "*.po" -delete cp -ar artwork %{emu_data_dir}/ @@ -322,7 +296,7 @@ cp -ar bgfx/chains %{emu_data_dir}/bgfx/ cp -ar bgfx/effects %{emu_data_dir}/bgfx/ cp -ar bgfx/shaders/glsl %{emu_data_dir}/bgfx/shaders/ -install -pm 0644 src/osd/modules/opengl/shader/*.{fsh,vsh} %{emu_data_dir}/opengl_shaders/ +install -pm0644 src/osd/modules/opengl/shader/*.{fsh,vsh} %{emu_data_dir}/opengl_shaders/ %fdupes -s %{buildroot}/%{_datadir}/mame/bgfx %endif ++++++ mame-bgfx.patch ++++++ diff -Pdpru mame-mame0252.orig/src/osd/modules/render/bgfx/shadermanager.cpp mame-mame0252/src/osd/modules/render/bgfx/shadermanager.cpp --- mame-mame0252.orig/src/osd/modules/render/bgfx/shadermanager.cpp 2023-02-21 20:59:53.000000000 +0300 +++ mame-mame0252/src/osd/modules/render/bgfx/shadermanager.cpp 2023-03-30 12:59:56.277101437 +0300 @@ -85,7 +85,6 @@ std::string shader_manager::make_path_st shader_path += PATH_SEPARATOR "shaders" PATH_SEPARATOR; switch (bgfx::getRendererType()) { - case bgfx::RendererType::Noop: case bgfx::RendererType::Direct3D9: shader_path += "dx9"; break; @@ -103,6 +102,7 @@ std::string shader_manager::make_path_st shader_path += "metal"; break; + case bgfx::RendererType::Noop: case bgfx::RendererType::OpenGL: shader_path += "glsl"; break; diff -Pdpru mame-mame0252.orig/src/osd/sdl/osdsdl.cpp mame-mame0252/src/osd/sdl/osdsdl.cpp --- mame-mame0252.orig/src/osd/sdl/osdsdl.cpp 2023-02-21 20:59:53.000000000 +0300 +++ mame-mame0252/src/osd/sdl/osdsdl.cpp 2023-03-30 13:02:28.937468880 +0300 @@ -269,8 +269,13 @@ void sdl_osd_interface::init(running_mac } // bgfx does not work with wayland - if ((strcmp(SDL_GetCurrentVideoDriver(), "wayland") == 0) && ((strcmp(options().video(), "auto") == 0) || (strcmp(options().video(), "bgfx") == 0))) - fatalerror("Error: BGFX video does not work with wayland videodriver. Please change either of the options."); + if ((strcmp(SDL_GetCurrentVideoDriver(), "wayland") == 0) && (strcmp(options().video(), "bgfx") == 0)) + { + osd_printf_verbose("BGFX does not work with wayland, overriding SDL videodriver to '%s' ...\n", "x11"); + SDL_QuitSubSystem(SDL_INIT_VIDEO); + osd_setenv(SDLENV_VIDEODRIVER, "x11", 1); + SDL_InitSubSystem(SDL_INIT_VIDEO); + } osd_sdl_info(); ++++++ mame-fortify.patch ++++++ diff -Pdpru mame-mame0252.orig/src/osd/sdl/sdlprefix.h mame-mame0252/src/osd/sdl/sdlprefix.h --- mame-mame0252.orig/src/osd/sdl/sdlprefix.h 2023-02-21 20:59:53.000000000 +0300 +++ mame-mame0252/src/osd/sdl/sdlprefix.h 2023-03-30 01:39:49.234387890 +0300 @@ -73,11 +73,6 @@ struct _IO_FILE {}; //_IO_FILE is an op #define SDLMAME_ANDROID 1 #endif -// fix for Ubuntu 8.10 -#ifdef _FORTIFY_SOURCE -#undef _FORTIFY_SOURCE -#endif - // nasty hack to stop altivec #define vector/bool/pixel screwing us over #if defined(__ALTIVEC__) && !defined(__APPLE_ALTIVEC__) #define __APPLE_ALTIVEC__ 1 ++++++ mame-mame0248.tar.gz -> mame-mame0252.tar.gz ++++++ /work/SRC/openSUSE:Factory/mame/mame-mame0248.tar.gz /work/SRC/openSUSE:Factory/.mame.new.31432/mame-mame0252.tar.gz differ: char 13, line 1 ++++++ use_thin_archives.patch ++++++ --- /var/tmp/diff_new_pack.0EQMP3/_old 2023-03-31 21:15:29.454375614 +0200 +++ /var/tmp/diff_new_pack.0EQMP3/_new 2023-03-31 21:15:29.490375781 +0200 @@ -1,5 +1,5 @@ ---- 3rdparty/genie/src/tools/gcc.lua_orig 2019-10-31 01:14:26.826612937 +0100 -+++ 3rdparty/genie/src/tools/gcc.lua 2019-10-31 02:06:13.625516286 +0100 +--- a/3rdparty/genie/src/tools/gcc.lua 2019-10-31 01:14:26.826612937 +0100 ++++ b/3rdparty/genie/src/tools/gcc.lua 2019-10-31 02:06:13.625516286 +0100 @@ -277,7 +277,7 @@ if premake.gcc.llvm then table.insert(result, 'rcs') ++++++ whatsnew_0248.txt -> whatsnew_0252.txt ++++++ ++++ 2743 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/mame/whatsnew_0248.txt ++++ and /work/SRC/openSUSE:Factory/.mame.new.31432/whatsnew_0252.txt

1 0

commit vulkan-validationlayers for openSUSE:Factory
by Source-Sync 31 Mar '23

31 Mar '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package vulkan-validationlayers for openSUSE:Factory checked in at 2023-03-31 21:15:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vulkan-validationlayers (Old) and /work/SRC/openSUSE:Factory/.vulkan-validationlayers.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vulkan-validationlayers" Fri Mar 31 21:15:17 2023 rev:42 rq:1075344 version:1.3.243.0 Changes: -------- --- /work/SRC/openSUSE:Factory/vulkan-validationlayers/vulkan-validationlayers.changes 2023-02-17 16:44:15.562610683 +0100 +++ /work/SRC/openSUSE:Factory/.vulkan-validationlayers.new.31432/vulkan-validationlayers.changes 2023-03-31 21:15:19.834330902 +0200 @@ -1,0 +2,13 @@ +Wed Mar 29 18:35:13 UTC 2023 - Jan Engelhardt <jengelh(a)inai.de> + +- Update to release SDK-1.3.243.0 + * layers: Add texelBufferAlignment support in 1.3 + * bp: Add DescriptorTypeNotInPool support + * gpu: Add state tracking for EXT mesh_shader + * layers: Add dynamic VK_EXT_line_rasterization + * layers: Check correct pNext for VK_EXT_sample_locations + * layers: Add conservativeRasterizationPostDepthCoverage + * layers: Add validation for VkImageViewSlicedCreateInfoEXT + * layers: Add validation for XCB surface creation + +------------------------------------------------------------------- Old: ---- sdk-1.3.239.0.tar.gz New: ---- sdk-1.3.243.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vulkan-validationlayers.spec ++++++ --- /var/tmp/diff_new_pack.UTKtll/_old 2023-03-31 21:15:20.450333765 +0200 +++ /var/tmp/diff_new_pack.UTKtll/_new 2023-03-31 21:15:20.454333784 +0200 @@ -17,9 +17,9 @@ Name: vulkan-validationlayers -Version: 1.3.239.0 +Version: 1.3.243.0 Release: 0 -%define lname libVkLayer_utils-1_3_239_0 +%define lname libVkLayer_utils-1_3_243_0 Summary: Validation layers for Vulkan License: Apache-2.0 Group: Development/Tools/Other @@ -28,15 +28,15 @@ Patch2: xxhash.diff BuildRequires: cmake >= 3.7.12 BuildRequires: gcc-c++ >= 4.8 -BuildRequires: glslang-devel >= 11.13 +BuildRequires: glslang-devel >= 12 BuildRequires: memory-constraints BuildRequires: pkg-config BuildRequires: python3-base -BuildRequires: spirv-headers >= 1.6.1+sdk236 -BuildRequires: spirv-tools-devel >= 2022.4+sdk236 +BuildRequires: spirv-headers >= 1.6.1+sdk239 +BuildRequires: spirv-tools-devel >= 2023.1 BuildRequires: vulkan-headers BuildRequires: xxhash-devel -BuildRequires: pkgconfig(vulkan) >= 1.3.239 +BuildRequires: pkgconfig(vulkan) >= 1.3.241 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcb) Conflicts: vulkan < 1.1 ++++++ sdk-1.3.239.0.tar.gz -> sdk-1.3.243.0.tar.gz ++++++ ++++ 514612 lines of diff (skipped) ++++++ xxhash.diff ++++++ --- /var/tmp/diff_new_pack.UTKtll/_old 2023-03-31 21:15:21.646339324 +0200 +++ /var/tmp/diff_new_pack.UTKtll/_new 2023-03-31 21:15:21.646339324 +0200 @@ -7,32 +7,29 @@ xxhash as well, so that the ABI matches. --- - layers/CMakeLists.txt | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) + layers/CMakeLists.txt | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) -Index: Vulkan-ValidationLayers-sdk-1.3.239.0/layers/CMakeLists.txt +Index: Vulkan-ValidationLayers-sdk-1.3.243.0/layers/CMakeLists.txt =================================================================== ---- Vulkan-ValidationLayers-sdk-1.3.239.0.orig/layers/CMakeLists.txt -+++ Vulkan-ValidationLayers-sdk-1.3.239.0/layers/CMakeLists.txt -@@ -50,10 +50,8 @@ target_sources(VkLayer_utils PRIVATE +--- Vulkan-ValidationLayers-sdk-1.3.243.0.orig/layers/CMakeLists.txt ++++ Vulkan-ValidationLayers-sdk-1.3.243.0/layers/CMakeLists.txt +@@ -41,8 +41,6 @@ target_sources(VkLayer_utils PRIVATE vk_layer_logging.cpp vk_layer_utils.h vk_layer_utils.cpp - xxhash.h -- xxhash.c +- xxhash.cpp ) + + # XXH_NO_LONG_LONG: removes compilation of algorithms relying on 64-bit types (XXH3 and XXH64). Only XXH32 will be compiled. +@@ -53,7 +51,7 @@ target_sources(VkLayer_utils PRIVATE + # https://github.com/KhronosGroup/Vulkan-ValidationLayers/issues/4640 + target_compile_definitions(VkLayer_utils PUBLIC XXH_NO_LONG_LONG) + -target_link_libraries(VkLayer_utils PUBLIC Vulkan::Headers) +target_link_libraries(VkLayer_utils PUBLIC Vulkan::Headers -lxxhash) - set_target_properties(VkLayer_utils PROPERTIES LINKER_LANGUAGE CXX) target_include_directories(VkLayer_utils PUBLIC . -@@ -258,8 +256,6 @@ target_sources(VkLayer_khronos_validatio - video_validation.cpp - vk_layer_settings_ext.h - wsi_validation.cpp -- xxhash.c -- xxhash.h - ) - - target_compile_definitions(VkLayer_khronos_validation PUBLIC ${KHRONOS_LAYER_COMPILE_DEFINITIONS}) + generated # Needed otherwise VkLayer_utils won't install properly.

1 0

commit Mesa-demo for openSUSE:Factory
by Source-Sync 31 Mar '23

31 Mar '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package Mesa-demo for openSUSE:Factory checked in at 2023-03-31 21:15:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Mesa-demo (Old) and /work/SRC/openSUSE:Factory/.Mesa-demo.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "Mesa-demo" Fri Mar 31 21:15:15 2023 rev:27 rq:1075695 version:9.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/Mesa-demo/Mesa-demo.changes 2023-03-28 17:48:31.726732681 +0200 +++ /work/SRC/openSUSE:Factory/.Mesa-demo.new.31432/Mesa-demo.changes 2023-03-31 21:15:18.482325852 +0200 @@ -1,0 +2,16 @@ +Thu Mar 30 21:00:29 UTC 2023 - Stefan Dirsch <sndirsch(a)suse.com> + +- enabled osmesa and libdrm support + +------------------------------------------------------------------- +Thu Mar 30 20:46:13 UTC 2023 - Stefan Dirsch <sndirsch(a)suse.com> + +- enabled vulkan support (first Vulkan demo: vkgears!) + +------------------------------------------------------------------- +Thu Mar 30 14:33:55 UTC 2023 - Stefan Dirsch <sndirsch(a)suse.com> + +- Update to version 9.0.0 +- supersedes n_install-more-egl-binaries.patch + +------------------------------------------------------------------- Old: ---- mesa-demos-8.5.0.tar.bz2 mesa-demos-8.5.0.tar.bz2.sig n_install-more-egl-binaries.patch New: ---- mesa-demos-9.0.0.tar.xz mesa-demos-9.0.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Mesa-demo.spec ++++++ --- /var/tmp/diff_new_pack.4z4ryv/_old 2023-03-31 21:15:19.566329717 +0200 +++ /var/tmp/diff_new_pack.4z4ryv/_new 2023-03-31 21:15:19.570329732 +0200 @@ -17,34 +17,40 @@ Name: Mesa-demo -Version: 8.5.0 +Version: 9.0.0 Release: 0 Summary: Mesa demo programs for the OpenGL stack License: MIT Group: Development/Tools/Other URL: https://www.mesa3d.org -Source0: https://mesa.freedesktop.org/archive/demos/mesa-demos-%{version}.tar.bz2 -Source1: https://mesa.freedesktop.org/archive/demos/mesa-demos-%{version}.tar.bz2.sig +Source0: https://mesa.freedesktop.org/archive/demos/mesa-demos-%{version}.tar.xz +Source1: https://mesa.freedesktop.org/archive/demos/mesa-demos-%{version}.tar.xz.sig Source2: %{name}.keyring Source3: baselibs.conf -Patch0: n_install-more-egl-binaries.patch BuildRequires: autoconf >= 2.59 BuildRequires: automake BuildRequires: cmake BuildRequires: freeglut-devel BuildRequires: gcc-c++ BuildRequires: glew-devel +BuildRequires: glslang-devel BuildRequires: libexpat-devel BuildRequires: libtool BuildRequires: meson BuildRequires: pkgconfig +BuildRequires: vulkan-devel BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glesv1_cm) BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(glew) BuildRequires: pkgconfig(glu) +BuildRequires: pkgconfig(libdrm) +BuildRequires: pkgconfig(osmesa) BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xcb) BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xkbcommon) +BuildRequires: pkgconfig(xkbcommon-x11) Requires: Mesa-demo-egl = %{version} Requires: Mesa-demo-es = %{version} Requires: Mesa-demo-x = %{version} @@ -99,15 +105,15 @@ %prep %setup -q -n mesa-demos-%{version} -b0 -%patch0 -p1 %build %{meson} \ -Dgles1=enabled \ -Dgles2=enabled \ - -Dosmesa=disabled \ - -Dlibdrm=disabled \ + -Dosmesa=enabled \ + -Dlibdrm=enabled \ -Dwayland=disabled \ + -Dvulkan=enabled \ %{nil} %{meson_build}

1 0

commit libstorage-ng for openSUSE:Factory
by Source-Sync 31 Mar '23

31 Mar '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libstorage-ng for openSUSE:Factory checked in at 2023-03-31 21:15:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libstorage-ng (Old) and /work/SRC/openSUSE:Factory/.libstorage-ng.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libstorage-ng" Fri Mar 31 21:15:14 2023 rev:211 rq:1075587 version:4.5.91 Changes: -------- --- /work/SRC/openSUSE:Factory/libstorage-ng/libstorage-ng.changes 2023-03-29 23:26:25.175236342 +0200 +++ /work/SRC/openSUSE:Factory/.libstorage-ng.new.31432/libstorage-ng.changes 2023-03-31 21:15:16.958320417 +0200 @@ -1,0 +2,20 @@ +Thu Mar 30 15:53:17 UTC 2023 - aschnell(a)suse.com + +- merge gh#openSUSE/libstorage-ng#922 +- add PCIe as disk transport +- 4.5.91 + +-------------------------------------------------------------------- +Thu Mar 30 09:49:34 UTC 2023 - aschnell(a)suse.com + +- merge gh#openSUSE/libstorage-ng#921 +- fixed setting sysfs-name for partitions on nvme disks +- 4.5.90 + +-------------------------------------------------------------------- +Thu Mar 30 04:56:07 UTC 2023 - aschnell(a)suse.com + +- Translated using Weblate (Georgian) (bsc#1149754) +- 4.5.89 + +-------------------------------------------------------------------- Old: ---- libstorage-ng-4.5.88.tar.xz New: ---- libstorage-ng-4.5.91.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage-ng.spec ++++++ --- /var/tmp/diff_new_pack.0h2Ukz/_old 2023-03-31 21:15:17.574322614 +0200 +++ /var/tmp/diff_new_pack.0h2Ukz/_new 2023-03-31 21:15:17.578322628 +0200 @@ -18,7 +18,7 @@ %define libname %{name}1 Name: libstorage-ng -Version: 4.5.88 +Version: 4.5.91 Release: 0 Summary: Library for storage management License: GPL-2.0-only ++++++ libstorage-ng-4.5.88.tar.xz -> libstorage-ng-4.5.91.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.88/LIBVERSION new/libstorage-ng-4.5.91/LIBVERSION --- old/libstorage-ng-4.5.88/LIBVERSION 2023-03-27 00:14:42.000000000 +0200 +++ new/libstorage-ng-4.5.91/LIBVERSION 2023-03-30 17:53:17.000000000 +0200 @@ -1 +1 @@ -1.84.2 +1.85.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.88/VERSION new/libstorage-ng-4.5.91/VERSION --- old/libstorage-ng-4.5.88/VERSION 2023-03-27 00:14:42.000000000 +0200 +++ new/libstorage-ng-4.5.91/VERSION 2023-03-30 17:53:17.000000000 +0200 @@ -1 +1 @@ -4.5.88 +4.5.91 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.88/po/ka.po new/libstorage-ng-4.5.91/po/ka.po --- old/libstorage-ng-4.5.88/po/ka.po 2023-03-27 00:14:42.000000000 +0200 +++ new/libstorage-ng-4.5.91/po/ka.po 2023-03-30 17:53:17.000000000 +0200 @@ -8,10 +8,10 @@ "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-03-09 09:55+0100\n" -"PO-Revision-Date: 2023-02-04 20:14+0000\n" +"PO-Revision-Date: 2023-03-30 07:14+0000\n" "Last-Translator: Temuri Doghonadze <temuri.doghonadze(a)gmail.com>\n" -"Language-Team: Georgian <https://l10n.opensuse.org/projects/libstorage/ng-" -"master/ka/>\n" +"Language-Team: Georgian <https://l10n.opensuse.org/projects/libstorage/" +"ng-master/ka/>\n" "Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -79,17 +79,17 @@ #. TRANSLATORS: displayed before action, #. %1$s is replaced by the device name (e.g. /dev/loop0), #. %2$s is replaced by the size (e.g. 20.00 GiB) -#, fuzzy, c-format +#, c-format msgid "Activate hard disk %1$s (%2$s)" -msgstr "%1 �� " +msgstr "%1$s (%2$s) �� " #. TRANSLATORS: displayed before action, #. %1$s is replaced by logical volume name (e.g. root), #. %2$s is replaced by size (e.g. 2.00 GiB), #. %3$s is replaced by volume group name (e.g. system) -#, fuzzy, c-format +#, c-format msgid "Activate logical volume %1$s (%2$s) on volume group %3$s" -msgstr "%1 �� " +msgstr "�� %1$s (%2$s) �� %3$s" #. TRANSLATORS: displayed before action, #. %1$s is replaced by logical volume name (e.g. root), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.88/storage/Devices/Disk.h new/libstorage-ng-4.5.91/storage/Devices/Disk.h --- old/libstorage-ng-4.5.88/storage/Devices/Disk.h 2023-03-27 00:14:42.000000000 +0200 +++ new/libstorage-ng-4.5.91/storage/Devices/Disk.h 2023-03-30 17:53:17.000000000 +0200 @@ -35,7 +35,7 @@ * Data Transport Layer */ enum class Transport { - UNKNOWN, SBP, ATA, FC, ISCSI, SAS, SATA, SPI, USB, FCOE + UNKNOWN, SBP, ATA, FC, ISCSI, SAS, SATA, SPI, USB, FCOE, PCIE }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.88/storage/Devices/DiskImpl.cc new/libstorage-ng-4.5.91/storage/Devices/DiskImpl.cc --- old/libstorage-ng-4.5.88/storage/Devices/DiskImpl.cc 2023-03-27 00:14:42.000000000 +0200 +++ new/libstorage-ng-4.5.91/storage/Devices/DiskImpl.cc 2023-03-30 17:53:17.000000000 +0200 @@ -21,7 +21,7 @@ */ -#include <ctype.h> +#include <cctype> #include <boost/algorithm/string.hpp> #include "storage/Devices/DiskImpl.h" @@ -54,7 +54,7 @@ const vector<string> EnumTraits<Transport>::names({ - "UNKNOWN", "SBP", "ATA", "FC", "iSCSI", "SAS", "SATA", "SPI", "USB", "FCoE" + "UNKNOWN", "SBP", "ATA", "FC", "iSCSI", "SAS", "SATA", "SPI", "USB", "FCoE", "PCIe" }); @@ -211,7 +211,7 @@ dax = dax_file.get<bool>(); Lsscsi::Entry entry; - if (system_info.getLsscsi().getEntry(get_name(), entry)) + if (system_info.getLsscsi().get_entry(get_name(), entry)) transport = entry.transport; const File& zoned_file = get_sysfs_file(system_info, "queue/zoned"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.88/storage/Devices/PartitionImpl.cc new/libstorage-ng-4.5.91/storage/Devices/PartitionImpl.cc --- old/libstorage-ng-4.5.88/storage/Devices/PartitionImpl.cc 2023-03-27 00:14:42.000000000 +0200 +++ new/libstorage-ng-4.5.91/storage/Devices/PartitionImpl.cc 2023-03-30 17:53:17.000000000 +0200 @@ -1,6 +1,6 @@ /* * Copyright (c) [2014-2015] Novell, Inc. - * Copyright (c) [2016-2022] SUSE LLC + * Copyright (c) [2016-2023] SUSE LLC * * All Rights Reserved. * @@ -21,6 +21,7 @@ */ +#include <cctype> #include <boost/algorithm/string.hpp> #include "storage/Utils/AppUtil.h" @@ -630,11 +631,17 @@ { const Partitionable* partitionable = get_partitionable(); - if ((!partitionable->get_sysfs_name().empty() && !partitionable->get_sysfs_path().empty()) && - partitionable->get_dm_table_name().empty()) + const string& sysfs_name = partitionable->get_sysfs_name(); + const string& sysfs_path = partitionable->get_sysfs_path(); + + if ((!sysfs_name.empty() && !sysfs_path.empty()) && partitionable->get_dm_table_name().empty()) { - set_sysfs_name(partitionable->get_sysfs_name() + to_string(get_number())); - set_sysfs_path(partitionable->get_sysfs_path() + "/" + get_sysfs_name()); + if (isdigit(sysfs_name.back())) + set_sysfs_name(sysfs_name + "p" + to_string(get_number())); + else + set_sysfs_name(sysfs_name + to_string(get_number())); + + set_sysfs_path(sysfs_path + "/" + get_sysfs_name()); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.88/storage/Devices/PartitionableImpl.cc new/libstorage-ng-4.5.91/storage/Devices/PartitionableImpl.cc --- old/libstorage-ng-4.5.88/storage/Devices/PartitionableImpl.cc 2023-03-27 00:14:42.000000000 +0200 +++ new/libstorage-ng-4.5.91/storage/Devices/PartitionableImpl.cc 2023-03-30 17:53:17.000000000 +0200 @@ -21,6 +21,7 @@ */ +#include <cctype> #include <boost/algorithm/string.hpp> #include "storage/Devices/PartitionableImpl.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.88/storage/SystemInfo/CmdLsscsi.cc new/libstorage-ng-4.5.91/storage/SystemInfo/CmdLsscsi.cc --- old/libstorage-ng-4.5.88/storage/SystemInfo/CmdLsscsi.cc 2023-03-27 00:14:42.000000000 +0200 +++ new/libstorage-ng-4.5.91/storage/SystemInfo/CmdLsscsi.cc 2023-03-30 17:53:17.000000000 +0200 @@ -1,5 +1,6 @@ /* * Copyright (c) [2010-2020] Novell, Inc. + * Copyright (c) 2023 SUSE LLC * * All Rights Reserved. * @@ -48,16 +49,19 @@ { data.clear(); - for (vector<string>::const_iterator it = lines.begin(); it != lines.end(); ++it) + for (const string& line : lines) { - string line = boost::replace_all_copy(*it, " usb: ", " usb:"); - string type = extractNthWord(1, line); if (type != "disk") continue; - string transport = extractNthWord(2, line); - string device = extractNthWord(3, line); + string tmp = line; + + boost::replace_all(tmp, " usb: ", " usb:"); + boost::replace_all(tmp, " pcie 0x", " pcie:0x"); + + string transport = extractNthWord(2, tmp); + string device = extractNthWord(3, tmp); if (boost::starts_with(transport, "/dev/")) { device = transport; @@ -87,6 +91,8 @@ entry.transport = Transport::SPI; else if (boost::starts_with(transport, "usb:")) entry.transport = Transport::USB; + else if (boost::starts_with(transport, "pcie:")) + entry.transport = Transport::PCIE; data[device] = entry; } @@ -96,13 +102,13 @@ bool - Lsscsi::getEntry(const string& device, Entry& entry) const + Lsscsi::get_entry(const string& device, Entry& entry) const { - const_iterator i = data.find(device); - if (i == data.end()) + const_iterator it = data.find(device); + if (it == data.end()) return false; - entry = i->second; + entry = it->second; return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.88/storage/SystemInfo/CmdLsscsi.h new/libstorage-ng-4.5.91/storage/SystemInfo/CmdLsscsi.h --- old/libstorage-ng-4.5.88/storage/SystemInfo/CmdLsscsi.h 2023-03-27 00:14:42.000000000 +0200 +++ new/libstorage-ng-4.5.91/storage/SystemInfo/CmdLsscsi.h 2023-03-30 17:53:17.000000000 +0200 @@ -52,7 +52,7 @@ friend std::ostream& operator<<(std::ostream& s, const Lsscsi& lsscsi); friend std::ostream& operator<<(std::ostream& s, const Entry& entry); - bool getEntry(const string& device, Entry& entry) const; + bool get_entry(const string& device, Entry& entry) const; private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.88/testsuite/SystemInfo/lsscsi.cc new/libstorage-ng-4.5.91/testsuite/SystemInfo/lsscsi.cc --- old/libstorage-ng-4.5.88/testsuite/SystemInfo/lsscsi.cc 2023-03-27 00:14:42.000000000 +0200 +++ new/libstorage-ng-4.5.91/testsuite/SystemInfo/lsscsi.cc 2023-03-30 17:53:17.000000000 +0200 @@ -110,3 +110,17 @@ check(input, output); } + + +BOOST_AUTO_TEST_CASE(parse6) +{ + vector<string> input = { + "[N:0:0:1] disk pcie 0x1d4c:0x03e2 /dev/nvme0n1" + }; + + vector<string> output = { + "data[/dev/nvme0n1] -> transport:PCIe" + }; + + check(input, output); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.88/testsuite/partitions/set-number.cc new/libstorage-ng-4.5.91/testsuite/partitions/set-number.cc --- old/libstorage-ng-4.5.88/testsuite/partitions/set-number.cc 2023-03-27 00:14:42.000000000 +0200 +++ new/libstorage-ng-4.5.91/testsuite/partitions/set-number.cc 2023-03-30 17:53:17.000000000 +0200 @@ -7,11 +7,13 @@ #include "storage/Devices/DiskImpl.h" #include "storage/Devices/Msdos.h" +#include "storage/Devices/Gpt.h" #include "storage/Devices/PartitionImpl.h" #include "storage/Devicegraph.h" #include "storage/Storage.h" #include "storage/Environment.h" #include "storage/Utils/Region.h" +#include "storage/Utils/HumanString.h" using namespace std; @@ -47,9 +49,9 @@ BOOST_REQUIRE_EQUAL(partitions.size(), 2); BOOST_CHECK_EQUAL(partitions[1]->get_name(), "/dev/sda6"); + BOOST_CHECK_EQUAL(partitions[1]->get_number(), 6); BOOST_CHECK_EQUAL(partitions[1]->get_sysfs_name(), "sda6"); - BOOST_CHECK_EQUAL(partitions[1]->get_sysfs_path(), "/devices/pci0000:00/0000:00:1f.2/ata1/host0/target0:0:0/0:0:0:0/block/sda/sda6"); BOOST_REQUIRE_EQUAL(partitions[1]->get_udev_paths().size(), 1); @@ -59,3 +61,49 @@ BOOST_CHECK_EQUAL(partitions[1]->get_udev_ids()[0], "ata-WDC_WD10EADS-00M2B0_WD-WCAV52321683-part6"); BOOST_CHECK_EQUAL(partitions[1]->get_udev_ids()[1], "scsi-350014ee203733bb5-part6"); } + + +BOOST_AUTO_TEST_CASE(test2) +{ + Environment environment(true, ProbeMode::NONE, TargetMode::DIRECT); + + Storage storage(environment); + + Devicegraph* staging = storage.get_staging(); + + Disk* nvme0n1 = Disk::create(staging, "/dev/nvme0n1"); + nvme0n1->set_size(16 * GiB); + nvme0n1->get_impl().set_sysfs_name("nvme0n1"); + nvme0n1->get_impl().set_sysfs_path("/devices/pci0000:00/0000:00:1d.0/0000:3c:00.0/nvme/nvme0/nvme0n1"); + nvme0n1->get_impl().set_udev_paths({ "pci-0000:3c:00.0-nvme-1" }); + nvme0n1->get_impl().set_udev_ids({ "nvme-eui.008738c571d83492" }); + + Gpt* gpt = to_gpt(nvme0n1->create_partition_table(PtType::GPT)); + Partition* partition = gpt->create_partition("/dev/nvme0n1p1", Region(2048, 1048576, 512), PartitionType::PRIMARY); + + BOOST_CHECK_EQUAL(partition->get_name(), "/dev/nvme0n1p1"); + BOOST_CHECK_EQUAL(partition->get_number(), 1); + + BOOST_CHECK_EQUAL(partition->get_sysfs_name(), "nvme0n1p1"); + BOOST_CHECK_EQUAL(partition->get_sysfs_path(), "/devices/pci0000:00/0000:00:1d.0/0000:3c:00.0/nvme/nvme0/nvme0n1/nvme0n1p1"); + + BOOST_REQUIRE_EQUAL(partition->get_udev_paths().size(), 1); + BOOST_CHECK_EQUAL(partition->get_udev_paths()[0], "pci-0000:3c:00.0-nvme-1-part1"); + + BOOST_REQUIRE_EQUAL(partition->get_udev_ids().size(), 1); + BOOST_CHECK_EQUAL(partition->get_udev_ids()[0], "nvme-eui.008738c571d83492-part1"); + + partition->get_impl().set_number(2); + + BOOST_CHECK_EQUAL(partition->get_name(), "/dev/nvme0n1p2"); + BOOST_CHECK_EQUAL(partition->get_number(), 2); + + BOOST_CHECK_EQUAL(partition->get_sysfs_name(), "nvme0n1p2"); + BOOST_CHECK_EQUAL(partition->get_sysfs_path(), "/devices/pci0000:00/0000:00:1d.0/0000:3c:00.0/nvme/nvme0/nvme0n1/nvme0n1p2"); + + BOOST_REQUIRE_EQUAL(partition->get_udev_paths().size(), 1); + BOOST_CHECK_EQUAL(partition->get_udev_paths()[0], "pci-0000:3c:00.0-nvme-1-part2"); + + BOOST_REQUIRE_EQUAL(partition->get_udev_ids().size(), 1); + BOOST_CHECK_EQUAL(partition->get_udev_ids()[0], "nvme-eui.008738c571d83492-part2"); +}

1 0