openSUSE Commits
Threads by month
- ----- 2024 -----
- 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
November 2021
- 1 participants
- 2337 discussions
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package blueberry for openSUSE:Factory checked in at 2021-11-27 23:42:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/blueberry (Old)
and /work/SRC/openSUSE:Factory/.blueberry.new.1895 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blueberry"
Sat Nov 27 23:42:38 2021 rev:41 rq:934297 version:1.4.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/blueberry/blueberry.changes 2021-07-01 07:05:44.311428301 +0200
+++ /work/SRC/openSUSE:Factory/.blueberry.new.1895/blueberry.changes 2021-11-27 23:43:09.556328667 +0100
@@ -1,0 +2,14 @@
+Sat Nov 27 14:57:11 UTC 2021 - Ferdinand Thiessen <rpm(a)fthiessen.de>
+
+- Update to version 1.4.5:
+ * Add Turn bluetooth on/off option in tray menu.
+ * blueberry-tray.py: Remove menu positioning code.
+ * blueberry-tray.py: Silence a runtime warning.
+ * rfkillMagic: Rewrite safechild in shell script to reduce
+ memory usage.
+ * Added build & install steps to readme file.
+ * l10n: Update POT.
+- Restore Group.
+
+
+-------------------------------------------------------------------
Old:
----
blueberry-1.4.4.tar.gz
New:
----
blueberry-1.4.5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ blueberry.spec ++++++
--- /var/tmp/diff_new_pack.edGRbP/_old 2021-11-27 23:43:09.968327316 +0100
+++ /var/tmp/diff_new_pack.edGRbP/_new 2021-11-27 23:43:09.972327304 +0100
@@ -18,10 +18,11 @@
%define __requires_exclude typelib\\((St)\\)
Name: blueberry
-Version: 1.4.4
+Version: 1.4.5
Release: 0
Summary: A configuration tool for Bluetooth
License: GPL-3.0-or-later
+Group: System/GUI/Other
URL: https://github.com/linuxmint/blueberry
Source: https://github.com/linuxmint/%{name}/archive/%{version}.tar.gz#/%{name}-%{v…
Source1: blueberry-rfkill.rules
@@ -34,15 +35,15 @@
BuildRequires: python3
Requires: bluez-tools
Requires: gnome-bluetooth >= 3.14
-Requires: wmctrl
-Recommends: %{name}-lang
-BuildArch: noarch
-%glib2_gsettings_schema_requires
Requires: python3-dbus-python
Requires: python3-gobject
Requires: python3-gobject-Gdk
Requires: python3-setproctitle
Requires: util-linux
+Requires: wmctrl
+Recommends: %{name}-lang
+BuildArch: noarch
+%glib2_gsettings_schema_requires
%description
Utility for Bluetooth devices graphical configuration.
++++++ blueberry-1.4.4.tar.gz -> blueberry-1.4.5.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blueberry-1.4.4/README.md new/blueberry-1.4.5/README.md
--- old/blueberry-1.4.4/README.md 2021-06-25 15:38:17.000000000 +0200
+++ new/blueberry-1.4.5/README.md 2021-11-26 11:15:14.000000000 +0100
@@ -1,3 +1,40 @@
+## Introduction
A Bluetooth configuration tool.
-Depends on gnome-bluetooth 3.14.
\ No newline at end of file
+Depends on gnome-bluetooth 3.14.
+
+---
+
+## How to build and install
+
+#### Download the source code and enter the source directory
+
+```
+# Clone this repo:
+git clone https://github.com/linuxmint/blueberry.git
+
+# Enter the folder:
+cd blueberry
+```
+
+#### Building the package
+
+```
+# Use mint-build to build the project for the first time.
+# This also fetches and installs the build dependencies:
+mint-build
+
+# In subsequent builds, you can use dpkg-buildpackage for faster builds:
+dpkg-buildPackage
+```
+
+#### Install the package:
+
+```
+# Once that succeeds, install:
+cd ..
+sudo dpkg -i blueberry\*.deb
+```
+
+For more information, refer the developer guide:
+https://linuxmint-developer-guide.readthedocs.io/en/latest/index.html
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blueberry-1.4.4/blueberry.pot new/blueberry-1.4.5/blueberry.pot
--- old/blueberry-1.4.4/blueberry.pot 2021-06-25 15:38:17.000000000 +0200
+++ new/blueberry-1.4.5/blueberry.pot 2021-11-26 11:15:14.000000000 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-02-04 15:14+0000\n"
+"POT-Creation-Date: 2021-11-26 10:14+0000\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"
@@ -91,8 +91,8 @@
msgstr[0] ""
msgstr[1] ""
-#: usr/lib/blueberry/blueberry.py:100 usr/lib/blueberry/blueberry-tray.py:50
-#: usr/lib/blueberry/blueberry-tray.py:80 generate_desktop_files:23
+#: usr/lib/blueberry/blueberry.py:100 usr/lib/blueberry/blueberry-tray.py:58
+#: usr/lib/blueberry/blueberry-tray.py:88 generate_desktop_files:23
msgid "Bluetooth"
msgstr ""
@@ -144,7 +144,7 @@
msgid "Bluetooth is disabled by hardware switch"
msgstr ""
-#: usr/lib/blueberry/blueberry.py:304 usr/lib/blueberry/blueberry-tray.py:67
+#: usr/lib/blueberry/blueberry.py:304 usr/lib/blueberry/blueberry-tray.py:75
msgid "Bluetooth is disabled"
msgstr ""
@@ -158,28 +158,36 @@
"the 'rfkill' group."
msgstr ""
-#: usr/lib/blueberry/blueberry-tray.py:77
+#: usr/lib/blueberry/blueberry-tray.py:85
#, python-format
msgid "Bluetooth: Connected to %s"
msgstr ""
-#: usr/lib/blueberry/blueberry-tray.py:120
+#: usr/lib/blueberry/blueberry-tray.py:130
+msgid "Turn on Bluetooth"
+msgstr ""
+
+#: usr/lib/blueberry/blueberry-tray.py:134
+msgid "Turn off Bluetooth"
+msgstr ""
+
+#: usr/lib/blueberry/blueberry-tray.py:139
msgid "Send files to a device"
msgstr ""
-#: usr/lib/blueberry/blueberry-tray.py:124
+#: usr/lib/blueberry/blueberry-tray.py:143
msgid "Open Bluetooth device manager"
msgstr ""
-#: usr/lib/blueberry/blueberry-tray.py:130
+#: usr/lib/blueberry/blueberry-tray.py:149
msgid "Paired devices"
msgstr ""
-#: usr/lib/blueberry/blueberry-tray.py:139
+#: usr/lib/blueberry/blueberry-tray.py:158
msgid "Connected"
msgstr ""
-#: usr/lib/blueberry/blueberry-tray.py:147
+#: usr/lib/blueberry/blueberry-tray.py:166
msgid "Quit"
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blueberry-1.4.4/debian/changelog new/blueberry-1.4.5/debian/changelog
--- old/blueberry-1.4.4/debian/changelog 2021-06-25 15:38:17.000000000 +0200
+++ new/blueberry-1.4.5/debian/changelog 2021-11-26 11:15:14.000000000 +0100
@@ -1,3 +1,23 @@
+blueberry (1.4.5) una; urgency=medium
+
+ [ P. Radha Krishna ]
+ * Added Turn bluetooth on/off option in tray menu #112 (#117)
+
+ [ Michael Webster ]
+ * blueberry-tray.py: Remove menu positioning code.
+ * blueberry-tray.py: Silence a runtime warning.
+
+ [ Mickey Rose ]
+ * rfkillMagic: rewrite safechild in shell script to reduce memory usage (#115)
+
+ [ P. Radha Krishna ]
+ * Added build & install steps to readme file (#118)
+
+ [ Clement Lefebvre ]
+ * l10n: Update POT
+
+ -- Clement Lefebvre <root(a)linuxmint.com> Fri, 26 Nov 2021 10:14:48 +0000
+
blueberry (1.4.4) uma; urgency=medium
* l10n: Update translations
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blueberry-1.4.4/usr/lib/blueberry/blueberry-tray.py new/blueberry-1.4.5/usr/lib/blueberry/blueberry-tray.py
--- old/blueberry-1.4.4/usr/lib/blueberry/blueberry-tray.py 2021-06-25 15:38:17.000000000 +0200
+++ new/blueberry-1.4.5/usr/lib/blueberry/blueberry-tray.py 2021-11-26 11:15:14.000000000 +0100
@@ -124,6 +124,17 @@
def on_statusicon_released(self, icon, x, y, button, time, position):
if button == 3:
menu = Gtk.Menu()
+
+ if not self.rfkill.hard_block:
+ if self.rfkill.soft_block:
+ item = Gtk.MenuItem(label=_("Turn on Bluetooth"))
+ item.connect("activate", self.turn_on_bluetooth)
+ menu.append(item)
+ else:
+ item = Gtk.MenuItem(label=_("Turn off Bluetooth"))
+ item.connect("activate", self.turn_off_bluetooth)
+ menu.append(item)
+
if not(self.rfkill.hard_block or self.rfkill.soft_block):
item = Gtk.MenuItem(label=_("Send files to a device"))
item.connect("activate", self.send_files_cb)
@@ -135,7 +146,7 @@
if len(self.paired_devices) > 0:
menu.append(Gtk.SeparatorMenuItem())
- m_item = Gtk.MenuItem(_("Paired devices"))
+ m_item = Gtk.MenuItem(label=_("Paired devices"))
menu.append(m_item)
paired_menu = Gtk.Menu()
m_item.set_submenu(paired_menu)
@@ -157,21 +168,7 @@
menu.append(item)
menu.show_all()
-
- if position == -1:
- # The position and coordinates are unknown. This is the
- # case when the XAppStatusIcon fallbacks as a Gtk.StatusIcon
- menu.popup(None, None, None, None, button, time)
- else:
- def position_menu_cb(menu, pointer_x, pointer_y, user_data):
- [x, y, position] = user_data;
- if (position == Gtk.PositionType.BOTTOM):
- y = y - menu.get_allocation().height;
- if (position == Gtk.PositionType.RIGHT):
- x = x - menu.get_allocation().width;
- return (x, y, False)
- device = Gdk.Display.get_default().get_device_manager().get_client_pointer()
- menu.popup_for_device(device, None, None, position_menu_cb, [x, y, position], button, time)
+ icon.popup_menu(menu, x, y, button, time, position)
def toggle_connect_cb(self, item, data = None):
proxy = self.paired_devices[data]
@@ -184,6 +181,14 @@
def open_manager_cb(self, item, data = None):
subprocess.Popen(["blueberry"])
+ def turn_on_bluetooth(self, item):
+ self.rfkill.try_set_blocked(False)
+ return True
+
+ def turn_off_bluetooth(self,item):
+ self.rfkill.try_set_blocked(True)
+ return True
+
def terminate(self, window = None, data = None):
self.quit()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blueberry-1.4.4/usr/lib/blueberry/safechild new/blueberry-1.4.5/usr/lib/blueberry/safechild
--- old/blueberry-1.4.4/usr/lib/blueberry/safechild 2021-06-25 15:38:17.000000000 +0200
+++ new/blueberry-1.4.5/usr/lib/blueberry/safechild 2021-11-26 11:15:14.000000000 +0100
@@ -1,8 +1,6 @@
-#!/usr/bin/python3
-
-import subprocess
-import sys
+#!/bin/sh
+: \
"""
Wrapper for rfkill binary.
@@ -20,16 +18,12 @@
"""
-proc = None
+trap exit CHLD
+
+"$@" &
+childPID=$!
-try:
- proc = subprocess.Popen(sys.argv[1:])
+while read -r anything; do : nothing; done
- while True:
- line = sys.stdin.readline()
- if line == "":
- proc.kill()
- proc.wait()
- break
-except Exception as e:
- print("safechild exception: ", e)
+kill $childPID
+wait
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-pymisp for openSUSE:Factory checked in at 2021-11-27 23:42:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pymisp (Old)
and /work/SRC/openSUSE:Factory/.python-pymisp.new.1895 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pymisp"
Sat Nov 27 23:42:37 2021 rev:39 rq:934267 version:2.4.151
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pymisp/python-pymisp.changes 2021-10-11 15:32:26.234923846 +0200
+++ /work/SRC/openSUSE:Factory/.python-pymisp.new.1895/python-pymisp.changes 2021-11-27 23:43:08.676331552 +0100
@@ -1,0 +2,57 @@
+Sat Nov 20 15:29:17 UTC 2021 - Sebastian Wagner <sebix+novell.com(a)sebix.at>
+
+- - update to version 2.4.151:
+ - New
+ - Add Blind Carbon Copy (bcc) headers. [Sami Tainio]
+ - Changes
+ - Bump version. [Rapha��l Vinot]
+ - Bump misp-objects. [Rapha��l Vinot]
+ - [feed-generator] Make the feature to exlude attribute type more
+ generic. [Sami Mokaddem]
+ - [feed-generator] Added exclude malware samples option. [Sami Mokaddem]
+ - Bump deps, chardet is required by pyfaup. [Rapha��l Vinot]
+ - Removed a whitespace. [Sami Tainio]
+ - Keep strict and generate attributes when needed. [Rapha��l Vinot]
+ - Slight changes regarding timezones. [Rapha��l Vinot]
+ - Bump deps. [Rapha��l Vinot]
+ - Unified constructors. [Thomas Dupuy]
+ - Slight changes regarding timezones. [Rapha��l Vinot]
+ - Bump deps. [Rapha��l Vinot]
+ - [types] remove the duplicate. [Alexandre Dulaunoy]
+ - [describeTypes] remove duplicate filename-pattern. [Alexandre
+ Dulaunoy]
+ - [misp-objects] updated. [Alexandre Dulaunoy]
+ - [misp-objects] updated to the latest version. [Alexandre Dulaunoy]
+ - Bump many dependencies. [Rapha��l Vinot]
+ - Add in test case for get_sharing_group and validate orgs are present.
+ [Tom King]
+ - Improve sharing groups, bring back organsations included and ability
+ to get specific SG. [Tom King]
+ - Add in test case for searching against orgs and users. [Tom King]
+ - Add ability to search against orgs and users by freetext search (both)
+ or organisation (users) [Tom King]
+ - [test] Check if all category types exists. [Jakub Onderka]
+ - Bump changelog. [Rapha��l Vinot]
+ - [py] Typo. [Steve Clement]
+ - [describeTypes] updated to include ssh-fingerprint. [Alexandre
+ Dulaunoy]
+ - Fix
+ - [feed-generator] Revert back the event initial search to use the index
+ endpoint instead of RestSearch. [Sami Mokaddem]
+ Relying on RestSearch was offering more flexibility than index in terms of filtering options,
+ however, it might introduce a significant overhead potentially leading to timeout.
+ - PyMISP.get_user_setting method. [Jakub Onderka]
+ - [tests] Remove debug prints. [Jakub Onderka]
+ - Fix final nosetest. [Tom King]
+ - Fix nosetests. [Tom King]
+ - [types] Update types to use `filename-pattern` type. [Jakub Onderka]
+ - [test] Remove debug print. [Jakub Onderka]
+ - [test] Correct error messages for blocked event. [Jakub Onderka]
+ - Missing import in __init__ [Rapha��l Vinot]
+ Fix #796
+ - [tests] Fixed stix test. [chrisr3d]
+ - [py] Typo. [Steve Clement]
+ - Other
+ - Update README.md. [Rapha��l Vinot]
+
+-------------------------------------------------------------------
Old:
----
python-pymisp-2.4.148.1.tar.gz
New:
----
python-pymisp-2.4.151.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pymisp.spec ++++++
--- /var/tmp/diff_new_pack.lfxGZE/_old 2021-11-27 23:43:09.140330031 +0100
+++ /var/tmp/diff_new_pack.lfxGZE/_new 2021-11-27 23:43:09.144330017 +0100
@@ -20,7 +20,7 @@
%define skip_python2 1
%define misp_objects_revision 3d52773e9d3ba39ff324455bf8c10b47e11b695a
Name: python-pymisp
-Version: 2.4.148.1
+Version: 2.4.151
Release: 0
Summary: Python API for MISP
License: BSD-2-Clause
++++++ python-pymisp-2.4.148.1.tar.gz -> python-pymisp-2.4.151.tar.gz ++++++
++++ 2575 lines of diff (skipped)
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 2021-11-27 23:42:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/diffoscope (Old)
and /work/SRC/openSUSE:Factory/.diffoscope.new.1895 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "diffoscope"
Sat Nov 27 23:42:36 2021 rev:22 rq:934266 version:193
Changes:
--------
--- /work/SRC/openSUSE:Factory/diffoscope/diffoscope.changes 2021-11-03 17:26:30.585345225 +0100
+++ /work/SRC/openSUSE:Factory/.diffoscope.new.1895/diffoscope.changes 2021-11-27 23:43:07.420335669 +0100
@@ -1,0 +2,44 @@
+Sat Nov 20 13:01:25 UTC 2021 - Sebastian Wagner <sebix+novell.com(a)sebix.at>
+
+- - update to version 193:
+ - Don't duplicate file lists at each directory level.
+ (Closes: #989192, reproducible-builds/diffoscope#263)
+ - When pretty-printing JSON, mark the difference as such, additionally
+ avoiding including the full path.
+ (Closes: reproducible-builds/diffoscope#205)
+ - Codebase improvements:
+ - Update a bunch of %-style string interpolations into f-strings or
+ str.format.
+ - Import itertools top-level directly.
+ - Drop some unused imports.
+ - Use isinstance(...) over type(...) ==
+ - Avoid aliasing variables if we aren't going to use them.
+ - Fix missing diff output on large diffs.
+ - Ignore a Python warning coming from a dependent library (triggered by
+ supporting Python 3.10)
+ - Document that support both Python 3.9 and 3.10.
+
+-------------------------------------------------------------------
+Sun Nov 14 21:14:04 UTC 2021 - Sebastian Wagner <sebix+novell.com(a)sebix.at>
+
+- update to version 192:
+ - Update .epub test methodology after improving XML file parsing.
+- update to version 191:
+ - Detect XML files as XML files if either file(1) claims if they are XML
+ files, or if they are named .xml.
+ (Closes: #999438, reproducible-builds/diffoscope#287)
+ - Don't reject Debian .changes files if they contain non-printable
+ characters. (Closes: reproducible-builds/diffoscope#286)
+ - Continue loading a .changes file even if the referenced files inside it do
+ not exist, but include a comment in the diff as a result.
+ - Log the reason if we cannot load a Debian .changes file.
+ - Fix inverted logic in the assert_diff_startswith() utility.
+- update to version 190:
+ - Don't raise a traceback if we cannot de-marshal Python bytecode to support
+ Python 3.7 loading newer .pyc files.
+ (Closes: reproducible-builds/diffoscope#284)
+ - Fix Python tests under Python 3.7 with file 5.39+.
+ - Skip Python bytecode testing when "file" is older than 5.39.
+ - Detect whether the GNU_BUILD_ID field has been modified.
+
+-------------------------------------------------------------------
Old:
----
diffoscope-189.tar.bz2
diffoscope-189.tar.bz2.asc
New:
----
diffoscope-193.tar.bz2
diffoscope-193.tar.bz2.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ diffoscope.spec ++++++
--- /var/tmp/diff_new_pack.4umysR/_old 2021-11-27 23:43:07.796334436 +0100
+++ /var/tmp/diff_new_pack.4umysR/_new 2021-11-27 23:43:07.800334423 +0100
@@ -17,7 +17,7 @@
Name: diffoscope
-Version: 189
+Version: 193
Release: 0
Summary: In-depth comparison of files, archives, and directories
License: GPL-3.0-or-later
++++++ diffoscope-189.tar.bz2 -> diffoscope-193.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-189/debian/changelog new/diffoscope-193/debian/changelog
--- old/diffoscope-189/debian/changelog 2021-10-29 10:47:06.000000000 +0200
+++ new/diffoscope-193/debian/changelog 2021-11-19 16:35:12.000000000 +0100
@@ -1,3 +1,69 @@
+diffoscope (193) unstable; urgency=medium
+
+ [ Chris Lamb ]
+ * Don't duplicate file lists at each directory level.
+ (Closes: #989192, reproducible-builds/diffoscope#263)
+ * When pretty-printing JSON, mark the difference as such, additionally
+ avoiding including the full path.
+ (Closes: reproducible-builds/diffoscope#205)
+
+ * Codebase improvements:
+ - Update a bunch of %-style string interpolations into f-strings or
+ str.format.
+ - Import itertools top-level directly.
+ - Drop some unused imports.
+ - Use isinstance(...) over type(...) ==
+ - Avoid aliasing variables if we aren't going to use them.
+
+ [ Brandon Maier ]
+ * Fix missing diff output on large diffs.
+
+ [ Mattia Rizzolo ]
+ * Ignore a Python warning coming from a dependent library (triggered by
+ supporting Python 3.10)
+ * Document that support both Python 3.9 and 3.10.
+
+ -- Chris Lamb <lamby(a)debian.org> Fri, 19 Nov 2021 07:35:10 -0800
+
+diffoscope (192) unstable; urgency=medium
+
+ * Update .epub test methodology after improving XML file parsing.
+
+ -- Chris Lamb <lamby(a)debian.org> Fri, 12 Nov 2021 08:17:14 -0800
+
+diffoscope (191) unstable; urgency=medium
+
+ [ Chris Lamb ]
+ * Detect XML files as XML files if either file(1) claims if they are XML
+ files, or if they are named .xml.
+ (Closes: #999438, reproducible-builds/diffoscope#287)
+ * Don't reject Debian .changes files if they contain non-printable
+ characters. (Closes: reproducible-builds/diffoscope#286)
+ * Continue loading a .changes file even if the referenced files inside it do
+ not exist, but include a comment in the diff as a result.
+ * Log the reason if we cannot load a Debian .changes file.
+
+ [ Zbigniew J��drzejewski-Szmek ]
+ * Fix inverted logic in the assert_diff_startswith() utility.
+
+ -- Chris Lamb <lamby(a)debian.org> Fri, 12 Nov 2021 06:43:57 -0800
+
+diffoscope (190) unstable; urgency=medium
+
+ [ Chris Lamb ]
+ * Don't raise a traceback if we cannot de-marshal Python bytecode to support
+ Python 3.7 loading newer .pyc files.
+ (Closes: reproducible-builds/diffoscope#284)
+ * Fix Python tests under Python 3.7 with file 5.39+.
+
+ [ Vagrant Cascadian ]
+ * Skip Python bytecode testing when "file" is older than 5.39.
+
+ [ Roland Clobus ]
+ * Detect whether the GNU_BUILD_ID field has been modified.
+
+ -- Chris Lamb <lamby(a)debian.org> Fri, 05 Nov 2021 08:47:27 +0000
+
diffoscope (189) unstable; urgency=medium
[ Chris Lamb ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-189/diffoscope/__init__.py new/diffoscope-193/diffoscope/__init__.py
--- old/diffoscope-189/diffoscope/__init__.py 2021-10-29 10:47:06.000000000 +0200
+++ new/diffoscope-193/diffoscope/__init__.py 2021-11-19 16:35:12.000000000 +0100
@@ -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 = "189"
+VERSION = "193"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-189/diffoscope/comparators/deb.py new/diffoscope-193/diffoscope/comparators/deb.py
--- old/diffoscope-189/diffoscope/comparators/deb.py 2021-10-29 10:47:06.000000000 +0200
+++ new/diffoscope-193/diffoscope/comparators/deb.py 2021-11-19 16:35:12.000000000 +0100
@@ -184,7 +184,7 @@
with open(self.path, "r", encoding="utf-8") as f:
for line in f:
md5sum, path = re.split(r"\s+", line.strip(), maxsplit=1)
- md5sums["./%s" % path] = md5sum
+ md5sums[f"./{path}"] = md5sum
return md5sums
except (UnicodeDecodeError, ValueError):
logger.debug("Malformed md5sums, ignoring.")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-189/diffoscope/comparators/debian.py new/diffoscope-193/diffoscope/comparators/debian.py
--- old/diffoscope-189/diffoscope/comparators/debian.py 2021-10-29 10:47:06.000000000 +0200
+++ new/diffoscope-193/diffoscope/comparators/debian.py 2021-11-19 16:35:12.000000000 +0100
@@ -217,7 +217,10 @@
class DotChangesFile(DebControlFile):
DESCRIPTION = "Debian .changes files"
FILE_EXTENSION_SUFFIX = {".changes"}
- FILE_TYPE_RE = re.compile(r"^(ASCII text|UTF-8 Unicode text)")
+
+ # .changes files can be identified "data" if they contain non-printable
+ # characters (Re: reproducible-builds/diffoscope#286)
+ FILE_TYPE_RE = re.compile(r"^(ASCII text|UTF-8 Unicode text|data)")
@classmethod
def recognizes(cls, file):
@@ -226,13 +229,19 @@
try:
file._deb822 = Changes(filename=file.path)
- except ChangesFileException:
+ except ChangesFileException as exc:
+ logger.warning(
+ f"Rejecting {file.path} as a Debian .changes file: {exc}"
+ )
return False
try:
+ file.validation_msg = None
file._deb822.validate("sha256", check_signature=False)
- except FileNotFoundError:
- return False
+ except FileNotFoundError as exc:
+ # Continue even though this .changes file may be invalid
+ file.validation_msg = f"{os.path.basename(file.path)} is missing referenced files: {exc}"
+ logger.warning(file.validation_msg)
return True
@@ -242,6 +251,10 @@
if differences is None:
return None
+ for x in (self, other):
+ if x.validation_msg:
+ differences.add_comment(x.validation_msg)
+
other_deb822 = self._get_deb822(other)
files = zip(self._deb822.get("Files"), other_deb822.get("Files"))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-189/diffoscope/comparators/decompile.py new/diffoscope-193/diffoscope/comparators/decompile.py
--- old/diffoscope-189/diffoscope/comparators/decompile.py 2021-10-29 10:47:06.000000000 +0200
+++ new/diffoscope-193/diffoscope/comparators/decompile.py 2021-11-19 16:35:12.000000000 +0100
@@ -18,7 +18,6 @@
# along with diffoscope. If not, see <https://www.gnu.org/licenses/>.
import re
-import sys
import abc
import logging
@@ -26,7 +25,6 @@
from .utils.operation import Operation
from .utils.container import Container
-from diffoscope.config import Config
from diffoscope.difference import Difference
from diffoscope.excludes import operation_excluded
from diffoscope.tools import (
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-189/diffoscope/comparators/device.py new/diffoscope-193/diffoscope/comparators/device.py
--- old/diffoscope-189/diffoscope/comparators/device.py 2021-10-29 10:47:06.000000000 +0200
+++ new/diffoscope-193/diffoscope/comparators/device.py 2021-11-19 16:35:12.000000000 +0100
@@ -88,4 +88,4 @@
kind = "block"
else:
kind = "weird"
- return "device:%s\nmajor: %d\nminor: %d\n" % (kind, major, minor)
+ return f"device:{kind}\nmajor: {major}\nminor: {minor}\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-189/diffoscope/comparators/directory.py new/diffoscope-193/diffoscope/comparators/directory.py
--- old/diffoscope-189/diffoscope/comparators/directory.py 2021-10-29 10:47:06.000000000 +0200
+++ new/diffoscope-193/diffoscope/comparators/directory.py 2021-11-19 16:35:12.000000000 +0100
@@ -35,20 +35,6 @@
logger = logging.getLogger(__name__)
-def list_files(path):
- path = os.path.realpath(path)
- all_files = []
- for root, dirs, names in os.walk(path):
- all_files.extend(
- [os.path.join(root[len(path) + 1 :], dir) for dir in dirs]
- )
- all_files.extend(
- [os.path.join(root[len(path) + 1 :], name) for name in names]
- )
- all_files.sort()
- return all_files
-
-
if os.uname()[0] == "FreeBSD":
class Stat(Command):
@@ -174,7 +160,7 @@
try:
stat1 = os.lstat(path1)
stat2 = os.lstat(path2)
- except Exception as e:
+ except Exception:
return []
differences = []
@@ -267,6 +253,11 @@
def compare(self, other, source=None):
differences = []
+ # We don't need to recurse into subdirectories; DirectoryContainer will
+ # find them and do that for us.
+ def list_files(path):
+ return sorted(os.listdir(os.path.realpath(path)))
+
listing_diff = Difference.from_text(
"\n".join(list_files(self.path)),
"\n".join(list_files(other.path)),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-189/diffoscope/comparators/elf.py new/diffoscope-193/diffoscope/comparators/elf.py
--- old/diffoscope-189/diffoscope/comparators/elf.py 2021-10-29 10:47:06.000000000 +0200
+++ new/diffoscope-193/diffoscope/comparators/elf.py 2021-11-19 16:35:12.000000000 +0100
@@ -22,6 +22,7 @@
import logging
import subprocess
import collections
+import hashlib
from diffoscope.exc import OutputParsingError
from diffoscope.tools import get_tool_name, tool_required
@@ -34,7 +35,6 @@
from .decompile import DecompilableContainer
from .utils.file import File
from .utils.command import Command, our_check_output
-from .utils.container import Container
DEBUG_SECTION_GROUPS = (
"rawline",
@@ -157,7 +157,7 @@
class ReadelfDebugDump(Readelf):
def readelf_options(self):
- return ["--debug-dump=%s" % self._debug_section_group]
+ return [f"--debug-dump={self._debug_section_group}"]
READELF_DEBUG_DUMP_COMMANDS = [
@@ -460,6 +460,7 @@
]
output = our_check_output(cmd, shell=False, stderr=subprocess.DEVNULL)
has_debug_symbols = False
+ has_build_id = False
try:
output = output.decode("utf-8").split("\n")
@@ -481,6 +482,9 @@
if name.startswith(".debug") or name.startswith(".zdebug"):
has_debug_symbols = True
+ if name == ".note.gnu.build-id" and type == "NOTE":
+ has_build_id = True
+
if _should_skip_section(name, type):
continue
@@ -515,6 +519,13 @@
if not has_debug_symbols:
self._install_debug_symbols()
+ if has_build_id:
+ try:
+ self._verify_build_id()
+ except Exception:
+ # It is fine to skip the verification of the build_id
+ pass
+
@tool_required("objcopy")
def _install_debug_symbols(self):
if Config().use_dbgsym == "no":
@@ -632,6 +643,36 @@
logger.debug("Installed debug symbols at %s", dest_path)
+ def _verify_build_id(self):
+ """
+ Verify whether the NT_GNU_BUILD_ID field contains a sha1 checksum
+ that matches the binary. (#260)
+ """
+
+ with open(self.source.path, "rb") as f:
+ blob = f.read()
+
+ # Magic value: length=0x14, owner length=3, owner='GNU', followed by the sha1 checksum
+ m = re.search(
+ b"\x14\x00\x00\x00\x03\x00\x00\x00\x47\x4e\x55\x00.{20}", blob
+ )
+ build_id = blob[m.end() - 20 : m.end()].hex()
+ blob_with_reset_build_id = (
+ blob[: m.end() - 20] + b"\x00" * 20 + blob[m.end() :]
+ )
+
+ if hashlib.sha1(blob_with_reset_build_id).hexdigest() != build_id:
+ logger.warning(
+ "The file (%s) has been modified after NT_GNU_BUILD_ID has been applied",
+ self.source.path,
+ )
+ logger.debug(
+ "Expected value: %s Current value: %s",
+ hashlib.sha1(blob_with_reset_build_id).hexdigest(),
+ build_id,
+ )
+ return
+
def get_member_names(self):
decompiled_members = super().get_member_names()
return list(decompiled_members) + list(self._sections.keys())
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-189/diffoscope/comparators/fit.py new/diffoscope-193/diffoscope/comparators/fit.py
--- old/diffoscope-189/diffoscope/comparators/fit.py 2021-10-29 10:47:06.000000000 +0200
+++ new/diffoscope-193/diffoscope/comparators/fit.py 2021-11-19 16:35:12.000000000 +0100
@@ -81,7 +81,7 @@
dest_path,
)
- output = command.our_check_output(cmd)
+ command.our_check_output(cmd)
# Cannot rely on dumpimage returning a non-zero exit code on failure.
if not os.path.exists(dest_path):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-189/diffoscope/comparators/json.py new/diffoscope-193/diffoscope/comparators/json.py
--- old/diffoscope-189/diffoscope/comparators/json.py 2021-10-29 10:47:06.000000000 +0200
+++ new/diffoscope-193/diffoscope/comparators/json.py 2021-11-19 16:35:12.000000000 +0100
@@ -58,7 +58,11 @@
def compare_details(self, other, source=None):
difference = Difference.from_text(
- self.dumps(self), self.dumps(other), self.path, other.path
+ self.dumps(self),
+ self.dumps(other),
+ self.path,
+ other.path,
+ source="Pretty-printed",
)
if difference:
@@ -71,6 +75,7 @@
self.dumps(other, sort_keys=False),
self.path,
other.path,
+ source="Pretty-printed",
comment="ordering differences only",
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-189/diffoscope/comparators/missing_file.py new/diffoscope-193/diffoscope/comparators/missing_file.py
--- old/diffoscope-189/diffoscope/comparators/missing_file.py 2021-10-29 10:47:06.000000000 +0200
+++ new/diffoscope-193/diffoscope/comparators/missing_file.py 2021-11-19 16:35:12.000000000 +0100
@@ -40,7 +40,7 @@
@classmethod
def recognizes(cls, file):
if isinstance(file, FilesystemFile) and not os.path.lexists(file.name):
- assert Config().new_file, "%s does not exist" % file.name
+ assert Config().new_file, f"{file.name} does not exist"
return True
return False
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-189/diffoscope/comparators/python.py new/diffoscope-193/diffoscope/comparators/python.py
--- old/diffoscope-189/diffoscope/comparators/python.py 2021-10-29 10:47:06.000000000 +0200
+++ new/diffoscope-193/diffoscope/comparators/python.py 2021-11-19 16:35:12.000000000 +0100
@@ -38,15 +38,19 @@
FILE_TYPE_RE = re.compile(r"^python .*byte-compiled$")
def compare_details(self, other, source=None):
- return [
- Difference.from_text(
- describe_pyc(self.path),
- describe_pyc(other.path),
- self.path,
- other.path,
- source="Python bytecode",
- )
- ]
+ try:
+ return [
+ Difference.from_text(
+ describe_pyc(self.path),
+ describe_pyc(other.path),
+ self.path,
+ other.path,
+ source="Python bytecode",
+ )
+ ]
+ except ValueError as exc:
+ self.add_comment("Could not decombile bytecode: {}".format(exc))
+ return []
def describe_pyc(filename):
@@ -87,7 +91,7 @@
yield f"{indent}consts"
for const in code.co_consts:
- if type(const) == types.CodeType:
+ if isinstance(const, types.CodeType):
yield from show_code(const, f"{indent} ")
else:
yield f" {indent}{const!r}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-189/diffoscope/comparators/rpm.py new/diffoscope-193/diffoscope/comparators/rpm.py
--- old/diffoscope-189/diffoscope/comparators/rpm.py 2021-10-29 10:47:06.000000000 +0200
+++ new/diffoscope-193/diffoscope/comparators/rpm.py 2021-11-19 16:35:12.000000000 +0100
@@ -70,7 +70,7 @@
for rpmtag in sorted(rpm.tagnames):
if rpmtag not in hdr:
continue
- s.write(u"%s: " % rpm.tagnames[rpmtag])
+ s.write(u"{}: ".format(rpm.tagnames[rpmtag]))
convert_header_field(s, hdr[rpmtag])
s.write(u"\n")
return s.getvalue()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-189/diffoscope/comparators/squashfs.py new/diffoscope-193/diffoscope/comparators/squashfs.py
--- old/diffoscope-189/diffoscope/comparators/squashfs.py 2021-10-29 10:47:06.000000000 +0200
+++ new/diffoscope-193/diffoscope/comparators/squashfs.py 2021-11-19 16:35:12.000000000 +0100
@@ -187,22 +187,20 @@
d["mode"] = SquashfsDevice.KIND_MAP[d["kind"]]
del d["kind"]
except KeyError:
- raise SquashfsInvalidLineFormat(
- "unknown device kind %s" % d["kind"]
- )
+ raise SquashfsInvalidLineFormat(f"unknown device kind {d['kind']}")
try:
d["major"] = int(d["major"])
except ValueError:
raise SquashfsInvalidLineFormat(
- "unable to parse major number %s" % d["major"]
+ f"unable to parse major number {d['major']}"
)
try:
d["minor"] = int(d["minor"])
except ValueError:
raise SquashfsInvalidLineFormat(
- "unable to parse minor number %s" % d["minor"]
+ f"unable to parse minor number {d['minor']}"
)
return d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-189/diffoscope/comparators/symlink.py new/diffoscope-193/diffoscope/comparators/symlink.py
--- old/diffoscope-189/diffoscope/comparators/symlink.py 2021-10-29 10:47:06.000000000 +0200
+++ new/diffoscope-193/diffoscope/comparators/symlink.py 2021-11-19 16:35:12.000000000 +0100
@@ -41,7 +41,7 @@
def create_placeholder(self):
with get_named_temporary_file("w+", delete=False) as f:
- f.write("destination: %s\n" % self.symlink_destination)
+ f.write(f"destination: {self.symlink_destination}\n")
f.flush()
return f.name
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-189/diffoscope/comparators/utils/archive.py new/diffoscope-193/diffoscope/comparators/utils/archive.py
--- old/diffoscope-189/diffoscope/comparators/utils/archive.py 2021-10-29 10:47:06.000000000 +0200
+++ new/diffoscope-193/diffoscope/comparators/utils/archive.py 2021-11-19 16:35:12.000000000 +0100
@@ -85,7 +85,7 @@
basename = os.path.basename(self.source.name)
if not basename.endswith(expected_extension):
- return "%s-content" % basename
+ return f"{basename}-content"
return basename[: -len(expected_extension)]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-189/diffoscope/comparators/utils/compare.py new/diffoscope-193/diffoscope/comparators/utils/compare.py
--- old/diffoscope-189/diffoscope/comparators/utils/compare.py 2021-10-29 10:47:06.000000000 +0200
+++ new/diffoscope-193/diffoscope/comparators/utils/compare.py 2021-11-19 16:35:12.000000000 +0100
@@ -171,5 +171,7 @@
hexdump = io.StringIO()
with open(path, "rb") as f:
for buf in iter(lambda: f.read(32), b""):
- hexdump.write("%s\n" % binascii.hexlify(buf).decode("us-ascii"))
+ hexdump.write(
+ "{}\n".format(binascii.hexlify(buf).decode("us-ascii"))
+ )
return hexdump.getvalue()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-189/diffoscope/comparators/utils/file.py new/diffoscope-193/diffoscope/comparators/utils/file.py
--- old/diffoscope-189/diffoscope/comparators/utils/file.py 2021-10-29 10:47:06.000000000 +0200
+++ new/diffoscope-193/diffoscope/comparators/utils/file.py 2021-11-19 16:35:12.000000000 +0100
@@ -113,7 +113,7 @@
self._container = container
def __repr__(self):
- return "<%s %s>" % (self.__class__, self.name)
+ return f"<{self.__class__} {self.name}>"
# This should return a path that allows to access the file content
@property
@@ -567,8 +567,7 @@
if difference is None:
return None
difference.add_comment(
- "Error parsing output of `%s` for %s"
- % (e.operation, e.object_class)
+ f"Error parsing output of `{e.operation}` for {e.object_class}"
)
except ContainerExtractionError as e:
difference = self.compare_bytes(other, source=source)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-189/diffoscope/comparators/utils/libarchive.py new/diffoscope-193/diffoscope/comparators/utils/libarchive.py
--- old/diffoscope-189/diffoscope/comparators/utils/libarchive.py 2021-10-29 10:47:06.000000000 +0200
+++ new/diffoscope-193/diffoscope/comparators/utils/libarchive.py 2021-11-19 16:35:12.000000000 +0100
@@ -260,7 +260,7 @@
for entry in archive:
if entry.pathname == member_name:
return self.get_subclass(entry)
- raise KeyError("%s not found in archive" % member_name)
+ raise KeyError(f"{member_name} not found in archive")
def get_filtered_members(self):
try:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-189/diffoscope/comparators/xml.py new/diffoscope-193/diffoscope/comparators/xml.py
--- old/diffoscope-189/diffoscope/comparators/xml.py 2021-10-29 10:47:06.000000000 +0200
+++ new/diffoscope-193/diffoscope/comparators/xml.py 2021-11-19 16:35:12.000000000 +0100
@@ -2,7 +2,7 @@
# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright �� 2017 Juliana Rodrigues <juliana.orod(a)gmail.com>
-# Copyright �� 2017-2020 Chris Lamb <lamby(a)debian.org>
+# Copyright �� 2017-2021 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
@@ -17,6 +17,8 @@
# You should have received a copy of the GNU General Public License
# along with diffoscope. If not, see <https://www.gnu.org/licenses/>.
+import re
+
from xml.parsers.expat import ExpatError
from diffoscope.comparators.utils.file import File
@@ -83,7 +85,7 @@
"""
DESCRIPTION = "XML files"
- FILE_EXTENSION_SUFFIX = {".xml"}
+ FILE_TYPE_RE = re.compile(r"^XML \S+ document")
@classmethod
def recognizes(cls, file):
@@ -96,7 +98,9 @@
Returns:
False if file is not a XML File, True otherwise
"""
- if not super().recognizes(file):
+
+ # Emulate FALLBACK_FILE_EXTENSION_SUFFIX = {".xml"}
+ if not super().recognizes(file) and not file.name.endswith(".xml"):
return False
with open(file.path) as f:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-189/diffoscope/diff.py new/diffoscope-193/diffoscope/diff.py
--- old/diffoscope-189/diffoscope/diff.py 2021-10-29 10:47:06.000000000 +0200
+++ new/diffoscope-193/diffoscope/diff.py 2021-11-19 16:35:12.000000000 +0100
@@ -24,6 +24,7 @@
import fcntl
import hashlib
import logging
+import itertools
import threading
import subprocess
@@ -99,7 +100,7 @@
found = DiffParser.RANGE_RE.match(line)
if not found:
- raise ValueError("Unable to parse diff headers: %r" % line)
+ raise ValueError(f"Unable to parse diff headers: {line!r}")
self._diff.write(line + b"\n")
if found.group("len1"):
@@ -136,7 +137,7 @@
elif self._remaining_hunk_lines == 0:
return self.read_headers(line)
else:
- raise ValueError("Unable to parse diff hunk: %r" % line)
+ raise ValueError(f"Unable to parse diff hunk: {line!r}")
self._diff.write(line + b"\n")
@@ -551,11 +552,11 @@
if len(l0) + len(l1) > 750:
# difflib.Differ.compare is at least O(n^2), so don't call it if
# our inputs are too large.
- logger.debug(
- "Not calling difflib.Differ.compare(x, y) with len(x) == %d and len(y) == %d",
- len(l0),
- len(l1),
+ yield "C", "Diff chunk too large, falling back to line-by-line diff ({} lines added, {} lines removed)".format(
+ self.add_cpt, self.del_cpt
)
+ for line0, line1 in itertools.zip_longest(l0, l1, fillvalue=""):
+ yield from self.yield_line(line0, line1)
return
saved_line = None
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-189/diffoscope/difference.py new/diffoscope-193/diffoscope/difference.py
--- old/diffoscope-189/diffoscope/difference.py 2021-10-29 10:47:06.000000000 +0200
+++ new/diffoscope-193/diffoscope/difference.py 2021-11-19 16:35:12.000000000 +0100
@@ -76,10 +76,8 @@
self._size_cache = None
def __repr__(self):
- return "<Difference %s -- %s %s>" % (
- self._source1,
- self._source2,
- self._details,
+ return (
+ f"<Difference {self._source1} -- {self._source2} {self._details}>"
)
def map_lines(self, f_diff, f_comment):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-189/diffoscope/main.py new/diffoscope-193/diffoscope/main.py
--- old/diffoscope-189/diffoscope/main.py 2021-10-29 10:47:06.000000000 +0200
+++ new/diffoscope-193/diffoscope/main.py 2021-11-19 16:35:12.000000000 +0100
@@ -32,12 +32,10 @@
from .path import set_path
from .tools import (
get_tools,
- tool_check_installed,
tool_prepend_prefix,
python_module_missing,
tool_required,
OS_NAMES,
- get_current_os,
)
from .config import Config
from .environ import normalize_environment
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-189/diffoscope/presenters/html/html.py new/diffoscope-193/diffoscope/presenters/html/html.py
--- old/diffoscope-189/diffoscope/presenters/html/html.py 2021-10-29 10:47:06.000000000 +0200
+++ new/diffoscope-193/diffoscope/presenters/html/html.py 2021-11-19 16:35:12.000000000 +0100
@@ -134,9 +134,9 @@
for c in s:
# used by diffs
if c == DIFFON:
- t.write("<%s>" % tag)
+ t.write(f"<{tag}>")
elif c == DIFFOFF:
- t.write("</%s>" % tag)
+ t.write(f"</{tag}>")
# special highlighted chars
elif c == "\t" and ponct == 1:
@@ -150,7 +150,7 @@
t.write('<br/><span class="dp">\\</span>')
elif ord(c) < 32:
conv = "\\x%x" % ord(c)
- t.write("<em>%s</em>" % conv)
+ t.write(f"<em>{conv}</em>")
i += len(conv)
else:
t.write(html.escape(c))
@@ -305,15 +305,12 @@
def output_header(css_url, our_css_url=False, icon_url=None):
if css_url:
css_link = (
- ' <link href="%s" type="text/css" rel="stylesheet" />\n' % css_url
+ f' <link href="{css_url}" type="text/css" rel="stylesheet" />\n'
)
else:
css_link = ""
if our_css_url:
- css_style = (
- ' <link href="%s" type="text/css" rel="stylesheet" />\n'
- % our_css_url
- )
+ css_style = f' <link href="{our_css_url}" type="text/css" rel="stylesheet" />\n'
else:
css_style = "<style>\n{}</style>\n".format(templates.STYLES)
if icon_url:
@@ -414,7 +411,7 @@
def output_line(
self, has_internal_linenos, type_name, s1, line1, s2, line2
):
- self.spl_print_func('<tr class="diff%s">' % type_name)
+ self.spl_print_func(f'<tr class="diff{type_name}">')
try:
if s1:
if has_internal_linenos:
@@ -499,7 +496,7 @@
_, rotation_params = self.spl_print_ctrl
ctx, mainname = rotation_params
self.spl_current_page += 1
- filename = "%s.html" % (mainname)
+ filename = f"{mainname}.html"
# rotate to the next child page
memory = self.write_memory
@@ -543,7 +540,7 @@
elif t == "H":
self.output_hunk_header(*args)
elif t == "C":
- self.spl_print_func('<td colspan="2">%s</td>\n' % args)
+ self.spl_print_func(f'<td colspan="2">{args}</td>\n')
else:
raise AssertionError()
self.spl_rows += 1
@@ -634,7 +631,7 @@
if truncated:
text += " (truncated)"
parent_last_row = templates.UD_TABLE_FOOTER % {
- "filename": html.escape("%s.html" % mainname),
+ "filename": html.escape(f"{mainname}.html"),
"text": text,
}
yield self.bytes_written, parent_last_row
@@ -803,7 +800,7 @@
printers[node] = (
(make_printer, ctx.target)
if ctx.single_page
- else (file_printer, ctx.target, "%s.html" % pagename)
+ else (file_printer, ctx.target, f"{pagename}.html")
)
stored = node
@@ -893,7 +890,7 @@
os.makedirs(directory)
if not os.path.isdir(directory):
- raise ValueError("%s is not a directory" % directory)
+ raise ValueError(f"{directory} is not a directory")
jquery_url = self.ensure_jquery(jquery_url, directory, "jquery.js")
with open(os.path.join(directory, "common.css"), "w") as fp:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-189/diffoscope/presenters/utils.py new/diffoscope-193/diffoscope/presenters/utils.py
--- old/diffoscope-189/diffoscope/presenters/utils.py 2021-10-29 10:47:06.000000000 +0200
+++ new/diffoscope-193/diffoscope/presenters/utils.py 2021-11-19 16:35:12.000000000 +0100
@@ -40,7 +40,7 @@
num /= 1024.0
else:
unit = "Y"
- return "%s %s%s" % (round_sigfig(num, sigfig), unit, suffix)
+ return "{} {}{}".format(round_sigfig(num, sigfig), unit, suffix)
class Presenter:
@@ -150,13 +150,13 @@
self.ident = str(ident)
def __repr__(self):
- return "%s(%r)" % (self.__class__.__name__, self.ident)
+ return f"{self.__class__.__name__}({self.ident!r})"
def __format__(self, spec):
result = self.ident
if spec:
result += ":" + spec
- return "{" + result + "}"
+ return f"{{{result}}}"
def __getitem__(self, key):
return FormatPlaceholder(self.ident + "[" + str(key) + "]")
@@ -354,7 +354,7 @@
mapping = {}
real_mapping, new_holes = self._pformat(mapping, False)
if new_holes:
- raise ValueError("not all holes filled: %r" % new_holes)
+ raise ValueError(f"not all holes filled: {new_holes!r}")
return self._fmtstr.format(*real_mapping)
def formatl(self, *args):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-189/pytest.ini new/diffoscope-193/pytest.ini
--- old/diffoscope-189/pytest.ini 2021-10-29 10:47:06.000000000 +0200
+++ new/diffoscope-193/pytest.ini 2021-11-19 16:35:12.000000000 +0100
@@ -4,6 +4,6 @@
# this comes from binwalk
# https://github.com/ReFirmLabs/binwalk/issues/507
ignore:the imp module is deprecated in favour of importlib.*:DeprecationWarning
-# this comes from h5py
-# https://bugs.debian.org/994617
- ignore:h5py is running against HDF5 [\d\.]+ when it was built against [\d\.]+, this may cause problems
+# this come from coverage, fixed in >= 6.0
+# https://github.com/nedbat/coveragepy/commit/90815d959dfff9c42629e3467d6e1a4…
+ ignore:currentThread\(\) is deprecated, use current_thread\(\) instead
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-189/setup.py new/diffoscope-193/setup.py
--- old/diffoscope-189/setup.py 2021-10-29 10:47:06.000000000 +0200
+++ new/diffoscope-193/setup.py 2021-11-19 16:35:12.000000000 +0100
@@ -80,6 +80,8 @@
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
+ "Programming Language :: Python :: 3.9",
+ "Programming Language :: Python :: 3.10",
"Topic :: Utilities",
],
# https://packaging.python.org/guides/distributing-packages-using-setuptools/…
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-189/tests/comparators/test_debian.py new/diffoscope-193/tests/comparators/test_debian.py
--- old/diffoscope-189/tests/comparators/test_debian.py 2021-10-29 10:47:06.000000000 +0200
+++ new/diffoscope-193/tests/comparators/test_debian.py 2021-11-19 16:35:12.000000000 +0100
@@ -113,7 +113,8 @@
shutil.copy(TEST_DOT_CHANGES_FILE1_PATH, dot_changes_path)
# we don't copy the referenced .deb
identified = specialize(FilesystemFile(dot_changes_path))
- assert not isinstance(identified, DotChangesFile)
+ # ... but it is identified regardless
+ assert isinstance(identified, DotChangesFile)
def test_dot_changes_no_differences(dot_changes1):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-189/tests/comparators/test_epub.py new/diffoscope-193/tests/comparators/test_epub.py
--- old/diffoscope-189/tests/comparators/test_epub.py 2021-10-29 10:47:06.000000000 +0200
+++ new/diffoscope-193/tests/comparators/test_epub.py 2021-11-19 16:35:12.000000000 +0100
@@ -55,8 +55,18 @@
assert differences[2].source2 == "toc.ncx"
assert differences[3].source1 == "ch001.xhtml"
assert differences[3].source2 == "ch001.xhtml"
- expected_diff = get_data("epub_expected_diffs")
- assert expected_diff == "".join(map(lambda x: x.unified_diff, differences))
+
+ # Flatten everything recursively, as XMLFile will contain reformatted data
+ # under Difference.details.
+ def fn(difference):
+ if difference.unified_diff:
+ yield difference.unified_diff
+ for x in difference.details:
+ yield from fn(x)
+
+ val = "\n".join("\n".join(fn(x)) for x in differences)
+
+ assert val == get_data("epub_expected_diffs")
@skip_unless_tools_exist("zipinfo")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-189/tests/comparators/test_python.py new/diffoscope-193/tests/comparators/test_python.py
--- old/diffoscope-189/tests/comparators/test_python.py 2021-10-29 10:47:06.000000000 +0200
+++ new/diffoscope-193/tests/comparators/test_python.py 2021-11-19 16:35:12.000000000 +0100
@@ -22,13 +22,16 @@
from diffoscope.comparators.python import PycFile
from ..utils.data import assert_diff_startswith, load_fixture
-from ..utils.tools import skipif
-
+from ..utils.tools import (
+ skipif,
+ skip_unless_file_version_is_at_least,
+)
pyc1 = load_fixture("test1.pyc-renamed")
pyc2 = load_fixture("test2.pyc-renamed")
+@skip_unless_file_version_is_at_least("5.39")
def test_identification(pyc1, pyc2):
assert isinstance(pyc1, PycFile)
assert isinstance(pyc2, PycFile)
@@ -47,9 +50,10 @@
return pyc1.compare(pyc2).details
+@skip_unless_file_version_is_at_least("5.39")
@skipif(
- sys.version_info < (3, 9),
- reason="pyc_expected_diff generated on Python 3.9",
+ sys.version_info < (3, 8),
+ reason="Python 3.7 cannot de-marshal test1.pyc-renamed",
)
def test_diff(differences):
assert_diff_startswith(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-189/tests/data/epub_expected_diffs new/diffoscope-193/tests/data/epub_expected_diffs
--- old/diffoscope-189/tests/data/epub_expected_diffs 2021-10-29 10:47:06.000000000 +0200
+++ new/diffoscope-193/tests/data/epub_expected_diffs 2021-11-19 16:35:12.000000000 +0100
@@ -21,9 +21,10 @@
+-rw---- 0.0 fat 655 b- defX 15-Oct-27 11:33 nav.xhtml
+-rw---- 0.0 fat 615 b- defX 15-Oct-27 11:33 ch001.xhtml
+9 files, 4535 bytes uncompressed, 2325 bytes compressed: 48.7%
+
@@ -1,13 +1,13 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <package version="2.0" xmlns="http://www.idpf.org/2007/opf" unique-identifier="epub-id-1">
+ <?xml version="1.0" encoding="utf-8"?>
+ <package xmlns="http://www.idpf.org/2007/opf" version="2.0" unique-identifier="epub-id-1">
<metadata xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:opf="http://www.idpf.org/2007/opf">
- <dc:identifier id="epub-id-1">urn:uuid:488fe0b5-29d9-4d64-a023-ca08947d78ae</dc:identifier>
+ <dc:identifier id="epub-id-1">urn:uuid:c3082605-195c-4273-acad-528beceba843</dc:identifier>
@@ -33,34 +34,35 @@
<dc:language>en-US</dc:language>
</metadata>
<manifest>
- <item id="ncx" href="toc.ncx" media-type="application/x-dtbncx+xml" />
- <item id="style" href="stylesheet.css" media-type="text/css" />
- <item id="nav" href="nav.xhtml" media-type="application/xhtml+xml" />
- <item id="title_page_xhtml" href="title_page.xhtml" media-type="application/xhtml+xml" />
+ <item id="ncx" href="toc.ncx" media-type="application/x-dtbncx+xml"/>
+ <item id="style" href="stylesheet.css" media-type="text/css"/>
+ <item id="nav" href="nav.xhtml" media-type="application/xhtml+xml"/>
+ <item id="title_page_xhtml" href="title_page.xhtml" media-type="application/xhtml+xml"/>
+
@@ -1,11 +1,11 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <ncx version="2005-1" xmlns="http://www.daisy.org/z3986/2005/ncx/">
+ <?xml version="1.0" encoding="utf-8"?>
+ <ncx xmlns="http://www.daisy.org/z3986/2005/ncx/" version="2005-1">
<head>
-- <meta name="dtb:uid" content="urn:uuid:488fe0b5-29d9-4d64-a023-ca08947d78ae" />
-+ <meta name="dtb:uid" content="urn:uuid:c3082605-195c-4273-acad-528beceba843" />
- <meta name="dtb:depth" content="1" />
- <meta name="dtb:totalPageCount" content="0" />
- <meta name="dtb:maxPageNumber" content="0" />
+- <meta name="dtb:uid" content="urn:uuid:488fe0b5-29d9-4d64-a023-ca08947d78ae"/>
++ <meta name="dtb:uid" content="urn:uuid:c3082605-195c-4273-acad-528beceba843"/>
+ <meta name="dtb:depth" content="1"/>
+ <meta name="dtb:totalPageCount" content="0"/>
+ <meta name="dtb:maxPageNumber" content="0"/>
</head>
<docTitle>
<text>Test Ebook</text>
</docTitle>
-@@ -8,12 +8,12 @@
- <title>Test Ebook</title>
- <link rel="stylesheet" type="text/css" href="stylesheet.css" />
- </head>
- <body>
- <div id="test-ebook" class="section level1 unnumbered">
- <h1>Test Ebook</h1>
- <p>Hello World!</p>
--<p>Time: 12:32</p>
-+<p>Time: 12:33</p>
- </div>
- </body>
+
+@@ -10,11 +10,11 @@
+ <title>Test Ebook</title>
+ <link rel="stylesheet" type="text/css" href="stylesheet.css"/>
+ </head>
+ <body>
+ <div id="test-ebook" class="section level1 unnumbered">
+ <h1>Test Ebook</h1>
+ <p>Hello World!</p>
+- <p>Time: 12:32</p>
++ <p>Time: 12:33</p>
+ </div>
+ </body>
</html>
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-189/tests/utils/data.py new/diffoscope-193/tests/utils/data.py
--- old/diffoscope-189/tests/utils/data.py 2021-10-29 10:47:06.000000000 +0200
+++ new/diffoscope-193/tests/utils/data.py 2021-11-19 16:35:12.000000000 +0100
@@ -67,7 +67,7 @@
def assert_diff_startswith(difference, filename):
haystack = difference.unified_diff
needle = get_data(filename)
- assert needle.startswith(haystack)
+ assert haystack.startswith(needle)
# https://code.activestate.com/recipes/576620-changedirectory-context-manager…
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-189/tests/utils/nonexisting.py new/diffoscope-193/tests/utils/nonexisting.py
--- old/diffoscope-189/tests/utils/nonexisting.py 2021-10-29 10:47:06.000000000 +0200
+++ new/diffoscope-193/tests/utils/nonexisting.py 2021-11-19 16:35:12.000000000 +0100
@@ -32,4 +32,7 @@
assert difference.source2 == "/nonexisting"
assert not has_details or len(difference.details) > 0
- assert not has_null_source or difference.details[-1].source2 == "/dev/null"
+ assert not has_null_source or (
+ difference.details[-1].source2 == "/dev/null"
+ or difference.source2 == "/nonexisting"
+ )
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ayatana-ido for openSUSE:Factory checked in at 2021-11-27 23:42:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ayatana-ido (Old)
and /work/SRC/openSUSE:Factory/.ayatana-ido.new.1895 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ayatana-ido"
Sat Nov 27 23:42:35 2021 rev:6 rq:934265 version:0.9.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/ayatana-ido/ayatana-ido.changes 2021-06-05 23:32:15.156513139 +0200
+++ /work/SRC/openSUSE:Factory/.ayatana-ido.new.1895/ayatana-ido.changes 2021-11-27 23:43:05.740341176 +0100
@@ -1,0 +2,22 @@
+Wed Nov 24 20:55:20 UTC 2021 - Alexei Sorokin <sor.alexei(a)meowr.ru>
+
+- Update to version 0.9.0:
+ * Switch to CMake from autotools.
+ * Add better documentation.
+ * data/libayatana-ido3-0.4.pc.in: Add glib-2.0 dependency.
+ * src/idoappointmentmenuitem.c: Construct the basic menu item
+ using the pixbuf property.
+ * src/basicmenuitem.c: Add GdkPixbuf source support for the
+ icon.
+ * src/idoremovablemenuitem.c: Replace grid with box to fix
+ a11y.
+ * src/idolocationmenuitem.c: Fix deprecated g_time_zone_new
+ warning.
+ * Fix a unit test failure on Ubuntu 20.04.
+ * Use consistent Ayatana IDO names. This version of Ayatana IDO
+ breaks NG system indicators before 0.9.x.
+- Drop pkgconfig-requires.patch: merged upstream.
+- Add ayatana-ido-0.9.0-libm.patch: Link with libm to fix build.
+- Restore Group.
+
+-------------------------------------------------------------------
Old:
----
ayatana-ido-0.8.2.tar.gz
pkgconfig-requires.patch
New:
----
ayatana-ido-0.9.0-libm.patch
ayatana-ido-0.9.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ayatana-ido.spec ++++++
--- /var/tmp/diff_new_pack.7GOIyr/_old 2021-11-27 23:43:06.060340127 +0100
+++ /var/tmp/diff_new_pack.7GOIyr/_new 2021-11-27 23:43:06.064340115 +0100
@@ -16,27 +16,27 @@
#
-%define lname libayatana-ido3-0_4
+%define lname libayatana-ido3-0_4-0
%define soname libayatana-ido3-0.4
%define sover 0
%define typelib typelib-1_0-AyatanaIdo3-0_4
Name: ayatana-ido
-Version: 0.8.2
+Version: 0.9.0
Release: 0
Summary: Ayatana Indicator Display Objects
License: GPL-3.0-only AND LGPL-3.0-only AND LGPL-2.1-only
+Group: System/GUI/Other
URL: https://github.com/AyatanaIndicators/ayatana-ido
-Source: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source: https://github.com/AyatanaIndicators/ayatana-ido/archive/%{version}.tar.gz#…
Source1: baselibs.conf
-# PATCH-FIX-UPSTREAM pkgconfig-requires.patch -- https://github.com/AyatanaIndicators/ayatana-ido/issues/37
-Patch0: pkgconfig-requires.patch
+# PATCH-FIX-UPSTREAM ayatana-ido-0.9.0-libm.patch -- Link with libm to fix build.
+Patch0: ayatana-ido-0.9.0-libm.patch
+BuildRequires: cmake
BuildRequires: gcc-c++
-BuildRequires: gtk-doc
-BuildRequires: mate-common
BuildRequires: pkgconfig
BuildRequires: vala >= 0.16
-BuildRequires: pkgconfig(gio-2.0) >= 2.37.0
-BuildRequires: pkgconfig(glib-2.0) >= 2.37.0
+BuildRequires: pkgconfig(gio-2.0)
+BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(xorg-macros)
@@ -44,20 +44,22 @@
%description
Widgets and other objects used for indicators.
-%package -n %{lname}-%{sover}
-Summary: Shared library providing extra GTK+ menu items in system indicators
+%package -n %{lname}
+Summary: Shared library providing extra GTK menu items in system indicators
+Group: System/Libraries
-%description -n %{lname}-%{sover}
-Shared library providing extra GTK+ menu items for display in
+%description -n %{lname}
+Shared library providing extra GTK menu items for display in
system indicators.
This package contains shared libraries.
%package -n %{typelib}
Summary: Ayatana Indicator Display Objects typelib
+Group: System/Libraries
%description -n %{typelib}
-Shared library providing extra GTK+ menu items for display in
+Shared library providing extra GTK menu items for display in
system indicators.
This package provides the GObject Introspection bindings for
@@ -65,12 +67,13 @@
%package devel
Summary: Development files for Ayatana Indicator Display Objects
-Requires: %{lname}-%{sover} = %{version}
+Group: Development/Libraries/C and C++
+Requires: %{lname} = %{version}
Requires: %{typelib} = %{version}
Requires: pkgconfig(gobject-introspection-1.0)
%description devel
-Shared library providing extra GTK+ menu items for display in
+Shared library providing extra GTK menu items for display in
system indicators.
This package contains the development files for Ido.
@@ -79,18 +82,17 @@
%autosetup -p1
%build
-NOCONFIGURE=1 mate-autogen
-%configure
-%make_build
+%cmake
+%cmake_build
%install
-%make_install
-find %{buildroot} -type f -name "*.la" -delete -print
+%cmake_install
-%post -n %{lname}-%{sover} -p /sbin/ldconfig
-%postun -n %{lname}-%{sover} -p /sbin/ldconfig
+%post -n %{lname} -p /sbin/ldconfig
-%files -n %{lname}-%{sover}
+%postun -n %{lname} -p /sbin/ldconfig
+
+%files -n %{lname}
%license COPYING*
%{_libdir}/%{soname}.so.%{sover}*
++++++ ayatana-ido-0.9.0-libm.patch ++++++
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,6 +32,7 @@ endif()
set(DEPS glib-2.0>=2.58 gtk+-3.0>=3.24)
find_package (PkgConfig REQUIRED)
+find_library(M_LIBRARY m)
pkg_check_modules(PROJECT_DEPS REQUIRED ${DEPS})
# Set global variables
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -99,6 +99,9 @@ set_source_files_properties(${SOURCES} P
add_library("ayatana-ido3-0.4" SHARED ${SOURCES})
set_target_properties("ayatana-ido3-0.4" PROPERTIES VERSION 0.0.0 SOVERSION 0)
target_link_libraries("ayatana-ido3-0.4" ${PROJECT_DEPS_LIBRARIES})
+if(M_LIBRARY)
+ target_link_libraries("ayatana-ido3-0.4" ${M_LIBRARY})
+endif()
target_include_directories("ayatana-ido3-0.4" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS})
target_include_directories("ayatana-ido3-0.4" PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
target_include_directories("ayatana-ido3-0.4" PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
++++++ ayatana-ido-0.8.2.tar.gz -> ayatana-ido-0.9.0.tar.gz ++++++
++++ 6578 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package irrlicht for openSUSE:Factory checked in at 2021-11-27 23:42:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/irrlicht (Old)
and /work/SRC/openSUSE:Factory/.irrlicht.new.1895 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "irrlicht"
Sat Nov 27 23:42:35 2021 rev:5 rq:934261 version:1.8.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/irrlicht/irrlicht.changes 2021-02-19 23:46:03.451409993 +0100
+++ /work/SRC/openSUSE:Factory/.irrlicht.new.1895/irrlicht.changes 2021-11-27 23:43:06.476338763 +0100
@@ -1,0 +2,42 @@
+Sat Nov 27 12:26:32 UTC 2021 - Dirk M��ller <dmueller(a)suse.com>
+
+- update to 1.8.5:
+ * Fix some aes compile warnings on gcc about fall-throughs.
+ * No longer include sys/sysctl.h on other platforms than OSX. Fixes compile
+ errors in COSOperator on newer Linux systems.
+ * Update script to generate tutorial.html's in example folders.
+ * Update libpng to 1.6.37 (from 1.6.23)
+ * Fix CIrrDeviceSDL::getVideoModeList which didn't return video modes before.
+ * CIrrDeviceMacOSX now sets the SEvent.MouseInput Shift and Control values on
+ mouse events like the other devices.
+ * isWindowFocused in IrrDeviceSDL device now returns the input focus like the
+ other devices. Before it was returning a mouse-over-window state.
+ * Prevent SDL device from dropping OpenGL resources on Win32 when
+ setResizable was called with OpenGL driver.
+ * Fix isWindowActive when using SDL device. Before it was only active when
+ the mouse was over the window.
+ * Fix SViewFrustum::clipLine. Was before clipping at wrong points
+ * Fix compilation on OSX and prevent capturing mouse cursor when Window is not on top
+ * Fix serialization of OverrideTextColorEnabled flag in CGUITab.
+ * CFileSystem::getAbsolutePath no longer wrongly converts an empty filename
+ to "/" on unix platforms.
+ * Fix bug in cursor positions when compiled with newer Windows SDK's (v110 in
+ VS2012) and running on Systems >= Windows Vista in windowed mode.
+ * IOSOperator::getSysteMemory() no longer returns incorrect values with >2GB.
+ * Increase KEY_KEY_CODES_COUNT to fix problem with laptop keyboards which
+ return the keycode 0xff for the function key.
+ * Fix bug when calling activateJoysticks on windows several times. It had
+ appened joystick information instead of replacing it, thereby increasing
+ joystick number on each call.
+ * Fix bug in fast_atof when reading floating point numbers with more than 16
+ digits past the dot. Those produced completely wrong results
+ * Accuracy of fast_atof is back to older Irrlicht versions (fixes test
+ warnings, usually not a noticable problem).
+ * Fix crash in eventhandling when calling remove() on a contextmenu while it
+ has focus.
+ * CImageLoaderJPG::isALoadableFileFormat uses a test which allows to load
+ more jpg formats (for example uncompressed jpg's). Thx @Yaron Cohen-Tal for
+ report, test-image and his help with the patch.
+- drop irrlicht-1.8.4-remove-sys-sysctl.h.patch (merged upstream)
+
+-------------------------------------------------------------------
Old:
----
irrlicht-1.8.4-remove-sys-sysctl.h.patch
irrlicht-1.8.4.zip
New:
----
irrlicht-1.8.5.zip
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ irrlicht.spec ++++++
--- /var/tmp/diff_new_pack.2HSIn8/_old 2021-11-27 23:43:06.944337230 +0100
+++ /var/tmp/diff_new_pack.2HSIn8/_new 2021-11-27 23:43:06.948337216 +0100
@@ -19,21 +19,18 @@
#
%define sover 1_8
%define libver 1.8
-%define libfullver %{libver}.4
Name: irrlicht
-Version: %{libfullver}
+Version: 1.8.5
Release: 0
Summary: A realtime 3D engine
License: Zlib
Group: Development/Libraries/C and C++
-URL: http://irrlicht.sourceforge.net/
-Source0: http://downloads.sourceforge.net/irrlicht/%{name}-%{version}.zip
+URL: https://irrlicht.sourceforge.io/
+Source0: https://downloads.sourceforge.net/irrlicht/%{name}-%{version}.zip
# PATCH-FIX-OPENSUSE irrlicht-1.7.9.3629-config.patch -- use system libraries http://irrlicht.sourceforge.net/phpBB2/viewtopic.php?t=24076
Patch0: irrlicht-1.7.9.3629-config.patch
# PATCH-FIX-UPSTREAM irrlicht-1.8-directionlight.patch
Patch1: irrlicht-1.8-directionlight.patch
-# PATCH-FIX-UPSTREAM fixes build
-Patch2: irrlicht-1.8.4-remove-sys-sysctl.h.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: libjpeg-devel
@@ -100,7 +97,6 @@
%setup -q
%patch0
%patch1 -p1
-%patch2 -p1
sed -i 's/\r//' readme.txt
iconv -o readme.txt.iso88591 -f iso88591 -t utf8 readme.txt
@@ -132,7 +128,7 @@
ZLIBOBJ= JPEGLIBOBJ= LIBPNGOBJ=
# Cleaning up after the really bad installer...
pushd %{buildroot}%{_libdir}
-ln -s -f libIrrlicht.so.%{libfullver} libIrrlicht.so.%{libver}
+ln -s -f libIrrlicht.so.%{version} libIrrlicht.so.%{libver}
ln -s -f libIrrlicht.so.%{libver} libIrrlicht.so
popd
# End Makefile mess cleanup
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package x11perf for openSUSE:Factory checked in at 2021-11-27 23:42:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/x11perf (Old)
and /work/SRC/openSUSE:Factory/.x11perf.new.1895 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "x11perf"
Sat Nov 27 23:42:34 2021 rev:9 rq:934226 version:1.6.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/x11perf/x11perf.changes 2019-03-26 22:32:39.357702403 +0100
+++ /work/SRC/openSUSE:Factory/.x11perf.new.1895/x11perf.changes 2021-11-27 23:43:05.292342645 +0100
@@ -1,0 +2,6 @@
+Wed May 12 21:15:46 UTC 2021 - Dirk M��ller <dmueller(a)suse.com>
+
+- modernize spec file:
+ * move license to licensedir
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ x11perf.spec ++++++
--- /var/tmp/diff_new_pack.y54KVA/_old 2021-11-27 23:43:05.624341557 +0100
+++ /var/tmp/diff_new_pack.y54KVA/_new 2021-11-27 23:43:05.628341543 +0100
@@ -1,7 +1,7 @@
#
# spec file for package x11perf
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -22,9 +22,9 @@
Summary: Utility to test X11 server performance
License: HPND
Group: System/X11/Utilities
-Url: http://xorg.freedesktop.org/
+URL: https://xorg.freedesktop.org/
Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.…
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xft)
@@ -33,7 +33,6 @@
BuildRequires: pkgconfig(xrender)
# This was part of the xorg-x11 package up to version 7.6
Conflicts: xorg-x11 <= 7.6
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
The x11perf program runs one or more performance tests and reports how
@@ -44,14 +43,14 @@
%build
%configure
-make %{?_smp_mflags}
+%make_build
%install
%make_install
%files
-%defattr(-,root,root)
-%doc ChangeLog COPYING README.md
+%license COPYING
+%doc ChangeLog README.md
%{_bindir}/x11perf
%{_bindir}/x11perfcomp
%{_libdir}/X11/x11perfcomp/
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package epy for openSUSE:Factory checked in at 2021-11-27 23:42:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/epy (Old)
and /work/SRC/openSUSE:Factory/.epy.new.1895 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "epy"
Sat Nov 27 23:42:33 2021 rev:2 rq:934246 version:2021.10.23+git.1636702550.2ab1584
Changes:
--------
--- /work/SRC/openSUSE:Factory/epy/epy.changes 2021-10-13 18:10:03.071647464 +0200
+++ /work/SRC/openSUSE:Factory/.epy.new.1895/epy.changes 2021-11-27 23:43:04.604344900 +0100
@@ -1,0 +2,15 @@
+Sat Nov 27 10:19:32 UTC 2021 - mcepl(a)cepl.eu
+
+- Update to version 2021.10.23+git.1636702550.2ab1584:
+ * Fixed reset to beginning of row when resizing term and Seamless==True
+ * Implement SeamlessBetweenChapters Squashed commit of the following:
+ * Minor annotation & prevent next page animation on edge of book
+ * Removed Board class
+ * Added TextStructure dataclass
+ * Give styling to images
+ * Better image opening scheme
+ * Refactor parser.get_lines(width) to get_lines(textwidth)
+ * Fixed image cursor on double spread and progress pctg in double spread
+ * Refactor variables
+
+-------------------------------------------------------------------
Old:
----
epy-2021.7.16.tar.gz
New:
----
_service
_servicedata
epy-2021.10.23+git.1636702550.2ab1584.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ epy.spec ++++++
--- /var/tmp/diff_new_pack.sTstQn/_old 2021-11-27 23:43:05.044343458 +0100
+++ /var/tmp/diff_new_pack.sTstQn/_new 2021-11-27 23:43:05.044343458 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package python-epy-reader
+# spec file for package epy
#
# Copyright (c) 2021 SUSE LLC
#
@@ -15,16 +15,18 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
+
Name: epy
-Version: 2021.7.16
+Version: 2021.10.23+git.1636702550.2ab1584
Release: 0
Summary: CLI ebook reader
-License: GPL-3.0
+License: GPL-3.0-only
URL: https://github.com/wustho/epy
-Source: https://files.pythonhosted.org/packages/source/e/epy-reader/epy-reader-%{ve…
-BuildRequires: python3-setuptools
-BuildRequires: python3-mobi
+# Source: https://files.pythonhosted.org/packages/source/e/epy-reader/epy-reader-%%{v…
+Source: epy-%{version}.tar.gz
BuildRequires: fdupes
+BuildRequires: python3-mobi
+BuildRequires: python3-setuptools
Requires: python3-mobi
Suggests: sdcv
Suggests: dictd
@@ -47,7 +49,7 @@
Double Spread
%prep
-%setup -q -n epy-reader-%{version}
+%autosetup -p1 -n epy-%{version}
%build
python3 setup.py build
++++++ _service ++++++
<services>
<service name="tar_scm" mode="disabled">
<param name="versionprefix">2021.10.23+git</param>
<param name="url">https://github.com/wustho/epy.git</param>
<param name="scm">git</param>
<param name="exclude">.git*</param>
<param name="changesgenerate">enable</param>
<param name="changesauthor">mcepl(a)cepl.eu</param>
</service>
<service name="recompress" mode="disabled">
<param name="compression">gz</param>
<param name="file">*.tar</param>
<param name="keep">enable</param>
</service>
<service name="set_version" mode="disabled" />
</services>
++++++ _servicedata ++++++
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/wustho/epy.git</param>
<param name="changesrevision">2ab1584d2e05b95587d209280b5a56811e651d72</param></service></servicedata>
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package scummvm for openSUSE:Factory checked in at 2021-11-27 23:42:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/scummvm (Old)
and /work/SRC/openSUSE:Factory/.scummvm.new.1895 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scummvm"
Sat Nov 27 23:42:33 2021 rev:24 rq:934218 version:2.5.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/scummvm/scummvm.changes 2021-04-17 00:02:39.361678417 +0200
+++ /work/SRC/openSUSE:Factory/.scummvm.new.1895/scummvm.changes 2021-11-27 23:43:03.112349792 +0100
@@ -1,0 +2,217 @@
+Wed Nov 24 19:38:46 UTC 2021 - Giacomo Comes <gcomes.obs(a)gmail.com> - 2.5.0
+
+- Update to 2.5.0
+ New games:
+ * Added support for Grim Fandango.
+ * Added support for The Longest Journey (only on some desktop platforms).
+ * Added support for Myst 3: Exile (only on some desktop platforms).
+ * Added support for Little Big Adventure.
+ * Added support for Red Comrades 1: Save the Galaxy.
+ * Added support for Red Comrades 2: For the Great Justice.
+ * Added support for Transylvania.
+ * Added support for Crimson Crown.
+ * Added support for OO-Topos.
+ * Added support for Glulx interactive fiction games.
+ * Added support for Lure of the Temptress Konami release.
+ * Added support for Private Eye.
+ * Added support for Spanish Blue Force.
+ * Added support for Spanish Ringworld.
+ * Added support for Spanish Amazon: Guardians of Eden.
+ * Added support for AGS Games versions 2.5+.
+ * Added support for Nightlong: Union City Conspiracy.
+ * Added support for The Journeyman Project 2: Buried in Time.
+ * Added support for Crusader: No Remorse.
+ * Added support for L-ZONE.
+ * Added support for Spaceship Warlock.
+ New ports:
+ * The Nintendo DS port got a major rewrite.
+ General:
+ * Switched ScummVM GUI output to UTF-32.
+ * Updated the Roland MT-32 emulation code to the Munt project���s mt32emu 2.5.1.
+ * Updated Dropbox Cloud Storage to use the new Dropbox OAuth workflow.
+ * Major extension to the number of supported graphics scalers.
+ * Display path to scummvm configuration file in GUI -> Options -> Paths.
+ * Added new optional dependency, giflib >= 5.0.0. Used by some version of LBA.
+ * Added HiDPI support to the ScummVM GUI.
+ * Added command line option --window-size for specifying ScummVM window size,
+ * applicable only to the OpenGL renderer.
+ * Fixed switching to the default graphics mode. This was sometimes not applied
+ * until restarting ScummVM or starting a game.
+ * ScummVM GUI has been fully translated into Korean and Japanese.
+ * Added GUI option for enabling and disabling the Discord RPC integration.
+ ADL:
+ * Added support for Mystery House French translation.
+ * Added support for several game variants.
+ AGI:
+ * Added support for Russian versions. Input now works.
+ AGOS:
+ * Added support for the Japanese PC-98 version of Elvira 1.
+ CGE:
+ * Added option to use Text To Speech for Soltys.
+ CGE2:
+ * Added option to use Text To Speech for Sfinx.
+ Cine:
+ * Added detection for Future Wars CD version with French translation patch.
+ * Added detection for Italian Amiga Operation Stealth.
+ * Fixed crash before entering secret base.
+ * Fixed space missing in verb line.
+ * Fixed vertically overflowing message boxes.
+ Dreamweb:
+ * Rendering fixes for Russian fan translation.
+ Glk:
+ * Fixed savegame issues with several subengines.
+ * Fixed memory overrun in Level9 game detector.
+ * Added detections for 2020 IF Comp games.
+ * Enabled Glulx sub-engine.
+ Gob:
+ * Added support for Bargon Attack Russian translation.
+ * Added support for Woodruff Russian translation.
+ Griffon:
+ * Fixed Return to Launcher from The Griffon Legend.
+ * Added option to use Text To Speech in The Griffon Legend
+ Grim:
+ * Added support for Brazillian Portuguese Grim Fandango.
+ Kyra:
+ * Added support for the Japanese Sega-CD version of Eye of the Beholder.
+ * Added support for the Hebrew fan translation of Legend of Kyrandia.
+ * Added support for the Hebrew fan translation of Legend of Kyrandia 2.
+ * Added support for the Simplified Chinese version of Legend of Kyrandia 3.
+ * Added support for the playable demo of Lands of Lore.
+ Lure:
+ * Fixed fire animation in first room when loading saves.
+ * Fixed AdLib support.
+ * Fixed MT-32 support.
+ Pegasus:
+ * Added support for DVD/GOG.com release.
+ Queen:
+ * Added support for German Amiga floppy release.
+ SAGA:
+ * Added support for ITE GOG Mac CD v1.1.
+ * Added support for ITE PC-98 Japanese.
+ SCI:
+ * Added RGB rendering mode (16/32bpp) for SCI0 - SCI1.1 games, which addresses palette
+ * issues in screen transitions and avoids mode changes when playing Mac QuickTime videos.
+ * Added custom palette mods for SQ3 and LSL2 from the FreeSCI project.
+ When enabled, the mods improve the visuals
+ * in these two games.
+ * Added support for Macintosh version of Gabriel Knight 1.
+ * Added support for CD-Audio version of Mixed-Up Mother Goose.
+ * Added support for Korean fan translations from the scummkor project: Castle of Dr. Brain,
+ * EcoQuest 1, Gabriel Knight 1, King���s Quest 1, 5, and 6, Laura Bow 2, and Space Quest 4.
+ * Added support for Space Quest 4 Update 1.3 by New Rising Sun.
+ * Added support for French LSL1VGA.
+ * Added support for Hebrew QFG1VGA.
+ * Added support for Hebrew GK1.
+ * Added support for Russian Longbow.
+ * Added support for Russian LSL6.
+ * Added support for alternate Russian LSL7.
+ * Added support for alternate Polish LSL7 including files packaged with InstallShield.
+ * Added support for alternate Russian SQ5.
+ * Added support for alternate Russian Torin���s Passage.
+ * Added support for fan game Soulshade Asylum.
+ * SCI1.1 views are now scaled accurately.
+ * Fixed sounds not stopping or restarting correctly.
+ * Fixed sound issues when restoring SCI0 games.
+ * Fixed corruption when ���Prefer digital sound effects��� was disabled in SCI1 games.
+ * Space Quest 4 CD sound effects now match the selected platform.
+ * Added option to enable Windows cursors in CD versions of King���s Quest 5 and Space Quest 4.
+ * Fixed ���Girl In The Tower��� song not playing at the end of King���s Quest 6 CD.
+ * Fixed King���s Quest 5 Amiga beach error that prevented completing the game.
+ * Fixed over 30 script bugs in GK1, HOYLE4, KQ1DEMO, KQ5, KQ6, KQ7, LB1,
+ * LSL3, PEPPER, PQ3, QFG3, SQ1, SQ4, and SQ6.
+ * Unlocked JANE easter egg in Gabriel Knight 1.
+ SCUMM:
+ * Fixed Chinese, Japanese and Korean text display for The Dig and for
+ The Curse of Monkey Island. These fixes
+ * also include some improvements to the common text display (mainly the formatting of wrapped texts).
+ * Fixed display of Chinese, Japanese and Korean pause and restart dialogs.
+ * Added support for numerous Korean translations from scummkor project.
+ * Added support for Russobit-M versions of Pajama2 and SpyOzone.
+ * Fixed speech playback in Akella version of COMI.
+ * Added support for Discord and Humble Bundle versions of Indiana Jones and the Fate of Atlantis.
+ * Added smooth scrolling for FM-TOWNS versions of games.
+ * Added optional trimming to 200 pixels for some FM-TOWNS games, so aspect-ratio correction is possible.
+ * Fixed audio distortion in Loom for PC-Engine.
+ * Added support for the high resolution font and cursor in the 16-color Macintosh version of Loom.
+ * Added support for Japanese Mac version of The Dig.
+ * Added partial support for the high resolution fonts and cursor in the
+ * 16-color Macintosh version of Indiana Jones and the Last Crusade.
+ * Fixed missing instruments in the m68k Mac versions of Monkey Island 2
+ * and Indiana Jones and the Fate of Atlantis.
+ * Added ���Macintosh b/w��� render mode for the 16-color Macintosh versions of
+ * Loom and Indiana Jones and the Last Crusade.
+ * Enabled difficulty selection in the version of Monkey Island 2 that was
+ * included on the LucasArts Mac CD Game Pack II compilation. (It had been
+ * disabled along with the copy protection.)
+ * Repaired clumsy crack in Maniac Mansion (enhanced)'s keypad script.
+ * This means that the GOG and Steam versions will no longer accept incorrect
+ * numbers, e.g. for Edna���s phone number. (Why are they selling a cracked
+ * version anyway?!)
+ * Added support for Low quality music in Macintosh version of Loom.
+ * Improved Digital iMUSE accuracy for Full Throttle and The Curse of Monkey Island.
+ These improvements also fix several audio related bugs for both games.
+ * Fixed a very old regression in the walk code for Full Throttle which softlocked the game.
+ * Improved the accuracy of the walk code for The Dig and The Curse of Monkey Island.
+ * Fixed a bug in The Curse of Monkey Island which prevented, during the cannon minigame
+ in Part 1, the destruction of one of the three destroyable turrets in the fort.
+ * Added animated cigar smoke to the close-up of captain Smirk in the CD
+ * version of Monkey Island 1. It was present in earlier versions.
+ * Restored some missing Lemonhead lines in the English, Italian, German and Spanish CD
+ * versions as well as the English Macintosh, FM-Towns and Sega CD versions
+ * of Monkey Island 1.
+ * Made the clock tower in Monkey Island 1 behave the same in the CD version
+ * as in earlier versions, i.e. after examining it you have to leave the
+ * room and come back again for its description to change.
+ Tinsel:
+ * Enabled the Return to Launcher feature.
+ Titanic:
+ * Fixed crashes when asking bots what I should do.
+ TsAGE:
+ * Added support for uninstalled floppy version.
+ Stark:
+ * Added support for Hungarian translation.
+ Supernova:
+ * Added Italian translation for part 1.
+ Sword25:
+ * Made the extracted version working.
+ * Fixed crash when selecting Croatian language.
+ Ultima:
+ * Ultima 4: Added several debugger commands.
+ * Ultima 4: Allow Enter key to exit ZStats display.
+ * Ultima 8: Fixed several animation bugs for events and objects.
+ * Ultima 8: Restored original text for the Spell of Resurrection book.
+ Xeen:
+ * Fixed occasional border corruption during fights.
+ * Improvements to cutscenes to better match the original games.
+ * Fixes for character selection, deselection, and dismissing to better match original.
+ * Added support for Russian version.
+ AmigaOS port:
+ * Added native system file browser feature.
+ * Re-activated nuked OPL Adlib driver.
+ Big-endian ports:
+ * Fixed crashes or rendering issues with the Blazing Dragons, Duckman and
+ * Full Pipe games.
+ iOS port:
+ * Fixed using arrow keys on physical keyboard in iOS 15.
+ * Fixed rotating the device while ScummVM is inactive.
+ * Added support for upside down portrait orientation.
++++ 20 more lines (skipped)
++++ between /work/SRC/openSUSE:Factory/scummvm/scummvm.changes
++++ and /work/SRC/openSUSE:Factory/.scummvm.new.1895/scummvm.changes
Old:
----
0001-FLUIDSYNTH-Make-FluidSynth-logging-less-noisy-by-default.patch
0002-FLUIDSYNTH-Swapped-debug-levels-for-FLUID_WARN-and-FLUID_INFO.patch
0003-FLUIDSYNTH-Fix-build.patch
0004-AUDIO-Fix-compilation-with-Fluidsynth2.patch
0005-FLUIDSYNTH-Simplify-FluidSynth-version-check.patch
0006-FLUIDSYNTH-Fix-compilation-with-Fluidsynth-2.2.patch
scummvm-2.2.0.tar.xz
New:
----
scummvm-2.5.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ scummvm.spec ++++++
--- /var/tmp/diff_new_pack.sf2NkY/_old 2021-11-27 23:43:04.424345491 +0100
+++ /var/tmp/diff_new_pack.sf2NkY/_new 2021-11-27 23:43:04.424345491 +0100
@@ -17,22 +17,16 @@
%bcond_with faad
-%bcond_with libmpeg2
+%bcond_without libmpeg2
%bcond_without mad
Name: scummvm
-Version: 2.2.0
+Version: 2.5.0
Release: 0
Summary: Interpreter for several adventure games
License: GPL-2.0-or-later
Group: Amusements/Games/Other
URL: https://www.scummvm.org/
Source: https://www.scummvm.org/frs/scummvm/%{version}/scummvm-%{version}.tar.xz
-Patch0: 0001-FLUIDSYNTH-Make-FluidSynth-logging-less-noisy-by-default.patch
-Patch1: 0002-FLUIDSYNTH-Swapped-debug-levels-for-FLUID_WARN-and-FLUID_INFO.patch
-Patch2: 0003-FLUIDSYNTH-Fix-build.patch
-Patch3: 0004-AUDIO-Fix-compilation-with-Fluidsynth2.patch
-Patch4: 0005-FLUIDSYNTH-Simplify-FluidSynth-version-check.patch
-Patch5: 0006-FLUIDSYNTH-Fix-compilation-with-Fluidsynth-2.2.patch
BuildRequires: desktop-file-utils
BuildRequires: discord-rpc-devel
BuildRequires: gcc-c++
@@ -64,6 +58,14 @@
%ifarch %{ix86}
BuildRequires: nasm
%endif
+BuildRequires: fdupes
+BuildRequires: fribidi-devel
+BuildRequires: giflib-devel
+BuildRequires: glew-devel
+BuildRequires: libSDL2_net-devel
+BuildRequires: liba52-devel
+BuildRequires: libcurl-devel
+BuildRequires: libspeechd-devel
%description
ScummVM is an interpreter that will play graphic adventure games written for
@@ -86,16 +88,13 @@
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
# build the endianness test without optimization otherwise gcc is too smart
# and optimize everything away, making the test fail
sed -i '/tmp_endianness_check.cpp/ s/$CXXFLAGS/$CXXFLAGS -fno-lto -O0/' configure
+#allow to use liba52 from svn
+sed -i '/a52_init/s@(0)@()@' configure
+sed -i '/a52_init/s@(0)@()@' audio/decoders/ac3.cpp
%build
# scummvm relies on -gsplit-dwarf which is incompatible with -flto
@@ -119,6 +118,8 @@
%install
%make_install
+rm %{buildroot}%{_docdir}/%{name}/COPYING*
+%fdupes %{buildroot}%{_datadir}/scummvm
%files
%defattr(0644,root,root,0755)
++++++ scummvm-2.2.0.tar.xz -> scummvm-2.5.0.tar.xz ++++++
/work/SRC/openSUSE:Factory/scummvm/scummvm-2.2.0.tar.xz /work/SRC/openSUSE:Factory/.scummvm.new.1895/scummvm-2.5.0.tar.xz differ: char 25, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package vkquake for openSUSE:Factory checked in at 2021-11-27 23:42:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vkquake (Old)
and /work/SRC/openSUSE:Factory/.vkquake.new.1895 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vkquake"
Sat Nov 27 23:42:32 2021 rev:10 rq:934217 version:1.12.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/vkquake/vkquake.changes 2021-10-26 20:14:39.266040255 +0200
+++ /work/SRC/openSUSE:Factory/.vkquake.new.1895/vkquake.changes 2021-11-27 23:43:01.240355929 +0100
@@ -1,0 +2,19 @@
+Fri Nov 26 16:42:03 UTC 2021 - Martin Hauke <mardnh(a)gmx.de>
+
+- Fix source url
+
+-------------------------------------------------------------------
+Fri Nov 26 08:57:22 UTC 2021 - Martin Hauke <mardnh(a)gmx.de>
+
+- Update to version 1.12.1
+ * Bugfix release
+
+-------------------------------------------------------------------
+Thu Nov 25 22:40:02 UTC 2021 - Martin Hauke <mardnh(a)gmx.de>
+
+- Update to version 1.12.0
+ * Support for scriptable particles ported from QuakeSpasm-Spiked
+ (e.g. for Arcane Dimensions). If vanilla behavior is wanted
+ they can be diabled with r_fteparticles 0
+
+-------------------------------------------------------------------
Old:
----
vkQuake-1.11.1.tar.gz
New:
----
vkQuake-1.12.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vkquake.spec ++++++
--- /var/tmp/diff_new_pack.p3QWLM/_old 2021-11-27 23:43:01.760354224 +0100
+++ /var/tmp/diff_new_pack.p3QWLM/_new 2021-11-27 23:43:01.760354224 +0100
@@ -18,13 +18,13 @@
Name: vkquake
-Version: 1.11.1
+Version: 1.12.1
Release: 0
Summary: Quake 1 port using Vulkan instead of OpenGL for rendering
License: GPL-2.0-or-later
Group: Amusements/Games/3D/Shoot
URL: https://github.com/Novum/vkQuake
-Source: https://github.com/Novum/vkQuake/archive/%{version}/vkQuake-%{version}.tar.…
+Source: https://github.com/Novum/vkQuake/archive/refs/tags/%{version}.tar.gz#/vkQua…
Source99: %{name}.changes
Source100: appdata.xml
Source101: %{name}.desktop
++++++ vkQuake-1.11.1.tar.gz -> vkQuake-1.12.1.tar.gz ++++++
/work/SRC/openSUSE:Factory/vkquake/vkQuake-1.11.1.tar.gz /work/SRC/openSUSE:Factory/.vkquake.new.1895/vkQuake-1.12.1.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 nodejs-electron for openSUSE:Factory checked in at 2021-11-27 23:42:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nodejs-electron (Old)
and /work/SRC/openSUSE:Factory/.nodejs-electron.new.1895 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nodejs-electron"
Sat Nov 27 23:42:32 2021 rev:11 rq:934173 version:13.6.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/nodejs-electron/nodejs-electron.changes 2021-11-11 21:38:56.492998906 +0100
+++ /work/SRC/openSUSE:Factory/.nodejs-electron.new.1895/nodejs-electron.changes 2021-11-27 23:42:51.316388462 +0100
@@ -1,0 +2,11 @@
+Tue Nov 23 17:01:09 UTC 2021 - Andreas Schneider <asn(a)cryptomilk.org>
+
+- Update to version 13.6.2
+ https://github.com/electron/electron/releases/tag/v13.6.2
+- Fix for CVE-2021-37998
+- Fix for CVE-2021-38001
+- Fix for CVE-2021-38002
+- Fix for CVE-2021-38003
+- Fixed building on Tumbleweed
+
+-------------------------------------------------------------------
Old:
----
electron-13.6.1.tar.xz
New:
----
electron-13.6.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nodejs-electron.spec ++++++
--- /var/tmp/diff_new_pack.8aYzD7/_old 2021-11-27 23:43:00.744357555 +0100
+++ /var/tmp/diff_new_pack.8aYzD7/_new 2021-11-27 23:43:00.748357541 +0100
@@ -50,7 +50,7 @@
%bcond_with system_vpx
%bcond_with clang
Name: nodejs-electron
-Version: 13.6.1
+Version: 13.6.2
Release: 0
Summary: Build cross platform desktop apps with JavaScript, HTML, and CSS
License: MIT
@@ -293,6 +293,10 @@
sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
tools/generate_shim_headers/generate_shim_headers.py
+%if %{with systemicu}
+find third_party/icu -type f ! -name "*.gn" -a ! -name "*.gni" -delete
+%endif
+
%build
# GN sets lto on its own and we need just ldflag options, not cflags
%define _lto_cflags %{nil}
++++++ electron-13.6.1.tar.xz -> electron-13.6.2.tar.xz ++++++
/work/SRC/openSUSE:Factory/nodejs-electron/electron-13.6.1.tar.xz /work/SRC/openSUSE:Factory/.nodejs-electron.new.1895/electron-13.6.2.tar.xz differ: char 15, line 1
1
0