From 69f6d6770990b5d397c07f755616b7868f2796ea4a0ca4c6b2a7ff5ee8926d13 Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Mon, 27 May 2024 17:56:18 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kbibtex?expand=0&rev=67 --- kbibtex-0.10.0-cxx17.patch | 11 +++++++++++ kbibtex.spec | 6 +++--- 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 kbibtex-0.10.0-cxx17.patch diff --git a/kbibtex-0.10.0-cxx17.patch b/kbibtex-0.10.0-cxx17.patch new file mode 100644 index 0000000..8ab8fc1 --- /dev/null +++ b/kbibtex-0.10.0-cxx17.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -10,7 +10,7 @@ + LANGUAGES CXX + ) + +-set(CMAKE_CXX_STANDARD 11) ++set(CMAKE_CXX_STANDARD 17) + set(QT_MIN_VERSION 5.9.0) + # Somewhat arbitrary chosen version number ... + set(KF5_MIN_VERSION 5.51) diff --git a/kbibtex.spec b/kbibtex.spec index 03b4258..3600d16 100644 --- a/kbibtex.spec +++ b/kbibtex.spec @@ -1,7 +1,7 @@ # # spec file for package kbibtex # -# 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 @@ -56,8 +56,8 @@ BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5XmlPatterns) Requires(post): desktop-file-utils Requires(post): shared-mime-info -Requires(postun):desktop-file-utils -Requires(postun):shared-mime-info +Requires(postun): desktop-file-utils +Requires(postun): shared-mime-info %description KBibTeX is a BibTeX editor by KDE to edit bibliographies used with From d76d84be96da573dfe624c2bf3326560fb9e3733bcd4818e03384fca791760ee Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Mon, 27 May 2024 18:00:41 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kbibtex?expand=0&rev=68 --- kbibtex.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/kbibtex.spec b/kbibtex.spec index 3600d16..f84328e 100644 --- a/kbibtex.spec +++ b/kbibtex.spec @@ -25,6 +25,7 @@ License: GPL-2.0-only Group: Productivity/Publishing/TeX/Utilities URL: https://apps.kde.org/nl/kbibtex/ Source: https://download.kde.org/stable/KBibTeX/%{version}/%{name}-%{version}.tar.xz +Patch0: kbibtex-0.10.0-cxx17.patch BuildRequires: extra-cmake-modules BuildRequires: libicu-devel BuildRequires: libpoppler-qt5-devel From 901587ff24bec862c3e3f294da71c2af1b2907a2b27334456ce973f0e447084c Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Mon, 27 May 2024 18:06:42 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kbibtex?expand=0&rev=69 --- kbibtex-0.10.0-cxx17.patch => fix-icu-75.patch | 2 +- kbibtex.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename kbibtex-0.10.0-cxx17.patch => fix-icu-75.patch (88%) diff --git a/kbibtex-0.10.0-cxx17.patch b/fix-icu-75.patch similarity index 88% rename from kbibtex-0.10.0-cxx17.patch rename to fix-icu-75.patch index 8ab8fc1..c8b973e 100644 --- a/kbibtex-0.10.0-cxx17.patch +++ b/fix-icu-75.patch @@ -5,7 +5,7 @@ ) -set(CMAKE_CXX_STANDARD 11) -+set(CMAKE_CXX_STANDARD 17) ++set(CMAKE_CXX_STANDARD 14) set(QT_MIN_VERSION 5.9.0) # Somewhat arbitrary chosen version number ... set(KF5_MIN_VERSION 5.51) diff --git a/kbibtex.spec b/kbibtex.spec index f84328e..a3a7408 100644 --- a/kbibtex.spec +++ b/kbibtex.spec @@ -25,7 +25,7 @@ License: GPL-2.0-only Group: Productivity/Publishing/TeX/Utilities URL: https://apps.kde.org/nl/kbibtex/ Source: https://download.kde.org/stable/KBibTeX/%{version}/%{name}-%{version}.tar.xz -Patch0: kbibtex-0.10.0-cxx17.patch +Patch0: fix-icu-75.patch BuildRequires: extra-cmake-modules BuildRequires: libicu-devel BuildRequires: libpoppler-qt5-devel From 4cc4e9084cd9a20861d28d88618303e1a807161ed429d13cc36d80de14e071d3 Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Mon, 27 May 2024 18:08:02 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kbibtex?expand=0&rev=70 --- fix-icu-75.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fix-icu-75.patch b/fix-icu-75.patch index c8b973e..8ab8fc1 100644 --- a/fix-icu-75.patch +++ b/fix-icu-75.patch @@ -5,7 +5,7 @@ ) -set(CMAKE_CXX_STANDARD 11) -+set(CMAKE_CXX_STANDARD 14) ++set(CMAKE_CXX_STANDARD 17) set(QT_MIN_VERSION 5.9.0) # Somewhat arbitrary chosen version number ... set(KF5_MIN_VERSION 5.51) From 1a4c3b291fc5b68dd3d7c3521f96f64ca502448618805be03082f3f7d20c6509 Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Mon, 27 May 2024 18:11:31 +0000 Subject: [PATCH 5/5] - Fix build with icu 75: fix-icu-75.patch OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kbibtex?expand=0&rev=71 --- kbibtex.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/kbibtex.changes b/kbibtex.changes index d8abe81..e7399a9 100644 --- a/kbibtex.changes +++ b/kbibtex.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 27 18:10:49 UTC 2024 - Cor Blom + +- Fix build with icu 75: + fix-icu-75.patch + ------------------------------------------------------------------- Wed Nov 22 20:01:21 UTC 2023 - Cor Blom