July 2023 - openSUSE Commits - openSUSE Mailing Lists

commit topgrade for openSUSE:Factory
by Source-Sync 31 Jul '23

31 Jul '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package topgrade for openSUSE:Factory checked in at 2023-07-31 15:24:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/topgrade (Old) and /work/SRC/openSUSE:Factory/.topgrade.new.32662 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "topgrade" Mon Jul 31 15:24:15 2023 rev:2 rq:1101329 version:12.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/topgrade/topgrade.changes 2023-06-07 23:07:10.659258221 +0200 +++ /work/SRC/openSUSE:Factory/.topgrade.new.32662/topgrade.changes 2023-07-31 15:24:15.959288401 +0200 @@ -1,0 +2,72 @@ +Sat Jul 29 06:47:10 UTC 2023 - stigpro(a)outlook.fr + +- Update to version 12.0.2: + * chore: release v12.0.2 (#518) + * fix: WSL detection (#508) + * fix: fix Linux and DragonFlyBSD yes option (#513) + * feat: extra arguments for Home Manager (#507) + * feat: better error message on wrong os-release file (#511) + * chore: release v12.0.1 (#510) + * chore: bump ci toolchain and MSRV (#506) + * fix(oh-my-zsh): fix remote oh-my-zsh issue (#496) + * CI: release to PyPI (#500) + * feat: add assume-yes to more Linux managers (#501) + * test: unit test for Solus (#504) + * Fix clippy warning about non_minimal_cfg (#505) + * Ass assume-yes to DragonflyBSD (#502) + * steps/toolbx: Don't self-update and don't send notifications (#503) + * chore: bump tempfile to ~3.6 + * fix(generic): add alternate binary name for spicetify (#486) + * docs(config): document 4 missing sections in example config file (#485) + * fix: fix wrong path in oh-my-bash (#478) + * ci: separate code-coverage and test-config-creation (#488) + * docs: apply corrections in config.example.toml (#492) + * docs: add Karma commit messages to CONTRIBUTING.md (#493) + * Update only base conda env (#495) + * refactor(config): move sudo_command to section misc (#484) + * v12 Cargo files update (#441) + * test: test for config file creation and default config file parsing (#459) + * feat: support Bob (#461) + * chore: update bug report issue template (#474) + * fix(pip3): prefer python when available (#471) + * fix: Run AstroUpdate before Lazy sync (#473) + * fix: handle no topgrade.toml but files in topgrade.d (#460) + * refactor: unify the behavior of the steps that require sudo (#467) + * fix: fix Mist (#466) + * Revert "fix: fix mist" (#465) + * fix: fix mist (#464) + * refactor: make update fn take &ExectionContext & put update fn together (#457) + * docs: update CONTRIBUTING.md & config.example.toml (#458) + * fix: warn user about bad pattern paths before skipping step git (#456) + * fix: Handle '# [include]'. Update default config (#450) + * fix: run AM without sudo (#454) + * docs: add config-related CONTRIBUTING doc (#452) + * fix: Write to correct config path when none exists. (#449) + * feat: Add arguments to pipupgrade and fix enable_pipupgrade check (#448) + * feat: support Vanilla Linux (#447) + * refactor: remove Anarchy and Antergos as they are discontinued (#446) + * fix: fix panic during container update (#445) + * feat: support deepin OS (#444) + * refactor: remove unnecessary qualification (#443) + * refactor: rename update fn name & some cleanup (#442) + * Allow apt-get update to continue to apt-get upgrade with error code 100 (#440) + * Merge code for desktop notification between MacOS and Linux (#438) + * docs: CONTRIBUTING.md (#439) + * Added ability to include directories as an extension of the config file (#421) + * fix: fix .NET language issue (#437) + * refactor: make all step functions take &ExectutionContext (#436) + * fix: use --platform opt when pulling containers (#435) + * fix: use env ZSH to compose oh-my-zsh install dir (#434) + * fix: run deb-get without sudo (#430) + * Adding local pip-review (#433) + * Differentiate NPM and PNPM steps in name (#431) + * feat: support maza (#427) + * feat: support oh-my-bash (#425) + * feat: support AppMan (#423) + * feat(shell): add `packer.nu` (#414) + * Make `zypper dist-upgrade` opt-in on SLE/Leap (#417) + * feat: support stew (#422) + * docs: update README for alternative config path (#419) + * Add the ability to have the config file in $XDG_CONFIG_HOME/topgrade/topgrade.toml (#418) + +------------------------------------------------------------------- Old: ---- topgrade-11.0.2.tar.zst New: ---- topgrade-12.0.2.tar.zst ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ topgrade.spec ++++++ --- /var/tmp/diff_new_pack.5NiItO/_old 2023-07-31 15:24:18.127300917 +0200 +++ /var/tmp/diff_new_pack.5NiItO/_new 2023-07-31 15:24:18.131300940 +0200 @@ -17,7 +17,7 @@ Name: topgrade -Version: 11.0.2 +Version: 12.0.2 Release: 0 Summary: Upgrade all the things License: GPL-3.0-only @@ -27,6 +27,7 @@ Source1: vendor.tar.zst Source2: cargo_config BuildRequires: cargo-packaging +BuildRequires: zstd ExclusiveArch: %{rust_tier1_arches} %description ++++++ _service ++++++ --- /var/tmp/diff_new_pack.5NiItO/_old 2023-07-31 15:24:18.163301124 +0200 +++ /var/tmp/diff_new_pack.5NiItO/_new 2023-07-31 15:24:18.163301124 +0200 @@ -4,7 +4,7 @@ <param name="versionformat">@PARENT_TAG@</param> <param name="scm">git</param> - <param name="revision">v11.0.2</param> + <param name="revision">v12.0.2</param> <param name="match-tag">*</param> <param name="versionrewrite-pattern">v(\d+\.\d+\.\d+)</param> @@ -24,7 +24,8 @@ <param name="srcdir">topgrade</param> <param name="compression">zst</param> + <param name="update">true</param> </service> + <service mode="disabled" name="cargo_audit"/> </services> -(No newline at EOF) ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.5NiItO/_old 2023-07-31 15:24:18.187301263 +0200 +++ /var/tmp/diff_new_pack.5NiItO/_new 2023-07-31 15:24:18.191301286 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/topgrade-rs/topgrade.git</param> - <param name="changesrevision">26a2c3c26642a1e32d84fd6c362c19c32fd5c084</param></service></servicedata> + <param name="changesrevision">8e580457a5d0f39612e4f73edb8c281c0625ab76</param></service></servicedata> (No newline at EOF) ++++++ topgrade.obsinfo ++++++ --- /var/tmp/diff_new_pack.5NiItO/_old 2023-07-31 15:24:18.235301540 +0200 +++ /var/tmp/diff_new_pack.5NiItO/_new 2023-07-31 15:24:18.235301540 +0200 @@ -1,5 +1,5 @@ name: topgrade -version: 11.0.2 -mtime: 1682965578 -commit: 26a2c3c26642a1e32d84fd6c362c19c32fd5c084 +version: 12.0.2 +mtime: 1690266134 +commit: 8e580457a5d0f39612e4f73edb8c281c0625ab76 ++++++ vendor.tar.zst ++++++ Binary files /var/tmp/diff_new_pack.5NiItO/_old and /var/tmp/diff_new_pack.5NiItO/_new differ

1 0

commit pspp for openSUSE:Factory
by Source-Sync 31 Jul '23

31 Jul '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package pspp for openSUSE:Factory checked in at 2023-07-31 15:24:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pspp (Old) and /work/SRC/openSUSE:Factory/.pspp.new.32662 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pspp" Mon Jul 31 15:24:09 2023 rev:20 rq:1101327 version:1.6.2 Changes: -------- --- /work/SRC/openSUSE:Factory/pspp/pspp.changes 2022-05-05 23:08:27.061711413 +0200 +++ /work/SRC/openSUSE:Factory/.pspp.new.32662/pspp.changes 2023-07-31 15:24:11.231261105 +0200 @@ -1,0 +2,57 @@ +Sat Jul 22 08:41:49 UTC 2023 - Klaus Kämpf <kkaempf(a)suse.com> + +- Update to 1.6.2 + * Previously, numeric variables defaulted to "scale" measurement + level. Now, the default is "unknown", with a better guess chosen + based on heuristics the first time the data is read. + + * Bug fixes. + +- Update to 1.6.1 + * The SET command now supports LEADZERO for controlling output of a + leading zero in F, COMMA, and DOT format. + + * Bug fixes and translation updates. + +- Update to 1.6.0 + * In the Kruskal-Wallis test, a misleading result could occur + if the lower bound specified by the user was in fact higher + than the upper bound specified. This has been fixed. + + * The DEFINE, MATRIX, MCONVERT, and MATRIX DATA commands are now + implemented. + + * An error in the displayed signficance of oneway anova + contrasts tests has been corrected. + + * Added Drag-N-Drop in output view. + + * The Explore GUI dialog supports the "Plots" subdialog. Boxplots, + Q-Q Plots and Spreadlevel plots are now also available via the GUI. + + * The graphical user interface for importing spreadsheets has been + improved. + The new interface provides the user with a preview of the data to + be imported and interactive methods to select the desired ranges. + + * The user manual, in its Info and HTML versions, now includes + graphical output examples and screenshots. + + * New command SHOW SYSTEM to easily print system information useful + in bug reports. + + * Output improvements: + - New drivers for output to TeX source files and to PNG files. + - Table output styles may now be set with the new option + --table-look and the new SET TLOOK command. + - New driver option "trim" to remove empty space from PDF, + PostScript, SVG, and PNG output files. + - The PDF output driver now adds an outline to allow PDF viewers + to display as a "table of contents" for the file. + - The HTML output driver has a new option "bare". + + * New features in pspp-output: + - New --table-look and --nth-commands options. + - New get-table-look and convert-table-look commands. + +------------------------------------------------------------------- Old: ---- pspp-1.4.1.lt.po pspp-1.4.1.tar.gz pspp-1.4.1.tar.gz.sig New: ---- pspp-1.6.2.tar.gz pspp-1.6.2.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pspp.spec ++++++ --- /var/tmp/diff_new_pack.1Yhd0b/_old 2023-07-31 15:24:13.787275861 +0200 +++ /var/tmp/diff_new_pack.1Yhd0b/_new 2023-07-31 15:24:13.791275884 +0200 @@ -26,7 +26,7 @@ %define _disable_ld_as_needed 1 %endif Name: pspp -Version: 1.4.1 +Version: 1.6.2 Release: 0 Summary: A program for statistical analysis of sampled data License: GPL-3.0-or-later @@ -35,7 +35,6 @@ Source0: https://ftp.gnu.org/pub/gnu/pspp/pspp-%{version}.tar.gz Source1: https://ftp.gnu.org/pub/gnu/pspp/pspp-%{version}.tar.gz.sig Source2: https://savannah.gnu.org/people/viewgpg.php?user_id=245#/%{name}.keyring -Source3: https://translationproject.org/PO-files/lt/pspp-%{version}.lt.po BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?fedora} @@ -54,20 +53,19 @@ BuildRequires: automake BuildRequires: cairo-devel BuildRequires: desktop-file-utils -BuildRequires: gettext +BuildRequires: gettext >= 0.20 BuildRequires: gsl-devel >= 1.12 BuildRequires: gtk3-devel >= 3.22 +BuildRequires: gtksourceview4-devel BuildRequires: libtool BuildRequires: libxml2-devel BuildRequires: m4 BuildRequires: pango-devel -BuildRequires: perl(base) -BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: perl(Text::Diff) BuildRequires: pkgconfig BuildRequires: pkgconfig(appstream) BuildRequires: pkgconfig(gtksourceview-3.0) BuildRequires: postgresql-devel +BuildRequires: python3-devel >= 3.4 BuildRequires: readline-devel BuildRequires: spread-sheet-widget-devel >= 0.6 BuildRequires: texinfo @@ -146,7 +144,6 @@ %prep %setup -q -n pspp-%{version} -cp -f %{SOURCE3} po/lt.po %build export SUSE_ASNEEDED=0 @@ -165,7 +162,7 @@ %install %make_install %if 0%{?suse_version} -%suse_update_desktop_file -r org.fsf.%{name} Education Math +%suse_update_desktop_file -r org.gnu.%{name} Education Math %endif cp -r ./doc/pspp.html/ ./doc/pspp-dev.html/ %{buildroot}%{_datadir}/doc/pspp/ @@ -241,13 +238,15 @@ %{_bindir}/pspp-output %defattr(644,root,root,755) %{_infodir}/pspp* +%dir %{_infodir}/screenshots +%{_infodir}/screenshots/*.png %dir %{_libdir}/pspp/ %{_libdir}/pspp/*.so %{_datadir}/pspp %exclude %dir %{_datadir}/pspp/tests %exclude %{_datadir}/pspp/tests/testsuite.log -%{_datadir}/icons/hicolor/scalable/apps/pspp.svg -%{_datadir}/icons/hicolor/16x16/apps/pspp.png +%{_datadir}/icons/hicolor/scalable/apps/org.gnu.pspp.svg +%{_datadir}/icons/hicolor/16x16/apps/org.gnu.pspp.png %{_datadir}/icons/hicolor/16x16/mimetypes/application-x-spss-por.png %{_datadir}/icons/hicolor/16x16/mimetypes/application-x-spss-sav.png %{_datadir}/icons/hicolor/16x16/mimetypes/application-x-spss-sps.png @@ -260,24 +259,24 @@ %{_datadir}/icons/hicolor/24x24/mimetypes/application-x-spss-sav.png %{_datadir}/icons/hicolor/24x24/mimetypes/application-x-spss-sps.png %{_datadir}/icons/hicolor/24x24/mimetypes/application-x-spss-zsav.png -%{_datadir}/icons/hicolor/256x256/apps/pspp.png +%{_datadir}/icons/hicolor/256x256/apps/org.gnu.pspp.png %{_datadir}/icons/hicolor/256x256/mimetypes/application-x-spss-por.png %{_datadir}/icons/hicolor/256x256/mimetypes/application-x-spss-sav.png %{_datadir}/icons/hicolor/256x256/mimetypes/application-x-spss-sps.png %{_datadir}/icons/hicolor/256x256/mimetypes/application-x-spss-zsav.png -%{_datadir}/icons/hicolor/32x32/apps/pspp.png +%{_datadir}/icons/hicolor/32x32/apps/org.gnu.pspp.png %{_datadir}/icons/hicolor/32x32/mimetypes/application-x-spss-por.png %{_datadir}/icons/hicolor/32x32/mimetypes/application-x-spss-sav.png %{_datadir}/icons/hicolor/32x32/mimetypes/application-x-spss-sps.png %{_datadir}/icons/hicolor/32x32/mimetypes/application-x-spss-zsav.png -%{_datadir}/icons/hicolor/48x48/apps/pspp.png +%{_datadir}/icons/hicolor/48x48/apps/org.gnu.pspp.png %{_datadir}/icons/hicolor/48x48/mimetypes/application-x-spss-por.png %{_datadir}/icons/hicolor/48x48/mimetypes/application-x-spss-sav.png %{_datadir}/icons/hicolor/48x48/mimetypes/application-x-spss-sps.png %{_datadir}/icons/hicolor/48x48/mimetypes/application-x-spss-zsav.png -%{_datadir}/mime/packages/pspp.xml -%{_datadir}/applications/org.fsf.pspp.desktop -%{_datadir}/appdata/org.fsf.pspp.metainfo.xml +%{_datadir}/mime/packages/org.gnu.pspp.xml +%{_datadir}/applications/org.gnu.pspp.desktop +%{_datadir}/appdata/org.gnu.pspp.metainfo.xml %if 0%{?mandriva_version} %doc %{_mandir}/man1/pspp.1.xz %doc %{_mandir}/man1/psppire.1.xz ++++++ pspp-1.4.1.tar.gz -> pspp-1.6.2.tar.gz ++++++ /work/SRC/openSUSE:Factory/pspp/pspp-1.4.1.tar.gz /work/SRC/openSUSE:Factory/.pspp.new.32662/pspp-1.6.2.tar.gz differ: char 12, line 1

1 0

commit meteo for openSUSE:Factory
by Source-Sync 31 Jul '23

31 Jul '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package meteo for openSUSE:Factory checked in at 2023-07-31 15:24:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/meteo (Old) and /work/SRC/openSUSE:Factory/.meteo.new.32662 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "meteo" Mon Jul 31 15:24:08 2023 rev:7 rq:1101252 version:0.9.9.2 Changes: -------- --- /work/SRC/openSUSE:Factory/meteo/meteo.changes 2021-11-05 22:59:11.528303356 +0100 +++ /work/SRC/openSUSE:Factory/.meteo.new.32662/meteo.changes 2023-07-31 15:24:09.491251059 +0200 @@ -1,0 +2,7 @@ +Fri Jul 21 00:05:02 UTC 2023 - Carlos Suarez <bitseater(a)gmail.com> - 0.9.9.2 + +- Update to 0.9.9.2: + * Modify Map provider + * Fix some issues + +------------------------------------------------------------------- Old: ---- meteo-0.9.9.1.tar.gz New: ---- meteo-0.9.9.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ meteo.spec ++++++ --- /var/tmp/diff_new_pack.A6BtIa/_old 2023-07-31 15:24:10.103254593 +0200 +++ /var/tmp/diff_new_pack.A6BtIa/_new 2023-07-31 15:24:10.107254616 +0200 @@ -17,7 +17,7 @@ Name: meteo -Version: 0.9.9.1 +Version: 0.9.9.2 Release: 0 Summary: Program to show the weather forecast of the next hours and days License: GPL-3.0-or-later @@ -32,17 +32,17 @@ BuildRequires: update-desktop-files BuildRequires: vala BuildRequires: pkgconfig(appindicator3-0.1) -BuildRequires: pkgconfig(champlain-0.12) -BuildRequires: pkgconfig(clutter-1.0) -BuildRequires: pkgconfig(clutter-gtk-1.0) -BuildRequires: pkgconfig(geocode-glib-1.0) +#BuildRequires: pkgconfig(champlain-0.12) +#BuildRequires: pkgconfig(clutter-1.0) +#BuildRequires: pkgconfig(clutter-gtk-1.0) +#BuildRequires: pkgconfig(geocode-glib-1.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(libsoup-2.4) > 2.54.1 BuildRequires: pkgconfig(webkit2gtk-4.0) Recommends: %{name}-lang -Provides: weather = %{version} -Obsoletes: weather < %{version} +Provides: meteo = %{version} +Obsoletes: meteo < %{version} %description A program which displays current weather, with information about temperature, ++++++ meteo-0.9.9.1.tar.gz -> meteo-0.9.9.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meteo-0.9.9.1/.gitlab-ci.yml new/meteo-0.9.9.2/.gitlab-ci.yml --- old/meteo-0.9.9.1/.gitlab-ci.yml 2021-11-01 14:24:29.000000000 +0100 +++ new/meteo-0.9.9.2/.gitlab-ci.yml 2023-07-19 23:36:04.000000000 +0200 @@ -32,6 +32,7 @@ - tags artifacts: when: on_success + name: $CI_PROJECT_NAME%-$CI_COMMIT_TAG paths: - ./*.deb @@ -39,13 +40,13 @@ build:debian: <<: *build_definition - image: debian:11 + image: debian:12 before_script: - apt-get update -y - apt-get -y install $DEPENS package:debian: - image: debian:11 + image: debian:12 dependencies: - build:debian <<: *debpkg_template @@ -54,7 +55,7 @@ build:ubuntu: <<: *build_definition - image: ubuntu:focal + image: ubuntu:jammy before_script: - apt-get update -y - DEBIAN_FRONTEND=noninteractive apt-get -y install $DEPENS @@ -63,12 +64,12 @@ build:fedora: <<: *build_definition - image: fedora:34 + image: fedora:38 before_script: - dnf install $DEPENS_RPM -y package:fedora: - image: fedora:34 + image: fedora:38 stage: package before_script: @@ -78,19 +79,20 @@ - rpmdev-setuptree - cp rpm/meteo.spec ~/rpmbuild/SPECS - cd ~/rpmbuild - - wget https://gitlab.com/bitseater/meteo/-/archive/0.9.9/meteo-0.9.9.tar.gz - - cp meteo-0.9.9.tar.gz ~/rpmbuild/SOURCES + - wget https://gitlab.com/bitseater/meteo/-/archive/0.9.9.2/meteo-0.9.9.2.tar.gz + - cp meteo-0.9.9.2.tar.gz ~/rpmbuild/SOURCES - QA_SKIP_BUILD_ROOT=1 rpmbuild -v -ba --clean SPECS/meteo.spec - cd ~/rpmbuild/RPMS/x86_64/ - - cp meteo-0.9.9-1.fc34.x86_64.rpm /builds/bitseater/meteo/ + - cp meteo-0.9.9.2-1.fc38.x86_64.rpm /builds/bitseater/meteo/ - cd ~/rpmbuild/SRPMS/ - - cp meteo-0.9.9-1.fc34.src.rpm /builds/bitseater/meteo/ + - cp meteo-0.9.9.2-1.fc38.src.rpm /builds/bitseater/meteo/ only: - tags artifacts: + when: on_success paths: - - meteo-0.9.9-1.fc34.x86_64.rpm - - meteo-0.9.9-1.fc34.src.rpm - expire_in: 90 days + - meteo-0.9.9.2-1.fc38.x86_64.rpm + - meteo-0.9.9.2-1.fc38.src.rpm + name: $CI_PROJECT_NAME-$CI_COMMIT_TAG-fc38" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meteo-0.9.9.1/CREDITS.md new/meteo-0.9.9.2/CREDITS.md --- old/meteo-0.9.9.1/CREDITS.md 2021-11-01 14:24:29.000000000 +0100 +++ new/meteo-0.9.9.2/CREDITS.md 2023-07-19 23:36:04.000000000 +0200 @@ -1,5 +1,5 @@ -####Acknowledgements and credits: +## Acknowledgements and credits: - **Weather data**: Provided by [OpenWeatherMap](http://openweathermap.org/) under [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/) . -- **Maps images**: Provided by [Dark Sky](https://darksky.net) © The Dark Sky Company, LLC. +- **Maps images**: Provided by [WorldWeatherOnline](https://map.worldweatheronline.com) © WorldWeatherOnline. - **Images and backgrouds**: Provided by [Wikimedia Commons](https://commons.wikimedia.org) and used as [free content](https://commons.wikimedia.org/w/index.php?title=Commons:Licensing&… . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meteo-0.9.9.1/README.md new/meteo-0.9.9.2/README.md --- old/meteo-0.9.9.1/README.md 2021-11-01 14:24:29.000000000 +0100 +++ new/meteo-0.9.9.2/README.md 2023-07-19 23:36:04.000000000 +0200 @@ -33,7 +33,7 @@ You can download the last .deb package from: -[Package: Debian 11](https://gitlab.com/bitseater/meteo/-/jobs/artifacts/0.9.9/download?job=… +[Package: Debian 11](https://gitlab.com/bitseater/meteo/-/jobs/artifacts/0.9.9.1/download?jo… #### For Fedora: @@ -69,14 +69,6 @@ flatpak install flathub com.gitlab.bitseater.meteo -#### Snap package: - -Snap package is available at [Meteo in Snap Store](https://snapcraft.io/meteo) - -I've added it at the request of the users, but I don't give support to Snap.You can install it, at your own risk, from terminal: - - sudo snap install meteo - #### Packaging status: [![Packaging status](https://repology.org/badge/vertical-allrepos/meteo.svg)](https://re… @@ -117,13 +109,12 @@ ---- -#### New on release 0.9.9: +#### New on release 0.9.9.2: -- Delete geocode-glib dependencies. -- Add Moon phases. -- Add Temperature to tray popup. + * Change Maps provider + * Fixed some issues. - Fixed issues: #132, #135, #136, #138. + Fixed issues: various. ---- ### Other screenshots: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meteo-0.9.9.1/data/com.gitlab.bitseater.meteo.appdata.xml.in new/meteo-0.9.9.2/data/com.gitlab.bitseater.meteo.appdata.xml.in --- old/meteo-0.9.9.1/data/com.gitlab.bitseater.meteo.appdata.xml.in 2021-11-01 14:24:29.000000000 +0100 +++ new/meteo-0.9.9.2/data/com.gitlab.bitseater.meteo.appdata.xml.in 2023-07-19 23:36:04.000000000 +0200 @@ -44,7 +44,7 @@ <url type="homepage">https://gitlab.com/bitseater/meteo</url> <url type="bugtracker">https://gitlab.com/bitseater/meteo/issues</url> <releases> - <release version="0.9.9" date="2021-10-30"> + <release version="0.9.9.2" date="2023-07-20"> </release> </releases> <content_rating type="oars-1.0"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meteo-0.9.9.1/data/com.gitlab.bitseater.meteo.desktop.in new/meteo-0.9.9.2/data/com.gitlab.bitseater.meteo.desktop.in --- old/meteo-0.9.9.1/data/com.gitlab.bitseater.meteo.desktop.in 2021-11-01 14:24:29.000000000 +0100 +++ new/meteo-0.9.9.2/data/com.gitlab.bitseater.meteo.desktop.in 2023-07-19 23:36:04.000000000 +0200 @@ -11,3 +11,4 @@ X-GNOME-Gettext-Domain=com.gitlab.bitseater.meteo Keywords=Meteo;Weather;Forecast;Temperature;Wind;Snow;Rain; X-GNOME-UsesNotifications=true +X-Purism-FormFactor=Workstation;Mobile; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meteo-0.9.9.1/data/com.gitlab.bitseater.meteo.gschema.xml new/meteo-0.9.9.2/data/com.gitlab.bitseater.meteo.gschema.xml --- old/meteo-0.9.9.1/data/com.gitlab.bitseater.meteo.gschema.xml 2021-11-01 14:24:29.000000000 +0100 +++ new/meteo-0.9.9.2/data/com.gitlab.bitseater.meteo.gschema.xml 2023-07-19 23:36:04.000000000 +0200 @@ -68,7 +68,7 @@ </key> <key name="auto" type="b"> - <default>true</default> + <default>false</default> <summary>Autolocation</summary> <description>Catch my location on start</description> </key> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meteo-0.9.9.1/data/com.gitlab.bitseater.meteo.svg new/meteo-0.9.9.2/data/com.gitlab.bitseater.meteo.svg --- old/meteo-0.9.9.1/data/com.gitlab.bitseater.meteo.svg 2021-11-01 14:24:29.000000000 +0100 +++ new/meteo-0.9.9.2/data/com.gitlab.bitseater.meteo.svg 2023-07-19 23:36:04.000000000 +0200 @@ -2,21 +2,21 @@  <svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="128" height="128" viewBox="0 0 33.866671 33.866667" version="1.1" id="svg520" - inkscape:version="0.92.4 (5da689c313, 2019-01-14)" - sodipodi:docname="dibujo.svg"> + inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)" + sodipodi:docname="com.gitlab.bitseater.meteo.svg" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> <defs id="defs514"> <filter @@ -83,8 +83,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="6.1300268" - inkscape:cx="59.10722" - inkscape:cy="66.33776" + inkscape:cx="59.135141" + inkscape:cy="66.394489" inkscape:document-units="px" inkscape:current-layer="g1278-7" showgrid="true" @@ -94,10 +94,11 @@ fit-margin-bottom="0" units="px" inkscape:window-width="1920" - inkscape:window-height="1016" + inkscape:window-height="1011" inkscape:window-x="0" - inkscape:window-y="27" - inkscape:window-maximized="1"> + inkscape:window-y="32" + inkscape:window-maximized="1" + inkscape:pagecheckerboard="0"> <inkscape:grid type="xygrid" id="grid30" /> @@ -164,7 +165,7 @@ inkscape:connector-curvature="0" sodipodi:nodetypes="csccccccscccc" /> <circle - style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#98c1f1;fill-opacity:1;fill-rule:evenodd;stroke:#98c1f1;stroke-width:5.00000048;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#99c1f1;fill-opacity:1;fill-rule:evenodd;stroke:#98c1f1;stroke-width:5.00000048;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" id="path4232" cx="-618.01123" cy="426.60718" @@ -175,7 +176,7 @@ id="path4222-7" inkscape:connector-curvature="0" /> <path - style="fill:none;fill-rule:evenodd;stroke:#98c1f1;stroke-width:4.99999952;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-rule:evenodd;stroke:#99c1f1;stroke-width:4.99999952;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m -618.01123,392.67926 v 31.74409 z" id="path4222" inkscape:connector-curvature="0" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meteo-0.9.9.1/debian/changelog new/meteo-0.9.9.2/debian/changelog --- old/meteo-0.9.9.1/debian/changelog 2021-11-01 14:24:29.000000000 +0100 +++ new/meteo-0.9.9.2/debian/changelog 2023-07-19 23:36:04.000000000 +0200 @@ -1,3 +1,10 @@ +com.gitlab.bitseater.meteo (0.9.9.2) unstable; urgency=medium + + * Change Maps provider + * Fixed some issues. + + -- Carlos Suárez <bitseater(a)gmail.com> Thu, 20 Jul 2023 00:00:00 +0100 + com.gitlab.bitseater.meteo (0.9.9) unstable; urgency=medium * Delete geocode-glib dependencies. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meteo-0.9.9.1/debian/compat new/meteo-0.9.9.2/debian/compat --- old/meteo-0.9.9.1/debian/compat 2021-11-01 14:24:29.000000000 +0100 +++ new/meteo-0.9.9.2/debian/compat 2023-07-19 23:36:04.000000000 +0200 @@ -1 +1 @@ -11 +13 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meteo-0.9.9.1/meson.build new/meteo-0.9.9.2/meson.build --- old/meteo-0.9.9.1/meson.build 2021-11-01 14:24:29.000000000 +0100 +++ new/meteo-0.9.9.2/meson.build 2023-07-19 23:36:04.000000000 +0200 @@ -1,5 +1,5 @@ # Project name-language-version -project('com.gitlab.bitseater.meteo', ['vala', 'c'], version: '0.9.9') +project('com.gitlab.bitseater.meteo', ['vala', 'c'], version: '0.9.9.1') # Main libraries gnome = import('gnome') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meteo-0.9.9.1/po/LINGUAS new/meteo-0.9.9.2/po/LINGUAS --- old/meteo-0.9.9.1/po/LINGUAS 2021-11-01 14:24:29.000000000 +0100 +++ new/meteo-0.9.9.2/po/LINGUAS 2023-07-19 23:36:04.000000000 +0200 @@ -13,4 +13,5 @@ pt_PT ru sr +tr uk Binary files old/meteo-0.9.9.1/po/es.mo and new/meteo-0.9.9.2/po/es.mo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meteo-0.9.9.1/po/tr.po new/meteo-0.9.9.2/po/tr.po --- old/meteo-0.9.9.1/po/tr.po 1970-01-01 01:00:00.000000000 +0100 +++ new/meteo-0.9.9.2/po/tr.po 2023-07-19 23:36:04.000000000 +0200 @@ -0,0 +1,404 @@ +# Turkish translation for com.gitlab.bitseater.meteo. +# Copyright (C) 2022 com.gitlab.bitseater.meteo's COPYRIGHT HOLDER +# This file is distributed under the same license as the com.gitlab.bitseater.meteo package. +# +# Sabri Ünal <libreajans(a)gmail.com>, 2022. +# +msgid "" +msgstr "" +"Project-Id-Version: com.gitlab.bitseater.meteo\n" +"Report-Msgid-Bugs-To: https://gitlab.com/bitseater/meteo/-/issues\n" +"POT-Creation-Date: 2021-10-30 13:21+0200\n" +"PO-Revision-Date: 2022-11-18 23:46+0300\n" +"Last-Translator: Sabri Ünal <libreajans(a)gmail.com>\n" +"Language-Team: Turkish <gnome-turk(a)gnome.org>\n" +"Language: tr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Poedit 3.1.1\n" + +#: src/Widgets/Preferences.vala:146 +msgid "1 hr." +msgstr "1 saat" + +#: src/Widgets/Preferences.vala:149 +msgid "12 hrs." +msgstr "12 saat" + +#: src/Widgets/Preferences.vala:147 +msgid "2 hrs." +msgstr "2 saat" + +#: src/Widgets/Preferences.vala:150 +msgid "24 hrs." +msgstr "24 saat" + +#: src/Widgets/Preferences.vala:148 +msgid "6 hrs." +msgstr "6 saat" + +#: src/Widgets/About.vala:30 +msgid "A forecast application with OpenWeatherMap API" +msgstr "OpenWeatherMap APIʼsini kullanan bir hava durumu uygulaması" + +#: src/Utils/OWM_Today.vala:300 +msgid "API key" +msgstr "API anahtarı" + +#: src/Widgets/Header.vala:36 +msgid "About Meteo" +msgstr "Meteo Hakkında" + +#: src/Widgets/City.vala:85 +msgid "At least of 3 characters are required!" +msgstr "En azından 3 karakter gerekli!" + +#: src/Widgets/About.vala:57 +msgid "Based in a mockup by" +msgstr "Mockup kaynağı" + +#: data/com.gitlab.bitseater.meteo.appdata.xml.in:43 +msgid "Carlos Suarez" +msgstr "Carlos Suarez" + +#: src/Widgets/Header.vala:57 +msgid "Change location" +msgstr "Konum değiştir" + +#: data/com.gitlab.bitseater.meteo.appdata.xml.in:22 +msgid "Choose your city with popup maps" +msgstr "Açılır haritalarla şehir seçimi" + +#: data/com.gitlab.bitseater.meteo.appdata.xml.in:21 +msgid "Choose your units from metric, imperial or british systems" +msgstr "Metrik, imparatorluk veya İngiliz ölçü birimleri desteği" + +#: src/Widgets/Preferences.vala:272 +msgid "Close" +msgstr "Kapat" + +#: src/Widgets/Today.vala:70 +msgid "Cloudiness" +msgstr "Bulutluluk" + +#: src/Utils/OWM_Today.vala:316 src/Widgets/MapView.vala:99 +msgid "Clouds" +msgstr "Bulutlar" + +#: src/Widgets/About.vala:55 +msgid "Collaborators" +msgstr "Katkıcılar" + +#: src/Utils/OWM_Today.vala:304 +msgid "Coord. lat" +msgstr "Koordinat enlemi" + +#: src/Utils/OWM_Today.vala:303 +msgid "Coord. lon" +msgstr "Koordinat boylamı" + +#: src/Widgets/Today.vala:39 +msgid "Coordinates" +msgstr "Koordinatlar" + +#: src/Utils/OWM_Today.vala:307 src/Widgets/City.vala:63 +msgid "Country" +msgstr "Ülke" + +#: data/com.gitlab.bitseater.meteo.appdata.xml.in:12 +msgid "" +"Current weather, with information about temperature, pressure, wind speed " +"and wind direction, sunrise and sunset. Know meteorologic predictions to " +"next hours and days. Show awesome maps with all the information. Switch " +"between some maps distributors. Now with System Tray Indicator, showing your " +"location and forecast." +msgstr "" +"Sıcaklık, basınç, rüzgar hızı ve rüzgar yönü, gün doğumu ve gün batımı " +"hakkında bilgiler içeren mevcut hava durumu. Önümüzdeki saat ve günlere " +"ilişkin meteorolojik tahminleri öğrenin. Tüm bilgileri harika haritalarda " +"gösterin. Harita sağlayıcıları arasında geçiş yapın. Artık konumunuzu ve " +"hava durumunu gösteren Sistem Tepsisi Göstergesi de destekleniyor." + +#: src/Widgets/Preferences.vala:41 +msgid "Dark theme" +msgstr "Koyu tema" + +#: src/Widgets/Header.vala:76 +msgid "Data" +msgstr "Veriler" + +#: src/Utils/OWM_Today.vala:309 +msgid "Description" +msgstr "Açıklama" + +#: src/Utils/OWM_Today.vala:283 +msgid "Error" +msgstr "Hata" + +#: src/Widgets/Preferences.vala:222 +msgid "Find my location automatically" +msgstr "Konumumu kendiliğiden bul" + +#: src/Widgets/Forecast.vala:93 +msgid "Forecast" +msgstr "Hava Durumu" + +#: data/com.gitlab.bitseater.meteo.desktop.in:5 +msgid "Forecast App for desktop" +msgstr "Masaüstü için Hava Durumu Uygulaması" + +#: data/com.gitlab.bitseater.meteo.appdata.xml.in:19 +msgid "Forecast for next 18 hours" +msgstr "Gelecek 18 saatlik hava durumu tahmini" + +#: data/com.gitlab.bitseater.meteo.appdata.xml.in:20 +msgid "Forecast for next five days" +msgstr "Gelecek 5 günlük hava durumu tahmini" + +#: src/Utils/GeoLocate.vala:67 src/Widgets/MapView.vala:78 +msgid "Found an error" +msgstr "Hata bulundu" + +#: src/Utils/OWM_Today.vala:267 +msgid "Full Moon" +msgstr "Dolunay" + +#: src/Widgets/Preferences.vala:36 +msgid "General" +msgstr "Genel" + +#: src/Utils/OWM_Today.vala:313 src/Widgets/Today.vala:58 +msgid "Humidity" +msgstr "Nem" + +#: src/Utils/OWM_Today.vala:302 +msgid "ID place" +msgstr "Kimlik yeri" + +#: src/Utils/OWM_Today.vala:310 +msgid "Icon file" +msgstr "Simge dosyası" + +# İngiliz Sistemi olarak çevirmeyin. UK System ile çeviriler karışıyor. +#: src/Widgets/Preferences.vala:202 +msgid "Imperial System" +msgstr "İmparatorluk Sistemi" + +#: src/Widgets/Preferences.vala:33 +msgid "Interface" +msgstr "Arayüz" + +#: data/com.gitlab.bitseater.meteo.appdata.xml.in:10 +msgid "Know the forecast of the next hours and days with data and maps" +msgstr "" +"Veriler ve haritalarla sonraki saatlerin ve günlerin hava durumu " +"tahminlerini öğrenin" + +#: src/Utils/OWM_Today.vala:299 +msgid "Language" +msgstr "Dil" + +#: src/Utils/OWM_Today.vala:275 +msgid "Last Quarter Moon" +msgstr "Son Dördün" + +#: src/Widgets/City.vala:61 +msgid "Lat" +msgstr "Enlem" + +#: src/Widgets/Preferences.vala:123 +msgid "Launch on start" +msgstr "Başlangıçta başlat" + +#: src/MainWindow.vala:74 +msgid "Loading" +msgstr "Yükleniyor" + +#: src/Utils/OWM_Today.vala:175 +msgid "Loading cache data" +msgstr "Önbellek verisi yükleniyor" + +#: src/Utils/OWM_Today.vala:305 src/Widgets/City.vala:65 +msgid "Location" +msgstr "Konum" + +#: src/Widgets/City.vala:62 +msgid "Lon" +msgstr "Boylam" + +#: src/Widgets/Header.vala:77 +msgid "Maps" +msgstr "Haritalar" + +#: data/com.gitlab.bitseater.meteo.appdata.xml.in:8 +#: data/com.gitlab.bitseater.meteo.desktop.in:3 +#: data/com.gitlab.bitseater.meteo.desktop.in:4 +msgid "Meteo" +msgstr "Meteo" + +#: data/com.gitlab.bitseater.meteo.desktop.in:13 +msgid "Meteo;Weather;Forecast;Temperature;Wind;Snow;Rain;" +msgstr "" +"Meteo;Hava Durumu; Hava Tahmini;Sıcaklık;Rüzgar;Kar;Yağmur;Dolu;Weather;" +"Forecast;" + +#: src/Widgets/Preferences.vala:201 +msgid "Metric System" +msgstr "Metrik Sistem" + +#: src/Widgets/Today.vala:80 +msgid "Moonphase" +msgstr "Ay evresi" + +#: src/Utils/OWM_Today.vala:251 +msgid "New Moon" +msgstr "Yeni Ay" + +#: src/Widgets/City.vala:131 +msgid "No data" +msgstr "Veri yok" + +#: src/Utils/OWM_Today.vala:183 +msgid "No data received, loading cache. Are you connected?" +msgstr "Veri alınmadı, önbellek yükleniyor. Bağlı olduğunuza emin misiniz?" + +#: src/Widgets/Header.vala:51 +msgid "Options" +msgstr "Seçenekler" + +#: data/com.gitlab.bitseater.meteo.appdata.xml.in:17 +msgid "Other features:" +msgstr "Diğer özellikler:" + +#: src/Widgets/MapView.vala:100 +msgid "Precipitation" +msgstr "Yağış" + +#: src/Widgets/Preferences.vala:24 src/Widgets/Header.vala:35 +msgid "Preferences" +msgstr "Tercihler" + +#: src/Utils/OWM_Today.vala:312 src/Widgets/MapView.vala:101 +#: src/Widgets/Today.vala:54 +msgid "Pressure" +msgstr "Basınç" + +#: src/Utils/OWM_Today.vala:259 +msgid "Quarter Moon" +msgstr "Yeni Ay" + +#: src/MainWindow.vala:189 +msgid "Quit" +msgstr "Çık" + +#: src/Widgets/City.vala:49 +msgid "Search for new location" +msgstr "Yeni konum ara" + +#: src/MainWindow.vala:180 +msgid "Show Meteo" +msgstr "Meteoʼyu Göster" + +#: src/Widgets/About.vala:58 +msgid "Some icons by" +msgstr "Kimi simgeler" + +#: src/Widgets/About.vala:56 +msgid "Special Thanks to" +msgstr "Özel teşekkürler" + +#: src/Widgets/Preferences.vala:79 +msgid "Start minimized" +msgstr "Simge durumunda başlat" + +#: src/Utils/OWM_Today.vala:306 src/Widgets/City.vala:64 +msgid "State" +msgstr "Durum" + +#: src/Utils/OWM_Today.vala:317 src/Widgets/Today.vala:72 +msgid "Sunrise" +msgstr "Gün doğumu" + +#: src/Utils/OWM_Today.vala:318 src/Widgets/Today.vala:76 +msgid "Sunset" +msgstr "Gün batımı" + +#: src/Widgets/Preferences.vala:61 +msgid "Symbolic icons" +msgstr "Sembolik simgeler" + +#: src/Utils/OWM_Today.vala:311 src/Widgets/MapView.vala:98 +msgid "Temperature" +msgstr "Sıcaklık" + +#: src/Widgets/MapView.vala:106 +msgid "Terms of Service" +msgstr "Kullanım Şartları" + +#: src/Widgets/Today.vala:36 +msgid "Today" +msgstr "Bugün" + +#: src/Widgets/Preferences.vala:203 +msgid "UK System" +msgstr "İngiliz Sistemi" + +#: src/Utils/OWM_Today.vala:301 src/Widgets/Preferences.vala:198 +msgid "Units" +msgstr "Birimler" + +# Birebir çeviri değil fakat arayüze uygun. +#: src/Widgets/Header.vala:59 +msgid "Update conditions" +msgstr "Verileri güncelle" + +# Birebir çeviri değil fakat arayüze uygun. +#: src/Widgets/Preferences.vala:143 +msgid "Update conditions every" +msgstr "Verileri günceleme sıklığı" + +#: src/Widgets/Preferences.vala:97 +msgid "Use System Tray Indicator" +msgstr "Sistem Tepsisi Göstergesini kullan" + +#: src/Utils/OWM_Today.vala:279 +msgid "Waning Crescent Moon" +msgstr "Azalan Hilal" + +#: src/Utils/OWM_Today.vala:271 +msgid "Waning Gibbous Moon" +msgstr "Azalan Sondördün" + +#: data/com.gitlab.bitseater.meteo.appdata.xml.in:23 +msgid "Watch awesome maps with weather information" +msgstr "Hava durumu bilgilerini harika haritalarda görün" + +#: src/Utils/OWM_Today.vala:255 +msgid "Waxing Crescent Moon" +msgstr "Yükselen Hilal" + +#: src/Utils/OWM_Today.vala:263 +msgid "Waxing Gibbous Moon" +msgstr "Yükselen Sondördün" + +#: src/Utils/OWM_Today.vala:308 +msgid "Weather" +msgstr "Hava Durumu" + +#: src/Widgets/MapView.vala:102 +msgid "Wind Speed" +msgstr "Rüzgar Hızı" + +#: src/Utils/OWM_Today.vala:315 src/Widgets/Today.vala:66 +msgid "Wind dir" +msgstr "Rüzgar yönü" + +#: src/Utils/OWM_Today.vala:314 src/Widgets/Today.vala:62 +msgid "Wind speed" +msgstr "Rüzgar hızı" + +#: src/Widgets/About.vala:49 +msgid "website" +msgstr "Web sitesi" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meteo-0.9.9.1/rpm/meteo.spec new/meteo-0.9.9.2/rpm/meteo.spec --- old/meteo-0.9.9.1/rpm/meteo.spec 2021-11-01 14:24:29.000000000 +0100 +++ new/meteo-0.9.9.2/rpm/meteo.spec 2023-07-19 23:36:04.000000000 +0200 @@ -1,7 +1,7 @@ %global appname com.gitlab.bitseater.%{name} Name: meteo -Version: 0.9.9 +Version: 0.9.9.2 Release: 1%{?dist} Summary: Forecast application using OpenWeatherMap API @@ -57,9 +57,8 @@ %{_mandir}/man1/*.1* %changelog -* Sat Oct 30 2021 Carlos Suárez (bitseater) -- Delete geocode-glib dependencies. -- Add Moon phases. -- Add Temperature to tray popup. -- Fixed issues: #132, #135, #136, #138. +* Thu Jul 20 2023 Carlos Suárez (bitseater) +- Change Maps provider +- Fixed some issues. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meteo-0.9.9.1/src/MainWindow.vala new/meteo-0.9.9.2/src/MainWindow.vala --- old/meteo-0.9.9.1/src/MainWindow.vala 2021-11-01 14:24:29.000000000 +0100 +++ new/meteo-0.9.9.2/src/MainWindow.vala 2023-07-19 23:36:04.000000000 +0200 @@ -28,7 +28,7 @@ public MainWindow (MeteoApp app) { this.app = app; this.set_application (app); - this.set_size_request (950, 650); + this.set_default_size (950, 650); window_position = Gtk.WindowPosition.CENTER; var header = new Meteo.Widgets.Header (this, false); this.set_titlebar (header); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meteo-0.9.9.1/src/Utils/OWM_Today.vala new/meteo-0.9.9.2/src/Utils/OWM_Today.vala --- old/meteo-0.9.9.1/src/Utils/OWM_Today.vala 2021-11-01 14:24:29.000000000 +0100 +++ new/meteo-0.9.9.2/src/Utils/OWM_Today.vala 2023-07-19 23:36:04.000000000 +0200 @@ -188,9 +188,9 @@ } var coord = root.get_object_member ("coord"); if(coord.get_double_member ("lon") > 0) { - _coor_lon = Meteo.Utils.to_string2 (coord.get_double_member ("lon")) + "W"; + _coor_lon = Meteo.Utils.to_string2 (coord.get_double_member ("lon")) + "E"; } else { - _coor_lon = Meteo.Utils.to_string2 ((coord.get_double_member ("lon"))*-1) + "E"; + _coor_lon = Meteo.Utils.to_string2 ((coord.get_double_member ("lon"))*-1) + "W"; } if(coord.get_double_member ("lat") > 0) { _coor_lat = Meteo.Utils.to_string2 (coord.get_double_member ("lat")) + "N"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meteo-0.9.9.1/src/Widgets/About.vala new/meteo-0.9.9.2/src/Widgets/About.vala --- old/meteo-0.9.9.1/src/Widgets/About.vala 2021-11-01 14:24:29.000000000 +0100 +++ new/meteo-0.9.9.2/src/Widgets/About.vala 2023-07-19 23:36:04.000000000 +0200 @@ -43,7 +43,8 @@ (de) BeatriceFendt <https://github.com/BeatriceFendt> (sr) Pavle Radosavljević <https://gitlab.com/PavleR> (nb) Harald H. <https://gitlab.com/haarek> - (nl) Koen Roggemans <https://gitlab.com/koenro>"; + (nl) Koen Roggemans <https://gitlab.com/koenro> + (tr) Sabri Ünal <libreajans(a)gmail.com>"; version = Constants.VERSION; website = "https://gitlab.com/bitseater/meteo"; website_label = _("website"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meteo-0.9.9.1/src/Widgets/City.vala new/meteo-0.9.9.2/src/Widgets/City.vala --- old/meteo-0.9.9.1/src/Widgets/City.vala 2021-11-01 14:24:29.000000000 +0100 +++ new/meteo-0.9.9.2/src/Widgets/City.vala 2023-07-19 23:36:04.000000000 +0200 @@ -101,7 +101,6 @@ int i; for (i=0; i< root.get_length (); i++) { var osmobj = root.get_object_element (i); - var type = osmobj.get_string_member ("type"); var osmlat = osmobj.get_string_member ("lat"); var osmlon = osmobj.get_string_member ("lon"); var address = osmobj.get_object_member ("address"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meteo-0.9.9.1/src/Widgets/MapView.vala new/meteo-0.9.9.2/src/Widgets/MapView.vala --- old/meteo-0.9.9.1/src/Widgets/MapView.vala 2021-11-01 14:24:29.000000000 +0100 +++ new/meteo-0.9.9.2/src/Widgets/MapView.vala 2023-07-19 23:36:04.000000000 +0200 @@ -20,7 +20,7 @@ public class MapView : Gtk.Box { - public MapView (Meteo.MainWindow window, Meteo.Widgets.Header header) { + public MapView (Meteo.MainWindow window, Meteo.Widgets.Header header) { orientation = Gtk.Orientation.VERTICAL; //Define latitude y longitude and units @@ -28,39 +28,8 @@ string lon = ""; var setting = new Settings ("com.gitlab.bitseater.meteo"); string apiid = setting.get_string ("apiid"); - string units = setting.get_string ("units"); string idplace = setting.get_string ("idplace"); string uri = Constants.OWM_API_ADDR + "weather?id=" + idplace + "&APPID=" + apiid; - string temp_un = ""; - string prec_un = ""; - string pres_un = ""; - string wspe_un = ""; - switch (units) { - case "metric": - temp_un = "_c"; - prec_un = "_mmph"; - pres_un = "_hpa"; - wspe_un = "_kmph"; - break; - case "imperial": - temp_un = "_f"; - prec_un = "_inph"; - pres_un = "_inhg"; - wspe_un = "_mph"; - break; - case "british": - temp_un = "_c"; - prec_un = "_inph"; - pres_un = "_hpa"; - wspe_un = "_mph"; - break; - default: - temp_un = "_c"; - prec_un = "_mmph"; - pres_un = "_hpa"; - wspe_un = "_kmph"; - break; - } var session = new Soup.Session (); var message = new Soup.Message ("GET", uri); @@ -79,31 +48,12 @@ } //Define maps URL's - string url_serv = "https://maps.darksky.net/@"; - string url_med = ",8?embed=true&timeControl=false&fieldControl=false&defaultField="; - string url_temp = url_serv + "temperature," + lat + "," + lon + url_med + "temperature&defaultUnits=" + temp_un; - string url_clou = url_serv + "cloud_cover," + lat + "," + lon + url_med + "cloud_cover"; - string url_prec = url_serv + "precipitation_rate," + lat + "," + lon + url_med + "precipitation_rate&defaultUnits=" + prec_un; - string url_pres = url_serv + "sea_level_pressure," + lat + "," + lon + url_med + "sea_level_pressure&defaultUnits=" + pres_un; - string url_wspe = url_serv + "wind_speed," + lat + "," + lon + url_med + "wind_speed&defaultUnits=" + wspe_un; - - //Define switcher - var showmap = new Gtk.Stack (); - showmap.transition_type = Gtk.StackTransitionType.CROSSFADE; - showmap.transition_duration = 1000; - var switchmap = new Gtk.StackSwitcher (); - switchmap.stack = showmap; - switchmap.homogeneous = true; - - showmap.add_titled (new Meteo.Utils.MapLayer (url_temp), "TEMP", _("Temperature")); - showmap.add_titled (new Meteo.Utils.MapLayer (url_clou), "CLOU", _("Clouds")); - showmap.add_titled (new Meteo.Utils.MapLayer (url_prec), "PREC", _("Precipitation")); - showmap.add_titled (new Meteo.Utils.MapLayer (url_pres), "PRES", _("Pressure")); - showmap.add_titled (new Meteo.Utils.MapLayer (url_wspe), "WSPE", _("Wind Speed")); + string url_serv = "https://map.worldweatheronline.com/temperature?lat="; + string url_ok = url_serv + lat + "&lng=" + lon; //Define other elements - var prov_lab = new Gtk.Label ("\xc2\xa9 Dark Sky"); - var tos = new Gtk.LinkButton.with_label ("http://darksky.net/widgetterms", _("Terms of Service")); + var prov_lab = new Gtk.Label ("\xc2\xa9 WorldWeatherOnline"); + var tos = new Gtk.LinkButton.with_label ("https://map.worldweatheronline.com", _("Link to website")); tos.halign = Gtk.Align.END; //Pack combo to actionbar @@ -116,8 +66,7 @@ action_box.pack_start (prov_box); //Pack elementes - pack_start (switchmap, false, false , 0); - pack_start (showmap, true, true, 0); + pack_start (new Meteo.Utils.MapLayer (url_ok), true, true, 0); pack_end (action_box, false, false, 0); } }

1 0

commit python-natsort for openSUSE:Factory
by Source-Sync 31 Jul '23

31 Jul '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-natsort for openSUSE:Factory checked in at 2023-07-31 15:24:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-natsort (Old) and /work/SRC/openSUSE:Factory/.python-natsort.new.32662 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-natsort" Mon Jul 31 15:24:05 2023 rev:24 rq:1098030 version:8.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-natsort/python-natsort.changes 2023-06-14 16:31:54.079413069 +0200 +++ /work/SRC/openSUSE:Factory/.python-natsort.new.32662/python-natsort.changes 2023-07-31 15:24:08.183243508 +0200 @@ -1,0 +2,37 @@ +Mon Jul 10 16:16:15 UTC 2023 - ecsos <ecsos(a)opensuse.org> + +- Add %{?sle15_python_module_pythons} +- Fix BuildReuquires Versions. + +------------------------------------------------------------------- +Sat Jul 8 20:28:50 UTC 2023 - Arun Persaud <arun(a)gmx.de> + +- update to version 8.4.0: + * Changed + + The changelog now only explictly exists in the repository (issue + #162) + * Fixed + + Inputs with spaces near adjascent to the extension are now + sorted correctly for os_sorted on Windows (issues #165 and #166) + +- changes from version 8.3.1: + * Fixed + + Broken test found on FreeBSD. This change has no effect outside + fixing tests (issue #161) + +- changes from version 8.3.0: + * Added + + The PRESORT option to the ns enum to attain consistent sort + order in certain corner cases (issue #149) + + Logic to ensure None and NaN are sorted in a consistent order + (issue #149) + + Explict Python 3.11 support + * Changed + + Only convert to str if necessary in os_sorted (@Dobatymo, issues + #157 and #158) + + Attempt to use new fastnumbers functionality if available + + Move non-API documentation to the GitHub wiki + * Removed + + Support for EOL Python 3.6 + +------------------------------------------------------------------- Old: ---- natsort-8.2.0.tar.gz New: ---- natsort-8.4.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-natsort.spec ++++++ --- /var/tmp/diff_new_pack.NIzHyo/_old 2023-07-31 15:24:08.855247388 +0200 +++ /var/tmp/diff_new_pack.NIzHyo/_new 2023-07-31 15:24:08.859247411 +0200 @@ -16,15 +16,15 @@ # -%define skip_python2 1 %{?sle15_python_module_pythons} Name: python-natsort -Version: 8.2.0 +Version: 8.4.0 Release: 0 Summary: Natural sorting in Python License: MIT URL: https://github.com/SethMMorton/natsort Source: https://files.pythonhosted.org/packages/source/n/natsort/natsort-%{version}… +BuildRequires: %{python_module fastnumbers >= 5.0.1} BuildRequires: %{python_module hypothesis} BuildRequires: %{python_module pytest >= 4.3} BuildRequires: %{python_module pytest-mock} @@ -36,8 +36,9 @@ Requires(post): update-alternatives Requires(postun):update-alternatives Recommends: python-PyICU >= 1.0.0 -Recommends: python-fastnumbers >= 2.0.0 +Recommends: python-fastnumbers >= 5.0.1 BuildArch: noarch +%{?sle15_python_module_pythons} %python_subpackages %description ++++++ natsort-8.2.0.tar.gz -> natsort-8.4.0.tar.gz ++++++ ++++ 4938 lines of diff (skipped)

1 0

commit util-linux for openSUSE:Factory
by Source-Sync 31 Jul '23

31 Jul '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package util-linux for openSUSE:Factory checked in at 2023-07-31 15:24:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/util-linux (Old) and /work/SRC/openSUSE:Factory/.util-linux.new.32662 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "util-linux" Mon Jul 31 15:24:04 2023 rev:274 rq:1101236 version:2.39.1 Changes: -------- --- /work/SRC/openSUSE:Factory/util-linux/util-linux.changes 2023-07-16 17:28:32.343893306 +0200 +++ /work/SRC/openSUSE:Factory/.util-linux.new.32662/util-linux.changes 2023-07-31 15:24:04.843224225 +0200 @@ -1,0 +2,17 @@ +Fri Jul 28 14:47:15 UTC 2023 - Goldwyn Rodrigues <rgoldwyn(a)suse.com> + +- Re-add 0001-Revert-libblkid-try-LUKS2-first-when-probing.patch + because the patch is not in 2.39.1 + +------------------------------------------------------------------- +Wed Jul 26 01:22:20 UTC 2023 - Neil Brown <nfbrown(a)suse.com> + +- Upgrade to version 2.39.1 + (bsc#1213328) + Various bug fixes including problem with parsing mount options. +- Dropped upstreamed patches: + 0001-Revert-libblkid-try-LUKS2-first-when-probing.patch + 0001-libmount-fix-sync-options-between-context-and-fs-str.patch + util-linux-fix-tests-with-64k-pagesize.patch + +------------------------------------------------------------------- Old: ---- 0001-libmount-fix-sync-options-between-context-and-fs-str.patch util-linux-2.39.tar.sign util-linux-2.39.tar.xz util-linux-fix-tests-with-64k-pagesize.patch New: ---- util-linux-2.39.1.tar.sign util-linux-2.39.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ util-linux.spec ++++++ --- /var/tmp/diff_new_pack.219EAP/_old 2023-07-31 15:24:06.159231823 +0200 +++ /var/tmp/diff_new_pack.219EAP/_new 2023-07-31 15:24:06.163231846 +0200 @@ -85,7 +85,7 @@ %endif # ulbuild == python -Version: 2.39 +Version: 2.39.1 Release: 0 License: GPL-2.0-or-later URL: https://www.kernel.org/pub/linux/utils/util-linux/ @@ -109,13 +109,10 @@ Patch1: libmount-print-a-blacklist-hint-for-unknown-filesyst.patch Patch2: Add-documentation-on-blacklisted-modules-to-mount-8-.patch # PATCH-FIX-SUSE util-linux-bash-completion-su-chsh-l.patch bsc1172427 -- Fix "su -s" bash completion. -Patch4: util-linux-bash-completion-su-chsh-l.patch -# PATCH-FIX-UPSTREAM util-linux-fix-tests-with-64k-pagesize.patch -- fadvise: fix tests with 64k pagesize -Patch5: util-linux-fix-tests-with-64k-pagesize.patch -# https://github.com/util-linux/util-linux/pull/2331 -Patch6: 0001-libmount-fix-sync-options-between-context-and-fs-str.patch +Patch3: util-linux-bash-completion-su-chsh-l.patch # https://github.com/util-linux/util-linux/pull/2373 -Patch7: 0001-Revert-libblkid-try-LUKS2-first-when-probing.patch +Patch4: 0001-Revert-libblkid-try-LUKS2-first-when-probing.patch + BuildRequires: audit-devel BuildRequires: bc BuildRequires: binutils-devel ++++++ Add-documentation-on-blacklisted-modules-to-mount-8-.patch ++++++ --- /var/tmp/diff_new_pack.219EAP/_old 2023-07-31 15:24:06.191232008 +0200 +++ /var/tmp/diff_new_pack.219EAP/_new 2023-07-31 15:24:06.195232030 +0200 @@ -5,17 +5,15 @@ Signed-off-by: Martin Wilck <mwilck(a)suse.com> --- - sys-utils/mount.8 | 26 ++++++++++++++++++++++++++ - 1 file changed, 26 insertions(+) + sys-utils/mount.8 | 28 +++++++++++++++++++++++++++- + 1 file changed, 27 insertions(+), 1 deletion(-) -Index: util-linux-2.37.2/sys-utils/mount.8 -=================================================================== ---- util-linux-2.37.2.orig/sys-utils/mount.8 -+++ util-linux-2.37.2/sys-utils/mount.8 -@@ -203,6 +203,32 @@ Note that \fBmount\fP is very strict abo - Since util\-linux 2.35, \fBmount\fP does not exit when user permissions are inadequate according to libmount\(cqs internal security rules. Instead, it drops suid permissions and continues as regular non\-root user. This behavior supports use\-cases where root permissions are not necessary (e.g., fuse filesystems, user namespaces, etc). - .sp +--- a/sys-utils/mount.8 ++++ b/sys-utils/mount.8 +@@ -205,6 +205,32 @@ Since util\-linux 2.35, \fBmount\fP does For more details, see \fBfstab\fP(5). Only the user that mounted a filesystem can unmount it again. If any user should be able to unmount it, then use \fBusers\fP instead of \fBuser\fP in the \fIfstab\fP line. The \fBowner\fP option is similar to the \fBuser\fP option, with the restriction that the user must be the owner of the special file. This may be useful e.g. for \fI/dev/fd\fP if a login script makes the console user owner of this device. The \fBgroup\fP option is similar, with the restriction that the user must be a member of the group of the special file. + .sp + The \fBuser\fP mount option is accepted if no username is specified. If used in the format \fBuser=someone\fP, the option is silently ignored and visible only for external mount helpers (/sbin/mount.<type>) for compatibility with some network filesystems. +.SS Blacklisted file systems +In the Linux kernel, file system types are implemented as kernel +modules. While many of these file systems are well maintained, @@ -45,7 +43,7 @@ .SS "Bind mount operation" .sp Remount part of the file hierarchy somewhere else. The call is: -@@ -2396,4 +2422,4 @@ For bug reports, use the issue tracker a +@@ -2571,4 +2597,4 @@ For bug reports, use the issue tracker a .SH "AVAILABILITY" .sp The \fBmount\fP command is part of the util\-linux package which can be downloaded from \c ++++++ util-linux-2.39.tar.xz -> util-linux-2.39.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/util-linux/util-linux-2.39.tar.xz /work/SRC/openSUSE:Factory/.util-linux.new.32662/util-linux-2.39.1.tar.xz differ: char 15, line 1

1 0

commit 000product for openSUSE:Factory
by Source-Sync 31 Jul '23

31 Jul '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package 000product for openSUSE:Factory checked in at 2023-07-31 07:46:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000product (Old) and /work/SRC/openSUSE:Factory/.000product.new.32662 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000product" Mon Jul 31 07:46:19 2023 rev:3699 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ openSUSE-Addon-NonOss-ftp-ftp-x86_64.kiwi: same change openSUSE-cd-mini-x86_64.kiwi: same change openSUSE-dvd5-dvd-x86_64.kiwi: same change ++++++ openSUSE-ftp-ftp-x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.4E1UMz/_old 2023-07-31 07:46:23.251579701 +0200 +++ /var/tmp/diff_new_pack.4E1UMz/_new 2023-07-31 07:46:23.251579701 +0200 @@ -42,6 +42,7 @@ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20230730/x86_64</productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="DEBUGMEDIUM">2</productoption> + <productoption name="DOWNLOAD_MIRROR_POLICY">false</productoption> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption> <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption> <productoption name="REPO_LOCATION">http://download.opensuse.org/tumbleweed/repo/oss/</productoption> ++++++ openSUSE.product ++++++ --- /var/tmp/diff_new_pack.4E1UMz/_old 2023-07-31 07:46:23.387580491 +0200 +++ /var/tmp/diff_new_pack.4E1UMz/_new 2023-07-31 07:46:23.391580515 +0200 @@ -87,7 +87,7 @@ <mediasets>  <media type="ftp" flavor="ftp" sourcemedia="3" debugmedia="2" mediastyle="tumbleweed" - create_pattern="false" repo_only="true" run_make_listings="true" + create_pattern="false" repo_only="true" run_make_listings="true" download_mirror_policy="false" use_required="true" use_recommended="true" use_suggested="false" use_undecided="true"> <archsets>

1 0

commit 000package-groups for openSUSE:Factory
by Source-Sync 31 Jul '23

31 Jul '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package 000package-groups for openSUSE:Factory checked in at 2023-07-31 07:00:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000package-groups (Old) and /work/SRC/openSUSE:Factory/.000package-groups.new.32662 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000package-groups" Mon Jul 31 07:00:10 2023 rev:241 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openSUSE.product.in ++++++ --- /var/tmp/diff_new_pack.E7Sbub/_old 2023-07-31 07:00:12.307029913 +0200 +++ /var/tmp/diff_new_pack.E7Sbub/_new 2023-07-31 07:00:12.311029935 +0200 @@ -87,7 +87,7 @@ <mediasets>  <media type="ftp" flavor="ftp" sourcemedia="3" debugmedia="2" mediastyle="tumbleweed" - create_pattern="false" repo_only="true" run_make_listings="true" + create_pattern="false" repo_only="true" run_make_listings="true" download_mirror_policy="false" use_required="true" use_recommended="true" use_suggested="false" use_undecided="true"> <archsets>

1 0

commit 000product for openSUSE:Factory
by Source-Sync 31 Jul '23

31 Jul '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package 000product for openSUSE:Factory checked in at 2023-07-31 03:20:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000product (Old) and /work/SRC/openSUSE:Factory/.000product.new.32662 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000product" Mon Jul 31 03:20:47 2023 rev:3698 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MicroOS-dvd5-dvd-x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.xqa1Yn/_old 2023-07-31 03:20:53.783080544 +0200 +++ /var/tmp/diff_new_pack.xqa1Yn/_new 2023-07-31 03:20:53.811080708 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__MicroOS___20230729" schemaversion="4.1"> +<image name="OBS__MicroOS___20230730" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -35,11 +35,11 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20230729</productvar> + <productvar name="VERSION">20230730</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:microos:20230729,openSUSE MicroOS</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:microos:20230730,openSUSE MicroOS</productinfo> <productinfo name="LINGUAS">en_US </productinfo> - <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20230729/x86_64</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20230730/x86_64</productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption> <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption> ++++++ openSUSE-Addon-NonOss-ftp-ftp-x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.xqa1Yn/_old 2023-07-31 03:20:54.147082682 +0200 +++ /var/tmp/diff_new_pack.xqa1Yn/_new 2023-07-31 03:20:54.183082894 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE-Addon-NonOss___20230729" schemaversion="4.1"> +<image name="OBS__openSUSE-Addon-NonOss___20230730" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -35,11 +35,11 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20230729</productvar> + <productvar name="VERSION">20230730</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20230729,openSUSE NonOSS Addon</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20230730,openSUSE NonOSS Addon</productinfo> <productinfo name="LINGUAS">af ar be_BY bg br ca cy el et ga gl gu_IN he hi_IN hr ka km ko lt mk nn pa_IN rw sk sl sr_CS ss st tg th tr uk ve vi xh zu </productinfo> - <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2023…</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2023…</productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption> <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption> ++++++ openSUSE-cd-mini-x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.xqa1Yn/_old 2023-07-31 03:20:54.415084256 +0200 +++ /var/tmp/diff_new_pack.xqa1Yn/_new 2023-07-31 03:20:54.451084468 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE___20230729" schemaversion="4.1"> +<image name="OBS__openSUSE___20230730" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -35,11 +35,11 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20230729</productvar> + <productvar name="VERSION">20230730</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20230729,openSUSE Tumbleweed</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20230730,openSUSE Tumbleweed</productinfo> <productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo> - <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20230729/x86_64</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20230730/x86_64</productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption> <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption> openSUSE-dvd5-dvd-x86_64.kiwi: same change ++++++ openSUSE-ftp-ftp-x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.xqa1Yn/_old 2023-07-31 03:20:54.523084891 +0200 +++ /var/tmp/diff_new_pack.xqa1Yn/_new 2023-07-31 03:20:54.527084914 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE___20230729" schemaversion="4.1"> +<image name="OBS__openSUSE___20230730" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -23,7 +23,7 @@ <productvar name="DISTNAME">openSUSE</productvar> <productvar name="FLAVOR">ftp</productvar> <productvar name="MAKE_LISTINGS">true</productvar> - <productvar name="MEDIUM_NAME">openSUSE-20230729-x86_64</productvar> + <productvar name="MEDIUM_NAME">openSUSE-20230730-x86_64</productvar> <productvar name="MULTIPLE_MEDIA">true</productvar> <productvar name="PRODUCT_DIR">/</productvar> <productvar name="PRODUCT_NAME">$DISTNAME-$FLAVOR</productvar> @@ -35,11 +35,11 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20230729</productvar> + <productvar name="VERSION">20230730</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20230729,openSUSE Tumbleweed</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20230730,openSUSE Tumbleweed</productinfo> <productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo> - <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20230729/x86_64</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20230730/x86_64</productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="DEBUGMEDIUM">2</productoption> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption> ++++++ MicroOS.product ++++++ --- /var/tmp/diff_new_pack.xqa1Yn/_old 2023-07-31 03:20:54.579085220 +0200 +++ /var/tmp/diff_new_pack.xqa1Yn/_new 2023-07-31 03:20:54.583085243 +0200 @@ -6,7 +6,7 @@ <name>MicroOS</name> <releasepkgname>MicroOS-release</releasepkgname> <endoflife/> - <version>20230729</version> + <version>20230730</version>  <release>0</release> <productline>MicroOS</productline> ++++++ openSUSE-Addon-NonOss.product ++++++ --- /var/tmp/diff_new_pack.xqa1Yn/_old 2023-07-31 03:20:54.687085854 +0200 +++ /var/tmp/diff_new_pack.xqa1Yn/_new 2023-07-31 03:20:54.687085854 +0200 @@ -4,7 +4,7 @@ <product> <vendor>openSUSE</vendor> <name>openSUSE-Addon-NonOss</name> - <version>20230729</version> + <version>20230730</version> <release>0</release> <summary>openSUSE NonOSS Addon</summary> <shortsummary>non oss addon</shortsummary> ++++++ openSUSE.product ++++++ --- /var/tmp/diff_new_pack.xqa1Yn/_old 2023-07-31 03:20:54.703085948 +0200 +++ /var/tmp/diff_new_pack.xqa1Yn/_new 2023-07-31 03:20:54.707085971 +0200 @@ -4,7 +4,7 @@ <product> <vendor>openSUSE</vendor> <name>openSUSE</name> - <version>20230729</version> + <version>20230730</version> <release>0</release> <productline>openSUSE</productline> ++++++ unsorted.yml ++++++ --- /var/tmp/diff_new_pack.xqa1Yn/_old 2023-07-31 03:20:54.787086441 +0200 +++ /var/tmp/diff_new_pack.xqa1Yn/_new 2023-07-31 03:20:54.791086465 +0200 @@ -14413,6 +14413,7 @@ - librdmacm-utils - librdmacm1-32bit - libre12 + - libre2-11 - libreadline-java - libreadline-java-javadoc - libreadline5 @@ -33930,6 +33931,7 @@ - rds-tools - rds-tools-devel - re-devel + - re2-10-devel - re2-devel - read-edid - read-only-root-fs-volatile

1 0

commit 000release-packages for openSUSE:Factory
by Source-Sync 30 Jul '23

30 Jul '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package 000release-packages for openSUSE:Factory checked in at 2023-07-30 22:41:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000release-packages (Old) and /work/SRC/openSUSE:Factory/.000release-packages.new.32662 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000release-packages" Sun Jul 30 22:41:44 2023 rev:2420 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MicroOS-release.spec ++++++ --- /var/tmp/diff_new_pack.2FlI7q/_old 2023-07-30 22:41:47.596189633 +0200 +++ /var/tmp/diff_new_pack.2FlI7q/_new 2023-07-30 22:41:47.604189680 +0200 @@ -17,7 +17,7 @@ Name: MicroOS-release -Version: 20230729 +Version: 20230730 Release: 0 Summary: openSUSE MicroOS License: GPL-2.0-or-later @@ -176,9 +176,9 @@ %include %{SOURCE100} Provides: %name-%version Provides: product() = MicroOS -Provides: product(MicroOS) = 20230729-0 +Provides: product(MicroOS) = 20230730-0 Provides: product-label() = openSUSE%20MicroOS -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20230729 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20230730 Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm Provides: product-endoflife() Requires: product_flavor(MicroOS) @@ -194,7 +194,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(MicroOS) = 20230729-0 +Provides: product_flavor(MicroOS) = 20230730-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description dvd @@ -210,7 +210,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance) -Provides: product_flavor(MicroOS) = 20230729-0 +Provides: product_flavor(MicroOS) = 20230730-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description appliance @@ -275,11 +275,11 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>MicroOS</name> - <version>20230729</version> + <version>20230730</version> <release>0</release> <endoflife></endoflife> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:microos:20230729</cpeid> + <cpeid>cpe:/o:opensuse:microos:20230730</cpeid> <productline>MicroOS</productline> <register> <pool> ++++++ openSUSE-Addon-NonOss-release.spec ++++++ --- /var/tmp/diff_new_pack.2FlI7q/_old 2023-07-30 22:41:47.628189822 +0200 +++ /var/tmp/diff_new_pack.2FlI7q/_new 2023-07-30 22:41:47.632189845 +0200 @@ -1,5 +1,5 @@ # -# spec file for package openSUSE-Addon-NonOss-release (Version 20230729) +# spec file for package openSUSE-Addon-NonOss-release (Version 20230730) # # Copyright (c) 2023 openSUSE. # @@ -16,7 +16,7 @@ Name: openSUSE-Addon-NonOss-release %define product openSUSE-Addon-NonOss Summary: openSUSE NonOSS Addon%{?betaversion: %{betaversion}} -Version: 20230729 +Version: 20230730 Release: 0 License: BSD-3-Clause Group: System/Fhs @@ -24,9 +24,9 @@ Provides: %name-%version Provides: product() = openSUSE%2DAddon%2DNonOss -Provides: product(openSUSE-Addon-NonOss) = 20230729-0 +Provides: product(openSUSE-Addon-NonOss) = 20230730-0 Provides: product-label() = non%20oss%20addon -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20230729 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20230730 AutoReqProv: on @@ -49,10 +49,10 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>openSUSE-Addon-NonOss</name> - <version>20230729</version> + <version>20230730</version> <release>0</release> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20230729</cpeid> + <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20230730</cpeid> <register> <pool> </pool> ++++++ openSUSE-release.spec ++++++ --- /var/tmp/diff_new_pack.2FlI7q/_old 2023-07-30 22:41:47.648189940 +0200 +++ /var/tmp/diff_new_pack.2FlI7q/_new 2023-07-30 22:41:47.656189987 +0200 @@ -20,7 +20,7 @@ #define betaversion %{nil} %define codename Tumbleweed Name: openSUSE-release -Version: 20230729 +Version: 20230730 Release: 0 # 0 is the product release, not the build release of this package Summary: openSUSE Tumbleweed @@ -180,7 +180,7 @@ %include %{SOURCE100} Provides: %name-%version Provides: product() = openSUSE -Provides: product(openSUSE) = 20230729-0 +Provides: product(openSUSE) = 20230730-0 %ifarch x86_64 Provides: product-register-target() = openSUSE%2DTumbleweed%2Dx86_64 %endif @@ -194,7 +194,7 @@ Provides: product-register-target() = openSUSE%2DTumbleweed%2Daarch64 %endif Provides: product-label() = openSUSE -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20230729 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20230730 Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm Provides: product-url(repository) = http%3A%2F%2Fdownload.opensuse.org%2Ftumbleweed%2Frepo%2Foss%2F Requires: product_flavor(openSUSE) @@ -208,7 +208,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(ftp) -Provides: product_flavor(openSUSE) = 20230729-0 +Provides: product_flavor(openSUSE) = 20230730-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description ftp @@ -223,7 +223,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(mini) -Provides: product_flavor(openSUSE) = 20230729-0 +Provides: product_flavor(openSUSE) = 20230730-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description mini @@ -238,7 +238,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(openSUSE) = 20230729-0 +Provides: product_flavor(openSUSE) = 20230730-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description dvd @@ -253,7 +253,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-kde) -Provides: product_flavor(openSUSE) = 20230729-0 +Provides: product_flavor(openSUSE) = 20230730-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-kde @@ -268,7 +268,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-x11) -Provides: product_flavor(openSUSE) = 20230729-0 +Provides: product_flavor(openSUSE) = 20230730-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-x11 @@ -283,7 +283,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-gnome) -Provides: product_flavor(openSUSE) = 20230729-0 +Provides: product_flavor(openSUSE) = 20230730-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-gnome @@ -298,7 +298,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-xfce) -Provides: product_flavor(openSUSE) = 20230729-0 +Provides: product_flavor(openSUSE) = 20230730-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-xfce @@ -313,7 +313,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-kde) -Provides: product_flavor(openSUSE) = 20230729-0 +Provides: product_flavor(openSUSE) = 20230730-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description usb-kde @@ -328,7 +328,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-gnome) -Provides: product_flavor(openSUSE) = 20230729-0 +Provides: product_flavor(openSUSE) = 20230730-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description usb-gnome @@ -343,7 +343,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-x11) -Provides: product_flavor(openSUSE) = 20230729-0 +Provides: product_flavor(openSUSE) = 20230730-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description usb-x11 @@ -358,7 +358,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance) -Provides: product_flavor(openSUSE) = 20230729-0 +Provides: product_flavor(openSUSE) = 20230730-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance @@ -373,7 +373,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-docker) -Provides: product_flavor(openSUSE) = 20230729-0 +Provides: product_flavor(openSUSE) = 20230730-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-docker @@ -388,7 +388,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-kvm) -Provides: product_flavor(openSUSE) = 20230729-0 +Provides: product_flavor(openSUSE) = 20230730-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-kvm @@ -403,7 +403,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-vmware) -Provides: product_flavor(openSUSE) = 20230729-0 +Provides: product_flavor(openSUSE) = 20230730-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-vmware @@ -418,7 +418,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-openstack) -Provides: product_flavor(openSUSE) = 20230729-0 +Provides: product_flavor(openSUSE) = 20230730-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-openstack @@ -433,7 +433,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-hyperv) -Provides: product_flavor(openSUSE) = 20230729-0 +Provides: product_flavor(openSUSE) = 20230730-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-hyperv @@ -448,7 +448,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-vagrant) -Provides: product_flavor(openSUSE) = 20230729-0 +Provides: product_flavor(openSUSE) = 20230730-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-vagrant @@ -463,7 +463,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-wsl) -Provides: product_flavor(openSUSE) = 20230729-0 +Provides: product_flavor(openSUSE) = 20230730-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-wsl @@ -478,7 +478,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-custom) -Provides: product_flavor(openSUSE) = 20230729-0 +Provides: product_flavor(openSUSE) = 20230730-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-custom @@ -558,10 +558,10 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>openSUSE</name> - <version>20230729</version> + <version>20230730</version> <release>0</release> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:opensuse:20230729</cpeid> + <cpeid>cpe:/o:opensuse:opensuse:20230730</cpeid> <productline>openSUSE</productline> <register> <target>openSUSE-Tumbleweed-x86_64</target>

1 0

commit foot for openSUSE:Factory
by Source-Sync 30 Jul '23

30 Jul '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package foot for openSUSE:Factory checked in at 2023-07-30 20:58:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/foot (Old) and /work/SRC/openSUSE:Factory/.foot.new.32662 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "foot" Sun Jul 30 20:58:26 2023 rev:25 rq:1101397 version:1.15.2 Changes: -------- --- /work/SRC/openSUSE:Factory/foot/foot.changes 2023-07-24 18:26:05.482194155 +0200 +++ /work/SRC/openSUSE:Factory/.foot.new.32662/foot.changes 2023-07-30 20:58:34.087503316 +0200 @@ -1,0 +2,10 @@ +Sun Jul 30 17:16:33 UTC 2023 - Arnav Singh <opensuse(a)arnavion.dev> + +- Update to v1.15.2: + * foot.ini options: + * Added tweak.bold-text-in-bright-amount option. + * Fixed various crashes related to copy-paste, font sizes, wayland support + of compositor, and more. + * See https://codeberg.org/dnkl/foot/releases/tag/1.15.2 for more details. + +------------------------------------------------------------------- Old: ---- foot-1.15.1.tar.gz New: ---- foot-1.15.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ foot.spec ++++++ --- /var/tmp/diff_new_pack.IRQENx/_old 2023-07-30 20:58:34.699506950 +0200 +++ /var/tmp/diff_new_pack.IRQENx/_new 2023-07-30 20:58:34.703506974 +0200 @@ -17,7 +17,7 @@ Name: foot -Version: 1.15.1 +Version: 1.15.2 Release: 0 Summary: A Wayland terminal emulator License: MIT @@ -78,6 +78,7 @@ -Dgrapheme-clustering=enabled \ -Dime=true \ -Dterminfo=enabled \ + -Dterminfo-base-name=foot-extra \ -Dtests=false \ -Dthemes=true \ -Dutmp-backend=libutempter \ @@ -87,8 +88,6 @@ %install %meson_install rm -r %{buildroot}/%{_datadir}/doc/%{name}/ -mv %{buildroot}/%{_datadir}/terminfo/f/foot %{buildroot}/%{_datadir}/terminfo/f/foot-extra -mv %{buildroot}/%{_datadir}/terminfo/f/foot-direct %{buildroot}/%{_datadir}/terminfo/f/foot-extra-direct %files %license LICENSE ++++++ foot-1.15.1.tar.gz -> foot-1.15.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/foot/.builds/alpine-x64.yml new/foot/.builds/alpine-x64.yml --- old/foot/.builds/alpine-x64.yml 2023-07-21 08:57:03.000000000 +0200 +++ new/foot/.builds/alpine-x64.yml 2023-07-30 13:18:55.000000000 +0200 @@ -47,6 +47,9 @@ ninja -C bld/release -k0 meson test -C bld/release --print-errorlogs - codespell: | + python3 -m venv codespell-venv + source codespell-venv/bin/activate pip install codespell cd foot ~/.local/bin/codespell -Lser,doas,zar README.md INSTALL.md CHANGELOG.md *.c *.h doc/*.scd + deactivate diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/foot/.woodpecker.yml new/foot/.woodpecker.yml --- old/foot/.woodpecker.yml 2023-07-21 08:57:03.000000000 +0200 +++ new/foot/.woodpecker.yml 2023-07-30 13:18:55.000000000 +0200 @@ -8,8 +8,11 @@ commands: - apk add python3 - apk add py3-pip + - python3 -m venv codespell-venv + - source codespell-venv/bin/activate - pip install codespell - codespell -Lser,doas,zar README.md INSTALL.md CHANGELOG.md *.c *.h doc/*.scd + - deactivate subprojects: when: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/foot/CHANGELOG.md new/foot/CHANGELOG.md --- old/foot/CHANGELOG.md 2023-07-21 08:57:03.000000000 +0200 +++ new/foot/CHANGELOG.md 2023-07-30 13:18:55.000000000 +0200 @@ -1,5 +1,6 @@ # Changelog +* [1.15.2](#1-15-2) * [1.15.1](#1-15-1) * [1.15.0](#1-15-0) * [1.14.0](#1-14-0) @@ -43,6 +44,44 @@ * [1.2.0](#1-2-0) +## 1.15.2 + +### Added + +* `[tweak].bold-text-in-bright-amount` option ([#1434][1434]). +* `-Dterminfo-base-name` meson option, allowing you to name the + terminfo files to something other than `-Ddefault-terminfo`. Use + case: have foot default to using the terminfo from ncurses (`foot`, + `foot-direct`), while still packaging foot's terminfo files, but + under a different name (e.g. `foot-extra`, `foot-extra-direct`). + +[1434]: https://codeberg.org/dnkl/foot/issues/1434 + + +### Fixed + +* Crash when copying text that contains invalid UTF-8 ([#1423][1423]). +* Wrong font size after suspending the monitor ([#1431][1431]). +* Vertical alignment in URL jump labels, and the scrollback position + indicator ([#1430][1430]). +* Regression: line- and box drawing characters not covering the full + height of the line, when a custom `line-height` is being used + ([#1430][1430]). +* Crash when compositor does not implement the _viewporter_ interface + ([#1444][1444]). +* CSD rendering with fractional scaling ([#1441][1441]). +* Regression: crash with certain combinations of + `--window-size-chars=NxM` and desktop scaling factors + ([#1446][1446]). + +[1423]: https://codeberg.org/dnkl/foot/issues/1423 +[1431]: https://codeberg.org/dnkl/foot/issues/1431 +[1430]: https://codeberg.org/dnkl/foot/issues/1430 +[1444]: https://codeberg.org/dnkl/foot/issues/1444 +[1441]: https://codeberg.org/dnkl/foot/issues/1441 +[1446]: https://codeberg.org/dnkl/foot/issues/1446 + + ## 1.15.1 ### Changed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/foot/INSTALL.md new/foot/INSTALL.md --- old/foot/INSTALL.md 2023-07-21 08:57:03.000000000 +0200 +++ new/foot/INSTALL.md 2023-07-30 13:18:55.000000000 +0200 @@ -151,6 +151,7 @@ | `-Dgrapheme-clustering` | feature | `auto` | Enables grapheme clustering | libutf8proc | | `-Dterminfo` | feature | `enabled` | Build and install terminfo files | tic (ncurses) | | `-Ddefault-terminfo` | string | `foot` | Default value of `TERM` | None | +| `-Dterminfo-base-name` | string | `-Ddefault-terminfo` | Base name of the generated terminfo files | None | | `-Dcustom-terminfo-install-location` | string | `${datadir}/terminfo` | Value to set `TERMINFO` to | None | | `-Dsystemd-units-dir` | string | `${systemduserunitdir}` | Where to install the systemd service files (absolute) | None | | `-Dutmp-backend` | combo | `auto` | Which utmp backend to use (`none`, `libutempter`, `ulog` or `auto`) | libutempter or ulog | @@ -165,8 +166,18 @@ `$TERM`, and the names of the terminfo files (if `-Dterminfo=enabled`). -`-Dcustom-terminfo-install-location` enables foot’s terminfo to -co-exist with ncurses’ version, without changing the terminfo +If you want foot to use the terminfo files from ncurses, but still +package foot's own terminfo files under a different name, you can use +the `-Dterminfo-base-name` option. Many distributions use the name +`foot-extra`, and thus it might be a good idea to re-use that: + +```sh +meson ... -Ddefault-terminfo=foot -Dterminfo-base-name=foot-extra +``` +(or just leave out `-Ddefault-terminfo`, since it defaults to `foot` anyway). + +Finally, `-Dcustom-terminfo-install-location` enables foot’s terminfo +to co-exist with ncurses’ version, without changing the terminfo names. The idea is that you install foot’s terminfo to a non-standard location, for example `/usr/share/foot/terminfo`. Use `-Dcustom-terminfo-install-location` to tell foot where the terminfo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/foot/box-drawing.c new/foot/box-drawing.c --- old/foot/box-drawing.c 2023-07-21 08:57:03.000000000 +0200 +++ new/foot/box-drawing.c 2023-07-30 13:18:55.000000000 +0200 @@ -3011,7 +3011,7 @@ .cols = 1, .pix = buf.pix, .x = -term->font_x_ofs, - .y = term->font_y_ofs + term->fonts[0]->ascent, + .y = term_font_baseline(term), .width = width, .height = height, .advance = { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/foot/config.c new/foot/config.c --- old/foot/config.c 2023-07-21 08:57:03.000000000 +0200 +++ new/foot/config.c 2023-07-30 13:18:55.000000000 +0200 @@ -480,7 +480,7 @@ } static bool NOINLINE -value_to_double(struct context *ctx, float *res) +value_to_float(struct context *ctx, float *res) { const char *s = ctx->value; @@ -659,7 +659,7 @@ res->px = value; } else { float value; - if (!value_to_double(ctx, &value)) + if (!value_to_float(ctx, &value)) return false; res->pt = value; res->px = 0; @@ -1089,7 +1089,7 @@ } else if (strcmp(key, "multiplier") == 0) - return value_to_double(ctx, &conf->scrollback.multiplier); + return value_to_float(ctx, &conf->scrollback.multiplier); else { LOG_CONTEXTUAL_ERR("not a valid option: %s", key); @@ -1298,7 +1298,7 @@ else if (strcmp(key, "alpha") == 0) { float alpha; - if (!value_to_double(ctx, &alpha)) + if (!value_to_float(ctx, &alpha)) return false; if (alpha < 0. || alpha > 1.) { @@ -2461,7 +2461,7 @@ } else if (strcmp(key, "box-drawing-base-thickness") == 0) - return value_to_double(ctx, &conf->tweak.box_drawing_base_thickness); + return value_to_float(ctx, &conf->tweak.box_drawing_base_thickness); else if (strcmp(key, "box-drawing-solid-shades") == 0) return value_to_bool(ctx, &conf->tweak.box_drawing_solid_shades); @@ -2472,6 +2472,9 @@ else if (strcmp(key, "sixel") == 0) return value_to_bool(ctx, &conf->tweak.sixel); + else if (strcmp(key, "bold-text-in-bright-amount") == 0) + return value_to_float(ctx, &conf->bold_in_bright.amount); + else { LOG_CONTEXTUAL_ERR("not a valid option: %s", key); return false; @@ -2939,6 +2942,7 @@ .bold_in_bright = { .enabled = false, .palette_based = false, + .amount = 1.3, }, .startup_mode = STARTUP_WINDOWED, .fonts = {{0}}, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/foot/config.h new/foot/config.h --- old/foot/config.h 2023-07-21 08:57:03.000000000 +0200 +++ new/foot/config.h 2023-07-30 13:18:55.000000000 +0200 @@ -133,6 +133,7 @@ struct { bool enabled; bool palette_based; + float amount; } bold_in_bright; enum { STARTUP_WINDOWED, STARTUP_MAXIMIZED, STARTUP_FULLSCREEN } startup_mode; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/foot/csi.c new/foot/csi.c --- old/foot/csi.c 2023-07-21 08:57:03.000000000 +0200 +++ new/foot/csi.c 2023-07-30 13:18:55.000000000 +0200 @@ -1208,8 +1208,8 @@ char reply[64]; size_t n = xsnprintf( reply, sizeof(reply), "\033[4;%d;%dt", - (int)round(height / term->scale), - (int)(width / term->scale)); + (int)roundf(height / term->scale), + (int)roundf((width / term->scale))); term_to_slave(term, reply, n); } break; @@ -1233,8 +1233,8 @@ char reply[64]; size_t n = xsnprintf( reply, sizeof(reply), "\033[6;%d;%dt", - (int)round(term->cell_height / term->scale), - (int)round(term->cell_width / term->scale)); + (int)roundf(term->cell_height / term->scale), + (int)roundf(term->cell_width / term->scale)); term_to_slave(term, reply, n); break; } @@ -1252,8 +1252,8 @@ char reply[64]; size_t n = xsnprintf( reply, sizeof(reply), "\033[9;%d;%dt", - (int)round(it->item->dim.px_real.height / term->cell_height / term->scale), - (int)round(it->item->dim.px_real.width / term->cell_width / term->scale)); + (int)roundf(it->item->dim.px_real.height / term->cell_height / term->scale), + (int)roundf(it->item->dim.px_real.width / term->cell_width / term->scale)); term_to_slave(term, reply, n); break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/foot/doc/foot.ini.5.scd new/foot/doc/foot.ini.5.scd --- old/foot/doc/foot.ini.5.scd 2023-07-21 08:57:03.000000000 +0200 +++ new/foot/doc/foot.ini.5.scd 2023-07-30 13:18:55.000000000 +0200 @@ -1337,7 +1337,13 @@ Default: _512_. Maximum allowed: _2048_ (2GB). *sixel* - Boolean. When enabled, foot will process sixel images. Default: _yes_ + Boolean. When enabled, foot will process sixel images. Default: + _yes_ + +*bold-text-in-bright-amount* + Amount by which bold fonts are brightened when + *bold-text-in-bright* is set to *yes* (the *palette-based* variant + is not affected by this option). Default: _1.3_. # SEE ALSO diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/foot/hsl.c new/foot/hsl.c --- old/foot/hsl.c 2023-07-21 08:57:03.000000000 +0200 +++ new/foot/hsl.c 2023-07-30 13:18:55.000000000 +0200 @@ -83,7 +83,7 @@ b += m; return ( - (int)round(r * 255.) << 16 | - (int)round(g * 255.) << 8 | - (int)round(b * 255.) << 0); + (uint8_t)round(r * 255.) << 16 | + (uint8_t)round(g * 255.) << 8 | + (uint8_t)round(b * 255.) << 0); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/foot/meson.build new/foot/meson.build --- old/foot/meson.build 2023-07-21 08:57:03.000000000 +0200 +++ new/foot/meson.build 2023-07-30 13:18:55.000000000 +0200 @@ -1,5 +1,5 @@ project('foot', 'c', - version: '1.15.1', + version: '1.15.2', license: 'MIT', meson_version: '>=0.59.0', default_options: [ @@ -352,11 +352,16 @@ install_subdir('themes', install_dir: join_paths(get_option('datadir'), 'foot')) endif +terminfo_base_name = get_option('terminfo-base-name') +if terminfo_base_name == '' + terminfo_base_name = get_option('default-terminfo') +endif + tic = find_program('tic', native: true, required: get_option('terminfo')) if tic.found() conf_data = configuration_data( { - 'default_terminfo': get_option('default-terminfo'), + 'default_terminfo': terminfo_base_name } ) @@ -367,9 +372,9 @@ ) custom_target( 'terminfo', - output: get_option('default-terminfo')[0], + output: terminfo_base_name[0], input: preprocessed, - command: [tic, '-x', '-o', '@OUTDIR@', '-e', '@0@,@0@-direct'.format(get_option('default-terminfo')), '@INPUT@'], + command: [tic, '-x', '-o', '@OUTDIR@', '-e', '@0@,@0@-direct'.format(terminfo_base_name), '@INPUT@'], install: true, install_dir: terminfo_install_location ) @@ -395,6 +400,7 @@ 'utmp backend': utmp_backend, 'utmp helper default path': utmp_default_helper_path, 'Build terminfo': tic.found(), + 'Terminfo base name': terminfo_base_name, 'Terminfo install location': terminfo_install_location, 'Default TERM': get_option('default-terminfo'), 'Set TERMINFO': get_option('custom-terminfo-install-location') != '', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/foot/meson_options.txt new/foot/meson_options.txt --- old/foot/meson_options.txt 2023-07-21 08:57:03.000000000 +0200 +++ new/foot/meson_options.txt 2023-07-30 13:18:55.000000000 +0200 @@ -15,7 +15,8 @@ option('terminfo', type: 'feature', value: 'enabled', description: 'Build and install foot\'s terminfo files.') option('default-terminfo', type: 'string', value: 'foot', description: 'Default value of the "term" option in foot.ini.') - +option('terminfo-base-name', type: 'string', + description: 'Base name of the generated terminfo files. Defaults to the value of the \'default-terminfo\' meson option') option('custom-terminfo-install-location', type: 'string', value: '', description: 'Path to foot\'s terminfo, relative to ${prefix}. If set, foot will set $TERMINFO to this value in the client process.') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/foot/render.c new/foot/render.c --- old/foot/render.c 2023-07-21 08:57:03.000000000 +0200 +++ new/foot/render.c 2023-07-30 13:18:55.000000000 +0200 @@ -299,25 +299,16 @@ int hue, sat, lum; rgb_to_hsl(color, &hue, &sat, &lum); - return hsl_to_rgb(hue, sat, min(100, lum * 1.3)); -} - -static inline int -font_baseline(const struct terminal *term) -{ - const struct fcft_font *font = term->fonts[0]; - const int line_height = term->cell_height; - const int font_height = font->ascent + font->descent; - const int glyph_top_y = round((line_height - font_height) / 2.); - return term->font_y_ofs + glyph_top_y + font->ascent; + lum = (int)roundf(lum * term->conf->bold_in_bright.amount); + return hsl_to_rgb(hue, sat, min(lum, 100)); } static void draw_unfocused_block(const struct terminal *term, pixman_image_t *pix, const pixman_color_t *color, int x, int y, int cell_cols) { - const int scale = round(term->scale); + const int scale = (int)roundf(term->scale); const int width = min(min(scale, term->cell_width), term->cell_height); pixman_image_fill_rectangles( @@ -335,7 +326,7 @@ const struct fcft_font *font, const pixman_color_t *color, int x, int y) { - int baseline = y + font_baseline(term) - term->fonts[0]->ascent; + int baseline = y + term_font_baseline(term) - term->fonts[0]->ascent; pixman_image_fill_rectangles( PIXMAN_OP_SRC, pix, color, 1, &(pixman_rectangle16_t){ @@ -347,7 +338,7 @@ static int underline_offset(const struct terminal *term, const struct fcft_font *font) { - return font_baseline(term) - + return term_font_baseline(term) - (term->conf->use_custom_underline_offset ? -term_pt_or_px_as_pixels(term, &term->conf->underline_offset) : font->underline.position); @@ -401,7 +392,7 @@ pixman_image_fill_rectangles( PIXMAN_OP_SRC, pix, color, 1, &(pixman_rectangle16_t){ - x, y + font_baseline(term) - font->strikeout.position, + x, y + term_font_baseline(term) - font->strikeout.position, cols * term->cell_width, font->strikeout.thickness}); } @@ -767,13 +758,13 @@ if (!(cell->attrs.blink && term->blink.state == BLINK_OFF)) { pixman_image_composite32( PIXMAN_OP_OVER, glyph->pix, NULL, pix, 0, 0, 0, 0, - pen_x + letter_x_ofs + g_x, y + font_baseline(term) - g_y, + pen_x + letter_x_ofs + g_x, y + term_font_baseline(term) - g_y, glyph->width, glyph->height); } } else { pixman_image_composite32( PIXMAN_OP_OVER, clr_pix, glyph->pix, pix, 0, 0, 0, 0, - pen_x + letter_x_ofs + g_x, y + font_baseline(term) - g_y, + pen_x + letter_x_ofs + g_x, y + term_font_baseline(term) - g_y, glyph->width, glyph->height); /* Combining characters */ @@ -813,7 +804,7 @@ /* Some fonts use a negative offset, while others use a * "normal" offset */ pen_x + x_ofs + g->x, - y + font_baseline(term) - g->y, + y + term_font_baseline(term) - g->y, g->width, g->height); } } @@ -1817,33 +1808,49 @@ const bool borders_visible = wayl_win_csd_borders_visible(term->window); const bool title_visible = wayl_win_csd_titlebar_visible(term->window); - /* Only title bar is rendered in maximized mode */ + const float scale = term->scale; + const int border_width = borders_visible - ? term->conf->csd.border_width * term->scale : 0; + ? roundf(term->conf->csd.border_width * scale) : 0; const int title_height = title_visible - ? term->conf->csd.title_height * term->scale : 0; + ? roundf(term->conf->csd.title_height * scale) : 0; const int button_width = title_visible - ? term->conf->csd.button_width * term->scale : 0; + ? roundf(term->conf->csd.button_width * scale) : 0; const int button_close_width = term->width >= 1 * button_width ? button_width : 0; const int button_maximize_width = term->width >= 2 * button_width && term->window->wm_capabilities.maximize - ? button_width : 0; + ? button_width : 0; const int button_minimize_width = term->width >= 3 * button_width && term->window->wm_capabilities.minimize - ? button_width : 0; + ? button_width : 0; + + /* + * With fractional scaling, we must ensure the offset, when + * divided by the scale (in set_position()), and the scaled back + * (by the compositor), matches the actual pixel count made up by + * the titlebar and the border. + */ + const int top_offset = roundf( + scale * (roundf(-title_height / scale) - roundf(border_width / scale))); + + const int top_bottom_width = roundf( + scale * (roundf(term->width / scale) + 2 * roundf(border_width / scale))); + + const int left_right_height = roundf( + scale * (roundf(title_height / scale) + roundf(term->height / scale))); switch (surf_idx) { - case CSD_SURF_TITLE: return (struct csd_data){ 0, -title_height, term->width, title_height}; - case CSD_SURF_LEFT: return (struct csd_data){-border_width, -title_height, border_width, title_height + term->height}; - case CSD_SURF_RIGHT: return (struct csd_data){ term->width, -title_height, border_width, title_height + term->height}; - case CSD_SURF_TOP: return (struct csd_data){-border_width, -title_height - border_width, term->width + 2 * border_width, border_width}; - case CSD_SURF_BOTTOM: return (struct csd_data){-border_width, term->height, term->width + 2 * border_width, border_width}; + case CSD_SURF_TITLE: return (struct csd_data){ 0, -title_height, term->width, title_height}; + case CSD_SURF_LEFT: return (struct csd_data){-border_width, -title_height, border_width, left_right_height}; + case CSD_SURF_RIGHT: return (struct csd_data){ term->width, -title_height, border_width, left_right_height}; + case CSD_SURF_TOP: return (struct csd_data){-border_width, top_offset, top_bottom_width, border_width}; + case CSD_SURF_BOTTOM: return (struct csd_data){-border_width, term->height, top_bottom_width, border_width}; /* Positioned relative to CSD_SURF_TITLE */ case CSD_SURF_MINIMIZE: return (struct csd_data){term->width - 3 * button_width, 0, button_minimize_width, title_height}; @@ -1937,12 +1944,12 @@ if (pixman_image_get_format(glyph->pix) == PIXMAN_a8r8g8b8) { pixman_image_composite32( PIXMAN_OP_OVER, glyph->pix, NULL, buf->pix[0], 0, 0, 0, 0, - x + x_ofs + glyph->x, y + term->font_y_ofs + font->ascent - glyph->y, + x + x_ofs + glyph->x, y + term->font_y_ofs + font->ascent /*term_font_baseline(term)*/ - glyph->y, glyph->width, glyph->height); } else { pixman_image_composite32( PIXMAN_OP_OVER, src, glyph->pix, buf->pix[0], 0, 0, 0, 0, - x + x_ofs + glyph->x, y + term->font_y_ofs + font->ascent - glyph->y, + x + x_ofs + glyph->x, y + term->font_y_ofs + font->ascent /* term_font_baseline(term)*/ - glyph->y, glyph->width, glyph->height); } @@ -2033,8 +2040,8 @@ */ float scale = term->scale; - int bwidth = round(term->conf->csd.border_width * scale); - int vwidth = round(term->conf->csd.border_width_visible * scale); /* Visible size */ + int bwidth = (int)roundf(term->conf->csd.border_width * scale); + int vwidth = (int)roundf(term->conf->csd.border_width_visible * scale); /* Visible size */ xassert(bwidth >= vwidth); @@ -2379,6 +2386,7 @@ if (term->window->is_fullscreen) return; + const float scale = term->scale; struct csd_data infos[CSD_SURF_COUNT]; int widths[CSD_SURF_COUNT]; int heights[CSD_SURF_COUNT]; @@ -2406,8 +2414,7 @@ widths[i] = width; heights[i] = height; - - wl_subsurface_set_position(sub, x / term->scale, y / term->scale); + wl_subsurface_set_position(sub, roundf(x / scale), roundf(y / scale)); } struct buffer *bufs[CSD_SURF_COUNT]; @@ -2498,7 +2505,7 @@ char lineno_str[64]; snprintf(lineno_str, sizeof(lineno_str), "%d", rebased_view + 1); mbstoc32(_text, lineno_str, ALEN(_text)); - cell_count = ceil(log10(term->grid->num_rows)); + cell_count = (int)ceilf(log10f(term->grid->num_rows)); break; } @@ -2508,13 +2515,14 @@ break; } - const int scale = term->scale; - const int margin = 3 * scale; + const float scale = term->scale; + const int margin = (int)roundf(3. * scale); + + int width = margin + cell_count * term->cell_width + margin; + int height = margin + term->cell_height + margin; - const int width = - (2 * margin + cell_count * term->cell_width + scale - 1) / scale * scale; - const int height = - (2 * margin + term->cell_height + scale - 1) / scale * scale; + width = roundf(scale * ceilf(width / scale)); + height = roundf(scale * ceilf(height / scale)); /* *Where* to render - parent relative coordinates */ int surf_top = 0; @@ -2542,8 +2550,11 @@ } } - const int x = (term->width - margin - width) / scale * scale; - const int y = (term->margins.top + surf_top) / scale * scale; + int x = term->width - margin - width; + int y = term->margins.top + surf_top; + + x = roundf(scale * ceilf(x / scale)); + y = roundf(scale * ceilf(y / scale)); if (y + height > term->height) { wl_surface_attach(win->scrollback_indicator.surface.surf, NULL, 0, 0); @@ -2555,7 +2566,7 @@ struct buffer *buf = shm_get_buffer(chain, width, height); wl_subsurface_set_position( - win->scrollback_indicator.sub, x / scale, y / scale); + win->scrollback_indicator.sub, roundf(x / scale), roundf(y / scale)); uint32_t fg = term->colors.table[0]; uint32_t bg = term->colors.table[8 + 4]; @@ -2584,21 +2595,23 @@ char32_t text[256]; mbstoc32(text, usecs_str, ALEN(text)); - const int scale = round(term->scale); + const float scale = term->scale; const int cell_count = c32len(text); - const int margin = 3 * scale; - const int width = - (2 * margin + cell_count * term->cell_width + scale - 1) / scale * scale; - const int height = - (2 * margin + term->cell_height + scale - 1) / scale * scale; + const int margin = (int)roundf(3. * scale); + + int width = margin + cell_count * term->cell_width + margin; + int height = margin + term->cell_height + margin; + + width = roundf(scale * ceilf(width / scale)); + height = roundf(scale * ceilf(height / scale)); struct buffer_chain *chain = term->render.chains.render_timer; struct buffer *buf = shm_get_buffer(chain, width, height); wl_subsurface_set_position( win->render_timer.sub, - margin / term->scale, - (term->margins.top + term->cell_height - margin) / term->scale); + roundf(margin / scale), + roundf((term->margins.top + term->cell_height - margin) / scale)); render_osd( term, @@ -3143,18 +3156,21 @@ const size_t total_cells = c32swidth(text, text_len); const size_t wanted_visible_cells = max(20, total_cells); - xassert(term->scale >= 1); - const int rounded_scale = round(term->scale); + const float scale = term->scale; + xassert(scale >= 1.); + const size_t margin = (size_t)roundf(3 * scale); + + size_t width = term->width - 2 * margin; + size_t height = min( + term->height - 2 * margin, + margin + 1 * term->cell_height + margin); - const size_t margin = 3 * rounded_scale; + width = roundf(scale * ceilf((term->width - 2 * margin) / scale)); + height = roundf(scale * ceilf(height / scale)); - const size_t width = term->width - 2 * margin; - const size_t visible_width = min( + size_t visible_width = min( term->width - 2 * margin, - (2 * margin + wanted_visible_cells * term->cell_width + rounded_scale - 1) / rounded_scale * rounded_scale); - const size_t height = min( - term->height - 2 * margin, - (2 * margin + 1 * term->cell_height + rounded_scale - 1) / rounded_scale * rounded_scale); + margin + wanted_visible_cells * term->cell_width + margin); const size_t visible_cells = (visible_width - 2 * margin) / term->cell_width; size_t glyph_offset = term->render.search_glyph_offset; @@ -3364,7 +3380,7 @@ /* Glyph surface is a pre-rendered image (typically a color emoji...) */ pixman_image_composite32( PIXMAN_OP_OVER, glyph->pix, NULL, buf->pix[0], 0, 0, 0, 0, - x + x_ofs + glyph->x, y + font_baseline(term) - glyph->y, + x + x_ofs + glyph->x, y + term_font_baseline(term) - glyph->y, glyph->width, glyph->height); } else { int combining_ofs = width == 0 @@ -3376,7 +3392,7 @@ pixman_image_composite32( PIXMAN_OP_OVER, src, glyph->pix, buf->pix[0], 0, 0, 0, 0, x + x_ofs + combining_ofs + glyph->x, - y + font_baseline(term) - glyph->y, + y + term_font_baseline(term) - glyph->y, glyph->width, glyph->height); pixman_image_unref(src); } @@ -3401,10 +3417,10 @@ /* TODO: this is only necessary on a window resize */ wl_subsurface_set_position( term->window->search.sub, - margin / term->scale, - max(0, (int32_t)term->height - height - margin) / term->scale); + roundf(margin / scale), + roundf(max(0, (int32_t)term->height - height - margin) / scale)); - wayl_surface_scale(term->window, &term->window->search.surface, buf, term->scale); + wayl_surface_scale(term->window, &term->window->search.surface, buf, scale); wl_surface_attach(term->window->search.surface.surf, buf->wl_buf, 0, 0); wl_surface_damage_buffer(term->window->search.surface.surf, 0, 0, width, height); @@ -3431,9 +3447,9 @@ struct wl_window *win = term->window; xassert(tll_length(win->urls) > 0); - const int scale = round(term->scale); - const int x_margin = 2 * scale; - const int y_margin = 1 * scale; + const float scale = term->scale; + const int x_margin = (int)roundf(2 * scale); + const int y_margin = (int)roundf(1 * scale); /* Calculate view start, counted from the *current* scrollback start */ const int scrollback_end @@ -3603,10 +3619,11 @@ if (cols == 0) continue; - const int width = - (2 * x_margin + cols * term->cell_width + scale - 1) / scale * scale; - const int height = - (2 * y_margin + term->cell_height + scale - 1) / scale * scale; + int width = x_margin + cols * term->cell_width + x_margin; + int height = y_margin + term->cell_height + y_margin; + + width = roundf(scale * ceilf(width / scale)); + height = roundf(scale * ceilf(height / scale)); info[render_count].url = &it->item; info[render_count].text = xc32dup(label); @@ -3642,8 +3659,8 @@ wl_subsurface_set_position( sub_surf->sub, - (term->margins.left + x) / term->scale, - (term->margins.top + y) / term->scale); + roundf((term->margins.left + x) / scale), + roundf((term->margins.top + y) / scale)); render_osd( term, sub_surf, term->fonts[0], bufs[i], label, @@ -3916,22 +3933,9 @@ width += 2 * term->conf->pad_x * scale; height += 2 * term->conf->pad_y * scale; - /* - * Ensure we can scale to logical size, and back to - * pixels without truncating. - */ - if (wayl_fractional_scaling(term->wl)) { - xassert((int)round(scale) == (int)scale); - - int iscale = scale; - if (width % iscale) - width += iscale - width % iscale; - if (height % iscale) - height += iscale - height % iscale; - - xassert(width % iscale == 0); - xassert(height % iscale == 0); - } + /* Ensure width/height is a valid multiple of scale */ + width = roundf(scale * roundf(width / scale)); + height = roundf(scale * roundf(height / scale)); break; } } @@ -3942,8 +3946,8 @@ const int min_rows = 1; /* Minimum window size (must be divisible by the scaling factor)*/ - const int min_width = (min_cols * term->cell_width + scale - 1) / scale * scale; - const int min_height = (min_rows * term->cell_height + scale - 1) / scale * scale; + const int min_width = roundf(scale * ceilf((min_cols * term->cell_width) / scale)); + const int min_height = roundf(scale * ceilf((min_rows * term->cell_height) / scale)); width = max(width, min_width); height = max(height, min_height); @@ -4203,22 +4207,43 @@ const bool title_shown = wayl_win_csd_titlebar_visible(term->window); const bool border_shown = wayl_win_csd_borders_visible(term->window); - const int title_height = - title_shown ? term->conf->csd.title_height : 0; - const int border_width = - border_shown ? term->conf->csd.border_width_visible : 0; + const int title = title_shown + ? roundf(term->conf->csd.title_height * scale) + : 0; + const int border = border_shown + ? roundf(term->conf->csd.border_width_visible * scale) + : 0; + + /* Must use surface logical coordinates (same calculations as + in get_csd_data(), but with different inputs) */ + const int toplevel_min_width = roundf(border / scale) + + roundf(min_width / scale) + + roundf(border / scale); + + const int toplevel_min_height = roundf(border / scale) + + roundf(title / scale) + + roundf(min_height / scale) + + roundf(border / scale); + + const int toplevel_width = roundf(border / scale) + + roundf(term->width / scale) + + roundf(border / scale); + + const int toplevel_height = roundf(border / scale) + + roundf(title / scale) + + roundf(term->height / scale) + + roundf(border / scale); + + const int x = roundf(-border / scale); + const int y = roundf(-title / scale) - roundf(border / scale); xdg_toplevel_set_min_size( term->window->xdg_toplevel, - min_width / scale + 2 * border_width, - min_height / scale + title_height + 2 * border_width); + toplevel_min_width, toplevel_min_height); xdg_surface_set_window_geometry( term->window->xdg_surface, - -border_width, - -title_height - border_width, - term->width / term->scale + 2 * border_width, - term->height / term->scale + title_height + 2 * border_width); + x, y, toplevel_width, toplevel_height); } tll_free(term->normal.scroll_damage); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/foot/selection.c new/foot/selection.c --- old/foot/selection.c 2023-07-21 08:57:03.000000000 +0200 +++ new/foot/selection.c 2023-07-30 13:18:55.000000000 +0200 @@ -1662,7 +1662,7 @@ return; } - size_t len = strlen(selection); + size_t len = selection != NULL ? strlen(selection) : 0; size_t async_idx = 0; switch (async_write(fd, selection, len, &async_idx)) { @@ -1701,7 +1701,6 @@ struct seat *seat = data; const struct wl_clipboard *clipboard = &seat->clipboard; - xassert(clipboard->text != NULL); send_clipboard_or_primary(seat, fd, clipboard->text, "clipboard"); } @@ -1756,7 +1755,6 @@ struct seat *seat = data; const struct wl_primary *primary = &seat->primary; - xassert(primary->text != NULL); send_clipboard_or_primary(seat, fd, primary->text, "primary"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/foot/terminal.c new/foot/terminal.c --- old/foot/terminal.c 2023-07-21 08:57:03.000000000 +0200 +++ new/foot/terminal.c 2023-07-30 13:18:55.000000000 +0200 @@ -784,8 +784,8 @@ /* Use force, since cell-width/height may have changed */ render_resize_force( term, - round(term->width / term->scale), - round(term->height / term->scale)); + (int)roundf(term->width / term->scale), + (int)roundf(term->height / term->scale)); } return true; } @@ -825,7 +825,7 @@ ? tll_back(win->on_outputs) : &tll_front(term->wl->monitors); - if (wayl_fractional_scaling(term->wl)) + if (term_fractional_scaling(term)) return mon->dpi.physical; else return mon->dpi.scaled; @@ -880,12 +880,12 @@ term_pt_or_px_as_pixels(const struct terminal *term, const struct pt_or_px *pt_or_px) { - double scale = !term->font_is_sized_by_dpi ? term->scale : 1.; - double dpi = term->font_is_sized_by_dpi ? term->font_dpi : 96.; + float scale = !term->font_is_sized_by_dpi ? term->scale : 1.; + float dpi = term->font_is_sized_by_dpi ? term->font_dpi : 96.; return pt_or_px->px == 0 - ? round(pt_or_px->pt * scale * dpi / 72) - : pt_or_px->px * scale; + ? (int)roundf(pt_or_px->pt * scale * dpi / 72) + : (int)roundf(pt_or_px->px * scale); } struct font_load_data { @@ -932,7 +932,7 @@ if (use_px_size) snprintf(size, sizeof(size), ":pixelsize=%d", - (int)round(term->font_sizes[i][j].px_size * scale)); + (int)roundf(term->font_sizes[i][j].px_size * scale)); else snprintf(size, sizeof(size), ":size=%.2f", term->font_sizes[i][j].pt_size * scale); @@ -2078,6 +2078,16 @@ } bool +term_fractional_scaling(const struct terminal *term) +{ +#if defined(HAVE_FRACTIONAL_SCALE) + return term->wl->fractional_scale_manager != NULL && term->window->scale > 0.; +#else + return false; +#endif +} + +bool term_update_scale(struct terminal *term) { const struct wl_window *win = term->window; @@ -2093,7 +2103,7 @@ * - if there aren’t any outputs available, use 1.0 */ const float new_scale = - (wayl_fractional_scaling(term->wl) && win->scale > 0. + (term_fractional_scaling(term) ? win->scale : (tll_length(win->on_outputs) > 0 ? tll_back(win->on_outputs)->scale @@ -2166,6 +2176,17 @@ render_refresh(term); } +int +term_font_baseline(const struct terminal *term) +{ + const struct fcft_font *font = term->fonts[0]; + const int line_height = term->cell_height; + const int font_height = max(font->height, font->ascent + font->descent); + const int glyph_top_y = round((line_height - font_height) / 2.); + + return term->font_y_ofs + glyph_top_y + font->ascent; +} + void term_damage_rows(struct terminal *term, int start, int end) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/foot/terminal.h new/foot/terminal.h --- old/foot/terminal.h 2023-07-21 08:57:03.000000000 +0200 +++ new/foot/terminal.h 2023-07-30 13:18:55.000000000 +0200 @@ -736,12 +736,14 @@ bool term_paste_data_to_slave( struct terminal *term, const void *data, size_t len); +bool term_fractional_scaling(const struct terminal *term); bool term_update_scale(struct terminal *term); bool term_font_size_increase(struct terminal *term); bool term_font_size_decrease(struct terminal *term); bool term_font_size_reset(struct terminal *term); bool term_font_dpi_changed(struct terminal *term, float old_scale); void term_font_subpixel_changed(struct terminal *term); +int term_font_baseline(const struct terminal *term); int term_pt_or_px_as_pixels( const struct terminal *term, const struct pt_or_px *pt_or_px); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/foot/tests/test-config.c new/foot/tests/test-config.c --- old/foot/tests/test-config.c 2023-07-21 08:57:03.000000000 +0200 +++ new/foot/tests/test-config.c 2023-07-30 13:18:55.000000000 +0200 @@ -265,7 +265,7 @@ } static void -test_double(struct context *ctx, bool (*parse_fun)(struct context *ctx), +test_float(struct context *ctx, bool (*parse_fun)(struct context *ctx), const char *key, const float *ptr) { ctx->key = key; @@ -580,7 +580,7 @@ test_uint32(&ctx, &parse_section_scrollback, "lines", &conf.scrollback.lines); - test_double(&ctx, parse_section_scrollback, "multiplier", &conf.scrollback.multiplier); + test_float(&ctx, parse_section_scrollback, "multiplier", &conf.scrollback.multiplier); test_enum( &ctx, &parse_section_scrollback, "indicator-position", @@ -1312,7 +1312,7 @@ RENDER_TIMER_BOTH}, (int *)&conf.tweak.render_timer); - test_double(&ctx, &parse_section_tweak, "box-drawing-base-thickness", + test_float(&ctx, &parse_section_tweak, "box-drawing-base-thickness", &conf.tweak.box_drawing_base_thickness); test_boolean(&ctx, &parse_section_tweak, "box-drawing-solid-shades", &conf.tweak.box_drawing_solid_shades); @@ -1345,6 +1345,9 @@ test_boolean(&ctx, &parse_section_tweak, "font-monospace-warn", &conf.tweak.font_monospace_warn); + test_float(&ctx, &parse_section_tweak, "bold-text-in-bright-amount", + &conf.bold_in_bright.amount); + #if 0 /* Must be equal to, or less than INT32_MAX */ test_uint32(&ctx, &parse_section_tweak, "max-shm-pool-size-mb", &conf.tweak.max_shm_pool_size); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/foot/vt.c new/foot/vt.c --- old/foot/vt.c 2023-07-21 08:57:03.000000000 +0200 +++ new/foot/vt.c 2023-07-30 13:18:55.000000000 +0200 @@ -913,6 +913,16 @@ { // wc = ((utf8[0] & 0xf) << 12) | ((utf8[1] & 0x3f) << 6) | (utf8[2] & 0x3f) term->vt.utf8 |= c & 0x3f; + + const char32_t utf32 = term->vt.utf8; + if (unlikely(utf32 >= 0xd800 && utf32 <= 0xdfff)) { + /* Invalid sequence - invalid UTF-16 surrogate halves */ + return; + } + + /* Note: the E0 range contains overlong encodings. We don’t try to + detect, as they’ll still decode to valid UTF-32. */ + action_utf8_print(term, term->vt.utf8); } @@ -942,6 +952,17 @@ { // wc = ((utf8[0] & 7) << 18) | ((utf8[1] & 0x3f) << 12) | ((utf8[2] & 0x3f) << 6) | (utf8[3] & 0x3f); term->vt.utf8 |= c & 0x3f; + + const char32_t utf32 = term->vt.utf8; + + if (unlikely(utf32 > 0x10FFFF)) { + /* Invalid UTF-8 */ + return; + } + + /* Note: the F0 range contains overlong encodings. We don’t try to + detect, as they’ll still decode to valid UTF-32. */ + action_utf8_print(term, term->vt.utf8); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/foot/wayland.c new/foot/wayland.c --- old/foot/wayland.c 2023-07-21 08:57:03.000000000 +0200 +++ new/foot/wayland.c 2023-07-30 13:18:55.000000000 +0200 @@ -57,7 +57,7 @@ char pixelsize[32]; snprintf(pixelsize, sizeof(pixelsize), "pixelsize=%u", - (int)round(conf->csd.title_height * scale * 1 / 2)); + (int)roundf(conf->csd.title_height * scale * 1 / 2)); LOG_DBG("loading CSD font \"%s:%s\" (old-scale=%.2f, scale=%.2f)", patterns[0], pixelsize, old_scale, scale); @@ -315,15 +315,17 @@ } #if defined(HAVE_FRACTIONAL_SCALE) - xassert(seat->pointer.surface.viewport == NULL); - seat->pointer.surface.viewport = wp_viewporter_get_viewport( - seat->wayl->viewporter, seat->pointer.surface.surf); - - if (seat->pointer.surface.viewport == NULL) { - LOG_ERR("%s: failed to create pointer viewport", seat->name); - wl_surface_destroy(seat->pointer.surface.surf); - seat->pointer.surface.surf = NULL; - return; + if (seat->wayl->viewporter != NULL) { + xassert(seat->pointer.surface.viewport == NULL); + seat->pointer.surface.viewport = wp_viewporter_get_viewport( + seat->wayl->viewporter, seat->pointer.surface.surf); + + if (seat->pointer.surface.viewport == NULL) { + LOG_ERR("%s: failed to create pointer viewport", seat->name); + wl_surface_destroy(seat->pointer.surface.surf); + seat->pointer.surface.surf = NULL; + return; + } } #endif @@ -351,8 +353,10 @@ wl_surface_destroy(seat->pointer.surface.surf); #if defined(HAVE_FRACTIONAL_SCALE) - wp_viewport_destroy(seat->pointer.surface.viewport); - seat->pointer.surface.viewport = NULL; + if (seat->pointer.surface.viewport != NULL) { + wp_viewport_destroy(seat->pointer.surface.viewport); + seat->pointer.surface.viewport = NULL; + } #endif if (seat->pointer.theme != NULL) @@ -416,7 +420,7 @@ * buffer dimensions may not have been updated (in which case * render_size() normally shortcuts and returns early). */ - render_resize_force(term, round(logical_width), round(logical_height)); + render_resize_force(term, (int)roundf(logical_width), (int)roundf(logical_height)); } else if (scale_updated) { @@ -425,7 +429,7 @@ * been updated, even though the window logical dimensions * haven’t changed. */ - render_resize(term, round(logical_width), round(logical_height)); + render_resize(term, (int)roundf(logical_width), (int)roundf(logical_height)); } } @@ -620,6 +624,8 @@ static void xdg_output_handle_done(void *data, struct zxdg_output_v1 *xdg_output) { + struct monitor *mon = data; + update_terms_on_monitor(mon); } static void @@ -1526,7 +1532,7 @@ LOG_INFO( "%s: %dx%d+%dx%d@%dHz %s %.2f\" scale=%d, DPI=%.2f/%.2f (physical/scaled)", it->item.name, it->item.dim.px_real.width, it->item.dim.px_real.height, - it->item.x, it->item.y, (int)round(it->item.refresh), + it->item.x, it->item.y, (int)roundf(it->item.refresh), it->item.model != NULL ? it->item.model : it->item.description, it->item.inch, it->item.scale, it->item.dpi.physical, it->item.dpi.scaled); @@ -1994,33 +2000,35 @@ wayl_flush(wayl); } - -bool -wayl_fractional_scaling(const struct wayland *wayl) -{ -#if defined(HAVE_FRACTIONAL_SCALE) - return wayl->fractional_scale_manager != NULL; -#else - return false; -#endif -} - -void -wayl_surface_scale_explicit_width_height( +static void +surface_scale_explicit_width_height( const struct wl_window *win, const struct wayl_surface *surf, - int width, int height, float scale) + int width, int height, float scale, bool verify) { - - if (wayl_fractional_scaling(win->term->wl) && win->scale > 0.) { + if (term_fractional_scaling(win->term)) { #if defined(HAVE_FRACTIONAL_SCALE) LOG_DBG("scaling by a factor of %.2f using fractional scaling " "(width=%d, height=%d) ", scale, width, height); + if (verify) { + if ((int)roundf(scale * (int)roundf(width / scale)) != width) { + BUG("width=%d is not valid with scaling factor %.2f (%d != %d)", + width, scale, + (int)roundf(scale * (int)roundf(width / scale)), + width); + } + + if ((int)roundf(scale * (int)roundf(height / scale)) != height) { + BUG("height=%d is not valid with scaling factor %.2f (%d != %d)", + height, scale, + (int)roundf(scale * (int)roundf(height / scale)), + height); + } + } + wl_surface_set_buffer_scale(surf->surf, 1); wp_viewport_set_destination( - surf->viewport, - round((float)width / scale), - round((float)height / scale)); + surf->viewport, roundf(width / scale), roundf(height / scale)); #else BUG("wayl_fraction_scaling() returned true, " "but fractional scaling was not available at compile time"); @@ -2029,9 +2037,9 @@ LOG_DBG("scaling by a factor of %.2f using legacy mode " "(width=%d, height=%d)", scale, width, height); - xassert(scale == floor(scale)); + xassert(scale == floorf(scale)); - const int iscale = (int)scale; + const int iscale = (int)floorf(scale); xassert(width % iscale == 0); xassert(height % iscale == 0); @@ -2040,11 +2048,19 @@ } void +wayl_surface_scale_explicit_width_height( + const struct wl_window *win, const struct wayl_surface *surf, + int width, int height, float scale) +{ + surface_scale_explicit_width_height(win, surf, width, height, scale, false); +} + +void wayl_surface_scale(const struct wl_window *win, const struct wayl_surface *surf, const struct buffer *buf, float scale) { - wayl_surface_scale_explicit_width_height( - win, surf, buf->width, buf->height, scale); + surface_scale_explicit_width_height( + win, surf, buf->width, buf->height, scale, true); } void

1 0