openSUSE Commits
Threads by month
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
June 2022
- 1 participants
- 2040 discussions
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-cligj for openSUSE:Factory checked in at 2022-04-28 23:07:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-cligj (Old)
and /work/SRC/openSUSE:Factory/.python-cligj.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-cligj"
Thu Apr 28 23:07:52 2022 rev:2 rq:973538 version:0.7.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-cligj/python-cligj.changes 2019-03-10 09:36:21.436162133 +0100
+++ /work/SRC/openSUSE:Factory/.python-cligj.new.1538/python-cligj.changes 2022-04-28 23:07:56.736686031 +0200
@@ -1,0 +2,17 @@
+Mon Apr 25 13:47:41 UTC 2022 - Stefan Br��ns <stefan.bruens(a)rwth-aachen.de>
+
+- Update to 0.7.2:
+ * Permit use with click versions 8 and higher.
+- Update to 0.7.1:
+ * Future deprecation warning added in 0.7.0 has been changed.
+ Cligj version 1.0.0 will support Python versions >= 3.6.
+- Update to 0.7.0:
+ * Warn about deprecation of support for Python versions < 3.7
+ in 1.0.0 (#33).
+ * Warn about future change in --sequence default when the option
+ is used (#31).
+- Update to 0.6.0:
+ * Always use `encoding='utf-8'` when opening input GeoJSON (#27).
+ * Improve docstrings (#22).
+
+-------------------------------------------------------------------
Old:
----
cligj-0.5.0.tar.gz
New:
----
cligj-0.7.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-cligj.spec ++++++
--- /var/tmp/diff_new_pack.nCHSqc/_old 2022-04-28 23:07:57.216686554 +0200
+++ /var/tmp/diff_new_pack.nCHSqc/_new 2022-04-28 23:07:57.220686558 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-cligj
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -13,15 +13,16 @@
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-cligj
-Version: 0.5.0
+Version: 0.7.2
Release: 0
License: BSD-3-Clause
Summary: Click params for commmand line interfaces to GeoJSON
-Url: https://github.com/mapbox/cligj
+URL: https://github.com/mapbox/cligj
Group: Development/Languages/Python
# pypi source lack license and tests
Source: https://github.com/mapbox/cligj/archive/%{version}.tar.gz#/cligj-%{version}…
@@ -35,7 +36,6 @@
Requires: python-click
BuildArch: noarch
-
%python_subpackages
%description
++++++ cligj-0.5.0.tar.gz -> cligj-0.7.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cligj-0.5.0/.travis.yml new/cligj-0.7.2/.travis.yml
--- old/cligj-0.5.0/.travis.yml 2018-09-26 17:58:55.000000000 +0200
+++ new/cligj-0.7.2/.travis.yml 2021-05-28 23:21:08.000000000 +0200
@@ -1,10 +1,9 @@
sudo: false
language: python
python:
- - "2.7"
- - "3.3"
- - "3.4"
- - "3.5"
+ - "3.6"
+ - "3.7"
+ - "3.8"
install:
- "pip install coveralls"
- "pip install -e .[test]"
@@ -17,4 +16,4 @@
tags: true
provider: pypi
distributions: "sdist bdist_wheel"
- user: mapboxci
+ user: __token__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cligj-0.5.0/CHANGES.txt new/cligj-0.7.2/CHANGES.txt
--- old/cligj-0.5.0/CHANGES.txt 2018-09-26 17:58:55.000000000 +0200
+++ new/cligj-0.7.2/CHANGES.txt 2021-05-28 23:21:08.000000000 +0200
@@ -1,6 +1,36 @@
Changes
=======
+0.7.1 (2010-11-20)
+------------------
+
+- Future deprecation warning added in 0.7.0 has been changed. Cligj version
+ 1.0.0 will support Python versions >= 3.6.
+
+0.7.0 (2010-10-21)
+------------------
+
+- Warn about deprecation of support for Python versions < 3.7 in 1.0.0 (#33).
+- Warn about future change in --sequence default when the option is used (#31).
+
+0.6.0 (2020-10-19)
+------------------
+
+No changes since 0.6b1.
+
+0.6b1 (2020-10-14)
+------------------
+
+Future changes:
+
+- Feature sequences, not collections, will be the default form of output in
+ version 1.0 (#20).
+
+Bug fixes:
+
+- Always use `encoding='utf-8'` when opening input GeoJSON (#27).
+- Improve docstrings (#22).
+
0.5.0 (2018-09-26)
------------------
@@ -20,7 +50,7 @@
0.3.0 (2015-08-12)
------------------
-- Deprecation of the cligj.plugins module (#6). Please switch to the
+- Deprecation of the cligj.plugins module (#6). Please switch to the
click-plugins module: https://github.com/click-contrib/click-plugins. The
cligj.plugins module will be removed from cligj at version 1.0.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cligj-0.5.0/MANIFEST.in new/cligj-0.7.2/MANIFEST.in
--- old/cligj-0.5.0/MANIFEST.in 1970-01-01 01:00:00.000000000 +0100
+++ new/cligj-0.7.2/MANIFEST.in 2021-05-28 23:21:08.000000000 +0200
@@ -0,0 +1,4 @@
+include CHANGES.txt
+include LICENSE
+
+graft tests
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cligj-0.5.0/README.rst new/cligj-0.7.2/README.rst
--- old/cligj-0.5.0/README.rst 2018-09-26 17:58:55.000000000 +0200
+++ new/cligj-0.7.2/README.rst 2021-05-28 23:21:08.000000000 +0200
@@ -1,8 +1,8 @@
cligj
======
-.. image:: https://travis-ci.org/mapbox/cligj.svg
- :target: https://travis-ci.org/mapbox/cligj
+.. image:: https://travis-ci.com/mapbox/cligj.svg
+ :target: https://travis-ci.com/mapbox/cligj
.. image:: https://coveralls.io/repos/mapbox/cligj/badge.png?branch=master
:target: https://coveralls.io/r/mapbox/cligj?branch=master
@@ -10,7 +10,7 @@
Common arguments and options for GeoJSON processing commands, using Click.
`cligj` is for Python developers who create command line interfaces for geospatial data.
-`cligj` allows you to quickly build consistent, well-tested and interoperable CLIs for handling GeoJSON.
+`cligj` allows you to quickly build consistent, well-tested and interoperable CLIs for handling GeoJSON.
Arguments
@@ -76,11 +76,15 @@
reads and writes GeoJSON expects a text containing a single feature collection,
that's the default, and a LF-delimited sequence of texts containing one GeoJSON
feature each is a feature that is turned on using the ``--sequence`` option.
-To write sequences of feature texts that conform to the `JSON Text Sequences
-proposed standard
-<http://tools.ietf.org/html/draft-ietf-json-text-sequence-13>`__ (and might
-contain pretty-printed JSON) with the ASCII Record Separator (0x1e) as
-a delimiter, use the ``--rs`` option
+To write sequences of feature texts that conform to the `GeoJSON Text Sequences
+standard <https://tools.ietf.org/html/rfc8142>`__ (and might contain
+pretty-printed JSON) with the ASCII Record Separator (0x1e) as a delimiter, use
+the ``--rs`` option
+
+.. warning:: Future change warning
+ GeoJSON sequences (`--sequence`), not collections (`--no-sequence`), will be
+ the default in version 1.0.0.
+
.. code-block:: python
@@ -125,7 +129,6 @@
False).
--help Show this message and exit.
-
And can be used like this
.. code-block:: console
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cligj-0.5.0/cligj/__init__.py new/cligj-0.7.2/cligj/__init__.py
--- old/cligj-0.5.0/cligj/__init__.py 2018-09-26 17:58:55.000000000 +0200
+++ new/cligj-0.7.2/cligj/__init__.py 2021-05-28 23:21:08.000000000 +0200
@@ -1,12 +1,21 @@
-# cligj
+"""cligj
-# Shared arguments and options.
+A package of arguments, options, and parsers for the Python GeoJSON
+ecosystem.
+"""
+
+import sys
+from warnings import warn
import click
from .features import normalize_feature_inputs
-# Arguments.
+__version__ = "0.7.2"
+
+if sys.version_info < (3, 6):
+ warn("cligj 1.0.0 will require Python >= 3.6", FutureWarning)
+
# Multiple input files.
files_in_arg = click.argument(
@@ -97,8 +106,14 @@
'--sequence/--no-sequence',
default=False,
help="Write a LF-delimited sequence of texts containing individual "
- "objects or write a single JSON text containing a feature "
- "collection object (the default).")
+ "objects or write a single JSON text containing a feature "
+ "collection object (the default).",
+ callback=lambda ctx, param, value: warn(
+ "Sequences of Features, not FeatureCollections, will be the default in version 1.0.0",
+ FutureWarning,
+ )
+ or value,
+)
use_rs_opt = click.option(
'--rs/--no-rs',
@@ -109,8 +124,8 @@
"(default is False).")
-# GeoJSON output mode option.
def geojson_type_collection_opt(default=False):
+ """GeoJSON FeatureCollection output mode"""
return click.option(
'--collection',
'geojson_type',
@@ -120,6 +135,7 @@
def geojson_type_feature_opt(default=False):
+ """GeoJSON Feature or Feature sequence output mode"""
return click.option(
'--feature',
'geojson_type',
@@ -129,6 +145,7 @@
def geojson_type_bbox_opt(default=False):
+ """GeoJSON bbox output mode"""
return click.option(
'--bbox',
'geojson_type',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cligj-0.5.0/cligj/features.py new/cligj-0.7.2/cligj/features.py
--- old/cligj-0.5.0/cligj/features.py 2018-09-26 17:58:55.000000000 +0200
+++ new/cligj-0.7.2/cligj/features.py 2021-05-28 23:21:08.000000000 +0200
@@ -1,3 +1,5 @@
+"""Feature parsing and normalization"""
+
from itertools import chain
import json
import re
@@ -23,10 +25,16 @@
"[lng, lat]", or "lng, lat", or "lng lat".
If no value is provided, features will be read from stdin.
+
+ Yields
+ ------
+ Mapping
+ A GeoJSON Feature represented by a Python mapping
+
"""
for feature_like in value or ('-',):
try:
- with click.open_file(feature_like) as src:
+ with click.open_file(feature_like, encoding="utf-8") as src:
for feature in iter_features(iter(src)):
yield feature
except IOError:
@@ -55,6 +63,12 @@
A function that will be applied to each extracted feature. It
takes a feature object and may return a replacement feature or
None -- in which case iter_features does not yield.
+
+ Yields
+ ------
+ Mapping
+ A GeoJSON Feature represented by a Python mapping
+
"""
func = func or (lambda x: x)
first_line = next(geojsonfile)
@@ -136,9 +150,20 @@
def to_feature(obj):
- """Takes a feature or a geometry
- returns feature verbatim or
- wraps geom in a feature with empty properties
+ """Converts an object to a GeoJSON Feature
+
+ Returns feature verbatim or wraps geom in a feature with empty
+ properties.
+
+ Raises
+ ------
+ ValueError
+
+ Returns
+ -------
+ Mapping
+ A GeoJSON Feature represented by a Python mapping
+
"""
if obj['type'] == 'Feature':
return obj
@@ -177,13 +202,13 @@
an iterable of objects with a geo interface and
normalizes it to the former."""
for obj in feature_objs:
- if hasattr(obj, "__geo_interface__") and \
- 'type' in obj.__geo_interface__.keys() and \
- obj.__geo_interface__['type'] == 'Feature':
+ if (
+ hasattr(obj, "__geo_interface__")
+ and "type" in obj.__geo_interface__.keys()
+ and obj.__geo_interface__["type"] == "Feature"
+ ):
yield obj.__geo_interface__
- elif isinstance(obj, dict) and 'type' in obj and \
- obj['type'] == 'Feature':
+ elif isinstance(obj, dict) and "type" in obj and obj["type"] == "Feature":
yield obj
else:
- raise ValueError("Did not recognize object {0}"
- "as GeoJSON Feature".format(obj))
+ raise ValueError("Did not recognize object as GeoJSON Feature")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cligj-0.5.0/setup.cfg new/cligj-0.7.2/setup.cfg
--- old/cligj-0.5.0/setup.cfg 1970-01-01 01:00:00.000000000 +0100
+++ new/cligj-0.7.2/setup.cfg 2021-05-28 23:21:08.000000000 +0200
@@ -0,0 +1,2 @@
+[metadata]
+license_file = LICENSE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cligj-0.5.0/setup.py new/cligj-0.7.2/setup.py
--- old/cligj-0.5.0/setup.py 2018-09-26 17:58:55.000000000 +0200
+++ new/cligj-0.7.2/setup.py 2021-05-28 23:21:08.000000000 +0200
@@ -1,28 +1,32 @@
from codecs import open as codecs_open
+
from setuptools import setup, find_packages
+with open("cligj/__init__.py") as f:
+ for line in f:
+ if "__version__" in line:
+ version = line.split("=")[1].strip().strip('"').strip("'")
+ continue
-# Get the long description from the relevant file
with codecs_open('README.rst', encoding='utf-8') as f:
long_description = f.read()
-setup(name='cligj',
- version='0.5.0',
- description=u"Click params for commmand line interfaces to GeoJSON",
- long_description=long_description,
- classifiers=[],
- keywords='',
- author=u"Sean Gillies",
- author_email='sean(a)mapbox.com',
- url='https://github.com/mapbox/cligj',
- license='BSD',
- packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
- include_package_data=True,
- zip_safe=False,
- install_requires=[
- 'click >= 4.0, < 8'
- ],
- extras_require={
- 'test': ['pytest-cov'],
- })
+setup(
+ name="cligj",
+ version=version,
+ description=u"Click params for commmand line interfaces to GeoJSON",
+ long_description=long_description,
+ classifiers=[],
+ keywords="",
+ author=u"Sean Gillies",
+ author_email="sean(a)mapbox.com",
+ url="https://github.com/mapbox/cligj",
+ license="BSD",
+ packages=find_packages(exclude=["ez_setup", "examples", "tests"]),
+ include_package_data=True,
+ zip_safe=False,
+ python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, <4",
+ install_requires=["click >= 4.0"],
+ extras_require={"test": ["pytest-cov"],},
+)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cligj-0.5.0/tests/test_cli.py new/cligj-0.7.2/tests/test_cli.py
--- old/cligj-0.5.0/tests/test_cli.py 2018-09-26 17:58:55.000000000 +0200
+++ new/cligj-0.7.2/tests/test_cli.py 2021-05-28 23:21:08.000000000 +0200
@@ -1,7 +1,9 @@
import os
import os.path
+import sys
import click
+import pytest
import cligj
@@ -155,62 +157,67 @@
assert result.output.splitlines() == ['geographic']
-def test_sequence(runner):
+(a)pytest.mark.filterwarnings("ignore")
+(a)pytest.mark.parametrize(
+ ("opt", "val"),
+ [
+ ("--sequence", True),
+ ("--no-sequence", False),
+ (None, cligj.__version__.startswith("1.0")),
+ ],
+)
+def test_sequence(runner, opt, val):
+ """True becomes the default in 1.0"""
@click.command()
@cligj.sequence_opt
def cmd(sequence):
- click.echo("%s" % sequence)
+ click.echo(str(sequence))
- result = runner.invoke(cmd)
+ result = runner.invoke(cmd, [opt] if opt is not None else [])
assert not result.exception
- assert result.output.splitlines() == ['False']
+ assert result.output.splitlines() == [str(val)]
- result = runner.invoke(cmd, ['--sequence'])
- assert not result.exception
- assert result.output.splitlines() == ['True']
- result = runner.invoke(cmd, ['--no-sequence'])
- assert not result.exception
- assert result.output.splitlines() == ['False']
+(a)pytest.mark.skipif(sys.version_info < (3,), reason="Requires Python 3")
+(a)pytest.mark.xfail(cligj.__version__.startswith("1.0"), reason="No warning in 1.0")
+def test_sequence_warns(runner):
+ """Warn about --sequence until 1.0"""
+ @click.command()
+ @cligj.sequence_opt
+ def cmd(sequence):
+ click.echo(str(sequence))
+
+ with pytest.warns(FutureWarning):
+ result = runner.invoke(cmd, ["--sequence"])
-def test_sequence_rs(runner):
+(a)pytest.mark.filterwarnings("ignore")
+(a)pytest.mark.parametrize(("opt", "val"), [("--rs", True), (None, False)])
+def test_sequence_rs(runner, opt, val):
@click.command()
@cligj.sequence_opt
@cligj.use_rs_opt
def cmd(sequence, use_rs):
- click.echo("%s" % sequence)
- click.echo("%s" % use_rs)
+ click.echo(str(sequence))
+ click.echo(str(use_rs))
- result = runner.invoke(cmd, ['--sequence', '--rs'])
+ result = runner.invoke(cmd, ["--sequence"] + ([opt] if opt is not None else []))
assert not result.exception
- assert result.output.splitlines() == ['True', 'True']
-
- result = runner.invoke(cmd, ['--sequence'])
- assert not result.exception
- assert result.output.splitlines() == ['True', 'False']
+ assert result.output.splitlines() == ["True", str(val)]
-def test_geojson_type(runner):
+(a)pytest.mark.parametrize(
+ ("opt", "val"),
+ [("--collection", "collection"), ("--feature", "feature"), ("--bbox", "bbox")],
+)
+def test_geojson_type(runner, opt, val):
@click.command()
@cligj.geojson_type_collection_opt(True)
@cligj.geojson_type_feature_opt(False)
@cligj.geojson_type_bbox_opt(False)
def cmd(geojson_type):
- click.echo("%s" % geojson_type)
-
- result = runner.invoke(cmd)
- assert not result.exception
- assert result.output.splitlines() == ['collection']
-
- result = runner.invoke(cmd, ['--collection'])
- assert not result.exception
- assert result.output.splitlines() == ['collection']
-
- result = runner.invoke(cmd, ['--feature'])
- assert not result.exception
- assert result.output.splitlines() == ['feature']
+ click.echo(str(geojson_type))
- result = runner.invoke(cmd, ['--bbox'])
+ result = runner.invoke(cmd, [opt])
assert not result.exception
- assert result.output.splitlines() == ['bbox']
+ assert result.output.splitlines() == [val]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cligj-0.5.0/tests/twopoints.geojson new/cligj-0.7.2/tests/twopoints.geojson
--- old/cligj-0.5.0/tests/twopoints.geojson 2018-09-26 17:58:55.000000000 +0200
+++ new/cligj-0.7.2/tests/twopoints.geojson 2021-05-28 23:21:08.000000000 +0200
@@ -1 +1 @@
-{"features": [{"bbox": [-122.9292140099711, 45.37948199034149, -122.44106199104115, 45.858097009742835], "center": [-122.7282, 45.5801], "context": [{"id": "postcode.2503633822", "text": "97203"}, {"id": "region.3470299826", "text": "Oregon"}, {"id": "country.4150104525", "short_code": "us", "text": "United States"}], "geometry": {"coordinates": [-122.7282, 45.5801], "type": "Point"}, "id": "place.42767", "place_name": "Portland, Oregon, United States", "properties": {}, "relevance": 0.999, "text": "Portland", "type": "Feature"}, {"bbox": [-121.9779540096568, 43.74737999114854, -120.74788099000016, 44.32812500969035], "center": [-121.3153, 44.0582], "context": [{"id": "postcode.3332732485", "text": "97701"}, {"id": "region.3470299826", "text": "Oregon"}, {"id": "country.4150104525", "short_code": "us", "text": "United States"}], "geometry": {"coordinates": [-121.3153, 44.0582], "type": "Point"}, "id": "place.3965", "place_name": "Bend, Oregon, United States", "properties": {}, "rele
vance": 0.999, "text": "Bend", "type": "Feature"}], "type": "FeatureCollection"}
+{"features": [{"bbox": [-122.9292140099711, 45.37948199034149, -122.44106199104115, 45.858097009742835], "center": [-122.7282, 45.5801], "context": [{"id": "postcode.2503633822", "text": "97203"}, {"id": "region.3470299826", "text": "Oregon"}, {"id": "country.4150104525", "short_code": "us", "text": "United States"}], "geometry": {"coordinates": [-122.7282, 45.5801], "type": "Point"}, "id": "place.42767", "place_name": "Portland, Oregon, United States", "properties": {}, "relevance": 0.999, "text": "Portland", "type": "Feature"}, {"bbox": [-121.9779540096568, 43.74737999114854, -120.74788099000016, 44.32812500969035], "center": [-121.3153, 44.0582], "context": [{"id": "postcode.3332732485", "text": "97701"}, {"id": "region.3470299826", "text": "Oregon"}, {"id": "country.4150104525", "short_code": "us", "text": "United States"}], "geometry": {"coordinates": [-121.3153, 44.0582], "type": "Point"}, "id": "place.3965", "place_name": "Bend, ����regon, United States", "properties": {}, "r
elevance": 0.999, "text": "Bend", "type": "Feature"}], "type": "FeatureCollection"}
2
1
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package 000update-repos for openSUSE:Factory checked in at 2022-06-30 21:03:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/000update-repos (Old)
and /work/SRC/openSUSE:Factory/.000update-repos.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "000update-repos"
Thu Jun 30 21:03:43 2022 rev:2025 rq: version:unknown
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
New:
----
15.3:update_1656597763.packages.zst
factory:non-oss_3265.2.packages.zst
factory_20220629.packages.zst
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package 000product for openSUSE:Factory checked in at 2022-06-30 17:30:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/000product (Old)
and /work/SRC/openSUSE:Factory/.000product.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "000product"
Thu Jun 30 17:30:39 2022 rev:3266 rq: version:unknown
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ MicroOS-dvd5-dvd-x86_64.kiwi ++++++
--- /var/tmp/diff_new_pack.I4BzKG/_old 2022-06-30 17:30:43.820200242 +0200
+++ /var/tmp/diff_new_pack.I4BzKG/_new 2022-06-30 17:30:43.828200247 +0200
@@ -1,4 +1,4 @@
-<image name="OBS__MicroOS___20220629" schemaversion="4.1">
+<image name="OBS__MicroOS___20220630" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -35,11 +35,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20220629</productvar>
+ <productvar name="VERSION">20220630</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:microos:20220629,openSUSE MicroOS</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:microos:20220630,openSUSE MicroOS</productinfo>
<productinfo name="LINGUAS">en_US </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20220629/x86_64</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20220630/x86_64</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
<productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
++++++ openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi ++++++
--- /var/tmp/diff_new_pack.I4BzKG/_old 2022-06-30 17:30:43.864200269 +0200
+++ /var/tmp/diff_new_pack.I4BzKG/_new 2022-06-30 17:30:43.868200271 +0200
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE-Addon-NonOss___20220629" schemaversion="4.1">
+<image name="OBS__openSUSE-Addon-NonOss___20220630" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -36,11 +36,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20220629</productvar>
+ <productvar name="VERSION">20220630</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20220629,openSUSE NonOSS Addon</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20220630,openSUSE NonOSS Addon</productinfo>
<productinfo name="LINGUAS">af ar be_BY bg br ca cy el et ga gl gu_IN he hi_IN hr ka km ko lt mk nn pa_IN rw sk sl sr_CS ss st tg th tr uk ve vi xh zu </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2022… obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2022…</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2022… obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2022…</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
<productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
++++++ openSUSE-cd-mini-i586.kiwi ++++++
--- /var/tmp/diff_new_pack.I4BzKG/_old 2022-06-30 17:30:43.892200286 +0200
+++ /var/tmp/diff_new_pack.I4BzKG/_new 2022-06-30 17:30:43.892200286 +0200
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20220629" schemaversion="4.1">
+<image name="OBS__openSUSE___20220630" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -32,11 +32,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20220629</productvar>
+ <productvar name="VERSION">20220630</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220629,openSUSE Tumbleweed</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220630,openSUSE Tumbleweed</productinfo>
<productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20220629/i586</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20220630/i586</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
<productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
++++++ openSUSE-cd-mini-x86_64.kiwi ++++++
--- /var/tmp/diff_new_pack.I4BzKG/_old 2022-06-30 17:30:43.916200300 +0200
+++ /var/tmp/diff_new_pack.I4BzKG/_new 2022-06-30 17:30:43.920200303 +0200
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20220629" schemaversion="4.1">
+<image name="OBS__openSUSE___20220630" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -35,11 +35,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20220629</productvar>
+ <productvar name="VERSION">20220630</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220629,openSUSE Tumbleweed</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220630,openSUSE Tumbleweed</productinfo>
<productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20220629/x86_64</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20220630/x86_64</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
<productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
++++++ openSUSE-dvd5-dvd-i586.kiwi ++++++
--- /var/tmp/diff_new_pack.I4BzKG/_old 2022-06-30 17:30:43.952200322 +0200
+++ /var/tmp/diff_new_pack.I4BzKG/_new 2022-06-30 17:30:43.960200327 +0200
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20220629" schemaversion="4.1">
+<image name="OBS__openSUSE___20220630" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -32,11 +32,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20220629</productvar>
+ <productvar name="VERSION">20220630</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220629,openSUSE Tumbleweed</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220630,openSUSE Tumbleweed</productinfo>
<productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20220629/i586</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20220630/i586</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
<productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
@@ -2293,7 +2293,6 @@
<repopackage name="libpcre2-16-0"/>
<repopackage name="libpcre2-32-0"/>
<repopackage name="libpcre2-8-0"/>
- <repopackage name="libpcreposix0"/>
<repopackage name="libpcsclite1"/>
<repopackage name="libpeas-1_0-0"/>
<repopackage name="libpeas-gtk-1_0-0"/>
++++++ openSUSE-dvd5-dvd-x86_64.kiwi ++++++
--- /var/tmp/diff_new_pack.I4BzKG/_old 2022-06-30 17:30:44.004200354 +0200
+++ /var/tmp/diff_new_pack.I4BzKG/_new 2022-06-30 17:30:44.016200361 +0200
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20220629" schemaversion="4.1">
+<image name="OBS__openSUSE___20220630" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -35,11 +35,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20220629</productvar>
+ <productvar name="VERSION">20220630</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220629,openSUSE Tumbleweed</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220630,openSUSE Tumbleweed</productinfo>
<productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20220629/x86_64</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20220630/x86_64</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
<productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
@@ -2447,7 +2447,6 @@
<repopackage name="libpcre2-32-0"/>
<repopackage name="libpcre2-8-0"/>
<repopackage name="libpcre2-8-0-32bit" arch="x86_64"/>
- <repopackage name="libpcreposix0"/>
<repopackage name="libpcsclite1"/>
<repopackage name="libpeas-1_0-0"/>
<repopackage name="libpeas-gtk-1_0-0"/>
++++++ openSUSE-ftp-ftp-i586_x86_64.kiwi ++++++
--- /var/tmp/diff_new_pack.I4BzKG/_old 2022-06-30 17:30:44.056200385 +0200
+++ /var/tmp/diff_new_pack.I4BzKG/_new 2022-06-30 17:30:44.064200390 +0200
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20220629" schemaversion="4.1">
+<image name="OBS__openSUSE___20220630" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -24,7 +24,7 @@
<productvar name="DISTNAME">openSUSE</productvar>
<productvar name="FLAVOR">ftp</productvar>
<productvar name="MAKE_LISTINGS">true</productvar>
- <productvar name="MEDIUM_NAME">openSUSE-20220629-i586-x86_64</productvar>
+ <productvar name="MEDIUM_NAME">openSUSE-20220630-i586-x86_64</productvar>
<productvar name="MULTIPLE_MEDIA">true</productvar>
<productvar name="PRODUCT_DIR">/</productvar>
<productvar name="PRODUCT_NAME">$DISTNAME-$FLAVOR</productvar>
@@ -36,11 +36,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20220629</productvar>
+ <productvar name="VERSION">20220630</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220629,openSUSE Tumbleweed</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220630,openSUSE Tumbleweed</productinfo>
<productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20220629/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20220629/x86_64</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20220630/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20220630/x86_64</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="DEBUGMEDIUM">2</productoption>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
++++++ MicroOS.product ++++++
--- /var/tmp/diff_new_pack.I4BzKG/_old 2022-06-30 17:30:44.144200439 +0200
+++ /var/tmp/diff_new_pack.I4BzKG/_new 2022-06-30 17:30:44.160200449 +0200
@@ -6,7 +6,7 @@
<name>MicroOS</name>
<releasepkgname>MicroOS-release</releasepkgname>
<endoflife/>
- <version>20220629</version>
+ <version>20220630</version>
<!-- release is no longer optional -->
<release>0</release>
<productline>MicroOS</productline>
++++++ dvd.group ++++++
--- /var/tmp/diff_new_pack.I4BzKG/_old 2022-06-30 17:30:44.352200565 +0200
+++ /var/tmp/diff_new_pack.I4BzKG/_new 2022-06-30 17:30:44.356200567 +0200
@@ -2380,7 +2380,6 @@
<package name="libpcre2-16-0" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
<package name="libpcre2-32-0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
<package name="libpcre2-8-0" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
- <package name="libpcreposix0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
<package name="libpcsclite1" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
<package name="libpeas-1_0-0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
<package name="libpeas-gtk-1_0-0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
++++++ openSUSE-Addon-NonOss.product ++++++
--- /var/tmp/diff_new_pack.I4BzKG/_old 2022-06-30 17:30:44.388200587 +0200
+++ /var/tmp/diff_new_pack.I4BzKG/_new 2022-06-30 17:30:44.392200589 +0200
@@ -4,7 +4,7 @@
<product>
<vendor>openSUSE</vendor>
<name>openSUSE-Addon-NonOss</name>
- <version>20220629</version>
+ <version>20220630</version>
<release>0</release>
<summary>openSUSE NonOSS Addon</summary>
<shortsummary>non oss addon</shortsummary>
++++++ openSUSE.product ++++++
--- /var/tmp/diff_new_pack.I4BzKG/_old 2022-06-30 17:30:44.428200611 +0200
+++ /var/tmp/diff_new_pack.I4BzKG/_new 2022-06-30 17:30:44.436200616 +0200
@@ -4,7 +4,7 @@
<product>
<vendor>openSUSE</vendor>
<name>openSUSE</name>
- <version>20220629</version>
+ <version>20220630</version>
<release>0</release>
<productline>openSUSE</productline>
++++++ unsorted.yml ++++++
--- /var/tmp/diff_new_pack.I4BzKG/_old 2022-06-30 17:30:44.568200696 +0200
+++ /var/tmp/diff_new_pack.I4BzKG/_new 2022-06-30 17:30:44.576200701 +0200
@@ -3929,6 +3929,7 @@
- fplll-devel
- fprintd-devel
- fprintd-doc
+ - fq
- fractal
- fractal-lang
- frame
@@ -10121,7 +10122,7 @@
- libcapi20-devel
- libcapi20-devel-32bit: [x86_64]
- libcapi20-mod_misdn
- - libcapnp-0_10_0
+ - libcapnp-0_10_2
- libcapnp-devel
- libcapstone-devel
- libcapstone4
@@ -11158,7 +11159,7 @@
- libgnt0
- libgnt0-32bit: [x86_64]
- libgnuastro15
- - libgnuradio-3_10_2
+ - libgnuradio-3_10_3
- libgnuradio-iqbalance-devel
- libgnuradio-iqbalance3_9_0
- libgnutls-dane-devel
@@ -12940,6 +12941,7 @@
- libpcre2-posix3-32bit: [x86_64]
- libpcrecpp0
- libpcrecpp0-32bit: [x86_64]
+ - libpcreposix0
- libpcreposix0-32bit: [x86_64]
- libpcsclite1-32bit: [x86_64]
- libpcscspy0
@@ -13951,7 +13953,6 @@
- libspice-server-devel
- libspiro-devel
- libspiro1
- - libspirv-cross-c-shared-devel
- libspirv-cross-c-shared0
- libsplinter-3-0
- libspnav-devel
@@ -33073,6 +33074,7 @@
- spindle: [x86_64]
- spindle-devel: [x86_64]
- spirv-cross
+ - spirv-cross-devel
- spirv-headers
- spirv-tools
- spirv-tools-devel
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package 000release-packages for openSUSE:Factory checked in at 2022-06-30 17:30:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/000release-packages (Old)
and /work/SRC/openSUSE:Factory/.000release-packages.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "000release-packages"
Thu Jun 30 17:30:34 2022 rev:1696 rq: version:unknown
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
openSUSE-Addon-NonOss-release.spec: same change
openSUSE-release.spec: same change
stub.spec: same change
++++++ weakremovers.inc ++++++
--- /var/tmp/diff_new_pack.ToE9AD/_old 2022-06-30 17:30:37.720196541 +0200
+++ /var/tmp/diff_new_pack.ToE9AD/_new 2022-06-30 17:30:37.728196546 +0200
@@ -11973,6 +11973,7 @@
Provides: weakremover(libcantorlibs27)
Provides: weakremover(libcap1)
Provides: weakremover(libcapi20-2)
+Provides: weakremover(libcapnp-0_10_0)
Provides: weakremover(libcapnp-0_6)
Provides: weakremover(libcapnp-0_7)
Provides: weakremover(libcapnp-0_8)
@@ -12565,6 +12566,7 @@
Provides: weakremover(libgnuastro6)
Provides: weakremover(libgnuastro9)
Provides: weakremover(libgnuradio-3_10_1)
+Provides: weakremover(libgnuradio-3_10_2)
Provides: weakremover(libgnuradio-3_7_11-0_0_0)
Provides: weakremover(libgnuradio-3_7_12-0_0_0)
Provides: weakremover(libgnuradio-3_8_0)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package lxc for openSUSE:Leap:15.3:Update checked in at 2022-06-30 16:01:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.3:Update/lxc (Old)
and /work/SRC/openSUSE:Leap:15.3:Update/.lxc.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lxc"
Thu Jun 30 16:01:18 2022 rev:2 rq:985307 version:unknown
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ _link ++++++
--- /var/tmp/diff_new_pack.l3DRcX/_old 2022-06-30 16:01:19.276886524 +0200
+++ /var/tmp/diff_new_pack.l3DRcX/_new 2022-06-30 16:01:19.280886528 +0200
@@ -1,2 +1,2 @@
-<link package='lxc.17486' cicount='copy' />
+<link package='lxc.17548' cicount='copy' />
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package 000release-packages for openSUSE:Factory checked in at 2022-06-30 13:42:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/000release-packages (Old)
and /work/SRC/openSUSE:Factory/.000release-packages.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "000release-packages"
Thu Jun 30 13:42:45 2022 rev:1695 rq: version:unknown
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ MicroOS-release.spec ++++++
--- /var/tmp/diff_new_pack.G3AIV5/_old 2022-06-30 13:42:47.630615463 +0200
+++ /var/tmp/diff_new_pack.G3AIV5/_new 2022-06-30 13:42:47.634615466 +0200
@@ -17,7 +17,7 @@
Name: MicroOS-release
-Version: 20220629
+Version: 20220630
Release: 0
Summary: openSUSE MicroOS
License: GPL-2.0-or-later
@@ -176,9 +176,9 @@
%include %{SOURCE100}
Provides: %name-%version
Provides: product() = MicroOS
-Provides: product(MicroOS) = 20220629-0
+Provides: product(MicroOS) = 20220630-0
Provides: product-label() = openSUSE%20MicroOS
-Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20220629
+Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20220630
Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm
Provides: product-endoflife()
Requires: product_flavor(MicroOS)
@@ -194,7 +194,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(dvd)
-Provides: product_flavor(MicroOS) = 20220629-0
+Provides: product_flavor(MicroOS) = 20220630-0
Summary: openSUSE MicroOS%{?betaversion: %{betaversion}}
%description dvd
@@ -210,7 +210,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance)
-Provides: product_flavor(MicroOS) = 20220629-0
+Provides: product_flavor(MicroOS) = 20220630-0
Summary: openSUSE MicroOS%{?betaversion: %{betaversion}}
%description appliance
@@ -267,11 +267,11 @@
<product schemeversion="0">
<vendor>openSUSE</vendor>
<name>MicroOS</name>
- <version>20220629</version>
+ <version>20220630</version>
<release>0</release>
<endoflife></endoflife>
<arch>%{_target_cpu}</arch>
- <cpeid>cpe:/o:opensuse:microos:20220629</cpeid>
+ <cpeid>cpe:/o:opensuse:microos:20220630</cpeid>
<productline>MicroOS</productline>
<register>
<pool>
++++++ openSUSE-Addon-NonOss-release.spec ++++++
--- /var/tmp/diff_new_pack.G3AIV5/_old 2022-06-30 13:42:47.654615481 +0200
+++ /var/tmp/diff_new_pack.G3AIV5/_new 2022-06-30 13:42:47.658615484 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package openSUSE-Addon-NonOss-release (Version 20220629)
+# spec file for package openSUSE-Addon-NonOss-release (Version 20220630)
#
# Copyright (c) 2022 openSUSE.
#
@@ -16,16 +16,16 @@
Name: openSUSE-Addon-NonOss-release
%define product openSUSE-Addon-NonOss
Summary: openSUSE NonOSS Addon%{?betaversion: %{betaversion}}
-Version: 20220629
+Version: 20220630
Release: 0
License: BSD-3-Clause
Group: System/Fhs
Provides: %name-%version
Provides: product() = openSUSE-Addon-NonOss
-Provides: product(openSUSE-Addon-NonOss) = 20220629-0
+Provides: product(openSUSE-Addon-NonOss) = 20220630-0
Provides: product-label() = non%20oss%20addon
-Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20220629
+Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20220630
AutoReqProv: on
@@ -48,10 +48,10 @@
<product schemeversion="0">
<vendor>openSUSE</vendor>
<name>openSUSE-Addon-NonOss</name>
- <version>20220629</version>
+ <version>20220630</version>
<release>0</release>
<arch>%{_target_cpu}</arch>
- <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20220629</cpeid>
+ <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20220630</cpeid>
<register>
<pool>
</pool>
++++++ openSUSE-release.spec ++++++
--- /var/tmp/diff_new_pack.G3AIV5/_old 2022-06-30 13:42:47.678615499 +0200
+++ /var/tmp/diff_new_pack.G3AIV5/_new 2022-06-30 13:42:47.682615502 +0200
@@ -20,7 +20,7 @@
#define betaversion %{nil}
%define codename Tumbleweed
Name: openSUSE-release
-Version: 20220629
+Version: 20220630
Release: 0
# 0 is the product release, not the build release of this package
Summary: openSUSE Tumbleweed
@@ -178,7 +178,7 @@
%include %{SOURCE100}
Provides: %name-%version
Provides: product() = openSUSE
-Provides: product(openSUSE) = 20220629-0
+Provides: product(openSUSE) = 20220630-0
%ifarch x86_64
Provides: product-register-target() = openSUSE%2DTumbleweed%2Dx86_64
%endif
@@ -192,7 +192,7 @@
Provides: product-register-target() = openSUSE%2DTumbleweed%2Daarch64
%endif
Provides: product-label() = openSUSE
-Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20220629
+Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20220630
Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm
Provides: product-url(repository) = http%3A%2F%2Fdownload.opensuse.org%2Ftumbleweed%2Frepo%2Foss%2F
Requires: product_flavor(openSUSE)
@@ -206,7 +206,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(ftp)
-Provides: product_flavor(openSUSE) = 20220629-0
+Provides: product_flavor(openSUSE) = 20220630-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description ftp
@@ -221,7 +221,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(mini)
-Provides: product_flavor(openSUSE) = 20220629-0
+Provides: product_flavor(openSUSE) = 20220630-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description mini
@@ -236,7 +236,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(dvd)
-Provides: product_flavor(openSUSE) = 20220629-0
+Provides: product_flavor(openSUSE) = 20220630-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description dvd
@@ -251,7 +251,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(livecd-kde)
-Provides: product_flavor(openSUSE) = 20220629-0
+Provides: product_flavor(openSUSE) = 20220630-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description livecd-kde
@@ -266,7 +266,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(livecd-x11)
-Provides: product_flavor(openSUSE) = 20220629-0
+Provides: product_flavor(openSUSE) = 20220630-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description livecd-x11
@@ -281,7 +281,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(livecd-gnome)
-Provides: product_flavor(openSUSE) = 20220629-0
+Provides: product_flavor(openSUSE) = 20220630-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description livecd-gnome
@@ -296,7 +296,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(livecd-xfce)
-Provides: product_flavor(openSUSE) = 20220629-0
+Provides: product_flavor(openSUSE) = 20220630-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description livecd-xfce
@@ -311,7 +311,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(usb-kde)
-Provides: product_flavor(openSUSE) = 20220629-0
+Provides: product_flavor(openSUSE) = 20220630-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description usb-kde
@@ -326,7 +326,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(usb-gnome)
-Provides: product_flavor(openSUSE) = 20220629-0
+Provides: product_flavor(openSUSE) = 20220630-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description usb-gnome
@@ -341,7 +341,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(usb-x11)
-Provides: product_flavor(openSUSE) = 20220629-0
+Provides: product_flavor(openSUSE) = 20220630-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description usb-x11
@@ -356,7 +356,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance)
-Provides: product_flavor(openSUSE) = 20220629-0
+Provides: product_flavor(openSUSE) = 20220630-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance
@@ -371,7 +371,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-docker)
-Provides: product_flavor(openSUSE) = 20220629-0
+Provides: product_flavor(openSUSE) = 20220630-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-docker
@@ -386,7 +386,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-kvm)
-Provides: product_flavor(openSUSE) = 20220629-0
+Provides: product_flavor(openSUSE) = 20220630-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-kvm
@@ -401,7 +401,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-vmware)
-Provides: product_flavor(openSUSE) = 20220629-0
+Provides: product_flavor(openSUSE) = 20220630-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-vmware
@@ -416,7 +416,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-openstack)
-Provides: product_flavor(openSUSE) = 20220629-0
+Provides: product_flavor(openSUSE) = 20220630-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-openstack
@@ -431,7 +431,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-hyperv)
-Provides: product_flavor(openSUSE) = 20220629-0
+Provides: product_flavor(openSUSE) = 20220630-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-hyperv
@@ -446,7 +446,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-vagrant)
-Provides: product_flavor(openSUSE) = 20220629-0
+Provides: product_flavor(openSUSE) = 20220630-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-vagrant
@@ -461,7 +461,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-wsl)
-Provides: product_flavor(openSUSE) = 20220629-0
+Provides: product_flavor(openSUSE) = 20220630-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-wsl
@@ -476,7 +476,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-custom)
-Provides: product_flavor(openSUSE) = 20220629-0
+Provides: product_flavor(openSUSE) = 20220630-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-custom
@@ -557,10 +557,10 @@
<product schemeversion="0">
<vendor>openSUSE</vendor>
<name>openSUSE</name>
- <version>20220629</version>
+ <version>20220630</version>
<release>0</release>
<arch>%{_target_cpu}</arch>
- <cpeid>cpe:/o:opensuse:opensuse:20220629</cpeid>
+ <cpeid>cpe:/o:opensuse:opensuse:20220630</cpeid>
<productline>openSUSE</productline>
<register>
<pool>
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qdirstat for openSUSE:Factory checked in at 2022-06-30 13:18:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qdirstat (Old)
and /work/SRC/openSUSE:Factory/.qdirstat.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qdirstat"
Thu Jun 30 13:18:44 2022 rev:12 rq:986023 version:1.8.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/qdirstat/qdirstat.changes 2021-08-28 22:30:07.266038827 +0200
+++ /work/SRC/openSUSE:Factory/.qdirstat.new.1548/qdirstat.changes 2022-06-30 13:18:50.973555302 +0200
@@ -1,0 +2,8 @@
+Thu Jun 30 08:50:08 UTC 2022 - Stefan Hundhammer <shundhammer(a)suse.com>
+
+- Update to V1.8.1:
+ - New treemap interaction: Middle click to show parent hierarchy
+ - Some small improvements
+ - Bug fixes
+
+-------------------------------------------------------------------
Old:
----
qdirstat-1.8.tar.bz2
New:
----
qdirstat-1.8.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qdirstat.spec ++++++
--- /var/tmp/diff_new_pack.KjPZve/_old 2022-06-30 13:18:51.373555602 +0200
+++ /var/tmp/diff_new_pack.KjPZve/_new 2022-06-30 13:18:51.377555606 +0200
@@ -17,7 +17,7 @@
Name: qdirstat
-Version: 1.8
+Version: 1.8.1
Release: 0
Summary: Directory Statistics
License: GPL-2.0-only
++++++ qdirstat-1.8.tar.bz2 -> qdirstat-1.8.1.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/qdirstat/qdirstat-1.8.tar.bz2 /work/SRC/openSUSE:Factory/.qdirstat.new.1548/qdirstat-1.8.1.tar.bz2 differ: char 11, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package R-base for openSUSE:Factory checked in at 2022-06-30 13:18:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/R-base (Old)
and /work/SRC/openSUSE:Factory/.R-base.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "R-base"
Thu Jun 30 13:18:42 2022 rev:85 rq:986019 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/R-base/R-base.changes 2022-04-24 19:45:39.209843963 +0200
+++ /work/SRC/openSUSE:Factory/.R-base.new.1548/R-base.changes 2022-06-30 13:18:50.101554648 +0200
@@ -1,0 +2,70 @@
+Thu Jun 23 08:40:01 UTC 2022 - Detlef Steuer <detlef.steuer(a)gmx.de>
+
+- CHANGES IN R 4.2.1:
+
+ NEW FEATURES:
+
+ * New function utils::findCRANmirror() to find out if a CRAN mirror
+ has been selected, otherwise fallback to the main site. This
+ behaves in the same way as tools::CRAN_package_db() and is
+ intended for packages wishing to access CRAN for purposes other
+ than installing packages.
+
+ The need for this was shown by a day when the main CRAN website
+ was offline and a dozen or so packages which had its URL
+ hardcoded failed their checks.
+
+ INSTALLATION on a UNIX-ALIKE:
+
+ * The libraries searched for by --with-blas (without a value) now
+ include BLIS (after OpenBLAS but before ATLAS). And on macOS,
+ the Accelerate framework (after ATLAS). (This is patterned after
+ the AX_BLAS macro from the Autoconf Archive.)
+
+ * The included LAPACK sources have been updated to 3.10.1.
+
+ UTILITIES:
+
+ * The (full path to) the command tidy to be used for HTML
+ validation can be set by environment variable R_TIDYCMD.
+
+ * Setting environment variable _R_CHECK_RD_VALIDATE_RD2HTML_ to a
+ false value will override R CMD check --as-cran and turn off HTML
+ validation. This provides a way to circumvent a problematic
+ tidy.
+
+ The 2006 version that ships with macOS is always skipped.
+
+ C-LEVEL FACILITIES:
+
+ * The undocumented legacy declarations of Sint, Sfloat, SINT_MAX
+ and SINT_MIN in header R.h are deprecated.
+
+ BUG FIXES:
+
+ * fisher.test(d) no longer segfaults for "large" d; fixing PR#18336
+ by preventing/detecting an integer overflow reliably.
+
+ * tar(., files=*) now produces correctly the warning about invalid
+ uid or gid of files, fixing PR#18344, reported by Martin Morgan.
+
+ * tk_choose.files() with multi = FALSE misbehaved on paths
+ containing spaces (PR#18334) (regression introduced in R 4.0.0).
+
+ * sort(x, partial = ind, *) now works correctly notably for the
+ non-default na.last = FALSE or TRUE, fixing PR#18335 reported by
+ James Edwards.
+
+ * Environment variable _R_CHECK_XREFS_REPOSITORIES_ is only used
+ for checking .Rd cross-references in R CMD check (as documented)
+ and not for other uses looking for a CRAN mirror.
+
+ * The search for a CRAN mirror when checking packages now uses
+ getOption("repos") if that specifies a CRAN mirror, even when it
+ does not also specify all three Bioconductor repositories (as was
+ previously required).
+
+ * The HTML code generated by tools::Rd2HTML() has been improved to
+ pass tidy 5.8.0.
+
+-------------------------------------------------------------------
Old:
----
R-4.2.0.tar.xz
New:
----
R-4.2.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ R-base.spec ++++++
--- /var/tmp/diff_new_pack.BX72C9/_old 2022-06-30 13:18:50.689555090 +0200
+++ /var/tmp/diff_new_pack.BX72C9/_new 2022-06-30 13:18:50.693555093 +0200
@@ -23,7 +23,7 @@
%define release 1
Name: R-base
-Version: 4.2.0
+Version: 4.2.1
Release: %release
%define Rversion %{version}
Source0: R-%{version}.tar.xz
@@ -1287,7 +1287,7 @@
%package -n R-KernSmooth
Summary: Package provides recommended R-KernSmooth
-Version: 2.23.30
+Version: 2.23.20
Release: %release
Requires: R-base
@@ -1349,7 +1349,7 @@
%package -n R-MASS
Summary: Package provides recommended R-MASS
-Version: 7.3.56
+Version: 7.3.57
Release: %release
Requires: R-base
++++++ R-4.2.0.tar.xz -> R-4.2.1.tar.xz ++++++
/work/SRC/openSUSE:Factory/R-base/R-4.2.0.tar.xz /work/SRC/openSUSE:Factory/.R-base.new.1548/R-4.2.1.tar.xz differ: char 1, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package capnproto for openSUSE:Factory checked in at 2022-06-30 13:18:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/capnproto (Old)
and /work/SRC/openSUSE:Factory/.capnproto.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "capnproto"
Thu Jun 30 13:18:40 2022 rev:8 rq:986010 version:0.10.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/capnproto/capnproto.changes 2022-06-04 23:27:03.624757302 +0200
+++ /work/SRC/openSUSE:Factory/.capnproto.new.1548/capnproto.changes 2022-06-30 13:18:48.957553791 +0200
@@ -1,0 +2,17 @@
+Thu Jun 30 05:52:05 UTC 2022 - Luigi Baldoni <aloisio(a)gmx.com>
+
+- Update to version 0.10.2
+ * cmake: adding src/ include path to build
+ * Allow unused parameter in KJ_STRINGIFY
+ * Add List::addFront().
+ * Don't use deprecated std::iterator
+ * using absolute includes across library boundary
+ * Add kj::VectorOutputStream::clear()
+ * Mention map() and orDefault() in KJ tour
+ * Fix ASAN problems under Clang 15.
+ * Add header guards to all headers that were missing them.
+ * Support permessage-deflate WebSocket Extension
+ version 0.10.1:
+ * Add missing header to makefiles.
+
+-------------------------------------------------------------------
Old:
----
capnproto-c++-0.10.0.tar.gz
New:
----
capnproto-c++-0.10.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ capnproto.spec ++++++
--- /var/tmp/diff_new_pack.7NnC4J/_old 2022-06-30 13:18:49.337554076 +0200
+++ /var/tmp/diff_new_pack.7NnC4J/_new 2022-06-30 13:18:49.341554079 +0200
@@ -16,9 +16,9 @@
#
-%define _libver 0_10_0
+%define _libver 0_10_2
Name: capnproto
-Version: 0.10.0
+Version: 0.10.2
Release: 0
Summary: A Data Serialization Format
License: MIT
++++++ capnproto-c++-0.10.0.tar.gz -> capnproto-c++-0.10.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/capnproto-c++-0.10.0/CMakeLists.txt new/capnproto-c++-0.10.2/CMakeLists.txt
--- old/capnproto-c++-0.10.0/CMakeLists.txt 2022-06-03 16:38:27.000000000 +0200
+++ new/capnproto-c++-0.10.2/CMakeLists.txt 2022-06-30 00:42:46.000000000 +0200
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.6)
project("Cap'n Proto" CXX)
-set(VERSION 0.10.0)
+set(VERSION 0.10.2)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/capnproto-c++-0.10.0/Makefile.am new/capnproto-c++-0.10.2/Makefile.am
--- old/capnproto-c++-0.10.0/Makefile.am 2022-05-25 14:55:57.000000000 +0200
+++ new/capnproto-c++-0.10.2/Makefile.am 2022-06-07 15:34:35.000000000 +0200
@@ -177,6 +177,7 @@
src/kj/async-queue.h \
src/kj/main.h \
src/kj/test.h \
+ src/kj/win32-api-version.h \
src/kj/windows-sanity.h
includekjparse_HEADERS = \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/capnproto-c++-0.10.0/Makefile.in new/capnproto-c++-0.10.2/Makefile.in
--- old/capnproto-c++-0.10.0/Makefile.in 2022-06-03 16:38:33.000000000 +0200
+++ new/capnproto-c++-0.10.2/Makefile.in 2022-06-30 00:42:52.000000000 +0200
@@ -1153,6 +1153,7 @@
src/kj/async-queue.h \
src/kj/main.h \
src/kj/test.h \
+ src/kj/win32-api-version.h \
src/kj/windows-sanity.h
includekjparse_HEADERS = \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/capnproto-c++-0.10.0/configure new/capnproto-c++-0.10.2/configure
--- old/capnproto-c++-0.10.0/configure 2022-06-03 16:38:32.000000000 +0200
+++ new/capnproto-c++-0.10.2/configure 2022-06-30 00:42:51.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Capn Proto 0.10.0.
+# Generated by GNU Autoconf 2.69 for Capn Proto 0.10.2.
#
# Report bugs to <capnproto(a)googlegroups.com>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='Capn Proto'
PACKAGE_TARNAME='capnproto-c++'
-PACKAGE_VERSION='0.10.0'
-PACKAGE_STRING='Capn Proto 0.10.0'
+PACKAGE_VERSION='0.10.2'
+PACKAGE_STRING='Capn Proto 0.10.2'
PACKAGE_BUGREPORT='capnproto(a)googlegroups.com'
PACKAGE_URL=''
@@ -1367,7 +1367,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Capn Proto 0.10.0 to adapt to many kinds of systems.
+\`configure' configures Capn Proto 0.10.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1438,7 +1438,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Capn Proto 0.10.0:";;
+ short | recursive ) echo "Configuration of Capn Proto 0.10.2:";;
esac
cat <<\_ACEOF
@@ -1569,7 +1569,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Capn Proto configure 0.10.0
+Capn Proto configure 0.10.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2284,7 +2284,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Capn Proto $as_me 0.10.0, which was
+It was created by Capn Proto $as_me 0.10.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3157,7 +3157,7 @@
# Define the identity of the package.
PACKAGE='capnproto-c++'
- VERSION='0.10.0'
+ VERSION='0.10.2'
cat >>confdefs.h <<_ACEOF
@@ -18386,7 +18386,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Capn Proto $as_me 0.10.0, which was
+This file was extended by Capn Proto $as_me 0.10.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18452,7 +18452,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Capn Proto config.status 0.10.0
+Capn Proto config.status 0.10.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/capnproto-c++-0.10.0/configure.ac new/capnproto-c++-0.10.2/configure.ac
--- old/capnproto-c++-0.10.0/configure.ac 2022-06-03 16:38:27.000000000 +0200
+++ new/capnproto-c++-0.10.2/configure.ac 2022-06-30 00:42:46.000000000 +0200
@@ -1,6 +1,6 @@
## Process this file with autoconf to produce configure.
-AC_INIT([Capn Proto],[0.10.0],[capnproto(a)googlegroups.com],[capnproto-c++]
+AC_INIT([Capn Proto],[0.10.2],[capnproto(a)googlegroups.com],[capnproto-c++]
AC_CONFIG_SRCDIR([src/capnp/layout.c++])
AC_CONFIG_AUX_DIR([build-aux])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/capnproto-c++-0.10.0/src/capnp/c++.capnp.h new/capnproto-c++-0.10.2/src/capnp/c++.capnp.h
--- old/capnproto-c++-0.10.0/src/capnp/c++.capnp.h 2022-06-03 16:38:27.000000000 +0200
+++ new/capnproto-c++-0.10.2/src/capnp/c++.capnp.h 2022-06-30 00:42:46.000000000 +0200
@@ -6,7 +6,7 @@
#include <capnp/generated-header-support.h>
#include <kj/windows-sanity.h>
-#if CAPNP_VERSION != 10000
+#if CAPNP_VERSION != 10002
#error "Version mismatch between generated code and library headers. You must use the same version of the Cap'n Proto compiler and library."
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/capnproto-c++-0.10.0/src/capnp/common.h new/capnproto-c++-0.10.2/src/capnp/common.h
--- old/capnproto-c++-0.10.0/src/capnp/common.h 2022-06-03 16:38:27.000000000 +0200
+++ new/capnproto-c++-0.10.2/src/capnp/common.h 2022-06-30 00:42:46.000000000 +0200
@@ -48,7 +48,7 @@
#define CAPNP_VERSION_MAJOR 0
#define CAPNP_VERSION_MINOR 10
-#define CAPNP_VERSION_MICRO 0
+#define CAPNP_VERSION_MICRO 2
#define CAPNP_VERSION \
(CAPNP_VERSION_MAJOR * 1000000 + CAPNP_VERSION_MINOR * 1000 + CAPNP_VERSION_MICRO)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/capnproto-c++-0.10.0/src/capnp/compat/json.capnp.h new/capnproto-c++-0.10.2/src/capnp/compat/json.capnp.h
--- old/capnproto-c++-0.10.0/src/capnp/compat/json.capnp.h 2022-06-03 16:38:27.000000000 +0200
+++ new/capnproto-c++-0.10.2/src/capnp/compat/json.capnp.h 2022-06-30 00:42:46.000000000 +0200
@@ -9,7 +9,7 @@
#include <capnp/capability.h>
#endif // !CAPNP_LITE
-#if CAPNP_VERSION != 10000
+#if CAPNP_VERSION != 10002
#error "Version mismatch between generated code and library headers. You must use the same version of the Cap'n Proto compiler and library."
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/capnproto-c++-0.10.0/src/capnp/compat/json.h new/capnproto-c++-0.10.2/src/capnp/compat/json.h
--- old/capnproto-c++-0.10.0/src/capnp/compat/json.h 2021-03-20 19:47:34.000000000 +0100
+++ new/capnproto-c++-0.10.2/src/capnp/compat/json.h 2022-06-29 18:37:00.000000000 +0200
@@ -25,6 +25,8 @@
#include <capnp/dynamic.h>
#include <capnp/compat/json.capnp.h>
+CAPNP_BEGIN_HEADER
+
namespace capnp {
typedef json::Value JsonValue;
@@ -523,3 +525,5 @@
}
} // namespace capnp
+
+CAPNP_END_HEADER
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/capnproto-c++-0.10.0/src/capnp/compat/std-iterator.h new/capnproto-c++-0.10.2/src/capnp/compat/std-iterator.h
--- old/capnproto-c++-0.10.0/src/capnp/compat/std-iterator.h 2020-04-22 19:50:38.000000000 +0200
+++ new/capnproto-c++-0.10.2/src/capnp/compat/std-iterator.h 2022-06-29 18:37:00.000000000 +0200
@@ -29,6 +29,8 @@
#include "../list.h"
#include <iterator>
+CAPNP_BEGIN_HEADER
+
namespace std {
template <typename Container, typename Element>
@@ -37,3 +39,4 @@
} // namespace std
+CAPNP_END_HEADER
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/capnproto-c++-0.10.0/src/capnp/compat/websocket-rpc.h new/capnproto-c++-0.10.2/src/capnp/compat/websocket-rpc.h
--- old/capnproto-c++-0.10.0/src/capnp/compat/websocket-rpc.h 2021-08-08 19:08:05.000000000 +0200
+++ new/capnproto-c++-0.10.2/src/capnp/compat/websocket-rpc.h 2022-06-29 18:37:00.000000000 +0200
@@ -24,6 +24,8 @@
#include <kj/compat/http.h>
#include <capnp/serialize-async.h>
+CAPNP_BEGIN_HEADER
+
namespace capnp {
class WebSocketMessageStream final : public MessageStream {
@@ -51,3 +53,5 @@
};
} // namespace capnp
+
+CAPNP_END_HEADER
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/capnproto-c++-0.10.0/src/capnp/compiler/grammar.capnp.h new/capnproto-c++-0.10.2/src/capnp/compiler/grammar.capnp.h
--- old/capnproto-c++-0.10.0/src/capnp/compiler/grammar.capnp.h 2022-06-03 16:38:27.000000000 +0200
+++ new/capnproto-c++-0.10.2/src/capnp/compiler/grammar.capnp.h 2022-06-30 00:42:46.000000000 +0200
@@ -6,7 +6,7 @@
#include <capnp/generated-header-support.h>
#include <kj/windows-sanity.h>
-#if CAPNP_VERSION != 10000
+#if CAPNP_VERSION != 10002
#error "Version mismatch between generated code and library headers. You must use the same version of the Cap'n Proto compiler and library."
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/capnproto-c++-0.10.0/src/capnp/compiler/lexer.capnp.h new/capnproto-c++-0.10.2/src/capnp/compiler/lexer.capnp.h
--- old/capnproto-c++-0.10.0/src/capnp/compiler/lexer.capnp.h 2022-06-03 16:38:27.000000000 +0200
+++ new/capnproto-c++-0.10.2/src/capnp/compiler/lexer.capnp.h 2022-06-30 00:42:46.000000000 +0200
@@ -6,7 +6,7 @@
#include <capnp/generated-header-support.h>
#include <kj/windows-sanity.h>
-#if CAPNP_VERSION != 10000
+#if CAPNP_VERSION != 10002
#error "Version mismatch between generated code and library headers. You must use the same version of the Cap'n Proto compiler and library."
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/capnproto-c++-0.10.0/src/capnp/compiler/type-id.h new/capnproto-c++-0.10.2/src/capnp/compiler/type-id.h
--- old/capnproto-c++-0.10.0/src/capnp/compiler/type-id.h 2018-08-26 03:41:52.000000000 +0200
+++ new/capnproto-c++-0.10.2/src/capnp/compiler/type-id.h 2022-06-29 18:37:00.000000000 +0200
@@ -25,6 +25,8 @@
#include <kj/array.h>
#include <capnp/common.h>
+CAPNP_BEGIN_HEADER
+
namespace capnp {
namespace compiler {
@@ -40,3 +42,5 @@
} // namespace compiler
} // namespace capnp
+
+CAPNP_END_HEADER
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/capnproto-c++-0.10.0/src/capnp/membrane.h new/capnproto-c++-0.10.2/src/capnp/membrane.h
--- old/capnproto-c++-0.10.0/src/capnp/membrane.h 2021-03-20 19:47:34.000000000 +0100
+++ new/capnproto-c++-0.10.2/src/capnp/membrane.h 2022-06-29 18:37:00.000000000 +0200
@@ -49,6 +49,8 @@
#include "capability.h"
+CAPNP_BEGIN_HEADER
+
namespace capnp {
class MembranePolicy {
@@ -275,3 +277,5 @@
}
} // namespace capnp
+
+CAPNP_END_HEADER
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/capnproto-c++-0.10.0/src/capnp/persistent.capnp.h new/capnproto-c++-0.10.2/src/capnp/persistent.capnp.h
--- old/capnproto-c++-0.10.0/src/capnp/persistent.capnp.h 2022-06-03 16:38:27.000000000 +0200
+++ new/capnproto-c++-0.10.2/src/capnp/persistent.capnp.h 2022-06-30 00:42:46.000000000 +0200
@@ -9,7 +9,7 @@
#include <capnp/capability.h>
#endif // !CAPNP_LITE
-#if CAPNP_VERSION != 10000
+#if CAPNP_VERSION != 10002
#error "Version mismatch between generated code and library headers. You must use the same version of the Cap'n Proto compiler and library."
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/capnproto-c++-0.10.0/src/capnp/rpc-twoparty.capnp.h new/capnproto-c++-0.10.2/src/capnp/rpc-twoparty.capnp.h
--- old/capnproto-c++-0.10.0/src/capnp/rpc-twoparty.capnp.h 2022-06-03 16:38:27.000000000 +0200
+++ new/capnproto-c++-0.10.2/src/capnp/rpc-twoparty.capnp.h 2022-06-30 00:42:46.000000000 +0200
@@ -6,7 +6,7 @@
#include <capnp/generated-header-support.h>
#include <kj/windows-sanity.h>
-#if CAPNP_VERSION != 10000
+#if CAPNP_VERSION != 10002
#error "Version mismatch between generated code and library headers. You must use the same version of the Cap'n Proto compiler and library."
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/capnproto-c++-0.10.0/src/capnp/rpc.capnp.h new/capnproto-c++-0.10.2/src/capnp/rpc.capnp.h
--- old/capnproto-c++-0.10.0/src/capnp/rpc.capnp.h 2022-06-03 16:38:27.000000000 +0200
+++ new/capnproto-c++-0.10.2/src/capnp/rpc.capnp.h 2022-06-30 00:42:46.000000000 +0200
@@ -6,7 +6,7 @@
#include <capnp/generated-header-support.h>
#include <kj/windows-sanity.h>
-#if CAPNP_VERSION != 10000
+#if CAPNP_VERSION != 10002
#error "Version mismatch between generated code and library headers. You must use the same version of the Cap'n Proto compiler and library."
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/capnproto-c++-0.10.0/src/capnp/schema.capnp.h new/capnproto-c++-0.10.2/src/capnp/schema.capnp.h
--- old/capnproto-c++-0.10.0/src/capnp/schema.capnp.h 2022-06-03 16:38:27.000000000 +0200
+++ new/capnproto-c++-0.10.2/src/capnp/schema.capnp.h 2022-06-30 00:42:46.000000000 +0200
@@ -6,7 +6,7 @@
#include <capnp/generated-header-support.h>
#include <kj/windows-sanity.h>
-#if CAPNP_VERSION != 10000
+#if CAPNP_VERSION != 10002
#error "Version mismatch between generated code and library headers. You must use the same version of the Cap'n Proto compiler and library."
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/capnproto-c++-0.10.0/src/capnp/stream.capnp.h new/capnproto-c++-0.10.2/src/capnp/stream.capnp.h
--- old/capnproto-c++-0.10.0/src/capnp/stream.capnp.h 2022-06-03 16:38:27.000000000 +0200
+++ new/capnproto-c++-0.10.2/src/capnp/stream.capnp.h 2022-06-30 00:42:46.000000000 +0200
@@ -6,7 +6,7 @@
#include <capnp/generated-header-support.h>
#include <kj/windows-sanity.h>
-#if CAPNP_VERSION != 10000
+#if CAPNP_VERSION != 10002
#error "Version mismatch between generated code and library headers. You must use the same version of the Cap'n Proto compiler and library."
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/capnproto-c++-0.10.0/src/kj/CMakeLists.txt new/capnproto-c++-0.10.2/src/kj/CMakeLists.txt
--- old/capnproto-c++-0.10.0/src/kj/CMakeLists.txt 2022-05-25 14:55:57.000000000 +0200
+++ new/capnproto-c++-0.10.2/src/kj/CMakeLists.txt 2022-06-07 15:34:35.000000000 +0200
@@ -64,6 +64,7 @@
filesystem.h
time.h
main.h
+ win32-api-version.h
windows-sanity.h
)
set(kj-parse_headers
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/capnproto-c++-0.10.0/src/kj/async-io-internal.h new/capnproto-c++-0.10.2/src/kj/async-io-internal.h
--- old/capnproto-c++-0.10.0/src/kj/async-io-internal.h 2018-08-26 03:41:52.000000000 +0200
+++ new/capnproto-c++-0.10.2/src/kj/async-io-internal.h 2022-06-29 18:37:00.000000000 +0200
@@ -26,6 +26,8 @@
#include "async-io.h"
#include <stdint.h>
+KJ_BEGIN_HEADER
+
struct sockaddr;
struct sockaddr_un;
@@ -86,3 +88,5 @@
} // namespace _ (private)
} // namespace kj
+
+KJ_END_HEADER
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/capnproto-c++-0.10.0/src/kj/async-test.c++ new/capnproto-c++-0.10.2/src/kj/async-test.c++
--- old/capnproto-c++-0.10.0/src/kj/async-test.c++ 2022-05-25 14:55:57.000000000 +0200
+++ new/capnproto-c++-0.10.2/src/kj/async-test.c++ 2022-06-29 18:37:00.000000000 +0200
@@ -1162,7 +1162,12 @@
if (i1_local == nullptr) {
i1_local = &i;
} else {
+#if !KJ_HAS_COMPILER_FEATURE(address_sanitizer)
+ // Verify that the stack variable is in the exact same spot as before.
+ // May not work under ASAN as the instrumentation to detect stack-use-after-return can
+ // change the address.
KJ_ASSERT(i1_local == &i);
+#endif
}
return i;
});
@@ -1173,7 +1178,9 @@
if (i2_local == nullptr) {
i2_local = &i;
} else {
+#if !KJ_HAS_COMPILER_FEATURE(address_sanitizer)
KJ_ASSERT(i2_local == &i);
+#endif
}
return i;
});
@@ -1210,9 +1217,24 @@
bool onOurStack(char* p) {
// If p points less than 64k away from a random stack variable, then it must be on the same
// stack, since we never allocate stacks smaller than 64k.
+#if KJ_HAS_COMPILER_FEATURE(address_sanitizer)
+ // The stack-use-after-return detection mechanism breaks our ability to check this, so don't.
+ return true;
+#else
char c;
ptrdiff_t diff = p - &c;
return diff < 65536 && diff > -65536;
+#endif
+}
+
+bool notOnOurStack(char* p) {
+ // Opposite of onOurStack(), except returns true if the check can't be performed.
+#if KJ_HAS_COMPILER_FEATURE(address_sanitizer)
+ // The stack-use-after-return detection mechanism breaks our ability to check this, so don't.
+ return true;
+#else
+ return !onOurStack(p);
+#endif
}
KJ_TEST("fiber pool runSynchronously()") {
@@ -1240,11 +1262,14 @@
});
KJ_ASSERT(ptr2 != nullptr);
+#if !KJ_HAS_COMPILER_FEATURE(address_sanitizer)
// Should have used the same stack both times, so local var would be in the same place.
+ // Under ASAN, the stack-use-after-return detection correctly fires on this, so we skip the check.
KJ_EXPECT(ptr1 == ptr2);
+#endif
// Should have been on a different stack from the main stack.
- KJ_EXPECT(!onOurStack(ptr1));
+ KJ_EXPECT(notOnOurStack(ptr1));
KJ_EXPECT_THROW_MESSAGE("test exception",
pool.runSynchronously([&]() { KJ_FAIL_ASSERT("test exception"); }));
@@ -1298,7 +1323,7 @@
// is the one from the thread.
pool.runSynchronously([&]() {
KJ_EXPECT(onOurStack(ptr2));
- KJ_EXPECT(!onOurStack(ptr1));
+ KJ_EXPECT(notOnOurStack(ptr1));
KJ_EXPECT(pool.getFreelistSize() == 0);
});
@@ -1369,15 +1394,15 @@
// The event callbacks should have run on a different stack, but the wait should have been on
// the main stack.
- KJ_EXPECT(!onOurStack(ptr1));
- KJ_EXPECT(!onOurStack(ptr2));
+ KJ_EXPECT(notOnOurStack(ptr1));
+ KJ_EXPECT(notOnOurStack(ptr2));
KJ_EXPECT(onOurStack(port.waitStack));
pool.runSynchronously([&]() {
// This should run on the same stack where the event callbacks ran.
KJ_EXPECT(onOurStack(ptr1));
KJ_EXPECT(onOurStack(ptr2));
- KJ_EXPECT(!onOurStack(port.waitStack));
+ KJ_EXPECT(notOnOurStack(port.waitStack));
});
}
@@ -1410,8 +1435,8 @@
// The event callback should have run on a different stack, and poll() should have run on
// a separate stack too.
- KJ_EXPECT(!onOurStack(ptr1));
- KJ_EXPECT(!onOurStack(port.pollStack));
+ KJ_EXPECT(notOnOurStack(ptr1));
+ KJ_EXPECT(notOnOurStack(port.pollStack));
pool.runSynchronously([&]() {
// This should run on the same stack where the event callbacks ran.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/capnproto-c++-0.10.0/src/kj/async-win32.h new/capnproto-c++-0.10.2/src/kj/async-win32.h
--- old/capnproto-c++-0.10.0/src/kj/async-win32.h 2022-05-25 14:55:57.000000000 +0200
+++ new/capnproto-c++-0.10.2/src/kj/async-win32.h 2022-06-29 18:37:00.000000000 +0200
@@ -38,6 +38,8 @@
#include <windows.h>
#include "windows-sanity.h"
+KJ_BEGIN_HEADER
+
namespace kj {
class Win32EventPort: public EventPort {
@@ -227,3 +229,5 @@
};
} // namespace kj
+
+KJ_END_HEADER
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/capnproto-c++-0.10.0/src/kj/async.c++ new/capnproto-c++-0.10.2/src/kj/async.c++
--- old/capnproto-c++-0.10.0/src/kj/async.c++ 2022-05-25 14:55:57.000000000 +0200
+++ new/capnproto-c++-0.10.2/src/kj/async.c++ 2022-06-29 18:37:00.000000000 +0200
@@ -78,6 +78,19 @@
#include <stdlib.h>
+#if KJ_HAS_COMPILER_FEATURE(address_sanitizer)
+// Clang's address sanitizer requires special hints when switching fibers, especially in order for
+// stack-use-after-return handling to work right.
+//
+// TODO(someday): Does GCC's sanitizer, flagged by __SANITIZE_ADDRESS__, have these hints too? I
+// don't know and am not in a position to test, so I'm assuming not for now.
+#include <sanitizer/common_interface_defs.h>
+#else
+// Nop the hints so that we don't have to put #ifdefs around every use.
+#define __sanitizer_start_switch_fiber(...)
+#define __sanitizer_finish_switch_fiber(...)
+#endif
+
#if _MSC_VER && !__clang__
// MSVC's atomic intrinsics are weird and different, whereas the C++ standard atomics match the GCC
// builtins -- except for requiring the obnoxious std::atomic<T> wrapper. So, on MSVC let's just
@@ -1330,6 +1343,23 @@
jmp_buf fiberJmpBuf;
jmp_buf originalJmpBuf;
+#if KJ_HAS_COMPILER_FEATURE(address_sanitizer)
+ // Stuff that we need to pass to __sanitizer_start_switch_fiber() /
+ // __sanitizer_finish_switch_fiber() when using ASAN.
+
+ void* originalFakeStack = nullptr;
+ void* fiberFakeStack = nullptr;
+ // Pointer to ASAN "fake stack" associated with the fiber and its calling stack. Filled in by
+ // __sanitizer_start_switch_fiber() before switching away, consumed by
+ // __sanitizer_finish_switch_fiber() upon switching back.
+
+ void const* originalBottom;
+ size_t originalSize;
+ // Size and location of the original stack before switching fibers. These are filled in by
+ // __sanitizer_finish_switch_fiber() after the switch, and must be passed to
+ // __sanitizer_start_switch_fiber() when switching back later.
+#endif
+
static Impl* alloc(size_t stackSize, ucontext_t* context) {
#ifndef MAP_ANONYMOUS
#define MAP_ANONYMOUS MAP_ANON
@@ -1423,6 +1453,9 @@
auto& stack = *reinterpret_cast<FiberStack*>(ptr);
+ __sanitizer_finish_switch_fiber(nullptr,
+ &stack.impl->originalBottom, &stack.impl->originalSize);
+
// We first switch to the fiber inside of the FiberStack constructor. This is just for
// initialization purposes, and we're expected to switch back immediately.
stack.switchToMain();
@@ -1478,9 +1511,11 @@
makecontext(&context, reinterpret_cast<void(*)()>(&StartRoutine::run), 2, arg1, arg2);
+ __sanitizer_start_switch_fiber(&impl->originalFakeStack, impl, stackSize - sizeof(Impl));
if (_setjmp(impl->originalJmpBuf) == 0) {
setcontext(&context);
}
+ __sanitizer_finish_switch_fiber(impl->originalFakeStack, nullptr, nullptr);
#endif
#else
#if KJ_NO_EXCEPTIONS
@@ -1577,9 +1612,11 @@
#if _WIN32 || __CYGWIN__
SwitchToFiber(osFiber);
#else
+ __sanitizer_start_switch_fiber(&impl->originalFakeStack, impl, stackSize - sizeof(Impl));
if (_setjmp(impl->originalJmpBuf) == 0) {
_longjmp(impl->fiberJmpBuf, 1);
}
+ __sanitizer_finish_switch_fiber(impl->originalFakeStack, nullptr, nullptr);
#endif
#endif
}
@@ -1590,9 +1627,21 @@
#if _WIN32 || __CYGWIN__
SwitchToFiber(getMainWin32Fiber());
#else
+ // TODO(someady): In theory, the last time we switch away from the fiber, we should pass `nullptr`
+ // for the first argument here, so that ASAN destroys the fake stack. However, as currently
+ // designed, we don't actually know if we're switching away for the last time. It's understood
+ // that when we call switchToMain() in FiberStack::run(), then the main stack is allowed to
+ // destroy the fiber, or reuse it. I don't want to develop a mechanism to switch back to the
+ // fiber on final destruction just to get the hints right, so instead we leak the fake stack.
+ // This doesn't seem to cause any problems -- it's not even detected by ASAN as a memory leak.
+ // But if we wanted to run ASAN builds in production or something, it might be an issue.
+ __sanitizer_start_switch_fiber(&impl->fiberFakeStack,
+ impl->originalBottom, impl->originalSize);
if (_setjmp(impl->fiberJmpBuf) == 0) {
_longjmp(impl->originalJmpBuf, 1);
}
+ __sanitizer_finish_switch_fiber(impl->fiberFakeStack,
+ &impl->originalBottom, &impl->originalSize);
#endif
#endif
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/capnproto-c++-0.10.0/src/kj/compat/gtest.h new/capnproto-c++-0.10.2/src/kj/compat/gtest.h
--- old/capnproto-c++-0.10.0/src/kj/compat/gtest.h 2018-08-26 03:41:52.000000000 +0200
+++ new/capnproto-c++-0.10.2/src/kj/compat/gtest.h 2022-06-29 18:37:00.000000000 +0200
@@ -32,6 +32,8 @@
#include "../test.h"
#include <kj/windows-sanity.h> // work-around macro conflict with `ERROR`
+KJ_BEGIN_HEADER
+
namespace kj {
namespace _ { // private
@@ -118,3 +120,5 @@
#define TEST(x, y) KJ_TEST("legacy test: " #x "/" #y)
} // namespace kj
+
+KJ_END_HEADER
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/capnproto-c++-0.10.0/src/kj/compat/gzip.h new/capnproto-c++-0.10.2/src/kj/compat/gzip.h
--- old/capnproto-c++-0.10.0/src/kj/compat/gzip.h 2021-08-08 19:08:05.000000000 +0200
+++ new/capnproto-c++-0.10.2/src/kj/compat/gzip.h 2022-06-29 18:37:00.000000000 +0200
@@ -25,6 +25,8 @@
#include <kj/async-io.h>
#include <zlib.h>
+KJ_BEGIN_HEADER
+
namespace kj {
namespace _ { // private
@@ -140,3 +142,5 @@
};
} // namespace kj
+
+KJ_END_HEADER
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/capnproto-c++-0.10.0/src/kj/compat/http.h new/capnproto-c++-0.10.2/src/kj/compat/http.h
--- old/capnproto-c++-0.10.0/src/kj/compat/http.h 2022-05-25 14:55:57.000000000 +0200
+++ new/capnproto-c++-0.10.2/src/kj/compat/http.h 2022-06-29 18:37:00.000000000 +0200
@@ -40,6 +40,8 @@
#include <kj/one-of.h>
#include <kj/async-io.h>
+KJ_BEGIN_HEADER
+
namespace kj {
#define KJ_HTTP_FOR_EACH_METHOD(MACRO) \
@@ -1154,3 +1156,5 @@
}
} // namespace kj
+
+KJ_END_HEADER
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/capnproto-c++-0.10.0/src/kj/compat/readiness-io.h new/capnproto-c++-0.10.2/src/kj/compat/readiness-io.h
--- old/capnproto-c++-0.10.0/src/kj/compat/readiness-io.h 2022-05-25 14:55:55.000000000 +0200
+++ new/capnproto-c++-0.10.2/src/kj/compat/readiness-io.h 2022-06-29 18:37:00.000000000 +0200
@@ -23,6 +23,8 @@
#include <kj/async-io.h>
+KJ_BEGIN_HEADER
+
namespace kj {
class ReadyInputStreamWrapper {
@@ -122,3 +124,5 @@
};
} // namespace kj
+
+KJ_END_HEADER
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/capnproto-c++-0.10.0/src/kj/compat/tls.h new/capnproto-c++-0.10.2/src/kj/compat/tls.h
--- old/capnproto-c++-0.10.0/src/kj/compat/tls.h 2022-05-25 14:55:57.000000000 +0200
+++ new/capnproto-c++-0.10.2/src/kj/compat/tls.h 2022-06-29 18:37:00.000000000 +0200
@@ -30,6 +30,8 @@
#include <kj/async-io.h>
+KJ_BEGIN_HEADER
+
namespace kj {
class TlsPrivateKey;
@@ -296,3 +298,5 @@
};
} // namespace kj
+
+KJ_END_HEADER
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/capnproto-c++-0.10.0/src/kj/compat/url.h new/capnproto-c++-0.10.2/src/kj/compat/url.h
--- old/capnproto-c++-0.10.0/src/kj/compat/url.h 2021-03-20 19:47:34.000000000 +0100
+++ new/capnproto-c++-0.10.2/src/kj/compat/url.h 2022-06-29 18:37:00.000000000 +0200
@@ -25,6 +25,8 @@
#include <kj/vector.h>
#include <inttypes.h>
+KJ_BEGIN_HEADER
+
namespace kj {
struct UrlOptions {
@@ -145,3 +147,5 @@
};
} // namespace kj
+
+KJ_END_HEADER
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/capnproto-c++-0.10.0/src/kj/exception-test.c++ new/capnproto-c++-0.10.2/src/kj/exception-test.c++
--- old/capnproto-c++-0.10.0/src/kj/exception-test.c++ 2022-05-25 14:55:57.000000000 +0200
+++ new/capnproto-c++-0.10.2/src/kj/exception-test.c++ 2022-06-29 18:37:00.000000000 +0200
@@ -132,10 +132,16 @@
}
#endif
+#if defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) || \
+ KJ_HAS_COMPILER_FEATURE(address_sanitizer) || \
+ defined(__SANITIZE_ADDRESS__)
+// The implementation skips this check in these cases.
+#else
#if !__MINGW32__ // Inexplicably crashes when exception is thrown from constructor.
TEST(Exception, ExceptionCallbackMustBeOnStack) {
KJ_EXPECT_THROW_MESSAGE("must be allocated on the stack", new ExceptionCallback);
}
+#endif
#endif // !__MINGW32__
#if !KJ_NO_EXCEPTIONS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/capnproto-c++-0.10.0/src/kj/exception.c++ new/capnproto-c++-0.10.2/src/kj/exception.c++
--- old/capnproto-c++-0.10.0/src/kj/exception.c++ 2022-05-25 14:55:57.000000000 +0200
+++ new/capnproto-c++-0.10.2/src/kj/exception.c++ 2022-06-29 18:37:53.000000000 +0200
@@ -971,7 +971,11 @@
ExceptionCallback::ExceptionCallback(): next(getExceptionCallback()) {
char stackVar;
-#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+#if defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) || \
+ KJ_HAS_COMPILER_FEATURE(address_sanitizer) || \
+ defined(__SANITIZE_ADDRESS__)
+ // When using libfuzzer or ASAN, this sanity check may spurriously fail, so skip it.
+#else
ptrdiff_t offset = reinterpret_cast<char*>(this) - &stackVar;
KJ_ASSERT(offset < 65536 && offset > -65536,
"ExceptionCallback must be allocated on the stack.");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/capnproto-c++-0.10.0/src/kj/filesystem.h new/capnproto-c++-0.10.2/src/kj/filesystem.h
--- old/capnproto-c++-0.10.0/src/kj/filesystem.h 2022-05-25 14:55:57.000000000 +0200
+++ new/capnproto-c++-0.10.2/src/kj/filesystem.h 2022-06-29 18:37:00.000000000 +0200
@@ -28,6 +28,8 @@
#include "function.h"
#include "hash.h"
+KJ_BEGIN_HEADER
+
namespace kj {
template <typename T>
@@ -1110,3 +1112,5 @@
}
} // namespace kj
+
+KJ_END_HEADER
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/capnproto-c++-0.10.0/src/kj/source-location.h new/capnproto-c++-0.10.2/src/kj/source-location.h
--- old/capnproto-c++-0.10.0/src/kj/source-location.h 2022-05-25 14:55:57.000000000 +0200
+++ new/capnproto-c++-0.10.2/src/kj/source-location.h 2022-06-29 18:37:00.000000000 +0200
@@ -23,6 +23,8 @@
#include "string.h"
+KJ_BEGIN_HEADER
+
// GCC does not implement __builtin_COLUMN() as that's non-standard but MSVC & clang do.
// MSVC does as of version https://github.com/microsoft/STL/issues/54) but there's currently not any
// pressing need for this for MSVC & writing the write compiler version check is annoying.
@@ -105,3 +107,5 @@
return kj::String();
}
} // namespace kj
+
+KJ_END_HEADER
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/capnproto-c++-0.10.0/src/kj/win32-api-version.h new/capnproto-c++-0.10.2/src/kj/win32-api-version.h
--- old/capnproto-c++-0.10.0/src/kj/win32-api-version.h 1970-01-01 01:00:00.000000000 +0100
+++ new/capnproto-c++-0.10.2/src/kj/win32-api-version.h 2021-03-20 19:47:34.000000000 +0100
@@ -0,0 +1,44 @@
+// Copyright (c) 2013-2017 Sandstorm Development Group, Inc. and contributors
+// Licensed under the MIT License:
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#pragma once
+
+// Request Vista-level APIs.
+#ifndef WINVER
+#define WINVER 0x0600
+#elif WINVER < 0x0600
+#error "WINVER defined but older than Vista"
+#endif
+
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x0600
+#elif _WIN32_WINNT < 0x0600
+#error "_WIN32_WINNT defined but older than Vista"
+#endif
+
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN // ::eyeroll::
+#endif
+
+#define NOSERVICE 1
+#define NOMCX 1
+#define NOIME 1
+#define NOMINMAX 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package cura-lulzbot for openSUSE:Factory checked in at 2022-06-30 13:18:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cura-lulzbot (Old)
and /work/SRC/openSUSE:Factory/.cura-lulzbot.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cura-lulzbot"
Thu Jun 30 13:18:35 2022 rev:16 rq:986001 version:3.6.37
Changes:
--------
--- /work/SRC/openSUSE:Factory/cura-lulzbot/cura-lulzbot.changes 2022-06-28 15:22:08.637921937 +0200
+++ /work/SRC/openSUSE:Factory/.cura-lulzbot.new.1548/cura-lulzbot.changes 2022-06-30 13:18:46.529551970 +0200
@@ -1,0 +2,6 @@
+Thu Jun 30 07:15:59 UTC 2022 - Adrian Schr��ter <adrian(a)suse.de>
+
+- update to version 3.6.37
+ * Printer profile updates
+
+-------------------------------------------------------------------
Old:
----
cura-lulzbot-3.6.23.obscpio
New:
----
cura-lulzbot-3.6.37.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cura-lulzbot.spec ++++++
--- /var/tmp/diff_new_pack.WR6ZVc/_old 2022-06-30 13:18:48.009553080 +0200
+++ /var/tmp/diff_new_pack.WR6ZVc/_new 2022-06-30 13:18:48.013553083 +0200
@@ -20,7 +20,7 @@
%global __requires_exclude qmlimport\\(Cura.*
Name: cura-lulzbot
-Version: 3.6.23
+Version: 3.6.37
Release: 0
Summary: 3D printer control software
License: AGPL-3.0-only
@@ -51,8 +51,8 @@
Requires: cura-engine-lulzbot >= 3.6.21
Requires: uranium-lulzbot >= 3.6.21
# dependency scripts do not find qtquickcontrols automatically
-Requires: libqt5-qtquickcontrols
-Requires: libqt5-qtquickcontrols2
+#Requires: libqt5-qtquickcontrols
+#Requires: libqt5-qtquickcontrols2
Requires: python3-Arcus
Requires: python3-numpy
Requires: python3-opengl
@@ -93,10 +93,6 @@
%make_install
install -m 0644 ../version.json %buildroot/usr/share/cura/
%suse_update_desktop_file cura-lulzbot Graphics 3DGraphics
-sed -i -e 's,^Exec=.*,Exec=cura-lulzbot %F,' \
- -e 's,^#!/usr/bin/env.*,#!/usr/bin/python3,' \
- %{buildroot}%{_datadir}/applications/cura-lulzbot.desktop
-%fdupes %buildroot
%files
%license LICENSE
++++++ _service ++++++
--- /var/tmp/diff_new_pack.WR6ZVc/_old 2022-06-30 13:18:48.045553107 +0200
+++ /var/tmp/diff_new_pack.WR6ZVc/_new 2022-06-30 13:18:48.049553110 +0200
@@ -2,8 +2,8 @@
<service mode="manual" name="obs_scm">
<param name="url">https://gitlab.com/lulzbot3d/cura-le/cura-lulzbot.git</param>
<param name="scm">git</param>
- <param name="revision">3.6.23</param>
- <param name="version">3.6.23</param>
+ <param name="revision">3.6.37</param>
+ <param name="version">3.6.37</param>
<param name="submodules">disable</param>
</service>
<service mode="manual" name="set_version" />
++++++ cura-lulzbot-3.6.23.obscpio -> cura-lulzbot-3.6.37.obscpio ++++++
/work/SRC/openSUSE:Factory/cura-lulzbot/cura-lulzbot-3.6.23.obscpio /work/SRC/openSUSE:Factory/.cura-lulzbot.new.1548/cura-lulzbot-3.6.37.obscpio differ: char 47, line 1
++++++ cura-lulzbot.obsinfo ++++++
--- /var/tmp/diff_new_pack.WR6ZVc/_old 2022-06-30 13:18:48.089553140 +0200
+++ /var/tmp/diff_new_pack.WR6ZVc/_new 2022-06-30 13:18:48.093553143 +0200
@@ -1,5 +1,5 @@
name: cura-lulzbot
-version: 3.6.23
-mtime: 1605104823
-commit: f3dfdd433619d670d8341b3f4d5c29bc6c48d4ce
+version: 3.6.37
+mtime: 1653501686
+commit: 2ae3d2e3d4bf045947d5abbf37bca349055785d7
++++++ fix-build.patch ++++++
--- /var/tmp/diff_new_pack.WR6ZVc/_old 2022-06-30 13:18:48.105553152 +0200
+++ /var/tmp/diff_new_pack.WR6ZVc/_new 2022-06-30 13:18:48.109553155 +0200
@@ -18,18 +18,6 @@
set(CURA_INSTALL_PLUGINS_PATH lib/cura)
else()
set(CURA_INSTALL_PLUGINS_PATH ${CMAKE_INSTALL_LIBDIR}/cura)
-diff --git a/cura_app.py b/cura_app.py
-index 35212be5d..5b587559f 100644
---- a/cura_app.py
-+++ b/cura_app.py
-@@ -42,7 +42,6 @@ import faulthandler
- if Platform.isLinux(): # Needed for platform.linux_distribution, which is not available on Windows and OSX
- # For Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-qt4/+bug/941826
-
-- linux_distro_name = platform.linux_distribution()[0].lower()
- # TODO: Needs a "if X11_GFX == 'nvidia'" here. The workaround is only needed on Ubuntu+NVidia drivers. Other drivers are not affected, but fine with this fix.
- import ctypes
- from ctypes.util import find_library
diff --git a/cura/CuraSplashScreen.py b/cura/CuraSplashScreen.py
index 863c5f443..c668ce294 100644
--- a/cura/CuraSplashScreen.py
@@ -44,4 +32,14 @@
painter.save()
painter.setPen(QColor(0, 0, 0, 255))
+diff --git a/cura_app.py b/cura_app.py
+index e75db4e19..1fb4ffbd0 100644
+--- a/cura_app.py
++++ b/cura_app.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python3
++#!/usr/bin/python3
+
+ # Copyright (c) 2015 Ultimaker B.V.
+ # Cura is released under the terms of the LGPLv3 or higher.
1
0