May 2024 - openSUSE Commits - openSUSE Mailing Lists

commit yt-dlp for openSUSE:Factory
by Source-Sync 28 May '24

28 May '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package yt-dlp for openSUSE:Factory checked in at 2024-05-28 17:29:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yt-dlp (Old) and /work/SRC/openSUSE:Factory/.yt-dlp.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yt-dlp" Tue May 28 17:29:05 2024 rev:39 rq:1177277 version:2024.05.27 Changes: -------- --- /work/SRC/openSUSE:Factory/yt-dlp/yt-dlp.changes 2024-04-10 17:50:14.068129316 +0200 +++ /work/SRC/openSUSE:Factory/.yt-dlp.new.24587/yt-dlp.changes 2024-05-28 17:30:02.138678732 +0200 @@ -1,0 +2,14 @@ +Tue May 28 06:39:46 UTC 2024 - Jan Engelhardt <jengelh(a)inai.de> + +- Update to release 2024.05.27 + * Fix parsing of base URL in SMIL manifest + +------------------------------------------------------------------- +Mon May 27 06:23:09 UTC 2024 - Jan Engelhardt <jengelh(a)inai.de> + +- Update to release 2024.05.26 + * Better warning when requested subs format not found + * Warn if lack of installed ffmpeg alters format selection + * youtube: Add mediaconnect client + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yt-dlp.spec ++++++ --- /var/tmp/diff_new_pack.YS29No/_old 2024-05-28 17:30:03.118714569 +0200 +++ /var/tmp/diff_new_pack.YS29No/_new 2024-05-28 17:30:03.118714569 +0200 @@ -21,7 +21,7 @@ %define skip_python37 1 %{?sle15_python_module_pythons} Name: yt-dlp -Version: 2024.04.09 +Version: 2024.05.27 Release: 0 Summary: Enhanced fork of youtube-dl, a video site downloader for offline watching License: CC-BY-SA-3.0 AND SUSE-Public-Domain ++++++ yt-dlp.tar.gz ++++++ ++++ 27957 lines of diff (skipped)

1 0

commit python-plotly for openSUSE:Factory
by Source-Sync 28 May '24

28 May '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-plotly for openSUSE:Factory checked in at 2024-05-28 17:29:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-plotly (Old) and /work/SRC/openSUSE:Factory/.python-plotly.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-plotly" Tue May 28 17:29:00 2024 rev:40 rq:1177151 version:5.22.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-plotly/python-plotly.changes 2024-03-11 15:42:56.586331643 +0100 +++ /work/SRC/openSUSE:Factory/.python-plotly.new.24587/python-plotly.changes 2024-05-28 17:29:59.574584971 +0200 @@ -1,0 +2,97 @@ +Thu May 23 18:43:23 UTC 2024 - Ben Greiner <code(a)bnavigator.de> + +- Update to 5.22.0 + * Updated Plotly.js from version 2.31.1 to version 2.32.0. See + the plotly.js CHANGELOG for more information. These changes are + reflected in the auto-generated plotly.graph_objects module. + Notable changes include: + * Add "bold" weight, "italic" style and "small-caps" variant + options to fonts [#6956] + * Fix applying autotickangles on axes with showdividers as well + as cases where tickson is set to "boundaries" [#6967], with + thanks to @my-tien for the contribution! + * Fix positioning of multi-line axis titles with standoff + [#6970], with thanks to @my-tien for the contribution! +- Release 5.21.0 + * Updated Plotly.js from version 2.30.0 to version 2.31.1. See + the plotly.js CHANGELOG for more information. These changes are + reflected in the auto-generated plotly.graph_objects module. + Notable changes include: + * Add zorder attribute to various cartesian traces for + controlling stacking order of SVG traces drawn into a subplot + [#6918, #6953], This feature was anonymously sponsored: thank + you to our sponsor! + * Add "between" option to shape layer for placing them above grid + lines and below traces [#6927], with thanks to @my-tien for the + contribution! + * Add "raw" sizemode to cone trace [#6938] + * Add layout.hoversubplots to enable hover effects across + multiple cartesian suplots sharing one axis [#6947, #6950] + * Fixed orjson loading issue [#4562] +- Release 5.20.0 + * Updated Plotly.js from version 2.29.1 to version 2.30.0. See + the plotly.js CHANGELOG for more information. These changes are + reflected in the auto-generated plotly.graph_objects module. + Notable changes include: + * Add fill gradients for scatter traces [#6905], with thanks to + @lumip for the contribution! + * Add indentation to legend [#6874], with thanks to @my-tien for + the contribution! +- Release 5.19.0 + * Updated Plotly.js from version 2.27.0 to version 2.29.1. See + the plotly.js CHANGELOG for more information. These changes are + reflected in the auto-generated plotly.graph_objects module. + Notable changes include: + * Add layout.barcornerradius and trace.marker.cornerradius + properties to support rounding the corners of bar traces + [#6761], with thanks to Displayr for sponsoring development! + * Add autotickangles to cartesian and radial axes [#6790], with + thanks to @my-tien for the contribution! + * Add align option to sankey nodes to control horizontal + alignment [#6800], with thanks to @adamreeve for the + contribution! + * Add the possibility of loading "virtual-webgl" script for WebGL + 1 to help display several WebGL contexts on a page [#6784], + with thanks to @greggman for the contribution! + * Add options to use base64 encoding (bdata) and shape (for 2 + dimensional arrays) to declare various typed arrays i.e. + dtype=(float64|float32|int32|int16|int8|uint32|uint16|uint8) + [#5230] + * Adjust stamen styles to point to stadiamaps.com, the users may + also need to provide their own API_KEY via + config.mapboxAccessToken [#6776, #6778] + * Removed Python 3.6 and Python 3.7 support [#4492] + * Ensure scatter mode is deterministic from px [#4429] + * Fix issue with creating dendrogram in subplots [#4411], + * Fix issue with px.line not accepting "spline" line shape + [#2812] + * Fix KeyError when using column of pd.Categorical dtype with + unobserved categories [#4437] + * Fix dataframe interchange in case column_names returns an + unmaterialized object: generator, iterator, etc. [#4442] + * Fix issue with FutureWarning being displayed when setting the + color argument in plotly.express [#4519] +- Release 5.18.0 + * Updated Plotly.js from version 2.26.0 to version 2.27.0. See + the plotly.js CHANGELOG for more information. These changes are + reflected in the auto-generated plotly.graph_objects module. + Notable changes include: + * Add insiderange to cartesian axes to help avoid overlap between + visible grid lines and tick labels of the counter axis when + they are positioned inside [#6735], this feature was + anonymously sponsored: thank you to our sponsor! + * Fix column order changes on hover [#6718], with thanks to + @bhavinpatel1109 for the contribution! + * Fix hover at timestamp '1970-01-01 00:00:00' [#6752], with + thanks to @adamjhawley for the contribution! + * Fix clearing empty candlestick using react [#6757] + * Repair crash on Matplotlib 3.8 related to get_offset_position + [#4372], + * Handle deprecation of pandas.Series.dt.to_pydatetime() calls + and suppress the FutureWarning they currently emit. [#4379] +- boo#1224382, CVE-2024-4067 bogus CVE from overeager + pseudo-security researchers. Ignore it. Neither micromatch nor + braces is used in plotly runtime, it's pulled in by eslint for + development only. + +------------------------------------------------------------------- Old: ---- plotly-5.17.0.tar.gz plotly.py-5.17.0-gh.tar.gz New: ---- plotly-5.22.0.tar.gz plotly.py-5.22.0-gh.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-plotly.spec ++++++ --- /var/tmp/diff_new_pack.4T6wzt/_old 2024-05-28 17:30:00.666624903 +0200 +++ /var/tmp/diff_new_pack.4T6wzt/_new 2024-05-28 17:30:00.666624903 +0200 @@ -16,14 +16,13 @@ # -%define skip_python39 1 Name: python-plotly -Version: 5.17.0 +Version: 5.22.0 Release: 0 Summary: Library for collaborative, interactive, publication-quality graphs License: MIT URL: https://github.com/plotly/plotly.py -# Get the PyPI archive for the bundles JS files +# Get the PyPI archive for the bundled JS files Source: https://files.pythonhosted.org/packages/source/p/plotly/plotly-%{version}.t… # Additionally use the GitHub archive for the test suite Source1: https://github.com/plotly/plotly.py/archive/refs/tags/v%{version}.tar.gz#/p… ++++++ plotly-5.17.0.tar.gz -> plotly-5.22.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/python-plotly/plotly-5.17.0.tar.gz /work/SRC/openSUSE:Factory/.python-plotly.new.24587/plotly-5.22.0.tar.gz differ: char 5, line 1 ++++++ plotly.py-5.17.0-gh.tar.gz -> plotly.py-5.22.0-gh.tar.gz ++++++ /work/SRC/openSUSE:Factory/python-plotly/plotly.py-5.17.0-gh.tar.gz /work/SRC/openSUSE:Factory/.python-plotly.new.24587/plotly.py-5.22.0-gh.tar.gz differ: char 13, line 1

1 0

commit kup-backup for openSUSE:Factory
by Source-Sync 28 May '24

28 May '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kup-backup for openSUSE:Factory checked in at 2024-05-28 17:28:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kup-backup (Old) and /work/SRC/openSUSE:Factory/.kup-backup.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kup-backup" Tue May 28 17:28:58 2024 rev:4 rq:1177140 version:0.10.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kup-backup/kup-backup.changes 2022-10-12 18:26:13.997893484 +0200 +++ /work/SRC/openSUSE:Factory/.kup-backup.new.24587/kup-backup.changes 2024-05-28 17:29:57.398505399 +0200 @@ -1,0 +2,6 @@ +Mon May 27 12:53:44 UTC 2024 - Christophe Marin <christophe(a)krop.fr> + +- Update to 0.10.0 (boo#1221521) + * Port to KF6 and Qt6 + +------------------------------------------------------------------- Old: ---- kup-0.9.1.tar.xz kup-0.9.1.tar.xz.sig New: ---- kup-0.10.0.tar.xz kup-0.10.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kup-backup.spec ++++++ --- /var/tmp/diff_new_pack.ZTzyPX/_old 2024-05-28 17:29:58.106531290 +0200 +++ /var/tmp/diff_new_pack.ZTzyPX/_new 2024-05-28 17:29:58.110531436 +0200 @@ -1,7 +1,7 @@ # # spec file for package kup-backup # -# Copyright (c) 2021 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 @@ -16,35 +16,42 @@ # +%define kf6_version 6.1.0 +%define qt6_version 6.6.0 + %define rname kup -%bcond_without lang +%bcond_without released Name: kup-backup -Version: 0.9.1 +Version: 0.10.0 Release: 0 Summary: Backup scheduler for the Plasma desktop -License: GPL-2.0-only AND GPL-3.0-only -Group: System/GUI/KDE +License: GPL-3.0-or-later URL: https://apps.kde.org/kup/ Source0: https://download.kde.org/stable/%{rname}/%{rname}-%{version}.tar.xz -%if %{with lang} +%if %{with released} Source1: https://download.kde.org/stable/%{rname}/%{rname}-%{version}.tar.xz.sig -Source2: %{rname}.keyring +Source2: kup.keyring %endif -BuildRequires: extra-cmake-modules -BuildRequires: libgit2-devel -BuildRequires: cmake(KF5Config) -BuildRequires: cmake(KF5CoreAddons) -BuildRequires: cmake(KF5DBusAddons) -BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(KF5IdleTime) -BuildRequires: cmake(KF5Init) -BuildRequires: cmake(KF5JobWidgets) -BuildRequires: cmake(KF5KIO) -BuildRequires: cmake(KF5Notifications) -BuildRequires: cmake(KF5Plasma) -BuildRequires: cmake(KF5Solid) -BuildRequires: cmake(KF5WidgetsAddons) -BuildRequires: cmake(Qt5Widgets) >= 5.11.0 +BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} +BuildRequires: pkgconfig +BuildRequires: cmake(KF6Config) >= %{kf6_version} +BuildRequires: cmake(KF6CoreAddons) >= %{kf6_version} +BuildRequires: cmake(KF6DBusAddons) >= %{kf6_version} +BuildRequires: cmake(KF6I18n) >= %{kf6_version} +BuildRequires: cmake(KF6IdleTime) >= %{kf6_version} +BuildRequires: cmake(KF6JobWidgets) >= %{kf6_version} +BuildRequires: cmake(KF6KCMUtils) >= %{kf6_version} +BuildRequires: cmake(KF6KIO) >= %{kf6_version} +BuildRequires: cmake(KF6Notifications) >= %{kf6_version} +BuildRequires: cmake(KF6Solid) >= %{kf6_version} +BuildRequires: cmake(KF6WidgetsAddons) >= %{kf6_version} +BuildRequires: cmake(KF6XmlGui) >= %{kf6_version} +BuildRequires: cmake(Plasma) >= 6.0 +BuildRequires: cmake(Plasma5Support) >= 6.0 +BuildRequires: cmake(Qt6Core) >= %{qt6_version} +BuildRequires: cmake(Qt6Widgets) >= %{qt6_version} +BuildRequires: pkgconfig(libgit2) +Requires: systemsettings6 Recommends: bup Recommends: rsync @@ -65,35 +72,38 @@ %autosetup -p1 -n %{rname}-%{version} %build -%cmake_kf5 -d build -%cmake_build +%cmake_kf6 -DBUILD_WITH_QT6:BOOL=TRUE + +%kf6_build %install -%kf5_makeinstall -C build -%if %{with lang} -%find_lang %{rname} -%endif +%kf6_install + +%find_lang %{name} --all-name %files %license LICENSES/* %doc README.md -%{_kf5_appstreamdir}/*.xml -%{_kf5_bindir}/kup-daemon -%{_kf5_bindir}/kup-filedigger -%{_kf5_bindir}/kup-purger -%{_kf5_configdir}/autostart/kup-daemon.desktop -%{_kf5_debugdir}/kup.categories -%{_kf5_iconsdir}/hicolor/scalable/apps/kup.svg -%{_kf5_libdir}/libkdeinit5_kup-daemon.so -%{_kf5_notifydir}/kupdaemon.notifyrc -%{_kf5_plugindir}/kcm_kup.so -%{_kf5_plugindir}/kio_bup.so -%{_kf5_plugindir}/plasma/ -%{_kf5_sharedir}/plasma/ -%{_kf5_servicesdir} +%{_kf6_applicationsdir}/kcm_kup.desktop +%{_kf6_appstreamdir}/org.kde.kup.appdata.xml +%{_kf6_appstreamdir}/org.kde.kupapplet.appdata.xml +%{_kf6_bindir}/kup-daemon +%{_kf6_bindir}/kup-filedigger +%{_kf6_bindir}/kup-purger +%{_kf6_configdir}/autostart/kup-daemon.desktop +%{_kf6_debugdir}/kup.categories +%{_kf6_iconsdir}/hicolor/scalable/apps/kup.svg +%{_kf6_notificationsdir}/kupdaemon.notifyrc +%{_kf6_plasmadir}/plasmoids/org.kde.kupapplet/ +%{_kf6_plugindir}/kf6/kio/kio_bup.so +%{_kf6_plugindir}/plasma/kcms/systemsettings_qwidgets/kcm_kup.so +%{_kf6_plugindir}/plasma5support +%dir %{_kf6_plugindir}/plasma5support/dataengine +%{_kf6_plugindir}/plasma5support/dataengine/plasma_engine_kup.so +%dir %{_kf6_sharedir}/plasma5support +%dir %{_kf6_sharedir}/plasma5support/services +%{_kf6_sharedir}/plasma5support/services/kupdaemonservice.operations +%{_kf6_sharedir}/plasma5support/services/kupservice.operations -%if %{with lang} -%files lang -f %{rname}.lang -%license LICENSES/* -%endif +%files lang -f %{name}.lang ++++++ kup-0.9.1.tar.xz -> kup-0.10.0.tar.xz ++++++ ++++ 71468 lines of diff (skipped)

1 0

commit ghc-these for openSUSE:Factory
by Source-Sync 28 May '24

28 May '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-these for openSUSE:Factory checked in at 2024-05-28 17:28:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-these (Old) and /work/SRC/openSUSE:Factory/.ghc-these.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-these" Tue May 28 17:28:57 2024 rev:14 rq:1177138 version:1.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-these/ghc-these.changes 2023-11-23 21:43:08.396998058 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-these.new.24587/ghc-these.changes 2024-05-28 17:29:56.174460641 +0200 @@ -1,0 +2,8 @@ +Thu May 16 19:49:16 UTC 2024 - Peter Simons <psimons(a)suse.com> + +- Update these to version 1.2.1. + # 1.2.1 + + - Support GHC-8.6.5...GHC-9.10.1 + +------------------------------------------------------------------- Old: ---- these-1.2.tar.gz these.cabal New: ---- these-1.2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-these.spec ++++++ --- /var/tmp/diff_new_pack.VKtZ2a/_old 2024-05-28 17:29:56.790483165 +0200 +++ /var/tmp/diff_new_pack.VKtZ2a/_new 2024-05-28 17:29:56.794483312 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-these # -# 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 @@ -19,13 +19,12 @@ %global pkg_name these %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 1.2 +Version: 1.2.1 Release: 0 Summary: An either-or-both data type 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-assoc-devel BuildRequires: ghc-assoc-prof @@ -90,7 +89,6 @@ %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ these-1.2.tar.gz -> these-1.2.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/these-1.2/CHANGELOG.md new/these-1.2.1/CHANGELOG.md --- old/these-1.2/CHANGELOG.md 2001-09-09 03:46:40.000000000 +0200 +++ new/these-1.2.1/CHANGELOG.md 2001-09-09 03:46:40.000000000 +0200 @@ -1,3 +1,7 @@ +# 1.2.1 + +- Support GHC-8.6.5...GHC-9.10.1 + # 1.2 - Depend on `bifunctor-classes-compat` instead of `bifunctors` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/these-1.2/src/Data/Functor/These.hs new/these-1.2.1/src/Data/Functor/These.hs --- old/these-1.2/src/Data/Functor/These.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/these-1.2.1/src/Data/Functor/These.hs 2001-09-09 03:46:40.000000000 +0200 @@ -1,4 +1,3 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveFoldable #-} {-# LANGUAGE DeriveFunctor #-} @@ -7,18 +6,6 @@ {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE Safe #-} - -#if MIN_VERSION_base(4,9,0) -#define LIFTED_FUNCTOR_CLASSES 1 -#else -#if MIN_VERSION_transformers (0,5,0) -#define LIFTED_FUNCTOR_CLASSES 1 -#else -#if MIN_VERSION_transformers_compat(0,5,0) && !MIN_VERSION_transformers(0,4,0) -#define LIFTED_FUNCTOR_CLASSES 1 -#endif -#endif -#endif module Data.Functor.These ( These1 (..), ) where @@ -37,20 +24,12 @@ import qualified Data.Foldable as F import qualified Data.Foldable1 as F1 -#if MIN_VERSION_deepseq(1,4,3) import Control.DeepSeq (NFData (..), NFData1 (..)) -#else -import Control.DeepSeq (NFData (..)) -#endif -#if __GLASGOW_HASKELL__ >= 706 import GHC.Generics (Generic1) -#endif -#if __GLASGOW_HASKELL__ >= 708 import Data.Data (Data) import Data.Typeable (Typeable) -#endif ------------------------------------------------------------------------------- -- These1 @@ -60,21 +39,13 @@ = This1 (f a) | That1 (g a) | These1 (f a) (g a) - deriving (Functor, Foldable, Traversable, Generic -#if __GLASGOW_HASKELL__ >= 706 - , Generic1 -#endif -#if __GLASGOW_HASKELL__ >= 708 - , Typeable, Data -#endif - ) + deriving (Functor, Foldable, Traversable, Generic, Generic1, Typeable, Data) ------------------------------------------------------------------------------- -- Eq1 ------------------------------------------------------------------------------- instance (Eq1 f, Eq1 g) => Eq1 (These1 f g) where -#ifdef LIFTED_FUNCTOR_CLASSES liftEq eq (This1 f) (This1 f') = liftEq eq f f' liftEq eq (That1 g) (That1 g') = liftEq eq g g' liftEq eq (These1 f g) (These1 f' g') = liftEq eq f f' && liftEq eq g g' @@ -82,22 +53,12 @@ liftEq _ This1 {} _ = False liftEq _ That1 {} _ = False liftEq _ These1 {} _ = False -#else - eq1 (This1 f) (This1 f') = eq1 f f' - eq1 (That1 g) (That1 g') = eq1 g g' - eq1 (These1 f g) (These1 f' g') = eq1 f f' && eq1 g g' - - eq1 This1 {} _ = False - eq1 That1 {} _ = False - eq1 These1 {} _ = False -#endif ------------------------------------------------------------------------------- -- Ord1 ------------------------------------------------------------------------------- instance (Ord1 f, Ord1 g) => Ord1 (These1 f g) where -#ifdef LIFTED_FUNCTOR_CLASSES liftCompare cmp (This1 f) (This1 f') = liftCompare cmp f f' liftCompare _cmp (This1 _) _ = LT liftCompare _cmp _ (This1 _) = GT @@ -108,26 +69,12 @@ liftCompare cmp (These1 f g) (These1 f' g') = liftCompare cmp f f' `mappend` liftCompare cmp g g' -#else - compare1 (This1 f) (This1 f') = compare1 f f' - compare1 (This1 _) _ = LT - compare1 _ (This1 _) = GT - - compare1 (That1 g) (That1 g') = compare1 g g' - compare1 (That1 _) _ = LT - compare1 _ (That1 _) = GT - - compare1 (These1 f g) (These1 f' g') = - compare1 f f' `mappend` compare1 g g' -#endif - ------------------------------------------------------------------------------- -- Show1 ------------------------------------------------------------------------------- instance (Show1 f, Show1 g) => Show1 (These1 f g) where -#ifdef LIFTED_FUNCTOR_CLASSES liftShowsPrec sp sl d (This1 f) = showParen (d > 10) $ showString "This1 " . liftShowsPrec sp sl 11 f @@ -139,26 +86,12 @@ . liftShowsPrec sp sl 11 f . showChar ' ' . liftShowsPrec sp sl 11 g -#else - showsPrec1 d (This1 f) = showParen (d > 10) - $ showString "This1 " - . showsPrec1 11 f - showsPrec1 d (That1 g) = showParen (d > 10) - $ showString "That1 " - . showsPrec1 11 g - showsPrec1 d (These1 f g) = showParen (d > 10) - $ showString "These1 " - . showsPrec1 11 f - . showChar ' ' - . showsPrec1 11 g -#endif ------------------------------------------------------------------------------- -- Read1 ------------------------------------------------------------------------------- instance (Read1 f, Read1 g) => Read1 (These1 f g) where -#ifdef LIFTED_FUNCTOR_CLASSES liftReadsPrec rp rl d = readParen (d > 10) $ \s0 -> do (t, s1) <- lex s0 case t of @@ -173,22 +106,6 @@ (y, s3) <- liftReadsPrec rp rl 11 s2 return (These1 x y, s3) _ -> [] -#else - readsPrec1 d = readParen (d > 10) $ \s0 -> do - (t, s1) <- lex s0 - case t of - "This1" -> do - (x, s2) <- readsPrec1 11 s1 - return (This1 x, s2) - "That1" -> do - (y, s2) <- readsPrec1 11 s1 - return (That1 y, s2) - "These1" -> do - (x, s2) <- readsPrec1 11 s1 - (y, s3) <- readsPrec1 11 s2 - return (These1 x y, s3) - _ -> [] -#endif ------------------------------------------------------------------------------- -- Eq, Ord, Show, Read @@ -248,13 +165,11 @@ -- deepseq ------------------------------------------------------------------------------- -#if MIN_VERSION_deepseq(1,4,3) -- | This instance is available only with @deepseq >= 1.4.3.0@ instance (NFData1 f, NFData1 g) => NFData1 (These1 f g) where liftRnf r (This1 x) = liftRnf r x liftRnf r (That1 y) = liftRnf r y liftRnf r (These1 x y) = liftRnf r x `seq` liftRnf r y -#endif -- | Available always -- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/these-1.2/src/Data/These/Combinators.hs new/these-1.2.1/src/Data/These/Combinators.hs --- old/these-1.2/src/Data/These/Combinators.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/these-1.2.1/src/Data/These/Combinators.hs 2001-09-09 03:46:40.000000000 +0200 @@ -1,4 +1,3 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE Trustworthy #-} -- | This module provides -- @@ -87,10 +86,8 @@ import Data.These import Prelude (Bool (..), Maybe (..), curry, uncurry, (.)) -#ifdef MIN_VERSION_assoc import Data.Bifunctor.Assoc (assoc, unassoc) import Data.Bifunctor.Swap (swap) -#endif -- $setup -- >>> import Data.These @@ -127,13 +124,7 @@ -- -- @since 0.8 swapThese :: These a b -> These b a -#ifdef MIN_VERSION_assoc swapThese = swap -#else -swapThese (This a) = That a -swapThese (That b) = This b -swapThese (These a b) = These b a -#endif -- | 'These' is associative. -- @@ -144,33 +135,13 @@ -- -- @since 0.8 assocThese :: These (These a b) c -> These a (These b c) -#ifdef MIN_VERSION_assoc assocThese = assoc -#else -assocThese (This (This a)) = This a -assocThese (This (That b)) = That (This b) -assocThese (That c) = That (That c) -assocThese (These (That b) c) = That (These b c) -assocThese (This (These a b)) = These a (This b) -assocThese (These (This a) c) = These a (That c) -assocThese (These (These a b) c) = These a (These b c) -#endif -- | 'These' is associative. See 'assocThese'. -- -- @since 0.8 unassocThese :: These a (These b c) -> These (These a b) c -#ifdef MIN_VERSION_assoc unassocThese = unassoc -#else -unassocThese (This a) = This (This a) -unassocThese (That (This b)) = This (That b) -unassocThese (That (That c)) = That c -unassocThese (That (These b c)) = These (That b) c -unassocThese (These a (This b)) = This (These a b) -unassocThese (These a (That c)) = These (This a) c -unassocThese (These a (These b c)) = These (These a b) c -#endif ------------------------------------------------------------------------------- -- preview diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/these-1.2/src/Data/These.hs new/these-1.2.1/src/Data/These.hs --- old/these-1.2/src/Data/These.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/these-1.2.1/src/Data/These.hs 2001-09-09 03:46:40.000000000 +0200 @@ -1,22 +1,8 @@ -{-# LANGUAGE CPP #-} --- | The 'These' type and associated operations. Now enhanced with "Control.Lens" magic! +-- | The 'These' type and associated operations. {-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE Safe #-} - -#if MIN_VERSION_base(4,9,0) -#define LIFTED_FUNCTOR_CLASSES 1 -#else -#if MIN_VERSION_transformers(0,5,0) -#define LIFTED_FUNCTOR_CLASSES 1 -#else -#if MIN_VERSION_transformers_compat(0,5,0) && !MIN_VERSION_transformers(0,4,0) -#define LIFTED_FUNCTOR_CLASSES 1 -#endif -#endif -#endif - module Data.These ( These(..) @@ -41,48 +27,32 @@ ) where import Control.Applicative (Applicative (..), (<$>)) -import Control.DeepSeq (NFData (..)) +import Control.DeepSeq (NFData (..), NFData1 (..), NFData2 (..)) import Data.Bifoldable (Bifoldable (..)) import Data.Bifoldable1 (Bifoldable1 (..)) import Data.Bifunctor (Bifunctor (..)) +import Data.Bifunctor.Assoc (Assoc (..)) +import Data.Bifunctor.Swap (Swap (..)) import Data.Binary (Binary (..)) import Data.Bitraversable (Bitraversable (..)) import Data.Data (Data, Typeable) import Data.Either (partitionEithers) import Data.Foldable (Foldable (..)) +import Data.Functor.Classes + (Eq1 (..), Eq2 (..), Ord1 (..), Ord2 (..), Read1 (..), Read2 (..), + Show1 (..), Show2 (..)) import Data.Hashable (Hashable (..)) import Data.Hashable.Lifted (Hashable1 (..), Hashable2 (..)) import Data.List.NonEmpty (NonEmpty (..)) import Data.Monoid (Monoid (..)) import Data.Semigroup (Semigroup (..)) import Data.Traversable (Traversable (..)) -import GHC.Generics (Generic) +import GHC.Generics (Generic, Generic1) import Prelude (Bool (..), Either (..), Eq (..), Functor (..), Int, Monad (..), Ord (..), Ordering (..), Read (..), Show (..), fail, id, lex, readParen, seq, showParen, showString, ($), (&&), (.)) -#if MIN_VERSION_deepseq(1,4,3) -import Control.DeepSeq (NFData1 (..), NFData2 (..)) -#endif - -#if __GLASGOW_HASKELL__ >= 706 -import GHC.Generics (Generic1) -#endif - -#ifdef MIN_VERSION_assoc -import Data.Bifunctor.Assoc (Assoc (..)) -import Data.Bifunctor.Swap (Swap (..)) -#endif - -#ifdef LIFTED_FUNCTOR_CLASSES -import Data.Functor.Classes - (Eq1 (..), Eq2 (..), Ord1 (..), Ord2 (..), Read1 (..), Read2 (..), - Show1 (..), Show2 (..)) -#else -import Data.Functor.Classes (Eq1 (..), Ord1 (..), Read1 (..), Show1 (..)) -#endif - -- $setup -- >>> import Control.Lens -- >>> import Data.List.NonEmpty (NonEmpty (..)) @@ -103,11 +73,7 @@ -- For zipping and unzipping of structures with 'These' values, see -- "Data.Align". data These a b = This a | That b | These a b - deriving (Eq, Ord, Read, Show, Typeable, Data, Generic -#if __GLASGOW_HASKELL__ >= 706 - , Generic1 -#endif - ) + deriving (Eq, Ord, Read, Show, Typeable, Data, Generic, Generic1) ------------------------------------------------------------------------------- -- Eliminators @@ -293,7 +259,6 @@ -- Data.Functor.Classes ------------------------------------------------------------------------------- -#ifdef LIFTED_FUNCTOR_CLASSES -- | @since 1.1.1 instance Eq2 These where liftEq2 f _ (This a) (This a') = f a a' @@ -360,17 +325,6 @@ instance Read a => Read1 (These a) where liftReadsPrec = liftReadsPrec2 readsPrec readList -#else --- | @since 1.1.1 -instance Eq a => Eq1 (These a) where eq1 = (==) --- | @since 1.1.1 -instance Ord a => Ord1 (These a) where compare1 = compare --- | @since 1.1.1 -instance Show a => Show1 (These a) where showsPrec1 = showsPrec --- | @since 1.1.1 -instance Read a => Read1 (These a) where readsPrec1 = readsPrec -#endif - ------------------------------------------------------------------------------- -- assoc ------------------------------------------------------------------------------- @@ -409,7 +363,6 @@ rnf (That b) = rnf b rnf (These a b) = rnf a `seq` rnf b -#if MIN_VERSION_deepseq(1,4,3) -- | @since 1.1.1 instance NFData a => NFData1 (These a) where liftRnf _rnfB (This a) = rnf a @@ -421,7 +374,6 @@ liftRnf2 rnfA _rnfB (This a) = rnfA a liftRnf2 _rnfA rnfB (That b) = rnfB b liftRnf2 rnfA rnfB (These a b) = rnfA a `seq` rnfB b -#endif ------------------------------------------------------------------------------- -- binary diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/these-1.2/these.cabal new/these-1.2.1/these.cabal --- old/these-1.2/these.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/these-1.2.1/these.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,6 +1,6 @@ cabal-version: >=1.10 name: these -version: 1.2 +version: 1.2.1 synopsis: An either-or-both data type. homepage: https://github.com/haskellari/these license: BSD3 @@ -31,21 +31,15 @@ * <http://hackage.haskell.org/package/monad-chronicle monad-chronicle> For transformers variant of @These@. tested-with: - GHC ==7.4.2 - || ==7.6.3 - || ==7.8.4 - || ==7.10.3 - || ==8.0.2 - || ==8.2.2 - || ==8.4.4 - || ==8.6.5 - || ==8.8.4 - || ==8.10.7 - || ==9.0.2 - || ==9.2.7 - || ==9.4.4 - || ==9.6.1 - , GHCJS ==8.4 + 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 + || ==9.10.1 source-repository head type: git @@ -54,11 +48,7 @@ library default-language: Haskell2010 - ghc-options: -Wall - - if impl(ghc >=8.0) - ghc-options: -Wno-trustworthy-safe - + ghc-options: -Wall -Wno-trustworthy-safe hs-source-dirs: src exposed-modules: Data.Functor.These @@ -67,34 +57,18 @@ -- ghc boot libs build-depends: - base >=4.5.1.0 && <4.19 - , binary >=0.5.1.0 && <0.10 - , deepseq >=1.3.0.0 && <1.5 + base >=4.12.0.0 && <4.21 + , binary >=0.8.6.0 && <0.10 + , deepseq >=1.4.4.0 && <1.6 -- other dependencies -- note: we need to depend on assoc-1.1 to be sure that -- Bifunctor type class comes from bifunctor-classes-compat build-depends: - assoc >=1.1 && <1.2 - , hashable >=1.2.7.0 && <1.5 - - if impl(ghc <7.5) - build-depends: ghc-prim + assoc >=1.1.1 && <1.2 + , hashable >=1.4.4.0 && <1.5 if !impl(ghc >=9.6) build-depends: foldable1-classes-compat >=0.1 && <0.2 - if !impl(ghc >=8.2) - build-depends: bifunctor-classes-compat >=0.1 && <0.2 - - if !impl(ghc >=8.0) - build-depends: - semigroups >=0.18.5 && <0.21 - , transformers >=0.3.0.0 && <0.7 - , transformers-compat >=0.6.5 && <0.8 - - -- Ensure Data.Functor.Classes is always available - if impl(ghc >=7.10) - build-depends: transformers >=0.4.2.0 - x-docspec-extra-packages: lens

1 0

commit ghc-servant-server for openSUSE:Factory
by Source-Sync 28 May '24

28 May '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-servant-server for openSUSE:Factory checked in at 2024-05-28 17:28:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-servant-server (Old) and /work/SRC/openSUSE:Factory/.ghc-servant-server.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-servant-server" Tue May 28 17:28:54 2024 rev:11 rq:1177136 version:0.20 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-servant-server/ghc-servant-server.changes 2023-12-05 17:04:08.867207880 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-servant-server.new.24587/ghc-servant-server.changes 2024-05-28 17:29:52.206315538 +0200 @@ -1,0 +2,6 @@ +Thu May 16 21:43:26 UTC 2024 - Peter Simons <psimons(a)suse.com> + +- Update servant-server to version 0.20 revision 5. + Upstream has revised the Cabal build instructions on Hackage. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-servant-server.spec ++++++ --- /var/tmp/diff_new_pack.c5epNk/_old 2024-05-28 17:29:53.414359714 +0200 +++ /var/tmp/diff_new_pack.c5epNk/_new 2024-05-28 17:29:53.418359860 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-servant-server # -# 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 @@ -26,7 +26,7 @@ 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/4.cabal… +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/5.cabal… BuildRequires: chrpath BuildRequires: ghc-Cabal-devel BuildRequires: ghc-aeson-devel ++++++ servant-server.cabal ++++++ --- /var/tmp/diff_new_pack.c5epNk/_old 2024-05-28 17:29:53.462361469 +0200 +++ /var/tmp/diff_new_pack.c5epNk/_new 2024-05-28 17:29:53.466361615 +0200 @@ -1,7 +1,7 @@ cabal-version: 2.2 name: servant-server version: 0.20 -x-revision: 4 +x-revision: 5 synopsis: A family of combinators for defining webservices APIs and serving them category: Servant, Web @@ -86,7 +86,7 @@ , http-types >= 0.12.2 && < 0.13 , network-uri >= 2.6.1.0 && < 2.8 , monad-control >= 1.0.2.3 && < 1.1 - , network >= 2.8 && < 3.2 + , network >= 2.8 && < 3.3 , sop-core >= 0.4.0.0 && < 0.6 , string-conversions >= 0.4.0.1 && < 0.5 , resourcet >= 1.2.2 && < 1.4 @@ -116,7 +116,7 @@ build-depends: aeson >= 1.4.1.0 && < 3 - , warp >= 3.2.25 && < 3.4 + , warp >= 3.2.25 && < 3.5 test-suite spec type: exitcode-stdio-1.0

1 0

commit ghc-semialign for openSUSE:Factory
by Source-Sync 28 May '24

28 May '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-semialign for openSUSE:Factory checked in at 2024-05-28 17:28:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-semialign (Old) and /work/SRC/openSUSE:Factory/.ghc-semialign.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-semialign" Tue May 28 17:28:53 2024 rev:12 rq:1177135 version:1.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-semialign/ghc-semialign.changes 2023-10-13 23:16:00.965942391 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-semialign.new.24587/ghc-semialign.changes 2024-05-28 17:29:50.710260831 +0200 @@ -1,0 +2,8 @@ +Thu May 16 19:49:27 UTC 2024 - Peter Simons <psimons(a)suse.com> + +- Update semialign to version 1.3.1. + # 1.3.1 + + - Support GHC-8.6.5...GHC-9.10.1 + +------------------------------------------------------------------- Old: ---- semialign-1.3.tar.gz semialign.cabal New: ---- semialign-1.3.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-semialign.spec ++++++ --- /var/tmp/diff_new_pack.vOibWl/_old 2024-05-28 17:29:51.278281602 +0200 +++ /var/tmp/diff_new_pack.vOibWl/_new 2024-05-28 17:29:51.278281602 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-semialign # -# 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 @@ -19,13 +19,12 @@ %global pkg_name semialign %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 1.3 +Version: 1.3.1 Release: 0 Summary: Align and Zip type-classes from the common Semialign ancestor 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-base-devel BuildRequires: ghc-base-prof @@ -88,7 +87,6 @@ %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ semialign-1.3.tar.gz -> semialign-1.3.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/semialign-1.3/CHANGELOG.md new/semialign-1.3.1/CHANGELOG.md --- old/semialign-1.3/CHANGELOG.md 2001-09-09 03:46:40.000000000 +0200 +++ new/semialign-1.3.1/CHANGELOG.md 2001-09-09 03:46:40.000000000 +0200 @@ -1,3 +1,7 @@ +# 1.3.1 + +- Support GHC-8.6.5...GHC-9.10.1 + # 1.3 - Depend on `bifunctor-classes-compat` instead of `bifunctors` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/semialign-1.3/semialign.cabal new/semialign-1.3.1/semialign.cabal --- old/semialign-1.3/semialign.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/semialign-1.3.1/semialign.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,6 +1,6 @@ cabal-version: >=1.10 name: semialign -version: 1.3 +version: 1.3.1 synopsis: Align and Zip type-classes from the common Semialign ancestor. @@ -21,21 +21,15 @@ forming lattice-like structure. tested-with: - GHC ==7.4.2 - || ==7.6.3 - || ==7.8.4 - || ==7.10.3 - || ==8.0.2 - || ==8.2.2 - || ==8.4.4 - || ==8.6.5 - || ==8.8.4 - || ==8.10.7 - || ==9.0.2 - || ==9.2.7 - || ==9.4.4 - || ==9.6.1 - , GHCJS ==8.4 + 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 + || ==9.10.1 source-repository head type: git @@ -49,10 +43,8 @@ library default-language: Haskell2010 - ghc-options: -Wall + ghc-options: -Wall -Wno-trustworthy-safe - if impl(ghc >=8.0) - ghc-options: -Wno-trustworthy-safe if impl(ghc >=9.2) ghc-options: -Wno-noncanonical-monoid-instances @@ -68,41 +60,21 @@ -- ghc boot libs build-depends: - base >=4.5.1.0 && <4.19 - , containers >=0.4.2.1 && <0.7 - , transformers >=0.3.0.0 && <0.7 + base >=4.12.0.0 && <4.21 + , containers >=0.6.0.1 && <0.8 + , transformers >=0.5.6.2 && <0.7 -- These - build-depends: these >=1.2 && <1.3 + build-depends: these >=1.2.1 && <1.3 -- other dependencies build-depends: - hashable >=1.2.7.0 && <1.5 - , indexed-traversable >=0.1.1 && <0.2 - , indexed-traversable-instances >=0.1 && <0.2 - , tagged >=0.8.6 && <0.9 + hashable >=1.4.4.0 && <1.5 + , indexed-traversable >=0.1.4 && <0.2 + , indexed-traversable-instances >=0.1.2 && <0.2 + , tagged >=0.8.8 && <0.9 , unordered-containers >=0.2.8.0 && <0.3 - , vector >=0.12.0.2 && <0.14 - - -- base shims - if !impl(ghc >=8.2) - build-depends: bifunctor-classes-compat >=0.1 && <0.2 - - if !impl(ghc >=8.0) - build-depends: - semigroups >=0.18.5 && <0.21 - , transformers >=0.3.0.0 && <0.7 - , transformers-compat >=0.6.5 && <0.8 - - -- Ensure Data.Functor.Classes is always available - if impl(ghc >=7.10) - build-depends: transformers >=0.4.2.0 - - if !impl(ghc >=7.10) - build-depends: void >=0.7.3 && <0.8 - - if impl(ghc <7.5) - build-depends: ghc-prim + , vector >=0.13.0.0 && <0.14 if flag(semigroupoids) - build-depends: semigroupoids >=5.3.2 && <6.1 + build-depends: semigroupoids >=6.0.1 && <6.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/semialign-1.3/src/Data/Crosswalk.hs new/semialign-1.3.1/src/Data/Crosswalk.hs --- old/semialign-1.3/src/Data/Crosswalk.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/semialign-1.3.1/src/Data/Crosswalk.hs 2001-09-09 03:46:40.000000000 +0200 @@ -1,4 +1,3 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE Trustworthy #-} module Data.Crosswalk ( -- * Crosswalk @@ -42,9 +41,7 @@ sequenceL :: (Align f) => t (f a) -> f (t a) sequenceL = crosswalk id -#if __GLASGOW_HASKELL__ >= 707 {-# MINIMAL crosswalk | sequenceL #-} -#endif instance Crosswalk Identity where crosswalk f (Identity a) = fmap Identity (f a) @@ -106,10 +103,7 @@ bisequenceL :: (Align f) => t (f a) (f b) -> f (t a b) bisequenceL = bicrosswalk id id -#if __GLASGOW_HASKELL__ >= 707 {-# MINIMAL bicrosswalk | bisequenceL #-} -#endif - instance Bicrosswalk Either where bicrosswalk f _ (Left x) = Left <$> f x diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/semialign-1.3/src/Data/Semialign/Internal.hs new/semialign-1.3.1/src/Data/Semialign/Internal.hs --- old/semialign-1.3/src/Data/Semialign/Internal.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/semialign-1.3.1/src/Data/Semialign/Internal.hs 2001-09-09 03:46:40.000000000 +0200 @@ -2,18 +2,16 @@ {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE FunctionalDependencies #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-} +{-# LANGUAGE PolyKinds #-} {-# LANGUAGE StandaloneDeriving #-} {-# LANGUAGE Trustworthy #-} {-# LANGUAGE UndecidableInstances #-} -#if __GLASGOW_HASKELL__ >= 706 -{-# LANGUAGE PolyKinds #-} -#endif module Data.Semialign.Internal where import Prelude (Bool (..), Either (..), Eq (..), Functor (fmap), Int, Maybe (..), - Monad (..), Ord (..), Ordering (..), String, error, flip, fst, id, - maybe, snd, uncurry, ($), (++), (.)) + Monad (..), Ord (..), Ordering (..), String, error, flip, fst, id, maybe, + snd, uncurry, ($), (++), (.)) import qualified Prelude as Prelude @@ -45,38 +43,22 @@ import qualified Data.Vector as V import qualified Data.Vector.Fusion.Stream.Monadic as Stream -#if MIN_VERSION_vector(0,11,0) import Data.Vector.Fusion.Bundle.Monadic (Bundle (..)) import qualified Data.Vector.Fusion.Bundle.Monadic as Bundle import qualified Data.Vector.Fusion.Bundle.Size as Bundle -#else -import qualified Data.Vector.Fusion.Stream.Size as Stream -#endif -#if MIN_VERSION_containers(0,5,0) import Data.Map.Lazy (Map) import qualified Data.Map.Lazy as Map import Data.IntMap.Lazy (IntMap) import qualified Data.IntMap.Lazy as IntMap -#if MIN_VERSION_containers(0,5,9) import qualified Data.IntMap.Merge.Lazy as IntMap import qualified Data.Map.Merge.Lazy as Map -#endif - --- containers <0.5 -#else -import Data.Map (Map) -import qualified Data.Map as Map - -import Data.IntMap (IntMap) -import qualified Data.IntMap as IntMap -#endif #if !(MIN_VERSION_base(4,16,0)) import Data.Semigroup (Option (..)) -#endif +#endif import Data.These import Data.These.Combinators @@ -95,7 +77,7 @@ -- The laws of 'align' and 'zip' resemble lattice laws. -- There is a plenty of laws, but they are simply satisfied. -- --- And an addition property if @f@ is 'Foldable', +-- And an additional property if @f@ is 'Foldable', -- which tries to enforce 'align'-feel: -- neither values are duplicated nor lost. -- @@ -139,16 +121,6 @@ -- ≡ mapMaybe justHere (toList (align x y)) -- @ -- --- --- And an addition property if @f@ is 'Foldable', --- which tries to enforce 'align'-feel: --- neither values are duplicated nor lost. --- --- @ --- toList x = toListOf (folded . here) (align x y) --- = mapMaybe justHere (toList (align x y)) --- @ --- class Functor f => Semialign f where -- | Analogous to @'zip'@, combines two structures by taking the union of -- their shapes and using @'These'@ to hold the elements. @@ -160,9 +132,7 @@ alignWith :: (These a b -> c) -> f a -> f b -> f c alignWith f a b = f <$> align a b -#if __GLASGOW_HASKELL__ >= 707 {-# MINIMAL (align | alignWith) #-} -#endif -- | A unit of 'align'. -- @@ -206,10 +176,7 @@ unalignWith :: (c -> These a b) -> f c -> (f a, f b) unalignWith f fx = unalign (fmap f fx) -#if __GLASGOW_HASKELL__ >= 707 {-# MINIMAL unalignWith | unalign #-} -#endif - -- | Functors supporting a 'zip' operation that takes the intersection of -- non-uniform shapes. @@ -294,9 +261,7 @@ zipWith :: (a -> b -> c) -> f a -> f b -> f c zipWith f a b = uncurry f <$> zip a b -#if __GLASGOW_HASKELL__ >= 707 {-# MINIMAL (zip | zipWith) #-} -#endif -- | Zippable functors supporting left and right units -- @@ -337,9 +302,7 @@ unzip :: f (a, b) -> (f a, f b) unzip = unzipWith id -#if __GLASGOW_HASKELL__ >= 707 {-# MINIMAL unzipWith | unzip #-} -#endif unzipDefault :: Functor f => f (a, b) -> (f a, f b) unzipDefault x = (fst <$> x, snd <$> x) @@ -529,12 +492,8 @@ nil = Seq.empty instance Unzip Seq where -#if MIN_VERSION_containers(0,5,11) unzip = Seq.unzip unzipWith = Seq.unzipWith -#else - unzip = unzipDefault -#endif instance Zip Seq where zip = Seq.zip @@ -563,17 +522,9 @@ ------------------------------------------------------------------------------- instance Ord k => Semialign (Map k) where -#if MIN_VERSION_containers(0,5,9) alignWith f = Map.merge (Map.mapMissing (\_ x -> f (This x))) (Map.mapMissing (\_ y -> f (That y))) (Map.zipWithMatched (\_ x y -> f (These x y))) -#elif MIN_VERSION_containers(0,5,0) - alignWith f = Map.mergeWithKey (\_ x y -> Just $ f $ These x y) (fmap (f . This)) (fmap (f . That)) -#else - align m n = Map.unionWith merge (Map.map This m) (Map.map That n) - where merge (This a) (That b) = These a b - merge _ _ = oops "Align Map: merge" -#endif instance (Ord k) => Align (Map k) where nil = Map.empty @@ -587,17 +538,9 @@ zipWith = Map.intersectionWith instance Semialign IntMap where -#if MIN_VERSION_containers(0,5,9) alignWith f = IntMap.merge (IntMap.mapMissing (\_ x -> f (This x))) (IntMap.mapMissing (\_ y -> f (That y))) (IntMap.zipWithMatched (\_ x y -> f (These x y))) -#elif MIN_VERSION_containers(0,5,0) - alignWith f = IntMap.mergeWithKey (\_ x y -> Just $ f $ These x y) (fmap (f . This)) (fmap (f . That)) -#else - align m n = IntMap.unionWith merge (IntMap.map This m) (IntMap.map That n) - where merge (This a) (That b) = These a b - merge _ _ = oops "Align IntMap: merge" -#endif instance Align IntMap where nil = IntMap.empty @@ -722,13 +665,8 @@ nil = Stream.empty instance Monad m => Semialign (Stream m) where -#if MIN_VERSION_vector(0,11,0) alignWith f (Stream stepa ta) (Stream stepb tb) = Stream step (ta, tb, Nothing, False) -#else - alignWith f (Stream stepa ta na) (Stream stepb tb nb) - = Stream step (ta, tb, Nothing, False) (Stream.larger na nb) -#endif where step (sa, sb, Nothing, False) = do r <- stepa sa @@ -753,14 +691,12 @@ instance Monad m => Zip (Stream m) where zipWith = Stream.zipWith -#if MIN_VERSION_vector(0,11,0) instance Monad m => Align (Bundle m v) where nil = Bundle.empty instance Monad m => Semialign (Bundle m v) where alignWith f Bundle{sElems = sa, sSize = na} Bundle{sElems = sb, sSize = nb} = Bundle.fromStream (alignWith f sa sb) (Bundle.larger na nb) -#endif instance Monad m => Zip (Bundle m v) where zipWith = Bundle.zipWith diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/semialign-1.3/src/Data/Zip.hs new/semialign-1.3.1/src/Data/Zip.hs --- old/semialign-1.3/src/Data/Zip.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/semialign-1.3.1/src/Data/Zip.hs 2001-09-09 03:46:40.000000000 +0200 @@ -50,6 +50,4 @@ Zippy f <*> Zippy x = Zippy $ zipWith ($) f x #endif -#if MIN_VERSION_base(4,10,0) liftA2 f (Zippy x) (Zippy y) = Zippy $ zipWith f x y -#endif

1 0

commit ghc-indexed-traversable-instances for openSUSE:Factory
by Source-Sync 28 May '24

28 May '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-indexed-traversable-instances for openSUSE:Factory checked in at 2024-05-28 17:28:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-indexed-traversable-instances (Old) and /work/SRC/openSUSE:Factory/.ghc-indexed-traversable-instances.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-indexed-traversable-instances" Tue May 28 17:28:53 2024 rev:7 rq:1177134 version:0.1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-indexed-traversable-instances/ghc-indexed-traversable-instances.changes 2023-10-13 23:16:00.329919322 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-indexed-traversable-instances.new.24587/ghc-indexed-traversable-instances.changes 2024-05-28 17:29:49.146203638 +0200 @@ -1,0 +2,8 @@ +Thu May 16 08:02:44 UTC 2024 - Peter Simons <psimons(a)suse.com> + +- Update indexed-traversable-instances to version 0.1.2. + # 0.1.2 [2024-05-dd] + + - Drop support for GHCs prior 8.6.5 + +------------------------------------------------------------------- Old: ---- indexed-traversable-instances-0.1.1.2.tar.gz indexed-traversable-instances.cabal New: ---- indexed-traversable-instances-0.1.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-indexed-traversable-instances.spec ++++++ --- /var/tmp/diff_new_pack.toDMas/_old 2024-05-28 17:29:50.174241230 +0200 +++ /var/tmp/diff_new_pack.toDMas/_new 2024-05-28 17:29:50.178241377 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-indexed-traversable-instances # -# 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.1.1.2 +Version: 0.1.2 Release: 0 Summary: More instances of FunctorWithIndex, FoldableWithIndex, TraversableWithIndex License: BSD-2-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/2.cabal… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-OneTuple-devel BuildRequires: ghc-OneTuple-prof @@ -96,7 +95,6 @@ %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ indexed-traversable-instances-0.1.1.2.tar.gz -> indexed-traversable-instances-0.1.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/indexed-traversable-instances-0.1.1.2/Changelog.md new/indexed-traversable-instances-0.1.2/Changelog.md --- old/indexed-traversable-instances-0.1.1.2/Changelog.md 2001-09-09 03:46:40.000000000 +0200 +++ new/indexed-traversable-instances-0.1.2/Changelog.md 2001-09-09 03:46:40.000000000 +0200 @@ -1,3 +1,7 @@ +# 0.1.2 [2024-05-dd] + +- Drop support for GHCs prior 8.6.5 + # 0.1.1 [2021-10-30] - Add `Solo` instances diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/indexed-traversable-instances-0.1.1.2/indexed-traversable-instances.cabal new/indexed-traversable-instances-0.1.2/indexed-traversable-instances.cabal --- old/indexed-traversable-instances-0.1.1.2/indexed-traversable-instances.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/indexed-traversable-instances-0.1.2/indexed-traversable-instances.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,6 +1,6 @@ cabal-version: 1.12 name: indexed-traversable-instances -version: 0.1.1.2 +version: 0.1.2 build-type: Simple license: BSD2 license-file: LICENSE @@ -21,19 +21,15 @@ extra-source-files: Changelog.md tested-with: - GHC ==7.4.2 - || ==7.6.3 - || ==7.8.4 - || ==7.10.3 - || ==8.0.2 - || ==8.2.2 - || ==8.4.4 - || ==8.6.5 + GHC ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 - || ==9.2.5 - || ==9.4.4 + || ==9.2.8 + || ==9.4.8 + || ==9.6.5 + || ==9.8.2 + || ==9.10.1 source-repository head type: git @@ -42,22 +38,20 @@ library default-language: Haskell2010 - ghc-options: -Wall hs-source-dirs: src build-depends: - base >=4.5 && <4.18 - , indexed-traversable >=0.1 && <0.2 + base >=4.12 && <4.21 + , indexed-traversable >=0.1.4 && <0.2 , OneTuple >=0.3 && <0.5 , tagged >=0.8.6 && <0.9 , unordered-containers >=0.2.8.0 && <0.3 - , vector >=0.12.1.2 && <0.14 + , vector >=0.13.1.0 && <0.14 exposed-modules: Data.Functor.WithIndex.Instances test-suite safe type: exitcode-stdio-1.0 default-language: Haskell2010 - ghc-options: -Wall hs-source-dirs: tests main-is: safe.hs build-depends: @@ -68,7 +62,6 @@ test-suite indexed-tests type: exitcode-stdio-1.0 default-language: Haskell2010 - ghc-options: -Wall hs-source-dirs: tests main-is: main.hs build-depends: @@ -84,5 +77,5 @@ build-depends: QuickCheck >=2.14.2 && <2.15 , quickcheck-instances >=0.3.29 && <0.4 - , tasty >=1.2.3 && <1.5 + , tasty >=1.2.3 && <1.6 , tasty-quickcheck >=0.10.1.1 && <0.11 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/indexed-traversable-instances-0.1.1.2/src/Data/Functor/WithIndex/Instances.hs new/indexed-traversable-instances-0.1.2/src/Data/Functor/WithIndex/Instances.hs --- old/indexed-traversable-instances-0.1.1.2/src/Data/Functor/WithIndex/Instances.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/indexed-traversable-instances-0.1.2/src/Data/Functor/WithIndex/Instances.hs 2001-09-09 03:46:40.000000000 +0200 @@ -2,16 +2,10 @@ {-# LANGUAGE CPP #-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE FunctionalDependencies #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE Trustworthy #-} {-# LANGUAGE UndecidableInstances #-} {-# OPTIONS_GHC -fno-warn-orphans #-} - -#if __GLASGOW_HASKELL__ >= 702 -{-# LANGUAGE Trustworthy #-} -#endif - -#if __GLASGOW_HASKELL__ >= 706 -{-# LANGUAGE PolyKinds #-} -#endif -- | Extra instances for 'FunctorWithIndex', 'FoldableWithIndex', -- and 'TraversableWithIndex' type classes. module Data.Functor.WithIndex.Instances () where diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/indexed-traversable-instances-0.1.1.2/tests/main.hs new/indexed-traversable-instances-0.1.2/tests/main.hs --- old/indexed-traversable-instances-0.1.1.2/tests/main.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/indexed-traversable-instances-0.1.2/tests/main.hs 2001-09-09 03:46:40.000000000 +0200 @@ -37,16 +37,7 @@ import Data.Functor.WithIndex import Data.Traversable.WithIndex -#if MIN_VERSION_base(4,7,0) import Data.Typeable (Typeable, typeRep) -#else -import Data.Typeable (TypeRep, Typeable1, typeOf1) - -#define Typeable Typeable1 - -typeRep :: forall f i. Typeable1 f => Tests i f -> TypeRep -typeRep _ = typeOf1 (undefined :: f Int) -#endif ------------------------------------------------------------------------------- -- Main

1 0

commit ghc-generically for openSUSE:Factory
by Source-Sync 28 May '24

28 May '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-generically for openSUSE:Factory checked in at 2024-05-28 17:28:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-generically (Old) and /work/SRC/openSUSE:Factory/.ghc-generically.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-generically" Tue May 28 17:28:50 2024 rev:5 rq:1177132 version:0.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-generically/ghc-generically.changes 2023-11-23 21:43:08.184990249 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-generically.new.24587/ghc-generically.changes 2024-05-28 17:29:42.305953507 +0200 @@ -1,0 +2,6 @@ +Thu May 16 11:22:04 UTC 2024 - Peter Simons <psimons(a)suse.com> + +- Update generically to version 0.1.1 revision 3. + Upstream has revised the Cabal build instructions on Hackage. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-generically.spec ++++++ --- /var/tmp/diff_new_pack.xAWFQ8/_old 2024-05-28 17:29:43.321990660 +0200 +++ /var/tmp/diff_new_pack.xAWFQ8/_new 2024-05-28 17:29:43.325990807 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-generically # -# 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 @@ -25,7 +25,7 @@ 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/2.cabal… +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/3.cabal… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-base-devel BuildRequires: ghc-base-prof ++++++ generically.cabal ++++++ --- /var/tmp/diff_new_pack.xAWFQ8/_old 2024-05-28 17:29:43.357991977 +0200 +++ /var/tmp/diff_new_pack.xAWFQ8/_new 2024-05-28 17:29:43.361992123 +0200 @@ -1,43 +1,43 @@ -cabal-version: 1.12 -name: generically -version: 0.1.1 -x-revision: 2 -synopsis: Generically newtype to use with DerivingVia -description: - This is a compatibility package as @Generically@ and @Generically1@ newtypes - are available since @base-4.17@ in 'GHC.Generics'. - -bug-reports: https://github.com/haskell-compat/generically/issues -author: Oleg Grenrus -maintainer: Oleg Grenrus <oleg.grenrus(a)iki.fi> -copyright: 2022 Oleg Grenrus -license: BSD3 -license-file: LICENSE -category: Generics -build-type: Simple -extra-source-files: CHANGELOG.md -tested-with: - GHC ==8.0.2 - || ==8.2.2 - || ==8.4.4 - || ==8.6.5 - || ==8.8.4 - || ==8.10.7 - || ==9.0.2 - || ==9.2.8 - || ==9.4.7 - || ==9.6.3 - || ==9.8.1 - -source-repository head - type: git - location: https://github.com/haskell-compat/generically.git - -library - default-language: Haskell2010 - build-depends: base >=4.9 && <4.20 - if impl(ghc >= 9.4) && !impl(ghc >= 9.6) - build-depends: base-orphans >=0.8.8 && <0.10 - hs-source-dirs: src - exposed-modules: GHC.Generics.Generically +cabal-version: 1.12 +name: generically +version: 0.1.1 +x-revision: 3 +synopsis: Generically newtype to use with DerivingVia +description: + This is a compatibility package as @Generically@ and @Generically1@ newtypes + are available since @base-4.17@ in 'GHC.Generics'. + +bug-reports: https://github.com/haskell-compat/generically/issues +author: Oleg Grenrus +maintainer: Oleg Grenrus <oleg.grenrus(a)iki.fi> +copyright: 2022 Oleg Grenrus +license: BSD3 +license-file: LICENSE +category: Generics +build-type: Simple +extra-source-files: CHANGELOG.md +tested-with: + GHC ==8.0.2 + || ==8.2.2 + || ==8.4.4 + || ==8.6.5 + || ==8.8.4 + || ==8.10.7 + || ==9.0.2 + || ==9.2.8 + || ==9.4.7 + || ==9.6.3 + || ==9.8.1 + +source-repository head + type: git + location: https://github.com/haskell-compat/generically.git + +library + default-language: Haskell2010 + build-depends: base >=4.9 && <4.21 + if impl(ghc >= 9.4) && !impl(ghc >= 9.6) + build-depends: base-orphans >=0.8.8 && <0.10 + hs-source-dirs: src + exposed-modules: GHC.Generics.Generically

1 0

commit ghc-fast-logger for openSUSE:Factory
by Source-Sync 28 May '24

28 May '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-fast-logger for openSUSE:Factory checked in at 2024-05-28 17:28:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-fast-logger (Old) and /work/SRC/openSUSE:Factory/.ghc-fast-logger.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-fast-logger" Tue May 28 17:28:49 2024 rev:29 rq:1177130 version:3.2.3 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-fast-logger/ghc-fast-logger.changes 2023-11-23 21:43:08.176989955 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-fast-logger.new.24587/ghc-fast-logger.changes 2024-05-28 17:29:36.345735556 +0200 @@ -1,0 +2,9 @@ +Thu May 16 07:11:46 UTC 2024 - Peter Simons <psimons(a)suse.com> + +- Update fast-logger to version 3.2.3. + ## 3.2.3 + + * Ensuring flush for single logger. + [#214](https://github.com/kazu-yamamoto/logger/pull/214) + +------------------------------------------------------------------- Old: ---- fast-logger-3.2.2.tar.gz New: ---- fast-logger-3.2.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-fast-logger.spec ++++++ --- /var/tmp/diff_new_pack.Zb5WQX/_old 2024-05-28 17:29:37.625782364 +0200 +++ /var/tmp/diff_new_pack.Zb5WQX/_new 2024-05-28 17:29:37.629782510 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-fast-logger # -# 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,7 +20,7 @@ %global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} -Version: 3.2.2 +Version: 3.2.3 Release: 0 Summary: A fast logging system License: BSD-3-Clause ++++++ fast-logger-3.2.2.tar.gz -> fast-logger-3.2.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fast-logger-3.2.2/ChangeLog.md new/fast-logger-3.2.3/ChangeLog.md --- old/fast-logger-3.2.2/ChangeLog.md 2001-09-09 03:46:40.000000000 +0200 +++ new/fast-logger-3.2.3/ChangeLog.md 2001-09-09 03:46:40.000000000 +0200 @@ -1,3 +1,8 @@ +## 3.2.3 + +* Ensuring flush for single logger. + [#214](https://github.com/kazu-yamamoto/logger/pull/214) + ## 3.2.2 * Corrected handling of messages at the buffer boundary in the SingleLogger diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fast-logger-3.2.2/System/Log/FastLogger/SingleLogger.hs new/fast-logger-3.2.3/System/Log/FastLogger/SingleLogger.hs --- old/fast-logger-3.2.2/System/Log/FastLogger/SingleLogger.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fast-logger-3.2.3/System/Log/FastLogger/SingleLogger.hs 2001-09-09 03:46:40.000000000 +0200 @@ -1,11 +1,11 @@ {-# LANGUAGE RecordWildCards #-} module System.Log.FastLogger.SingleLogger ( - SingleLogger - , newSingleLogger - ) where + SingleLogger, + newSingleLogger, +) where -import Control.Concurrent (forkIO, newEmptyMVar, MVar, takeMVar, putMVar) +import Control.Concurrent (MVar, forkIO, newEmptyMVar, putMVar, takeMVar) import Control.Concurrent.STM import System.Log.FastLogger.FileIO @@ -16,43 +16,50 @@ ---------------------------------------------------------------- +data Ent = F (MVar ()) Bool | L LogStr +type Q = [Ent] -- writer queue + -- | A non-scale but time-ordered logger. -data SingleLogger = SingleLogger { - slgrRef :: IORef (LogStr - ,[LogStr])-- writer queue - , slgrKill :: IO () - , slgrWakeup :: IO () - , slgrBuffer :: Buffer - , slgrBufSize :: BufSize - , slgrFdRef :: IORef FD - } +data SingleLogger = SingleLogger + { slgrRef :: IORef (LogStr, Q) + , slgrFlush :: Bool -> IO () -- teminate if False + , slgrWakeup :: IO () + , slgrBuffer :: Buffer + , slgrBufSize :: BufSize + , slgrFdRef :: IORef FD + } instance Loggers SingleLogger where stopLoggers = System.Log.FastLogger.SingleLogger.stopLoggers - pushLog = System.Log.FastLogger.SingleLogger.pushLog + pushLog = System.Log.FastLogger.SingleLogger.pushLog flushAllLog = System.Log.FastLogger.SingleLogger.flushAllLog ---------------------------------------------------------------- -writer :: BufSize -> Buffer -> IORef FD -> TVar Int -> IORef (LogStr, [LogStr]) -> MVar () -> IO () -writer bufsize buf fdref tvar ref mvar = loop (0 :: Int) +writer + :: BufSize + -> Buffer + -> IORef FD + -> TVar Int + -> IORef (LogStr, Q) + -> IO () +writer bufsize buf fdref tvar ref = loop (0 :: Int) where loop cnt = do cnt' <- atomically $ do n <- readTVar tvar check (n /= cnt) return n - msgs <- reverse <$> atomicModifyIORef' ref (\(msg,q) -> ((msg,[]),q)) + msgs <- reverse <$> atomicModifyIORef' ref (\(msg, q) -> ((msg, []), q)) cont <- go msgs - if cont then - loop cnt' - else - putMVar mvar () + when cont $ loop cnt' go [] = return True - go (msg@(LogStr len _):msgs) - | len < 0 = return False - | len <= bufsize = writeLogStr buf fdref msg >> go msgs - | otherwise = writeBigLogStr fdref msg >> go msgs + go (F mvar cont : msgs) = do + putMVar mvar () + if cont then go msgs else return False + go (L msg@(LogStr len _) : msgs) + | len <= bufsize = writeLogStr buf fdref msg >> go msgs + | otherwise = writeBigLogStr fdref msg >> go msgs ---------------------------------------------------------------- @@ -60,46 +67,47 @@ newSingleLogger :: BufSize -> IORef FD -> IO SingleLogger newSingleLogger bufsize fdref = do tvar <- newTVarIO 0 - ref <- newIORef (mempty,[]) - mvar <- newEmptyMVar + ref <- newIORef (mempty, []) buf <- getBuffer bufsize - _ <- forkIO $ writer bufsize buf fdref tvar ref mvar + _ <- forkIO $ writer bufsize buf fdref tvar ref let wakeup = atomically $ modifyTVar' tvar (+ 1) - kill = do - let fin = LogStr (-1) mempty - atomicModifyIORef' ref (\(old,q) -> ((mempty,fin:old:q),())) + flush cont = do + mvar <- newEmptyMVar + let fin = F mvar cont + atomicModifyIORef' ref (\(old, q) -> ((mempty, fin : L old : q), ())) wakeup takeMVar mvar - return $ SingleLogger { - slgrRef = ref - , slgrKill = kill - , slgrWakeup = wakeup - , slgrBuffer = buf - , slgrBufSize = bufsize - , slgrFdRef = fdref - } + return $ + SingleLogger + { slgrRef = ref + , slgrFlush = flush + , slgrWakeup = wakeup + , slgrBuffer = buf + , slgrBufSize = bufsize + , slgrFdRef = fdref + } ---------------------------------------------------------------- pushLog :: SingleLogger -> LogStr -> IO () pushLog SingleLogger{..} nlogmsg@(LogStr nlen _) - | nlen > slgrBufSize = do - atomicModifyIORef' slgrRef (\(old,q) -> ((mempty,nlogmsg:old:q),())) + | nlen > slgrBufSize = do + atomicModifyIORef' slgrRef (\(old, q) -> ((mempty, L nlogmsg : L old : q), ())) slgrWakeup - | otherwise = do + | otherwise = do wake <- atomicModifyIORef' slgrRef checkBuf when wake slgrWakeup where - checkBuf (ologmsg@(LogStr olen _),q) - | slgrBufSize < olen + nlen = ((nlogmsg, ologmsg:q), True) - | otherwise = ((ologmsg <> nlogmsg, q), False) + checkBuf (ologmsg@(LogStr olen _), q) + | slgrBufSize < olen + nlen = ((nlogmsg, L ologmsg : q), True) + | otherwise = ((ologmsg <> nlogmsg, q), False) flushAllLog :: SingleLogger -> IO () flushAllLog SingleLogger{..} = do - atomicModifyIORef' slgrRef (\(old,q) -> ((mempty,old:q),())) - slgrWakeup + atomicModifyIORef' slgrRef (\(old, q) -> ((mempty, L old : q), ())) + slgrFlush True stopLoggers :: SingleLogger -> IO () stopLoggers SingleLogger{..} = do - slgrKill + slgrFlush False freeBuffer slgrBuffer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fast-logger-3.2.2/fast-logger.cabal new/fast-logger-3.2.3/fast-logger.cabal --- old/fast-logger-3.2.2/fast-logger.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/fast-logger-3.2.3/fast-logger.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,6 +1,6 @@ cabal-version: >=1.10 name: fast-logger -version: 3.2.2 +version: 3.2.3 license: BSD3 license-file: LICENSE maintainer: Kazu Yamamoto <kazu(a)iij.ad.jp>

1 0

commit koko for openSUSE:Factory
by Source-Sync 28 May '24

28 May '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package koko for openSUSE:Factory checked in at 2024-05-28 17:28:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/koko (Old) and /work/SRC/openSUSE:Factory/.koko.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "koko" Tue May 28 17:28:47 2024 rev:13 rq:1177139 version:24.05.0 Changes: -------- --- /work/SRC/openSUSE:Factory/koko/koko.changes 2024-04-15 20:21:48.704028343 +0200 +++ /work/SRC/openSUSE:Factory/.koko.new.24587/koko.changes 2024-05-28 17:29:33.469630385 +0200 @@ -1,0 +2,24 @@ +Sun May 19 09:56:35 UTC 2024 - Christophe Marin <christophe(a)krop.fr> + +- Update to 24.05.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/24.05.0/ +- No code change since 24.04.80 + +------------------------------------------------------------------- +Fri May 3 09:16:20 UTC 2024 - Christophe Marin <christophe(a)krop.fr> + +- Update to 24.04.80 + * New feature release +- Changes since 24.02.2: + * Use consistently generic apps.kde.org/koko as homepage + * appstream: use desktop-application type, add developer & launchable tags + * qml/EditorView: Set position for InlineMessage in footer + * Add "koko" to keywords list (kde#480249) + * Remove property dialog + * Disable slideshow on mobile + * Fix image actions on mobile + * Port away from deprecated ECMQMLModules + +------------------------------------------------------------------- Old: ---- koko-24.02.2.tar.xz koko-24.02.2.tar.xz.sig New: ---- koko-24.05.0.tar.xz koko-24.05.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ koko.spec ++++++ --- /var/tmp/diff_new_pack.IMtEhc/_old 2024-05-28 17:29:35.229694745 +0200 +++ /var/tmp/diff_new_pack.IMtEhc/_new 2024-05-28 17:29:35.229694745 +0200 @@ -21,14 +21,14 @@ %bcond_without released Name: koko -Version: 24.02.2 +Version: 24.05.0 Release: 0 Summary: Kirigami based gallery application License: LGPL-2.1-or-later URL: https://apps.kde.org/koko/ -Source0: %{name}-%{version}.tar.xz +Source0: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{ve… %if %{with released} -Source1: %{name}-%{version}.tar.xz.sig +Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{ve… Source2: applications.keyring %endif # TODO Sources change daily, download updates before each release ++++++ admin1CodesASCII.txt ++++++ --- /var/tmp/diff_new_pack.IMtEhc/_old 2024-05-28 17:29:35.269696208 +0200 +++ /var/tmp/diff_new_pack.IMtEhc/_new 2024-05-28 17:29:35.273696354 +0200 @@ -3587,7 +3587,7 @@ UA.10 Kirovohrad Kirovohrad 705811 UA.09 Khmelnytskyi Khmelnytskyi 706370 UA.08 Kherson Kherson 706442 -UA.07 Kharkiv Kharkiv 706482 +UA.07 Kharkivs’ka Oblast’ Kharkivs'ka Oblast' 706482 UA.06 Ivano-Frankivsk Ivano-Frankivsk 707470 UA.05 Donetsk Donetsk 709716 UA.04 Dnipropetrovsk Dnipropetrovsk 709929 ++++++ admin2Codes.txt ++++++ --- /var/tmp/diff_new_pack.IMtEhc/_old 2024-05-28 17:29:35.329698402 +0200 +++ /var/tmp/diff_new_pack.IMtEhc/_new 2024-05-28 17:29:35.341698841 +0200 @@ -13123,7 +13123,7 @@ FI.02.023 Turku Turku 9610674 FI.02.024 Vakka-Suomi Vakka-Suomi 9610675 FI.02.025 Loimaa Loimaa 9610676 -FI.01.011 Helsinki Helsinki 9610677 +FI.01.011 Helsinki sub-region Helsinki sub-region 9610677 FI.04.041 Rauma Rauma 9610678 FI.04.043 Pori Pori 9610679 FI.04.044 Pohjois-Satakunta Pohjois-Satakunta 9610680 @@ -18724,7 +18724,7 @@ JP.06.1854517 Ōi-gun Oi-gun 1854517 JP.07.1854627 Ogōri-shi Ogori-shi 1854627 JP.33.1854650 Ogi-shi Ogi-shi 1854650 -JP.02.1854681 Oga-shi Oga-shi 1854681 +JP.02.1854681 Oga Shi Oga Shi 1854681 JP.09.1854700 Ōgaki Shi Ogaki Shi 1854700 JP.19.1854744 Odawara-shi Odawara-shi 1854744 JP.36.1854750 Ōda Shi Oda Shi 1854750 @@ -19141,7 +19141,7 @@ JP.05.1926017 Yawatahama-shi Yawatahama-shi 1926017 JP.05.1926135 Imabari-shi Imabari-shi 1926135 JP.12.2038726 Okushiri-gun Okushiri-gun 2038726 -JP.02.2110459 Yuzawa-shi Yuzawa-shi 2110459 +JP.02.2110459 Yuzawa Shi Yuzawa Shi 2110459 JP.44.2110496 Yonezawa Shi Yonezawa Shi 2110496 JP.02.2110504 Yokote Shi Yokote Shi 2110504 JP.44.2110552 Yamagata Shi Yamagata Shi 2110552 @@ -19149,7 +19149,7 @@ JP.16.2110604 Waga-gun Waga-gun 2110604 JP.14.2110701 Tsuchiura-shi Tsuchiura-shi 2110701 JP.14.2110728 Toride Shi Toride Shi 2110728 -JP.16.2110732 Tōno-shi Tono-shi 2110732 +JP.16.2110732 Tōno Shi Tono Shi 2110732 JP.04.2110747 Tomisato-shi Tomisato-shi 2110747 JP.24.2110755 Tome Shi Tome Shi 2110755 JP.04.2110773 Tōgane Shi Togane Shi 2110773 @@ -19188,11 +19188,11 @@ JP.44.2111778 Nagai-shi Nagai-shi 2111778 JP.44.2111805 Murayama Shi Murayama Shi 2111805 JP.24.2111817 Motoyoshi Gun Motoyoshi Gun 2111817 -JP.16.2111833 Morioka-shi Morioka-shi 2111833 +JP.16.2111833 Morioka Shi Morioka Shi 2111833 JP.38.2111835 Mooka-shi Mooka-shi 2111835 JP.44.2111850 Mogami-gun Mogami-gun 2111850 JP.04.2111854 Mobara Shi Mobara Shi 2111854 -JP.16.2111883 Miyako-shi Miyako-shi 2111883 +JP.16.2111883 Miyako Shi Miyako Shi 2111883 JP.24.2111889 Miyagi Gun Miyagi Gun 2111889 JP.14.2111899 Mito Shi Mito Shi 2111899 JP.02.2111935 Minamiakita-gun Minamiakita-gun 2111935 @@ -19200,7 +19200,7 @@ JP.24.2112092 Kurihara Shi Kurihara Shi 2112092 JP.14.2112115 Kuji-gun Kuji-gun 2112115 JP.08.2112139 Kōriyama Shi Koriyama Shi 2112139 -JP.16.2112223 Kitakami-shi Kitakami-shi 2112223 +JP.16.2112223 Kitakami Shi Kitakami Shi 2112223 JP.14.2112231 Kitaibaraki Shi Kitaibaraki Shi 2112231 JP.02.2112235 Kitaakita-gun Kitaakita-gun 2112235 JP.24.2112261 Kesennuma Shi Kesennuma Shi 2112261 @@ -19214,7 +19214,7 @@ JP.14.2112399 Kamisu-shi Kamisu-shi 2112399 JP.44.2112407 Kaminoyama-shi Kaminoyama-shi 2112407 JP.16.2112424 Kamihei-gun Kamihei-gun 2112424 -JP.16.2112441 Kamaishi-shi Kamaishi-shi 2112441 +JP.16.2112441 Kamaishi Shi Kamaishi Shi 2112441 JP.04.2112445 Kamagaya Shi Kamagaya Shi 2112445 JP.24.2112525 Iwanuma-shi Iwanuma-shi 2112525 JP.08.2112535 Iwaki-shi Iwaki-shi 2112535 @@ -19242,40 +19242,40 @@ JP.02.2113122 Akita Shi Akita Shi 2113122 JP.08.2113158 Adachi-gun Adachi-gun 2113158 JP.04.2113162 Abiko Shi Abiko Shi 2113162 -JP.12.2127415 Yūbari-shi Yubari-shi 2127415 +JP.12.2127415 Yūbari Shi Yubari Shi 2127415 JP.12.2127440 Yoichi-gun Yoichi-gun 2127440 JP.02.2127468 Yamamoto-gun Yamamoto-gun 2127468 JP.12.2127513 Wakkanai Shi Wakkanai Shi 2127513 -JP.12.2127544 Utashinai-shi Utashinai-shi 2127544 +JP.12.2127544 Utashinai Shi Utashinai Shi 2127544 JP.03.2127674 Towada Shi Towada Shi 2127674 JP.12.2127730 Tomamae Gun Tomamae Gun 2127730 JP.12.2127732 Tomakomai Shi Tomakomai Shi 2127732 JP.12.2127817 Teshio Gun Teshio Gun 2127817 -JP.12.2127895 Takikawa-shi Takikawa-shi 2127895 -JP.12.2127954 Sunagawa-shi Sunagawa-shi 2127954 +JP.12.2127895 Takikawa Shi Takikawa Shi 2127895 +JP.12.2127954 Sunagawa Shi Sunagawa Shi 2127954 JP.03.2128134 Shimokita-gun Shimokita-gun 2128134 JP.12.2128201 Shibetsu Shi Shibetsu Shi 2128201 JP.12.2128291 Sapporo-shi Sapporo-shi 2128291 JP.03.2128302 Sannohe Gun Sannohe Gun 2128302 -JP.12.2128378 Rumoi-shi Rumoi-shi 2128378 +JP.12.2128378 Rumoi Shi Rumoi Shi 2128378 JP.12.2128405 Rishiri Gun Rishiri Gun 2128405 JP.12.2128418 Rebun Gun Rebun Gun 2128418 -JP.12.2128570 Otaru-shi Otaru-shi 2128570 +JP.12.2128570 Otaru Shi Otaru Shi 2128570 JP.02.2128783 Ōdate-shi Odate-shi 2128783 JP.12.2128812 Obihiro Shi Obihiro Shi 2128812 JP.02.2128864 Noshiro Shi Noshiro Shi 2128864 -JP.12.2128892 Noboribetsu-shi Noboribetsu-shi 2128892 +JP.12.2128892 Noboribetsu Shi Noboribetsu Shi 2128892 JP.16.2128940 Ninohe Shi Ninohe Shi 2128940 JP.16.2128941 Ninohe-gun Ninohe-gun 2128941 JP.12.2128971 Nemuro-shi Nemuro-shi 2128971 -JP.03.2129089 Mutsu-shi Mutsu-shi 2129089 -JP.12.2129098 Muroran-shi Muroran-shi 2129098 +JP.03.2129089 Mutsu Shi Mutsu Shi 2129089 +JP.12.2129098 Muroran Shi Muroran Shi 2129098 JP.03.2129224 Minamitsugaru Gun Minamitsugaru Gun 2129224 JP.12.2129370 Kushiro Shi Kushiro Shi 2129370 JP.12.2129373 Kushiro-gun Kushiro-gun 2129373 JP.03.2129393 Kuroishi Shi Kuroishi Shi 2129393 JP.16.2129400 Kunohe-gun Kunohe-gun 2129400 -JP.16.2129423 Kuji-shi Kuji-shi 2129423 +JP.16.2129423 Kuji Shi Kuji Shi 2129423 JP.03.2129525 Kitatsugaru Gun Kitatsugaru Gun 2129525 JP.12.2129532 Kitami Shi Kitami Shi 2129532 JP.02.2129593 Kazuno Shi Kazuno Shi 2129593 @@ -19286,7 +19286,7 @@ JP.12.2129763 Kamiiso-gun Kamiiso-gun 2129763 JP.12.2129779 Kameda-gun Kameda-gun 2129779 JP.12.2129864 Iwanai-gun Iwanai-gun 2129864 -JP.12.2129869 Iwamizawa-shi Iwamizawa-shi 2129869 +JP.12.2129869 Iwamizawa Shi Iwamizawa Shi 2129869 JP.12.2130044 Hiyama-gun Hiyama-gun 2130044 JP.03.2130056 Hirosaki Shi Hirosaki Shi 2130056 JP.12.2130058 Hiroo-gun Hiroo-gun 2130058 @@ -19295,17 +19295,17 @@ JP.03.2130200 Hachinohe Shi Hachinohe Shi 2130200 JP.03.2130225 Goshogawara Shi Goshogawara Shi 2130225 JP.12.2130287 Furubira-gun Furubira-gun 2130287 -JP.12.2130304 Furano-shi Furano-shi 2130304 -JP.12.2130331 Fukagawa-shi Fukagawa-shi 2130331 +JP.12.2130304 Furano Shi Furano Shi 2130304 +JP.12.2130331 Fukagawa Shi Fukagawa Shi 2130331 JP.12.2130385 Eniwa-shi Eniwa-shi 2130385 -JP.12.2130402 Ebetsu-shi Ebetsu-shi 2130402 +JP.12.2130402 Ebetsu Shi Ebetsu Shi 2130402 JP.12.2130419 Date-shi Date-shi 2130419 JP.12.2130449 Chitose Shi Chitose Shi 2130449 -JP.12.2130533 Bibai-shi Bibai-shi 2130533 -JP.12.2130609 Ashibetsu-shi Ashibetsu-shi 2130609 +JP.12.2130533 Bibai Shi Bibai Shi 2130533 +JP.12.2130609 Ashibetsu Shi Ashibetsu Shi 2130609 JP.12.2130628 Asahikawa-shi Asahikawa-shi 2130628 JP.03.2130654 Aomori Shi Aomori Shi 2130654 -JP.12.2130704 Akabira-shi Akabira-shi 2130704 +JP.12.2130704 Akabira Shi Akabira Shi 2130704 JP.12.2130724 Abuta-gun Abuta-gun 2130724 JP.12.2130736 Abashiri Shi Abashiri Shi 2130736 JP.05.6691620 Tōon-shi Toon-shi 6691620 @@ -19528,8 +19528,8 @@ JP.12.7428119 Yamakoshi-gun Yamakoshi-gun 7428119 JP.12.7428120 Yūbari-gun Yubari-gun 7428120 JP.12.7428121 Yūfutsu-gun Yufutsu-gun 7428121 -JP.12.7429513 Hokuto-shi Hokuto-shi 7429513 -JP.12.7429514 Ishikari-shi Ishikari-shi 7429514 +JP.12.7429513 Hokuto Shi Hokuto Shi 7429513 +JP.12.7429514 Ishikari Shi Ishikari Shi 7429514 JP.12.7429515 Monbetsu Shi Monbetsu Shi 7429515 JP.12.7429516 Nayoro Shi Nayoro Shi 7429516 JP.03.7439929 Nakatsugaru Gun Nakatsugaru Gun 7439929 @@ -19540,13 +19540,13 @@ JP.16.7441805 Nishiiwai Gun Nishiiwai Gun 7441805 JP.16.7441806 Shimohei-gun Shimohei-gun 7441806 JP.16.7441808 Hachimantai Shi Hachimantai Shi 7441808 -JP.16.7441816 Ōshū-shi Oshu-shi 7441816 -JP.16.7441817 Rikuzentakata-shi Rikuzentakata-shi 7441817 +JP.16.7441816 Ōshū Shi Oshu Shi 7441816 +JP.16.7441817 Rikuzen-takata Shi Rikuzen-takata Shi 7441817 JP.02.7443147 Ogachi-gun Ogachi-gun 7443147 -JP.02.7443149 Daisen-shi Daisen-shi 7443149 -JP.02.7443155 Katagami-shi Katagami-shi 7443155 +JP.02.7443149 Daisen Shi Daisen Shi 7443149 +JP.02.7443155 Katagami Shi Katagami Shi 7443155 JP.02.7443156 Kitaakita-shi Kitaakita-shi 7443156 -JP.02.7443160 Yurihonjō-shi Yurihonjo-shi 7443160 +JP.02.7443160 Yuri-honjō Shi Yuri-honjo Shi 7443160 JP.24.7446984 Igu-gun Igu-gun 7446984 JP.24.7446985 Kami-gun Kami-gun 7446985 JP.24.7446986 Oshika Gun Oshika Gun 7446986 @@ -19647,7 +19647,7 @@ JP.37.8301107 Kakegawa Shi Kakegawa Shi 8301107 JP.37.8301108 Kosai Shi Kosai Shi 8301108 JP.27.8301120 Isahaya Shi Isahaya Shi 8301120 -JP.12.8301405 Mikasa-shi Mikasa-shi 8301405 +JP.12.8301405 Mikasa Shi Mikasa Shi 8301405 JP.24.8303940 Natori Shi Natori Shi 8303940 JP.24.8303941 Tagajō Shi Tagajo Shi 8303941 JP.14.8304033 Hitachinaka Shi Hitachinaka Shi 8304033 @@ -25211,7 +25211,7 @@ MX.26.035 Imuris Imuris 8583399 MX.26.036 Magdalena Magdalena 8583400 MX.26.037 Mazatán Mazatan 8583401 -MX.26.038 Moctezuma Moctezuma 8583402 +MX.26.038 Moctezuma municipality Moctezuma municipality 8583402 MX.26.039 Naco Naco 8583403 MX.26.040 Nácori Chico Nacori Chico 8583404 MX.26.041 Nacozari de García Nacozari de Garcia 8583405 @@ -25239,7 +25239,7 @@ MX.26.063 Tepache Tepache 8583427 MX.26.064 Trincheras Trincheras 8583428 MX.26.065 Tubutama Tubutama 8583429 -MX.26.066 Ures Ures 8583430 +MX.26.066 Ures municipality Ures municipality 8583430 MX.26.067 Villa Hidalgo Villa Hidalgo 8583431 MX.26.068 Villa Pesqueira Villa Pesqueira 8583432 MX.26.069 Yécora Yecora 8583433 @@ -28246,7 +28246,7 @@ PE.13.1307 Provincia de Pacasmayo Provincia de Pacasmayo 3694175 PE.13.1306 Provincia de Otuzco Provincia de Otuzco 3694211 PE.22.2201 Provincia de Moyobamba Provincia de Moyobamba 3694563 -PE.20.2004 Morropon Morropon 3694581 +PE.20.2004 Provincia de Morropón Provincia de Morropon 3694581 PE.16.1601 Provincia de Maynas Provincia de Maynas 3694873 PE.02.0213 Provincia de Mariscal Luzuriaga Provincia de Mariscal Luzuriaga 3694919 PE.22.2206 Provincia de Mariscal Cáceres Provincia de Mariscal Caceres 3694924 @@ -28297,13 +28297,13 @@ PE.12.1207 Provincia de Tarma Provincia de Tarma 3927757 PE.23.2304 Provincia de Tarata Provincia de Tarata 3927773 PE.17.1701 Provincia de Tambopata Provincia de Tambopata 3927937 -PE.17.1703 Provincia de Tahuamanú Provincia de Tahuamanu 3928091 +PE.17.1703 Tahuamanu Tahuamanu 3928091 PE.23.2301 Provincia de Tacna Provincia de Tacna 3928126 PE.12.1206 Provincia de Satipo Provincia de Satipo 3928923 -PE.21.2111 San Roman San Roman 3929310 +PE.21.2111 Provincia de San Román Provincia de San Roman 3929310 PE.21.2112 Provincia de Sandia Provincia de Sandia 3929739 PE.02.0217 Provincia de Recuay Provincia de Recuay 3930459 -PE.08.0812 Provincia de Quispicanchis Provincia de Quispicanchis 3930646 +PE.08.0812 Provincia de Quispicanchi Provincia de Quispicanchi 3930646 PE.21.2101 Provincia de Puno Provincia de Puno 3931274 PE.11.1105 Provincia de Pisco Provincia de Pisco 3932143 PE.08.0811 Provincia de Paucartambo Provincia de Paucartambo 3932649 @@ -28312,10 +28312,10 @@ PE.05.0507 Provincia de Parinacochas Provincia de Parinacochas 3932906 PE.11.1104 Provincia de Palpa Provincia de Palpa 3933344 PE.19.1903 Provincia de Oxapampa Provincia de Oxapampa 3933873 -PE.11.1103 Provincia de Nazca Provincia de Nazca 3934353 +PE.11.1103 Nasca Nasca 3934353 PE.21.2108 Provincia de Melgar Provincia de Melgar 3935054 PE.18.1801 Provincia de Mariscal Nieto Provincia de Mariscal Nieto 3935255 -PE.17.1702 Provincia de Manú Provincia de Manu 3935423 +PE.17.1702 Provincia de Manu Provincia de Manu 3935423 PE.05.0506 Provincia de Lucanas Provincia de Lucanas 3935835 PE.04.0408 Provincia de La Unión Provincia de La Union 3936625 PE.21.2107 Provincia de Lampa Provincia de Lampa 3936995 @@ -28335,7 +28335,7 @@ PE.03.0307 Provincia de Grau Provincia de Grau 3940641 PE.18.1802 Provincia de General Sánchez Cerro Provincia de General Sanchez Cerro 3940771 PE.08.0808 Provincia de Espinar Provincia de Espinar 3941092 -PE.19.1902 Provincia de Daniel Carrión Provincia de Daniel Carrion 3941507 +PE.19.1902 Daniel Alcides Carrión Daniel Alcides Carrion 3941507 PE.08.0801 Provincia de Cusco Provincia de Cusco 3941582 PE.03.0305 Provincia de Cotabambas Provincia de Cotabambas 3942083 PE.04.0406 Provincia de Condesuyos Provincia de Condesuyos 3942520 @@ -35388,7 +35388,7 @@ RU.13.1535939 Gorod Miass Gorod Miass 1535939 RU.13.1535940 Plastovskij rayon Plastovskij rayon 1535940 RU.13.1535941 Gorod Yuzhnoural’sk Gorod Yuzhnoural'sk 1535941 -RU.71.1536221 Polevskoy Gorod Polevskoy Gorod 1536221 +RU.71.1536221 Polevskoy Gorodskoy Okrug Polevskoy Gorodskoy Okrug 1536221 RU.31.1536883 Chernogorsk Gorod Chernogorsk Gorod 1536883 RU.31.1536884 Abakan Gorod Abakan Gorod 1536884 RU.31.1536885 Sayanogorsk Gorod Sayanogorsk Gorod 1536885 @@ -36300,6 +36300,35 @@ RU.06.12738773 Solovetskiy Rayon Solovetskiy Rayon 12738773 RU.06.12738774 Gorodskoy Okrug Arkhangel'sk Gorodskoy Okrug Arkhangel'sk 12738774 RU.06.12738775 Novaya Zemlya Rayon Novaya Zemlya Rayon 12738775 +RU.72.12750977 Gorodskoy Okrug Morshansk Gorodskoy Okrug Morshansk 12750977 +RU.72.12750978 Gorodskoy Okug Kirsanov Gorodskoy Okug Kirsanov 12750978 +RU.72.12750979 Gorodskoy Okrug Tambov Gorodskoy Okrug Tambov 12750979 +RU.72.12750980 Gorodskoy Okrug Uvarovo Gorodskoy Okrug Uvarovo 12750980 +RU.72.12750981 Gorodskoy Okrug Kotovsk Gorodskoy Okrug Kotovsk 12750981 +RU.38.12760005 Gorodskoy Okrug Anapa Gorodskoy Okrug Anapa 12760005 +RU.71.12789796 Gorodskoy Okrug Alapayevsk Gorodskoy Okrug Alapayevsk 12789796 +RU.71.12789797 Serovskiy Gorodskoy Okrug Serovskiy Gorodskoy Okrug 12789797 +RU.71.12789798 ZATO Novoural'sk ZATO Novoural'sk 12789798 +RU.71.12789799 Nizhneturinskiy Gorodskoy Okrug Nizhneturinskiy Gorodskoy Okrug 12789799 +RU.71.12789800 Kushvinskiy Gorodskoy Okrug Kushvinskiy Gorodskoy Okrug 12789800 +RU.71.12789801 Gorodskoy Okrug Karpinsk Gorodskoy Okrug Karpinsk 12789801 +RU.71.12789802 Ivdel'skiy Gorodskoy Okrug Ivdel'skiy Gorodskoy Okrug 12789802 +RU.71.12789803 Berëzovskiy Gorodskoy Okrug Berezovskiy Gorodskoy Okrug 12789803 +RU.71.12789804 Gorodskoy Okrug Yekaterinburg Gorodskoy Okrug Yekaterinburg 12789804 +RU.71.12789805 Kachkanarskiy Gorodskoy Okrug Kachkanarskiy Gorodskoy Okrug 12789805 +RU.71.12789806 Gorodskoy Okrug Krasnoural'sk Gorodskoy Okrug Krasnoural'sk 12789806 +RU.71.12789807 Kamensk-Ural'skiy Gorodskoy Okrug Kamensk-Ural'skiy Gorodskoy Okrug 12789807 +RU.71.12789808 Kamyshlovskiy Gorodskoy Okrug Kamyshlovskiy Gorodskoy Okrug 12789808 +RU.71.12789809 Gorodskoy Okrug Nizhnyaya Salda Gorodskoy Okrug Nizhnyaya Salda 12789809 +RU.71.12789810 Gorodskoy Okrug Krasnoufimsk Gorodskoy Okrug Krasnoufimsk 12789810 +RU.71.12789812 Gorodskoy Okrug Nizhniy Tagil Gorodskoy Okrug Nizhniy Tagil 12789812 +RU.71.12789813 Gorodskoy Okrug Krasnotur'insk Gorodskoy Okrug Krasnotur'insk 12789813 +RU.71.12789814 Kirovgradskiy Gorodskoy Okrug Kirovgradskiy Gorodskoy Okrug 12789814 +RU.71.12789815 ZATO Lesnoy ZATO Lesnoy 12789815 +RU.71.12789816 ZATO Ural'skiy ZATO Ural'skiy 12789816 +RU.71.12789817 Gorodskoy Okrug Pervoural'sk Gorodskoy Okrug Pervoural'sk 12789817 +RU.71.12789818 Asbestovskiy Gorodskoy Okrug Asbestovskiy Gorodskoy Okrug 12789818 +RU.71.12789819 Severoural'skiy Gorodskoy Okrug Severoural'skiy Gorodskoy Okrug 12789819 RW.11.52 Nyagatare District Nyagatare District 7688799 RW.11.53 Gatsibo District Gatsibo District 7688800 RW.11.54 Kayonza District Kayonza District 7688801 @@ -40475,7 +40504,7 @@ UA.11.0120 Gorodskoy okrug Yalta Gorodskoy okrug Yalta 8449687 UA.11.0110 Kerchens'ka Mis'ka Rada Kerchens'ka Mis'ka Rada 8449692 UA.07.6310 Lozova City Council Lozova City Council 9101597 -UA.07.6312 Kharkiv City Council Kharkiv City Council 9114284 +UA.07.6312 Kharkiv Raion Kharkiv Raion 9114284 UA.07.6314 Chuhuiv City Council Chuhuiv City Council 9114317 UA.07.6308 Kupianska Miskrada Kupianska Miskrada 9194084 UA.07.6304 Iziumska Miskrada Iziumska Miskrada 9197254 ++++++ cities1000.zip ++++++ /work/SRC/openSUSE:Factory/koko/cities1000.zip /work/SRC/openSUSE:Factory/.koko.new.24587/cities1000.zip differ: char 11, line 1 ++++++ koko-24.02.2.tar.xz -> koko-24.05.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/koko/koko-24.02.2.tar.xz /work/SRC/openSUSE:Factory/.koko.new.24587/koko-24.05.0.tar.xz differ: char 26, line 1

1 0