openSUSE Commits
Threads by month
- ----- 2024 -----
- 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
October 2024
- 1 participants
- 1410 discussions
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package skelcd-control-MicroOS for openSUSE:Factory checked in at 2024-10-17 18:38:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/skelcd-control-MicroOS (Old)
and /work/SRC/openSUSE:Factory/.skelcd-control-MicroOS.new.19354 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "skelcd-control-MicroOS"
Thu Oct 17 18:38:50 2024 rev:36 rq:1208402 version:20241015
Changes:
--------
--- /work/SRC/openSUSE:Factory/skelcd-control-MicroOS/skelcd-control-MicroOS.changes 2024-06-06 12:31:33.618160128 +0200
+++ /work/SRC/openSUSE:Factory/.skelcd-control-MicroOS.new.19354/skelcd-control-MicroOS.changes 2024-10-17 18:39:13.593984094 +0200
@@ -1,0 +2,7 @@
+Tue Oct 15 09:29:52 UTC 2024 - Josef Reidinger <jreidinger(a)suse.com>
+
+- Update dependencies as micro role dialog is moved to
+ yast2-installation (gh#yast/yast-caasp#49)
+- 20241015
+
+-------------------------------------------------------------------
Old:
----
skelcd-control-MicroOS-20240527.tar.bz2
New:
----
skelcd-control-MicroOS-20241015.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ skelcd-control-MicroOS.spec ++++++
--- /var/tmp/diff_new_pack.yQE4LF/_old 2024-10-17 18:39:14.310014123 +0200
+++ /var/tmp/diff_new_pack.yQE4LF/_new 2024-10-17 18:39:14.314014291 +0200
@@ -53,13 +53,12 @@
Requires: autoyast2
Requires: yast2-add-on
Requires: yast2-buildtools
-Requires: yast2-caasp >= 4.2.1
Requires: yast2-devtools
Requires: yast2-fcoe-client
# For creating the AutoYast profile at the end of installation (bnc#887406)
Requires: yast2-firewall
-# instsys_cleanup
-Requires: yast2-installation >= 3.1.217.9
+# microos_role
+Requires: yast2-installation >= 5.0.13
Requires: yast2-iscsi-client
%ifnarch %{arm}
Requires: yast2-kdump
@@ -92,7 +91,7 @@
# we really do not need the YaST packages for building, ignore the dependencies
# to have faster builds and less rebuilds triggered by dependencies
# these are pulled in by the skelcd-control-openSUSE dependencies
-#!BuildIgnore: yast2-caasp yast2-branding-openSUSE yast2-qt-branding-openSUSE
+#!BuildIgnore: yast2-branding-openSUSE yast2-qt-branding-openSUSE
#!BuildIgnore: autoyast2 yast2-add-on yast2-buildtools yast2-devtools
#!BuildIgnore: yast2-fcoe-client yast2-firewall
#!BuildIgnore: yast2-installation yast2-iscsi-client yast2-kdump yast2-multipath
@@ -122,7 +121,7 @@
URL: https://github.com/yast/skelcd-control-MicroOS
AutoReqProv: off
-Version: 20240527
+Version: 20241015
Release: 0
Summary: The MicroOS control file needed for installation
License: MIT
++++++ skelcd-control-MicroOS-20240527.tar.bz2 -> skelcd-control-MicroOS-20241015.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-MicroOS-20240527/.github/workflows/ci.yml new/skelcd-control-MicroOS-20241015/.github/workflows/ci.yml
--- old/skelcd-control-MicroOS-20240527/.github/workflows/ci.yml 2024-06-04 09:39:02.000000000 +0200
+++ new/skelcd-control-MicroOS-20241015/.github/workflows/ci.yml 2024-10-15 16:47:27.000000000 +0200
@@ -36,4 +36,6 @@
run: rake test:validate
- name: Package Build
+ # skip in master, but run in forks
+ if: github.ref_name != 'master' || github.repository_owner != 'yast'
run: yast-ci-ruby -o package
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-MicroOS-20240527/.github/workflows/submit.yml new/skelcd-control-MicroOS-20241015/.github/workflows/submit.yml
--- old/skelcd-control-MicroOS-20240527/.github/workflows/submit.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/skelcd-control-MicroOS-20241015/.github/workflows/submit.yml 2024-10-15 16:47:27.000000000 +0200
@@ -0,0 +1,29 @@
+# See https://docs.github.com/en/actions/reference/workflow-syntax-for-github-act…
+
+name: OBS
+
+on:
+ # only when committing to master
+ push:
+ branches: master
+
+ # allow running manually from GitHub Web
+ workflow_dispatch:
+
+jobs:
+ submit:
+ # do not run in forks
+ if: github.repository_owner == 'yast'
+
+ runs-on: ubuntu-latest
+
+ # the default timeout is 6 hours, do not wait for that long if osc gets stucked
+ timeout-minutes: 30
+
+ steps:
+ - name: Submit the package
+ # see https://github.com/yast/actions/blob/master/submit/action.yml
+ uses: yast/actions/submit@master
+ with:
+ obs_user: ${{ secrets.OBS_USER }}
+ obs_password: ${{ secrets.OBS_PASSWORD }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-MicroOS-20240527/package/skelcd-control-MicroOS.changes new/skelcd-control-MicroOS-20241015/package/skelcd-control-MicroOS.changes
--- old/skelcd-control-MicroOS-20240527/package/skelcd-control-MicroOS.changes 2024-06-04 09:39:02.000000000 +0200
+++ new/skelcd-control-MicroOS-20241015/package/skelcd-control-MicroOS.changes 2024-10-15 16:47:27.000000000 +0200
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Oct 15 09:29:52 UTC 2024 - Josef Reidinger <jreidinger(a)suse.com>
+
+- Update dependencies as micro role dialog is moved to
+ yast2-installation (gh#yast/yast-caasp#49)
+- 20241015
+
+-------------------------------------------------------------------
Mon May 27 17:03:13 UTC 2024 - Richard Brown <rbrown(a)suse.com>
- Remove MicroOS GNOME Desktop/Aeon, now installed via own media
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-MicroOS-20240527/package/skelcd-control-MicroOS.spec new/skelcd-control-MicroOS-20241015/package/skelcd-control-MicroOS.spec
--- old/skelcd-control-MicroOS-20240527/package/skelcd-control-MicroOS.spec 2024-06-04 09:39:02.000000000 +0200
+++ new/skelcd-control-MicroOS-20241015/package/skelcd-control-MicroOS.spec 2024-10-15 16:47:27.000000000 +0200
@@ -53,13 +53,12 @@
Requires: autoyast2
Requires: yast2-add-on
Requires: yast2-buildtools
-Requires: yast2-caasp >= 4.2.1
Requires: yast2-devtools
Requires: yast2-fcoe-client
# For creating the AutoYast profile at the end of installation (bnc#887406)
Requires: yast2-firewall
-# instsys_cleanup
-Requires: yast2-installation >= 3.1.217.9
+# microos_role
+Requires: yast2-installation >= 5.0.13
Requires: yast2-iscsi-client
%ifnarch %{arm}
Requires: yast2-kdump
@@ -92,7 +91,7 @@
# we really do not need the YaST packages for building, ignore the dependencies
# to have faster builds and less rebuilds triggered by dependencies
# these are pulled in by the skelcd-control-openSUSE dependencies
-#!BuildIgnore: yast2-caasp yast2-branding-openSUSE yast2-qt-branding-openSUSE
+#!BuildIgnore: yast2-branding-openSUSE yast2-qt-branding-openSUSE
#!BuildIgnore: autoyast2 yast2-add-on yast2-buildtools yast2-devtools
#!BuildIgnore: yast2-fcoe-client yast2-firewall
#!BuildIgnore: yast2-installation yast2-iscsi-client yast2-kdump yast2-multipath
@@ -122,7 +121,7 @@
Url: https://github.com/yast/skelcd-control-MicroOS
AutoReqProv: off
-Version: 20240527
+Version: 20241015
Release: 0
Summary: The MicroOS control file needed for installation
License: MIT
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package rpmlint for openSUSE:Factory checked in at 2024-10-17 18:38:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rpmlint (Old)
and /work/SRC/openSUSE:Factory/.rpmlint.new.19354 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpmlint"
Thu Oct 17 18:38:46 2024 rev:486 rq:1208449 version:2.6.1+git20241016.ae941eb7
Changes:
--------
--- /work/SRC/openSUSE:Factory/rpmlint/rpmlint.changes 2024-09-22 11:05:21.898978508 +0200
+++ /work/SRC/openSUSE:Factory/.rpmlint.new.19354/rpmlint.changes 2024-10-17 18:39:08.593774397 +0200
@@ -1,0 +2,7 @@
+Wed Oct 16 12:47:08 UTC 2024 - matthias.gerstner(a)suse.com
+
+- Update to version 2.6.1+git20241016.ae941eb7:
+ * dbus-services: adjust gnome-remote-desktop to version 47 (bsc#1230406)
+ * Add new warning about the usage of %suse_update_desktop_file
+
+-------------------------------------------------------------------
Old:
----
rpmlint-2.6.1+git20240918.5cb5647.tar.xz
New:
----
rpmlint-2.6.1+git20241016.ae941eb7.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rpmlint.spec ++++++
--- /var/tmp/diff_new_pack.Yu72zU/_old 2024-10-17 18:39:09.453810465 +0200
+++ /var/tmp/diff_new_pack.Yu72zU/_new 2024-10-17 18:39:09.457810633 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package rpmlint
+# spec file
#
# Copyright (c) 2024 SUSE LLC
#
@@ -23,7 +23,7 @@
%define name_suffix -%{flavor}
%endif
Name: rpmlint%{name_suffix}
-Version: 2.6.1+git20240918.5cb5647
+Version: 2.6.1+git20241016.ae941eb7
Release: 0
Summary: RPM file correctness checker
License: GPL-2.0-or-later
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.Yu72zU/_old 2024-10-17 18:39:09.517813149 +0200
+++ /var/tmp/diff_new_pack.Yu72zU/_new 2024-10-17 18:39:09.521813317 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/rpm-software-management/rpmlint.git</param>
- <param name="changesrevision">5cb56478d963a538fc72efce6d9f9ceede0d632c</param></service></servicedata>
+ <param name="changesrevision">ae941eb7a870b80c2bafb9b01a65c1c8208252e4</param></service></servicedata>
(No newline at EOF)
++++++ rpmlint-2.6.1+git20240918.5cb5647.tar.xz -> rpmlint-2.6.1+git20241016.ae941eb7.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-2.6.1+git20240918.5cb5647/configs/openSUSE/dbus-services.toml new/rpmlint-2.6.1+git20241016.ae941eb7/configs/openSUSE/dbus-services.toml
--- old/rpmlint-2.6.1+git20240918.5cb5647/configs/openSUSE/dbus-services.toml 2024-09-18 14:15:47.000000000 +0200
+++ new/rpmlint-2.6.1+git20241016.ae941eb7/configs/openSUSE/dbus-services.toml 2024-10-16 14:44:33.000000000 +0200
@@ -1370,16 +1370,20 @@
[[FileDigestGroup]]
package = "gnome-remote-desktop"
note = "system wide remote desktop access to the display manager"
-bug = "bsc#1222159"
+bugs = ["bsc#1222159", "bsc#1230406"]
type = "dbus"
[[FileDigestGroup.digests]]
path = "/usr/share/dbus-1/system.d/org.gnome.RemoteDesktop.conf"
digester = "xml"
-hash = "5ed8492b7b77bf77beba04b5eb989a028cc90ac193eb598b102189b8374a9c5d"
+hash = "d28ae537328593ac6462af9ec6bab63c49f9a6851190e7a4f13fe8dd48fd88b6"
[[FileDigestGroup.digests]]
path = "/usr/share/dbus-1/system-services/org.gnome.RemoteDesktop.service"
digester = "shell"
hash = "1053fce12e03e219ff4518c8498b3ce1983597961afcefa93be25005414a50d8"
+[[FileDigestGroup.digests]]
+path = "/usr/share/dbus-1/system-services/org.gnome.RemoteDesktop.Configuration.service"
+digester = "shell"
+hash = "ecc8ae6fe29a9ddc6c1f598c8558245b16d8280cd99caecc3ab268c428e1f8ff"
[[FileDigestGroup]]
package = "kdeplasma6-addons"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-2.6.1+git20240918.5cb5647/rpmlint/checks/SpecCheck.py new/rpmlint-2.6.1+git20241016.ae941eb7/rpmlint/checks/SpecCheck.py
--- old/rpmlint-2.6.1+git20240918.5cb5647/rpmlint/checks/SpecCheck.py 2024-09-18 14:15:47.000000000 +0200
+++ new/rpmlint-2.6.1+git20241016.ae941eb7/rpmlint/checks/SpecCheck.py 2024-10-16 14:44:33.000000000 +0200
@@ -85,6 +85,10 @@
python_module_def_regex = re.compile(r'^[^#]*%{\?!python_module:%define python_module()')
python_sitelib_glob_regex = re.compile(r'^[^#]*%{python_site(lib|arch)}/\*\s*$')
+# %suse_update_desktop_file deprecation
+# https://lists.opensuse.org/archives/list/packaging@lists.opensuse.org/messa…
+suse_update_desktop_file_regex = re.compile(r'^BuildRequires:\s*update-desktop-files', re.IGNORECASE)
+
UNICODE_NBSP = '\xa0'
@@ -698,6 +702,7 @@
self._checkline_package_conflicts(line)
self._checkline_forbidden_controlchars(line)
+ self._check_suse_update_desktop_file(line)
def _checkline_changelog(self, line):
if self.current_section == 'changelog':
@@ -802,3 +807,13 @@
# https://github.com/rpm-software-management/rpmlint/issues/1067
if Pkg.has_forbidden_controlchars(line):
self.output.add_info('W', self.pkg, 'forbidden-controlchar-found')
+
+ def _check_suse_update_desktop_file(self, line):
+ """
+ Test if update-desktop-files is in BuildRequires. The usage of
+ %suse_update_desktop_file is deprecated now.
+ """
+ if suse_update_desktop_file_regex.match(line):
+ self.output.add_info('W', self.pkg,
+ 'suse-update-desktop-file-deprecated',
+ '%suse_update_desktop_file is deprecated')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-2.6.1+git20240918.5cb5647/rpmlint/descriptions/SpecCheck.toml new/rpmlint-2.6.1+git20241016.ae941eb7/rpmlint/descriptions/SpecCheck.toml
--- old/rpmlint-2.6.1+git20240918.5cb5647/rpmlint/descriptions/SpecCheck.toml 2024-09-18 14:15:47.000000000 +0200
+++ new/rpmlint-2.6.1+git20241016.ae941eb7/rpmlint/descriptions/SpecCheck.toml 2024-10-16 14:44:33.000000000 +0200
@@ -225,3 +225,6 @@
The specfile contains a comparison of %suse_version against a suse release
that does not exist. Please double check.
"""
+suse-update-desktop-file-deprecated="""
+The usage of %suse_update_desktop_file is deprecated and should not be used.
+"""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-2.6.1+git20240918.5cb5647/test/spec/gimp.spec new/rpmlint-2.6.1+git20241016.ae941eb7/test/spec/gimp.spec
--- old/rpmlint-2.6.1+git20240918.5cb5647/test/spec/gimp.spec 1970-01-01 01:00:00.000000000 +0100
+++ new/rpmlint-2.6.1+git20241016.ae941eb7/test/spec/gimp.spec 2024-10-16 14:44:33.000000000 +0200
@@ -0,0 +1,374 @@
+#
+# spec file for package gimp
+#
+# Copyright (c) 2021 SUSE LLC
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
+
+%global abiver 4
+%global apiver 2.0
+%global gegl_version 0.4.38
+
+%if 0%{?suse_version} >= 1550
+%bcond_without libheif
+%else
+%bcond_with libheif
+%endif
+
+%if 0%{?sle_version}
+%bcond_with python_plugin
+%else
+%bcond_without python_plugin
+%endif
+Name: gimp
+Version: 2.10.38
+Release: 0
+Summary: The GNU Image Manipulation Program
+License: GPL-3.0-or-later
+Group: Productivity/Graphics/Bitmap Editors
+URL: https://www.gimp.org/
+Source: https://download.gimp.org/pub/gimp/v2.10/%{name}-%{version}.tar.bz2
+Source1: macros.gimp
+# openSUSE palette file
+Source2: openSUSE.gpl
+# PATCH-FIX-UPSTREAM fix-gcc14-build.patch bsc#1223892
+Patch0: fix-gcc14-build.patch
+
+BuildRequires: aalib-devel
+BuildRequires: alsa-devel >= 1.0.0
+BuildRequires: fdupes
+BuildRequires: fontconfig-devel >= 2.12.4
+BuildRequires: gcc-c++
+BuildRequires: gdk-pixbuf-loader-rsvg
+# For some odd reason build needs gegl executable.
+BuildRequires: gegl >= %{gegl_version}
+BuildRequires: ghostscript-devel
+# Explicitly needed, otherwise ghostscript-mini is used during the
+# build, and it's not enough for gimp.
+BuildRequires: ghostscript-library
+BuildRequires: glib-networking
+BuildRequires: intltool >= 0.40.1
+BuildRequires: libtiff-devel
+BuildRequires: libwmf-devel >= 0.2.8
+BuildRequires: libxslt-tools
+BuildRequires: libjxl-devel >= 0.7.0
+BuildRequires: pkgconfig
+%if %{with python_plugin}
+BuildRequires: python-gtk-devel >= 2.10.4
+%endif
+BuildRequires: update-desktop-files
+BuildRequires: pkgconfig(atk) >= 2.2.0
+BuildRequires: (pkgconfig(babl) or pkgconfig(babl-0.1))
+BuildRequires: pkgconfig(bzip2)
+BuildRequires: pkgconfig(cairo) >= 1.12.2
+BuildRequires: pkgconfig(cairo-pdf) >= 1.12.2
+BuildRequires: pkgconfig(dbus-glib-1) >= 0.70
+BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.30.8
+BuildRequires: pkgconfig(gegl-0.4) >= %{gegl_version}
+BuildRequires: pkgconfig(gexiv2) >= 0.10.6
+BuildRequires: pkgconfig(glib-2.0) >= 2.56.2
+BuildRequires: pkgconfig(gtk+-2.0) >= 2.24.32
+BuildRequires: pkgconfig(gudev-1.0) >= 167
+BuildRequires: pkgconfig(harfbuzz) >= 0.9.19
+BuildRequires: pkgconfig(iso-codes)
+BuildRequires: pkgconfig(json-glib-1.0) >= 1.2.6
+BuildRequires: pkgconfig(lcms2) >= 2.8
+BuildRequires: pkgconfig(libexif) >= 0.6.15
+%if %{with libheif}
+BuildRequires: pkgconfig(libheif) >= 1.3.2
+%endif
+BuildRequires: pkgconfig(libjpeg)
+BuildRequires: pkgconfig(liblzma) >= 5.0.0
+BuildRequires: pkgconfig(libmng)
+BuildRequires: pkgconfig(libmypaint) >= 1.3.0
+BuildRequires: pkgconfig(libopenjp2) >= 2.1.0
+BuildRequires: pkgconfig(libpng) >= 1.6.25
+BuildRequires: pkgconfig(librsvg-2.0) >= 2.40.6
+BuildRequires: pkgconfig(libunwind)
+BuildRequires: pkgconfig(libwebp) >= 0.6.0
+BuildRequires: pkgconfig(xmu)
+BuildRequires: pkgconfig(mypaint-brushes-1.0)
+BuildRequires: pkgconfig(OpenEXR) >= 1.6.1
+BuildRequires: pkgconfig(pango) >= 1.29.4
+BuildRequires: pkgconfig(poppler-data) >= 0.4.7
+BuildRequires: pkgconfig(poppler-glib) >= 0.44.0
+BuildRequires: pkgconfig(libtiff-4)
+BuildRequires: pkgconfig(xcursor)
+BuildRequires: pkgconfig(xfixes)
+BuildRequires: pkgconfig(xpm)
+BuildRequires: pkgconfig(zlib)
+BuildRequires: xdg-utils
+# obs does not automaticaly add this
+Requires: libglib-2_0-0 >= 2.54.2
+Requires: libgexiv2-2 >= 0.10.6
+Requires: libbabl-0_1-0 >= 0.1.78
+# Explicitly declare the libgimp versions for upgrade purposes
+Requires: libgimp-2_0-0 = %{version}
+Requires: libgimpui-2_0-0 = %{version}
+Requires: xdg-utils
+Recommends: iso-codes
+Suggests: AdobeICCProfiles
+Suggests: gimp-2.0-scanner-plugin
+Obsoletes: %{name}-help-browser
+Provides: gimp-2.0 = %{version}
+Provides: gimp(abi) = %{abiver}
+Provides: gimp(api) = %{apiver}
+
+%description
+The GIMP is an image composition and editing program, which can be
+used for creating logos and other graphics for Web pages. The GIMP
+offers many tools and filters, and provides a large image
+manipulation toolbox, including channel operations and layers,
+effects, subpixel imaging and antialiasing, and conversions, together
+with multilevel undo. The GIMP offers a scripting facility, but many
+of the included scripts rely on fonts that we cannot distribute.
+
+%package -n libgimp-2_0-0
+Summary: The GNU Image Manipulation Program - Libraries
+Group: System/Libraries
+%requires_ge libbabl-0_1-0
+%requires_ge libgegl-0_4-0
+
+%description -n libgimp-2_0-0
+The GIMP is an image composition and editing program. GIMP offers
+many tools and filters, and provides a large image manipulation
+toolbox and scripting.
+
+This package provides GIMP libraries.
+
+%package -n libgimpui-2_0-0
+Summary: The GNU Image Manipulation Program - UI Libraries
+Group: System/Libraries
+
+%description -n libgimpui-2_0-0
+The GIMP is an image composition and editing program. GIMP offers
+many tools and filters, and provides a large image manipulation
+toolbox and scripting.
+
+This package provides GIMP UI libraries.
+
+%if %{with python_plugin}
+%package plugins-python
+Summary: The GNU Image Manipulation Program - python-gtk based plugins
+Group: Productivity/Graphics/Bitmap Editors
+Requires: %{name} = %{version}
+Requires: python-gtk
+Recommends: python-xml
+Provides: gimp-2.0-plugins-python = %{version}
+Obsoletes: gimp-unstable-plugins-python < 2.6.0
+# For update from <= 10.3 and SLED 10:
+Provides: %{name}:%{_libdir}/gimp/2.0/plug-ins/pyconsole.py = %{version}
+
+%description plugins-python
+The GIMP is an image composition and editing program. GIMP offers
+many tools and filters, and provides a large image manipulation
+toolbox and scripting.
+%endif
+
+%package plugin-aa
+Summary: The GNU Image Manipulation Program -- ASCII-Art output plugin
+Group: Productivity/Graphics/Bitmap Editors
+Requires: %{name} = %{version}
+# Let's trigger automatic installation if the user already has libaa installed.
+Supplements: packageand(%{name}:libaa1)
+
+%description plugin-aa
+The GIMP is an image composition and editing program. GIMP offers
+many tools and filters, and provides a large image manipulation
+toolbox and scripting.
+
+%package devel
+Summary: The GNU Image Manipulation Program
+Group: Development/Libraries/Other
+Requires: libgimp-2_0-0 = %{version}
+Requires: libgimpui-2_0-0 = %{version}
+Provides: gimp-2.0-devel = %{version}
+Provides: gimp-doc = 2.6.4
+Obsoletes: gimp-doc < 2.6.4
+Obsoletes: gimp-unstable-devel < 2.6.0
+
+%description devel
+The GIMP is an image composition and editing program. GIMP offers
+many tools and filters, and provides a large image manipulation
+toolbox and scripting.
+
+This subpackage contains libraries and header files for developing
+applications that want to make use of the GIMP libraries.
+
+%lang_package
+
+%prep
+%autosetup -p1
+
+export LC_ALL=en_US.UTF-8
+export LANG=en_US.UTF-8
+# Safety check for ABI version change.
+vabi=`printf "%d" $(sed -n '/#define GIMP_MODULE_ABI_VERSION/{s/.* //;p}' libgimpmodule/gimpmodule.h)`
+if test "x${vabi}" != "x%{abiver}"; then
+ : Error: Upstream ABI version is now ${vabi}, expecting %{abiver}.
+ : Update the apiver macro and rebuild.
+ exit 1
+fi
+# Safety check for API version change.
+vapi=`sed -n '/#define GIMP_API_VERSION/{s/.* //;p}' libgimpbase/gimpversion.h | sed -e 's@"@@g'`
+if test "x${vapi}" != "x%{apiver}"; then
+ : Error: Upstream API version is now ${vapi}, expecting %{apiver}.
+ : Update the apiver macro and rebuild.
+ exit 1
+fi
+
+%build
+export LC_ALL=en_US.UTF-8
+export LANG=en_US.UTF-8
+export CFLAGS="%{optflags} -fno-strict-aliasing"
+%configure \
+ --disable-silent-rules \
+ --disable-static\
+ --without-webkit\
+ --with-lcms=lcms2\
+ %{!?with_python_plugin:--disable-python} \
+ --libexecdir=%{_libexecdir}\
+ --enable-default-binary\
+ --disable-check-update\
+ --enable-mp
+
+%make_build
+
+%install
+%make_install
+install -D -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/gimp/2.0/palettes
+%suse_update_desktop_file -N GIMP gimp
+rm %{buildroot}%{_libdir}/gimp/2.0/*/*.*a
+%find_lang gimp20 %{?no_lang_C}
+%find_lang gimp20-libgimp %{?no_lang_C} gimp20.lang
+%find_lang gimp20-python %{?no_lang_C} gimp20.lang
+%find_lang gimp20-script-fu %{?no_lang_C} gimp20.lang
+%find_lang gimp20-std-plug-ins %{?no_lang_C} gimp20.lang
+echo "%%defattr(-,root,root)" >plugins.list
+echo "%%defattr(-,root,root)" >plugins-python.list
+for PLUGIN in %{buildroot}%{_libdir}/gimp/2.0/plug-ins/* ; do
+ if grep -qr '^#!.*python' $PLUGIN ; then
+ echo "${PLUGIN#%{buildroot}}" >>plugins-python.list
+ else
+ echo "${PLUGIN#%{buildroot}}" >>plugins.list
+ fi
+done
+find %{buildroot} -type f -name "*.la" -delete -print
+# Install the macros file:
+install -d %{buildroot}%{_rpmmacrodir}
+sed -e "s/@GIMP_APIVER@/%{apiver}/;s/@GIMP_ABIVER@/%{abiver}/" \
+ < $RPM_SOURCE_DIR/macros.gimp > macros.gimp
+install -m 644 -c macros.gimp \
+ %{buildroot}%{_rpmmacrodir}/macros.gimp
+%fdupes %{buildroot}%{_datadir}/gtk-doc/
+%fdupes %{buildroot}%{_libdir}/gimp/2.0/python/
+%fdupes %{buildroot}%{_datadir}/gimp/2.0/
+
+%post -n libgimp-2_0-0 -p /sbin/ldconfig
+%postun -n libgimp-2_0-0 -p /sbin/ldconfig
+%post -n libgimpui-2_0-0 -p /sbin/ldconfig
+%postun -n libgimpui-2_0-0 -p /sbin/ldconfig
+
+%files -f plugins.list
+%license COPYING LICENSE
+%doc AUTHORS ChangeLog NEWS* README
+%{_bindir}/gimp
+%{_bindir}/gimp-2.*
+%{_bindir}/gimp-console
+%{_bindir}/gimp-console-2.*
+# should this maybe be in _libexecdir too?
+%{_bindir}/gimp-test-clipboard-2.0
+%{_libexecdir}/gimp-debug-tool-2.0
+%dir %{_datadir}/metainfo
+%{_datadir}/metainfo/gimp-data-extras.metainfo.xml
+%{_datadir}/metainfo/org.gimp.GIMP.appdata.xml
+%{_datadir}/applications/gimp.desktop
+%{_datadir}/icons/hicolor/*/apps/*.png
+%{_datadir}/gimp/
+%{_datadir}/gimp/2.0/images/gimp-splash.png
+%{_libdir}/gimp/2.0/environ/default.env
+%{_libdir}/gimp/2.0/interpreters/default.interp
+# Explicitly list modules so we don't lose one by accident
+%{_libdir}/gimp/2.0/modules/libcolor-selector-cmyk.so
+%{_libdir}/gimp/2.0/modules/libcolor-selector-water.so
+%{_libdir}/gimp/2.0/modules/libcolor-selector-wheel.so
+%{_libdir}/gimp/2.0/modules/libcontroller-linux-input.so
+%{_libdir}/gimp/2.0/modules/libcontroller-midi.so
+%{_libdir}/gimp/2.0/modules/libdisplay-filter-color-blind.so
+%{_libdir}/gimp/2.0/modules/libdisplay-filter-gamma.so
+%{_libdir}/gimp/2.0/modules/libdisplay-filter-high-contrast.so
+%{_libdir}/gimp/2.0/modules/libdisplay-filter-clip-warning.so
+%{_mandir}/man?/gimp.*
+%{_mandir}/man?/gimp-2.*
+%{_mandir}/man?/gimp-console.*
+%{_mandir}/man?/gimp-console-2.*
+%{_mandir}/man?/gimprc.*
+%{_mandir}/man?/gimprc-2.*
+%{_mandir}/man?/gimptool-2.*
+%dir %{_sysconfdir}/gimp
+%dir %{_sysconfdir}/gimp/2.0
+%config %{_sysconfdir}/gimp/2.0/*rc
+# split file-aa into own package (bnc#851509
+%exclude %{_libdir}/gimp/2.0/plug-ins/file-aa
+
+%files plugin-aa
+%{_libdir}/gimp/2.0/plug-ins/file-aa
+
+%files -n libgimp-2_0-0
+%dir %{_datadir}/gimp
+%dir %{_datadir}/gimp/2.0
+%dir %{_libdir}/gimp
+%dir %{_libdir}/gimp/2.0
+%dir %{_libdir}/gimp/2.0/environ
+%dir %{_libdir}/gimp/2.0/interpreters
+%dir %{_libdir}/gimp/2.0/modules
+%dir %{_libdir}/gimp/2.0/plug-ins
+%{_libdir}/libgimp-2.0.so.*
+%{_libdir}/libgimpbase-2.0.so.*
+%{_libdir}/libgimpcolor-2.0.so.*
+%{_libdir}/libgimpconfig-2.0.so.*
+%{_libdir}/libgimpmath-2.0.so.*
+%{_libdir}/libgimpmodule-2.0.so.*
+
+%files -n libgimpui-2_0-0
+%{_libdir}/libgimpthumb-2.0.so.*
+%{_libdir}/libgimpui-2.0.so.*
+%{_libdir}/libgimpwidgets-2.0.so.*
+
+%if %{with python_plugin}
+%files plugins-python -f plugins-python.list
+%{_libdir}/gimp/2.0/environ/pygimp.env
+%{_libdir}/gimp/2.0/interpreters/pygimp.interp
+%{_libdir}/gimp/2.0/python/
+# FIXME: Maybe split gimp-lang and gimp-plugins-python-lang
+%endif
+
+%files lang -f gimp20.lang
+
+%files devel
+%doc README.i18n
+%{_bindir}/gimptool-2.0
+#{_mandir}/man?/gimptool-2.0%%{?ext_man}
+%{_includedir}/gimp-2.0/
+%{_libdir}/*.so
+%{_datadir}/aclocal/gimp-2.0.m4
+%{_libdir}/pkgconfig/gimp-2.0.pc
+%{_libdir}/pkgconfig/gimpthumb-2.0.pc
+%{_libdir}/pkgconfig/gimpui-2.0.pc
+# Own these repositories to not depend on gtk-doc while building:
+%dir %{_datadir}/gtk-doc
+%{_datadir}/gtk-doc/html/
+%{_rpmmacrodir}/macros.gimp
+
+%changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-2.6.1+git20240918.5cb5647/test/spec/libcanberra.spec new/rpmlint-2.6.1+git20241016.ae941eb7/test/spec/libcanberra.spec
--- old/rpmlint-2.6.1+git20240918.5cb5647/test/spec/libcanberra.spec 1970-01-01 01:00:00.000000000 +0100
+++ new/rpmlint-2.6.1+git20241016.ae941eb7/test/spec/libcanberra.spec 2024-10-16 14:44:33.000000000 +0200
@@ -0,0 +1,311 @@
+#
+# spec file for package libcanberra
+#
+# Copyright (c) 2024 SUSE LLC
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
+
+%define debug_package_requires libcanberra0 = %{version}-%{release}
+Name: libcanberra
+Version: 0.30
+Release: 0
+Summary: Portable sound event library
+License: LGPL-2.0-or-later
+Group: Development/Libraries/GNOME
+URL: http://0pointer.de/lennart/projects/libcanberra
+Source: http://0pointer.de/lennart/projects/libcanberra/%{name}-%{version}.tar.xz
+Source1: libcanberra-gtk-module.sh
+Source99: baselibs.conf
+# PATCH-FIX-UPSTREAM libcanberra-multi-backend.patch boo#753243 fdo#51662 dimstar(a)opensuse.org -- Set the multi backend as default and allow it actually to work.
+Patch0: libcanberra-multi-backend.patch
+# PATCH-FIX-UPSTREAM libcanberra-broadway-fix.patch boo#789066 michael.meeks(a)suse.com
+Patch1: libcanberra-broadway-fix.patch
+BuildRequires: gtk-doc
+BuildRequires: libltdl-devel
+BuildRequires: pkgconfig
+BuildRequires: update-desktop-files
+BuildRequires: pkgconfig(alsa)
+BuildRequires: pkgconfig(glib-2.0) >= 2.32
+BuildRequires: pkgconfig(gtk+-2.0)
+BuildRequires: pkgconfig(gtk+-3.0)
+BuildRequires: pkgconfig(libpulse) >= 0.9.11
+BuildRequires: pkgconfig(libudev) >= 160
+BuildRequires: pkgconfig(vorbisfile)
+BuildRequires: pkgconfig(x11)
+
+%description
+libcanberra is an implementation of the XDG Sound Theme and Name
+Specifications, for generating event sounds on free desktops, such
+as GNOME. It comes with several backends (ALSA, PulseAudio, null)
+and is designed to be portable.
+
+%package -n libcanberra0
+Summary: Portable sound event library
+Group: System/Libraries
+Requires: libpulse0 >= 0.9.11
+
+%description -n libcanberra0
+libcanberra is an implementation of the XDG Sound Theme and Name
+Specifications, for generating event sounds on free desktops, such
+as GNOME. It comes with several backends (ALSA, PulseAudio, null)
+and is designed to be portable.
+
+This package contains the main library.
+
+%package gtk0
+Summary: Portable sound event library -- GTK+ 2 Library
+Group: System/Libraries
+
+%description gtk0
+libcanberra is an implementation of the XDG Sound Theme and Name
+Specifications, for generating event sounds on free desktops, such
+as GNOME. It comes with several backends (ALSA, PulseAudio, null)
+and is designed to be portable.
+
+This package contains a library to make it easier to use
+libcanberra from GTK+ 2 applications.
+
+%package gtk3-0
+Summary: Portable sound event library -- GTK+ 3 Library
+Group: System/Libraries
+
+%description gtk3-0
+libcanberra is an implementation of the XDG Sound Theme and Name
+Specifications, for generating event sounds on free desktops, such
+as GNOME. It comes with several backends (ALSA, PulseAudio, null)
+and is designed to be portable.
+
+This package contains a library to make it easier to use
+libcanberra from GTK+ 3 applications.
+
+%package gtk-module-common
+Summary: Portable sound event library -- Common Files for GTK+ Modules
+Group: System/Libraries
+
+%description gtk-module-common
+libcanberra is an implementation of the XDG Sound Theme and Name
+Specifications, for generating event sounds on free desktops, such
+as GNOME. It comes with several backends (ALSA, PulseAudio, null)
+and is designed to be portable.
+
+This package contains files common to both the GTK+ 2 and GTK+ 3
+modules.
+
+%package gtk2-module
+Summary: Portable sound event library -- GTK+ 2 Module
+Group: System/Libraries
+Requires: %{name}-gtk-module-common = %{version}
+Supplements: (libcanberra0 and gtk2)
+
+%description gtk2-module
+libcanberra is an implementation of the XDG Sound Theme and Name
+Specifications, for generating event sounds on free desktops, such
+as GNOME. It comes with several backends (ALSA, PulseAudio, null)
+and is designed to be portable.
+
+This package contains a GTK+ 2 module that triggers input feedback
+event sounds.
+
+%package gtk3-module
+Summary: Portable sound event library -- GTK+ 3 Module
+Group: System/Libraries
+Requires: %{name}-gtk-module-common = %{version}
+Supplements: (libcanberra0 and gtk3)
+
+%description gtk3-module
+libcanberra is an implementation of the XDG Sound Theme and Name
+Specifications, for generating event sounds on free desktops, such
+as GNOME. It comes with several backends (ALSA, PulseAudio, null)
+and is designed to be portable.
+
+This package contains a GTK+ 3 module that triggers input feedback
+event sounds.
+
+%package -n canberra-gtk-play
+Summary: Utilities from libcanberra
+Group: System/GUI/GNOME
+Provides: %{name}-gtk = %{version}
+Obsoletes: %{name}-gtk < %{version}
+
+%description -n canberra-gtk-play
+libcanberra is an implementation of the XDG Sound Theme and Name
+Specifications, for generating event sounds on free desktops, such
+as GNOME. It comes with several backends (ALSA, PulseAudio, null)
+and is designed to be portable.
+
+This package provides the canberra-gtk-play utility.
+
+%package -n canberra-gtk-play-gnome
+Summary: .desktop links for the canberra-gtk-play utility
+# Disable supplements as we do not want it installed by default.
+# This package contains a ready sound for gdm
+#Supplements: gdm
+# This package contains login/logout sound for GNOME.
+#Supplements: gnome-session
+Group: System/GUI/GNOME
+Provides: %{name}-gtk-gnome = %{version}
+Obsoletes: %{name}-gtk-gnome < %{version}
+
+%description -n canberra-gtk-play-gnome
+libcanberra is an implementation of the XDG Sound Theme and Name
+Specifications, for generating event sounds on free desktops, such
+as GNOME. It comes with several backends (ALSA, PulseAudio, null)
+and is designed to be portable.
+
+This package provides the canberra-gtk-play .desktop files for the
+gnome-desktop and gdm.
+Currently there are no desktop-login, desktop-logout or
+session-ready sounds in the freedesktop sound theme, so installing
+this will require a different sound-theme for it to be operational.
+
+%package devel
+Summary: Development files for libcanberra, a portable sound event library
+Group: Development/Libraries/C and C++
+Requires: libcanberra0 = %{version}
+
+%description devel
+libcanberra is an implementation of the XDG Sound Theme and Name
+Specifications, for generating event sounds on free desktops, such
+as GNOME. It comes with several backends (ALSA, PulseAudio, null)
+and is designed to be portable.
+
+This package provides the development files for libcanberra.
+
+%package -n libcanberra-gtk3-devel
+Summary: GTK+ 3 development files for libcanberra
+Group: Development/Libraries/C and C++
+Requires: libcanberra-devel
+Requires: libcanberra-gtk3-0 = %{version}
+Requires: libcanberra0 = %{version}
+
+%description -n libcanberra-gtk3-devel
+libcanberra is an implementation of the XDG Sound Theme and Name
+Specifications, for generating event sounds on free desktops, such
+as GNOME. It comes with several backends (ALSA, PulseAudio, null)
+and is designed to be portable.
+
+This package provides the development files for libcanberra-gtk3.
+
+%package -n libcanberra-gtk-devel
+Summary: GTK+ 2 development files for libcanberra
+Group: Development/Libraries/C and C++
+Requires: libcanberra-devel
+Requires: libcanberra-gtk0 = %{version}
+Requires: libcanberra0 = %{version}
+
+%description -n libcanberra-gtk-devel
+libcanberra is an implementation of the XDG Sound Theme and Name
+Specifications, for generating event sounds on free desktops, such
+as GNOME. It comes with several backends (ALSA, PulseAudio, null)
+and is designed to be portable.
+
+This package provides the development files for libcanberra-gtk2.
+
+%prep
+%autosetup -p1
+cp %{SOURCE1} libcanberra-gtk-module.sh
+
+%build
+%configure \
+ --disable-static \
+ --enable-pulse \
+ --enable-alsa \
+ --enable-null \
+ --disable-oss \
+ --enable-udev \
+ --with-builtin=dso
+make %{?_smp_mflags} V=1
+
+%install
+%make_install
+install -Dpm 0755 libcanberra-gtk-module.sh \
+ %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/libcanberra-gtk-module.sh
+rm %{buildroot}%{_datadir}/doc/libcanberra/README
+
+%suse_update_desktop_file %{buildroot}%{_datadir}/gnome/autostart/libcanberra-login-sound.desktop
+%suse_update_desktop_file %{buildroot}%{_datadir}/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop
+
+find %{buildroot} -type f -name "*.la" -delete -print
+
+%post -n libcanberra0 -p /sbin/ldconfig
+%postun -n libcanberra0 -p /sbin/ldconfig
+%post gtk0 -p /sbin/ldconfig
+%postun gtk0 -p /sbin/ldconfig
+%post gtk3-0 -p /sbin/ldconfig
+%postun gtk3-0 -p /sbin/ldconfig
+
+%files -n libcanberra0
+%doc README
+%license LGPL
+%{_libdir}/libcanberra.so.*
+%dir %{_libdir}/libcanberra-%{version}/
+%{_libdir}/libcanberra-%{version}/libcanberra-alsa.so
+%{_libdir}/libcanberra-%{version}/libcanberra-multi.so
+%{_libdir}/libcanberra-%{version}/libcanberra-null.so
+%{_libdir}/libcanberra-%{version}/libcanberra-pulse.so
+
+%files gtk0
+%{_libdir}/libcanberra-gtk.so.*
+
+%files gtk3-0
+%{_libdir}/libcanberra-gtk3.so.*
+
+%files gtk-module-common
+%{_bindir}/canberra-boot
+%dir %{_sysconfdir}/X11/xinit/
+%dir %{_sysconfdir}/X11/xinit/xinitrc.d/
+%{_sysconfdir}/X11/xinit/xinitrc.d/libcanberra-gtk-module.sh
+%dir %{_libdir}/gnome-settings-daemon-3.0/
+%dir %{_libdir}/gnome-settings-daemon-3.0/gtk-modules/
+%{_libdir}/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk-module.desktop
+
+%files gtk2-module
+%{_libdir}/gtk-2.0/modules/libcanberra-gtk-module.so
+
+%files gtk3-module
+%{_libdir}/gtk-3.0/modules/libcanberra-gtk*-module.so
+
+%files -n canberra-gtk-play
+%{_bindir}/canberra-gtk-play
+
+%files -n canberra-gtk-play-gnome
+%dir %{_datadir}/gnome/
+%dir %{_datadir}/gnome/autostart/
+%{_datadir}/gnome/autostart/libcanberra-login-sound.desktop
+%dir %{_datadir}/gnome/shutdown/
+%{_datadir}/gnome/shutdown/libcanberra-logout-sound.sh
+%dir %{_datadir}/gdm/
+%dir %{_datadir}/gdm/autostart/
+%dir %{_datadir}/gdm/autostart/LoginWindow/
+%{_datadir}/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop
+
+%files -n libcanberra-gtk-devel
+%{_libdir}/libcanberra-gtk.so
+%{_libdir}/pkgconfig/libcanberra-gtk.pc
+
+%files -n libcanberra-gtk3-devel
+%{_libdir}/libcanberra-gtk3.so
+%{_libdir}/pkgconfig/libcanberra-gtk3.pc
+
+%files devel
+%doc %{_datadir}/gtk-doc/html/libcanberra/
+%{_includedir}/canberra.h
+%{_includedir}/canberra-gtk.h
+%{_libdir}/libcanberra.so
+%{_libdir}/pkgconfig/libcanberra.pc
+%dir %{_datadir}/vala/
+%dir %{_datadir}/vala/vapi/
+%{_datadir}/vala/vapi/*.vapi
+
+%changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-2.6.1+git20240918.5cb5647/test/test_speccheck.py new/rpmlint-2.6.1+git20241016.ae941eb7/test/test_speccheck.py
--- old/rpmlint-2.6.1+git20240918.5cb5647/test/test_speccheck.py 2024-09-18 14:15:47.000000000 +0200
+++ new/rpmlint-2.6.1+git20241016.ae941eb7/test/test_speccheck.py 2024-10-16 14:44:33.000000000 +0200
@@ -1234,3 +1234,16 @@
out = output.print_results(output.results)
assert 'W: macro-in-comment %configure' in out
assert 'W: macro-in-comment %{name}' not in out
+
+
+(a)pytest.mark.parametrize('spec,expected', [
+ ('spec/gimp', True),
+ ('spec/libcanberra', True),
+ ('spec/MacroInComment', False),
+ ('spec/ghc', False),
+])
+def test_deprecated_suse_update_desktop_files(spec, expected, output, test):
+ package = get_tested_spec_package(spec)
+ test.check_spec(package)
+ out = output.print_results(output.results)
+ assert ('W: suse-update-desktop-file-deprecated' in out) == expected
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kiwi-templates-Minimal for openSUSE:Factory checked in at 2024-10-17 18:38:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiwi-templates-Minimal (Old)
and /work/SRC/openSUSE:Factory/.kiwi-templates-Minimal.new.19354 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi-templates-Minimal"
Thu Oct 17 18:38:39 2024 rev:23 rq:1206527 version:84.87.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/kiwi-templates-Minimal/kiwi-templates-Minimal.changes 2024-10-06 17:51:47.148640723 +0200
+++ /work/SRC/openSUSE:Factory/.kiwi-templates-Minimal.new.19354/kiwi-templates-Minimal.changes 2024-10-17 18:38:59.577396271 +0200
@@ -1,0 +2,6 @@
+Wed Oct 9 09:12:20 UTC 2024 - Stefan Schubert <schubi(a)suse.com>
+
+- Added package systemd-repart-dracut to kvm-and-xen-sdboot and
+ kvm-and-xen-grub-bls
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ Minimal.kiwi ++++++
--- /var/tmp/diff_new_pack.Plou3u/_old 2024-10-17 18:39:01.001455992 +0200
+++ /var/tmp/diff_new_pack.Plou3u/_new 2024-10-17 18:39:01.017456662 +0200
@@ -408,6 +408,7 @@
<package name="uefi_mbr" arch="x86_64"/>
<package name="systemd-experimental"/> <!-- XXX: pulls in python but needed for tpm files -->
<package name="disk-encryption-tool"/>
+ <package name="systemd-repart-dracut"/>
<package name="dracut-pcr-signature"/>
</packages>
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-PyQt6 for openSUSE:Factory checked in at 2024-10-17 18:38:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-PyQt6 (Old)
and /work/SRC/openSUSE:Factory/.python-PyQt6.new.19354 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-PyQt6"
Thu Oct 17 18:38:29 2024 rev:24 rq:1208477 version:6.8.0~dev2410061818
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-PyQt6/python-PyQt6.changes 2024-09-12 16:53:54.626745011 +0200
+++ /work/SRC/openSUSE:Factory/.python-PyQt6.new.19354/python-PyQt6.changes 2024-10-17 18:38:46.432845016 +0200
@@ -1,0 +2,17 @@
+Wed Oct 16 15:48:52 UTC 2024 - Ben Greiner <code(a)bnavigator.de>
+
+- Change version to 6.8.0~dev2410061818
+ * Mark development version for correct order before release
+- Changes from 6.7.1
+ * SIP v6.8.6 and PyQt6-sip v13.8 are now required for Python
+ v3.13 support and for Linux on ARM.
+
+-------------------------------------------------------------------
+Wed Oct 16 08:11:34 UTC 2024 - Fabian Vogt <fvogt(a)suse.com>
+
+- Update to 6.8.0.dev2410061818:
+ * Added support for Qt v6.8 (excluding any technical previews).
+ * Implemented QtAudio as a synonym for QAudio.
+ * Bug fixes.
+
+-------------------------------------------------------------------
Old:
----
PyQt6-6.7.0.tar.gz
New:
----
PyQt6-6.8.0.dev2410061818.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-PyQt6.spec ++++++
--- /var/tmp/diff_new_pack.Fm3UdE/_old 2024-10-17 18:38:47.144874877 +0200
+++ /var/tmp/diff_new_pack.Fm3UdE/_new 2024-10-17 18:38:47.144874877 +0200
@@ -19,24 +19,28 @@
%define plainpython python
%define mname PyQt6
%define pyqt_build_for_qt6 1
+%define pep440version 6.8.0.dev2410061818
%{?sle15_python_module_pythons}
Name: python-%{mname}
-Version: 6.7.0
+Version: 6.8.0~dev2410061818
Release: 0
Summary: Python bindings for Qt 6
License: GPL-3.0-only OR SUSE-GPL-2.0-with-FLOSS-exception OR NonFree
Group: Development/Libraries/Python
URL: https://www.riverbankcomputing.com/software/pyqt
-Source: https://files.pythonhosted.org/packages/source/P/PyQt6/PyQt6-%{version}.tar…
+#Source: https://files.pythonhosted.org/packages/source/P/PyQt6/PyQt6-%%{version}.ta…
+# The URL will be dead soon, don't bother including it
+# https://www.riverbankcomputing.com/pypi/packages/PyQt6/PyQt6-%{version}.tar…
+Source: PyQt6-%{pep440version}.tar.gz
# PATCH-FIX-OPENSUSE - disable-rpaths.diff - Disable RPATH when building PyQt6.
Patch0: disable-rpaths.diff
# PATCH-FIX-OPENSUSE - install binary dbus mainloop integration in arch dependent directory
Patch1: 0001-Use-a-noarch-wrapper-for-dbus-mainloop-integration.patch
-BuildRequires: %{python_module PyQt6-sip >= 13.6}
+BuildRequires: %{python_module PyQt6-sip >= 13.8}
BuildRequires: %{python_module dbus-python-devel >= 0.8}
-BuildRequires: %{python_module devel >= 3.6.1}
+BuildRequires: %{python_module devel >= 3.8}
BuildRequires: %{python_module pyqt-builder >= 1.15}
-BuildRequires: %{python_module sip-devel >= 6.5}
+BuildRequires: %{python_module sip-devel >= 6.8}
BuildRequires: dbus-1-devel
BuildRequires: dos2unix
BuildRequires: fdupes
@@ -176,7 +180,7 @@
This package contains programming examples for PyQt6.
%prep
-%autosetup -p1 -n PyQt6-%{version}
+%autosetup -p1 -n PyQt6-%{pep440version}
dos2unix examples/quick/models/*/view.qml
dos2unix examples/multimedia*/*/*.ui
@@ -202,7 +206,7 @@
export PYTHONDONTWRITEBYTECODE=1 # boo#1047218
%{python_expand # there is no test suite. If it compiles and imports, it should be okay.
export PYTHONPATH=%{buildroot}%{$python_sitearch}
-$python -c 'from PyQt6 import QtCore; assert QtCore.PYQT_VERSION_STR == "%{version}"'
+$python -c 'from PyQt6 import QtCore; assert QtCore.PYQT_VERSION_STR == "%{pep440version}"'
}
%post devel
@@ -215,7 +219,7 @@
%license LICENSE
%doc README.md NEWS ChangeLog
%{python_sitearch}/PyQt6/
-%{python_sitearch}/PyQt6-%{version}.dist-info/
+%{python_sitearch}/PyQt6-%{pep440version}.dist-info/
%dir %{python_sitelib}/dbus
%dir %{python_sitelib}/dbus/mainloop
%{python_sitelib}/dbus/mainloop/pyqt6.py
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt6-webengine for openSUSE:Factory checked in at 2024-10-17 18:38:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt6-webengine (Old)
and /work/SRC/openSUSE:Factory/.qt6-webengine.new.19354 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-webengine"
Thu Oct 17 18:38:06 2024 rev:36 rq:1207640 version:6.8.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/qt6-webengine/qt6-webengine.changes 2024-10-03 18:03:18.685508987 +0200
+++ /work/SRC/openSUSE:Factory/.qt6-webengine.new.19354/qt6-webengine.changes 2024-10-17 18:38:14.191497305 +0200
@@ -1,0 +2,14 @@
+Sun Oct 13 16:56:37 UTC 2024 - Christophe Marin <christophe(a)krop.fr>
+
+- Add patch to avoid a build failure on ARM (QTBUG-129985):
+ * QtWebEngine_6.8_skip_xnnpack.patch
+
+-------------------------------------------------------------------
+Tue Oct 8 09:29:57 UTC 2024 - Christophe Marin <christophe(a)krop.fr>
+
+- Update to 6.8.0:
+ * https://www.qt.io/blog/qt-6.8-released
+- Drop patch:
+ * qtwebengine-ffmpeg-7.patch
+
+-------------------------------------------------------------------
Old:
----
qtwebengine-everywhere-src-6.7.3.tar.xz
qtwebengine-ffmpeg-7.patch
New:
----
QtWebEngine_6.8_skip_xnnpack.patch
qtwebengine-everywhere-src-6.8.0.tar.xz
BETA DEBUG BEGIN:
Old:- Drop patch:
* qtwebengine-ffmpeg-7.patch
BETA DEBUG END:
BETA DEBUG BEGIN:
New:- Add patch to avoid a build failure on ARM (QTBUG-129985):
* QtWebEngine_6.8_skip_xnnpack.patch
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt6-webengine.spec ++++++
--- /var/tmp/diff_new_pack.7Fu9F9/_old 2024-10-17 18:38:27.696060430 +0200
+++ /var/tmp/diff_new_pack.7Fu9F9/_new 2024-10-17 18:38:27.696060430 +0200
@@ -16,8 +16,8 @@
#
-%define real_version 6.7.3
-%define short_version 6.7
+%define real_version 6.8.0
+%define short_version 6.8
%define tar_name qtwebengine-everywhere-src
%define tar_suffix %{nil}
#
@@ -35,9 +35,16 @@
%bcond_without system_icu
# and so is tiff...
%bcond_without system_tiff
+# Leap 15's ffmpeg is too old since 6.8.0
+%bcond_without system_ffmpeg
+# and python 3.6 is also too old for this QtWE version
+%define pyver python3
+%else
+%{?sle15_python_module_pythons}
+%define pyver python311
%endif
Name: qt6-webengine%{?pkg_suffix}
-Version: 6.7.3
+Version: 6.8.0
Release: 0
Summary: Web browser engine for Qt applications
License: GPL-2.0-only OR LGPL-3.0-only OR GPL-3.0-only
@@ -47,7 +54,7 @@
# Patches 0-100 are upstream patches #
# Patches 100-200 are openSUSE and/or non-upstream(able) patches #
Patch100: rtc-dont-use-h264.patch
-Patch101: qtwebengine-ffmpeg-7.patch
+Patch101: QtWebEngine_6.8_skip_xnnpack.patch
#
# Chromium/blink don't support PowerPC and zSystems and build fails on
# 32 bits archs (https://bugreports.qt.io/browse/QTBUG-102143)
@@ -66,9 +73,10 @@
BuildRequires: nodejs-default
BuildRequires: pipewire-devel
BuildRequires: pkgconfig
-BuildRequires: python3-devel
-BuildRequires: python3-html5lib
-BuildRequires: python3-importlib-metadata
+BuildRequires: %{pyver}
+BuildRequires: %{pyver}-devel
+BuildRequires: %{pyver}-html5lib
+BuildRequires: %{pyver}-importlib-metadata
BuildRequires: qt6-core-private-devel
BuildRequires: qt6-gui-private-devel
BuildRequires: qt6-qml-private-devel
@@ -76,27 +84,33 @@
BuildRequires: qt6-quickwidgets-private-devel
BuildRequires: qt6-widgets-private-devel
BuildRequires: snappy-devel
-BuildRequires: cmake(Qt6Core) = %{real_version}
-BuildRequires: cmake(Qt6Designer) = %{real_version}
-BuildRequires: cmake(Qt6Gui) = %{real_version}
-BuildRequires: cmake(Qt6GuiTools) = %{real_version}
-BuildRequires: cmake(Qt6Network) = %{real_version}
-BuildRequires: cmake(Qt6OpenGL) = %{real_version}
-BuildRequires: cmake(Qt6OpenGLWidgets) = %{real_version}
-BuildRequires: cmake(Qt6Positioning) = %{real_version}
-BuildRequires: cmake(Qt6PrintSupport) = %{real_version}
-BuildRequires: cmake(Qt6Qml) = %{real_version}
-BuildRequires: cmake(Qt6QmlModels) = %{real_version}
-BuildRequires: cmake(Qt6QmlTools) = %{real_version}
-BuildRequires: cmake(Qt6Quick) = %{real_version}
-BuildRequires: cmake(Qt6QuickControls2) = %{real_version}
-BuildRequires: cmake(Qt6QuickTest) = %{real_version}
-BuildRequires: cmake(Qt6QuickWidgets) = %{real_version}
-BuildRequires: cmake(Qt6WebChannel) = %{real_version}
-BuildRequires: cmake(Qt6WebChannelQuick) = %{real_version}
-BuildRequires: cmake(Qt6WebSockets) = %{real_version}
-BuildRequires: cmake(Qt6Widgets) = %{real_version}
-BuildRequires: cmake(Qt6WidgetsTools) = %{real_version}
+# Note about required versions:
+# qtwebengine supports building against the latest LTS release. This allows submitting
+# updates to Leap
+%global lts_version 6.5.0
+BuildRequires: cmake(Qt6Core) >= %{lts_version}
+BuildRequires: cmake(Qt6Designer) >= %{lts_version}
+BuildRequires: cmake(Qt6Gui) >= %{lts_version}
+BuildRequires: cmake(Qt6GuiTools) >= %{lts_version}
+# Only needed for tests, no need to have it
+# BuildRequires: cmake(Qt6HttpServer)
+BuildRequires: cmake(Qt6Network) >= %{lts_version}
+BuildRequires: cmake(Qt6OpenGL) >= %{lts_version}
+BuildRequires: cmake(Qt6OpenGLWidgets) >= %{lts_version}
+BuildRequires: cmake(Qt6Positioning) >= %{lts_version}
+BuildRequires: cmake(Qt6PrintSupport) >= %{lts_version}
+BuildRequires: cmake(Qt6Qml) >= %{lts_version}
+BuildRequires: cmake(Qt6QmlModels) >= %{lts_version}
+BuildRequires: cmake(Qt6QmlTools) >= %{lts_version}
+BuildRequires: cmake(Qt6Quick) >= %{lts_version}
+BuildRequires: cmake(Qt6QuickControls2) >= %{lts_version}
+BuildRequires: cmake(Qt6QuickTest) >= %{lts_version}
+BuildRequires: cmake(Qt6QuickWidgets) >= %{lts_version}
+BuildRequires: cmake(Qt6WebChannel) >= %{lts_version}
+BuildRequires: cmake(Qt6WebChannelQuick) >= %{lts_version}
+BuildRequires: cmake(Qt6WebSockets) >= %{lts_version}
+BuildRequires: cmake(Qt6Widgets) >= %{lts_version}
+BuildRequires: cmake(Qt6WidgetsTools) >= %{lts_version}
BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(epoxy)
@@ -114,9 +128,11 @@
BuildRequires: pkgconfig(icu-uc) >= 71
%endif
BuildRequires: pkgconfig(lcms2)
-BuildRequires: pkgconfig(libavcodec)
-BuildRequires: pkgconfig(libavformat)
-BuildRequires: pkgconfig(libavutil)
+%if %{with system_ffmpeg}
+BuildRequires: pkgconfig(libavcodec) >= 60.31.102
+BuildRequires: pkgconfig(libavformat) >= 60.16.100
+BuildRequires: pkgconfig(libavutil) >= 58.29.100
+%endif
BuildRequires: pkgconfig(libcrypto)
BuildRequires: pkgconfig(libdrm)
BuildRequires: pkgconfig(libevent)
@@ -155,8 +171,6 @@
BuildRequires: pkgconfig(xt)
BuildRequires: pkgconfig(xtst)
BuildRequires: pkgconfig(zlib)
-# Picked from chromium.spec
-BuildRequires: (python3 >= 3.7 or python3-dataclasses)
%if "%{qt6_flavor}" == "docs"
BuildRequires: qt6-tools
%{qt6_doc_packages}
@@ -194,8 +208,8 @@
%package -n qt6-pdf-devel
Summary: Development files for the Qt 6 Pdf library
Requires: libQt6Pdf6 = %{version}
-Requires: cmake(Qt6Gui) = %{real_version}
-Requires: cmake(Qt6Network) = %{real_version}
+Requires: cmake(Qt6Gui) >= %{lts_version}
+Requires: cmake(Qt6Network) >= %{lts_version}
%description -n qt6-pdf-devel
Development files for the Qt 6 Pdf library.
@@ -218,9 +232,9 @@
Summary: Development files for the Qt 6 PdfQuick library
Requires: libQt6PdfQuick6 = %{version}
Requires: qt6-pdf-private-devel = %{version}
-Requires: cmake(Qt6Gui) = %{real_version}
-Requires: cmake(Qt6Qml) = %{real_version}
-Requires: cmake(Qt6Quick) = %{real_version}
+Requires: cmake(Qt6Gui) >= %{lts_version}
+Requires: cmake(Qt6Qml) >= %{lts_version}
+Requires: cmake(Qt6Quick) >= %{lts_version}
%requires_eq qt6-quick-private-devel
%description -n qt6-pdfquick-devel
@@ -243,9 +257,9 @@
%package -n qt6-pdfwidgets-devel
Summary: Development files for the Qt 6 PdfWidgets library
Requires: libQt6PdfWidgets6 = %{version}
-Requires: cmake(Qt6Gui) = %{real_version}
+Requires: cmake(Qt6Gui) >= %{lts_version}
Requires: cmake(Qt6Pdf) = %{real_version}
-Requires: cmake(Qt6Widgets) = %{real_version}
+Requires: cmake(Qt6Widgets) >= %{lts_version}
%description -n qt6-pdfwidgets-devel
Development files for the Qt 6 PdfWidgets library.
@@ -268,11 +282,11 @@
%package -n qt6-webenginecore-devel
Summary: Development files for the Qt 6 WebEngineCore library
Requires: libQt6WebEngineCore6 = %{version}
-Requires: cmake(Qt6Gui) = %{real_version}
-Requires: cmake(Qt6Network) = %{real_version}
-Requires: cmake(Qt6Positioning) = %{real_version}
-Requires: cmake(Qt6Quick) = %{real_version}
-Requires: cmake(Qt6WebChannel) = %{real_version}
+Requires: cmake(Qt6Gui) >= %{lts_version}
+Requires: cmake(Qt6Network) >= %{lts_version}
+Requires: cmake(Qt6Positioning) >= %{lts_version}
+Requires: cmake(Qt6Quick) >= %{lts_version}
+Requires: cmake(Qt6WebChannel) >= %{lts_version}
%description -n qt6-webenginecore-devel
Development files for the Qt 6 WebEngineCore library.
@@ -295,10 +309,10 @@
%package -n qt6-webenginequick-devel
Summary: Development files for the Qt 6 WebEngineQuick library
Requires: libQt6WebEngineQuick6 = %{version}
-Requires: cmake(Qt6Gui) = %{real_version}
-Requires: cmake(Qt6Qml) = %{real_version}
-Requires: cmake(Qt6Quick) = %{real_version}
-Requires: cmake(Qt6WebChannelQuick) = %{real_version}
+Requires: cmake(Qt6Gui) >= %{lts_version}
+Requires: cmake(Qt6Qml) >= %{lts_version}
+Requires: cmake(Qt6Quick) >= %{lts_version}
+Requires: cmake(Qt6WebChannelQuick) >= %{lts_version}
Requires: cmake(Qt6WebEngineCore) = %{real_version}
%description -n qt6-webenginequick-devel
@@ -321,12 +335,12 @@
%package -n qt6-webenginewidgets-devel
Summary: Development files for the Qt 6 WebEngineWidgets library
Requires: libQt6WebEngineWidgets6 = %{version}
-Requires: cmake(Qt6Gui) = %{real_version}
-Requires: cmake(Qt6PrintSupport) = %{real_version}
-Requires: cmake(Qt6Quick) = %{real_version}
-Requires: cmake(Qt6QuickWidgets) = %{real_version}
+Requires: cmake(Qt6Gui) >= %{lts_version}
+Requires: cmake(Qt6PrintSupport) >= %{lts_version}
+Requires: cmake(Qt6Quick) >= %{lts_version}
+Requires: cmake(Qt6QuickWidgets) >= %{lts_version}
Requires: cmake(Qt6WebEngineCore) = %{real_version}
-Requires: cmake(Qt6Widgets) = %{real_version}
+Requires: cmake(Qt6Widgets) >= %{lts_version}
%description -n qt6-webenginewidgets-devel
Development files for the Qt 6 WebEngineWidgets library.
@@ -346,11 +360,6 @@
%prep
%autosetup -p1 -n %{tar_name}-%{real_version}%{tar_suffix}
-%if %{pkg_vcmp pkgconfig(libavcodec) <= 5}
-# The ffmpeg 7 compatibility patch would break build with older ffmpeg
-%patch -P101 -p1 -R
-%endif
-
%build
%if %{no_flavor}
# Determine the right number of parallel processes based on the available memory
@@ -364,6 +373,9 @@
%cmake_qt6 \
-DCMAKE_TOOLCHAIN_FILE:STRING="%{_qt6_cmakedir}/Qt6/qt.toolchain.cmake" \
+%if 0%{?suse_version} == 1500
+ -DPython3_EXECUTABLE=%{_bindir}/python3.11 \
+%endif
-DFEATURE_qtpdf_build:BOOL=ON \
-DFEATURE_webengine_developer_build:BOOL=OFF \
-DFEATURE_webengine_embedded_build:BOOL=OFF \
@@ -372,7 +384,11 @@
-DFEATURE_webengine_native_spellchecker:BOOL=OFF \
-DFEATURE_webengine_printing_and_pdf:BOOL=ON \
-DFEATURE_webengine_proprietary_codecs:BOOL=ON \
+%if %{with system_ffmpeg}
-DFEATURE_webengine_system_ffmpeg:BOOL=ON \
+%else
+ -DFEATURE_webengine_system_ffmpeg:BOOL=OFF \
+%endif
%if %{without system_harfbuzz}
-DFEATURE_webengine-system-harfbuzz:BOOL=OFF \
%endif
++++++ QtWebEngine_6.8_skip_xnnpack.patch ++++++
Don't use xnnpack on ARM with QtWebEngine 6.8.0
Bug ref: https://bugreports.qt.io/browse/QTBUG-129985
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index fe4f2c3f1..729d4d3e9 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -544,6 +544,10 @@ foreach(arch ${archs})
)
endif()
endif()
+ if(cpu MATCHES "arm.*")
+ # https://bugreports.qt.io/browse/QTBUG-129985
+ list(APPEND gnArgArg build_webnn_with_xnnpack=false)
+ endif()
unset(cpu)
endif()
++++++ qtwebengine-everywhere-src-6.7.3.tar.xz -> qtwebengine-everywhere-src-6.8.0.tar.xz ++++++
/work/SRC/openSUSE:Factory/qt6-webengine/qtwebengine-everywhere-src-6.7.3.tar.xz /work/SRC/openSUSE:Factory/.qt6-webengine.new.19354/qtwebengine-everywhere-src-6.8.0.tar.xz differ: char 25, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt6-wayland for openSUSE:Factory checked in at 2024-10-17 18:38:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt6-wayland (Old)
and /work/SRC/openSUSE:Factory/.qt6-wayland.new.19354 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-wayland"
Thu Oct 17 18:38:03 2024 rev:39 rq:1207638 version:6.8.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/qt6-wayland/qt6-wayland.changes 2024-10-03 18:03:16.533419420 +0200
+++ /work/SRC/openSUSE:Factory/.qt6-wayland.new.19354/qt6-wayland.changes 2024-10-17 18:38:11.835399059 +0200
@@ -1,0 +2,7 @@
+Tue Oct 8 09:29:56 UTC 2024 - Christophe Marin <christophe(a)krop.fr>
+
+- Update to 6.8.0:
+ * https://www.qt.io/blog/qt-6.8-released
+- Rebase 0001-update-wayland_xml-to-version-1_23_0.patch
+
+-------------------------------------------------------------------
Old:
----
qtwayland-everywhere-src-6.7.3.tar.xz
New:
----
qtwayland-everywhere-src-6.8.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt6-wayland.spec ++++++
--- /var/tmp/diff_new_pack.aBuSBW/_old 2024-10-17 18:38:12.563429417 +0200
+++ /var/tmp/diff_new_pack.aBuSBW/_new 2024-10-17 18:38:12.563429417 +0200
@@ -16,8 +16,8 @@
#
-%define real_version 6.7.3
-%define short_version 6.7
+%define real_version 6.8.0
+%define short_version 6.8
%define tar_name qtwayland-everywhere-src
%define tar_suffix %{nil}
#
@@ -30,7 +30,7 @@
%global with_opengl 1
%endif
Name: qt6-wayland%{?pkg_suffix}
-Version: 6.7.3
+Version: 6.8.0
Release: 0
Summary: Qt 6 Wayland libraries and tools
# The wayland compositor files are GPL-3.0-or-later
@@ -38,7 +38,7 @@
URL: https://www.qt.io
Source0: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version…
Source99: qt6-wayland-rpmlintrc
-# PATCH-FIX-UPSTREAM https://bugreports.qt.io/browse/QTBUG-126379
+# PATCH-FIX-UPSTREAM
Patch0: 0001-update-wayland_xml-to-version-1_23_0.patch
BuildRequires: pkgconfig
BuildRequires: qt6-core-private-devel
@@ -52,6 +52,7 @@
BuildRequires: cmake(Qt6OpenGL) = %{real_version}
BuildRequires: cmake(Qt6Qml) = %{real_version}
BuildRequires: cmake(Qt6Quick) = %{real_version}
+BuildRequires: cmake(Qt6Svg) = %{real_version}
BuildRequires: pkgconfig(egl)
BuildRequires: pkgconfig(wayland-client)
BuildRequires: pkgconfig(wayland-cursor)
@@ -165,7 +166,6 @@
This package contains enabled features information shared by all the
qt6-wayland libraries.
-
### Private only libraries ###
%package -n libQt6WaylandEglClientHwIntegration6
@@ -296,16 +296,52 @@
%files -n libQt6WaylandCompositor6
%{_qt6_libdir}/libQt6WaylandCompositor.so.*
+%{_qt6_libdir}/libQt6WaylandCompositorIviapplication.so.*
+%{_qt6_libdir}/libQt6WaylandCompositorPresentationTime.so.*
+%{_qt6_libdir}/libQt6WaylandCompositorWLShell.so.*
+%{_qt6_libdir}/libQt6WaylandCompositorXdgShell.so.*
%files -n qt6-waylandcompositor-devel
%{_qt6_cmakedir}/Qt6WaylandCompositor/
+%{_qt6_cmakedir}/Qt6WaylandCompositorIviapplication/
+%{_qt6_cmakedir}/Qt6WaylandCompositorPresentationTime/
+%{_qt6_cmakedir}/Qt6WaylandCompositorWLShell/
+%{_qt6_cmakedir}/Qt6WaylandCompositorXdgShell/
%{_qt6_descriptionsdir}/WaylandCompositor.json
+%{_qt6_descriptionsdir}/WaylandCompositorIviapplication.json
+%{_qt6_descriptionsdir}/WaylandCompositorPresentationTime.json
+%{_qt6_descriptionsdir}/WaylandCompositorWLShell.json
+%{_qt6_descriptionsdir}/WaylandCompositorXdgShell.json
%{_qt6_includedir}/QtWaylandCompositor/
+%{_qt6_includedir}/QtWaylandCompositorIviapplication/
+%{_qt6_includedir}/QtWaylandCompositorPresentationTime/
+%{_qt6_includedir}/QtWaylandCompositorWLShell/
+%{_qt6_includedir}/QtWaylandCompositorXdgShell/
%{_qt6_libdir}/libQt6WaylandCompositor.prl
%{_qt6_libdir}/libQt6WaylandCompositor.so
+%{_qt6_libdir}/libQt6WaylandCompositorIviapplication.prl
+%{_qt6_libdir}/libQt6WaylandCompositorIviapplication.so
+%{_qt6_libdir}/libQt6WaylandCompositorPresentationTime.prl
+%{_qt6_libdir}/libQt6WaylandCompositorPresentationTime.so
+%{_qt6_libdir}/libQt6WaylandCompositorWLShell.prl
+%{_qt6_libdir}/libQt6WaylandCompositorWLShell.so
+%{_qt6_libdir}/libQt6WaylandCompositorXdgShell.prl
+%{_qt6_libdir}/libQt6WaylandCompositorXdgShell.so
%{_qt6_metatypesdir}/qt6waylandcompositor_*_metatypes.json
+%{_qt6_metatypesdir}/qt6waylandcompositoriviapplication_*_metatypes.json
+%{_qt6_metatypesdir}/qt6waylandcompositorpresentationtime_*_metatypes.json
+%{_qt6_metatypesdir}/qt6waylandcompositorwlshell_*_metatypes.json
+%{_qt6_metatypesdir}/qt6waylandcompositorxdgshell_*_metatypes.json
%{_qt6_mkspecsdir}/modules/qt_lib_waylandcompositor.pri
+%{_qt6_mkspecsdir}/modules/qt_lib_waylandcompositoriviapplication*.pri
+%{_qt6_mkspecsdir}/modules/qt_lib_waylandcompositorpresentationtime*.pri
+%{_qt6_mkspecsdir}/modules/qt_lib_waylandcompositorwlshell*.pri
+%{_qt6_mkspecsdir}/modules/qt_lib_waylandcompositorxdgshell*.pri
%{_qt6_pkgconfigdir}/Qt6WaylandCompositor.pc
+%{_qt6_pkgconfigdir}/Qt6WaylandCompositorIviapplication.pc
+%{_qt6_pkgconfigdir}/Qt6WaylandCompositorPresentationTime.pc
+%{_qt6_pkgconfigdir}/Qt6WaylandCompositorWLShell.pc
+%{_qt6_pkgconfigdir}/Qt6WaylandCompositorXdgShell.pc
%exclude %{_qt6_includedir}/QtWaylandCompositor/%{real_version}
%files -n qt6-waylandcompositor-private-devel
++++++ 0001-update-wayland_xml-to-version-1_23_0.patch ++++++
--- /var/tmp/diff_new_pack.aBuSBW/_old 2024-10-17 18:38:12.587430418 +0200
+++ /var/tmp/diff_new_pack.aBuSBW/_new 2024-10-17 18:38:12.591430584 +0200
@@ -9,13 +9,13 @@
Change-Id: I5999e6dd75dfff7d904981fb1545d58c8b38ceb0
Reviewed-by: David Edmundson <davidedmundson(a)kde.org>
---
- src/3rdparty/protocol/wayland.xml | 215 ++++++++++++++++++++++--------
+ src/3rdparty/protocol/wayland/wayland.xml | 215 ++++++++++++++++++++++--------
1 file changed, 156 insertions(+), 59 deletions(-)
-diff --git a/src/3rdparty/protocol/wayland.xml b/src/3rdparty/protocol/wayland.xml
+diff --git a/src/3rdparty/protocol/wayland/wayland.xml b/src/3rdparty/protocol/wayland/wayland.xml
index 10e039d6e..9418c62f3 100644
---- a/src/3rdparty/protocol/wayland.xml
-+++ b/src/3rdparty/protocol/wayland.xml
+--- a/src/3rdparty/protocol/wayland/wayland.xml
++++ b/src/3rdparty/protocol/wayland/wayland.xml
@@ -46,7 +46,7 @@
compositor after the callback is fired and as such the client must not
attempt to use it after that point.
++++++ qtwayland-everywhere-src-6.7.3.tar.xz -> qtwayland-everywhere-src-6.8.0.tar.xz ++++++
++++ 34373 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt6-sensors for openSUSE:Factory checked in at 2024-10-17 18:37:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt6-sensors (Old)
and /work/SRC/openSUSE:Factory/.qt6-sensors.new.19354 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-sensors"
Thu Oct 17 18:37:55 2024 rev:27 rq:1207629 version:6.8.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/qt6-sensors/qt6-sensors.changes 2024-10-03 18:03:07.605047834 +0200
+++ /work/SRC/openSUSE:Factory/.qt6-sensors.new.19354/qt6-sensors.changes 2024-10-17 18:38:02.975029591 +0200
@@ -1,0 +2,6 @@
+Tue Oct 8 09:29:51 UTC 2024 - Christophe Marin <christophe(a)krop.fr>
+
+- Update to 6.8.0:
+ * https://www.qt.io/blog/qt-6.8-released
+
+-------------------------------------------------------------------
Old:
----
qtsensors-everywhere-src-6.7.3.tar.xz
New:
----
qtsensors-everywhere-src-6.8.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt6-sensors.spec ++++++
--- /var/tmp/diff_new_pack.WFO6DP/_old 2024-10-17 18:38:03.555053777 +0200
+++ /var/tmp/diff_new_pack.WFO6DP/_new 2024-10-17 18:38:03.555053777 +0200
@@ -16,8 +16,8 @@
#
-%define real_version 6.7.3
-%define short_version 6.7
+%define real_version 6.8.0
+%define short_version 6.8
%define short_name qtsensors
%define tar_name qtsensors-everywhere-src
%define tar_suffix %{nil}
@@ -28,7 +28,7 @@
%endif
#
Name: qt6-sensors%{?pkg_suffix}
-Version: 6.7.3
+Version: 6.8.0
Release: 0
Summary: Qt Sensors API to access sensor hardware
License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
++++++ qtsensors-everywhere-src-6.7.3.tar.xz -> qtsensors-everywhere-src-6.8.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/.cmake.conf new/qtsensors-everywhere-src-6.8.0/.cmake.conf
--- old/qtsensors-everywhere-src-6.7.3/.cmake.conf 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/.cmake.conf 2024-10-02 16:25:47.000000000 +0200
@@ -1,4 +1,4 @@
-set(QT_REPO_MODULE_VERSION "6.7.3")
+set(QT_REPO_MODULE_VERSION "6.8.0")
set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1")
set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1")
list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/.tag new/qtsensors-everywhere-src-6.8.0/.tag
--- old/qtsensors-everywhere-src-6.7.3/.tag 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/.tag 2024-10-02 16:25:47.000000000 +0200
@@ -1 +1 @@
-d88050c095f9f1e4b8abe71090fda11c80d1906f
+8adb8f42df3f0b4acbb2ad9ad52ea930659743c2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/dependencies.yaml new/qtsensors-everywhere-src-6.8.0/dependencies.yaml
--- old/qtsensors-everywhere-src-6.7.3/dependencies.yaml 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/dependencies.yaml 2024-10-02 16:25:47.000000000 +0200
@@ -1,7 +1,7 @@
dependencies:
../qtbase:
- ref: 92b685784960eea6eb353688cf0edeb94d69c6cd
+ ref: b839e9b36db3a4e50dfb34521d8ef8de1fd01969
required: true
../qtdeclarative:
- ref: 34ffe0c15a9564fefcf01a738eb0bde370399959
+ ref: 2884c601242f030307a5acdca984b3aa0d34e064
required: false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensors/CMakeLists.txt new/qtsensors-everywhere-src-6.8.0/src/sensors/CMakeLists.txt
--- old/qtsensors-everywhere-src-6.7.3/src/sensors/CMakeLists.txt 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensors/CMakeLists.txt 2024-10-02 16:25:47.000000000 +0200
@@ -72,7 +72,6 @@
Qt::Core
PRIVATE_MODULE_INTERFACE
Qt::CorePrivate
- GENERATE_CPP_EXPORTS
)
if(ANDROID)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensors/doc/src/qtsensors-backend.qdoc new/qtsensors-everywhere-src-6.8.0/src/sensors/doc/src/qtsensors-backend.qdoc
--- old/qtsensors-everywhere-src-6.7.3/src/sensors/doc/src/qtsensors-backend.qdoc 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensors/doc/src/qtsensors-backend.qdoc 2024-10-02 16:25:47.000000000 +0200
@@ -9,8 +9,6 @@
The Qt Sensors backend connects the Qt Sensors API to the platform services or
hardware sensors.
-\tableofcontents
-
\section1 Overview
QSensor instances talk to a backend object. Backends are usually supplied
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensors/doc/src/qtsensors-cpp.qdoc new/qtsensors-everywhere-src-6.8.0/src/sensors/doc/src/qtsensors-cpp.qdoc
--- old/qtsensors-everywhere-src-6.7.3/src/sensors/doc/src/qtsensors-cpp.qdoc 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensors/doc/src/qtsensors-cpp.qdoc 2024-10-02 16:25:47.000000000 +0200
@@ -7,8 +7,6 @@
\brief Explains how to use the Qt Sensors C++ API.
\ingroup explanation
-\tableofcontents
-
\section1 Sensor Types
On a device there can be many types of sensors. Not all of the types that the Qt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensors/make_sensor.pl new/qtsensors-everywhere-src-6.8.0/src/sensors/make_sensor.pl
--- old/qtsensors-everywhere-src-6.7.3/src/sensors/make_sensor.pl 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensors/make_sensor.pl 2024-10-02 16:25:47.000000000 +0200
@@ -1,6 +1,6 @@
#!/usr/bin/perl
# Copyright (C) 2021 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
# About this script
#
@@ -82,7 +82,7 @@
class '.$sensor.';
-class Q_SENSORSQUICK_PRIVATE_EXPORT '.$qmlsensor.' : public QmlSensor
+class Q_SENSORSQUICK_EXPORT '.$qmlsensor.' : public QmlSensor
{
Q_OBJECT
QML_NAMED_ELEMENT('.$no_q_sensor.')
@@ -99,7 +99,7 @@
'.$sensor.' *m_sensor;
};
-class Q_SENSORSQUICK_PRIVATE_EXPORT '.$qmlreading.' : public QmlSensorReading
+class Q_SENSORSQUICK_EXPORT '.$qmlreading.' : public QmlSensorReading
{
Q_OBJECT
Q_PROPERTY(qreal myprop READ myprop NOTIFY mypropChanged BINDABLE bindableMyprop)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/CMakeLists.txt new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/CMakeLists.txt
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/CMakeLists.txt 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/CMakeLists.txt 2024-10-02 16:25:47.000000000 +0200
@@ -35,6 +35,4 @@
Qt::Sensors
LIBRARIES
Qt::CorePrivate
- GENERATE_CPP_EXPORTS
- GENERATE_PRIVATE_CPP_EXPORTS
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlaccelerometer.cpp new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlaccelerometer.cpp
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlaccelerometer.cpp 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlaccelerometer.cpp 2024-10-02 16:25:47.000000000 +0200
@@ -6,7 +6,7 @@
/*!
\qmltype Accelerometer
-//! \instantiates QmlAccelerometer
+//! \nativetype QmlAccelerometer
\ingroup qml-sensors_type
\inqmlmodule QtSensors
\since QtSensors 5.0
@@ -66,7 +66,7 @@
/*!
\qmltype AccelerometerReading
-//! \instantiates QmlAccelerometerReading
+//! \nativetype QmlAccelerometerReading
\ingroup qml-sensors_reading
\inqmlmodule QtSensors
\since QtSensors 5.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlaccelerometer_p.h new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlaccelerometer_p.h
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlaccelerometer_p.h 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlaccelerometer_p.h 2024-10-02 16:25:47.000000000 +0200
@@ -21,7 +21,7 @@
class QAccelerometer;
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlAccelerometer : public QmlSensor
+class Q_SENSORSQUICK_EXPORT QmlAccelerometer : public QmlSensor
{
Q_OBJECT
Q_PROPERTY(AccelerationMode accelerationMode READ accelerationMode WRITE setAccelerationMode
@@ -53,7 +53,7 @@
QmlSensorReading *createReading() const override;
};
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlAccelerometerReading : public QmlSensorReading
+class Q_SENSORSQUICK_EXPORT QmlAccelerometerReading : public QmlSensorReading
{
Q_OBJECT
Q_PROPERTY(qreal x READ x NOTIFY xChanged BINDABLE bindableX)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlambientlightsensor.cpp new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlambientlightsensor.cpp
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlambientlightsensor.cpp 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlambientlightsensor.cpp 2024-10-02 16:25:47.000000000 +0200
@@ -6,7 +6,7 @@
/*!
\qmltype AmbientLightSensor
-//! \instantiates QmlAmbientLightSensor
+//! \nativetype QmlAmbientLightSensor
\ingroup qml-sensors_type
\inqmlmodule QtSensors
\since QtSensors 5.0
@@ -43,7 +43,7 @@
/*!
\qmltype AmbientLightReading
-//! \instantiates QmlAmbientLightSensorReading
+//! \nativetype QmlAmbientLightSensorReading
\ingroup qml-sensors_reading
\inqmlmodule QtSensors
\since QtSensors 5.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlambientlightsensor_p.h new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlambientlightsensor_p.h
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlambientlightsensor_p.h 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlambientlightsensor_p.h 2024-10-02 16:25:47.000000000 +0200
@@ -22,7 +22,7 @@
class QAmbientLightSensor;
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlAmbientLightSensor : public QmlSensor
+class Q_SENSORSQUICK_EXPORT QmlAmbientLightSensor : public QmlSensor
{
Q_OBJECT
QML_NAMED_ELEMENT(AmbientLightSensor)
@@ -39,7 +39,7 @@
};
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlAmbientLightSensorReading : public QmlSensorReading
+class Q_SENSORSQUICK_EXPORT QmlAmbientLightSensorReading : public QmlSensorReading
{
Q_OBJECT
Q_PROPERTY(QAmbientLightReading::LightLevel lightLevel READ lightLevel
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlambienttemperaturesensor.cpp new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlambienttemperaturesensor.cpp
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlambienttemperaturesensor.cpp 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlambienttemperaturesensor.cpp 2024-10-02 16:25:47.000000000 +0200
@@ -5,7 +5,7 @@
/*!
\qmltype AmbientTemperatureSensor
-//! \instantiates QmlAmbientTemperatureSensor
+//! \nativetype QmlAmbientTemperatureSensor
\ingroup qml-sensors_type
\inqmlmodule QtSensors
\since QtSensors 5.1
@@ -42,7 +42,7 @@
/*!
\qmltype AmbientTemperatureReading
-//! \instantiates QmlAmbientTemperatureReading
+//! \nativetype QmlAmbientTemperatureReading
\ingroup qml-sensors_reading
\inqmlmodule QtSensors
\since QtSensors 5.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlambienttemperaturesensor_p.h new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlambienttemperaturesensor_p.h
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlambienttemperaturesensor_p.h 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlambienttemperaturesensor_p.h 2024-10-02 16:25:47.000000000 +0200
@@ -20,7 +20,7 @@
class QAmbientTemperatureSensor;
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlAmbientTemperatureSensor : public QmlSensor
+class Q_SENSORSQUICK_EXPORT QmlAmbientTemperatureSensor : public QmlSensor
{
Q_OBJECT
QML_NAMED_ELEMENT(AmbientTemperatureSensor)
@@ -37,7 +37,7 @@
QAmbientTemperatureSensor *m_sensor;
};
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlAmbientTemperatureReading : public QmlSensorReading
+class Q_SENSORSQUICK_EXPORT QmlAmbientTemperatureReading : public QmlSensorReading
{
Q_OBJECT
Q_PROPERTY(qreal temperature READ temperature
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlcompass.cpp new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlcompass.cpp
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlcompass.cpp 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlcompass.cpp 2024-10-02 16:25:47.000000000 +0200
@@ -6,7 +6,7 @@
/*!
\qmltype Compass
-//! \instantiates QmlCompass
+//! \nativetype QmlCompass
\ingroup qml-sensors_type
\inqmlmodule QtSensors
\since QtSensors 5.0
@@ -43,7 +43,7 @@
/*!
\qmltype CompassReading
-//! \instantiates QmlCompassReading
+//! \nativetype QmlCompassReading
\ingroup qml-sensors_reading
\inqmlmodule QtSensors
\since QtSensors 5.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlcompass_p.h new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlcompass_p.h
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlcompass_p.h 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlcompass_p.h 2024-10-02 16:25:47.000000000 +0200
@@ -21,7 +21,7 @@
class QCompass;
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlCompass : public QmlSensor
+class Q_SENSORSQUICK_EXPORT QmlCompass : public QmlSensor
{
Q_OBJECT
QML_NAMED_ELEMENT(Compass)
@@ -37,7 +37,7 @@
QmlSensorReading *createReading() const override;
};
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlCompassReading : public QmlSensorReading
+class Q_SENSORSQUICK_EXPORT QmlCompassReading : public QmlSensorReading
{
Q_OBJECT
Q_PROPERTY(qreal azimuth READ azimuth NOTIFY azimuthChanged BINDABLE bindableAzimuth)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlgyroscope.cpp new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlgyroscope.cpp
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlgyroscope.cpp 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlgyroscope.cpp 2024-10-02 16:25:47.000000000 +0200
@@ -6,7 +6,7 @@
/*!
\qmltype Gyroscope
-//! \instantiates QmlGyroscope
+//! \nativetype QmlGyroscope
\ingroup qml-sensors_type
\inqmlmodule QtSensors
\since QtSensors 5.0
@@ -42,7 +42,7 @@
/*!
\qmltype GyroscopeReading
-//! \instantiates QmlGyroscopeReading
+//! \nativetype QmlGyroscopeReading
\ingroup qml-sensors_reading
\inqmlmodule QtSensors
\since QtSensors 5.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlgyroscope_p.h new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlgyroscope_p.h
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlgyroscope_p.h 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlgyroscope_p.h 2024-10-02 16:25:47.000000000 +0200
@@ -21,7 +21,7 @@
class QGyroscope;
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlGyroscope : public QmlSensor
+class Q_SENSORSQUICK_EXPORT QmlGyroscope : public QmlSensor
{
Q_OBJECT
QML_NAMED_ELEMENT(Gyroscope)
@@ -37,7 +37,7 @@
QmlSensorReading *createReading() const override;
};
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlGyroscopeReading : public QmlSensorReading
+class Q_SENSORSQUICK_EXPORT QmlGyroscopeReading : public QmlSensorReading
{
Q_OBJECT
Q_PROPERTY(qreal x READ x NOTIFY xChanged BINDABLE bindableX)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlhumiditysensor.cpp new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlhumiditysensor.cpp
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlhumiditysensor.cpp 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlhumiditysensor.cpp 2024-10-02 16:25:47.000000000 +0200
@@ -6,7 +6,7 @@
/*!
\qmltype HumiditySensor
-//! \instantiates QmlHumiditySensor
+//! \nativetype QmlHumiditySensor
\ingroup qml-sensors_type
\inqmlmodule QtSensors
\since QtSensors 5.9
@@ -43,7 +43,7 @@
/*!
\qmltype HumidityReading
-//! \instantiates QmlHumidityReading
+//! \nativetype QmlHumidityReading
\ingroup qml-sensors_reading
\inqmlmodule QtSensors
\since QtSensors 5.9
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlhumiditysensor_p.h new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlhumiditysensor_p.h
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlhumiditysensor_p.h 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlhumiditysensor_p.h 2024-10-02 16:25:47.000000000 +0200
@@ -21,7 +21,7 @@
class QHumiditySensor;
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlHumiditySensor : public QmlSensor
+class Q_SENSORSQUICK_EXPORT QmlHumiditySensor : public QmlSensor
{
Q_OBJECT
@@ -39,7 +39,7 @@
QHumiditySensor *m_sensor;
};
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlHumidityReading : public QmlSensorReading
+class Q_SENSORSQUICK_EXPORT QmlHumidityReading : public QmlSensorReading
{
Q_OBJECT
Q_PROPERTY(qreal relativeHumidity READ relativeHumidity
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlirproximitysensor.cpp new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlirproximitysensor.cpp
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlirproximitysensor.cpp 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlirproximitysensor.cpp 2024-10-02 16:25:47.000000000 +0200
@@ -6,7 +6,7 @@
/*!
\qmltype IRProximitySensor
-//! \instantiates QmlIRProximitySensor
+//! \nativetype QmlIRProximitySensor
\ingroup qml-sensors_type
\inqmlmodule QtSensors
\since QtSensors 5.0
@@ -42,7 +42,7 @@
/*!
\qmltype IRProximityReading
-//! \instantiates QmlIRProximitySensorReading
+//! \nativetype QmlIRProximitySensorReading
\ingroup qml-sensors_reading
\inqmlmodule QtSensors
\since QtSensors 5.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlirproximitysensor_p.h new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlirproximitysensor_p.h
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlirproximitysensor_p.h 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlirproximitysensor_p.h 2024-10-02 16:25:47.000000000 +0200
@@ -21,7 +21,7 @@
class QIRProximitySensor;
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlIRProximitySensor : public QmlSensor
+class Q_SENSORSQUICK_EXPORT QmlIRProximitySensor : public QmlSensor
{
Q_OBJECT
QML_NAMED_ELEMENT(IRProximitySensor)
@@ -37,7 +37,7 @@
QmlSensorReading *createReading() const override;
};
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlIRProximitySensorReading : public QmlSensorReading
+class Q_SENSORSQUICK_EXPORT QmlIRProximitySensorReading : public QmlSensorReading
{
Q_OBJECT
Q_PROPERTY(qreal reflectance READ reflectance
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmllidsensor.cpp new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmllidsensor.cpp
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmllidsensor.cpp 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmllidsensor.cpp 2024-10-02 16:25:47.000000000 +0200
@@ -5,7 +5,7 @@
/*!
\qmltype LidSensor
-//! \instantiates QmlLidSensor
+//! \nativetype QmlLidSensor
\ingroup qml-sensors_type
\inqmlmodule QtSensors
\since QtSensors 5.9
@@ -43,7 +43,7 @@
/*!
\qmltype LidReading
-//! \instantiates QmlLidReading
+//! \nativetype QmlLidReading
\ingroup qml-sensors_reading
\inqmlmodule QtSensors
\since QtSensors 5.9
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmllidsensor_p.h new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmllidsensor_p.h
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmllidsensor_p.h 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmllidsensor_p.h 2024-10-02 16:25:47.000000000 +0200
@@ -20,7 +20,7 @@
class QLidSensor;
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlLidSensor : public QmlSensor
+class Q_SENSORSQUICK_EXPORT QmlLidSensor : public QmlSensor
{
Q_OBJECT
QML_NAMED_ELEMENT(LidSensor)
@@ -37,7 +37,7 @@
QLidSensor *m_sensor;
};
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlLidReading : public QmlSensorReading
+class Q_SENSORSQUICK_EXPORT QmlLidReading : public QmlSensorReading
{
Q_OBJECT
Q_PROPERTY(bool backLidClosed READ backLidClosed
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmllightsensor.cpp new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmllightsensor.cpp
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmllightsensor.cpp 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmllightsensor.cpp 2024-10-02 16:25:47.000000000 +0200
@@ -6,7 +6,7 @@
/*!
\qmltype LightSensor
-//! \instantiates QmlLightSensor
+//! \nativetype QmlLightSensor
\ingroup qml-sensors_type
\inqmlmodule QtSensors
\since QtSensors 5.0
@@ -57,7 +57,7 @@
/*!
\qmltype LightReading
-//! \instantiates QmlLightSensorReading
+//! \nativetype QmlLightSensorReading
\ingroup qml-sensors_reading
\inqmlmodule QtSensors
\since QtSensors 5.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmllightsensor_p.h new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmllightsensor_p.h
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmllightsensor_p.h 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmllightsensor_p.h 2024-10-02 16:25:47.000000000 +0200
@@ -21,7 +21,7 @@
class QLightSensor;
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlLightSensor : public QmlSensor
+class Q_SENSORSQUICK_EXPORT QmlLightSensor : public QmlSensor
{
Q_OBJECT
Q_PROPERTY(qreal fieldOfView READ fieldOfView NOTIFY fieldOfViewChanged)
@@ -42,7 +42,7 @@
QmlSensorReading *createReading() const override;
};
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlLightSensorReading : public QmlSensorReading
+class Q_SENSORSQUICK_EXPORT QmlLightSensorReading : public QmlSensorReading
{
Q_OBJECT
Q_PROPERTY(qreal illuminance READ illuminance
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlmagnetometer.cpp new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlmagnetometer.cpp
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlmagnetometer.cpp 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlmagnetometer.cpp 2024-10-02 16:25:47.000000000 +0200
@@ -6,7 +6,7 @@
/*!
\qmltype Magnetometer
-//! \instantiates QmlMagnetometer
+//! \nativetype QmlMagnetometer
\ingroup qml-sensors_type
\inqmlmodule QtSensors
\since QtSensors 5.0
@@ -64,7 +64,7 @@
/*!
\qmltype MagnetometerReading
-//! \instantiates QmlMagnetometerReading
+//! \nativetype QmlMagnetometerReading
\ingroup qml-sensors_reading
\inqmlmodule QtSensors
\since QtSensors 5.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlmagnetometer_p.h new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlmagnetometer_p.h
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlmagnetometer_p.h 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlmagnetometer_p.h 2024-10-02 16:25:47.000000000 +0200
@@ -21,7 +21,7 @@
class QMagnetometer;
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlMagnetometer : public QmlSensor
+class Q_SENSORSQUICK_EXPORT QmlMagnetometer : public QmlSensor
{
Q_OBJECT
Q_PROPERTY(bool returnGeoValues READ returnGeoValues WRITE setReturnGeoValues NOTIFY returnGeoValuesChanged)
@@ -44,7 +44,7 @@
QmlSensorReading *createReading() const override;
};
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlMagnetometerReading : public QmlSensorReading
+class Q_SENSORSQUICK_EXPORT QmlMagnetometerReading : public QmlSensorReading
{
Q_OBJECT
Q_PROPERTY(qreal x READ x NOTIFY xChanged BINDABLE bindableX)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlorientationsensor.cpp new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlorientationsensor.cpp
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlorientationsensor.cpp 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlorientationsensor.cpp 2024-10-02 16:25:47.000000000 +0200
@@ -6,7 +6,7 @@
/*!
\qmltype OrientationSensor
-//! \instantiates QmlOrientationSensor
+//! \nativetype QmlOrientationSensor
\ingroup qml-sensors_type
\inqmlmodule QtSensors
\since QtSensors 5.0
@@ -43,7 +43,7 @@
/*!
\qmltype OrientationReading
-//! \instantiates QmlOrientationSensorReading
+//! \nativetype QmlOrientationSensorReading
\ingroup qml-sensors_reading
\inqmlmodule QtSensors
\since QtSensors 5.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlorientationsensor_p.h new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlorientationsensor_p.h
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlorientationsensor_p.h 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlorientationsensor_p.h 2024-10-02 16:25:47.000000000 +0200
@@ -22,7 +22,7 @@
class QOrientationSensor;
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlOrientationSensor : public QmlSensor
+class Q_SENSORSQUICK_EXPORT QmlOrientationSensor : public QmlSensor
{
Q_OBJECT
QML_NAMED_ELEMENT(OrientationSensor)
@@ -38,7 +38,7 @@
QmlSensorReading *createReading() const override;
};
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlOrientationSensorReading : public QmlSensorReading
+class Q_SENSORSQUICK_EXPORT QmlOrientationSensorReading : public QmlSensorReading
{
Q_OBJECT
Q_PROPERTY(QOrientationReading::Orientation orientation READ orientation
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlpressuresensor.cpp new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlpressuresensor.cpp
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlpressuresensor.cpp 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlpressuresensor.cpp 2024-10-02 16:25:47.000000000 +0200
@@ -5,7 +5,7 @@
/*!
\qmltype PressureSensor
-//! \instantiates QmlPressureSensor
+//! \nativetype QmlPressureSensor
\ingroup qml-sensors_type
\inqmlmodule QtSensors
\since QtSensors 5.1
@@ -42,7 +42,7 @@
/*!
\qmltype PressureReading
-//! \instantiates QmlPressureReading
+//! \nativetype QmlPressureReading
\ingroup qml-sensors_reading
\inqmlmodule QtSensors
\since QtSensors 5.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlpressuresensor_p.h new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlpressuresensor_p.h
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlpressuresensor_p.h 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlpressuresensor_p.h 2024-10-02 16:25:47.000000000 +0200
@@ -20,7 +20,7 @@
class QPressureSensor;
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlPressureSensor : public QmlSensor
+class Q_SENSORSQUICK_EXPORT QmlPressureSensor : public QmlSensor
{
Q_OBJECT
QML_NAMED_ELEMENT(PressureSensor)
@@ -37,7 +37,7 @@
QPressureSensor *m_sensor;
};
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlPressureReading : public QmlSensorReading
+class Q_SENSORSQUICK_EXPORT QmlPressureReading : public QmlSensorReading
{
Q_OBJECT
Q_PROPERTY(qreal pressure READ pressure NOTIFY pressureChanged BINDABLE bindablePressure)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlproximitysensor.cpp new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlproximitysensor.cpp
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlproximitysensor.cpp 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlproximitysensor.cpp 2024-10-02 16:25:47.000000000 +0200
@@ -6,7 +6,7 @@
/*!
\qmltype ProximitySensor
-//! \instantiates QmlProximitySensor
+//! \nativetype QmlProximitySensor
\ingroup qml-sensors_type
\inqmlmodule QtSensors
\since QtSensors 5.0
@@ -43,7 +43,7 @@
/*!
\qmltype ProximityReading
-//! \instantiates QmlProximitySensorReading
+//! \nativetype QmlProximitySensorReading
\ingroup qml-sensors_reading
\inqmlmodule QtSensors
\since QtSensors 5.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlproximitysensor_p.h new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlproximitysensor_p.h
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlproximitysensor_p.h 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlproximitysensor_p.h 2024-10-02 16:25:47.000000000 +0200
@@ -23,7 +23,7 @@
class QProximitySensor;
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlProximitySensor : public QmlSensor
+class Q_SENSORSQUICK_EXPORT QmlProximitySensor : public QmlSensor
{
Q_OBJECT
QML_NAMED_ELEMENT(ProximitySensor)
@@ -39,7 +39,7 @@
QmlSensorReading *createReading() const override;
};
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlProximitySensorReading : public QmlSensorReading
+class Q_SENSORSQUICK_EXPORT QmlProximitySensorReading : public QmlSensorReading
{
Q_OBJECT
Q_PROPERTY(bool near READ near NOTIFY nearChanged BINDABLE bindableNear)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlrotationsensor.cpp new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlrotationsensor.cpp
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlrotationsensor.cpp 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlrotationsensor.cpp 2024-10-02 16:25:47.000000000 +0200
@@ -6,7 +6,7 @@
/*!
\qmltype RotationSensor
-//! \instantiates QmlRotationSensor
+//! \nativetype QmlRotationSensor
\ingroup qml-sensors_type
\inqmlmodule QtSensors
\since QtSensors 5.0
@@ -58,7 +58,7 @@
/*!
\qmltype RotationReading
-//! \instantiates QmlRotationSensorReading
+//! \nativetype QmlRotationSensorReading
\ingroup qml-sensors_reading
\inqmlmodule QtSensors
\since QtSensors 5.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlrotationsensor_p.h new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlrotationsensor_p.h
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlrotationsensor_p.h 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlrotationsensor_p.h 2024-10-02 16:25:47.000000000 +0200
@@ -21,7 +21,7 @@
class QRotationSensor;
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlRotationSensor : public QmlSensor
+class Q_SENSORSQUICK_EXPORT QmlRotationSensor : public QmlSensor
{
Q_OBJECT
Q_PROPERTY(bool hasZ READ hasZ NOTIFY hasZChanged)
@@ -42,7 +42,7 @@
QmlSensorReading *createReading() const override;
};
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlRotationSensorReading : public QmlSensorReading
+class Q_SENSORSQUICK_EXPORT QmlRotationSensorReading : public QmlSensorReading
{
Q_OBJECT
Q_PROPERTY(qreal x READ x NOTIFY xChanged BINDABLE bindableX)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlsensor.cpp new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlsensor.cpp
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlsensor.cpp 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlsensor.cpp 2024-10-02 16:25:47.000000000 +0200
@@ -39,7 +39,7 @@
/*!
\qmltype Sensor
-//! \instantiates QmlSensor
+//! \nativetype QmlSensor
\inqmlmodule QtSensors
\since QtSensors 5.0
\brief The Sensor element serves as a base type for sensors.
@@ -489,7 +489,7 @@
/*!
\qmltype SensorReading
-//! \instantiates QmlSensorReading
+//! \nativetype QmlSensorReading
\inqmlmodule QtSensors
\since QtSensors 5.0
\brief The SensorReading element serves as a base type for sensor readings.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlsensor_p.h new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlsensor_p.h
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlsensor_p.h 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlsensor_p.h 2024-10-02 16:25:47.000000000 +0200
@@ -34,7 +34,7 @@
class QmlSensorReading;
class QmlSensorPrivate;
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlSensor : public QObject, public QQmlParserStatus
+class Q_SENSORSQUICK_EXPORT QmlSensor : public QObject, public QQmlParserStatus
{
Q_OBJECT
Q_DECLARE_PRIVATE(QmlSensor)
@@ -180,7 +180,7 @@
m_reading, nullptr)
};
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlSensorReading : public QObject
+class Q_SENSORSQUICK_EXPORT QmlSensorReading : public QObject
{
Q_OBJECT
Q_PROPERTY(quint64 timestamp READ timestamp NOTIFY timestampChanged BINDABLE bindableTimestamp)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlsensorglobal.cpp new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlsensorglobal.cpp
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlsensorglobal.cpp 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlsensorglobal.cpp 2024-10-02 16:25:47.000000000 +0200
@@ -8,7 +8,7 @@
/*!
\qmltype QmlSensors
-//! \instantiates QmlSensorGlobal
+//! \nativetype QmlSensorGlobal
\inqmlmodule QtSensors
\since QtSensors 5.0
\brief The QmlSensors singleton provides the module API.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlsensorglobal_p.h new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlsensorglobal_p.h
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlsensorglobal_p.h 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlsensorglobal_p.h 2024-10-02 16:25:47.000000000 +0200
@@ -24,7 +24,7 @@
class QSensor;
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlSensorGlobal : public QObject
+class Q_SENSORSQUICK_EXPORT QmlSensorGlobal : public QObject
{
Q_OBJECT
public:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlsensorrange_p.h new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlsensorrange_p.h
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmlsensorrange_p.h 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmlsensorrange_p.h 2024-10-02 16:25:47.000000000 +0200
@@ -21,7 +21,7 @@
QT_BEGIN_NAMESPACE
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlSensorRange : public QObject
+class Q_SENSORSQUICK_EXPORT QmlSensorRange : public QObject
{
Q_OBJECT
Q_PROPERTY(int minimum READ minimum)
@@ -45,7 +45,7 @@
int max;
};
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlSensorOutputRange : public QObject
+class Q_SENSORSQUICK_EXPORT QmlSensorOutputRange : public QObject
{
Q_OBJECT
Q_PROPERTY(qreal minimum READ minimum)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmltapsensor.cpp new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmltapsensor.cpp
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmltapsensor.cpp 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmltapsensor.cpp 2024-10-02 16:25:47.000000000 +0200
@@ -6,7 +6,7 @@
/*!
\qmltype TapSensor
-//! \instantiates QmlTapSensor
+//! \nativetype QmlTapSensor
\ingroup qml-sensors_type
\inqmlmodule QtSensors
\since QtSensors 5.0
@@ -65,7 +65,7 @@
/*!
\qmltype TapReading
-//! \instantiates QmlTapSensorReading
+//! \nativetype QmlTapSensorReading
\ingroup qml-sensors_reading
\inqmlmodule QtSensors
\since QtSensors 5.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmltapsensor_p.h new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmltapsensor_p.h
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmltapsensor_p.h 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmltapsensor_p.h 2024-10-02 16:25:47.000000000 +0200
@@ -22,7 +22,7 @@
class QTapSensor;
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlTapSensor : public QmlSensor
+class Q_SENSORSQUICK_EXPORT QmlTapSensor : public QmlSensor
{
Q_OBJECT
Q_PROPERTY(bool returnDoubleTapEvents READ returnDoubleTapEvents WRITE setReturnDoubleTapEvents NOTIFY returnDoubleTapEventsChanged)
@@ -45,7 +45,7 @@
QmlSensorReading *createReading() const override;
};
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlTapSensorReading : public QmlSensorReading
+class Q_SENSORSQUICK_EXPORT QmlTapSensorReading : public QmlSensorReading
{
Q_OBJECT
Q_PROPERTY(QTapReading::TapDirection tapDirection READ tapDirection
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmltiltsensor.cpp new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmltiltsensor.cpp
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmltiltsensor.cpp 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmltiltsensor.cpp 2024-10-02 16:25:47.000000000 +0200
@@ -9,7 +9,7 @@
/*!
\qmltype TiltSensor
-//! \instantiates QmlTiltSensor
+//! \nativetype QmlTiltSensor
\ingroup qml-sensors_type
\inqmlmodule QtSensors
\since QtSensors 5.0
@@ -58,7 +58,7 @@
/*!
\qmltype TiltReading
-//! \instantiates QmlTiltSensorReading
+//! \nativetype QmlTiltSensorReading
\ingroup qml-sensors_reading
\inqmlmodule QtSensors
\since QtSensors 5.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmltiltsensor_p.h new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmltiltsensor_p.h
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qmltiltsensor_p.h 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qmltiltsensor_p.h 2024-10-02 16:25:47.000000000 +0200
@@ -22,7 +22,7 @@
class QTiltSensor;
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlTiltSensor : public QmlSensor
+class Q_SENSORSQUICK_EXPORT QmlTiltSensor : public QmlSensor
{
Q_OBJECT
QML_NAMED_ELEMENT(TiltSensor)
@@ -40,7 +40,7 @@
QmlSensorReading *createReading() const override;
};
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlTiltSensorReading : public QmlSensorReading
+class Q_SENSORSQUICK_EXPORT QmlTiltSensorReading : public QmlSensorReading
{
Q_OBJECT
Q_PROPERTY(qreal yRotation READ yRotation NOTIFY yRotationChanged BINDABLE bindableYRotation)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qsensorsquickglobal_p.h new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qsensorsquickglobal_p.h
--- old/qtsensors-everywhere-src-6.7.3/src/sensorsquick/qsensorsquickglobal_p.h 2024-09-19 20:58:46.000000000 +0200
+++ new/qtsensors-everywhere-src-6.8.0/src/sensorsquick/qsensorsquickglobal_p.h 2024-10-02 16:25:47.000000000 +0200
@@ -16,8 +16,8 @@
//
#include <QtCore/qglobal.h>
-#include <QtSensorsQuick/private/qtsensorsquickexports_p.h>
+#include <QtSensorsQuick/qtsensorsquickexports.h>
-void Q_SENSORSQUICK_PRIVATE_EXPORT qml_register_types_QtSensors();
+void Q_SENSORSQUICK_EXPORT qml_register_types_QtSensors();
#endif // QSENSORSQUICKGLOBALS_P_H
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt6-scxml for openSUSE:Factory checked in at 2024-10-17 18:37:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt6-scxml (Old)
and /work/SRC/openSUSE:Factory/.qt6-scxml.new.19354 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-scxml"
Thu Oct 17 18:37:54 2024 rev:29 rq:1207628 version:6.8.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/qt6-scxml/qt6-scxml.changes 2024-10-03 18:03:06.240991065 +0200
+++ /work/SRC/openSUSE:Factory/.qt6-scxml.new.19354/qt6-scxml.changes 2024-10-17 18:38:01.842982386 +0200
@@ -1,0 +2,6 @@
+Tue Oct 8 09:29:51 UTC 2024 - Christophe Marin <christophe(a)krop.fr>
+
+- Update to 6.8.0:
+ * https://www.qt.io/blog/qt-6.8-released
+
+-------------------------------------------------------------------
Old:
----
qtscxml-everywhere-src-6.7.3.tar.xz
New:
----
qtscxml-everywhere-src-6.8.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt6-scxml.spec ++++++
--- /var/tmp/diff_new_pack.1vj13h/_old 2024-10-17 18:38:02.423006572 +0200
+++ /var/tmp/diff_new_pack.1vj13h/_new 2024-10-17 18:38:02.423006572 +0200
@@ -1,7 +1,7 @@
#
# spec file for package qt6-scxml
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,8 +16,8 @@
#
-%define real_version 6.7.3
-%define short_version 6.7
+%define real_version 6.8.0
+%define short_version 6.8
%define short_name qtscxml
%define tar_name qtscxml-everywhere-src
%define tar_suffix %{nil}
@@ -28,7 +28,7 @@
%endif
#
Name: qt6-scxml%{?pkg_suffix}
-Version: 6.7.3
+Version: 6.8.0
Release: 0
Summary: SCXML (state machine notation) compiler and related tools
License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
++++++ qtscxml-everywhere-src-6.7.3.tar.xz -> qtscxml-everywhere-src-6.8.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/.cmake.conf new/qtscxml-everywhere-src-6.8.0/.cmake.conf
--- old/qtscxml-everywhere-src-6.7.3/.cmake.conf 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/.cmake.conf 2024-10-02 16:25:33.000000000 +0200
@@ -1,4 +1,4 @@
-set(QT_REPO_MODULE_VERSION "6.7.3")
+set(QT_REPO_MODULE_VERSION "6.8.0")
set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1")
set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1")
list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/.tag new/qtscxml-everywhere-src-6.8.0/.tag
--- old/qtscxml-everywhere-src-6.7.3/.tag 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/.tag 2024-10-02 16:25:33.000000000 +0200
@@ -1 +1 @@
-3b0ed59f2c2aeed0a538217398cc7cff8bbff0ee
+b54f02c748804584024a28c676b41dfc43e118e3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/dependencies.yaml new/qtscxml-everywhere-src-6.8.0/dependencies.yaml
--- old/qtscxml-everywhere-src-6.7.3/dependencies.yaml 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/dependencies.yaml 2024-10-02 16:25:33.000000000 +0200
@@ -1,7 +1,7 @@
dependencies:
../qtbase:
- ref: 92b685784960eea6eb353688cf0edeb94d69c6cd
+ ref: b839e9b36db3a4e50dfb34521d8ef8de1fd01969
required: true
../qtdeclarative:
- ref: 34ffe0c15a9564fefcf01a738eb0bde370399959
+ ref: 2884c601242f030307a5acdca984b3aa0d34e064
required: false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/examples/scxml/sudoku/mainwindow.cpp new/qtscxml-everywhere-src-6.8.0/examples/scxml/sudoku/mainwindow.cpp
--- old/qtscxml-everywhere-src-6.7.3/examples/scxml/sudoku/mainwindow.cpp 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/examples/scxml/sudoku/mainwindow.cpp 2024-10-02 16:25:33.000000000 +0200
@@ -187,6 +187,4 @@
}
}
});
-
- setLayout(layout);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/scxml/CMakeLists.txt new/qtscxml-everywhere-src-6.8.0/src/scxml/CMakeLists.txt
--- old/qtscxml-everywhere-src-6.7.3/src/scxml/CMakeLists.txt 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/src/scxml/CMakeLists.txt 2024-10-02 16:25:33.000000000 +0200
@@ -34,8 +34,6 @@
Qt::Core
PRIVATE_MODULE_INTERFACE
Qt::CorePrivate
- GENERATE_CPP_EXPORTS
- GENERATE_PRIVATE_CPP_EXPORTS
)
# Install the public qscxlmc.prf file that is used by the qmake
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/scxml/doc/qtscxml-index.qdoc new/qtscxml-everywhere-src-6.8.0/src/scxml/doc/qtscxml-index.qdoc
--- old/qtscxml-everywhere-src-6.7.3/src/scxml/doc/qtscxml-index.qdoc 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/src/scxml/doc/qtscxml-index.qdoc 2024-10-02 16:25:33.000000000 +0200
@@ -15,6 +15,8 @@
\section1 Getting Started
+ To use Qt SCXML, install the \e {Qt State Machines} additional library.
+
To import the QML types into your application, use the following import statement
in your .qml file:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/scxml/qscxmldatamodelplugin_p.h new/qtscxml-everywhere-src-6.8.0/src/scxml/qscxmldatamodelplugin_p.h
--- old/qtscxml-everywhere-src-6.7.3/src/scxml/qscxmldatamodelplugin_p.h 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/src/scxml/qscxmldatamodelplugin_p.h 2024-10-02 16:25:33.000000000 +0200
@@ -23,7 +23,7 @@
#define QScxmlDataModelPluginInterface_iid "org.qt-project.qt.scxml.datamodel.plugin"
-class Q_SCXML_PRIVATE_EXPORT QScxmlDataModelPlugin : public QObject
+class Q_SCXML_EXPORT QScxmlDataModelPlugin : public QObject
{
Q_OBJECT
public:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/scxml/qscxmlglobals_p.h new/qtscxml-everywhere-src-6.8.0/src/scxml/qscxmlglobals_p.h
--- old/qtscxml-everywhere-src-6.7.3/src/scxml/qscxmlglobals_p.h 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/src/scxml/qscxmlglobals_p.h 2024-10-02 16:25:33.000000000 +0200
@@ -16,13 +16,6 @@
//
#include "qscxmlglobals.h"
-
-#if defined(BUILD_QSCXMLC)
-# define Q_SCXML_PRIVATE_EXPORT
-#else
-# include <QtScxml/private/qtscxmlexports_p.h>
-#endif
-
#include <QtCore/qloggingcategory.h>
QT_BEGIN_NAMESPACE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/scxml/qscxmlstatemachine.cpp new/qtscxml-everywhere-src-6.8.0/src/scxml/qscxmlstatemachine.cpp
--- old/qtscxml-everywhere-src-6.7.3/src/scxml/qscxmlstatemachine.cpp 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/src/scxml/qscxmlstatemachine.cpp 2024-10-02 16:25:33.000000000 +0200
@@ -43,7 +43,7 @@
/*!
\qmltype ScxmlStateMachine
- \instantiates QScxmlStateMachine
+ \nativetype QScxmlStateMachine
\inqmlmodule QtScxml
\since 5.7
@@ -2252,20 +2252,28 @@
*/
/*!
- Starts this state machine. The machine will reset its configuration and
- transition to the initial state. When a final top-level state
+ Starts this state machine. When a final top-level state
is entered, the machine will emit the finished() signal.
\note A state machine will not run without a running event loop, such as
the main application event loop started with QCoreApplication::exec() or
QApplication::exec().
+ \note Calling start() after stop() will not result in a full reset of its
+ configuration yet, hence it is strongly advised not to do it.
+
+ \note Starting a finished machine yields a warning.
+
\sa runningChanged(), setRunning(), stop(), finished()
*/
void QScxmlStateMachine::start()
{
Q_D(QScxmlStateMachine);
+ if (d->isFinished()) {
+ qCWarning(qscxmlLog) << this << "Can't start finished machine";
+ }
+
if (!parseErrors().isEmpty())
return;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/scxml/qscxmlstatemachine_p.h new/qtscxml-everywhere-src-6.8.0/src/scxml/qscxmlstatemachine_p.h
--- old/qtscxml-everywhere-src-6.7.3/src/scxml/qscxmlstatemachine_p.h 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/src/scxml/qscxmlstatemachine_p.h 2024-10-02 16:25:33.000000000 +0200
@@ -89,7 +89,7 @@
} // QScxmlInternal namespace
class QScxmlInvokableService;
-class Q_SCXML_PRIVATE_EXPORT QScxmlStateMachinePrivate: public QObjectPrivate
+class Q_SCXML_EXPORT QScxmlStateMachinePrivate: public QObjectPrivate
{
Q_DECLARE_PUBLIC(QScxmlStateMachine)
@@ -391,6 +391,7 @@
}
bool isPaused() const { return m_runningState == Paused; }
+ bool isFinished() const { return m_runningState == Finished; }
QScxmlInternal::StateMachineInfoProxy *m_infoSignalProxy;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/scxmlqml/CMakeLists.txt new/qtscxml-everywhere-src-6.8.0/src/scxmlqml/CMakeLists.txt
--- old/qtscxml-everywhere-src-6.7.3/src/scxmlqml/CMakeLists.txt 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/src/scxmlqml/CMakeLists.txt 2024-10-02 16:25:33.000000000 +0200
@@ -24,6 +24,4 @@
Qt::Scxml
LIBRARIES
Qt::CorePrivate
- GENERATE_CPP_EXPORTS
- GENERATE_PRIVATE_CPP_EXPORTS
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/scxmlqml/eventconnection.cpp new/qtscxml-everywhere-src-6.8.0/src/scxmlqml/eventconnection.cpp
--- old/qtscxml-everywhere-src-6.7.3/src/scxmlqml/eventconnection.cpp 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/src/scxmlqml/eventconnection.cpp 2024-10-02 16:25:33.000000000 +0200
@@ -7,7 +7,7 @@
/*!
\qmltype EventConnection
-//! \instantiates QScxmlEventConnection
+//! \nativetype QScxmlEventConnection
\inqmlmodule QtScxml
\since QtScxml 5.8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/scxmlqml/eventconnection_p.h new/qtscxml-everywhere-src-6.8.0/src/scxmlqml/eventconnection_p.h
--- old/qtscxml-everywhere-src-6.7.3/src/scxmlqml/eventconnection_p.h 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/src/scxmlqml/eventconnection_p.h 2024-10-02 16:25:33.000000000 +0200
@@ -28,7 +28,7 @@
QT_BEGIN_NAMESPACE
// QScxmlEvent is used as signal parameter, and defined in the cpp lib
-struct Q_SCXMLQML_PRIVATE_EXPORT QScxmlEventForeign
+struct Q_SCXMLQML_EXPORT QScxmlEventForeign
{
Q_GADGET
QML_ANONYMOUS
@@ -36,7 +36,7 @@
QML_ADDED_IN_VERSION(5,8)
};
-class Q_SCXMLQML_PRIVATE_EXPORT QScxmlEventConnection : public QObject, public QQmlParserStatus
+class Q_SCXMLQML_EXPORT QScxmlEventConnection : public QObject, public QQmlParserStatus
{
Q_OBJECT
Q_PROPERTY(QStringList events READ events WRITE setEvents NOTIFY eventsChanged
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/scxmlqml/invokedservices.cpp new/qtscxml-everywhere-src-6.8.0/src/scxmlqml/invokedservices.cpp
--- old/qtscxml-everywhere-src-6.7.3/src/scxmlqml/invokedservices.cpp 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/src/scxmlqml/invokedservices.cpp 2024-10-02 16:25:33.000000000 +0200
@@ -8,7 +8,7 @@
/*!
\qmltype InvokedServices
-//! \instantiates QScxmlInvokedServices
+//! \nativetype QScxmlInvokedServices
\inqmlmodule QtScxml
\since QtScxml 5.8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/scxmlqml/invokedservices_p.h new/qtscxml-everywhere-src-6.8.0/src/scxmlqml/invokedservices_p.h
--- old/qtscxml-everywhere-src-6.7.3/src/scxmlqml/invokedservices_p.h 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/src/scxmlqml/invokedservices_p.h 2024-10-02 16:25:33.000000000 +0200
@@ -26,7 +26,7 @@
QT_BEGIN_NAMESPACE
-class Q_SCXMLQML_PRIVATE_EXPORT QScxmlInvokedServices : public QObject, public QQmlParserStatus
+class Q_SCXMLQML_EXPORT QScxmlInvokedServices : public QObject, public QQmlParserStatus
{
Q_OBJECT
Q_PROPERTY(QScxmlStateMachine *stateMachine READ stateMachine WRITE setStateMachine
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/scxmlqml/qscxmlqmlglobals_p.h new/qtscxml-everywhere-src-6.8.0/src/scxmlqml/qscxmlqmlglobals_p.h
--- old/qtscxml-everywhere-src-6.7.3/src/scxmlqml/qscxmlqmlglobals_p.h 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/src/scxmlqml/qscxmlqmlglobals_p.h 2024-10-02 16:25:33.000000000 +0200
@@ -16,11 +16,11 @@
//
#include <QtCore/qglobal.h>
-#include <QtScxmlQml/private/qtscxmlqmlexports_p.h>
+#include <QtScxmlQml/qtscxmlqmlexports.h>
QT_BEGIN_NAMESPACE
-void Q_SCXMLQML_PRIVATE_EXPORT qml_register_types_QtScxml();
+void Q_SCXMLQML_EXPORT qml_register_types_QtScxml();
QT_END_NAMESPACE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/scxmlqml/statemachineextended_p.h new/qtscxml-everywhere-src-6.8.0/src/scxmlqml/statemachineextended_p.h
--- old/qtscxml-everywhere-src-6.7.3/src/scxmlqml/statemachineextended_p.h 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/src/scxmlqml/statemachineextended_p.h 2024-10-02 16:25:33.000000000 +0200
@@ -25,7 +25,7 @@
QT_BEGIN_NAMESPACE
/* Allow State Machines created from QML to have children. */
-class Q_SCXMLQML_PRIVATE_EXPORT QScxmlStateMachineExtended : public QObject
+class Q_SCXMLQML_EXPORT QScxmlStateMachineExtended : public QObject
{
Q_OBJECT
Q_PROPERTY(QQmlListProperty<QObject> children READ children)
@@ -39,7 +39,7 @@
};
// The QScxmlStateMachine is defined in the scxml library
-struct Q_SCXMLQML_PRIVATE_EXPORT QScxmlStateMachineForeign
+struct Q_SCXMLQML_EXPORT QScxmlStateMachineForeign
{
Q_GADGET
QML_UNCREATABLE("Only created through derived types")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/scxmlqml/statemachineloader.cpp new/qtscxml-everywhere-src-6.8.0/src/scxmlqml/statemachineloader.cpp
--- old/qtscxml-everywhere-src-6.7.3/src/scxmlqml/statemachineloader.cpp 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/src/scxmlqml/statemachineloader.cpp 2024-10-02 16:25:33.000000000 +0200
@@ -12,7 +12,7 @@
/*!
\qmltype StateMachineLoader
-//! \instantiates QScxmlStateMachineLoader
+//! \nativetype QScxmlStateMachineLoader
\inqmlmodule QtScxml
\brief Dynamically loads an SCXML document and instantiates the state machine.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/scxmlqml/statemachineloader_p.h new/qtscxml-everywhere-src-6.8.0/src/scxmlqml/statemachineloader_p.h
--- old/qtscxml-everywhere-src-6.7.3/src/scxmlqml/statemachineloader_p.h 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/src/scxmlqml/statemachineloader_p.h 2024-10-02 16:25:33.000000000 +0200
@@ -25,7 +25,7 @@
QT_BEGIN_NAMESPACE
-class Q_SCXMLQML_PRIVATE_EXPORT QScxmlStateMachineLoader: public QObject
+class Q_SCXMLQML_EXPORT QScxmlStateMachineLoader: public QObject
{
Q_OBJECT
Q_PROPERTY(QUrl source READ source WRITE setSource
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/statemachine/CMakeLists.txt new/qtscxml-everywhere-src-6.8.0/src/statemachine/CMakeLists.txt
--- old/qtscxml-everywhere-src-6.7.3/src/statemachine/CMakeLists.txt 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/src/statemachine/CMakeLists.txt 2024-10-02 16:25:33.000000000 +0200
@@ -28,7 +28,6 @@
Qt::Core
PRIVATE_MODULE_INTERFACE
Qt::CorePrivate
- GENERATE_CPP_EXPORTS
)
## Scopes:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/statemachine/doc/qstatemachine-qml-guide.qdoc new/qtscxml-everywhere-src-6.8.0/src/statemachine/doc/qstatemachine-qml-guide.qdoc
--- old/qtscxml-everywhere-src-6.7.3/src/statemachine/doc/qstatemachine-qml-guide.qdoc 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/src/statemachine/doc/qstatemachine-qml-guide.qdoc 2024-10-02 16:25:33.000000000 +0200
@@ -8,8 +8,6 @@
\ingroup technology-apis
\ingroup explanation
- \tableofcontents
-
Qt State Machine QML APIs provide types for creating and
executing state graphs in QML. It is similar to the C++ State Machine
framework based on Harel's
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/statemachine/doc/qtstatemachine-cpp-guide.qdoc new/qtscxml-everywhere-src-6.8.0/src/statemachine/doc/qtstatemachine-cpp-guide.qdoc
--- old/qtscxml-everywhere-src-6.7.3/src/statemachine/doc/qtstatemachine-cpp-guide.qdoc 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/src/statemachine/doc/qtstatemachine-cpp-guide.qdoc 2024-10-02 16:25:33.000000000 +0200
@@ -9,8 +9,6 @@
\ingroup technology-apis
\ingroup explanation
- \tableofcontents
-
The State Machine framework provides classes for creating and executing
state graphs. This page illustrates the framework's key features in C++.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/statemachine/doc/qtstatemachine-overview.qdoc new/qtscxml-everywhere-src-6.8.0/src/statemachine/doc/qtstatemachine-overview.qdoc
--- old/qtscxml-everywhere-src-6.7.3/src/statemachine/doc/qtstatemachine-overview.qdoc 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/src/statemachine/doc/qtstatemachine-overview.qdoc 2024-10-02 16:25:33.000000000 +0200
@@ -8,8 +8,6 @@
\ingroup technology-apis
\ingroup explanation
- \tableofcontents
-
The State Machine framework provides classes for creating and executing
state graphs. The concepts and notation are based on those from Harel's
\l{http://www.wisdom.weizmann.ac.il/~dharel/SCANNED.PAPERS/Statecharts.pdf}{Statecharts: A visual formalism for complex systems}, which
Binary files old/qtscxml-everywhere-src-6.7.3/src/statemachine/doc/src/images/animatedtiles-example.png and new/qtscxml-everywhere-src-6.8.0/src/statemachine/doc/src/images/animatedtiles-example.png differ
Binary files old/qtscxml-everywhere-src-6.7.3/src/statemachine/doc/src/images/padnavigator-example.png and new/qtscxml-everywhere-src-6.8.0/src/statemachine/doc/src/images/padnavigator-example.png differ
Binary files old/qtscxml-everywhere-src-6.7.3/src/statemachine/doc/src/images/states-example.png and new/qtscxml-everywhere-src-6.8.0/src/statemachine/doc/src/images/states-example.png differ
Binary files old/qtscxml-everywhere-src-6.7.3/src/statemachine/doc/src/images/stickman-example.png and new/qtscxml-everywhere-src-6.8.0/src/statemachine/doc/src/images/stickman-example.png differ
Binary files old/qtscxml-everywhere-src-6.7.3/src/statemachine/doc/src/images/stickman-example1.png and new/qtscxml-everywhere-src-6.8.0/src/statemachine/doc/src/images/stickman-example1.png differ
Binary files old/qtscxml-everywhere-src-6.7.3/src/statemachine/doc/src/images/stickman-example2.png and new/qtscxml-everywhere-src-6.8.0/src/statemachine/doc/src/images/stickman-example2.png differ
Binary files old/qtscxml-everywhere-src-6.7.3/src/statemachine/doc/src/images/stickman-example3.png and new/qtscxml-everywhere-src-6.8.0/src/statemachine/doc/src/images/stickman-example3.png differ
Binary files old/qtscxml-everywhere-src-6.7.3/src/statemachine/doc/src/images/sub-attaq-demo.png and new/qtscxml-everywhere-src-6.8.0/src/statemachine/doc/src/images/sub-attaq-demo.png differ
Binary files old/qtscxml-everywhere-src-6.7.3/src/statemachine/doc/src/images/transitions.png and new/qtscxml-everywhere-src-6.8.0/src/statemachine/doc/src/images/transitions.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/statemachineqml/CMakeLists.txt new/qtscxml-everywhere-src-6.8.0/src/statemachineqml/CMakeLists.txt
--- old/qtscxml-everywhere-src-6.7.3/src/statemachineqml/CMakeLists.txt 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/src/statemachineqml/CMakeLists.txt 2024-10-02 16:25:33.000000000 +0200
@@ -27,6 +27,4 @@
Qt::StateMachine
LIBRARIES
Qt::QmlPrivate
- GENERATE_CPP_EXPORTS
- GENERATE_PRIVATE_CPP_EXPORTS
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/statemachineqml/finalstate_p.h new/qtscxml-everywhere-src-6.8.0/src/statemachineqml/finalstate_p.h
--- old/qtscxml-everywhere-src-6.7.3/src/statemachineqml/finalstate_p.h 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/src/statemachineqml/finalstate_p.h 2024-10-02 16:25:33.000000000 +0200
@@ -27,7 +27,7 @@
QT_BEGIN_NAMESPACE
-class Q_STATEMACHINEQML_PRIVATE_EXPORT FinalState : public QFinalState
+class Q_STATEMACHINEQML_EXPORT FinalState : public QFinalState
{
Q_OBJECT
Q_PROPERTY(QQmlListProperty<QObject> children READ children
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/statemachineqml/qstatemachineqmlglobals_p.h new/qtscxml-everywhere-src-6.8.0/src/statemachineqml/qstatemachineqmlglobals_p.h
--- old/qtscxml-everywhere-src-6.7.3/src/statemachineqml/qstatemachineqmlglobals_p.h 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/src/statemachineqml/qstatemachineqmlglobals_p.h 2024-10-02 16:25:33.000000000 +0200
@@ -16,11 +16,11 @@
//
#include <QtCore/qglobal.h>
-#include <QtStateMachineQml/private/qtstatemachineqmlexports_p.h>
+#include <QtStateMachineQml/qtstatemachineqmlexports.h>
QT_BEGIN_NAMESPACE
-void Q_STATEMACHINEQML_PRIVATE_EXPORT qml_register_types_QtQml_StateMachine();
+void Q_STATEMACHINEQML_EXPORT qml_register_types_QtQml_StateMachine();
QT_END_NAMESPACE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/statemachineqml/signaltransition_p.h new/qtscxml-everywhere-src-6.8.0/src/statemachineqml/signaltransition_p.h
--- old/qtscxml-everywhere-src-6.7.3/src/statemachineqml/signaltransition_p.h 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/src/statemachineqml/signaltransition_p.h 2024-10-02 16:25:33.000000000 +0200
@@ -30,7 +30,7 @@
QT_BEGIN_NAMESPACE
-class Q_STATEMACHINEQML_PRIVATE_EXPORT SignalTransition : public QSignalTransition, public QQmlParserStatus
+class Q_STATEMACHINEQML_EXPORT SignalTransition : public QSignalTransition, public QQmlParserStatus
{
Q_OBJECT
Q_INTERFACES(QQmlParserStatus)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/statemachineqml/state_p.h new/qtscxml-everywhere-src-6.8.0/src/statemachineqml/state_p.h
--- old/qtscxml-everywhere-src-6.7.3/src/statemachineqml/state_p.h 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/src/statemachineqml/state_p.h 2024-10-02 16:25:33.000000000 +0200
@@ -26,7 +26,7 @@
QT_BEGIN_NAMESPACE
-class Q_STATEMACHINEQML_PRIVATE_EXPORT State : public QState, public QQmlParserStatus
+class Q_STATEMACHINEQML_EXPORT State : public QState, public QQmlParserStatus
{
Q_OBJECT
Q_INTERFACES(QQmlParserStatus)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/statemachineqml/statemachine_p.h new/qtscxml-everywhere-src-6.8.0/src/statemachineqml/statemachine_p.h
--- old/qtscxml-everywhere-src-6.7.3/src/statemachineqml/statemachine_p.h 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/src/statemachineqml/statemachine_p.h 2024-10-02 16:25:33.000000000 +0200
@@ -26,7 +26,7 @@
QT_BEGIN_NAMESPACE
-class Q_STATEMACHINEQML_PRIVATE_EXPORT StateMachine : public QStateMachine, public QQmlParserStatus
+class Q_STATEMACHINEQML_EXPORT StateMachine : public QStateMachine, public QQmlParserStatus
{
Q_OBJECT
Q_INTERFACES(QQmlParserStatus)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/statemachineqml/statemachineforeign_p.h new/qtscxml-everywhere-src-6.8.0/src/statemachineqml/statemachineforeign_p.h
--- old/qtscxml-everywhere-src-6.7.3/src/statemachineqml/statemachineforeign_p.h 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/src/statemachineqml/statemachineforeign_p.h 2024-10-02 16:25:33.000000000 +0200
@@ -23,7 +23,7 @@
#include <QtStateMachine/qabstractstate.h>
#include <QtStateMachine/qsignaltransition.h>
-struct Q_STATEMACHINEQML_PRIVATE_EXPORT QHistoryStateForeign
+struct Q_STATEMACHINEQML_EXPORT QHistoryStateForeign
{
Q_GADGET
QML_FOREIGN(QHistoryState)
@@ -31,7 +31,7 @@
QML_ADDED_IN_VERSION(1, 0)
};
-struct Q_STATEMACHINEQML_PRIVATE_EXPORT QStateForeign
+struct Q_STATEMACHINEQML_EXPORT QStateForeign
{
Q_GADGET
QML_FOREIGN(QState)
@@ -40,7 +40,7 @@
QML_UNCREATABLE("Don't use this, use State instead.")
};
-struct Q_STATEMACHINEQML_PRIVATE_EXPORT QAbstractStateForeign
+struct Q_STATEMACHINEQML_EXPORT QAbstractStateForeign
{
Q_GADGET
QML_FOREIGN(QAbstractState)
@@ -49,7 +49,7 @@
QML_UNCREATABLE("Don't use this, use State instead.")
};
-struct Q_STATEMACHINEQML_PRIVATE_EXPORT QSignalTransitionForeign
+struct Q_STATEMACHINEQML_EXPORT QSignalTransitionForeign
{
Q_GADGET
QML_FOREIGN(QSignalTransition)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/statemachineqml/timeouttransition_p.h new/qtscxml-everywhere-src-6.8.0/src/statemachineqml/timeouttransition_p.h
--- old/qtscxml-everywhere-src-6.7.3/src/statemachineqml/timeouttransition_p.h 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/src/statemachineqml/timeouttransition_p.h 2024-10-02 16:25:33.000000000 +0200
@@ -25,7 +25,7 @@
QT_BEGIN_NAMESPACE
class QTimer;
-class Q_STATEMACHINEQML_PRIVATE_EXPORT TimeoutTransition : public QSignalTransition, public QQmlParserStatus
+class Q_STATEMACHINEQML_EXPORT TimeoutTransition : public QSignalTransition, public QQmlParserStatus
{
Q_OBJECT
Q_PROPERTY(int timeout READ timeout WRITE setTimeout BINDABLE bindableTimeout)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/tests/auto/statemachine/tst_statemachine.cpp new/qtscxml-everywhere-src-6.8.0/tests/auto/statemachine/tst_statemachine.cpp
--- old/qtscxml-everywhere-src-6.7.3/tests/auto/statemachine/tst_statemachine.cpp 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/tests/auto/statemachine/tst_statemachine.cpp 2024-10-02 16:25:33.000000000 +0200
@@ -31,6 +31,7 @@
void doneDotStateEvent();
void running();
+ void restart();
void invokeStateMachine();
@@ -392,6 +393,24 @@
QCOMPARE(stateMachine->isRunning(), false);
}
+void tst_StateMachine::restart()
+{
+ QScopedPointer<QScxmlStateMachine> stateMachine(
+ QScxmlStateMachine::fromFile(QString(":/tst_statemachine/stateDotDoneEvent.scxml")));
+ QVERIFY(!stateMachine.isNull());
+
+ QSignalSpy finishedSpy(stateMachine.data(), SIGNAL(finished()));
+
+ stateMachine->start();
+ finishedSpy.wait(5000);
+ QCOMPARE(finishedSpy.size(), 1);
+ QCOMPARE(stateMachine->activeStateNames(true).size(), 1);
+ QVERIFY(stateMachine->activeStateNames(true).contains(QLatin1String("success")));
+
+ QTest::ignoreMessage(QtWarningMsg, QRegularExpression("(.*)Can't start finished machine"));
+ stateMachine->start();
+}
+
void tst_StateMachine::invokeStateMachine()
{
QScopedPointer<QScxmlStateMachine> stateMachine(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/generator.cpp new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/generator.cpp
--- old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/generator.cpp 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/generator.cpp 2024-10-02 16:25:33.000000000 +0200
@@ -877,7 +877,7 @@
//
if (cdef->propertyList.size())
- fprintf(out, "\n // properties: name, type, flags\n");
+ fprintf(out, "\n // properties: name, type, flags, notifyId, revision\n");
for (const PropertyDef &p : std::as_const(cdef->propertyList)) {
uint flags = Invalid;
if (!isBuiltinType(p.type))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/moc.cpp new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/moc.cpp
--- old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/moc.cpp 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/moc.cpp 2024-10-02 16:25:33.000000000 +0200
@@ -79,6 +79,7 @@
}
}
def->classname = name;
+ def->lineNumber = symbol().lineNum;
if (test(IDENTIFIER)) {
const QByteArray lex = lexem();
@@ -437,7 +438,7 @@
// note that testFunctionAttribute is handled further below,
// and revisions and attributes must come first
while (testForFunctionModifiers(def)) {}
- Type tempType = parseType();;
+ Type tempType = parseType();
while (!tempType.name.isEmpty() && lookup() != LPAREN) {
if (testFunctionAttribute(def->type.firstToken, def))
; // fine
@@ -555,7 +556,7 @@
// but otherwise we end up with misparses
if (def->isSlot || def->isSignal || def->isInvokable)
while (testForFunctionModifiers(def)) {}
- Type tempType = parseType();;
+ Type tempType = parseType();
while (!tempType.name.isEmpty() && lookup() != LPAREN) {
if (testFunctionAttribute(def->type.firstToken, def))
; // fine
@@ -692,6 +693,7 @@
} else if (!test(SEMIC)) {
NamespaceDef def;
def.classname = nsName;
+ def.lineNumber = symbol().lineNum;
def.doGenerate = currentFilenames.size() <= 1;
next(LBRACE);
@@ -2005,6 +2007,7 @@
QJsonObject cls;
cls["className"_L1] = QString::fromUtf8(classname.constData());
cls["qualifiedClassName"_L1] = QString::fromUtf8(qualified.constData());
+ cls["lineNumber"_L1] = lineNumber;
QJsonArray classInfos;
for (const auto &info: std::as_const(classInfoList)) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/moc.h new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/moc.h
--- old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/moc.h 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/moc.h 2024-10-02 16:25:33.000000000 +0200
@@ -163,6 +163,7 @@
QMap<QByteArray, QByteArray> flagAliases;
qsizetype begin = 0;
qsizetype end = 0;
+ qsizetype lineNumber = 0;
};
struct SuperClass {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/moc_patches/generator.cpp.patch new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/moc_patches/generator.cpp.patch
--- old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/moc_patches/generator.cpp.patch 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/moc_patches/generator.cpp.patch 2024-10-02 16:25:33.000000000 +0200
@@ -1,5 +1,5 @@
---- .upstream/generator.cpp 2024-02-01 11:08:00.055494626 +0100
-+++ generator.cpp 2024-02-05 14:18:32.229391845 +0100
+--- .upstream/generator.cpp 2024-05-08 08:57:34.586091856 +0200
++++ generator.cpp 2024-08-05 16:00:04.723392397 +0200
@@ -4,7 +4,9 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/moc_patches/generator.h.patch new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/moc_patches/generator.h.patch
--- old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/moc_patches/generator.h.patch 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/moc_patches/generator.h.patch 2024-10-02 16:25:33.000000000 +0200
@@ -1,5 +1,5 @@
---- .upstream/generator.h 2023-06-22 20:40:43.078529554 +0200
-+++ generator.h 2024-02-05 14:06:04.258179059 +0100
+--- .upstream/generator.h 2023-06-22 08:29:43.218633538 +0200
++++ generator.h 2024-08-05 16:00:04.719392449 +0200
@@ -6,23 +6,34 @@
#include "moc.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/moc_patches/moc.cpp.patch new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/moc_patches/moc.cpp.patch
--- old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/moc_patches/moc.cpp.patch 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/moc_patches/moc.cpp.patch 2024-10-02 16:25:33.000000000 +0200
@@ -1,5 +1,5 @@
---- .upstream/moc.cpp 2024-02-01 11:08:00.055494626 +0100
-+++ moc.cpp 2024-02-05 14:06:04.258179059 +0100
+--- .upstream/moc.cpp 2024-08-05 12:14:28.111250492 +0200
++++ moc.cpp 2024-08-05 16:00:04.711392552 +0200
@@ -12,14 +12,15 @@
#include <QtCore/qdir.h>
#include <QtCore/qjsondocument.h>
@@ -19,7 +19,7 @@
// only moc needs this function
static QByteArray normalizeType(const QByteArray &ba)
{
-@@ -1997,6 +1998,7 @@
+@@ -1999,6 +2000,7 @@
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/moc_patches/moc.h.patch new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/moc_patches/moc.h.patch
--- old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/moc_patches/moc.h.patch 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/moc_patches/moc.h.patch 2024-10-02 16:25:33.000000000 +0200
@@ -1,5 +1,5 @@
---- .upstream/moc.h 2024-02-05 14:10:55.937714571 +0100
-+++ moc.h 2024-02-05 14:12:52.133597464 +0100
+--- .upstream/moc.h 2024-08-05 12:14:28.111250492 +0200
++++ moc.h 2024-08-05 16:00:04.715392500 +0200
@@ -4,14 +4,12 @@
#ifndef MOC_H
#define MOC_H
@@ -76,7 +76,7 @@
};
Q_DECLARE_TYPEINFO(PropertyDef, Q_RELOCATABLE_TYPE);
-@@ -204,6 +214,7 @@
+@@ -205,6 +215,7 @@
};
Q_DECLARE_TYPEINFO(NamespaceDef, Q_RELOCATABLE_TYPE);
@@ -84,7 +84,7 @@
class Moc : public Parser
{
public:
-@@ -293,6 +304,7 @@
+@@ -294,6 +305,7 @@
void checkListSizes(const ClassDef &def);
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/moc_patches/outputrevision.h.patch new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/moc_patches/outputrevision.h.patch
--- old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/moc_patches/outputrevision.h.patch 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/moc_patches/outputrevision.h.patch 2024-10-02 16:25:33.000000000 +0200
@@ -1,5 +1,5 @@
---- .upstream/outputrevision.h 2022-05-23 08:46:14.490945334 +0200
-+++ outputrevision.h 2024-02-05 14:06:04.254179068 +0100
+--- .upstream/outputrevision.h 2022-07-14 10:20:51.543950028 +0200
++++ outputrevision.h 2024-08-05 16:00:04.703392655 +0200
@@ -4,7 +4,13 @@
#ifndef OUTPUTREVISION_H
#define OUTPUTREVISION_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/qscxmlc.h new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/qscxmlc.h
--- old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/qscxmlc.h 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/qscxmlc.h 2024-10-02 16:25:33.000000000 +0200
@@ -1,5 +1,5 @@
// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#ifndef QSCXMLC_H
#define QSCXMLC_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/utils.h new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/utils.h
--- old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/utils.h 2024-09-19 20:58:59.000000000 +0200
+++ new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/utils.h 2024-10-02 16:25:33.000000000 +0200
@@ -1,5 +1,5 @@
// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#ifndef UTILS_H
#define UTILS_H
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt6-quick3d for openSUSE:Factory checked in at 2024-10-17 18:37:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt6-quick3d (Old)
and /work/SRC/openSUSE:Factory/.qt6-quick3d.new.19354 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-quick3d"
Thu Oct 17 18:37:50 2024 rev:26 rq:1207623 version:6.8.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/qt6-quick3d/qt6-quick3d.changes 2024-10-03 18:02:30.271494066 +0200
+++ /work/SRC/openSUSE:Factory/.qt6-quick3d.new.19354/qt6-quick3d.changes 2024-10-17 18:37:54.358670298 +0200
@@ -1,0 +2,6 @@
+Tue Oct 8 09:29:49 UTC 2024 - Christophe Marin <christophe(a)krop.fr>
+
+- Update to 6.8.0:
+ * https://www.qt.io/blog/qt-6.8-released
+
+-------------------------------------------------------------------
Old:
----
qtquick3d-everywhere-src-6.7.3.tar.xz
New:
----
qtquick3d-everywhere-src-6.8.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt6-quick3d.spec ++++++
--- /var/tmp/diff_new_pack.jZqbVm/_old 2024-10-17 18:37:58.118827093 +0200
+++ /var/tmp/diff_new_pack.jZqbVm/_new 2024-10-17 18:37:58.134827760 +0200
@@ -1,7 +1,7 @@
#
# spec file for package qt6-quick3d
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,8 +16,8 @@
#
-%define real_version 6.7.3
-%define short_version 6.7
+%define real_version 6.8.0
+%define short_version 6.8
%define tar_name qtquick3d-everywhere-src
%define tar_suffix %{nil}
#
@@ -27,7 +27,7 @@
%endif
#
Name: qt6-quick3d%{?pkg_suffix}
-Version: 6.7.3
+Version: 6.8.0
Release: 0
Summary: API for creating 3D content and 3D user interfaces based on Qt Quick
License: GPL-3.0-or-later
@@ -360,6 +360,20 @@
This package provides private headers of libQt6Quick3DUtils that do not have any
ABI or API guarantees.
+%package -n libQt6Quick3DXr6
+Summary: Qt 6 Quick3DXr library
+
+%description -n libQt6Quick3DXr6
+Adds OpenXR support for applications using QtQuick3D.
+
+%package -n qt6-quick3dxr-private-devel
+Summary: Qt 6 Quick3DXr library - Development files
+Requires: libQt6Quick3DXr6 = %{version}
+
+%description -n qt6-quick3dxr-private-devel
+Development files for the Qt 6 Quick3DXr library.
+This library does not have any ABI or API guarantees.
+
### Private only library ###
@@ -400,10 +414,16 @@
%autosetup -p1 -n %{tar_name}-%{real_version}%{tar_suffix}
%build
-%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
+# Package provides static libraries, -ffat-lto-objects is not enough for libQt6BundledEmbree.a
+%global _lto_cflags %{nil}
+
+%if %{qt6_docs_flavor}
+# Work around https://bugreports.qt.io/browse/QTBUG-129807
+%define extra_args -DFEATURE_quick3dxr_openxr:BOOL=OFF -DFEATURE_system_openxr:BOOL=OFF
+%endif
%cmake_qt6 \
- -DFEATURE_system_assimp=ON
+ -DFEATURE_system_assimp:BOOL=ON %{?extra_args}
%{qt6_build}
@@ -422,6 +442,11 @@
rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_quick3deffects_private.pri
rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_quick3dparticleeffects_private.pri
+# Probably unneeded
+rm %{buildroot}%{_qt6_cmakedir}/Qt6/FindWrapBundledOpenXRConfigExtra.cmake
+rm %{buildroot}%{_qt6_libdir}/libQt6BundledOpenXR.a
+rm -r %{buildroot}%{_qt6_cmakedir}/Qt6BundledOpenXR
+
%fdupes %{buildroot}%{_qt6_qmldir}/QtQuick3D
%ldconfig_scriptlets -n libQt6Quick3D6
@@ -436,6 +461,7 @@
%ldconfig_scriptlets -n libQt6Quick3DParticles6
%ldconfig_scriptlets -n libQt6Quick3DRuntimeRender6
%ldconfig_scriptlets -n libQt6Quick3DUtils6
+%ldconfig_scriptlets -n libQt6Quick3DXr6
%files
# No better place to install these quick3d plugins
@@ -465,6 +491,7 @@
%files devel
%{_qt6_cmakedir}/Qt6/FindWrapQuick3DAssimp.cmake
+%{_qt6_cmakedir}/Qt6/FindWrapOpenXR.cmake
%{_qt6_cmakedir}/Qt6BuildInternals/StandaloneTests/QtQuick3DTestsConfig.cmake
%{_qt6_cmakedir}/Qt6Quick3D/
# Only required by Qt6Quick3DDependencies.cmake
@@ -650,6 +677,26 @@
%{_qt6_includedir}/QtQuick3DUtils/%{real_version}/
%{_qt6_mkspecsdir}/modules/qt_lib_quick3dutils_private.pri
+%files -n libQt6Quick3DXr6
+%{_qt6_libdir}/libQt6Quick3DXr.so.*
+
+%files -n qt6-quick3dxr-private-devel
+%{_qt6_cmakedir}/Qt6/FindWrapSystemOpenXR.cmake
+%{_qt6_cmakedir}/Qt6OpenXRPrivate/
+%{_qt6_cmakedir}/Qt6Quick3DXr/
+%{_qt6_descriptionsdir}/OpenXRPrivate.json
+%{_qt6_descriptionsdir}/Quick3DXr.json
+%{_qt6_includedir}/QtOpenXR/
+%{_qt6_includedir}/QtQuick3DXr/
+%{_qt6_libdir}/libQt6Quick3DXr.prl
+%{_qt6_libdir}/libQt6Quick3DXr.so
+%{_qt6_metatypesdir}/qt6quick3dxr_*_metatypes.json
+%{_qt6_mkspecsdir}/modules/qt_ext_openxr_loader.pri
+%{_qt6_mkspecsdir}/modules/qt_lib_openxr_private.pri
+%{_qt6_mkspecsdir}/modules/qt_lib_quick3dxr.pri
+%{_qt6_mkspecsdir}/modules/qt_lib_quick3dxr_private.pri
+%{_qt6_pkgconfigdir}/Qt6Quick3DXr.pc
+
### Private only library ###
%files -n libQt6Quick3DGlslParser6
++++++ qtquick3d-everywhere-src-6.7.3.tar.xz -> qtquick3d-everywhere-src-6.8.0.tar.xz ++++++
/work/SRC/openSUSE:Factory/qt6-quick3d/qtquick3d-everywhere-src-6.7.3.tar.xz /work/SRC/openSUSE:Factory/.qt6-quick3d.new.19354/qtquick3d-everywhere-src-6.8.0.tar.xz differ: char 26, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt6-qt5compat for openSUSE:Factory checked in at 2024-10-17 18:37:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt6-qt5compat (Old)
and /work/SRC/openSUSE:Factory/.qt6-qt5compat.new.19354 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-qt5compat"
Thu Oct 17 18:37:49 2024 rev:33 rq:1207622 version:6.8.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/qt6-qt5compat/qt6-qt5compat.changes 2024-10-03 18:02:28.915437629 +0200
+++ /work/SRC/openSUSE:Factory/.qt6-qt5compat.new.19354/qt6-qt5compat.changes 2024-10-17 18:37:52.790604912 +0200
@@ -1,0 +2,6 @@
+Tue Oct 8 09:29:48 UTC 2024 - Christophe Marin <christophe(a)krop.fr>
+
+- Update to 6.8.0:
+ * https://www.qt.io/blog/qt-6.8-released
+
+-------------------------------------------------------------------
Old:
----
qt5compat-everywhere-src-6.7.3.tar.xz
New:
----
qt5compat-everywhere-src-6.8.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt6-qt5compat.spec ++++++
--- /var/tmp/diff_new_pack.3rNet3/_old 2024-10-17 18:37:53.550636604 +0200
+++ /var/tmp/diff_new_pack.3rNet3/_new 2024-10-17 18:37:53.554636771 +0200
@@ -1,7 +1,7 @@
#
# spec file for package qt6-qt5compat
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,8 +16,8 @@
#
-%define real_version 6.7.3
-%define short_version 6.7
+%define real_version 6.8.0
+%define short_version 6.8
%define tar_name qt5compat-everywhere-src
%define tar_suffix %{nil}
#
@@ -27,7 +27,7 @@
%endif
#
Name: qt6-qt5compat%{?pkg_suffix}
-Version: 6.7.3
+Version: 6.8.0
Release: 0
Summary: Unsupported Qt 5 APIs for Qt 6
License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
++++++ qt5compat-everywhere-src-6.7.3.tar.xz -> qt5compat-everywhere-src-6.8.0.tar.xz ++++++
/work/SRC/openSUSE:Factory/qt6-qt5compat/qt5compat-everywhere-src-6.7.3.tar.xz /work/SRC/openSUSE:Factory/.qt6-qt5compat.new.19354/qt5compat-everywhere-src-6.8.0.tar.xz differ: char 27, line 1
1
0