Accepting request 1281899 from KDE:Frameworks5

OBS-URL: https://build.opensuse.org/request/show/1281899
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/AppStream?expand=0&rev=52

AppStream-1.0.4.tar.xz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEE0zo/DKFrCsxRpgc4SUyKX79N7OsFAmdWHykACgkQSUyKX79N
-7OsXYA/+NB7UtHMYck//r/7r//RmCZ1fN8TTAEjRrf1qnECuvEh0Tpm3J+pytN6C
-Caczv36ZM7pdr/W8ivLXmExjiielo38cG5rpiL1qkt2KNMq1Ub2dnDu36KNI5vvb
-G1T7YOIpXpgEgi9gChcpksZ8pFN26qEDrogjG2+qck7faOglAUox5lp9muKBoEsM
-UkAKT49slQEGeucWffKnIF/wxX902jtbrvcdIyrDuhadiCa4KK7KJ9VcJ0j+mTWH
-6erJ3DOhx8+bRaqxeQDCfZKhkxvEQ1Rt2fOk4qg3TGPhwS42mTNg5C8WHXgT44Zg
-p2ph998TJsUz5ucLfbir05fnhXOyBbALRndG65JNYCloPctDF0bEC1rK9bJbdHm5
-rJlf9J+cC5rBV936jh5fC0qwz0u8T31V3Dfs8VY0aFidMizl78qflUU0pod/ppNj
-9Wrw/7q8HWStMQYflSNJ0niXlzRb//PCodjJ7UbxaLTyBukVOtpHCABklKc9OA4y
-me0ks1vvgomy91iybnjA/kk/0UaZOIqkjAfU7vdxGy8vmmigEt0+WvbN7e1xRgpT
-bDF0V9POWEE69sVLCw76GamkgIYID9lEa0CRmdxfr+xnrId+pywjfdwINK6W9vsn
-3NyVMicP3vKMg1Cztfp2xsJcZnCXTOfpGOVjTuS1MZBSPC+y6Tw=
-=I0fK
------END PGP SIGNATURE-----

AppStream-1.0.5.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ce0ed29e89abd5f0cf790ea87d792f1967c3413060beb30e63a979578d975121
+size 2727088

AppStream-1.0.5.tar.xz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEE0zo/DKFrCsxRpgc4SUyKX79N7OsFAmgKWY0ACgkQSUyKX79N
+7OvoDw/+OF6gQM5thkBU4lZrKP9EN9jZtuYhrT51h6NoAFoI8g8PGtdeLWXqViGl
+ama4yHGVXiz94/xhXVQbBqEHbvElAeq65NRZ/78lvv6NNpO3i6eAr6Ru3P5AHi2f
+h6KQfrHEejOa1HpNiayzuKy7rwbDUW2A1xUWpXCjgRVnuu7hEompPq0/AAOyQo0S
+Wx+ONOWTSgFMRf5TRDoOioBSTEYcasT8kuye2xWj7fy3B9WyF9qWeFU/ExepiqX0
+Egt1srENOO4hI4lTQL/Qt/Pv4NpP3TyDmF4W3UUnqyA4RLIxpO+OJlRJXtxEUZrN
+K/4vxqkWCuj4N5dPSRAA+DH+myCkzdsDDCgWTj/lziTxlP7Gn8x3jahK0xebtD8O
+cnmHUprWMGX+eoaWiQXTLEXD0gZYNME2LTttqV1BrGf0Z487IZHVAkpWbJkgzTVo
++XVsRg0KZw0W5kwaI+7QRZyPb50sD+TjsKmHRv5YDCOTfM07EnGKx23dKD4eZ1M0
+bzW7XTXZvXGX/TPl1JQzQQr1A6pGZiklWbom5hTAFxnDqLzJY9DjAt0fVPJAAV2j
+UKfFKGut9L2Jq5joeIj7tZaF3/Oep/Jx2CfMEwC5OSyhfEMR+Y4CjFbW0CAgO815
+WgGd2yIQU63XK01aDMK+BrVEswBeXUGtaPVS/B+55WI+2oYCRew=
+=zesi
+-----END PGP SIGNATURE-----

AppStream.changes

@@ -1,3 +1,52 @@
+-------------------------------------------------------------------
+Fri May 30 08:17:19 UTC 2025 - Antonio Larrosa <alarrosa@suse.com>
+
+- Make qt6 the default qt flavor and qt5 the flavor built
+  separately and disable the qt5 flavor in SLE16 where we don't
+  want to have Qt5 libraries.
+
+-------------------------------------------------------------------
+Wed Apr 30 15:23:00 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 1.0.5
+  Features:
+  * qt: Expose markup conversion utils
+  * desktop-styles: Add android and iOS
+  * validator: Check for xml:lang="en" being used on description
+    template elements
+  * validator: Flag cases of raw text in "description" elements
+  * metadata: Add more known extensions into
+    as_metadata_file_guess_style()
+  Specification:
+  * docs: Clarify that the style segment of a screenshot
+    environment is optional
+  * docs: Explain consequences of defining an icon for
+    desktop-app metainfo
+  * docs: Clarify that description content must be in p/li
+    elements
+  Bugfixes:
+  * validator: mark as_validator_issue_tag_list static
+  * docs: Add workaround for gi-docgen misnaming devhelp files
+  * compose: Do not permit SVG images as screenshots
+  * compose: Don't "forget" to scan remaining paths when
+    re-encountering a dir
+  * pool: Try explicit singular term match if we only have
+    low-quality tokens
+  * utils: Provide compatibility with Fedora icon tarballs when
+    installing them
+  * utils: Remove leftover g_chmod()
+  * zstd-decompressor: Pass output/written data when decompression
+    finished
+  * utils: Expect a dash in icons file name
+  * utils: Recognize .yml* and .yaml* file extension variants,
+    and .zst extension
+  * utils: Rename the appstream file when re-saving it on install
+
+-------------------------------------------------------------------
+Sun Mar 23 19:05:11 UTC 2025 - Marcus Meissner <meissner@suse.com>
+
+- build with PIE mode also when using gcc13 (bsc#1239941)
+
 -------------------------------------------------------------------
 Fri Dec 20 20:08:20 UTC 2024 - Christophe Marin <christophe@krop.fr>
 

AppStream.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package AppStream
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,12 +17,16 @@
 
 
 %global flavor @BUILD_FLAVOR@%{nil}
-%if "%flavor" == "qt6"
+%if "%flavor" == "qt5"
-%define pkg_suffix -qt6
-%define qt6 1
-%define min_qt_version 6.2.4
-%else
 %define min_qt_version 5.15
+%define qt5 1
+%define pkg_suffix -qt5
+
+%if 0%{?suse_version} == 1600 && ! 0%{?is_opensuse}
+ExclusiveArch:  donotbuild
+%endif
+%else
+%define min_qt_version 6.2.4
 %if 0%{?sle_version} >= 150400 && 0%{?is_opensuse} || 0%{?sle_version} >= 150600 || 0%{?suse_version} > 1500
 %bcond_without vala
 %endif
@@ -36,7 +40,7 @@
 %define libAppStreamQt_sover 3
 %define libappstream_compose_sover 0
 Name:           AppStream%{?pkg_suffix}
-Version:        1.0.4
+Version:        1.0.5
 Release:        0
 Summary:        Tools and libraries to work with AppStream metadata
 License:        LGPL-2.1-or-later
@@ -50,6 +54,7 @@ BuildRequires:  cairo-devel
 BuildRequires:  docbook-xsl-stylesheets
 %if %{with gcc13}
 BuildRequires:  gcc13
+BuildRequires:  gcc13-PIE
 BuildRequires:  gcc13-c++
 %endif
 BuildRequires:  gdk-pixbuf-loader-rsvg
@@ -59,12 +64,12 @@ BuildRequires:  itstool
 BuildRequires:  meson >= 0.59
 BuildRequires:  pkgconfig
 BuildRequires:  xsltproc
-%if 0%{?qt6}
+%if 0%{?qt5}
-BuildRequires:  pkgconfig(Qt6Core) >= %{min_qt_version}
-BuildRequires:  pkgconfig(Qt6Test) >= %{min_qt_version}
-%else
 BuildRequires:  pkgconfig(Qt5Core) >= %{min_qt_version}
 BuildRequires:  pkgconfig(Qt5Test) >= %{min_qt_version}
+%else
+BuildRequires:  pkgconfig(Qt6Core) >= %{min_qt_version}
+BuildRequires:  pkgconfig(Qt6Test) >= %{min_qt_version}
 %endif
 BuildRequires:  pkgconfig(gdk-pixbuf-2.0)
 BuildRequires:  pkgconfig(gio-2.0)
@@ -86,34 +91,7 @@ BuildRequires:  vala
 AppStream-Core makes it easy to access application information from the
 AppStream database over a nice GObject-based interface.
 
-%if 0%{?qt6}
+%if 0%{?qt5}
-%package -n libAppStreamQt%{libAppStreamQt_sover}
-Summary:        Qt 6 bindings for AppStream
-License:        GPL-2.0-or-later AND LGPL-2.1-or-later
-
-%description -n libAppStreamQt%{libAppStreamQt_sover}
-The Qt 6 bindings for AppStream.
-
-%package -n appstream-qt6-devel
-Summary:        Header files for AppStream's Qt 6 bindings
-License:        GPL-2.0-or-later AND LGPL-2.1-or-later
-Requires:       libAppStreamQt%{libAppStreamQt_sover} = %{version}
-Requires:       libappstream%{libappstream_sover} = %{version}
-Conflicts:      libAppStreamQt-devel < 1.0
-
-%description -n appstream-qt6-devel
-This package contains all necessary include files, libraries,
-configuration files and development tools (with manual pages) needed to
-compile and link applications using the Qt bindings for AppStream.
-%else
-
-%package -n libappstream%{libappstream_sover}
-Summary:        The main library for AppStream
-License:        GPL-2.0-or-later AND LGPL-2.1-or-later
-
-%description -n libappstream%{libappstream_sover}
-The main library for AppStream.
-
 %package -n libAppStreamQt5-%{libAppStreamQt_sover}
 Summary:        Qt 5 bindings for AppStream
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -135,6 +113,34 @@ This package contains all necessary include files, libraries,
 configuration files and development tools (with manual pages) needed to
 compile and link applications using the Qt bindings for AppStream.
 
+%else
+
+%package -n libAppStreamQt%{libAppStreamQt_sover}
+Summary:        Qt 6 bindings for AppStream
+License:        GPL-2.0-or-later AND LGPL-2.1-or-later
+
+%description -n libAppStreamQt%{libAppStreamQt_sover}
+The Qt 6 bindings for AppStream.
+
+%package -n appstream-qt6-devel
+Summary:        Header files for AppStream's Qt 6 bindings
+License:        GPL-2.0-or-later AND LGPL-2.1-or-later
+Requires:       libAppStreamQt%{libAppStreamQt_sover} = %{version}
+Requires:       libappstream%{libappstream_sover} = %{version}
+Conflicts:      libAppStreamQt-devel < 1.0
+
+%description -n appstream-qt6-devel
+This package contains all necessary include files, libraries,
+configuration files and development tools (with manual pages) needed to
+compile and link applications using the Qt bindings for AppStream.
+
+%package -n libappstream%{libappstream_sover}
+Summary:        The main library for AppStream
+License:        GPL-2.0-or-later AND LGPL-2.1-or-later
+
+%description -n libappstream%{libappstream_sover}
+The main library for AppStream.
+
 %package compose
 Summary:        Support for appstreamcli compose
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -217,10 +223,10 @@ GObject introspection bindings for interfaces provided by AppStream.
 %define build_vapi false
 %endif
 
-%if 0%{?qt6}
+%if 0%{?qt5}
-%define options -Dqt=true -Dqt-versions=6 -Dvapi=false -Dcompose=false -Dgir=false
+%define options -Dqt=true -Dqt-versions=5 -Dvapi=false -Dcompose=false -Dgir=false
 %else
-%define options -Dqt=true -Dqt-versions=5 -Dcompose=true -Dvapi=%{build_vapi}
+%define options -Dqt=true -Dqt-versions=6 -Dcompose=true -Dvapi=%{build_vapi}
 %endif
 
 %if %{with gcc13}
@@ -237,8 +243,8 @@ export CC=gcc-13 CXX=g++-13
 # Unneeded test file
 rm -r %{buildroot}%{_datadir}/installed-tests
 
-# Only keep the Qt6 library when using the qt6 flavor
+# Only keep the Qt5 library when using the qt5 flavor
-%if 0%{?qt6}
+%if 0%{?qt5}
 rm %{buildroot}%{_bindir}/appstreamcli
 rm %{buildroot}%{_libdir}/libappstream.so*
 rm -r %{buildroot}%{_datadir}/{appstream,doc,gettext,locale,man,metainfo}
@@ -251,24 +257,23 @@ rm -r %{buildroot}%{_libdir}/pkgconfig
 %check
 %meson_test
 
-%if 0%{?qt6}
+%if 0%{?qt5}
-%ldconfig_scriptlets -n libAppStreamQt%{libAppStreamQt_sover}
+%ldconfig_scriptlets -n libAppStreamQt5-%{libAppStreamQt_sover}
 %else
 %ldconfig_scriptlets -n libappstream%{libappstream_sover}
-%ldconfig_scriptlets -n libAppStreamQt5-%{libAppStreamQt_sover}
+%ldconfig_scriptlets -n libAppStreamQt%{libAppStreamQt_sover}
 %ldconfig_scriptlets -n libappstream-compose%{libappstream_compose_sover}
 %endif
 
-%if 0%{?qt6}
+%if 0%{?qt5}
-%files -n libAppStreamQt%{libAppStreamQt_sover}
+%files -n libAppStreamQt5-%{libAppStreamQt_sover}
-%{_libdir}/libAppStreamQt.so.%{libAppStreamQt_sover}
+%{_libdir}/libAppStreamQt5.so.%{libAppStreamQt_sover}
-%{_libdir}/libAppStreamQt.so.%{version}
+%{_libdir}/libAppStreamQt5.so.%{version}
-
-%files -n appstream-qt6-devel
-%{_includedir}/AppStreamQt/
-%{_libdir}/cmake/AppStreamQt/
-%{_libdir}/libAppStreamQt.so
 
+%files -n appstream-qt5-devel
+%{_includedir}/AppStreamQt5/
+%{_libdir}/cmake/AppStreamQt5/
+%{_libdir}/libAppStreamQt5.so
 %else
 
 %files lang -f %{name}.lang
@@ -287,14 +292,14 @@ rm -r %{buildroot}%{_libdir}/pkgconfig
 %{_libdir}/libappstream.so.%{libappstream_sover}
 %{_libdir}/libappstream.so.%{version}
 
-%files -n libAppStreamQt5-%{libAppStreamQt_sover}
+%files -n libAppStreamQt%{libAppStreamQt_sover}
-%{_libdir}/libAppStreamQt5.so.%{libAppStreamQt_sover}
+%{_libdir}/libAppStreamQt.so.%{libAppStreamQt_sover}
-%{_libdir}/libAppStreamQt5.so.%{version}
+%{_libdir}/libAppStreamQt.so.%{version}
 
-%files -n appstream-qt5-devel
+%files -n appstream-qt6-devel
-%{_includedir}/AppStreamQt5/
+%{_includedir}/AppStreamQt/
-%{_libdir}/cmake/AppStreamQt5/
+%{_libdir}/cmake/AppStreamQt/
-%{_libdir}/libAppStreamQt5.so
+%{_libdir}/libAppStreamQt.so
 
 %files compose
 %{_datadir}/metainfo/org.freedesktop.appstream.compose.metainfo.xml

_multibuild

@@ -1,3 +1,3 @@
 <multibuild>
-  <flavor>qt6</flavor>
+  <flavor>qt5</flavor>
 </multibuild>

support-meson0.59.patch

@@ -3,12 +3,12 @@ Author: Antonio Larrosa
 
 ---
  data/meson.build | 12 ++++++++++++
- meson.build      |  4 ++--
+ meson.build      |  3 ++-
  po/meson.build   | 15 +++++++++++++++
- 3 files changed, 29 insertions(+), 2 deletions(-)
+ 3 files changed, 29 insertions(+), 1 deletion(-)
 
 diff --git a/data/meson.build b/data/meson.build
-index 7ae7a9b3..b9208821 100644
+index 7ae7a9b..b920882 100644
 --- a/data/meson.build
 +++ b/data/meson.build
 @@ -24,6 +24,17 @@ metainfo_with_relinfo = custom_target('gen-output',
@@ -38,27 +38,26 @@ index 7ae7a9b3..b9208821 100644
  test('as-validate_metainfo.cli',
      ascli_exe,
 diff --git a/meson.build b/meson.build
-index 4636789f..6742fc7c 100644
+index ce84a77..e378bad 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -1,5 +1,5 @@
  project('AppStream', 'c',
 -  meson_version: '>=0.62',
 +  meson_version: '>=0.59',
-   default_options: ['c_std=c11', 'cpp_std=gnu++17'],
+   default_options: ['c_std=gnu17', 'cpp_std=c++20'],
  
    license: 'LGPL-2.1-or-later',
-@@ -107,7 +107,7 @@ add_project_arguments(
+@@ -73,6 +73,7 @@ if get_option('maintainer')
-     '-Werror=missing-include-dirs',
+                          '-Winline',
-     '-Werror=declaration-after-statement',
+                          '-Wno-error=comment',
                           '-Werror=format-security',
--
 +                         '-Werror=format',
-     '-Wno-missing-field-initializers',
+ 
-     '-Wno-error=missing-field-initializers',
+                          # used in rsvg's headers, so we can not make this fatal yet
-     '-Wno-unused-parameter',
+                          '-Wno-error=expansion-to-defined',
 diff --git a/po/meson.build b/po/meson.build
-index e9ede195..f7c1d842 100644
+index e9ede19..f7c1d84 100644
 --- a/po/meson.build
 +++ b/po/meson.build
 @@ -1,5 +1,19 @@
@@ -90,4 +89,4 @@ index e9ede195..f7c1d842 100644
  run_target ('make-linguas',
      command: ['sh',
 -- 
-2.42.1
+2.49.0