openSUSE Commits
Threads by month
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
June 2022
- 1 participants
- 2040 discussions
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package perl-App-CELL for openSUSE:Factory checked in at 2022-06-28 15:23:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-App-CELL (Old)
and /work/SRC/openSUSE:Factory/.perl-App-CELL.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-App-CELL"
Tue Jun 28 15:23:07 2022 rev:5 rq:985583 version:0.231
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-App-CELL/perl-App-CELL.changes 2020-02-14 16:38:49.895634464 +0100
+++ /work/SRC/openSUSE:Factory/.perl-App-CELL.new.1548/perl-App-CELL.changes 2022-06-28 15:23:27.142039122 +0200
@@ -1,0 +2,11 @@
+Tue Jun 28 12:09:08 UTC 2022 - Dirk Stoecker <opensuse(a)dstoecker.de>
+
+- updated to 0.231
+ - MANIFEST.SKIP: add bootstrap.sh
+ - bootstrap.sh: install cpanspec package
+
+ 0.230 2022-06-28 11:18 CEST
+ - CONTRIBUTING.rst: add new file
+ - bootstrap.sh: add new file and update README.rst
+
+-------------------------------------------------------------------
@@ -7 +17,0 @@
-
@@ -311 +320,0 @@
-
Old:
----
App-CELL-0.229.tar.gz
New:
----
App-CELL-0.231.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-App-CELL.spec ++++++
--- /var/tmp/diff_new_pack.5YEZKj/_old 2022-06-28 15:23:27.558039743 +0200
+++ /var/tmp/diff_new_pack.5YEZKj/_new 2022-06-28 15:23:27.566039755 +0200
@@ -1,7 +1,7 @@
#
# spec file for package perl-App-CELL
#
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,18 +16,16 @@
#
+%define cpan_name App-CELL
Name: perl-App-CELL
-Version: 0.229
+Version: 0.231
Release: 0
-%define cpan_name App-CELL
-Summary: Configuration, Error-handling, Localization, and Logging
License: BSD-3-Clause
-Group: Development/Libraries/Perl
-Url: https://metacpan.org/release/%{cpan_name}
+Summary: Configuration, Error-handling, Localization, and Logging
+URL: https://metacpan.org/release/%{cpan_name}
Source0: https://cpan.metacpan.org/authors/id/S/SM/SMITHFARM/%{cpan_name}-%{version}…
Source1: cpanspec.yml
BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: perl
BuildRequires: perl-macros
BuildRequires: perl(Date::Format)
@@ -63,7 +61,7 @@
read App::CELL::Guide.
%prep
-%setup -q -n %{cpan_name}-%{version}
+%autosetup -n %{cpan_name}-%{version}
%build
perl Build.PL installdirs=vendor
@@ -77,8 +75,7 @@
%perl_gen_filelist
%files -f %{name}.files
-%defattr(-,root,root,755)
-%doc Changes README.rst WISHLIST
+%doc Changes CONTRIBUTING.rst README.rst WISHLIST
%license LICENSE
%changelog
++++++ App-CELL-0.229.tar.gz -> App-CELL-0.231.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-CELL-0.229/CONTRIBUTING.rst new/App-CELL-0.231/CONTRIBUTING.rst
--- old/App-CELL-0.229/CONTRIBUTING.rst 1970-01-01 01:00:00.000000000 +0100
+++ new/App-CELL-0.231/CONTRIBUTING.rst 2022-06-28 12:05:52.000000000 +0200
@@ -0,0 +1,62 @@
+========================================
+Submitting Patches to Date::Holidays::CZ
+========================================
+
+If you have a patch that fixes an issue, feel free to open a GitHub pull request
+("PR") targeting the "master" branch, but do read this document first, as it
+contains important information for ensuring that your PR passes code review
+smoothly.
+
+Sign your work
+--------------
+
+The sign-off is a simple line at the end of the explanation for the
+commit, which certifies that you wrote it or otherwise have the right to
+pass it on as a open-source patch. The rules are pretty simple: if you
+can certify the below:
+
+Developer's Certificate of Origin 1.1
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+By making a contribution to this project, I certify that:
+
+ (a) The contribution was created in whole or in part by me and I
+ have the right to submit it under the open source license
+ indicated in the file; or
+
+ (b) The contribution is based upon previous work that, to the best
+ of my knowledge, is covered under an appropriate open source
+ license and I have the right under that license to submit that
+ work with modifications, whether created in whole or in part
+ by me, under the same open source license (unless I am
+ permitted to submit under a different license), as indicated
+ in the file; or
+
+ (c) The contribution was provided directly to me by some other
+ person who certified (a), (b) or (c) and I have not modified
+ it.
+
+ (d) I understand and agree that this project and the contribution
+ are public and that a record of the contribution (including all
+ personal information I submit with it, including my sign-off) is
+ maintained indefinitely and may be redistributed consistent with
+ this project or the open source license(s) involved.
+
+then you just add a line saying ::
+
+ Signed-off-by: Random J Developer <random(a)developer.example.org>
+
+using your real name (sorry, no pseudonyms or anonymous contributions.)
+
+Git can sign off on your behalf
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Please note that git makes it trivially easy to sign commits. First, set the
+following config options::
+
+ $ git config --list | grep user
+ user.email=my_real_email_address(a)example.com
+ user.name=My Real Name
+
+Then just remember to use ``git commit -s``. Git will add the ``Signed-off-by``
+line automatically.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-CELL-0.229/Changes new/App-CELL-0.231/Changes
--- old/App-CELL-0.229/Changes 2020-02-12 12:13:39.000000000 +0100
+++ new/App-CELL-0.231/Changes 2022-06-28 12:05:52.000000000 +0200
@@ -906,3 +906,11 @@
- Qualify all calls to CORE::caller()
- t/034-status-dump.t: use Test::Output
+0.230 2022-06-28 11:18 CEST
+- CONTRIBUTING.rst: add new file
+- bootstrap.sh: add new file and update README.rst
+
+0.231 2022-06-28 12:05 CEST
+- MANIFEST.SKIP: add bootstrap.sh
+- bootstrap.sh: install cpanspec package
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-CELL-0.229/MANIFEST new/App-CELL-0.231/MANIFEST
--- old/App-CELL-0.229/MANIFEST 2020-02-12 12:13:39.000000000 +0100
+++ new/App-CELL-0.231/MANIFEST 2022-06-28 12:05:52.000000000 +0200
@@ -5,6 +5,7 @@
config/CELL_MetaConfig.pm
config/CELL_SiteConfig.pm
config/README
+CONTRIBUTING.rst
lib/App/CELL.pm
lib/App/CELL/Config.pm
lib/App/CELL/Guide.pm
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-CELL-0.229/MANIFEST.SKIP new/App-CELL-0.231/MANIFEST.SKIP
--- old/App-CELL-0.229/MANIFEST.SKIP 2020-02-12 12:13:39.000000000 +0100
+++ new/App-CELL-0.231/MANIFEST.SKIP 2022-06-28 12:05:52.000000000 +0200
@@ -66,7 +66,6 @@
\bBuild.COM$
\bBUILD.COM$
\bbuild.com$
-^MANIFEST\.SKIP
# Avoid archives of this distribution
\bApp-Dochazka-Common-[\d\.\_]+
@@ -82,3 +81,6 @@
# Avoid perlcritic, travis config files
\B\.perlcriticrc\b
\B\.travis.yml\b
+
+# Avoid bootstrap.sh
+\bbootstrap.sh$
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-CELL-0.229/META.json new/App-CELL-0.231/META.json
--- old/App-CELL-0.229/META.json 2020-02-12 12:13:39.000000000 +0100
+++ new/App-CELL-0.231/META.json 2022-06-28 12:05:52.000000000 +0200
@@ -51,14 +51,14 @@
"provides" : {
"App::CELL" : {
"file" : "lib/App/CELL.pm",
- "version" : "0.229"
+ "version" : "0.231"
},
"App::CELL::Config" : {
"file" : "lib/App/CELL/Config.pm"
},
"App::CELL::Guide" : {
"file" : "lib/App/CELL/Guide.pm",
- "version" : "0.229"
+ "version" : "0.231"
},
"App::CELL::Load" : {
"file" : "lib/App/CELL/Load.pm"
@@ -94,6 +94,6 @@
"url" : "https://github.com/smithfarm/cell"
}
},
- "version" : "0.229",
+ "version" : "0.231",
"x_serialization_backend" : "JSON::PP version 2.27400_02"
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-CELL-0.229/META.yml new/App-CELL-0.231/META.yml
--- old/App-CELL-0.229/META.yml 2020-02-12 12:13:39.000000000 +0100
+++ new/App-CELL-0.231/META.yml 2022-06-28 12:05:52.000000000 +0200
@@ -26,12 +26,12 @@
provides:
App::CELL:
file: lib/App/CELL.pm
- version: '0.229'
+ version: '0.231'
App::CELL::Config:
file: lib/App/CELL/Config.pm
App::CELL::Guide:
file: lib/App/CELL/Guide.pm
- version: '0.229'
+ version: '0.231'
App::CELL::Load:
file: lib/App/CELL/Load.pm
App::CELL::Log:
@@ -60,5 +60,5 @@
bugtracker: https://github.com/smithfarm/cell/issues
license: http://opensource.org/licenses/bsd-license.php
repository: https://github.com/smithfarm/cell
-version: '0.229'
+version: '0.231'
x_serialization_backend: 'CPAN::Meta::YAML version 0.018'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-CELL-0.229/README.rst new/App-CELL-0.231/README.rst
--- old/App-CELL-0.229/README.rst 2020-02-12 12:13:39.000000000 +0100
+++ new/App-CELL-0.231/README.rst 2022-06-28 12:05:52.000000000 +0200
@@ -2,8 +2,7 @@
App::CELL
=========
-.. image:: https://travis-ci.org/smithfarm/cell.svg?branch=master
- :target: https://travis-ci.org/smithfarm/cell
+.. image:: https://travis-ci.org/smithfarm/cell.svg?branch=master :target: https://travis-ci.org/smithfarm/cell
.. image:: https://badge.fury.io/pl/App-CELL.svg
:target: https://badge.fury.io/pl/App-CELL
@@ -12,6 +11,7 @@
Configuration, Error-handling, Localization, and Logging "framework"
--------------------------------------------------------------------
+
General Documentation
=====================
@@ -26,28 +26,37 @@
* http://metacpan.org/pod/App::CELL::Test
* http://metacpan.org/pod/App::CELL::Test::LogToFile
+
+Contributor Documentation
+=========================
+
+All would-be contributors should first read ``CONTRIBUTING.rst``.
+
+
Maintainer Documentation
========================
Read on only if you are a maintainer of ``App::CELL``
-How to run tests
-----------------
+How to build and run tests
+--------------------------
-After cloning the git repo, you'll need to install all of the
-dependencies shown in Build.PL -- either using distro packages
-or ``cpanm``.
+First, install build and runtime dependencies. This can be done either by
+installing packages from your favorite Linux distribution or direct from CPAN
+using a tool such as ``cpanm``.
-Since ``App::CELL`` needs its configuration files installed
-in the system in order to run, install it::
+Second, build and install the distro:
$ perl Build.PL ; ./Build ; sudo ./Build install
-Then::
+Third, run the tests:
$ prove -l t/
+To ease the pain, a script called ``bootstrap.sh`` is provided. This script
+automates all three of the steps just described.
+
To include the "Perl Critic" and "Check Manifest" tests, do::
$ sudo cpanm Test::Perl::Critic
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-CELL-0.229/lib/App/CELL/Guide.pm new/App-CELL-0.231/lib/App/CELL/Guide.pm
--- old/App-CELL-0.229/lib/App/CELL/Guide.pm 2020-02-12 12:13:39.000000000 +0100
+++ new/App-CELL-0.231/lib/App/CELL/Guide.pm 2022-06-28 12:05:52.000000000 +0200
@@ -46,11 +46,11 @@
=head1 VERSION
-Version 0.229
+Version 0.231
=cut
-our $VERSION = '0.229';
+our $VERSION = '0.231';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-CELL-0.229/lib/App/CELL.pm new/App-CELL-0.231/lib/App/CELL.pm
--- old/App-CELL-0.229/lib/App/CELL.pm 2020-02-12 12:13:39.000000000 +0100
+++ new/App-CELL-0.231/lib/App/CELL.pm 2022-06-28 12:05:52.000000000 +0200
@@ -54,11 +54,11 @@
=head1 VERSION
-Version 0.229
+Version 0.231
=cut
-our $VERSION = '0.229';
+our $VERSION = '0.231';
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ibus-table-others for openSUSE:Factory checked in at 2022-06-28 15:23:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ibus-table-others (Old)
and /work/SRC/openSUSE:Factory/.ibus-table-others.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ibus-table-others"
Tue Jun 28 15:23:06 2022 rev:19 rq:985582 version:1.3.13
Changes:
--------
--- /work/SRC/openSUSE:Factory/ibus-table-others/ibus-table-others.changes 2021-07-20 15:39:47.121506855 +0200
+++ /work/SRC/openSUSE:Factory/.ibus-table-others.new.1548/ibus-table-others.changes 2022-06-28 15:23:26.466038113 +0200
@@ -1,0 +2,6 @@
+Sat Jun 25 18:24:19 UTC 2022 - Gordon Leung <pirateclip(a)protonmail.com> - 1.3.13
+
+update: 1.3.12 -> 1.3.13
+- Improvements in the latex.txt table gh#mike-fabian/ibus-table-others#24
+
+-------------------------------------------------------------------
Old:
----
ibus-table-others-1.3.12.tar.gz
New:
----
ibus-table-others-1.3.13.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ibus-table-others.spec ++++++
--- /var/tmp/diff_new_pack.S7qNnj/_old 2022-06-28 15:23:26.850038686 +0200
+++ /var/tmp/diff_new_pack.S7qNnj/_new 2022-06-28 15:23:26.858038698 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ibus-table-others
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: ibus-table-others
-Version: 1.3.12
+Version: 1.3.13
Release: 0
Summary: Other non-Chinese tables for ibus
License: GPL-3.0-or-later
++++++ ibus-table-others-1.3.12.tar.gz -> ibus-table-others-1.3.13.tar.gz ++++++
++++ 3979 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ibus-table-others-1.3.12/ChangeLog new/ibus-table-others-1.3.13/ChangeLog
--- old/ibus-table-others-1.3.12/ChangeLog 2021-07-14 13:21:27.000000000 +0200
+++ new/ibus-table-others-1.3.13/ChangeLog 2022-04-25 11:31:02.000000000 +0200
@@ -1,9 +1,29 @@
-commit 8a7ed6cf8f70e1bcdf4345d5ed9edf0f9b6286c8
+commit 7f61c30f5be9a38352f8f3c247c02d8639c8595f
+Author: Mike FABIAN <mfabian(a)redhat.com>
+Date: Mon Apr 25 11:30:33 2022 +0200
+
+ Release 1.3.13
+
+commit ec9c80571796f68415b8e05a36ea00b90cca3525
+Author: Jonathan Chan <jonathanhwchan(a)gmail.com>
+Date: Sun Apr 24 12:19:50 2022 -0700
+
+ Use correct angle brackets
+
+ `\langle` and `\rangle` were previously U+2329, U+232A from Miscellaneous Technical. Changing them to U+27E8, U+27E9 from Miscellaneous Mathematical Symbols-A makes more sense and lets us also add the double angle brackets U+27EA, U+27EB.
+
+commit 7587b7155fe4c0224662f40a5da1cf2bccf5cbe4
Author: Mike FABIAN <mfabian(a)redhat.com>
Date: Wed Jul 14 13:02:10 2021 +0200
Release 1.3.12
+commit 826ba70e653cf9a4da180dddeb4365f4482eb4c7
+Author: Mike FABIAN <mfabian(a)redhat.com>
+Date: Wed Jul 14 13:20:48 2021 +0200
+
+ Add stuff to .gitignore
+
commit 58c57c7ff392c911bbff8ed8095884d4529ed7c3
Author: Mike FABIAN <mfabian(a)redhat.com>
Date: Wed Jul 14 12:54:43 2021 +0200
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ibus-table-others-1.3.12/configure.ac new/ibus-table-others-1.3.13/configure.ac
--- old/ibus-table-others-1.3.12/configure.ac 2021-07-14 13:21:27.000000000 +0200
+++ new/ibus-table-others-1.3.13/configure.ac 2022-04-25 11:30:14.000000000 +0200
@@ -23,7 +23,7 @@
m4_define([ibus_released], [1])
m4_define([ibus_major_version], [1])
m4_define([ibus_minor_version], [3])
-m4_define([ibus_micro_version], [12])
+m4_define([ibus_micro_version], [13])
# commented out as datestamp doesn't suit dist date.
m4_define(ibus_maybe_datestamp,
m4_esyscmd([if test x]ibus_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi]))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ibus-table-others-1.3.12/tables/latex.txt new/ibus-table-others-1.3.13/tables/latex.txt
--- old/ibus-table-others-1.3.12/tables/latex.txt 2021-07-05 13:26:37.000000000 +0200
+++ new/ibus-table-others-1.3.13/tables/latex.txt 2022-04-25 11:15:56.000000000 +0200
@@ -622,8 +622,10 @@
\flat ��� 0
\natural ��� 0
\sharp ��� 0
-\langle ��� 0
-\rangle ��� 0
+\langle ��� 0
+\rangle ��� 0
+\llangle ��� 0
+\rrangle ��� 0
\llbracket ��� 0
\rrbracket ��� 0
\llparenthesis ��� 0
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ibus-table-chinese for openSUSE:Factory checked in at 2022-06-28 15:23:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ibus-table-chinese (Old)
and /work/SRC/openSUSE:Factory/.ibus-table-chinese.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ibus-table-chinese"
Tue Jun 28 15:23:05 2022 rev:26 rq:985581 version:1.8.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/ibus-table-chinese/ibus-table-chinese.changes 2021-01-13 18:36:04.582347374 +0100
+++ /work/SRC/openSUSE:Factory/.ibus-table-chinese.new.1548/ibus-table-chinese.changes 2022-06-28 15:23:25.870037223 +0200
@@ -1,0 +2,16 @@
+Sat Jun 25 17:30:05 UTC 2022 - Gordon Leung <pirateclip(a)protonmail.com> - 1.8.8
+
+update: 1.8.3 -> 1.8.8
+- Move source to mike-fabian's repo as previous repo is now deprecated
+ * https://github.com/definite/ibus-table-chinese/blob/master/README
+- Simplify CMakeLists.txt to avoid requiring cmake-fedora
+- cangjie5.txt improvement gh#mike-fabian/ibus-table-chinese#87
+- quick5.txt improvement gh#mike-fabian/ibus-table-chinese#4
+- Add table_extra tag gh#definite/ibus-table-chinese#18
+- "Traditional Chinese only" is now the default for cangjie5 and quick5
+ * gh#mike-fabian/ibus-table-chinese#2
+- Build outside of source tree gh#mike-fabian/ibus-table-chinese#2
+
+chore: clean up specfile
+
+-------------------------------------------------------------------
Old:
----
ibus-table-chinese-1.8.3.tar.gz
New:
----
ibus-table-chinese-1.8.8.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ibus-table-chinese.spec ++++++
--- /var/tmp/diff_new_pack.sYMmV4/_old 2022-06-28 15:23:26.310037880 +0200
+++ /var/tmp/diff_new_pack.sYMmV4/_new 2022-06-28 15:23:26.318037892 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ibus-table-chinese
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,15 +17,14 @@
Name: ibus-table-chinese
-Version: 1.8.3
+Version: 1.8.8
Release: 0
Summary: Various Chinese input method table for the IBus framework
License: GPL-3.0-or-later
Group: System/I18n/Chinese
-URL: https://github.com/definite/ibus-table-chinese
-Source: https://github.com/definite/ibus-table-chinese/archive/%{version}/%{name}-%…
+URL: https://github.com/mike-fabian/ibus-table-chinese
+Source: https://github.com/mike-fabian/ibus-table-chinese/archive/%{version}/%{name…
BuildRequires: cmake
-BuildRequires: cmake-fedora-modules
BuildRequires: pkgconfig
BuildRequires: pkgconfig(ibus-table)
BuildArch: noarch
@@ -199,20 +198,18 @@
YongMa input method.
%prep
-%setup -q
-sed -i 's/\r//' tables/wubi-haifeng/COPYING
+%autosetup
%build
export PYTHON=python3
cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DDATA_DIR=%{_datadir} \
- -DPRJ_DOC_DIR=%{_docdir}/%{name} \
- -DCMAKE_FEDORA_TMP_DIR=.
+ -DPRJ_DOC_DIR=%{_docdir}/%{name}
make -j1 V=1
%install
%make_install
-rm -rf %{buildroot}%{_docdir}/%{name}
+rm -rf %{buildroot}/usr/share/doc/%{name}
%post array
%ibus_table_index_post array30
@@ -339,8 +336,6 @@
%files wubi-haifeng
%license COPYING
%doc ChangeLog AUTHORS NEWS README RELEASE-NOTES.txt
-%license tables/wubi-haifeng/COPYING
-%doc tables/wubi-haifeng/README
%{_ibus_icondir}/wubi-haifeng86.*
%{_ibus_tabledir}/wubi-haifeng86.db
++++++ ibus-table-chinese-1.8.3.tar.gz -> ibus-table-chinese-1.8.8.tar.gz ++++++
/work/SRC/openSUSE:Factory/ibus-table-chinese/ibus-table-chinese-1.8.3.tar.gz /work/SRC/openSUSE:Factory/.ibus-table-chinese.new.1548/ibus-table-chinese-1.8.8.tar.gz differ: char 12, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ibus-table for openSUSE:Factory checked in at 2022-06-28 15:23:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ibus-table (Old)
and /work/SRC/openSUSE:Factory/.ibus-table.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ibus-table"
Tue Jun 28 15:23:04 2022 rev:30 rq:985580 version:1.16.9
Changes:
--------
--- /work/SRC/openSUSE:Factory/ibus-table/ibus-table.changes 2021-06-11 00:19:20.141385926 +0200
+++ /work/SRC/openSUSE:Factory/.ibus-table.new.1548/ibus-table.changes 2022-06-28 15:23:24.502035181 +0200
@@ -1,0 +2,17 @@
+Sat Jun 25 18:07:26 UTC 2022 - Gordon Leung <pirateclip(a)protonmail.com> - 1.16.9
+
+update: 1.13.3 -> 1.16.9
+- Now requires Python >= 3.6 to build
+- Update Unihan_Variants.txt to "2022-04-26 Unicode 15.0.0 draft"
+- Update weblate translations
+- Add option to set dynamic adjust at runtime gh#mike-fabian/ibus-table#70
+- Add button to forget all data learned by typing and selecting candidates
+ * gh#kaio/ibus-table#75
+- Fix problems with goucima for erbi-qs table gh#kaio/ibus-table#77
+- Fix gh#mike-fabian/ibus-table#85
+- ��� U+6817 is used in Traditional Chinese as well gh#mike-fabian/ibus-table#95
+- Ignore MOD3_MASK (Scroll Lock) when matching key bindings gh#mike-fabian/ibus-table#102
+- When a Modifier key release matches a hotkey command, return False not True
+ * gh#mike-fabian/ibus-table#102
+
+-------------------------------------------------------------------
Old:
----
ibus-table-1.13.3.tar.gz
New:
----
ibus-table-1.16.9.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ibus-table.spec ++++++
--- /var/tmp/diff_new_pack.2b4OCx/_old 2022-06-28 15:23:25.426036560 +0200
+++ /var/tmp/diff_new_pack.2b4OCx/_new 2022-06-28 15:23:25.430036566 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ibus-table
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: ibus-table
-Version: 1.13.3
+Version: 1.16.9
Release: 0
Summary: The Table engine for IBus platform
License: LGPL-2.1-or-later
++++++ ibus-table-1.13.3.tar.gz -> ibus-table-1.16.9.tar.gz ++++++
++++ 38106 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ibus-m17n for openSUSE:Factory checked in at 2022-06-28 15:23:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ibus-m17n (Old)
and /work/SRC/openSUSE:Factory/.ibus-m17n.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ibus-m17n"
Tue Jun 28 15:23:03 2022 rev:27 rq:985579 version:1.4.9
Changes:
--------
--- /work/SRC/openSUSE:Factory/ibus-m17n/ibus-m17n.changes 2021-07-23 23:41:44.589790601 +0200
+++ /work/SRC/openSUSE:Factory/.ibus-m17n.new.1548/ibus-m17n.changes 2022-06-28 15:23:23.722034017 +0200
@@ -1,0 +2,14 @@
+Sun Jun 26 18:48:40 UTC 2022 - Gordon Leung <pirateclip(a)protonmail.com> - 1.4.9
+
+update: 1.4.6 -> 1.4.9
+- Allow use of kbd engines gh#ibus/ibus-m17n#32
+- Assign symbols to all the new inscript2 engines (and add some other missing symbols)
+ * gh#ibus/ibus-m17n#37
+- Remove gnome-common requirement and re-write autogen.sh (by Parag Nemade)
+ * gh#ibus/ibus-m17n#37
+- Update weblate translation for Sinhala
+- Free lang and name after engine_name is built gh#ibus/ibus-m17n#39
+- Just return from ibus_m17n_engine_callback with nullable m17n
+- Hide status from the panel if status == title (by Daiki Ueno)
+
+-------------------------------------------------------------------
Old:
----
ibus-m17n-1.4.6.tar.gz
New:
----
ibus-m17n-1.4.9.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ibus-m17n.spec ++++++
--- /var/tmp/diff_new_pack.YGcFxa/_old 2022-06-28 15:23:24.198034727 +0200
+++ /var/tmp/diff_new_pack.YGcFxa/_new 2022-06-28 15:23:24.202034734 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ibus-m17n
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: ibus-m17n
-Version: 1.4.6
+Version: 1.4.9
Release: 0
Summary: The M17N engine for IBus platform
License: GPL-2.0-or-later
++++++ ibus-m17n-1.4.6.tar.gz -> ibus-m17n-1.4.9.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-m17n-1.4.6/autogen.sh new/ibus-m17n-1.4.9/autogen.sh
--- old/ibus-m17n-1.4.6/autogen.sh 2020-06-20 14:50:12.000000000 +0200
+++ new/ibus-m17n-1.4.9/autogen.sh 2021-10-19 18:31:01.000000000 +0200
@@ -1,27 +1,44 @@
#!/bin/sh
# Run this to generate all the initial makefiles, etc.
+test -n "$srcdir" || srcdir=$(dirname "$0")
+test -n "$srcdir" || srcdir=.
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
+olddir=$(pwd)
-PKG_NAME="ibus-m17n"
+cd $srcdir
-(test -f $srcdir/configure.ac \
- && test -f $srcdir/README ) || {
- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
- echo " top-level $PKG_NAME directory"
- exit 1
+(test -f configure.ac) || {
+ echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***"
+ exit 1
}
-which gnome-autogen.sh || {
- echo "You need to install gnome-common from the GNOME CVS"
- exit 1
-}
+# shellcheck disable=SC2016
+PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac)
+
+if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
+ echo "*** WARNING: I am going to run 'configure' with no arguments." >&2
+ echo "*** If you wish to pass any to it, please specify them on the" >&2
+ echo "*** '$0' command line." >&2
+ echo "" >&2
+fi
+
+autoreconf --verbose --force --install || exit 1
+
+cd "$olddir"
+if [ "$NOCONFIGURE" = "" ]; then
+ $srcdir/configure "$@" || exit 1
+
+ if [ "$1" = "--help" ]; then
+ exit 0
+ else
+ echo "Now type 'make' to compile $PKG_NAME" || exit 1
+ fi
+else
+ echo "Skipping configure process."
+fi
export CFLAGS=${CFLAGS-"-Wall"}
export CXXFLAGS=${CXXFLAGS-"$CFLAGS"}
ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4"
REQUIRED_AUTOMAKE_VERSION=1.10
-
-. gnome-autogen.sh "$@"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-m17n-1.4.6/configure new/ibus-m17n-1.4.9/configure
--- old/ibus-m17n-1.4.6/configure 2021-07-15 16:44:28.000000000 +0200
+++ new/ibus-m17n-1.4.9/configure 2022-01-18 09:13:51.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ibus-m17n 1.4.6.
+# Generated by GNU Autoconf 2.69 for ibus-m17n 1.4.9.
#
# Report bugs to <http://code.google.com/p/ibus/issues/entry>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='ibus-m17n'
PACKAGE_TARNAME='ibus-m17n'
-PACKAGE_VERSION='1.4.6'
-PACKAGE_STRING='ibus-m17n 1.4.6'
+PACKAGE_VERSION='1.4.9'
+PACKAGE_STRING='ibus-m17n 1.4.9'
PACKAGE_BUGREPORT='http://code.google.com/p/ibus/issues/entry'
PACKAGE_URL=''
@@ -1387,7 +1387,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures ibus-m17n 1.4.6 to adapt to many kinds of systems.
+\`configure' configures ibus-m17n 1.4.9 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1458,7 +1458,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ibus-m17n 1.4.6:";;
+ short | recursive ) echo "Configuration of ibus-m17n 1.4.9:";;
esac
cat <<\_ACEOF
@@ -1593,7 +1593,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ibus-m17n configure 1.4.6
+ibus-m17n configure 1.4.9
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2083,7 +2083,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ibus-m17n $as_me 1.4.6, which was
+It was created by ibus-m17n $as_me 1.4.9, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2947,7 +2947,7 @@
# Define the identity of the package.
PACKAGE='ibus-m17n'
- VERSION='1.4.6'
+ VERSION='1.4.9'
cat >>confdefs.h <<_ACEOF
@@ -4585,9 +4585,9 @@
# define PACKAGE_VERSION_* variables
- PACKAGE_VERSION_MAJOR=$(echo 1.4.6 | cut -d'.' -f1)
- PACKAGE_VERSION_MINOR=$(echo 1.4.6 | cut -d'.' -f2)
- PACKAGE_VERSION_MICRO=$(echo 1.4.6 | cut -d'.' -f3)
+ PACKAGE_VERSION_MAJOR=$(echo 1.4.9 | cut -d'.' -f1)
+ PACKAGE_VERSION_MINOR=$(echo 1.4.9 | cut -d'.' -f2)
+ PACKAGE_VERSION_MICRO=$(echo 1.4.9 | cut -d'.' -f3)
@@ -4597,7 +4597,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking nano version" >&5
$as_echo_n "checking nano version... " >&6; }
- NANO=$(echo 1.4.6 | cut -d'.' -f4)
+ NANO=$(echo 1.4.9 | cut -d'.' -f4)
if test x"$NANO" = x || test "x$NANO" = "x0" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 0 (release)" >&5
@@ -20087,7 +20087,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by ibus-m17n $as_me 1.4.6, which was
+This file was extended by ibus-m17n $as_me 1.4.9, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20153,7 +20153,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-ibus-m17n config.status 1.4.6
+ibus-m17n config.status 1.4.9
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-m17n-1.4.6/configure.ac new/ibus-m17n-1.4.9/configure.ac
--- old/ibus-m17n-1.4.6/configure.ac 2021-07-15 16:39:01.000000000 +0200
+++ new/ibus-m17n-1.4.9/configure.ac 2022-01-18 09:13:31.000000000 +0100
@@ -22,7 +22,7 @@
m4_define([ibus_released], [1])
m4_define([ibus_major_version], [1])
m4_define([ibus_minor_version], [4])
-m4_define([ibus_micro_version], [6])
+m4_define([ibus_micro_version], [9])
m4_define(ibus_maybe_datestamp,
m4_esyscmd([if test x]ibus_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi]))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-m17n-1.4.6/m17n.appdata.xml new/ibus-m17n-1.4.9/m17n.appdata.xml
--- old/ibus-m17n-1.4.6/m17n.appdata.xml 2021-07-15 16:43:29.000000000 +0200
+++ new/ibus-m17n-1.4.9/m17n.appdata.xml 2022-01-18 09:13:31.000000000 +0100
@@ -17,6 +17,63 @@
<url type="bugtracker">https://github.com/ibus/ibus-m17n/issues</url>
<url type="help">https://github.com/ibus/ibus-m17n</url>
<releases>
+ <release version="1.4.9" date="2022-01-18" urgency="medium">
+ <description>
+ <p>This new stable release includes these changes:</p>
+ </description>
+ <url>github.com/ibus/ibus-m17n/releases/tag/1.4.9</url>
+ <issues>
+ <issue>
+ Hide status from the panel if status == title (by Daiki
+ Ueno, this patch has been applied to the Fedora packages for
+ a long time, take it upstream)
+ </issue>
+ <issue url="https://github.com/ibus/ibus-m17n/issues/39">
+ Free lang and name after engine_name is built
+ </issue>
+ <issue url="https://github.com/ibus/ibus-m17n/issues/39">
+ Just return from ibus_m17n_engine_callback with nullable m17n
+ </issue>
+ <issue url="https://github.com/ibus/ibus-m17n/issues/42">
+ Accept virtual engine names for CI
+ </issue>
+ </issues>
+ </release>
+ <release version="1.4.8" date="2021-10-19" urgency="medium">
+ <description>
+ <p>This new stable release includes these changes:</p>
+ </description>
+ <url>github.com/ibus/ibus-m17n/releases/tag/1.4.8</url>
+ <issues>
+ <issue url="https://github.com/ibus/ibus-m17n/pull/37">
+ Remove gnome-common requirement in autogen.sh (by Parag Nemade)
+ </issue>
+ <issue>
+ Translation update from Weblate for Sinhala
+ </issue>
+ </issues>
+ </release>
+ <release version="1.4.7" date="2021-08-13" urgency="medium">
+ <description>
+ <p>This new stable release includes these changes:</p>
+ </description>
+ <url>github.com/ibus/ibus-m17n/releases/tag/1.4.7</url>
+ <issues>
+ <issue url="https://github.com/ibus/ibus-m17n/issues/34">
+ Assign symbols to all the new inscript2 engines (and add
+ some other missing symbols)
+ </issue>
+ <issue url="https://github.com/ibus/ibus-m17n/issues/32">
+ Allow to use kbd engines (#32)
+ </issue>
+ <issue>
+ Add ibus-m17n-xkb-options.patch from Fedora
+ </issue>
+ <issue>
+ Add ibus-m17n-enable-ar-kbd.patch from Fedora
+ </issue>
+ </issues>
+ </release>
<release version="1.4.6" date="2021-07-15" urgency="medium">
<description>
<p>This new stable release includes these changes:</p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-m17n-1.4.6/po/bn.po new/ibus-m17n-1.4.9/po/bn.po
--- old/ibus-m17n-1.4.6/po/bn.po 2021-07-15 16:45:42.000000000 +0200
+++ new/ibus-m17n-1.4.9/po/bn.po 2022-01-18 09:14:34.000000000 +0100
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: ibus-m17n 1.4.3\n"
"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2021-07-15 16:45+0200\n"
+"POT-Creation-Date: 2022-01-18 09:12+0100\n"
"PO-Revision-Date: 2021-04-04 09:01+0000\n"
"Last-Translator: Abu Huraira <abuhuraira(a)tutamail.com>\n"
"Language-Team: Bengali <https://translate.fedoraproject.org/projects/ibus-"
@@ -18,7 +18,7 @@
"Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Generator: Weblate 4.5.3\n"
-#: src/m17nutil.c:342
+#: src/m17nutil.c:351
msgid "M17N"
msgstr "������������������"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-m17n-1.4.6/po/de.po new/ibus-m17n-1.4.9/po/de.po
--- old/ibus-m17n-1.4.6/po/de.po 2021-07-15 16:45:42.000000000 +0200
+++ new/ibus-m17n-1.4.9/po/de.po 2022-01-18 09:14:34.000000000 +0100
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: ibus-m17n 1.4.0\n"
"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2021-07-15 16:45+0200\n"
+"POT-Creation-Date: 2022-01-18 09:12+0100\n"
"PO-Revision-Date: 2019-12-19 09:38+0000\n"
"Last-Translator: Mike FABIAN <mfabian(a)redhat.com>\n"
"Language-Team: German <https://translate.stg.fedoraproject.org/projects/ibus-"
@@ -21,7 +21,7 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 3.9.1\n"
-#: src/m17nutil.c:342
+#: src/m17nutil.c:351
msgid "M17N"
msgstr "M17N"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-m17n-1.4.6/po/es.po new/ibus-m17n-1.4.9/po/es.po
--- old/ibus-m17n-1.4.6/po/es.po 2021-07-15 16:45:42.000000000 +0200
+++ new/ibus-m17n-1.4.9/po/es.po 2022-01-18 09:14:34.000000000 +0100
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: ibus-m17n 1.4.1\n"
"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2021-07-15 16:45+0200\n"
+"POT-Creation-Date: 2022-01-18 09:12+0100\n"
"PO-Revision-Date: 2020-06-19 12:40+0000\n"
"Last-Translator: Emilio Herrera <ehespinosa57(a)gmail.com>\n"
"Language-Team: Spanish <https://translate.fedoraproject.org/projects/ibus-"
@@ -18,7 +18,7 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 4.0.4\n"
-#: src/m17nutil.c:342
+#: src/m17nutil.c:351
msgid "M17N"
msgstr "M17N"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-m17n-1.4.6/po/fa.po new/ibus-m17n-1.4.9/po/fa.po
--- old/ibus-m17n-1.4.6/po/fa.po 2021-07-15 16:45:42.000000000 +0200
+++ new/ibus-m17n-1.4.9/po/fa.po 2022-01-18 09:14:34.000000000 +0100
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: ibus-m17n 1.4.1\n"
"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2021-07-15 16:45+0200\n"
+"POT-Creation-Date: 2022-01-18 09:12+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -15,7 +15,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/m17nutil.c:342
+#: src/m17nutil.c:351
msgid "M17N"
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-m17n-1.4.6/po/fr.po new/ibus-m17n-1.4.9/po/fr.po
--- old/ibus-m17n-1.4.6/po/fr.po 2021-07-15 16:45:42.000000000 +0200
+++ new/ibus-m17n-1.4.9/po/fr.po 2022-01-18 09:14:34.000000000 +0100
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: ibus-m17n 1.4.1\n"
"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2021-07-15 16:45+0200\n"
+"POT-Creation-Date: 2022-01-18 09:12+0100\n"
"PO-Revision-Date: 2020-01-18 16:32+0000\n"
"Last-Translator: Julien Humbert <julroy67(a)gmail.com>\n"
"Language-Team: French <https://translate.stg.fedoraproject.org/projects/ibus-"
@@ -18,7 +18,7 @@
"Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Generator: Weblate 3.10.2\n"
-#: src/m17nutil.c:342
+#: src/m17nutil.c:351
msgid "M17N"
msgstr "M17N"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-m17n-1.4.6/po/ibus-m17n.pot new/ibus-m17n-1.4.9/po/ibus-m17n.pot
--- old/ibus-m17n-1.4.6/po/ibus-m17n.pot 2021-07-15 16:45:42.000000000 +0200
+++ new/ibus-m17n-1.4.9/po/ibus-m17n.pot 2022-01-18 09:13:31.000000000 +0100
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: ibus-m17n 1.4.6\n"
+"Project-Id-Version: ibus-m17n 1.4.9\n"
"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2021-07-15 16:45+0200\n"
+"POT-Creation-Date: 2022-01-18 09:12+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -17,7 +17,7 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/m17nutil.c:342
+#: src/m17nutil.c:351
msgid "M17N"
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-m17n-1.4.6/po/id.po new/ibus-m17n-1.4.9/po/id.po
--- old/ibus-m17n-1.4.6/po/id.po 2021-07-15 16:45:42.000000000 +0200
+++ new/ibus-m17n-1.4.9/po/id.po 2022-01-18 09:14:34.000000000 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: ibus-m17n 1.4.1\n"
"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2021-07-15 16:45+0200\n"
+"POT-Creation-Date: 2022-01-18 09:12+0100\n"
"PO-Revision-Date: 2019-12-20 00:06+0000\n"
"Last-Translator: Mike FABIAN <mfabian(a)redhat.com>\n"
"Language-Team: Indonesian <https://translate.stg.fedoraproject.org/projects/"
@@ -19,7 +19,7 @@
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Weblate 3.9.1\n"
-#: src/m17nutil.c:342
+#: src/m17nutil.c:351
msgid "M17N"
msgstr "M17N"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-m17n-1.4.6/po/ja.po new/ibus-m17n-1.4.9/po/ja.po
--- old/ibus-m17n-1.4.6/po/ja.po 2021-07-15 16:45:42.000000000 +0200
+++ new/ibus-m17n-1.4.9/po/ja.po 2022-01-18 09:14:34.000000000 +0100
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: ibus-m17n 1.4.1\n"
"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2021-07-15 16:45+0200\n"
+"POT-Creation-Date: 2022-01-18 09:12+0100\n"
"PO-Revision-Date: 2019-12-19 09:38+0000\n"
"Last-Translator: Mike FABIAN <mfabian(a)redhat.com>\n"
"Language-Team: Japanese <https://translate.stg.fedoraproject.org/projects/"
@@ -18,7 +18,7 @@
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Weblate 3.9.1\n"
-#: src/m17nutil.c:342
+#: src/m17nutil.c:351
msgid "M17N"
msgstr "M17N"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-m17n-1.4.6/po/pt_BR.po new/ibus-m17n-1.4.9/po/pt_BR.po
--- old/ibus-m17n-1.4.6/po/pt_BR.po 2021-07-15 16:45:42.000000000 +0200
+++ new/ibus-m17n-1.4.9/po/pt_BR.po 2022-01-18 09:14:34.000000000 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: ibus-m17n 1.4.1\n"
"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2021-07-15 16:45+0200\n"
+"POT-Creation-Date: 2022-01-18 09:12+0100\n"
"PO-Revision-Date: 2021-03-08 02:01+0000\n"
"Last-Translator: Rafael Fontenelle <rafaelff(a)gnome.org>\n"
"Language-Team: Portuguese (Brazil) <https://translate.fedoraproject.org/"
@@ -19,7 +19,7 @@
"Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Generator: Weblate 4.5.1\n"
-#: src/m17nutil.c:342
+#: src/m17nutil.c:351
msgid "M17N"
msgstr "M17N"
Binary files old/ibus-m17n-1.4.6/po/si.gmo and new/ibus-m17n-1.4.9/po/si.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-m17n-1.4.6/po/si.po new/ibus-m17n-1.4.9/po/si.po
--- old/ibus-m17n-1.4.6/po/si.po 2021-07-15 16:45:42.000000000 +0200
+++ new/ibus-m17n-1.4.9/po/si.po 2022-01-18 09:14:34.000000000 +0100
@@ -6,22 +6,25 @@
msgstr ""
"Project-Id-Version: ibus-m17n 1.4.3\n"
"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2021-07-15 16:45+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"POT-Creation-Date: 2022-01-18 09:12+0100\n"
+"PO-Revision-Date: 2021-08-18 09:19+0000\n"
+"Last-Translator: Hela Basa <r45xveza(a)pm.me>\n"
+"Language-Team: Sinhala <https://translate.fedoraproject.org/projects/ibus-"
+"m17n/app/si/>\n"
"Language: si\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.7.2\n"
-#: src/m17nutil.c:342
+#: src/m17nutil.c:351
msgid "M17N"
msgstr ""
#: src/ibus-m17n-preferences.ui:14
msgid "System"
-msgstr ""
+msgstr "���������������������"
#: src/ibus-m17n-preferences.ui:18
msgid "Vertical"
@@ -57,7 +60,7 @@
#: src/ibus-m17n-preferences.ui:181
msgid "Background:"
-msgstr ""
+msgstr "������������������:"
#: src/ibus-m17n-preferences.ui:196
msgid "Underline:"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-m17n-1.4.6/po/tr.po new/ibus-m17n-1.4.9/po/tr.po
--- old/ibus-m17n-1.4.6/po/tr.po 2021-07-15 16:45:42.000000000 +0200
+++ new/ibus-m17n-1.4.9/po/tr.po 2022-01-18 09:14:34.000000000 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: ibus-m17n 1.4.0\n"
"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2021-07-15 16:45+0200\n"
+"POT-Creation-Date: 2022-01-18 09:12+0100\n"
"PO-Revision-Date: 2019-12-19 11:20+0000\n"
"Last-Translator: O��uz Ersen <oguzersen(a)protonmail.com>\n"
"Language-Team: Turkish <https://translate.stg.fedoraproject.org/projects/"
@@ -19,7 +19,7 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 3.9.1\n"
-#: src/m17nutil.c:342
+#: src/m17nutil.c:351
msgid "M17N"
msgstr "M17N"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-m17n-1.4.6/po/uk.po new/ibus-m17n-1.4.9/po/uk.po
--- old/ibus-m17n-1.4.6/po/uk.po 2021-07-15 16:45:42.000000000 +0200
+++ new/ibus-m17n-1.4.9/po/uk.po 2022-01-18 09:14:34.000000000 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: ibus-m17n 1.4.1\n"
"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2021-07-15 16:45+0200\n"
+"POT-Creation-Date: 2022-01-18 09:12+0100\n"
"PO-Revision-Date: 2020-01-17 17:15+0000\n"
"Last-Translator: Yuri Chornoivan <yurchor(a)ukr.net>\n"
"Language-Team: Ukrainian <https://translate.stg.fedoraproject.org/projects/"
@@ -21,7 +21,7 @@
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Generator: Weblate 3.10.1\n"
-#: src/m17nutil.c:342
+#: src/m17nutil.c:351
msgid "M17N"
msgstr "M17N"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-m17n-1.4.6/po/zh_CN.po new/ibus-m17n-1.4.9/po/zh_CN.po
--- old/ibus-m17n-1.4.6/po/zh_CN.po 2021-07-15 16:45:42.000000000 +0200
+++ new/ibus-m17n-1.4.9/po/zh_CN.po 2022-01-18 09:14:34.000000000 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2021-07-15 16:45+0200\n"
+"POT-Creation-Date: 2022-01-18 09:12+0100\n"
"PO-Revision-Date: 2021-01-28 17:40+0000\n"
"Last-Translator: Dingzhong Chen <wsxy162(a)gmail.com>\n"
"Language-Team: Chinese (Simplified) <https://translate.fedoraproject.org/"
@@ -20,7 +20,7 @@
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Weblate 4.4.2\n"
-#: src/m17nutil.c:342
+#: src/m17nutil.c:351
msgid "M17N"
msgstr "M17N"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-m17n-1.4.6/po/zh_TW.po new/ibus-m17n-1.4.9/po/zh_TW.po
--- old/ibus-m17n-1.4.6/po/zh_TW.po 2021-07-15 16:45:42.000000000 +0200
+++ new/ibus-m17n-1.4.9/po/zh_TW.po 2022-01-18 09:14:34.000000000 +0100
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: ibus-m17n 1.4.1\n"
"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2021-07-15 16:45+0200\n"
+"POT-Creation-Date: 2022-01-18 09:12+0100\n"
"PO-Revision-Date: 2020-09-11 08:29+0000\n"
"Last-Translator: Mike FABIAN <mfabian(a)redhat.com>\n"
"Language-Team: Chinese (Traditional) <https://translate.fedoraproject.org/"
@@ -18,7 +18,7 @@
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Weblate 4.2.2\n"
-#: src/m17nutil.c:342
+#: src/m17nutil.c:351
msgid "M17N"
msgstr "M17N"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-m17n-1.4.6/src/default.xml new/ibus-m17n-1.4.9/src/default.xml
--- old/ibus-m17n-1.4.6/src/default.xml 2021-07-15 16:38:28.000000000 +0200
+++ new/ibus-m17n-1.4.9/src/default.xml 2021-08-18 11:20:22.000000000 +0200
@@ -12,12 +12,13 @@
<preedit-highlight>FALSE</preedit-highlight>
<symbol></symbol>
</engine>
+ <!-- Arabic kbd engine should be selected by default:
+ https://bugzilla.redhat.com/show_bug.cgi?id=1076945 -->
+ <engine>
+ <name>m17n:ar:kbd</name>
+ <rank>1</rank>
+ </engine>
<!-- Blacklist some engines -->
- <!-- kbd engines are duplicate of xkb engines -->
- <engine>
- <name>m17n:*:kbd</name>
- <rank>-1</rank>
- </engine>
<!-- zh:py is superseded by ibus-pinyin etc -->
<engine>
<name>m17n:zh:py</name>
@@ -190,6 +191,15 @@
<name>m17n:si:samanala</name>
<rank>0</rank>
</engine>
+ <!-- Some Indic engines expect AltGr is automatically mapped -->
+ <engine>
+ <name>m17n:*:inscript*</name>
+ <layout>default[lv3:ralt_switch]</layout>
+ </engine>
+ <engine>
+ <name>m17n:si:*</name>
+ <layout>default[lv3:ralt_switch]</layout>
+ </engine>
<!-- Some CJK engines use preedit. -->
<engine>
<name>m17n:zh:cangjie</name>
@@ -229,60 +239,96 @@
</engine>
<!-- Set IME symbols. -->
<engine>
+ <name>m17n:*:kbd</name>
+ <symbol></symbol>
+ </engine>
+ <engine>
<name>m17n:as:*</name>
- <symbol>���</symbol>
+ <symbol>���</symbol>
</engine>
<engine>
<name>m17n:bn:*</name>
- <symbol>������</symbol>
+ <symbol>���</symbol>
+ </engine>
+ <engine>
+ <name>m17n:brx:*</name>
+ <symbol>���</symbol>
+ </engine>
+ <engine>
+ <name>m17n:doi:*</name>
+ <symbol>���</symbol>
</engine>
<engine>
<name>m17n:gu:*</name>
- <symbol>������</symbol>
+ <symbol>���</symbol>
</engine>
<engine>
<name>m17n:hi:*</name>
- <symbol>���������</symbol>
+ <symbol>���</symbol>
</engine>
<engine>
<name>m17n:kn:*</name>
<symbol>���</symbol>
</engine>
<engine>
+ <name>m17n:kok:*</name>
+ <symbol>���</symbol>
+ </engine>
+ <engine>
<name>m17n:ks:*</name>
<symbol>���</symbol>
</engine>
<engine>
+ <name>m17n:ks:kbd</name>
+ <symbol>��</symbol>
+ </engine>
+ <engine>
<name>m17n:mai:*</name>
- <symbol>������</symbol>
+ <symbol>���</symbol>
</engine>
<engine>
<name>m17n:ml:*</name>
- <symbol>���</symbol>
+ <symbol>���</symbol>
+ </engine>
+ <engine>
+ <name>m17n:mni:*beng</name>
+ <symbol>���</symbol>
+ </engine>
+ <engine>
+ <name>m17n:mni:*mtei</name>
+ <symbol>���</symbol>
</engine>
<engine>
<name>m17n:mr:*</name>
- <symbol>���</symbol>
+ <symbol>���</symbol>
</engine>
<engine>
<name>m17n:ne:*</name>
- <symbol>������</symbol>
+ <symbol>���</symbol>
</engine>
<engine>
<name>m17n:or:*</name>
- <symbol>���</symbol>
+ <symbol>���</symbol>
</engine>
<engine>
<name>m17n:pa:*</name>
- <symbol>������</symbol>
+ <symbol>���</symbol>
</engine>
<engine>
<name>m17n:sa:*</name>
- <symbol>������</symbol>
+ <symbol>���</symbol>
+ </engine>
+ <engine>
+ <name>m17n:sat:inscript2-deva</name>
+ <symbol>���</symbol>
+ </engine>
+ <engine>
+ <name>m17n:sat:inscript2-olck</name>
+ <symbol>���</symbol>
</engine>
<engine>
<name>m17n:sd:*</name>
- <symbol>���������</symbol>
+ <symbol>���</symbol>
</engine>
<engine>
<name>m17n:si:*</name>
@@ -290,15 +336,11 @@
</engine>
<engine>
<name>m17n:ta:*</name>
- <symbol>���</symbol>
+ <symbol>���</symbol>
</engine>
<engine>
<name>m17n:te:*</name>
- <symbol>������</symbol>
- </engine>
- <engine>
- <name>m17n:*:kbd</name>
- <symbol></symbol>
+ <symbol>���</symbol>
</engine>
<engine>
<name>m17n:*:pre</name>
@@ -318,7 +360,7 @@
</engine>
<engine>
<name>m17n:cr:*</name>
- <symbol></symbol>
+ <symbol>���</symbol>
</engine>
<engine>
<name>m17n:dv:*</name>
@@ -338,11 +380,11 @@
</engine>
<engine>
<name>m17n:ii:*</name>
- <symbol></symbol>
+ <symbol>���</symbol>
</engine>
<engine>
<name>m17n:iu:*</name>
- <symbol></symbol>
+ <symbol>���</symbol>
</engine>
<engine>
<name>m17n:ja:anthy</name>
@@ -365,20 +407,24 @@
<symbol>���</symbol>
</engine>
<engine>
- <name>m17n:lo:*</name>
+ <name>m17n:lo:kbd</name>
+ <symbol>���</symbol>
+ </engine>
+ <engine>
+ <name>m17n:lo:lrt</name>
<symbol>���</symbol>
</engine>
<engine>
<name>m17n:nsk:*</name>
- <symbol></symbol>
+ <symbol>���</symbol>
</engine>
<engine>
<name>m17n:oj:*</name>
- <symbol></symbol>
+ <symbol>���</symbol>
</engine>
<engine>
<name>m17n:ps:*</name>
- <symbol></symbol>
+ <symbol>��</symbol>
</engine>
<engine>
<name>m17n:ru:*</name>
@@ -405,6 +451,10 @@
<symbol>��</symbol>
</engine>
<engine>
+ <name>m17n:vi:*</name>
+ <symbol>���</symbol>
+ </engine>
+ <engine>
<name>m17n:vi:han</name>
<symbol>���</symbol>
</engine>
@@ -413,12 +463,8 @@
<symbol>���</symbol>
</engine>
<engine>
- <name>m17n:vi:*</name>
- <symbol>���</symbol>
- </engine>
- <engine>
<name>m17n:yi:*</name>
- <symbol></symbol>
+ <symbol>��</symbol>
</engine>
<engine>
<name>m17n:zh:bopomofo</name>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-m17n-1.4.6/src/engine.c new/ibus-m17n-1.4.9/src/engine.c
--- old/ibus-m17n-1.4.6/src/engine.c 2021-07-15 16:38:20.000000000 +0200
+++ new/ibus-m17n-1.4.9/src/engine.c 2022-01-18 09:10:14.000000000 +0100
@@ -41,6 +41,7 @@
gint lookup_table_orientation;
gboolean use_us_layout;
+ gchar *title;
MInputMethod *im;
};
@@ -105,9 +106,10 @@
gchar **strv;
g_return_val_if_fail (g_str_has_prefix (engine_name, "m17n:"), FALSE);
- strv = g_strsplit (engine_name, ":", 3);
+ /* Test engine name 'm17n:lang:layout:ci' works */
+ strv = g_strsplit (engine_name, ":", -1);
- if (g_strv_length (strv) != 3) {
+ if (g_strv_length (strv) < 3) {
g_strfreev (strv);
g_return_val_if_reached (FALSE);
}
@@ -236,10 +238,13 @@
"org.freedesktop.ibus.engine.m17n",
g_strdup_printf ("/org/freedesktop/ibus/engine/m17n/%s/%s/",
lang, name));
+ MPlist *l = minput_get_title_icon (msymbol (lang), msymbol (name));
+ if (l && mplist_key (l) == Mtext) {
+ klass->title = ibus_m17n_mtext_to_utf8 (mplist_value (l));
+ }
+ engine_name = g_strdup_printf ("m17n:%s:%s", lang, name);
g_free (lang);
g_free (name);
-
- engine_name = g_strdup_printf ("m17n:%s:%s", lang, name);
engine_config = ibus_m17n_get_engine_config (engine_name);
g_free (engine_name);
@@ -936,7 +941,12 @@
IBusM17NEngine *m17n = NULL;
m17n = context->arg;
- g_return_if_fail (m17n != NULL);
+ /* m17n always can be NULL when create_ic_for_im() calls minput_create_ic()
+ * in m17n-lib-1.8.0/src/input.c and g_return_if_fail() should not be
+ * called with CI since warnings are treated as errors.
+ */
+ if (!m17n)
+ return;
/* the callback may be called in minput_create_ic, in the time
* m17n->context has not be assigned, so need assign it. */
@@ -959,8 +969,9 @@
else if (command == Minput_status_draw) {
gchar *status;
status = ibus_m17n_mtext_to_utf8 (m17n->context->status);
+ IBusM17NEngineClass *klass = (IBusM17NEngineClass *) G_OBJECT_GET_CLASS (m17n);
- if (status && strlen (status)) {
+ if (status && strlen (status) && g_strcmp0 (status, klass->title)) {
IBusText *text;
text = ibus_text_new_from_string (status);
ibus_property_set_label (m17n->status_prop, text);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-m17n-1.4.6/src/m17nutil.c new/ibus-m17n-1.4.9/src/m17nutil.c
--- old/ibus-m17n-1.4.6/src/m17nutil.c 2020-06-20 14:50:12.000000000 +0200
+++ new/ibus-m17n-1.4.9/src/m17nutil.c 2021-08-18 11:20:22.000000000 +0200
@@ -17,7 +17,8 @@
ENGINE_CONFIG_RANK_MASK = 1 << 0,
ENGINE_CONFIG_SYMBOL_MASK = 1 << 1,
ENGINE_CONFIG_LONGNAME_MASK = 1 << 2,
- ENGINE_CONFIG_PREEDIT_HIGHLIGHT_MASK = 1 << 3
+ ENGINE_CONFIG_LAYOUT_MASK = 1 << 3,
+ ENGINE_CONFIG_PREEDIT_HIGHLIGHT_MASK = 1 << 4
} EngineConfigMask;
struct _EngineConfigNode {
@@ -137,7 +138,7 @@
"language", msymbol_name (lang),
"license", "GPL",
"icon", engine_icon ? engine_icon : "",
- "layout", "default",
+ "layout", config->layout ? config->layout : "default",
"rank", config->rank,
"symbol", config->symbol ? config->symbol : "",
"setup", engine_setup,
@@ -272,6 +273,8 @@
config->symbol = cnode->config.symbol;
if (cnode->mask & ENGINE_CONFIG_LONGNAME_MASK)
config->longname = cnode->config.longname;
+ if (cnode->mask & ENGINE_CONFIG_LAYOUT_MASK)
+ config->layout = cnode->config.layout;
if (cnode->mask & ENGINE_CONFIG_PREEDIT_HIGHLIGHT_MASK)
config->preedit_highlight = cnode->config.preedit_highlight;
}
@@ -314,6 +317,12 @@
cnode->mask |= ENGINE_CONFIG_LONGNAME_MASK;
continue;
}
+ if (g_strcmp0 (sub_node->name , "layout") == 0) {
+ g_free (cnode->config.layout);
+ cnode->config.layout = g_strdup (sub_node->text);
+ cnode->mask |= ENGINE_CONFIG_LAYOUT_MASK;
+ continue;
+ }
if (g_strcmp0 (sub_node->name , "preedit-highlight") == 0) {
if (g_ascii_strcasecmp ("TRUE", sub_node->text) == 0)
cnode->config.preedit_highlight = TRUE;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-m17n-1.4.6/src/m17nutil.h new/ibus-m17n-1.4.9/src/m17nutil.h
--- old/ibus-m17n-1.4.6/src/m17nutil.h 2020-06-20 14:50:12.000000000 +0200
+++ new/ibus-m17n-1.4.9/src/m17nutil.h 2021-08-18 11:20:22.000000000 +0200
@@ -20,6 +20,9 @@
/* overridding longname shown on panel */
gchar *longname;
+ /* keyboard layout */
+ gchar *layout;
+
/* whether to highlight preedit */
gboolean preedit_highlight;
};
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package perl-Type-Tiny for openSUSE:Factory checked in at 2022-06-28 15:23:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Type-Tiny (Old)
and /work/SRC/openSUSE:Factory/.perl-Type-Tiny.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Type-Tiny"
Tue Jun 28 15:23:03 2022 rev:28 rq:985574 version:1.014000
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-Type-Tiny/perl-Type-Tiny.changes 2022-06-16 18:22:31.224276916 +0200
+++ /work/SRC/openSUSE:Factory/.perl-Type-Tiny.new.1548/perl-Type-Tiny.changes 2022-06-28 15:23:22.898032787 +0200
@@ -1,0 +2,53 @@
+Tue Jun 28 03:08:37 UTC 2022 - Tina M��ller <timueller+perl(a)suse.de>
+
+- updated to 1.014000
+ see /usr/share/doc/packages/perl-Type-Tiny/Changes
+
+ 1.014000 2022-06-27
+ [ Documentation ]
+ - Update copyright dates to 2022.
+ - Various minor documentation improvements.
+ [ Test Suite ]
+ - Eliminate some warnings and other noise from the test suite.
+ - Rename some directories in the test suite to better reflect their
+ contents.
+ [ Packaging ]
+ - Repackaged as stable version.
+ [ Other ]
+ - Added: $Type::Tiny::SafePackage variable.
+ - Added: Error::TypeTiny now has a `throw_cb` method which acts like
+ `throw` but takes an initial callback parameter.
+ jsf116++
+ - Added: Type::Params `compile`, `compile_named`, and `compile_named_oo`
+ functions now support an `on_die` callback.
+ jsf116++
+ - Eliminate warnings while generating deep explanations for type
+ constraint check fails under some circumstances. (Mostly affects
+ StrMatch when Regexp::Util isn't installed.)
+ James Wright++
+ 1.013_001 2022-06-23
+ [ Documentation ]
+ - Various minor documentation improvements.
+ [ Other ]
+ - Added: $Type::Tiny::SafePackage variable.
+ 1.013_000 2022-06-09
+ [ Documentation ]
+ - Update copyright dates to 2022.
+ - Various minor documentation improvements.
+ [ Test Suite ]
+ - Eliminate some warnings and other noise from the test suite.
+ - Rename some directories in the test suite to better reflect their
+ contents.
+ [ Other ]
+ - Added: Error::TypeTiny now has a `throw_cb` method which acts like
+ `throw` but takes an initial callback parameter.
+ jsf116++
+ - Added: Type::Params `compile`, `compile_named`, and `compile_named_oo`
+ functions now support an `on_die` callback.
+ jsf116++
+ - Eliminate warnings while generating deep explanations for type
+ constraint check fails under some circumstances. (Mostly affects
+ StrMatch when Regexp::Util isn't installed.)
+ James Wright++
+
+-------------------------------------------------------------------
Old:
----
Type-Tiny-1.012005.tar.gz
New:
----
Type-Tiny-1.014000.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Type-Tiny.spec ++++++
--- /var/tmp/diff_new_pack.O96og2/_old 2022-06-28 15:23:23.302033390 +0200
+++ /var/tmp/diff_new_pack.O96og2/_new 2022-06-28 15:23:23.310033401 +0200
@@ -18,7 +18,7 @@
%define cpan_name Type-Tiny
Name: perl-Type-Tiny
-Version: 1.012005
+Version: 1.014000
Release: 0
License: Artistic-1.0 OR GPL-1.0-or-later
Summary: Tiny, yet Moo(se)-compatible type constraint
++++++ Type-Tiny-1.012005.tar.gz -> Type-Tiny-1.014000.tar.gz ++++++
++++ 50745 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package perl-YAML-PP for openSUSE:Factory checked in at 2022-06-28 15:23:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-YAML-PP (Old)
and /work/SRC/openSUSE:Factory/.perl-YAML-PP.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-YAML-PP"
Tue Jun 28 15:23:02 2022 rev:15 rq:985573 version:0.033
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-YAML-PP/perl-YAML-PP.changes 2022-03-11 11:50:53.930952827 +0100
+++ /work/SRC/openSUSE:Factory/.perl-YAML-PP.new.1548/perl-YAML-PP.changes 2022-06-28 15:23:21.930031342 +0200
@@ -1,0 +2,10 @@
+Tue Jun 28 03:09:17 UTC 2022 - Tina M��ller <timueller+perl(a)suse.de>
+
+- updated to 0.033
+ see /usr/share/doc/packages/perl-YAML-PP/Changes
+
+ 0.033 2022-06-27 16:31:32+02:00
+
+ - Fix add_mapping_resolver + on_create (tie existing data)
+
+-------------------------------------------------------------------
Old:
----
YAML-PP-0.032.tar.gz
New:
----
YAML-PP-0.033.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-YAML-PP.spec ++++++
--- /var/tmp/diff_new_pack.iByBCR/_old 2022-06-28 15:23:22.430032089 +0200
+++ /var/tmp/diff_new_pack.iByBCR/_new 2022-06-28 15:23:22.434032094 +0200
@@ -18,7 +18,7 @@
%define cpan_name YAML-PP
Name: perl-YAML-PP
-Version: 0.032
+Version: 0.033
Release: 0
License: Artistic-1.0 OR GPL-1.0-or-later
Summary: YAML 1.2 Processor
++++++ YAML-PP-0.032.tar.gz -> YAML-PP-0.033.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-PP-0.032/Changes new/YAML-PP-0.033/Changes
--- old/YAML-PP-0.032/Changes 2022-03-08 19:06:12.000000000 +0100
+++ new/YAML-PP-0.033/Changes 2022-06-27 16:33:50.000000000 +0200
@@ -1,5 +1,9 @@
Revision history for Perl module YAML::PP
+0.033 2022-06-27 16:31:32+02:00
+
+ - Fix add_mapping_resolver + on_create (tie existing data)
+
0.032 2022-03-08 19:02:00+01:00
- Add missing '~' to allowed chars in tags
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-PP-0.032/META.json new/YAML-PP-0.033/META.json
--- old/YAML-PP-0.032/META.json 2022-03-08 19:06:12.000000000 +0100
+++ new/YAML-PP-0.033/META.json 2022-06-27 16:33:50.000000000 +0200
@@ -67,131 +67,131 @@
"provides" : {
"YAML::PP" : {
"file" : "lib/YAML/PP.pm",
- "version" : "0.032"
+ "version" : "0.033"
},
"YAML::PP::Common" : {
"file" : "lib/YAML/PP/Common.pm",
- "version" : "0.032"
+ "version" : "0.033"
},
"YAML::PP::Constructor" : {
"file" : "lib/YAML/PP/Constructor.pm",
- "version" : "0.032"
+ "version" : "0.033"
},
"YAML::PP::Dumper" : {
"file" : "lib/YAML/PP/Dumper.pm",
- "version" : "0.032"
+ "version" : "0.033"
},
"YAML::PP::Emitter" : {
"file" : "lib/YAML/PP/Emitter.pm",
- "version" : "0.032"
+ "version" : "0.033"
},
"YAML::PP::Exception" : {
"file" : "lib/YAML/PP/Exception.pm",
- "version" : "0.032"
+ "version" : "0.033"
},
"YAML::PP::Grammar" : {
"file" : "lib/YAML/PP/Grammar.pm",
- "version" : "0.032"
+ "version" : "0.033"
},
"YAML::PP::Highlight" : {
"file" : "lib/YAML/PP/Highlight.pm",
- "version" : "0.032"
+ "version" : "0.033"
},
"YAML::PP::Lexer" : {
"file" : "lib/YAML/PP/Lexer.pm",
- "version" : "0.032"
+ "version" : "0.033"
},
"YAML::PP::Loader" : {
"file" : "lib/YAML/PP/Loader.pm",
- "version" : "0.032"
+ "version" : "0.033"
},
"YAML::PP::Parser" : {
"file" : "lib/YAML/PP/Parser.pm",
- "version" : "0.032"
+ "version" : "0.033"
},
"YAML::PP::Perl" : {
"file" : "lib/YAML/PP/Perl.pm",
- "version" : "0.032"
+ "version" : "0.033"
},
"YAML::PP::Preserve::Array" : {
"file" : "lib/YAML/PP.pm",
- "version" : "0.032"
+ "version" : "0.033"
},
"YAML::PP::Preserve::Hash" : {
"file" : "lib/YAML/PP.pm",
- "version" : "0.032"
+ "version" : "0.033"
},
"YAML::PP::Preserve::Scalar" : {
"file" : "lib/YAML/PP.pm",
- "version" : "0.032"
+ "version" : "0.033"
},
"YAML::PP::Reader" : {
"file" : "lib/YAML/PP/Reader.pm",
- "version" : "0.032"
+ "version" : "0.033"
},
"YAML::PP::Reader::File" : {
"file" : "lib/YAML/PP/Reader.pm",
- "version" : "0.032"
+ "version" : "0.033"
},
"YAML::PP::Render" : {
"file" : "lib/YAML/PP/Render.pm",
- "version" : "0.032"
+ "version" : "0.033"
},
"YAML::PP::Representer" : {
"file" : "lib/YAML/PP/Representer.pm",
- "version" : "0.032"
+ "version" : "0.033"
},
"YAML::PP::Schema" : {
"file" : "lib/YAML/PP/Schema.pm",
- "version" : "0.032"
+ "version" : "0.033"
},
"YAML::PP::Schema::Binary" : {
"file" : "lib/YAML/PP/Schema/Binary.pm",
- "version" : "0.032"
+ "version" : "0.033"
},
"YAML::PP::Schema::Core" : {
"file" : "lib/YAML/PP/Schema/Core.pm",
- "version" : "0.032"
+ "version" : "0.033"
},
"YAML::PP::Schema::Failsafe" : {
"file" : "lib/YAML/PP/Schema/Failsafe.pm",
- "version" : "0.032"
+ "version" : "0.033"
},
"YAML::PP::Schema::Include" : {
"file" : "lib/YAML/PP/Schema/Include.pm",
- "version" : "0.032"
+ "version" : "0.033"
},
"YAML::PP::Schema::JSON" : {
"file" : "lib/YAML/PP/Schema/JSON.pm",
- "version" : "0.032"
+ "version" : "0.033"
},
"YAML::PP::Schema::Merge" : {
"file" : "lib/YAML/PP/Schema/Merge.pm",
- "version" : "0.032"
+ "version" : "0.033"
},
"YAML::PP::Schema::Perl" : {
"file" : "lib/YAML/PP/Schema/Perl.pm",
- "version" : "0.032"
+ "version" : "0.033"
},
"YAML::PP::Schema::Tie::IxHash" : {
"file" : "lib/YAML/PP/Schema/Tie/IxHash.pm",
- "version" : "0.032"
+ "version" : "0.033"
},
"YAML::PP::Schema::YAML1_1" : {
"file" : "lib/YAML/PP/Schema/YAML1_1.pm",
- "version" : "0.032"
+ "version" : "0.033"
},
"YAML::PP::Type::MergeKey" : {
"file" : "lib/YAML/PP/Type/MergeKey.pm",
- "version" : "0.032"
+ "version" : "0.033"
},
"YAML::PP::Writer" : {
"file" : "lib/YAML/PP/Writer.pm",
- "version" : "0.032"
+ "version" : "0.033"
},
"YAML::PP::Writer::File" : {
"file" : "lib/YAML/PP/Writer/File.pm",
- "version" : "0.032"
+ "version" : "0.033"
}
},
"release_status" : "stable",
@@ -205,7 +205,7 @@
"web" : "https://github.com/perlpunk/YAML-PP-p5"
}
},
- "version" : "0.032",
+ "version" : "0.033",
"x_generated_by_perl" : "v5.30.3",
"x_serialization_backend" : "Cpanel::JSON::XS version 4.26",
"x_spdx_expression" : "Artistic-1.0-Perl OR GPL-1.0-or-later"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-PP-0.032/META.yml new/YAML-PP-0.033/META.yml
--- old/YAML-PP-0.032/META.yml 2022-03-08 19:06:12.000000000 +0100
+++ new/YAML-PP-0.033/META.yml 2022-06-27 16:33:50.000000000 +0200
@@ -25,100 +25,100 @@
provides:
YAML::PP:
file: lib/YAML/PP.pm
- version: '0.032'
+ version: '0.033'
YAML::PP::Common:
file: lib/YAML/PP/Common.pm
- version: '0.032'
+ version: '0.033'
YAML::PP::Constructor:
file: lib/YAML/PP/Constructor.pm
- version: '0.032'
+ version: '0.033'
YAML::PP::Dumper:
file: lib/YAML/PP/Dumper.pm
- version: '0.032'
+ version: '0.033'
YAML::PP::Emitter:
file: lib/YAML/PP/Emitter.pm
- version: '0.032'
+ version: '0.033'
YAML::PP::Exception:
file: lib/YAML/PP/Exception.pm
- version: '0.032'
+ version: '0.033'
YAML::PP::Grammar:
file: lib/YAML/PP/Grammar.pm
- version: '0.032'
+ version: '0.033'
YAML::PP::Highlight:
file: lib/YAML/PP/Highlight.pm
- version: '0.032'
+ version: '0.033'
YAML::PP::Lexer:
file: lib/YAML/PP/Lexer.pm
- version: '0.032'
+ version: '0.033'
YAML::PP::Loader:
file: lib/YAML/PP/Loader.pm
- version: '0.032'
+ version: '0.033'
YAML::PP::Parser:
file: lib/YAML/PP/Parser.pm
- version: '0.032'
+ version: '0.033'
YAML::PP::Perl:
file: lib/YAML/PP/Perl.pm
- version: '0.032'
+ version: '0.033'
YAML::PP::Preserve::Array:
file: lib/YAML/PP.pm
- version: '0.032'
+ version: '0.033'
YAML::PP::Preserve::Hash:
file: lib/YAML/PP.pm
- version: '0.032'
+ version: '0.033'
YAML::PP::Preserve::Scalar:
file: lib/YAML/PP.pm
- version: '0.032'
+ version: '0.033'
YAML::PP::Reader:
file: lib/YAML/PP/Reader.pm
- version: '0.032'
+ version: '0.033'
YAML::PP::Reader::File:
file: lib/YAML/PP/Reader.pm
- version: '0.032'
+ version: '0.033'
YAML::PP::Render:
file: lib/YAML/PP/Render.pm
- version: '0.032'
+ version: '0.033'
YAML::PP::Representer:
file: lib/YAML/PP/Representer.pm
- version: '0.032'
+ version: '0.033'
YAML::PP::Schema:
file: lib/YAML/PP/Schema.pm
- version: '0.032'
+ version: '0.033'
YAML::PP::Schema::Binary:
file: lib/YAML/PP/Schema/Binary.pm
- version: '0.032'
+ version: '0.033'
YAML::PP::Schema::Core:
file: lib/YAML/PP/Schema/Core.pm
- version: '0.032'
+ version: '0.033'
YAML::PP::Schema::Failsafe:
file: lib/YAML/PP/Schema/Failsafe.pm
- version: '0.032'
+ version: '0.033'
YAML::PP::Schema::Include:
file: lib/YAML/PP/Schema/Include.pm
- version: '0.032'
+ version: '0.033'
YAML::PP::Schema::JSON:
file: lib/YAML/PP/Schema/JSON.pm
- version: '0.032'
+ version: '0.033'
YAML::PP::Schema::Merge:
file: lib/YAML/PP/Schema/Merge.pm
- version: '0.032'
+ version: '0.033'
YAML::PP::Schema::Perl:
file: lib/YAML/PP/Schema/Perl.pm
- version: '0.032'
+ version: '0.033'
YAML::PP::Schema::Tie::IxHash:
file: lib/YAML/PP/Schema/Tie/IxHash.pm
- version: '0.032'
+ version: '0.033'
YAML::PP::Schema::YAML1_1:
file: lib/YAML/PP/Schema/YAML1_1.pm
- version: '0.032'
+ version: '0.033'
YAML::PP::Type::MergeKey:
file: lib/YAML/PP/Type/MergeKey.pm
- version: '0.032'
+ version: '0.033'
YAML::PP::Writer:
file: lib/YAML/PP/Writer.pm
- version: '0.032'
+ version: '0.033'
YAML::PP::Writer::File:
file: lib/YAML/PP/Writer/File.pm
- version: '0.032'
+ version: '0.033'
requires:
B: '0'
B::Deparse: '0'
@@ -142,7 +142,7 @@
resources:
bugtracker: https://github.com/perlpunk/YAML-PP-p5/issues
repository: https://github.com/perlpunk/YAML-PP-p5
-version: '0.032'
+version: '0.033'
x_generated_by_perl: v5.30.3
x_serialization_backend: 'YAML::Tiny version 1.73'
x_spdx_expression: 'Artistic-1.0-Perl OR GPL-1.0-or-later'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-PP-0.032/Makefile.PL new/YAML-PP-0.033/Makefile.PL
--- old/YAML-PP-0.032/Makefile.PL 2022-03-08 19:06:12.000000000 +0100
+++ new/YAML-PP-0.033/Makefile.PL 2022-06-27 16:33:50.000000000 +0200
@@ -54,7 +54,7 @@
"Test::Warn" => 0,
"lib" => 0
},
- "VERSION" => "0.032",
+ "VERSION" => "0.033",
"test" => {
"TESTS" => "t/*.t"
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-PP-0.032/dist.ini new/YAML-PP-0.033/dist.ini
--- old/YAML-PP-0.032/dist.ini 2022-03-08 19:06:12.000000000 +0100
+++ new/YAML-PP-0.033/dist.ini 2022-06-27 16:33:50.000000000 +0200
@@ -4,7 +4,7 @@
copyright_holder = Tina M��ller
copyright_year = 2022
-version = 0.032
+version = 0.033
[@Filter]
-bundle = @Basic
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-PP-0.032/lib/YAML/PP/Common.pm new/YAML-PP-0.033/lib/YAML/PP/Common.pm
--- old/YAML-PP-0.032/lib/YAML/PP/Common.pm 2022-03-08 19:06:12.000000000 +0100
+++ new/YAML-PP-0.033/lib/YAML/PP/Common.pm 2022-06-27 16:33:50.000000000 +0200
@@ -2,7 +2,7 @@
use warnings;
package YAML::PP::Common;
-our $VERSION = '0.032'; # VERSION
+our $VERSION = '0.033'; # VERSION
use base 'Exporter';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-PP-0.032/lib/YAML/PP/Constructor.pm new/YAML-PP-0.033/lib/YAML/PP/Constructor.pm
--- old/YAML-PP-0.032/lib/YAML/PP/Constructor.pm 2022-03-08 19:06:12.000000000 +0100
+++ new/YAML-PP-0.033/lib/YAML/PP/Constructor.pm 2022-06-27 16:33:50.000000000 +0200
@@ -3,7 +3,7 @@
use warnings;
package YAML::PP::Constructor;
-our $VERSION = '0.032'; # VERSION
+our $VERSION = '0.033'; # VERSION
use YAML::PP;
use YAML::PP::Common qw/
@@ -139,7 +139,7 @@
my $preserve_style = $self->preserve_flow_style;
my $preserve_alias = $self->preserve_alias;
if (($preserve_order or $preserve_style or $preserve_alias) and not tied(%$data)) {
- tie %$data, 'YAML::PP::Preserve::Hash';
+ tie %$data, 'YAML::PP::Preserve::Hash', %$data;
}
if ($preserve_style) {
my $t = tied %$data;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-PP-0.032/lib/YAML/PP/Dumper.pm new/YAML-PP-0.033/lib/YAML/PP/Dumper.pm
--- old/YAML-PP-0.032/lib/YAML/PP/Dumper.pm 2022-03-08 19:06:12.000000000 +0100
+++ new/YAML-PP-0.033/lib/YAML/PP/Dumper.pm 2022-06-27 16:33:50.000000000 +0200
@@ -2,7 +2,7 @@
use warnings;
package YAML::PP::Dumper;
-our $VERSION = '0.032'; # VERSION
+our $VERSION = '0.033'; # VERSION
use Scalar::Util qw/ blessed refaddr reftype /;
use YAML::PP;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-PP-0.032/lib/YAML/PP/Emitter.pm new/YAML-PP-0.033/lib/YAML/PP/Emitter.pm
--- old/YAML-PP-0.032/lib/YAML/PP/Emitter.pm 2022-03-08 19:06:12.000000000 +0100
+++ new/YAML-PP-0.033/lib/YAML/PP/Emitter.pm 2022-06-27 16:33:50.000000000 +0200
@@ -2,7 +2,7 @@
use warnings;
package YAML::PP::Emitter;
-our $VERSION = '0.032'; # VERSION
+our $VERSION = '0.033'; # VERSION
use Data::Dumper;
use YAML::PP::Common qw/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-PP-0.032/lib/YAML/PP/Exception.pm new/YAML-PP-0.033/lib/YAML/PP/Exception.pm
--- old/YAML-PP-0.032/lib/YAML/PP/Exception.pm 2022-03-08 19:06:12.000000000 +0100
+++ new/YAML-PP-0.033/lib/YAML/PP/Exception.pm 2022-06-27 16:33:50.000000000 +0200
@@ -2,7 +2,7 @@
use warnings;
package YAML::PP::Exception;
-our $VERSION = '0.032'; # VERSION
+our $VERSION = '0.033'; # VERSION
use overload '""' => \&to_string;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-PP-0.032/lib/YAML/PP/Grammar.pm new/YAML-PP-0.033/lib/YAML/PP/Grammar.pm
--- old/YAML-PP-0.032/lib/YAML/PP/Grammar.pm 2022-03-08 19:06:12.000000000 +0100
+++ new/YAML-PP-0.033/lib/YAML/PP/Grammar.pm 2022-06-27 16:33:50.000000000 +0200
@@ -2,7 +2,7 @@
use warnings;
package YAML::PP::Grammar;
-our $VERSION = '0.032'; # VERSION
+our $VERSION = '0.033'; # VERSION
use base 'Exporter';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-PP-0.032/lib/YAML/PP/Highlight.pm new/YAML-PP-0.033/lib/YAML/PP/Highlight.pm
--- old/YAML-PP-0.032/lib/YAML/PP/Highlight.pm 2022-03-08 19:06:12.000000000 +0100
+++ new/YAML-PP-0.033/lib/YAML/PP/Highlight.pm 2022-06-27 16:33:50.000000000 +0200
@@ -2,7 +2,7 @@
use warnings;
package YAML::PP::Highlight;
-our $VERSION = '0.032'; # VERSION
+our $VERSION = '0.033'; # VERSION
our @EXPORT_OK = qw/ Dump /;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-PP-0.032/lib/YAML/PP/Lexer.pm new/YAML-PP-0.033/lib/YAML/PP/Lexer.pm
--- old/YAML-PP-0.032/lib/YAML/PP/Lexer.pm 2022-03-08 19:06:12.000000000 +0100
+++ new/YAML-PP-0.033/lib/YAML/PP/Lexer.pm 2022-06-27 16:33:50.000000000 +0200
@@ -2,7 +2,7 @@
use warnings;
package YAML::PP::Lexer;
-our $VERSION = '0.032'; # VERSION
+our $VERSION = '0.033'; # VERSION
use constant TRACE => $ENV{YAML_PP_TRACE} ? 1 : 0;
use constant DEBUG => ($ENV{YAML_PP_DEBUG} || $ENV{YAML_PP_TRACE}) ? 1 : 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-PP-0.032/lib/YAML/PP/Loader.pm new/YAML-PP-0.033/lib/YAML/PP/Loader.pm
--- old/YAML-PP-0.032/lib/YAML/PP/Loader.pm 2022-03-08 19:06:12.000000000 +0100
+++ new/YAML-PP-0.033/lib/YAML/PP/Loader.pm 2022-06-27 16:33:50.000000000 +0200
@@ -3,7 +3,7 @@
use warnings;
package YAML::PP::Loader;
-our $VERSION = '0.032'; # VERSION
+our $VERSION = '0.033'; # VERSION
use YAML::PP::Parser;
use YAML::PP::Constructor;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-PP-0.032/lib/YAML/PP/Parser.pm new/YAML-PP-0.033/lib/YAML/PP/Parser.pm
--- old/YAML-PP-0.032/lib/YAML/PP/Parser.pm 2022-03-08 19:06:12.000000000 +0100
+++ new/YAML-PP-0.033/lib/YAML/PP/Parser.pm 2022-06-27 16:33:50.000000000 +0200
@@ -3,7 +3,7 @@
use warnings;
package YAML::PP::Parser;
-our $VERSION = '0.032'; # VERSION
+our $VERSION = '0.033'; # VERSION
use constant TRACE => $ENV{YAML_PP_TRACE} ? 1 : 0;
use constant DEBUG => ($ENV{YAML_PP_DEBUG} || $ENV{YAML_PP_TRACE}) ? 1 : 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-PP-0.032/lib/YAML/PP/Perl.pm new/YAML-PP-0.033/lib/YAML/PP/Perl.pm
--- old/YAML-PP-0.032/lib/YAML/PP/Perl.pm 2022-03-08 19:06:12.000000000 +0100
+++ new/YAML-PP-0.033/lib/YAML/PP/Perl.pm 2022-06-27 16:33:50.000000000 +0200
@@ -2,7 +2,7 @@
use warnings;
package YAML::PP::Perl;
-our $VERSION = '0.032'; # VERSION
+our $VERSION = '0.033'; # VERSION
use base 'Exporter';
use base 'YAML::PP';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-PP-0.032/lib/YAML/PP/Reader.pm new/YAML-PP-0.033/lib/YAML/PP/Reader.pm
--- old/YAML-PP-0.032/lib/YAML/PP/Reader.pm 2022-03-08 19:06:12.000000000 +0100
+++ new/YAML-PP-0.033/lib/YAML/PP/Reader.pm 2022-06-27 16:33:50.000000000 +0200
@@ -3,7 +3,7 @@
use warnings;
package YAML::PP::Reader;
-our $VERSION = '0.032'; # VERSION
+our $VERSION = '0.033'; # VERSION
sub input { return $_[0]->{input} }
sub set_input { $_[0]->{input} = $_[1] }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-PP-0.032/lib/YAML/PP/Render.pm new/YAML-PP-0.033/lib/YAML/PP/Render.pm
--- old/YAML-PP-0.032/lib/YAML/PP/Render.pm 2022-03-08 19:06:12.000000000 +0100
+++ new/YAML-PP-0.033/lib/YAML/PP/Render.pm 2022-06-27 16:33:50.000000000 +0200
@@ -3,7 +3,7 @@
use warnings;
package YAML::PP::Render;
-our $VERSION = '0.032'; # VERSION
+our $VERSION = '0.033'; # VERSION
use constant TRACE => $ENV{YAML_PP_TRACE} ? 1 : 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-PP-0.032/lib/YAML/PP/Representer.pm new/YAML-PP-0.033/lib/YAML/PP/Representer.pm
--- old/YAML-PP-0.032/lib/YAML/PP/Representer.pm 2022-03-08 19:06:12.000000000 +0100
+++ new/YAML-PP-0.033/lib/YAML/PP/Representer.pm 2022-06-27 16:33:50.000000000 +0200
@@ -2,7 +2,7 @@
use warnings;
package YAML::PP::Representer;
-our $VERSION = '0.032'; # VERSION
+our $VERSION = '0.033'; # VERSION
use Scalar::Util qw/ reftype blessed refaddr /;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-PP-0.032/lib/YAML/PP/Schema/Binary.pm new/YAML-PP-0.033/lib/YAML/PP/Schema/Binary.pm
--- old/YAML-PP-0.032/lib/YAML/PP/Schema/Binary.pm 2022-03-08 19:06:12.000000000 +0100
+++ new/YAML-PP-0.033/lib/YAML/PP/Schema/Binary.pm 2022-06-27 16:33:50.000000000 +0200
@@ -2,7 +2,7 @@
use warnings;
package YAML::PP::Schema::Binary;
-our $VERSION = '0.032'; # VERSION
+our $VERSION = '0.033'; # VERSION
use MIME::Base64 qw/ decode_base64 encode_base64 /;
use YAML::PP::Common qw/ YAML_ANY_SCALAR_STYLE /;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-PP-0.032/lib/YAML/PP/Schema/Core.pm new/YAML-PP-0.033/lib/YAML/PP/Schema/Core.pm
--- old/YAML-PP-0.032/lib/YAML/PP/Schema/Core.pm 2022-03-08 19:06:12.000000000 +0100
+++ new/YAML-PP-0.033/lib/YAML/PP/Schema/Core.pm 2022-06-27 16:33:50.000000000 +0200
@@ -2,7 +2,7 @@
use warnings;
package YAML::PP::Schema::Core;
-our $VERSION = '0.032'; # VERSION
+our $VERSION = '0.033'; # VERSION
use YAML::PP::Schema::JSON qw/
represent_int represent_float represent_literal represent_bool
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-PP-0.032/lib/YAML/PP/Schema/Failsafe.pm new/YAML-PP-0.033/lib/YAML/PP/Schema/Failsafe.pm
--- old/YAML-PP-0.032/lib/YAML/PP/Schema/Failsafe.pm 2022-03-08 19:06:12.000000000 +0100
+++ new/YAML-PP-0.033/lib/YAML/PP/Schema/Failsafe.pm 2022-06-27 16:33:50.000000000 +0200
@@ -2,7 +2,7 @@
use warnings;
package YAML::PP::Schema::Failsafe;
-our $VERSION = '0.032'; # VERSION
+our $VERSION = '0.033'; # VERSION
sub register {
my ($self, %args) = @_;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-PP-0.032/lib/YAML/PP/Schema/Include.pm new/YAML-PP-0.033/lib/YAML/PP/Schema/Include.pm
--- old/YAML-PP-0.032/lib/YAML/PP/Schema/Include.pm 2022-03-08 19:06:12.000000000 +0100
+++ new/YAML-PP-0.033/lib/YAML/PP/Schema/Include.pm 2022-06-27 16:33:50.000000000 +0200
@@ -2,7 +2,7 @@
use warnings;
package YAML::PP::Schema::Include;
-our $VERSION = '0.032'; # VERSION
+our $VERSION = '0.033'; # VERSION
use Carp qw/ croak /;
use Scalar::Util qw/ weaken /;
@@ -164,7 +164,7 @@
my $include = YAML::PP::Schema::Include->new;
- my $yp = YAML::PP->new( schema => ['JSON', $include] );
+ my $yp = YAML::PP->new( schema => ['+', $include] );
# we need the original YAML::PP object for getting the current filename
# and for loading another file
$include->yp($yp);
@@ -188,7 +188,7 @@
my $include = YAML::PP::Schema::Include->new(
paths => \@include_paths,
);
- my $yp = YAML::PP->new( schema => ['JSON', $include] );
+ my $yp = YAML::PP->new( schema => ['+', $include] );
$include->yp($yp);
# /path/to/include/yaml/1/file1.yaml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-PP-0.032/lib/YAML/PP/Schema/JSON.pm new/YAML-PP-0.033/lib/YAML/PP/Schema/JSON.pm
--- old/YAML-PP-0.032/lib/YAML/PP/Schema/JSON.pm 2022-03-08 19:06:12.000000000 +0100
+++ new/YAML-PP-0.033/lib/YAML/PP/Schema/JSON.pm 2022-06-27 16:33:50.000000000 +0200
@@ -2,7 +2,7 @@
use warnings;
package YAML::PP::Schema::JSON;
-our $VERSION = '0.032'; # VERSION
+our $VERSION = '0.033'; # VERSION
use base 'Exporter';
our @EXPORT_OK = qw/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-PP-0.032/lib/YAML/PP/Schema/Merge.pm new/YAML-PP-0.033/lib/YAML/PP/Schema/Merge.pm
--- old/YAML-PP-0.032/lib/YAML/PP/Schema/Merge.pm 2022-03-08 19:06:12.000000000 +0100
+++ new/YAML-PP-0.033/lib/YAML/PP/Schema/Merge.pm 2022-06-27 16:33:50.000000000 +0200
@@ -2,7 +2,7 @@
use warnings;
package YAML::PP::Schema::Merge;
-our $VERSION = '0.032'; # VERSION
+our $VERSION = '0.033'; # VERSION
use YAML::PP::Type::MergeKey;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-PP-0.032/lib/YAML/PP/Schema/Perl.pm new/YAML-PP-0.033/lib/YAML/PP/Schema/Perl.pm
--- old/YAML-PP-0.032/lib/YAML/PP/Schema/Perl.pm 2022-03-08 19:06:12.000000000 +0100
+++ new/YAML-PP-0.033/lib/YAML/PP/Schema/Perl.pm 2022-06-27 16:33:50.000000000 +0200
@@ -2,7 +2,7 @@
use warnings;
package YAML::PP::Schema::Perl;
-our $VERSION = '0.032'; # VERSION
+our $VERSION = '0.033'; # VERSION
use Scalar::Util qw/ blessed reftype /;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-PP-0.032/lib/YAML/PP/Schema/Tie/IxHash.pm new/YAML-PP-0.033/lib/YAML/PP/Schema/Tie/IxHash.pm
--- old/YAML-PP-0.032/lib/YAML/PP/Schema/Tie/IxHash.pm 2022-03-08 19:06:12.000000000 +0100
+++ new/YAML-PP-0.033/lib/YAML/PP/Schema/Tie/IxHash.pm 2022-06-27 16:33:50.000000000 +0200
@@ -2,7 +2,7 @@
use warnings;
package YAML::PP::Schema::Tie::IxHash;
-our $VERSION = '0.032'; # VERSION
+our $VERSION = '0.033'; # VERSION
use base 'YAML::PP::Schema';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-PP-0.032/lib/YAML/PP/Schema/YAML1_1.pm new/YAML-PP-0.033/lib/YAML/PP/Schema/YAML1_1.pm
--- old/YAML-PP-0.032/lib/YAML/PP/Schema/YAML1_1.pm 2022-03-08 19:06:12.000000000 +0100
+++ new/YAML-PP-0.033/lib/YAML/PP/Schema/YAML1_1.pm 2022-06-27 16:33:50.000000000 +0200
@@ -2,7 +2,7 @@
use warnings;
package YAML::PP::Schema::YAML1_1;
-our $VERSION = '0.032'; # VERSION
+our $VERSION = '0.033'; # VERSION
use YAML::PP::Schema::JSON qw/
represent_int represent_float represent_literal represent_bool
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-PP-0.032/lib/YAML/PP/Schema.pm new/YAML-PP-0.033/lib/YAML/PP/Schema.pm
--- old/YAML-PP-0.032/lib/YAML/PP/Schema.pm 2022-03-08 19:06:12.000000000 +0100
+++ new/YAML-PP-0.033/lib/YAML/PP/Schema.pm 2022-06-27 16:33:50.000000000 +0200
@@ -4,7 +4,7 @@
use B;
use Module::Load qw//;
-our $VERSION = '0.032'; # VERSION
+our $VERSION = '0.033'; # VERSION
use YAML::PP::Common qw/ YAML_PLAIN_SCALAR_STYLE /;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-PP-0.032/lib/YAML/PP/Type/MergeKey.pm new/YAML-PP-0.033/lib/YAML/PP/Type/MergeKey.pm
--- old/YAML-PP-0.032/lib/YAML/PP/Type/MergeKey.pm 2022-03-08 19:06:12.000000000 +0100
+++ new/YAML-PP-0.033/lib/YAML/PP/Type/MergeKey.pm 2022-06-27 16:33:50.000000000 +0200
@@ -2,7 +2,7 @@
use warnings;
package YAML::PP::Type::MergeKey;
-our $VERSION = '0.032'; # VERSION
+our $VERSION = '0.033'; # VERSION
sub new {
my ($class) = @_;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-PP-0.032/lib/YAML/PP/Writer/File.pm new/YAML-PP-0.033/lib/YAML/PP/Writer/File.pm
--- old/YAML-PP-0.032/lib/YAML/PP/Writer/File.pm 2022-03-08 19:06:12.000000000 +0100
+++ new/YAML-PP-0.033/lib/YAML/PP/Writer/File.pm 2022-06-27 16:33:50.000000000 +0200
@@ -2,7 +2,7 @@
use warnings;
package YAML::PP::Writer::File;
-our $VERSION = '0.032'; # VERSION
+our $VERSION = '0.033'; # VERSION
use Scalar::Util qw/ openhandle /;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-PP-0.032/lib/YAML/PP/Writer.pm new/YAML-PP-0.033/lib/YAML/PP/Writer.pm
--- old/YAML-PP-0.032/lib/YAML/PP/Writer.pm 2022-03-08 19:06:12.000000000 +0100
+++ new/YAML-PP-0.033/lib/YAML/PP/Writer.pm 2022-06-27 16:33:50.000000000 +0200
@@ -3,7 +3,7 @@
use warnings;
package YAML::PP::Writer;
-our $VERSION = '0.032'; # VERSION
+our $VERSION = '0.033'; # VERSION
sub output { return $_[0]->{output} }
sub set_output { $_[0]->{output} = $_[1] }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-PP-0.032/lib/YAML/PP.pm new/YAML-PP-0.033/lib/YAML/PP.pm
--- old/YAML-PP-0.032/lib/YAML/PP.pm 2022-03-08 19:06:12.000000000 +0100
+++ new/YAML-PP-0.033/lib/YAML/PP.pm 2022-06-27 16:33:50.000000000 +0200
@@ -3,7 +3,7 @@
use warnings;
package YAML::PP;
-our $VERSION = '0.032'; # VERSION
+our $VERSION = '0.033'; # VERSION
use YAML::PP::Schema;
use YAML::PP::Schema::JSON;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-PP-0.032/t/41.custom.schema.t new/YAML-PP-0.033/t/41.custom.schema.t
--- old/YAML-PP-0.032/t/41.custom.schema.t 2022-03-08 19:06:12.000000000 +0100
+++ new/YAML-PP-0.033/t/41.custom.schema.t 2022-06-27 16:33:50.000000000 +0200
@@ -3,23 +3,37 @@
use warnings;
use Test::More;
use YAML::PP;
+use YAML::PP::Common qw/ :PRESERVE /;
use FindBin '$Bin';
use lib "$Bin/lib";
my $yp = YAML::PP->new(
schema => [qw/ :MySchema /],
+ preserve => PRESERVE_ORDER,
);
-my $data = {
- o1 => (bless {}, 'Class1'),
-};
+my $yaml = <<'EOM';
+---
+o1: !Class1
+ z: 1
+ a: 2
+ y: 3
+ b: 4
+EOM
+
+my $data = $yp->load_string($yaml);
-my $yaml = $yp->dump_string($data);
+$yaml = $yp->dump_string($data);
cmp_ok($yaml, 'eq', <<EOY, '$data serializes with the schema in t/lib/MySchema.pm');
---
-o1: !Class1 ''
+o1: !Class1
+ id: 23
+ z: 1
+ a: 2
+ y: 3
+ b: 4
EOY
done_testing;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-PP-0.032/t/lib/MySchema.pm new/YAML-PP-0.033/t/lib/MySchema.pm
--- old/YAML-PP-0.032/t/lib/MySchema.pm 2022-03-08 19:06:12.000000000 +0100
+++ new/YAML-PP-0.033/t/lib/MySchema.pm 2022-06-27 16:33:50.000000000 +0200
@@ -13,13 +13,22 @@
my ($self, %args) = @_;
my $schema = $args{schema};
+ $schema->add_mapping_resolver(
+ tag => '!Class1',
+ on_create => sub { return bless { id => 23 }, 'Class1' },
+ on_data => sub {
+ my ($constructor, $data, $list) = @_;
+ %$$data = (%$$data, @$list);
+ },
+ );
+
$schema->add_representer(
class_equals => 'Class1',
code => sub {
my ($representer, $node) = @_;
# $node->{value} contains the object
$node->{tag} = '!Class1';
- $node->{ data } = '';
+ $node->{data} = $node->{value};
return 1;
},
);
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ibus-typing-booster for openSUSE:Factory checked in at 2022-06-28 15:23:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ibus-typing-booster (Old)
and /work/SRC/openSUSE:Factory/.ibus-typing-booster.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ibus-typing-booster"
Tue Jun 28 15:23:01 2022 rev:81 rq:985565 version:2.16.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/ibus-typing-booster/ibus-typing-booster.changes 2022-06-24 08:46:00.631186221 +0200
+++ /work/SRC/openSUSE:Factory/.ibus-typing-booster.new.1548/ibus-typing-booster.changes 2022-06-28 15:23:21.222030285 +0200
@@ -1,0 +2,11 @@
+Mon Jun 27 22:22:33 UTC 2022 - maiku.fabian(a)gmail.com
+
+- Update to 2.16.7
+- When the lookup table is hidden because of inline completion,
+ ignore commands to commit candidates by their index
+ (Resolves: https://github.com/mike-fabian/ibus-typing-booster/issues/325)
+- Add a command 'commit' with configurable key bindings
+ (Resolves: https://github.com/mike-fabian/ibus-typing-booster/issues/320)
+- Translation update from Weblate (sw updated to 100%)
+
+-------------------------------------------------------------------
Old:
----
ibus-typing-booster-2.16.5.tar.gz
New:
----
ibus-typing-booster-2.16.7.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ibus-typing-booster.spec ++++++
--- /var/tmp/diff_new_pack.hsYtBm/_old 2022-06-28 15:23:21.790031133 +0200
+++ /var/tmp/diff_new_pack.hsYtBm/_new 2022-06-28 15:23:21.794031139 +0200
@@ -15,7 +15,7 @@
#
Name: ibus-typing-booster
-Version: 2.16.5
+Version: 2.16.7
Release: 0
Summary: An input completion utility
License: GPL-3.0+
++++++ ibus-typing-booster-2.16.5.tar.gz -> ibus-typing-booster-2.16.7.tar.gz ++++++
/work/SRC/openSUSE:Factory/ibus-typing-booster/ibus-typing-booster-2.16.5.tar.gz /work/SRC/openSUSE:Factory/.ibus-typing-booster.new.1548/ibus-typing-booster-2.16.7.tar.gz differ: char 29, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package scap-security-guide for openSUSE:Factory checked in at 2022-06-28 15:22:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/scap-security-guide (Old)
and /work/SRC/openSUSE:Factory/.scap-security-guide.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scap-security-guide"
Tue Jun 28 15:22:59 2022 rev:17 rq:985543 version:0.1.62
Changes:
--------
--- /work/SRC/openSUSE:Factory/scap-security-guide/scap-security-guide.changes 2022-06-10 15:58:02.816857868 +0200
+++ /work/SRC/openSUSE:Factory/.scap-security-guide.new.1548/scap-security-guide.changes 2022-06-28 15:23:19.894028303 +0200
@@ -1,0 +2,6 @@
+Mon Jun 27 12:59:21 UTC 2022 - Marcus Meissner <meissner(a)suse.com>
+
+- fix-bash-template.patch: convert one bash emitter to new jinja method.
+ (bsc#1200163)
+
+-------------------------------------------------------------------
New:
----
fix-bash-template.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ scap-security-guide.spec ++++++
--- /var/tmp/diff_new_pack.qCsvvS/_old 2022-06-28 15:23:20.902029807 +0200
+++ /var/tmp/diff_new_pack.qCsvvS/_new 2022-06-28 15:23:20.906029814 +0200
@@ -53,6 +53,8 @@
%endif
Source: https://github.com/ComplianceAsCode/content/archive/v%{version}.tar.gz
Patch0: scap-security-guide-UnicodeEncodeError-character-fix.patch
+# upstream d9aa7a49d135be60e1a6f9d2ce4e29560482b3d0 and 3485c8298957b24d97a563079fd648004a92822b
+Patch1: fix-bash-template.patch
BuildRequires: cmake
%if "%{_vendor}" == "debbuild"
@@ -178,6 +180,7 @@
%prep
%setup -n content-%version
%patch0 -p0
+%patch1 -p1
%build
cd build
++++++ fix-bash-template.patch ++++++
diff --git a/shared/templates/audit_rules_syscall_events/bash.template b/shared/templates/audit_rules_syscall_events/bash.template
index 6532554875..bd5bb94cb9 100644
--- a/shared/templates/audit_rules_syscall_events/bash.template
+++ b/shared/templates/audit_rules_syscall_events/bash.template
@@ -1,19 +1,20 @@
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ol,multi_platform_rhv,multi_platform_sle
-# Include source function library.
-. /usr/share/scap-security-guide/remediation_functions
-
# First perform the remediation of the syscall rule
# Retrieve hardware architecture of the underlying system
[ "$(getconf LONG_BIT)" = "32" ] && RULE_ARCHS=("b32") || RULE_ARCHS=("b32" "b64")
for ARCH in "${RULE_ARCHS[@]}"
do
- PATTERN="-a always,exit -F arch=$ARCH -S {{{ ATTR }}}.*"
- GROUP="perm_mod"
- FULL_RULE="-a always,exit -F arch=$ARCH -S {{{ ATTR }}} -F auid>={{{ auid }}} -F auid!=4294967295 -F key=perm_mod"
+ # FULL_RULE="-a always,exit -F arch=$ARCH -S {{{ ATTR }}} -F auid>={{{ auid }}} -F auid!=4294967295 -F key=perm_mod"
+ ACTION_ARCH_FILTERS="-a always,exit -F arch=$ARCH"
+ SYSCALL="{{{ ATTR }}}"
+ SYSCALL_GROUPING="{{{ ATTR }}}"
+ AUID_FILTERS="-F auid>={{{ auid }}} -F auid!=4294967295"
+ KEY="perm_mod"
+ OTHER_FILTERS=""
# Perform the remediation for both possible tools: 'auditctl' and 'augenrules'
- fix_audit_syscall_rule "augenrules" "$PATTERN" "$GROUP" "$ARCH" "$FULL_RULE"
- fix_audit_syscall_rule "auditctl" "$PATTERN" "$GROUP" "$ARCH" "$FULL_RULE"
+ {{{ bash_fix_audit_syscall_rule("augenrules","$ACTION_ARCH_FILTERS", "$OTHER_FILTERS", "$AUID_FILTERS", "$SYSCALL", "$SYSCALL_GROUPING", "$KEY") }}}
+ {{{ bash_fix_audit_syscall_rule("auditctl", "$ACTION_ARCH_FILTERS", "$OTHER_FILTERS", "$AUID_FILTERS", "$SYSCALL", "$SYSCALL_GROUPING", "$KEY") }}}
done
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package diffoscope for openSUSE:Factory checked in at 2022-06-28 15:22:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/diffoscope (Old)
and /work/SRC/openSUSE:Factory/.diffoscope.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "diffoscope"
Tue Jun 28 15:22:59 2022 rev:35 rq:985550 version:216
Changes:
--------
--- /work/SRC/openSUSE:Factory/diffoscope/diffoscope.changes 2022-06-03 14:17:03.501347049 +0200
+++ /work/SRC/openSUSE:Factory/.diffoscope.new.1548/diffoscope.changes 2022-06-28 15:23:18.310025938 +0200
@@ -1,0 +2,33 @@
+Tue Jun 21 09:09:17 UTC 2022 - Sebastian Wagner <sebix+novell.com(a)sebix.at>
+
+- update to version 216:
+ - Print profile output if we were called with --profile and we receive a
+ TERM signal.
+ - Emit a warning if/when we are handling a TERM signal.
+ - Clarify in the code in what situations the main "finally" block gets
+ called, especially in relation to handling TERM signals.
+ - Clarify and tidy some unconditional control flow in diffoscope.profiling.
+- update to version 215:
+ - Bug fixes:
+ - Also catch IndexError (in addition to ValueError) when parsing .pyc
+ files. (Closes: #1012258)
+ - Strip "sticky" etc. from "x.deb: sticky Debian binary package [���]".
+ Thanks to David Pr��vot for the report. (Closes: #1011635)
+ - Correctly package diffoscope's scripts/ directory, fixing the extraction
+ of vmlinuz kernel images. (Closes: reproducible-builds/diffoscope#305)
+ - Correct the logic for supporting different versions of argcomplete in
+ debian/rules.
+ - New features:
+ - Support both PyPDF 1.x and 2.x.
+ - Codebase improvements:
+ - Don't call re.compile and then call .sub on the result; just call
+ re.sub directly.
+ - Clarify the logic around the difference between --usage and --help.
+ - Testsuite improvements:
+ - Integrate test coverage with GitLab's concept of artifacts.
+ - Re-enable Gnumeric tests as its now available again.
+ - Test --help and --usage, and additionally test that --help includes
+ the programmatically-generated file format list as well.
+ - Bump Standards Version field in debian/control to 4.6.1.
+
+-------------------------------------------------------------------
Old:
----
diffoscope-214.tar.bz2
diffoscope-214.tar.bz2.asc
New:
----
diffoscope-216.tar.bz2
diffoscope-216.tar.bz2.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ diffoscope.spec ++++++
--- /var/tmp/diff_new_pack.TOZxAS/_old 2022-06-28 15:23:18.930026864 +0200
+++ /var/tmp/diff_new_pack.TOZxAS/_new 2022-06-28 15:23:18.938026876 +0200
@@ -17,7 +17,7 @@
Name: diffoscope
-Version: 214
+Version: 216
Release: 0
Summary: In-depth comparison of files, archives, and directories
License: GPL-3.0-or-later
++++++ diffoscope-214.tar.bz2 -> diffoscope-216.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-214/MANIFEST.in new/diffoscope-216/MANIFEST.in
--- old/diffoscope-214/MANIFEST.in 2022-05-27 07:53:07.000000000 +0200
+++ new/diffoscope-216/MANIFEST.in 2022-06-10 08:01:00.000000000 +0200
@@ -2,5 +2,4 @@
include README.rst
include CONTRIBUTING.md
include pyproject.toml
-graft scripts
graft tests
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-214/debian/changelog new/diffoscope-216/debian/changelog
--- old/diffoscope-214/debian/changelog 2022-05-27 07:53:07.000000000 +0200
+++ new/diffoscope-216/debian/changelog 2022-06-10 08:01:00.000000000 +0200
@@ -1,3 +1,46 @@
+diffoscope (216) unstable; urgency=medium
+
+ * Print profile output if we were called with --profile and we receive a
+ TERM signal.
+ * Emit a warning if/when we are handling a TERM signal.
+ * Clarify in the code in what situations the main "finally" block gets
+ called, especially in relation to handling TERM signals.
+ * Clarify and tidy some unconditional control flow in diffoscope.profiling.
+
+ -- Chris Lamb <lamby(a)debian.org> Fri, 10 Jun 2022 07:00:54 +0100
+
+diffoscope (215) unstable; urgency=medium
+
+ [ Chris Lamb ]
+ * Bug fixes:
+ - Also catch IndexError (in addition to ValueError) when parsing .pyc
+ files. (Closes: #1012258)
+ - Strip "sticky" etc. from "x.deb: sticky Debian binary package [���]".
+ Thanks to David Pr��vot for the report. (Closes: #1011635)
+ - Correctly package diffoscope's scripts/ directory, fixing the extraction
+ of vmlinuz kernel images. (Closes: reproducible-builds/diffoscope#305)
+ - Correct the logic for supporting different versions of argcomplete in
+ debian/rules.
+
+ * New features:
+ - Support both PyPDF 1.x and 2.x.
+
+ * Codebase improvements:
+ - Don't call re.compile and then call .sub on the result; just call
+ re.sub directly.
+ - Clarify the logic around the difference between --usage and --help.
+
+ * Testsuite improvements:
+ - Integrate test coverage with GitLab's concept of artifacts.
+ - Re-enable Gnumeric tests as its now available again.
+ - Test --help and --usage, and additionally test that --help includes
+ the programmatically-generated file format list as well.
+
+ [ Holger Levsen ]
+ * Bump Standards Version field in debian/control to 4.6.1.
+
+ -- Chris Lamb <lamby(a)debian.org> Fri, 03 Jun 2022 06:54:48 +0100
+
diffoscope (214) unstable; urgency=medium
[ Chris Lamb ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-214/debian/control new/diffoscope-216/debian/control
--- old/diffoscope-214/debian/control 2022-05-27 07:53:07.000000000 +0200
+++ new/diffoscope-216/debian/control 2022-06-10 08:01:00.000000000 +0200
@@ -32,8 +32,7 @@
ghc <!nocheck>,
ghostscript <!nocheck>,
giflib-tools <!nocheck>,
-# drop gnumeric because it's not in testing currently (2022-04-27)
-# gnumeric <!nocheck>,
+ gnumeric <!nocheck>,
gnupg-utils <!nocheck>,
hdf5-tools <!nocheck>,
help2man,
@@ -91,7 +90,7 @@
zstd <!nocheck>,
Build-Conflicts:
graphicsmagick-imagemagick-compat,
-Standards-Version: 4.6.0
+Standards-Version: 4.6.1
Rules-Requires-Root: no
Homepage: https://diffoscope.org
Vcs-Git: https://salsa.debian.org/reproducible-builds/diffoscope.git
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-214/debian/rules new/diffoscope-216/debian/rules
--- old/diffoscope-214/debian/rules 2022-05-27 07:53:07.000000000 +0200
+++ new/diffoscope-216/debian/rules 2022-06-10 08:01:00.000000000 +0200
@@ -38,7 +38,7 @@
$(MAKE) -C doc $*.1
debian/diffoscope-minimal.bash-completion:
- register-python-argcomplete diffoscope || register-python-argcomplete3 diffoscope > $@
+ (register-python-argcomplete diffoscope || register-python-argcomplete3 diffoscope) > $@
execute_after_dh_auto_build: debian/diffoscope-minimal.bash-completion
dh_auto_build -O--buildsystem=makefile -Ddoc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-214/debian/tests/control new/diffoscope-216/debian/tests/control
--- old/diffoscope-214/debian/tests/control 2022-05-27 07:53:07.000000000 +0200
+++ new/diffoscope-216/debian/tests/control 2022-06-10 08:01:00.000000000 +0200
@@ -7,7 +7,7 @@
# $ mv debian/tests/control.tmp debian/tests/control
Tests: pytest-with-recommends
-Depends: python3-all, diffoscope, black, python3-pytest, python3-h5py, file, linux-image-amd64 [amd64] | linux-image-generic [amd64], abootimg, acl, apksigner, apktool [!ppc64el !s390x], binutils-multiarch, bzip2, caca-utils, colord, db-util, default-jdk-headless | default-jdk | java-sdk, device-tree-compiler, docx2txt, e2fsprogs, enjarify, ffmpeg, fontforge-extras, fp-utils [!ppc64el !s390x], genisoimage, gettext, ghc, ghostscript, giflib-tools, gnupg, gnupg-utils, hdf5-tools, imagemagick, jsbeautifier, libarchive-tools, libxmlb-dev, llvm, lz4 | liblz4-tool, mono-utils, ocaml-nox, odt2txt, oggvideotools [!s390x], openssh-client, openssl, pgpdump, poppler-utils, procyon-decompiler, python3-pdfminer, r-base-core, rpm2cpio, sng, sqlite3, squashfs-tools, tcpdump, u-boot-tools, unzip, wabt, xmlbeans, xxd | vim-common, xz-utils, zip, zstd, androguard, python3-argcomplete, python3-binwalk, python3-defusedxml, python3-distro, python3-guestfs, python3-jsondiff, python3-progressbar, python3-
pypdf2, python3-debian, python3-pyxattr, python3-rpm, python3-tlsh
+Depends: python3-all, diffoscope, black, python3-pytest, python3-h5py, file, linux-image-amd64 [amd64] | linux-image-generic [amd64], abootimg, acl, apksigner, apktool [!ppc64el !s390x], binutils-multiarch, bzip2, caca-utils, colord, db-util, default-jdk-headless | default-jdk | java-sdk, device-tree-compiler, docx2txt, e2fsprogs, enjarify, ffmpeg, fontforge-extras, fp-utils [!ppc64el !s390x], genisoimage, gettext, ghc, ghostscript, giflib-tools, gnumeric, gnupg, gnupg-utils, hdf5-tools, imagemagick, jsbeautifier, libarchive-tools, libxmlb-dev, llvm, lz4 | liblz4-tool, mono-utils, ocaml-nox, odt2txt, oggvideotools [!s390x], openssh-client, openssl, pgpdump, poppler-utils, procyon-decompiler, python3-pdfminer, r-base-core, rpm2cpio, sng, sqlite3, squashfs-tools, tcpdump, u-boot-tools, unzip, wabt, xmlbeans, xxd | vim-common, xz-utils, zip, zstd, androguard, python3-argcomplete, python3-binwalk, python3-defusedxml, python3-distro, python3-guestfs, python3-jsondiff, python3-progressbar
, python3-pypdf2, python3-debian, python3-pyxattr, python3-rpm, python3-tlsh
Tests: pytest
Depends: python3-all, diffoscope, python3-pytest, python3-h5py, file, python3-tlsh
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-214/debian/tests/control.sh new/diffoscope-216/debian/tests/control.sh
--- old/diffoscope-214/debian/tests/control.sh 2022-05-27 07:53:07.000000000 +0200
+++ new/diffoscope-216/debian/tests/control.sh 2022-06-10 08:01:00.000000000 +0200
@@ -19,8 +19,6 @@
# Don't test-depend on radare2; not in bullseye for security reasons. (#950372)
sed -i "s#radare2, ##" debian/tests/control.tmp
-# Drop gnumeric as it's not in testing currently (2022-04-27)
-sed -i "s#gnumeric, ##" debian/tests/control.tmp
sed -i "s,python3-python-debian,python3-debian," debian/tests/control.tmp
sed -i "s,python3-rpm-python,python3-rpm," debian/tests/control.tmp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-214/debian/tests/pytest new/diffoscope-216/debian/tests/pytest
--- old/diffoscope-214/debian/tests/pytest 2022-05-27 07:53:07.000000000 +0200
+++ new/diffoscope-216/debian/tests/pytest 2022-06-10 08:01:00.000000000 +0200
@@ -9,8 +9,7 @@
export LIBGUESTFS_MEMSIZE=128
if [ "$(basename "$0")" = "pytest-with-recommends" ]; then
- # ssconvert because gnumeric is not currently in testing (2022-04-27)
- export DIFFOSCOPE_FAIL_TESTS_ON_MISSING_TOOLS="apktool zipinfo pedump oggDump ppudump cbfstool otool lipo radare2 ssconvert"
+ export DIFFOSCOPE_FAIL_TESTS_ON_MISSING_TOOLS="apktool zipinfo pedump oggDump ppudump cbfstool otool lipo radare2"
fi
for py in $(py3versions -s); do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-214/diffoscope/__init__.py new/diffoscope-216/diffoscope/__init__.py
--- old/diffoscope-214/diffoscope/__init__.py 2022-05-27 07:53:07.000000000 +0200
+++ new/diffoscope-216/diffoscope/__init__.py 2022-06-10 08:01:00.000000000 +0200
@@ -17,4 +17,4 @@
# You should have received a copy of the GNU General Public License
# along with diffoscope. If not, see <https://www.gnu.org/licenses/>.
-VERSION = "214"
+VERSION = "216"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-214/diffoscope/comparators/pdf.py new/diffoscope-216/diffoscope/comparators/pdf.py
--- old/diffoscope-214/diffoscope/comparators/pdf.py 2022-05-27 07:53:07.000000000 +0200
+++ new/diffoscope-216/diffoscope/comparators/pdf.py 2022-06-10 08:01:00.000000000 +0200
@@ -27,6 +27,14 @@
try:
import PyPDF2
+
+ try:
+ # PyPDF 2.x
+ from PyPDF2.errors import PdfReadError
+ except ImportError:
+ # PyPDF 1.x
+ from PyPDF2.utils import PdfReadError
+
except ImportError: # noqa
python_module_missing("PyPDF2")
PyPDF2 = None
@@ -92,7 +100,7 @@
try:
pdf = PyPDF2.PdfFileReader(file.path)
document_info = pdf.getDocumentInfo()
- except PyPDF2.utils.PdfReadError as e:
+ except PdfReadError as e:
return f"(Could not extract metadata: {e})"
if document_info is None:
@@ -108,7 +116,7 @@
def dump_pypdf2_annotations(file):
try:
pdf = PyPDF2.PdfFileReader(file.path)
- except PyPDF2.utils.PdfReadError as e:
+ except PdfReadError as e:
return f"(Could not open file: {e})"
xs = []
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-214/diffoscope/comparators/python.py new/diffoscope-216/diffoscope/comparators/python.py
--- old/diffoscope-214/diffoscope/comparators/python.py 2022-05-27 07:53:07.000000000 +0200
+++ new/diffoscope-216/diffoscope/comparators/python.py 2022-06-10 08:01:00.000000000 +0200
@@ -53,7 +53,7 @@
source="Python bytecode",
)
]
- except ValueError as exc:
+ except (ValueError, IndexError) as exc:
self.add_comment("Could not decompile bytecode: {}".format(exc))
return []
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-214/diffoscope/comparators/utils/file.py new/diffoscope-216/diffoscope/comparators/utils/file.py
--- old/diffoscope-214/diffoscope/comparators/utils/file.py 2022-05-27 07:53:07.000000000 +0200
+++ new/diffoscope-216/diffoscope/comparators/utils/file.py 2022-06-10 08:01:00.000000000 +0200
@@ -400,9 +400,11 @@
# gzip compressed data as this is just a symptom of the contents itself
# changing that will be reflected elsewhere.
if val.startswith("gzip compressed data"):
- val = re.compile(r", original size modulo 2\^\d+ \d+$").sub(
- "", val
- )
+ val = re.sub(r", original size modulo 2\^\d+ \d+$", "", val)
+
+ # Strip "sticky" etc. from "x.deb: sticky Debian binary package [���]"
+ # See (#1011635)
+ val = re.sub(r"^(sticky|setuid|setgid)\s", "", val)
return val
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-214/diffoscope/comparators/vmlinuz.py new/diffoscope-216/diffoscope/comparators/vmlinuz.py
--- old/diffoscope-214/diffoscope/comparators/vmlinuz.py 2022-05-27 07:53:07.000000000 +0200
+++ new/diffoscope-216/diffoscope/comparators/vmlinuz.py 2022-06-10 08:01:00.000000000 +0200
@@ -46,7 +46,7 @@
logger.debug("extracting vmlinuz to %s", dest_path)
# Locate extract-vmlinux script
- script = pathlib.Path(__file__).parent.parent.parent.joinpath(
+ script = pathlib.Path(__file__).parent.parent.joinpath(
"scripts", "extract-vmlinux"
)
with open(dest_path, "wb") as f:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-214/diffoscope/main.py new/diffoscope-216/diffoscope/main.py
--- old/diffoscope-214/diffoscope/main.py 2022-05-27 07:53:07.000000000 +0200
+++ new/diffoscope-216/diffoscope/main.py 2022-06-10 08:01:00.000000000 +0200
@@ -487,7 +487,8 @@
def format_help(self, *args, **kwargs):
val = super().format_help(*args, **kwargs)
- # Only append the file formats if --help is passed.
+ # Only append the file formats (etc.) if --help is passed; otherwise we
+ # are being called via --usage
if not set(sys.argv) & {"--help", "-h"}:
return val
@@ -725,7 +726,10 @@
def sigterm_handler(signo, stack_frame):
+ logger.warning("Received TERM signal; cleaning up temp files...")
clean_all_temp_files()
+ ProfileManager().finish()
+ logger.warning("Exiting...")
os._exit(2)
@@ -780,6 +784,9 @@
pdb.post_mortem()
sys.exit(2)
finally:
+ # Note that this is block is not called if the sigterm_handler method
+ # is a) called, and b) executes successfully.
+
# Helps our tests run more predictably - some of them call main()
# which sets Config() values.
Config().reset()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-214/diffoscope/profiling.py new/diffoscope-216/diffoscope/profiling.py
--- old/diffoscope-214/diffoscope/profiling.py 2022-05-27 07:53:07.000000000 +0200
+++ new/diffoscope-216/diffoscope/profiling.py 2022-06-10 08:01:00.000000000 +0200
@@ -60,16 +60,25 @@
self.data[namespace][key]["time"] += time.time() - start
self.data[namespace][key]["count"] += 1
- def finish(self, parsed_args):
+ def finish(self, parsed_args=None):
from .presenters.utils import make_printer
+ # We are being called in the TERM handler so we don't have access to
+ # parsed_args. Print the profiling output to stderr if we have been
+ # collecting it.
+ if parsed_args is None:
+ if _ENABLED:
+ self.output(lambda x: print(x, file=sys.stderr))
+ return
+
# Include profiling in --debug output if --profile is not set.
if parsed_args.profile_output is None:
with setup_logging(parsed_args.debug, None) as logger:
self.output(lambda x: logger.debug(x.strip("\n")))
- else:
- with make_printer(parsed_args.profile_output) as fn:
- self.output(fn)
+ return
+
+ with make_printer(parsed_args.profile_output) as fn:
+ self.output(fn)
def output(self, print_fn):
title = "# Profiling output for: {}".format(" ".join(sys.argv))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-214/diffoscope/scripts/extract-vmlinux new/diffoscope-216/diffoscope/scripts/extract-vmlinux
--- old/diffoscope-214/diffoscope/scripts/extract-vmlinux 1970-01-01 01:00:00.000000000 +0100
+++ new/diffoscope-216/diffoscope/scripts/extract-vmlinux 2022-06-10 08:01:00.000000000 +0200
@@ -0,0 +1,64 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0-only
+# ----------------------------------------------------------------------
+# extract-vmlinux - Extract uncompressed vmlinux from a kernel image
+#
+# Inspired from extract-ikconfig
+# (c) 2009,2010 Dick Streefland <dick(a)streefland.net>
+#
+# (c) 2011 Corentin Chary <corentin.chary(a)gmail.com>
+#
+# ----------------------------------------------------------------------
+
+check_vmlinux()
+{
+ # Use readelf to check if it's a valid ELF
+ # TODO: find a better to way to check that it's really vmlinux
+ # and not just an elf
+ readelf -h $1 > /dev/null 2>&1 || return 1
+
+ cat $1
+ exit 0
+}
+
+try_decompress()
+{
+ # The obscure use of the "tr" filter is to work around older versions of
+ # "grep" that report the byte offset of the line instead of the pattern.
+
+ # Try to find the header ($1) and decompress from here
+ for pos in `tr "$1\n$2" "\n$2=" < "$img" | grep -abo "^$2"`
+ do
+ pos=${pos%%:*}
+ tail -c+$pos "$img" | $3 > $tmp 2> /dev/null
+ check_vmlinux $tmp
+ done
+}
+
+# Check invocation:
+me=${0##*/}
+img=$1
+if [ $# -ne 1 -o ! -s "$img" ]
+then
+ echo "Usage: $me <kernel-image>" >&2
+ exit 2
+fi
+
+# Prepare temp files:
+tmp=$(mktemp /tmp/vmlinux-XXX)
+trap "rm -f $tmp" 0
+
+# That didn't work, so retry after decompression.
+try_decompress '\037\213\010' xy gunzip
+try_decompress '\3757zXZ\000' abcde unxz
+try_decompress 'BZh' xy bunzip2
+try_decompress '\135\0\0\0' xxx unlzma
+try_decompress '\211\114\132' xy 'lzop -d'
+try_decompress '\002!L\030' xxx 'lz4 -d'
+try_decompress '(\265/\375' xxx unzstd
+
+# Finally check for uncompressed images or objects:
+check_vmlinux $img
+
+# Bail out:
+echo "$me: Cannot find vmlinux." >&2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-214/scripts/extract-vmlinux new/diffoscope-216/scripts/extract-vmlinux
--- old/diffoscope-214/scripts/extract-vmlinux 2022-05-27 07:53:07.000000000 +0200
+++ new/diffoscope-216/scripts/extract-vmlinux 1970-01-01 01:00:00.000000000 +0100
@@ -1,64 +0,0 @@
-#!/bin/sh
-# SPDX-License-Identifier: GPL-2.0-only
-# ----------------------------------------------------------------------
-# extract-vmlinux - Extract uncompressed vmlinux from a kernel image
-#
-# Inspired from extract-ikconfig
-# (c) 2009,2010 Dick Streefland <dick(a)streefland.net>
-#
-# (c) 2011 Corentin Chary <corentin.chary(a)gmail.com>
-#
-# ----------------------------------------------------------------------
-
-check_vmlinux()
-{
- # Use readelf to check if it's a valid ELF
- # TODO: find a better to way to check that it's really vmlinux
- # and not just an elf
- readelf -h $1 > /dev/null 2>&1 || return 1
-
- cat $1
- exit 0
-}
-
-try_decompress()
-{
- # The obscure use of the "tr" filter is to work around older versions of
- # "grep" that report the byte offset of the line instead of the pattern.
-
- # Try to find the header ($1) and decompress from here
- for pos in `tr "$1\n$2" "\n$2=" < "$img" | grep -abo "^$2"`
- do
- pos=${pos%%:*}
- tail -c+$pos "$img" | $3 > $tmp 2> /dev/null
- check_vmlinux $tmp
- done
-}
-
-# Check invocation:
-me=${0##*/}
-img=$1
-if [ $# -ne 1 -o ! -s "$img" ]
-then
- echo "Usage: $me <kernel-image>" >&2
- exit 2
-fi
-
-# Prepare temp files:
-tmp=$(mktemp /tmp/vmlinux-XXX)
-trap "rm -f $tmp" 0
-
-# That didn't work, so retry after decompression.
-try_decompress '\037\213\010' xy gunzip
-try_decompress '\3757zXZ\000' abcde unxz
-try_decompress 'BZh' xy bunzip2
-try_decompress '\135\0\0\0' xxx unlzma
-try_decompress '\211\114\132' xy 'lzop -d'
-try_decompress '\002!L\030' xxx 'lz4 -d'
-try_decompress '(\265/\375' xxx unzstd
-
-# Finally check for uncompressed images or objects:
-check_vmlinux $img
-
-# Bail out:
-echo "$me: Cannot find vmlinux." >&2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-214/setup.py new/diffoscope-216/setup.py
--- old/diffoscope-214/setup.py 2022-05-27 07:53:07.000000000 +0200
+++ new/diffoscope-216/setup.py 2022-06-10 08:01:00.000000000 +0200
@@ -45,6 +45,8 @@
license="GPL-3+",
url="https://diffoscope.org/",
packages=find_packages(exclude=["tests", "tests.*"]),
+ package_data={"diffoscope": ["scripts/*"]},
+ include_package_data=True,
tests_require=["pytest"],
cmdclass={"test": PyTest},
entry_points={
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-214/tests/test_main.py new/diffoscope-216/tests/test_main.py
--- old/diffoscope-214/tests/test_main.py 2022-05-27 07:53:07.000000000 +0200
+++ new/diffoscope-216/tests/test_main.py 2022-06-10 08:01:00.000000000 +0200
@@ -2,7 +2,7 @@
# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright �� 2015 J��r��my Bobbio <lunar(a)debian.org>
-# Copyright �� 2016-2020 Chris Lamb <lamby(a)debian.org>
+# Copyright �� 2016-2022 Chris Lamb <lamby(a)debian.org>
#
# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@
# along with diffoscope. If not, see <https://www.gnu.org/licenses/>.
import os
+import sys
import pytest
import signal
import tempfile
@@ -173,3 +174,20 @@
assert ret == 0
assert out == err == ""
+
+
+def test_help(capsys, monkeypatch):
+ # Fake --help in sys.argv so that we include out file formats in the output
+ monkeypatch.setattr(sys, "argv", ["diffoscope", "--help"])
+
+ ret, out, err = run(capsys, "--help")
+
+ assert err == ""
+ assert "file formats supported:" in out
+
+
+def test_usage(capsys):
+ ret, out, err = run(capsys, "--usage")
+
+ assert out == ""
+ assert "usage:" in err
1
0