Accepting request 930858 from GNOME:Factory
- Add PackageKit-zypp-c++17.patch: Fix build failure when building with libzypp > 17.28.5 and gcc < 11 (gh#hughsie/PackageKit/commit/1a6bb6ae6, bsc#1192349). OBS-URL: https://build.opensuse.org/request/show/930858 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/PackageKit?expand=0&rev=223
This commit is contained in:
commit
eeac6fa6b4
14
PackageKit-zypp-c++17.patch
Normal file
14
PackageKit-zypp-c++17.patch
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
Index: PackageKit-1.2.2/backends/zypp/meson.build
|
||||||
|
===================================================================
|
||||||
|
--- PackageKit-1.2.2.orig/backends/zypp/meson.build
|
||||||
|
+++ PackageKit-1.2.2/backends/zypp/meson.build
|
||||||
|
@@ -22,7 +22,8 @@ shared_module(
|
||||||
|
'-DG_LOG_DOMAIN="PackageKit-Zypp"',
|
||||||
|
'-Wall',
|
||||||
|
'-Woverloaded-virtual',
|
||||||
|
- '-Wnon-virtual-dtor'
|
||||||
|
+ '-Wnon-virtual-dtor',
|
||||||
|
+ '-std=c++1z'
|
||||||
|
],
|
||||||
|
c_args: [
|
||||||
|
'-Wno-deprecated',
|
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Nov 5 12:07:00 UTC 2021 - Jonathan Kang <songchuan.kang@suse.com>
|
||||||
|
|
||||||
|
- Add PackageKit-zypp-c++17.patch: Fix build failure when building
|
||||||
|
with libzypp > 17.28.5 and gcc < 11
|
||||||
|
(gh#hughsie/PackageKit/commit/1a6bb6ae6, bsc#1192349).
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Nov 5 11:16:00 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
|
Fri Nov 5 11:16:00 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||||
|
|
||||||
@ -355,7 +362,7 @@ Wed Nov 13 02:00:32 UTC 2019 - Jonathan Kang <sckang@suse.com>
|
|||||||
array of strings to pk_backend_job_files()
|
array of strings to pk_backend_job_files()
|
||||||
(gh#hughsie/PackageKit#351).
|
(gh#hughsie/PackageKit#351).
|
||||||
|
|
||||||
------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Oct 14 07:00:32 UTC 2019 - Jonathan Kang <sckang@suse.com>
|
Mon Oct 14 07:00:32 UTC 2019 - Jonathan Kang <sckang@suse.com>
|
||||||
|
|
||||||
- Remove zypp-Switch-to-doUpgrade-solver-when-required-by-distribution.patch,
|
- Remove zypp-Switch-to-doUpgrade-solver-when-required-by-distribution.patch,
|
||||||
|
@ -55,7 +55,9 @@ Patch4: https://patch-diff.githubusercontent.com/raw/PackageKit/PackageK
|
|||||||
# PATCH-FIX-UPSTREAM PackageKit-fix-crash-pre-dbus.patch gh#hughsie/PackageKit!436 -- Do not crash when calling pk_dbus_get_uid() before D-Bus is setup
|
# PATCH-FIX-UPSTREAM PackageKit-fix-crash-pre-dbus.patch gh#hughsie/PackageKit!436 -- Do not crash when calling pk_dbus_get_uid() before D-Bus is setup
|
||||||
Patch5: PackageKit-fix-crash-pre-dbus.patch
|
Patch5: PackageKit-fix-crash-pre-dbus.patch
|
||||||
# PATCH-FIX-UPSTREAM PackageKit-zypp-fix-crash-with-empty-search-string.patch gh#hughsie/PackageKit/commit#21ccf49, bsc#1179287 sckang@suse.com -- zypp: Fix crash when search string is NULL
|
# PATCH-FIX-UPSTREAM PackageKit-zypp-fix-crash-with-empty-search-string.patch gh#hughsie/PackageKit/commit#21ccf49, bsc#1179287 sckang@suse.com -- zypp: Fix crash when search string is NULL
|
||||||
Patch12: PackageKit-zypp-fix-crash-with-empty-search-string.patch
|
Patch6: PackageKit-zypp-fix-crash-with-empty-search-string.patch
|
||||||
|
# PATCH-FIX-SLE PackageKit-zypp-c++17.patch gh#hughsie/PackageKit/commit/1a6bb6ae6, bsc#1192349 sckang@suse.com -- Fix build failure when building with libzypp > 17.28.5 and gcc < 11.
|
||||||
|
Patch1000: PackageKit-zypp-c++17.patch
|
||||||
|
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
@ -270,7 +272,11 @@ This package provides the upstream default configuration for PackageKit.
|
|||||||
%lang_package
|
%lang_package
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1
|
%autosetup -N
|
||||||
|
%autopatch -p1 -M 1000
|
||||||
|
%if 0%{?sle_version} > 150300 && 0%{?sle_version} < 160000
|
||||||
|
%patch1000 -p1
|
||||||
|
%endif
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%meson \
|
%meson \
|
||||||
|
Loading…
Reference in New Issue
Block a user