April 2024 - openSUSE Commits - openSUSE Mailing Lists

commit mkvtoolnix for openSUSE:Factory
by Source-Sync 29 Apr '24

29 Apr '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mkvtoolnix for openSUSE:Factory checked in at 2024-04-28 21:51:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mkvtoolnix (Old) and /work/SRC/openSUSE:Factory/.mkvtoolnix.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mkvtoolnix" Sun Apr 28 21:51:14 2024 rev:164 rq:1170582 version:84.0 Changes: -------- --- /work/SRC/openSUSE:Factory/mkvtoolnix/mkvtoolnix.changes 2024-03-11 15:38:45.605083243 +0100 +++ /work/SRC/openSUSE:Factory/.mkvtoolnix.new.1880/mkvtoolnix.changes 2024-04-29 01:36:19.793057532 +0200 @@ -1,0 +2,37 @@ +Sun Apr 28 12:23:10 UTC 2024 - Luigi Baldoni <aloisio(a)gmx.com> + +- Update to version 84.0 + New features and enhancements: + * mkvmerge: added a new file-specific option + `--regenerate-track-uids`. When used for Matroska files, + `mkvmerge` will generate new random track UIDs instead of + keeping existing track UIDs. This is done automatically when + a Matroska file was created by MakeMKV. + * mkvmerge: MP4 reader: added support for FLAC in MP4. + * MKVToolNix GUI: multiplexer: the "Attachments" tab's title + will now include the total number of attachments (both from + source files & to newly attach). + * translations: added a Norwegian Bokmål translation of the + programs by Roger Knutsen (see `AUTHORS`). + Bug fixes: + * configure: when called with `--disable-gui` the build system + still ran the check for the GUI libraries & failed if they + weren't found. This check is now skipped when the option is + given. + * mkvmerge: several color-related track header properties were + parsed into & stored as a wrong integer type internally. This + could result in wrong values being copied when very large + values were present in source files, or in error messages + when very large values were used as command-line parameters. + * MKVToolNix GUI: multiplexer: the keyboard shortcuts from the + "modify selected tracks" sub-menu didn't work right after + opening a file. They only started working after opening the + "multiplexer" menu. + Build system changes: + * Release v8.0.0 of the `fmt` library is now required. If not + found, the bundled copy will be used. + * A C++20 compatible compiler is now required for several but + certainly not all C++20 features. g++ v10 & clang++ v10 + should suffice. + +------------------------------------------------------------------- Old: ---- mkvtoolnix-83.0.tar.xz mkvtoolnix-83.0.tar.xz.sig New: ---- mkvtoolnix-84.0.tar.xz mkvtoolnix-84.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkvtoolnix.spec ++++++ --- /var/tmp/diff_new_pack.GV56Rd/_old 2024-04-29 03:48:52.845093748 +0200 +++ /var/tmp/diff_new_pack.GV56Rd/_new 2024-04-29 03:48:52.849093888 +0200 @@ -17,7 +17,7 @@ Name: mkvtoolnix -Version: 83.0 +Version: 84.0 Release: 0 Summary: Tools to Create, Alter, and Inspect Matroska Files License: GPL-2.0-or-later @@ -61,7 +61,7 @@ BuildRequires: pkgconfig(Qt6Widgets) BuildRequires: pkgconfig(dvdread) BuildRequires: pkgconfig(flac) -BuildRequires: pkgconfig(fmt) >= 6.1.0 +BuildRequires: pkgconfig(fmt) >= 8.0.0 BuildRequires: pkgconfig(libcmark) BuildRequires: pkgconfig(libebml) >= 1.4.4 BuildRequires: pkgconfig(libmatroska) >= 1.7.1 ++++++ mkvtoolnix-83.0.tar.xz -> mkvtoolnix-84.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/mkvtoolnix/mkvtoolnix-83.0.tar.xz /work/SRC/openSUSE:Factory/.mkvtoolnix.new.1880/mkvtoolnix-84.0.tar.xz differ: char 15, line 1

1 0

commit 000release-packages for openSUSE:Factory
by Source-Sync 28 Apr '24

28 Apr '24

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 2024-04-28 14:13:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000release-packages (Old) and /work/SRC/openSUSE:Factory/.000release-packages.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000release-packages" Sun Apr 28 14:13:06 2024 rev:2875 rq: version:unknown Sun Apr 28 12:41:30 2024 rev:2874 rq: version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/000release-packages/Aeon-release.changes 2024-04-27 02:15:10.114921819 +0200 +++ /work/SRC/openSUSE:Factory/.000release-packages.new.1880/Aeon-release.changes 2024-04-28 14:25:00.885729299 +0200 @@ -2 +2 @@ -Sat Apr 27 00:15:06 UTC 2024 - openSUSE <packaging(a)lists.opensuse.org> +Sun Apr 28 12:13:04 UTC 2024 - openSUSE <packaging(a)lists.opensuse.org> Kalpa-release.changes: same change MicroOS-release.changes: same change openSUSE-Addon-NonOss-release.changes: same change openSUSE-release.changes: same change stub.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Aeon-release.spec ++++++ --- /var/tmp/diff_new_pack.RcqEQc/_old 2024-04-28 14:25:03.285817218 +0200 +++ /var/tmp/diff_new_pack.RcqEQc/_new 2024-04-28 14:25:03.285817218 +0200 @@ -17,7 +17,7 @@ Name: Aeon-release -Version: 20240426 +Version: 20240427 Release: 0 Summary: openSUSE Aeon License: GPL-2.0-or-later @@ -174,9 +174,9 @@ %include %{SOURCE100} Provides: %name-%version Provides: product() = Aeon -Provides: product(Aeon) = 20240426-0 +Provides: product(Aeon) = 20240427-0 Provides: product-label() = openSUSE%20Aeon -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aaeon%3A20240426 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aaeon%3A20240427 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(Aeon) @@ -192,7 +192,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance) -Provides: product_flavor(Aeon) = 20240426-0 +Provides: product_flavor(Aeon) = 20240427-0 Summary: openSUSE Aeon%{?betaversion: %{betaversion}} %description appliance @@ -257,11 +257,11 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>Aeon</name> - <version>20240426</version> + <version>20240427</version> <release>0</release> <endoflife></endoflife> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:aeon:20240426</cpeid> + <cpeid>cpe:/o:opensuse:aeon:20240427</cpeid> <productline>Aeon</productline> <register> <pool> ++++++ Kalpa-release.spec ++++++ --- /var/tmp/diff_new_pack.RcqEQc/_old 2024-04-28 14:25:03.325818683 +0200 +++ /var/tmp/diff_new_pack.RcqEQc/_new 2024-04-28 14:25:03.329818830 +0200 @@ -17,7 +17,7 @@ Name: Kalpa-release -Version: 20240426 +Version: 20240427 Release: 0 Summary: openSUSE Kalpa License: GPL-2.0-or-later @@ -174,9 +174,9 @@ %include %{SOURCE100} Provides: %name-%version Provides: product() = Kalpa -Provides: product(Kalpa) = 20240426-0 +Provides: product(Kalpa) = 20240427-0 Provides: product-label() = openSUSE%20Kalpa -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Akalpa%3A20240426 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Akalpa%3A20240427 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(Kalpa) @@ -192,7 +192,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance) -Provides: product_flavor(Kalpa) = 20240426-0 +Provides: product_flavor(Kalpa) = 20240427-0 Summary: openSUSE Kalpa%{?betaversion: %{betaversion}} %description appliance @@ -257,11 +257,11 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>Kalpa</name> - <version>20240426</version> + <version>20240427</version> <release>0</release> <endoflife></endoflife> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:kalpa:20240426</cpeid> + <cpeid>cpe:/o:opensuse:kalpa:20240427</cpeid> <productline>Kalpa</productline> <register> <pool> ++++++ MicroOS-release.spec ++++++ --- /var/tmp/diff_new_pack.RcqEQc/_old 2024-04-28 14:25:03.365820148 +0200 +++ /var/tmp/diff_new_pack.RcqEQc/_new 2024-04-28 14:25:03.369820295 +0200 @@ -17,7 +17,7 @@ Name: MicroOS-release -Version: 20240426 +Version: 20240427 Release: 0 Summary: openSUSE MicroOS License: GPL-2.0-or-later @@ -179,9 +179,9 @@ %include %{SOURCE100} Provides: %name-%version Provides: product() = MicroOS -Provides: product(MicroOS) = 20240426-0 +Provides: product(MicroOS) = 20240427-0 Provides: product-label() = openSUSE%20MicroOS -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20240426 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20240427 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) @@ -197,7 +197,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(MicroOS) = 20240426-0 +Provides: product_flavor(MicroOS) = 20240427-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description dvd @@ -213,7 +213,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance) -Provides: product_flavor(MicroOS) = 20240426-0 +Provides: product_flavor(MicroOS) = 20240427-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description appliance @@ -278,11 +278,11 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>MicroOS</name> - <version>20240426</version> + <version>20240427</version> <release>0</release> <endoflife></endoflife> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:microos:20240426</cpeid> + <cpeid>cpe:/o:opensuse:microos:20240427</cpeid> <productline>MicroOS</productline> <register> <pool> ++++++ openSUSE-Addon-NonOss-release.spec ++++++ --- /var/tmp/diff_new_pack.RcqEQc/_old 2024-04-28 14:25:03.409821760 +0200 +++ /var/tmp/diff_new_pack.RcqEQc/_new 2024-04-28 14:25:03.413821907 +0200 @@ -18,7 +18,7 @@ Name: openSUSE-Addon-NonOss-release %define product openSUSE-Addon-NonOss -Version: 20240426 +Version: 20240427 #!BcntSyncTag: openSUSE-Addon-NonOss Release: 0 Summary: openSUSE NonOSS Addon @@ -26,9 +26,9 @@ Group: System/Fhs Provides: %name-%version Provides: product() = openSUSE%2DAddon%2DNonOss -Provides: product(openSUSE-Addon-NonOss) = 20240426-0 +Provides: product(openSUSE-Addon-NonOss) = 20240427-0 Provides: product-label() = non%20oss%20addon -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20240426 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20240427 @@ -48,10 +48,10 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>openSUSE-Addon-NonOss</name> - <version>20240426</version> + <version>20240427</version> <release>0</release> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20240426</cpeid> + <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20240427</cpeid> <register> <pool> </pool> ++++++ openSUSE-release.spec ++++++ --- /var/tmp/diff_new_pack.RcqEQc/_old 2024-04-28 14:25:03.453823372 +0200 +++ /var/tmp/diff_new_pack.RcqEQc/_new 2024-04-28 14:25:03.457823519 +0200 @@ -20,7 +20,7 @@ #define betaversion %{nil} %define codename Tumbleweed Name: openSUSE-release -Version: 20240426 +Version: 20240427 Release: 0 # 0 is the product release, not the build release of this package Summary: openSUSE Tumbleweed @@ -185,7 +185,7 @@ %include %{SOURCE100} Provides: %name-%version Provides: product() = openSUSE -Provides: product(openSUSE) = 20240426-0 +Provides: product(openSUSE) = 20240427-0 %ifarch x86_64 Provides: product-register-target() = openSUSE%2DTumbleweed%2Dx86_64 %endif @@ -199,7 +199,7 @@ Provides: product-register-target() = openSUSE%2DTumbleweed%2Daarch64 %endif Provides: product-label() = openSUSE -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20240426 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20240427 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) @@ -213,7 +213,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(ftp) -Provides: product_flavor(openSUSE) = 20240426-0 +Provides: product_flavor(openSUSE) = 20240427-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description ftp @@ -228,7 +228,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(mini) -Provides: product_flavor(openSUSE) = 20240426-0 +Provides: product_flavor(openSUSE) = 20240427-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description mini @@ -243,7 +243,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(openSUSE) = 20240426-0 +Provides: product_flavor(openSUSE) = 20240427-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description dvd @@ -258,7 +258,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-kde) -Provides: product_flavor(openSUSE) = 20240426-0 +Provides: product_flavor(openSUSE) = 20240427-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-kde @@ -273,7 +273,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-x11) -Provides: product_flavor(openSUSE) = 20240426-0 +Provides: product_flavor(openSUSE) = 20240427-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-x11 @@ -288,7 +288,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-gnome) -Provides: product_flavor(openSUSE) = 20240426-0 +Provides: product_flavor(openSUSE) = 20240427-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-gnome @@ -303,7 +303,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-xfce) -Provides: product_flavor(openSUSE) = 20240426-0 +Provides: product_flavor(openSUSE) = 20240427-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-xfce @@ -318,7 +318,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-kde) -Provides: product_flavor(openSUSE) = 20240426-0 +Provides: product_flavor(openSUSE) = 20240427-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description usb-kde @@ -333,7 +333,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-gnome) -Provides: product_flavor(openSUSE) = 20240426-0 +Provides: product_flavor(openSUSE) = 20240427-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description usb-gnome @@ -348,7 +348,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-x11) -Provides: product_flavor(openSUSE) = 20240426-0 +Provides: product_flavor(openSUSE) = 20240427-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description usb-x11 @@ -363,7 +363,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance) -Provides: product_flavor(openSUSE) = 20240426-0 +Provides: product_flavor(openSUSE) = 20240427-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance @@ -378,7 +378,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-docker) -Provides: product_flavor(openSUSE) = 20240426-0 +Provides: product_flavor(openSUSE) = 20240427-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-docker @@ -393,7 +393,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-kvm) -Provides: product_flavor(openSUSE) = 20240426-0 +Provides: product_flavor(openSUSE) = 20240427-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-kvm @@ -408,7 +408,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-vmware) -Provides: product_flavor(openSUSE) = 20240426-0 +Provides: product_flavor(openSUSE) = 20240427-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-vmware @@ -423,7 +423,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-openstack) -Provides: product_flavor(openSUSE) = 20240426-0 +Provides: product_flavor(openSUSE) = 20240427-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-openstack @@ -438,7 +438,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-hyperv) -Provides: product_flavor(openSUSE) = 20240426-0 +Provides: product_flavor(openSUSE) = 20240427-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-hyperv @@ -453,7 +453,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-vagrant) -Provides: product_flavor(openSUSE) = 20240426-0 +Provides: product_flavor(openSUSE) = 20240427-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-vagrant @@ -468,7 +468,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-wsl) -Provides: product_flavor(openSUSE) = 20240426-0 +Provides: product_flavor(openSUSE) = 20240427-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-wsl @@ -483,7 +483,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-custom) -Provides: product_flavor(openSUSE) = 20240426-0 +Provides: product_flavor(openSUSE) = 20240427-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-custom @@ -566,10 +566,10 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>openSUSE</name> - <version>20240426</version> + <version>20240427</version> <release>0</release> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:opensuse:20240426</cpeid> + <cpeid>cpe:/o:opensuse:opensuse:20240427</cpeid> <productline>openSUSE</productline> <register> <target>openSUSE-Tumbleweed-x86_64</target> ++++++ weakremovers.inc ++++++ --- /var/tmp/diff_new_pack.RcqEQc/_old 2024-04-28 14:25:03.585828208 +0200 +++ /var/tmp/diff_new_pack.RcqEQc/_new 2024-04-28 14:25:03.601828794 +0200 @@ -15686,10 +15686,14 @@ Provides: weakremover(libpasswdqc0-32bit) Provides: weakremover(libpath_utils-devel-32bit) Provides: weakremover(libpath_utils1-32bit) +Provides: weakremover(libpcre2-16-0-x86-64-v3) +Provides: weakremover(libpcre2-32-0-x86-64-v3) +Provides: weakremover(libpcre2-8-0-x86-64-v3) Provides: weakremover(libpcre2-posix1) Provides: weakremover(libpcre2-posix1-32bit) Provides: weakremover(libpcre2-posix2) Provides: weakremover(libpcre2-posix2-32bit) +Provides: weakremover(libpcre2-posix3-x86-64-v3) Provides: weakremover(libpeas-loader-python) Provides: weakremover(libpegclient1) Provides: weakremover(libpegcommon1)

1 0

commit 000product for openSUSE:Factory
by Source-Sync 28 Apr '24

28 Apr '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package 000product for openSUSE:Factory checked in at 2024-04-28 14:13:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000product (Old) and /work/SRC/openSUSE:Factory/.000product.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000product" Sun Apr 28 14:13:09 2024 rev:3996 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MicroOS-dvd5-dvd-x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.y8I0AK/_old 2024-04-28 14:24:59.785689004 +0200 +++ /var/tmp/diff_new_pack.y8I0AK/_new 2024-04-28 14:24:59.789689150 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__MicroOS___20240426" schemaversion="4.1"> +<image name="OBS__MicroOS___20240427" 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">20240426</productvar> + <productvar name="VERSION">20240427</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:microos:20240426,openSUSE MicroOS</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:microos:20240427,openSUSE MicroOS</productinfo> <productinfo name="LINGUAS">en_US </productinfo> - <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20240426/x86_64</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20240427/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.y8I0AK/_old 2024-04-28 14:24:59.837690908 +0200 +++ /var/tmp/diff_new_pack.y8I0AK/_new 2024-04-28 14:24:59.841691055 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE-Addon-NonOss___20240426" schemaversion="4.1"> +<image name="OBS__openSUSE-Addon-NonOss___20240427" 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">20240426</productvar> + <productvar name="VERSION">20240427</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20240426,openSUSE NonOSS Addon</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20240427,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/2024…</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2024…</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.y8I0AK/_old 2024-04-28 14:24:59.873692227 +0200 +++ /var/tmp/diff_new_pack.y8I0AK/_new 2024-04-28 14:24:59.877692373 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE___20240426" schemaversion="4.1"> +<image name="OBS__openSUSE___20240427" 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">20240426</productvar> + <productvar name="VERSION">20240427</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20240426,openSUSE Tumbleweed</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20240427,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/20240426/x86_64</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20240427/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 ++++++ --- /var/tmp/diff_new_pack.y8I0AK/_old 2024-04-28 14:24:59.909693546 +0200 +++ /var/tmp/diff_new_pack.y8I0AK/_new 2024-04-28 14:24:59.917693839 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE___20240426" schemaversion="4.1"> +<image name="OBS__openSUSE___20240427" 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">20240426</productvar> + <productvar name="VERSION">20240427</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20240426,openSUSE Tumbleweed</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20240427,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/20240426/x86_64</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20240427/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> @@ -2409,12 +2409,9 @@ <repopackage name="libpciaccess0"/> <repopackage name="libpcre1"/> <repopackage name="libpcre2-16-0"/> - <repopackage name="libpcre2-16-0-x86-64-v3"/> <repopackage name="libpcre2-32-0"/> - <repopackage name="libpcre2-32-0-x86-64-v3"/> <repopackage name="libpcre2-8-0"/> <repopackage name="libpcre2-8-0-32bit"/> - <repopackage name="libpcre2-8-0-x86-64-v3"/> <repopackage name="libpcsclite1"/> <repopackage name="libpeas-1_0-0"/> <repopackage name="libpeas-gtk-1_0-0"/> ++++++ openSUSE-ftp-ftp-x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.y8I0AK/_old 2024-04-28 14:24:59.945694864 +0200 +++ /var/tmp/diff_new_pack.y8I0AK/_new 2024-04-28 14:24:59.953695158 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE___20240426" schemaversion="4.1"> +<image name="OBS__openSUSE___20240427" 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-20240426-x86_64</productvar> + <productvar name="MEDIUM_NAME">openSUSE-20240427-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">20240426</productvar> + <productvar name="VERSION">20240427</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20240426,openSUSE Tumbleweed</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20240427,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/20240426/x86_64</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20240427/x86_64</productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="DEBUGMEDIUM">2</productoption> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption> ++++++ Aeon.product ++++++ --- /var/tmp/diff_new_pack.y8I0AK/_old 2024-04-28 14:25:00.013697356 +0200 +++ /var/tmp/diff_new_pack.y8I0AK/_new 2024-04-28 14:25:00.017697502 +0200 @@ -6,7 +6,7 @@ <name>Aeon</name> <releasepkgname>Aeon-release</releasepkgname> <endoflife/> - <version>20240426</version> + <version>20240427</version>  <release>0</release> <productline>Aeon</productline> ++++++ Kalpa.product ++++++ --- /var/tmp/diff_new_pack.y8I0AK/_old 2024-04-28 14:25:00.037698235 +0200 +++ /var/tmp/diff_new_pack.y8I0AK/_new 2024-04-28 14:25:00.041698382 +0200 @@ -6,7 +6,7 @@ <name>Kalpa</name> <releasepkgname>Kalpa-release</releasepkgname> <endoflife/> - <version>20240426</version> + <version>20240427</version>  <release>0</release> <productline>Kalpa</productline> ++++++ MicroOS.product ++++++ --- /var/tmp/diff_new_pack.y8I0AK/_old 2024-04-28 14:25:00.069699407 +0200 +++ /var/tmp/diff_new_pack.y8I0AK/_new 2024-04-28 14:25:00.073699554 +0200 @@ -6,7 +6,7 @@ <name>MicroOS</name> <releasepkgname>MicroOS-release</releasepkgname> <endoflife/> - <version>20240426</version> + <version>20240427</version>  <release>0</release> <productline>MicroOS</productline> ++++++ dvd.group ++++++ --- /var/tmp/diff_new_pack.y8I0AK/_old 2024-04-28 14:25:00.185703656 +0200 +++ /var/tmp/diff_new_pack.y8I0AK/_new 2024-04-28 14:25:00.197704096 +0200 @@ -2553,12 +2553,9 @@ <package name="libpciaccess0" supportstatus="unsupported"/>  <package name="libpcre1" supportstatus="unsupported"/>  <package name="libpcre2-16-0" supportstatus="unsupported"/>  - <package name="libpcre2-16-0-x86-64-v3" supportstatus="unsupported"/>  <package name="libpcre2-32-0" supportstatus="unsupported"/>  - <package name="libpcre2-32-0-x86-64-v3" supportstatus="unsupported"/>  <package name="libpcre2-8-0" supportstatus="unsupported"/>  <package name="libpcre2-8-0-32bit" supportstatus="unsupported"/>  - <package name="libpcre2-8-0-x86-64-v3" supportstatus="unsupported"/>  <package name="libpcsclite1" supportstatus="unsupported"/>  <package name="libpeas-1_0-0" supportstatus="unsupported"/>  <package name="libpeas-gtk-1_0-0" supportstatus="unsupported"/>  ++++++ openSUSE-Addon-NonOss.product ++++++ --- /var/tmp/diff_new_pack.y8I0AK/_old 2024-04-28 14:25:00.225705122 +0200 +++ /var/tmp/diff_new_pack.y8I0AK/_new 2024-04-28 14:25:00.229705268 +0200 @@ -4,7 +4,7 @@ <product> <vendor>openSUSE</vendor> <name>openSUSE-Addon-NonOss</name> - <version>20240426</version> + <version>20240427</version> <release>0</release> <summary>openSUSE NonOSS Addon</summary> <shortsummary>non oss addon</shortsummary> ++++++ openSUSE.product ++++++ --- /var/tmp/diff_new_pack.y8I0AK/_old 2024-04-28 14:25:00.261706441 +0200 +++ /var/tmp/diff_new_pack.y8I0AK/_new 2024-04-28 14:25:00.265706587 +0200 @@ -4,7 +4,7 @@ <product> <vendor>openSUSE</vendor> <name>openSUSE</name> - <version>20240426</version> + <version>20240427</version> <release>0</release> <productline>openSUSE</productline> ++++++ unsorted.yml ++++++ --- /var/tmp/diff_new_pack.y8I0AK/_old 2024-04-28 14:25:00.381710837 +0200 +++ /var/tmp/diff_new_pack.y8I0AK/_new 2024-04-28 14:25:00.397711422 +0200 @@ -14909,7 +14909,6 @@ - libpcre2-32-0-32bit - libpcre2-posix3 - libpcre2-posix3-32bit - - libpcre2-posix3-x86-64-v3 - libpcrecpp0 - libpcrecpp0-32bit - libpcreposix0

1 0

commit pcre2 for openSUSE:Factory
by Source-Sync 28 Apr '24

28 Apr '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package pcre2 for openSUSE:Factory checked in at 2024-04-28 12:12:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pcre2 (Old) and /work/SRC/openSUSE:Factory/.pcre2.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pcre2" Sun Apr 28 12:12:25 2024 rev:32 rq:1170573 version:10.43 Changes: -------- --- /work/SRC/openSUSE:Factory/pcre2/pcre2.changes 2024-04-24 15:14:13.236829582 +0200 +++ /work/SRC/openSUSE:Factory/.pcre2.new.1880/pcre2.changes 2024-04-28 12:12:26.833012203 +0200 @@ -2,5 +1,0 @@ -Tue Apr 23 14:51:10 UTC 2024 - Dirk Müller <dmueller(a)suse.com> - -- build x86_64-v3 optimized libs - -------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcre2.spec ++++++ --- /var/tmp/diff_new_pack.ZyphO1/_old 2024-04-28 14:24:56.369563866 +0200 +++ /var/tmp/diff_new_pack.ZyphO1/_new 2024-04-28 14:24:56.369563866 +0200 @@ -1,7 +1,7 @@ # # spec file for package pcre2 # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2024 Andreas Stieger <Andreas.Stieger(a)gmx.de> # # All modifications and additions to the file contributed by third parties @@ -39,7 +39,6 @@ BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: pkgconfig(zlib) -%{?suse_build_hwcaps_libs} %description The PCRE2 library is a set of functions that implement regular

1 0

commit 000product for openSUSE:Factory
by Source-Sync 27 Apr '24

27 Apr '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package 000product for openSUSE:Factory checked in at 2024-04-27 02:15:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000product (Old) and /work/SRC/openSUSE:Factory/.000product.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000product" Sat Apr 27 02:15:10 2024 rev:3995 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MicroOS-dvd5-dvd-x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.BNRcl8/_old 2024-04-27 02:15:15.307110655 +0200 +++ /var/tmp/diff_new_pack.BNRcl8/_new 2024-04-27 02:15:15.311110801 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__MicroOS___20240425" schemaversion="4.1"> +<image name="OBS__MicroOS___20240426" 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">20240425</productvar> + <productvar name="VERSION">20240426</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:microos:20240425,openSUSE MicroOS</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:microos:20240426,openSUSE MicroOS</productinfo> <productinfo name="LINGUAS">en_US </productinfo> - <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20240425/x86_64</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20240426/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.BNRcl8/_old 2024-04-27 02:15:15.347112110 +0200 +++ /var/tmp/diff_new_pack.BNRcl8/_new 2024-04-27 02:15:15.351112255 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE-Addon-NonOss___20240425" schemaversion="4.1"> +<image name="OBS__openSUSE-Addon-NonOss___20240426" 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">20240425</productvar> + <productvar name="VERSION">20240426</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20240425,openSUSE NonOSS Addon</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20240426,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/2024…</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2024…</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.BNRcl8/_old 2024-04-27 02:15:15.391113710 +0200 +++ /var/tmp/diff_new_pack.BNRcl8/_new 2024-04-27 02:15:15.391113710 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE___20240425" schemaversion="4.1"> +<image name="OBS__openSUSE___20240426" 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">20240425</productvar> + <productvar name="VERSION">20240426</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20240425,openSUSE Tumbleweed</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20240426,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/20240425/x86_64</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20240426/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.BNRcl8/_old 2024-04-27 02:15:15.447115747 +0200 +++ /var/tmp/diff_new_pack.BNRcl8/_new 2024-04-27 02:15:15.451115893 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE___20240425" schemaversion="4.1"> +<image name="OBS__openSUSE___20240426" 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-20240425-x86_64</productvar> + <productvar name="MEDIUM_NAME">openSUSE-20240426-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">20240425</productvar> + <productvar name="VERSION">20240426</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20240425,openSUSE Tumbleweed</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20240426,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/20240425/x86_64</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20240426/x86_64</productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="DEBUGMEDIUM">2</productoption> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption> ++++++ Aeon.product ++++++ --- /var/tmp/diff_new_pack.BNRcl8/_old 2024-04-27 02:15:15.503117784 +0200 +++ /var/tmp/diff_new_pack.BNRcl8/_new 2024-04-27 02:15:15.511118075 +0200 @@ -6,7 +6,7 @@ <name>Aeon</name> <releasepkgname>Aeon-release</releasepkgname> <endoflife/> - <version>20240425</version> + <version>20240426</version>  <release>0</release> <productline>Aeon</productline> ++++++ Kalpa.product ++++++ --- /var/tmp/diff_new_pack.BNRcl8/_old 2024-04-27 02:15:15.527118656 +0200 +++ /var/tmp/diff_new_pack.BNRcl8/_new 2024-04-27 02:15:15.531118802 +0200 @@ -6,7 +6,7 @@ <name>Kalpa</name> <releasepkgname>Kalpa-release</releasepkgname> <endoflife/> - <version>20240425</version> + <version>20240426</version>  <release>0</release> <productline>Kalpa</productline> ++++++ MicroOS.product ++++++ --- /var/tmp/diff_new_pack.BNRcl8/_old 2024-04-27 02:15:15.555119675 +0200 +++ /var/tmp/diff_new_pack.BNRcl8/_new 2024-04-27 02:15:15.559119820 +0200 @@ -6,7 +6,7 @@ <name>MicroOS</name> <releasepkgname>MicroOS-release</releasepkgname> <endoflife/> - <version>20240425</version> + <version>20240426</version>  <release>0</release> <productline>MicroOS</productline> ++++++ openSUSE-Addon-NonOss.product ++++++ --- /var/tmp/diff_new_pack.BNRcl8/_old 2024-04-27 02:15:15.663123603 +0200 +++ /var/tmp/diff_new_pack.BNRcl8/_new 2024-04-27 02:15:15.667123749 +0200 @@ -4,7 +4,7 @@ <product> <vendor>openSUSE</vendor> <name>openSUSE-Addon-NonOss</name> - <version>20240425</version> + <version>20240426</version> <release>0</release> <summary>openSUSE NonOSS Addon</summary> <shortsummary>non oss addon</shortsummary> ++++++ openSUSE.product ++++++ --- /var/tmp/diff_new_pack.BNRcl8/_old 2024-04-27 02:15:15.691124621 +0200 +++ /var/tmp/diff_new_pack.BNRcl8/_new 2024-04-27 02:15:15.695124767 +0200 @@ -4,7 +4,7 @@ <product> <vendor>openSUSE</vendor> <name>openSUSE</name> - <version>20240425</version> + <version>20240426</version> <release>0</release> <productline>openSUSE</productline> ++++++ unsorted.yml ++++++ --- /var/tmp/diff_new_pack.BNRcl8/_old 2024-04-27 02:15:15.807128840 +0200 +++ /var/tmp/diff_new_pack.BNRcl8/_new 2024-04-27 02:15:15.871131171 +0200 @@ -13282,7 +13282,7 @@ - libgsm-utils - libgsm1-32bit - libgsmsd8 - - libgsoap-2_8_133 + - libgsoap-2_8_134 - libgssapi3 - libgssdp-1_6-0-32bit - libgssdp-devel @@ -15139,8 +15139,6 @@ - libptytty-devel - libptytty0 - libpugixml1 - - libpulp-tools - - libpulp0 - libpulse-devel - libpulse-devel-32bit - libpulse-mainloop-glib0-32bit @@ -15907,8 +15905,8 @@ - libspatialindex6 - libspatialite-devel - libspatialite8 - - libspdlog1_13 - - libspdlog1_13-32bit + - libspdlog1_14 + - libspdlog1_14-32bit - libspdylay7 - libspectre-devel - libspectre1 @@ -18651,7 +18649,6 @@ - mousetweaks-lang - movit-devel - mozaddon-devel - - mozilla-jss - mozilla-nspr-32bit - mozilla-nspr-devel - mozilla-nss-32bit @@ -36354,7 +36351,6 @@ - spooles-openmpi-devel - spotify-easyrpm - spotify-qt - - spotifyd - spread-sheet-widget-devel - spyder - spyder-dicom

1 0

commit terragrunt for openSUSE:Factory
by Source-Sync 26 Apr '24

26 Apr '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package terragrunt for openSUSE:Factory checked in at 2024-04-26 23:28:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/terragrunt (Old) and /work/SRC/openSUSE:Factory/.terragrunt.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "terragrunt" Fri Apr 26 23:28:06 2024 rev:116 rq:1170330 version:0.57.11 Changes: -------- --- /work/SRC/openSUSE:Factory/terragrunt/terragrunt.changes 2024-04-25 20:48:21.828276814 +0200 +++ /work/SRC/openSUSE:Factory/.terragrunt.new.1880/terragrunt.changes 2024-04-26 23:29:07.829028627 +0200 @@ -1,0 +2,13 @@ +Fri Apr 26 16:55:15 UTC 2024 - opensuse_buildservice(a)ojkastl.de + +- Update to version 0.57.11: + * fix: sync Terraform CLI args for 'show' command (#3075) + +------------------------------------------------------------------- +Fri Apr 26 16:46:18 UTC 2024 - opensuse_buildservice(a)ojkastl.de + +- Update to version 0.57.10: + * Open Telemetry context propagation (#3098) + * feat: Adding RFC Form (#3099) + +------------------------------------------------------------------- Old: ---- terragrunt-0.57.9.obscpio New: ---- terragrunt-0.57.11.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ terragrunt.spec ++++++ --- /var/tmp/diff_new_pack.kPL26K/_old 2024-04-26 23:29:09.625094146 +0200 +++ /var/tmp/diff_new_pack.kPL26K/_new 2024-04-26 23:29:09.625094146 +0200 @@ -19,7 +19,7 @@ %define __arch_install_post export NO_BRP_STRIP_DEBUG=true Name: terragrunt -Version: 0.57.9 +Version: 0.57.11 Release: 0 Summary: Thin wrapper for Terraform for working with multiple Terraform modules License: MIT ++++++ _service ++++++ --- /var/tmp/diff_new_pack.kPL26K/_old 2024-04-26 23:29:09.661095459 +0200 +++ /var/tmp/diff_new_pack.kPL26K/_new 2024-04-26 23:29:09.713097356 +0200 @@ -3,7 +3,7 @@ <param name="url">https://github.com/gruntwork-io/terragrunt</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="revision">v0.57.9</param> + <param name="revision">v0.57.11</param> <param name="versionformat">@PARENT_TAG@</param> <param name="changesgenerate">enable</param> <param name="versionrewrite-pattern">v(.*)</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.kPL26K/_old 2024-04-26 23:29:09.741098377 +0200 +++ /var/tmp/diff_new_pack.kPL26K/_new 2024-04-26 23:29:09.745098523 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/gruntwork-io/terragrunt</param> - <param name="changesrevision">1e40725e6e92faa3e5c14c489a1899c6b2a170f1</param></service></servicedata> + <param name="changesrevision">5bb77abc1cf83b6f2ba8b46456b895715adbd43b</param></service></servicedata> (No newline at EOF) ++++++ terragrunt-0.57.9.obscpio -> terragrunt-0.57.11.obscpio ++++++ /work/SRC/openSUSE:Factory/terragrunt/terragrunt-0.57.9.obscpio /work/SRC/openSUSE:Factory/.terragrunt.new.1880/terragrunt-0.57.11.obscpio differ: char 50, line 1 ++++++ terragrunt.obsinfo ++++++ --- /var/tmp/diff_new_pack.kPL26K/_old 2024-04-26 23:29:09.781099836 +0200 +++ /var/tmp/diff_new_pack.kPL26K/_new 2024-04-26 23:29:09.785099982 +0200 @@ -1,5 +1,5 @@ name: terragrunt -version: 0.57.9 -mtime: 1713974008 -commit: 1e40725e6e92faa3e5c14c489a1899c6b2a170f1 +version: 0.57.11 +mtime: 1714142481 +commit: 5bb77abc1cf83b6f2ba8b46456b895715adbd43b ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/terragrunt/vendor.tar.gz /work/SRC/openSUSE:Factory/.terragrunt.new.1880/vendor.tar.gz differ: char 5, line 1

1 0

commit openSUSE-repos for openSUSE:Factory
by Source-Sync 26 Apr '24

26 Apr '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package openSUSE-repos for openSUSE:Factory checked in at 2024-04-26 23:28:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openSUSE-repos (Old) and /work/SRC/openSUSE:Factory/.openSUSE-repos.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openSUSE-repos" Fri Apr 26 23:28:05 2024 rev:13 rq:1170307 version:20240412.89bd714 Changes: -------- --- /work/SRC/openSUSE:Factory/openSUSE-repos/openSUSE-repos.changes 2024-04-14 12:24:27.085194374 +0200 +++ /work/SRC/openSUSE:Factory/.openSUSE-repos.new.1880/openSUSE-repos.changes 2024-04-26 23:29:04.820918895 +0200 @@ -1,0 +2,5 @@ +Fri Apr 26 16:41:00 UTC 2024 - opensuse-releaseteam(a)opensuse.org + +- NVIDIA package needs to require specific flavor. Issue #53 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openSUSE-repos.spec ++++++ --- /var/tmp/diff_new_pack.oNDHBW/_old 2024-04-26 23:29:06.796990979 +0200 +++ /var/tmp/diff_new_pack.oNDHBW/_new 2024-04-26 23:29:06.812991563 +0200 @@ -116,7 +116,7 @@ %if 0%{?with_nvidia} %package NVIDIA Summary: openSUSE NVIDIA repository definitions -Requires: openSUSE-repos +Requires: openSUSE-repos-%{theme} Supplements: modalias(pci:v000010DEd*sv*sd*bc03sc*i*) Provides: openSUSE-repos-NVIDIA %if "%{?theme}" == "Tumbleweed"

1 0

commit waylyrics for openSUSE:Factory
by Source-Sync 26 Apr '24

26 Apr '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package waylyrics for openSUSE:Factory checked in at 2024-04-26 23:28:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/waylyrics (Old) and /work/SRC/openSUSE:Factory/.waylyrics.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "waylyrics" Fri Apr 26 23:28:02 2024 rev:12 rq:1170299 version:0.3.5 Changes: -------- --- /work/SRC/openSUSE:Factory/waylyrics/waylyrics.changes 2024-04-21 20:27:50.299148164 +0200 +++ /work/SRC/openSUSE:Factory/.waylyrics.new.1880/waylyrics.changes 2024-04-26 23:29:02.272825941 +0200 @@ -1,0 +2,63 @@ +Fri Apr 26 11:16:31 UTC 2024 - xtexchooser(a)duck.com + +- Update to version 0.3.5: + * chore: release v0.3.5 + * feat: emit NewLyricCache signal on lyric cache update + * feat: reload lyric from cache + * build(test): set profile.test.debug a boolean + * chore: release v0.3.4 + * Fix Exec in desktop file + * chore(metainfo): use v0.3.3 tag + * chore(metainfo): add screenshot of search window + * chore(metainfo): fix warnings + * chore: release v0.3.3 + * chore(desktopfile): remove action `Launch` + * chore(metainfo): h3 tags are not supported + * chore: release v0.3.2 + * fix: enum tuple variant cannot be destrcucted by tuple matching + * fix(readme): broken link of desktop file + * Use patched ksni to solve tray issue in flatpak (thanks to @taoky) + * chore: make extracting values from tuples more readable + * chore: use for loop to refactor items appending in ui_section & play_section + * chore: use for loop to refactor entries appending in imp.vbox + * log(tray): do not flood start_time on smtc + * ci: fix documents deploy CI + * ci: remove microsoft-prod.list + * ci: fix test.yml + * chore: release v0.3.1 + * feat: set search-window ColumnView row padding in themes + * docs(changelog): update changelog + * Add replaces & launchable + * Update metainfo to v0.3.0 + +------------------------------------------------------------------- +Fri Apr 26 11:15:19 UTC 2024 - xtexchooser(a)duck.com + +- Update to version 0.3.0: + * docs(changelog): update changelog + * chore: release v0.3.0 + * fix(ci): new schema path + * docs(install): update packaging script + * BREAKING CHANGE: formalize app id & restructure files~ + * Fix missing wayland icon + * Add metainfo + * Change filenames + * Change screenshot 1 + * Add screenshots + * fix: set titlebar before set decorated + * log: set time diff log level to TRACE so we will not flood debug log + * log: mpris position delay + * refactor: pass WeakRef<Window> to register_sync_task + * fix(i18n): en_US translation + * revert: "Translate display modes" + * Translate display modes + * align -> alignment + * docs(changelog): update changelog + * chore: release v0.2.21 + * fix: stop lyric update when show_lyric_on_pause not set on pause + * docs(changelog): update changelog + * chore: release v0.2.20 + * build: remove git dependencies + * docs(changelog): update changelog + +------------------------------------------------------------------- Old: ---- waylyrics-0.2.19.obscpio New: ---- waylyrics-0.3.5.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ waylyrics.spec ++++++ --- /var/tmp/diff_new_pack.aL24Ep/_old 2024-04-26 23:29:03.360865632 +0200 +++ /var/tmp/diff_new_pack.aL24Ep/_new 2024-04-26 23:29:03.364865777 +0200 @@ -17,14 +17,14 @@ Name: waylyrics -Version: 0.2.19 +Version: 0.3.5 Release: 0 Summary: The furry way to show desktop lyrics License: MIT URL: https://github.com/waylyrics/waylyrics Source0: %{name}-%{version}.tar.zst Source1: vendor.tar.zst -BuildRequires: cargo >= 1.73.0 +BuildRequires: cargo >= 1.76.0 BuildRequires: cargo-packaging BuildRequires: dbus-1-devel BuildRequires: gettext @@ -47,14 +47,14 @@ %install export WAYLYRICS_THEME_PRESETS_DIR=%{_datadir}/waylyrics/themes -# locked is required as waylyrics includes some git dependencies %{cargo_install} --locked -install -d %{buildroot}%{_datadir}/waylyrics +install -dm755 %{buildroot}%{_datadir}/waylyrics cp -r themes %{buildroot}%{_datadir}/waylyrics/ -install -Dm644 "io.poly000.waylyrics.desktop" -t %{buildroot}%{_datadir}/applications/ -install -Dm644 "io.poly000.waylyrics.gschema.xml" -t %{buildroot}%{_datadir}/glib-2.0/schemas/ +install -Dm644 "metainfo/io.github.waylyrics.Waylyrics.desktop" -t %{buildroot}%{_datadir}/applications/ +install -Dm644 "metainfo/io.github.waylyrics.Waylyrics.gschema.xml" -t %{buildroot}%{_datadir}/glib-2.0/schemas/ +cp -r res/icons %{buildroot}%{_datadir}/icons # Locale files ( @@ -69,15 +69,16 @@ %check export WAYLYRICS_THEME_PRESETS_DIR=%{_datadir}/waylyrics/themes -%{cargo_test} --locked --no-default-features --features mimalloc +%{cargo_test} --locked --no-default-features --features mimalloc,tray-icon %files %license LICENSE %doc README.md %{_bindir}/%{name} %{_datadir}/waylyrics/ -%{_datadir}/applications/io.poly000.waylyrics.desktop -%{_datadir}/glib-2.0/schemas/io.poly000.waylyrics.gschema.xml +%{_datadir}/applications/io.github.waylyrics.Waylyrics.desktop +%{_datadir}/glib-2.0/schemas/io.github.waylyrics.Waylyrics.gschema.xml +%{_datadir}/icons/hicolor/scalable/apps/io.github.waylyrics.Waylyrics.svg %files lang -f %{name}.lang ++++++ _service ++++++ --- /var/tmp/diff_new_pack.aL24Ep/_old 2024-04-26 23:29:03.396866945 +0200 +++ /var/tmp/diff_new_pack.aL24Ep/_new 2024-04-26 23:29:03.400867091 +0200 @@ -3,7 +3,7 @@ <param name="url">https://github.com/waylyrics/waylyrics.git</param> <param name="versionformat">@PARENT_TAG@</param> <param name="scm">git</param> - <param name="revision">v0.2.19</param> + <param name="revision">v0.3.5</param> <param name="match-tag">*</param>  <param name="versionrewrite-pattern">v(\d+\.\d+\.\d+)</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.aL24Ep/_old 2024-04-26 23:29:03.428868113 +0200 +++ /var/tmp/diff_new_pack.aL24Ep/_new 2024-04-26 23:29:03.432868258 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/waylyrics/waylyrics.git</param> - <param name="changesrevision">4db5b69e0f0a46dd9cba14bc4bd4d5dd0a8b2d1a</param></service></servicedata> + <param name="changesrevision">b3abbfa63c0978e0ca09815249addad8c72fe638</param></service></servicedata> (No newline at EOF) ++++++ vendor.tar.zst ++++++ Binary files /var/tmp/diff_new_pack.aL24Ep/_old and /var/tmp/diff_new_pack.aL24Ep/_new differ ++++++ waylyrics-0.2.19.obscpio -> waylyrics-0.3.5.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/.github/workflows/docs.yaml new/waylyrics-0.3.5/.github/workflows/docs.yaml --- old/waylyrics-0.2.19/.github/workflows/docs.yaml 2024-04-17 12:18:51.000000000 +0200 +++ new/waylyrics-0.3.5/.github/workflows/docs.yaml 2024-04-25 14:58:04.000000000 +0200 @@ -24,6 +24,7 @@ - name: Install deps run: | + sudo rm /etc/apt/sources.list.d/microsoft-prod.list sudo apt update sudo apt install -y --no-install-recommends libgtk-4-dev libdbus-1-dev pkg-config diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/.github/workflows/test.yml new/waylyrics-0.3.5/.github/workflows/test.yml --- old/waylyrics-0.2.19/.github/workflows/test.yml 2024-04-17 12:18:51.000000000 +0200 +++ new/waylyrics-0.3.5/.github/workflows/test.yml 2024-04-25 14:58:04.000000000 +0200 @@ -1,4 +1,4 @@ -name: test +name: Build, Test & upload on: [push, pull_request] @@ -20,8 +20,9 @@ - name: Install deps run: | - sudo apt update - sudo apt install -y --no-install-recommends libgtk-4-dev libdbus-1-dev pkg-config weston + sudo rm /etc/apt/sources.list.d/microsoft-prod.list + sudo apt-get update + sudo apt-get install -y --no-install-recommends libgtk-4-dev libdbus-1-dev pkg-config weston - uses: Swatinem/rust-cache@v2 - name: Test run: cargo test @@ -30,7 +31,7 @@ - name: Installation run: | sudo mkdir -p /usr/share/waylyrics - sudo install -m644 io.poly000.waylyrics.gschema.xml /usr/share/glib-2.0/schemas/ + sudo install -m644 metainfo/io.github.waylyrics.Waylyrics.gschema.xml /usr/share/glib-2.0/schemas/ sudo install -dm755 ${WAYLYRICS_THEME_PRESETS_DIR} sudo cp -r themes/* ${WAYLYRICS_THEME_PRESETS_DIR}/ @@ -59,7 +60,7 @@ shell: bash run: | tar -cvzf amd64-linux-gnu.tar.gz target/release/waylyrics \ - LICENSE res io.poly000.waylyrics.gschema.xml + LICENSE res metainfo/io.github.waylyrics.Waylyrics.{gschema.xml,desktop} - name: Declare some variables # https://stackoverflow.com/a/61699863 id: vars Binary files old/waylyrics-0.2.19/CHANGELOG.md and new/waylyrics-0.3.5/CHANGELOG.md differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/Cargo.lock new/waylyrics-0.3.5/Cargo.lock --- old/waylyrics-0.2.19/Cargo.lock 2024-04-17 12:18:51.000000000 +0200 +++ new/waylyrics-0.3.5/Cargo.lock 2024-04-25 14:58:04.000000000 +0200 @@ -1783,8 +1783,7 @@ [[package]] name = "ksni" version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b31b9cf486bcd22bcd09900b44538cf87b00f526fcd087d671a632dc0d271d0c" +source = "git+https://github.com/waylyrics/ksni.git#af6fa6e6e29b7cb3779f98c1ca3aaeb87…" dependencies = [ "dbus", "dbus-codegen", @@ -2075,9 +2074,10 @@ ] [[package]] -name = "ncmapi" +name = "ncmapi2" version = "0.1.13" -source = "git+https://github.com/waylyrics/ncmapi-rs.git?rev=6095abf7#6095abf7e54eedb…" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcd3c218f2db46fc0b26ac6263d3005b96c82d5ebec0d349c3c902eef8bd660c" dependencies = [ "aes", "base64", @@ -2610,7 +2610,8 @@ [[package]] name = "qqmusic-rs" version = "0.1.0" -source = "git+https://github.com/waylyrics/qqmusic-rs.git?rev=22e66ba#22e66ba62e63d97…" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7698cb357cfa1a75f5a2071469345ede01a6c4ee83a2ff2a88f9e481893f341" dependencies = [ "serde", "serde_json", @@ -3817,7 +3818,7 @@ [[package]] name = "waylyrics" -version = "0.2.19" +version = "0.3.5" dependencies = [ "ahash 0.8.11", "anyhow", @@ -3835,7 +3836,7 @@ "md5", "mimalloc", "mpris", - "ncmapi", + "ncmapi2", "once_cell", "opencc-rust", "qqmusic-rs", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/Cargo.toml new/waylyrics-0.3.5/Cargo.toml --- old/waylyrics-0.2.19/Cargo.toml 2024-04-17 12:18:51.000000000 +0200 +++ new/waylyrics-0.3.5/Cargo.toml 2024-04-25 14:58:04.000000000 +0200 @@ -1,6 +1,6 @@ [package] name = "waylyrics" -version = "0.2.19" +version = "0.3.5" edition = "2021" description = "Simple On Screen lyrics Display for linux/unix" authors = ["poly000"] @@ -17,7 +17,7 @@ panic = "abort" [profile.test] -debug = "none" +debug = false incremental = true lto = "off" @@ -42,8 +42,8 @@ glib-macros = "0.19.2" # lyric providers + parse -ncmapi = { git = "https://github.com/waylyrics/ncmapi-rs.git", rev = "6095abf7" } -qqmusic-rs = { git = "https://github.com/waylyrics/qqmusic-rs.git", rev = "22e66ba" } +ncmapi = { version = "0.1.13", package = "ncmapi2" } +qqmusic-rs = { version = "0.1.0" } lrc-nom = "0.3.0" # logging @@ -100,7 +100,7 @@ [target.'cfg(unix)'.dependencies] # MPRIS integration dbus = "0.9.7" -ksni = { version = "0.2.1", optional = true } +ksni = { git = "https://github.com/waylyrics/ksni.git", optional = true } mpris = "2.0.1" [target.'cfg(target_os = "windows")'.dependencies] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/README.en.md new/waylyrics-0.3.5/README.en.md --- old/waylyrics-0.2.19/README.en.md 2024-04-17 12:18:51.000000000 +0200 +++ new/waylyrics-0.3.5/README.en.md 2024-04-25 14:58:04.000000000 +0200 @@ -32,7 +32,7 @@ ## Usage -Also check [desktop file](io.poly000.waylyrics.desktop) +Also check [desktop file](metainfo/io.github.waylyrics.Waylyrics.desktop) https://github.com/waylyrics/waylyrics/blob/d2132b42b135e0de09640de6a5a0b47… diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/README.md new/waylyrics-0.3.5/README.md --- old/waylyrics-0.2.19/README.md 2024-04-17 12:18:51.000000000 +0200 +++ new/waylyrics-0.3.5/README.md 2024-04-25 14:58:04.000000000 +0200 @@ -32,7 +32,7 @@ ## 用法 -另见 [desktop文件](io.poly000.waylyrics.desktop) +另见 [desktop文件](metainfo/io.github.waylyrics.Waylyrics.desktop) https://github.com/waylyrics/waylyrics/blob/d2132b42b135e0de09640de6a5a0b47… diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/build.rs new/waylyrics-0.3.5/build.rs --- old/waylyrics-0.2.19/build.rs 2024-04-17 12:18:51.000000000 +0200 +++ new/waylyrics-0.3.5/build.rs 2024-04-25 14:58:04.000000000 +0200 @@ -5,7 +5,7 @@ #[cfg(windows)] { use std::path::Path; - windows_exe_info::icon::icon_ico(Path::new("win_res/io.poly000.waylyrics.ico")); + windows_exe_info::icon::icon_ico(Path::new("res/win/icon.ico")); windows_exe_info::versioninfo::VersionInfo::from_cargo_env_ex( Some("Desktop lyric for SMTC"), Some("Waylyrics"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/doc/INSTALLATION.en.md new/waylyrics-0.3.5/doc/INSTALLATION.en.md --- old/waylyrics-0.2.19/doc/INSTALLATION.en.md 2024-04-17 12:18:51.000000000 +0200 +++ new/waylyrics-0.3.5/doc/INSTALLATION.en.md 2024-04-25 14:58:04.000000000 +0200 @@ -93,14 +93,14 @@ ### Compiling Schema ```bash -install -Dm644 io.poly000.waylyrics.gschema.xml -t ~/.local/share/glib-2.0/schemas/ +install -Dm644 metainfo/io.github.waylyrics.Waylyrics.gschema.xml -t ~/.local/share/glib-2.0/schemas/ glib-compile-schemas ~/.local/share/glib-2.0/schemas/ ``` ### Desktop File ```bash -install -Dm644 io.poly000.waylyrics.desktop -t ~/.local/share/applications +install -Dm644 metainfo/io.github.waylyrics.Waylyrics.desktop -t ~/.local/share/applications ``` ## Packging example @@ -108,9 +108,11 @@ An example packaging script: ```bash -install -Dm644 io.poly000.waylyrics.gschema.xml -t /usr/share/glib-2.0/schemas/ +install -Dm644 metainfo/io.github.waylyrics.Waylyrics.gschema.xml -t /usr/share/glib-2.0/schemas/ +install -Dm644 metainfo/io.github.waylyrics.Waylyrics.desktop -t /usr/share/applications install -dm755 /usr/share/waylyrics/themes cp -r themes/* /usr/share/waylyrics/themes/ +cp -r res/icons /usr/share/icons cd locales for po in $(find . -type f -name '*.po') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/doc/INSTALLATION.md new/waylyrics-0.3.5/doc/INSTALLATION.md --- old/waylyrics-0.2.19/doc/INSTALLATION.md 2024-04-17 12:18:51.000000000 +0200 +++ new/waylyrics-0.3.5/doc/INSTALLATION.md 2024-04-25 14:58:04.000000000 +0200 @@ -94,7 +94,7 @@ ### 编译Schema ```bash -install -Dm644 io.poly000.waylyrics.gschema.xml -t ~/.local/share/glib-2.0/schemas/ +install -Dm644 metainfo/io.github.waylyrics.Waylyrics.gschema.xml -t ~/.local/share/glib-2.0/schemas/ glib-compile-schemas ~/.local/share/glib-2.0/schemas/ ``` @@ -112,7 +112,7 @@ ### Desktop 文件 ```bash -install -Dm644 io.poly000.waylyrics.desktop -t ~/.local/share/applications +install -Dm644 metainfo/io.github.waylyrics.Waylyrics.desktop -t ~/.local/share/applications ``` ## 打包 @@ -120,11 +120,11 @@ 打包脚本样例： ```bash -install -Dm644 io.poly000.waylyrics.gschema.xml -t /usr/share/glib-2.0/schemas/ -install -Dm644 "io.poly000.waylyrics.desktop" -t /usr/share/applications/ -install -Dm644 io.poly000.waylyrics.gschema.xml /usr/share/glib-2.0/schemas/ +install -Dm644 metainfo/io.github.waylyrics.Waylyrics.gschema.xml -t /usr/share/glib-2.0/schemas/ +install -Dm644 metainfo/"io.github.waylyrics.Waylyrics.desktop" -t /usr/share/applications/ install -dm755 /usr/share/waylyrics/themes cp -r themes/* /usr/share/waylyrics/themes/ +cp -r res/icons /usr/share/icons cd locales for po in $(find . -type f -name '*.po') Binary files old/waylyrics-0.2.19/img/en-cn.png and new/waylyrics-0.3.5/img/en-cn.png differ Binary files old/waylyrics-0.2.19/img/search-window.jpg and new/waylyrics-0.3.5/img/search-window.jpg differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/io.poly000.waylyrics.desktop new/waylyrics-0.3.5/io.poly000.waylyrics.desktop --- old/waylyrics-0.2.19/io.poly000.waylyrics.desktop 2024-04-17 12:18:51.000000000 +0200 +++ new/waylyrics-0.3.5/io.poly000.waylyrics.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -1,43 +0,0 @@ -[Desktop Entry] - -Type=Application -Version=1.0 -Name=Waylyrics -Comment=desktop lyrics with QQMusic/NetEase Cloud Music source -Comment[zh]=桌面歌词（使用QQ音乐/网易云音乐歌词） -Exec=/usr/bin/waylyrics -Icon=io.poly000.waylyrics -Terminal=false -Categories=Audio;AudioVideo;GTK;Player; -Actions=Launch;Search;ToggleClickPassthrough;ToggleGTKDecoration;RefetchLyric;ReloadTheme;RemoveLyric; -Keywords=desktop lyric; - -[Desktop Action Search] -Name=Search lyric -Name[zh]=搜索歌词 -Exec=gdbus call -e -d io.poly000.waylyrics -o /io/poly000/waylyrics -m org.gtk.Actions.Activate "search-lyric" [] {} - -[Desktop Action ToggleClickPassthrough] -Name=Toggle mouse clickthrough -Name[zh]=切换鼠标点击穿透 -Exec=gdbus call -e -d io.poly000.waylyrics -o /io/poly000/waylyrics/window/1 -m org.gtk.Actions.Activate "switch-passthrough" [] {} - -[Desktop Action ToggleGTKDecoration] -Name=Toggle GTK+ Decoration -Name[zh]=开关 GTK+ 边框 -Exec=gdbus call -e -d io.poly000.waylyrics -o /io/poly000/waylyrics/window/1 -m org.gtk.Actions.Activate "switch-decoration" [] {} - -[Desktop Action RefetchLyric] -Name=Refetch lyric -Name[zh]=重新下载歌词 -Exec=gdbus call -e -d io.poly000.waylyrics -o /io/poly000/waylyrics -m org.gtk.Actions.Activate "refetch-lyric" [] {} - -[Desktop Action RemoveLyric] -Name=Remove lyric -Name[zh]=删除此首歌词 -Exec=gdbus call -e -d io.poly000.waylyrics -o /io/poly000/waylyrics -m org.gtk.Actions.Activate "remove-lyric" [] {} - -[Desktop Action ReloadTheme] -Name=Reload theme -Name[zh]=重新加载歌词 -Exec=gdbus call -e -d io.poly000.waylyrics -o /io/poly000/waylyrics -m org.gtk.Actions.Activate "reload-theme" [] {} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/io.poly000.waylyrics.gschema.xml new/waylyrics-0.3.5/io.poly000.waylyrics.gschema.xml --- old/waylyrics-0.2.19/io.poly000.waylyrics.gschema.xml 2024-04-17 12:18:51.000000000 +0200 +++ new/waylyrics-0.3.5/io.poly000.waylyrics.gschema.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<schemalist> - <schema id="io.poly000.waylyrics" path="/io/poly000/waylyrics/"> - <key name="window-width" type="i"> - <default>1200</default> - <summary>Default window width</summary> - </key> - <key name="window-height" type="i"> - <default>300</default> - <summary>Default window height</summary> - </key> - <key name="window-decorated" type="b"> - <default>true</default> - <summary>enable GTK+ CSD</summary> - </key> - <key name="window-click-through" type="b"> - <default>true</default> - <summary>allow mouse click-through</summary> - </key> - <key name="lyric-align-mode" type="s"> - <default>"Center"</default> - <summary>lyric align mode</summary> - </key> - <key name="lyric-display-mode" type="s"> - <default>"show_both"</default> - <summary>lyric display mode</summary> - </key> - </schema> -</schemalist> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/locales/en_US/LC_MESSAGES/waylyrics.po new/waylyrics-0.3.5/locales/en_US/LC_MESSAGES/waylyrics.po --- old/waylyrics-0.2.19/locales/en_US/LC_MESSAGES/waylyrics.po 1970-01-01 01:00:00.000000000 +0100 +++ new/waylyrics-0.3.5/locales/en_US/LC_MESSAGES/waylyrics.po 2024-04-25 14:58:04.000000000 +0200 @@ -0,0 +1,170 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the waylyrics package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: waylyrics 0.2.18\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2024-04-17 18:08+0800\n" +"PO-Revision-Date: 2024-04-23 18:58+0800\n" +"Last-Translator: Integral <integral(a)member.fsf.org>\n" +"Language-Team: \n" +"Language: en_US\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 3.4.2\n" + +#: ../src/app/search_window/mod.rs:57 ../src/app/window/imp.rs:69 +#: ../src/tray_icon/windows/mod.rs:38 +msgid "Search lyric" +msgstr "" + +#: ../src/app/search_window/mod.rs:108 +msgid "Title" +msgstr "" + +#: ../src/app/search_window/mod.rs:109 +msgid "Singer" +msgstr "" + +#: ../src/app/search_window/mod.rs:110 +msgid "Album" +msgstr "" + +#: ../src/app/search_window/mod.rs:111 +msgid "Length" +msgstr "" + +#: ../src/app/search_window/mod.rs:112 +msgid "Source" +msgstr "" + +#: ../src/app/search_window/mod.rs:121 +msgid "Enter title..." +msgstr "" + +#: ../src/app/search_window/mod.rs:122 +msgid "title" +msgstr "" + +#: ../src/app/search_window/mod.rs:124 +msgid "Enter album..." +msgstr "" + +#: ../src/app/search_window/mod.rs:125 +msgid "album" +msgstr "" + +#: ../src/app/search_window/mod.rs:127 +msgid "Enter artists split by '/'..." +msgstr "" + +#: ../src/app/search_window/mod.rs:129 +msgid "artists" +msgstr "" + +#: ../src/app/search_window/mod.rs:134 +msgid "Set as lyric" +msgstr "" + +#: ../src/app/search_window/mod.rs:252 +msgid "No result was found." +msgstr "" + +#: ../src/app/window/imp.rs:61 +msgid "Hide Decoration" +msgstr "" + +#: ../src/app/window/imp.rs:65 ../src/tray_icon/unix/mod.rs:87 +#: ../src/tray_icon/windows/mod.rs:48 +msgid "Toggle Passthrough" +msgstr "" + +#: ../src/app/window/imp.rs:68 ../src/tray_icon/unix/mod.rs:101 +msgid "Reload theme" +msgstr "" + +#: ../src/app/window/imp.rs:71 +msgid "Refetch lyric" +msgstr "" + +#: ../src/app/window/imp.rs:74 +msgid "Remove lyric" +msgstr "" + +#: ../src/app/window/imp.rs:76 +msgid "Remove lyric forever" +msgstr "" + +#: ../src/app/window/imp.rs:87 ../src/tray_icon/unix/mod.rs:38 +msgid "Lyric Display Mode" +msgstr "" + +#: ../src/app/window/imp.rs:91 ../src/tray_icon/unix/mod.rs:58 +msgid "Lyric Alignment" +msgstr "" + +#: ../src/app/window/imp.rs:101 ../src/app/window/imp.rs:113 +#: ../src/tray_icon/unix/mod.rs:111 +msgid "Select Player" +msgstr "" + +#: ../src/app/window/imp.rs:122 +msgid "Disconnect" +msgstr "" + +#: ../src/tray_icon/unix/mod.rs:78 ../src/tray_icon/windows/mod.rs:43 +msgid "Toggle Decoration" +msgstr "" + +#: ../src/tray_icon/unix/mod.rs:137 +msgid "Search Lyric" +msgstr "" + +#: ../src/tray_icon/unix/mod.rs:146 +msgid "Refetch Lyric" +msgstr "" + +#: ../src/tray_icon/unix/mod.rs:156 ../src/tray_icon/windows/mod.rs:53 +msgid "Restart" +msgstr "" + +#: ../src/tray_icon/unix/mod.rs:165 ../src/tray_icon/windows/mod.rs:58 +msgid "Quit" +msgstr "" + +#: ../src/app/window/imp.rs:140 ../src/tray_icon/unix/mod.rs:42 +msgid "show_both" +msgstr "Source + Translation" + +#: ../src/app/window/imp.rs:140 ../src/tray_icon/unix/mod.rs:42 +msgid "show_both_rev" +msgstr "Translation + Source" + +#: ../src/app/window/imp.rs:140 ../src/tray_icon/unix/mod.rs:42 +msgid "origin" +msgstr "Source Only" + +#: ../src/app/window/imp.rs:140 ../src/tray_icon/unix/mod.rs:42 +msgid "prefer_translation" +msgstr "Prefer Translation" + +#: ../src/app/window/imp.rs:150 ../src/tray_icon/unix/mod.rs:62 +msgid "Center" +msgstr "" + +#: ../src/app/window/imp.rs:150 ../src/tray_icon/unix/mod.rs:62 +msgid "Start" +msgstr "" + +#: ../src/app/window/imp.rs:150 ../src/tray_icon/unix/mod.rs:62 +msgid "End" +msgstr "" + +#: ../src/app/window/imp.rs:150 ../src/tray_icon/unix/mod.rs:62 +msgid "Fill" +msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/locales/waylyrics.pot new/waylyrics-0.3.5/locales/waylyrics.pot --- old/waylyrics-0.2.19/locales/waylyrics.pot 2024-04-17 12:18:51.000000000 +0200 +++ new/waylyrics-0.3.5/locales/waylyrics.pot 2024-04-25 14:58:04.000000000 +0200 @@ -104,7 +104,7 @@ msgstr "" #: ../src/app/window/imp.rs:91 ../src/tray_icon/unix/mod.rs:58 -msgid "Lyric Align" +msgid "Lyric Alignment" msgstr "" #: ../src/app/window/imp.rs:101 ../src/app/window/imp.rs:113 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/locales/zh_CN/LC_MESSAGES/waylyrics.po new/waylyrics-0.3.5/locales/zh_CN/LC_MESSAGES/waylyrics.po --- old/waylyrics-0.2.19/locales/zh_CN/LC_MESSAGES/waylyrics.po 2024-04-17 12:18:51.000000000 +0200 +++ new/waylyrics-0.3.5/locales/zh_CN/LC_MESSAGES/waylyrics.po 2024-04-25 14:58:04.000000000 +0200 @@ -103,7 +103,7 @@ msgstr "显示模式" #: ../src/app/window/imp.rs:91 ../src/tray_icon/unix/mod.rs:58 -msgid "Lyric Align" +msgid "Lyric Alignment" msgstr "对齐方式" #: ../src/app/window/imp.rs:101 ../src/app/window/imp.rs:113 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/metainfo/io.github.waylyrics.Waylyrics.desktop new/waylyrics-0.3.5/metainfo/io.github.waylyrics.Waylyrics.desktop --- old/waylyrics-0.2.19/metainfo/io.github.waylyrics.Waylyrics.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/waylyrics-0.3.5/metainfo/io.github.waylyrics.Waylyrics.desktop 2024-04-25 14:58:04.000000000 +0200 @@ -0,0 +1,43 @@ +[Desktop Entry] + +Type=Application +Version=1.0 +Name=Waylyrics +Comment=desktop lyrics with QQMusic/NetEase Cloud Music source +Comment[zh]=桌面歌词（使用QQ音乐/网易云音乐歌词） +Exec=waylyrics +Icon=io.github.waylyrics.Waylyrics +Terminal=false +Categories=Audio;AudioVideo;GTK;Player; +Actions=Search;ToggleClickPassthrough;ToggleGTKDecoration;RefetchLyric;ReloadTheme;RemoveLyric; +Keywords=desktop lyric; + +[Desktop Action Search] +Name=Search lyric +Name[zh]=搜索歌词 +Exec=gdbus call -e -d io.github.waylyrics.Waylyrics -o /io/github/waylyrics/Waylyrics -m org.gtk.Actions.Activate "search-lyric" [] {} + +[Desktop Action ToggleClickPassthrough] +Name=Toggle mouse clickthrough +Name[zh]=切换鼠标点击穿透 +Exec=gdbus call -e -d io.github.waylyrics.Waylyrics -o /io/github/waylyrics/Waylyrics/window/1 -m org.gtk.Actions.Activate "switch-passthrough" [] {} + +[Desktop Action ToggleGTKDecoration] +Name=Toggle GTK+ Decoration +Name[zh]=开关 GTK+ 边框 +Exec=gdbus call -e -d io.github.waylyrics.Waylyrics -o /io/github/waylyrics/Waylyrics/window/1 -m org.gtk.Actions.Activate "switch-decoration" [] {} + +[Desktop Action RefetchLyric] +Name=Refetch lyric +Name[zh]=重新下载歌词 +Exec=gdbus call -e -d io.github.waylyrics.Waylyrics -o /io/github/waylyrics/Waylyrics -m org.gtk.Actions.Activate "refetch-lyric" [] {} + +[Desktop Action RemoveLyric] +Name=Remove lyric +Name[zh]=删除此首歌词 +Exec=gdbus call -e -d io.github.waylyrics.Waylyrics -o /io/github/waylyrics/Waylyrics -m org.gtk.Actions.Activate "remove-lyric" [] {} + +[Desktop Action ReloadTheme] +Name=Reload theme +Name[zh]=重新加载歌词 +Exec=gdbus call -e -d io.github.waylyrics.Waylyrics -o /io/github/waylyrics/Waylyrics -m org.gtk.Actions.Activate "reload-theme" [] {} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/metainfo/io.github.waylyrics.Waylyrics.gschema.xml new/waylyrics-0.3.5/metainfo/io.github.waylyrics.Waylyrics.gschema.xml --- old/waylyrics-0.2.19/metainfo/io.github.waylyrics.Waylyrics.gschema.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/waylyrics-0.3.5/metainfo/io.github.waylyrics.Waylyrics.gschema.xml 2024-04-25 14:58:04.000000000 +0200 @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<schemalist> + <schema id="io.github.waylyrics.Waylyrics" path="/io/github/waylyrics/Waylyrics/"> + <key name="window-width" type="i"> + <default>1200</default> + <summary>Default window width</summary> + </key> + <key name="window-height" type="i"> + <default>300</default> + <summary>Default window height</summary> + </key> + <key name="window-decorated" type="b"> + <default>true</default> + <summary>enable GTK+ CSD</summary> + </key> + <key name="window-click-through" type="b"> + <default>true</default> + <summary>allow mouse click-through</summary> + </key> + <key name="lyric-align-mode" type="s"> + <default>"Center"</default> + <summary>lyric alignment mode</summary> + </key> + <key name="lyric-display-mode" type="s"> + <default>"show_both"</default> + <summary>lyric display mode</summary> + </key> + </schema> +</schemalist> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/metainfo/io.github.waylyrics.Waylyrics.metainfo.xml new/waylyrics-0.3.5/metainfo/io.github.waylyrics.Waylyrics.metainfo.xml --- old/waylyrics-0.2.19/metainfo/io.github.waylyrics.Waylyrics.metainfo.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/waylyrics-0.3.5/metainfo/io.github.waylyrics.Waylyrics.metainfo.xml 2024-04-25 14:58:04.000000000 +0200 @@ -0,0 +1,125 @@ +<?xml version="1.0" encoding="UTF-8"?> +<component type="desktop-application"> + <id>io.github.waylyrics.Waylyrics</id> + <replaces> + <id>io.poly000.waylyrics</id> + </replaces> + + <name>Waylyrics</name> + <summary>A furry way to show desktop lyrics</summary> + <launchable type="desktop-id">io.github.waylyrics.Waylyrics.desktop</launchable> + + <developer id="io.github.waylyrics"> + <name>mokurin000</name> + </developer> + + <url type="homepage">https://github.com/waylyrics/waylyrics</url> + <url type="bugtracker">https://github.com/waylyrics/waylyrics/issues</url> + + <metadata_license>CC-BY-4.0</metadata_license> + <project_license>MIT</project_license> + + <description> + <p>The furry way to show desktop lyrics</p> + </description> + + <launchable type="desktop-id">io.github.waylyrics.Waylyrics</launchable> + <screenshots> + <screenshot type="default"> + <caption>Main UI</caption> + <caption xml:lang="zh">主界面</caption> + <image>https://github.com/waylyrics/waylyrics/raw/v0.3.3/img/en-cn.png</image> + </screenshot> + <screenshot type="default"> + <caption>Search Lyrics</caption> + <caption xml:lang="zh">搜索歌词</caption> + <image>https://github.com/waylyrics/waylyrics/raw/v0.3.3/img/search-window.jpg</image> + </screenshot> + </screenshots> + + <releases> + <release version="0.3.5" date="2024-04-25"> + <url type="details">https://github.com/waylyrics/waylyrics/releases/tag/v0.3.5</url> + <description> + <p>Features</p> + <ul> + <li>Reload lyric from cache by `reload-lyric` action</li> + <li>Emit `NewLyricCache` signal on lyric cache update</li> + </ul> + </description> + </release> + <release version="0.3.4" date="2024-04-25"> + <url type="details">https://github.com/waylyrics/waylyrics/releases/tag/v0.3.4</url> + <description> + <p>Miscellaneous Tasks</p> + <ul> + <li><em>(desktopfile)</em> Fix `Exec`</li> + </ul> + </description> + </release> + <release version="0.3.3" date="2024-04-25"> + <url type="details">https://github.com/waylyrics/waylyrics/releases/tag/v0.3.3</url> + <description> + <p>Miscellaneous Tasks</p> + <ul> + <li><em>(desktopfile)</em> Remove action `Launch`</li> + </ul> + </description> + </release> + <release version="0.3.2" date="2024-04-25"> + <url type="details">https://github.com/waylyrics/waylyrics/releases/tag/v0.3.2</url> + <description> + <p>🐛 Bug Fixes</p> + <ul> + <li><em>(readme)</em> Broken link of desktop file</li> + <li>Enum tuple variant cannot be destrcucted by tuple matching</li> + </ul> + <p>⚙️ Miscellaneous Tasks</p> + <ul> + <li>Make extracting values from tuples more readable</li> + <li>Use for loop to refactor entries appending in imp.vbox</li> + <li>Use for loop to refactor items appending in ui_section & play_section</li> + </ul> + <p>Log</p> + <ul> + <li><em>(tray)</em> Do not flood start_time on smtc</li> + </ul> + </description> + </release> + <release version="0.3.1" date="2024-04-24"> + <url type="details">https://github.com/waylyrics/waylyrics/releases/tag/v0.3.1</url> + <description> + <p>Features</p> + <ul> + <li>Set search-window ColumnView row padding in themes</li> + </ul> + </description> + </release> + <release version="0.3.0" date="2024-04-24"> + <url type="details">https://github.com/waylyrics/waylyrics/releases/tag/v0.3.0</url> + <description> + <p>Bug Fixes</p> + <ul> + <li>Set titlebar before set decorated</li> + <li>CI: New schema path</li> + <li>i18n: en_US translation</li> + <li>Fix: missing icon for search window under wayland</li> + </ul> + <p>BREAKING CHANGE</p> + <ul> + <li>We moved .gschema.xml and .desktop to metainfo/, and we changed APP_ID from io.poly000.waylyrics to io.github.waylyrics.Waylyrics to hit the requirement of flathub.</li> + </ul> + </description> + </release> + <release version="0.2.21" date="2024-04-23"> + <url type="details">https://github.com/waylyrics/waylyrics/releases/tag/v0.2.21</url> + <description> + <p>Bug Fixes</p> + <ul> + <li>Stop lyric update when show_lyric_on_pause not set on pause</li> + </ul> + </description> + </release> + </releases> + <content_rating type="oars-1.1"/> +</component> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/res/icons/hicolor/scalable/apps/io.github.waylyrics.Waylyrics.svg new/waylyrics-0.3.5/res/icons/hicolor/scalable/apps/io.github.waylyrics.Waylyrics.svg --- old/waylyrics-0.2.19/res/icons/hicolor/scalable/apps/io.github.waylyrics.Waylyrics.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/waylyrics-0.3.5/res/icons/hicolor/scalable/apps/io.github.waylyrics.Waylyrics.svg 2024-04-25 14:58:04.000000000 +0200 @@ -0,0 +1,112 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + + +<svg + version="1.1" + id="svg1" + width="512" + height="512" + viewBox="0 0 512 512" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + <defs + id="defs1" /> + <g + id="g1"> + <g + id="g2"> + <path + style="fill:#f8935c" + d="M 243.26999,509.00651 C 214.05615,505.91389 199.17331,500.01587 186.5,486.50874 l -6,-6.39476 -7,1.45398 c -11.36142,2.35991 -39.10503,2.92625 -51.33071,1.04784 -11.4898,-1.76535 -27.695213,-6.83917 -37.340777,-11.69117 C 74.94576,465.95331 61.129159,456.12871 53.995327,449 47.302451,442.31193 35.180345,425.34537 30.775043,416.5 26.601421,408.11982 22.252891,394.0564 20.442262,383.08313 16.406583,358.625 21.497298,329.37892 34.443139,302.6483 39.472196,292.26429 47.549881,278.67825 62.475544,255.5 c 13.379733,-20.77756 20.272085,-33.2261 26.576036,-48 2.816188,-6.6 5.826404,-12.7875 6.689368,-13.75 2.048088,-2.28432 6.363412,-2.23307 8.873442,0.10537 7.78433,7.25222 13.26349,23.55641 20.91532,62.23717 10.03983,50.7524 14.23196,64.72497 26.82458,89.40746 8.04835,15.77538 18.487,31.92413 27.99974,43.31604 10.94371,13.10556 9.14021,12.84419 19.64548,2.84706 4.97422,-4.73362 17.7359,-15.11513 28.35927,-23.07003 10.62338,-7.95489 22.65108,-17.59601 26.72823,-21.42469 7.31759, -6.87166 7.38082,-6.97406 4.91299,-7.95673 -1.375,-0.54751 -8.77684,-2.19936 -16.44853,-3.67076 -25.12684,-4.81923 -53.58723,-15.60425 -71.0655,-26.93014 C 159.80296,300.39218 159,299.53119 159,294.15011 c 0,-4.18169 -0.41348,-4.897 -5.8242,-10.07568 C 144.72835,275.98925 141,270.45619 141,266.00495 c 0,-4.55853 1.67516,-6.17052 9.41881,-9.06363 7.32036,-2.73497 13.93172,-8.67383 16.16449,-14.52026 1.40189,-3.6708 1.60754,-6.92445 1.21171,-19.1711 -0.52395,-16.2103 -0.49649,-16.11863 -8.30453,-27.72969 -6.1229,-9.10516 -9.42311,-15.7972 -13.81831,-28.02027 -4.59789,-12.78676 -6.2512,-19.47792 -8.14336,-32.95722 -3.4368,-24.48301 -0.20822,-53.462692 9.05406,-81.269156 4.64412,-13.942207 8.81735,-22.656673 12.07831,-25.221752 3.59807,-2.830239 8.31415,-2.624953 23.06612,1.004044 24.71741,6.080503 51.58944,17.651932 71.46015,30.771618 13.84031,9.1381 16.7515,10.633518 18.09167,9.293344 0.73243,-0.732425 -0.0639,-2.852801 -2.63669,-7.021125 C 263.71873,54.122724 262,48.91238 262,41.9631 67 c 0,-5.285564 0.27753,-6.018902 3.21237,-8.488412 2.82544,-2.377446 3.7977,-2.633709 8.07182,-2.127503 13.1712,1.559934 32.33793,9.499938 48.20355,19.96879 9.92932,6.551807 10.00321,6.580398 12.63119,4.88716 1.45389,-0.936761 10.04414,-6.683211 19.08944,-12.769889 C 371.73536,30.966302 390.40599,21.356114 409.32588,14.548368 424.97599,8.9171558 444.0098,4.098882 453.74607,3.303711 l 7.24608,-0.5917941 3.32786,3.5285582 C 471.1464,13.478565 478.69314,41.012154 480.97371,67 c 3.45094,39.32469 -2.48356,76.76514 -17.43558,110 -4.57961,10.1794 -4.709,10.73122 -4.2377,18.07265 0.97844,15.2413 10.17253,25.73972 24.91871,28.45383 2.04552,0.37649 4.90301,1.8684 6.34997,3.31535 3.86234,3.86235 2.91256,8.20852 -4.09556,18.74107 -16.02964,24.09107 -30.94674,37.84198 -60.22355,55.51541 l -10.25,6.18758 0.007,4.10705 c 0.008,4.45305 3.082,18.3812 5.65233,25.60706 0.88038,2.475 4.55615,10.71267 8.16836,18.30593 6.40315,13.46012 6.52734,13.87342 4.95801,16.5 -1.03418,1.7309 -3.79926,3.58786 -7.7 3416,5.19407 -3.36848,1.37501 -6.48343,3.08077 -6.92213,3.79059 -0.43869,0.70982 -0.58875,5.98698 -0.33346,11.72702 0.53377,12.00165 -0.3476,14.31428 -6.57184,17.24387 l -3.72412,1.75284 -0.26954,21.75635 c -0.19674,15.8805 0.15274,24.52098 1.29402,31.99284 2.8141,18.4237 2.84547,19.15462 0.9899,23.06495 -2.81551,5.93324 -7.54553,8.18181 -17.01438,8.08835 -6.35568,-0.0627 -9.33601,-0.64273 -14.5,-2.82184 -8.88794,-3.75053 -9.22283,-3.72644 -10.30788,0.74148 -3.4055,14.02289 -26.36597,16.94758 -47.82541,6.09197 -4.57007,-2.31185 -4.65715,-2.31746 -6.38215,-0.41136 -2.78343,3.07566 -9.5728,5.90454 -18.09443,7.53928 -9.44966,1.81277 -42.36378,2.69471 -54.12014,1.45017 z m 70.78573,-43.62341 c 5.12559,-3.89433 14.71756,-8.05497 24.10765,-10.45701 4.58515,-1.1729 8.67526,-2.44722 9.08913,-2.83182 0.41388,-0.3846 -0.26112,-3.82565 -1.5,-7.64677 -2.15084,-6.63393 -2.40481,-6.96206 -5.62713,-7.27015 -5.29961,-0.50671 -17.46196,2.62519 -25.17041,6.48157 l -7.03788,3.52091 0.47243,10.16008 c 0.25983,5.58805 0.50349,10.27259 0.54146,10.41009 0.22082,0.79967 2.09828,-0.0674 5.12475,-2.3669 z m 60.46676,-12.68421 c 3.86236,-1.36407 10.49986,-3.04108 14.75,-3.7267 L 397,447.7256 v -8.3628 C 397,432.05292 396.77883,431 395.2434,431 c -3.88095,0 -8.56694,2.08305 -13.03575,5.79475 -3.76511,3.12722 -9.89483,7.36338 -20.07775,13.87543 -0.20355,0.13017 -0.0703,1.43113 0.2961,2.89101 0.76527,3.04908 1.08615,3.0262 12.09648,-0.8623 z m -7.42931,-18.85662 c 9.23998,-6.43424 20.11165,-17.44748 25.71889,-26.05381 4.26003,-6.53854 4.30668,-6.57285 9.88689,-7.27005 l 5.60666,-0.70051 -0.62857,-15.23318 c -0.4571,-11.07765 -0.30782,-15.55394 0.5472,-16.40896 0.64667,-0.64667 3.44826,-1.18265 6.22576,-1.19107 8.33624,-0.0253 8.49402,-0.54892 3.23418,-10.73294 -5.54202,-10.73037 -9.89105,-23.36721 -12.47622,-36.25175 -1.79841,-8.96329 -2.05586,-9.51788 -4.55703,-9.81642 C 399.19292,310.00955 398,309.28596 398,308.57561 c 0,-0.71036 6.11509,-5.2456 13.58909,-10.07833 18.57106,-12.00814 30.0 851,-21.04738 41.95438,-32.93678 C 463.20038,255.88721 477,238.71559 477,236.37226 c 0,-2.50875 -12.45613,-5.44509 -39.5,-9.31153 -39.18252,-5.60188 -48.54454,-6.4043 -66.17379,-5.67174 -20.29787,0.84345 -21.21665,1.06365 -22.9837,5.50854 -3.72818,9.37791 -7.87793,14.0462 -15.74034,17.7072 -15.77903,7.34723 -34.35103,-4.40416 -36.24299,-22.93268 -0.29046,-2.84463 -0.70548,-5.74627 -0.92226,-6.4481 -0.50144,-1.62344 -4.88838,1.09925 -21.43692,13.30458 -6.875,5.07063 -14.525,10.24469 -17,11.49791 -5.17927,2.62254 -13.25166,4.94443 -17.25,4.96169 -3.23918,0.014 -3.18696,-0.17132 -1.11951,3.97299 1.50402,3.01487 1.50486,3.53183 0.0109,6.66459 -2.08225,4.36653 -7.13028,6.88037 -11.98686,5.96927 C 222.65731,260.84508 219,256.97143 219,253.48759 c 0,-2.61077 2.40574,-4.97289 4.03757,-3.96437 0.70873,0.43802 1.01177,0.007 0.81877,-1.16391 -0.47486,-2.88136 0.97824,-4.35931 4.28601,-4.35931 3.58084,0 3.67948,0.31183 -2.64235,-8.3535 l -5,-6.8535 -0.67546,7.99722 c -0.75692,8.96177 -2.90611,1 4.09685 -7.9735,19.05116 -3.91861,3.83116 -6.37141,4.5855 -12.62006,3.88119 -3.89689,-0.43924 -5.3044,-1.23592 -8.69049,-4.91898 -2.22227,-2.41717 -4.49049,-5.16108 -5.04049,-6.09757 -0.55,-0.93649 -2.40302,-1.97281 -4.11782,-2.30293 -2.7587,-0.53108 -3.23544,-0.27212 -4.13912,2.24835 -1.91618,5.34447 -7.36502,11.50567 -13.80813,15.61334 -3.53921,2.25635 -6.43493,4.4484 -6.43493,4.87122 0,1.30421 9.97382,10.82238 14.01106,13.37098 5.18558,3.27351 5.57016,4.2156 3.09024,7.56988 l -2.13425,2.88672 4.26647,3.15431 c 5.44231,4.02361 27.39811,14.61902 39.90222,19.25597 24.33328,9.02361 60.78766,15.54599 87.36426,15.63114 4.4,0.0141 8.49442,0.35623 9.09872,0.76031 0.60429,0.40408 1.39346,3.98131 1.7537,7.9494 0.84437,9.30078 4.12568,18.22798 9.87957,26.87851 4.36109,6.55657 16.56714,19.23778 21.60488,22.44593 2.10005,1.33735 2.57262,3.11541 4.66316,17.54516 1.27946,8.83135 2.84567,18.05021 3.48045,20.48635 0.63479,2.43614 1.59121,6.11684 2.12538,8.17934 0.53418,2.0625 1.55831,3.75 2.27586 ,3.75 0.71754,0 4.63769,-2.32098 8.71145,-5.15773 z M 188.5,297.1293 c -7.24274,-4.49829 -11.3203,-12.11373 -9.47686,-17.69942 C 180.2943,275.57823 184.27899,272 187.297,272 c 4.39494,0 10.45975,4.80348 13.24024,10.48659 3.04899,6.23192 2.84028,8.72288 -1.12584,13.43634 -3.02935,3.60017 -6.44846,3.97819 -10.9114,1.20637 z m 38.13486,-15.20188 c -2.93116,-2.30565 -3.55818,-6.63588 -1.09761,-7.58009 0.84548,-0.32444 2.40372,0.19426 3.46275,1.15267 2.55116,2.30876 4.65373,1.35305 5.5,-2.5 0.87294,-3.97446 2.98862,-4.80438 5.80088,-2.27553 4.37645,3.93542 5.66483,3.76346 9.17466,-1.22447 1.90963,-2.71384 4.91362,-0.89998 5.32784,3.21704 0.23916,2.37707 -0.38632,3.59568 -2.95489,5.75699 -2.80841,2.36313 -3.85359,2.66005 -7.5702,2.15064 -3.47659,-0.47652 -4.69614,-0.20682 -6.29511,1.39215 -2.6117,2.6117 -7.96808,2.5695 -11.34832,-0.0894 z M 340.5,281.83791 c -13.79404,-7.59549 -13.15061,-24.08134 1.20321,-30.82843 5.77776,-2.71586 10.76849,-2.28663 16.34854,1.40607 4.27264,2.8275 7.94825, 8.9451 7.94825,13.22889 0,8.75999 -9.17854,17.38091 -18.44578,17.32515 -2.77982,-0.0167 -5.95422,-0.52598 -7.05422,-1.13168 z m -82,139.42777 c 2.65648,-0.97289 6.01397,-1.28788 9.99612,-0.93781 7.4331,0.65343 5.17526,-0.99696 -2.61396,-1.91072 -5.11059,-0.59952 -11.71185,0.50549 -14.76028,2.47078 -1.8659,1.20294 -0.35132,3.43246 1.72927,2.54555 0.90687,-0.38658 3.44885,-1.36209 5.64885,-2.1678 z M 231,386.52434 c 13.13067,-9.86915 31,-25.78182 31,-27.60555 0,-0.39955 -9.1125,6.06143 -20.25,14.35774 -21.23722,15.81957 -38.25848,31.636 -42.53299,39.52231 -1.98752,3.6669 -1.01683,2.94445 7.5,-5.58205 C 212.09765,401.83004 223.025,392.51844 231,386.52434 Z m -92,-46.82118 c 0,-0.16326 -1.815,-5.67576 -4.03333,-12.25 -5.54443,-16.43143 -9.84734,-34.05949 -16.34288,-66.95316 -3.04105,-15.4 -6.49517,-31.15 -7.6758,-35 -3.00616,-9.80292 -6.04694,-16.63368 -7.22923,-16.23959 -0.55172,0.18391 -2.89779,4.58805 -5.213485,9.78698 C 93.643586,229.96228 86.505814,242.51996 73.522651,263 c -14.092 788,22.2304 -18.41665,29.59946 -24.057096,41 -5.758623,11.6394 -9.022371,19.77652 -8.244311,20.55458 0.280493,0.28049 8.309054,-1.06112 17.841246,-2.98135 18.920228,-3.81143 18.390041,-3.86631 22.114033,2.28919 C 84.896805,330.01179 92.055399,339 93.232737,339 c 0.613713,0 4.364451,-3.15 8.334973,-7 3.97052,-3.85 7.74851,-7 8.39554,-7 0.64702,0 3.28248,1.46065 5.85657,3.24588 C 124.21011,334.06486 139,341.37507 139,339.70316 Z m 59.05115,-95.75431 c 2.36289,-2.36289 1.88302,-5.64284 -1.14421,-7.82082 -2.51774,-1.81142 -2.46576,-7.29962 0.12316,-13.0054 l 1.98617,-4.37738 -2.20513,1.46416 c -3.96989,2.6359 -6.31114,8.61641 -6.31114,16.1212 0,5.60741 0.34761,7.08479 1.94113,8.25 2.55754,1.87012 3.17802,1.80024 5.61002,-0.63176 z M 313.6281,230.40159 c 2.75089,-0.73823 4.34494,-4.24247 3.26176,-7.17041 -0.46163,-1.24785 -2.38552,-3.18109 -4.27529,-4.29609 -1.88978,-1.11499 -3.68891,-2.68644 -3.99808,-3.49211 -0.73383,-1.91233 0.29603,-7.20168 2.10006,-10.78591 1.80099,-3.57818 0.94005, -4.56126 -1.8128,-2.06997 -7.12249,6.44577 -8.37444,21.5377 -2.19018,26.40223 2.72291,2.14184 3.55931,2.31267 6.91453,1.41226 z M 165.09766,173.01978 c -1.75749,-8.1949 -1.30205,-13.61471 1.96302,-23.3603 3.41465,-10.19203 7.25227,-17.04138 13.16159,-23.49064 2.96481,-3.23572 3.81604,-4.87971 3.36556,-6.5 -0.33163,-1.19286 -0.88054,-4.67856 -1.21979,-7.746 -0.60108,-5.4348 -0.54346,-5.60751 2.25757,-6.76655 1.58091,-0.65416 5.68599,-1.29444 9.1224,-1.42284 4.08313,-0.15256 6.2487,-0.65171 6.25,-1.44059 0.006,-3.396218 -14.93634,-28.343316 -24.66855,-41.186662 C 172.05512,56.785135 170.95262,51.765353 173,50.5 c 1.96706,-1.215709 0.94252,-4.590562 -2.50901,-8.264685 -3.29344,-3.505848 -3.59451,-3.624391 -4.90093,-1.92967 -2.32213,3.012332 -9.31791,25.388417 -12.25394,39.194355 -2.52047,11.851857 -2.76779,14.898852 -2.80038,34.5 -0.0376,22.63259 0.84851,29.66443 5.55243,44.06076 2.71644,8.31366 8.75612,21.42828 9.51766,20.66675 0.32422,-0.32423 0.0956,-2.8927 -0.50817,-5.70773 z m 53. 13703,2.59544 C 221.53818,170.60068 212.90851,157 206.42327,157 c -7.21352,0 -8.56877,11.48473 -1.99868,16.93741 4.26526,3.53986 11.96699,4.47555 13.8101,1.67781 z m 91.15147,-14.03092 c 6.17184,-1.85745 11.14852,-5.75186 13.67241,-10.6991 2.46168,-4.8253 1.85798,-7.35987 -2.26026,-9.4895 -2.5975,-1.34322 -3.72659,-1.39572 -7.47082,-0.3474 -6.1731,1.72836 -12.70222,7.02861 -15.32028,12.4368 -2.45186,5.06488 -2.15598,7.11936 1.22062,8.47554 3.21298,1.29045 4.81751,1.23101 10.15833,-0.37634 z M 196.31611,142.85917 c 11.77863,-15.71068 29.1345,-30.52158 53.14937,-45.35584 2.88257,-1.7806 2.90623,-1.858247 0.84617,-2.777471 -2.66833,-1.190641 -9.98922,2.588448 -22.81165,11.775511 -15.48256,11.09301 -29.46621,26.37208 -35.89054,39.21539 -4.5208,9.03783 -3.95328,8.69327 4.70665,-2.85759 z M 428.28965,146.25 c 9.19037,-20.62005 15.29788,-62.652035 13.02784,-89.657734 -0.58592,-6.970377 -1.34514,-12.953254 -1.68717,-13.29528 -1.06638,-1.066381 -4.8367,1.20678 -13.13032,7.916384 -11.41698,9. 236428 -23.91045,20.877625 -31.85917,29.685808 C 386.72596,89.669862 374,106.19395 374,107.70037 c 0,0.62804 2.9995,0.30676 7.75,-0.83009 8.38504,-2.00665 15.88735,-2.38535 18.20545,-0.91897 1.24275,0.78613 1.26721,1.65517 0.16738,5.94649 -0.70844,2.7642 -1.03972,5.42766 -0.73617,5.91882 0.30355,0.49115 3.2555,1.87878 6.55989,3.08362 10.83164,3.94941 13.07735,7.27978 17.09368,25.34976 0.70292,3.1625 1.59497,5.75 1.98234,5.75 0.38736,0 1.85755,-2.5875 3.26708,-5.75 z M 277.92207,79.448805 c 10.90862,-1.972666 11.92565,-2.306849 10.22302,-3.359132 -1.33619,-0.825815 -3.86408,-0.418514 -17.64509,2.843029 -10.16801,2.406456 -5.01344,2.764885 7.42207,0.516103 z m 81.2128,-22.987403 c 16.16856,-10.329629 39.52084,-22.164097 58.0998,-29.443806 7.55406,-2.959877 13.55317,-5.563091 13.33134,-5.78492 C 428.97247,19.639134 396.34981,32.437266 381,40.677825 366.84944,48.274562 342.27407,65 345.26243,65 c 0.27902,0 6.52162,-3.842369 13.87244,-8.538598 z" + id="path8" /> + <path + style="fill:#9e9e9d" + d="M 243.26999,509.00651 C 214.05615,505.91389 199.17331,500.01587 186.5,486.50874 l -6,-6.39476 -7,1.45398 c -11.36142,2.35991 -39.10503,2.92625 -51.33071,1.04784 -11.4898,-1.76535 -27.695213,-6.83917 -37.340777,-11.69117 C 74.94576,465.95331 61.129159,456.12871 53.995327,449 47.302451,442.31193 35.180345,425.34537 30.775043,416.5 26.601421,408.11982 22.252891,394.0564 20.442262,383.08313 16.406583,358.625 21.497298,329.37892 34.443139,302.6483 39.472196,292.26429 47.549881,278.67825 62.475544,255.5 c 13.379733,-20.77756 20.272085,-33.2261 26.576036,-48 2.816188,-6.6 5.826404,-12.7875 6.689368,-13.75 2.048088,-2.28432 6.363412,-2.23307 8.873442,0.10537 7.78433,7.25222 13.26349,23.55641 20.91532,62.23717 10.03983,50.7524 14.23196,64.72497 26.82458,89.40746 8.04835,15.77538 18.487,31.92413 27.99974,43.31604 10.94371,13.10556 9.14021,12.84419 19.64548,2.84706 4.97422,-4.73362 17.7359,-15.11513 28.35927,-23.07003 10.62338,-7.95489 22.65108,-17.59601 26.72823,-21.42469 7.31759, -6.87166 7.38082,-6.97406 4.91299,-7.95673 -1.375,-0.54751 -8.77684,-2.19936 -16.44853,-3.67076 -25.12684,-4.81923 -53.58723,-15.60425 -71.0655,-26.93014 C 159.80296,300.39218 159,299.53119 159,294.15011 c 0,-4.18169 -0.41348,-4.897 -5.8242,-10.07568 C 144.72835,275.98925 141,270.45619 141,266.00495 c 0,-4.55853 1.67516,-6.17052 9.41881,-9.06363 7.32036,-2.73497 13.93172,-8.67383 16.16449,-14.52026 1.40189,-3.6708 1.60754,-6.92445 1.21171,-19.1711 -0.52395,-16.2103 -0.49649,-16.11863 -8.30453,-27.72969 -6.1229,-9.10516 -9.42311,-15.7972 -13.81831,-28.02027 -4.59789,-12.78676 -6.2512,-19.47792 -8.14336,-32.95722 -3.4368,-24.48301 -0.20822,-53.462692 9.05406,-81.269156 4.64412,-13.942207 8.81735,-22.656673 12.07831,-25.221752 3.59807,-2.830239 8.31415,-2.624953 23.06612,1.004044 24.71741,6.080503 51.58944,17.651932 71.46015,30.771618 13.84031,9.1381 16.7515,10.633518 18.09167,9.293344 0.73243,-0.732425 -0.0639,-2.852801 -2.63669,-7.021125 C 263.71873,54.122724 262,48.91238 262,41.9631 67 c 0,-5.285564 0.27753,-6.018902 3.21237,-8.488412 2.82544,-2.377446 3.7977,-2.633709 8.07182,-2.127503 13.1712,1.559934 32.33793,9.499938 48.20355,19.96879 9.92932,6.551807 10.00321,6.580398 12.63119,4.88716 1.45389,-0.936761 10.04414,-6.683211 19.08944,-12.769889 C 371.73536,30.966302 390.40599,21.356114 409.32588,14.548368 424.97599,8.9171558 444.0098,4.098882 453.74607,3.303711 l 7.24608,-0.5917941 3.32786,3.5285582 C 471.1464,13.478565 478.69314,41.012154 480.97371,67 c 3.45094,39.32469 -2.48356,76.76514 -17.43558,110 -4.57961,10.1794 -4.709,10.73122 -4.2377,18.07265 0.97844,15.2413 10.17253,25.73972 24.91871,28.45383 2.04552,0.37649 4.90301,1.8684 6.34997,3.31535 3.86234,3.86235 2.91256,8.20852 -4.09556,18.74107 -16.02964,24.09107 -30.94674,37.84198 -60.22355,55.51541 l -10.25,6.18758 0.007,4.10705 c 0.008,4.45305 3.082,18.3812 5.65233,25.60706 0.88038,2.475 4.55615,10.71267 8.16836,18.30593 6.40315,13.46012 6.52734,13.87342 4.95801,16.5 -1.03418,1.7309 -3.79926,3.58786 -7.7 3416,5.19407 -3.36848,1.37501 -6.48343,3.08077 -6.92213,3.79059 -0.43869,0.70982 -0.58875,5.98698 -0.33346,11.72702 0.53377,12.00165 -0.3476,14.31428 -6.57184,17.24387 l -3.72412,1.75284 -0.26954,21.75635 c -0.19674,15.8805 0.15274,24.52098 1.29402,31.99284 2.8141,18.4237 2.84547,19.15462 0.9899,23.06495 -2.81551,5.93324 -7.54553,8.18181 -17.01438,8.08835 -6.35568,-0.0627 -9.33601,-0.64273 -14.5,-2.82184 -8.88794,-3.75053 -9.22283,-3.72644 -10.30788,0.74148 -3.4055,14.02289 -26.36597,16.94758 -47.82541,6.09197 -4.57007,-2.31185 -4.65715,-2.31746 -6.38215,-0.41136 -2.78343,3.07566 -9.5728,5.90454 -18.09443,7.53928 -9.44966,1.81277 -42.36378,2.69471 -54.12014,1.45017 z m 72.80045,-42.97364 c 6.91721,-4.47081 14.01866,-7.35136 24.77625,-10.04996 6.95683,-1.74516 9.96975,-2.98291 7.26096,-2.98291 -0.67413,0 -0.99308,-0.37636 -0.70879,-0.83635 0.28429,-0.45999 -0.38978,-3.72249 -1.49792,-7.25 -1.10815,-3.52751 -2.14243,-7.08865 -2.2984,-7.91365 -0.42684,-2.25784 -4.21469,-2.39236 -13.358 21,-0.47438 -10.6181,2.22728 -22.83442,8.18857 -22.52735,10.99283 0.17784,1.62405 0.61331,9.17941 1.19491,20.73155 0.0485,0.9625 0.29793,1.75 0.55437,1.75 0.25644,0 3.22832,-1.78521 6.60418,-3.96713 z m 56.71974,-11.01598 c 4.89719,-1.64071 12.36437,-3.56759 16.59373,-4.28196 4.22936,-0.71437 7.67317,-1.62197 7.65292,-2.01689 C 397.01657,448.32312 397,443.70461 397,438.45469 v -9.54532 l -3.75,0.68831 c -2.0625,0.37857 -4.85602,1.78112 -6.20782,3.11677 -3.54398,3.50165 -13.36167,10.75824 -19.66275,14.53341 -4.74396,2.84225 -5.35695,3.56723 -4.86356,5.75214 0.31049,1.375 0.62145,3.0625 0.691,3.75 0.15898,1.57143 -0.79502,1.74395 9.58331,-1.73311 z m -5.69701,-21.17462 c 9.23998,-6.43424 20.11165,-17.44748 25.71889,-26.05381 4.26003,-6.53854 4.30668,-6.57285 9.88689,-7.27005 l 5.60666,-0.70051 -0.62857,-15.23318 c -0.4571,-11.07765 -0.30782,-15.55394 0.5472,-16.40896 0.64667,-0.64667 3.44826,-1.18265 6.22576,-1.19107 8.33624,-0.0253 8.49402,-0.54892 3.23418,-10.73294 -5.54202,-10.7303 7 -9.89105,-23.36721 -12.47622,-36.25175 -1.79841,-8.96329 -2.05586,-9.51788 -4.55703,-9.81642 C 399.19292,310.00955 398,309.28596 398,308.57561 c 0,-0.71036 6.11509,-5.2456 13.58909,-10.07833 18.57106,-12.00814 30.0851,-21.04738 41.95438,-32.93678 C 463.20038,255.88721 477,238.71559 477,236.37226 c 0,-0.62063 -2.67805,-2.12993 -5.95123,-3.35402 -3.27317,-1.22409 -6.08567,-2.54601 -6.25,-2.93761 -0.30337,-0.72296 -42.38632,-7.1659 -59.85714,-9.16419 -11.30259,-1.29277 -51.70167,-0.85716 -54.1206,0.58356 -0.92343,0.55 -1.71316,1.45 -1.75495,2 -0.42401,5.57991 -5.75308,14.3217 -10.89529,17.87262 -14.49986,10.01278 -30.82336,5.94123 -38.80561,-9.67922 -2.7486,-5.37872 -4.61294,-17.04564 -2.98414,-18.67444 0.69195,-0.69195 0.60932,-1.01896 -0.25746,-1.01896 -1.59609,0 -12.28705,7.16016 -26.62358,17.83086 -12.08547,8.99524 -18.88502,12.1238 -28.03142,12.8976 -5.49357,0.46477 -6.32131,0.26634 -9.2823,-2.22517 -1.78799,-1.50449 -5.30085,-5.60821 -7.80636,-9.11937 -4.35643,-6.10498 -7.74369 ,-8.80067 -5.28444,-4.20551 1.74921,3.26842 0.56183,16.61283 -1.90917,21.4564 -2.47911,4.85946 -7.8326,10.23831 -10.97501,11.027 -5.06424,1.27105 -11.24966,-0.30776 -14.88223,-3.79862 -3.64139,-3.49934 -6.62196,-8.23697 -5.73814,-9.12079 0.28114,-0.28114 -0.92896,-1.01319 -2.68911,-1.62678 -3.74481,-1.30545 -4.985,-1.40225 -4.68418,-0.36562 0.43315,1.49267 -2.06377,6.84258 -5.17183,11.08116 -1.74677,2.38214 -6.07166,6.17727 -9.61088,8.43362 -3.53921,2.25635 -6.43493,4.4484 -6.43493,4.87122 0,1.30421 9.97382,10.82238 14.01106,13.37098 5.18558,3.27351 5.57016,4.2156 3.09024,7.56988 l -2.13425,2.88672 4.26647,3.15431 c 5.48134,4.05247 27.42678,14.62941 40.13021,19.34136 17.56921,6.51677 46.42797,12.81005 65.77255,14.34315 6.56221,0.52006 9.28892,1.10942 9.11372,1.96984 -0.18472,0.90717 2.44421,1.22776 10.06798,1.22776 h 10.31797 l 1.1682,8.731 c 2.06983,15.46973 13.64074,34.58364 26.91158,44.45505 3.18135,2.36642 6.0673,4.69356 6.41322,5.17142 0.34592,0.47786 0.85294,0.25542 1.12671,-0 .49432 0.67196,-1.84023 1.31438,1.24892 3.25187,15.63685 2.51056,18.64367 5.86771,32.5 7.87419,32.5 0.71754,0 4.63769,-2.32098 8.71145,-5.15773 z M 190.5,296.3348 c -4.40932,-2.32977 -6.48728,-4.39289 -8.60641,-8.54496 -2.55083,-4.99791 -2.38289,-8.39145 0.56096,-11.33529 3.4077,-3.40771 7.61222,-3.21283 11.8996,0.55154 7.07104,6.20845 8.40071,14.68178 2.97381,18.95058 -3.06628,2.41193 -2.9871,2.40754 -6.82796,0.37813 z m 36.13486,-14.40738 c -2.93116,-2.30565 -3.55818,-6.63588 -1.09761,-7.58009 0.84548,-0.32444 2.40372,0.19426 3.46275,1.15267 2.55116,2.30876 4.65373,1.35305 5.5,-2.5 0.87294,-3.97446 2.98862,-4.80438 5.80088,-2.27553 4.37645,3.93542 5.66483,3.76346 9.17466,-1.22447 1.90963,-2.71384 4.91362,-0.89998 5.32784,3.21704 0.23916,2.37707 -0.38632,3.59568 -2.95489,5.75699 -2.80841,2.36313 -3.85359,2.66005 -7.5702,2.15064 -3.47659,-0.47652 -4.69614,-0.20682 -6.29511,1.39215 -2.6117,2.6117 -7.96808,2.5695 -11.34832,-0.0894 z M 340.96996,279.75 c -6.26219,-3.16356 -9.26929,-7.9 4844 -8.71815,-13.87224 0.23653,-2.54223 1.40477,-5.99111 2.5961,-7.66417 2.64664,-3.71686 9.56276,-7.21359 14.26765,-7.21359 4.17012,0 10.91881,4.09532 13.24891,8.03985 4.67096,7.9073 -1.02368,19.10503 -11.14552,21.91614 -4.99956,1.38852 -5.14774,1.37108 -10.24899,-1.20599 z M 224.357,261.00842 C 221.62339,259.90527 219,256.1793 219,253.39994 c 0,-2.59056 2.44129,-4.86327 4.11372,-3.82966 0.84238,0.52062 1.03571,0.10915 0.64704,-1.37714 -0.70761,-2.7059 0.93627,-4.04781 5.2876,-4.31631 5.25309,-0.32414 7.59539,0.85266 9.44179,4.74365 1.42217,2.99702 1.48825,4.01745 0.42618,6.58151 -2.22582,5.37362 -8.96842,8.06264 -14.55933,5.80643 z m 60.07,165.5297 c -1.05985,-0.79267 -4.627,-2.89421 -7.927,-4.67007 -5.18851,-2.79216 -7.01436,-3.23642 -13.5,-3.28485 -5.28726,-0.0395 -8.43573,0.45192 -10.67162,1.66555 -2.38872,1.29659 -3.2949,1.41666 -3.67105,0.4864 -0.27469,-0.67933 -0.53496,-0.27775 -0.57838,0.89241 -0.14449,3.89376 2.05053,4.51155 7.99044,2.24893 7.61935,-2.90235 15.80956,-2.29 493 23.58167,1.74891 5.93524,3.08811 8.28499,3.53717 4.77594,0.91272 z m -85.63497,-7.7604 c 7.01242,-9.36419 17.89007,-19.33393 36.56844,-33.51624 7.73373,-5.87214 16.74128,-13.39571 20.01677,-16.71905 7.69748,-7.80989 15.86957,-17.62896 15.21598,-18.28254 -0.28106,-0.28107 -1.7286,0.93598 -3.21675,2.70455 -1.48815,1.76856 -12.41915,10.45705 -24.2911,19.30774 -23.75891,17.71257 -39.82567,32.7425 -44.08537,41.24042 -1.375,2.74307 -3.79903,6.95791 -5.38673,9.36631 -4.69279,7.11853 -1.08164,4.25877 5.17876,-4.10119 z M 135.39765,328.75 c -5.98359,-17.76609 -10.16202,-34.76741 -16.77386,-68.25 -3.04105,-15.4 -6.49517,-31.15 -7.6758,-35 -3.00616,-9.80292 -6.04694,-16.63368 -7.22923,-16.23959 -0.55172,0.18391 -2.89779,4.58805 -5.213485,9.78698 C 93.643586,229.96228 86.505814,242.51996 73.522651,263 59.808853,284.63257 55.171534,292.49312 49.808956,303.19622 45.704094,311.38907 40,324.93939 40,326.49783 c 0,0.5243 1.518471,0.2638 21,-3.60266 7.975,-1.58279 14.784644,-2.8817 15.132542,-2.8 8648 0.347898,-0.005 2.597898,3.02691 5,6.73708 C 86.426987,334.92331 91.745969,341 93.609411,341 c 0.757177,0 4.532943,-3.15 8.390589,-7 3.85765,-3.85 7.44674,-7 7.97577,-7 0.52903,0 4.11041,2.03679 7.95864,4.52619 7.27091,4.70353 18.69682,10.47165 20.74571,10.47302 0.74151,5e-4 -0.47844,-4.92366 -3.28247,-13.24921 z m 62.6535,-84.80115 c 2.36289,-2.36289 1.88302,-5.64284 -1.14421,-7.82082 -2.51774,-1.81142 -2.46576,-7.29962 0.12316,-13.0054 l 1.98617,-4.37738 -2.20513,1.46416 c -3.96989,2.6359 -6.31114,8.61641 -6.31114,16.1212 0,5.60741 0.34761,7.08479 1.94113,8.25 2.55754,1.87012 3.17802,1.80024 5.61002,-0.63176 z M 313.6281,230.40159 c 2.75089,-0.73823 4.34494,-4.24247 3.26176,-7.17041 -0.46163,-1.24785 -2.38552,-3.18109 -4.27529,-4.29609 -1.88978,-1.11499 -3.68891,-2.68644 -3.99808,-3.49211 -0.73383,-1.91233 0.29603,-7.20168 2.10006,-10.78591 1.80099,-3.57818 0.94005,-4.56126 -1.8128,-2.06997 -7.12249,6.44577 -8.37444,21.5377 -2.19018,26.40223 2.72291,2.14184 3.55931,2.31267 6. 91453,1.41226 z M 167,176.68366 c 0,-1.27399 -0.48052,-4.91572 -1.06783,-8.09275 -0.95228,-5.15136 -0.78557,-6.76038 1.54061,-14.86987 3.15867,-11.01166 7.43412,-19.28894 13.37817,-25.90016 4.76594,-5.30087 5.09036,-6.77488 3.26197,-14.82088 -1.40031,-6.16217 -0.23009,-7.09185 10.05361,-7.98711 4.58341,-0.39901 7.77097,-0.79015 7.08347,-0.86918 -0.6875,-0.079 -1.25,-0.79942 -1.25,-1.60085 0,-3.629631 -14.58617,-28.128584 -24.67054,-41.436662 -3.48991,-4.60555 -4.29635,-9.058859 -1.98745,-10.975077 0.7381,-0.612573 1.6381,-0.817673 2,-0.455778 C 175.7039,50.037238 176,49.416207 176,48.295275 c 0,-1.120931 -1.7959,-4.008431 -3.99089,-6.416666 L 168.01821,37.5 166.1461,39.691607 c -2.67125,3.127118 -9.56532,24.551184 -12.80998,39.808393 -2.52047,11.851857 -2.76779,14.898852 -2.80038,34.5 -0.045,27.06988 2.13207,38.5044 10.99527,57.75 3.36565,7.30818 5.46899,9.20564 5.46899,4.93366 z m 52.4433,0.0938 c 2.17796,-3.10947 1.95365,-5.58822 -1.05138,-11.61854 C 215.59148,159.5392 210.13986,1 55 206.19094,155 202.56478,155 198,160.16903 198,164.27519 198,171.42309 206.02272,179 213.59118,179 c 3.30514,0 4.6543,-0.51238 5.85212,-2.22251 z m -29.38388,-21.7855 c 6.24282,-10.63565 18.23611,-24.61244 29.44563,-34.31545 8.17687,-7.07793 28.17503,-20.84401 32.87782,-22.632008 C 253.82229,97.497265 255,96.561806 255,95.965734 c 0,-0.596072 -0.41628,-0.826493 -0.92506,-0.512047 -0.50879,0.314447 -2.03742,0.0649 -3.39696,-0.554547 -2.1089,-0.960881 -3.33138,-0.665163 -8.32493,2.013806 -21.83984,11.716754 -44.29317,33.930934 -51.63985,51.089834 -1.53001,3.57347 -3.89139,8.58854 -5.24751,11.1446 C 184.10956,161.70344 183,164.0925 183,164.4564 c 0,1.75806 2.21609,-1.213 7.05942,-9.46441 z m 123.72382,6.60126 c 5.66251,-2.88933 9.60671,-6.85386 11.53381,-11.59325 2.14917,-5.28555 0.13334,-9.03619 -5.93258,-11.03813 -2.93136,-0.96743 -4.1283,-0.7686 -9.12908,1.5165 -7.16391,3.27353 -11.29523,7.20157 -14.28267,13.57986 l -2.31684,4.94657 2.34637,2.4976 c 3.24035,3.44919 11.12041,3.4894 5 17.78099,0.0909 z M 428.36657,150.25 c 4.49852,-8.90234 8.74361,-24.19781 12.28109,-44.25 2.4127,-13.676387 2.72772,-58.634032 0.44495,-63.5 -1.00611,-2.144617 -1.51833,-2.540754 -1.79649,-1.389332 -0.21401,0.885867 -1.38068,2.065161 -2.59261,2.620652 -5.88227,2.696155 -30.91949,24.819804 -42.06268,37.167858 C 386.65364,89.750003 374,106.1989 374,107.73091 c 0,0.58031 -0.73941,1.33885 -1.64313,1.68564 -0.90372,0.34679 -1.41975,0.8539 -1.14675,1.12691 0.27301,0.27301 4.27492,-0.40943 8.89313,-1.51653 8.03314,-1.92575 17.917,-2.67334 19.14245,-1.44789 0.31848,0.31847 -0.0964,2.56135 -0.92194,4.98417 -0.82554,2.42282 -1.31657,4.95836 -1.09119,5.63451 0.22539,0.67616 3.9674,2.60701 8.31559,4.29077 5.93595,2.2986 8.44249,3.85781 10.05981,6.25775 1.78069,2.64236 4.65828,12.54501 6.97519,24.00376 0.73927,3.65618 3.21291,2.58689 5.78341,-2.5 z M 281,80.647789 c 9.1174,-1.864977 10.5,-2.411141 10.5,-4.147789 0,-1.645426 -0.77075,-2.05536 -4.3475,-2.312262 -2.44582,-0.175673 -4.10075,0.0869 7 -3.78341,0.600445 0.79987,1.294225 -16.46071,5.39477 -25.20627,5.988176 -4.56403,0.309681 -6.83178,0.818197 -6,1.34543 2.40306,1.523205 18.10939,0.720383 28.83718,-1.474 z m 72.29516,-18.484587 c 22.19535,-14.900324 47.15889,-27.311429 77.8766,-38.717857 15.55038,-5.774335 19.91948,-8.906354 6.32824,-4.536445 -3.3,1.061029 -10.12914,3.087728 -15.17587,4.503775 -11.06976,3.106032 -31.34716,11.726655 -43.75228,18.600599 -12.17394,6.745846 -31.5404,19.947859 -33.35324,22.736726 -2.30476,3.545655 0.079,2.782175 8.07655,-2.586798 z" + id="path7" /> + <path + style="fill:#fd7021" + d="m 249,508.42704 c -23.97668,-2.7568 -36.99205,-5.74796 -46.45278,-10.67567 -3.77781,-1.9677 -8.93167,-6.09626 -13.73331,-11.00121 l -7.68609,-7.85147 -8.31391,1.61594 c -12.73543,2.47532 -37.16034,3.01645 -49.64462,1.09987 C 89.206943,476.40062 59.509179,458.20593 41.371327,431.5 33.861077,420.44201 30.196148,413.1796 26.232017,401.5 20.243105,383.85475 18.675433,366.29925 21.454571,348 25.133995,323.77281 34.319298,302.04782 54.007918,271.00514 57.672468,265.22731 64.664758,254.2 69.546338,246.5 c 9.878078,-15.58126 17.726207,-30.43681 21.977201,-41.60016 5.186371,-13.61969 9.547061,-15.15738 15.980001,-5.63494 5.44515,8.06026 10.73198,26.0104 17.01432,57.76801 10.03647,50.73495 14.33942,65.11105 26.629,88.96709 11.44231,22.21136 34.99204,55 39.50256,55 0.87887,0 5.79907,-4.01631 10.93379,-8.92512 5.13471,-4.90882 18.01655,-15.43224 28.62631,-23.38537 C 250.78408,353.26671 263,342.72386 263,340.38997 c 0,-1.99659 -2.50795,-2.79173 -18.44853,-5.84908 -24.46058,-4.69145 - 53.2561,-15.49205 -71.17541,-26.69642 C 161.06536,300.14699 160,299.00446 160,293.49948 c 0,-4.36388 -0.35173,-4.9429 -6.96338,-11.46336 -7.8935,-7.78463 -11.02746,-12.36678 -11.03288,-16.13113 -0.005,-3.39447 2.20923,-5.27149 9.37709,-7.94946 7.00521,-2.61721 13.24441,-7.94628 15.75351,-13.45553 1.47178,-3.2316 1.8145,-6.49729 1.78409,-17 -0.0534,-18.44398 -0.63514,-20.94395 -7.13878,-30.67899 -6.94684,-10.39845 -10.52858,-17.58707 -15.10748,-30.32101 -4.59789,-12.78676 -6.2512,-19.47792 -8.14336,-32.95722 -1.92922,-13.74333 -1.92847,-22.87426 0.003,-38.476666 1.84395,-14.894303 4.33294,-26.416244 8.38386,-38.810213 C 154.18824,34.005557 158.57353,27 165.22919,27 c 4.81792,0 26.78371,5.701315 39.09565,10.147442 16.04821,5.795383 37.23776,16.381346 51.62943,25.793247 12.37157,8.090788 16.17365,9.404508 16.85597,5.82419 0.18187,-0.954316 -1.2627,-4.329316 -3.21015,-7.5 -5.78266,-9.414836 -8.12917,-19.116593 -5.97891,-24.720077 1.05056,-2.737721 6.21752,-4.793499 10.2503,-4.078287 14. 17164,2.513336 32.7055,10.382698 47.23628,20.056232 C 326.45904,56.085236 331.27445,59 331.80867,59 c 0.53422,0 3.83332,-2.110894 7.33132,-4.690875 22.40062,-16.521755 47.82957,-30.369446 71.18589,-38.765275 14.49011,-5.208716 34.21183,-10.3225266 43.20037,-11.2017845 5.50099,-0.5381058 6.30038,-0.358827 9.17121,2.0568196 3.45171,2.904419 6.97358,11.0833109 10.86849,25.2400649 12.85158,46.711355 8.75113,100.3922 -11.02713,144.36105 -4.66653,10.37411 -4.71773,10.60201 -4.27032,19.00829 0.89673,16.84836 8.49137,25.45 26.48417,29.99582 8.04248,2.0319 8.93146,6.85652 3.03951,16.49589 -14.08852,23.04916 -33.7132,41.59727 -61.54218,58.16613 l -11.25,6.69804 0.007,5.06791 c 0.0152,11.00657 5.62489,28.83867 14.75852,46.91452 l 5.48072,10.84661 -1.92227,2.57467 c -1.1236,1.50494 -4.18702,3.33955 -7.37313,4.41561 -2.99797,1.01251 -5.98542,2.55824 -6.63877,3.43495 -0.83276,1.11745 -1.0128,4.68656 -0.60217,11.9377 0.67483,11.91653 -0.2034,14.24663 -6.48579,17.2079 l -3.72412,1.7554 v 25.49028 c 0,20.2631 0.38381,27.7804 1.87165,36.65803 1.82887,10.91248 1.82887,11.25471 0,14.97216 -4.56179,9.27253 -18.70678,10.56563 -34.04209,3.11205 -5.15994,-2.50794 -6.88804,-1.91902 -7.74308,2.63876 -0.99744,5.31678 -4.92574,9.33558 -10.84303,11.09283 -10.10549,3.00101 -20.09635,1.61454 -34.02097,-4.7212 l -6.77752,-3.0838 -2.72248,2.60768 c -6.28804,6.02288 -18.60486,8.60342 -43.6717,9.14979 -9.92793,0.2164 -19.62578,0.21236 -21.55078,-0.009 z m 67.07044,-42.39417 c 6.91721,-4.47081 14.01866,-7.35136 24.77625,-10.04996 4.04068,-1.01363 7.59672,-2.09298 7.90231,-2.39857 0.76774,-0.76775 -2.67845,-13.57562 -4.39505,-16.33434 -1.70627,-2.74212 -4.70383,-2.87069 -14.65654,-0.62865 -7.23464,1.62974 -17.48179,5.82493 -21.19039,8.67536 -1.79595,1.38036 -1.96032,2.50212 -1.66259,11.34661 0.2894,8.59712 1.23621,13.35668 2.65701,13.35668 0.23709,0 3.19314,-1.78521 6.569,-3.96713 z m 56.86016,-11.06302 c 4.97441,-1.66658 12.47792,-3.57645 16.67447,-4.24415 6.67583,-1.06217 7.75256,-1.52739 8.609 42,-3.71985 1.06564,-2.72667 0.23592,-15.95544 -1.08349,-17.27485 -1.46961,-1.46961 -9.29478,1.04919 -12.99829,4.18395 -1.99799,1.69116 -8.02021,6.04854 -13.38271,9.68307 -9.97926,6.76363 -10.99208,8.21261 -8.71482,12.46772 0.56935,1.06384 1.21875,1.93426 1.44311,1.93426 0.22435,0 4.47789,-1.36357 9.45231,-3.03015 z m -6.78369,-19.06962 c 8.91783,-6.05598 20.36931,-17.30362 26.48044,-26.00908 5.27733,-7.51769 5.40352,-7.61622 10.53164,-8.22357 2.85467,-0.3381 5.58868,-1.18911 6.07558,-1.89115 0.85718,-1.23591 0.36094,-15.35635 -0.8787,-25.00336 -0.57211,-4.45223 -0.45103,-4.78639 2.08346,-5.75 1.47998,-0.56269 4.26616,-1.02307 6.19151,-1.02307 1.92535,0 4.36416,-0.46214 5.41958,-1.02698 1.81459,-0.97114 1.64626,-1.55568 -3.09574,-10.75 -5.65912,-10.97254 -10.01258,-23.69481 -12.75745,-37.28152 -1.26085,-6.24106 -2.45988,-9.66039 -3.70739,-10.57259 -1.01411,-0.74153 -1.65169,-1.49706 -1.41684,-1.67894 0.23485,-0.18188 5.81394,-3.842 12.39798,-8.13361 17.23817,-11.23617 26.57775,-18.5 6449 38.88955,-30.51475 C 463.72307,257.01273 478,239.21923 478,236.08685 c 0,-3.26021 -12.27049,-6.55897 -39,-10.48465 -13.475,-1.97903 -28.80127,-4.08891 -34.05837,-4.68863 -12.77919,-1.45782 -51.67456,-0.84979 -54.65767,0.85444 -1.25857,0.71901 -2.67453,2.96873 -3.27722,5.20695 -1.47067,5.46167 -6.65819,11.91486 -12.46285,15.50361 -4.233,2.61706 -5.83438,3.02143 -11.96547,3.02143 -5.93565,0 -7.84013,-0.44776 -11.79652,-2.77346 C 302.63349,237.93663 297,227.35569 297,216.84107 297,214.05123 296.54391,212 295.92358,212 c -1.41211,0 -12.71133,7.62481 -26.42358,17.83086 -12.08547,8.99524 -18.88502,12.1238 -28.03142,12.8976 -5.49357,0.46477 -6.32131,0.26634 -9.2823,-2.22517 -1.78799,-1.50449 -5.30085,-5.60821 -7.80636,-9.11937 C 221.87441,227.87277 219.3916,225 218.86257,225 c -0.58105,0 -0.70126,2.3036 -0.30361,5.81833 1.73548,15.33969 -6.13479,28.18888 -17.2593,28.17793 -5.095,-0.005 -9.77331,-3.04333 -13.05715,-8.47995 C 185.86468,246.57965 182.15773,244 178.87857,244 c -0.45263,0 -1.78388,2.23369 -2.95833,4.96376 -2.39005,5.55584 -9.4922,12.7569 -15.71036,15.92916 -2.2408,1.14318 -4.37478,2.56487 -4.74217,3.15932 -0.68615,1.11023 9.29109,11.47075 15.53229,16.12896 l 3.5,2.61228 -1.90444,3.26899 -1.90444,3.269 2.35645,1.90813 c 3.57376,2.89385 14.61156,9.15051 22.45243,12.72691 23.62113,10.77415 46.15274,17.34915 72,21.0105 8.25,1.16864 17.50209,2.55189 20.5602,3.07389 3.0581,0.52201 9.61369,0.9491 14.56797,0.9491 h 9.00778 l 1.1682,8.731 c 2.08963,15.61775 13.99952,35.14787 27.17583,44.56357 3.23678,2.31299 6.17399,4.88043 6.52711,5.70543 0.35313,0.825 1.71962,8.35648 3.03664,16.73662 2.30503,14.66685 4.43066,24.43562 6.50317,29.88674 1.16955,3.07614 1.81744,2.90146 10.10001,-2.72313 z M 190.5,296.3348 c -4.40932,-2.32977 -6.48728,-4.39289 -8.60641,-8.54496 -2.55083,-4.99791 -2.38289,-8.39145 0.56096,-11.33529 3.4077,-3.40771 7.61222,-3.21283 11.8996,0.55154 7.07104,6.20845 8.40071,14.68178 2.97381,18.95058 -3.06628,2.41193 -2.9871,2.40754 -6.82796,0.37813 z m 36.68856,-15.37376 c -3.76001,-3.50298 -2.49764,-7.0488 1.5624,-4.38856 3.16427,2.0733 5.01227,1.23844 6.81638,-3.0794 l 1.47703,-3.53503 3.70995,2.52097 c 4.76069,3.23497 5.58832,3.17572 8.55294,-0.61237 1.38197,-1.76583 2.94113,-2.83117 3.57247,-2.44098 2.05,1.26697 1.19012,5.60501 -1.62973,8.22186 -2.36268,2.1926 -3.36257,2.46834 -7.09929,1.95777 -3.43956,-0.46996 -4.87965,-0.17708 -6.88486,1.40022 -3.25494,2.56034 -7.30051,2.54248 -10.07729,-0.0445 z M 340.96996,279.75 c -6.26219,-3.16356 -9.26929,-7.94844 -8.71815,-13.87224 0.23653,-2.54223 1.40477,-5.99111 2.5961,-7.66417 2.64664,-3.71686 9.56276,-7.21359 14.26765,-7.21359 4.17012,0 10.91881,4.09532 13.24891,8.03985 4.67096,7.9073 -1.02368,19.10503 -11.14552,21.91614 -4.99956,1.38852 -5.14774,1.37108 -10.24899,-1.20599 z M 225.3083,260.02825 c -2.76233,-1.16037 -5.70333,-5.55643 -4.9794,-7.44297 0.30184,-0.78658 1.58882,-1.57756 2.85995,-1.75772 1.67554,-0.23747 2.39817,-1.08386 2.62757,-3.07756 0.27388,-2.38028 0.75992,-2. 75 3.61514,-2.75 4.71198,0 8.56844,3.32979 8.56844,7.39827 0,5.68115 -7.12875,9.96681 -12.6917,7.62998 z m 57.68531,164.86465 c -8.79916,-7.4381 -18.50319,-9.56914 -29.04301,-6.37794 -4.26135,1.29023 -5.9506,2.28975 -5.9506,3.52092 0,3.4988 2.32438,4.02899 8.06939,1.84061 7.61935,-2.90235 15.80956,-2.29493 23.58167,1.74891 3.21692,1.67376 6.07106,2.85815 6.34255,2.63197 0.27148,-0.22619 -1.07852,-1.7402 -3,-3.36447 z m -84.20158,-6.11518 c 6.81722,-9.10353 17.74565,-19.20927 34.5347,-31.93494 16.06638,-12.17791 19.79317,-15.47074 28.49442,-25.17647 12.1387,-13.53999 12.0127,-15.32805 -0.35512,-5.03958 -4.38132,3.6447 -15.61603,12.36806 -24.96603,19.38525 -26.59377,19.95865 -34.57377,28.16714 -42.39781,43.61172 -5.28568,10.43391 -3.51844,10.11512 4.68984,-0.84598 z M 140,340.03702 c 0,-1.07964 -0.93323,-4.3306 -2.07384,-7.22436 -4.79027,-12.153 -10.43115,-34.41038 -16.9773,-66.98777 -7.23246,-35.99289 -9.44459,-44.68379 -13.64961,-53.62596 -2.436,-5.18025 -3.91905,-6.04549 -5.38104,- 3.13941 -0.39858,0.79226 -3.653069,7.51548 -7.232208,14.94048 -3.579139,7.425 -13.730817,25.03076 -22.559285,39.12391 -8.828468,14.09315 -18.517355,30.29315 -21.530861,36 -6.392997,12.10679 -11.934338,25.5194 -11.100555,26.86849 0.641041,1.03722 0.757042,1.02052 21.504699,-3.09723 7.975,-1.58279 14.784644,-2.8817 15.132542,-2.88648 0.347898,-0.005 2.597898,3.02691 5,6.73708 C 86.426987,334.92331 91.745969,341 93.609411,341 c 0.757177,0 4.532943,-3.15 8.390589,-7 3.85765,-3.85 7.44674,-7 7.97577,-7 0.52903,0 4.11041,2.03679 7.95864,4.52619 7.37606,4.77155 18.70534,10.47169 20.81559,10.47302 0.6875,4.3e-4 1.25,-0.88255 1.25,-1.96219 z M 199,245 c 2.66626,-2.66626 2.52103,-5.22733 -0.5,-8.81763 -3.1482,-3.74142 -3.14913,-6.56393 -0.004,-12.76289 2.98004,-5.87392 2.92207,-5.41948 0.69128,-5.41948 -2.40141,0 -6.701,4.59033 -8.63404,9.21788 -0.85418,2.04484 -1.55305,6.22779 -1.55305,9.29546 0,4.58853 0.43525,6.01282 2.45455,8.03211 2.97757,2.97758 4.90624,3.09376 7.54545,0.45455 z m 117.6 4123,-15.55032 c 3.76888,-3.76888 2.20152,-8.98559 -3.51935,-11.71362 -4.36386,-2.08094 -3.85297,-10.14832 1.07265,-16.9381 2.16782,-2.98826 -0.0203,-3.17903 -4.26258,-0.37162 -9.57842,6.33869 -11.51478,25.47018 -3.0439,30.07402 3.89868,2.11889 6.90777,1.79473 9.75318,-1.05068 z M 167,178.18366 c 0,-2.09899 -0.48052,-6.41572 -1.06783,-9.59275 -0.95228,-5.15136 -0.78557,-6.76038 1.54061,-14.86987 3.15867,-11.01166 7.43412,-19.28894 13.37817,-25.90016 4.76594,-5.30087 5.09036,-6.77488 3.26197,-14.82088 -1.41968,-6.24742 -0.20175,-7.20982 9.86129,-7.79237 7.67913,-0.44453 8.04556,-0.57232 7.42024,-2.58763 C 199.1946,95.530209 189.921,79.960097 176.06914,60.099519 172.6638,55.216997 172.25754,52.861078 174.5,51 c 2.35308,-1.952884 1.79149,-4.299457 -2.12359,-8.873356 -4.92626,-5.755225 -6.88848,-5.291356 -10.03957,2.373356 -3.95197,9.612737 -8.94298,27.980024 -11.34395,41.746551 -1.96478,11.265495 -2.16419,15.099849 -1.71623,32.999999 0.56946,22.75515 2.21316,31.37955 9.20075,48.27561 6 .10618,14.76481 8.52259,17.78767 8.52259,10.6615 z m 52.4433,-1.40617 c 2.17796,-3.10947 1.95365,-5.58822 -1.05138,-11.61854 C 215.59148,159.5392 210.13986,155 206.19094,155 202.56478,155 198,160.16903 198,164.27519 198,171.42309 206.02272,179 213.59118,179 c 3.30514,0 4.6543,-0.51238 5.85212,-2.22251 z m -29.38388,-21.7855 c 6.24282,-10.63565 18.23611,-24.61244 29.44563,-34.31545 8.17687,-7.07793 28.17503,-20.84401 32.87782,-22.632008 3.67584,-1.397551 3.25794,-2.772258 -1.25366,-4.123965 -3.68463,-1.103944 -4.22566,-0.954065 -11.25,3.116568 -17.97488,10.416515 -34.80273,25.557775 -44.32693,39.884225 -5.28731,7.95324 -11.23366,20.13932 -12.19132,24.98413 -1.00509,5.08474 0.67162,3.3542 6.69846,-6.9135 z m 123.72382,6.60126 c 5.66251,-2.88933 9.60671,-6.85386 11.53381,-11.59325 2.14917,-5.28555 0.13334,-9.03619 -5.93258,-11.03813 -2.93136,-0.96743 -4.1283,-0.7686 -9.12908,1.5165 -7.16391,3.27353 -11.29523,7.20157 -14.28267,13.57986 l -2.31684,4.94657 2.34637,2.4976 c 3.24035,3.44919 11.12041,3.48945 17.78099,0.0909 z M 428.36657,150.25 c 4.39516,-8.69779 8.21516,-22.18929 11.82117,-41.75 3.74949,-20.339062 3.63759,-65.635818 -0.16796,-67.987775 C 438.4204,39.523753 416.56171,57.527346 403.00369,71 c -15.55396,15.456024 -33.52878,37.80825 -31.79678,39.54025 0.27478,0.27477 4.27813,-0.40622 8.89634,-1.51332 8.03314,-1.92575 17.917,-2.67334 19.14245,-1.44789 0.31848,0.31847 -0.0964,2.56135 -0.92194,4.98417 -0.82554,2.42282 -1.31657,4.95836 -1.09119,5.63451 0.22539,0.67616 3.9674,2.60701 8.31559,4.29077 5.93595,2.2986 8.44249,3.85781 10.05981,6.25775 1.78069,2.64236 4.65828,12.54501 6.97519,24.00376 0.73927,3.65618 3.21291,2.58689 5.78341,-2.5 z M 281,80.647789 c 9.1174,-1.864977 10.5,-2.411141 10.5,-4.147789 0,-2.999324 -4.15776,-3.034523 -15.84972,-0.134183 -5.58265,1.384849 -13.07528,2.820272 -16.65028,3.189831 -7.33128,0.757856 -8.8177,1.311527 -6.85676,2.554039 2.42076,1.533874 18.09257,0.739932 28.85676,-1.461898 z m 72.29516,-18.484587 c 22.19535,-14.900324 47.15889,-27.311429 77.8766,-38.717857 6.78053,-2.51782 12.75574,-4.99804 13.27824,-5.5116 1.98378,-1.949839 -5.59551,-0.838359 -17.10871,2.50894 -22.03372,6.405988 -46.31959,17.818179 -66.84129,31.409432 -14.72723,9.753653 -18.04125,12.463105 -17.10229,13.982372 1.15135,1.862926 2.27412,1.446455 9.89745,-3.671287 z" + id="path6" /> + <path + style="fill:#fb6d1c" + d="m 249,508.42704 c -23.97668,-2.7568 -36.99205,-5.74796 -46.45278,-10.67567 -3.77781,-1.9677 -8.93167,-6.09626 -13.73331,-11.00121 l -7.68609,-7.85147 -8.31391,1.61594 c -12.73543,2.47532 -37.16034,3.01645 -49.64462,1.09987 C 89.206943,476.40062 59.509179,458.20593 41.371327,431.5 33.861077,420.44201 30.196148,413.1796 26.232017,401.5 20.243105,383.85475 18.675433,366.29925 21.454571,348 25.133995,323.77281 34.319298,302.04782 54.007918,271.00514 57.672468,265.22731 64.664758,254.2 69.546338,246.5 c 9.878078,-15.58126 17.726207,-30.43681 21.977201,-41.60016 5.186371,-13.61969 9.547061,-15.15738 15.980001,-5.63494 5.44515,8.06026 10.73198,26.0104 17.01432,57.76801 10.03647,50.73495 14.33942,65.11105 26.629,88.96709 11.44231,22.21136 34.99204,55 39.50256,55 0.87887,0 5.79907,-4.01631 10.93379,-8.92512 5.13471,-4.90882 18.01655,-15.43224 28.62631,-23.38537 C 250.78408,353.26671 263,342.72386 263,340.38997 c 0,-1.99659 -2.50795,-2.79173 -18.44853,-5.84908 -24.46058,-4.69145 - 53.2561,-15.49205 -71.17541,-26.69642 C 161.06536,300.14699 160,299.00446 160,293.49948 c 0,-4.36388 -0.35173,-4.9429 -6.96338,-11.46336 -7.8935,-7.78463 -11.02746,-12.36678 -11.03288,-16.13113 -0.005,-3.39447 2.20923,-5.27149 9.37709,-7.94946 7.00521,-2.61721 13.24441,-7.94628 15.75351,-13.45553 1.47178,-3.2316 1.8145,-6.49729 1.78409,-17 -0.0534,-18.44398 -0.63514,-20.94395 -7.13878,-30.67899 -6.94684,-10.39845 -10.52858,-17.58707 -15.10748,-30.32101 -4.59789,-12.78676 -6.2512,-19.47792 -8.14336,-32.95722 -1.92922,-13.74333 -1.92847,-22.87426 0.003,-38.476666 1.84395,-14.894303 4.33294,-26.416244 8.38386,-38.810213 C 154.18824,34.005557 158.57353,27 165.22919,27 c 4.81792,0 26.78371,5.701315 39.09565,10.147442 16.04821,5.795383 37.23776,16.381346 51.62943,25.793247 12.37157,8.090788 16.17365,9.404508 16.85597,5.82419 0.18187,-0.954316 -1.2627,-4.329316 -3.21015,-7.5 -5.78266,-9.414836 -8.12917,-19.116593 -5.97891,-24.720077 1.05056,-2.737721 6.21752,-4.793499 10.2503,-4.078287 14. 17164,2.513336 32.7055,10.382698 47.23628,20.056232 C 326.45904,56.085236 331.27445,59 331.80867,59 c 0.53422,0 3.83332,-2.110894 7.33132,-4.690875 22.40062,-16.521755 47.82957,-30.369446 71.18589,-38.765275 14.49011,-5.208716 34.21183,-10.3225266 43.20037,-11.2017845 5.50099,-0.5381058 6.30038,-0.358827 9.17121,2.0568196 3.45171,2.904419 6.97358,11.0833109 10.86849,25.2400649 12.85158,46.711355 8.75113,100.3922 -11.02713,144.36105 -4.66653,10.37411 -4.71773,10.60201 -4.27032,19.00829 0.89673,16.84836 8.49137,25.45 26.48417,29.99582 8.04248,2.0319 8.93146,6.85652 3.03951,16.49589 -14.08852,23.04916 -33.7132,41.59727 -61.54218,58.16613 l -11.25,6.69804 0.007,5.06791 c 0.0152,11.00657 5.62489,28.83867 14.75852,46.91452 l 5.48072,10.84661 -1.92227,2.57467 c -1.1236,1.50494 -4.18702,3.33955 -7.37313,4.41561 -2.99797,1.01251 -5.98542,2.55824 -6.63877,3.43495 -0.83276,1.11745 -1.0128,4.68656 -0.60217,11.9377 0.67483,11.91653 -0.2034,14.24663 -6.48579,17.2079 l -3.72412,1.7554 v 25.49028 c 0,20.2631 0.38381,27.7804 1.87165,36.65803 1.82887,10.91248 1.82887,11.25471 0,14.97216 -4.56179,9.27253 -18.70678,10.56563 -34.04209,3.11205 -5.15994,-2.50794 -6.88804,-1.91902 -7.74308,2.63876 -0.99744,5.31678 -4.92574,9.33558 -10.84303,11.09283 -10.10549,3.00101 -20.09635,1.61454 -34.02097,-4.7212 l -6.77752,-3.0838 -2.72248,2.60768 c -6.28804,6.02288 -18.60486,8.60342 -43.6717,9.14979 -9.92793,0.2164 -19.62578,0.21236 -21.55078,-0.009 z m 21,-13.50687 c -1.1338,-0.79306 -0.58451,-0.96041 2.25,-0.68549 2.0625,0.20005 3.75,0.004 3.75,-0.43548 0,-0.43956 0.91583,-0.7992 2.03518,-0.7992 3.32634,0 6.96482,-2.9709 6.96482,-5.68694 0,-1.35131 1.2256,-4.54825 2.72355,-7.10431 1.49796,-2.55607 2.81393,-5.26317 2.92439,-6.01578 0.11046,-0.75262 0.88437,-2.12369 1.71981,-3.04683 4.03562,-4.45932 3.85727,-19.59056 -0.33607,-28.51083 -1.68467,-3.58372 -1.87333,-3.73515 -1.41442,-1.13531 l 0.52955,3 -2.5734,-2.80576 C 285.687,438.54721 285.22257,436 287.53518,436 c 1.20792,0 1.31451,-0.41234 0.5,-1.93426 C 287.46583,433.0019 287,431.25611 287,430.1862 c 0,-2.11133 -6.38222,-7.8003 -11.99203,-10.68943 -5.45189,-2.8078 -15.35331,-3.0558 -22.44685,-0.56221 -6.66202,2.34189 -7.85883,1.86265 -7.38396,-2.95678 0.51554,-5.23225 6.01173,-9.02537 13.96146,-9.63531 3.49876,-0.26844 9.24021,-1.16795 12.75877,-1.99891 9.6266,-2.27346 16.46733,-0.52123 19.44917,4.98185 0.94608,1.74602 3.67402,5.26502 6.06207,7.81999 5.30445,5.67521 10.37371,15.47226 8.8132,17.03277 -0.75623,0.75623 -0.73733,1.7911 0.0649,3.55173 1.03323,2.26768 1.52839,2.43163 5.67267,1.87825 l 4.54063,-0.60631 -4.30988,2.59147 c -2.37043,1.4253 -4.65961,3.56239 -5.08706,4.74908 -1.17409,3.25946 0.16711,21.3314 1.69646,22.85879 1.06532,1.06396 1.96643,0.8846 5,-0.99517 7.07272,-4.38267 16.031,-8.13904 24.84001,-10.41588 4.87326,-1.25957 9.21018,-2.74013 9.6376,-3.29013 0.89518,-1.1519 0.41459,-4.31275 -1.82937,-12.03169 -1.85548,-6.38262 -3.57382,-8.41661 -7.26919,-8.60449 -2.32382,-0.11815 -2.38353,-0.19319 -0.450 87,-0.56663 2.09385,-0.40458 2.19356,-0.802 1.65945,-6.61382 -0.31254,-3.40085 -1.00513,-7.62383 -1.53909,-9.3844 -0.60083,-1.98104 -0.61822,-3.88667 -0.0456,-5 0.50887,-0.98943 1.20934,-4.27397 1.55661,-7.29897 0.34727,-3.025 0.88491,-6.625 1.19475,-8 0.48483,-2.15161 -0.27348,-3.1271 -5.44148,-7 -9.09192,-6.81348 -21.8873,-27.72909 -23.55284,-38.5 -0.54786,-3.54296 -0.35291,-3.31078 1.70619,2.03202 1.27859,3.31761 4.00587,8.7995 6.06061,12.18198 4.76907,7.85073 16.65835,20.60664 22.2741,23.89768 3.32283,1.94731 4.46069,3.28465 4.86273,5.71524 0.28867,1.7452 1.44014,9.02308 2.55883,16.17308 2.22714,14.23459 5.65735,28.18374 7.1588,29.11169 1.51947,0.93908 14.15469,-7.98731 22.48021,-15.88158 4.1938,-3.97656 10.02869,-10.65409 12.96642,-14.83896 5.27733,-7.51769 5.40352,-7.61622 10.53164,-8.22357 2.85467,-0.3381 5.58868,-1.18911 6.07558,-1.89115 0.85718,-1.23591 0.36094,-15.35635 -0.8787,-25.00336 -0.57211,-4.45223 -0.45103,-4.78639 2.08346,-5.75 1.47998,-0.56269 4.26616,-1.02307 6. 19151,-1.02307 1.92535,0 4.36416,-0.46214 5.41958,-1.02698 1.81459,-0.97114 1.64626,-1.55568 -3.09574,-10.75 -5.65912,-10.97254 -10.01258,-23.69481 -12.75745,-37.28152 -1.26085,-6.24106 -2.45988,-9.66039 -3.70739,-10.57259 -1.01411,-0.74153 -1.65169,-1.49706 -1.41684,-1.67894 0.23485,-0.18188 5.81394,-3.842 12.39798,-8.13361 17.23817,-11.23617 26.57775,-18.56449 38.88955,-30.51475 C 463.72307,257.01273 478,239.21923 478,236.08685 c 0,-2.67479 -13.4908,-7.33513 -30.5,-10.53609 l -7,-1.31733 5.25,-0.11672 c 2.95491,-0.0657 5.25,-0.57967 5.25,-1.17573 0,-0.58246 0.52647,-0.73364 1.16994,-0.33595 0.82843,0.512 0.93345,0.16434 0.35978,-1.19099 -3.30262,-7.80267 -5.71658,-15.58762 -6.59138,-21.25701 -0.56495,-3.66136 -1.29053,-8.33773 -1.61241,-10.39192 -0.41665,-2.65911 0.0516,-5.21533 1.62585,-8.87466 1.21609,-2.82687 2.35888,-5.87117 2.53955,-6.76511 0.18066,-0.89394 2.14192,-5.45034 4.35836,-10.12534 9.85285,-20.78202 15.98066,-54.69747 14.8157,-82 -0.85609,-20.063599 -4.93321,-44.031 406 -9.40316,-55.277558 -1.31837,-3.316946 -1.64943,-3.575168 -2.71514,-2.117725 -1.12724,1.541594 -1.4059,1.5339 -3.91178,-0.108016 -3.60673,-2.363218 -9.33781,-1.634011 -23.18055,2.949428 -5.92595,1.962129 -10.95864,3.383327 -11.18375,3.158219 -0.44629,-0.446295 23.87956,-10.102067 28.15118,-11.174175 1.94503,-0.488171 2.36401,-0.982857 1.60601,-1.896191 -3.1737,-3.824077 -36.67353,7.06989 -62.96972,20.477418 -11.08829,5.653539 -32.27424,19.016251 -38.55848,24.320169 -2.7202,2.295855 -2.85504,2.680004 -1.4457,4.118805 1.41584,1.445446 2.30664,1.126699 10,-3.57822 C 367.93373,54.384103 369,53.777933 369,54.375544 c 0,0.315203 -1.32955,1.260635 -2.95457,2.100961 C 362.52821,58.295333 353,67.611698 353,69.231895 353,71.59394 348.76233,79 347.41079,79 c -0.77593,0 -1.41595,0.3375 -1.42226,0.75 -0.006,0.4125 -1.81768,1.615425 -4.02526,2.673167 -3.86494,1.851851 -4.15062,1.857914 -7.70383,0.16351 -5.02735,-2.397376 -11.39549,-7.557522 -10.70518,-8.674473 0.50089,-0.810459 -0.8266,-1.321 437 -2.73633,-1.053269 -0.37514,0.05268 -2.33628,-0.595394 -4.35809,-1.44016 -2.0218,-0.844765 -3.88898,-1.322967 -4.14928,-1.062671 -0.26029,0.260297 -2.34916,-0.378459 -4.64191,-1.419456 -4.40387,-1.999521 -8.62771,-2.730167 -5.62756,-0.973464 0.84759,0.496302 1.64957,2.513253 1.78216,4.482112 0.20476,3.040259 -0.15033,3.728563 -2.35618,4.567224 C 297.36143,78.57348 294.17324,78.192225 293,76 c -1.44145,-2.693377 -5.65652,-2.598123 -17.2375,0.389542 -5.09437,1.314249 -12.52678,2.710098 -16.51645,3.101889 -3.98968,0.39179 -7.49076,1.095495 -7.78018,1.563788 -1.07424,1.738154 8.0994,3.179816 17.03413,2.676959 4.95,-0.278591 8.2125,-0.299305 7.25,-0.04603 -1.23845,0.325889 -1.75,1.466471 -1.75,3.901875 0,2.79177 -0.59764,3.804818 -3.16607,5.366773 -1.74133,1.05897 -5.33478,2.445668 -7.98544,3.081552 -4.28028,1.026822 -5.30378,0.921661 -9.14966,-0.940098 C 251.31718,93.943313 248.80164,93 248.10875,93 c -2.12956,0 -15.1261,7.95271 -24.74723,15.14307 -15.7626,11.78019 -28.01805,26.5032 4 -35.93094,43.16553 -3.61128,7.60433 -5.77688,16.64149 -3.67682,15.34359 0.58199,-0.35969 2.76215,-3.56691 4.84481,-7.12715 2.08265,-3.56024 3.91179,-6.34801 4.06476,-6.19505 0.3413,0.3413 -2.58199,10.41314 -3.82251,13.17001 -0.49497,1.1 -1.04091,6.275 -1.2132,11.5 -0.17229,5.225 -0.90691,12.09337 -1.63249,15.26305 -1.25344,5.47564 -1.21141,5.87783 0.84282,8.06445 1.18913,1.26577 2.16205,2.78242 2.16205,3.37032 0,1.47878 3.50336,2.27517 10,2.27321 3.71796,-0.001 5.03089,-0.29844 4.05215,-0.91764 -2.44922,-1.5495 2.86932,-3.41394 6.16467,-2.16105 2.38977,0.90858 9.04441,9.77594 10.52812,14.02881 0.30295,0.86837 1.51202,2.92885 2.6868,4.57885 1.17479,1.65 2.72091,4.34132 3.43581,5.98072 l 1.29982,2.98072 -2.18606,-1.97836 c -1.20234,-1.0881 -2.86044,-3.28245 -3.68467,-4.87634 -2.20803,-4.26986 -3.46601,-1.48619 -2.71075,5.99836 1.58974,15.75406 -6.11118,28.40216 -17.28623,28.39116 -5.17286,-0.005 -9.71805,-3.02097 -13.28193,-8.81302 -3.06783,-4.98587 -6.76984,-7.57251 -8.92845,-6.238 42 -0.67459,0.41692 -2.25247,2.9624 -3.50639,5.65661 -2.54953,5.47802 -9.31991,12.20344 -15.41563,15.31324 -2.21736,1.13121 -4.33216,2.54312 -4.69955,3.13757 -0.68615,1.11023 9.29109,11.47075 15.53229,16.12896 l 3.5,2.61228 -1.90444,3.26899 -1.90444,3.269 2.35645,1.90813 c 3.57376,2.89385 14.61156,9.15051 22.45243,12.72691 23.61907,10.77321 46.14803,17.34776 72,21.01151 8.25,1.16919 17.25,2.60624 20,3.19343 2.75,0.5872 9.1625,1.26972 14.25,1.51671 l 9.25,0.44908 -0.116,3.18138 c -0.0638,1.74976 -0.32174,2.39419 -0.57319,1.43206 -0.60358,-2.30942 -4.1973,-3.1616 -13.31081,-3.15641 -9.43482,0.005 -14,2.05893 -14,6.29764 0,2.18631 -1.05093,3.65932 -4.56298,6.39552 -2.50963,1.95524 -7.38479,6.85294 -10.83368,10.88378 -8.7434,10.2187 -17.18511,17.87414 -31.12367,28.22477 -6.58882,4.89279 -12.54217,9.33539 -13.22967,9.87245 -0.6875,0.53705 -1.25,0.74302 -1.25,0.45771 0,-0.28531 6.1875,-5.25173 13.75,-11.03648 7.5625,-5.78476 15.81947,-12.55884 18.34881,-15.05351 8.42761,-8.3121 18.86283,- 20.34117 18.21123,-20.99278 -1.38572,-1.38572 -3.16729,-0.40271 -10.84401,5.98336 -4.38132,3.6447 -15.84103,12.51481 -25.46603,19.71136 -20.3255,15.19724 -32.77661,27.19964 -38.55626,37.16679 -5.44219,9.38518 -6.99292,13.34594 -5.72262,14.61624 0.67981,0.67981 2.5993,-1.21763 5.87308,-5.80563 6.13483,-8.59756 10.32196,-13.2342 16.78158,-18.58317 4.27939,-3.54359 3.60876,-2.55093 -4.12108,6.10005 -5.0777,5.6828 -10.41814,12.6578 -11.86763,15.5 -2.3567,4.6211 -2.64241,6.33099 -2.70146,16.16763 -0.0913,15.21543 1.54886,30.56897 3.57461,33.46113 1.98133,2.82874 9.90105,7.28631 17.0224,9.58095 2.86956,0.92463 6.74799,2.55593 8.61873,3.62511 3.10506,1.77462 13.0275,3.58434 29.36215,5.35525 3.16993,0.34367 5.50587,1.04171 5.19099,1.5512 -0.32858,0.53165 2.11566,0.91984 5.73649,0.91105 4.69288,-0.0114 5.92477,-0.28408 4.80902,-1.06452 z m -19.1875,-67.60328 c 0.72187,-0.28887 1.58437,-0.25335 1.91667,0.0789 0.33229,0.33229 -0.25834,0.56864 -1.3125,0.52522 -1.16495,-0.048 -1.4019,-0.28494 -0 .60417,-0.60416 z M 275,425.95069 c -2.475,-1.01306 -3.92305,-1.8664 -3.21788,-1.89631 1.61958,-0.0687 8.21788,2.65689 8.21788,3.39459 0,0.30307 -0.1125,0.50437 -0.25,0.44734 -0.1375,-0.057 -2.275,-0.93255 -4.75,-1.94562 z m -21,0.6563 c 0,-0.21616 0.69837,-0.661 1.55194,-0.98855 0.88992,-0.34149 1.29132,-0.17385 0.94098,0.39301 C 255.90566,426.96166 254,427.4169 254,426.60699 Z M 311.15789,344 c 0,-1.375 0.22698,-1.9375 0.50439,-1.25 0.27741,0.6875 0.27741,1.8125 0,2.5 -0.27741,0.6875 -0.50439,0.125 -0.50439,-1.25 z M 196.9157,292.89822 c 2.31219,-3.80209 1.44133,-7.87235 -2.5831,-12.07294 C 192.84387,279.27137 192.15719,278 192.80664,278 194.4606,278 200,285.88995 200,288.24575 200,290.43186 196.98343,296 195.79909,296 c -0.42333,0 0.0791,-1.3958 1.11661,-3.10178 z m -14.359,-6.12073 c -1.91,-2.72691 -1.99226,-5.79957 -0.22014,-8.22309 1.18297,-1.61781 1.35799,-1.22231 1.52307,3.44169 0.10258,2.89825 0.42768,5.65978 0.72246,6.13673 1.1671,1.88842 -0.56542,0.72906 -2.02539,-1.35533 z m 44.63186,-5.81645 c -3.76001,-3.50298 -2.49764,-7.0488 1.5624,-4.38856 3.16427,2.0733 5.01227,1.23844 6.81638,-3.0794 l 1.47703,-3.53503 3.70995,2.52097 c 4.76069,3.23497 5.58832,3.17572 8.55294,-0.61237 1.38197,-1.76583 2.94113,-2.83117 3.57247,-2.44098 2.05,1.26697 1.19012,5.60501 -1.62973,8.22186 -2.36268,2.1926 -3.36257,2.46834 -7.09929,1.95777 -3.43956,-0.46996 -4.87965,-0.17708 -6.88486,1.40022 -3.25494,2.56034 -7.30051,2.54248 -10.07729,-0.0445 z M 353.5,277.83574 c 1.1,-0.60689 3.2375,-2.25239 4.75,-3.65668 1.5125,-1.40428 2.75,-2.05905 2.75,-1.45504 0,1.59978 -5.86657,6.28119 -7.82673,6.24557 -1.37673,-0.025 -1.31883,-0.22596 0.32673,-1.13385 z M 334.97423,273.25 c -1.74393,-2.20909 -2.0815,-3.69071 -1.71624,-7.53263 0.4868,-5.1203 3.04535,-8.76448 7.94235,-11.31238 4.10965,-2.13825 4.11686,-1.72245 0.035,2.01662 -3.72297,3.4103 -3.73531,3.4483 -3.73531,11.49783 0,4.44193 -0.0798,8.0772 -0.17742,8.07839 -0.0976,0.001 -1.15434,-1.23533 -2.34835,-2.74783 z m 26.83194,-7. 789 c -0.36947,-1.67145 -2.64596,-5.15895 -5.05886,-7.75 -4.82633,-5.18268 -4.83447,-5.67127 -0.0459,-2.75148 3.83094,2.33585 6.53989,7.15924 6.09754,10.85688 L 362.47795,268.5 Z M 225.3083,260.02825 c -2.76233,-1.16037 -5.70333,-5.55643 -4.9794,-7.44297 0.30184,-0.78658 1.58882,-1.57756 2.85995,-1.75772 1.67554,-0.23747 2.39817,-1.08386 2.62757,-3.07756 0.27388,-2.38028 0.75992,-2.75 3.61514,-2.75 4.71198,0 8.56844,3.32979 8.56844,7.39827 0,5.68115 -7.12875,9.96681 -12.6917,7.62998 z m 90.45574,-14.96445 c -4.97944,-1.60765 -9.75243,-5.18657 -12.77407,-9.57838 -4.13106,-6.00429 -5.01649,-8.71682 -6.03404,-18.48542 -1.2959,-12.44072 0.78116,-18.26897 9.35493,-26.25 3.92118,-3.65009 4.23073,-3.75 11.61828,-3.75 6.50676,0 7.76799,-0.28539 8.83879,-2 1.43802,-2.30264 5.75265,-2.57002 11.19162,-0.69356 2.90873,1.00353 3.59075,1.82837 4.28363,5.18065 0.46655,2.25728 2.14679,5.35179 3.87283,7.1326 2.99279,3.08778 3.39453,4.54708 3.74159,13.59135 0.22769,5.93376 3.00692,7.75949 12.08096,7. 93626 l 7.56144,0.1473 -8.5,0.73334 c -10.49624,0.90557 -11.52453,1.3246 -12.99127,5.29392 -3.74442,10.13326 -6.87977,14.34618 -13.61373,18.29254 -4.79453,2.80978 -13.83386,3.99818 -18.63096,2.4494 z m 0.87719,-15.61412 c 3.76888,-3.76888 2.20152,-8.98559 -3.51935,-11.71362 -4.36386,-2.08094 -3.85297,-10.14832 1.07265,-16.9381 2.16782,-2.98826 -0.0203,-3.17903 -4.26258,-0.37162 -9.57842,6.33869 -11.51478,25.47018 -3.0439,30.07402 3.89868,2.11889 6.90777,1.79473 9.75318,-1.05068 z m -58.06929,4.75529 c 3.81043,-2.63727 11.60357,-8.28527 17.31809,-12.55112 10.31148,-7.69744 18.11161,-12.40305 18.10818,-10.92417 -9.8e-4,0.42367 -2.07697,2.0814 -4.6133,3.68383 -2.53634,1.60242 -10.07303,6.93755 -16.74821,11.85582 C 261.61668,234.38888 254.273,239 252.36178,239 c -0.39485,0 2.39972,-2.15776 6.21016,-4.79503 z M 434.75,223.33772 c 0.6875,-0.27741 1.8125,-0.27741 2.5,0 0.6875,0.27741 0.125,0.50439 -1.25,0.50439 -1.375,0 -1.9375,-0.22698 -1.25,-0.50439 z m -5.9375,-1.02083 c 0.72187,-0.2888 7 1.58438,-0.25335 1.91667,0.0789 0.33229,0.33229 -0.25834,0.56864 -1.3125,0.52522 -1.16495,-0.048 -1.4019,-0.28494 -0.60417,-0.60416 z m -8.0625,-0.97917 c 0.6875,-0.27741 1.8125,-0.27741 2.5,0 0.6875,0.27741 0.125,0.50439 -1.25,0.50439 -1.375,0 -1.9375,-0.22698 -1.25,-0.50439 z m -7.5,-1.02705 c 0.9625,-0.25152 2.5375,-0.25152 3.5,0 0.9625,0.25153 0.175,0.45733 -1.75,0.45733 -1.925,0 -2.7125,-0.2058 -1.75,-0.45733 z M 391,218.89427 c -17.34613,-1.23703 -18.26245,-1.8208 -2,-1.27418 7.975,0.26806 16.3,0.86145 18.5,1.31865 l 4,0.83126 -4.5,-0.0278 c -2.475,-0.0153 -9.675,-0.39686 -16,-0.84792 z m -20.1875,-1.57738 c 0.72187,-0.28887 1.58438,-0.25335 1.91667,0.0789 0.33229,0.33229 -0.25834,0.56864 -1.3125,0.52522 -1.16495,-0.048 -1.4019,-0.28494 -0.60417,-0.60416 z M 206.03428,179.75 c -2.41422,-1.2375 -5.07117,-3.375 -5.90432,-4.75 -1.23649,-2.04065 -0.83842,-1.86879 2.16649,0.93539 3.16653,2.95499 4.52685,3.49654 9.72803,3.87276 4.815,0.34829 6.44688,0.0752 8.01112,-1.34037 1.08042 ,-0.97777 1.9644,-1.30977 1.9644,-0.73778 0,1.79405 -4.78545,4.27 -8.25293,4.27 -1.82781,0 -5.29857,-1.0125 -7.71279,-2.25 z M 222.15275,173 c -0.10817,-1.925 -1.09479,-5.4795 -2.19248,-7.8989 -2.57551,-5.67659 -1.75625,-6.58167 1.02422,-1.13151 1.46669,2.87495 2.00655,5.45808 1.74447,8.34691 -0.35789,3.94477 -0.39077,3.98377 -0.57621,0.6835 z M 302,166.64584 l -5.5,-1.06631 7.5,-0.60058 c 8.28717,-0.66362 12.06857,-2.27368 18.28512,-7.78552 l 4.16565,-3.69343 -3.17288,4.07762 c -3.5928,4.61726 -9.56446,8.96327 -13.27789,9.66327 -1.375,0.2592 -4.975,-0.009 -8,-0.59505 z M 293.51332,153.5 c 0.78805,-3.8898 5.29492,-9.48921 9.5927,-11.91813 3.1643,-1.78833 3.07686,-1.60751 -1.29206,2.67188 -2.57732,2.52451 -5.63607,6.31267 -6.79723,8.41814 -1.99596,3.61916 -2.07802,3.66436 -1.50341,0.82811 z m 134.67243,0.98837 c 0.17284,-0.5564 1.52922,-4.1564 3.01418,-8 3.98221,-10.30734 7.49427,-23.44158 9.89058,-36.98837 3.69066,-20.863985 3.73307,-70.5 0.0602,-70.5 -2.19558,0 -26.74444,20.644362 -38.64678,32.5 -14.09966,14.044342 -30.08749,33.82405 -31.11934,38.5 -1.05455,4.77883 -1.28979,5 -5.31806,5 -5.15355,0 -6.53754,-2.30459 -5.63917,-9.39022 0.99443,-7.843291 2.45977,-11.583083 7.09585,-18.10978 6.03848,-8.501006 31.92194,-34.569703 38.47675,-38.752105 3.025,-1.930152 7.1754,-5.07514 9.2231,-6.988863 2.04771,-1.913723 3.96021,-3.242392 4.25,-2.952597 0.2898,0.289794 0.5269,-0.02106 0.5269,-0.690795 0,-1.948902 7.06874,-4.368531 12.42048,-4.25153 3.63207,0.07941 5.55449,0.700431 7.34182,2.371731 3.49356,3.266766 4.10392,4.754371 5.73538,13.97851 2.51467,14.217777 1.70483,37.869066 -2.06425,60.285649 -1.93534,11.51043 -10.82922,39.5901 -13.5104,42.65492 -1.12835,1.28979 -1.91012,1.88985 -1.73728,1.33345 z M 418.16729,143.94844 C 415.33441,133.36405 412.62172,129.84183 403.93294,125.46623 400.11982,123.54597 397,121.77977 397,121.54133 c 0,-0.63245 9.94593,2.38657 13.79405,4.18709 4.13102,1.93289 5.67252,4.90638 8.23029,15.87598 2.65308,11.37831 2.02253,13.10287 -0.85705 ,2.34404 z M 327.14057,150 c 0,-0.825 0.38674,-2.4 0.85943,-3.5 0.54172,-1.26064 0.85943,-1.44548 0.85943,-0.5 0,0.825 -0.38674,2.4 -0.85943,3.5 -0.54172,1.26064 -0.85943,1.44548 -0.85943,0.5 z M 202.5,140 c 0.99549,-1.1 2.03498,-2 2.30998,-2 0.275,0 -0.31449,0.9 -1.30998,2 -0.99549,1.1 -2.03498,2 -2.30998,2 -0.275,0 0.31449,-0.9 1.30998,-2 z m 30.98123,-28.36735 c 4.25991,-3.68163 17.52914,-11.955611 18.16072,-11.32404 0.29237,0.29237 -0.74497,1.311 -2.30519,2.26361 -1.56022,0.95262 -5.08676,3.16145 -7.83676,4.90852 -2.75,1.74708 -6.35,3.97569 -8,4.95248 l -3,1.77597 z m 141.10384,0.43764 c 0.96479,-0.90643 8.27503,-2.67283 7.41493,-1.7917 -0.275,0.28172 -2.26172,0.99351 -4.41493,1.58175 -2.15322,0.58824 -3.50322,0.68271 -3,0.20995 z M 396,111.25 c 0,-1.14583 -0.5625,-2.31031 -1.25,-2.58772 -0.6875,-0.27741 0.003,-0.53991 1.53518,-0.58333 2.57513,-0.073 2.6969,0.0907 1.61455,2.17105 -1.67379,3.21708 -1.89973,3.33601 -1.89973,1 z M 278.75,82.337719 c 0.6875,-0.277412 1.8125,-0.27741 2 2.5,0 0.6875,0.277413 0.125,0.504386 -1.25,0.504386 -1.375,0 -1.9375,-0.226973 -1.25,-0.504386 z M 370,53.570368 c 0,-0.275 0.9,-0.981666 2,-1.570368 1.1,-0.588702 2,-0.845368 2,-0.570368 0,0.275 -0.9,0.981666 -2,1.570368 -1.1,0.588702 -2,0.845368 -2,0.570368 z m 7,-4.063041 c 0,-0.677431 8.12258,-4.718082 8.57497,-4.265695 0.20963,0.209635 -1.63398,1.360179 -4.09691,2.556765 C 379.01513,48.994982 377,49.764001 377,49.507327 Z M 405,35.5 c 1.375,-0.786021 2.95,-1.429129 3.5,-1.429129 0.55,0 -0.125,0.643108 -1.5,1.429129 -1.375,0.786021 -2.95,1.429129 -3.5,1.429129 -0.55,0 0.125,-0.643108 1.5,-1.429129 z m 7,-3 c 1.375,-0.786021 2.95,-1.429129 3.5,-1.429129 0.55,0 -0.125,0.643108 -1.5,1.429129 -1.375,0.786021 -2.95,1.429129 -3.5,1.429129 -0.55,0 0.125,-0.643108 1.5,-1.429129 z m -65.61578,455.08513 c 1.01147,-1.87819 1.58147,-3.83162 1.26667,-4.34098 -0.31479,-0.50935 0.72629,-1.88622 2.31351,-3.05971 2.05014,-1.51574 3.02949,-1.77898 3.38179,-0.90903 0.27275,0.67353 0.53144,0.3051 4 0.57486,-0.81864 0.0906,-2.34535 -4.74294,-19.64155 -5.75131,-20.58023 -1.02859,-0.9575 -13.89483,1.98399 -18.83474,4.30602 -5.25159,2.46854 -6.34616,4.24632 -6.6245,10.75933 -0.1818,4.25419 0.19853,5.35728 2.7895,8.09067 3.4128,3.60039 13.69964,9.08824 18.5226,9.88149 0.28742,0.0473 1.35016,-1.45074 2.36162,-3.32892 z m 46.01099,-14.57123 c 2.14237,-2.17384 4.27987,-3.71471 4.75,-3.42416 1.05258,0.65054 1.05431,0.77775 -0.12909,-9.51584 -0.73377,-6.38256 -0.6713,-8.78523 0.25759,-9.90691 1.56549,-1.8904 1.55663,-18.73665 -0.0107,-20.30396 -1.82591,-1.82591 -7.85773,-0.0672 -12.48872,3.64144 -2.35087,1.88263 -8.66181,6.4107 -14.02431,10.06238 -10.4385,7.10826 -11.57213,8.99821 -8,13.33733 1.7497,2.12539 1.75086,2.12542 6.75,0.22828 6.06644,-2.30219 13.24807,-3.7822 9.86408,-2.03282 -3.42405,1.77009 -4.68157,5.55044 -2.90456,8.73166 0.81989,1.46778 1.7794,3.4562 2.13223,4.4187 0.35283,0.9625 1.03903,1.75 1.52488,1.75 0.48585,0 0.88337,1.05623 0.88337,2.34719 0,2.31906 2.81221,4.460 23 6,4.5683 0.825,0.028 3.25284,-1.72774 5.39521,-3.90159 z m -9.58271,-19.69701 c 0.72187,-0.28887 1.58438,-0.25335 1.91667,0.0789 0.33229,0.33229 -0.25834,0.56864 -1.3125,0.52522 -1.16495,-0.048 -1.4019,-0.28494 -0.60417,-0.60416 z m 4.9375,-0.97917 c 0.6875,-0.27741 1.8125,-0.27741 2.5,0 0.6875,0.27741 0.125,0.50439 -1.25,0.50439 -1.375,0 -1.9375,-0.22698 -1.25,-0.50439 z m 5.0625,-1.02083 c 0.72187,-0.28887 1.58438,-0.25335 1.91667,0.0789 0.33229,0.33229 -0.25834,0.56864 -1.3125,0.52522 -1.16495,-0.048 -1.4019,-0.28494 -0.60417,-0.60416 z m -232.64737,14.77034 c 2.46401,-0.76262 4.33733,-2.27366 5.71628,-4.6108 1.12812,-1.91204 2.74132,-3.47643 3.58486,-3.47643 1.31769,0 1.82715,-0.87177 1.7532,-3 -0.14042,-4.04142 2.07517,-19.69278 3.71336,-26.23189 l 2.12714,-8.4908 -3.56312,-7.01365 c -1.95971,-3.85751 -4.4482,-7.81465 -5.52998,-8.79364 -1.08178,-0.979 -1.96687,-2.30681 -1.96687,-2.95069 0,-0.64389 -1.1054,-2.20917 -2.45644,-3.47841 -4.02897,-3.78502 -11.22885,-15.2161 -12.62 28,-20.04092 -0.71506,-2.475 -2.33988,-5.77218 -3.61072,-7.32707 -2.50985,-3.07083 -3.78891,-6.83267 -3.0193,-8.88002 0.27199,-0.72354 1.18986,0.33028 2.08428,2.39299 1.46352,3.37517 5.91105,10.52599 7.33169,11.78803 0.3257,0.28934 -0.93757,-2.37569 -2.80727,-5.92229 -1.86969,-3.5466 -4.98656,-10.24775 -6.92637,-14.89145 -3.10272,-7.42759 -3.85546,-8.47813 -6.25836,-8.73432 -1.50228,-0.16016 -5.31516,-1.86512 -8.47306,-3.78878 C 123.4331,339.09877 111.26686,330 112.34421,330 c 0.32167,0 3.86331,1.98674 7.87032,4.41497 4.00701,2.42823 9.31047,5.19591 11.78547,6.15038 2.475,0.95448 4.9275,2.11774 5.45,2.58503 3.18261,2.84632 3.44315,-2.81039 0.47616,-10.33772 -4.79027,-12.153 -10.43115,-34.41038 -16.9773,-66.98777 -7.23246,-35.99289 -9.44459,-44.68379 -13.64961,-53.62596 -2.436,-5.18025 -3.91905,-6.04549 -5.38104,-3.13941 -0.39858,0.79226 -3.653069,7.51548 -7.232208,14.94048 -3.579139,7.425 -13.730817,25.03076 -22.559285,39.12391 -17.271872,27.57161 -25.192625,41.82087 -30.139317,54.2 1993 -3.230287,8.09684 -3.302452,11.16341 -0.242326,10.29745 C 42.710283,327.36815 45.975,326.89858 49,326.5978 c 4.839951,-0.48124 5.095344,-0.42269 2.128116,0.48784 -1.854536,0.56909 -4.690126,2.00933 -6.301311,3.20053 -2.363978,1.74776 -3.091444,1.90367 -3.768792,0.8077 -0.650508,-1.05255 -0.985553,-0.89753 -1.489086,0.68896 -1.016984,3.20423 0.325271,7.195 2.180519,6.48307 1.375147,-0.52769 1.483287,0.39143 0.88712,7.53999 -0.832968,9.988 -1.358137,11.50018 -3.774472,10.8683 C 37.23282,356.24812 37,356.80069 37,361.09362 37,364.78818 37.370483,366 38.5,366 c 1.230093,0 1.5,1.7429 1.5,9.68611 0,9.69789 2.130973,21.41403 4.422297,24.31389 0.651874,0.825 2.564477,4.20642 4.250229,7.51426 C 58.956832,427.69448 75.413918,446 83.272103,446 c 0.743479,0 2.349878,1.35 3.569776,3 1.219898,1.65 2.775063,3 3.455924,3 0.68086,0 2.893514,1.125 4.917009,2.5 2.096824,1.42483 5.105688,2.5 6.996248,2.5 3.9047,0 13.85255,3.43646 15.28894,5.28152 3.54254,4.55043 32.0446,7.0928 42.66513,3.80571 z M 87.340342,340.25 c -2.19584,-2.0625 -5.492087,-6.45 -7.324993,-9.75 -1.832906,-3.3 -3.706949,-6.491 -4.16454,-7.09112 -0.591885,-0.77624 -3.215522,-0.56667 -9.091396,0.7262 C 62.216736,325.13461 57.6,325.92454 56.5,325.89049 c -1.1,-0.034 2.725,-1.11639 8.5,-2.4052 5.775,-1.28881 10.762195,-2.03774 11.082656,-1.66429 0.32046,0.37345 3.653141,5.0665 7.405958,10.429 8.544573,12.20957 9.794172,12.49087 17.920436,4.03411 3.02088,-3.14374 5.75131,-5.45708 6.06763,-5.14076 0.31632,0.31631 -2.08716,3.33846 -5.34106,6.71588 -7.101964,7.37157 -9.141585,7.70115 -14.795278,2.39077 z M 199,245 c 2.66626,-2.66626 2.52103,-5.22733 -0.5,-8.81763 -3.1482,-3.74142 -3.14913,-6.56393 -0.004,-12.76289 2.98004,-5.87392 2.92207,-5.41948 0.69128,-5.41948 -2.40141,0 -6.701,4.59033 -8.63404,9.21788 -0.85418,2.04484 -1.55305,6.22779 -1.55305,9.29546 0,4.58853 0.43525,6.01282 2.45455,8.03211 2.97757,2.97758 4.90624,3.09376 7.54545,0.45455 z m -32.29724,-73.25 c -0.49296,-8.5924 -0.25527,-11.38202 1.46978,-17 .25 2.72096,-9.25572 7.69378,-18.95085 12.56652,-24.5 6.08069,-6.92478 6.33747,-7.73169 4.79746,-15.07561 -0.74096,-3.53341 -0.99073,-6.80095 -0.55505,-7.26119 0.43567,-0.46024 4.44307,-1.08704 8.90533,-1.39289 5.25173,-0.35997 8.1132,-0.97216 8.1132,-1.73578 0,-4.01985 -11.56458,-23.836868 -25.93086,-44.435011 -3.61644,-5.185185 -3.84152,-7.445115 -0.94367,-9.474846 2.89699,-2.029132 1.90953,-5.508748 -2.71576,-9.569807 -5.1153,-4.491291 -7.08737,-3.816802 -10.07287,3.445134 -3.95197,9.612737 -8.94298,27.980024 -11.34395,41.746551 -1.96478,11.265495 -2.16419,15.099849 -1.71623,32.999999 0.43303,17.30359 0.86958,21.64033 2.99735,29.77561 3.69113,14.11265 11.7497,32.97784 14.08701,32.97784 0.55085,0 0.69013,-4.17757 0.34174,-10.25 z M 214.8,85.8 c 0.89401,-0.894014 1.48894,-0.911056 2.33317,-0.06683 0.84422,0.844223 2.49076,0.130256 6.4573,-2.8 C 226.51874,80.769925 229.38382,79 229.9573,79 c 2.03288,0 1.13447,-6.836594 -1.18202,-8.994735 -4.52569,-4.216314 -22.66623,-11.391295 -31.8 9641,-12.615721 -5.38118,-0.71384 -5.9852,0.02883 -2.90856,3.576224 1.08367,1.249484 2.22622,3.078081 2.539,4.06355 0.31277,0.985469 1.67613,2.517393 3.02968,3.404275 1.53202,1.003812 2.46101,2.559373 2.46101,4.120845 0,1.379582 0.69417,2.774709 1.5426,3.100282 0.84843,0.325572 2.47788,2.448949 3.62101,4.718615 3.46249,6.874715 5.05597,8.007089 7.63639,5.426665 z" + id="path5" /> + <path + style="fill:#5c5c5b" + d="m 249,508.42704 c -23.97668,-2.7568 -36.99205,-5.74796 -46.45278,-10.67567 -3.77781,-1.9677 -8.93167,-6.09626 -13.73331,-11.00121 l -7.68609,-7.85147 -8.31391,1.61594 c -12.73543,2.47532 -37.16034,3.01645 -49.64462,1.09987 C 89.206943,476.40062 59.509179,458.20593 41.371327,431.5 33.861077,420.44201 30.196148,413.1796 26.232017,401.5 20.243105,383.85475 18.675433,366.29925 21.454571,348 25.133995,323.77281 34.319298,302.04782 54.007918,271.00514 57.672468,265.22731 64.664758,254.2 69.546338,246.5 c 9.878078,-15.58126 17.726207,-30.43681 21.977201,-41.60016 5.186371,-13.61969 9.547061,-15.15738 15.980001,-5.63494 5.44515,8.06026 10.73198,26.0104 17.01432,57.76801 10.03647,50.73495 14.33942,65.11105 26.629,88.96709 11.44231,22.21136 34.99204,55 39.50256,55 0.87887,0 5.79907,-4.01631 10.93379,-8.92512 5.13471,-4.90882 18.01655,-15.43224 28.62631,-23.38537 C 250.78408,353.26671 263,342.72386 263,340.38997 c 0,-1.99659 -2.50795,-2.79173 -18.44853,-5.84908 -24.46058,-4.69145 - 53.2561,-15.49205 -71.17541,-26.69642 C 161.06536,300.14699 160,299.00446 160,293.49948 c 0,-4.36388 -0.35173,-4.9429 -6.96338,-11.46336 -7.8935,-7.78463 -11.02746,-12.36678 -11.03288,-16.13113 -0.005,-3.39447 2.20923,-5.27149 9.37709,-7.94946 7.00521,-2.61721 13.24441,-7.94628 15.75351,-13.45553 1.47178,-3.2316 1.8145,-6.49729 1.78409,-17 -0.0534,-18.44398 -0.63514,-20.94395 -7.13878,-30.67899 -6.94684,-10.39845 -10.52858,-17.58707 -15.10748,-30.32101 -4.59789,-12.78676 -6.2512,-19.47792 -8.14336,-32.95722 -1.92922,-13.74333 -1.92847,-22.87426 0.003,-38.476666 1.84395,-14.894303 4.33294,-26.416244 8.38386,-38.810213 C 154.18824,34.005557 158.57353,27 165.22919,27 c 4.81792,0 26.78371,5.701315 39.09565,10.147442 16.04821,5.795383 37.23776,16.381346 51.62943,25.793247 12.37157,8.090788 16.17365,9.404508 16.85597,5.82419 0.18187,-0.954316 -1.2627,-4.329316 -3.21015,-7.5 -5.78266,-9.414836 -8.12917,-19.116593 -5.97891,-24.720077 1.05056,-2.737721 6.21752,-4.793499 10.2503,-4.078287 14. 17164,2.513336 32.7055,10.382698 47.23628,20.056232 C 326.45904,56.085236 331.27445,59 331.80867,59 c 0.53422,0 3.83332,-2.110894 7.33132,-4.690875 22.40062,-16.521755 47.82957,-30.369446 71.18589,-38.765275 14.49011,-5.208716 34.21183,-10.3225266 43.20037,-11.2017845 5.50099,-0.5381058 6.30038,-0.358827 9.17121,2.0568196 3.45171,2.904419 6.97358,11.0833109 10.86849,25.2400649 12.85158,46.711355 8.75113,100.3922 -11.02713,144.36105 -4.66653,10.37411 -4.71773,10.60201 -4.27032,19.00829 0.89673,16.84836 8.49137,25.45 26.48417,29.99582 8.04248,2.0319 8.93146,6.85652 3.03951,16.49589 -14.08852,23.04916 -33.7132,41.59727 -61.54218,58.16613 l -11.25,6.69804 0.007,5.06791 c 0.0152,11.00657 5.62489,28.83867 14.75852,46.91452 l 5.48072,10.84661 -1.92227,2.57467 c -1.1236,1.50494 -4.18702,3.33955 -7.37313,4.41561 -2.99797,1.01251 -5.98542,2.55824 -6.63877,3.43495 -0.83276,1.11745 -1.0128,4.68656 -0.60217,11.9377 0.67483,11.91653 -0.2034,14.24663 -6.48579,17.2079 l -3.72412,1.7554 v 25.49028 c 0,20.2631 0.38381,27.7804 1.87165,36.65803 1.82887,10.91248 1.82887,11.25471 0,14.97216 -4.56179,9.27253 -18.70678,10.56563 -34.04209,3.11205 -5.15994,-2.50794 -6.88804,-1.91902 -7.74308,2.63876 -0.99744,5.31678 -4.92574,9.33558 -10.84303,11.09283 -10.10549,3.00101 -20.09635,1.61454 -34.02097,-4.7212 l -6.77752,-3.0838 -2.72248,2.60768 c -6.28804,6.02288 -18.60486,8.60342 -43.6717,9.14979 -9.92793,0.2164 -19.62578,0.21236 -21.55078,-0.009 z m 43,-12.42977 c 8.17145,-1.28813 15.21481,-3.84709 14.72237,-5.34887 -0.80759,-2.46294 -7.06231,-5.64856 -11.12025,-5.66371 -6.82741,-0.0255 -7.05761,-0.73899 -2.87107,-8.89882 3.08522,-6.0133 3.80453,-8.56007 4.10647,-14.5393 0.9272,-18.36138 -7.56989,-34.75318 -21.79233,-42.03976 -5.0446,-2.58449 -14.79346,-3.12132 -20.62141,-1.13554 -5.98082,2.03787 -7.05344,2.03621 -7.83948,-0.0122 -0.99256,-2.58659 2.16957,-6.36269 7.1866,-8.58196 6.40162,-2.83174 18.63586,-2.11098 26.68015,1.57182 10.10333,4.62546 21.00394,17.90564 24.7485,30.15104 0.5045 5,1.65 1.16775,7.95 1.47375,14 0.5252,10.38345 0.75792,11.3363 4.15211,17 4.88587,8.1528 11.87436,14.73457 19.77475,18.62393 5.41537,2.66597 8.08703,3.32316 14.98063,3.68498 9.41997,0.49442 13.42758,-1.02444 13.40903,-5.08196 -0.006,-1.22482 -1.80861,-8.30195 -4.00669,-15.72695 -2.19808,-7.425 -4.50832,-15.525 -5.13385,-18 -0.62554,-2.475 -2.02566,-7.65 -3.11138,-11.5 -5.43863,-19.28553 -5.84028,-21.31094 -5.85002,-29.5 -0.01,-8.34803 2.11345,-19.09175 4.29211,-21.71687 0.60775,-0.7323 1.27564,-1.16083 1.48419,-0.95228 0.20855,0.20854 1.49413,7.5002 2.85686,16.20368 2.60893,16.66279 6.05253,31.08389 7.65968,32.07716 1.51947,0.93908 14.15469,-7.98731 22.48021,-15.88158 4.1938,-3.97656 10.02869,-10.65409 12.96642,-14.83896 5.27733,-7.51769 5.40352,-7.61622 10.53164,-8.22357 2.85467,-0.3381 5.58868,-1.18911 6.07558,-1.89115 0.85718,-1.23591 0.36094,-15.35635 -0.8787,-25.00336 -0.57211,-4.45223 -0.45103,-4.78639 2.08346,-5.75 1.47998,-0.56269 4.26616,-1.02307 6.19151,-1.02307 1.92535,0 4.36416,-0.46214 5.41958,-1.02698 1.81459,-0.97114 1.64626,-1.55568 -3.09574,-10.75 -5.65912,-10.97254 -10.01258,-23.69481 -12.75745,-37.28152 -1.26085,-6.24106 -2.45988,-9.66039 -3.70739,-10.57259 -1.01411,-0.74153 -1.65169,-1.49706 -1.41684,-1.67894 0.23485,-0.18188 5.81394,-3.842 12.39798,-8.13361 17.23817,-11.23617 26.57775,-18.56449 38.88955,-30.51475 C 463.79796,256.94003 478,239.21321 478,236.03871 c 0,-1.41177 -1.54571,-2.39119 -6.25,-3.96023 -8.5723,-2.85914 -12.07891,-5.19388 -16.20818,-10.79159 -3.74032,-5.07046 -5.83479,-10.75377 -7.62834,-20.69942 -0.60378,-3.34811 -1.55179,-7.69452 -2.10668,-9.65868 -0.90685,-3.20995 -0.60674,-4.37329 2.96666,-11.5 C 468.31348,140.45862 474.25298,89.065299 464.54048,43 c -1.62128,-7.689521 -6.87424,-24.397262 -8.45686,-26.898156 -1.94993,-3.081323 -30.94988,3.785993 -50.79577,12.028658 -20.00474,8.308646 -47.9279,24.264916 -59.74529,34.140553 -2.87745,2.404642 -2.91107,2.535837 -1.2431,4.85022 0.94289,1.308299 2.39645,3.327818 3.23013, 4.48782 C 349.5079,74.361764 348.43021,77 345.32747,77 341.59243,77 328.86237,70.752334 319.13175,64.143645 304.92568,54.495392 282.30167,44 275.70984,44 c -1.67772,0 -1.86631,0.467841 -1.31009,3.25 1.55959,7.800879 9.91835,16.780909 20.77948,22.323912 7.37571,3.764211 7.23787,4.847464 -0.51575,4.053082 -5.48826,-0.562289 -8.13978,-0.247361 -15.23432,1.809418 -4.72424,1.369607 -12.26595,2.965473 -16.75935,3.546369 -4.49339,0.580896 -9.29481,1.311115 -10.66981,1.62271 l -2.5,0.566535 2.82488,1.485155 c 1.55368,0.816836 6.50368,2.24793 11,3.18021 11.50672,2.385837 10.7107,5.223888 -2.43809,8.692473 -4.0525,1.06903 -5.44037,1.023214 -9.12335,-0.301178 l -4.34377,-1.562008 -7.45983,4.32337 C 209.06322,114.89627 189.3325,138.9815 181.37857,168.5 c -2.90708,10.78875 -3.29216,20.4267 -2.29734,57.5 l 0.41592,15.5 -3.08784,6.5 c -3.34422,7.0397 -9.54655,13.49888 -16.24205,16.91467 -2.21736,1.13121 -4.33216,2.54312 -4.69955,3.13757 -0.68615,1.11023 9.29109,11.47075 15.53229,16.12896 l 3.5,2.6 1228 -1.90444,3.26899 -1.90444,3.269 2.35645,1.90813 c 10.46308,8.47249 40.01533,21.41192 62.27957,27.26906 13.91668,3.66111 39.96897,8.42292 47.00233,8.59102 2.29379,0.0548 5.29553,0.42432 6.67053,0.82109 2.39949,0.69241 2.31908,0.81195 -2,2.97323 -2.475,1.2385 -7.45161,5.25651 -11.05913,8.92891 -7.79555,7.93575 -14.88615,13.71333 -39.20792,31.94749 -29.15265,21.85591 -40.16305,34.45522 -46.3559,53.04552 -4.93789,14.82305 -5.05551,32.01315 -0.28654,41.87724 4.8765,10.08648 17.78527,19.12291 32.64168,22.8499 16.06347,4.02981 51.34331,5.2798 69.26781,2.45421 z M 227.18856,280.96104 c -3.76001,-3.50298 -2.49764,-7.0488 1.5624,-4.38856 3.16427,2.0733 5.01227,1.23844 6.81638,-3.0794 l 1.47703,-3.53503 3.70995,2.52097 c 4.76069,3.23497 5.58832,3.17572 8.55294,-0.61237 1.38197,-1.76583 2.94113,-2.83117 3.57247,-2.44098 2.05,1.26697 1.19012,5.60501 -1.62973,8.22186 -2.36268,2.1926 -3.36257,2.46834 -7.09929,1.95777 -3.43956,-0.46996 -4.87965,-0.17708 -6.88486,1.40022 -3.25494,2.56034 -7.300 51,2.54248 -10.07729,-0.0445 z m -1.88026,-20.93279 c -2.76233,-1.16037 -5.70333,-5.55643 -4.9794,-7.44297 0.30184,-0.78658 1.58882,-1.57756 2.85995,-1.75772 1.67554,-0.23747 2.39817,-1.08386 2.62757,-3.07756 0.27388,-2.38028 0.75992,-2.75 3.61514,-2.75 4.71198,0 8.56844,3.32979 8.56844,7.39827 0,5.68115 -7.12875,9.96681 -12.6917,7.62998 z M 193.97478,256.75 c -4.49668,-3.04655 -8.78181,-10.33882 -10.02401,-17.05847 -1.86415,-10.08414 3.32045,-24.44705 10.37811,-28.75046 4.0549,-2.47248 10.28734,-2.47248 14.34224,0 10.16546,6.1984 13.42789,28.75541 5.82133,40.24971 -5.10798,7.71867 -13.83875,10.08426 -20.51767,5.55922 z M 199,245 c 2.66626,-2.66626 2.52103,-5.22733 -0.5,-8.81763 -3.1482,-3.74142 -3.14913,-6.56393 -0.004,-12.76289 2.98004,-5.87392 2.92207,-5.41948 0.69128,-5.41948 -2.40141,0 -6.701,4.59033 -8.63404,9.21788 -0.85418,2.04484 -1.55305,6.22779 -1.55305,9.29546 0,4.58853 0.43525,6.01282 2.45455,8.03211 2.97757,2.97758 4.90624,3.09376 7.54545,0.45455 z m 116.76404,0.0638 c -14.65912,-4.7328 -22.67707,-23.53026 -16.77047,-39.31706 2.39461,-6.40017 7.70306,-11.85216 14.43136,-14.82156 8.89232,-3.92446 20.69638,-1.10679 27.41361,6.54371 12.53567,14.27734 9.73603,35.09867 -6.03002,44.84607 -5.01819,3.10251 -13.95411,4.3923 -19.04448,2.74884 z m 0.87719,-15.61412 c 3.76888,-3.76888 2.20152,-8.98559 -3.51935,-11.71362 -4.36386,-2.08094 -3.85297,-10.14832 1.07265,-16.9381 2.16782,-2.98826 -0.0203,-3.17903 -4.26258,-0.37162 -9.57842,6.33869 -11.51478,25.47018 -3.0439,30.07402 3.89868,2.11889 6.90777,1.79473 9.75318,-1.05068 z M 363,112 c -1.1,-1.1 -2,-2.60443 -2,-3.34317 0,-1.75785 8.68789,-14.17612 16.59326,-23.718034 C 394.17351,64.926173 428.3502,36 435.41516,36 c 1.32794,0 4.28735,3.807123 3.41586,4.394336 C 438.64896,40.51701 434.45,43.730788 429.5,47.536064 409.35361,63.023452 388.96627,83.826978 376.92871,101.18053 370.34317,110.67436 367.5173,114 366.03573,114 365.46608,114 364.1,113.1 363,112 Z m 38.18551,371.21449 c 0.75704,-0.75704 0.41117,-5.0444 5 -1.18851,-14.73263 -1.70702,-10.33835 -2.09014,-15.49829 -1.5738,-21.19633 0.57609,-6.35732 -0.77727,-21.67372 -2.04834,-23.18174 -0.18367,-0.21792 -2.29994,1.35708 -4.70282,3.5 -6.94421,6.19294 -15.58901,12.76988 -23.42204,17.81942 -5.39044,3.47493 -7.24981,5.23837 -7.24927,6.87524 0.001,3.25387 9.38884,18.48266 14.77401,23.96633 5.76516,5.87061 12.7931,8.88509 19.53412,8.37872 2.64488,-0.19867 5.28937,-0.84173 5.87665,-1.42901 z M 168.57778,469.66888 c 5.75362,-1.1356 5.9144,-1.25429 5.64745,-4.16888 -1.71632,-18.73951 0.27324,-33.01644 6.51033,-46.71774 l 3.51327,-7.71773 -7.68576,-8.78227 c -4.22716,-4.83024 -10.86432,-13.50283 -14.74925,-19.27241 -6.85593,-10.18189 -18.28245,-32.39286 -20.84045,-40.50985 -0.69331,-2.2 -2.50103,-7.61188 -4.01715,-12.02641 -5.42332,-15.79121 -10.03309,-34.4688 -16.42832,-66.56323 -6.74768,-33.8632 -9.02883,-42.78032 -13.22865,-51.71143 -2.436,-5.18025 -3.91905,-6.04549 -5.38104,-3.13941 -0.39858,0.79226 -3.654039,7.51548 -7.234364,14.94048 -3.5 80324,7.425 -13.991897,25.425 -23.136829,40 -18.284262,29.14107 -29.295014,50.22033 -32.646883,62.5 -1.201028,4.4 -2.848986,10.25 -3.662131,13 -2.378329,8.04335 -2.850004,35.35492 -0.788064,45.63164 8.911132,44.41313 46.335111,78.74458 93.050061,85.36087 11.03102,1.56234 31.01973,1.16156 41.07778,-0.82363 z M 167.44396,177.25 c 3.07294,-21.75177 14.19765,-44.43953 29.89548,-60.9689 6.84868,-7.21147 6.85434,-7.2222 5.50815,-10.43734 -5.83295,-13.930887 -12.3257,-25.022113 -26.77845,-45.744241 -3.34486,-4.7958 -3.81023,-7.239577 -1.71051,-8.982194 2.02258,-1.678589 5.33931,1.357394 13.72521,12.563428 8.11438,10.843198 15.16978,21.916719 19.76883,31.027394 1.70642,3.380387 3.52065,6.404543 4.03163,6.720353 0.51099,0.3158 3.33356,-1.35627 6.27238,-3.715721 2.93883,-2.359449 7.71864,-5.790193 10.62182,-7.623876 4.4574,-2.81535 5.16539,-3.664907 4.55142,-5.461435 -1.35815,-3.974006 -0.55047,-7.041211 2.59397,-9.850773 C 237.63311,73.249513 240.1229,72 241.45676,72 c 7.18233,0 1.18535,-4.6 63586 -18.95676,-14.741831 -6.6,-3.302355 -16.33567,-7.624356 -21.63483,-9.604446 -11.69691,-4.370681 -31.51667,-9.855177 -34.14726,-9.44918 -3.66864,0.566206 -11.75206,25.26209 -15.72502,48.042008 -1.96478,11.265495 -2.16419,15.099849 -1.71623,32.999999 0.43303,17.30359 0.86958,21.64033 2.99735,29.77561 C 155.73699,162.26251 164.01319,182 166.10206,182 c 0.36897,0 0.97282,-2.1375 1.3419,-4.75 z" + id="path4" /> + <path + style="fill:#5d2b09" + d="m 249,507.42704 c -24.08019,-2.7687 -37.06902,-5.76529 -46.45278,-10.71691 -3.73133,-1.96895 -8.96693,-6.18658 -13.67111,-11.01301 l -7.6239,-7.82202 -8.3761,1.62773 c -12.79192,2.48585 -37.19989,3.03173 -49.70682,1.11167 C 101.93005,477.35386 81.554647,468.54789 64.533569,455.27294 48.201241,442.53516 34.345229,422.57306 27.208904,401.5 c -12.521771,-36.97591 -5.710998,-75.32896 21.309718,-120 3.659537,-6.05 11.278557,-18.2 16.931154,-27 14.171793,-22.06274 18.84326,-30.44997 25.451218,-45.69557 5.928108,-13.67708 7.787045,-16.111 10.849006,-14.20469 7.75359,4.82723 13.8064,22.1875 21.76786,62.43317 6.7524,34.1338 11.41132,53.15919 16.15093,65.95477 6.9574,18.78295 23.80928,48.33724 36.78499,64.51232 6.91382,8.61855 12.74411,14.5 14.37386,14.5 0.77617,0 5.42853,-3.823 10.33858,-8.49555 4.91005,-4.67255 17.69561,-15.06817 28.41236,-23.10139 22.76684,-17.0659 35.10641,-28.17563 34.12764,-30.72627 -0.89879,-2.3422 -3.17259,-3.07058 -19.15475,-6.1359 -24.2887,-4.65848 -52.9 7863,-15.3625 -70.36149,-26.25139 C 161.99533,299.65058 161,298.58 161,293.10233 c 0,-4.24354 -0.39107,-4.92117 -5.82305,-10.09007 -10.56222,-10.05067 -14.60204,-17.75473 -10.91481,-20.81486 0.69418,-0.57612 3.92015,-2.04197 7.16882,-3.25745 6.95863,-2.60356 14.12042,-8.79686 16.69803,-14.43995 1.47863,-3.23712 1.81991,-6.47935 1.78944,-17 -0.0536,-18.48988 -0.64883,-21.05447 -7.13393,-30.73468 -6.95392,-10.38 -10.55561,-17.59307 -15.11233,-30.26532 -4.59789,-12.78676 -6.2512,-19.47792 -8.14336,-32.95722 -1.92922,-13.74333 -1.92847,-22.87426 0.003,-38.476666 2.5162,-20.324297 7.00212,-37.477496 14.53048,-55.561437 C 157.49366,31.262489 160.67681,28 165.28732,28 c 4.76752,0 26.78962,5.724439 39.03752,10.147442 16.02518,5.787065 37.23199,16.377544 51.56377,25.750464 C 262.70235,68.354058 268.85305,72 269.55683,72 c 5.21587,0 5.72614,-3.564772 1.43141,-10 C 266.76761,55.675807 264,47.768934 264,42.035068 c 0,-4.142129 0.4201,-5.220355 2.74711,-7.050782 3.2444,-2.552046 6.16998,-2.30333 2 19.15428,1.628377 11.90286,3.60424 24.00297,9.429665 35.15303,16.923917 C 326.34343,57.091461 331.14031,60 331.71415,60 c 0.57384,0 5.78158,-3.379535 11.57276,-7.510077 30.53578,-21.779563 59.71941,-35.590724 92.03897,-43.557463 17.28963,-4.2618739 23.44636,-4.7290377 26.83878,-2.0364873 2.93963,2.3331741 6.69084,11.2566883 10.40129,24.7429773 12.85158,46.711355 8.75113,100.3922 -11.02713,144.36105 -4.66774,10.37679 -4.71784,10.59995 -4.26978,19.01779 0.84909,15.952 9.32781,26.42458 24.34657,30.07192 5.32388,1.29291 9.38439,4.29389 9.38439,6.93566 0,5.02696 -17.61151,29.6401 -28.48979,39.8162 -9.32317,8.72136 -23.26722,19.01846 -36.64298,27.0593 l -11.36723,6.83341 -0.30038,5.07862 c -0.59672,10.08906 5.00797,28.46899 14.47315,47.46298 6.34888,12.74042 6.21527,13.56365 -2.73065,16.8255 -8.44037,3.07751 -8.9343,4.05681 -8.23897,16.33529 0.65756,11.61173 -0.1,13.99554 -5.11325,16.09021 -5.87178,2.45339 -5.80165,2.05838 -5.35804,30.18101 0.2993,18.97443 0.88432,28.45763 2.21319,35.87 61 1.68461,9.40445 1.6957,10.31715 0.16449,13.54394 -2.49677,5.26155 -6.7842,7.31627 -15.10954,7.24114 -5.30188,-0.0479 -8.57682,-0.73212 -13.5,-2.82073 -3.575,-1.51666 -7.71885,-2.98382 -9.20855,-3.26036 -2.51289,-0.46649 -2.79339,-0.16593 -3.88278,4.16046 C 365.755,501.00142 359.01083,505 346.73868,505 c -6.32875,0 -13.66924,-1.98493 -22.94327,-6.20404 l -6.70458,-3.05017 -3.29542,2.77864 c -4.33501,3.65523 -8.49658,5.32343 -17.64811,7.0744 -7.26419,1.38987 -39.9398,2.65692 -47.1473,1.82821 z m 43,-11.42977 c 8.17145,-1.28813 15.21481,-3.84709 14.72237,-5.34887 -0.80759,-2.46294 -7.06231,-5.64856 -11.12025,-5.66371 -6.82741,-0.0255 -7.05761,-0.73899 -2.87107,-8.89882 6.40642,-12.48654 5.7425,-26.15559 -2.00429,-41.26474 -6.31591,-12.31842 -13.8248,-17.74719 -25.69166,-18.57455 -5.0315,-0.3508 -7.78967,0.0242 -11.98785,1.62986 -4.18141,1.59924 -5.63506,1.79848 -6.23468,0.85452 -1.12862,-1.77672 -1.03168,-2.18269 1.19818,-5.0175 5.06579,-6.4401 21.02059,-7.59262 32.48016,-2.34625 7. 73349,3.54051 16.37141,12.43635 21.06727,21.69631 3.92788,7.74556 4.20302,9.39014 4.36673,26.10153 0.0599,6.11627 0.47546,8.13684 2.05657,10 1.08981,1.28422 3.95907,5.07299 6.37613,8.41949 C 322.27432,488.5455 334.72763,495 347.95899,495 355.25654,495 359,493.24723 359,489.83036 c 0,-2.05388 -5.94157,-23.57899 -8.54637,-30.96178 -0.75754,-2.14709 -1.13572,-4.53346 -0.84041,-5.30303 0.70035,-1.82508 -2.40895,-13.2185 -4.65725,-17.06555 -2.47401,-4.23328 -4.21121,-13.69861 -4.12839,-22.49399 0.0689,-7.31496 2.3758,-18.60467 4.16863,-20.40065 1.05688,-1.05874 1.11134,-0.81723 4.37329,19.39464 2.73393,16.94014 6.02666,28.99758 7.92068,29.00427 2.51134,0.009 18.48923,-11.74914 25.34042,-18.64784 3.92183,-3.94902 9.04314,-10.08901 11.38069,-13.64442 4.14042,-6.29757 4.38219,-6.48002 9.3694,-7.07047 8.09852,-0.9588 8.54337,-2.42488 6.57018,-21.65312 -0.57702,-5.62292 -0.88726,-10.38536 -0.68942,-10.5832 0.19783,-0.19784 3.43525,-0.79526 7.19426,-1.3276 3.75901,-0.53234 7.27517,-1.4085 7.81 37,-1.94703 0.63886,-0.63886 -0.93869,-4.74145 -4.53927,-11.80487 -6.11419,-11.99447 -9.68442,-22.40793 -12.63595,-36.85593 -1.07932,-5.28333 -2.43702,-10.17795 -3.01712,-10.87692 -0.80567,-0.97077 1.12684,-2.63994 8.18411,-7.06884 12.3618,-7.75785 29.51091,-20.72974 38.87347,-29.40458 8.05649,-7.46471 20.54492,-22.28258 25.73717,-30.53788 3.87075,-6.15422 3.43348,-6.76656 -7.23884,-10.13692 -8.86453,-2.79945 -11.17966,-4.49157 -15.57947,-11.38697 C 451.27368,214.70113 447,200.67267 447,195.90438 c 0,-1.24431 -0.50468,-3.65806 -1.12152,-5.36389 -1.00656,-2.78361 -0.71193,-3.91836 2.87452,-11.071 13.30487,-26.53455 20.23356,-57.33886 20.24239,-89.995724 0.008,-28.209733 -4.10901,-52.176874 -12.48763,-72.703162 -0.60787,-1.489179 -1.8381,-1.673727 -8.85684,-1.328617 -19.06868,0.9376 -56.38055,15.632036 -84.05273,33.102265 C 351.26243,56.33217 342,63.560624 342,65.399613 c 0,0.753702 1.10917,2.097121 2.46482,2.985377 C 349.50207,71.685527 350.03423,77 345.32747,77 341.59243,77 328.8623 7,70.752334 319.13175,64.143645 304.92568,54.495392 282.30167,44 275.70984,44 c -1.67772,0 -1.86631,0.467841 -1.31009,3.25 1.55959,7.800879 9.91835,16.780909 20.77948,22.323912 2.57358,1.313431 4.9337,2.799791 5.24471,3.303022 0.32822,0.531068 -3.52317,0.88629 -9.17923,0.846621 -6.49499,-0.04555 -11.61761,0.50006 -15.36083,1.636089 -3.08887,0.937438 -10.02668,2.253471 -15.41737,2.924518 -5.39069,0.671047 -9.9679,1.72001 -10.17157,2.33103 -0.49968,1.499034 4.60573,3.499455 13.68862,5.363525 10.84113,2.224912 9.77522,5.15558 -3.11154,8.555045 -3.90054,1.028941 -4.99468,1.023365 -5.86882,-0.02991 -0.59095,-0.712051 -2.65765,-1.591646 -4.59266,-1.954656 -2.96872,-0.556937 -4.64209,-0.01225 -10.71437,3.487536 -23.22909,13.388218 -41.71391,32.053818 -51.95516,52.463268 -4.07067,8.11232 -4.89872,10.90672 -7.85218,26.49848 -1.97456,10.424 -2.09797,13.0405 -1.32063,28 1.30858,25.18308 1.10475,38.56269 -0.6201,40.70388 -0.79645,0.9887 -2.54107,3.96896 -3.87693,6.62279 -2.76542,5.49383 -8.3929 6,10.73915 -15.32117,14.28055 -2.6125,1.33539 -4.75,3.01117 -4.75,3.72395 0,1.60101 11.47982,13.10531 15.81885,15.85259 3.52098,2.22933 3.82489,3.38257 1.64935,6.25889 -0.80751,1.06762 -1.4682,2.49992 -1.4682,3.18288 0,1.552 14.28557,10.24393 24.68104,15.01696 27.88082,12.80133 51.85507,19.12192 90.81896,23.94355 l 5,0.61873 -4.6768,2.38034 c -2.57224,1.30919 -6.82057,4.86346 -9.44073,7.89838 -2.62015,3.03491 -5.3378,5.51803 -6.03921,5.51803 -0.70141,0 -5.22809,3.29772 -10.05928,7.32826 C 255.45279,360.35881 244.3,368.98633 235.5,375.50053 215.29562,390.45681 202.34861,403.29704 195.23565,415.43277 191.82589,421.25031 190,425.4997 190,427.61767 c 0,1.78867 -0.49789,4.51893 -1.10642,6.06723 -3.50426,8.91596 -2.86759,28.60125 1.19693,37.00826 4.8765,10.08648 17.78527,19.12291 32.64168,22.8499 16.06347,4.02981 51.34331,5.2798 69.26781,2.45421 z m -64.50555,-216.0034 c -2.18862,-2.4184 -1.43766,-3.56903 1.35416,-2.07489 3.33955,1.78727 5.01444,1.24931 6.75289,-2.16898 0.90907,-1.7875 1. 76391,-3.38079 1.89964,-3.54064 0.13574,-0.15984 1.86295,0.66292 3.83824,1.82837 4.15099,2.44915 6.77354,1.98832 8.65122,-1.52017 0.72096,-1.34712 1.69301,-2.2131 2.16011,-1.92441 1.72663,1.06711 0.76888,4.32494 -1.88521,6.41265 -2.21532,1.74257 -3.53424,2.03103 -6.94672,1.5193 -3.44588,-0.51675 -4.58577,-0.25811 -6.2655,1.42162 -2.61702,2.61702 -7.21261,2.63969 -9.55883,0.0471 z m -2.17908,-20.96301 C 223.21404,258.14782 221,255.15149 221,253.19074 c 0,-0.51741 1.35,-1.21074 3,-1.54074 2.38284,-0.47657 3,-1.11944 3,-3.125 0,-2.09394 0.47417,-2.525 2.77749,-2.525 6.3774,0 9.86114,7.3021 5.40689,11.33314 -2.29527,2.07719 -7.02845,2.89142 -9.86901,1.69772 z M 194.6861,256.1315 c -1.54765,-1.02042 -3.98852,-3.60496 -5.42415,-5.74341 -1.43564,-2.13845 -2.9812,-4.13922 -3.43457,-4.44616 -0.45338,-0.30694 -1.29168,-3.08625 -1.8629,-6.17624 -1.27889,-6.91817 0.40248,-15.3034 4.45525,-22.21893 3.31741,-5.66074 7.7267,-8.53928 13.08027,-8.53928 5.31571,0 9.75847,2.87106 12.9988,8.40025 2.388 64,4.07591 2.67393,5.62019 2.82888,15.31267 0.15202,9.50979 -0.10532,11.34345 -2.18461,15.56621 -4.28713,8.7066 -13.68443,12.3103 -20.45697,7.84489 z m 4.85935,-10.58605 c 1.35,-1.35 2.45455,-3.17958 2.45455,-4.06574 0,-2.14058 -1.95891,-5.783 -3.64598,-6.7794 -2.08184,-1.22955 -1.61436,-5.8482 1.14179,-11.28083 3.94387,-7.77372 3.03509,-9.2599 -3.30038,-5.39725 -8.63184,5.26271 -11.28338,25.19984 -3.83135,28.80818 3.28959,1.59285 4.52454,1.37188 7.18137,-1.28496 z m 114.9656,-2.08544 c -5.02287,-1.91494 -10.92911,-7.62644 -13.6071,-13.15842 -1.14224,-2.35956 -2.40774,-7.72494 -2.83751,-12.03032 -0.64138,-6.42517 -0.45561,-8.64441 1.07247,-12.81204 2.23655,-6.09988 7.64662,-11.60388 14.28602,-14.53405 5.86252,-2.58732 14.19783,-2.1786 20.43206,1.00186 10.94072,5.58154 18.1421,22.35296 13.67721,31.85312 -5.3806,11.44857 -6.35516,12.8252 -11.71694,16.55089 -4.524,3.14355 -6.57254,3.90451 -11.41534,4.24039 -3.78848,0.26276 -7.33034,-0.13524 -9.89087,-1.11143 z m 0.83163,-11.57028 c 6.4 3237,-2.93079 5.05767,-12.24575 -2.21772,-15.02728 -2.16376,-0.82725 -2.33225,-1.35337 -1.894,-5.91431 0.35111,-3.65404 1.33027,-6.06304 3.62504,-8.91858 3.76643,-4.68682 3.8204,-5.02956 0.79188,-5.02956 -3.13216,0 -8.57593,3.7695 -11.31626,7.83588 -8.98583,13.33407 -1.14715,32.5935 11.01106,27.05385 z M 363,112 c -1.1,-1.1 -2,-2.60443 -2,-3.34317 0,-1.75785 8.68789,-14.17612 16.59326,-23.718034 8.88921,-10.729418 29.44882,-30.33045 40.50398,-38.615503 13.69485,-10.263314 17.82038,-12.079813 19.72114,-8.68335 0.73486,1.313134 -0.40109,2.633886 -5.70031,6.627609 C 407.5915,62.751853 378.34085,93.541553 370.94373,108.66064 369.22268,112.17832 367.33748,114 365.41821,114 365.1882,114 364.1,113.1 363,112 Z m 38.18551,371.21449 c 0.75704,-0.75704 0.41281,-5.03449 -1.18285,-14.6984 -1.59561,-9.66357 -2.01308,-14.85088 -1.43439,-17.82336 1.22279,-6.28103 0.97315,-19.55131 -0.39352,-20.91798 C 397.52864,429.12864 397,427.565 397,426.3 c 0,-2.98425 -1.08554,-2.90567 -4.07569,0.29501 -1.33337 ,1.42726 -3.62242,3.21845 -5.08677,3.98041 -1.46435,0.76197 -6.18935,4.01063 -10.5,7.21924 -4.31065,3.20861 -9.97424,7.15493 -12.58575,8.76959 -5.53589,3.42276 -6.21132,6.49732 -2.44046,11.10902 1.27123,1.5547 3.60448,5.07673 5.18499,7.82673 4.48328,7.80061 12.00968,15.15957 17.87568,17.47799 5.40492,2.13618 13.78844,2.26157 15.81351,0.2365 z M 168.57778,469.66888 c 5.75362,-1.1356 5.9144,-1.25429 5.64745,-4.16888 -1.71632,-18.73951 0.27324,-33.01644 6.51033,-46.71774 l 3.51327,-7.71773 -7.68576,-8.78227 c -4.22716,-4.83024 -10.86432,-13.50283 -14.74925,-19.27241 -8.29939,-12.3256 -19.72238,-35.32838 -20.42067,-41.12164 -0.26899,-2.23165 -1.40072,-6.3704 -2.51496,-9.19724 C 134.11812,320.61456 128.46392,298.24364 121.89585,265.5 113.33788,222.83619 108.08673,206 103.338,206 c -0.83803,0 -2.22604,1.87383 -3.14813,4.25 -5.071758,13.06965 -12.545947,26.40189 -33.196652,59.21522 -16.44263,26.12683 -30.282393,53.63983 -28.463039,56.58361 0.339417,0.54919 -0.293079,3.80037 -1.405548,7.224 85 C 33.95614,343.02714 33,350.31813 33,364.72582 c 0,15.99988 1.654947,25.04835 7.061101,38.60677 14.380138,36.06483 47.499759,61.50329 87.438899,67.15992 11.03102,1.56234 31.01973,1.16156 41.07778,-0.82363 z M 168.00252,178.25 c 0.008,-17.47613 12.87248,-44.63233 29.37654,-62.01061 l 6.89536,-7.26061 -2.13434,-6.50165 C 199.38522,94.085246 192.21467,81.422411 182.0769,67.046534 177.63461,60.747127 174,54.770504 174,53.765149 c 0,-2.678736 2.76321,-3.289278 5.14328,-1.13643 5.78661,5.234163 22.4075,29.59544 28.70939,42.079428 1.70642,3.380387 3.52065,6.404543 4.03163,6.720353 0.51099,0.3158 3.33356,-1.35627 6.27238,-3.715721 2.93883,-2.359449 7.71864,-5.790193 10.62182,-7.623876 4.4574,-2.81535 5.16539,-3.664907 4.55142,-5.461435 -1.35815,-3.974006 -0.55047,-7.041211 2.59397,-9.850773 C 237.63311,73.249513 240.1229,72 241.45676,72 248.91909,72 241.84801,66.738327 220.14372,56.140709 199.96728,46.289103 166.85527,35.631076 164.44396,38.212185 162.68027,40.100074 157.56257,54.085239 154.64128,65 c -3.93858,14.715639 -5.70509,25.315127 -6.66415,39.98642 -1.71288,26.20308 2.05019,47.05027 12.59285,69.76358 5.20414,11.2119 7.4287,12.25945 7.43254,3.5 z" + id="path3" /> + <path + style="fill:#090906" + d="m 250,507.42621 c -35.76358,-4.10352 -48.24268,-8.61734 -60.90276,-22.02913 -3.84036,-4.06839 -7.5708,-7.39655 -8.28986,-7.3959 -0.71906,6.5e-4 -4.68238,0.67409 -8.80738,1.49654 -12.19321,2.43109 -35.71694,2.98147 -47.83071,1.11908 C 105.73508,477.78269 84.182594,469.30095 70.370626,459.44493 50.493331,445.26079 35.354776,424.58198 27.218192,400.5 13.846647,360.92403 22.115912,323.44203 56.007918,270.00514 59.672468,264.22731 66.66192,253.2 71.540031,245.5 c 10.194461,-16.09175 17.125681,-29.28687 21.674741,-41.26269 3.391817,-8.92927 5.42057,-11.03802 8.852348,-9.20139 6.83808,3.65963 13.69779,23.80537 21.45074,62.99699 9.94324,50.26368 14.41074,65.29801 26.13969,87.96709 10.49645,20.28698 33.75237,53.40838 38.88249,55.37699 3.32805,1.27709 4.75648,0.4051 14.60123,-8.91338 5.54122,-5.24501 18.77912,-16.05416 29.41755,-24.02033 29.14273,-21.82238 35.68113,-28.84581 29.19118,-31.35663 -1.2375,-0.47877 -8.52684,-2.07436 -16.19853,-3.54576 -23.70291,-4.54613 -52.44736,-15.1 971 -70.84756,-26.25186 C 162.99337,300.25339 161,298.14094 161,292.76649 c 0,-4.16298 -0.4508,-4.89224 -7.45048,-12.05269 -13.07237,-13.37263 -13.5361,-17.01559 -2.69337,-21.15883 8.33834,-3.18626 14.22688,-8.02932 17.18011,-14.12987 2.08322,-4.30335 2.18703,-5.58104 1.78207,-21.93248 l -0.43002,-17.36293 -5.57165,-8.31485 c -9.1697,-13.68439 -17.08058,-31.6835 -21.24967,-48.34799 C 140.39395,140.7809 138,122.73798 138,115.04607 138,98.810385 142.45601,73.633588 148.55694,55.398587 155.70556,34.032133 159.45842,28 165.6028,28 c 3.63221,0 27.0928,6.308803 37.72204,10.143858 15.92825,5.746953 39.27364,17.370971 52.67516,26.227752 11.9661,7.908143 16.07142,9.231984 17.91964,5.778548 0.73396,-1.371417 0.47842,-2.729225 -0.98805,-5.25 -9.94742,-17.098996 -11.52803,-26.989009 -4.8641,-30.43506 2.81617,-1.456296 3.63836,-1.415913 11.23552,0.551835 15.14464,3.922634 29.38108,10.415956 42.65817,19.456632 C 326.42503,57.513104 330.7941,60 331.67022,60 c 0.87612,0 5.92124,-3.110732 11.21137,- 6.912739 C 372.40418,31.869418 404.30719,16.779235 436.00848,9.038064 461.97275,2.6978224 462.84218,3.0363689 469.29643,22 c 5.77721,16.974346 8.41177,30.699179 9.93122,51.736916 C 481.74453,108.58463 475.60829,143.71568 461.54032,175 l -4.72165,10.5 0.42979,9.56909 c 0.36711,8.1735 0.84968,10.34056 3.30881,14.8588 4.73791,8.7051 10.8862,12.96634 23.1954,16.07622 2.61975,0.66186 4.87229,2.02007 5.86635,3.5372 1.52336,2.32493 1.46528,2.76609 -1.03753,7.88166 -4.13335,8.44826 -16.44061,24.21909 -26.32504,33.73356 -10.86887,10.46208 -22.24789,19.0282 -36.13828,27.20489 -5.71001,3.36125 -10.94927,7.01748 -11.6428,8.12497 -3.49253,5.57719 3.97452,33.35014 14.08198,52.3765 2.44346,4.59958 4.44265,9.14234 4.44265,10.09501 0,2.35985 -2.71113,4.5428 -7.5,6.03884 -2.2,0.68728 -5.02678,2.18603 -6.28173,3.33055 -2.17759,1.98598 -2.25107,2.52595 -1.61013,11.83205 0.8234,11.95513 -0.13327,14.87184 -5.70147,17.38274 -2.45333,1.1063 -4.16844,2.6527 -4.52712,4.0818 -1.26006,5.02048 0.31596,53.73408 2.02855,62.7006 1.60468,8.4016 1.59934,8.99929 -0.11133,12.47217 -0.98822,2.00622 -3.31676,4.5227 -5.17453,5.59218 -6.11297,3.51911 -18.66284,2.00897 -29.02277,-3.49234 -4.30759,-2.2874 -6.63414,-1.19045 -7.52289,3.54698 -2.02597,10.79938 -16.18389,15.38785 -32.22124,10.44265 -3.77044,-1.16263 -8.97788,-3.18763 -11.5721,-4.5 -5.91085,-2.99019 -6.92639,-2.97799 -10.61713,0.12756 -7.00456,5.89395 -18.6142,8.32496 -42.50632,8.90065 -9.43789,0.22741 -18.73479,0.23276 -20.65979,0.0119 z m 28.5,-8.44733 c 19.29971,-1.38347 30.5,-4.47096 30.5,-8.4077 C 309,488.14256 300.05358,483 295.82856,483 293.72285,483 292,482.62188 292,482.15972 c 0,-0.46215 1.42237,-3.68668 3.16082,-7.16563 4.31649,-8.63807 4.90951,-17.53487 1.89999,-28.50468 -3.79715,-13.84074 -8.7688,-20.71774 -19.54191,-27.0312 -6.07369,-3.55942 -16.94236,-4.52413 -23.97463,-2.12799 -4.05317,1.38105 -4.71235,1.39534 -5.2045,0.11282 -2.46745,-6.43007 16.79795,-9.98248 29.1248,-5.37041 16.42753,6.14633 26.91759,22.81166 28.17664,44 .76362 0.72892,12.7091 2.77951,17.43909 11.35879,26.20081 9.23182,9.42814 19.36753,13.91475 31.5,13.94358 5.25563,0.0125 11.04381,-2.62825 12.165,-5.55003 0.32881,-0.85687 -1.32584,-8.16679 -3.67701,-16.24428 -13.03992,-44.79886 -14.07097,-49.1501 -14.14293,-59.68633 -0.0658,-9.63571 1.38153,-18.5 3.02063,-18.5 0.43374,0 1.3448,4.25124 2.0246,9.44719 1.2969,9.91278 5.17838,28.11601 6.99456,32.80281 0.58611,1.5125 1.79074,2.75 2.67697,2.75 2.2563,0 15.15078,-9.08522 22.6543,-15.96181 3.45613,-3.16737 9.12219,-9.59194 12.59124,-14.27681 6.26681,-8.46319 6.33982,-8.52106 11.35659,-9.00311 2.77708,-0.26684 5.47891,-1.10912 6.00408,-1.87172 0.76518,-1.11113 0.3739,-24.79891 -0.48289,-29.23409 -0.10183,-0.52711 2.85181,-1.474 6.56364,-2.1042 9.78359,-1.66107 10.00567,-2.15806 5.06413,-11.3326 -6.10998,-11.34385 -9.73602,-21.22968 -12.73342,-34.71566 -1.46691,-6.6 -3.04686,-13.20717 -3.511,-14.6826 -0.8106,-2.57679 -0.36518,-2.99847 11.29382,-10.69201 16.61565,-10.96433 31.58376,-23.16187 42.23916,-34.42077 10.02304,-10.59074 21.62977,-26.26536 21.17965,-28.60264 -0.16925,-0.87886 -3.33741,-2.65728 -7.41534,-4.16255 -3.91591,-1.44546 -8.44627,-3.57262 -10.06748,-4.72702 -6.27962,-4.47148 -11.53607,-15.32092 -12.86198,-26.54741 -0.33551,-2.84075 -1.06288,-6.64885 -1.61637,-8.46244 -0.90057,-2.95079 -0.42914,-4.5802 4.48461,-15.5 9.30877,-20.68683 15.07524,-41.99851 17.76535,-65.65711 C 471.73937,95.363153 470.75995,67.753611 468.01079,52 465.60323,38.203833 458.82846,15.932446 456.43512,13.946151 c -1.24707,-1.034969 -3.42284,-0.87186 -11.79034,0.883874 -32.69045,6.859366 -68.61778,23.148988 -95.83672,43.452828 -7.57085,5.647437 -8.17189,7.307614 -4.30806,11.899516 2.7478,3.265574 3.04115,4.365151 1.43016,5.360796 -1.5981,0.987678 -18.62105,-7.58084 -27.70098,-13.943312 -14.04296,-9.840164 -40.02287,-21.044209 -44.66587,-19.262521 -2.16271,0.829908 -1.94436,3.302386 0.81493,9.228064 3.08831,6.632278 7.83864,11.942297 14.62176,16.344521 l 5.5,3.569483 -6,0.634296 c -3. 3,0.348863 -7.33951,1.168646 -8.9767,1.82174 -4.5746,1.824867 -15.13957,3.831436 -24.32096,4.619194 -6.87909,0.590224 -8.24443,0.988318 -7.98631,2.328597 0.39201,2.03554 10.30823,6.036223 16.89523,6.816357 6.33221,0.749955 5.8518,2.272915 -1.41484,4.4852 -4.70328,1.431888 -6.53494,1.53374 -10.9454,0.608635 l -5.29687,-1.111029 -9.69582,5.908805 c -35.61804,21.706255 -55.26945,50.208375 -59.95841,86.962805 -0.90073,7.06042 -0.86183,13.25025 0.1767,28.1115 1.60065,22.9051 1.14358,28.61675 -2.95652,36.94523 -3.18608,6.47186 -6.65811,9.84368 -15.2701,14.8294 -2.6125,1.51245 -4.75,3.22331 -4.75,3.8019 0,2.64929 10.3377,12.74243 18.88546,18.43868 0.212,0.14128 -0.3505,1.38008 -1.25,2.7529 -2.5794,3.93666 -2.00791,5.26668 3.88189,9.03434 14.80733,9.47213 39.45395,19.94791 58.98265,25.06995 14.09069,3.69574 39.75173,8.4621 45.55807,8.4621 1.98473,0 3.84782,0.23922 4.14021,0.53161 0.79956,0.79957 -12.44297,13.83363 -23.19828,22.83307 -5.225,4.37199 -17.15,13.6771 -26.5,20.67802 -24.24293,18. 15217 -34.06324,28.54998 -42.4603,44.9573 -8.6407,16.88338 -9.84892,38.07321 -2.91289,51.08654 7.95966,14.93385 23.81136,22.90945 51.37319,25.84782 20.74095,2.2112 21.45187,2.23074 38,1.04452 z m -50.63922,-218.8928 c -1.29843,-1.05266 -2.03415,-2.24178 -1.63495,-2.6425 0.39921,-0.40072 1.38694,-0.17991 2.19496,0.49068 3.12456,2.59316 6.89157,0.30466 8.8847,-5.39756 0.18519,-0.52982 1.6029,0.0327 3.15047,1.25 3.806,2.9938 6.93881,2.81514 9.37913,-0.53487 2.36108,-3.24125 3.99282,-2.36432 2.34208,1.25867 -1.65279,3.62748 -5.22922,5.01561 -9.28221,3.60273 -2.93554,-1.02334 -3.52257,-0.88612 -5.88267,1.375 -3.13562,3.00411 -5.95615,3.18837 -9.15151,0.59785 z m -2.46556,-21.51589 c -3.58936,-1.56246 -5.17991,-5.40534 -2.5676,-6.20351 3.24127,-0.99034 4.67251,-2.10797 4.68513,-3.65851 0.0198,-2.43297 1.08081,-2.95635 4.47979,-2.20981 6.30199,1.38415 6.64108,9.5033 0.50399,12.06754 -4.02686,1.68253 -3.24708,1.68206 -7.10131,0.004 z m -30.37142,-2.75568 c -4.77562,-3.24506 -7.69546,-7.9159 3 -9.06136,-14.49546 -1.4979,-7.21533 -0.58257,-13.33552 3.15243,-21.07807 C 192.44993,213.32748 195.56931,211 201.5,211 c 5.33169,0 8.78535,2.26497 11.69739,7.67136 8.79991,16.33762 3.16387,37.54805 -10.37138,39.03121 -3.41287,0.37398 -5.05977,-0.0246 -7.80221,-1.88806 z m 4.66175,-9.98882 c 3.05058,-2.86588 2.94988,-6.91707 -0.26696,-10.74007 -3.06161,-3.63852 -2.71908,-7.29124 1.26103,-13.44744 3.88461,-6.00848 0.23495,-7.50522 -6.11714,-2.50867 -3.31741,2.60948 -5.37445,6.60605 -6.52632,12.67981 -2.23704,11.79588 4.88788,20.36848 11.64939,14.01637 z m 117.30798,-1.7043 c -11.58715,-3.7823 -18.23877,-13.42011 -18.36482,-26.60954 -0.11415,-11.94476 6.47959,-22.41231 16.12275,-25.59484 4.77346,-1.57538 14.05989,-0.72724 18.80116,1.71713 4.78134,2.46503 11.06809,10.39982 12.57057,15.86586 1.45568,5.29581 0.61744,16.14639 -1.58431,20.50797 -2.42203,4.79797 -7.29294,9.78291 -11.85727,12.13487 -4.33294,2.23273 -11.96186,3.19488 -15.68808,1.97855 z m 0.55192,-13.57594 c 1.35,-1.35 2.454 55,-3.39734 2.45455,-4.54966 0,-3.5145 -2.73938,-7.6452 -5.95284,-8.97626 -2.48723,-1.03024 -3.04312,-1.83708 -3.0252,-4.39085 0.0258,-3.66999 2.94882,-10.53926 5.31956,-12.50112 1.83962,-1.52235 2.23497,-4.12756 0.62636,-4.12756 -2.45842,0 -7.71343,3.01974 -10.67535,6.13448 -7.71814,8.11638 -8.31299,22.30473 -1.18655,28.30124 4.03899,3.39859 9.10592,3.44329 12.43947,0.10973 z m 46.5692,-119.45343 c -0.87401,-0.55352 -1.1592,-1.74745 -0.77265,-3.23469 0.91314,-3.51331 15.54154,-22.706331 24.3985,-32.011773 16.50994,-17.345951 42.43438,-38.264053 46.6448,-37.637113 3.25509,0.484689 2.78273,2.139928 -1.46985,5.150598 -20.04308,14.189784 -46.34549,41.031147 -59.92025,61.148068 -5.00316,7.41437 -6.18596,8.29142 -8.88055,6.58491 z m 35.43153,374.45313 c 1.91506,-0.80016 3.71973,-2.07452 4.01036,-2.8319 0.29063,-0.75738 -0.39069,-6.4814 -1.51406,-12.72004 C 400.82184,463.21432 400,454.3552 400,447.97599 c 0,-5.87083 -0.29103,-14.11713 -0.64674,-18.32511 -0.72984,-8.63405 -2.08961,-9.70284 -6.42895,-5.05321 -3.80928,4.08168 -18.7037,15.67475 -26.67431,20.76195 -3.9875,2.545 -7.2456,5.19272 -7.24023,5.88382 0.0172,2.21647 4.90363,11.85733 9.55924,18.86036 4.99072,7.50712 9.99604,11.97376 15.98723,14.26667 7.58734,2.90378 10.33609,3.11918 14.98994,1.17468 z M 165.5,471.89491 c 11.57734,-1.5538 11.83069,-1.77126 10.44248,-8.96332 -2.81048,-14.56068 -0.0364,-29.35253 9.65132,-51.46155 0.24822,-0.56648 -1.19861,-2.81648 -3.21517,-5 C 162.34636,384.77923 148.54026,360.55617 137.59152,327.89027 130.99554,308.21094 128.6255,298.56253 121.40618,262 c -5.88527,-29.80618 -9.21639,-42.71855 -12.89144,-49.97092 -4.01623,-7.92563 -6.00715,-8.4012 -8.49452,-2.02908 -4.118588,10.55094 -15.157507,30.50111 -29.879527,54 -18.742524,29.91631 -27.361818,46.37663 -32.702269,62.45173 -11.672311,35.1344 -7.555365,69.14772 11.867686,98.04827 5.984883,8.90521 19.949201,22.75622 29.238234,29.00098 15.119831,10.16464 30.777316,16.18428 47.955656,18.4369 4.4,0.57698 9.35,1.22882 11,1.44854 3.883 27,0.5171 19.05598,-0.29112 28,-1.49151 z m 3.68153,-293.6547 c 2.42008,-21.64845 14.37128,-45.90907 30.93321,-62.79358 l 5.93772,-6.05338 -4.13087,-8.94662 C 196.33022,88.336849 191.18235,79.593468 181.85318,66.361458 173.9844,55.200787 172.40863,51.546881 175.74106,52.18865 c 3.52394,0.678649 21.21957,25.712876 30.79166,43.56135 4.59091,8.56039 5.72855,8.87477 12.3285,3.406915 2.55133,-2.113696 7.27367,-5.51342 10.49408,-7.554941 l 5.85531,-3.711857 -0.66452,-4.431303 c -0.57563,-3.838583 -0.34366,-4.752153 1.73424,-6.830051 1.33557,-1.335577 4.24274,-2.710289 6.55921,-3.101653 6.64065,-1.121931 5.58355,-3.538186 -4.08954,-9.347651 C 227.6945,57.539745 217.68706,52.600529 204.76846,47.407712 191.86336,42.22032 168.63923,35.662341 166.0661,36.479021 162.50047,37.610709 155.52384,57.684294 150.7665,80.5 c -2.86175,13.724656 -3.12901,16.615435 -3.14343,34 -0.0132,15.89679 0.34552,20.67144 2.1962,29.23367 2.57424,11.90986 6.02293,21.9402 10.92206,31.76633 5.8495,11.73225 7.37945,12.22 897 8.4402,2.74021 z" + id="path2" /> + </g> + <path + style="fill:#ffffff;stroke-width:0.441645" + d="m 133.15604,337.71839 c -4.95494,-2.24683 -9.93486,-5.03544 -16.43145,-9.2011 -6.39955,-4.10344 -6.52366,-4.14138 -8.59836,-2.62849 -0.92935,0.67769 -3.70031,3.11626 -6.1577,5.41905 -2.457383,2.30278 -5.397212,4.94832 -6.53296,5.87898 l -2.064988,1.6921 -1.572787,-1.50386 c -2.294409,-2.19387 -6.695686,-7.92457 -9.985615,-13.00181 -1.756946,-2.71143 -3.328971,-4.64001 -4.049936,-4.9685 -1.994417,-0.90872 -5.695554,-0.60844 -14.970532,1.21458 -12.289107,2.41546 -18.769383,3.54826 -20.298065,3.54826 -1.190319,0 -1.271647,-0.0987 -1.001064,-1.21452 1.006694,-4.15149 10.517628,-23.97775 16.154587,-33.67545 1.764909,-3.03631 8.424139,-13.86766 14.798288,-24.06967 14.572641,-23.32392 18.848654,-30.77638 25.670408,-44.73973 3.110154,-6.36611 5.650994,-11.05626 5.904704,-10.89946 0.70038,0.43286 2.61081,4.44185 4.45131,9.34099 2.25816,6.01087 4.86478,16.89096 9.45197,39.4527 7.97064,39.20299 10.19957,48.28214 17.61885,71.76735 1.38127,4.37229 2.61517,8.29741 2.742,8.7225 0.34479,1 .15558 -0.48349,0.97245 -5.12866,-1.13392 z" + id="path13" /> + <path + style="fill:#ffffff;stroke-width:0.0552057" + d="m 198.38152,414.8243 c 0,-0.0828 1.0824,-2.12977 1.43792,-2.7193 1.41002,-2.33817 3.49947,-5.00698 6.47798,-8.27419 1.16506,-1.27799 5.43557,-5.54645 7.12849,-7.12509 8.44371,-7.87369 18.1663,-15.85544 30.05863,-24.67662 10.04644,-7.45199 18.27028,-13.26874 18.473,-13.06603 0.0913,0.0913 -0.55424,1.00768 -1.33059,1.88869 -0.67733,0.76865 -3.73611,3.81098 -5.16363,5.13587 -7.2197,6.70064 -16.2415,14.25921 -24.51046,20.53516 -5.41036,4.10635 -11.02613,8.70215 -16.42186,13.43924 -3.8037,3.33939 -5.44068,4.86989 -9.33249,8.72543 -3.15788,3.12844 -4.51524,4.43579 -5.49205,5.2897 -0.7606,0.66489 -1.32494,1.02572 -1.32494,0.84714 z" + id="path14" /> + <path + style="fill:#ffffff;stroke-width:0.0390363" + d="m 251.53723,423.58008 c -0.43181,-0.085 -0.93227,-0.44963 -1.09645,-0.7989 -0.2668,-0.5676 -0.15408,-1.08361 0.34538,-1.58104 0.22399,-0.22308 0.35695,-0.30744 1.05648,-0.67027 0.8397,-0.43553 1.29066,-0.62931 2.08007,-0.89382 0.68667,-0.23008 1.78742,-0.52544 2.29947,-0.61701 1.87271,-0.33491 4.72408,-0.47574 8.028,-0.39651 3.63891,0.0873 5.2115,0.29682 7.24724,0.96578 0.53097,0.17449 1.44647,0.52891 1.49718,0.57962 0.0138,0.0138 -0.009,0.0502 -0.0511,0.0808 -0.36173,0.26451 -1.94565,0.275 -4.76417,0.0315 -0.95654,-0.0826 -3.43561,-0.11585 -4.35255,-0.0583 -1.89121,0.11859 -3.58245,0.42731 -5.01616,0.91566 -0.85485,0.29117 -4.02674,1.49364 -5.51395,2.09034 -0.96151,0.38578 -1.27231,0.44798 -1.75944,0.35212 z" + id="path15" /> + <path + style="fill:#ffffff;stroke-width:0.220823" + d="m 308.96179,466.21175 c -0.0751,-0.94125 -0.28678,-5.08996 -0.47049,-9.21934 -0.1837,-4.12938 -0.36609,-8.02026 -0.40531,-8.6464 l -0.0713,-1.13843 4.76412,-2.33427 c 5.42906,-2.66007 8.64302,-3.93746 13.37819,-5.31719 5.27072,-1.53576 8.76141,-2.15981 12.25367,-2.19062 3.57848,-0.0316 4.30211,0.20227 5.15226,1.665 1.21646,2.09296 3.78875,10.83209 3.64048,12.36817 -0.0673,0.6975 -0.14351,0.7526 -1.83682,1.32859 -0.97162,0.3305 -4.10178,1.24321 -6.95592,2.02824 -10.8587,2.9867 -18.2548,6.17349 -24.4009,10.51369 -2.4805,1.75166 -4.04437,2.65394 -4.59996,2.65394 -0.2296,0 -0.34741,-0.45001 -0.44801,-1.71138 z" + id="path16" /> + <path + style="fill:#ffffff;stroke-width:0.220823" + d="m 363.30341,455.24448 c -0.17192,-0.17192 -0.43864,-1.04953 -0.59271,-1.95025 -0.24097,-1.40873 -0.23351,-1.72783 0.0534,-2.28261 0.46963,-0.90816 0.62952,-1.0287 5.67847,-4.28092 5.16304,-3.32572 9.74542,-6.56364 13.57062,-9.58904 4.9056,-3.87989 8.23135,-5.5026 12.27242,-5.988 1.0033,-0.12051 1.30979,-0.0743 1.71696,0.25914 0.71127,0.58237 0.92241,2.90291 0.92444,10.15969 l 0.002,5.99987 -0.60727,0.12439 c -0.33399,0.0684 -2.74372,0.47852 -5.35494,0.91135 -6.57433,1.08973 -10.9442,2.20153 -18.68951,4.75503 -6.78135,2.23569 -8.30066,2.55423 -8.97353,1.88135 z" + id="path17" /> + <path + style="fill:#ffffff;stroke-width:0.220823" + d="m 357.65698,438.2165 c -0.6625,-0.84224 -1.69019,-3.8805 -2.78447,-8.23199 -1.62034,-6.44345 -2.7008,-12.59405 -4.75947,-27.09364 -1.44839,-10.20125 -2.03117,-12.96852 -2.65053,-12.58573 -0.095,0.0587 -0.22578,-0.0317 -0.2907,-0.20088 -0.0649,-0.16917 -1.04579,-0.9958 -2.17972,-1.83696 -6.31242,-4.68262 -17.26193,-16.3997 -21.41504,-22.91628 -5.19335,-8.1488 -8.06888,-16.25312 -9.12789,-25.72583 -0.37223,-3.3296 -1.01991,-6.73592 -1.42451,-7.49193 -0.39711,-0.742 -1.64843,-0.9091 -8.51026,-1.13644 -8.83295,-0.29264 -16.91809,-0.76691 -22.30308,-1.30828 -24.38204,-2.45122 -51.31068,-8.5636 -69.33831,-15.73872 -7.57815,-3.01616 -17.17461,-7.40879 -25.3946,-11.624 -6.62687,-3.39825 -9.07646,-4.83042 -12.50915,-7.31352 l -2.82827,-2.04589 0.67981,-0.9059 c 1.86675,-2.48758 2.67837,-3.8989 2.78471,-4.84232 0.10039,-0.89069 0.0366,-1.05548 -0.74243,-1.91777 -0.46874,-0.51884 -1.85092,-1.61338 -3.0715,-2.4323 -3.05251,-2.04801 -5.9967,-4.55018 -10.08798,-8.57345 -3.53355,-3.47481 -4.74202,-4.90535 -4.48929,-5.31427 0.23763,-0.3845 2.52403,-2.07495 5.34522,-3.95199 7.92219,-5.27095 11.90616,-9.70293 14.975,-16.659 0.86232,-1.95462 1.31363,-2.26189 2.9686,-2.02112 1.32458,0.1927 3.14559,0.87349 3.8785,1.45 0.32089,0.25241 1.45634,1.61469 2.52322,3.0273 3.17584,4.20497 5.76979,6.74283 8.11445,7.93899 1.62416,0.82858 5.36902,1.42707 8.28007,1.32327 2.42847,-0.0866 2.66888,-0.13782 4.19783,-0.89476 3.53967,-1.75238 7.51227,-6.01717 9.761,-10.47893 1.36901,-2.71627 2.33852,-7.63445 2.90815,-14.7526 0.19439,-2.42904 0.37617,-4.50382 0.40396,-4.61062 0.0548,-0.21061 7.46465,9.89738 8.94932,12.20804 1.32724,2.06564 1.29484,2.13565 -1.06587,2.30322 -2.32763,0.16522 -3.55217,0.60092 -4.3484,1.54719 -0.55042,0.65413 -0.57318,0.77802 -0.44599,2.42738 l 0.13403,1.73807 -0.60209,-0.17088 c -1.58794,-0.45067 -2.96905,0.27775 -3.80645,2.00759 -1.02054,2.10816 -0.22738,5.03495 2.03543,7.51083 1.37709,1.50676 2.51573,2.1912 4.37384,2.62913 4.77318,1.12498 9.85562,-0.82728 12. 37507,-4.7535 1.01338,-1.57922 1.82473,-4.05458 1.65086,-5.03667 -0.0775,-0.43804 -0.69293,-1.96366 -1.36752,-3.39027 -0.67458,-1.4266 -1.17474,-2.72877 -1.11144,-2.89371 0.083,-0.21633 0.78187,-0.3329 2.5082,-0.41837 2.86602,-0.14191 6.57575,-0.94007 10.67397,-2.29654 6.58109,-2.17828 9.72995,-4.10826 26.05707,-15.97071 11.71874,-8.51424 15.05176,-10.75164 17.2624,-11.58797 0.56757,-0.21472 1.12998,-0.32981 1.2498,-0.25575 0.23047,0.14243 0.39028,1.05113 1.14567,6.51431 0.9136,6.6074 2.74625,11.11015 6.33035,15.55337 3.57212,4.42838 7.35967,7.15251 12.16739,8.7512 2.75111,0.91482 5.07331,1.19345 8.74198,1.04891 3.82852,-0.15084 6.21487,-0.75089 9.766,-2.45567 7.09998,-3.40848 11.50706,-8.26424 14.79197,-16.29792 0.77198,-1.88798 1.43642,-3.16153 1.89778,-3.63753 1.75724,-1.81302 5.0743,-2.25734 22.15244,-2.96733 13.1378,-0.54618 24.20452,0.13901 43.50206,2.6934 35.77801,4.7359 53.77496,7.90492 58.50541,10.30203 1.76273,0.89324 2.77286,1.63781 2.77286,2.04388 0,0.95031 -4.55164,7.34 977 -9.56195,13.44378 -12.37591,15.05277 -24.01112,26.05585 -39.46067,37.31681 -3.3353,2.43107 -11.73478,8.15954 -17.37081,11.84698 -4.94435,3.23488 -10.06887,6.90299 -11.52193,8.2473 -1.04595,0.96766 -1.15134,1.14389 -0.93072,1.5561 0.36888,0.68927 1.10906,1.09577 2.4544,1.34793 2.35584,0.44157 2.81145,1.25621 4.07559,7.28736 3.37136,16.08474 6.58831,25.64794 13.05554,38.81112 3.18629,6.48523 3.78903,8.12845 3.33162,9.08279 -0.46916,0.9789 -1.29643,1.19423 -5.31416,1.38324 -5.98741,0.28166 -7.447,0.67418 -7.8822,2.11966 -0.47678,1.58361 -0.48159,8.40162 -0.0138,19.58026 0.25371,6.06305 0.42074,11.06427 0.37121,11.11381 -0.0495,0.0495 -1.96197,0.33253 -4.24982,0.62886 -4.77975,0.6191 -5.85589,0.91705 -7.07205,1.95805 -0.48214,0.41269 -2.07977,2.52097 -3.55029,4.68505 -1.47053,2.16409 -3.53566,5.00933 -4.58921,6.32275 -5.2953,6.60149 -13.17219,14.23419 -19.69686,19.08622 -4.2226,3.14011 -9.6303,6.4598 -10.52286,6.4598 -0.17683,0 -0.51904,-0.25112 -0.76046,-0.55804 z M 196.35428,298.4 5544 c 2.07585,-0.9665 4.44665,-3.62125 5.72234,-6.40774 1.13126,-2.47099 0.63867,-5.53746 -1.57939,-9.83203 -2.92672,-5.66667 -8.64846,-10.1693 -13.02338,-10.24853 -1.08439,-0.0196 -1.59872,0.10845 -2.78992,0.69484 -1.97993,0.97465 -4.15127,3.2757 -5.22542,5.53756 -2.07376,4.36675 -0.63921,9.80691 3.9232,14.87767 1.16005,1.28932 3.89678,3.46991 5.62866,4.48486 2.58996,1.51782 5.29576,1.84697 7.34391,0.89337 z m 39.28757,-14.90902 c 0.67558,-0.23745 1.83244,-0.92681 2.57266,-1.53302 1.7276,-1.41484 2.73388,-1.67548 5.25039,-1.35993 3.02979,0.3799 4.58441,0.30196 5.84384,-0.29299 1.52597,-0.72087 4.04857,-2.91018 4.85208,-4.21103 0.60141,-0.97365 0.66794,-1.26112 0.66306,-2.86514 -0.008,-2.75606 -1.14755,-4.78756 -2.86534,-5.10982 -1.09015,-0.20452 -1.92006,0.3593 -3.41011,2.3167 -2.6777,3.51757 -3.79872,3.66436 -7.16044,0.93762 -2.86921,-2.32726 -4.09097,-2.73847 -5.30324,-1.78489 -0.75214,0.59163 -1.18188,1.43619 -1.72135,3.38293 -0.52932,1.91013 -1.11754,2.90342 -1.98503,3.35202 - 0.85527,0.44228 -1.6731,0.25363 -2.87614,-0.66342 -1.43545,-1.09422 -2.26378,-1.45376 -3.34927,-1.45376 -0.82886,0 -1.07568,0.10772 -1.55673,0.67941 -0.31443,0.37368 -0.58613,0.94506 -0.60378,1.26973 -0.1442,2.65164 0.99244,4.79537 3.38418,6.38268 2.05693,1.36512 5.84864,1.80227 8.26522,0.95291 z m 116.42029,-1.10801 c 3.36244,-0.95294 6.41763,-2.85811 9.11858,-5.68621 3.13001,-3.27736 4.61016,-6.509 4.78175,-10.44012 0.0911,-2.08652 0.0418,-2.49549 -0.49218,-4.08522 -2.40318,-7.1544 -8.71997,-12.36585 -15.79767,-13.03332 -2.90315,-0.27379 -6.88777,0.88469 -10.38059,3.01804 -2.30696,1.40904 -5.51391,4.57145 -6.68538,6.59253 -2.58508,4.4599 -2.82376,9.92173 -0.63207,14.46388 1.81255,3.75642 5.26391,7.20109 8.76819,8.7512 2.50178,1.10666 8.155,1.31603 11.31937,0.41922 z" + id="path18" /> + <path + style="fill:#ffffff;stroke-width:0.156145" + d="m 193.55785,245.18695 c -2.01966,-1.19223 -2.55971,-2.08305 -2.83203,-4.67149 -0.19422,-1.84611 -0.18828,-5.42259 0.0123,-7.41321 0.46299,-4.59465 2.00312,-8.64702 4.21978,-11.10306 0.77474,-0.8584 3.73683,-3.12212 3.73683,-2.8558 0,0.0489 -0.49573,1.18454 -1.10162,2.52369 -2.19623,4.85416 -2.94385,8.13865 -2.50137,10.98922 0.27514,1.77252 0.71163,2.57053 2.072,3.78805 3.19207,2.85689 3.02156,5.93413 -0.47579,8.58646 -1.25166,0.94924 -1.7449,0.97384 -3.1301,0.15614 z" + id="path19" /> + <path + style="fill:#ffffff;stroke-width:0.156145" + d="m 309.01129,230.40617 c -2.94492,-1.51506 -4.69371,-3.80769 -5.66683,-7.42907 -0.36378,-1.35378 -0.39963,-1.76146 -0.4052,-4.60808 -0.005,-2.67825 0.0444,-3.35634 0.34882,-4.76243 0.95889,-4.42933 2.70981,-7.95767 5.14301,-10.36389 1.79645,-1.77652 2.85985,-2.34826 3.07964,-1.65578 0.1505,0.47419 -0.0449,1.16062 -0.82137,2.88518 -0.8815,1.9579 -1.35499,3.32108 -1.84402,5.30894 -0.4723,1.91986 -0.65053,4.40656 -0.38546,5.37803 0.25689,0.94146 1.48873,2.12299 3.84774,3.69056 2.23297,1.48381 3.74089,2.93501 4.35591,4.19206 0.37606,0.76865 0.44556,1.10129 0.43913,2.10195 -0.0107,1.66541 -0.46204,2.77949 -1.59403,3.93471 -0.73696,0.75208 -1.04971,0.94836 -1.96913,1.23581 -0.60116,0.18794 -1.69027,0.37591 -2.42025,0.41769 -1.20207,0.0688 -1.40085,0.0381 -2.10796,-0.32568 z" + id="path20" /> + <path + style="fill:#ffffff;stroke-width:0.156145" + d="m 302.04425,162.69543 c -0.48256,-0.0726 -1.38857,-0.31057 -2.01336,-0.52885 -3.92419,-1.37103 -4.42847,-3.14702 -2.26397,-7.97322 2.43995,-5.44035 8.53987,-10.71345 14.81319,-12.8053 2.38125,-0.79403 4.30459,-1.10577 5.52866,-0.8961 1.99067,0.34099 4.92861,2.15963 5.74829,3.55831 1.85443,3.16434 -1.60455,9.91161 -7.0766,13.80396 -2.49744,1.77647 -4.60852,2.78085 -8.00546,3.80872 -3.11702,0.94317 -5.20006,1.26271 -6.73075,1.03248 z" + id="path21" /> + <path + style="fill:#ffffff;stroke-width:0.156145" + d="m 212.11622,177.06203 c -4.74781,-0.65556 -8.7254,-3.26809 -10.50969,-6.90288 -0.88294,-1.79864 -1.18146,-2.90429 -1.30005,-4.81512 -0.27633,-4.4524 2.11998,-7.94 5.65024,-8.22337 2.98569,-0.23967 6.62069,2.37636 9.71154,6.98916 3.27855,4.89292 4.1517,10.20607 1.97244,12.0024 -1.03348,0.85188 -3.34968,1.2501 -5.52448,0.94981 z" + id="path22" /> + <path + style="fill:#ffffff;stroke-width:0.156145" + d="m 189.16987,151.75536 c 0,-0.21616 2.58616,-5.82024 3.40178,-7.37149 6.04695,-11.5009 18.60356,-25.43519 32.19932,-35.73219 6.52937,-4.94512 13.62289,-9.594685 18.19092,-11.923509 3.84151,-1.95844 5.97168,-2.465906 7.53251,-1.794455 1.07645,0.463079 1.26256,0.694193 0.89028,1.105562 -0.1575,0.174036 -1.41441,1.029362 -2.79313,1.900723 -13.07699,8.264759 -22.15781,14.825749 -30.84062,22.282679 -8.87372,7.62088 -15.75616,14.9151 -22.25547,23.58702 -2.8693,3.82847 -6.32559,8.16996 -6.32559,7.94566 z" + id="path23" /> + <path + style="fill:#ffffff;stroke-width:0.156145" + d="m 265.3119,80.761443 c -0.22192,-0.359079 2.31835,-1.094178 9.5036,-2.750134 7.12594,-1.642286 11.44073,-2.430691 12.12736,-2.215931 0.11446,0.0358 0.38992,0.104566 0.61214,0.152813 0.22221,0.04825 0.59375,0.236959 0.82564,0.419361 0.33286,0.261826 0.38369,0.377328 0.24148,0.548681 -0.36939,0.445081 -2.82334,1.019932 -9.58895,2.246257 -7.13602,1.293465 -13.45498,2.02982 -13.72127,1.598953 z" + id="path24" /> + <path + style="fill:#ffffff;stroke-width:0.156145" + d="m 164.66213,177.36467 c -2.23223,-3.1676 -6.81614,-13.91014 -9.18776,-21.53179 -2.98474,-9.59206 -3.84359,-14.64593 -4.59056,-27.01311 -0.27074,-4.48257 -0.2666,-28.04291 0.006,-32.243982 0.36414,-5.618534 0.94579,-9.61417 2.36396,-16.239098 3.35153,-15.656529 9.96167,-36.5022 12.78685,-40.32449 0.59072,-0.799201 0.97264,-0.845246 1.83139,-0.220798 0.78653,0.571936 2.99272,2.907873 3.98776,4.222284 1.46973,1.941478 2.25143,4.025619 1.95414,5.210109 -0.0507,0.202011 -0.43727,0.716018 -0.85903,1.142237 -1.04401,1.055029 -1.24157,1.940372 -0.88895,3.983719 0.43775,2.536603 1.33335,4.288234 4.14575,8.108317 4.38072,5.950332 9.66117,13.945187 14.48991,21.938397 4.01421,6.644903 8.03424,14.211487 8.83071,16.621345 0.39001,1.18004 0.40606,1.31724 0.18299,1.56374 -0.49695,0.54912 -2.17523,0.84722 -6.17301,1.09644 -4.73921,0.29544 -7.99218,0.89637 -9.83043,1.81601 -1.28113,0.64092 -1.58433,1.05711 -1.68307,2.31022 -0.0908,1.15271 0.45765,6.19982 1.01115,9.30466 0.6072,3.40609 0.620 62,4.00615 0.11203,5.00981 -0.55354,1.09234 -1.27629,2.05289 -3.04482,4.04661 -4.40928,4.97072 -7.41733,9.59409 -9.96102,15.31012 -2.5643,5.76235 -4.95746,13.26575 -5.74954,18.02687 -0.21628,1.30005 -0.28463,2.53372 -0.28114,5.07472 0.005,3.47847 0.0619,4.02195 0.87073,8.27569 0.54285,2.85513 0.80012,5.11288 0.61941,5.4358 -0.0979,0.17492 -0.3269,-0.0494 -0.94311,-0.92383 z" + id="path25" /> + <path + style="fill:#ffffff;stroke-width:0.156145" + d="m 424.67445,151.3783 c -0.48791,-0.95668 -1.03787,-2.90857 -2.06307,-7.32213 -2.63965,-11.36386 -4.69085,-16.0135 -8.37014,-18.97333 -2.06182,-1.65866 -3.78667,-2.54854 -8.18572,-4.22319 -2.79472,-1.0639 -5.49907,-2.28218 -6.24485,-2.81322 -0.39391,-0.28049 -0.46929,-0.43925 -0.46877,-0.98722 8.7e-4,-0.90507 0.40792,-3.3267 0.8574,-5.10095 0.97486,-3.84806 0.98916,-5.06767 0.0685,-5.84237 -1.98073,-1.66668 -8.8722,-1.44226 -18.12187,0.59012 -1.74988,0.38449 -3.81398,0.80938 -4.5869,0.94419 -1.44566,0.25215 -3.22492,0.32626 -3.40918,0.142 -0.58734,-0.58734 9.21097,-13.631971 17.60771,-23.441415 3.28409,-3.836612 5.84025,-6.538237 11.03725,-11.665344 6.93336,-6.840111 14.22277,-13.480037 20.88444,-19.023649 8.19377,-6.818579 12.99524,-10.183491 14.98506,-10.501677 0.53838,-0.08609 0.65103,-0.0506 0.85619,0.269736 0.51967,0.81145 1.57343,9.967513 1.99225,17.310621 0.21051,3.690904 0.10988,16.542141 -0.16139,20.611162 -1.61051,24.156866 -6.11677,47.438596 -12.05877,62.301926 - 1.0198,2.55091 -3.26967,7.11391 -3.84732,7.80282 l -0.45453,0.54206 z" + id="path26" /> + <path + style="fill:#ffffff;stroke-width:0.0390363" + d="m 345.15838,64.955548 c -0.0136,-0.02193 0.0538,-0.149806 0.14967,-0.284162 1.5648,-2.192869 13.2594,-10.505454 24.83408,-17.652196 2.47688,-1.529344 6.37635,-3.832557 8.37328,-4.945667 6.69864,-3.733886 15.76085,-7.976425 26.3495,-12.335707 0.78365,-0.322626 1.438,-0.594412 1.4541,-0.603971 0.0161,-0.0096 0.0293,0.526113 0.0293,1.19038 v 1.207758 l -0.94663,0.420332 c -12.49187,5.546759 -26.08588,12.480396 -37.2802,19.014795 -3.42354,1.998406 -6.08877,3.625033 -9.53407,5.818782 -7.49252,4.770749 -13.09144,8.209536 -13.36652,8.209536 -0.0208,0 -0.0489,-0.01795 -0.0625,-0.03988 z" + id="path27" /> + <path + style="fill:#ffffff;stroke-width:0.0276028" + d="m 378.7522,43.476523 v -1.543689 l 0.47614,-0.261467 c 2.51343,-1.380195 5.55262,-2.932765 8.95022,-4.57222 6.96173,-3.359267 18.54864,-8.287616 25.21518,-10.724968 3.5078,-1.282486 6.18946,-2.162705 9.20555,-3.021604 2.89239,-0.823673 4.14547,-1.185469 6.36715,-1.83835 0.69335,-0.203752 1.2939,-0.370459 1.33457,-0.370459 0.0407,0 0.11819,0.021 0.17228,0.04667 l 0.0983,0.04667 -0.10208,0.08824 c -0.5254,0.454173 -5.23117,2.49679 -11.38962,4.943854 -3.99206,1.586246 -4.66889,1.857448 -5.87941,2.355846 -6.35475,2.616409 -12.70969,5.481346 -20.05345,9.040515 -1.43656,0.69623 -6.15608,3.055566 -7.67359,3.836103 -2.08041,1.070073 -5.42174,2.823061 -6.42554,3.371086 -0.14856,0.08111 -0.27588,0.147467 -0.28293,0.147467 -0.007,0 -0.0128,-0.69466 -0.0128,-1.543688 z" + id="path28" /> + </g> +</svg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/res/icons/hicolor/scalable/apps/io.poly000.waylyrics.svg new/waylyrics-0.3.5/res/icons/hicolor/scalable/apps/io.poly000.waylyrics.svg --- old/waylyrics-0.2.19/res/icons/hicolor/scalable/apps/io.poly000.waylyrics.svg 2024-04-17 12:18:51.000000000 +0200 +++ new/waylyrics-0.3.5/res/icons/hicolor/scalable/apps/io.poly000.waylyrics.svg 1970-01-01 01:00:00.000000000 +0100 @@ -1,112 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - version="1.1" - id="svg1" - width="512" - height="512" - viewBox="0 0 512 512" - xmlns="http://www.w3.org/2000/svg" - xmlns:svg="http://www.w3.org/2000/svg"> - <defs - id="defs1" /> - <g - id="g1"> - <g - id="g2"> - <path - style="fill:#f8935c" - d="M 243.26999,509.00651 C 214.05615,505.91389 199.17331,500.01587 186.5,486.50874 l -6,-6.39476 -7,1.45398 c -11.36142,2.35991 -39.10503,2.92625 -51.33071,1.04784 -11.4898,-1.76535 -27.695213,-6.83917 -37.340777,-11.69117 C 74.94576,465.95331 61.129159,456.12871 53.995327,449 47.302451,442.31193 35.180345,425.34537 30.775043,416.5 26.601421,408.11982 22.252891,394.0564 20.442262,383.08313 16.406583,358.625 21.497298,329.37892 34.443139,302.6483 39.472196,292.26429 47.549881,278.67825 62.475544,255.5 c 13.379733,-20.77756 20.272085,-33.2261 26.576036,-48 2.816188,-6.6 5.826404,-12.7875 6.689368,-13.75 2.048088,-2.28432 6.363412,-2.23307 8.873442,0.10537 7.78433,7.25222 13.26349,23.55641 20.91532,62.23717 10.03983,50.7524 14.23196,64.72497 26.82458,89.40746 8.04835,15.77538 18.487,31.92413 27.99974,43.31604 10.94371,13.10556 9.14021,12.84419 19.64548,2.84706 4.97422,-4.73362 17.7359,-15.11513 28.35927,-23.07003 10.62338,-7.95489 22.65108,-17.59601 26.72823,-21.42469 7.31759, -6.87166 7.38082,-6.97406 4.91299,-7.95673 -1.375,-0.54751 -8.77684,-2.19936 -16.44853,-3.67076 -25.12684,-4.81923 -53.58723,-15.60425 -71.0655,-26.93014 C 159.80296,300.39218 159,299.53119 159,294.15011 c 0,-4.18169 -0.41348,-4.897 -5.8242,-10.07568 C 144.72835,275.98925 141,270.45619 141,266.00495 c 0,-4.55853 1.67516,-6.17052 9.41881,-9.06363 7.32036,-2.73497 13.93172,-8.67383 16.16449,-14.52026 1.40189,-3.6708 1.60754,-6.92445 1.21171,-19.1711 -0.52395,-16.2103 -0.49649,-16.11863 -8.30453,-27.72969 -6.1229,-9.10516 -9.42311,-15.7972 -13.81831,-28.02027 -4.59789,-12.78676 -6.2512,-19.47792 -8.14336,-32.95722 -3.4368,-24.48301 -0.20822,-53.462692 9.05406,-81.269156 4.64412,-13.942207 8.81735,-22.656673 12.07831,-25.221752 3.59807,-2.830239 8.31415,-2.624953 23.06612,1.004044 24.71741,6.080503 51.58944,17.651932 71.46015,30.771618 13.84031,9.1381 16.7515,10.633518 18.09167,9.293344 0.73243,-0.732425 -0.0639,-2.852801 -2.63669,-7.021125 C 263.71873,54.122724 262,48.91238 262,41.9631 67 c 0,-5.285564 0.27753,-6.018902 3.21237,-8.488412 2.82544,-2.377446 3.7977,-2.633709 8.07182,-2.127503 13.1712,1.559934 32.33793,9.499938 48.20355,19.96879 9.92932,6.551807 10.00321,6.580398 12.63119,4.88716 1.45389,-0.936761 10.04414,-6.683211 19.08944,-12.769889 C 371.73536,30.966302 390.40599,21.356114 409.32588,14.548368 424.97599,8.9171558 444.0098,4.098882 453.74607,3.303711 l 7.24608,-0.5917941 3.32786,3.5285582 C 471.1464,13.478565 478.69314,41.012154 480.97371,67 c 3.45094,39.32469 -2.48356,76.76514 -17.43558,110 -4.57961,10.1794 -4.709,10.73122 -4.2377,18.07265 0.97844,15.2413 10.17253,25.73972 24.91871,28.45383 2.04552,0.37649 4.90301,1.8684 6.34997,3.31535 3.86234,3.86235 2.91256,8.20852 -4.09556,18.74107 -16.02964,24.09107 -30.94674,37.84198 -60.22355,55.51541 l -10.25,6.18758 0.007,4.10705 c 0.008,4.45305 3.082,18.3812 5.65233,25.60706 0.88038,2.475 4.55615,10.71267 8.16836,18.30593 6.40315,13.46012 6.52734,13.87342 4.95801,16.5 -1.03418,1.7309 -3.79926,3.58786 -7.7 3416,5.19407 -3.36848,1.37501 -6.48343,3.08077 -6.92213,3.79059 -0.43869,0.70982 -0.58875,5.98698 -0.33346,11.72702 0.53377,12.00165 -0.3476,14.31428 -6.57184,17.24387 l -3.72412,1.75284 -0.26954,21.75635 c -0.19674,15.8805 0.15274,24.52098 1.29402,31.99284 2.8141,18.4237 2.84547,19.15462 0.9899,23.06495 -2.81551,5.93324 -7.54553,8.18181 -17.01438,8.08835 -6.35568,-0.0627 -9.33601,-0.64273 -14.5,-2.82184 -8.88794,-3.75053 -9.22283,-3.72644 -10.30788,0.74148 -3.4055,14.02289 -26.36597,16.94758 -47.82541,6.09197 -4.57007,-2.31185 -4.65715,-2.31746 -6.38215,-0.41136 -2.78343,3.07566 -9.5728,5.90454 -18.09443,7.53928 -9.44966,1.81277 -42.36378,2.69471 -54.12014,1.45017 z m 70.78573,-43.62341 c 5.12559,-3.89433 14.71756,-8.05497 24.10765,-10.45701 4.58515,-1.1729 8.67526,-2.44722 9.08913,-2.83182 0.41388,-0.3846 -0.26112,-3.82565 -1.5,-7.64677 -2.15084,-6.63393 -2.40481,-6.96206 -5.62713,-7.27015 -5.29961,-0.50671 -17.46196,2.62519 -25.17041,6.48157 l -7.03788,3.52091 0.47243,10.16008 c 0.25983,5.58805 0.50349,10.27259 0.54146,10.41009 0.22082,0.79967 2.09828,-0.0674 5.12475,-2.3669 z m 60.46676,-12.68421 c 3.86236,-1.36407 10.49986,-3.04108 14.75,-3.7267 L 397,447.7256 v -8.3628 C 397,432.05292 396.77883,431 395.2434,431 c -3.88095,0 -8.56694,2.08305 -13.03575,5.79475 -3.76511,3.12722 -9.89483,7.36338 -20.07775,13.87543 -0.20355,0.13017 -0.0703,1.43113 0.2961,2.89101 0.76527,3.04908 1.08615,3.0262 12.09648,-0.8623 z m -7.42931,-18.85662 c 9.23998,-6.43424 20.11165,-17.44748 25.71889,-26.05381 4.26003,-6.53854 4.30668,-6.57285 9.88689,-7.27005 l 5.60666,-0.70051 -0.62857,-15.23318 c -0.4571,-11.07765 -0.30782,-15.55394 0.5472,-16.40896 0.64667,-0.64667 3.44826,-1.18265 6.22576,-1.19107 8.33624,-0.0253 8.49402,-0.54892 3.23418,-10.73294 -5.54202,-10.73037 -9.89105,-23.36721 -12.47622,-36.25175 -1.79841,-8.96329 -2.05586,-9.51788 -4.55703,-9.81642 C 399.19292,310.00955 398,309.28596 398,308.57561 c 0,-0.71036 6.11509,-5.2456 13.58909,-10.07833 18.57106,-12.00814 30.0 851,-21.04738 41.95438,-32.93678 C 463.20038,255.88721 477,238.71559 477,236.37226 c 0,-2.50875 -12.45613,-5.44509 -39.5,-9.31153 -39.18252,-5.60188 -48.54454,-6.4043 -66.17379,-5.67174 -20.29787,0.84345 -21.21665,1.06365 -22.9837,5.50854 -3.72818,9.37791 -7.87793,14.0462 -15.74034,17.7072 -15.77903,7.34723 -34.35103,-4.40416 -36.24299,-22.93268 -0.29046,-2.84463 -0.70548,-5.74627 -0.92226,-6.4481 -0.50144,-1.62344 -4.88838,1.09925 -21.43692,13.30458 -6.875,5.07063 -14.525,10.24469 -17,11.49791 -5.17927,2.62254 -13.25166,4.94443 -17.25,4.96169 -3.23918,0.014 -3.18696,-0.17132 -1.11951,3.97299 1.50402,3.01487 1.50486,3.53183 0.0109,6.66459 -2.08225,4.36653 -7.13028,6.88037 -11.98686,5.96927 C 222.65731,260.84508 219,256.97143 219,253.48759 c 0,-2.61077 2.40574,-4.97289 4.03757,-3.96437 0.70873,0.43802 1.01177,0.007 0.81877,-1.16391 -0.47486,-2.88136 0.97824,-4.35931 4.28601,-4.35931 3.58084,0 3.67948,0.31183 -2.64235,-8.3535 l -5,-6.8535 -0.67546,7.99722 c -0.75692,8.96177 -2.90611,1 4.09685 -7.9735,19.05116 -3.91861,3.83116 -6.37141,4.5855 -12.62006,3.88119 -3.89689,-0.43924 -5.3044,-1.23592 -8.69049,-4.91898 -2.22227,-2.41717 -4.49049,-5.16108 -5.04049,-6.09757 -0.55,-0.93649 -2.40302,-1.97281 -4.11782,-2.30293 -2.7587,-0.53108 -3.23544,-0.27212 -4.13912,2.24835 -1.91618,5.34447 -7.36502,11.50567 -13.80813,15.61334 -3.53921,2.25635 -6.43493,4.4484 -6.43493,4.87122 0,1.30421 9.97382,10.82238 14.01106,13.37098 5.18558,3.27351 5.57016,4.2156 3.09024,7.56988 l -2.13425,2.88672 4.26647,3.15431 c 5.44231,4.02361 27.39811,14.61902 39.90222,19.25597 24.33328,9.02361 60.78766,15.54599 87.36426,15.63114 4.4,0.0141 8.49442,0.35623 9.09872,0.76031 0.60429,0.40408 1.39346,3.98131 1.7537,7.9494 0.84437,9.30078 4.12568,18.22798 9.87957,26.87851 4.36109,6.55657 16.56714,19.23778 21.60488,22.44593 2.10005,1.33735 2.57262,3.11541 4.66316,17.54516 1.27946,8.83135 2.84567,18.05021 3.48045,20.48635 0.63479,2.43614 1.59121,6.11684 2.12538,8.17934 0.53418,2.0625 1.55831,3.75 2.27586 ,3.75 0.71754,0 4.63769,-2.32098 8.71145,-5.15773 z M 188.5,297.1293 c -7.24274,-4.49829 -11.3203,-12.11373 -9.47686,-17.69942 C 180.2943,275.57823 184.27899,272 187.297,272 c 4.39494,0 10.45975,4.80348 13.24024,10.48659 3.04899,6.23192 2.84028,8.72288 -1.12584,13.43634 -3.02935,3.60017 -6.44846,3.97819 -10.9114,1.20637 z m 38.13486,-15.20188 c -2.93116,-2.30565 -3.55818,-6.63588 -1.09761,-7.58009 0.84548,-0.32444 2.40372,0.19426 3.46275,1.15267 2.55116,2.30876 4.65373,1.35305 5.5,-2.5 0.87294,-3.97446 2.98862,-4.80438 5.80088,-2.27553 4.37645,3.93542 5.66483,3.76346 9.17466,-1.22447 1.90963,-2.71384 4.91362,-0.89998 5.32784,3.21704 0.23916,2.37707 -0.38632,3.59568 -2.95489,5.75699 -2.80841,2.36313 -3.85359,2.66005 -7.5702,2.15064 -3.47659,-0.47652 -4.69614,-0.20682 -6.29511,1.39215 -2.6117,2.6117 -7.96808,2.5695 -11.34832,-0.0894 z M 340.5,281.83791 c -13.79404,-7.59549 -13.15061,-24.08134 1.20321,-30.82843 5.77776,-2.71586 10.76849,-2.28663 16.34854,1.40607 4.27264,2.8275 7.94825, 8.9451 7.94825,13.22889 0,8.75999 -9.17854,17.38091 -18.44578,17.32515 -2.77982,-0.0167 -5.95422,-0.52598 -7.05422,-1.13168 z m -82,139.42777 c 2.65648,-0.97289 6.01397,-1.28788 9.99612,-0.93781 7.4331,0.65343 5.17526,-0.99696 -2.61396,-1.91072 -5.11059,-0.59952 -11.71185,0.50549 -14.76028,2.47078 -1.8659,1.20294 -0.35132,3.43246 1.72927,2.54555 0.90687,-0.38658 3.44885,-1.36209 5.64885,-2.1678 z M 231,386.52434 c 13.13067,-9.86915 31,-25.78182 31,-27.60555 0,-0.39955 -9.1125,6.06143 -20.25,14.35774 -21.23722,15.81957 -38.25848,31.636 -42.53299,39.52231 -1.98752,3.6669 -1.01683,2.94445 7.5,-5.58205 C 212.09765,401.83004 223.025,392.51844 231,386.52434 Z m -92,-46.82118 c 0,-0.16326 -1.815,-5.67576 -4.03333,-12.25 -5.54443,-16.43143 -9.84734,-34.05949 -16.34288,-66.95316 -3.04105,-15.4 -6.49517,-31.15 -7.6758,-35 -3.00616,-9.80292 -6.04694,-16.63368 -7.22923,-16.23959 -0.55172,0.18391 -2.89779,4.58805 -5.213485,9.78698 C 93.643586,229.96228 86.505814,242.51996 73.522651,263 c -14.092 788,22.2304 -18.41665,29.59946 -24.057096,41 -5.758623,11.6394 -9.022371,19.77652 -8.244311,20.55458 0.280493,0.28049 8.309054,-1.06112 17.841246,-2.98135 18.920228,-3.81143 18.390041,-3.86631 22.114033,2.28919 C 84.896805,330.01179 92.055399,339 93.232737,339 c 0.613713,0 4.364451,-3.15 8.334973,-7 3.97052,-3.85 7.74851,-7 8.39554,-7 0.64702,0 3.28248,1.46065 5.85657,3.24588 C 124.21011,334.06486 139,341.37507 139,339.70316 Z m 59.05115,-95.75431 c 2.36289,-2.36289 1.88302,-5.64284 -1.14421,-7.82082 -2.51774,-1.81142 -2.46576,-7.29962 0.12316,-13.0054 l 1.98617,-4.37738 -2.20513,1.46416 c -3.96989,2.6359 -6.31114,8.61641 -6.31114,16.1212 0,5.60741 0.34761,7.08479 1.94113,8.25 2.55754,1.87012 3.17802,1.80024 5.61002,-0.63176 z M 313.6281,230.40159 c 2.75089,-0.73823 4.34494,-4.24247 3.26176,-7.17041 -0.46163,-1.24785 -2.38552,-3.18109 -4.27529,-4.29609 -1.88978,-1.11499 -3.68891,-2.68644 -3.99808,-3.49211 -0.73383,-1.91233 0.29603,-7.20168 2.10006,-10.78591 1.80099,-3.57818 0.94005, -4.56126 -1.8128,-2.06997 -7.12249,6.44577 -8.37444,21.5377 -2.19018,26.40223 2.72291,2.14184 3.55931,2.31267 6.91453,1.41226 z M 165.09766,173.01978 c -1.75749,-8.1949 -1.30205,-13.61471 1.96302,-23.3603 3.41465,-10.19203 7.25227,-17.04138 13.16159,-23.49064 2.96481,-3.23572 3.81604,-4.87971 3.36556,-6.5 -0.33163,-1.19286 -0.88054,-4.67856 -1.21979,-7.746 -0.60108,-5.4348 -0.54346,-5.60751 2.25757,-6.76655 1.58091,-0.65416 5.68599,-1.29444 9.1224,-1.42284 4.08313,-0.15256 6.2487,-0.65171 6.25,-1.44059 0.006,-3.396218 -14.93634,-28.343316 -24.66855,-41.186662 C 172.05512,56.785135 170.95262,51.765353 173,50.5 c 1.96706,-1.215709 0.94252,-4.590562 -2.50901,-8.264685 -3.29344,-3.505848 -3.59451,-3.624391 -4.90093,-1.92967 -2.32213,3.012332 -9.31791,25.388417 -12.25394,39.194355 -2.52047,11.851857 -2.76779,14.898852 -2.80038,34.5 -0.0376,22.63259 0.84851,29.66443 5.55243,44.06076 2.71644,8.31366 8.75612,21.42828 9.51766,20.66675 0.32422,-0.32423 0.0956,-2.8927 -0.50817,-5.70773 z m 53. 13703,2.59544 C 221.53818,170.60068 212.90851,157 206.42327,157 c -7.21352,0 -8.56877,11.48473 -1.99868,16.93741 4.26526,3.53986 11.96699,4.47555 13.8101,1.67781 z m 91.15147,-14.03092 c 6.17184,-1.85745 11.14852,-5.75186 13.67241,-10.6991 2.46168,-4.8253 1.85798,-7.35987 -2.26026,-9.4895 -2.5975,-1.34322 -3.72659,-1.39572 -7.47082,-0.3474 -6.1731,1.72836 -12.70222,7.02861 -15.32028,12.4368 -2.45186,5.06488 -2.15598,7.11936 1.22062,8.47554 3.21298,1.29045 4.81751,1.23101 10.15833,-0.37634 z M 196.31611,142.85917 c 11.77863,-15.71068 29.1345,-30.52158 53.14937,-45.35584 2.88257,-1.7806 2.90623,-1.858247 0.84617,-2.777471 -2.66833,-1.190641 -9.98922,2.588448 -22.81165,11.775511 -15.48256,11.09301 -29.46621,26.37208 -35.89054,39.21539 -4.5208,9.03783 -3.95328,8.69327 4.70665,-2.85759 z M 428.28965,146.25 c 9.19037,-20.62005 15.29788,-62.652035 13.02784,-89.657734 -0.58592,-6.970377 -1.34514,-12.953254 -1.68717,-13.29528 -1.06638,-1.066381 -4.8367,1.20678 -13.13032,7.916384 -11.41698,9. 236428 -23.91045,20.877625 -31.85917,29.685808 C 386.72596,89.669862 374,106.19395 374,107.70037 c 0,0.62804 2.9995,0.30676 7.75,-0.83009 8.38504,-2.00665 15.88735,-2.38535 18.20545,-0.91897 1.24275,0.78613 1.26721,1.65517 0.16738,5.94649 -0.70844,2.7642 -1.03972,5.42766 -0.73617,5.91882 0.30355,0.49115 3.2555,1.87878 6.55989,3.08362 10.83164,3.94941 13.07735,7.27978 17.09368,25.34976 0.70292,3.1625 1.59497,5.75 1.98234,5.75 0.38736,0 1.85755,-2.5875 3.26708,-5.75 z M 277.92207,79.448805 c 10.90862,-1.972666 11.92565,-2.306849 10.22302,-3.359132 -1.33619,-0.825815 -3.86408,-0.418514 -17.64509,2.843029 -10.16801,2.406456 -5.01344,2.764885 7.42207,0.516103 z m 81.2128,-22.987403 c 16.16856,-10.329629 39.52084,-22.164097 58.0998,-29.443806 7.55406,-2.959877 13.55317,-5.563091 13.33134,-5.78492 C 428.97247,19.639134 396.34981,32.437266 381,40.677825 366.84944,48.274562 342.27407,65 345.26243,65 c 0.27902,0 6.52162,-3.842369 13.87244,-8.538598 z" - id="path8" /> - <path - style="fill:#9e9e9d" - d="M 243.26999,509.00651 C 214.05615,505.91389 199.17331,500.01587 186.5,486.50874 l -6,-6.39476 -7,1.45398 c -11.36142,2.35991 -39.10503,2.92625 -51.33071,1.04784 -11.4898,-1.76535 -27.695213,-6.83917 -37.340777,-11.69117 C 74.94576,465.95331 61.129159,456.12871 53.995327,449 47.302451,442.31193 35.180345,425.34537 30.775043,416.5 26.601421,408.11982 22.252891,394.0564 20.442262,383.08313 16.406583,358.625 21.497298,329.37892 34.443139,302.6483 39.472196,292.26429 47.549881,278.67825 62.475544,255.5 c 13.379733,-20.77756 20.272085,-33.2261 26.576036,-48 2.816188,-6.6 5.826404,-12.7875 6.689368,-13.75 2.048088,-2.28432 6.363412,-2.23307 8.873442,0.10537 7.78433,7.25222 13.26349,23.55641 20.91532,62.23717 10.03983,50.7524 14.23196,64.72497 26.82458,89.40746 8.04835,15.77538 18.487,31.92413 27.99974,43.31604 10.94371,13.10556 9.14021,12.84419 19.64548,2.84706 4.97422,-4.73362 17.7359,-15.11513 28.35927,-23.07003 10.62338,-7.95489 22.65108,-17.59601 26.72823,-21.42469 7.31759, -6.87166 7.38082,-6.97406 4.91299,-7.95673 -1.375,-0.54751 -8.77684,-2.19936 -16.44853,-3.67076 -25.12684,-4.81923 -53.58723,-15.60425 -71.0655,-26.93014 C 159.80296,300.39218 159,299.53119 159,294.15011 c 0,-4.18169 -0.41348,-4.897 -5.8242,-10.07568 C 144.72835,275.98925 141,270.45619 141,266.00495 c 0,-4.55853 1.67516,-6.17052 9.41881,-9.06363 7.32036,-2.73497 13.93172,-8.67383 16.16449,-14.52026 1.40189,-3.6708 1.60754,-6.92445 1.21171,-19.1711 -0.52395,-16.2103 -0.49649,-16.11863 -8.30453,-27.72969 -6.1229,-9.10516 -9.42311,-15.7972 -13.81831,-28.02027 -4.59789,-12.78676 -6.2512,-19.47792 -8.14336,-32.95722 -3.4368,-24.48301 -0.20822,-53.462692 9.05406,-81.269156 4.64412,-13.942207 8.81735,-22.656673 12.07831,-25.221752 3.59807,-2.830239 8.31415,-2.624953 23.06612,1.004044 24.71741,6.080503 51.58944,17.651932 71.46015,30.771618 13.84031,9.1381 16.7515,10.633518 18.09167,9.293344 0.73243,-0.732425 -0.0639,-2.852801 -2.63669,-7.021125 C 263.71873,54.122724 262,48.91238 262,41.9631 67 c 0,-5.285564 0.27753,-6.018902 3.21237,-8.488412 2.82544,-2.377446 3.7977,-2.633709 8.07182,-2.127503 13.1712,1.559934 32.33793,9.499938 48.20355,19.96879 9.92932,6.551807 10.00321,6.580398 12.63119,4.88716 1.45389,-0.936761 10.04414,-6.683211 19.08944,-12.769889 C 371.73536,30.966302 390.40599,21.356114 409.32588,14.548368 424.97599,8.9171558 444.0098,4.098882 453.74607,3.303711 l 7.24608,-0.5917941 3.32786,3.5285582 C 471.1464,13.478565 478.69314,41.012154 480.97371,67 c 3.45094,39.32469 -2.48356,76.76514 -17.43558,110 -4.57961,10.1794 -4.709,10.73122 -4.2377,18.07265 0.97844,15.2413 10.17253,25.73972 24.91871,28.45383 2.04552,0.37649 4.90301,1.8684 6.34997,3.31535 3.86234,3.86235 2.91256,8.20852 -4.09556,18.74107 -16.02964,24.09107 -30.94674,37.84198 -60.22355,55.51541 l -10.25,6.18758 0.007,4.10705 c 0.008,4.45305 3.082,18.3812 5.65233,25.60706 0.88038,2.475 4.55615,10.71267 8.16836,18.30593 6.40315,13.46012 6.52734,13.87342 4.95801,16.5 -1.03418,1.7309 -3.79926,3.58786 -7.7 3416,5.19407 -3.36848,1.37501 -6.48343,3.08077 -6.92213,3.79059 -0.43869,0.70982 -0.58875,5.98698 -0.33346,11.72702 0.53377,12.00165 -0.3476,14.31428 -6.57184,17.24387 l -3.72412,1.75284 -0.26954,21.75635 c -0.19674,15.8805 0.15274,24.52098 1.29402,31.99284 2.8141,18.4237 2.84547,19.15462 0.9899,23.06495 -2.81551,5.93324 -7.54553,8.18181 -17.01438,8.08835 -6.35568,-0.0627 -9.33601,-0.64273 -14.5,-2.82184 -8.88794,-3.75053 -9.22283,-3.72644 -10.30788,0.74148 -3.4055,14.02289 -26.36597,16.94758 -47.82541,6.09197 -4.57007,-2.31185 -4.65715,-2.31746 -6.38215,-0.41136 -2.78343,3.07566 -9.5728,5.90454 -18.09443,7.53928 -9.44966,1.81277 -42.36378,2.69471 -54.12014,1.45017 z m 72.80045,-42.97364 c 6.91721,-4.47081 14.01866,-7.35136 24.77625,-10.04996 6.95683,-1.74516 9.96975,-2.98291 7.26096,-2.98291 -0.67413,0 -0.99308,-0.37636 -0.70879,-0.83635 0.28429,-0.45999 -0.38978,-3.72249 -1.49792,-7.25 -1.10815,-3.52751 -2.14243,-7.08865 -2.2984,-7.91365 -0.42684,-2.25784 -4.21469,-2.39236 -13.358 21,-0.47438 -10.6181,2.22728 -22.83442,8.18857 -22.52735,10.99283 0.17784,1.62405 0.61331,9.17941 1.19491,20.73155 0.0485,0.9625 0.29793,1.75 0.55437,1.75 0.25644,0 3.22832,-1.78521 6.60418,-3.96713 z m 56.71974,-11.01598 c 4.89719,-1.64071 12.36437,-3.56759 16.59373,-4.28196 4.22936,-0.71437 7.67317,-1.62197 7.65292,-2.01689 C 397.01657,448.32312 397,443.70461 397,438.45469 v -9.54532 l -3.75,0.68831 c -2.0625,0.37857 -4.85602,1.78112 -6.20782,3.11677 -3.54398,3.50165 -13.36167,10.75824 -19.66275,14.53341 -4.74396,2.84225 -5.35695,3.56723 -4.86356,5.75214 0.31049,1.375 0.62145,3.0625 0.691,3.75 0.15898,1.57143 -0.79502,1.74395 9.58331,-1.73311 z m -5.69701,-21.17462 c 9.23998,-6.43424 20.11165,-17.44748 25.71889,-26.05381 4.26003,-6.53854 4.30668,-6.57285 9.88689,-7.27005 l 5.60666,-0.70051 -0.62857,-15.23318 c -0.4571,-11.07765 -0.30782,-15.55394 0.5472,-16.40896 0.64667,-0.64667 3.44826,-1.18265 6.22576,-1.19107 8.33624,-0.0253 8.49402,-0.54892 3.23418,-10.73294 -5.54202,-10.7303 7 -9.89105,-23.36721 -12.47622,-36.25175 -1.79841,-8.96329 -2.05586,-9.51788 -4.55703,-9.81642 C 399.19292,310.00955 398,309.28596 398,308.57561 c 0,-0.71036 6.11509,-5.2456 13.58909,-10.07833 18.57106,-12.00814 30.0851,-21.04738 41.95438,-32.93678 C 463.20038,255.88721 477,238.71559 477,236.37226 c 0,-0.62063 -2.67805,-2.12993 -5.95123,-3.35402 -3.27317,-1.22409 -6.08567,-2.54601 -6.25,-2.93761 -0.30337,-0.72296 -42.38632,-7.1659 -59.85714,-9.16419 -11.30259,-1.29277 -51.70167,-0.85716 -54.1206,0.58356 -0.92343,0.55 -1.71316,1.45 -1.75495,2 -0.42401,5.57991 -5.75308,14.3217 -10.89529,17.87262 -14.49986,10.01278 -30.82336,5.94123 -38.80561,-9.67922 -2.7486,-5.37872 -4.61294,-17.04564 -2.98414,-18.67444 0.69195,-0.69195 0.60932,-1.01896 -0.25746,-1.01896 -1.59609,0 -12.28705,7.16016 -26.62358,17.83086 -12.08547,8.99524 -18.88502,12.1238 -28.03142,12.8976 -5.49357,0.46477 -6.32131,0.26634 -9.2823,-2.22517 -1.78799,-1.50449 -5.30085,-5.60821 -7.80636,-9.11937 -4.35643,-6.10498 -7.74369 ,-8.80067 -5.28444,-4.20551 1.74921,3.26842 0.56183,16.61283 -1.90917,21.4564 -2.47911,4.85946 -7.8326,10.23831 -10.97501,11.027 -5.06424,1.27105 -11.24966,-0.30776 -14.88223,-3.79862 -3.64139,-3.49934 -6.62196,-8.23697 -5.73814,-9.12079 0.28114,-0.28114 -0.92896,-1.01319 -2.68911,-1.62678 -3.74481,-1.30545 -4.985,-1.40225 -4.68418,-0.36562 0.43315,1.49267 -2.06377,6.84258 -5.17183,11.08116 -1.74677,2.38214 -6.07166,6.17727 -9.61088,8.43362 -3.53921,2.25635 -6.43493,4.4484 -6.43493,4.87122 0,1.30421 9.97382,10.82238 14.01106,13.37098 5.18558,3.27351 5.57016,4.2156 3.09024,7.56988 l -2.13425,2.88672 4.26647,3.15431 c 5.48134,4.05247 27.42678,14.62941 40.13021,19.34136 17.56921,6.51677 46.42797,12.81005 65.77255,14.34315 6.56221,0.52006 9.28892,1.10942 9.11372,1.96984 -0.18472,0.90717 2.44421,1.22776 10.06798,1.22776 h 10.31797 l 1.1682,8.731 c 2.06983,15.46973 13.64074,34.58364 26.91158,44.45505 3.18135,2.36642 6.0673,4.69356 6.41322,5.17142 0.34592,0.47786 0.85294,0.25542 1.12671,-0 .49432 0.67196,-1.84023 1.31438,1.24892 3.25187,15.63685 2.51056,18.64367 5.86771,32.5 7.87419,32.5 0.71754,0 4.63769,-2.32098 8.71145,-5.15773 z M 190.5,296.3348 c -4.40932,-2.32977 -6.48728,-4.39289 -8.60641,-8.54496 -2.55083,-4.99791 -2.38289,-8.39145 0.56096,-11.33529 3.4077,-3.40771 7.61222,-3.21283 11.8996,0.55154 7.07104,6.20845 8.40071,14.68178 2.97381,18.95058 -3.06628,2.41193 -2.9871,2.40754 -6.82796,0.37813 z m 36.13486,-14.40738 c -2.93116,-2.30565 -3.55818,-6.63588 -1.09761,-7.58009 0.84548,-0.32444 2.40372,0.19426 3.46275,1.15267 2.55116,2.30876 4.65373,1.35305 5.5,-2.5 0.87294,-3.97446 2.98862,-4.80438 5.80088,-2.27553 4.37645,3.93542 5.66483,3.76346 9.17466,-1.22447 1.90963,-2.71384 4.91362,-0.89998 5.32784,3.21704 0.23916,2.37707 -0.38632,3.59568 -2.95489,5.75699 -2.80841,2.36313 -3.85359,2.66005 -7.5702,2.15064 -3.47659,-0.47652 -4.69614,-0.20682 -6.29511,1.39215 -2.6117,2.6117 -7.96808,2.5695 -11.34832,-0.0894 z M 340.96996,279.75 c -6.26219,-3.16356 -9.26929,-7.9 4844 -8.71815,-13.87224 0.23653,-2.54223 1.40477,-5.99111 2.5961,-7.66417 2.64664,-3.71686 9.56276,-7.21359 14.26765,-7.21359 4.17012,0 10.91881,4.09532 13.24891,8.03985 4.67096,7.9073 -1.02368,19.10503 -11.14552,21.91614 -4.99956,1.38852 -5.14774,1.37108 -10.24899,-1.20599 z M 224.357,261.00842 C 221.62339,259.90527 219,256.1793 219,253.39994 c 0,-2.59056 2.44129,-4.86327 4.11372,-3.82966 0.84238,0.52062 1.03571,0.10915 0.64704,-1.37714 -0.70761,-2.7059 0.93627,-4.04781 5.2876,-4.31631 5.25309,-0.32414 7.59539,0.85266 9.44179,4.74365 1.42217,2.99702 1.48825,4.01745 0.42618,6.58151 -2.22582,5.37362 -8.96842,8.06264 -14.55933,5.80643 z m 60.07,165.5297 c -1.05985,-0.79267 -4.627,-2.89421 -7.927,-4.67007 -5.18851,-2.79216 -7.01436,-3.23642 -13.5,-3.28485 -5.28726,-0.0395 -8.43573,0.45192 -10.67162,1.66555 -2.38872,1.29659 -3.2949,1.41666 -3.67105,0.4864 -0.27469,-0.67933 -0.53496,-0.27775 -0.57838,0.89241 -0.14449,3.89376 2.05053,4.51155 7.99044,2.24893 7.61935,-2.90235 15.80956,-2.29 493 23.58167,1.74891 5.93524,3.08811 8.28499,3.53717 4.77594,0.91272 z m -85.63497,-7.7604 c 7.01242,-9.36419 17.89007,-19.33393 36.56844,-33.51624 7.73373,-5.87214 16.74128,-13.39571 20.01677,-16.71905 7.69748,-7.80989 15.86957,-17.62896 15.21598,-18.28254 -0.28106,-0.28107 -1.7286,0.93598 -3.21675,2.70455 -1.48815,1.76856 -12.41915,10.45705 -24.2911,19.30774 -23.75891,17.71257 -39.82567,32.7425 -44.08537,41.24042 -1.375,2.74307 -3.79903,6.95791 -5.38673,9.36631 -4.69279,7.11853 -1.08164,4.25877 5.17876,-4.10119 z M 135.39765,328.75 c -5.98359,-17.76609 -10.16202,-34.76741 -16.77386,-68.25 -3.04105,-15.4 -6.49517,-31.15 -7.6758,-35 -3.00616,-9.80292 -6.04694,-16.63368 -7.22923,-16.23959 -0.55172,0.18391 -2.89779,4.58805 -5.213485,9.78698 C 93.643586,229.96228 86.505814,242.51996 73.522651,263 59.808853,284.63257 55.171534,292.49312 49.808956,303.19622 45.704094,311.38907 40,324.93939 40,326.49783 c 0,0.5243 1.518471,0.2638 21,-3.60266 7.975,-1.58279 14.784644,-2.8817 15.132542,-2.8 8648 0.347898,-0.005 2.597898,3.02691 5,6.73708 C 86.426987,334.92331 91.745969,341 93.609411,341 c 0.757177,0 4.532943,-3.15 8.390589,-7 3.85765,-3.85 7.44674,-7 7.97577,-7 0.52903,0 4.11041,2.03679 7.95864,4.52619 7.27091,4.70353 18.69682,10.47165 20.74571,10.47302 0.74151,5e-4 -0.47844,-4.92366 -3.28247,-13.24921 z m 62.6535,-84.80115 c 2.36289,-2.36289 1.88302,-5.64284 -1.14421,-7.82082 -2.51774,-1.81142 -2.46576,-7.29962 0.12316,-13.0054 l 1.98617,-4.37738 -2.20513,1.46416 c -3.96989,2.6359 -6.31114,8.61641 -6.31114,16.1212 0,5.60741 0.34761,7.08479 1.94113,8.25 2.55754,1.87012 3.17802,1.80024 5.61002,-0.63176 z M 313.6281,230.40159 c 2.75089,-0.73823 4.34494,-4.24247 3.26176,-7.17041 -0.46163,-1.24785 -2.38552,-3.18109 -4.27529,-4.29609 -1.88978,-1.11499 -3.68891,-2.68644 -3.99808,-3.49211 -0.73383,-1.91233 0.29603,-7.20168 2.10006,-10.78591 1.80099,-3.57818 0.94005,-4.56126 -1.8128,-2.06997 -7.12249,6.44577 -8.37444,21.5377 -2.19018,26.40223 2.72291,2.14184 3.55931,2.31267 6. 91453,1.41226 z M 167,176.68366 c 0,-1.27399 -0.48052,-4.91572 -1.06783,-8.09275 -0.95228,-5.15136 -0.78557,-6.76038 1.54061,-14.86987 3.15867,-11.01166 7.43412,-19.28894 13.37817,-25.90016 4.76594,-5.30087 5.09036,-6.77488 3.26197,-14.82088 -1.40031,-6.16217 -0.23009,-7.09185 10.05361,-7.98711 4.58341,-0.39901 7.77097,-0.79015 7.08347,-0.86918 -0.6875,-0.079 -1.25,-0.79942 -1.25,-1.60085 0,-3.629631 -14.58617,-28.128584 -24.67054,-41.436662 -3.48991,-4.60555 -4.29635,-9.058859 -1.98745,-10.975077 0.7381,-0.612573 1.6381,-0.817673 2,-0.455778 C 175.7039,50.037238 176,49.416207 176,48.295275 c 0,-1.120931 -1.7959,-4.008431 -3.99089,-6.416666 L 168.01821,37.5 166.1461,39.691607 c -2.67125,3.127118 -9.56532,24.551184 -12.80998,39.808393 -2.52047,11.851857 -2.76779,14.898852 -2.80038,34.5 -0.045,27.06988 2.13207,38.5044 10.99527,57.75 3.36565,7.30818 5.46899,9.20564 5.46899,4.93366 z m 52.4433,0.0938 c 2.17796,-3.10947 1.95365,-5.58822 -1.05138,-11.61854 C 215.59148,159.5392 210.13986,1 55 206.19094,155 202.56478,155 198,160.16903 198,164.27519 198,171.42309 206.02272,179 213.59118,179 c 3.30514,0 4.6543,-0.51238 5.85212,-2.22251 z m -29.38388,-21.7855 c 6.24282,-10.63565 18.23611,-24.61244 29.44563,-34.31545 8.17687,-7.07793 28.17503,-20.84401 32.87782,-22.632008 C 253.82229,97.497265 255,96.561806 255,95.965734 c 0,-0.596072 -0.41628,-0.826493 -0.92506,-0.512047 -0.50879,0.314447 -2.03742,0.0649 -3.39696,-0.554547 -2.1089,-0.960881 -3.33138,-0.665163 -8.32493,2.013806 -21.83984,11.716754 -44.29317,33.930934 -51.63985,51.089834 -1.53001,3.57347 -3.89139,8.58854 -5.24751,11.1446 C 184.10956,161.70344 183,164.0925 183,164.4564 c 0,1.75806 2.21609,-1.213 7.05942,-9.46441 z m 123.72382,6.60126 c 5.66251,-2.88933 9.60671,-6.85386 11.53381,-11.59325 2.14917,-5.28555 0.13334,-9.03619 -5.93258,-11.03813 -2.93136,-0.96743 -4.1283,-0.7686 -9.12908,1.5165 -7.16391,3.27353 -11.29523,7.20157 -14.28267,13.57986 l -2.31684,4.94657 2.34637,2.4976 c 3.24035,3.44919 11.12041,3.4894 5 17.78099,0.0909 z M 428.36657,150.25 c 4.49852,-8.90234 8.74361,-24.19781 12.28109,-44.25 2.4127,-13.676387 2.72772,-58.634032 0.44495,-63.5 -1.00611,-2.144617 -1.51833,-2.540754 -1.79649,-1.389332 -0.21401,0.885867 -1.38068,2.065161 -2.59261,2.620652 -5.88227,2.696155 -30.91949,24.819804 -42.06268,37.167858 C 386.65364,89.750003 374,106.1989 374,107.73091 c 0,0.58031 -0.73941,1.33885 -1.64313,1.68564 -0.90372,0.34679 -1.41975,0.8539 -1.14675,1.12691 0.27301,0.27301 4.27492,-0.40943 8.89313,-1.51653 8.03314,-1.92575 17.917,-2.67334 19.14245,-1.44789 0.31848,0.31847 -0.0964,2.56135 -0.92194,4.98417 -0.82554,2.42282 -1.31657,4.95836 -1.09119,5.63451 0.22539,0.67616 3.9674,2.60701 8.31559,4.29077 5.93595,2.2986 8.44249,3.85781 10.05981,6.25775 1.78069,2.64236 4.65828,12.54501 6.97519,24.00376 0.73927,3.65618 3.21291,2.58689 5.78341,-2.5 z M 281,80.647789 c 9.1174,-1.864977 10.5,-2.411141 10.5,-4.147789 0,-1.645426 -0.77075,-2.05536 -4.3475,-2.312262 -2.44582,-0.175673 -4.10075,0.0869 7 -3.78341,0.600445 0.79987,1.294225 -16.46071,5.39477 -25.20627,5.988176 -4.56403,0.309681 -6.83178,0.818197 -6,1.34543 2.40306,1.523205 18.10939,0.720383 28.83718,-1.474 z m 72.29516,-18.484587 c 22.19535,-14.900324 47.15889,-27.311429 77.8766,-38.717857 15.55038,-5.774335 19.91948,-8.906354 6.32824,-4.536445 -3.3,1.061029 -10.12914,3.087728 -15.17587,4.503775 -11.06976,3.106032 -31.34716,11.726655 -43.75228,18.600599 -12.17394,6.745846 -31.5404,19.947859 -33.35324,22.736726 -2.30476,3.545655 0.079,2.782175 8.07655,-2.586798 z" - id="path7" /> - <path - style="fill:#fd7021" - d="m 249,508.42704 c -23.97668,-2.7568 -36.99205,-5.74796 -46.45278,-10.67567 -3.77781,-1.9677 -8.93167,-6.09626 -13.73331,-11.00121 l -7.68609,-7.85147 -8.31391,1.61594 c -12.73543,2.47532 -37.16034,3.01645 -49.64462,1.09987 C 89.206943,476.40062 59.509179,458.20593 41.371327,431.5 33.861077,420.44201 30.196148,413.1796 26.232017,401.5 20.243105,383.85475 18.675433,366.29925 21.454571,348 25.133995,323.77281 34.319298,302.04782 54.007918,271.00514 57.672468,265.22731 64.664758,254.2 69.546338,246.5 c 9.878078,-15.58126 17.726207,-30.43681 21.977201,-41.60016 5.186371,-13.61969 9.547061,-15.15738 15.980001,-5.63494 5.44515,8.06026 10.73198,26.0104 17.01432,57.76801 10.03647,50.73495 14.33942,65.11105 26.629,88.96709 11.44231,22.21136 34.99204,55 39.50256,55 0.87887,0 5.79907,-4.01631 10.93379,-8.92512 5.13471,-4.90882 18.01655,-15.43224 28.62631,-23.38537 C 250.78408,353.26671 263,342.72386 263,340.38997 c 0,-1.99659 -2.50795,-2.79173 -18.44853,-5.84908 -24.46058,-4.69145 - 53.2561,-15.49205 -71.17541,-26.69642 C 161.06536,300.14699 160,299.00446 160,293.49948 c 0,-4.36388 -0.35173,-4.9429 -6.96338,-11.46336 -7.8935,-7.78463 -11.02746,-12.36678 -11.03288,-16.13113 -0.005,-3.39447 2.20923,-5.27149 9.37709,-7.94946 7.00521,-2.61721 13.24441,-7.94628 15.75351,-13.45553 1.47178,-3.2316 1.8145,-6.49729 1.78409,-17 -0.0534,-18.44398 -0.63514,-20.94395 -7.13878,-30.67899 -6.94684,-10.39845 -10.52858,-17.58707 -15.10748,-30.32101 -4.59789,-12.78676 -6.2512,-19.47792 -8.14336,-32.95722 -1.92922,-13.74333 -1.92847,-22.87426 0.003,-38.476666 1.84395,-14.894303 4.33294,-26.416244 8.38386,-38.810213 C 154.18824,34.005557 158.57353,27 165.22919,27 c 4.81792,0 26.78371,5.701315 39.09565,10.147442 16.04821,5.795383 37.23776,16.381346 51.62943,25.793247 12.37157,8.090788 16.17365,9.404508 16.85597,5.82419 0.18187,-0.954316 -1.2627,-4.329316 -3.21015,-7.5 -5.78266,-9.414836 -8.12917,-19.116593 -5.97891,-24.720077 1.05056,-2.737721 6.21752,-4.793499 10.2503,-4.078287 14. 17164,2.513336 32.7055,10.382698 47.23628,20.056232 C 326.45904,56.085236 331.27445,59 331.80867,59 c 0.53422,0 3.83332,-2.110894 7.33132,-4.690875 22.40062,-16.521755 47.82957,-30.369446 71.18589,-38.765275 14.49011,-5.208716 34.21183,-10.3225266 43.20037,-11.2017845 5.50099,-0.5381058 6.30038,-0.358827 9.17121,2.0568196 3.45171,2.904419 6.97358,11.0833109 10.86849,25.2400649 12.85158,46.711355 8.75113,100.3922 -11.02713,144.36105 -4.66653,10.37411 -4.71773,10.60201 -4.27032,19.00829 0.89673,16.84836 8.49137,25.45 26.48417,29.99582 8.04248,2.0319 8.93146,6.85652 3.03951,16.49589 -14.08852,23.04916 -33.7132,41.59727 -61.54218,58.16613 l -11.25,6.69804 0.007,5.06791 c 0.0152,11.00657 5.62489,28.83867 14.75852,46.91452 l 5.48072,10.84661 -1.92227,2.57467 c -1.1236,1.50494 -4.18702,3.33955 -7.37313,4.41561 -2.99797,1.01251 -5.98542,2.55824 -6.63877,3.43495 -0.83276,1.11745 -1.0128,4.68656 -0.60217,11.9377 0.67483,11.91653 -0.2034,14.24663 -6.48579,17.2079 l -3.72412,1.7554 v 25.49028 c 0,20.2631 0.38381,27.7804 1.87165,36.65803 1.82887,10.91248 1.82887,11.25471 0,14.97216 -4.56179,9.27253 -18.70678,10.56563 -34.04209,3.11205 -5.15994,-2.50794 -6.88804,-1.91902 -7.74308,2.63876 -0.99744,5.31678 -4.92574,9.33558 -10.84303,11.09283 -10.10549,3.00101 -20.09635,1.61454 -34.02097,-4.7212 l -6.77752,-3.0838 -2.72248,2.60768 c -6.28804,6.02288 -18.60486,8.60342 -43.6717,9.14979 -9.92793,0.2164 -19.62578,0.21236 -21.55078,-0.009 z m 67.07044,-42.39417 c 6.91721,-4.47081 14.01866,-7.35136 24.77625,-10.04996 4.04068,-1.01363 7.59672,-2.09298 7.90231,-2.39857 0.76774,-0.76775 -2.67845,-13.57562 -4.39505,-16.33434 -1.70627,-2.74212 -4.70383,-2.87069 -14.65654,-0.62865 -7.23464,1.62974 -17.48179,5.82493 -21.19039,8.67536 -1.79595,1.38036 -1.96032,2.50212 -1.66259,11.34661 0.2894,8.59712 1.23621,13.35668 2.65701,13.35668 0.23709,0 3.19314,-1.78521 6.569,-3.96713 z m 56.86016,-11.06302 c 4.97441,-1.66658 12.47792,-3.57645 16.67447,-4.24415 6.67583,-1.06217 7.75256,-1.52739 8.609 42,-3.71985 1.06564,-2.72667 0.23592,-15.95544 -1.08349,-17.27485 -1.46961,-1.46961 -9.29478,1.04919 -12.99829,4.18395 -1.99799,1.69116 -8.02021,6.04854 -13.38271,9.68307 -9.97926,6.76363 -10.99208,8.21261 -8.71482,12.46772 0.56935,1.06384 1.21875,1.93426 1.44311,1.93426 0.22435,0 4.47789,-1.36357 9.45231,-3.03015 z m -6.78369,-19.06962 c 8.91783,-6.05598 20.36931,-17.30362 26.48044,-26.00908 5.27733,-7.51769 5.40352,-7.61622 10.53164,-8.22357 2.85467,-0.3381 5.58868,-1.18911 6.07558,-1.89115 0.85718,-1.23591 0.36094,-15.35635 -0.8787,-25.00336 -0.57211,-4.45223 -0.45103,-4.78639 2.08346,-5.75 1.47998,-0.56269 4.26616,-1.02307 6.19151,-1.02307 1.92535,0 4.36416,-0.46214 5.41958,-1.02698 1.81459,-0.97114 1.64626,-1.55568 -3.09574,-10.75 -5.65912,-10.97254 -10.01258,-23.69481 -12.75745,-37.28152 -1.26085,-6.24106 -2.45988,-9.66039 -3.70739,-10.57259 -1.01411,-0.74153 -1.65169,-1.49706 -1.41684,-1.67894 0.23485,-0.18188 5.81394,-3.842 12.39798,-8.13361 17.23817,-11.23617 26.57775,-18.5 6449 38.88955,-30.51475 C 463.72307,257.01273 478,239.21923 478,236.08685 c 0,-3.26021 -12.27049,-6.55897 -39,-10.48465 -13.475,-1.97903 -28.80127,-4.08891 -34.05837,-4.68863 -12.77919,-1.45782 -51.67456,-0.84979 -54.65767,0.85444 -1.25857,0.71901 -2.67453,2.96873 -3.27722,5.20695 -1.47067,5.46167 -6.65819,11.91486 -12.46285,15.50361 -4.233,2.61706 -5.83438,3.02143 -11.96547,3.02143 -5.93565,0 -7.84013,-0.44776 -11.79652,-2.77346 C 302.63349,237.93663 297,227.35569 297,216.84107 297,214.05123 296.54391,212 295.92358,212 c -1.41211,0 -12.71133,7.62481 -26.42358,17.83086 -12.08547,8.99524 -18.88502,12.1238 -28.03142,12.8976 -5.49357,0.46477 -6.32131,0.26634 -9.2823,-2.22517 -1.78799,-1.50449 -5.30085,-5.60821 -7.80636,-9.11937 C 221.87441,227.87277 219.3916,225 218.86257,225 c -0.58105,0 -0.70126,2.3036 -0.30361,5.81833 1.73548,15.33969 -6.13479,28.18888 -17.2593,28.17793 -5.095,-0.005 -9.77331,-3.04333 -13.05715,-8.47995 C 185.86468,246.57965 182.15773,244 178.87857,244 c -0.45263,0 -1.78388,2.23369 -2.95833,4.96376 -2.39005,5.55584 -9.4922,12.7569 -15.71036,15.92916 -2.2408,1.14318 -4.37478,2.56487 -4.74217,3.15932 -0.68615,1.11023 9.29109,11.47075 15.53229,16.12896 l 3.5,2.61228 -1.90444,3.26899 -1.90444,3.269 2.35645,1.90813 c 3.57376,2.89385 14.61156,9.15051 22.45243,12.72691 23.62113,10.77415 46.15274,17.34915 72,21.0105 8.25,1.16864 17.50209,2.55189 20.5602,3.07389 3.0581,0.52201 9.61369,0.9491 14.56797,0.9491 h 9.00778 l 1.1682,8.731 c 2.08963,15.61775 13.99952,35.14787 27.17583,44.56357 3.23678,2.31299 6.17399,4.88043 6.52711,5.70543 0.35313,0.825 1.71962,8.35648 3.03664,16.73662 2.30503,14.66685 4.43066,24.43562 6.50317,29.88674 1.16955,3.07614 1.81744,2.90146 10.10001,-2.72313 z M 190.5,296.3348 c -4.40932,-2.32977 -6.48728,-4.39289 -8.60641,-8.54496 -2.55083,-4.99791 -2.38289,-8.39145 0.56096,-11.33529 3.4077,-3.40771 7.61222,-3.21283 11.8996,0.55154 7.07104,6.20845 8.40071,14.68178 2.97381,18.95058 -3.06628,2.41193 -2.9871,2.40754 -6.82796,0.37813 z m 36.68856,-15.37376 c -3.76001,-3.50298 -2.49764,-7.0488 1.5624,-4.38856 3.16427,2.0733 5.01227,1.23844 6.81638,-3.0794 l 1.47703,-3.53503 3.70995,2.52097 c 4.76069,3.23497 5.58832,3.17572 8.55294,-0.61237 1.38197,-1.76583 2.94113,-2.83117 3.57247,-2.44098 2.05,1.26697 1.19012,5.60501 -1.62973,8.22186 -2.36268,2.1926 -3.36257,2.46834 -7.09929,1.95777 -3.43956,-0.46996 -4.87965,-0.17708 -6.88486,1.40022 -3.25494,2.56034 -7.30051,2.54248 -10.07729,-0.0445 z M 340.96996,279.75 c -6.26219,-3.16356 -9.26929,-7.94844 -8.71815,-13.87224 0.23653,-2.54223 1.40477,-5.99111 2.5961,-7.66417 2.64664,-3.71686 9.56276,-7.21359 14.26765,-7.21359 4.17012,0 10.91881,4.09532 13.24891,8.03985 4.67096,7.9073 -1.02368,19.10503 -11.14552,21.91614 -4.99956,1.38852 -5.14774,1.37108 -10.24899,-1.20599 z M 225.3083,260.02825 c -2.76233,-1.16037 -5.70333,-5.55643 -4.9794,-7.44297 0.30184,-0.78658 1.58882,-1.57756 2.85995,-1.75772 1.67554,-0.23747 2.39817,-1.08386 2.62757,-3.07756 0.27388,-2.38028 0.75992,-2. 75 3.61514,-2.75 4.71198,0 8.56844,3.32979 8.56844,7.39827 0,5.68115 -7.12875,9.96681 -12.6917,7.62998 z m 57.68531,164.86465 c -8.79916,-7.4381 -18.50319,-9.56914 -29.04301,-6.37794 -4.26135,1.29023 -5.9506,2.28975 -5.9506,3.52092 0,3.4988 2.32438,4.02899 8.06939,1.84061 7.61935,-2.90235 15.80956,-2.29493 23.58167,1.74891 3.21692,1.67376 6.07106,2.85815 6.34255,2.63197 0.27148,-0.22619 -1.07852,-1.7402 -3,-3.36447 z m -84.20158,-6.11518 c 6.81722,-9.10353 17.74565,-19.20927 34.5347,-31.93494 16.06638,-12.17791 19.79317,-15.47074 28.49442,-25.17647 12.1387,-13.53999 12.0127,-15.32805 -0.35512,-5.03958 -4.38132,3.6447 -15.61603,12.36806 -24.96603,19.38525 -26.59377,19.95865 -34.57377,28.16714 -42.39781,43.61172 -5.28568,10.43391 -3.51844,10.11512 4.68984,-0.84598 z M 140,340.03702 c 0,-1.07964 -0.93323,-4.3306 -2.07384,-7.22436 -4.79027,-12.153 -10.43115,-34.41038 -16.9773,-66.98777 -7.23246,-35.99289 -9.44459,-44.68379 -13.64961,-53.62596 -2.436,-5.18025 -3.91905,-6.04549 -5.38104,- 3.13941 -0.39858,0.79226 -3.653069,7.51548 -7.232208,14.94048 -3.579139,7.425 -13.730817,25.03076 -22.559285,39.12391 -8.828468,14.09315 -18.517355,30.29315 -21.530861,36 -6.392997,12.10679 -11.934338,25.5194 -11.100555,26.86849 0.641041,1.03722 0.757042,1.02052 21.504699,-3.09723 7.975,-1.58279 14.784644,-2.8817 15.132542,-2.88648 0.347898,-0.005 2.597898,3.02691 5,6.73708 C 86.426987,334.92331 91.745969,341 93.609411,341 c 0.757177,0 4.532943,-3.15 8.390589,-7 3.85765,-3.85 7.44674,-7 7.97577,-7 0.52903,0 4.11041,2.03679 7.95864,4.52619 7.37606,4.77155 18.70534,10.47169 20.81559,10.47302 0.6875,4.3e-4 1.25,-0.88255 1.25,-1.96219 z M 199,245 c 2.66626,-2.66626 2.52103,-5.22733 -0.5,-8.81763 -3.1482,-3.74142 -3.14913,-6.56393 -0.004,-12.76289 2.98004,-5.87392 2.92207,-5.41948 0.69128,-5.41948 -2.40141,0 -6.701,4.59033 -8.63404,9.21788 -0.85418,2.04484 -1.55305,6.22779 -1.55305,9.29546 0,4.58853 0.43525,6.01282 2.45455,8.03211 2.97757,2.97758 4.90624,3.09376 7.54545,0.45455 z m 117.6 4123,-15.55032 c 3.76888,-3.76888 2.20152,-8.98559 -3.51935,-11.71362 -4.36386,-2.08094 -3.85297,-10.14832 1.07265,-16.9381 2.16782,-2.98826 -0.0203,-3.17903 -4.26258,-0.37162 -9.57842,6.33869 -11.51478,25.47018 -3.0439,30.07402 3.89868,2.11889 6.90777,1.79473 9.75318,-1.05068 z M 167,178.18366 c 0,-2.09899 -0.48052,-6.41572 -1.06783,-9.59275 -0.95228,-5.15136 -0.78557,-6.76038 1.54061,-14.86987 3.15867,-11.01166 7.43412,-19.28894 13.37817,-25.90016 4.76594,-5.30087 5.09036,-6.77488 3.26197,-14.82088 -1.41968,-6.24742 -0.20175,-7.20982 9.86129,-7.79237 7.67913,-0.44453 8.04556,-0.57232 7.42024,-2.58763 C 199.1946,95.530209 189.921,79.960097 176.06914,60.099519 172.6638,55.216997 172.25754,52.861078 174.5,51 c 2.35308,-1.952884 1.79149,-4.299457 -2.12359,-8.873356 -4.92626,-5.755225 -6.88848,-5.291356 -10.03957,2.373356 -3.95197,9.612737 -8.94298,27.980024 -11.34395,41.746551 -1.96478,11.265495 -2.16419,15.099849 -1.71623,32.999999 0.56946,22.75515 2.21316,31.37955 9.20075,48.27561 6 .10618,14.76481 8.52259,17.78767 8.52259,10.6615 z m 52.4433,-1.40617 c 2.17796,-3.10947 1.95365,-5.58822 -1.05138,-11.61854 C 215.59148,159.5392 210.13986,155 206.19094,155 202.56478,155 198,160.16903 198,164.27519 198,171.42309 206.02272,179 213.59118,179 c 3.30514,0 4.6543,-0.51238 5.85212,-2.22251 z m -29.38388,-21.7855 c 6.24282,-10.63565 18.23611,-24.61244 29.44563,-34.31545 8.17687,-7.07793 28.17503,-20.84401 32.87782,-22.632008 3.67584,-1.397551 3.25794,-2.772258 -1.25366,-4.123965 -3.68463,-1.103944 -4.22566,-0.954065 -11.25,3.116568 -17.97488,10.416515 -34.80273,25.557775 -44.32693,39.884225 -5.28731,7.95324 -11.23366,20.13932 -12.19132,24.98413 -1.00509,5.08474 0.67162,3.3542 6.69846,-6.9135 z m 123.72382,6.60126 c 5.66251,-2.88933 9.60671,-6.85386 11.53381,-11.59325 2.14917,-5.28555 0.13334,-9.03619 -5.93258,-11.03813 -2.93136,-0.96743 -4.1283,-0.7686 -9.12908,1.5165 -7.16391,3.27353 -11.29523,7.20157 -14.28267,13.57986 l -2.31684,4.94657 2.34637,2.4976 c 3.24035,3.44919 11.12041,3.48945 17.78099,0.0909 z M 428.36657,150.25 c 4.39516,-8.69779 8.21516,-22.18929 11.82117,-41.75 3.74949,-20.339062 3.63759,-65.635818 -0.16796,-67.987775 C 438.4204,39.523753 416.56171,57.527346 403.00369,71 c -15.55396,15.456024 -33.52878,37.80825 -31.79678,39.54025 0.27478,0.27477 4.27813,-0.40622 8.89634,-1.51332 8.03314,-1.92575 17.917,-2.67334 19.14245,-1.44789 0.31848,0.31847 -0.0964,2.56135 -0.92194,4.98417 -0.82554,2.42282 -1.31657,4.95836 -1.09119,5.63451 0.22539,0.67616 3.9674,2.60701 8.31559,4.29077 5.93595,2.2986 8.44249,3.85781 10.05981,6.25775 1.78069,2.64236 4.65828,12.54501 6.97519,24.00376 0.73927,3.65618 3.21291,2.58689 5.78341,-2.5 z M 281,80.647789 c 9.1174,-1.864977 10.5,-2.411141 10.5,-4.147789 0,-2.999324 -4.15776,-3.034523 -15.84972,-0.134183 -5.58265,1.384849 -13.07528,2.820272 -16.65028,3.189831 -7.33128,0.757856 -8.8177,1.311527 -6.85676,2.554039 2.42076,1.533874 18.09257,0.739932 28.85676,-1.461898 z m 72.29516,-18.484587 c 22.19535,-14.900324 47.15889,-27.311429 77.8766,-38.717857 6.78053,-2.51782 12.75574,-4.99804 13.27824,-5.5116 1.98378,-1.949839 -5.59551,-0.838359 -17.10871,2.50894 -22.03372,6.405988 -46.31959,17.818179 -66.84129,31.409432 -14.72723,9.753653 -18.04125,12.463105 -17.10229,13.982372 1.15135,1.862926 2.27412,1.446455 9.89745,-3.671287 z" - id="path6" /> - <path - style="fill:#fb6d1c" - d="m 249,508.42704 c -23.97668,-2.7568 -36.99205,-5.74796 -46.45278,-10.67567 -3.77781,-1.9677 -8.93167,-6.09626 -13.73331,-11.00121 l -7.68609,-7.85147 -8.31391,1.61594 c -12.73543,2.47532 -37.16034,3.01645 -49.64462,1.09987 C 89.206943,476.40062 59.509179,458.20593 41.371327,431.5 33.861077,420.44201 30.196148,413.1796 26.232017,401.5 20.243105,383.85475 18.675433,366.29925 21.454571,348 25.133995,323.77281 34.319298,302.04782 54.007918,271.00514 57.672468,265.22731 64.664758,254.2 69.546338,246.5 c 9.878078,-15.58126 17.726207,-30.43681 21.977201,-41.60016 5.186371,-13.61969 9.547061,-15.15738 15.980001,-5.63494 5.44515,8.06026 10.73198,26.0104 17.01432,57.76801 10.03647,50.73495 14.33942,65.11105 26.629,88.96709 11.44231,22.21136 34.99204,55 39.50256,55 0.87887,0 5.79907,-4.01631 10.93379,-8.92512 5.13471,-4.90882 18.01655,-15.43224 28.62631,-23.38537 C 250.78408,353.26671 263,342.72386 263,340.38997 c 0,-1.99659 -2.50795,-2.79173 -18.44853,-5.84908 -24.46058,-4.69145 - 53.2561,-15.49205 -71.17541,-26.69642 C 161.06536,300.14699 160,299.00446 160,293.49948 c 0,-4.36388 -0.35173,-4.9429 -6.96338,-11.46336 -7.8935,-7.78463 -11.02746,-12.36678 -11.03288,-16.13113 -0.005,-3.39447 2.20923,-5.27149 9.37709,-7.94946 7.00521,-2.61721 13.24441,-7.94628 15.75351,-13.45553 1.47178,-3.2316 1.8145,-6.49729 1.78409,-17 -0.0534,-18.44398 -0.63514,-20.94395 -7.13878,-30.67899 -6.94684,-10.39845 -10.52858,-17.58707 -15.10748,-30.32101 -4.59789,-12.78676 -6.2512,-19.47792 -8.14336,-32.95722 -1.92922,-13.74333 -1.92847,-22.87426 0.003,-38.476666 1.84395,-14.894303 4.33294,-26.416244 8.38386,-38.810213 C 154.18824,34.005557 158.57353,27 165.22919,27 c 4.81792,0 26.78371,5.701315 39.09565,10.147442 16.04821,5.795383 37.23776,16.381346 51.62943,25.793247 12.37157,8.090788 16.17365,9.404508 16.85597,5.82419 0.18187,-0.954316 -1.2627,-4.329316 -3.21015,-7.5 -5.78266,-9.414836 -8.12917,-19.116593 -5.97891,-24.720077 1.05056,-2.737721 6.21752,-4.793499 10.2503,-4.078287 14. 17164,2.513336 32.7055,10.382698 47.23628,20.056232 C 326.45904,56.085236 331.27445,59 331.80867,59 c 0.53422,0 3.83332,-2.110894 7.33132,-4.690875 22.40062,-16.521755 47.82957,-30.369446 71.18589,-38.765275 14.49011,-5.208716 34.21183,-10.3225266 43.20037,-11.2017845 5.50099,-0.5381058 6.30038,-0.358827 9.17121,2.0568196 3.45171,2.904419 6.97358,11.0833109 10.86849,25.2400649 12.85158,46.711355 8.75113,100.3922 -11.02713,144.36105 -4.66653,10.37411 -4.71773,10.60201 -4.27032,19.00829 0.89673,16.84836 8.49137,25.45 26.48417,29.99582 8.04248,2.0319 8.93146,6.85652 3.03951,16.49589 -14.08852,23.04916 -33.7132,41.59727 -61.54218,58.16613 l -11.25,6.69804 0.007,5.06791 c 0.0152,11.00657 5.62489,28.83867 14.75852,46.91452 l 5.48072,10.84661 -1.92227,2.57467 c -1.1236,1.50494 -4.18702,3.33955 -7.37313,4.41561 -2.99797,1.01251 -5.98542,2.55824 -6.63877,3.43495 -0.83276,1.11745 -1.0128,4.68656 -0.60217,11.9377 0.67483,11.91653 -0.2034,14.24663 -6.48579,17.2079 l -3.72412,1.7554 v 25.49028 c 0,20.2631 0.38381,27.7804 1.87165,36.65803 1.82887,10.91248 1.82887,11.25471 0,14.97216 -4.56179,9.27253 -18.70678,10.56563 -34.04209,3.11205 -5.15994,-2.50794 -6.88804,-1.91902 -7.74308,2.63876 -0.99744,5.31678 -4.92574,9.33558 -10.84303,11.09283 -10.10549,3.00101 -20.09635,1.61454 -34.02097,-4.7212 l -6.77752,-3.0838 -2.72248,2.60768 c -6.28804,6.02288 -18.60486,8.60342 -43.6717,9.14979 -9.92793,0.2164 -19.62578,0.21236 -21.55078,-0.009 z m 21,-13.50687 c -1.1338,-0.79306 -0.58451,-0.96041 2.25,-0.68549 2.0625,0.20005 3.75,0.004 3.75,-0.43548 0,-0.43956 0.91583,-0.7992 2.03518,-0.7992 3.32634,0 6.96482,-2.9709 6.96482,-5.68694 0,-1.35131 1.2256,-4.54825 2.72355,-7.10431 1.49796,-2.55607 2.81393,-5.26317 2.92439,-6.01578 0.11046,-0.75262 0.88437,-2.12369 1.71981,-3.04683 4.03562,-4.45932 3.85727,-19.59056 -0.33607,-28.51083 -1.68467,-3.58372 -1.87333,-3.73515 -1.41442,-1.13531 l 0.52955,3 -2.5734,-2.80576 C 285.687,438.54721 285.22257,436 287.53518,436 c 1.20792,0 1.31451,-0.41234 0.5,-1.93426 C 287.46583,433.0019 287,431.25611 287,430.1862 c 0,-2.11133 -6.38222,-7.8003 -11.99203,-10.68943 -5.45189,-2.8078 -15.35331,-3.0558 -22.44685,-0.56221 -6.66202,2.34189 -7.85883,1.86265 -7.38396,-2.95678 0.51554,-5.23225 6.01173,-9.02537 13.96146,-9.63531 3.49876,-0.26844 9.24021,-1.16795 12.75877,-1.99891 9.6266,-2.27346 16.46733,-0.52123 19.44917,4.98185 0.94608,1.74602 3.67402,5.26502 6.06207,7.81999 5.30445,5.67521 10.37371,15.47226 8.8132,17.03277 -0.75623,0.75623 -0.73733,1.7911 0.0649,3.55173 1.03323,2.26768 1.52839,2.43163 5.67267,1.87825 l 4.54063,-0.60631 -4.30988,2.59147 c -2.37043,1.4253 -4.65961,3.56239 -5.08706,4.74908 -1.17409,3.25946 0.16711,21.3314 1.69646,22.85879 1.06532,1.06396 1.96643,0.8846 5,-0.99517 7.07272,-4.38267 16.031,-8.13904 24.84001,-10.41588 4.87326,-1.25957 9.21018,-2.74013 9.6376,-3.29013 0.89518,-1.1519 0.41459,-4.31275 -1.82937,-12.03169 -1.85548,-6.38262 -3.57382,-8.41661 -7.26919,-8.60449 -2.32382,-0.11815 -2.38353,-0.19319 -0.450 87,-0.56663 2.09385,-0.40458 2.19356,-0.802 1.65945,-6.61382 -0.31254,-3.40085 -1.00513,-7.62383 -1.53909,-9.3844 -0.60083,-1.98104 -0.61822,-3.88667 -0.0456,-5 0.50887,-0.98943 1.20934,-4.27397 1.55661,-7.29897 0.34727,-3.025 0.88491,-6.625 1.19475,-8 0.48483,-2.15161 -0.27348,-3.1271 -5.44148,-7 -9.09192,-6.81348 -21.8873,-27.72909 -23.55284,-38.5 -0.54786,-3.54296 -0.35291,-3.31078 1.70619,2.03202 1.27859,3.31761 4.00587,8.7995 6.06061,12.18198 4.76907,7.85073 16.65835,20.60664 22.2741,23.89768 3.32283,1.94731 4.46069,3.28465 4.86273,5.71524 0.28867,1.7452 1.44014,9.02308 2.55883,16.17308 2.22714,14.23459 5.65735,28.18374 7.1588,29.11169 1.51947,0.93908 14.15469,-7.98731 22.48021,-15.88158 4.1938,-3.97656 10.02869,-10.65409 12.96642,-14.83896 5.27733,-7.51769 5.40352,-7.61622 10.53164,-8.22357 2.85467,-0.3381 5.58868,-1.18911 6.07558,-1.89115 0.85718,-1.23591 0.36094,-15.35635 -0.8787,-25.00336 -0.57211,-4.45223 -0.45103,-4.78639 2.08346,-5.75 1.47998,-0.56269 4.26616,-1.02307 6. 19151,-1.02307 1.92535,0 4.36416,-0.46214 5.41958,-1.02698 1.81459,-0.97114 1.64626,-1.55568 -3.09574,-10.75 -5.65912,-10.97254 -10.01258,-23.69481 -12.75745,-37.28152 -1.26085,-6.24106 -2.45988,-9.66039 -3.70739,-10.57259 -1.01411,-0.74153 -1.65169,-1.49706 -1.41684,-1.67894 0.23485,-0.18188 5.81394,-3.842 12.39798,-8.13361 17.23817,-11.23617 26.57775,-18.56449 38.88955,-30.51475 C 463.72307,257.01273 478,239.21923 478,236.08685 c 0,-2.67479 -13.4908,-7.33513 -30.5,-10.53609 l -7,-1.31733 5.25,-0.11672 c 2.95491,-0.0657 5.25,-0.57967 5.25,-1.17573 0,-0.58246 0.52647,-0.73364 1.16994,-0.33595 0.82843,0.512 0.93345,0.16434 0.35978,-1.19099 -3.30262,-7.80267 -5.71658,-15.58762 -6.59138,-21.25701 -0.56495,-3.66136 -1.29053,-8.33773 -1.61241,-10.39192 -0.41665,-2.65911 0.0516,-5.21533 1.62585,-8.87466 1.21609,-2.82687 2.35888,-5.87117 2.53955,-6.76511 0.18066,-0.89394 2.14192,-5.45034 4.35836,-10.12534 9.85285,-20.78202 15.98066,-54.69747 14.8157,-82 -0.85609,-20.063599 -4.93321,-44.031 406 -9.40316,-55.277558 -1.31837,-3.316946 -1.64943,-3.575168 -2.71514,-2.117725 -1.12724,1.541594 -1.4059,1.5339 -3.91178,-0.108016 -3.60673,-2.363218 -9.33781,-1.634011 -23.18055,2.949428 -5.92595,1.962129 -10.95864,3.383327 -11.18375,3.158219 -0.44629,-0.446295 23.87956,-10.102067 28.15118,-11.174175 1.94503,-0.488171 2.36401,-0.982857 1.60601,-1.896191 -3.1737,-3.824077 -36.67353,7.06989 -62.96972,20.477418 -11.08829,5.653539 -32.27424,19.016251 -38.55848,24.320169 -2.7202,2.295855 -2.85504,2.680004 -1.4457,4.118805 1.41584,1.445446 2.30664,1.126699 10,-3.57822 C 367.93373,54.384103 369,53.777933 369,54.375544 c 0,0.315203 -1.32955,1.260635 -2.95457,2.100961 C 362.52821,58.295333 353,67.611698 353,69.231895 353,71.59394 348.76233,79 347.41079,79 c -0.77593,0 -1.41595,0.3375 -1.42226,0.75 -0.006,0.4125 -1.81768,1.615425 -4.02526,2.673167 -3.86494,1.851851 -4.15062,1.857914 -7.70383,0.16351 -5.02735,-2.397376 -11.39549,-7.557522 -10.70518,-8.674473 0.50089,-0.810459 -0.8266,-1.321 437 -2.73633,-1.053269 -0.37514,0.05268 -2.33628,-0.595394 -4.35809,-1.44016 -2.0218,-0.844765 -3.88898,-1.322967 -4.14928,-1.062671 -0.26029,0.260297 -2.34916,-0.378459 -4.64191,-1.419456 -4.40387,-1.999521 -8.62771,-2.730167 -5.62756,-0.973464 0.84759,0.496302 1.64957,2.513253 1.78216,4.482112 0.20476,3.040259 -0.15033,3.728563 -2.35618,4.567224 C 297.36143,78.57348 294.17324,78.192225 293,76 c -1.44145,-2.693377 -5.65652,-2.598123 -17.2375,0.389542 -5.09437,1.314249 -12.52678,2.710098 -16.51645,3.101889 -3.98968,0.39179 -7.49076,1.095495 -7.78018,1.563788 -1.07424,1.738154 8.0994,3.179816 17.03413,2.676959 4.95,-0.278591 8.2125,-0.299305 7.25,-0.04603 -1.23845,0.325889 -1.75,1.466471 -1.75,3.901875 0,2.79177 -0.59764,3.804818 -3.16607,5.366773 -1.74133,1.05897 -5.33478,2.445668 -7.98544,3.081552 -4.28028,1.026822 -5.30378,0.921661 -9.14966,-0.940098 C 251.31718,93.943313 248.80164,93 248.10875,93 c -2.12956,0 -15.1261,7.95271 -24.74723,15.14307 -15.7626,11.78019 -28.01805,26.5032 4 -35.93094,43.16553 -3.61128,7.60433 -5.77688,16.64149 -3.67682,15.34359 0.58199,-0.35969 2.76215,-3.56691 4.84481,-7.12715 2.08265,-3.56024 3.91179,-6.34801 4.06476,-6.19505 0.3413,0.3413 -2.58199,10.41314 -3.82251,13.17001 -0.49497,1.1 -1.04091,6.275 -1.2132,11.5 -0.17229,5.225 -0.90691,12.09337 -1.63249,15.26305 -1.25344,5.47564 -1.21141,5.87783 0.84282,8.06445 1.18913,1.26577 2.16205,2.78242 2.16205,3.37032 0,1.47878 3.50336,2.27517 10,2.27321 3.71796,-0.001 5.03089,-0.29844 4.05215,-0.91764 -2.44922,-1.5495 2.86932,-3.41394 6.16467,-2.16105 2.38977,0.90858 9.04441,9.77594 10.52812,14.02881 0.30295,0.86837 1.51202,2.92885 2.6868,4.57885 1.17479,1.65 2.72091,4.34132 3.43581,5.98072 l 1.29982,2.98072 -2.18606,-1.97836 c -1.20234,-1.0881 -2.86044,-3.28245 -3.68467,-4.87634 -2.20803,-4.26986 -3.46601,-1.48619 -2.71075,5.99836 1.58974,15.75406 -6.11118,28.40216 -17.28623,28.39116 -5.17286,-0.005 -9.71805,-3.02097 -13.28193,-8.81302 -3.06783,-4.98587 -6.76984,-7.57251 -8.92845,-6.238 42 -0.67459,0.41692 -2.25247,2.9624 -3.50639,5.65661 -2.54953,5.47802 -9.31991,12.20344 -15.41563,15.31324 -2.21736,1.13121 -4.33216,2.54312 -4.69955,3.13757 -0.68615,1.11023 9.29109,11.47075 15.53229,16.12896 l 3.5,2.61228 -1.90444,3.26899 -1.90444,3.269 2.35645,1.90813 c 3.57376,2.89385 14.61156,9.15051 22.45243,12.72691 23.61907,10.77321 46.14803,17.34776 72,21.01151 8.25,1.16919 17.25,2.60624 20,3.19343 2.75,0.5872 9.1625,1.26972 14.25,1.51671 l 9.25,0.44908 -0.116,3.18138 c -0.0638,1.74976 -0.32174,2.39419 -0.57319,1.43206 -0.60358,-2.30942 -4.1973,-3.1616 -13.31081,-3.15641 -9.43482,0.005 -14,2.05893 -14,6.29764 0,2.18631 -1.05093,3.65932 -4.56298,6.39552 -2.50963,1.95524 -7.38479,6.85294 -10.83368,10.88378 -8.7434,10.2187 -17.18511,17.87414 -31.12367,28.22477 -6.58882,4.89279 -12.54217,9.33539 -13.22967,9.87245 -0.6875,0.53705 -1.25,0.74302 -1.25,0.45771 0,-0.28531 6.1875,-5.25173 13.75,-11.03648 7.5625,-5.78476 15.81947,-12.55884 18.34881,-15.05351 8.42761,-8.3121 18.86283,- 20.34117 18.21123,-20.99278 -1.38572,-1.38572 -3.16729,-0.40271 -10.84401,5.98336 -4.38132,3.6447 -15.84103,12.51481 -25.46603,19.71136 -20.3255,15.19724 -32.77661,27.19964 -38.55626,37.16679 -5.44219,9.38518 -6.99292,13.34594 -5.72262,14.61624 0.67981,0.67981 2.5993,-1.21763 5.87308,-5.80563 6.13483,-8.59756 10.32196,-13.2342 16.78158,-18.58317 4.27939,-3.54359 3.60876,-2.55093 -4.12108,6.10005 -5.0777,5.6828 -10.41814,12.6578 -11.86763,15.5 -2.3567,4.6211 -2.64241,6.33099 -2.70146,16.16763 -0.0913,15.21543 1.54886,30.56897 3.57461,33.46113 1.98133,2.82874 9.90105,7.28631 17.0224,9.58095 2.86956,0.92463 6.74799,2.55593 8.61873,3.62511 3.10506,1.77462 13.0275,3.58434 29.36215,5.35525 3.16993,0.34367 5.50587,1.04171 5.19099,1.5512 -0.32858,0.53165 2.11566,0.91984 5.73649,0.91105 4.69288,-0.0114 5.92477,-0.28408 4.80902,-1.06452 z m -19.1875,-67.60328 c 0.72187,-0.28887 1.58437,-0.25335 1.91667,0.0789 0.33229,0.33229 -0.25834,0.56864 -1.3125,0.52522 -1.16495,-0.048 -1.4019,-0.28494 -0 .60417,-0.60416 z M 275,425.95069 c -2.475,-1.01306 -3.92305,-1.8664 -3.21788,-1.89631 1.61958,-0.0687 8.21788,2.65689 8.21788,3.39459 0,0.30307 -0.1125,0.50437 -0.25,0.44734 -0.1375,-0.057 -2.275,-0.93255 -4.75,-1.94562 z m -21,0.6563 c 0,-0.21616 0.69837,-0.661 1.55194,-0.98855 0.88992,-0.34149 1.29132,-0.17385 0.94098,0.39301 C 255.90566,426.96166 254,427.4169 254,426.60699 Z M 311.15789,344 c 0,-1.375 0.22698,-1.9375 0.50439,-1.25 0.27741,0.6875 0.27741,1.8125 0,2.5 -0.27741,0.6875 -0.50439,0.125 -0.50439,-1.25 z M 196.9157,292.89822 c 2.31219,-3.80209 1.44133,-7.87235 -2.5831,-12.07294 C 192.84387,279.27137 192.15719,278 192.80664,278 194.4606,278 200,285.88995 200,288.24575 200,290.43186 196.98343,296 195.79909,296 c -0.42333,0 0.0791,-1.3958 1.11661,-3.10178 z m -14.359,-6.12073 c -1.91,-2.72691 -1.99226,-5.79957 -0.22014,-8.22309 1.18297,-1.61781 1.35799,-1.22231 1.52307,3.44169 0.10258,2.89825 0.42768,5.65978 0.72246,6.13673 1.1671,1.88842 -0.56542,0.72906 -2.02539,-1.35533 z m 44.63186,-5.81645 c -3.76001,-3.50298 -2.49764,-7.0488 1.5624,-4.38856 3.16427,2.0733 5.01227,1.23844 6.81638,-3.0794 l 1.47703,-3.53503 3.70995,2.52097 c 4.76069,3.23497 5.58832,3.17572 8.55294,-0.61237 1.38197,-1.76583 2.94113,-2.83117 3.57247,-2.44098 2.05,1.26697 1.19012,5.60501 -1.62973,8.22186 -2.36268,2.1926 -3.36257,2.46834 -7.09929,1.95777 -3.43956,-0.46996 -4.87965,-0.17708 -6.88486,1.40022 -3.25494,2.56034 -7.30051,2.54248 -10.07729,-0.0445 z M 353.5,277.83574 c 1.1,-0.60689 3.2375,-2.25239 4.75,-3.65668 1.5125,-1.40428 2.75,-2.05905 2.75,-1.45504 0,1.59978 -5.86657,6.28119 -7.82673,6.24557 -1.37673,-0.025 -1.31883,-0.22596 0.32673,-1.13385 z M 334.97423,273.25 c -1.74393,-2.20909 -2.0815,-3.69071 -1.71624,-7.53263 0.4868,-5.1203 3.04535,-8.76448 7.94235,-11.31238 4.10965,-2.13825 4.11686,-1.72245 0.035,2.01662 -3.72297,3.4103 -3.73531,3.4483 -3.73531,11.49783 0,4.44193 -0.0798,8.0772 -0.17742,8.07839 -0.0976,0.001 -1.15434,-1.23533 -2.34835,-2.74783 z m 26.83194,-7. 789 c -0.36947,-1.67145 -2.64596,-5.15895 -5.05886,-7.75 -4.82633,-5.18268 -4.83447,-5.67127 -0.0459,-2.75148 3.83094,2.33585 6.53989,7.15924 6.09754,10.85688 L 362.47795,268.5 Z M 225.3083,260.02825 c -2.76233,-1.16037 -5.70333,-5.55643 -4.9794,-7.44297 0.30184,-0.78658 1.58882,-1.57756 2.85995,-1.75772 1.67554,-0.23747 2.39817,-1.08386 2.62757,-3.07756 0.27388,-2.38028 0.75992,-2.75 3.61514,-2.75 4.71198,0 8.56844,3.32979 8.56844,7.39827 0,5.68115 -7.12875,9.96681 -12.6917,7.62998 z m 90.45574,-14.96445 c -4.97944,-1.60765 -9.75243,-5.18657 -12.77407,-9.57838 -4.13106,-6.00429 -5.01649,-8.71682 -6.03404,-18.48542 -1.2959,-12.44072 0.78116,-18.26897 9.35493,-26.25 3.92118,-3.65009 4.23073,-3.75 11.61828,-3.75 6.50676,0 7.76799,-0.28539 8.83879,-2 1.43802,-2.30264 5.75265,-2.57002 11.19162,-0.69356 2.90873,1.00353 3.59075,1.82837 4.28363,5.18065 0.46655,2.25728 2.14679,5.35179 3.87283,7.1326 2.99279,3.08778 3.39453,4.54708 3.74159,13.59135 0.22769,5.93376 3.00692,7.75949 12.08096,7. 93626 l 7.56144,0.1473 -8.5,0.73334 c -10.49624,0.90557 -11.52453,1.3246 -12.99127,5.29392 -3.74442,10.13326 -6.87977,14.34618 -13.61373,18.29254 -4.79453,2.80978 -13.83386,3.99818 -18.63096,2.4494 z m 0.87719,-15.61412 c 3.76888,-3.76888 2.20152,-8.98559 -3.51935,-11.71362 -4.36386,-2.08094 -3.85297,-10.14832 1.07265,-16.9381 2.16782,-2.98826 -0.0203,-3.17903 -4.26258,-0.37162 -9.57842,6.33869 -11.51478,25.47018 -3.0439,30.07402 3.89868,2.11889 6.90777,1.79473 9.75318,-1.05068 z m -58.06929,4.75529 c 3.81043,-2.63727 11.60357,-8.28527 17.31809,-12.55112 10.31148,-7.69744 18.11161,-12.40305 18.10818,-10.92417 -9.8e-4,0.42367 -2.07697,2.0814 -4.6133,3.68383 -2.53634,1.60242 -10.07303,6.93755 -16.74821,11.85582 C 261.61668,234.38888 254.273,239 252.36178,239 c -0.39485,0 2.39972,-2.15776 6.21016,-4.79503 z M 434.75,223.33772 c 0.6875,-0.27741 1.8125,-0.27741 2.5,0 0.6875,0.27741 0.125,0.50439 -1.25,0.50439 -1.375,0 -1.9375,-0.22698 -1.25,-0.50439 z m -5.9375,-1.02083 c 0.72187,-0.2888 7 1.58438,-0.25335 1.91667,0.0789 0.33229,0.33229 -0.25834,0.56864 -1.3125,0.52522 -1.16495,-0.048 -1.4019,-0.28494 -0.60417,-0.60416 z m -8.0625,-0.97917 c 0.6875,-0.27741 1.8125,-0.27741 2.5,0 0.6875,0.27741 0.125,0.50439 -1.25,0.50439 -1.375,0 -1.9375,-0.22698 -1.25,-0.50439 z m -7.5,-1.02705 c 0.9625,-0.25152 2.5375,-0.25152 3.5,0 0.9625,0.25153 0.175,0.45733 -1.75,0.45733 -1.925,0 -2.7125,-0.2058 -1.75,-0.45733 z M 391,218.89427 c -17.34613,-1.23703 -18.26245,-1.8208 -2,-1.27418 7.975,0.26806 16.3,0.86145 18.5,1.31865 l 4,0.83126 -4.5,-0.0278 c -2.475,-0.0153 -9.675,-0.39686 -16,-0.84792 z m -20.1875,-1.57738 c 0.72187,-0.28887 1.58438,-0.25335 1.91667,0.0789 0.33229,0.33229 -0.25834,0.56864 -1.3125,0.52522 -1.16495,-0.048 -1.4019,-0.28494 -0.60417,-0.60416 z M 206.03428,179.75 c -2.41422,-1.2375 -5.07117,-3.375 -5.90432,-4.75 -1.23649,-2.04065 -0.83842,-1.86879 2.16649,0.93539 3.16653,2.95499 4.52685,3.49654 9.72803,3.87276 4.815,0.34829 6.44688,0.0752 8.01112,-1.34037 1.08042 ,-0.97777 1.9644,-1.30977 1.9644,-0.73778 0,1.79405 -4.78545,4.27 -8.25293,4.27 -1.82781,0 -5.29857,-1.0125 -7.71279,-2.25 z M 222.15275,173 c -0.10817,-1.925 -1.09479,-5.4795 -2.19248,-7.8989 -2.57551,-5.67659 -1.75625,-6.58167 1.02422,-1.13151 1.46669,2.87495 2.00655,5.45808 1.74447,8.34691 -0.35789,3.94477 -0.39077,3.98377 -0.57621,0.6835 z M 302,166.64584 l -5.5,-1.06631 7.5,-0.60058 c 8.28717,-0.66362 12.06857,-2.27368 18.28512,-7.78552 l 4.16565,-3.69343 -3.17288,4.07762 c -3.5928,4.61726 -9.56446,8.96327 -13.27789,9.66327 -1.375,0.2592 -4.975,-0.009 -8,-0.59505 z M 293.51332,153.5 c 0.78805,-3.8898 5.29492,-9.48921 9.5927,-11.91813 3.1643,-1.78833 3.07686,-1.60751 -1.29206,2.67188 -2.57732,2.52451 -5.63607,6.31267 -6.79723,8.41814 -1.99596,3.61916 -2.07802,3.66436 -1.50341,0.82811 z m 134.67243,0.98837 c 0.17284,-0.5564 1.52922,-4.1564 3.01418,-8 3.98221,-10.30734 7.49427,-23.44158 9.89058,-36.98837 3.69066,-20.863985 3.73307,-70.5 0.0602,-70.5 -2.19558,0 -26.74444,20.644362 -38.64678,32.5 -14.09966,14.044342 -30.08749,33.82405 -31.11934,38.5 -1.05455,4.77883 -1.28979,5 -5.31806,5 -5.15355,0 -6.53754,-2.30459 -5.63917,-9.39022 0.99443,-7.843291 2.45977,-11.583083 7.09585,-18.10978 6.03848,-8.501006 31.92194,-34.569703 38.47675,-38.752105 3.025,-1.930152 7.1754,-5.07514 9.2231,-6.988863 2.04771,-1.913723 3.96021,-3.242392 4.25,-2.952597 0.2898,0.289794 0.5269,-0.02106 0.5269,-0.690795 0,-1.948902 7.06874,-4.368531 12.42048,-4.25153 3.63207,0.07941 5.55449,0.700431 7.34182,2.371731 3.49356,3.266766 4.10392,4.754371 5.73538,13.97851 2.51467,14.217777 1.70483,37.869066 -2.06425,60.285649 -1.93534,11.51043 -10.82922,39.5901 -13.5104,42.65492 -1.12835,1.28979 -1.91012,1.88985 -1.73728,1.33345 z M 418.16729,143.94844 C 415.33441,133.36405 412.62172,129.84183 403.93294,125.46623 400.11982,123.54597 397,121.77977 397,121.54133 c 0,-0.63245 9.94593,2.38657 13.79405,4.18709 4.13102,1.93289 5.67252,4.90638 8.23029,15.87598 2.65308,11.37831 2.02253,13.10287 -0.85705 ,2.34404 z M 327.14057,150 c 0,-0.825 0.38674,-2.4 0.85943,-3.5 0.54172,-1.26064 0.85943,-1.44548 0.85943,-0.5 0,0.825 -0.38674,2.4 -0.85943,3.5 -0.54172,1.26064 -0.85943,1.44548 -0.85943,0.5 z M 202.5,140 c 0.99549,-1.1 2.03498,-2 2.30998,-2 0.275,0 -0.31449,0.9 -1.30998,2 -0.99549,1.1 -2.03498,2 -2.30998,2 -0.275,0 0.31449,-0.9 1.30998,-2 z m 30.98123,-28.36735 c 4.25991,-3.68163 17.52914,-11.955611 18.16072,-11.32404 0.29237,0.29237 -0.74497,1.311 -2.30519,2.26361 -1.56022,0.95262 -5.08676,3.16145 -7.83676,4.90852 -2.75,1.74708 -6.35,3.97569 -8,4.95248 l -3,1.77597 z m 141.10384,0.43764 c 0.96479,-0.90643 8.27503,-2.67283 7.41493,-1.7917 -0.275,0.28172 -2.26172,0.99351 -4.41493,1.58175 -2.15322,0.58824 -3.50322,0.68271 -3,0.20995 z M 396,111.25 c 0,-1.14583 -0.5625,-2.31031 -1.25,-2.58772 -0.6875,-0.27741 0.003,-0.53991 1.53518,-0.58333 2.57513,-0.073 2.6969,0.0907 1.61455,2.17105 -1.67379,3.21708 -1.89973,3.33601 -1.89973,1 z M 278.75,82.337719 c 0.6875,-0.277412 1.8125,-0.27741 2 2.5,0 0.6875,0.277413 0.125,0.504386 -1.25,0.504386 -1.375,0 -1.9375,-0.226973 -1.25,-0.504386 z M 370,53.570368 c 0,-0.275 0.9,-0.981666 2,-1.570368 1.1,-0.588702 2,-0.845368 2,-0.570368 0,0.275 -0.9,0.981666 -2,1.570368 -1.1,0.588702 -2,0.845368 -2,0.570368 z m 7,-4.063041 c 0,-0.677431 8.12258,-4.718082 8.57497,-4.265695 0.20963,0.209635 -1.63398,1.360179 -4.09691,2.556765 C 379.01513,48.994982 377,49.764001 377,49.507327 Z M 405,35.5 c 1.375,-0.786021 2.95,-1.429129 3.5,-1.429129 0.55,0 -0.125,0.643108 -1.5,1.429129 -1.375,0.786021 -2.95,1.429129 -3.5,1.429129 -0.55,0 0.125,-0.643108 1.5,-1.429129 z m 7,-3 c 1.375,-0.786021 2.95,-1.429129 3.5,-1.429129 0.55,0 -0.125,0.643108 -1.5,1.429129 -1.375,0.786021 -2.95,1.429129 -3.5,1.429129 -0.55,0 0.125,-0.643108 1.5,-1.429129 z m -65.61578,455.08513 c 1.01147,-1.87819 1.58147,-3.83162 1.26667,-4.34098 -0.31479,-0.50935 0.72629,-1.88622 2.31351,-3.05971 2.05014,-1.51574 3.02949,-1.77898 3.38179,-0.90903 0.27275,0.67353 0.53144,0.3051 4 0.57486,-0.81864 0.0906,-2.34535 -4.74294,-19.64155 -5.75131,-20.58023 -1.02859,-0.9575 -13.89483,1.98399 -18.83474,4.30602 -5.25159,2.46854 -6.34616,4.24632 -6.6245,10.75933 -0.1818,4.25419 0.19853,5.35728 2.7895,8.09067 3.4128,3.60039 13.69964,9.08824 18.5226,9.88149 0.28742,0.0473 1.35016,-1.45074 2.36162,-3.32892 z m 46.01099,-14.57123 c 2.14237,-2.17384 4.27987,-3.71471 4.75,-3.42416 1.05258,0.65054 1.05431,0.77775 -0.12909,-9.51584 -0.73377,-6.38256 -0.6713,-8.78523 0.25759,-9.90691 1.56549,-1.8904 1.55663,-18.73665 -0.0107,-20.30396 -1.82591,-1.82591 -7.85773,-0.0672 -12.48872,3.64144 -2.35087,1.88263 -8.66181,6.4107 -14.02431,10.06238 -10.4385,7.10826 -11.57213,8.99821 -8,13.33733 1.7497,2.12539 1.75086,2.12542 6.75,0.22828 6.06644,-2.30219 13.24807,-3.7822 9.86408,-2.03282 -3.42405,1.77009 -4.68157,5.55044 -2.90456,8.73166 0.81989,1.46778 1.7794,3.4562 2.13223,4.4187 0.35283,0.9625 1.03903,1.75 1.52488,1.75 0.48585,0 0.88337,1.05623 0.88337,2.34719 0,2.31906 2.81221,4.460 23 6,4.5683 0.825,0.028 3.25284,-1.72774 5.39521,-3.90159 z m -9.58271,-19.69701 c 0.72187,-0.28887 1.58438,-0.25335 1.91667,0.0789 0.33229,0.33229 -0.25834,0.56864 -1.3125,0.52522 -1.16495,-0.048 -1.4019,-0.28494 -0.60417,-0.60416 z m 4.9375,-0.97917 c 0.6875,-0.27741 1.8125,-0.27741 2.5,0 0.6875,0.27741 0.125,0.50439 -1.25,0.50439 -1.375,0 -1.9375,-0.22698 -1.25,-0.50439 z m 5.0625,-1.02083 c 0.72187,-0.28887 1.58438,-0.25335 1.91667,0.0789 0.33229,0.33229 -0.25834,0.56864 -1.3125,0.52522 -1.16495,-0.048 -1.4019,-0.28494 -0.60417,-0.60416 z m -232.64737,14.77034 c 2.46401,-0.76262 4.33733,-2.27366 5.71628,-4.6108 1.12812,-1.91204 2.74132,-3.47643 3.58486,-3.47643 1.31769,0 1.82715,-0.87177 1.7532,-3 -0.14042,-4.04142 2.07517,-19.69278 3.71336,-26.23189 l 2.12714,-8.4908 -3.56312,-7.01365 c -1.95971,-3.85751 -4.4482,-7.81465 -5.52998,-8.79364 -1.08178,-0.979 -1.96687,-2.30681 -1.96687,-2.95069 0,-0.64389 -1.1054,-2.20917 -2.45644,-3.47841 -4.02897,-3.78502 -11.22885,-15.2161 -12.62 28,-20.04092 -0.71506,-2.475 -2.33988,-5.77218 -3.61072,-7.32707 -2.50985,-3.07083 -3.78891,-6.83267 -3.0193,-8.88002 0.27199,-0.72354 1.18986,0.33028 2.08428,2.39299 1.46352,3.37517 5.91105,10.52599 7.33169,11.78803 0.3257,0.28934 -0.93757,-2.37569 -2.80727,-5.92229 -1.86969,-3.5466 -4.98656,-10.24775 -6.92637,-14.89145 -3.10272,-7.42759 -3.85546,-8.47813 -6.25836,-8.73432 -1.50228,-0.16016 -5.31516,-1.86512 -8.47306,-3.78878 C 123.4331,339.09877 111.26686,330 112.34421,330 c 0.32167,0 3.86331,1.98674 7.87032,4.41497 4.00701,2.42823 9.31047,5.19591 11.78547,6.15038 2.475,0.95448 4.9275,2.11774 5.45,2.58503 3.18261,2.84632 3.44315,-2.81039 0.47616,-10.33772 -4.79027,-12.153 -10.43115,-34.41038 -16.9773,-66.98777 -7.23246,-35.99289 -9.44459,-44.68379 -13.64961,-53.62596 -2.436,-5.18025 -3.91905,-6.04549 -5.38104,-3.13941 -0.39858,0.79226 -3.653069,7.51548 -7.232208,14.94048 -3.579139,7.425 -13.730817,25.03076 -22.559285,39.12391 -17.271872,27.57161 -25.192625,41.82087 -30.139317,54.2 1993 -3.230287,8.09684 -3.302452,11.16341 -0.242326,10.29745 C 42.710283,327.36815 45.975,326.89858 49,326.5978 c 4.839951,-0.48124 5.095344,-0.42269 2.128116,0.48784 -1.854536,0.56909 -4.690126,2.00933 -6.301311,3.20053 -2.363978,1.74776 -3.091444,1.90367 -3.768792,0.8077 -0.650508,-1.05255 -0.985553,-0.89753 -1.489086,0.68896 -1.016984,3.20423 0.325271,7.195 2.180519,6.48307 1.375147,-0.52769 1.483287,0.39143 0.88712,7.53999 -0.832968,9.988 -1.358137,11.50018 -3.774472,10.8683 C 37.23282,356.24812 37,356.80069 37,361.09362 37,364.78818 37.370483,366 38.5,366 c 1.230093,0 1.5,1.7429 1.5,9.68611 0,9.69789 2.130973,21.41403 4.422297,24.31389 0.651874,0.825 2.564477,4.20642 4.250229,7.51426 C 58.956832,427.69448 75.413918,446 83.272103,446 c 0.743479,0 2.349878,1.35 3.569776,3 1.219898,1.65 2.775063,3 3.455924,3 0.68086,0 2.893514,1.125 4.917009,2.5 2.096824,1.42483 5.105688,2.5 6.996248,2.5 3.9047,0 13.85255,3.43646 15.28894,5.28152 3.54254,4.55043 32.0446,7.0928 42.66513,3.80571 z M 87.340342,340.25 c -2.19584,-2.0625 -5.492087,-6.45 -7.324993,-9.75 -1.832906,-3.3 -3.706949,-6.491 -4.16454,-7.09112 -0.591885,-0.77624 -3.215522,-0.56667 -9.091396,0.7262 C 62.216736,325.13461 57.6,325.92454 56.5,325.89049 c -1.1,-0.034 2.725,-1.11639 8.5,-2.4052 5.775,-1.28881 10.762195,-2.03774 11.082656,-1.66429 0.32046,0.37345 3.653141,5.0665 7.405958,10.429 8.544573,12.20957 9.794172,12.49087 17.920436,4.03411 3.02088,-3.14374 5.75131,-5.45708 6.06763,-5.14076 0.31632,0.31631 -2.08716,3.33846 -5.34106,6.71588 -7.101964,7.37157 -9.141585,7.70115 -14.795278,2.39077 z M 199,245 c 2.66626,-2.66626 2.52103,-5.22733 -0.5,-8.81763 -3.1482,-3.74142 -3.14913,-6.56393 -0.004,-12.76289 2.98004,-5.87392 2.92207,-5.41948 0.69128,-5.41948 -2.40141,0 -6.701,4.59033 -8.63404,9.21788 -0.85418,2.04484 -1.55305,6.22779 -1.55305,9.29546 0,4.58853 0.43525,6.01282 2.45455,8.03211 2.97757,2.97758 4.90624,3.09376 7.54545,0.45455 z m -32.29724,-73.25 c -0.49296,-8.5924 -0.25527,-11.38202 1.46978,-17 .25 2.72096,-9.25572 7.69378,-18.95085 12.56652,-24.5 6.08069,-6.92478 6.33747,-7.73169 4.79746,-15.07561 -0.74096,-3.53341 -0.99073,-6.80095 -0.55505,-7.26119 0.43567,-0.46024 4.44307,-1.08704 8.90533,-1.39289 5.25173,-0.35997 8.1132,-0.97216 8.1132,-1.73578 0,-4.01985 -11.56458,-23.836868 -25.93086,-44.435011 -3.61644,-5.185185 -3.84152,-7.445115 -0.94367,-9.474846 2.89699,-2.029132 1.90953,-5.508748 -2.71576,-9.569807 -5.1153,-4.491291 -7.08737,-3.816802 -10.07287,3.445134 -3.95197,9.612737 -8.94298,27.980024 -11.34395,41.746551 -1.96478,11.265495 -2.16419,15.099849 -1.71623,32.999999 0.43303,17.30359 0.86958,21.64033 2.99735,29.77561 3.69113,14.11265 11.7497,32.97784 14.08701,32.97784 0.55085,0 0.69013,-4.17757 0.34174,-10.25 z M 214.8,85.8 c 0.89401,-0.894014 1.48894,-0.911056 2.33317,-0.06683 0.84422,0.844223 2.49076,0.130256 6.4573,-2.8 C 226.51874,80.769925 229.38382,79 229.9573,79 c 2.03288,0 1.13447,-6.836594 -1.18202,-8.994735 -4.52569,-4.216314 -22.66623,-11.391295 -31.8 9641,-12.615721 -5.38118,-0.71384 -5.9852,0.02883 -2.90856,3.576224 1.08367,1.249484 2.22622,3.078081 2.539,4.06355 0.31277,0.985469 1.67613,2.517393 3.02968,3.404275 1.53202,1.003812 2.46101,2.559373 2.46101,4.120845 0,1.379582 0.69417,2.774709 1.5426,3.100282 0.84843,0.325572 2.47788,2.448949 3.62101,4.718615 3.46249,6.874715 5.05597,8.007089 7.63639,5.426665 z" - id="path5" /> - <path - style="fill:#5c5c5b" - d="m 249,508.42704 c -23.97668,-2.7568 -36.99205,-5.74796 -46.45278,-10.67567 -3.77781,-1.9677 -8.93167,-6.09626 -13.73331,-11.00121 l -7.68609,-7.85147 -8.31391,1.61594 c -12.73543,2.47532 -37.16034,3.01645 -49.64462,1.09987 C 89.206943,476.40062 59.509179,458.20593 41.371327,431.5 33.861077,420.44201 30.196148,413.1796 26.232017,401.5 20.243105,383.85475 18.675433,366.29925 21.454571,348 25.133995,323.77281 34.319298,302.04782 54.007918,271.00514 57.672468,265.22731 64.664758,254.2 69.546338,246.5 c 9.878078,-15.58126 17.726207,-30.43681 21.977201,-41.60016 5.186371,-13.61969 9.547061,-15.15738 15.980001,-5.63494 5.44515,8.06026 10.73198,26.0104 17.01432,57.76801 10.03647,50.73495 14.33942,65.11105 26.629,88.96709 11.44231,22.21136 34.99204,55 39.50256,55 0.87887,0 5.79907,-4.01631 10.93379,-8.92512 5.13471,-4.90882 18.01655,-15.43224 28.62631,-23.38537 C 250.78408,353.26671 263,342.72386 263,340.38997 c 0,-1.99659 -2.50795,-2.79173 -18.44853,-5.84908 -24.46058,-4.69145 - 53.2561,-15.49205 -71.17541,-26.69642 C 161.06536,300.14699 160,299.00446 160,293.49948 c 0,-4.36388 -0.35173,-4.9429 -6.96338,-11.46336 -7.8935,-7.78463 -11.02746,-12.36678 -11.03288,-16.13113 -0.005,-3.39447 2.20923,-5.27149 9.37709,-7.94946 7.00521,-2.61721 13.24441,-7.94628 15.75351,-13.45553 1.47178,-3.2316 1.8145,-6.49729 1.78409,-17 -0.0534,-18.44398 -0.63514,-20.94395 -7.13878,-30.67899 -6.94684,-10.39845 -10.52858,-17.58707 -15.10748,-30.32101 -4.59789,-12.78676 -6.2512,-19.47792 -8.14336,-32.95722 -1.92922,-13.74333 -1.92847,-22.87426 0.003,-38.476666 1.84395,-14.894303 4.33294,-26.416244 8.38386,-38.810213 C 154.18824,34.005557 158.57353,27 165.22919,27 c 4.81792,0 26.78371,5.701315 39.09565,10.147442 16.04821,5.795383 37.23776,16.381346 51.62943,25.793247 12.37157,8.090788 16.17365,9.404508 16.85597,5.82419 0.18187,-0.954316 -1.2627,-4.329316 -3.21015,-7.5 -5.78266,-9.414836 -8.12917,-19.116593 -5.97891,-24.720077 1.05056,-2.737721 6.21752,-4.793499 10.2503,-4.078287 14. 17164,2.513336 32.7055,10.382698 47.23628,20.056232 C 326.45904,56.085236 331.27445,59 331.80867,59 c 0.53422,0 3.83332,-2.110894 7.33132,-4.690875 22.40062,-16.521755 47.82957,-30.369446 71.18589,-38.765275 14.49011,-5.208716 34.21183,-10.3225266 43.20037,-11.2017845 5.50099,-0.5381058 6.30038,-0.358827 9.17121,2.0568196 3.45171,2.904419 6.97358,11.0833109 10.86849,25.2400649 12.85158,46.711355 8.75113,100.3922 -11.02713,144.36105 -4.66653,10.37411 -4.71773,10.60201 -4.27032,19.00829 0.89673,16.84836 8.49137,25.45 26.48417,29.99582 8.04248,2.0319 8.93146,6.85652 3.03951,16.49589 -14.08852,23.04916 -33.7132,41.59727 -61.54218,58.16613 l -11.25,6.69804 0.007,5.06791 c 0.0152,11.00657 5.62489,28.83867 14.75852,46.91452 l 5.48072,10.84661 -1.92227,2.57467 c -1.1236,1.50494 -4.18702,3.33955 -7.37313,4.41561 -2.99797,1.01251 -5.98542,2.55824 -6.63877,3.43495 -0.83276,1.11745 -1.0128,4.68656 -0.60217,11.9377 0.67483,11.91653 -0.2034,14.24663 -6.48579,17.2079 l -3.72412,1.7554 v 25.49028 c 0,20.2631 0.38381,27.7804 1.87165,36.65803 1.82887,10.91248 1.82887,11.25471 0,14.97216 -4.56179,9.27253 -18.70678,10.56563 -34.04209,3.11205 -5.15994,-2.50794 -6.88804,-1.91902 -7.74308,2.63876 -0.99744,5.31678 -4.92574,9.33558 -10.84303,11.09283 -10.10549,3.00101 -20.09635,1.61454 -34.02097,-4.7212 l -6.77752,-3.0838 -2.72248,2.60768 c -6.28804,6.02288 -18.60486,8.60342 -43.6717,9.14979 -9.92793,0.2164 -19.62578,0.21236 -21.55078,-0.009 z m 43,-12.42977 c 8.17145,-1.28813 15.21481,-3.84709 14.72237,-5.34887 -0.80759,-2.46294 -7.06231,-5.64856 -11.12025,-5.66371 -6.82741,-0.0255 -7.05761,-0.73899 -2.87107,-8.89882 3.08522,-6.0133 3.80453,-8.56007 4.10647,-14.5393 0.9272,-18.36138 -7.56989,-34.75318 -21.79233,-42.03976 -5.0446,-2.58449 -14.79346,-3.12132 -20.62141,-1.13554 -5.98082,2.03787 -7.05344,2.03621 -7.83948,-0.0122 -0.99256,-2.58659 2.16957,-6.36269 7.1866,-8.58196 6.40162,-2.83174 18.63586,-2.11098 26.68015,1.57182 10.10333,4.62546 21.00394,17.90564 24.7485,30.15104 0.5045 5,1.65 1.16775,7.95 1.47375,14 0.5252,10.38345 0.75792,11.3363 4.15211,17 4.88587,8.1528 11.87436,14.73457 19.77475,18.62393 5.41537,2.66597 8.08703,3.32316 14.98063,3.68498 9.41997,0.49442 13.42758,-1.02444 13.40903,-5.08196 -0.006,-1.22482 -1.80861,-8.30195 -4.00669,-15.72695 -2.19808,-7.425 -4.50832,-15.525 -5.13385,-18 -0.62554,-2.475 -2.02566,-7.65 -3.11138,-11.5 -5.43863,-19.28553 -5.84028,-21.31094 -5.85002,-29.5 -0.01,-8.34803 2.11345,-19.09175 4.29211,-21.71687 0.60775,-0.7323 1.27564,-1.16083 1.48419,-0.95228 0.20855,0.20854 1.49413,7.5002 2.85686,16.20368 2.60893,16.66279 6.05253,31.08389 7.65968,32.07716 1.51947,0.93908 14.15469,-7.98731 22.48021,-15.88158 4.1938,-3.97656 10.02869,-10.65409 12.96642,-14.83896 5.27733,-7.51769 5.40352,-7.61622 10.53164,-8.22357 2.85467,-0.3381 5.58868,-1.18911 6.07558,-1.89115 0.85718,-1.23591 0.36094,-15.35635 -0.8787,-25.00336 -0.57211,-4.45223 -0.45103,-4.78639 2.08346,-5.75 1.47998,-0.56269 4.26616,-1.02307 6.19151,-1.02307 1.92535,0 4.36416,-0.46214 5.41958,-1.02698 1.81459,-0.97114 1.64626,-1.55568 -3.09574,-10.75 -5.65912,-10.97254 -10.01258,-23.69481 -12.75745,-37.28152 -1.26085,-6.24106 -2.45988,-9.66039 -3.70739,-10.57259 -1.01411,-0.74153 -1.65169,-1.49706 -1.41684,-1.67894 0.23485,-0.18188 5.81394,-3.842 12.39798,-8.13361 17.23817,-11.23617 26.57775,-18.56449 38.88955,-30.51475 C 463.79796,256.94003 478,239.21321 478,236.03871 c 0,-1.41177 -1.54571,-2.39119 -6.25,-3.96023 -8.5723,-2.85914 -12.07891,-5.19388 -16.20818,-10.79159 -3.74032,-5.07046 -5.83479,-10.75377 -7.62834,-20.69942 -0.60378,-3.34811 -1.55179,-7.69452 -2.10668,-9.65868 -0.90685,-3.20995 -0.60674,-4.37329 2.96666,-11.5 C 468.31348,140.45862 474.25298,89.065299 464.54048,43 c -1.62128,-7.689521 -6.87424,-24.397262 -8.45686,-26.898156 -1.94993,-3.081323 -30.94988,3.785993 -50.79577,12.028658 -20.00474,8.308646 -47.9279,24.264916 -59.74529,34.140553 -2.87745,2.404642 -2.91107,2.535837 -1.2431,4.85022 0.94289,1.308299 2.39645,3.327818 3.23013, 4.48782 C 349.5079,74.361764 348.43021,77 345.32747,77 341.59243,77 328.86237,70.752334 319.13175,64.143645 304.92568,54.495392 282.30167,44 275.70984,44 c -1.67772,0 -1.86631,0.467841 -1.31009,3.25 1.55959,7.800879 9.91835,16.780909 20.77948,22.323912 7.37571,3.764211 7.23787,4.847464 -0.51575,4.053082 -5.48826,-0.562289 -8.13978,-0.247361 -15.23432,1.809418 -4.72424,1.369607 -12.26595,2.965473 -16.75935,3.546369 -4.49339,0.580896 -9.29481,1.311115 -10.66981,1.62271 l -2.5,0.566535 2.82488,1.485155 c 1.55368,0.816836 6.50368,2.24793 11,3.18021 11.50672,2.385837 10.7107,5.223888 -2.43809,8.692473 -4.0525,1.06903 -5.44037,1.023214 -9.12335,-0.301178 l -4.34377,-1.562008 -7.45983,4.32337 C 209.06322,114.89627 189.3325,138.9815 181.37857,168.5 c -2.90708,10.78875 -3.29216,20.4267 -2.29734,57.5 l 0.41592,15.5 -3.08784,6.5 c -3.34422,7.0397 -9.54655,13.49888 -16.24205,16.91467 -2.21736,1.13121 -4.33216,2.54312 -4.69955,3.13757 -0.68615,1.11023 9.29109,11.47075 15.53229,16.12896 l 3.5,2.6 1228 -1.90444,3.26899 -1.90444,3.269 2.35645,1.90813 c 10.46308,8.47249 40.01533,21.41192 62.27957,27.26906 13.91668,3.66111 39.96897,8.42292 47.00233,8.59102 2.29379,0.0548 5.29553,0.42432 6.67053,0.82109 2.39949,0.69241 2.31908,0.81195 -2,2.97323 -2.475,1.2385 -7.45161,5.25651 -11.05913,8.92891 -7.79555,7.93575 -14.88615,13.71333 -39.20792,31.94749 -29.15265,21.85591 -40.16305,34.45522 -46.3559,53.04552 -4.93789,14.82305 -5.05551,32.01315 -0.28654,41.87724 4.8765,10.08648 17.78527,19.12291 32.64168,22.8499 16.06347,4.02981 51.34331,5.2798 69.26781,2.45421 z M 227.18856,280.96104 c -3.76001,-3.50298 -2.49764,-7.0488 1.5624,-4.38856 3.16427,2.0733 5.01227,1.23844 6.81638,-3.0794 l 1.47703,-3.53503 3.70995,2.52097 c 4.76069,3.23497 5.58832,3.17572 8.55294,-0.61237 1.38197,-1.76583 2.94113,-2.83117 3.57247,-2.44098 2.05,1.26697 1.19012,5.60501 -1.62973,8.22186 -2.36268,2.1926 -3.36257,2.46834 -7.09929,1.95777 -3.43956,-0.46996 -4.87965,-0.17708 -6.88486,1.40022 -3.25494,2.56034 -7.300 51,2.54248 -10.07729,-0.0445 z m -1.88026,-20.93279 c -2.76233,-1.16037 -5.70333,-5.55643 -4.9794,-7.44297 0.30184,-0.78658 1.58882,-1.57756 2.85995,-1.75772 1.67554,-0.23747 2.39817,-1.08386 2.62757,-3.07756 0.27388,-2.38028 0.75992,-2.75 3.61514,-2.75 4.71198,0 8.56844,3.32979 8.56844,7.39827 0,5.68115 -7.12875,9.96681 -12.6917,7.62998 z M 193.97478,256.75 c -4.49668,-3.04655 -8.78181,-10.33882 -10.02401,-17.05847 -1.86415,-10.08414 3.32045,-24.44705 10.37811,-28.75046 4.0549,-2.47248 10.28734,-2.47248 14.34224,0 10.16546,6.1984 13.42789,28.75541 5.82133,40.24971 -5.10798,7.71867 -13.83875,10.08426 -20.51767,5.55922 z M 199,245 c 2.66626,-2.66626 2.52103,-5.22733 -0.5,-8.81763 -3.1482,-3.74142 -3.14913,-6.56393 -0.004,-12.76289 2.98004,-5.87392 2.92207,-5.41948 0.69128,-5.41948 -2.40141,0 -6.701,4.59033 -8.63404,9.21788 -0.85418,2.04484 -1.55305,6.22779 -1.55305,9.29546 0,4.58853 0.43525,6.01282 2.45455,8.03211 2.97757,2.97758 4.90624,3.09376 7.54545,0.45455 z m 116.76404,0.0638 c -14.65912,-4.7328 -22.67707,-23.53026 -16.77047,-39.31706 2.39461,-6.40017 7.70306,-11.85216 14.43136,-14.82156 8.89232,-3.92446 20.69638,-1.10679 27.41361,6.54371 12.53567,14.27734 9.73603,35.09867 -6.03002,44.84607 -5.01819,3.10251 -13.95411,4.3923 -19.04448,2.74884 z m 0.87719,-15.61412 c 3.76888,-3.76888 2.20152,-8.98559 -3.51935,-11.71362 -4.36386,-2.08094 -3.85297,-10.14832 1.07265,-16.9381 2.16782,-2.98826 -0.0203,-3.17903 -4.26258,-0.37162 -9.57842,6.33869 -11.51478,25.47018 -3.0439,30.07402 3.89868,2.11889 6.90777,1.79473 9.75318,-1.05068 z M 363,112 c -1.1,-1.1 -2,-2.60443 -2,-3.34317 0,-1.75785 8.68789,-14.17612 16.59326,-23.718034 C 394.17351,64.926173 428.3502,36 435.41516,36 c 1.32794,0 4.28735,3.807123 3.41586,4.394336 C 438.64896,40.51701 434.45,43.730788 429.5,47.536064 409.35361,63.023452 388.96627,83.826978 376.92871,101.18053 370.34317,110.67436 367.5173,114 366.03573,114 365.46608,114 364.1,113.1 363,112 Z m 38.18551,371.21449 c 0.75704,-0.75704 0.41117,-5.0444 5 -1.18851,-14.73263 -1.70702,-10.33835 -2.09014,-15.49829 -1.5738,-21.19633 0.57609,-6.35732 -0.77727,-21.67372 -2.04834,-23.18174 -0.18367,-0.21792 -2.29994,1.35708 -4.70282,3.5 -6.94421,6.19294 -15.58901,12.76988 -23.42204,17.81942 -5.39044,3.47493 -7.24981,5.23837 -7.24927,6.87524 0.001,3.25387 9.38884,18.48266 14.77401,23.96633 5.76516,5.87061 12.7931,8.88509 19.53412,8.37872 2.64488,-0.19867 5.28937,-0.84173 5.87665,-1.42901 z M 168.57778,469.66888 c 5.75362,-1.1356 5.9144,-1.25429 5.64745,-4.16888 -1.71632,-18.73951 0.27324,-33.01644 6.51033,-46.71774 l 3.51327,-7.71773 -7.68576,-8.78227 c -4.22716,-4.83024 -10.86432,-13.50283 -14.74925,-19.27241 -6.85593,-10.18189 -18.28245,-32.39286 -20.84045,-40.50985 -0.69331,-2.2 -2.50103,-7.61188 -4.01715,-12.02641 -5.42332,-15.79121 -10.03309,-34.4688 -16.42832,-66.56323 -6.74768,-33.8632 -9.02883,-42.78032 -13.22865,-51.71143 -2.436,-5.18025 -3.91905,-6.04549 -5.38104,-3.13941 -0.39858,0.79226 -3.654039,7.51548 -7.234364,14.94048 -3.5 80324,7.425 -13.991897,25.425 -23.136829,40 -18.284262,29.14107 -29.295014,50.22033 -32.646883,62.5 -1.201028,4.4 -2.848986,10.25 -3.662131,13 -2.378329,8.04335 -2.850004,35.35492 -0.788064,45.63164 8.911132,44.41313 46.335111,78.74458 93.050061,85.36087 11.03102,1.56234 31.01973,1.16156 41.07778,-0.82363 z M 167.44396,177.25 c 3.07294,-21.75177 14.19765,-44.43953 29.89548,-60.9689 6.84868,-7.21147 6.85434,-7.2222 5.50815,-10.43734 -5.83295,-13.930887 -12.3257,-25.022113 -26.77845,-45.744241 -3.34486,-4.7958 -3.81023,-7.239577 -1.71051,-8.982194 2.02258,-1.678589 5.33931,1.357394 13.72521,12.563428 8.11438,10.843198 15.16978,21.916719 19.76883,31.027394 1.70642,3.380387 3.52065,6.404543 4.03163,6.720353 0.51099,0.3158 3.33356,-1.35627 6.27238,-3.715721 2.93883,-2.359449 7.71864,-5.790193 10.62182,-7.623876 4.4574,-2.81535 5.16539,-3.664907 4.55142,-5.461435 -1.35815,-3.974006 -0.55047,-7.041211 2.59397,-9.850773 C 237.63311,73.249513 240.1229,72 241.45676,72 c 7.18233,0 1.18535,-4.6 63586 -18.95676,-14.741831 -6.6,-3.302355 -16.33567,-7.624356 -21.63483,-9.604446 -11.69691,-4.370681 -31.51667,-9.855177 -34.14726,-9.44918 -3.66864,0.566206 -11.75206,25.26209 -15.72502,48.042008 -1.96478,11.265495 -2.16419,15.099849 -1.71623,32.999999 0.43303,17.30359 0.86958,21.64033 2.99735,29.77561 C 155.73699,162.26251 164.01319,182 166.10206,182 c 0.36897,0 0.97282,-2.1375 1.3419,-4.75 z" - id="path4" /> - <path - style="fill:#5d2b09" - d="m 249,507.42704 c -24.08019,-2.7687 -37.06902,-5.76529 -46.45278,-10.71691 -3.73133,-1.96895 -8.96693,-6.18658 -13.67111,-11.01301 l -7.6239,-7.82202 -8.3761,1.62773 c -12.79192,2.48585 -37.19989,3.03173 -49.70682,1.11167 C 101.93005,477.35386 81.554647,468.54789 64.533569,455.27294 48.201241,442.53516 34.345229,422.57306 27.208904,401.5 c -12.521771,-36.97591 -5.710998,-75.32896 21.309718,-120 3.659537,-6.05 11.278557,-18.2 16.931154,-27 14.171793,-22.06274 18.84326,-30.44997 25.451218,-45.69557 5.928108,-13.67708 7.787045,-16.111 10.849006,-14.20469 7.75359,4.82723 13.8064,22.1875 21.76786,62.43317 6.7524,34.1338 11.41132,53.15919 16.15093,65.95477 6.9574,18.78295 23.80928,48.33724 36.78499,64.51232 6.91382,8.61855 12.74411,14.5 14.37386,14.5 0.77617,0 5.42853,-3.823 10.33858,-8.49555 4.91005,-4.67255 17.69561,-15.06817 28.41236,-23.10139 22.76684,-17.0659 35.10641,-28.17563 34.12764,-30.72627 -0.89879,-2.3422 -3.17259,-3.07058 -19.15475,-6.1359 -24.2887,-4.65848 -52.9 7863,-15.3625 -70.36149,-26.25139 C 161.99533,299.65058 161,298.58 161,293.10233 c 0,-4.24354 -0.39107,-4.92117 -5.82305,-10.09007 -10.56222,-10.05067 -14.60204,-17.75473 -10.91481,-20.81486 0.69418,-0.57612 3.92015,-2.04197 7.16882,-3.25745 6.95863,-2.60356 14.12042,-8.79686 16.69803,-14.43995 1.47863,-3.23712 1.81991,-6.47935 1.78944,-17 -0.0536,-18.48988 -0.64883,-21.05447 -7.13393,-30.73468 -6.95392,-10.38 -10.55561,-17.59307 -15.11233,-30.26532 -4.59789,-12.78676 -6.2512,-19.47792 -8.14336,-32.95722 -1.92922,-13.74333 -1.92847,-22.87426 0.003,-38.476666 2.5162,-20.324297 7.00212,-37.477496 14.53048,-55.561437 C 157.49366,31.262489 160.67681,28 165.28732,28 c 4.76752,0 26.78962,5.724439 39.03752,10.147442 16.02518,5.787065 37.23199,16.377544 51.56377,25.750464 C 262.70235,68.354058 268.85305,72 269.55683,72 c 5.21587,0 5.72614,-3.564772 1.43141,-10 C 266.76761,55.675807 264,47.768934 264,42.035068 c 0,-4.142129 0.4201,-5.220355 2.74711,-7.050782 3.2444,-2.552046 6.16998,-2.30333 2 19.15428,1.628377 11.90286,3.60424 24.00297,9.429665 35.15303,16.923917 C 326.34343,57.091461 331.14031,60 331.71415,60 c 0.57384,0 5.78158,-3.379535 11.57276,-7.510077 30.53578,-21.779563 59.71941,-35.590724 92.03897,-43.557463 17.28963,-4.2618739 23.44636,-4.7290377 26.83878,-2.0364873 2.93963,2.3331741 6.69084,11.2566883 10.40129,24.7429773 12.85158,46.711355 8.75113,100.3922 -11.02713,144.36105 -4.66774,10.37679 -4.71784,10.59995 -4.26978,19.01779 0.84909,15.952 9.32781,26.42458 24.34657,30.07192 5.32388,1.29291 9.38439,4.29389 9.38439,6.93566 0,5.02696 -17.61151,29.6401 -28.48979,39.8162 -9.32317,8.72136 -23.26722,19.01846 -36.64298,27.0593 l -11.36723,6.83341 -0.30038,5.07862 c -0.59672,10.08906 5.00797,28.46899 14.47315,47.46298 6.34888,12.74042 6.21527,13.56365 -2.73065,16.8255 -8.44037,3.07751 -8.9343,4.05681 -8.23897,16.33529 0.65756,11.61173 -0.1,13.99554 -5.11325,16.09021 -5.87178,2.45339 -5.80165,2.05838 -5.35804,30.18101 0.2993,18.97443 0.88432,28.45763 2.21319,35.87 61 1.68461,9.40445 1.6957,10.31715 0.16449,13.54394 -2.49677,5.26155 -6.7842,7.31627 -15.10954,7.24114 -5.30188,-0.0479 -8.57682,-0.73212 -13.5,-2.82073 -3.575,-1.51666 -7.71885,-2.98382 -9.20855,-3.26036 -2.51289,-0.46649 -2.79339,-0.16593 -3.88278,4.16046 C 365.755,501.00142 359.01083,505 346.73868,505 c -6.32875,0 -13.66924,-1.98493 -22.94327,-6.20404 l -6.70458,-3.05017 -3.29542,2.77864 c -4.33501,3.65523 -8.49658,5.32343 -17.64811,7.0744 -7.26419,1.38987 -39.9398,2.65692 -47.1473,1.82821 z m 43,-11.42977 c 8.17145,-1.28813 15.21481,-3.84709 14.72237,-5.34887 -0.80759,-2.46294 -7.06231,-5.64856 -11.12025,-5.66371 -6.82741,-0.0255 -7.05761,-0.73899 -2.87107,-8.89882 6.40642,-12.48654 5.7425,-26.15559 -2.00429,-41.26474 -6.31591,-12.31842 -13.8248,-17.74719 -25.69166,-18.57455 -5.0315,-0.3508 -7.78967,0.0242 -11.98785,1.62986 -4.18141,1.59924 -5.63506,1.79848 -6.23468,0.85452 -1.12862,-1.77672 -1.03168,-2.18269 1.19818,-5.0175 5.06579,-6.4401 21.02059,-7.59262 32.48016,-2.34625 7. 73349,3.54051 16.37141,12.43635 21.06727,21.69631 3.92788,7.74556 4.20302,9.39014 4.36673,26.10153 0.0599,6.11627 0.47546,8.13684 2.05657,10 1.08981,1.28422 3.95907,5.07299 6.37613,8.41949 C 322.27432,488.5455 334.72763,495 347.95899,495 355.25654,495 359,493.24723 359,489.83036 c 0,-2.05388 -5.94157,-23.57899 -8.54637,-30.96178 -0.75754,-2.14709 -1.13572,-4.53346 -0.84041,-5.30303 0.70035,-1.82508 -2.40895,-13.2185 -4.65725,-17.06555 -2.47401,-4.23328 -4.21121,-13.69861 -4.12839,-22.49399 0.0689,-7.31496 2.3758,-18.60467 4.16863,-20.40065 1.05688,-1.05874 1.11134,-0.81723 4.37329,19.39464 2.73393,16.94014 6.02666,28.99758 7.92068,29.00427 2.51134,0.009 18.48923,-11.74914 25.34042,-18.64784 3.92183,-3.94902 9.04314,-10.08901 11.38069,-13.64442 4.14042,-6.29757 4.38219,-6.48002 9.3694,-7.07047 8.09852,-0.9588 8.54337,-2.42488 6.57018,-21.65312 -0.57702,-5.62292 -0.88726,-10.38536 -0.68942,-10.5832 0.19783,-0.19784 3.43525,-0.79526 7.19426,-1.3276 3.75901,-0.53234 7.27517,-1.4085 7.81 37,-1.94703 0.63886,-0.63886 -0.93869,-4.74145 -4.53927,-11.80487 -6.11419,-11.99447 -9.68442,-22.40793 -12.63595,-36.85593 -1.07932,-5.28333 -2.43702,-10.17795 -3.01712,-10.87692 -0.80567,-0.97077 1.12684,-2.63994 8.18411,-7.06884 12.3618,-7.75785 29.51091,-20.72974 38.87347,-29.40458 8.05649,-7.46471 20.54492,-22.28258 25.73717,-30.53788 3.87075,-6.15422 3.43348,-6.76656 -7.23884,-10.13692 -8.86453,-2.79945 -11.17966,-4.49157 -15.57947,-11.38697 C 451.27368,214.70113 447,200.67267 447,195.90438 c 0,-1.24431 -0.50468,-3.65806 -1.12152,-5.36389 -1.00656,-2.78361 -0.71193,-3.91836 2.87452,-11.071 13.30487,-26.53455 20.23356,-57.33886 20.24239,-89.995724 0.008,-28.209733 -4.10901,-52.176874 -12.48763,-72.703162 -0.60787,-1.489179 -1.8381,-1.673727 -8.85684,-1.328617 -19.06868,0.9376 -56.38055,15.632036 -84.05273,33.102265 C 351.26243,56.33217 342,63.560624 342,65.399613 c 0,0.753702 1.10917,2.097121 2.46482,2.985377 C 349.50207,71.685527 350.03423,77 345.32747,77 341.59243,77 328.8623 7,70.752334 319.13175,64.143645 304.92568,54.495392 282.30167,44 275.70984,44 c -1.67772,0 -1.86631,0.467841 -1.31009,3.25 1.55959,7.800879 9.91835,16.780909 20.77948,22.323912 2.57358,1.313431 4.9337,2.799791 5.24471,3.303022 0.32822,0.531068 -3.52317,0.88629 -9.17923,0.846621 -6.49499,-0.04555 -11.61761,0.50006 -15.36083,1.636089 -3.08887,0.937438 -10.02668,2.253471 -15.41737,2.924518 -5.39069,0.671047 -9.9679,1.72001 -10.17157,2.33103 -0.49968,1.499034 4.60573,3.499455 13.68862,5.363525 10.84113,2.224912 9.77522,5.15558 -3.11154,8.555045 -3.90054,1.028941 -4.99468,1.023365 -5.86882,-0.02991 -0.59095,-0.712051 -2.65765,-1.591646 -4.59266,-1.954656 -2.96872,-0.556937 -4.64209,-0.01225 -10.71437,3.487536 -23.22909,13.388218 -41.71391,32.053818 -51.95516,52.463268 -4.07067,8.11232 -4.89872,10.90672 -7.85218,26.49848 -1.97456,10.424 -2.09797,13.0405 -1.32063,28 1.30858,25.18308 1.10475,38.56269 -0.6201,40.70388 -0.79645,0.9887 -2.54107,3.96896 -3.87693,6.62279 -2.76542,5.49383 -8.3929 6,10.73915 -15.32117,14.28055 -2.6125,1.33539 -4.75,3.01117 -4.75,3.72395 0,1.60101 11.47982,13.10531 15.81885,15.85259 3.52098,2.22933 3.82489,3.38257 1.64935,6.25889 -0.80751,1.06762 -1.4682,2.49992 -1.4682,3.18288 0,1.552 14.28557,10.24393 24.68104,15.01696 27.88082,12.80133 51.85507,19.12192 90.81896,23.94355 l 5,0.61873 -4.6768,2.38034 c -2.57224,1.30919 -6.82057,4.86346 -9.44073,7.89838 -2.62015,3.03491 -5.3378,5.51803 -6.03921,5.51803 -0.70141,0 -5.22809,3.29772 -10.05928,7.32826 C 255.45279,360.35881 244.3,368.98633 235.5,375.50053 215.29562,390.45681 202.34861,403.29704 195.23565,415.43277 191.82589,421.25031 190,425.4997 190,427.61767 c 0,1.78867 -0.49789,4.51893 -1.10642,6.06723 -3.50426,8.91596 -2.86759,28.60125 1.19693,37.00826 4.8765,10.08648 17.78527,19.12291 32.64168,22.8499 16.06347,4.02981 51.34331,5.2798 69.26781,2.45421 z m -64.50555,-216.0034 c -2.18862,-2.4184 -1.43766,-3.56903 1.35416,-2.07489 3.33955,1.78727 5.01444,1.24931 6.75289,-2.16898 0.90907,-1.7875 1. 76391,-3.38079 1.89964,-3.54064 0.13574,-0.15984 1.86295,0.66292 3.83824,1.82837 4.15099,2.44915 6.77354,1.98832 8.65122,-1.52017 0.72096,-1.34712 1.69301,-2.2131 2.16011,-1.92441 1.72663,1.06711 0.76888,4.32494 -1.88521,6.41265 -2.21532,1.74257 -3.53424,2.03103 -6.94672,1.5193 -3.44588,-0.51675 -4.58577,-0.25811 -6.2655,1.42162 -2.61702,2.61702 -7.21261,2.63969 -9.55883,0.0471 z m -2.17908,-20.96301 C 223.21404,258.14782 221,255.15149 221,253.19074 c 0,-0.51741 1.35,-1.21074 3,-1.54074 2.38284,-0.47657 3,-1.11944 3,-3.125 0,-2.09394 0.47417,-2.525 2.77749,-2.525 6.3774,0 9.86114,7.3021 5.40689,11.33314 -2.29527,2.07719 -7.02845,2.89142 -9.86901,1.69772 z M 194.6861,256.1315 c -1.54765,-1.02042 -3.98852,-3.60496 -5.42415,-5.74341 -1.43564,-2.13845 -2.9812,-4.13922 -3.43457,-4.44616 -0.45338,-0.30694 -1.29168,-3.08625 -1.8629,-6.17624 -1.27889,-6.91817 0.40248,-15.3034 4.45525,-22.21893 3.31741,-5.66074 7.7267,-8.53928 13.08027,-8.53928 5.31571,0 9.75847,2.87106 12.9988,8.40025 2.388 64,4.07591 2.67393,5.62019 2.82888,15.31267 0.15202,9.50979 -0.10532,11.34345 -2.18461,15.56621 -4.28713,8.7066 -13.68443,12.3103 -20.45697,7.84489 z m 4.85935,-10.58605 c 1.35,-1.35 2.45455,-3.17958 2.45455,-4.06574 0,-2.14058 -1.95891,-5.783 -3.64598,-6.7794 -2.08184,-1.22955 -1.61436,-5.8482 1.14179,-11.28083 3.94387,-7.77372 3.03509,-9.2599 -3.30038,-5.39725 -8.63184,5.26271 -11.28338,25.19984 -3.83135,28.80818 3.28959,1.59285 4.52454,1.37188 7.18137,-1.28496 z m 114.9656,-2.08544 c -5.02287,-1.91494 -10.92911,-7.62644 -13.6071,-13.15842 -1.14224,-2.35956 -2.40774,-7.72494 -2.83751,-12.03032 -0.64138,-6.42517 -0.45561,-8.64441 1.07247,-12.81204 2.23655,-6.09988 7.64662,-11.60388 14.28602,-14.53405 5.86252,-2.58732 14.19783,-2.1786 20.43206,1.00186 10.94072,5.58154 18.1421,22.35296 13.67721,31.85312 -5.3806,11.44857 -6.35516,12.8252 -11.71694,16.55089 -4.524,3.14355 -6.57254,3.90451 -11.41534,4.24039 -3.78848,0.26276 -7.33034,-0.13524 -9.89087,-1.11143 z m 0.83163,-11.57028 c 6.4 3237,-2.93079 5.05767,-12.24575 -2.21772,-15.02728 -2.16376,-0.82725 -2.33225,-1.35337 -1.894,-5.91431 0.35111,-3.65404 1.33027,-6.06304 3.62504,-8.91858 3.76643,-4.68682 3.8204,-5.02956 0.79188,-5.02956 -3.13216,0 -8.57593,3.7695 -11.31626,7.83588 -8.98583,13.33407 -1.14715,32.5935 11.01106,27.05385 z M 363,112 c -1.1,-1.1 -2,-2.60443 -2,-3.34317 0,-1.75785 8.68789,-14.17612 16.59326,-23.718034 8.88921,-10.729418 29.44882,-30.33045 40.50398,-38.615503 13.69485,-10.263314 17.82038,-12.079813 19.72114,-8.68335 0.73486,1.313134 -0.40109,2.633886 -5.70031,6.627609 C 407.5915,62.751853 378.34085,93.541553 370.94373,108.66064 369.22268,112.17832 367.33748,114 365.41821,114 365.1882,114 364.1,113.1 363,112 Z m 38.18551,371.21449 c 0.75704,-0.75704 0.41281,-5.03449 -1.18285,-14.6984 -1.59561,-9.66357 -2.01308,-14.85088 -1.43439,-17.82336 1.22279,-6.28103 0.97315,-19.55131 -0.39352,-20.91798 C 397.52864,429.12864 397,427.565 397,426.3 c 0,-2.98425 -1.08554,-2.90567 -4.07569,0.29501 -1.33337 ,1.42726 -3.62242,3.21845 -5.08677,3.98041 -1.46435,0.76197 -6.18935,4.01063 -10.5,7.21924 -4.31065,3.20861 -9.97424,7.15493 -12.58575,8.76959 -5.53589,3.42276 -6.21132,6.49732 -2.44046,11.10902 1.27123,1.5547 3.60448,5.07673 5.18499,7.82673 4.48328,7.80061 12.00968,15.15957 17.87568,17.47799 5.40492,2.13618 13.78844,2.26157 15.81351,0.2365 z M 168.57778,469.66888 c 5.75362,-1.1356 5.9144,-1.25429 5.64745,-4.16888 -1.71632,-18.73951 0.27324,-33.01644 6.51033,-46.71774 l 3.51327,-7.71773 -7.68576,-8.78227 c -4.22716,-4.83024 -10.86432,-13.50283 -14.74925,-19.27241 -8.29939,-12.3256 -19.72238,-35.32838 -20.42067,-41.12164 -0.26899,-2.23165 -1.40072,-6.3704 -2.51496,-9.19724 C 134.11812,320.61456 128.46392,298.24364 121.89585,265.5 113.33788,222.83619 108.08673,206 103.338,206 c -0.83803,0 -2.22604,1.87383 -3.14813,4.25 -5.071758,13.06965 -12.545947,26.40189 -33.196652,59.21522 -16.44263,26.12683 -30.282393,53.63983 -28.463039,56.58361 0.339417,0.54919 -0.293079,3.80037 -1.405548,7.224 85 C 33.95614,343.02714 33,350.31813 33,364.72582 c 0,15.99988 1.654947,25.04835 7.061101,38.60677 14.380138,36.06483 47.499759,61.50329 87.438899,67.15992 11.03102,1.56234 31.01973,1.16156 41.07778,-0.82363 z M 168.00252,178.25 c 0.008,-17.47613 12.87248,-44.63233 29.37654,-62.01061 l 6.89536,-7.26061 -2.13434,-6.50165 C 199.38522,94.085246 192.21467,81.422411 182.0769,67.046534 177.63461,60.747127 174,54.770504 174,53.765149 c 0,-2.678736 2.76321,-3.289278 5.14328,-1.13643 5.78661,5.234163 22.4075,29.59544 28.70939,42.079428 1.70642,3.380387 3.52065,6.404543 4.03163,6.720353 0.51099,0.3158 3.33356,-1.35627 6.27238,-3.715721 2.93883,-2.359449 7.71864,-5.790193 10.62182,-7.623876 4.4574,-2.81535 5.16539,-3.664907 4.55142,-5.461435 -1.35815,-3.974006 -0.55047,-7.041211 2.59397,-9.850773 C 237.63311,73.249513 240.1229,72 241.45676,72 248.91909,72 241.84801,66.738327 220.14372,56.140709 199.96728,46.289103 166.85527,35.631076 164.44396,38.212185 162.68027,40.100074 157.56257,54.085239 154.64128,65 c -3.93858,14.715639 -5.70509,25.315127 -6.66415,39.98642 -1.71288,26.20308 2.05019,47.05027 12.59285,69.76358 5.20414,11.2119 7.4287,12.25945 7.43254,3.5 z" - id="path3" /> - <path - style="fill:#090906" - d="m 250,507.42621 c -35.76358,-4.10352 -48.24268,-8.61734 -60.90276,-22.02913 -3.84036,-4.06839 -7.5708,-7.39655 -8.28986,-7.3959 -0.71906,6.5e-4 -4.68238,0.67409 -8.80738,1.49654 -12.19321,2.43109 -35.71694,2.98147 -47.83071,1.11908 C 105.73508,477.78269 84.182594,469.30095 70.370626,459.44493 50.493331,445.26079 35.354776,424.58198 27.218192,400.5 13.846647,360.92403 22.115912,323.44203 56.007918,270.00514 59.672468,264.22731 66.66192,253.2 71.540031,245.5 c 10.194461,-16.09175 17.125681,-29.28687 21.674741,-41.26269 3.391817,-8.92927 5.42057,-11.03802 8.852348,-9.20139 6.83808,3.65963 13.69779,23.80537 21.45074,62.99699 9.94324,50.26368 14.41074,65.29801 26.13969,87.96709 10.49645,20.28698 33.75237,53.40838 38.88249,55.37699 3.32805,1.27709 4.75648,0.4051 14.60123,-8.91338 5.54122,-5.24501 18.77912,-16.05416 29.41755,-24.02033 29.14273,-21.82238 35.68113,-28.84581 29.19118,-31.35663 -1.2375,-0.47877 -8.52684,-2.07436 -16.19853,-3.54576 -23.70291,-4.54613 -52.44736,-15.1 971 -70.84756,-26.25186 C 162.99337,300.25339 161,298.14094 161,292.76649 c 0,-4.16298 -0.4508,-4.89224 -7.45048,-12.05269 -13.07237,-13.37263 -13.5361,-17.01559 -2.69337,-21.15883 8.33834,-3.18626 14.22688,-8.02932 17.18011,-14.12987 2.08322,-4.30335 2.18703,-5.58104 1.78207,-21.93248 l -0.43002,-17.36293 -5.57165,-8.31485 c -9.1697,-13.68439 -17.08058,-31.6835 -21.24967,-48.34799 C 140.39395,140.7809 138,122.73798 138,115.04607 138,98.810385 142.45601,73.633588 148.55694,55.398587 155.70556,34.032133 159.45842,28 165.6028,28 c 3.63221,0 27.0928,6.308803 37.72204,10.143858 15.92825,5.746953 39.27364,17.370971 52.67516,26.227752 11.9661,7.908143 16.07142,9.231984 17.91964,5.778548 0.73396,-1.371417 0.47842,-2.729225 -0.98805,-5.25 -9.94742,-17.098996 -11.52803,-26.989009 -4.8641,-30.43506 2.81617,-1.456296 3.63836,-1.415913 11.23552,0.551835 15.14464,3.922634 29.38108,10.415956 42.65817,19.456632 C 326.42503,57.513104 330.7941,60 331.67022,60 c 0.87612,0 5.92124,-3.110732 11.21137,- 6.912739 C 372.40418,31.869418 404.30719,16.779235 436.00848,9.038064 461.97275,2.6978224 462.84218,3.0363689 469.29643,22 c 5.77721,16.974346 8.41177,30.699179 9.93122,51.736916 C 481.74453,108.58463 475.60829,143.71568 461.54032,175 l -4.72165,10.5 0.42979,9.56909 c 0.36711,8.1735 0.84968,10.34056 3.30881,14.8588 4.73791,8.7051 10.8862,12.96634 23.1954,16.07622 2.61975,0.66186 4.87229,2.02007 5.86635,3.5372 1.52336,2.32493 1.46528,2.76609 -1.03753,7.88166 -4.13335,8.44826 -16.44061,24.21909 -26.32504,33.73356 -10.86887,10.46208 -22.24789,19.0282 -36.13828,27.20489 -5.71001,3.36125 -10.94927,7.01748 -11.6428,8.12497 -3.49253,5.57719 3.97452,33.35014 14.08198,52.3765 2.44346,4.59958 4.44265,9.14234 4.44265,10.09501 0,2.35985 -2.71113,4.5428 -7.5,6.03884 -2.2,0.68728 -5.02678,2.18603 -6.28173,3.33055 -2.17759,1.98598 -2.25107,2.52595 -1.61013,11.83205 0.8234,11.95513 -0.13327,14.87184 -5.70147,17.38274 -2.45333,1.1063 -4.16844,2.6527 -4.52712,4.0818 -1.26006,5.02048 0.31596,53.73408 2.02855,62.7006 1.60468,8.4016 1.59934,8.99929 -0.11133,12.47217 -0.98822,2.00622 -3.31676,4.5227 -5.17453,5.59218 -6.11297,3.51911 -18.66284,2.00897 -29.02277,-3.49234 -4.30759,-2.2874 -6.63414,-1.19045 -7.52289,3.54698 -2.02597,10.79938 -16.18389,15.38785 -32.22124,10.44265 -3.77044,-1.16263 -8.97788,-3.18763 -11.5721,-4.5 -5.91085,-2.99019 -6.92639,-2.97799 -10.61713,0.12756 -7.00456,5.89395 -18.6142,8.32496 -42.50632,8.90065 -9.43789,0.22741 -18.73479,0.23276 -20.65979,0.0119 z m 28.5,-8.44733 c 19.29971,-1.38347 30.5,-4.47096 30.5,-8.4077 C 309,488.14256 300.05358,483 295.82856,483 293.72285,483 292,482.62188 292,482.15972 c 0,-0.46215 1.42237,-3.68668 3.16082,-7.16563 4.31649,-8.63807 4.90951,-17.53487 1.89999,-28.50468 -3.79715,-13.84074 -8.7688,-20.71774 -19.54191,-27.0312 -6.07369,-3.55942 -16.94236,-4.52413 -23.97463,-2.12799 -4.05317,1.38105 -4.71235,1.39534 -5.2045,0.11282 -2.46745,-6.43007 16.79795,-9.98248 29.1248,-5.37041 16.42753,6.14633 26.91759,22.81166 28.17664,44 .76362 0.72892,12.7091 2.77951,17.43909 11.35879,26.20081 9.23182,9.42814 19.36753,13.91475 31.5,13.94358 5.25563,0.0125 11.04381,-2.62825 12.165,-5.55003 0.32881,-0.85687 -1.32584,-8.16679 -3.67701,-16.24428 -13.03992,-44.79886 -14.07097,-49.1501 -14.14293,-59.68633 -0.0658,-9.63571 1.38153,-18.5 3.02063,-18.5 0.43374,0 1.3448,4.25124 2.0246,9.44719 1.2969,9.91278 5.17838,28.11601 6.99456,32.80281 0.58611,1.5125 1.79074,2.75 2.67697,2.75 2.2563,0 15.15078,-9.08522 22.6543,-15.96181 3.45613,-3.16737 9.12219,-9.59194 12.59124,-14.27681 6.26681,-8.46319 6.33982,-8.52106 11.35659,-9.00311 2.77708,-0.26684 5.47891,-1.10912 6.00408,-1.87172 0.76518,-1.11113 0.3739,-24.79891 -0.48289,-29.23409 -0.10183,-0.52711 2.85181,-1.474 6.56364,-2.1042 9.78359,-1.66107 10.00567,-2.15806 5.06413,-11.3326 -6.10998,-11.34385 -9.73602,-21.22968 -12.73342,-34.71566 -1.46691,-6.6 -3.04686,-13.20717 -3.511,-14.6826 -0.8106,-2.57679 -0.36518,-2.99847 11.29382,-10.69201 16.61565,-10.96433 31.58376,-23.16187 42.23916,-34.42077 10.02304,-10.59074 21.62977,-26.26536 21.17965,-28.60264 -0.16925,-0.87886 -3.33741,-2.65728 -7.41534,-4.16255 -3.91591,-1.44546 -8.44627,-3.57262 -10.06748,-4.72702 -6.27962,-4.47148 -11.53607,-15.32092 -12.86198,-26.54741 -0.33551,-2.84075 -1.06288,-6.64885 -1.61637,-8.46244 -0.90057,-2.95079 -0.42914,-4.5802 4.48461,-15.5 9.30877,-20.68683 15.07524,-41.99851 17.76535,-65.65711 C 471.73937,95.363153 470.75995,67.753611 468.01079,52 465.60323,38.203833 458.82846,15.932446 456.43512,13.946151 c -1.24707,-1.034969 -3.42284,-0.87186 -11.79034,0.883874 -32.69045,6.859366 -68.61778,23.148988 -95.83672,43.452828 -7.57085,5.647437 -8.17189,7.307614 -4.30806,11.899516 2.7478,3.265574 3.04115,4.365151 1.43016,5.360796 -1.5981,0.987678 -18.62105,-7.58084 -27.70098,-13.943312 -14.04296,-9.840164 -40.02287,-21.044209 -44.66587,-19.262521 -2.16271,0.829908 -1.94436,3.302386 0.81493,9.228064 3.08831,6.632278 7.83864,11.942297 14.62176,16.344521 l 5.5,3.569483 -6,0.634296 c -3. 3,0.348863 -7.33951,1.168646 -8.9767,1.82174 -4.5746,1.824867 -15.13957,3.831436 -24.32096,4.619194 -6.87909,0.590224 -8.24443,0.988318 -7.98631,2.328597 0.39201,2.03554 10.30823,6.036223 16.89523,6.816357 6.33221,0.749955 5.8518,2.272915 -1.41484,4.4852 -4.70328,1.431888 -6.53494,1.53374 -10.9454,0.608635 l -5.29687,-1.111029 -9.69582,5.908805 c -35.61804,21.706255 -55.26945,50.208375 -59.95841,86.962805 -0.90073,7.06042 -0.86183,13.25025 0.1767,28.1115 1.60065,22.9051 1.14358,28.61675 -2.95652,36.94523 -3.18608,6.47186 -6.65811,9.84368 -15.2701,14.8294 -2.6125,1.51245 -4.75,3.22331 -4.75,3.8019 0,2.64929 10.3377,12.74243 18.88546,18.43868 0.212,0.14128 -0.3505,1.38008 -1.25,2.7529 -2.5794,3.93666 -2.00791,5.26668 3.88189,9.03434 14.80733,9.47213 39.45395,19.94791 58.98265,25.06995 14.09069,3.69574 39.75173,8.4621 45.55807,8.4621 1.98473,0 3.84782,0.23922 4.14021,0.53161 0.79956,0.79957 -12.44297,13.83363 -23.19828,22.83307 -5.225,4.37199 -17.15,13.6771 -26.5,20.67802 -24.24293,18. 15217 -34.06324,28.54998 -42.4603,44.9573 -8.6407,16.88338 -9.84892,38.07321 -2.91289,51.08654 7.95966,14.93385 23.81136,22.90945 51.37319,25.84782 20.74095,2.2112 21.45187,2.23074 38,1.04452 z m -50.63922,-218.8928 c -1.29843,-1.05266 -2.03415,-2.24178 -1.63495,-2.6425 0.39921,-0.40072 1.38694,-0.17991 2.19496,0.49068 3.12456,2.59316 6.89157,0.30466 8.8847,-5.39756 0.18519,-0.52982 1.6029,0.0327 3.15047,1.25 3.806,2.9938 6.93881,2.81514 9.37913,-0.53487 2.36108,-3.24125 3.99282,-2.36432 2.34208,1.25867 -1.65279,3.62748 -5.22922,5.01561 -9.28221,3.60273 -2.93554,-1.02334 -3.52257,-0.88612 -5.88267,1.375 -3.13562,3.00411 -5.95615,3.18837 -9.15151,0.59785 z m -2.46556,-21.51589 c -3.58936,-1.56246 -5.17991,-5.40534 -2.5676,-6.20351 3.24127,-0.99034 4.67251,-2.10797 4.68513,-3.65851 0.0198,-2.43297 1.08081,-2.95635 4.47979,-2.20981 6.30199,1.38415 6.64108,9.5033 0.50399,12.06754 -4.02686,1.68253 -3.24708,1.68206 -7.10131,0.004 z m -30.37142,-2.75568 c -4.77562,-3.24506 -7.69546,-7.9159 3 -9.06136,-14.49546 -1.4979,-7.21533 -0.58257,-13.33552 3.15243,-21.07807 C 192.44993,213.32748 195.56931,211 201.5,211 c 5.33169,0 8.78535,2.26497 11.69739,7.67136 8.79991,16.33762 3.16387,37.54805 -10.37138,39.03121 -3.41287,0.37398 -5.05977,-0.0246 -7.80221,-1.88806 z m 4.66175,-9.98882 c 3.05058,-2.86588 2.94988,-6.91707 -0.26696,-10.74007 -3.06161,-3.63852 -2.71908,-7.29124 1.26103,-13.44744 3.88461,-6.00848 0.23495,-7.50522 -6.11714,-2.50867 -3.31741,2.60948 -5.37445,6.60605 -6.52632,12.67981 -2.23704,11.79588 4.88788,20.36848 11.64939,14.01637 z m 117.30798,-1.7043 c -11.58715,-3.7823 -18.23877,-13.42011 -18.36482,-26.60954 -0.11415,-11.94476 6.47959,-22.41231 16.12275,-25.59484 4.77346,-1.57538 14.05989,-0.72724 18.80116,1.71713 4.78134,2.46503 11.06809,10.39982 12.57057,15.86586 1.45568,5.29581 0.61744,16.14639 -1.58431,20.50797 -2.42203,4.79797 -7.29294,9.78291 -11.85727,12.13487 -4.33294,2.23273 -11.96186,3.19488 -15.68808,1.97855 z m 0.55192,-13.57594 c 1.35,-1.35 2.454 55,-3.39734 2.45455,-4.54966 0,-3.5145 -2.73938,-7.6452 -5.95284,-8.97626 -2.48723,-1.03024 -3.04312,-1.83708 -3.0252,-4.39085 0.0258,-3.66999 2.94882,-10.53926 5.31956,-12.50112 1.83962,-1.52235 2.23497,-4.12756 0.62636,-4.12756 -2.45842,0 -7.71343,3.01974 -10.67535,6.13448 -7.71814,8.11638 -8.31299,22.30473 -1.18655,28.30124 4.03899,3.39859 9.10592,3.44329 12.43947,0.10973 z m 46.5692,-119.45343 c -0.87401,-0.55352 -1.1592,-1.74745 -0.77265,-3.23469 0.91314,-3.51331 15.54154,-22.706331 24.3985,-32.011773 16.50994,-17.345951 42.43438,-38.264053 46.6448,-37.637113 3.25509,0.484689 2.78273,2.139928 -1.46985,5.150598 -20.04308,14.189784 -46.34549,41.031147 -59.92025,61.148068 -5.00316,7.41437 -6.18596,8.29142 -8.88055,6.58491 z m 35.43153,374.45313 c 1.91506,-0.80016 3.71973,-2.07452 4.01036,-2.8319 0.29063,-0.75738 -0.39069,-6.4814 -1.51406,-12.72004 C 400.82184,463.21432 400,454.3552 400,447.97599 c 0,-5.87083 -0.29103,-14.11713 -0.64674,-18.32511 -0.72984,-8.63405 -2.08961,-9.70284 -6.42895,-5.05321 -3.80928,4.08168 -18.7037,15.67475 -26.67431,20.76195 -3.9875,2.545 -7.2456,5.19272 -7.24023,5.88382 0.0172,2.21647 4.90363,11.85733 9.55924,18.86036 4.99072,7.50712 9.99604,11.97376 15.98723,14.26667 7.58734,2.90378 10.33609,3.11918 14.98994,1.17468 z M 165.5,471.89491 c 11.57734,-1.5538 11.83069,-1.77126 10.44248,-8.96332 -2.81048,-14.56068 -0.0364,-29.35253 9.65132,-51.46155 0.24822,-0.56648 -1.19861,-2.81648 -3.21517,-5 C 162.34636,384.77923 148.54026,360.55617 137.59152,327.89027 130.99554,308.21094 128.6255,298.56253 121.40618,262 c -5.88527,-29.80618 -9.21639,-42.71855 -12.89144,-49.97092 -4.01623,-7.92563 -6.00715,-8.4012 -8.49452,-2.02908 -4.118588,10.55094 -15.157507,30.50111 -29.879527,54 -18.742524,29.91631 -27.361818,46.37663 -32.702269,62.45173 -11.672311,35.1344 -7.555365,69.14772 11.867686,98.04827 5.984883,8.90521 19.949201,22.75622 29.238234,29.00098 15.119831,10.16464 30.777316,16.18428 47.955656,18.4369 4.4,0.57698 9.35,1.22882 11,1.44854 3.883 27,0.5171 19.05598,-0.29112 28,-1.49151 z m 3.68153,-293.6547 c 2.42008,-21.64845 14.37128,-45.90907 30.93321,-62.79358 l 5.93772,-6.05338 -4.13087,-8.94662 C 196.33022,88.336849 191.18235,79.593468 181.85318,66.361458 173.9844,55.200787 172.40863,51.546881 175.74106,52.18865 c 3.52394,0.678649 21.21957,25.712876 30.79166,43.56135 4.59091,8.56039 5.72855,8.87477 12.3285,3.406915 2.55133,-2.113696 7.27367,-5.51342 10.49408,-7.554941 l 5.85531,-3.711857 -0.66452,-4.431303 c -0.57563,-3.838583 -0.34366,-4.752153 1.73424,-6.830051 1.33557,-1.335577 4.24274,-2.710289 6.55921,-3.101653 6.64065,-1.121931 5.58355,-3.538186 -4.08954,-9.347651 C 227.6945,57.539745 217.68706,52.600529 204.76846,47.407712 191.86336,42.22032 168.63923,35.662341 166.0661,36.479021 162.50047,37.610709 155.52384,57.684294 150.7665,80.5 c -2.86175,13.724656 -3.12901,16.615435 -3.14343,34 -0.0132,15.89679 0.34552,20.67144 2.1962,29.23367 2.57424,11.90986 6.02293,21.9402 10.92206,31.76633 5.8495,11.73225 7.37945,12.22 897 8.4402,2.74021 z" - id="path2" /> - </g> - <path - style="fill:#ffffff;stroke-width:0.441645" - d="m 133.15604,337.71839 c -4.95494,-2.24683 -9.93486,-5.03544 -16.43145,-9.2011 -6.39955,-4.10344 -6.52366,-4.14138 -8.59836,-2.62849 -0.92935,0.67769 -3.70031,3.11626 -6.1577,5.41905 -2.457383,2.30278 -5.397212,4.94832 -6.53296,5.87898 l -2.064988,1.6921 -1.572787,-1.50386 c -2.294409,-2.19387 -6.695686,-7.92457 -9.985615,-13.00181 -1.756946,-2.71143 -3.328971,-4.64001 -4.049936,-4.9685 -1.994417,-0.90872 -5.695554,-0.60844 -14.970532,1.21458 -12.289107,2.41546 -18.769383,3.54826 -20.298065,3.54826 -1.190319,0 -1.271647,-0.0987 -1.001064,-1.21452 1.006694,-4.15149 10.517628,-23.97775 16.154587,-33.67545 1.764909,-3.03631 8.424139,-13.86766 14.798288,-24.06967 14.572641,-23.32392 18.848654,-30.77638 25.670408,-44.73973 3.110154,-6.36611 5.650994,-11.05626 5.904704,-10.89946 0.70038,0.43286 2.61081,4.44185 4.45131,9.34099 2.25816,6.01087 4.86478,16.89096 9.45197,39.4527 7.97064,39.20299 10.19957,48.28214 17.61885,71.76735 1.38127,4.37229 2.61517,8.29741 2.742,8.7225 0.34479,1 .15558 -0.48349,0.97245 -5.12866,-1.13392 z" - id="path13" /> - <path - style="fill:#ffffff;stroke-width:0.0552057" - d="m 198.38152,414.8243 c 0,-0.0828 1.0824,-2.12977 1.43792,-2.7193 1.41002,-2.33817 3.49947,-5.00698 6.47798,-8.27419 1.16506,-1.27799 5.43557,-5.54645 7.12849,-7.12509 8.44371,-7.87369 18.1663,-15.85544 30.05863,-24.67662 10.04644,-7.45199 18.27028,-13.26874 18.473,-13.06603 0.0913,0.0913 -0.55424,1.00768 -1.33059,1.88869 -0.67733,0.76865 -3.73611,3.81098 -5.16363,5.13587 -7.2197,6.70064 -16.2415,14.25921 -24.51046,20.53516 -5.41036,4.10635 -11.02613,8.70215 -16.42186,13.43924 -3.8037,3.33939 -5.44068,4.86989 -9.33249,8.72543 -3.15788,3.12844 -4.51524,4.43579 -5.49205,5.2897 -0.7606,0.66489 -1.32494,1.02572 -1.32494,0.84714 z" - id="path14" /> - <path - style="fill:#ffffff;stroke-width:0.0390363" - d="m 251.53723,423.58008 c -0.43181,-0.085 -0.93227,-0.44963 -1.09645,-0.7989 -0.2668,-0.5676 -0.15408,-1.08361 0.34538,-1.58104 0.22399,-0.22308 0.35695,-0.30744 1.05648,-0.67027 0.8397,-0.43553 1.29066,-0.62931 2.08007,-0.89382 0.68667,-0.23008 1.78742,-0.52544 2.29947,-0.61701 1.87271,-0.33491 4.72408,-0.47574 8.028,-0.39651 3.63891,0.0873 5.2115,0.29682 7.24724,0.96578 0.53097,0.17449 1.44647,0.52891 1.49718,0.57962 0.0138,0.0138 -0.009,0.0502 -0.0511,0.0808 -0.36173,0.26451 -1.94565,0.275 -4.76417,0.0315 -0.95654,-0.0826 -3.43561,-0.11585 -4.35255,-0.0583 -1.89121,0.11859 -3.58245,0.42731 -5.01616,0.91566 -0.85485,0.29117 -4.02674,1.49364 -5.51395,2.09034 -0.96151,0.38578 -1.27231,0.44798 -1.75944,0.35212 z" - id="path15" /> - <path - style="fill:#ffffff;stroke-width:0.220823" - d="m 308.96179,466.21175 c -0.0751,-0.94125 -0.28678,-5.08996 -0.47049,-9.21934 -0.1837,-4.12938 -0.36609,-8.02026 -0.40531,-8.6464 l -0.0713,-1.13843 4.76412,-2.33427 c 5.42906,-2.66007 8.64302,-3.93746 13.37819,-5.31719 5.27072,-1.53576 8.76141,-2.15981 12.25367,-2.19062 3.57848,-0.0316 4.30211,0.20227 5.15226,1.665 1.21646,2.09296 3.78875,10.83209 3.64048,12.36817 -0.0673,0.6975 -0.14351,0.7526 -1.83682,1.32859 -0.97162,0.3305 -4.10178,1.24321 -6.95592,2.02824 -10.8587,2.9867 -18.2548,6.17349 -24.4009,10.51369 -2.4805,1.75166 -4.04437,2.65394 -4.59996,2.65394 -0.2296,0 -0.34741,-0.45001 -0.44801,-1.71138 z" - id="path16" /> - <path - style="fill:#ffffff;stroke-width:0.220823" - d="m 363.30341,455.24448 c -0.17192,-0.17192 -0.43864,-1.04953 -0.59271,-1.95025 -0.24097,-1.40873 -0.23351,-1.72783 0.0534,-2.28261 0.46963,-0.90816 0.62952,-1.0287 5.67847,-4.28092 5.16304,-3.32572 9.74542,-6.56364 13.57062,-9.58904 4.9056,-3.87989 8.23135,-5.5026 12.27242,-5.988 1.0033,-0.12051 1.30979,-0.0743 1.71696,0.25914 0.71127,0.58237 0.92241,2.90291 0.92444,10.15969 l 0.002,5.99987 -0.60727,0.12439 c -0.33399,0.0684 -2.74372,0.47852 -5.35494,0.91135 -6.57433,1.08973 -10.9442,2.20153 -18.68951,4.75503 -6.78135,2.23569 -8.30066,2.55423 -8.97353,1.88135 z" - id="path17" /> - <path - style="fill:#ffffff;stroke-width:0.220823" - d="m 357.65698,438.2165 c -0.6625,-0.84224 -1.69019,-3.8805 -2.78447,-8.23199 -1.62034,-6.44345 -2.7008,-12.59405 -4.75947,-27.09364 -1.44839,-10.20125 -2.03117,-12.96852 -2.65053,-12.58573 -0.095,0.0587 -0.22578,-0.0317 -0.2907,-0.20088 -0.0649,-0.16917 -1.04579,-0.9958 -2.17972,-1.83696 -6.31242,-4.68262 -17.26193,-16.3997 -21.41504,-22.91628 -5.19335,-8.1488 -8.06888,-16.25312 -9.12789,-25.72583 -0.37223,-3.3296 -1.01991,-6.73592 -1.42451,-7.49193 -0.39711,-0.742 -1.64843,-0.9091 -8.51026,-1.13644 -8.83295,-0.29264 -16.91809,-0.76691 -22.30308,-1.30828 -24.38204,-2.45122 -51.31068,-8.5636 -69.33831,-15.73872 -7.57815,-3.01616 -17.17461,-7.40879 -25.3946,-11.624 -6.62687,-3.39825 -9.07646,-4.83042 -12.50915,-7.31352 l -2.82827,-2.04589 0.67981,-0.9059 c 1.86675,-2.48758 2.67837,-3.8989 2.78471,-4.84232 0.10039,-0.89069 0.0366,-1.05548 -0.74243,-1.91777 -0.46874,-0.51884 -1.85092,-1.61338 -3.0715,-2.4323 -3.05251,-2.04801 -5.9967,-4.55018 -10.08798,-8.57345 -3.53355,-3.47481 -4.74202,-4.90535 -4.48929,-5.31427 0.23763,-0.3845 2.52403,-2.07495 5.34522,-3.95199 7.92219,-5.27095 11.90616,-9.70293 14.975,-16.659 0.86232,-1.95462 1.31363,-2.26189 2.9686,-2.02112 1.32458,0.1927 3.14559,0.87349 3.8785,1.45 0.32089,0.25241 1.45634,1.61469 2.52322,3.0273 3.17584,4.20497 5.76979,6.74283 8.11445,7.93899 1.62416,0.82858 5.36902,1.42707 8.28007,1.32327 2.42847,-0.0866 2.66888,-0.13782 4.19783,-0.89476 3.53967,-1.75238 7.51227,-6.01717 9.761,-10.47893 1.36901,-2.71627 2.33852,-7.63445 2.90815,-14.7526 0.19439,-2.42904 0.37617,-4.50382 0.40396,-4.61062 0.0548,-0.21061 7.46465,9.89738 8.94932,12.20804 1.32724,2.06564 1.29484,2.13565 -1.06587,2.30322 -2.32763,0.16522 -3.55217,0.60092 -4.3484,1.54719 -0.55042,0.65413 -0.57318,0.77802 -0.44599,2.42738 l 0.13403,1.73807 -0.60209,-0.17088 c -1.58794,-0.45067 -2.96905,0.27775 -3.80645,2.00759 -1.02054,2.10816 -0.22738,5.03495 2.03543,7.51083 1.37709,1.50676 2.51573,2.1912 4.37384,2.62913 4.77318,1.12498 9.85562,-0.82728 12. 37507,-4.7535 1.01338,-1.57922 1.82473,-4.05458 1.65086,-5.03667 -0.0775,-0.43804 -0.69293,-1.96366 -1.36752,-3.39027 -0.67458,-1.4266 -1.17474,-2.72877 -1.11144,-2.89371 0.083,-0.21633 0.78187,-0.3329 2.5082,-0.41837 2.86602,-0.14191 6.57575,-0.94007 10.67397,-2.29654 6.58109,-2.17828 9.72995,-4.10826 26.05707,-15.97071 11.71874,-8.51424 15.05176,-10.75164 17.2624,-11.58797 0.56757,-0.21472 1.12998,-0.32981 1.2498,-0.25575 0.23047,0.14243 0.39028,1.05113 1.14567,6.51431 0.9136,6.6074 2.74625,11.11015 6.33035,15.55337 3.57212,4.42838 7.35967,7.15251 12.16739,8.7512 2.75111,0.91482 5.07331,1.19345 8.74198,1.04891 3.82852,-0.15084 6.21487,-0.75089 9.766,-2.45567 7.09998,-3.40848 11.50706,-8.26424 14.79197,-16.29792 0.77198,-1.88798 1.43642,-3.16153 1.89778,-3.63753 1.75724,-1.81302 5.0743,-2.25734 22.15244,-2.96733 13.1378,-0.54618 24.20452,0.13901 43.50206,2.6934 35.77801,4.7359 53.77496,7.90492 58.50541,10.30203 1.76273,0.89324 2.77286,1.63781 2.77286,2.04388 0,0.95031 -4.55164,7.34 977 -9.56195,13.44378 -12.37591,15.05277 -24.01112,26.05585 -39.46067,37.31681 -3.3353,2.43107 -11.73478,8.15954 -17.37081,11.84698 -4.94435,3.23488 -10.06887,6.90299 -11.52193,8.2473 -1.04595,0.96766 -1.15134,1.14389 -0.93072,1.5561 0.36888,0.68927 1.10906,1.09577 2.4544,1.34793 2.35584,0.44157 2.81145,1.25621 4.07559,7.28736 3.37136,16.08474 6.58831,25.64794 13.05554,38.81112 3.18629,6.48523 3.78903,8.12845 3.33162,9.08279 -0.46916,0.9789 -1.29643,1.19423 -5.31416,1.38324 -5.98741,0.28166 -7.447,0.67418 -7.8822,2.11966 -0.47678,1.58361 -0.48159,8.40162 -0.0138,19.58026 0.25371,6.06305 0.42074,11.06427 0.37121,11.11381 -0.0495,0.0495 -1.96197,0.33253 -4.24982,0.62886 -4.77975,0.6191 -5.85589,0.91705 -7.07205,1.95805 -0.48214,0.41269 -2.07977,2.52097 -3.55029,4.68505 -1.47053,2.16409 -3.53566,5.00933 -4.58921,6.32275 -5.2953,6.60149 -13.17219,14.23419 -19.69686,19.08622 -4.2226,3.14011 -9.6303,6.4598 -10.52286,6.4598 -0.17683,0 -0.51904,-0.25112 -0.76046,-0.55804 z M 196.35428,298.4 5544 c 2.07585,-0.9665 4.44665,-3.62125 5.72234,-6.40774 1.13126,-2.47099 0.63867,-5.53746 -1.57939,-9.83203 -2.92672,-5.66667 -8.64846,-10.1693 -13.02338,-10.24853 -1.08439,-0.0196 -1.59872,0.10845 -2.78992,0.69484 -1.97993,0.97465 -4.15127,3.2757 -5.22542,5.53756 -2.07376,4.36675 -0.63921,9.80691 3.9232,14.87767 1.16005,1.28932 3.89678,3.46991 5.62866,4.48486 2.58996,1.51782 5.29576,1.84697 7.34391,0.89337 z m 39.28757,-14.90902 c 0.67558,-0.23745 1.83244,-0.92681 2.57266,-1.53302 1.7276,-1.41484 2.73388,-1.67548 5.25039,-1.35993 3.02979,0.3799 4.58441,0.30196 5.84384,-0.29299 1.52597,-0.72087 4.04857,-2.91018 4.85208,-4.21103 0.60141,-0.97365 0.66794,-1.26112 0.66306,-2.86514 -0.008,-2.75606 -1.14755,-4.78756 -2.86534,-5.10982 -1.09015,-0.20452 -1.92006,0.3593 -3.41011,2.3167 -2.6777,3.51757 -3.79872,3.66436 -7.16044,0.93762 -2.86921,-2.32726 -4.09097,-2.73847 -5.30324,-1.78489 -0.75214,0.59163 -1.18188,1.43619 -1.72135,3.38293 -0.52932,1.91013 -1.11754,2.90342 -1.98503,3.35202 - 0.85527,0.44228 -1.6731,0.25363 -2.87614,-0.66342 -1.43545,-1.09422 -2.26378,-1.45376 -3.34927,-1.45376 -0.82886,0 -1.07568,0.10772 -1.55673,0.67941 -0.31443,0.37368 -0.58613,0.94506 -0.60378,1.26973 -0.1442,2.65164 0.99244,4.79537 3.38418,6.38268 2.05693,1.36512 5.84864,1.80227 8.26522,0.95291 z m 116.42029,-1.10801 c 3.36244,-0.95294 6.41763,-2.85811 9.11858,-5.68621 3.13001,-3.27736 4.61016,-6.509 4.78175,-10.44012 0.0911,-2.08652 0.0418,-2.49549 -0.49218,-4.08522 -2.40318,-7.1544 -8.71997,-12.36585 -15.79767,-13.03332 -2.90315,-0.27379 -6.88777,0.88469 -10.38059,3.01804 -2.30696,1.40904 -5.51391,4.57145 -6.68538,6.59253 -2.58508,4.4599 -2.82376,9.92173 -0.63207,14.46388 1.81255,3.75642 5.26391,7.20109 8.76819,8.7512 2.50178,1.10666 8.155,1.31603 11.31937,0.41922 z" - id="path18" /> - <path - style="fill:#ffffff;stroke-width:0.156145" - d="m 193.55785,245.18695 c -2.01966,-1.19223 -2.55971,-2.08305 -2.83203,-4.67149 -0.19422,-1.84611 -0.18828,-5.42259 0.0123,-7.41321 0.46299,-4.59465 2.00312,-8.64702 4.21978,-11.10306 0.77474,-0.8584 3.73683,-3.12212 3.73683,-2.8558 0,0.0489 -0.49573,1.18454 -1.10162,2.52369 -2.19623,4.85416 -2.94385,8.13865 -2.50137,10.98922 0.27514,1.77252 0.71163,2.57053 2.072,3.78805 3.19207,2.85689 3.02156,5.93413 -0.47579,8.58646 -1.25166,0.94924 -1.7449,0.97384 -3.1301,0.15614 z" - id="path19" /> - <path - style="fill:#ffffff;stroke-width:0.156145" - d="m 309.01129,230.40617 c -2.94492,-1.51506 -4.69371,-3.80769 -5.66683,-7.42907 -0.36378,-1.35378 -0.39963,-1.76146 -0.4052,-4.60808 -0.005,-2.67825 0.0444,-3.35634 0.34882,-4.76243 0.95889,-4.42933 2.70981,-7.95767 5.14301,-10.36389 1.79645,-1.77652 2.85985,-2.34826 3.07964,-1.65578 0.1505,0.47419 -0.0449,1.16062 -0.82137,2.88518 -0.8815,1.9579 -1.35499,3.32108 -1.84402,5.30894 -0.4723,1.91986 -0.65053,4.40656 -0.38546,5.37803 0.25689,0.94146 1.48873,2.12299 3.84774,3.69056 2.23297,1.48381 3.74089,2.93501 4.35591,4.19206 0.37606,0.76865 0.44556,1.10129 0.43913,2.10195 -0.0107,1.66541 -0.46204,2.77949 -1.59403,3.93471 -0.73696,0.75208 -1.04971,0.94836 -1.96913,1.23581 -0.60116,0.18794 -1.69027,0.37591 -2.42025,0.41769 -1.20207,0.0688 -1.40085,0.0381 -2.10796,-0.32568 z" - id="path20" /> - <path - style="fill:#ffffff;stroke-width:0.156145" - d="m 302.04425,162.69543 c -0.48256,-0.0726 -1.38857,-0.31057 -2.01336,-0.52885 -3.92419,-1.37103 -4.42847,-3.14702 -2.26397,-7.97322 2.43995,-5.44035 8.53987,-10.71345 14.81319,-12.8053 2.38125,-0.79403 4.30459,-1.10577 5.52866,-0.8961 1.99067,0.34099 4.92861,2.15963 5.74829,3.55831 1.85443,3.16434 -1.60455,9.91161 -7.0766,13.80396 -2.49744,1.77647 -4.60852,2.78085 -8.00546,3.80872 -3.11702,0.94317 -5.20006,1.26271 -6.73075,1.03248 z" - id="path21" /> - <path - style="fill:#ffffff;stroke-width:0.156145" - d="m 212.11622,177.06203 c -4.74781,-0.65556 -8.7254,-3.26809 -10.50969,-6.90288 -0.88294,-1.79864 -1.18146,-2.90429 -1.30005,-4.81512 -0.27633,-4.4524 2.11998,-7.94 5.65024,-8.22337 2.98569,-0.23967 6.62069,2.37636 9.71154,6.98916 3.27855,4.89292 4.1517,10.20607 1.97244,12.0024 -1.03348,0.85188 -3.34968,1.2501 -5.52448,0.94981 z" - id="path22" /> - <path - style="fill:#ffffff;stroke-width:0.156145" - d="m 189.16987,151.75536 c 0,-0.21616 2.58616,-5.82024 3.40178,-7.37149 6.04695,-11.5009 18.60356,-25.43519 32.19932,-35.73219 6.52937,-4.94512 13.62289,-9.594685 18.19092,-11.923509 3.84151,-1.95844 5.97168,-2.465906 7.53251,-1.794455 1.07645,0.463079 1.26256,0.694193 0.89028,1.105562 -0.1575,0.174036 -1.41441,1.029362 -2.79313,1.900723 -13.07699,8.264759 -22.15781,14.825749 -30.84062,22.282679 -8.87372,7.62088 -15.75616,14.9151 -22.25547,23.58702 -2.8693,3.82847 -6.32559,8.16996 -6.32559,7.94566 z" - id="path23" /> - <path - style="fill:#ffffff;stroke-width:0.156145" - d="m 265.3119,80.761443 c -0.22192,-0.359079 2.31835,-1.094178 9.5036,-2.750134 7.12594,-1.642286 11.44073,-2.430691 12.12736,-2.215931 0.11446,0.0358 0.38992,0.104566 0.61214,0.152813 0.22221,0.04825 0.59375,0.236959 0.82564,0.419361 0.33286,0.261826 0.38369,0.377328 0.24148,0.548681 -0.36939,0.445081 -2.82334,1.019932 -9.58895,2.246257 -7.13602,1.293465 -13.45498,2.02982 -13.72127,1.598953 z" - id="path24" /> - <path - style="fill:#ffffff;stroke-width:0.156145" - d="m 164.66213,177.36467 c -2.23223,-3.1676 -6.81614,-13.91014 -9.18776,-21.53179 -2.98474,-9.59206 -3.84359,-14.64593 -4.59056,-27.01311 -0.27074,-4.48257 -0.2666,-28.04291 0.006,-32.243982 0.36414,-5.618534 0.94579,-9.61417 2.36396,-16.239098 3.35153,-15.656529 9.96167,-36.5022 12.78685,-40.32449 0.59072,-0.799201 0.97264,-0.845246 1.83139,-0.220798 0.78653,0.571936 2.99272,2.907873 3.98776,4.222284 1.46973,1.941478 2.25143,4.025619 1.95414,5.210109 -0.0507,0.202011 -0.43727,0.716018 -0.85903,1.142237 -1.04401,1.055029 -1.24157,1.940372 -0.88895,3.983719 0.43775,2.536603 1.33335,4.288234 4.14575,8.108317 4.38072,5.950332 9.66117,13.945187 14.48991,21.938397 4.01421,6.644903 8.03424,14.211487 8.83071,16.621345 0.39001,1.18004 0.40606,1.31724 0.18299,1.56374 -0.49695,0.54912 -2.17523,0.84722 -6.17301,1.09644 -4.73921,0.29544 -7.99218,0.89637 -9.83043,1.81601 -1.28113,0.64092 -1.58433,1.05711 -1.68307,2.31022 -0.0908,1.15271 0.45765,6.19982 1.01115,9.30466 0.6072,3.40609 0.620 62,4.00615 0.11203,5.00981 -0.55354,1.09234 -1.27629,2.05289 -3.04482,4.04661 -4.40928,4.97072 -7.41733,9.59409 -9.96102,15.31012 -2.5643,5.76235 -4.95746,13.26575 -5.74954,18.02687 -0.21628,1.30005 -0.28463,2.53372 -0.28114,5.07472 0.005,3.47847 0.0619,4.02195 0.87073,8.27569 0.54285,2.85513 0.80012,5.11288 0.61941,5.4358 -0.0979,0.17492 -0.3269,-0.0494 -0.94311,-0.92383 z" - id="path25" /> - <path - style="fill:#ffffff;stroke-width:0.156145" - d="m 424.67445,151.3783 c -0.48791,-0.95668 -1.03787,-2.90857 -2.06307,-7.32213 -2.63965,-11.36386 -4.69085,-16.0135 -8.37014,-18.97333 -2.06182,-1.65866 -3.78667,-2.54854 -8.18572,-4.22319 -2.79472,-1.0639 -5.49907,-2.28218 -6.24485,-2.81322 -0.39391,-0.28049 -0.46929,-0.43925 -0.46877,-0.98722 8.7e-4,-0.90507 0.40792,-3.3267 0.8574,-5.10095 0.97486,-3.84806 0.98916,-5.06767 0.0685,-5.84237 -1.98073,-1.66668 -8.8722,-1.44226 -18.12187,0.59012 -1.74988,0.38449 -3.81398,0.80938 -4.5869,0.94419 -1.44566,0.25215 -3.22492,0.32626 -3.40918,0.142 -0.58734,-0.58734 9.21097,-13.631971 17.60771,-23.441415 3.28409,-3.836612 5.84025,-6.538237 11.03725,-11.665344 6.93336,-6.840111 14.22277,-13.480037 20.88444,-19.023649 8.19377,-6.818579 12.99524,-10.183491 14.98506,-10.501677 0.53838,-0.08609 0.65103,-0.0506 0.85619,0.269736 0.51967,0.81145 1.57343,9.967513 1.99225,17.310621 0.21051,3.690904 0.10988,16.542141 -0.16139,20.611162 -1.61051,24.156866 -6.11677,47.438596 -12.05877,62.301926 - 1.0198,2.55091 -3.26967,7.11391 -3.84732,7.80282 l -0.45453,0.54206 z" - id="path26" /> - <path - style="fill:#ffffff;stroke-width:0.0390363" - d="m 345.15838,64.955548 c -0.0136,-0.02193 0.0538,-0.149806 0.14967,-0.284162 1.5648,-2.192869 13.2594,-10.505454 24.83408,-17.652196 2.47688,-1.529344 6.37635,-3.832557 8.37328,-4.945667 6.69864,-3.733886 15.76085,-7.976425 26.3495,-12.335707 0.78365,-0.322626 1.438,-0.594412 1.4541,-0.603971 0.0161,-0.0096 0.0293,0.526113 0.0293,1.19038 v 1.207758 l -0.94663,0.420332 c -12.49187,5.546759 -26.08588,12.480396 -37.2802,19.014795 -3.42354,1.998406 -6.08877,3.625033 -9.53407,5.818782 -7.49252,4.770749 -13.09144,8.209536 -13.36652,8.209536 -0.0208,0 -0.0489,-0.01795 -0.0625,-0.03988 z" - id="path27" /> - <path - style="fill:#ffffff;stroke-width:0.0276028" - d="m 378.7522,43.476523 v -1.543689 l 0.47614,-0.261467 c 2.51343,-1.380195 5.55262,-2.932765 8.95022,-4.57222 6.96173,-3.359267 18.54864,-8.287616 25.21518,-10.724968 3.5078,-1.282486 6.18946,-2.162705 9.20555,-3.021604 2.89239,-0.823673 4.14547,-1.185469 6.36715,-1.83835 0.69335,-0.203752 1.2939,-0.370459 1.33457,-0.370459 0.0407,0 0.11819,0.021 0.17228,0.04667 l 0.0983,0.04667 -0.10208,0.08824 c -0.5254,0.454173 -5.23117,2.49679 -11.38962,4.943854 -3.99206,1.586246 -4.66889,1.857448 -5.87941,2.355846 -6.35475,2.616409 -12.70969,5.481346 -20.05345,9.040515 -1.43656,0.69623 -6.15608,3.055566 -7.67359,3.836103 -2.08041,1.070073 -5.42174,2.823061 -6.42554,3.371086 -0.14856,0.08111 -0.27588,0.147467 -0.28293,0.147467 -0.007,0 -0.0128,-0.69466 -0.0128,-1.543688 z" - id="path28" /> - </g> -</svg> Binary files old/waylyrics-0.2.19/res/win/icon.ico and new/waylyrics-0.3.5/res/win/icon.ico differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/src/app/actions/event.rs new/waylyrics-0.3.5/src/app/actions/event.rs --- old/waylyrics-0.2.19/src/app/actions/event.rs 2024-04-17 12:18:51.000000000 +0200 +++ new/waylyrics-0.3.5/src/app/actions/event.rs 2024-04-25 14:58:04.000000000 +0200 @@ -19,7 +19,7 @@ SwitchDecoration, /// set new lyric display mode SetDisplayMode(String), - /// set new lyric align mode + /// set new lyric alignment mode SetLyricAlign(String), /// Quit Waylyrics Quit, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/src/app/actions/mod.rs new/waylyrics-0.3.5/src/app/actions/mod.rs --- old/waylyrics-0.2.19/src/app/actions/mod.rs 2024-04-17 12:18:51.000000000 +0200 +++ new/waylyrics-0.3.5/src/app/actions/mod.rs 2024-04-25 14:58:04.000000000 +0200 @@ -75,7 +75,7 @@ return; }; let Ok(align): Result<Align, _> = align.parse() else { - error!("unknown lyric align: {align}"); + error!("unknown lyric alignment: {align}"); return; }; set_lyric_align(&wind, align); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/src/app/search_window/mod.rs new/waylyrics-0.3.5/src/app/search_window/mod.rs --- old/waylyrics-0.2.19/src/app/search_window/mod.rs 2024-04-17 12:18:51.000000000 +0200 +++ new/waylyrics-0.3.5/src/app/search_window/mod.rs 2024-04-25 14:58:04.000000000 +0200 @@ -61,6 +61,12 @@ window.imp().input_artists.buffer().set_text(artists); window.imp().use_cache.set(use_cache); + + window + .imp() + .result_list + .set_widget_name("search-window-column"); + window } @@ -87,9 +93,9 @@ imp.vbox .set_properties(&[("orientation", &gtk::Orientation::Vertical)]); - imp.vbox.append(&imp.input_title); - imp.vbox.append(&imp.input_artists); - imp.vbox.append(&imp.input_album); + for entry in [&imp.input_title, &imp.input_artists, &imp.input_album] { + imp.vbox.append(entry); + } imp.vbox.append(&imp.result_scrolled_window); imp.vbox.append(&imp.set_button); @@ -111,11 +117,15 @@ imp.column_length.set_title(Some(&gettext("Length"))); imp.column_source.set_title(Some(&gettext("Source"))); - imp.result_list.append_column(&imp.column_title); - imp.result_list.append_column(&imp.column_singer); - imp.result_list.append_column(&imp.column_album); - imp.result_list.append_column(&imp.column_length); - imp.result_list.append_column(&imp.column_source); + for column in [ + &imp.column_title, + &imp.column_singer, + &imp.column_album, + &imp.column_length, + &imp.column_source, + ] { + imp.result_list.append_column(column); + } imp.input_title .set_placeholder_text(Some(&gettext("Enter title..."))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/src/app/utils.rs new/waylyrics-0.3.5/src/app/utils.rs --- old/waylyrics-0.2.19/src/app/utils.rs 2024-04-17 12:18:51.000000000 +0200 +++ new/waylyrics-0.3.5/src/app/utils.rs 2024-04-25 14:58:04.000000000 +0200 @@ -37,9 +37,9 @@ return; }; - let handle = surface.handle(); + let handle = surface.handle().0; - set_window_click_through(handle.0, enabled); + set_window_click_through(handle, enabled); } #[cfg(not(target_os = "windows"))] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/src/app/window/imp.rs new/waylyrics-0.3.5/src/app/window/imp.rs --- old/waylyrics-0.2.19/src/app/window/imp.rs 2024-04-17 12:18:51.000000000 +0200 +++ new/waylyrics-0.3.5/src/app/window/imp.rs 2024-04-25 14:58:04.000000000 +0200 @@ -6,7 +6,7 @@ use glib_macros::clone; use gtk::gio::MenuItem; use gtk::glib::Propagation; -use gtk::prelude::ToVariant; +use gtk::prelude::*; use gtk::subclass::prelude::*; use gtk::{gio, glib, ApplicationWindow, PopoverMenu}; use std::sync::OnceLock; @@ -52,6 +52,8 @@ // Load latest window state let obj = self.obj(); obj.setup_settings(); + // set titlebar before loading state: whether to show it is a state + obj.set_titlebar(Some(&self.headerbar)); obj.load_window_state(); self.headerbar.set_decoration_layout(Some("menu:close")); @@ -88,12 +90,14 @@ &self.display_mode_menu, ); ui_section.append_submenu( - Some(&gettext("Lyric Align")), // + Some(&gettext("Lyric Alignment")), // &self.align_mode_menu, ); - ui_section.append_item(&passthrough); - ui_section.append_item(&hide_decoration); - ui_section.append_item(&reload_theme); + + for item in [&passthrough, &hide_decoration, &reload_theme] { + ui_section.append_item(item); + } + self.menu.append_section(None, &ui_section); let play_section = gio::Menu::default(); @@ -101,9 +105,11 @@ Some(&gettext("Select Player")), // &self.player_menu, ); - play_section.append_item(&search_lyric); - play_section.append_item(&remove_lyric); - play_section.append_item(&refetch_lyric); + + for item in [&search_lyric, &remove_lyric, &refetch_lyric] { + play_section.append_item(item); + } + self.menu.append_section(None, &play_section); popover.set_menu_model(Some(&self.menu)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/src/app/window/mod.rs new/waylyrics-0.3.5/src/app/window/mod.rs --- old/waylyrics-0.2.19/src/app/window/mod.rs 2024-04-17 12:18:51.000000000 +0200 +++ new/waylyrics-0.3.5/src/app/window/mod.rs 2024-04-25 14:58:04.000000000 +0200 @@ -26,7 +26,6 @@ let window: Self = Object::builder().property("application", app).build(); let imp = window.imp(); - window.set_titlebar(Some(&imp.headerbar)); window.set_widget_name("main-window"); imp.cache_lyrics.set(cache_lyrics); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/src/lib.rs new/waylyrics-0.3.5/src/lib.rs --- old/waylyrics-0.2.19/src/lib.rs 2024-04-17 12:18:51.000000000 +0200 +++ new/waylyrics-0.3.5/src/lib.rs 2024-04-25 14:58:04.000000000 +0200 @@ -1,7 +1,7 @@ use std::{cell::RefCell, path::PathBuf, sync::OnceLock}; use app::Window; -use gtk::glib::MainContext; +use gtk::{glib::MainContext, Application}; use lyric_providers::LyricProvider; use once_cell::sync::Lazy; use regex::RegexSet; @@ -15,13 +15,14 @@ pub const DEFAULT_TEXT: &str = "Waylyrics"; pub const PACKAGE_NAME: &str = env!("CARGO_PKG_NAME"); -pub const APP_ID: &str = "io.poly000.waylyrics"; +pub const APP_ID: &str = "io.github.waylyrics.Waylyrics"; thread_local! { pub static CACHE_DIR: RefCell<String> = const { RefCell::new(String::new()) }; pub static THEME_PATH: RefCell<PathBuf> = RefCell::new(PathBuf::new()); pub static EXCLUDED_REGEXES: RefCell<RegexSet> = RefCell::new(RegexSet::empty()); pub static MAIN_WINDOW: RefCell<Option<Window>> = const { RefCell::new(None) }; + pub static GTK_APPLICATION: RefCell<Option<Application>> = const { RefCell::new(None) }; pub static PLAYER_IDENTITY_BLACKLIST: RefCell<Vec<String>> = RefCell::new(Default::default()); pub static PLAYER_NAME_BLACKLIST: RefCell<Vec<String>> = RefCell::new(Default::default()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/src/main.rs new/waylyrics-0.3.5/src/main.rs --- old/waylyrics-0.2.19/src/main.rs 2024-04-17 12:18:51.000000000 +0200 +++ new/waylyrics-0.3.5/src/main.rs 2024-04-25 14:58:04.000000000 +0200 @@ -15,8 +15,8 @@ use waylyrics::lyric_providers::LyricProvider; use waylyrics::utils::init_dirs; use waylyrics::{ - utils, EXCLUDED_REGEXES, LYRIC_PROVIDERS, MAIN_WINDOW, PLAYER_IDENTITY_BLACKLIST, - PLAYER_NAME_BLACKLIST, THEME_PATH, + utils, EXCLUDED_REGEXES, GTK_APPLICATION, LYRIC_PROVIDERS, MAIN_WINDOW, + PLAYER_IDENTITY_BLACKLIST, PLAYER_NAME_BLACKLIST, THEME_PATH, }; use waylyrics::log; @@ -75,6 +75,9 @@ let app = Application::builder() .application_id(waylyrics::APP_ID) .build(); + GTK_APPLICATION.set(Some(app.clone())); + + glib::set_prgname(Some(waylyrics::APP_ID)); log::info!("successfully created application!"); @@ -153,7 +156,7 @@ show_lyric_on_pause, ); - register_sync_task(ObjectExt::downgrade(app), player_sync_interval); + register_sync_task(ObjectExt::downgrade(&wind), player_sync_interval); register_lyric_display(ObjectExt::downgrade(&wind), lyric_update_interval); register_actions(app, &wind, triggers); @@ -209,6 +212,7 @@ register_reload_theme(app, wind, &reload_theme); register_search_lyric(app, wind, &search_lyric); register_remove_lyric(app, wind); + register_reload_lyric(app); register_refetch_lyric(app, wind, &refetch_lyric); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/src/sync/acts/event.rs new/waylyrics-0.3.5/src/sync/acts/event.rs --- old/waylyrics-0.2.19/src/sync/acts/event.rs 2024-04-17 12:18:51.000000000 +0200 +++ new/waylyrics-0.3.5/src/sync/acts/event.rs 2024-04-25 14:58:04.000000000 +0200 @@ -13,6 +13,7 @@ pub enum PlayAction { Connect(String), Disconnect, + ReloadLyric, RefetchLyric, RemoveLyric, SearchLyric, @@ -27,6 +28,7 @@ let (action_name, parameter) = match action { PlayAction::Connect(player_id) => ("connect", Some(player_id.to_variant())), PlayAction::Disconnect => ("disconnect", None), + PlayAction::ReloadLyric => ("reload-lyric", None), PlayAction::RefetchLyric => ("refetch-lyric", None), PlayAction::RemoveLyric => ("remove-lyric", None), PlayAction::SearchLyric => ("search-lyric", None), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/src/sync/acts/mod.rs new/waylyrics-0.3.5/src/sync/acts/mod.rs --- old/waylyrics-0.2.19/src/sync/acts/mod.rs 2024-04-17 12:18:51.000000000 +0200 +++ new/waylyrics-0.3.5/src/sync/acts/mod.rs 2024-04-25 14:58:04.000000000 +0200 @@ -69,6 +69,34 @@ bind_shortcut("app.search-lyric", wind, trigger); } +/// update lyric, but do not ignore cache +pub fn register_reload_lyric(app: &Application) { + let action = SimpleAction::new("reload-lyric", None); + action.connect_activate(move |_, _| { + let metainfo = TRACK_PLAYING_STATE + .with_borrow(|TrackState { metainfo, .. }| metainfo.as_ref().cloned()); + let Some(metainfo) = metainfo else { + return; + }; + + crate::log::debug!("spawned update_lyric from reload-lyric action"); + glib_spawn!(async move { + let Some(wind) = MAIN_WINDOW.with_borrow(|wind| wind.as_ref().cloned()) else { + return; + }; + reset_lyric_labels(&wind, None); + if let Err(err) = update_lyric(&metainfo, &wind, false).await { + show_dialog( + Some(&wind), + &format!("cannot refetch lyric: {err:?}"), + gtk::MessageType::Error, + ) + } + }); + }); + app.add_action(&action); +} + pub fn register_refetch_lyric(app: &Application, window: &app::Window, trigger: &str) { let action = SimpleAction::new("refetch-lyric", None); action.connect_activate(move |_, _| { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/src/sync/interop/common.rs new/waylyrics-0.3.5/src/sync/interop/common.rs --- old/waylyrics-0.2.19/src/sync/interop/common.rs 2024-04-17 12:18:51.000000000 +0200 +++ new/waylyrics-0.3.5/src/sync/interop/common.rs 2024-04-25 14:58:04.000000000 +0200 @@ -6,16 +6,12 @@ use std::time::Duration; -use gtk::{ - glib::{self, WeakRef}, - prelude::*, - Application, -}; +use gtk::glib::{self, WeakRef}; use anyhow::Result; use crate::{ - app, + app::{self, Window}, log::*, sync::{ interop::PlayerStatus, @@ -54,17 +50,11 @@ Ok(()) } -pub fn register_sync_task(app: WeakRef<Application>, interval: Duration) { +pub fn register_sync_task(wind: WeakRef<Window>, interval: Duration) { glib::timeout_add_local(interval, move || { - let Some(app) = app.upgrade() else { - return glib::ControlFlow::Break; - }; - - let mut windows = app.windows(); - if windows.is_empty() { + let Some(window) = wind.upgrade() else { return glib::ControlFlow::Continue; - } - let window: app::Window = windows.remove(0).downcast().unwrap(); + }; match try_sync_track(&window) { Err(PlayerStatus::Missing) => { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/src/sync/interop/mpris/sync_task.rs new/waylyrics-0.3.5/src/sync/interop/mpris/sync_task.rs --- old/waylyrics-0.2.19/src/sync/interop/mpris/sync_task.rs 2024-04-17 12:18:51.000000000 +0200 +++ new/waylyrics-0.3.5/src/sync/interop/mpris/sync_task.rs 2024-04-25 14:58:04.000000000 +0200 @@ -11,17 +11,16 @@ use utils::find_next_player; use crate::{ - app, - utils::reset_lyric_labels, - glib_spawn, - sync::{TrackMeta, TRACK_PLAYING_STATE}, + app, glib_spawn, sync::{ - interop::PlayerStatus, interop::common::need_fetch_lyric, interop::common::update_lyric, interop::mpris::{PLAYER, PLAYER_FINDER}, + interop::PlayerStatus, lyric::scroll::refresh_lyric, }, + sync::{TrackMeta, TRACK_PLAYING_STATE}, + utils::reset_lyric_labels, }; use super::hint_from_player; @@ -49,6 +48,18 @@ "Position is greater than SystemTime", ))?; + if let Some(s) = window.imp().lyric_start.get() { + let eplased = s.elapsed().unwrap_or_default(); + let diff: String = if eplased > position { + format!("{:?}", eplased - position) + } else { + format!("-{:?}", position - eplased) + }; + trace!("expected position: {:?}", s.elapsed()); + trace!("actual position: {:?}", position); + trace!("diff (expected - actual): {}", diff); + } + let offset = window.imp().lyric_offset_ms.get(); let start = if offset.is_negative() { start.checked_sub(Duration::from_millis(offset.unsigned_abs())) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/src/sync/interop/smtc/mod.rs new/waylyrics-0.3.5/src/sync/interop/smtc/mod.rs --- old/waylyrics-0.2.19/src/sync/interop/smtc/mod.rs 2024-04-17 12:18:51.000000000 +0200 +++ new/waylyrics-0.3.5/src/sync/interop/smtc/mod.rs 2024-04-25 14:58:04.000000000 +0200 @@ -9,6 +9,7 @@ use windows::Media::Control::GlobalSystemMediaTransportControlsSession as GSMTCSession; use windows::Media::Control::GlobalSystemMediaTransportControlsSessionManager as GSMTCSessionManager; use windows::Media::Control::GlobalSystemMediaTransportControlsSessionMediaProperties as GSMTCSessionMediaProperties; +use windows::Media::Control::GlobalSystemMediaTransportControlsSessionPlaybackStatus as GSMTCSessionPlaybackStatus; use windows::Media::Control::GlobalSystemMediaTransportControlsSessionTimelineProperties as GSMTCSessionTimelineProperties; use crate::glib_spawn; @@ -115,12 +116,12 @@ PlayerStatus::Unsupported("failed to get PlaybackInfo!") })?; - let playback_status = playback_info.PlaybackStatus().map_err(|e| { + let GSMTCSessionPlaybackStatus(playback_status) = playback_info.PlaybackStatus().map_err(|e| { error!("try_sync_track failed: {e}"); PlayerStatus::Unsupported("failed to get PlaybackStatus!") })?; - trace!("PlaybackStatus = {}", playback_status.0); - match playback_status.0 { + trace!("PlaybackStatus = {}", playback_status); + match playback_status { // Closed 0 => Err(PlayerStatus::Missing)?, // Opened @@ -207,7 +208,7 @@ .ok_or(PlayerStatus::Unsupported("Infinite position!"))?, }; - debug!( + trace!( "start time: {:?}", start.duration_since(SystemTime::UNIX_EPOCH) ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/src/sync/lyric/cache.rs new/waylyrics-0.3.5/src/sync/lyric/cache.rs --- old/waylyrics-0.2.19/src/sync/lyric/cache.rs 2024-04-17 12:18:51.000000000 +0200 +++ new/waylyrics-0.3.5/src/sync/lyric/cache.rs 2024-04-25 14:58:04.000000000 +0200 @@ -1,7 +1,10 @@ use anyhow::Result; +use gtk::glib::Variant; use std::path::PathBuf; use crate::log::{debug, error, info, warn}; +use crate::GTK_APPLICATION; +use gtk::prelude::*; use gtk::subclass::prelude::ObjectSubclassIsExt; use serde::{Deserialize, Serialize}; @@ -77,17 +80,32 @@ let result = fetch_lyric(track_meta, window).await; if result.is_ok() { - update_lyric_cache(&cache_path); + if update_lyric_cache(&cache_path) { + let app = GTK_APPLICATION + .with_borrow(|app| app.as_ref().cloned()) + .expect("GApplication was not set"); + if let Some(dbus_conn) = app.dbus_connection() { + let _ = dbus_conn.emit_signal( + None, + "/io/github/waylyrics/Waylyrics", + crate::APP_ID, + "NewLyricCache", + Some(&Variant::tuple_from_iter([cache_path + .to_string_lossy() + .to_variant()])), + ); + } + } } result } /// Using olyric and tlyric inside LYRIC to update corresponding cache file. -pub fn update_lyric_cache(cache_path: &PathBuf) { +pub fn update_lyric_cache(cache_path: &PathBuf) -> bool { let cache_dir = cache_path.parent().unwrap(); if let Err(e) = std::fs::create_dir_all(cache_dir) { error!("cannot create cache dir {cache_dir:?}: {e}"); - return; + return false; } LYRIC.with_borrow( @@ -95,8 +113,9 @@ origin, translation, }| { + // do not cache empty lyric if (&LyricOwned::None, &LyricOwned::None) == (origin, translation) { - return; + return false; } let Err(e) = std::fs::write( @@ -109,12 +128,13 @@ .expect("cannot serialize lyrics!"), ) else { info!("cached to {cache_path:?}"); - return; + return true; }; error!("cannot write cache {cache_path:?}: {e}"); + false }, - ); + ) } #[derive(Deserialize, Serialize)] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/src/sync/lyric/scroll.rs new/waylyrics-0.3.5/src/sync/lyric/scroll.rs --- old/waylyrics-0.2.19/src/sync/lyric/scroll.rs 2024-04-17 12:18:51.000000000 +0200 +++ new/waylyrics-0.3.5/src/sync/lyric/scroll.rs 2024-04-25 14:58:04.000000000 +0200 @@ -70,8 +70,10 @@ } pub fn refresh_lyric(window: &app::Window, paused: bool) { - if paused && !window.imp().show_lyric_on_pause.get() { - reset_lyric_labels(window, Some("")); + if paused { + if !window.imp().show_lyric_on_pause.get() { + reset_lyric_labels(window, Some("")); + } return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/src/sync/mod.rs new/waylyrics-0.3.5/src/sync/mod.rs --- old/waylyrics-0.2.19/src/sync/mod.rs 2024-04-17 12:18:51.000000000 +0200 +++ new/waylyrics-0.3.5/src/sync/mod.rs 2024-04-25 14:58:04.000000000 +0200 @@ -43,8 +43,8 @@ mod acts; pub use acts::{ - register_connect, register_disconnect, register_refetch_lyric, register_remove_lyric, - register_search_lyric, + register_connect, register_disconnect, register_refetch_lyric, register_reload_lyric, + register_remove_lyric, register_search_lyric, }; #[cfg(feature = "action-event")] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/src/tray_icon/unix/mod.rs new/waylyrics-0.3.5/src/tray_icon/unix/mod.rs --- old/waylyrics-0.2.19/src/tray_icon/unix/mod.rs 2024-04-17 12:18:51.000000000 +0200 +++ new/waylyrics-0.3.5/src/tray_icon/unix/mod.rs 2024-04-25 14:58:04.000000000 +0200 @@ -55,7 +55,7 @@ } .into(), SubMenu { - label: gettext("Lyric Align"), + label: gettext("Lyric Alignment"), icon_name: "format-justify-left".into(), submenu: Align::iter() .map(|lyric_align| { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/src/tray_icon/windows/mod.rs new/waylyrics-0.3.5/src/tray_icon/windows/mod.rs --- old/waylyrics-0.2.19/src/tray_icon/windows/mod.rs 2024-04-17 12:18:51.000000000 +0200 +++ new/waylyrics-0.3.5/src/tray_icon/windows/mod.rs 2024-04-25 14:58:04.000000000 +0200 @@ -3,7 +3,7 @@ use anyhow::Result; use async_channel::Sender; use tray_icon::{ - menu::{Menu, MenuEvent, MenuItemBuilder}, + menu::{Menu, MenuEvent, MenuId, MenuItemBuilder}, Icon, TrayIconBuilder, }; @@ -71,7 +71,8 @@ fn menu_event_handler() { while let Ok(event) = MenuEvent::receiver().recv() { - match event.id().0.as_str() { + let MenuId(event) = event.id(); + match event.as_str() { SEARCH_LYRIC => { let _ = play_action().send_blocking(PlayAction::SearchLyric); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/themes/default-dark.css new/waylyrics-0.3.5/themes/default-dark.css --- old/waylyrics-0.2.19/themes/default-dark.css 2024-04-17 12:18:51.000000000 +0200 +++ new/waylyrics-0.3.5/themes/default-dark.css 2024-04-25 14:58:04.000000000 +0200 @@ -11,6 +11,12 @@ box-shadow: 0 0 1px 0; } +/* 搜索窗口 */ +columnview#search-window-column listview row { + padding-top: 3px; + padding-bottom: 3px; +} + label#above, label#below { padding: 10px; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/themes/default.css new/waylyrics-0.3.5/themes/default.css --- old/waylyrics-0.2.19/themes/default.css 2024-04-17 12:18:51.000000000 +0200 +++ new/waylyrics-0.3.5/themes/default.css 2024-04-25 14:58:04.000000000 +0200 @@ -11,6 +11,12 @@ box-shadow: 0 0 1px 0; } +/* 搜索窗口 */ +columnview#search-window-column listview row { + padding-top: 3px; + padding-bottom: 3px; +} + label#above, label#below { padding: 10px; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/themes/no-background.css new/waylyrics-0.3.5/themes/no-background.css --- old/waylyrics-0.2.19/themes/no-background.css 2024-04-17 12:18:51.000000000 +0200 +++ new/waylyrics-0.3.5/themes/no-background.css 2024-04-25 14:58:04.000000000 +0200 @@ -11,6 +11,12 @@ box-shadow: 0 0 1px 0; } +/* 搜索窗口 */ +columnview#search-window-column listview row { + padding-top: 3px; + padding-bottom: 3px; +} + label#above, label#below { padding: 3px; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/themes/ocean.css new/waylyrics-0.3.5/themes/ocean.css --- old/waylyrics-0.2.19/themes/ocean.css 2024-04-17 12:18:51.000000000 +0200 +++ new/waylyrics-0.3.5/themes/ocean.css 2024-04-25 14:58:04.000000000 +0200 @@ -11,6 +11,12 @@ box-shadow: 0 0 1px 0; } +/* 搜索窗口 */ +columnview#search-window-column listview row { + padding-top: 3px; + padding-bottom: 3px; +} + label#above, label#below { padding: 10px; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylyrics-0.2.19/themes/trans.css new/waylyrics-0.3.5/themes/trans.css --- old/waylyrics-0.2.19/themes/trans.css 2024-04-17 12:18:51.000000000 +0200 +++ new/waylyrics-0.3.5/themes/trans.css 2024-04-25 14:58:04.000000000 +0200 @@ -11,6 +11,12 @@ box-shadow: 0 0 1px 0; } +/* 搜索窗口 */ +columnview#search-window-column listview row { + padding-top: 3px; + padding-bottom: 3px; +} + label#above, label#below { padding: 10px; Binary files old/waylyrics-0.2.19/win_res/io.poly000.waylyrics.ico and new/waylyrics-0.3.5/win_res/io.poly000.waylyrics.ico differ ++++++ waylyrics.obsinfo ++++++ --- /var/tmp/diff_new_pack.aL24Ep/_old 2024-04-26 23:29:04.440905031 +0200 +++ /var/tmp/diff_new_pack.aL24Ep/_new 2024-04-26 23:29:04.468906052 +0200 @@ -1,5 +1,5 @@ name: waylyrics -version: 0.2.19 -mtime: 1713349131 -commit: 4db5b69e0f0a46dd9cba14bc4bd4d5dd0a8b2d1a +version: 0.3.5 +mtime: 1714049884 +commit: b3abbfa63c0978e0ca09815249addad8c72fe638

1 0

commit kyverno for openSUSE:Factory
by Source-Sync 26 Apr '24

26 Apr '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kyverno for openSUSE:Factory checked in at 2024-04-26 23:27:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kyverno (Old) and /work/SRC/openSUSE:Factory/.kyverno.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kyverno" Fri Apr 26 23:27:58 2024 rev:31 rq:1170300 version:1.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kyverno/kyverno.changes 2024-01-22 20:33:09.814893498 +0100 +++ /work/SRC/openSUSE:Factory/.kyverno.new.1880/kyverno.changes 2024-04-26 23:28:59.280716791 +0200 @@ -1,0 +2,17 @@ +Fri Apr 26 12:32:29 UTC 2024 - opensuse_buildservice(a)ojkastl.de + +- Update to version 1.12.0: + large update, please see the full changelog at + https://github.com/kyverno/kyverno/releases/tag/v1.12.0 + Breaking (Potentially) + * Policies using long-deprecated or invalid operators in + conditions (ex., In and NotIn) will be blocked. Please see + the current list of available operators + [here](https://kyverno.io/docs/writing-policies/preconditions/#operators) + +------------------------------------------------------------------- +Thu Apr 18 07:48:19 UTC 2024 - opensuse_buildservice(a)ojkastl.de + +- do not strip aka remove -s -w ldflags + +------------------------------------------------------------------- Old: ---- kyverno-1.11.4.obscpio New: ---- kyverno-1.12.0.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kyverno.spec ++++++ --- /var/tmp/diff_new_pack.KlcnXB/_old 2024-04-26 23:29:01.120783915 +0200 +++ /var/tmp/diff_new_pack.KlcnXB/_new 2024-04-26 23:29:01.120783915 +0200 @@ -19,7 +19,7 @@ %define __arch_install_post export NO_BRP_STRIP_DEBUG=true Name: kyverno -Version: 1.11.4 +Version: 1.12.0 Release: 0 Summary: CLI and kubectl plugin for Kyverno License: Apache-2.0 @@ -71,7 +71,10 @@ go build \ -mod=vendor \ -buildmode=pie \ - -ldflags="-s -w -X github.com/kyverno/kyverno/pkg/version.BuildVersion=%{version} -X github.com/kyverno/kyverno/pkg/version.BuildHash=%{version} -X github.com/kyverno/kyverno/pkg/version.BuildTime=$BUILD_DATE" \ + -ldflags=" \ + -X github.com/kyverno/kyverno/pkg/version.BuildVersion=%{version} \ + -X github.com/kyverno/kyverno/pkg/version.BuildHash=%{version} \ + -X github.com/kyverno/kyverno/pkg/version.BuildTime=$BUILD_DATE" \ -o bin/kyverno ./cmd/cli/kubectl-kyverno %install ++++++ _service ++++++ --- /var/tmp/diff_new_pack.KlcnXB/_old 2024-04-26 23:29:01.156785229 +0200 +++ /var/tmp/diff_new_pack.KlcnXB/_new 2024-04-26 23:29:01.160785375 +0200 @@ -3,7 +3,7 @@ <param name="url">https://github.com/kyverno/kyverno</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="revision">v1.11.4</param> + <param name="revision">v1.12.0</param> <param name="versionformat">@PARENT_TAG@</param> <param name="changesgenerate">enable</param> <param name="versionrewrite-pattern">v(.*)</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.KlcnXB/_old 2024-04-26 23:29:01.180786104 +0200 +++ /var/tmp/diff_new_pack.KlcnXB/_new 2024-04-26 23:29:01.184786250 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/kyverno/kyverno</param> - <param name="changesrevision">6c88cf5ee12dcf0c3ecfc29b893864216a05b828</param></service></servicedata> + <param name="changesrevision">111b052c9a1826a563d1763b6d302e31a5338aa0</param></service></servicedata> (No newline at EOF) ++++++ kyverno-1.11.4.obscpio -> kyverno-1.12.0.obscpio ++++++ /work/SRC/openSUSE:Factory/kyverno/kyverno-1.11.4.obscpio /work/SRC/openSUSE:Factory/.kyverno.new.1880/kyverno-1.12.0.obscpio differ: char 48, line 1 ++++++ kyverno.obsinfo ++++++ --- /var/tmp/diff_new_pack.KlcnXB/_old 2024-04-26 23:29:01.224787709 +0200 +++ /var/tmp/diff_new_pack.KlcnXB/_new 2024-04-26 23:29:01.228787855 +0200 @@ -1,5 +1,5 @@ name: kyverno -version: 1.11.4 -mtime: 1705658880 -commit: 6c88cf5ee12dcf0c3ecfc29b893864216a05b828 +version: 1.12.0 +mtime: 1713770885 +commit: 111b052c9a1826a563d1763b6d302e31a5338aa0 ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/kyverno/vendor.tar.gz /work/SRC/openSUSE:Factory/.kyverno.new.1880/vendor.tar.gz differ: char 5, line 1

1 0

commit proj for openSUSE:Factory
by Source-Sync 26 Apr '24

26 Apr '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package proj for openSUSE:Factory checked in at 2024-04-26 23:27:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/proj (Old) and /work/SRC/openSUSE:Factory/.proj.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "proj" Fri Apr 26 23:27:43 2024 rev:44 rq:1170297 version:9.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/proj/proj.changes 2024-03-01 23:37:21.625266968 +0100 +++ /work/SRC/openSUSE:Factory/.proj.new.1880/proj.changes 2024-04-26 23:28:51.040415502 +0200 @@ -1,0 +2,62 @@ +Fri Apr 26 08:53:00 UTC 2024 - Atri Bhattacharya <badshah400(a)gmail.com> + +- Update to version 9.4.0: + * Add support for transformations involving coordinate epoch + changes (PointMotionOperation), specifically for Canadian + NAD83(CSRS)(gh#OSGeo/PROJ#3884) + * SSL_OPTIONS: set SSL options on Curl library + (gh#OSGeo/PROJ#3936) + * Add support for unity builds (gh#OSGeo/PROJ#3962) + * Added ability to install *.tif if present in data + (gh#OSGeo/PROJ#3970) + * createOperationsCompoundToGeog(): tune selection logic when + --grid-check known_available is specified (gh#OSGeo/PROJ#3990) + * Increase CMake minimum version from 3.9 to 3.16 + (gh#OSGeo/PROJ#3997) + * CMake: use FetchContent to get googletest-1.12.1 + (gh#OSGeo/PROJ#4006) + * CMake: Replace custom FindSqlite3 with FindSQLite3 built-in + (gh#OSGeo/PROJ#4007) + * tpeqd: use numerically stable formula for computing the + central angle from (phi_1, lam_1) to (phi_2, lam_2) + (gh#OSGeo/PROJ#4009) + * Move content of proj_experimental.h to proj.h + (gh#OSGeo/PROJ#4019) + * Add +proj=mod_krovak projection method for Modified Krovak + that applies to S-JTSK/05 in the Czech Republic + (gh#OSGeo/PROJ#4021) + * PROJString formatter optimizer: simplify pipelines doing + [Modified]Krovak (South West) <--> [Modified]Krovak (East + North) by just doing an axis swap (gh#OSGeo/PROJ#4034) + * +proj=gridshift: enhance to support grids referenced in + projected CRS, and with easting_offset/northing_offset + corrections (gh#OSGeo/PROJ#4038) + * Tune concatenated operation instanciation, reference CR2005 + geoid for Czechia and add (disabled by default) records for + Czechia S-JTSK/05 based transformations (gh#OSGeo/PROJ#4044) + * Database: update to EPSG v11.004 (gh#OSGeo/PROJ#4062) + * Bug fixes + - Fix missing symbols at link time for Windows target in + Visual Studio (gh#OSGeo/PROJ#3984) + - Improve error message in axisswap (gh#OSGeo/PROJ#3885 + - Avoid convergence errors in +proj=gridshift when using + biquadratic interpolation (gh#OSGeo/PROJ#3985) +- Update data to 1.17: + * New revisions of chartdatum norway v2023b + (gh#OSGeo/PROJ-data#112). + * Add fr_ign_RAC23.tif grid for France-Corsica NGF-IGN 1978 to + RGF93-2b (gh#OSGeo/PROJ-data#114). + * Update DVR90 to reflect recent EPSG-changes + (gh#OSGeo/PROJ-data#115). + * UI: show red polygon on 'mouse over' the list + (gh#OSGeo/PROJ-data#116). + * check_gtiff_grid.py: enhance to support grids referenced in + projected… (gh#OSGeo/PROJ-data#117). + * Add Czech geoid model CR-2005 (gh#OSGeo/PROJ-data#119). + * Add converter script (only) for Czechia table_yx_3_v1710.dat + grid (gh#OSGeo/PROJ-data#118). + * Add Portuguese geoid model GeodPT08 (gh#OSGeo/PROJ-data#120). +- Pass CMAKE_CXX_STANDARD=14 for builds on openSUSE >= 1650 + (Tumbleweed) for compatibility with gtest >= 1.14. + +------------------------------------------------------------------- Old: ---- proj-9.3.1.tar.gz proj-data-1.16.tar.gz New: ---- proj-9.4.0.tar.gz proj-data-1.17.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ proj.spec ++++++ --- /var/tmp/diff_new_pack.0UMyP0/_old 2024-04-26 23:28:57.936667761 +0200 +++ /var/tmp/diff_new_pack.0UMyP0/_new 2024-04-26 23:28:57.936667761 +0200 @@ -16,18 +16,19 @@ # -%define data_version 1.16 +%define data_version 1.17 %define sover 25 %define libname lib%{name}%{sover} Name: proj -Version: 9.3.1 +Version: 9.4.0 Release: 0 Summary: Cartographic projection software License: MIT URL: https://proj.org/ -Source0: https://download.osgeo.org/proj/%{name}-%{version}.tar.gz -Source1: https://download.osgeo.org/%{name}/%{name}-data-%{data_version}.tar.gz -BuildRequires: cmake +# Download from GitHub, osgeo.org appears to be slow and flaky at the moment +Source0: https://github.com/OSGeo/PROJ/releases/download/%{version}/%{name}-%{versio… +Source1: https://github.com/OSGeo/PROJ-data/releases/download/%{data_version}.0/%{na… +BuildRequires: cmake >= 3.16 BuildRequires: gcc-c++ BuildRequires: pkgconfig >= 0.9.0 BuildRequires: sqlite3 @@ -115,7 +116,12 @@ %autosetup %build -%cmake +# c++14 needed to build tests using gtest >= 1.14 +%cmake \ +%if 0%{?suse_version} >= 1650 + -DCMAKE_CXX_STANDARD=14 \ +%endif + %{nil} %cmake_build %install @@ -163,6 +169,8 @@ %{_datadir}/%{name}/ITRF2008 %{_datadir}/%{name}/ITRF2014 %{_datadir}/%{name}/README.DATA +%{_datadir}/%{name}/cz_cuzk_CR-2005.tif +%{_datadir}/%{name}/cz_cuzk_README.txt %{_datadir}/%{name}/deformation_model.schema.json %{_datadir}/%{name}/nad.lst %{_datadir}/%{name}/nad27 ++++++ proj-9.3.1.tar.gz -> proj-9.4.0.tar.gz ++++++ ++++ 34143 lines of diff (skipped) ++++++ proj-data-1.16.tar.gz -> proj-data-1.17.tar.gz ++++++ /work/SRC/openSUSE:Factory/proj/proj-data-1.16.tar.gz /work/SRC/openSUSE:Factory/.proj.new.1880/proj-data-1.17.tar.gz differ: char 5, line 1

1 0

commit yazi for openSUSE:Factory
by Source-Sync 26 Apr '24

26 Apr '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package yazi for openSUSE:Factory checked in at 2024-04-26 23:27:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yazi (Old) and /work/SRC/openSUSE:Factory/.yazi.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yazi" Fri Apr 26 23:27:39 2024 rev:4 rq:1170288 version:0.2.5 Changes: -------- --- /work/SRC/openSUSE:Factory/yazi/yazi.changes 2024-04-02 16:42:58.950375152 +0200 +++ /work/SRC/openSUSE:Factory/.yazi.new.1880/yazi.changes 2024-04-26 23:27:46.550055460 +0200 @@ -1,0 +2,61 @@ +Fri Apr 26 11:22:00 UTC 2024 - xtexchooser(a)duck.com + +- Update to version 0.2.5: + * chore: bump version to 0.2.5 + * feat: new builtin `session.lua` plugin (#940) + * feat: split `ya send` into `ya pub` and `ya pub-static` to make it more ergonomic (#933) + * perf: cache each file's icon to avoid redundant calculations at rendering (#931) + * feat: preserve files' modified at timestamp while copying (#926) + * fix: prevent pasting a directory into itself (#925) + * feat: change status bar percent at 100 to Bot (#930) + * fix: always persist static messages even when there are no remote clients (#928) + * feat: expand the types supported by the event system (#923) + * fix: rollback ratatui to v0.26.1 to avoid panicking (#922) + * feat: allow opening interactively with the `--chosen-file` flag (#920) + * feat: generate autocomplete script for `ya` command (#919) + * feat: allow creating a tab with the startup directory when the `tab_create` command is called without specifying a `path` parameter (#917) + * feat: add a new `ya send` command to allow standalone client processes to communicate with DDS from the command line (#913) + * feat: smart case completion in `cd` paths (#910) + * feat: trigger path completion with both `/` and `\` on Windows (#909) + * perf: switch to `globset` to reduce CPU time spent on matching icons (#908) + * feat: default "Reveal" opener for Linux (#907) + * feat: add loading state to directories (#904) + * feat: when there are no files in the list, add a placeholder message (#900) + * feat: add `YAZI_ID` environment variable (#895) + * feat: add new `move`, `trash`, and `delete` event kinds to DDS (#880) + * fix: file list expansion arguments (`$@`, `$*`) of shell command under opener rules are out of order (#890) + * feat: add new `--orphan` option to the `shell` command (#887) + * feat: re-implement `fzf` as a built-in plugin (#884) + * feat: re-implement `zoxide` as a built-in plugin (#881) + * fix: CJK text rendering issue where the input popup component overlaps with images (#879) + * perf: re-implement file watcher in an async way (#877) + * feat: add `is_exec` and `is_sticky` to `Cha` bindings (#875) + * feat: merge the `sender` and `severity` in the DDS payload into the same field to simplify the protocol (#871) + * fix: a race condition in DDS static messages sent as internal events (#868) + * feat: detect CSI u through `Stderr` to allow using `Stdout` as the carrier of DDS payload without an ANSI sequence response timeout (#867) + * feat: the `cd` event in DDS will now also be triggered when the tab is first created (#861) + * fix: wrong `state` pointed to and ignore plugin/flavor directory creation errors + * feat: add a new `sender` property to the DDS payload (#855) + * feat: readable toml parsing error (#854) + * fix: do not default to passing `self` to `setup` to respect user invocation behavior + * perf: port `require()` and `ya.sync()` to Rust to avoid plugin information initialization process (#853) + * feat: DDS (Data Distribution Service) (#826) + * perf: add `BufWriter` to `Stderr` to avoid frequent system calls and increase rendering frame rate (#849) + * fix: Windows `cmd.exe` not responding to correct CSI sequences due to ConPTY (#845) + * feat: add support for `YAZI_FILE_ONE` to the built-in `file` previewer (#846) + * feat: time-based selection order preservation (#843) + * fix: mime-type for xz archives (#841) + * perf: accelerate kitty graphics protocol encoding by avoiding string reallocation (#837) + * feat: enhance the `ya.dbg()` and `ya.err()` debugging functions (#835) + * fix: disable ANSI colours for the `tracing_subscriber` so that the logs are not polluted with escape codes (#832) + * fix: adjust calculation for number of lines in a notification message (#828) + * feat: add a bunch of new debugging information to `yazi --debug` (#824) + * fix: kill all spawned processes when exiting Yazi (#812) + * feat: fix all dependencies to specific version numbers to allow non-`--locked` builds (#821) + * refactor: switch to `stderr` (#819) + * fix: respond to the `SIGTERM` signal even when Yazi is in the background and has passed control of the terminal to the spawned process (#797) + * fix: wrong type in iterator binding + * refactor: wrap `Opener` with `Cow` to avoid unnecessary memory reallocations when opening files (#805) + * fix: use `BTreeSet` for selected files to maintain order (#799) + +------------------------------------------------------------------- Old: ---- yazi-0.2.4.obscpio New: ---- yazi-0.2.5.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yazi.spec ++++++ --- /var/tmp/diff_new_pack.0cKVhQ/_old 2024-04-26 23:27:47.774100204 +0200 +++ /var/tmp/diff_new_pack.0cKVhQ/_new 2024-04-26 23:27:47.778100350 +0200 @@ -17,7 +17,7 @@ Name: yazi -Version: 0.2.4 +Version: 0.2.5 Release: 0 Summary: Blazing fast terminal file manager written in Rust, based on async I/O License: MIT ++++++ 0001-use-system-jit.patch ++++++ --- /var/tmp/diff_new_pack.0cKVhQ/_old 2024-04-26 23:27:47.798101082 +0200 +++ /var/tmp/diff_new_pack.0cKVhQ/_new 2024-04-26 23:27:47.802101227 +0200 @@ -1,12 +1,12 @@ ---- yazi-plugin/Cargo.toml.orig 2024-02-02 07:53:14.641950555 +0800 -+++ yazi-plugin/Cargo.toml 2024-02-02 07:53:59.589599854 +0800 -@@ -19,7 +19,7 @@ - crossterm = "^0" - futures = "^0" - md-5 = "^0" --mlua = { version = "^0", features = [ "lua54", "vendored", "serialize", "macros", "async" ] } -+mlua = { version = "^0", features = [ "lua54", "serialize", "macros", "async" ] } - parking_lot = "^0" - ratatui = "^0" - serde = "^1" +--- yazi-plugin/Cargo.toml ++++ yazi-plugin/Cargo.toml +@@ -21,7 +21,7 @@ ansi-to-tui = "3.1.0" + anyhow = "1.0.82" + futures = "0.3.30" + md-5 = "0.10.6" +-mlua = { version = "0.9.7", features = [ "lua54", "vendored", "serialize", "macros", "async" ] } ++mlua = { version = "0.9.7", features = [ "lua54", "serialize", "macros", "async" ] } + parking_lot = "0.12.1" + ratatui = "=0.26.1" + serde = "1.0.198" ++++++ _service ++++++ --- /var/tmp/diff_new_pack.0cKVhQ/_old 2024-04-26 23:27:47.826102105 +0200 +++ /var/tmp/diff_new_pack.0cKVhQ/_new 2024-04-26 23:27:47.830102251 +0200 @@ -3,7 +3,7 @@ <param name="url">https://github.com/sxyazi/yazi.git</param> <param name="versionformat">@PARENT_TAG@</param> <param name="scm">git</param> - <param name="revision">v0.2.4</param> + <param name="revision">v0.2.5</param> <param name="match-tag">v*</param> <param name="versionrewrite-pattern">v(\d+\.\d+\.\d+)</param> <param name="versionrewrite-replacement">\1</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.0cKVhQ/_old 2024-04-26 23:27:47.854103129 +0200 +++ /var/tmp/diff_new_pack.0cKVhQ/_new 2024-04-26 23:27:47.854103129 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/sxyazi/yazi.git</param> - <param name="changesrevision">b10f2de16d46df3ed7f6efe99ac966fd49d6e919</param></service></servicedata> + <param name="changesrevision">c65a14c0e650c92cce52fe507b9f84a873cae44d</param></service></servicedata> (No newline at EOF) ++++++ vendor.tar.zst ++++++ Binary files /var/tmp/diff_new_pack.0cKVhQ/_old and /var/tmp/diff_new_pack.0cKVhQ/_new differ ++++++ yazi-0.2.4.obscpio -> yazi-0.2.5.obscpio ++++++ ++++ 14549 lines of diff (skipped) ++++++ yazi.obsinfo ++++++ --- /var/tmp/diff_new_pack.0cKVhQ/_old 2024-04-26 23:27:48.586129887 +0200 +++ /var/tmp/diff_new_pack.0cKVhQ/_new 2024-04-26 23:27:48.602130472 +0200 @@ -1,5 +1,5 @@ name: yazi -version: 0.2.4 -mtime: 1709982286 -commit: b10f2de16d46df3ed7f6efe99ac966fd49d6e919 +version: 0.2.5 +mtime: 1713861317 +commit: c65a14c0e650c92cce52fe507b9f84a873cae44d

1 0

commit uhd for openSUSE:Factory
by Source-Sync 26 Apr '24

26 Apr '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package uhd for openSUSE:Factory checked in at 2024-04-26 23:27:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/uhd (Old) and /work/SRC/openSUSE:Factory/.uhd.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "uhd" Fri Apr 26 23:27:33 2024 rev:40 rq:1170286 version:4.6.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/uhd/uhd.changes 2023-11-15 21:12:34.653085654 +0100 +++ /work/SRC/openSUSE:Factory/.uhd.new.1880/uhd.changes 2024-04-26 23:27:44.337974598 +0200 @@ -1,0 +2,6 @@ +Fri Apr 26 09:39:29 UTC 2024 - Ana Guerrero <ana.guerrero(a)suse.com> + +- Fix build with boost 1.85, add patches fix-boost1.85-one.patch + and fix-boost1.85-two.patch + +------------------------------------------------------------------- New: ---- fix-boost1.85-one.patch fix-boost1.85-two.patch BETA DEBUG BEGIN: New: - Fix build with boost 1.85, add patches fix-boost1.85-one.patch and fix-boost1.85-two.patch New:- Fix build with boost 1.85, add patches fix-boost1.85-one.patch and fix-boost1.85-two.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ uhd.spec ++++++ --- /var/tmp/diff_new_pack.utgqxP/_old 2024-04-26 23:27:45.642022267 +0200 +++ /var/tmp/diff_new_pack.utgqxP/_new 2024-04-26 23:27:45.646022413 +0200 @@ -1,7 +1,7 @@ # # spec file for package uhd # -# Copyright (c) 2021-2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %define libname libuhd4_6_0 Name: uhd Version: 4.6.0.0 @@ -25,6 +26,10 @@ URL: https://files.ettus.com/manual/ Source0: https://github.com/EttusResearch/uhd/archive/v%{version}.tar.gz#/%{name}-%{… Source1: https://github.com/EttusResearch/uhd/releases/download/v%{version}/uhd-imag… +# PATCH-FIX-UPSTREAM fix-boost1.85-one.patch -- https://github.com/EttusResearch/uhd/commit/ea586168c596d13d05d145832519755… +Patch0: fix-boost1.85-one.patch +# PATCH-FIX-UPSTREAM fix-boost1.85-two.patch -- https://github.com/EttusResearch/uhd/commit/c4863b9b9f8b639260f7797157e8ac4… +Patch1: fix-boost1.85-two.patch BuildRequires: cmake >= 2.6 BuildRequires: docutils BuildRequires: doxygen @@ -34,13 +39,13 @@ BuildRequires: memory-constraints BuildRequires: orc BuildRequires: pkgconfig -BuildRequires: pkgconfig(libusb-1.0) -BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(udev) -BuildRequires: python3-devel BuildRequires: python3-Mako >= 0.4.2 +BuildRequires: python3-devel BuildRequires: python3-numpy-devel BuildRequires: python3-setuptools +BuildRequires: pkgconfig(libusb-1.0) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(udev) Requires: udev BuildRequires: libboost_filesystem-devel BuildRequires: libboost_program_options-devel ++++++ fix-boost1.85-one.patch ++++++ From ea586168c596d13d05d145832519755794649ba0 Mon Sep 17 00:00:00 2001 From: Martin Braun <martin.braun(a)ettus.com> Date: Thu, 28 Mar 2024 17:28:57 +0100 Subject: [PATCH] lib: Replace deprecated boost::filesystem usage Recent versions of Boost were throwing compiler warnings due to usage of deprecated functions. Our minimum version of Boost (1.65) already provides the replacements, so this commit simply updates these deprecated use cases. --- host/lib/usrp/mpmd/mpmd_image_loader.cpp | 6 ++---- host/lib/usrp/x300/x300_image_loader.cpp | 4 ++-- host/lib/usrp_clock/octoclock/octoclock_image_loader.cpp | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/host/lib/usrp/mpmd/mpmd_image_loader.cpp b/host/lib/usrp/mpmd/mpmd_image_loader.cpp index 31b6387ab..ba0f45fad 100644 --- a/host/lib/usrp/mpmd/mpmd_image_loader.cpp +++ b/host/lib/usrp/mpmd/mpmd_image_loader.cpp @@ -27,8 +27,6 @@ #include <cctype> #include <fstream> #include <iterator> -#include <sstream> -#include <streambuf> #include <string> #include <vector> @@ -271,7 +269,7 @@ static uhd::usrp::component_files_t bin_dts_to_component_files( // DTS component struct // First, we need to determine the name const std::string base_name = - boost::filesystem::change_extension(fpga_path, "").string(); + boost::filesystem::path(fpga_path).replace_extension("").string(); if (base_name == fpga_path) { const std::string err_msg( "Can't cut extension from FPGA filename... " + fpga_path); @@ -340,7 +338,7 @@ static void mpmd_send_fpga_to_device( UHD_LOG_TRACE("MPMD IMAGE LOADER", "FPGA path: " << fpga_path); // If the fpga_path is a lvbitx file, parse it as such - if (boost::filesystem::extension(fpga_path) == ".lvbitx") { + if (boost::filesystem::path(fpga_path).extension() == ".lvbitx") { all_component_files = lvbitx_to_component_files(fpga_path, delay_reload); } else { all_component_files = bin_dts_to_component_files(fpga_path, delay_reload); diff --git a/host/lib/usrp/x300/x300_image_loader.cpp b/host/lib/usrp/x300/x300_image_loader.cpp index d7a64d4d0..a84dba420 100644 --- a/host/lib/usrp/x300/x300_image_loader.cpp +++ b/host/lib/usrp/x300/x300_image_loader.cpp @@ -138,8 +138,8 @@ static void x300_validate_image(x300_session_t& session) boost::format("Could not find image at path \"%s\".") % session.filepath)); } - std::string extension = fs::extension(session.filepath); - session.lvbitx = (extension == ".lvbitx"); + const std::string extension = fs::path(session.filepath).extension().string(); + session.lvbitx = (extension == ".lvbitx"); if (session.lvbitx) { extract_from_lvbitx(session); diff --git a/host/lib/usrp_clock/octoclock/octoclock_image_loader.cpp b/host/lib/usrp_clock/octoclock/octoclock_image_loader.cpp index 930c5d758..4c39790c7 100644 --- a/host/lib/usrp_clock/octoclock/octoclock_image_loader.cpp +++ b/host/lib/usrp_clock/octoclock/octoclock_image_loader.cpp @@ -95,7 +95,7 @@ static void octoclock_validate_firmware_image(octoclock_session_t& session) % session.image_filepath)); } - std::string extension = fs::extension(session.image_filepath); + const std::string extension = fs::path(session.image_filepath).extension().string(); if (extension == ".bin") { octoclock_read_bin(session); } else if (extension == ".hex") { -- 2.44.0 ++++++ fix-boost1.85-two.patch ++++++ From c4863b9b9f8b639260f7797157e8ac4dd81fef93 Mon Sep 17 00:00:00 2001 From: Joerg Hofrichter <joerg.hofrichter(a)ni.com> Date: Wed, 17 Apr 2024 13:59:19 +0200 Subject: [PATCH] fix compilation with boost 1.85.0 The header boost/filesystem/convenience.hpp was removed with boost 1.85.0 The deprecated extension-related functions were already replaced with commit ea586168c596d13d05d145832519755794649ba0 --- host/lib/usrp/mpmd/mpmd_image_loader.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/host/lib/usrp/mpmd/mpmd_image_loader.cpp b/host/lib/usrp/mpmd/mpmd_image_loader.cpp index ba0f45fad..9824bbf4d 100644 --- a/host/lib/usrp/mpmd/mpmd_image_loader.cpp +++ b/host/lib/usrp/mpmd/mpmd_image_loader.cpp @@ -21,7 +21,6 @@ #include <boost/algorithm/string.hpp> #include <boost/archive/iterators/binary_from_base64.hpp> #include <boost/archive/iterators/transform_width.hpp> -#include <boost/filesystem/convenience.hpp> #include <boost/optional.hpp> #include <boost/property_tree/xml_parser.hpp> #include <cctype> -- 2.44.0

1 0

commit perl-Net-OBS-Client for openSUSE:Factory
by Source-Sync 26 Apr '24

26 Apr '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package perl-Net-OBS-Client for openSUSE:Factory checked in at 2024-04-26 23:27:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Net-OBS-Client (Old) and /work/SRC/openSUSE:Factory/.perl-Net-OBS-Client.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Net-OBS-Client" Fri Apr 26 23:27:27 2024 rev:6 rq:1170263 version:0.1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Net-OBS-Client/perl-Net-OBS-Client.changes 2024-03-28 14:33:05.430822776 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Net-OBS-Client.new.1880/perl-Net-OBS-Client.changes 2024-04-26 23:27:34.521615764 +0200 @@ -1,0 +2,6 @@ +Fri Apr 26 09:00:33 UTC 2024 - Frank Schreiner <fschreiner(a)suse.de> + +- updated to 0.1.3 + see /usr/share/doc/packages/perl-Net-OBS-Client/Changes + +------------------------------------------------------------------- Old: ---- Net-OBS-Client-0.1.2.tar.gz New: ---- Net-OBS-Client-0.1.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Net-OBS-Client.spec ++++++ --- /var/tmp/diff_new_pack.WViUX7/_old 2024-04-26 23:27:35.941667673 +0200 +++ /var/tmp/diff_new_pack.WViUX7/_new 2024-04-26 23:27:35.941667673 +0200 @@ -18,7 +18,7 @@ %define cpan_name Net-OBS-Client Name: perl-Net-OBS-Client -Version: 0.1.2 +Version: 0.1.3 Release: 0 License: Artistic-2.0 Summary: Simple OBS API calls ++++++ Net-OBS-Client-0.1.2.tar.gz -> Net-OBS-Client-0.1.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-OBS-Client-0.1.2/Changes new/Net-OBS-Client-0.1.3/Changes --- old/Net-OBS-Client-0.1.2/Changes 2024-03-27 16:11:10.902957250 +0100 +++ new/Net-OBS-Client-0.1.3/Changes 2024-04-26 09:31:52.382236675 +0200 @@ -1,4 +1,9 @@ Revision history for Net-OBS-Client +0.1.3 2024-04-26 + + * add "use Carp" in Net::OBS::LWP::UserAgent + + 0.1.2 2024-03-27 * added Net::OBS::LWP::UserAgent with 'mirror' method diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-OBS-Client-0.1.2/META.json new/Net-OBS-Client-0.1.3/META.json --- old/Net-OBS-Client-0.1.2/META.json 2024-03-28 10:56:55.322310870 +0100 +++ new/Net-OBS-Client-0.1.3/META.json 2024-04-26 09:40:56.925566753 +0200 @@ -34,6 +34,7 @@ }, "runtime" : { "requires" : { + "Carp" : "0", "Config::INI::Reader" : "0", "Config::Tiny" : "0", "Const::Fast" : "0", @@ -60,6 +61,6 @@ "web" : "https://github.com/M0ses/Net-OBS-Client" } }, - "version" : "v0.1.2", + "version" : "v0.1.3", "x_serialization_backend" : "JSON::PP version 4.16" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-OBS-Client-0.1.2/META.yml new/Net-OBS-Client-0.1.3/META.yml --- old/Net-OBS-Client-0.1.2/META.yml 2024-03-28 10:56:55.095645447 +0100 +++ new/Net-OBS-Client-0.1.3/META.yml 2024-04-26 09:40:56.762233420 +0200 @@ -20,6 +20,7 @@ - t - inc requires: + Carp: '0' Config::INI::Reader: '0' Config::Tiny: '0' Const::Fast: '0' @@ -35,5 +36,5 @@ resources: bugtracker: https://github.com/M0ses/Net-OBS-Client/issues repository: https://github.com/M0ses/Net-OBS-Client.git -version: v0.1.2 +version: v0.1.3 x_serialization_backend: 'CPAN::Meta::YAML version 0.018' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-OBS-Client-0.1.2/Makefile.PL new/Net-OBS-Client-0.1.3/Makefile.PL --- old/Net-OBS-Client-0.1.2/Makefile.PL 2024-03-28 09:50:33.200829213 +0100 +++ new/Net-OBS-Client-0.1.3/Makefile.PL 2024-04-26 09:29:40.845570835 +0200 @@ -31,6 +31,7 @@ 'URI::URL' => 0, 'Path::Class' => 0, 'Const::Fast' => 0, + 'Carp' => 0, }, META_MERGE => { 'meta-spec' => { version => 2 }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-OBS-Client-0.1.2/lib/Net/OBS/Client.pm new/Net-OBS-Client-0.1.3/lib/Net/OBS/Client.pm --- old/Net-OBS-Client-0.1.2/lib/Net/OBS/Client.pm 2024-03-27 16:11:21.136234428 +0100 +++ new/Net-OBS-Client-0.1.3/lib/Net/OBS/Client.pm 2024-04-26 09:30:25.602237215 +0200 @@ -8,7 +8,7 @@ with 'Net::OBS::Client::Roles::Client'; -our $VERSION = '0.1.2'; +our $VERSION = '0.1.3'; sub project { my ($self, @args) = @_; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-OBS-Client-0.1.2/lib/Net/OBS/LWP/UserAgent.pm new/Net-OBS-Client-0.1.3/lib/Net/OBS/LWP/UserAgent.pm --- old/Net-OBS-Client-0.1.2/lib/Net/OBS/LWP/UserAgent.pm 2024-03-26 17:25:16.922675325 +0100 +++ new/Net-OBS-Client-0.1.3/lib/Net/OBS/LWP/UserAgent.pm 2024-04-26 09:27:49.155571530 +0200 @@ -3,6 +3,7 @@ use strict; use warnings; use Const::Fast; +use Carp; use base 'LWP::UserAgent';

1 0

commit owncloud-client for openSUSE:Factory
by Source-Sync 26 Apr '24

26 Apr '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package owncloud-client for openSUSE:Factory checked in at 2024-04-26 23:27:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/owncloud-client (Old) and /work/SRC/openSUSE:Factory/.owncloud-client.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "owncloud-client" Fri Apr 26 23:27:25 2024 rev:45 rq:1170255 version:5.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/owncloud-client/owncloud-client.changes 2024-02-22 21:03:04.417155857 +0100 +++ /work/SRC/openSUSE:Factory/.owncloud-client.new.1880/owncloud-client.changes 2024-04-26 23:27:33.629583156 +0200 @@ -1,0 +2,5 @@ +Thu Apr 18 06:07:15 UTC 2024 - thod_(a)gmx.de + +- Fix build for Leap which is missing /usr/etc + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ owncloud-client.spec ++++++ --- /var/tmp/diff_new_pack.LBa5qZ/_old 2024-04-26 23:27:34.341609183 +0200 +++ /var/tmp/diff_new_pack.LBa5qZ/_new 2024-04-26 23:27:34.341609183 +0200 @@ -16,9 +16,13 @@ # -# The minimum required version of qtkeychain, stay with 0.4.0 for now -# to stay compatible with 13.2 +# The minimum required version of qtkeychain %define keychain_version 0.12.0 +# old rpm without /usr/etc +%if 0%{?suse_version} && 0%{?suse_version} <= 1500 +%global _distconfdir /etc +%endif + Name: owncloud-client Version: 5.2.1 Release: 0 @@ -126,11 +130,7 @@ %autosetup -p1 -n ownCloud_os-%{version} %build - -echo suse_version 0%{?suse_version} - -%cmake_qt6 -DKDE_SKIP_RPATH_SETTINGS=ON - +%cmake_qt6 -DKDE_SKIP_RPATH_SETTINGS=ON -DKDE_INSTALL_SYSCONFDIR=%{_distconfdir} %{qt6_build} %install

1 0

commit 0ad for openSUSE:Factory
by Source-Sync 26 Apr '24

26 Apr '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package 0ad for openSUSE:Factory checked in at 2024-04-26 23:27:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/0ad (Old) and /work/SRC/openSUSE:Factory/.0ad.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "0ad" Fri Apr 26 23:27:14 2024 rev:12 rq:1170217 version:0.0.26 Changes: -------- --- /work/SRC/openSUSE:Factory/0ad/0ad.changes 2024-03-15 20:31:58.325601837 +0100 +++ /work/SRC/openSUSE:Factory/.0ad.new.1880/0ad.changes 2024-04-26 23:27:27.565361480 +0200 @@ -1,0 +2,5 @@ +Thu Apr 25 22:29:04 UTC 2024 - Aaron Puchert <aaronpuchert(a)alice-dsl.net> + +- Add fix-boost-1.85-build.patch to fix build with boost 1.85. + +------------------------------------------------------------------- New: ---- fix-boost-1.85-build.patch BETA DEBUG BEGIN: New: - Add fix-boost-1.85-build.patch to fix build with boost 1.85. BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ 0ad.spec ++++++ --- /var/tmp/diff_new_pack.E1xe8L/_old 2024-04-26 23:27:28.377391163 +0200 +++ /var/tmp/diff_new_pack.E1xe8L/_new 2024-04-26 23:27:28.377391163 +0200 @@ -50,6 +50,8 @@ Patch4: fix-gcc13-build.patch # PATCH-FIX-UPSTREAM -- Fix build with fmt 10 Patch5: fix-fmt10-build.patch +# PATCH-FIX-UPSTREAM -- Fix build with boost 1.85 +Patch6: fix-boost-1.85-build.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: libXcursor-devel @@ -107,6 +109,9 @@ %patch -P 1 -p1 %patch -P 2 -p1 %endif +%if %{pkg_vcmp libboost_filesystem-devel >= 1.74} +%patch -P 6 -p1 +%endif %build export CFLAGS="%{optflags}" ++++++ fix-boost-1.85-build.patch ++++++ --- 0ad-0.0.26-alpha/source/graphics/TextureManager.cpp +++ 0ad-0.0.26-alpha/source/graphics/TextureManager.cpp @@ -785,7 +785,7 @@ files.push_back(f); p = p / GetWstringFromWpath(*it); } - return m_TextureConverter.ComputeSettings(GetWstringFromWpath(srcPath.leaf()), files); + return m_TextureConverter.ComputeSettings(GetWstringFromWpath(srcPath.filename()), files); } /** --- 0ad-0.0.26-alpha/source/lib/file/file_system.cpp +++ 0ad-0.0.26-alpha/source/lib/file/file_system.cpp @@ -218,7 +218,7 @@ try { if(override_if_exists) - fs::copy_file(fs::path(path.string()), fs::path(newPath.string()), boost::filesystem::copy_option::overwrite_if_exists); + fs::copy_file(fs::path(path.string()), fs::path(newPath.string()), boost::filesystem::copy_options::overwrite_existing); else fs::copy_file(fs::path(path.string()), fs::path(newPath.string())); }

1 0

commit ffmpeg-5 for openSUSE:Factory
by Source-Sync 26 Apr '24

26 Apr '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ffmpeg-5 for openSUSE:Factory checked in at 2024-04-26 23:27:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ffmpeg-5 (Old) and /work/SRC/openSUSE:Factory/.ffmpeg-5.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ffmpeg-5" Fri Apr 26 23:27:12 2024 rev:24 rq:1170214 version:5.1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/ffmpeg-5/ffmpeg-5.changes 2024-04-23 18:56:45.555946601 +0200 +++ /work/SRC/openSUSE:Factory/.ffmpeg-5.new.1880/ffmpeg-5.changes 2024-04-26 23:27:26.349317028 +0200 @@ -1,0 +2,29 @@ +Thu Apr 23 16:14:18 UTC 2024 - Cliff Zhao <qzhao(a)suse.com> + +- Add ffmpeg-CVE-2023-51793.patch: + Backporting 0ecc1f0e from upstream, Fix odd height handling. + (CVE-2023-51793 bsc#1223272) + +------------------------------------------------------------------- +Thu Apr 23 15:35:32 UTC 2024 - Cliff Zhao <qzhao(a)suse.com> + +- Add ffmpeg-CVE-2023-49502.patch: + Backporting 737ede40 from upstream, account for chroma sub-sampling + in min size calculation. + (CVE-2023-49502 bsc#1223235) + +------------------------------------------------------------------- +Thu Apr 23 14:05:28 UTC 2024 - Cliff Zhao <qzhao(a)suse.com> + +- Add ffmpeg-CVE-2023-50008.patch: + Backporting 5f87a68c from upstream, Fix memory leaks. + (CVE-2023-50008 bsc#1223254) + +------------------------------------------------------------------- +Thu Apr 23 12:22:53 UTC 2024 - Cliff Zhao <qzhao(a)suse.com> + +- Add ffmpeg-CVE-2023-50007.patch: + Backporting b1942734 from upstream, Fix crash with EOF handling. + (CVE-2023-50007 bsc#1223253) + +------------------------------------------------------------------- New: ---- ffmpeg-CVE-2023-49502.patch ffmpeg-CVE-2023-50007.patch ffmpeg-CVE-2023-50008.patch ffmpeg-CVE-2023-51793.patch BETA DEBUG BEGIN: New: - Add ffmpeg-CVE-2023-49502.patch: Backporting 737ede40 from upstream, account for chroma sub-sampling New: - Add ffmpeg-CVE-2023-50007.patch: Backporting b1942734 from upstream, Fix crash with EOF handling. New: - Add ffmpeg-CVE-2023-50008.patch: Backporting 5f87a68c from upstream, Fix memory leaks. New: - Add ffmpeg-CVE-2023-51793.patch: Backporting 0ecc1f0e from upstream, Fix odd height handling. BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ffmpeg-5.spec ++++++ --- /var/tmp/diff_new_pack.AsBZlB/_old 2024-04-26 23:27:27.197348027 +0200 +++ /var/tmp/diff_new_pack.AsBZlB/_new 2024-04-26 23:27:27.201348174 +0200 @@ -121,7 +121,10 @@ Patch90: ffmpeg-chromium.patch Patch91: ffmpeg-dlopen-openh264.patch Patch93: soname.diff - +Patch94: ffmpeg-CVE-2023-50007.patch +Patch95: ffmpeg-CVE-2023-50008.patch +Patch96: ffmpeg-CVE-2023-49502.patch +Patch97: ffmpeg-CVE-2023-51793.patch %if %{with amf_sdk} BuildRequires: AMF-devel %endif @@ -817,7 +820,7 @@ %files private-devel %_includedir/ffmpeg/private/ -%else # "flavor" == "ffmpeg-5-mini" +%else %define _name ffmpeg @@ -848,6 +851,14 @@ Patch90: ffmpeg-chromium.patch Patch91: ffmpeg-dlopen-openh264.patch Patch93: soname.diff +# PATCH-FIX-UPSTREAM ffmpeg-CVE-2023-50007.patch CVE-2023-50007 bsc#1223253 qzhao(a)suse.com -- Fix crash with EOF handling. +Patch94: ffmpeg-CVE-2023-50007.patch +# PATCH-FIX-UPSTREAM ffmpeg-CVE-2023-50008.patch CVE-2023-50008 bsc#1223254 qzhao(a)suse.com -- Fix memory leaks. +Patch95: ffmpeg-CVE-2023-50008.patch +# PATCH-FIX-UPSTREAM ffmpeg-CVE-2023-49502.patch CVE-2023-49502 bsc#1223235 qzhao(a)suse.com -- Account for chroma sub-sampling in min size calculation. +Patch96: ffmpeg-CVE-2023-49502.patch +# PATCH-FIX-UPSTREAM ffmpeg-CVE-2023-51793.patch CVE-2023-51793 bsc#1223272 qzhao(a)suse.com -- Fix odd height handling. +Patch97: ffmpeg-CVE-2023-51793.patch BuildRequires: c_compiler Requires: this-is-only-for-build-envs @@ -946,5 +957,5 @@ %_libdir/pkgconfig/*.pc %_includedir/ffmpeg/ -%endif # "flavor" == "ffmpeg-5-mini" +%endif ++++++ ffmpeg-CVE-2023-49502.patch ++++++ From 737ede405b11a37fdd61d19cf25df296a0cb0b75 From: Cosmin Stejerean <cosmin(a)cosmin.at> Date: Wed Dec 6 18:39:32 2023 +0800 Subject: avfilter/bwdif: account for chroma sub-sampling in min size calculation References: https://bugzilla.opensuse.org/1223235 References: CVE-2023-49502 The current logic for detecting frames that are too small for the algorithm does not account for chroma sub-sampling, and so a sample where the luma plane is large enough, but the chroma planes are not will not be rejected. In that event, a heap overflow will occur. This change adjusts the logic to consider the chroma planes and makes the change to all three bwdif implementations. Fixes #10688 Signed-off-by: Cosmin Stejerean <cosmin(a)cosmin.at> Reviewed-by: Thomas Mundt <tmundt75(a)gmail.com> Signed-off-by: Philip Langdale <philipl(a)overt.org> diff -Nura ffmpeg-5.1.4/libavfilter/vf_bwdif.c ffmpeg-5.1.4_new/libavfilter/vf_bwdif.c --- ffmpeg-5.1.4/libavfilter/vf_bwdif.c 2023-11-10 07:38:51.000000000 +0800 +++ ffmpeg-5.1.4_new/libavfilter/vf_bwdif.c 2024-04-26 01:26:15.539021242 +0800 @@ -333,13 +333,14 @@ if(yadif->mode&1) link->frame_rate = av_mul_q(link->src->inputs[0]->frame_rate, (AVRational){2,1}); - if (link->w < 3 || link->h < 4) { - av_log(ctx, AV_LOG_ERROR, "Video of less than 3 columns or 4 lines is not supported\n"); + yadif->csp = av_pix_fmt_desc_get(link->format); + yadif->filter = filter; + + if (AV_CEIL_RSHIFT(link->w, yadif->csp->log2_chroma_w) < 3 || AV_CEIL_RSHIFT(link->h, yadif->csp->log2_chroma_h) < 4) { + av_log(ctx, AV_LOG_ERROR, "Video with planes less than 3 columns or 4 lines is not supported\n"); return AVERROR(EINVAL); } - yadif->csp = av_pix_fmt_desc_get(link->format); - yadif->filter = filter; if (yadif->csp->comp[0].depth > 8) { s->filter_intra = filter_intra_16bit; s->filter_line = filter_line_c_16bit; ++++++ ffmpeg-CVE-2023-50007.patch ++++++ From b1942734c7cbcdc9034034373abcc9ecb9644c47 From: Paul B Mahol <onemda(a)gmail.com> Date: Mon Nov 27 11:45:34 2023 +0100 Subject: avfilter/af_afwtdn: fix crash with EOF handling References: https://bugzilla.opensuse.org/1223253 References: CVE-2023-50007 diff -Nura ffmpeg-5.1.4/libavfilter/af_afwtdn.c ffmpeg-5.1.4_new/libavfilter/af_afwtdn.c --- ffmpeg-5.1.4/libavfilter/af_afwtdn.c 2023-11-10 07:38:51.000000000 +0800 +++ ffmpeg-5.1.4_new/libavfilter/af_afwtdn.c 2024-04-25 16:14:12.016919074 +0800 @@ -410,6 +410,7 @@ uint64_t sn; int64_t eof_pts; + int eof; int wavelet_type; int channels; @@ -1071,7 +1072,7 @@ s->drop_samples = 0; } else { if (s->padd_samples < 0 && eof) { - out->nb_samples += s->padd_samples; + out->nb_samples = FFMAX(0, out->nb_samples + s->padd_samples); s->padd_samples = 0; } if (!eof) @@ -1210,23 +1211,26 @@ FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink); - ret = ff_inlink_consume_samples(inlink, s->nb_samples, s->nb_samples, &in); - if (ret < 0) - return ret; - if (ret > 0) - return filter_frame(inlink, in); + if (!s->eof) { + ret = ff_inlink_consume_samples(inlink, s->nb_samples, s->nb_samples, &in); + if (ret < 0) + return ret; + if (ret > 0) + return filter_frame(inlink, in); + } if (ff_inlink_acknowledge_status(inlink, &status, &pts)) { - if (status == AVERROR_EOF) { - while (s->padd_samples != 0) { - ret = filter_frame(inlink, NULL); - if (ret < 0) - return ret; - } - ff_outlink_set_status(outlink, status, pts); - return ret; - } + if (status == AVERROR_EOF) + s->eof = 1; } + + if (s->eof && s->padd_samples != 0) { + return filter_frame(inlink, NULL); + } else if (s->eof) { + ff_outlink_set_status(outlink, AVERROR_EOF, s->eof_pts); + return 0; + } + FF_FILTER_FORWARD_WANTED(outlink, inlink); return FFERROR_NOT_READY; ++++++ ffmpeg-CVE-2023-50008.patch ++++++ From 5f87a68cf70dafeab2fb89b42e41a4c29053b89b From: Paul B Mahol <onemda(a)gmail.com> Date: Mon Nov 27 12:08:20 2023 +0100 Subject: avfilter/vf_colorcorrect: fix memory leaks References: https://bugzilla.opensuse.org/1223254 References: CVE-2023-50008 diff -Nura ffmpeg-5.1.4/libavfilter/vf_colorcorrect.c ffmpeg-5.1.4_new/libavfilter/vf_colorcorrect.c --- ffmpeg-5.1.4/libavfilter/vf_colorcorrect.c 2023-11-10 07:38:51.000000000 +0800 +++ ffmpeg-5.1.4_new/libavfilter/vf_colorcorrect.c 2024-04-25 16:21:53.290363296 +0800 @@ -498,6 +498,8 @@ ColorCorrectContext *s = ctx->priv; av_freep(&s->analyzeret); + av_freep(&s->uhistogram); + av_freep(&s->vhistogram); } static const AVFilterPad colorcorrect_inputs[] = { ++++++ ffmpeg-CVE-2023-51793.patch ++++++ From 0ecc1f0e48930723d7a467761b66850811c23e62 From: Michael Niedermayer <michael(a)niedermayer.cc> Date: Fri Dec 22 12:31:35 2023 +0100 Subject: avfilter/vf_weave: Fix odd height handling References: https://bugzilla.opensuse.org/1223272 References: CVE-2023-51793 Fixes: out of array access Fixes: tickets/10743/poc10ffmpeg Found-by: Zeng Yunxiang and Li Zeyuan Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff -Nura ffmpeg-5.1.4/libavfilter/vf_weave.c ffmpeg-5.1.4_new/libavfilter/vf_weave.c --- ffmpeg-5.1.4/libavfilter/vf_weave.c 2023-11-10 07:38:51.000000000 +0800 +++ ffmpeg-5.1.4_new/libavfilter/vf_weave.c 2024-04-26 01:39:00.742700759 +0800 @@ -30,6 +30,7 @@ int double_weave; int nb_planes; int planeheight[4]; + int outheight[4]; int linesize[4]; AVFrame *prev; @@ -79,6 +80,9 @@ s->planeheight[1] = s->planeheight[2] = AV_CEIL_RSHIFT(inlink->h, desc->log2_chroma_h); s->planeheight[0] = s->planeheight[3] = inlink->h; + s->outheight[1] = s->outheight[2] = AV_CEIL_RSHIFT(2*inlink->h, desc->log2_chroma_h); + s->outheight[0] = s->outheight[3] = 2*inlink->h; + s->nb_planes = av_pix_fmt_count_planes(inlink->format); return 0; @@ -104,19 +108,20 @@ const int height = s->planeheight[i]; const int start = (height * jobnr) / nb_jobs; const int end = (height * (jobnr+1)) / nb_jobs; + const int compensation = 2*end > s->outheight[i]; av_image_copy_plane(out->data[i] + out->linesize[i] * field1 + out->linesize[i] * start * 2, out->linesize[i] * 2, in->data[i] + start * in->linesize[i], in->linesize[i], - s->linesize[i], end - start); + s->linesize[i], end - start - compensation * field1); av_image_copy_plane(out->data[i] + out->linesize[i] * field2 + out->linesize[i] * start * 2, out->linesize[i] * 2, s->prev->data[i] + start * s->prev->linesize[i], s->prev->linesize[i], - s->linesize[i], end - start); + s->linesize[i], end - start - compensation * field2); } return 0;

1 0

commit ghc-postgresql-libpq for openSUSE:Factory
by Source-Sync 26 Apr '24

26 Apr '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-postgresql-libpq for openSUSE:Factory checked in at 2024-04-26 23:27:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-postgresql-libpq (Old) and /work/SRC/openSUSE:Factory/.ghc-postgresql-libpq.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-postgresql-libpq" Fri Apr 26 23:27:11 2024 rev:12 rq:1170213 version:0.10.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-postgresql-libpq/ghc-postgresql-libpq.changes 2023-11-23 21:42:01.046517387 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-postgresql-libpq.new.1880/ghc-postgresql-libpq.changes 2024-04-26 23:27:25.649291439 +0200 @@ -1,0 +2,9 @@ +Thu Apr 18 15:44:23 UTC 2024 - Peter Simons <psimons(a)suse.com> + +- Update postgresql-libpq to version 0.10.1.0. + 0.10.1.0 + -------- + + - Fix issue with empty binary values (https://github.com/haskellari/postgresql-libpq/issues/54) + +------------------------------------------------------------------- Old: ---- postgresql-libpq-0.10.0.0.tar.gz postgresql-libpq.cabal New: ---- postgresql-libpq-0.10.1.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-postgresql-libpq.spec ++++++ --- /var/tmp/diff_new_pack.TjE8rI/_old 2024-04-26 23:27:26.161310155 +0200 +++ /var/tmp/diff_new_pack.TjE8rI/_new 2024-04-26 23:27:26.161310155 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-postgresql-libpq # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,13 +20,12 @@ %global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.10.0.0 +Version: 0.10.1.0 Release: 0 Summary: Low-level binding to libpq License: BSD-3-Clause URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-Cabal-prof BuildRequires: ghc-base-devel @@ -38,6 +37,12 @@ BuildRequires: ghc-unix-prof BuildRequires: postgresql-server-devel ExcludeArch: %{ix86} +%if %{with tests} +BuildRequires: ghc-tasty-devel +BuildRequires: ghc-tasty-hunit-devel +BuildRequires: ghc-tasty-hunit-prof +BuildRequires: ghc-tasty-prof +%endif %description This is a binding to libpq: the C application programmer's interface to @@ -75,7 +80,6 @@ %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ postgresql-libpq-0.10.0.0.tar.gz -> postgresql-libpq-0.10.1.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postgresql-libpq-0.10.0.0/CHANGELOG.md new/postgresql-libpq-0.10.1.0/CHANGELOG.md --- old/postgresql-libpq-0.10.0.0/CHANGELOG.md 2001-09-09 03:46:40.000000000 +0200 +++ new/postgresql-libpq-0.10.1.0/CHANGELOG.md 2001-09-09 03:46:40.000000000 +0200 @@ -1,3 +1,8 @@ +0.10.1.0 +-------- + +- Fix issue with empty binary values (https://github.com/haskellari/postgresql-libpq/issues/54) + 0.10.0.0 -------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postgresql-libpq-0.10.0.0/postgresql-libpq.cabal new/postgresql-libpq-0.10.1.0/postgresql-libpq.cabal --- old/postgresql-libpq-0.10.0.0/postgresql-libpq.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/postgresql-libpq-0.10.1.0/postgresql-libpq.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,6 +1,6 @@ cabal-version: 2.4 name: postgresql-libpq -version: 0.10.0.0 +version: 0.10.1.0 synopsis: low-level binding to libpq description: This is a binding to libpq: the C application @@ -24,7 +24,14 @@ build-type: Custom extra-source-files: cbits/hs-libpq.h tested-with: - GHC ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.7 || ==9.4.4 || ==9.6.1 + GHC ==8.6.5 + || ==8.8.4 + || ==8.10.7 + || ==9.0.2 + || ==9.2.8 + || ==9.4.8 + || ==9.6.5 + || ==9.8.2 extra-source-files: CHANGELOG.md @@ -65,10 +72,11 @@ Database.PostgreSQL.LibPQ.Marshal Database.PostgreSQL.LibPQ.Notify Database.PostgreSQL.LibPQ.Oid + Database.PostgreSQL.LibPQ.Ptr build-depends: - , base >=4.12.0.0 && <4.19 - , bytestring >=0.10.8.2 && <0.12 + , base >=4.12.0.0 && <4.20 + , bytestring >=0.10.8.2 && <0.13 if !os(windows) build-depends: unix >=2.7.2.2 && <2.9 @@ -107,6 +115,8 @@ , base , bytestring , postgresql-libpq + , tasty ^>=1.5 + , tasty-hunit ^>=0.10.1 source-repository head type: git diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postgresql-libpq-0.10.0.0/src/Database/PostgreSQL/LibPQ/Ptr.hs new/postgresql-libpq-0.10.1.0/src/Database/PostgreSQL/LibPQ/Ptr.hs --- old/postgresql-libpq-0.10.0.0/src/Database/PostgreSQL/LibPQ/Ptr.hs 1970-01-01 01:00:00.000000000 +0100 +++ new/postgresql-libpq-0.10.1.0/src/Database/PostgreSQL/LibPQ/Ptr.hs 2001-09-09 03:46:40.000000000 +0200 @@ -0,0 +1,7 @@ +{-# LANGUAGE MagicHash #-} +module Database.PostgreSQL.LibPQ.Ptr (emptyPtr) where + +import GHC.Ptr (Ptr (..)) + +emptyPtr :: Ptr a +emptyPtr = Ptr ""# diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postgresql-libpq-0.10.0.0/src/Database/PostgreSQL/LibPQ.hs new/postgresql-libpq-0.10.1.0/src/Database/PostgreSQL/LibPQ.hs --- old/postgresql-libpq-0.10.0.0/src/Database/PostgreSQL/LibPQ.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/postgresql-libpq-0.10.1.0/src/Database/PostgreSQL/LibPQ.hs 2001-09-09 03:46:40.000000000 +0200 @@ -238,6 +238,7 @@ import Database.PostgreSQL.LibPQ.Marshal import Database.PostgreSQL.LibPQ.Notify import Database.PostgreSQL.LibPQ.Oid +import Database.PostgreSQL.LibPQ.Ptr -- $dbconn -- The following functions deal with making a connection to a @@ -662,10 +663,13 @@ -- * 'ByteString' uses pinned memory -- * the reference to the 'CString' doesn't escape unsafeUseParamAsCString :: (B.ByteString, Format) -> (CString -> IO a) -> IO a -unsafeUseParamAsCString (bs, format) = +unsafeUseParamAsCString (bs, format) kont = case format of - Binary -> B.unsafeUseAsCString bs - Text -> B.useAsCString bs + Binary -> B.unsafeUseAsCStringLen bs kont' + Text -> B.useAsCString bs kont + where + kont' (ptr, 0) = if ptr == nullPtr then kont emptyPtr else kont ptr + kont' (ptr, _) = kont ptr -- | Convert a list of parameters to the format expected by libpq FFI calls. withParams :: [Maybe (Oid, B.ByteString, Format)] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postgresql-libpq-0.10.0.0/test/Smoke.hs new/postgresql-libpq-0.10.1.0/test/Smoke.hs --- old/postgresql-libpq-0.10.0.0/test/Smoke.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/postgresql-libpq-0.10.1.0/test/Smoke.hs 2001-09-09 03:46:40.000000000 +0200 @@ -1,17 +1,24 @@ +{-# LANGUAGE OverloadedStrings #-} module Main (main) where -import Control.Monad (unless) +import Control.Monad (unless) +import Data.Foldable (toList) import Database.PostgreSQL.LibPQ -import Data.Foldable (toList) -import System.Environment (getEnvironment) -import System.Exit (exitFailure) +import System.Environment (getEnvironment) +import System.Exit (exitFailure) +import Test.Tasty (defaultMain, testGroup) +import Test.Tasty.HUnit (assertEqual, testCaseSteps) +import qualified Data.ByteString as BS import qualified Data.ByteString.Char8 as BS8 main :: IO () main = do libpqVersion >>= print - withConnstring smoke + withConnstring $ \connString -> defaultMain $ testGroup "postgresql-libpq" + [ testCaseSteps "smoke" $ smoke connString + , testCaseSteps "issue54" $ issue54 connString + ] withConnstring :: (BS8.ByteString -> IO ()) -> IO () withConnstring kont = do @@ -35,21 +42,48 @@ , "port=5432" ] -smoke :: BS8.ByteString -> IO () -smoke connstring = do +smoke :: BS8.ByteString -> (String -> IO ()) -> IO () +smoke connstring info = do + let infoShow x = info (show x) + conn <- connectdb connstring -- status functions - db conn >>= print - user conn >>= print - host conn >>= print - port conn >>= print - status conn >>= print - transactionStatus conn >>= print - protocolVersion conn >>= print - serverVersion conn >>= print + db conn >>= infoShow + user conn >>= infoShow + host conn >>= infoShow + port conn >>= infoShow + status conn >>= infoShow + transactionStatus conn >>= infoShow + protocolVersion conn >>= infoShow + serverVersion conn >>= infoShow s <- status conn - unless (s == ConnectionOk) exitFailure + assertEqual "connection not ok" ConnectionOk s finish conn + +issue54 :: BS8.ByteString -> (String -> IO ()) -> IO () +issue54 connString info = do + conn <- connectdb connString + + Just result <- execParams conn + "SELECT ($1 :: bytea), ($2 :: bytea)" + [Just (Oid 17,"",Binary), Just (Oid 17,BS.empty,Binary)] + Binary + s <- resultStatus result + assertEqual "result status" TuplesOk s + + -- ntuples result >>= info . show + -- nfields result >>= info . show + + null1 <- getisnull result 0 0 + null2 <- getisnull result 0 1 + assertEqual "fst not null" False null1 + assertEqual "snd not null" False null2 + + Just val1 <- getvalue result 0 0 + Just val2 <- getvalue result 0 1 + + assertEqual "fst not null" BS.empty val1 + assertEqual "snd not null" BS.empty val2

1 0

commit gamescope for openSUSE:Factory
by Source-Sync 26 Apr '24

26 Apr '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gamescope for openSUSE:Factory checked in at 2024-04-26 23:27:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gamescope (Old) and /work/SRC/openSUSE:Factory/.gamescope.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gamescope" Fri Apr 26 23:27:08 2024 rev:12 rq:1170210 version:3.14.6 Changes: -------- --- /work/SRC/openSUSE:Factory/gamescope/gamescope.changes 2024-03-08 18:09:28.810803094 +0100 +++ /work/SRC/openSUSE:Factory/.gamescope.new.1880/gamescope.changes 2024-04-26 23:27:24.105234996 +0200 @@ -1,0 +2,15 @@ +Thu Apr 25 14:16:52 UTC 2024 - antonio.teixeira(a)suse.com + +- Update to version 3.14.6: + * wlserver: Collection of cursor improvements/fixes + * wlserver: Fix some crashes wrt. Gamescope swapchain lifetime + * Revert "drm: Update AMD color management for Linux 6.8" + * convar: add Split helper + * drm: Only expose explicit sync on > kernel 6.8 + * wayland_backend: comment out assert for now + * build: Add missing input_emulation option + * input: Add support for xtest emulation with libei + * drm: Get backend to close down cleanly + * steamcompmgr: Set PDEATHSIG for launched children + +------------------------------------------------------------------- Old: ---- gamescope-3.14.2.tar.xz New: ---- gamescope-3.14.6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gamescope.spec ++++++ --- /var/tmp/diff_new_pack.mGFpu2/_old 2024-04-26 23:27:25.477285151 +0200 +++ /var/tmp/diff_new_pack.mGFpu2/_new 2024-04-26 23:27:25.481285297 +0200 @@ -18,7 +18,7 @@ %bcond_without intree_libs Name: gamescope -Version: 3.14.2 +Version: 3.14.6 Release: 0 Summary: Micro-compositor optimized for running video games on Wayland License: BSD-2-Clause @@ -47,7 +47,9 @@ BuildRequires: pkgconfig(hwdata) BuildRequires: pkgconfig(libavif) BuildRequires: pkgconfig(libcap) +BuildRequires: pkgconfig(libdecor-0) BuildRequires: pkgconfig(libdrm) >= 2.4.113 +BuildRequires: pkgconfig(libeis-1.0) BuildRequires: pkgconfig(libpipewire-0.3) BuildRequires: pkgconfig(sdl2) BuildRequires: pkgconfig(vulkan) @@ -107,6 +109,7 @@ %if 0%{?suse_version} < 1599 sed -i "s|dependency('stb')|declare_dependency(include_directories: include_directories('/usr/include/stb'))|g" src/meson.build %endif +sed -i "s|#include <libei-1.0/libeis.h>|#include <libeis.h>|g" src/InputEmulation.cpp %meson \ -Dpipewire=enabled \ %{nil} ++++++ _service ++++++ --- /var/tmp/diff_new_pack.mGFpu2/_old 2024-04-26 23:27:25.509286321 +0200 +++ /var/tmp/diff_new_pack.mGFpu2/_new 2024-04-26 23:27:25.513286467 +0200 @@ -3,6 +3,7 @@ <service name="tar_scm" mode="disabled"> <param name="url">https://github.com/Plagman/gamescope.git</param> <param name="versionformat">@PARENT_TAG@</param> + <param name="revision">jupiter-3.6</param> <param name="scm">git</param> <param name="versionrewrite-pattern">([\.\d]+)</param> <param name="versionrewrite-replacement">\1</param> ++++++ gamescope-3.14.2.tar.xz -> gamescope-3.14.6.tar.xz ++++++ /work/SRC/openSUSE:Factory/gamescope/gamescope-3.14.2.tar.xz /work/SRC/openSUSE:Factory/.gamescope.new.1880/gamescope-3.14.6.tar.xz differ: char 15, line 1

1 0

commit eksctl for openSUSE:Factory
by Source-Sync 26 Apr '24

26 Apr '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package eksctl for openSUSE:Factory checked in at 2024-04-26 23:27:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/eksctl (Old) and /work/SRC/openSUSE:Factory/.eksctl.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "eksctl" Fri Apr 26 23:27:02 2024 rev:26 rq:1170204 version:0.176.0 Changes: -------- --- /work/SRC/openSUSE:Factory/eksctl/eksctl.changes 2024-04-23 18:56:59.544452035 +0200 +++ /work/SRC/openSUSE:Factory/.eksctl.new.1880/eksctl.changes 2024-04-26 23:27:19.253057627 +0200 @@ -1,0 +2,16 @@ +Thu Apr 25 19:05:25 UTC 2024 - opensuse_buildservice(a)ojkastl.de + +- Update to version 0.176.0: + * Add release notes for v0.176.0 (#7672) + * Enforce `authenticationMode:CONFIG_MAP` on Outposts (#7699) + * [EKSCTL create cluster command] Authorise self-managed nodes + via `aws-auth configmap` when EKS access entries are disabled + (#7698) + * Add support for AMIs based on AmazonLinux2023 (#7684) + * Bump mkdocs version (#7696) + * Display full draft release notes in PR description (#7686) + * Allow GPU instance types for Windows nodes (#7681) + * Include MixedInstancesPolicy LaunchTemplate for validation + * Aim for namespace uniqueness across parallel specs (#7680) + +------------------------------------------------------------------- Old: ---- eksctl-0.175.0.obscpio New: ---- eksctl-0.176.0.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eksctl.spec ++++++ --- /var/tmp/diff_new_pack.ZwwGzi/_old 2024-04-26 23:27:20.697110413 +0200 +++ /var/tmp/diff_new_pack.ZwwGzi/_new 2024-04-26 23:27:20.701110560 +0200 @@ -19,7 +19,7 @@ %define __arch_install_post export NO_BRP_STRIP_DEBUG=true Name: eksctl -Version: 0.175.0 +Version: 0.176.0 Release: 0 Summary: The official CLI for Amazon EKS License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.ZwwGzi/_old 2024-04-26 23:27:20.737111876 +0200 +++ /var/tmp/diff_new_pack.ZwwGzi/_new 2024-04-26 23:27:20.741112022 +0200 @@ -3,7 +3,7 @@ <param name="url">https://github.com/eksctl-io/eksctl</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="revision">v0.175.0</param> + <param name="revision">v0.176.0</param> <param name="versionformat">@PARENT_TAG@</param> <param name="changesgenerate">enable</param> <param name="versionrewrite-pattern">v(.*)</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.ZwwGzi/_old 2024-04-26 23:27:20.765112899 +0200 +++ /var/tmp/diff_new_pack.ZwwGzi/_new 2024-04-26 23:27:20.785113631 +0200 @@ -1,6 +1,8 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/weaveworks/eksctl</param> - <param name="changesrevision">5b28c17948a1036f26becbbc02d23e61195e8a33</param></service></servicedata> + <param name="changesrevision">5b28c17948a1036f26becbbc02d23e61195e8a33</param></service><service name="tar_scm"> + <param name="url">https://github.com/eksctl-io/eksctl</param> + <param name="changesrevision">5b33f073a3b81365bf821e7c4eb7821ae08fab6c</param></service></servicedata> (No newline at EOF) ++++++ eksctl-0.175.0.obscpio -> eksctl-0.176.0.obscpio ++++++ /work/SRC/openSUSE:Factory/eksctl/eksctl-0.175.0.obscpio /work/SRC/openSUSE:Factory/.eksctl.new.1880/eksctl-0.176.0.obscpio differ: char 48, line 1 ++++++ eksctl.obsinfo ++++++ --- /var/tmp/diff_new_pack.ZwwGzi/_old 2024-04-26 23:27:20.829115239 +0200 +++ /var/tmp/diff_new_pack.ZwwGzi/_new 2024-04-26 23:27:20.833115385 +0200 @@ -1,5 +1,5 @@ name: eksctl -version: 0.175.0 -mtime: 1711105066 -commit: 5b28c17948a1036f26becbbc02d23e61195e8a33 +version: 0.176.0 +mtime: 1712299818 +commit: 5b33f073a3b81365bf821e7c4eb7821ae08fab6c ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/eksctl/vendor.tar.gz /work/SRC/openSUSE:Factory/.eksctl.new.1880/vendor.tar.gz differ: char 5, line 1

1 0

commit cmctl for openSUSE:Factory
by Source-Sync 26 Apr '24

26 Apr '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cmctl for openSUSE:Factory checked in at 2024-04-26 23:27:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cmctl (Old) and /work/SRC/openSUSE:Factory/.cmctl.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cmctl" Fri Apr 26 23:27:00 2024 rev:25 rq:1170200 version:1.14.5 Changes: -------- --- /work/SRC/openSUSE:Factory/cmctl/cmctl.changes 2024-03-17 22:14:17.724634779 +0100 +++ /work/SRC/openSUSE:Factory/.cmctl.new.1880/cmctl.changes 2024-04-26 23:27:17.332987439 +0200 @@ -1,0 +2,9 @@ +Thu Apr 25 19:06:40 UTC 2024 - opensuse_buildservice(a)ojkastl.de + +- Update to version 1.14.5: + * [release-1.14] fix CVE-2023-45288, bump base images, bump go + * make update-licenses + * Bump github.com/go-jose/go-jose to v3.0.3 to fix CVE-2024-28180 + * Update cmd/ctl's go.mod to v1.14.4 + +------------------------------------------------------------------- Old: ---- cert-manager-1.14.4.obscpio New: ---- cert-manager-1.14.5.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmctl.spec ++++++ --- /var/tmp/diff_new_pack.h0umnh/_old 2024-04-26 23:27:18.397026335 +0200 +++ /var/tmp/diff_new_pack.h0umnh/_new 2024-04-26 23:27:18.397026335 +0200 @@ -21,7 +21,7 @@ %define archive_name cert-manager Name: cmctl -Version: 1.14.4 +Version: 1.14.5 Release: 0 Summary: CLI tool that can help you to manage cert-manager resources inside your cluster License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.h0umnh/_old 2024-04-26 23:27:18.445028089 +0200 +++ /var/tmp/diff_new_pack.h0umnh/_new 2024-04-26 23:27:18.449028236 +0200 @@ -3,7 +3,7 @@ <param name="url">https://github.com/cert-manager/cert-manager</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="revision">v1.14.4</param> + <param name="revision">v1.14.5</param> <param name="versionformat">@PARENT_TAG@</param> <param name="changesgenerate">enable</param> <param name="versionrewrite-pattern">v(.*)</param> @@ -19,7 +19,7 @@ <param name="compression">gz</param> </service> <service name="go_modules" mode="manual"> - <param name="archive">cert-manager-1.14.4.obscpio</param> + <param name="archive">cert-manager-1.14.5.obscpio</param> </service> </services> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.h0umnh/_old 2024-04-26 23:27:18.473029113 +0200 +++ /var/tmp/diff_new_pack.h0umnh/_new 2024-04-26 23:27:18.473029113 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/cert-manager/cert-manager</param> - <param name="changesrevision">a36295727afde8c6fe43f2222615822260cc235f</param></service></servicedata> + <param name="changesrevision">8294b60f70a95f7f1fbe4cf218051c9d497ad0fc</param></service></servicedata> (No newline at EOF) ++++++ cert-manager-1.14.4.obscpio -> cert-manager-1.14.5.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cert-manager-1.14.4/LICENSES new/cert-manager-1.14.5/LICENSES --- old/cert-manager-1.14.4/LICENSES 2024-03-08 10:31:07.000000000 +0100 +++ new/cert-manager-1.14.5/LICENSES 2024-04-25 11:35:32.000000000 +0200 @@ -116,12 +116,12 @@ go.starlark.net,https://github.com/google/starlark-go/blob/a134d8f9ddca/LIC… go.uber.org/multierr,https://github.com/uber-go/multierr/blob/v1.11.0/LICEN… go.uber.org/zap,https://github.com/uber-go/zap/blob/v1.26.0/LICENSE.txt,MIT -golang.org/x/crypto,https://cs.opensource.google/go/x/crypto/+/v0.17.0:LICENSE,BSD-3-Clause -golang.org/x/net,https://cs.opensource.google/go/x/net/+/v0.19.0:LICENSE,BSD-3-Clause +golang.org/x/crypto,https://cs.opensource.google/go/x/crypto/+/v0.22.0:LICENSE,BSD-3-Clause +golang.org/x/net,https://cs.opensource.google/go/x/net/+/v0.24.0:LICENSE,BSD-3-Clause golang.org/x/oauth2,https://cs.opensource.google/go/x/oauth2/+/v0.15.0:LICE… golang.org/x/sync,https://cs.opensource.google/go/x/sync/+/v0.5.0:LICENSE,B… -golang.org/x/sys,https://cs.opensource.google/go/x/sys/+/v0.16.0:LICENSE,BSD-3-Clause -golang.org/x/term,https://cs.opensource.google/go/x/term/+/v0.15.0:LICENSE,BSD-3-Clause +golang.org/x/sys,https://cs.opensource.google/go/x/sys/+/v0.19.0:LICENSE,BSD-3-Clause +golang.org/x/term,https://cs.opensource.google/go/x/term/+/v0.19.0:LICENSE,BSD-3-Clause golang.org/x/text,https://cs.opensource.google/go/x/text/+/v0.14.0:LICENSE,… golang.org/x/time/rate,https://cs.opensource.google/go/x/time/+/v0.5.0:LICE… google.golang.org/genproto/googleapis/rpc/status,https://github.com/googlea… diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cert-manager-1.14.4/go.mod new/cert-manager-1.14.5/go.mod --- old/cert-manager-1.14.4/go.mod 2024-03-08 10:31:07.000000000 +0100 +++ new/cert-manager-1.14.5/go.mod 2024-04-25 11:35:32.000000000 +0200 @@ -16,12 +16,12 @@ // or a branch name (master). require ( - github.com/cert-manager/cert-manager v1.14.3 + github.com/cert-manager/cert-manager v1.14.4 github.com/go-logr/logr v1.4.1 github.com/spf13/cobra v1.8.0 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.4 - golang.org/x/crypto v0.17.0 + golang.org/x/crypto v0.22.0 helm.sh/helm/v3 v3.14.2 k8s.io/api v0.29.0 k8s.io/apiextensions-apiserver v0.29.0 @@ -148,11 +148,11 @@ go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.26.0 // indirect - golang.org/x/net v0.19.0 // indirect + golang.org/x/net v0.24.0 // indirect golang.org/x/oauth2 v0.15.0 // indirect golang.org/x/sync v0.5.0 // indirect - golang.org/x/sys v0.15.0 // indirect - golang.org/x/term v0.15.0 // indirect + golang.org/x/sys v0.19.0 // indirect + golang.org/x/term v0.19.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.5.0 // indirect google.golang.org/appengine v1.6.8 // indirect diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cert-manager-1.14.4/go.sum new/cert-manager-1.14.5/go.sum --- old/cert-manager-1.14.4/go.sum 2024-03-08 10:31:07.000000000 +0100 +++ new/cert-manager-1.14.5/go.sum 2024-04-25 11:35:32.000000000 +0200 @@ -50,8 +50,8 @@ github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0 h1:nvj0OLI3YqYXer/kZD8Ri1aaunCxIEsOst1BVJswV0o= github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cert-manager/cert-manager v1.14.3 h1:u1TVd/bD4NnAFjttzOyZYV0iOcoMGGoNfrLvSdx7a70= -github.com/cert-manager/cert-manager v1.14.3/go.mod h1:pik7K6jXfgh++lfVJ/i1HzEnDluSUtTVLXSHikj8Lho= +github.com/cert-manager/cert-manager v1.14.4 h1:DLXIZHx3jhkViYfobXo+N7/od/oj4YgG6AJw4ORJnYs= +github.com/cert-manager/cert-manager v1.14.4/go.mod h1:d+CBeRu5MbpHTfXkkiiamUhnfdvhbThoOPwilU4UM98= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chai2010/gettext-go v1.0.2 h1:1Lwwip6Q2QGsAdl/ZKPCwTe9fe0CjlUbqj5bFNSjIRk= @@ -437,8 +437,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= -golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= -golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= +golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20231226003508-02704c960a9b h1:kLiC65FbiHWFAOu+lxwNPujcsl8VYyTYYEZnsOO1WK4= golang.org/x/exp v0.0.0-20231226003508-02704c960a9b/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= @@ -466,8 +466,8 @@ golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= -golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= +golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= +golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.15.0 h1:s8pnnxNVzjWyrvYdFUQq5llS1PX2zhPXmccZv99h7uQ= golang.org/x/oauth2 v0.15.0/go.mod h1:q48ptWNTY5XWf+JNten23lcvHpLJ0ZSxF5ttTHKVCAM= @@ -499,8 +499,8 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= -golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= +golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -508,8 +508,8 @@ golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= -golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4= -golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= +golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q= +golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= ++++++ cert-manager.obsinfo ++++++ --- /var/tmp/diff_new_pack.h0umnh/_old 2024-04-26 23:27:18.609034085 +0200 +++ /var/tmp/diff_new_pack.h0umnh/_new 2024-04-26 23:27:18.613034230 +0200 @@ -1,5 +1,5 @@ name: cert-manager -version: 1.14.4 -mtime: 1709890267 -commit: f5ddc412723722518f401f9ce6ec6fc950e72c04 +version: 1.14.5 +mtime: 1714037732 +commit: 6a0915206f61a9116bb605e58e749c2aab2d43e2 ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/cmctl/vendor.tar.gz /work/SRC/openSUSE:Factory/.cmctl.new.1880/vendor.tar.gz differ: char 5, line 1

1 0

commit level-zero for openSUSE:Factory
by Source-Sync 26 Apr '24

26 Apr '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package level-zero for openSUSE:Factory checked in at 2024-04-26 23:26:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/level-zero (Old) and /work/SRC/openSUSE:Factory/.level-zero.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "level-zero" Fri Apr 26 23:26:54 2024 rev:13 rq:1170261 version:1.16.1 Changes: -------- --- /work/SRC/openSUSE:Factory/level-zero/level-zero.changes 2024-03-18 16:48:12.427031192 +0100 +++ /work/SRC/openSUSE:Factory/.level-zero.new.1880/level-zero.changes 2024-04-26 23:27:09.512701571 +0200 @@ -16 +16,2 @@ - - API Headers, Loader, & Validation Layer based on oneAPI Level Zero Specification v1.8.0 + - API Headers, Loader, & Validation Layer based on oneAPI + Level Zero Specification v1.8.0 @@ -25,3 +26,4 @@ - * level-zero -> Runtime package providing oneAPI Level Zero Loader & Validation Layer - * level-zero-devel -> Development package providing oneAPI Level Zero Loader, Validation Layer & API Headers - * level-zero Windows SDK -> Windows Software Development Kit for oneAPI Level-Zero + * level-zero -> Runtime package providing oneAPI + Level Zero Loader & Validation Layer + * level-zero-devel -> Development package providing oneAPI Level Zero + Loader, Validation Layer & API Headers @@ -39 +41,2 @@ - - API Headers, Loader, & Validation Layer based on oneAPI Level Zero Specification v1.7.8 Contents: + - API Headers, Loader, & Validation Layer based on oneAPI + Level Zero Specification v1.7.8 Contents: @@ -48,7 +51,4 @@ - * level-zero -> Runtime package providing oneAPI Level Zero Loader & Validation Layer - * level-zero-devel -> Development package providing oneAPI Level Zero Loader, Validation Layer & API Headers - * level-zero Windows SDK -> Windows Software Development Kit for oneAPI Level-Zero - - Installation of Windows SDK - * extract level-zero_win-sdk*.zip - * Add Include path for compiler to use <level-zero_win-sdk>\include - * Add Library path for compiler to use <level-zero_win-sdk>\lib + * level-zero -> Runtime package providing oneAPI Level Zero + Loader & Validation Layer + * level-zero-devel -> Development package providing oneAPI Level Zero + Loader, Validation Layer & API Headers @@ -60 +60,2 @@ - - API Headers, Loader, & Validation Layer based on oneAPI Level Zero Specification v1.6.10 Contents: + - API Headers, Loader, & Validation Layer based on oneAPI + Level Zero Specification v1.6.10 Contents: @@ -69,7 +70,4 @@ - * level-zero -> Runtime package providing oneAPI Level Zero Loader & Validation Layer - * level-zero-devel -> Development package providing oneAPI Level Zero Loader, Validation Layer & API Headers - * level-zero Windows SDK -> Windows Software Development Kit for oneAPI Level-Zero - - Installation of Windows SDK - * extract level-zero_win-sdk*.zip - * Add Include path for compiler to use <level-zero_win-sdk>\include - * Add Library path for compiler to use <level-zero_win-sdk>\lib + * level-zero -> Runtime package providing oneAPI Level Zero + Loader & Validation Layer + * level-zero-devel -> Development package providing oneAPI Level Zero + Loader, Validation Layer & API Headers @@ -81 +79,2 @@ - - API Headers, Loader, & Validation Layer based on oneAPI Level Zero Specification v1.6.10 Contents: + - API Headers, Loader, & Validation Layer based on oneAPI Level Zero + Specification v1.6.10 Contents: @@ -90,7 +89,4 @@ - * level-zero -> Runtime package providing oneAPI Level Zero Loader & Validation Layer - * level-zero-devel -> Development package providing oneAPI Level Zero Loader, Validation Layer & API Headers - * level-zero Windows SDK -> Windows Software Development Kit for oneAPI Level-Zero - - Installation of Windows SDK - * extract level-zero_win-sdk*.zip - * Add Include path for compiler to use <level-zero_win-sdk>\include - * Add Library path for compiler to use <level-zero_win-sdk>\lib + * level-zero -> Runtime package providing oneAPI Level Zero + Loader & Validation Layer + * level-zero-devel -> Development package providing oneAPI + Level Zero Loader, Validation Layer & API Headers @@ -101 +97,2 @@ -- API Headers, Loader, & Validation Layer based on oneAPI Level Zero Specification v1.6.0 +- API Headers, Loader, & Validation Layer based on oneAPI Level Zero + Specification v1.6.0 @@ -110,7 +107,4 @@ - * level-zero -> Runtime package providing oneAPI Level Zero Loader & Validation Layer - * level-zero-devel -> Development package providing oneAPI Level Zero Loader, Validation Layer & API Headers - * level-zero Windows SDK -> Windows Software Development Kit for oneAPI Level-Zero -- Installation of Windows SDK - * extract level-zero_win-sdk*.zip - * Add Include path for compiler to use <level-zero_win-sdk>\include - * Add Library path for compiler to use <level-zero_win-sdk>\lib + * level-zero -> Runtime package providing oneAPI Level Zero + Loader & Validation Layer + * level-zero-devel -> Development package providing oneAPI Level Zero + Loader, Validation Layer & API Headers @@ -118 +112,2 @@ - * intel-level-zero-gpu (https://github.com/intel/compute-runtime/releases) Minimum required version 21.09.19150 + * intel-level-zero-gpu (https://github.com/intel/compute-runtime/releases) + Minimum required version 21.09.19150 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------

1 0

commit nomacs for openSUSE:Factory
by Source-Sync 26 Apr '24

26 Apr '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package nomacs for openSUSE:Factory checked in at 2024-04-26 23:26:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nomacs (Old) and /work/SRC/openSUSE:Factory/.nomacs.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nomacs" Fri Apr 26 23:26:54 2024 rev:29 rq:1170188 version:3.17.2295 Changes: -------- --- /work/SRC/openSUSE:Factory/nomacs/nomacs.changes 2024-04-14 12:26:35.801901086 +0200 +++ /work/SRC/openSUSE:Factory/.nomacs.new.1880/nomacs.changes 2024-04-26 23:27:08.628669256 +0200 @@ -1,0 +2,5 @@ +Thu Apr 25 16:24:23 UTC 2024 - Muhammad Akbar Yanuar Mantari <mantarimay(a)pm.me> + +- Add kf6-kimageformats Requires: Enable QOI format support + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nomacs.spec ++++++ --- /var/tmp/diff_new_pack.DjiGyb/_old 2024-04-26 23:27:09.256692213 +0200 +++ /var/tmp/diff_new_pack.DjiGyb/_new 2024-04-26 23:27:09.260692359 +0200 @@ -45,6 +45,7 @@ BuildRequires: pkgconfig(libraw) >= 0.17 BuildRequires: pkgconfig(libtiff-4) BuildRequires: pkgconfig(zlib) +Requires: kf6-kimageformats Recommends: %{name}-lang Recommends: %{name}-plugins

1 0

commit gap-ferret for openSUSE:Factory
by Source-Sync 26 Apr '24

26 Apr '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gap-ferret for openSUSE:Factory checked in at 2024-04-26 23:26:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gap-ferret (Old) and /work/SRC/openSUSE:Factory/.gap-ferret.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gap-ferret" Fri Apr 26 23:26:51 2024 rev:4 rq:1170177 version:1.0.11 Changes: -------- --- /work/SRC/openSUSE:Factory/gap-ferret/gap-ferret.changes 2024-03-25 21:15:06.868419620 +0100 +++ /work/SRC/openSUSE:Factory/.gap-ferret.new.1880/gap-ferret.changes 2024-04-26 23:27:06.608595413 +0200 @@ -1,0 +2,6 @@ +Thu Apr 25 15:16:45 UTC 2024 - Jan Engelhardt <jengelh(a)inai.de> + +- Update to release 1.0.11 + * Replace functions which were removed in C++17 + +------------------------------------------------------------------- Old: ---- ferret-1.0.10.tar.gz New: ---- ferret-1.0.11.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gap-ferret.spec ++++++ --- /var/tmp/diff_new_pack.AL3Zo2/_old 2024-04-26 23:27:07.220617785 +0200 +++ /var/tmp/diff_new_pack.AL3Zo2/_new 2024-04-26 23:27:07.224617931 +0200 @@ -17,7 +17,7 @@ Name: gap-ferret -Version: 1.0.10 +Version: 1.0.11 Release: 0 Summary: GAP: Backtrack Search in Permutation Groups License: MPL-2.0 ++++++ ferret-1.0.10.tar.gz -> ferret-1.0.11.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ferret-1.0.10/Makefile.gappkg new/ferret-1.0.11/Makefile.gappkg --- old/ferret-1.0.10/Makefile.gappkg 2024-01-22 09:46:32.000000000 +0100 +++ new/ferret-1.0.11/Makefile.gappkg 2024-04-24 09:17:58.000000000 +0200 @@ -17,13 +17,6 @@ # KEXT_USE_AUTOCONF to 1 to enable dependency rules that enable # regenerating the configure script etc. when necessary # -# Only GAP >= 4.11 ships with this file. In order to keep your package -# compatible with older GAP versions, we recommend to bundle a copy of -# it with your package, but only as a fallback. So, your configure -# scripts should check if GAP ships with this file, and use it then, and -# only fall back to your own copy as a last resort. This way, you will -# benefit from any fixes and improvements made by the GAP team. -# # The contents of this file are released into the public domain; hence # you may edit this file as you wish, bundle and distribute it with your # package, etc. @@ -46,7 +39,7 @@ KEXT_CXXFLAGS += -I$(GAP_LIB_DIR)/src endif -# honor used supplied flags +# honor user supplied flags KEXT_CFLAGS += $(CPPFLAGS) KEXT_CFLAGS += $(CFLAGS) KEXT_CXXFLAGS += $(CPPFLAGS) @@ -151,7 +144,9 @@ distclean: distclean-kext distclean-kext: rm -rf bin gen Makefile - (cd doc && ./clean) + rm -rf doc/_*.xml + rm -rf doc/*.aux doc/*.bbl doc/*.blg doc/*.brf doc/*.idx doc/*.idx + rm -rf doc/*.ilg doc/*.ind doc/*.log doc/*.out doc/*.pnr doc/*.toc # hook into `make doc` doc: doc-kext @@ -193,14 +188,14 @@ @if test ! -f $@; then rm -f $<; else :; fi @if test ! -f $@; then $(MAKE) $<; else :; fi -gen/pkgconfig.h.stamp: gen/pkgconfig.h.in config.status +gen/pkgconfig.h.stamp: src/pkgconfig.h.in config.status @rm -f $@ @mkdir -p $(@D) ./config.status gen/pkgconfig.h echo > $@ ifneq ($(MAINTAINER_MODE),no) -gen/pkgconfig.h.in: $(configure_deps) +src/pkgconfig.h.in: $(configure_deps) @if command -v autoheader >/dev/null 2>&1 ; then \ mkdir -p $(@D) ; \ echo "running autoheader" ; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ferret-1.0.10/PackageInfo.g new/ferret-1.0.11/PackageInfo.g --- old/ferret-1.0.10/PackageInfo.g 2024-01-22 09:46:32.000000000 +0100 +++ new/ferret-1.0.11/PackageInfo.g 2024-04-24 09:17:58.000000000 +0200 @@ -2,8 +2,8 @@ PackageName := "ferret", Subtitle := "Backtrack Search in Permutation Groups", -Version := "1.0.10", -Date := "22/01/2024", # dd/mm/yyyy format +Version := "1.0.11", +Date := "24/04/2024", # dd/mm/yyyy format License := "MPL-2.0", Persons := [ @@ -12,8 +12,9 @@ IsMaintainer := true, FirstNames := "Christopher", LastName := "Jefferson", - WWWHome := "https://caj.host.cs.st-andrews.ac.uk/", + WWWHome := "https://heather.cafe/", Email := "caj21(a)st-andrews.ac.uk", + GitHubUsername := "ChrisJefferson", PostalAddress := Concatenation( "St Andrews\n", "Scotland\n", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ferret-1.0.10/YAPB++/source/search/search.hpp new/ferret-1.0.11/YAPB++/source/search/search.hpp --- old/ferret-1.0.10/YAPB++/source/search/search.hpp 2024-01-22 09:46:32.000000000 +0100 +++ new/ferret-1.0.11/YAPB++/source/search/search.hpp 2024-04-24 09:17:58.000000000 +0200 @@ -11,6 +11,9 @@ bool doSearchBranch(const SearchOptions& so, Problem* p, SolutionStore* ss, RBase* rbase, TraceFollowingQueue* tfq, int depth) { + std::minstd_rand rd; + static std::default_random_engine rng(rd()); + info_out(1, "search depth: " << depth); info_out(2, "Current partition: " << p->p_stack.dumpCurrentPartition()); if(depth > rbase->depth()) @@ -41,7 +44,7 @@ orderCell(firstbranch ? cell.begin() + 1 : cell.begin(), cell.end(), firstbranch ? so.heuristic.search_first_branch_value : so.heuristic.search_value, - rbase); + rbase, rng); for(int i : range1(cell.size())) { @@ -127,7 +130,7 @@ try { doSearchBranch<true>(so, p, &solutions, rb, &tfq, 1); } - catch(const EndOfSearch&) { + catch(const EndOfSearch&) { debug_out(1, "search", "Node limit reached!"); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ferret-1.0.10/YAPB++/source/search/search_common.hpp new/ferret-1.0.11/YAPB++/source/search/search_common.hpp --- old/ferret-1.0.10/YAPB++/source/search/search_common.hpp 2024-01-22 09:46:32.000000000 +0100 +++ new/ferret-1.0.11/YAPB++/source/search/search_common.hpp 2024-04-24 09:17:58.000000000 +0200 @@ -9,6 +9,8 @@ #include "library/stats.hpp" #include "library/perm.hpp" +#include <random> + // Checks a solution satisfies all the constraints, and // adds to the solutionStore if it is. Returns true if // the solution is real @@ -32,7 +34,7 @@ // Orders a cell of a partition stack according to a given heuristic template<typename It> -void orderCell(It begin, It end, SearchHeuristic sh, RBase* rbase) +void orderCell(It begin, It end, SearchHeuristic sh, RBase* rbase, std::default_random_engine& rng) { switch(sh) { @@ -45,7 +47,7 @@ ReverseSorter(IndirectSorter([&](auto i) -> auto& { return (rbase->inv_value_ordering)[i]; }))); return; case SearchBranch_Random: - std::random_shuffle(begin, end); + std::shuffle(begin, end, rng); return; case SearchBranch_Sorted: std::sort(begin, end); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ferret-1.0.10/doc/chap0.html new/ferret-1.0.11/doc/chap0.html --- old/ferret-1.0.10/doc/chap0.html 2024-01-22 09:55:45.000000000 +0100 +++ new/ferret-1.0.11/doc/chap0.html 2024-04-24 09:18:45.000000000 +0200 @@ -29,10 +29,10 @@ <h2>Backtrack Search in Permutation Groups</h2> <p> - 1.0.10</p> + 1.0.11</p> <p> - 22 January 2024 + 24 April 2024 </p> </div> @@ -44,7 +44,7 @@ </b> <br />Email: <span class="URL"><a href="mailto:caj21@st-andrews.ac.uk">caj21(a)st-andrews.ac.uk</a></span> -<br />Homepage: <span class="URL"><a href="https://caj.host.cs.st-andrews.ac.uk/">https://caj.host.cs.st-andrews.ac.uk/</a></span> +<br />Homepage: <span class="URL"><a href="https://heather.cafe/">https://heather.cafe/</a></span> <br />Address: <br />St Andrews<br /> Scotland<br /> UK<br /> </p> @@ -98,6 +98,6 @@ <div class="chlinkbot"><span class="chlink1">Goto Chapter: </span><a href="chap0.html">Top</a> <a href="chap1.html">1</a> <a href="chap2.html">2</a> <a href="chap3.html">3</a> <a href="chapInd.html">Ind</a> </div> <hr /> -<p class="foot">generated by <a href="http://www.math.rwth-aachen.de/~Frank.Luebeck/GAPDoc">GAPDoc2HTML</a></p> +<p class="foot">generated by <a href="https://www.math.rwth-aachen.de/~Frank.Luebeck/GAPDoc">GAPDoc2HTML</a></p> </body> </html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ferret-1.0.10/doc/chap0.txt new/ferret-1.0.11/doc/chap0.txt --- old/ferret-1.0.10/doc/chap0.txt 2024-01-22 09:55:41.000000000 +0100 +++ new/ferret-1.0.11/doc/chap0.txt 2024-04-24 09:18:42.000000000 +0200 @@ -6,10 +6,10 @@ [1X Backtrack Search in Permutation Groups [101X - 1.0.10 + 1.0.11 - 22 January 2024 + 24 April 2024 Christopher Jefferson @@ -18,7 +18,7 @@ Christopher Jefferson Email: [7Xmailto:caj21@st-andrews.ac.uk[107X - Homepage: [7Xhttps://caj.host.cs.st-andrews.ac.uk/[107X + Homepage: [7Xhttps://heather.cafe/[107X Address: [33X[0;14YSt Andrews[133X [33X[0;14YScotland[133X [33X[0;14YUK[133X diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ferret-1.0.10/doc/chap0_mj.html new/ferret-1.0.11/doc/chap0_mj.html --- old/ferret-1.0.10/doc/chap0_mj.html 2024-01-22 09:55:45.000000000 +0100 +++ new/ferret-1.0.11/doc/chap0_mj.html 2024-04-24 09:18:45.000000000 +0200 @@ -6,7 +6,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <script type="text/javascript" - src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-…"> + src="https://cdn.jsdelivr.net/npm/mathjax@2/MathJax.js?config=TeX-AMS-MML_HTMLor…"> </script> <title>GAP (Ferret) - Contents</title> <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> @@ -32,10 +32,10 @@ <h2>Backtrack Search in Permutation Groups</h2> <p> - 1.0.10</p> + 1.0.11</p> <p> - 22 January 2024 + 24 April 2024 </p> </div> @@ -47,7 +47,7 @@ </b> <br />Email: <span class="URL"><a href="mailto:caj21@st-andrews.ac.uk">caj21(a)st-andrews.ac.uk</a></span> -<br />Homepage: <span class="URL"><a href="https://caj.host.cs.st-andrews.ac.uk/">https://caj.host.cs.st-andrews.ac.uk/</a></span> +<br />Homepage: <span class="URL"><a href="https://heather.cafe/">https://heather.cafe/</a></span> <br />Address: <br />St Andrews<br /> Scotland<br /> UK<br /> </p> @@ -101,6 +101,6 @@ <div class="chlinkbot"><span class="chlink1">Goto Chapter: </span><a href="chap0_mj.html">Top</a> <a href="chap1_mj.html">1</a> <a href="chap2_mj.html">2</a> <a href="chap3_mj.html">3</a> <a href="chapInd_mj.html">Ind</a> </div> <hr /> -<p class="foot">generated by <a href="http://www.math.rwth-aachen.de/~Frank.Luebeck/GAPDoc">GAPDoc2HTML</a></p> +<p class="foot">generated by <a href="https://www.math.rwth-aachen.de/~Frank.Luebeck/GAPDoc">GAPDoc2HTML</a></p> </body> </html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ferret-1.0.10/doc/chap1.html new/ferret-1.0.11/doc/chap1.html --- old/ferret-1.0.10/doc/chap1.html 2024-01-22 09:55:45.000000000 +0100 +++ new/ferret-1.0.11/doc/chap1.html 2024-04-24 09:18:45.000000000 +0200 @@ -137,6 +137,6 @@ <div class="chlinkbot"><span class="chlink1">Goto Chapter: </span><a href="chap0.html">Top</a> <a href="chap1.html">1</a> <a href="chap2.html">2</a> <a href="chap3.html">3</a> <a href="chapInd.html">Ind</a> </div> <hr /> -<p class="foot">generated by <a href="http://www.math.rwth-aachen.de/~Frank.Luebeck/GAPDoc">GAPDoc2HTML</a></p> +<p class="foot">generated by <a href="https://www.math.rwth-aachen.de/~Frank.Luebeck/GAPDoc">GAPDoc2HTML</a></p> </body> </html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ferret-1.0.10/doc/chap1_mj.html new/ferret-1.0.11/doc/chap1_mj.html --- old/ferret-1.0.10/doc/chap1_mj.html 2024-01-22 09:55:45.000000000 +0100 +++ new/ferret-1.0.11/doc/chap1_mj.html 2024-04-24 09:18:45.000000000 +0200 @@ -6,7 +6,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <script type="text/javascript" - src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-…"> + src="https://cdn.jsdelivr.net/npm/mathjax@2/MathJax.js?config=TeX-AMS-MML_HTMLor…"> </script> <title>GAP (Ferret) - Chapter 1: The Ferret Package</title> <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> @@ -140,6 +140,6 @@ <div class="chlinkbot"><span class="chlink1">Goto Chapter: </span><a href="chap0_mj.html">Top</a> <a href="chap1_mj.html">1</a> <a href="chap2_mj.html">2</a> <a href="chap3_mj.html">3</a> <a href="chapInd_mj.html">Ind</a> </div> <hr /> -<p class="foot">generated by <a href="http://www.math.rwth-aachen.de/~Frank.Luebeck/GAPDoc">GAPDoc2HTML</a></p> +<p class="foot">generated by <a href="https://www.math.rwth-aachen.de/~Frank.Luebeck/GAPDoc">GAPDoc2HTML</a></p> </body> </html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ferret-1.0.10/doc/chap2.html new/ferret-1.0.11/doc/chap2.html --- old/ferret-1.0.10/doc/chap2.html 2024-01-22 09:55:45.000000000 +0100 +++ new/ferret-1.0.11/doc/chap2.html 2024-04-24 09:18:45.000000000 +0200 @@ -113,6 +113,6 @@ <div class="chlinkbot"><span class="chlink1">Goto Chapter: </span><a href="chap0.html">Top</a> <a href="chap1.html">1</a> <a href="chap2.html">2</a> <a href="chap3.html">3</a> <a href="chapInd.html">Ind</a> </div> <hr /> -<p class="foot">generated by <a href="http://www.math.rwth-aachen.de/~Frank.Luebeck/GAPDoc">GAPDoc2HTML</a></p> +<p class="foot">generated by <a href="https://www.math.rwth-aachen.de/~Frank.Luebeck/GAPDoc">GAPDoc2HTML</a></p> </body> </html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ferret-1.0.10/doc/chap2_mj.html new/ferret-1.0.11/doc/chap2_mj.html --- old/ferret-1.0.10/doc/chap2_mj.html 2024-01-22 09:55:45.000000000 +0100 +++ new/ferret-1.0.11/doc/chap2_mj.html 2024-04-24 09:18:45.000000000 +0200 @@ -6,7 +6,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <script type="text/javascript" - src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-…"> + src="https://cdn.jsdelivr.net/npm/mathjax@2/MathJax.js?config=TeX-AMS-MML_HTMLor…"> </script> <title>GAP (Ferret) - Chapter 2: The Solve Method</title> <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> @@ -116,6 +116,6 @@ <div class="chlinkbot"><span class="chlink1">Goto Chapter: </span><a href="chap0_mj.html">Top</a> <a href="chap1_mj.html">1</a> <a href="chap2_mj.html">2</a> <a href="chap3_mj.html">3</a> <a href="chapInd_mj.html">Ind</a> </div> <hr /> -<p class="foot">generated by <a href="http://www.math.rwth-aachen.de/~Frank.Luebeck/GAPDoc">GAPDoc2HTML</a></p> +<p class="foot">generated by <a href="https://www.math.rwth-aachen.de/~Frank.Luebeck/GAPDoc">GAPDoc2HTML</a></p> </body> </html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ferret-1.0.10/doc/chap3.html new/ferret-1.0.11/doc/chap3.html --- old/ferret-1.0.10/doc/chap3.html 2024-01-22 09:55:45.000000000 +0100 +++ new/ferret-1.0.11/doc/chap3.html 2024-04-24 09:18:45.000000000 +0200 @@ -39,7 +39,7 @@ <h4>3.1 <span class="Heading">Unpacking the Ferret Package</span></h4> -<p>If the Ferret package was obtained as a part of the <strong class="pkg">GAP</strong> distribution from the "Download" section of the <strong class="pkg">GAP</strong> website, you may proceed to Section <a href="chap3.html#X7DB615628530240D"><span class="RefLink">3.2</span></a>. Alternatively, the Ferret package may be installed using a separate archive, for example, for an update or an installation in a non-default location (see <a href="../../../doc/ref/chap9.html#X7A4973627A5DB27D"><span class="RefLink">Reference: GAP Root Directories</span></a>).</p> +<p>If the Ferret package was obtained as a part of the <strong class="pkg">GAP</strong> distribution from the <q>Download</q> section of the <strong class="pkg">GAP</strong> website, you may proceed to Section <a href="chap3.html#X7DB615628530240D"><span class="RefLink">3.2</span></a>. Alternatively, the Ferret package may be installed using a separate archive, for example, for an update or an installation in a non-default location (see <a href="../../../doc/ref/chap9.html#X7A4973627A5DB27D"><span class="RefLink">Reference: GAP Root Directories</span></a>).</p> <p>Below we describe the installation procedure for the <code class="file">.tar.gz</code> archive format. Installation using other archive formats is performed in a similar way.</p> @@ -104,6 +104,6 @@ <div class="chlinkbot"><span class="chlink1">Goto Chapter: </span><a href="chap0.html">Top</a> <a href="chap1.html">1</a> <a href="chap2.html">2</a> <a href="chap3.html">3</a> <a href="chapInd.html">Ind</a> </div> <hr /> -<p class="foot">generated by <a href="http://www.math.rwth-aachen.de/~Frank.Luebeck/GAPDoc">GAPDoc2HTML</a></p> +<p class="foot">generated by <a href="https://www.math.rwth-aachen.de/~Frank.Luebeck/GAPDoc">GAPDoc2HTML</a></p> </body> </html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ferret-1.0.10/doc/chap3_mj.html new/ferret-1.0.11/doc/chap3_mj.html --- old/ferret-1.0.10/doc/chap3_mj.html 2024-01-22 09:55:45.000000000 +0100 +++ new/ferret-1.0.11/doc/chap3_mj.html 2024-04-24 09:18:45.000000000 +0200 @@ -6,7 +6,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <script type="text/javascript" - src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-…"> + src="https://cdn.jsdelivr.net/npm/mathjax@2/MathJax.js?config=TeX-AMS-MML_HTMLor…"> </script> <title>GAP (Ferret) - Chapter 3: Installing and Loading the Ferret Package</title> <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> @@ -42,7 +42,7 @@ <h4>3.1 <span class="Heading">Unpacking the Ferret Package</span></h4> -<p>If the Ferret package was obtained as a part of the <strong class="pkg">GAP</strong> distribution from the "Download" section of the <strong class="pkg">GAP</strong> website, you may proceed to Section <a href="chap3_mj.html#X7DB615628530240D"><span class="RefLink">3.2</span></a>. Alternatively, the Ferret package may be installed using a separate archive, for example, for an update or an installation in a non-default location (see <a href="../../../doc/ref/chap9_mj.html#X7A4973627A5DB27D"><span class="RefLink">Reference: GAP Root Directories</span></a>).</p> +<p>If the Ferret package was obtained as a part of the <strong class="pkg">GAP</strong> distribution from the <q>Download</q> section of the <strong class="pkg">GAP</strong> website, you may proceed to Section <a href="chap3_mj.html#X7DB615628530240D"><span class="RefLink">3.2</span></a>. Alternatively, the Ferret package may be installed using a separate archive, for example, for an update or an installation in a non-default location (see <a href="../../../doc/ref/chap9_mj.html#X7A4973627A5DB27D"><span class="RefLink">Reference: GAP Root Directories</span></a>).</p> <p>Below we describe the installation procedure for the <code class="file">.tar.gz</code> archive format. Installation using other archive formats is performed in a similar way.</p> @@ -107,6 +107,6 @@ <div class="chlinkbot"><span class="chlink1">Goto Chapter: </span><a href="chap0_mj.html">Top</a> <a href="chap1_mj.html">1</a> <a href="chap2_mj.html">2</a> <a href="chap3_mj.html">3</a> <a href="chapInd_mj.html">Ind</a> </div> <hr /> -<p class="foot">generated by <a href="http://www.math.rwth-aachen.de/~Frank.Luebeck/GAPDoc">GAPDoc2HTML</a></p> +<p class="foot">generated by <a href="https://www.math.rwth-aachen.de/~Frank.Luebeck/GAPDoc">GAPDoc2HTML</a></p> </body> </html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ferret-1.0.10/doc/chapInd.html new/ferret-1.0.11/doc/chapInd.html --- old/ferret-1.0.10/doc/chapInd.html 2024-01-22 09:55:45.000000000 +0100 +++ new/ferret-1.0.11/doc/chapInd.html 2024-04-24 09:18:45.000000000 +0200 @@ -41,6 +41,6 @@ <div class="chlinkbot"><span class="chlink1">Goto Chapter: </span><a href="chap0.html">Top</a> <a href="chap1.html">1</a> <a href="chap2.html">2</a> <a href="chap3.html">3</a> <a href="chapInd.html">Ind</a> </div> <hr /> -<p class="foot">generated by <a href="http://www.math.rwth-aachen.de/~Frank.Luebeck/GAPDoc">GAPDoc2HTML</a></p> +<p class="foot">generated by <a href="https://www.math.rwth-aachen.de/~Frank.Luebeck/GAPDoc">GAPDoc2HTML</a></p> </body> </html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ferret-1.0.10/doc/chapInd.txt new/ferret-1.0.11/doc/chapInd.txt --- old/ferret-1.0.10/doc/chapInd.txt 2024-01-22 09:55:41.000000000 +0100 +++ new/ferret-1.0.11/doc/chapInd.txt 2024-04-24 09:18:42.000000000 +0200 @@ -6,7 +6,7 @@ [2XConStabilize[102X, for a transformation or partial perm 2.1-1 for an object and an action 2.1-1 [2XEnableFerretOverloads[102X 1.1-1 - Ferret package 1. + Ferret package 1.0 [2XFerretOverloadsEnabled[102X 1.1-2 [2XSolve[102X 2.1-3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ferret-1.0.10/doc/chapInd_mj.html new/ferret-1.0.11/doc/chapInd_mj.html --- old/ferret-1.0.10/doc/chapInd_mj.html 2024-01-22 09:55:45.000000000 +0100 +++ new/ferret-1.0.11/doc/chapInd_mj.html 2024-04-24 09:18:45.000000000 +0200 @@ -6,7 +6,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <script type="text/javascript" - src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-…"> + src="https://cdn.jsdelivr.net/npm/mathjax@2/MathJax.js?config=TeX-AMS-MML_HTMLor…"> </script> <title>GAP (Ferret) - Index</title> <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> @@ -44,6 +44,6 @@ <div class="chlinkbot"><span class="chlink1">Goto Chapter: </span><a href="chap0_mj.html">Top</a> <a href="chap1_mj.html">1</a> <a href="chap2_mj.html">2</a> <a href="chap3_mj.html">3</a> <a href="chapInd_mj.html">Ind</a> </div> <hr /> -<p class="foot">generated by <a href="http://www.math.rwth-aachen.de/~Frank.Luebeck/GAPDoc">GAPDoc2HTML</a></p> +<p class="foot">generated by <a href="https://www.math.rwth-aachen.de/~Frank.Luebeck/GAPDoc">GAPDoc2HTML</a></p> </body> </html> Binary files old/ferret-1.0.10/doc/manual.pdf and new/ferret-1.0.11/doc/manual.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ferret-1.0.10/doc/manual.six new/ferret-1.0.11/doc/manual.six --- old/ferret-1.0.10/doc/manual.six 2024-01-22 09:55:45.000000000 +0100 +++ new/ferret-1.0.11/doc/manual.six 2024-04-24 09:18:45.000000000 +0200 @@ -3,9 +3,11 @@ encoding := "UTF-8", bookname := "Ferret", entries := -[ [ "Title page", ".", [ 0, 0, 0 ], 1, 1, "title page", "X7D2C85EC87DD46E5" ], - [ "Copyright", ".-1", [ 0, 0, 1 ], 29, 2, "copyright", "X81488B807F2A1CF1" ] - , [ "Table of Contents", ".-2", [ 0, 0, 2 ], 34, 3, "table of contents", +[ [ "Title page", "0.0", [ 0, 0, 0 ], 1, 1, "title page", "X7D2C85EC87DD46E5" + ], + [ "Copyright", "0.0-1", [ 0, 0, 1 ], 29, 2, "copyright", + "X81488B807F2A1CF1" ], + [ "Table of Contents", "0.0-2", [ 0, 0, 2 ], 34, 3, "table of contents", "X8537FEB07AF2BEC8" ], [ "\033[1X\033[33X\033[0;-2YThe Ferret Package\033[133X\033[101X", "1", [ 1, 0, 0 ], 1, 4, "the ferret package", "X84F30BD780680D41" ], @@ -38,7 +40,7 @@ "3.3", [ 3, 3, 0 ], 59, 10, "loading the ferret package", "X7BA03640834E607E" ], [ "Index", "ind", [ "Ind", 0, 0 ], 1, 11, "index", "X83A0356F839C696F" ], - [ "Ferret package", "1.", [ 1, 0, 0 ], 1, 4, "ferret package", + [ "Ferret package", "1.0", [ 1, 0, 0 ], 1, 4, "ferret package", "X84F30BD780680D41" ], [ "\033[2XEnableFerretOverloads\033[102X", "1.1-1", [ 1, 1, 1 ], 44, 4, "enableferretoverloads", "X7E455E297809B021" ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ferret-1.0.10/doc/title.xml new/ferret-1.0.11/doc/title.xml --- old/ferret-1.0.10/doc/title.xml 2024-01-22 09:55:41.000000000 +0100 +++ new/ferret-1.0.11/doc/title.xml 2024-04-24 09:18:42.000000000 +0200 @@ -9,7 +9,7 @@ Backtrack Search in Permutation Groups </Subtitle> <Version> - 1.0.10 + 1.0.11 </Version> <Author> Christopher Jefferson<Alt Only="LaTeX"><Br/></Alt> @@ -19,11 +19,11 @@ UK<Br/> </Address> <Email>caj21(a)st-andrews.ac.uk</Email> -<Homepage>https://caj.host.cs.st-andrews.ac.uk/</Homepage> +<Homepage>https://heather.cafe/</Homepage> </Author> <Date> - 22 January 2024 + 24 April 2024 </Date> <Copyright> &copyright; by Christopher Jefferson

1 0

commit udiskie for openSUSE:Factory
by Source-Sync 26 Apr '24

26 Apr '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package udiskie for openSUSE:Factory checked in at 2024-04-26 23:26:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/udiskie (Old) and /work/SRC/openSUSE:Factory/.udiskie.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "udiskie" Fri Apr 26 23:26:46 2024 rev:7 rq:1170175 version:2.5.3 Changes: -------- --- /work/SRC/openSUSE:Factory/udiskie/udiskie.changes 2024-03-13 22:19:10.985608302 +0100 +++ /work/SRC/openSUSE:Factory/.udiskie.new.1880/udiskie.changes 2024-04-26 23:27:03.384477555 +0200 @@ -1,0 +2,10 @@ +Thu Apr 25 13:21:10 UTC 2024 - Michael Pujos <pujos.michael(a)gmail.com> + +- removed fix-keyutils-module-conflict.patch, fixed upstream +- Update to 2.5.3: + * allow matching against a list of values in config rules (device_config) + * fix --terminal command line option (was not doing anything) + * fix AttributeError when python-keyring-keyutils is installed instead of + keyutils + +------------------------------------------------------------------- Old: ---- fix-keyutils-module-conflict.patch udiskie-2.5.2.tar.gz New: ---- udiskie-2.5.3.tar.gz BETA DEBUG BEGIN: Old: - removed fix-keyutils-module-conflict.patch, fixed upstream - Update to 2.5.3: BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ udiskie.spec ++++++ --- /var/tmp/diff_new_pack.pVmNbM/_old 2024-04-26 23:27:03.952498319 +0200 +++ /var/tmp/diff_new_pack.pVmNbM/_new 2024-04-26 23:27:03.956498466 +0200 @@ -17,14 +17,13 @@ Name: udiskie -Version: 2.5.2 +Version: 2.5.3 Release: 0 Summary: Removable disk automounter for udisks License: MIT Group: System/GUI/Other URL: https://github.com/coldfix/udiskie Source: https://files.pythonhosted.org/packages/source/u/%{name}/%{name}-%{version}… -Patch: fix-keyutils-module-conflict.patch BuildRequires: asciidoc BuildRequires: fdupes # Needed for typelib() - Requires. @@ -67,7 +66,7 @@ %lang_package %prep -%autosetup -p1 +%autosetup %build %python3_build ++++++ udiskie-2.5.2.tar.gz -> udiskie-2.5.3.tar.gz ++++++ ++++ 2969 lines of diff (skipped)

1 0

commit dracut for openSUSE:Factory
by Source-Sync 26 Apr '24

26 Apr '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package dracut for openSUSE:Factory checked in at 2024-04-26 23:26:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dracut (Old) and /work/SRC/openSUSE:Factory/.dracut.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dracut" Fri Apr 26 23:26:38 2024 rev:225 rq:1170253 version:059+suse.581.g19b7c06c Changes: -------- --- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2024-04-17 14:45:16.745844077 +0200 +++ /work/SRC/openSUSE:Factory/.dracut.new.1880/dracut.changes 2024-04-26 23:26:49.607973961 +0200 @@ -1,0 +2,19 @@ +Fri Apr 26 06:19:27 UTC 2024 - antonio.feijoo(a)suse.com + +- Update to version 059+suse.581.g19b7c06c: + * fix(dracut): move hooks directory from /usr/lib to /var/lib (bsc#1218068) + * feat(tpm2-tss): add tpm2.target and systemd-tpm2-generator + * fix(systemd): explicitly install some libs that will not be statically included + * fix(dracut-lib): only remove initqueue/finished scripts, not the hook dir + * fix(dracut-util): avoid memory leak + * fix(dracut-install): memory leak in two `hashmap_put` calls if key exists + * fix(dracut-install): release memory allocated for regular expressions + * fix(dracut-install): memory leak in `--modalias` option + * refactor(dracut-install): strerror(errno) -> %m + * perf(dracut-install): don't strdup() environment block + * perf(dracut-install): don't reallocate {src,dst}path in hmac_install() + * perf(dracut-install): don't strdup() excessively for dracut_install() + * perf(dracut-install): stat() w/unused buf -> access(F_OK) in dracut-install + * perf(dracut-install): multiple single-character strstr()s -> strpbrk() + +------------------------------------------------------------------- Old: ---- dracut-059+suse.563.g4900899a.obscpio New: ---- dracut-059+suse.581.g19b7c06c.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dracut.spec ++++++ --- /var/tmp/diff_new_pack.1UdCA4/_old 2024-04-26 23:26:50.404003059 +0200 +++ /var/tmp/diff_new_pack.1UdCA4/_new 2024-04-26 23:26:50.404003059 +0200 @@ -25,7 +25,7 @@ %endif Name: dracut -Version: 059+suse.563.g4900899a +Version: 059+suse.581.g19b7c06c Release: 0 Summary: Event driven initramfs infrastructure License: GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later ++++++ README.susemaint ++++++ --- /var/tmp/diff_new_pack.1UdCA4/_old 2024-04-26 23:26:50.444004521 +0200 +++ /var/tmp/diff_new_pack.1UdCA4/_new 2024-04-26 23:26:50.448004667 +0200 @@ -89,8 +89,9 @@ the upgrade to dracut-059 (0aa08f0e docs: update NEWS.md and AUTHORS), extracted using `git log --oneline 0aa08f0e..HEAD`: +MERGED 5d2bda46 fix(zfcp_rules): correct shellcheck regression when parsing ccw args 4980bad3 fix(configure): misleading error if C compiler is not installed - de8ac630 fix(github): update format of labeler +MERGED de8ac630 fix(github): update format of labeler MERGED 4971f443 fix(systemd-journald): add systemd-sysusers dependency MERGED 4d594210 fix(dracut-initramfs-restore.sh): do not set selinux labels if disabled MERGED 1586af09 fix(systemd-repart): correct undefined $libdir @@ -295,13 +296,13 @@ MERGED 93339444 fix(dmsquash-live): live:/dev/* MERGED 10cf8e46 fix(load_fstype): avoid false positive searchs MERGED 08b63a25 fix: shellcheck 0.8.0 - 94dcac7c refactor(dracut-install): strerror(errno) -> %m - efd4ca27 perf(dracut-install): don't strdup() environment block - 77226cb4 perf(dracut-install): don't reallocate {src,dst}path in hmac_install() - a20556f0 perf(dracut-install): don't strdup() excessively for dracut_install() - e7ed8337 perf(dracut-install): stat() w/unused buf -> access(F_OK) in dracut-install - 751a110f perf(dracut-install): multiple single-character strstr()s -> strpbrk() - 1e5237dd chore: remove src/install/hashmap.lo +MERGED 94dcac7c refactor(dracut-install): strerror(errno) -> %m +MERGED efd4ca27 perf(dracut-install): don't strdup() environment block +MERGED 77226cb4 perf(dracut-install): don't reallocate {src,dst}path in hmac_install() +MERGED a20556f0 perf(dracut-install): don't strdup() excessively for dracut_install() +MERGED e7ed8337 perf(dracut-install): stat() w/unused buf -> access(F_OK) in dracut-install +MERGED 751a110f perf(dracut-install): multiple single-character strstr()s -> strpbrk() +MERGED 1e5237dd chore: remove src/install/hashmap.lo MERGED 9dbbebb1 feat(network-wicked): remove module @@ -325,10 +326,15 @@ 2557 feat(kernel-modules): install SPMI modules on ARM/RISC-V 2559 feat(install.d): add sort-key field to rescue BLS entries 2560 feat(resume): do not attempt to install systemd-hibernate-resume@.service +2571 fix(dracut-install): memory leak in `--modalias` option +2573 fix(dracut-install): release memory allocated for regular expressions +2574 fix(dracut-install): memory leak in two `hashmap_put` calls if key exists 2593 fix(dracut.sh): do not add device if find_block_device returns an error 2593 feat(dracut.sh): protect push_host_devs function +2601 feat(tpm2-tss): add tpm2.target and systemd-tpm2-generator 2607 fix(dracut-util): do not call strcmp if the value argument is NULL 2607 fix(dracut): correct regression with multiple `rd.break=` options +2608 fix(dracut-util): avoid memory leak 2611 fix(livenet): propagate error code 2611 fix(livenet): check also `content-length` from live image header 2611 fix(livenet): split `imgsize` calculation to avoid misleading error message @@ -336,6 +342,13 @@ 2614 fix(dracut-systemd): replace `rd.udev.log-priority` with `rd.udev.log_level` 2618 fix(i18n): handle keymap includes with `--sysroot` 2618 fix(dracut-init.sh): handle decompress with `--sysroot` -2630 fix(zfcp_rules): correct shellcheck regression when parsing ccw args +2623 fix(dracut-lib): only remove initqueue/finished scripts, not the hook dir +2643 fix(systemd): explicitly install some libs that will not be statically included + + +3. Commits from the new https://github.com/dracut-ng/dracut-ng upstream that +were already merged + +a45048b8 fix(dracut): move hooks directory from /usr/lib to /var/lib ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.1UdCA4/_old 2024-04-26 23:26:50.488006130 +0200 +++ /var/tmp/diff_new_pack.1UdCA4/_new 2024-04-26 23:26:50.492006276 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/opensuse/dracut.git</param> - <param name="changesrevision">f2e2d088dc19e2477d348fa712e67f85dad0de5e</param></service></servicedata> + <param name="changesrevision">19b7c06cbf2d96befb9ba0fb24c482a0da40dcef</param></service></servicedata> (No newline at EOF) ++++++ dracut-059+suse.563.g4900899a.obscpio -> dracut-059+suse.581.g19b7c06c.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.563.g4900899a/.github/labeler.yml new/dracut-059+suse.581.g19b7c06c/.github/labeler.yml --- old/dracut-059+suse.563.g4900899a/.github/labeler.yml 2024-04-16 15:33:54.000000000 +0200 +++ new/dracut-059+suse.581.g19b7c06c/.github/labeler.yml 2024-04-26 08:18:04.000000000 +0200 @@ -1,292 +1,543 @@ repository: - - ./* + - changed-files: + - any-glob-to-any-file: './*' github: - - .github/* - - .github/**/* + - changed-files: + - any-glob-to-any-file: ['.github/*', '.github/**/*'] + +docs: + - changed-files: + - any-glob-to-any-file: 'docs/*' + +man: + - changed-files: + - any-glob-to-any-file: 'man/*' + +kernel-install: + - changed-files: + - any-glob-to-any-file: 'install.d/*' + +shell-completion: + - changed-files: + - any-glob-to-any-file: ['shell-completion/*', 'shell-completion/**/*'] + +dracut-cpio: + - changed-files: + - any-glob-to-any-file: ['src/dracut-cpio/*', 'src/dracut-cpio/**/*'] dracut-install: - - install/* - - install/**/* + - changed-files: + - any-glob-to-any-file: 'src/install/*' -example: - - examples/* - - examples/**/* - - examples/**/**/* +dracut-util: + - changed-files: + - any-glob-to-any-file: 'src/util/*' + +logtee: + - changed-files: + - any-glob-to-any-file: 'src/logtee/*' + +skipcpio: + - changed-files: + - any-glob-to-any-file: 'src/skipcpio/*' modules: - - modules.d/* - - modules.d/**/* + - changed-files: + - any-glob-to-any-file: ['modules.d/*', 'modules.d/**/*'] bash: - - modules.d/00bash/* + - changed-files: + - any-glob-to-any-file: 'modules.d/00bash/*' dash: - - modules.d/00dash/* + - changed-files: + - any-glob-to-any-file: 'modules.d/00dash/*' mksh: - - modules.d/00mksh/* + - changed-files: + - any-glob-to-any-file: 'modules.d/00mksh/*' systemd: - - modules.d/00systemd/* + - changed-files: + - any-glob-to-any-file: 'modules.d/00systemd/*' warpclock: - - modules.d/00warpclock/* + - changed-files: + - any-glob-to-any-file: 'modules.d/00warpclock/*' fips: - - modules.d/01fips/* + - changed-files: + - any-glob-to-any-file: 'modules.d/01fips/*' + +systemd-ac-power: + - changed-files: + - any-glob-to-any-file: 'modules.d/01systemd-ac-power/*' + +systemd-ask-password: + - changed-files: + - any-glob-to-any-file: 'modules.d/01systemd-ask-password/*' + +systemd-coredump: + - changed-files: + - any-glob-to-any-file: 'modules.d/01systemd-coredump/*' + +systemd-creds: + - changed-files: + - any-glob-to-any-file: 'modules.d/01systemd-creds/*' + +systemd-hostnamed: + - changed-files: + - any-glob-to-any-file: 'modules.d/01systemd-hostnamed/*' systemd-initrd: - - modules.d/01systemd-initrd/* + - changed-files: + - any-glob-to-any-file: 'modules.d/01systemd-initrd/*' -caps: - - modules.d/02caps/* +systemd-integritysetup: + - changed-files: + - any-glob-to-any-file: 'modules.d/01systemd-integritysetup/*' + +systemd-journald: + - changed-files: + - any-glob-to-any-file: 'modules.d/01systemd-journald/*' + +systemd-ldconfig: + - changed-files: + - any-glob-to-any-file: 'modules.d/01systemd-ldconfig/*' + +systemd-modules-load: + - changed-files: + - any-glob-to-any-file: 'modules.d/01systemd-modules-load/*' systemd-networkd: - - modules.d/02systemd-networkd/* + - changed-files: + - any-glob-to-any-file: 'modules.d/01systemd-networkd/*' + +systemd-pcrphase: + - changed-files: + - any-glob-to-any-file: 'modules.d/01systemd-pcrphase/*' + +systemd-portabled: + - changed-files: + - any-glob-to-any-file: 'modules.d/01systemd-portabled/*' + +systemd-pstore: + - changed-files: + - any-glob-to-any-file: 'modules.d/01systemd-pstore/*' + +systemd-repart: + - changed-files: + - any-glob-to-any-file: 'modules.d/01systemd-repart/*' + +systemd-resolved: + - changed-files: + - any-glob-to-any-file: 'modules.d/01systemd-resolved/*' + +systemd-sysctl: + - changed-files: + - any-glob-to-any-file: 'modules.d/01systemd-sysctl/*' + +systemd-sysext: + - changed-files: + - any-glob-to-any-file: 'modules.d/01systemd-sysext/*' + +systemd-sysusers: + - changed-files: + - any-glob-to-any-file: 'modules.d/01systemd-sysusers/*' + +systemd-timedated: + - changed-files: + - any-glob-to-any-file: 'modules.d/01systemd-timedated/*' + +systemd-timesyncd: + - changed-files: + - any-glob-to-any-file: 'modules.d/01systemd-timesyncd/*' + +systemd-tmpfiles: + - changed-files: + - any-glob-to-any-file: 'modules.d/01systemd-tmpfiles/*' + +systemd-udevd: + - changed-files: + - any-glob-to-any-file: 'modules.d/01systemd-udevd/*' + +systemd-veritysetup: + - changed-files: + - any-glob-to-any-file: 'modules.d/01systemd-veritysetup/*' + +caps: + - changed-files: + - any-glob-to-any-file: 'modules.d/02caps/*' modsign: - - modules.d/03modsign/* + - changed-files: + - any-glob-to-any-file: 'modules.d/03modsign/*' rescue: - - modules.d/03rescue/* + - changed-files: + - any-glob-to-any-file: 'modules.d/03rescue/*' watchdog: - - modules.d/04watchdog/* + - changed-files: + - any-glob-to-any-file: 'modules.d/04watchdog/*' + +watchdog-modules: + - changed-files: + - any-glob-to-any-file: 'modules.d/04watchdog-modules/*' busybox: - - modules.d/05busybox/* + - changed-files: + - any-glob-to-any-file: 'modules.d/05busybox/*' + +dbus-broker: + - changed-files: + - any-glob-to-any-file: 'modules.d/06dbus-broker/*' + +dbus-daemon: + - changed-files: + - any-glob-to-any-file: 'modules.d/06dbus-daemon/*' rngd: - - modules.d/06rngd/* + - changed-files: + - any-glob-to-any-file: 'modules.d/06rngd/*' + +dbus: + - changed-files: + - any-glob-to-any-file: 'modules.d/09dbus/*' i18n: - - modules.d/10i18n/* + - changed-files: + - any-glob-to-any-file: 'modules.d/10i18n/*' convertfs: - - modules.d/30convertfs/* + - changed-files: + - any-glob-to-any-file: 'modules.d/30convertfs/*' + +connman: + - changed-files: + - any-glob-to-any-file: 'modules.d/35connman/*' network-legacy: - - modules.d/35network-legacy/* + - changed-files: + - any-glob-to-any-file: 'modules.d/35network-legacy/*' network-manager: - - modules.d/35network-manager/* + - changed-files: + - any-glob-to-any-file: 'modules.d/35network-manager/*' network: - - modules.d/40network/* + - changed-files: + - any-glob-to-any-file: 'modules.d/40network/*' ifcfg: - - modules.d/45ifcfg/* + - changed-files: + - any-glob-to-any-file: 'modules.d/45ifcfg/*' url-lib: - - modules.d/45url-lib/* + - changed-files: + - any-glob-to-any-file: 'modules.d/45url-lib/*' drm: - - modules.d/50drm/* + - changed-files: + - any-glob-to-any-file: 'modules.d/50drm/*' plymouth: - - modules.d/50plymouth/* + - changed-files: + - any-glob-to-any-file: 'modules.d/50plymouth/*' + +bluetooth: + - changed-files: + - any-glob-to-any-file: 'modules.d/62bluetooth/*' cms: - - modules.d/80cms/* + - changed-files: + - any-glob-to-any-file: 'modules.d/80cms/*' lvmmerge: - - modules.d/80lvmmerge/* + - changed-files: + - any-glob-to-any-file: 'modules.d/80lvmmerge/*' + +lvmthinpool-monitor: + - changed-files: + - any-glob-to-any-file: 'modules.d/80lvmthinpool-monitor/*' cio_ignore: - - modules.d/81cio_ignore/* + - changed-files: + - any-glob-to-any-file: 'modules.d/81cio_ignore/*' btrfs: - - modules.d/90btrfs/* + - changed-files: + - any-glob-to-any-file: 'modules.d/90btrfs/*' crypt: - - modules.d/90crypt/* + - changed-files: + - any-glob-to-any-file: 'modules.d/90crypt/*' dm: - - modules.d/90dm/* + - changed-files: + - any-glob-to-any-file: 'modules.d/90dm/*' dmraid: - - modules.d/90dmraid/* + - changed-files: + - any-glob-to-any-file: 'modules.d/90dmraid/*' dmsquash-live: - - modules.d/90dmsquash-live/* + - changed-files: + - any-glob-to-any-file: 'modules.d/90dmsquash-live/*' + +dmsquash-live-autooverlay: + - changed-files: + - any-glob-to-any-file: 'modules.d/90dmsquash-live-autooverlay/*' dmsquash-live-ntfs: - - modules.d/90dmsquash-live-ntfs/* + - changed-files: + - any-glob-to-any-file: 'modules.d/90dmsquash-live-ntfs/*' kernel-modules: - - modules.d/90kernel-modules/* + - changed-files: + - any-glob-to-any-file: 'modules.d/90kernel-modules/*' kernel-modules-extra: - - modules.d/90kernel-modules-extra/* + - changed-files: + - any-glob-to-any-file: 'modules.d/90kernel-modules-extra/*' kernel-network-modules: - - modules.d/90kernel-network-modules/* + - changed-files: + - any-glob-to-any-file: 'modules.d/90kernel-network-modules/*' livenet: - - modules.d/90livenet/* + - changed-files: + - any-glob-to-any-file: 'modules.d/90livenet/*' lvm: - - modules.d/90lvm/* + - changed-files: + - any-glob-to-any-file: 'modules.d/90lvm/*' mdraid: - - modules.d/90mdraid/* + - changed-files: + - any-glob-to-any-file: 'modules.d/90mdraid/*' multipath: - - modules.d/90multipath/* + - changed-files: + - any-glob-to-any-file: 'modules.d/90multipath/*' nvdimm: - - modules.d/90nvdimm/* + - changed-files: + - any-glob-to-any-file: 'modules.d/90nvdimm/*' overlayfs: - - modules.d/90overlayfs/* + - changed-files: + - any-glob-to-any-file: 'modules.d/90overlayfs/*' ppcmac: - - modules.d/90ppcmac/* + - changed-files: + - any-glob-to-any-file: 'modules.d/90ppcmac/*' qemu: - - modules.d/90qemu/* + - changed-files: + - any-glob-to-any-file: 'modules.d/90qemu/*' qemu-net: - - modules.d/90qemu-net/* + - changed-files: + - any-glob-to-any-file: 'modules.d/90qemu-net/*' crypt-gpg: - - modules.d/91crypt-gpg/* + - changed-files: + - any-glob-to-any-file: 'modules.d/91crypt-gpg/*' crypt-loop: - - modules.d/91crypt-loop/* + - changed-files: + - any-glob-to-any-file: 'modules.d/91crypt-loop/*' + +fido2: + - changed-files: + - any-glob-to-any-file: 'modules.d/91fido2/*' + +pcsc: + - changed-files: + - any-glob-to-any-file: 'modules.d/91pcsc/*' + +pkcs11: + - changed-files: + - any-glob-to-any-file: 'modules.d/91pkcs11/*' + +tpm2-tss: + - changed-files: + - any-glob-to-any-file: 'modules.d/91tpm2-tss/*' zipl: - - modules.d/91zipl/* + - changed-files: + - any-glob-to-any-file: 'modules.d/91zipl/*' cifs: - - modules.d/95cifs/* + - changed-files: + - any-glob-to-any-file: 'modules.d/95cifs/*' dasd: - - modules.d/95dasd/* + - changed-files: + - any-glob-to-any-file: 'modules.d/95dasd/*' dasd_mod: - - modules.d/95dasd_mod/* + - changed-files: + - any-glob-to-any-file: 'modules.d/95dasd_mod/*' dasd_rules: - - modules.d/95dasd_rules/* + - changed-files: + - any-glob-to-any-file: 'modules.d/95dasd_rules/*' dcssblk: - - modules.d/95dcssblk/* + - changed-files: + - any-glob-to-any-file: 'modules.d/95dcssblk/*' debug: - - modules.d/95debug/* + - changed-files: + - any-glob-to-any-file: 'modules.d/95debug/*' fcoe: - - modules.d/95fcoe/* + - changed-files: + - any-glob-to-any-file: 'modules.d/95fcoe/*' fcoe-uefi: - - modules.d/95fcoe-uefi/* + - changed-files: + - any-glob-to-any-file: 'modules.d/95fcoe-uefi/*' fstab-sys: - - modules.d/95fstab-sys/* + - changed-files: + - any-glob-to-any-file: 'modules.d/95fstab-sys/*' iscsi: - - modules.d/95iscsi/* + - changed-files: + - any-glob-to-any-file: 'modules.d/95iscsi/*' lunmask: - - modules.d/95lunmask/* + - changed-files: + - any-glob-to-any-file: 'modules.d/95lunmask/*' nbd: - - modules.d/95nbd/* + - changed-files: + - any-glob-to-any-file: 'modules.d/95nbd/*' nfs: - - modules.d/95nfs/* + - changed-files: + - any-glob-to-any-file: 'modules.d/95nfs/*' nvmf: - - modules.d/95nvmf/* + - changed-files: + - any-glob-to-any-file: 'modules.d/95nvmf/*' qeth_rules: - - modules.d/95qeth_rules/* + - changed-files: + - any-glob-to-any-file: 'modules.d/95qeth_rules/*' resume: - - modules.d/95resume/* + - changed-files: + - any-glob-to-any-file: 'modules.d/95resume/*' rootfs-block: - - modules.d/95rootfs-block/* + - changed-files: + - any-glob-to-any-file: 'modules.d/95rootfs-block/*' ssh-client: - - modules.d/95ssh-client/* + - changed-files: + - any-glob-to-any-file: 'modules.d/95ssh-client/*' terminfo: - - modules.d/95terminfo/* + - changed-files: + - any-glob-to-any-file: 'modules.d/95terminfo/*' udev-rules: - - modules.d/95udev-rules/* + - changed-files: + - any-glob-to-any-file: 'modules.d/95udev-rules/*' virtfs: - - modules.d/95virtfs/* + - changed-files: + - any-glob-to-any-file: 'modules.d/95virtfs/*' virtiofs: - - modules.d/95virtiofs/* + - changed-files: + - any-glob-to-any-file: 'modules.d/95virtiofs/*' zfcp: - - modules.d/95zfcp/* + - changed-files: + - any-glob-to-any-file: 'modules.d/95zfcp/*' zfcp_rules: - - modules.d/95zfcp_rules/* + - changed-files: + - any-glob-to-any-file: 'modules.d/95zfcp_rules/*' znet: - - modules.d/95znet/* + - changed-files: + - any-glob-to-any-file: 'modules.d/95znet/*' securityfs: - - modules.d/96securityfs/* + - changed-files: + - any-glob-to-any-file: 'modules.d/96securityfs/*' biosdevname: - - modules.d/97biosdevname/* + - changed-files: + - any-glob-to-any-file: 'modules.d/97biosdevname/*' masterkey: -- modules.d/97masterkey/* + - changed-files: + - any-glob-to-any-file: 'modules.d/97masterkey/*' dracut-systemd: - - modules.d/98dracut-systemd/* + - changed-files: + - any-glob-to-any-file: 'modules.d/98dracut-systemd/*' ecryptfs: - - modules.d/98ecryptfs/* + - changed-files: + - any-glob-to-any-file: 'modules.d/98ecryptfs/*' integrity: - - modules.d/98integrity/* + - changed-files: + - any-glob-to-any-file: 'modules.d/98integrity/*' pollcdrom: - - modules.d/98pollcdrom/* + - changed-files: + - any-glob-to-any-file: 'modules.d/98pollcdrom/*' selinux: - - modules.d/98selinux/* + - changed-files: + - any-glob-to-any-file: 'modules.d/98selinux/*' syslog: - - modules.d/98syslog/* + - changed-files: + - any-glob-to-any-file: 'modules.d/98syslog/*' usrmount: - - modules.d/98usrmount/* + - changed-files: + - any-glob-to-any-file: 'modules.d/98usrmount/*' base: - - modules.d/99base/* + - changed-files: + - any-glob-to-any-file: 'modules.d/99base/*' fs-lib: - - modules.d/99fs-lib/* + - changed-files: + - any-glob-to-any-file: 'modules.d/99fs-lib/*' img-lib: - - modules.d/99img-lib/* + - changed-files: + - any-glob-to-any-file: 'modules.d/99img-lib/*' memstrack: - - modules.d/99memstrack/* + - changed-files: + - any-glob-to-any-file: 'modules.d/99memstrack/*' shutdown: - - modules.d/99shutdown/* + - changed-files: + - any-glob-to-any-file: 'modules.d/99shutdown/*' squash: - - modules.d/99squash/* + - changed-files: + - any-glob-to-any-file: 'modules.d/99squash/*' uefi-lib: - - modules.d/99uefi-lib/* + - changed-files: + - any-glob-to-any-file: 'modules.d/99uefi-lib/*' test: - - test/* - - test/**/* - - modules.d/80test* - - modules.d/80test*/* + - changed-files: + - any-glob-to-any-file: ['test/*', 'test/**/*', 'modules.d/80test*', 'modules.d/80test*/*'] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.563.g4900899a/dracut-init.sh new/dracut-059+suse.581.g19b7c06c/dracut-init.sh --- old/dracut-059+suse.563.g4900899a/dracut-init.sh 2024-04-16 15:33:54.000000000 +0200 +++ new/dracut-059+suse.581.g19b7c06c/dracut-init.sh 2024-04-26 08:18:04.000000000 +0200 @@ -637,7 +637,7 @@ dfatal "No such hook type $1. Aborting initrd creation." exit 1 fi - hook="/lib/dracut/hooks/${1}/${2}-${3##*/}" + hook="/var/lib/dracut/hooks/${1}/${2}-${3##*/}" inst_simple "$3" "$hook" chmod u+x "$initdir/$hook" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.563.g4900899a/dracut.sh new/dracut-059+suse.581.g19b7c06c/dracut.sh --- old/dracut-059+suse.563.g4900899a/dracut.sh 2024-04-16 15:33:54.000000000 +0200 +++ new/dracut-059+suse.581.g19b7c06c/dracut.sh 2024-04-26 08:18:04.000000000 +0200 @@ -1881,7 +1881,11 @@ if [[ $kernel_only != yes ]]; then mkdir -p "${initdir}/etc/cmdline.d" - mkdir -m 0755 "${initdir}"/lib/dracut/hooks + mkdir -m 0755 -p "${initdir}"/var/lib/dracut/hooks + + # symlink to old hooks location for compatibility + ln_r /var/lib/dracut/hooks /lib/dracut/hooks + # shellcheck disable=SC2154 for _d in $hookdirs; do # shellcheck disable=SC2174 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.563.g4900899a/modules.d/00systemd/module-setup.sh new/dracut-059+suse.581.g19b7c06c/modules.d/00systemd/module-setup.sh --- old/dracut-059+suse.563.g4900899a/modules.d/00systemd/module-setup.sh 2024-04-16 15:33:54.000000000 +0200 +++ new/dracut-059+suse.581.g19b7c06c/modules.d/00systemd/module-setup.sh 2024-04-26 08:18:04.000000000 +0200 @@ -262,6 +262,8 @@ # Install library file(s) _arch=${DRACUT_ARCH:-$(uname -m)} inst_libdir_file \ + {"tls/$_arch/",tls/,"$_arch/",}"libgcrypt.so*" \ + {"tls/$_arch/",tls/,"$_arch/",}"libkmod.so*" \ {"tls/$_arch/",tls/,"$_arch/",}"libnss_*" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.563.g4900899a/modules.d/01systemd-coredump/module-setup.sh new/dracut-059+suse.581.g19b7c06c/modules.d/01systemd-coredump/module-setup.sh --- old/dracut-059+suse.563.g4900899a/modules.d/01systemd-coredump/module-setup.sh 2024-04-16 15:33:54.000000000 +0200 +++ new/dracut-059+suse.581.g19b7c06c/modules.d/01systemd-coredump/module-setup.sh 2024-04-26 08:18:04.000000000 +0200 @@ -40,6 +40,13 @@ "$sysusers"/systemd-coredump.conf \ coredumpctl + # Install library file(s) + _arch=${DRACUT_ARCH:-$(uname -m)} + inst_libdir_file \ + {"tls/$_arch/",tls/,"$_arch/",}"liblz4.so.*" \ + {"tls/$_arch/",tls/,"$_arch/",}"liblzma.so.*" \ + {"tls/$_arch/",tls/,"$_arch/",}"libzstd.so.*" + # Install the hosts local user configurations if enabled. if [[ $hostonly ]]; then inst_multiple -H -o \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.563.g4900899a/modules.d/01systemd-journald/module-setup.sh new/dracut-059+suse.581.g19b7c06c/modules.d/01systemd-journald/module-setup.sh --- old/dracut-059+suse.563.g4900899a/modules.d/01systemd-journald/module-setup.sh 2024-04-16 15:33:54.000000000 +0200 +++ new/dracut-059+suse.581.g19b7c06c/modules.d/01systemd-journald/module-setup.sh 2024-04-26 08:18:04.000000000 +0200 @@ -53,9 +53,10 @@ # Install library file(s) _arch=${DRACUT_ARCH:-$(uname -m)} inst_libdir_file \ + {"tls/$_arch/",tls/,"$_arch/",}"libgcrypt.so*" \ {"tls/$_arch/",tls/,"$_arch/",}"liblz4.so.*" \ - {"tls/$_arch/",tls/,"$_arch/",}"libzstd.so.*" \ - {"tls/$_arch/",tls/,"$_arch/",}"liblzma.so.*" + {"tls/$_arch/",tls/,"$_arch/",}"liblzma.so.*" \ + {"tls/$_arch/",tls/,"$_arch/",}"libzstd.so.*" # Install the hosts local user configurations if enabled. if [[ $hostonly ]]; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.563.g4900899a/modules.d/35connman/cm-lib.sh new/dracut-059+suse.581.g19b7c06c/modules.d/35connman/cm-lib.sh --- old/dracut-059+suse.563.g4900899a/modules.d/35connman/cm-lib.sh 2024-04-16 15:33:54.000000000 +0200 +++ new/dracut-059+suse.581.g19b7c06c/modules.d/35connman/cm-lib.sh 2024-04-26 08:18:04.000000000 +0200 @@ -4,7 +4,6 @@ cm_generate_connections() { if getargbool 0 rd.neednet; then - mkdir -p "$hookdir"/initqueue/finished echo '[ -f /tmp/cm.done ]' > "$hookdir"/initqueue/finished/cm.sh mkdir -p /run/connman/initrd : > /run/connman/initrd/neednet # activate ConnMan services diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.563.g4900899a/modules.d/35network-manager/nm-lib.sh new/dracut-059+suse.581.g19b7c06c/modules.d/35network-manager/nm-lib.sh --- old/dracut-059+suse.563.g4900899a/modules.d/35network-manager/nm-lib.sh 2024-04-16 15:33:54.000000000 +0200 +++ new/dracut-059+suse.581.g19b7c06c/modules.d/35network-manager/nm-lib.sh 2024-04-26 08:18:04.000000000 +0200 @@ -20,7 +20,6 @@ /etc/NetworkManager/system-connections/* \ /etc/sysconfig/network-scripts/ifcfg-*; do [ -f "$i" ] || continue - mkdir -p "$hookdir"/initqueue/finished echo '[ -f /tmp/nm.done ]' > "$hookdir"/initqueue/finished/nm.sh mkdir -p /run/NetworkManager/initrd : > /run/NetworkManager/initrd/neednet # activate NM services diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.563.g4900899a/modules.d/91tpm2-tss/module-setup.sh new/dracut-059+suse.581.g19b7c06c/modules.d/91tpm2-tss/module-setup.sh --- old/dracut-059+suse.563.g4900899a/modules.d/91tpm2-tss/module-setup.sh 2024-04-16 15:33:54.000000000 +0200 +++ new/dracut-059+suse.581.g19b7c06c/modules.d/91tpm2-tss/module-setup.sh 2024-04-26 08:18:04.000000000 +0200 @@ -35,6 +35,8 @@ "$sysusers"/system-user-tss.conf \ "$tmpfilesdir"/tpm2-tss-fapi*.conf \ "$udevrulesdir"/90-tpm.rules \ + "$systemdutildir"/system-generators/systemd-tpm2-generator \ + "$systemdsystemunitdir/tpm2.target" \ tpm2_pcrread tpm2_pcrextend tpm2_createprimary tpm2_createpolicy \ tpm2_create tpm2_load tpm2_unseal tpm2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.563.g4900899a/modules.d/99base/dracut-lib.sh new/dracut-059+suse.581.g19b7c06c/modules.d/99base/dracut-lib.sh --- old/dracut-059+suse.563.g4900899a/modules.d/99base/dracut-lib.sh 2024-04-16 15:33:54.000000000 +0200 +++ new/dracut-059+suse.581.g19b7c06c/modules.d/99base/dracut-lib.sh 2024-04-26 08:18:04.000000000 +0200 @@ -1131,7 +1131,7 @@ } remove_hostonly_files() { - rm -fr /etc/cmdline /etc/cmdline.d/*.conf "$hookdir/initqueue/finished" + rm -fr /etc/cmdline /etc/cmdline.d/*.conf "$hookdir"/initqueue/finished/*.sh if [ -f /lib/dracut/hostonly-files ]; then while read -r line || [ -n "$line" ]; do [ -e "$line" ] || [ -h "$line" ] || continue diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.563.g4900899a/modules.d/99base/module-setup.sh new/dracut-059+suse.581.g19b7c06c/modules.d/99base/module-setup.sh --- old/dracut-059+suse.563.g4900899a/modules.d/99base/module-setup.sh 2024-04-16 15:33:54.000000000 +0200 +++ new/dracut-059+suse.581.g19b7c06c/modules.d/99base/module-setup.sh 2024-04-26 08:18:04.000000000 +0200 @@ -45,7 +45,10 @@ [ -e "${initdir}/lib" ] || mkdir -m 0755 -p "${initdir}"/lib mkdir -m 0755 -p "${initdir}"/lib/dracut - mkdir -m 0755 -p "${initdir}"/lib/dracut/hooks + mkdir -m 0755 -p "${initdir}"/var/lib/dracut/hooks + + # symlink to old hooks location for compatibility + ln_r /var/lib/dracut/hooks /lib/dracut/hooks mkdir -p "${initdir}"/tmp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.563.g4900899a/modules.d/99shutdown/module-setup.sh new/dracut-059+suse.581.g19b7c06c/modules.d/99shutdown/module-setup.sh --- old/dracut-059+suse.563.g4900899a/modules.d/99shutdown/module-setup.sh 2024-04-16 15:33:54.000000000 +0200 +++ new/dracut-059+suse.581.g19b7c06c/modules.d/99shutdown/module-setup.sh 2024-04-26 08:18:04.000000000 +0200 @@ -17,9 +17,11 @@ inst_multiple umount poweroff reboot halt losetup stat sleep timeout inst_multiple -o kexec inst "$moddir/shutdown.sh" "$prefix/shutdown" - [ -e "${initdir}/lib" ] || mkdir -m 0755 -p "${initdir}"/lib - mkdir -m 0755 -p "${initdir}"/lib/dracut - mkdir -m 0755 -p "${initdir}"/lib/dracut/hooks + mkdir -m 0755 -p "${initdir}"/var/lib/dracut/hooks + + # symlink to old hooks location for compatibility + ln_r /var/lib/dracut/hooks /lib/dracut/hooks + for _d in $hookdirs shutdown shutdown-emergency; do mkdir -m 0755 -p "${initdir}"/lib/dracut/hooks/"$_d" done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.563.g4900899a/src/install/dracut-install.c new/dracut-059+suse.581.g19b7c06c/src/install/dracut-install.c --- old/dracut-059+suse.563.g4900899a/src/install/dracut-install.c 2024-04-16 15:33:54.000000000 +0200 +++ new/dracut-059+suse.581.g19b7c06c/src/install/dracut-install.c 2024-04-26 08:18:04.000000000 +0200 @@ -356,23 +356,23 @@ char *q, *clibdir; int r, ret = 0; - p = strdup(lib); - - r = dracut_install(p, p, false, false, true); + r = dracut_install(lib, lib, false, false, true); if (r != 0) - log_error("ERROR: failed to install '%s' for '%s'", p, src); + log_error("ERROR: failed to install '%s' for '%s'", lib, src); else - log_debug("Lib install: '%s'", p); + log_debug("Lib install: '%s'", lib); ret += r; /* also install lib.so for lib.so.* files */ - q = strstr(p, ".so."); + q = strstr(lib, ".so."); if (q) { - q[3] = '\0'; + p = strndup(lib, q - lib + 3); /* ignore errors for base lib symlink */ if (dracut_install(p, p, false, false, true) == 0) log_debug("Lib install: '%s'", p); + + free(p); } /* Also try to install the same library from one directory above @@ -384,7 +384,6 @@ libc.so.6 (libc6,64bit, OS ABI: Linux 2.6.32) => /lib64/libc.so.6 */ - free(p); p = strdup(lib); pdir = dirname_malloc(p); @@ -634,14 +633,9 @@ /* Install ".<filename>.hmac" file for FIPS self-checks */ static int hmac_install(const char *src, const char *dst, const char *hmacpath) { - _cleanup_free_ char *srcpath = strdup(src); - _cleanup_free_ char *dstpath = strdup(dst); _cleanup_free_ char *srchmacname = NULL; _cleanup_free_ char *dsthmacname = NULL; - if (!(srcpath && dstpath)) - return -ENOMEM; - size_t dlen = dir_len(src); if (endswith(src, ".hmac")) @@ -654,16 +648,14 @@ hmac_install(src, dst, "/lib64/hmaccalc"); } - srcpath[dlen] = '\0'; - dstpath[dir_len(dst)] = '\0'; if (hmacpath) { _asprintf(&srchmacname, "%s/%s.hmac", hmacpath, &src[dlen + 1]); _asprintf(&dsthmacname, "%s/%s.hmac", hmacpath, &src[dlen + 1]); } else { - _asprintf(&srchmacname, "%s/.%s.hmac", srcpath, &src[dlen + 1]); - _asprintf(&dsthmacname, "%s/.%s.hmac", dstpath, &src[dlen + 1]); + _asprintf(&srchmacname, "%.*s/.%s.hmac", (int)dlen, src, &src[dlen + 1]); + _asprintf(&dsthmacname, "%.*s/.%s.hmac", (int)dir_len(dst), dst, &src[dlen + 1]); } - log_debug("hmac cp '%s' '%s')", srchmacname, dsthmacname); + log_debug("hmac cp '%s' '%s'", srchmacname, dsthmacname); dracut_install(srchmacname, dsthmacname, false, false, true); return 0; } @@ -727,11 +719,11 @@ return 1; } } else if (errno != ENOENT) { - log_error("ERROR: stat '%s': %s", parent, strerror(errno)); + log_error("ERROR: stat '%s': %m", parent); return 1; } else { if (mkdir(parent, 0755) < 0) { - log_error("ERROR: mkdir '%s': %s", parent, strerror(errno)); + log_error("ERROR: mkdir '%s': %m", parent); return 1; } } @@ -747,7 +739,7 @@ static int dracut_install(const char *orig_src, const char *orig_dst, bool isdir, bool resolvedeps, bool hashdst) { - struct stat sb, db; + struct stat sb; _cleanup_free_ char *fullsrcpath = NULL; _cleanup_free_ char *fulldstpath = NULL; _cleanup_free_ char *fulldstdir = NULL; @@ -757,25 +749,24 @@ mode_t src_mode = 0; bool dst_exists = true; char *i = NULL; - _cleanup_free_ char *src; - _cleanup_free_ char *dst; + const char *src, *dst; if (sysrootdirlen) { if (strncmp(orig_src, sysrootdir, sysrootdirlen) == 0) { - src = strdup(orig_src + sysrootdirlen); + src = orig_src + sysrootdirlen; fullsrcpath = strdup(orig_src); } else { - src = strdup(orig_src); + src = orig_src; _asprintf(&fullsrcpath, "%s%s", sysrootdir, src); } if (strncmp(orig_dst, sysrootdir, sysrootdirlen) == 0) - dst = strdup(orig_dst + sysrootdirlen); + dst = orig_dst + sysrootdirlen; else - dst = strdup(orig_dst); + dst = orig_dst; } else { - src = strdup(orig_src); + src = orig_src; fullsrcpath = strdup(src); - dst = strdup(orig_dst); + dst = orig_dst; } log_debug("dracut_install('%s', '%s', %d, %d, %d)", src, dst, isdir, resolvedeps, hashdst); @@ -831,7 +822,7 @@ return 1; } - ret = stat(fulldstdir, &db); + ret = access(fulldstdir, F_OK); if (ret < 0) { _cleanup_free_ char *dname = NULL; @@ -891,12 +882,12 @@ return 1; } - if (lstat(abspath, &sb) != 0) { + if (faccessat(AT_FDCWD, abspath, F_OK, AT_SYMLINK_NOFOLLOW) != 0) { log_debug("lstat '%s': %m", abspath); return 1; } - if (lstat(fulldstpath, &sb) != 0) { + if (faccessat(AT_FDCWD, fulldstpath, F_OK, AT_SYMLINK_NOFOLLOW) != 0) { _cleanup_free_ char *absdestpath = NULL; _asprintf(&absdestpath, "%s/%s", destrootdir, @@ -941,7 +932,8 @@ if (!i) return -ENOMEM; - hashmap_put(items, i, i); + if (hashmap_put(items, i, i) < 0) + free(i); if (logfile_f) dracut_log_cp(src); @@ -1093,10 +1085,10 @@ arg_module = true; break; case 'D': - destrootdir = strdup(optarg); + destrootdir = optarg; break; case 'r': - sysrootdir = strdup(optarg); + sysrootdir = optarg; sysrootdirlen = strlen(sysrootdir); break; case 'p': @@ -1135,10 +1127,10 @@ arg_mod_filter_noname = true; break; case 'L': - logdir = strdup(optarg); + logdir = optarg; break; case ARG_KERNELDIR: - kerneldir = strdup(optarg); + kerneldir = optarg; break; case ARG_FIRMWAREDIRS: firmwaredirs = strv_split(optarg, ":"); @@ -1250,7 +1242,6 @@ char *newsrc = NULL; STRV_FOREACH(q, pathdirs) { - struct stat sb; char *fullsrcpath; _asprintf(&newsrc, "%s/%s", *q, src); @@ -1263,8 +1254,8 @@ continue; } - if (lstat(fullsrcpath, &sb) != 0) { - log_debug("stat(%s) != 0", fullsrcpath); + if (faccessat(AT_FDCWD, fullsrcpath, F_OK, AT_SYMLINK_NOFOLLOW) != 0) { + log_debug("lstat(%s) != 0", fullsrcpath); free(newsrc); newsrc = NULL; free(fullsrcpath); @@ -1347,8 +1338,7 @@ } else { if (strchr(argv[i], '*') == NULL) { - _cleanup_free_ char *dest = strdup(argv[i]); - ret = dracut_install(argv[i], dest, arg_createdir, arg_resolvedeps, true); + ret = dracut_install(argv[i], argv[i], arg_createdir, arg_resolvedeps, true); } else { _cleanup_free_ char *realsrc = NULL; _cleanup_globfree_ glob_t globbuf; @@ -1360,11 +1350,9 @@ size_t j; for (j = 0; j < globbuf.gl_pathc; j++) { - char *dest = strdup(globbuf.gl_pathv[j] + sysrootdirlen); - ret |= - dracut_install(globbuf.gl_pathv[j] + sysrootdirlen, dest, - arg_createdir, arg_resolvedeps, true); - free(dest); + ret |= dracut_install(globbuf.gl_pathv[j] + sysrootdirlen, + globbuf.gl_pathv[j] + sysrootdirlen, + arg_createdir, arg_resolvedeps, true); } } } @@ -1382,9 +1370,8 @@ { const char *fw = fwpath; _cleanup_free_ char *fwpath_compressed = NULL; - struct stat sb; int ret; - if (stat(fwpath, &sb) != 0) { + if (access(fwpath, F_OK) != 0) { _asprintf(&fwpath_compressed, "%s.zst", fwpath); if (access(fwpath_compressed, F_OK) != 0) { strcpy(fwpath_compressed + strlen(fwpath) + 1, "xz"); @@ -1427,12 +1414,11 @@ ret = -1; STRV_FOREACH(q, firmwaredirs) { _cleanup_free_ char *fwpath = NULL; - struct stat sb; _asprintf(&fwpath, "%s/%s", *q, value); - if ((strstr(value, "*") != 0 || strstr(value, "?") != 0 || strstr(value, "[") != 0) - && stat(fwpath, &sb) != 0) { + if (strpbrk(value, "*?[") != NULL + && access(fwpath, F_OK) != 0) { size_t i; _cleanup_globfree_ glob_t globbuf; @@ -1719,7 +1705,8 @@ struct kmod_module *mod = kmod_module_get_module(l); char *name = strdup(kmod_module_get_name(mod)); kmod_module_unref(mod); - hashmap_put(modules_loaded, name, name); + if (hashmap_put(modules_loaded, name, name) < 0) + free(name); } } @@ -1734,8 +1721,11 @@ struct kmod_module *mod = kmod_module_get_module(itr); char *name = strdup(kmod_module_get_name(mod)); - hashmap_put(modules_loaded, name, name); kmod_module_unref(mod); + if (hashmap_put(modules_loaded, name, name) < 0) { + free(name); + continue; + } /* also put the modules from the new kernel in the hashmap, * which resolve the name as an alias, in case a kernel module is @@ -1749,8 +1739,9 @@ kmod_list_foreach(l, modlist) { mod = kmod_module_get_module(l); char *name = strdup(kmod_module_get_name(mod)); - hashmap_put(modules_loaded, name, name); kmod_module_unref(mod); + if (hashmap_put(modules_loaded, name, name) < 0) + free(name); } } kmod_module_unref_list(loaded_list); @@ -1804,7 +1795,8 @@ log_debug("Adding module '%s' to hostonly module list", name); dupname = strdup(name); - hashmap_put(modules_loaded, dupname, dupname); + if (hashmap_put(modules_loaded, dupname, dupname) < 0) + free(dupname); } } } @@ -2042,7 +2034,8 @@ HASHMAP_FOREACH(name, modules_loaded, i) { printf("%s\n", name); } - exit(0); + r = EXIT_SUCCESS; + goto finish2; } log_debug("Program arguments:"); @@ -2079,7 +2072,6 @@ log_error("Environment DESTROOTDIR or argument -D is not set!"); usage(EXIT_FAILURE); } - destrootdir = strdup(destrootdir); } if (strcmp(destrootdir, "/") == 0) { @@ -2088,13 +2080,11 @@ } i = destrootdir; - destrootdir = realpath(destrootdir, NULL); - if (!destrootdir) { + if (!(destrootdir = realpath(i, NULL))) { log_error("Environment DESTROOTDIR or argument -D is set to '%s': %m", i); r = EXIT_FAILURE; - goto finish; + goto finish2; } - free(i); items = hashmap_new(string_hash_func, string_compare_func); items_failed = hashmap_new(string_hash_func, string_compare_func); @@ -2102,7 +2092,7 @@ if (!items || !items_failed || !modules_loaded) { log_error("Out of memory"); r = EXIT_FAILURE; - goto finish; + goto finish1; } if (logdir) { @@ -2112,7 +2102,7 @@ if (logfile_f == NULL) { log_error("Could not open %s for logging: %m", logfile); r = EXIT_FAILURE; - goto finish; + goto finish1; } } @@ -2145,7 +2135,9 @@ if (arg_optional) r = EXIT_SUCCESS; -finish: +finish1: + free(destrootdir); +finish2: if (logfile_f) fclose(logfile_f); @@ -2162,7 +2154,17 @@ hashmap_free(items_failed); hashmap_free(modules_loaded); - free(destrootdir); + if (arg_mod_filter_path) + regfree(&mod_filter_path); + if (arg_mod_filter_nopath) + regfree(&mod_filter_nopath); + if (arg_mod_filter_symbol) + regfree(&mod_filter_symbol); + if (arg_mod_filter_nosymbol) + regfree(&mod_filter_nosymbol); + if (arg_mod_filter_noname) + regfree(&mod_filter_noname); + strv_free(firmwaredirs); strv_free(pathdirs); return r; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.563.g4900899a/src/install/hashmap.lo new/dracut-059+suse.581.g19b7c06c/src/install/hashmap.lo --- old/dracut-059+suse.563.g4900899a/src/install/hashmap.lo 2024-04-16 15:33:54.000000000 +0200 +++ new/dracut-059+suse.581.g19b7c06c/src/install/hashmap.lo 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -# src/shared/hashmap.lo - a libtool object file -# Generated by libtool (GNU libtool) 2.4.2 -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# Name of the PIC object. -pic_object='.libs/hashmap.o' - -# Name of the non-PIC object -non_pic_object='hashmap.o' - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.563.g4900899a/src/util/util.c new/dracut-059+suse.581.g19b7c06c/src/util/util.c --- old/dracut-059+suse.563.g4900899a/src/util/util.c 2024-04-16 15:33:54.000000000 +0200 +++ new/dracut-059+suse.581.g19b7c06c/src/util/util.c 2024-04-26 08:18:04.000000000 +0200 @@ -2,10 +2,11 @@ // Parts are copied from the linux kernel +#include <errno.h> +#include <stdbool.h> #include <stdio.h> -#include <string.h> #include <stdlib.h> -#include <stdbool.h> +#include <string.h> // CODE FROM LINUX KERNEL START @@ -56,6 +57,13 @@ return (char *)str; } +#define _cleanup_(x) __attribute__((cleanup(x))) +static inline void freep(void *p) +{ + free(*(void **)p); +} +#define _cleanup_free_ _cleanup_(freep) + /* * Parse a string to get a param value pair. * You can use " around spaces, but can't escape ". @@ -179,17 +187,20 @@ char *search_value; char *end_value = NULL; bool bool_value = false; - char *cmdline = NULL; + _cleanup_free_ char *cmdline = NULL; + char *args = NULL; + + if (argc != 2) { + usage(GETARG, EXIT_FAILURE, "Number of arguments invalid"); + } char *p = getenv("CMDLINE"); if (p == NULL) { usage(GETARG, EXIT_FAILURE, "CMDLINE env not set"); } cmdline = strdup(p); - - if (argc != 2) { - usage(GETARG, EXIT_FAILURE, "Number of arguments invalid"); - } + if (!cmdline) + return -ENOMEM; search_key = argv[1]; @@ -204,9 +215,10 @@ if (strlen(search_key) == 0) usage(GETARG, EXIT_FAILURE, "search key undefined"); + args = cmdline; do { char *key = NULL, *value = NULL; - cmdline = next_arg(cmdline, &key, &value); + args = next_arg(args, &key, &value); if (strcmp(key, search_key) == 0) { if (value) { end_value = value; @@ -216,7 +228,7 @@ bool_value = true; } } - } while (cmdline[0]); + } while (args[0]); if (search_value) { if (end_value && strcmp(end_value, search_value) == 0) { @@ -243,17 +255,20 @@ char *search_key; char *search_value; bool found_value = false; - char *cmdline = NULL; + _cleanup_free_ char *cmdline = NULL; + char *args = NULL; + + if (argc != 2) { + usage(GETARGS, EXIT_FAILURE, "Number of arguments invalid"); + } char *p = getenv("CMDLINE"); if (p == NULL) { usage(GETARGS, EXIT_FAILURE, "CMDLINE env not set"); } cmdline = strdup(p); - - if (argc != 2) { - usage(GETARGS, EXIT_FAILURE, "Number of arguments invalid"); - } + if (!cmdline) + return -ENOMEM; search_key = argv[1]; @@ -268,9 +283,10 @@ if (strlen(search_key) == 0) usage(GETARGS, EXIT_FAILURE, "search key undefined"); + args = cmdline; do { char *key = NULL, *value = NULL; - cmdline = next_arg(cmdline, &key, &value); + args = next_arg(args, &key, &value); if (strcmp(key, search_key) == 0) { if (search_value) { if (value && strcmp(value, search_value) == 0) { @@ -286,7 +302,7 @@ found_value = true; } } - } while (cmdline[0]); + } while (args[0]); return found_value ? EXIT_SUCCESS : EXIT_FAILURE; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.563.g4900899a/suse/README.susemaint new/dracut-059+suse.581.g19b7c06c/suse/README.susemaint --- old/dracut-059+suse.563.g4900899a/suse/README.susemaint 2024-04-16 15:33:54.000000000 +0200 +++ new/dracut-059+suse.581.g19b7c06c/suse/README.susemaint 2024-04-26 08:18:04.000000000 +0200 @@ -89,8 +89,9 @@ the upgrade to dracut-059 (0aa08f0e docs: update NEWS.md and AUTHORS), extracted using `git log --oneline 0aa08f0e..HEAD`: +MERGED 5d2bda46 fix(zfcp_rules): correct shellcheck regression when parsing ccw args 4980bad3 fix(configure): misleading error if C compiler is not installed - de8ac630 fix(github): update format of labeler +MERGED de8ac630 fix(github): update format of labeler MERGED 4971f443 fix(systemd-journald): add systemd-sysusers dependency MERGED 4d594210 fix(dracut-initramfs-restore.sh): do not set selinux labels if disabled MERGED 1586af09 fix(systemd-repart): correct undefined $libdir @@ -295,13 +296,13 @@ MERGED 93339444 fix(dmsquash-live): live:/dev/* MERGED 10cf8e46 fix(load_fstype): avoid false positive searchs MERGED 08b63a25 fix: shellcheck 0.8.0 - 94dcac7c refactor(dracut-install): strerror(errno) -> %m - efd4ca27 perf(dracut-install): don't strdup() environment block - 77226cb4 perf(dracut-install): don't reallocate {src,dst}path in hmac_install() - a20556f0 perf(dracut-install): don't strdup() excessively for dracut_install() - e7ed8337 perf(dracut-install): stat() w/unused buf -> access(F_OK) in dracut-install - 751a110f perf(dracut-install): multiple single-character strstr()s -> strpbrk() - 1e5237dd chore: remove src/install/hashmap.lo +MERGED 94dcac7c refactor(dracut-install): strerror(errno) -> %m +MERGED efd4ca27 perf(dracut-install): don't strdup() environment block +MERGED 77226cb4 perf(dracut-install): don't reallocate {src,dst}path in hmac_install() +MERGED a20556f0 perf(dracut-install): don't strdup() excessively for dracut_install() +MERGED e7ed8337 perf(dracut-install): stat() w/unused buf -> access(F_OK) in dracut-install +MERGED 751a110f perf(dracut-install): multiple single-character strstr()s -> strpbrk() +MERGED 1e5237dd chore: remove src/install/hashmap.lo MERGED 9dbbebb1 feat(network-wicked): remove module @@ -325,10 +326,15 @@ 2557 feat(kernel-modules): install SPMI modules on ARM/RISC-V 2559 feat(install.d): add sort-key field to rescue BLS entries 2560 feat(resume): do not attempt to install systemd-hibernate-resume@.service +2571 fix(dracut-install): memory leak in `--modalias` option +2573 fix(dracut-install): release memory allocated for regular expressions +2574 fix(dracut-install): memory leak in two `hashmap_put` calls if key exists 2593 fix(dracut.sh): do not add device if find_block_device returns an error 2593 feat(dracut.sh): protect push_host_devs function +2601 feat(tpm2-tss): add tpm2.target and systemd-tpm2-generator 2607 fix(dracut-util): do not call strcmp if the value argument is NULL 2607 fix(dracut): correct regression with multiple `rd.break=` options +2608 fix(dracut-util): avoid memory leak 2611 fix(livenet): propagate error code 2611 fix(livenet): check also `content-length` from live image header 2611 fix(livenet): split `imgsize` calculation to avoid misleading error message @@ -336,5 +342,12 @@ 2614 fix(dracut-systemd): replace `rd.udev.log-priority` with `rd.udev.log_level` 2618 fix(i18n): handle keymap includes with `--sysroot` 2618 fix(dracut-init.sh): handle decompress with `--sysroot` -2630 fix(zfcp_rules): correct shellcheck regression when parsing ccw args +2623 fix(dracut-lib): only remove initqueue/finished scripts, not the hook dir +2643 fix(systemd): explicitly install some libs that will not be statically included + + +3. Commits from the new https://github.com/dracut-ng/dracut-ng upstream that +were already merged + +a45048b8 fix(dracut): move hooks directory from /usr/lib to /var/lib ++++++ dracut.obsinfo ++++++ --- /var/tmp/diff_new_pack.1UdCA4/_old 2024-04-26 23:26:50.876020313 +0200 +++ /var/tmp/diff_new_pack.1UdCA4/_new 2024-04-26 23:26:50.880020460 +0200 @@ -1,5 +1,5 @@ name: dracut -version: 059+suse.563.g4900899a -mtime: 1713274434 -commit: 4900899a25993aaf999e2f24e4b19d124e335cff +version: 059+suse.581.g19b7c06c +mtime: 1714112284 +commit: 19b7c06cbf2d96befb9ba0fb24c482a0da40dcef

1 0