January 2023 - rpmfusion-commits

[qt5-qtwebengine-freeworld/f37] feat: update to 5.15.12

by Ankur Sinha

Summary of changes: 1f6a8d9... feat: update to 5.15.12 (*) (*) This commit already existed in another branch; no separate mail sent

1 year, 10 months

1
0
0 / 0

[qt5-qtwebengine-freeworld] feat: update to 5.15.12

by Ankur Sinha

commit 1f6a8d9e31f80d84803ab3534e5d275e9f440e03 Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur(a)gmail.com> Date: Tue Jan 31 13:28:29 2023 +0000 feat: update to 5.15.12 .gitignore | 1 + qt5-qtwebengine-freeworld.spec | 11 +- qtwebengine-fix-build.patch | 485 +++++++++++++++++++++++++++++++++++++++++ qtwebengine-release.sh | 2 +- sources | 2 +- 5 files changed, 497 insertions(+), 4 deletions(-) --- diff --git a/.gitignore b/.gitignore index 539e020..c472263 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /qtwebengine-everywhere-src-5.15.8.tar.xz /qtwebengine-everywhere-src-5.15.9.tar.xz /qtwebengine-everywhere-src-5.15.10.tar.xz +/qtwebengine-everywhere-src-5.15.12.tar.xz diff --git a/qt5-qtwebengine-freeworld.spec b/qt5-qtwebengine-freeworld.spec index fe61e01..70f97c3 100644 --- a/qt5-qtwebengine-freeworld.spec +++ b/qt5-qtwebengine-freeworld.spec @@ -62,8 +62,8 @@ Summary: Qt5 - QtWebEngine components (freeworld version) Name: qt5-qtwebengine-freeworld -Version: 5.15.10 -Release: 5%{?dist} +Version: 5.15.12 +Release: 1%{?dist} %global major_minor %(echo %{version} | cut -d. -f-2) %global major %(echo %{version} | cut -d. -f1) @@ -107,6 +107,9 @@ Patch32: qtwebengine-skia-missing-includes.patch ## Cf. https://bugzilla.redhat.com/show_bug.cgi?id=2144200 ## From: https://chromium-review.googlesource.com/c/chromium/src/+/3545665 Patch33: qtwebengine-5.15-Backport-of-16k-page-support-on-aarch64.patch +# Fixes for GCC 13 +# https://bugzilla.redhat.com/show_bug.cgi?id=2164993 +Patch34: qtwebengine-fix-build.patch ## Upstream patches: @@ -383,6 +386,7 @@ popd %patch31 -p1 -b .TRUE %patch32 -p1 -b .skia-missing-includes %patch33 -p1 -b .aarch64-16kb-support +%patch34 -p1 -b .gcc-13 # delete all "toolprefix = " lines from build/toolchain/linux/BUILD.gn, as we # never cross-compile in native Fedora RPMs, fixes ARM and aarch64 FTBFS @@ -474,6 +478,9 @@ echo "%{_libdir}/%{name}" \ %changelog +* Fri Jan 27 2023 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 5.15.12-1 +- Update to 5.15.12 + * Thu Jan 12 2023 Vitaly Zaitsev <vitaly(a)easycoding.org> - 5.15.10-5 - Rebuilt due to Qt 5.15.8 update. diff --git a/qtwebengine-fix-build.patch b/qtwebengine-fix-build.patch new file mode 100644 index 0000000..7cec0af --- /dev/null +++ b/qtwebengine-fix-build.patch @@ -0,0 +1,485 @@ +diff --git a/src/3rdparty/chromium/base/debug/profiler.h b/src/3rdparty/chromium/base/debug/profiler.h +index 1229e0623..c7ed55e70 100644 +--- a/src/3rdparty/chromium/base/debug/profiler.h ++++ b/src/3rdparty/chromium/base/debug/profiler.h +@@ -5,6 +5,7 @@ + #ifndef BASE_DEBUG_PROFILER_H_ + #define BASE_DEBUG_PROFILER_H_ + ++#include <cstdint> + #include <stddef.h> + + #include <string> +diff --git a/src/3rdparty/chromium/cc/trees/target_property.cc b/src/3rdparty/chromium/cc/trees/target_property.cc +index ed2062557..036c870b2 100644 +--- a/src/3rdparty/chromium/cc/trees/target_property.cc ++++ b/src/3rdparty/chromium/cc/trees/target_property.cc +@@ -4,6 +4,10 @@ + + #include "cc/trees/target_property.h" + ++#include <cstdint> ++ ++#include <cstdint> ++ + namespace cc { + + static_assert(TargetProperty::LAST_TARGET_PROPERTY < kMaxTargetPropertyIndex, +diff --git a/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h b/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h +index 3896bc6e7..b93843dc1 100644 +--- a/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h ++++ b/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h +@@ -5,6 +5,7 @@ + #ifndef CONTENT_PUBLIC_BROWSER_BROWSING_DATA_REMOVER_DELEGATE_H_ + #define CONTENT_PUBLIC_BROWSER_BROWSING_DATA_REMOVER_DELEGATE_H_ + ++#include <cstdint> + #include <string> + #include <vector> + #include "base/callback_forward.h" +diff --git a/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc b/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc +index 213b6301c..d77be3f14 100644 +--- a/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc ++++ b/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc +@@ -4,6 +4,8 @@ + + #include "device/base/synchronization/one_writer_seqlock.h" + ++#include <cstdint> ++ + namespace device { + + OneWriterSeqLock::OneWriterSeqLock() : sequence_(0) {} +diff --git a/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h b/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h +index 0c27ae710..b64f82f75 100644 +--- a/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h ++++ b/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h +@@ -5,6 +5,7 @@ + #ifndef DEVICE_BLUETOOTH_PUBLIC_CPP_BLUETOOTH_UUID_H_ + #define DEVICE_BLUETOOTH_PUBLIC_CPP_BLUETOOTH_UUID_H_ + ++#include <cstdint> + #include <string> + #include <vector> + +diff --git a/src/3rdparty/chromium/extensions/common/constants.h b/src/3rdparty/chromium/extensions/common/constants.h +index 747906a06..fec888a11 100644 +--- a/src/3rdparty/chromium/extensions/common/constants.h ++++ b/src/3rdparty/chromium/extensions/common/constants.h +@@ -11,6 +11,8 @@ + #include "components/version_info/channel.h" + #include "ui/base/layout.h" + ++#include <cstdint> ++ + namespace extensions { + + // Scheme we serve extension content from. +diff --git a/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h b/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h +index 83615b30c..8fa9fb1f6 100644 +--- a/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h ++++ b/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h +@@ -5,6 +5,8 @@ + #ifndef GPU_COMMAND_BUFFER_COMMON_WEBGPU_CMD_ENUMS_H_ + #define GPU_COMMAND_BUFFER_COMMON_WEBGPU_CMD_ENUMS_H_ + ++#include <cstdint> ++ + namespace gpu { + namespace webgpu { + +diff --git a/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_format.h b/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_format.h +index 286a41c43..25d2413df 100644 +--- a/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_format.h ++++ b/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_format.h +@@ -5,6 +5,7 @@ + #ifndef GPU_COMMAND_BUFFER_COMMON_WEBGPU_CMD_FORMAT_H_ + #define GPU_COMMAND_BUFFER_COMMON_WEBGPU_CMD_FORMAT_H_ + ++#include <cstdint> + #include <string.h> + + #include "gpu/command_buffer/common/gl2_types.h" +diff --git a/src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.h b/src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.h +index bcba574d5..f4916bed7 100644 +--- a/src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.h ++++ b/src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.h +@@ -5,6 +5,7 @@ + #ifndef GPU_COMMAND_BUFFER_SERVICE_SHARED_CONTEXT_STATE_H_ + #define GPU_COMMAND_BUFFER_SERVICE_SHARED_CONTEXT_STATE_H_ + ++#include <cstdint> + #include <memory> + #include <vector> + +diff --git a/src/3rdparty/chromium/gpu/config/device_perf_info.h b/src/3rdparty/chromium/gpu/config/device_perf_info.h +index e33874ba3..824a207a2 100644 +--- a/src/3rdparty/chromium/gpu/config/device_perf_info.h ++++ b/src/3rdparty/chromium/gpu/config/device_perf_info.h +@@ -5,6 +5,7 @@ + #ifndef GPU_CONFIG_DEVICE_PERF_INFO_H_ + #define GPU_CONFIG_DEVICE_PERF_INFO_H_ + ++#include <cstdint> + #include <string> + #include <vector> + +diff --git a/src/3rdparty/chromium/gpu/config/gpu_feature_info.h b/src/3rdparty/chromium/gpu/config/gpu_feature_info.h +index 027f1a5af..70759b2ae 100644 +--- a/src/3rdparty/chromium/gpu/config/gpu_feature_info.h ++++ b/src/3rdparty/chromium/gpu/config/gpu_feature_info.h +@@ -5,6 +5,7 @@ + #ifndef GPU_CONFIG_GPU_FEATURE_INFO_H_ + #define GPU_CONFIG_GPU_FEATURE_INFO_H_ + ++#include <cstdint> + #include <string> + #include <vector> + +diff --git a/src/3rdparty/chromium/gpu/config/gpu_preferences.h b/src/3rdparty/chromium/gpu/config/gpu_preferences.h +index 6b8587151..e2bc6b90f 100644 +--- a/src/3rdparty/chromium/gpu/config/gpu_preferences.h ++++ b/src/3rdparty/chromium/gpu/config/gpu_preferences.h +@@ -5,6 +5,7 @@ + #ifndef GPU_CONFIG_GPU_PREFERENCES_H_ + #define GPU_CONFIG_GPU_PREFERENCES_H_ + ++#include <cstdint> + #include <stddef.h> + #include <string> + #include <vector> +diff --git a/src/3rdparty/chromium/gpu/config/gpu_util.h b/src/3rdparty/chromium/gpu/config/gpu_util.h +index b4d6dfb30..0dc300a9f 100644 +--- a/src/3rdparty/chromium/gpu/config/gpu_util.h ++++ b/src/3rdparty/chromium/gpu/config/gpu_util.h +@@ -5,6 +5,8 @@ + #ifndef GPU_CONFIG_GPU_UTIL_H_ + #define GPU_CONFIG_GPU_UTIL_H_ + ++#include <cstdint> ++ + #include "build/build_config.h" + #include "gpu/config/gpu_feature_info.h" + #include "gpu/gpu_export.h" +diff --git a/src/3rdparty/chromium/net/base/parse_number.h b/src/3rdparty/chromium/net/base/parse_number.h +index 0b4cfc1f8..55e9bfa8e 100644 +--- a/src/3rdparty/chromium/net/base/parse_number.h ++++ b/src/3rdparty/chromium/net/base/parse_number.h +@@ -9,6 +9,8 @@ + #include "base/strings/string_piece.h" + #include "net/base/net_export.h" + ++#include <cstdint> ++ + // This file contains utility functions for parsing numbers, in the context of + // network protocols. + // +diff --git a/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h b/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h +index 9e506b555..cfb03bfe2 100644 +--- a/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h ++++ b/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h +@@ -5,6 +5,7 @@ + #ifndef NET_COOKIES_COOKIE_INCLUSION_STATUS_H_ + #define NET_COOKIES_COOKIE_INCLUSION_STATUS_H_ + ++#include <cstdint> + #include <string> + #include <vector> + +diff --git a/src/3rdparty/chromium/pdf/document_attachment_info.h b/src/3rdparty/chromium/pdf/document_attachment_info.h +index 254398e62..22038e755 100644 +--- a/src/3rdparty/chromium/pdf/document_attachment_info.h ++++ b/src/3rdparty/chromium/pdf/document_attachment_info.h +@@ -7,6 +7,8 @@ + + #include "base/strings/string16.h" + ++#include <cstdint> ++ + namespace chrome_pdf { + + struct DocumentAttachmentInfo { +diff --git a/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h b/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h +index ac0b31a75..5d1c421d0 100644 +--- a/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h ++++ b/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h +@@ -38,6 +38,10 @@ namespace pp { + /// As a further optimization, we can add support for this later. + class ThreadSafeThreadTraits { + public: ++ ++ typedef pp::Lock Lock; ++ typedef pp::AutoLock AutoLock; ++ + class RefCount { + public: + /// Default constructor. In debug mode, this checks that the object is being +@@ -67,8 +71,6 @@ class ThreadSafeThreadTraits { + int32_t ref_; + }; + +- typedef pp::Lock Lock; +- typedef pp::AutoLock AutoLock; + }; + + /// The non-thread-safe version of thread traits. Using this class as the +diff --git a/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h b/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h +index a9b9e137d..6f1122c42 100644 +--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h ++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h +@@ -19,6 +19,7 @@ + #include <limits.h> + + #include <cstddef> ++#include <cstdint> + #include <cstring> + #include <ostream> + +diff --git a/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h b/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h +index 9911546b9..48b660db3 100644 +--- a/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h ++++ b/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h +@@ -12,6 +12,7 @@ + + #include <algorithm> + #include <array> ++#include <cstdint> + #include <string> + #include <vector> + +diff --git a/src/3rdparty/chromium/third_party/angle/src/common/angleutils.h b/src/3rdparty/chromium/third_party/angle/src/common/angleutils.h +index f669d7df3..8f391fdd7 100644 +--- a/src/3rdparty/chromium/third_party/angle/src/common/angleutils.h ++++ b/src/3rdparty/chromium/third_party/angle/src/common/angleutils.h +@@ -15,6 +15,7 @@ + # include "absl/container/flat_hash_map.h" + #endif // defined(ANGLE_USE_ABSEIL) + ++#include <cstdint> + #include <climits> + #include <cstdarg> + #include <cstddef> +diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h +index c7e4f2b37..e491a1f68 100644 +--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h ++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h +@@ -33,6 +33,7 @@ + #include <assert.h> + #include <sys/types.h> + ++#include <cstdint> + #include <string> + + #include "client/linux/handler/microdump_extra_info.h" +diff --git a/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc b/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc +index 8c8f4fe08..931782214 100644 +--- a/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc ++++ b/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc +@@ -30,6 +30,7 @@ + #include <cstddef> + #include <cstdint> + #include <cstring> ++#include <cstdio> + #include <new> + #include <utility> + +diff --git a/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h b/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h +index d2731dac7..46bc87ef9 100644 +--- a/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h ++++ b/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h +@@ -5,6 +5,8 @@ + #ifndef CONSTANTS_ANNOTATION_FLAGS_H_ + #define CONSTANTS_ANNOTATION_FLAGS_H_ + ++#include <cstdint> ++ + namespace pdfium { + namespace annotation_flags { + +diff --git a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h +index 1b4c53815..472042fab 100644 +--- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h ++++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h +@@ -18,6 +18,7 @@ + #define INCLUDE_PERFETTO_EXT_BASE_UUID_H_ + + #include <array> ++#include <cstdint> + #include <string> + + #include "perfetto/ext/base/optional.h" +diff --git a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h +index 74cc9583c..2a00b3b94 100644 +--- a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h ++++ b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h +@@ -21,6 +21,8 @@ + #include "perfetto/trace_processor/status.h" + #include "src/trace_processor/trace_blob_view.h" + ++#include <cstdint> ++ + namespace perfetto { + + namespace protos { +diff --git a/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp b/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp +index 503ed08ff..59c755b84 100644 +--- a/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp ++++ b/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp +@@ -12,6 +12,10 @@ + #include <algorithm> + #include <iterator> + ++#include <string.h> ++#include <algorithm> ++#include <iterator> ++ + static constexpr const char* gColorNames[] = { + "aliceblue", + "antiquewhite", +diff --git a/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h b/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h +index 3aa7e9df2..3cfc8d6a3 100644 +--- a/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h ++++ b/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h +@@ -11,6 +11,7 @@ + #ifndef CALL_RTP_DEMUXER_H_ + #define CALL_RTP_DEMUXER_H_ + ++#include <cstdint> + #include <map> + #include <set> + #include <string> +diff --git a/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h b/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h +index 7a936f23e..21951a1d2 100644 +--- a/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h ++++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h +@@ -12,6 +12,7 @@ + #ifndef RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_ + #define RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_ + ++#include <cstdint> + #include <string> + #include <vector> + +diff --git a/src/3rdparty/chromium/ui/events/gesture_event_details.h b/src/3rdparty/chromium/ui/events/gesture_event_details.h +index d20416738..8dadab3d0 100644 +--- a/src/3rdparty/chromium/ui/events/gesture_event_details.h ++++ b/src/3rdparty/chromium/ui/events/gesture_event_details.h +@@ -5,6 +5,7 @@ + #ifndef UI_EVENTS_GESTURE_DETECTION_GESTURE_EVENT_DETAILS_H_ + #define UI_EVENTS_GESTURE_DETECTION_GESTURE_EVENT_DETAILS_H_ + ++#include <cstdint> + #include <string.h> + + #include "base/check_op.h" +diff --git a/src/3rdparty/chromium/ui/events/types/scroll_types.h b/src/3rdparty/chromium/ui/events/types/scroll_types.h +index 7ff15f0fc..136cebc09 100644 +--- a/src/3rdparty/chromium/ui/events/types/scroll_types.h ++++ b/src/3rdparty/chromium/ui/events/types/scroll_types.h +@@ -5,6 +5,8 @@ + #ifndef UI_EVENTS_TYPES_SCROLL_TYPES_H_ + #define UI_EVENTS_TYPES_SCROLL_TYPES_H_ + ++#include <cstdint> ++ + namespace ui { + + enum class ScrollGranularity : uint8_t { +diff --git a/src/3rdparty/chromium/ui/gl/gl_surface_glx.cc b/src/3rdparty/chromium/ui/gl/gl_surface_glx.cc +index 1d5527691..ef9d5ce13 100644 +--- a/src/3rdparty/chromium/ui/gl/gl_surface_glx.cc ++++ b/src/3rdparty/chromium/ui/gl/gl_surface_glx.cc +@@ -4,6 +4,7 @@ + + #include "ui/gl/gl_surface_glx.h" + ++#include <cstdint> + #include <utility> + + #include "base/bind.h" +diff --git a/src/3rdparty/chromium/ui/gl/gl_surface_glx.h b/src/3rdparty/chromium/ui/gl/gl_surface_glx.h +index ab612cd87..2178d8514 100644 +--- a/src/3rdparty/chromium/ui/gl/gl_surface_glx.h ++++ b/src/3rdparty/chromium/ui/gl/gl_surface_glx.h +@@ -5,6 +5,7 @@ + #ifndef UI_GL_GL_SURFACE_GLX_H_ + #define UI_GL_GL_SURFACE_GLX_H_ + ++#include <cstdint> + #include <stdint.h> + + #include <memory> +diff --git a/src/3rdparty/chromium/v8/src/base/logging.h b/src/3rdparty/chromium/v8/src/base/logging.h +index fe39f9882..dbe130581 100644 +--- a/src/3rdparty/chromium/v8/src/base/logging.h ++++ b/src/3rdparty/chromium/v8/src/base/logging.h +@@ -5,6 +5,7 @@ + #ifndef V8_BASE_LOGGING_H_ + #define V8_BASE_LOGGING_H_ + ++#include <cstdint> + #include <cstring> + #include <sstream> + #include <string> +diff --git a/src/3rdparty/chromium/v8/src/base/macros.h b/src/3rdparty/chromium/v8/src/base/macros.h +index 37cab78f0..4220eacbb 100644 +--- a/src/3rdparty/chromium/v8/src/base/macros.h ++++ b/src/3rdparty/chromium/v8/src/base/macros.h +@@ -5,6 +5,7 @@ + #ifndef V8_BASE_MACROS_H_ + #define V8_BASE_MACROS_H_ + ++#include <cstdint> + #include <limits> + #include <type_traits> + +diff --git a/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h b/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h +index c1d69c18f..eb33c6816 100644 +--- a/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h ++++ b/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h +@@ -5,6 +5,7 @@ + #ifndef V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ + #define V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ + ++#include <cstdint> + #include <string> + + // Conversion routines between UT8 and UTF16, used by string-16.{h,cc}. You may +diff --git a/src/core/browsing_data_remover_delegate_qt.h b/src/core/browsing_data_remover_delegate_qt.h +index a10409f39..b9f5e59d8 100644 +--- a/src/core/browsing_data_remover_delegate_qt.h ++++ b/src/core/browsing_data_remover_delegate_qt.h +@@ -42,6 +42,8 @@ + + #include "content/public/browser/browsing_data_remover_delegate.h" + ++#include <cstdint> ++ + namespace QtWebEngineCore { + + class BrowsingDataRemoverDelegateQt : public content::BrowsingDataRemoverDelegate { +diff --git a/src/3rdparty/chromium/third_party/xcbproto/src/src/present.xml b/src/3rdparty/chromium/third_party/xcbproto/src/src/present.xml +index fb06e73..f20c11e 100644 +--- a/src/3rdparty/chromium/third_party/xcbproto/src/src/present.xml ++++ b/src/3rdparty/chromium/third_party/xcbproto/src/src/present.xml +@@ -89,7 +89,7 @@ OF THIS SOFTWARE. + </reply> + </request> + +- <request name="Pixmap" opcode="1"> ++ <request name="PresentPixmap" opcode="1"> + <required_start_align align="8" /> + <field type="WINDOW" name="window" /> + <field type="PIXMAP" name="pixmap" /> +diff --git a/src/3rdparty/chromium/extensions/browser/api/audio/audio_device_id_calculator.h b/src/3rdparty/chromium/extensions/browser/api/audio/audio_device_id_calculator.h +index 9d2858177..d263f6703 100644 +--- a/src/3rdparty/chromium/extensions/browser/api/audio/audio_device_id_calculator.h ++++ b/src/3rdparty/chromium/extensions/browser/api/audio/audio_device_id_calculator.h +@@ -5,6 +5,7 @@ + #ifndef EXTENSIONS_BROWSER_API_AUDIO_AUDIO_DEVICE_ID_CALCULATOR_H_ + #define EXTENSIONS_BROWSER_API_AUDIO_AUDIO_DEVICE_ID_CALCULATOR_H_ + ++#include <cstdint> + #include <map> + #include <string> + diff --git a/qtwebengine-release.sh b/qtwebengine-release.sh index d46ff5c..a5ce247 100755 --- a/qtwebengine-release.sh +++ b/qtwebengine-release.sh @@ -1,6 +1,6 @@ #!/bin/sh set -x -VERSION=5.15.9 +VERSION=5.15.12 CHROMIUMHASH=`wget https://code.qt.io/cgit/qt/qtwebengine.git/tree/src/3rdparty?h=$VERSION -q --content-on-error -O - | grep "Bad object name: " | sed 's/^.*Bad object name: $[0-9a-f]\{40\}$.*$/\1/g'` rm -rf qtwebengine-$VERSION qtwebengine-$VERSION.tar.gz qtwebengine-chromium-$CHROMIUMHASH qtwebengine-chromium-$CHROMIUMHASH.tar.gz qtwebengine-everywhere-src-$VERSION wget https://github.com/qt/qtwebengine/archive/$VERSION.tar.gz -O qtwebengine-$VERSION.tar.gz || exit $? diff --git a/sources b/sources index 29a8e6d..cca97df 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ +SHA512 (qtwebengine-everywhere-src-5.15.12.tar.xz) = 840531345de2d6b5166847904a2457d2d1f3bc3c86337d87f3d0d25ba4089575550d1eb9ff1ea7b23f697865f8e0b885f8ff4cef81df4cc8e07bafa383058db0 SHA512 (pulseaudio-12.2-headers.tar.gz) = a5a9bcbb16030b3bc83cc0cc8f5e7f90e0723d3e83258a5c77eacb32eaa267118a73fa7814fbcc99a24e4907916a2b371ebb6dedc4f45541c3acf6c834fd35be -SHA512 (qtwebengine-everywhere-src-5.15.10.tar.xz) = 006637ec95a568def7eb291d4c132e462c42f86c1a1446bd492c5419325acf8176f451cb90fc549ccc4a6e24ee90b3fe96269d213b1a26e941f265746bb7912b

1 year, 10 months

1
0
0 / 0

[kodi-visualization-spectrum] - Update to 20.2.0 - Add AppStream metadata - Switch to SPDX license identifiers

by Mohamed ElMorabity

commit be3a4bd42aaf8d27a2832efc6fc725ea32326fc8 Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org> Date: Tue Jan 31 12:38:20 2023 +0100 - Update to 20.2.0 - Add AppStream metadata - Switch to SPDX license identifiers .gitignore | 1 + kodi-visualization-spectrum.metainfo.xml | 11 ++++++++ kodi-visualization-spectrum.spec | 45 ++++++++++++++++++-------------- sources | 2 +- 4 files changed, 39 insertions(+), 20 deletions(-) --- diff --git a/.gitignore b/.gitignore index 018a155..2f6c726 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /visualization.spectrum-19.0.1-Matrix.tar.gz +/visualization.spectrum-20.2.0-Nexus.tar.gz diff --git a/kodi-visualization-spectrum.metainfo.xml b/kodi-visualization-spectrum.metainfo.xml new file mode 100644 index 0000000..6509b2b --- /dev/null +++ b/kodi-visualization-spectrum.metainfo.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<component type="addon"> + <id>kodi-visualization-spectrum</id> + <extends>kodi.desktop</extends> + <name>Spectrum</name> + <summary>Visualisation showing a rotating 3D Spectrum Analyzer</summary> + <url type="homepage">https://github.com/xbmc/peripheral.joystick/</url> + <metadata_license>CC0-1.0</metadata_license> + <project_license>GPL-2.0-or-later</project_license> + <update_contact>melmorabity(a)fedoraproject.org</update_contact> +</component> diff --git a/kodi-visualization-spectrum.spec b/kodi-visualization-spectrum.spec index 3dac8a7..9e12cfe 100644 --- a/kodi-visualization-spectrum.spec +++ b/kodi-visualization-spectrum.spec @@ -1,23 +1,23 @@ -%global aname visualization.spectrum -%global kodi_version 19.0 -%global kodi_codename Matrix +%global kodi_addon visualization.spectrum +%global kodi_version 20 +%global kodi_codename Nexus Name: kodi-visualization-spectrum -Version: 19.0.1 -Release: 2%{?dist} +Version: 20.2.0 +Release: 1%{?dist} Summary: Spectrum visualizer for Kodi -License: GPLv2+ -URL: https://github.com/xbmc/visualization.spectrum -Source0: %{url}/archive/%{version}-%{kodi_codename}/%{aname}-%{version}-%{kodi_codename}.tar.gz +License: GPL-2.0-or-later +URL: https://github.com/xbmc/%{kodi_addon}/ +Source0: %{url}/archive/%{version}-%{kodi_codename}/%{kodi_addon}-%{version}-%{kodi_codename}.tar.gz +Source1: %{name}.metainfo.xml BuildRequires: cmake3 BuildRequires: gcc-c++ BuildRequires: kodi-devel >= %{kodi_version} BuildRequires: glm-devel -BuildRequires: libglvnd-devel - +BuildRequires: libappstream-glib +BuildRequires: pkgconfig(gl) Requires: kodi >= %{kodi_version} - ExcludeArch: %{power64} %description @@ -25,10 +25,7 @@ ExcludeArch: %{power64} %prep -%setup -q -n %{aname}-%{version}-%{kodi_codename} - -# Fix spurious-executable-perm on debug package -find . -name '*.h' -or -name '*.cpp' | xargs chmod a-x +%setup -q -n %{kodi_addon}-%{version}-%{kodi_codename} %build @@ -39,18 +36,28 @@ find . -name '*.h' -or -name '*.cpp' | xargs chmod a-x %install %cmake3_install -# Fix permissions at installation -find $RPM_BUILD_ROOT%{_datadir}/kodi/addons/ -type f -exec chmod 0644 {} \; +# Install AppData file +install -Dpm 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_metainfodir}/%{name}.metainfo.xml + + +%check +appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/%{name}.metainfo.xml %files %doc README.md %license LICENSE.md -%{_libdir}/kodi/addons/%{aname}/ -%{_datadir}/kodi/addons/%{aname}/ +%{_libdir}/kodi/addons/%{kodi_addon}/ +%{_datadir}/kodi/addons/%{kodi_addon}/ +%{_metainfodir}/%{name}.metainfo.xml %changelog +* Sun Jan 29 2023 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 20.2.0-1 +- Update to 20.2.0 +- Add AppStream metadata +- Switch to SPDX license identifiers + * Sun Aug 07 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 19.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg 5.1 diff --git a/sources b/sources index 781ffe4..56f592a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (visualization.spectrum-19.0.1-Matrix.tar.gz) = 4d716d8221102bd9fba1859cda1b7d4dd501c2b71e23cf9cc03e9927ea49acd42f134f579a679762d39ca4bd125eee3232690ff9ef1607b1a4e01b3084a79b71 +SHA512 (visualization.spectrum-20.2.0-Nexus.tar.gz) = b5f07e51058ec644c6b2a889be9e49403c566c8e14a7745b7a3610304467412a6ee7df8bf0ada4123915fac38b8efd658d6b41ba32bbfb29d9df13669d68dded

1 year, 10 months

1
0
0 / 0

[kodi-pvr-wmc] - Update to 20.3.0 - Add AppStream metadata - Switch to SPDX license identifiers

by Mohamed ElMorabity

commit 71e89a57b6f2ef1000476ead6bcd7f0c767f544f Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org> Date: Tue Jan 31 12:27:55 2023 +0100 - Update to 20.3.0 - Add AppStream metadata - Switch to SPDX license identifiers .gitignore | 1 + kodi-pvr-wmc.metainfo.xml | 11 +++++++++++ kodi-pvr-wmc.spec | 28 ++++++++++++++++++++++------ sources | 2 +- 4 files changed, 35 insertions(+), 7 deletions(-) --- diff --git a/.gitignore b/.gitignore index 52a315e..66606e3 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /pvr.wmc-6.0.0.tar.gz /pvr.wmc-6.1.1.tar.gz /pvr.wmc-6.1.2.tar.gz +/pvr.wmc-20.3.0.tar.gz diff --git a/kodi-pvr-wmc.metainfo.xml b/kodi-pvr-wmc.metainfo.xml new file mode 100644 index 0000000..b386d47 --- /dev/null +++ b/kodi-pvr-wmc.metainfo.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<component type="addon"> + <id>kodi-pvr-wmc</id> + <extends>kodi.desktop</extends> + <name>Windows Media Center Client</name> + <summary>PVR WMC Client</summary> + <url type="homepage">https://github.com/xbmc/peripheral.joystick/</url> + <metadata_license>CC0-1.0</metadata_license> + <project_license>GPL-2.0-or-later</project_license> + <update_contact>melmorabity(a)fedoraproject.org</update_contact> +</component> diff --git a/kodi-pvr-wmc.spec b/kodi-pvr-wmc.spec index a87ebce..c54ad3d 100644 --- a/kodi-pvr-wmc.spec +++ b/kodi-pvr-wmc.spec @@ -1,24 +1,26 @@ %global kodi_addon pvr.wmc -%global kodi_version 19.0 -%global kodi_codename Matrix +%global kodi_version 20 +%global kodi_codename Nexus Name: kodi-%(tr "." "-" <<<%{kodi_addon}) # Use Epoch to manage upgrades from older upstream # (https://github.com/opdenkamp/xbmc-pvr-addons/) Epoch: 1 -Version: 6.1.2 -Release: 4%{?dist} +Version: 20.3.0 +Release: 1%{?dist} Summary: WMC PVR for Kodi -License: GPLv2+ +License: GPL-2.0-or-later URL: https://github.com/kodi-pvr/%{kodi_addon}/ Source0: %{url}/archive/%{version}-%{kodi_codename}/%{kodi_addon}-%{version}.tar.gz +Source1: %{name}.metainfo.xml BuildRequires: cmake3 BuildRequires: gcc-c++ BuildRequires: kodi-devel >= %{kodi_version} +BuildRequires: libappstream-glib Requires: kodi >= %{kodi_version} -ExcludeArch: %{power64} ppc64le +ExcludeArch: %{power64} %description %{summary}. @@ -36,15 +38,29 @@ ExcludeArch: %{power64} ppc64le %install %cmake3_install +# Install AppData file +install -Dpm 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_metainfodir}/%{name}.metainfo.xml + + +%check +appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/%{name}.metainfo.xml + + %files %doc README.md %{kodi_addon}/changelog.txt %license LICENSE.md %{_libdir}/kodi/addons/%{kodi_addon}/ %{_datadir}/kodi/addons/%{kodi_addon}/ +%{_metainfodir}/%{name}.metainfo.xml %changelog +* Sun Jan 29 2023 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 1:20.3.0-1 +- Update to 20.3.0 +- Add AppStream metadata +- Switch to SPDX license identifiers + * Sun Aug 07 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 1:6.1.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg 5.1 diff --git a/sources b/sources index ac3209a..e1c137d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pvr.wmc-6.1.2.tar.gz) = b0e53c8494a5c811182358afbc7834b7cc51104839c7b4bf59047ef00e4b9bbf013368d94f095fa384dd4aa590a1f64c0235328b652962cd39430273c8e41c0b +SHA512 (pvr.wmc-20.3.0.tar.gz) = dba272d3e4812b0d66b901597939baebf4c9d00145a1bf728e2a5f6d48c204fb73c948f9e38b53619f09203ddb9048f7173b58e1c37157865b58234083cd918c

1 year, 10 months

1
0
0 / 0

[kodi-pvr-vuplus] - Update to 20.4.2 - Add AppStream metadata - Switch to SPDX license identifiers

by Mohamed ElMorabity

commit 55d891ca6d799b68171180efe4c7bc709c75d35e Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org> Date: Tue Jan 31 12:23:29 2023 +0100 - Update to 20.4.2 - Add AppStream metadata - Switch to SPDX license identifiers .gitignore | 1 + kodi-pvr-vuplus.metainfo.xml | 11 +++++++++++ kodi-pvr-vuplus.spec | 31 +++++++++++++++++++++---------- sources | 2 +- 4 files changed, 34 insertions(+), 11 deletions(-) --- diff --git a/.gitignore b/.gitignore index 9f86655..53e3b9d 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /pvr.vuplus-7.1.0.tar.gz /pvr.vuplus-7.3.1.tar.gz /pvr.vuplus-7.4.5.tar.gz +/pvr.vuplus-20.4.2.tar.gz diff --git a/kodi-pvr-vuplus.metainfo.xml b/kodi-pvr-vuplus.metainfo.xml new file mode 100644 index 0000000..f328b11 --- /dev/null +++ b/kodi-pvr-vuplus.metainfo.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<component type="addon"> + <id>kodi-pvr-vuplus</id> + <extends>kodi.desktop</extends> + <name>Enigma2 Client</name> + <summary>Kodi's frontend for Enigma2 based set-top boxes</summary> + <url type="homepage">https://github.com/xbmc/peripheral.joystick/</url> + <metadata_license>CC0-1.0</metadata_license> + <project_license>GPL-2.0-or-later</project_license> + <update_contact>melmorabity(a)fedoraproject.org</update_contact> +</component> diff --git a/kodi-pvr-vuplus.spec b/kodi-pvr-vuplus.spec index c1e68d9..d423f1f 100644 --- a/kodi-pvr-vuplus.spec +++ b/kodi-pvr-vuplus.spec @@ -1,26 +1,28 @@ %global kodi_addon pvr.vuplus -%global kodi_version 19.0 -%global kodi_codename Matrix +%global kodi_version 20 +%global kodi_codename Nexus Name: kodi-%(tr "." "-" <<<%{kodi_addon}) # Use Epoch to manage upgrades from older upstream # (https://github.com/opdenkamp/xbmc-pvr-addons/) Epoch: 1 -Version: 7.4.5 -Release: 4%{?dist} +Version: 20.4.2 +Release: 1%{?dist} Summary: Vu+ PVR for Kodi -License: GPLv2+ +License: GPL-2.0-or-later URL: https://github.com/kodi-pvr/%{kodi_addon}/ Source0: %{url}/archive/%{version}-%{kodi_codename}/%{kodi_addon}-%{version}.tar.gz +Source1: %{name}.metainfo.xml BuildRequires: cmake3 BuildRequires: gcc-c++ BuildRequires: kodi-devel >= %{kodi_version} -BuildRequires: pkgconfig(nlohmann_json) +BuildRequires: json-devel +BuildRequires: libappstream-glib BuildRequires: pkgconfig(tinyxml) Requires: kodi >= %{kodi_version} -ExcludeArch: %{power64} ppc64le +ExcludeArch: %{power64} %description %{summary}. @@ -29,9 +31,6 @@ ExcludeArch: %{power64} ppc64le %prep %autosetup -n %{kodi_addon}-%{version}-%{kodi_codename} -# Fix permissions -# find . -name "*.cpp" -exec chmod 0644 {} \; - %build %cmake3 @@ -40,6 +39,12 @@ ExcludeArch: %{power64} ppc64le %install %cmake3_install +# Install AppData file +install -Dpm 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_metainfodir}/%{name}.metainfo.xml + + +%check +appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/%{name}.metainfo.xml %files @@ -47,9 +52,15 @@ ExcludeArch: %{power64} ppc64le %license LICENSE.md %{_libdir}/kodi/addons/%{kodi_addon}/ %{_datadir}/kodi/addons/%{kodi_addon}/ +%{_metainfodir}/%{name}.metainfo.xml %changelog +* Sun Jan 29 2023 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 1:20.4.2-1 +- Update to 20.4.2 +- Add AppStream metadata +- Switch to SPDX license identifiers + * Sun Aug 07 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 1:7.4.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg 5.1 diff --git a/sources b/sources index 39f9887..67dc29e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pvr.vuplus-7.4.5.tar.gz) = 04ba9ab1b7aee4418c305538ac880aae80c1523fed10d7104dce8a294c072d6be87469016fc673e4d54cc1faaab0074cd15f6edf3207ad88a962d4a41844985b +SHA512 (pvr.vuplus-20.4.2.tar.gz) = 760a683d3f71d363b05838ddb99fe45fc5de51e2a16a4c9ff61f8152f78320f24b216331d7a9005710e65c2fb36c530da9cea7379211143a0420471f23e1ba0c

1 year, 10 months

1
0
0 / 0

[kodi-pvr-vdr-vnsi] - Update to 20.4.0 - Add AppStream metadata - Switch to SPDX license identifiers

by Mohamed ElMorabity

commit 9d6ca88e381c82650fecc4d88ec666d5159199f8 Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org> Date: Tue Jan 31 12:17:24 2023 +0100 - Update to 20.4.0 - Add AppStream metadata - Switch to SPDX license identifiers .gitignore | 1 + kodi-pvr-vdr-vnsi.metainfo.xml | 11 +++++++++++ kodi-pvr-vdr-vnsi.spec | 33 +++++++++++++++++++++++---------- sources | 2 +- 4 files changed, 36 insertions(+), 11 deletions(-) --- diff --git a/.gitignore b/.gitignore index 7167aa6..a1d11c8 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /pvr.vdr.vnsi-8.1.0.tar.gz /pvr.vdr.vnsi-8.2.2.tar.gz /pvr.vdr.vnsi-8.2.3.tar.gz +/pvr.vdr.vnsi-20.4.0.tar.gz diff --git a/kodi-pvr-vdr-vnsi.metainfo.xml b/kodi-pvr-vdr-vnsi.metainfo.xml new file mode 100644 index 0000000..c814a21 --- /dev/null +++ b/kodi-pvr-vdr-vnsi.metainfo.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<component type="addon"> + <id>kodi-pvr-vdr-vnsi</id> + <extends>kodi.desktop</extends> + <name>VDR VNSI Client</name> + <summary>PVR client to connect VDR to Kodi over the VNSI interface</summary> + <url type="homepage">https://github.com/xbmc/peripheral.joystick/</url> + <metadata_license>CC0-1.0</metadata_license> + <project_license>GPL-2.0-or-later AND MIT</project_license> + <update_contact>melmorabity(a)fedoraproject.org</update_contact> +</component> diff --git a/kodi-pvr-vdr-vnsi.spec b/kodi-pvr-vdr-vnsi.spec index 0bf10a5..52b42eb 100644 --- a/kodi-pvr-vdr-vnsi.spec +++ b/kodi-pvr-vdr-vnsi.spec @@ -1,29 +1,29 @@ %global kodi_addon pvr.vdr.vnsi -%global kodi_version 19.0 -%global kodi_codename Matrix +%global kodi_version 20 +%global kodi_codename Nexus Name: kodi-%(tr "." "-" <<<%{kodi_addon}) # Use Epoch to manage upgrades from older upstream # (https://github.com/opdenkamp/xbmc-pvr-addons/) Epoch: 1 -Version: 8.2.3 -Release: 4%{?dist} +Version: 20.4.0 +Release: 1%{?dist} Summary: VDR PVR for Kodi -License: GPLv2+ +# lib/kissnet is MIT +License: GPL-2.0-or-later AND MIT URL: https://github.com/kodi-pvr/%{kodi_addon}/ Source0: %{url}/archive/%{version}-%{kodi_codename}/%{kodi_addon}-%{version}.tar.gz +Source1: %{name}.metainfo.xml BuildRequires: cmake3 BuildRequires: gcc-c++ BuildRequires: kodi-devel >= %{kodi_version} -%ifarch %{arm} aarch64 -BuildRequires: libglvnd-devel -%else +BuildRequires: libappstream-glib BuildRequires: pkgconfig(opengl) -%endif Requires: kodi >= %{kodi_version} -ExcludeArch: %{power64} ppc64le +Provides: bundled(kissnet) +ExcludeArch: %{power64} %description %{summary}. @@ -41,15 +41,28 @@ ExcludeArch: %{power64} ppc64le %install %cmake3_install +# Install AppData file +install -Dpm 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_metainfodir}/%{name}.metainfo.xml + + +%check +appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/%{name}.metainfo.xml + %files %doc README.md %{kodi_addon}/changelog.txt %license LICENSE.md %{_libdir}/kodi/addons/%{kodi_addon}/ %{_datadir}/kodi/addons/%{kodi_addon}/ +%{_metainfodir}/%{name}.metainfo.xml %changelog +* Sun Jan 29 2023 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 1:20.4.0-1 +- Update to 20.4.0 +- Add AppStream metadata +- Switch to SPDX license identifiers + * Sun Aug 07 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 1:8.2.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg 5.1 diff --git a/sources b/sources index ba3f7a4..04658cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pvr.vdr.vnsi-8.2.3.tar.gz) = 9fbb3e988fe6352fde230ce072b35e591d69015bbfd93a4e61b2719a1f36ef495d23db30d44a6c611dcc1b4e36339b454138902c3f815940c5a77ff2b3d9c62a +SHA512 (pvr.vdr.vnsi-20.4.0.tar.gz) = c5585ae725a1a0034235d66f3aa0211645c5acd510f0c6c3f29b68f07b5d43a99bd892af6c954146ac1c98bd715aec2e315a3e59887a5970eda044dbe9223d63

1 year, 10 months

1
0
0 / 0

[kodi-pvr-vbox] - Update to 20.3.0 - Add AppStream metadata - Switch to SPDX license identifiers

by Mohamed ElMorabity

commit c62cab57430dfc527be1962f9dfd75845c446569 Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org> Date: Tue Jan 31 12:09:58 2023 +0100 - Update to 20.3.0 - Add AppStream metadata - Switch to SPDX license identifiers .gitignore | 1 + kodi-pvr-vbox-20.3.0-use_external_tinyxml2.patch | 214 +++++++++++++++++++++++ kodi-pvr-vbox-7.0.0-tinyxml2_6.patch | 36 ---- kodi-pvr-vbox-8.0.0-use_external_tinyxml2.patch | 132 -------------- kodi-pvr-vbox.metainfo.xml | 11 ++ kodi-pvr-vbox.spec | 36 ++-- sources | 2 +- 7 files changed, 250 insertions(+), 182 deletions(-) --- diff --git a/.gitignore b/.gitignore index 076f4ca..9a294db 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /pvr.vbox-8.0.0.tar.gz /pvr.vbox-8.1.0.tar.gz /pvr.vbox-8.1.2.tar.gz +/pvr.vbox-20.3.0.tar.gz diff --git a/kodi-pvr-vbox-20.3.0-use_external_tinyxml2.patch b/kodi-pvr-vbox-20.3.0-use_external_tinyxml2.patch new file mode 100644 index 0000000..4c0bbf1 --- /dev/null +++ b/kodi-pvr-vbox-20.3.0-use_external_tinyxml2.patch @@ -0,0 +1,214 @@ +diff -up ./CMakeLists.txt.orig ./CMakeLists.txt +--- ./CMakeLists.txt.orig 2022-09-16 15:31:03.000000000 +0200 ++++ ./CMakeLists.txt 2023-01-31 12:07:58.392962248 +0100 +@@ -4,10 +4,14 @@ project(pvr.vbox) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}) + + find_package(Kodi REQUIRED) ++find_package(TinyXML2 REQUIRED) + + include_directories(${KODI_INCLUDE_DIR}/.. # Hack way with "/..", need bigger Kodi cmake rework to match right include ways ++ ${TINYXML2_INCLUDE_DIRS} + ${PROJECT_SOURCE_DIR}) + ++set(DEPLIBS ${TINYXML2_LIBRARIES}) ++ + # Sources and headers + set(VBOX_SOURCES + src/addon.h +@@ -79,13 +83,6 @@ source_group("Source Files\\vbox\\respon + source_group("Source Files\\timeshift" FILES ${VBOX_SOURCES_TIMESHIFT}) + source_group("Source Files\\xmltv" FILES ${VBOX_SOURCES_XMLTV}) + +-# Library files +-set(VBOX_LIBRARIES_TINYXML2 +- lib/tinyxml2/tinyxml2.h +- lib/tinyxml2/tinyxml2.cpp) +- +-source_group("Library Files\\tinyxml2" FILES ${VBOX_LIBRARIES_TINYXML2}) +- + # Resource files + set(VBOX_RESOURCES + README.md +@@ -105,8 +102,7 @@ list(APPEND VBOX_SOURCES + ${VBOX_SOURCES_VBOX_RESPONSE} + ${VBOX_SOURCES_TIMESHIFT} + ${VBOX_SOURCES_XMLTV} +- ${VBOX_RESOURCES} +- ${VBOX_LIBRARIES_TINYXML2}) ++ ${VBOX_RESOURCES}) + + build_addon(pvr.vbox VBOX DEPLIBS) + +diff -up ./debian/control.orig ./debian/control +--- ./debian/control.orig 2022-09-16 15:31:03.000000000 +0200 ++++ ./debian/control 2023-01-31 12:07:58.392962248 +0100 +@@ -1,7 +1,7 @@ + Source: kodi-pvr-vbox + Priority: extra + Maintainer: Sam Stenvall <sam.stenvall(a)kodi.tv> +-Build-Depends: debhelper (>= 9.0.0), cmake, ++Build-Depends: debhelper (>= 9.0.0), cmake, libtinyxml2-dev, + kodi-addon-dev + Standards-Version: 4.1.2 + Section: libs +diff -up ./depends/common/tinyxml2/flags.txt.orig ./depends/common/tinyxml2/flags.txt +--- ./depends/common/tinyxml2/flags.txt.orig 2023-01-31 12:07:51.713867945 +0100 ++++ ./depends/common/tinyxml2/flags.txt 2023-01-31 12:07:58.392962248 +0100 +@@ -0,0 +1 @@ ++-Dtinyxml2_BUILD_TESTING:BOOL=OFF +diff -up ./depends/common/tinyxml2/tinyxml2.sha256.orig ./depends/common/tinyxml2/tinyxml2.sha256 +--- ./depends/common/tinyxml2/tinyxml2.sha256.orig 2023-01-31 12:07:51.714867959 +0100 ++++ ./depends/common/tinyxml2/tinyxml2.sha256 2023-01-31 12:07:58.392962248 +0100 +@@ -0,0 +1 @@ ++cc2f1417c308b1f6acc54f88eb70771a0bf65f76282ce5c40e54cfe52952702c +diff -up ./depends/common/tinyxml2/tinyxml2.txt.orig ./depends/common/tinyxml2/tinyxml2.txt +--- ./depends/common/tinyxml2/tinyxml2.txt.orig 2023-01-31 12:07:51.714867959 +0100 ++++ ./depends/common/tinyxml2/tinyxml2.txt 2023-01-31 12:07:58.393962262 +0100 +@@ -0,0 +1 @@ ++tinyxml2 https://github.com/leethomason/tinyxml2/archive/refs/tags/9.0.0.tar.gz +diff -up ./FindTinyXML2.cmake.orig ./FindTinyXML2.cmake +--- ./FindTinyXML2.cmake.orig 2023-01-31 12:07:35.484638804 +0100 ++++ ./FindTinyXML2.cmake 2023-01-31 12:07:58.392962248 +0100 +@@ -0,0 +1,27 @@ ++# - Find TinyXML2 ++# Find the native TinyXML2 includes and library ++# ++# TINYXML2_FOUND - True if TinyXML2 found. ++# TINYXML2_INCLUDE_DIRS - where to find tinyxml2.h, etc. ++# TINYXML2_LIBRARIES - List of libraries when using TinyXML2. ++# ++ ++find_package(PkgConfig) ++if(PKG_CONFIG_FOUND) ++ pkg_check_modules(PC_TINYXML2 tinyxml2 QUIET) ++endif() ++ ++find_path(TINYXML2_INCLUDE_DIR tinyxml2.h PATHS ${PC_TINYXML2_INCLUDEDIR}) ++find_library(TINYXML2_LIBRARY NAMES tinyxml2 PATHS ${PC_TINYXML2_LIBDIR}) ++ ++include(FindPackageHandleStandardArgs) ++find_package_handle_standard_args(TinyXML2 ++ REQUIRED_VARS TINYXML2_LIBRARY TINYXML2_INCLUDE_DIR ++ VERSION_VAR ${PC_TINYXML2_VERSION}) ++ ++if(TINYXML2_FOUND) ++ set(TINYXML2_INCLUDE_DIRS ${TINYXML2_INCLUDE_DIR}) ++ set(TINYXML2_LIBRARIES ${TINYXML2_LIBRARY}) ++endif() ++ ++mark_as_advanced(TINYXML2_INCLUDE_DIR TINYXML2_LIBRARY) +diff -up ./src/vbox/CategoryGenreMapper.cpp.orig ./src/vbox/CategoryGenreMapper.cpp +--- ./src/vbox/CategoryGenreMapper.cpp.orig 2022-09-16 15:31:03.000000000 +0200 ++++ ./src/vbox/CategoryGenreMapper.cpp 2023-01-31 12:07:58.394962276 +0100 +@@ -16,7 +16,7 @@ + #include <kodi/General.h> + #include <kodi/addon-instance/pvr/EPG.h> + #include <kodi/tools/StringUtils.h> +-#include <lib/tinyxml2/tinyxml2.h> ++#include <tinyxml2.h> + + // using namespace xmltv; + using namespace kodi::tools; +@@ -68,7 +68,7 @@ bool CategoryGenreMapper::LoadCategoryTo + std::unique_ptr<std::string> contents = utilities::ReadFileContents(fileHandle); + + // Try to parse the document +- if (document.Parse(contents->c_str(), contents->size()) != XML_NO_ERROR) ++ if (document.Parse(contents->c_str(), contents->size()) != XML_SUCCESS) + throw vbox::InvalidXMLException("XML parsing failed: " + std::string(document.ErrorName())); + + // Create mappings +diff -up ./src/vbox/GuideChannelMapper.cpp.orig ./src/vbox/GuideChannelMapper.cpp +--- ./src/vbox/GuideChannelMapper.cpp.orig 2022-09-16 15:31:03.000000000 +0200 ++++ ./src/vbox/GuideChannelMapper.cpp 2023-01-31 12:07:58.394962276 +0100 +@@ -13,7 +13,7 @@ + + #include <memory> + +-#include <lib/tinyxml2/tinyxml2.h> ++#include <tinyxml2.h> + + using namespace vbox; + using namespace tinyxml2; +@@ -74,7 +74,7 @@ void GuideChannelMapper::Load() + std::unique_ptr<std::string> contents = utilities::ReadFileContents(fileHandle); + + // Try to parse the document +- if (document.Parse(contents->c_str(), contents->size()) != XML_NO_ERROR) ++ if (document.Parse(contents->c_str(), contents->size()) != XML_SUCCESS) + throw vbox::InvalidXMLException("XML parsing failed: " + std::string(document.ErrorName())); + + // Create mappings +diff -up ./src/vbox/response/Content.cpp.orig ./src/vbox/response/Content.cpp +--- ./src/vbox/response/Content.cpp.orig 2022-09-16 15:31:03.000000000 +0200 ++++ ./src/vbox/response/Content.cpp 2023-01-31 12:07:58.394962276 +0100 +@@ -13,7 +13,7 @@ + #include "../../xmltv/Utilities.h" + #include "../Channel.h" + +-#include <lib/tinyxml2/tinyxml2.h> ++#include <tinyxml2.h> + + using namespace tinyxml2; + using namespace vbox; +diff -up ./src/vbox/response/Response.cpp.orig ./src/vbox/response/Response.cpp +--- ./src/vbox/response/Response.cpp.orig 2022-09-16 15:31:03.000000000 +0200 ++++ ./src/vbox/response/Response.cpp 2023-01-31 12:07:58.394962276 +0100 +@@ -31,7 +31,7 @@ Response::~Response() + void Response::ParseRawResponse(const std::string& rawResponse) + { + // Try to parse the response as XML +- if (m_document->Parse(rawResponse.c_str(), rawResponse.size()) != XML_NO_ERROR) ++ if (m_document->Parse(rawResponse.c_str(), rawResponse.size()) != XML_SUCCESS) + throw vbox::InvalidXMLException("XML parsing failed: " + std::string(m_document->ErrorName())); + + // Parse the response status +diff -up ./src/vbox/response/Response.h.orig ./src/vbox/response/Response.h +--- ./src/vbox/response/Response.h.orig 2022-09-16 15:31:03.000000000 +0200 ++++ ./src/vbox/response/Response.h 2023-01-31 12:07:58.394962276 +0100 +@@ -11,7 +11,7 @@ + #include <memory> + #include <string> + +-#include <lib/tinyxml2/tinyxml2.h> ++#include <tinyxml2.h> + + namespace vbox + { +diff -up ./src/xmltv/Guide.cpp.orig ./src/xmltv/Guide.cpp +--- ./src/xmltv/Guide.cpp.orig 2022-09-16 15:31:03.000000000 +0200 ++++ ./src/xmltv/Guide.cpp 2023-01-31 12:07:58.394962276 +0100 +@@ -15,7 +15,7 @@ + #include <algorithm> + + #include <kodi/tools/StringUtils.h> +-#include <lib/tinyxml2/tinyxml2.h> ++#include <tinyxml2.h> + + using namespace kodi::tools; + using namespace xmltv; +diff -up ./src/xmltv/Programme.cpp.orig ./src/xmltv/Programme.cpp +--- ./src/xmltv/Programme.cpp.orig 2022-09-16 15:31:03.000000000 +0200 ++++ ./src/xmltv/Programme.cpp 2023-01-31 12:07:58.394962276 +0100 +@@ -10,7 +10,7 @@ + + #include "Utilities.h" + +-#include <lib/tinyxml2/tinyxml2.h> ++#include <tinyxml2.h> + + using namespace xmltv; + using namespace tinyxml2; +diff -up ./src/xmltv/Utilities.cpp.orig ./src/xmltv/Utilities.cpp +--- ./src/xmltv/Utilities.cpp.orig 2022-09-16 15:31:03.000000000 +0200 ++++ ./src/xmltv/Utilities.cpp 2023-01-31 12:07:58.394962276 +0100 +@@ -14,7 +14,7 @@ + #include <sstream> + #include <stdexcept> + +-#include <lib/tinyxml2/tinyxml2.h> ++#include <tinyxml2.h> + + using namespace xmltv; + diff --git a/kodi-pvr-vbox.metainfo.xml b/kodi-pvr-vbox.metainfo.xml new file mode 100644 index 0000000..45b4b2d --- /dev/null +++ b/kodi-pvr-vbox.metainfo.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<component type="addon"> + <id>kodi-pvr-vbox</id> + <extends>kodi.desktop</extends> + <name>VBox TV Gateway PVR Client</name> + <summary>PVR addon for VBox Home TV Gateways</summary> + <url type="homepage">https://github.com/xbmc/peripheral.joystick/</url> + <metadata_license>CC0-1.0</metadata_license> + <project_license>GPL-2.0-or-later</project_license> + <update_contact>melmorabity(a)fedoraproject.org</update_contact> +</component> diff --git a/kodi-pvr-vbox.spec b/kodi-pvr-vbox.spec index 37e0097..0f45b83 100644 --- a/kodi-pvr-vbox.spec +++ b/kodi-pvr-vbox.spec @@ -1,26 +1,27 @@ %global kodi_addon pvr.vbox -%global kodi_version 19.0 -%global kodi_codename Matrix +%global kodi_version 20 +%global kodi_codename Nexus Name: kodi-%(tr "." "-" <<<%{kodi_addon}) -Version: 8.1.2 -Release: 4%{?dist} +Version: 20.3.0 +Release: 1%{?dist} Summary: VBox Home TV Gateway PVR client for Kodi -License: GPLv2+ +License: GPL-2.0-or-later URL: https://github.com/kodi-pvr/%{kodi_addon}/ Source0: %{url}/archive/%{version}-%{kodi_codename}/%{kodi_addon}-%{version}.tar.gz -# Use external tinyxml2 library -Patch0: %{name}-8.0.0-use_external_tinyxml2.patch -# Fix build with tinyxml2 >= 6.0.0 -Patch1: %{name}-7.0.0-tinyxml2_6.patch +Source1: %{name}.metainfo.xml +# Use external tinyxml2 library (see +# https://github.com/kodi-pvr/pvr.vbox/pull/275) +Patch0: %{name}-20.3.0-use_external_tinyxml2.patch BuildRequires: cmake3 BuildRequires: gcc-c++ BuildRequires: kodi-devel >= %{kodi_version} +BuildRequires: libappstream-glib BuildRequires: pkgconfig(tinyxml2) Requires: kodi >= %{kodi_version} -ExcludeArch: %{power64} ppc64le +ExcludeArch: %{power64} %description %{summary}. @@ -29,9 +30,6 @@ ExcludeArch: %{power64} ppc64le %prep %autosetup -n %{kodi_addon}-%{version}-%{kodi_codename} -p0 -# Drop bundled tinyxml2 library -rm -r lib/tinyxml2/ - %build %cmake3 @@ -40,6 +38,12 @@ rm -r lib/tinyxml2/ %install %cmake3_install +# Install AppData file +install -Dpm 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_metainfodir}/%{name}.metainfo.xml + + +%check +appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/%{name}.metainfo.xml %files @@ -47,9 +51,15 @@ rm -r lib/tinyxml2/ %license LICENSE.md %{_libdir}/kodi/addons/%{kodi_addon}/ %{_datadir}/kodi/addons/%{kodi_addon}/ +%{_metainfodir}/%{name}.metainfo.xml %changelog +* Sun Jan 29 2023 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 20.3.0-1 +- Update to 20.3.0 +- Add AppStream metadata +- Switch to SPDX license identifiers + * Sun Aug 07 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 8.1.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg 5.1 diff --git a/sources b/sources index 9b797b3..f32a095 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pvr.vbox-8.1.2.tar.gz) = f0e3bed8305d9f7762ed41c3350029e5b374cacf3bf936e5b35503f651761e7addca1f961a7d44739dfd92e48bdd7756c53b616e2183c91c446afc2411598eed +SHA512 (pvr.vbox-20.3.0.tar.gz) = 28fc8d3d905bd10825c27d6d5fbd330edaedfbe09cf9e4489fbe375a630c5ac42ec65e1e18507cd3df0f03dc63b5744be9a8f6175cea104920bb73d7637ec834

1 year, 10 months

1
0
0 / 0

[kodi-pvr-stalker] - Update to 20.3.1 - Add AppStream metadata - Switch to SPDX license identifiers

by Mohamed ElMorabity

commit 25fc750abc924b6fa1ad170c5dfe252e3d446852 Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org> Date: Tue Jan 31 11:57:43 2023 +0100 - Update to 20.3.1 - Add AppStream metadata - Switch to SPDX license identifiers .gitignore | 1 + kodi-pvr-stalker.metainfo.xml | 11 +++++++++++ kodi-pvr-stalker.spec | 29 ++++++++++++++++++++++------- sources | 2 +- 4 files changed, 35 insertions(+), 8 deletions(-) --- diff --git a/.gitignore b/.gitignore index e31e8f0..2975fe6 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /pvr.stalker-7.0.0.tar.gz /pvr.stalker-7.1.0.tar.gz /pvr.stalker-7.1.1.tar.gz +/pvr.stalker-20.3.1.tar.gz diff --git a/kodi-pvr-stalker.metainfo.xml b/kodi-pvr-stalker.metainfo.xml new file mode 100644 index 0000000..cc17106 --- /dev/null +++ b/kodi-pvr-stalker.metainfo.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<component type="addon"> + <id>kodi-pvr-stalker</id> + <extends>kodi.desktop</extends> + <name>Stalker Client</name> + <summary>PVR Client to connect Kodi to Stalker Middleware</summary> + <url type="homepage">https://github.com/xbmc/peripheral.joystick/</url> + <metadata_license>CC0-1.0</metadata_license> + <project_license>GPL-2.0-or-later</project_license> + <update_contact>melmorabity(a)fedoraproject.org</update_contact> +</component> diff --git a/kodi-pvr-stalker.spec b/kodi-pvr-stalker.spec index 3662271..5dd53c0 100644 --- a/kodi-pvr-stalker.spec +++ b/kodi-pvr-stalker.spec @@ -1,24 +1,26 @@ %global kodi_addon pvr.stalker -%global kodi_version 18.0 -%global kodi_codename Matrix +%global kodi_version 20 +%global kodi_codename Nexus Name: kodi-%(tr "." "-" <<<%{kodi_addon}) -Version: 7.1.1 -Release: 4%{?dist} +Version: 20.3.1 +Release: 1%{?dist} Summary: Stalker PVR for Kodi -License: GPLv2+ +License: GPL-2.0-or-later URL: https://github.com/kodi-pvr/%{kodi_addon}/ Source0: %{url}/archive/%{version}-%{kodi_codename}/%{kodi_addon}-%{version}.tar.gz +Source1: %{name}.metainfo.xml BuildRequires: cmake3 BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: kodi-devel >= %{kodi_version} +BuildRequires: libappstream-glib BuildRequires: pkgconfig(jsoncpp) BuildRequires: pkgconfig(libxml-2.0) Requires: kodi >= %{kodi_version} -ExcludeArch: %{power64} ppc64le +ExcludeArch: %{power64} %description %{summary}. @@ -30,7 +32,7 @@ ExcludeArch: %{power64} ppc64le %build # https://gitlab.kitware.com/cmake/cmake/issues/17555#note_355574 -export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 +# export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 %cmake3 %cmake3_build @@ -38,15 +40,28 @@ export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 %install %cmake3_install +# Install AppData file +install -Dpm 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_metainfodir}/%{name}.metainfo.xml + + +%check +appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/%{name}.metainfo.xml + %files %doc README.md %{kodi_addon}/changelog.txt %license LICENSE.md %{_libdir}/kodi/addons/%{kodi_addon}/ %{_datadir}/kodi/addons/%{kodi_addon}/ +%{_metainfodir}/%{name}.metainfo.xml %changelog +* Sun Jan 29 2023 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 20.3.1-1 +- Update to 20.3.1 +- Add AppStream metadata +- Switch to SPDX license identifiers + * Sun Aug 07 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 7.1.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg 5.1 diff --git a/sources b/sources index 98d8599..b6dfb67 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pvr.stalker-7.1.1.tar.gz) = 9f47dcc44f1f5448b36b456778e8592768e28253083aae26a7d65e1f793c841b0c5fb2f83cd398e0895cdd7e31a608c340c518e4d7e63d0075d93fef5f738739 +SHA512 (pvr.stalker-20.3.1.tar.gz) = 4689458f1010d9a4d5021ef286aabddc2253198a39483794217c797048db66c4f6773189b4d7fd5bd4e2ccc3f8920626b462336bff731e4e69f75d7b275f4b25

1 year, 10 months

1
0
0 / 0

[kodi-pvr-pctv] - Update to 20.4.0 - Add AppStream metadata - Switch to SPDX license identifiers

by Mohamed ElMorabity

commit 3249abf20922d631b84df4b0c4993edf2ade6fdb Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org> Date: Tue Jan 31 11:50:44 2023 +0100 - Update to 20.4.0 - Add AppStream metadata - Switch to SPDX license identifiers .gitignore | 1 + kodi-pvr-pctv.metainfo.xml | 11 +++++++++++ kodi-pvr-pctv.spec | 29 ++++++++++++++++++++++------- sources | 2 +- 4 files changed, 35 insertions(+), 8 deletions(-) --- diff --git a/.gitignore b/.gitignore index e5962ee..cbe16c8 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /pvr.pctv-6.0.0.tar.gz /pvr.pctv-6.1.0.tar.gz /pvr.pctv-6.1.1.tar.gz +/pvr.pctv-20.4.0.tar.gz diff --git a/kodi-pvr-pctv.metainfo.xml b/kodi-pvr-pctv.metainfo.xml new file mode 100644 index 0000000..6979dc0 --- /dev/null +++ b/kodi-pvr-pctv.metainfo.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<component type="addon"> + <id>kodi-pvr-pctv</id> + <extends>kodi.desktop</extends> + <name>PCTV Systems Client</name> + <summary>PVR Client to connect PCTV Systems Broadway to Kodi</summary> + <url type="homepage">https://github.com/xbmc/peripheral.joystick/</url> + <metadata_license>CC0-1.0</metadata_license> + <project_license>GPL-2.0-or-later</project_license> + <update_contact>melmorabity(a)fedoraproject.org</update_contact> +</component> diff --git a/kodi-pvr-pctv.spec b/kodi-pvr-pctv.spec index 7b199f7..1c30cfc 100644 --- a/kodi-pvr-pctv.spec +++ b/kodi-pvr-pctv.spec @@ -1,22 +1,24 @@ %global kodi_addon pvr.pctv -%global kodi_version 19.0 -%global kodi_codename Matrix +%global kodi_version 20 +%global kodi_codename Nexus Name: kodi-%(tr "." "-" <<<%{kodi_addon}) -Version: 6.1.1 -Release: 4%{?dist} +Version: 20.4.0 +Release: 1%{?dist} Summary: PCTV PVR for Kodi -License: GPLv2+ +License: GPL-2.0-or-later URL: https://github.com/kodi-pvr/%{kodi_addon}/ Source0: %{url}/archive/%{version}-%{kodi_codename}/%{kodi_addon}-%{version}.tar.gz +Source1: %{name}.metainfo.xml BuildRequires: cmake3 BuildRequires: gcc-c++ BuildRequires: kodi-devel >= %{kodi_version} +BuildRequires: libappstream-glib BuildRequires: pkgconfig(jsoncpp) Requires: kodi >= %{kodi_version} -ExcludeArch: %{power64} ppc64le +ExcludeArch: %{power64} %description %{summary}. @@ -28,7 +30,7 @@ ExcludeArch: %{power64} ppc64le %build # https://gitlab.kitware.com/cmake/cmake/issues/17555#note_355574 -export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 +# export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 %cmake3 %cmake3_build @@ -36,15 +38,28 @@ export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 %install %cmake3_install +# Install AppData file +install -Dpm 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_metainfodir}/%{name}.metainfo.xml + + +%check +appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/%{name}.metainfo.xml + %files %doc README.md %{kodi_addon}/changelog.txt %license LICENSE.md %{_libdir}/kodi/addons/%{kodi_addon}/ %{_datadir}/kodi/addons/%{kodi_addon}/ +%{_metainfodir}/%{name}.metainfo.xml %changelog +* Sun Jan 29 2023 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 20.4.0-1 +- Update to 20.4.0 +- Add AppStream metadata +- Switch to SPDX license identifiers + * Sun Aug 07 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 6.1.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg 5.1 diff --git a/sources b/sources index f41cb87..85d23b8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pvr.pctv-6.1.1.tar.gz) = 12fa2d9299ed84ec89cf4f159946cb007a9a7d404d68a72eb5b63711b4ade6af054107d4880f81d8b3b6683f02aa2495b9c3fbf5d1f5e3d0aa7b8a3316b028ed +SHA512 (pvr.pctv-20.4.0.tar.gz) = 4edf384e6c7cff5b6583af54a1c9655481b26b27510c6193039067cdae313fd6184665e8645a8a97d27369fd37c4ef2258b19fbc25fcdb457a6f3315c3f03b7f

1 year, 10 months

1
0
0 / 0

[kodi-pvr-njoy] - Update to 20.3.0 - Add AppStream metadata - Switch to SPDX license identifiers

by Mohamed ElMorabity

commit 38377937120351d845b99baa1f6d4dcf7ddba44a Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org> Date: Tue Jan 31 11:42:48 2023 +0100 - Update to 20.3.0 - Add AppStream metadata - Switch to SPDX license identifiers .gitignore | 1 + kodi-pvr-njoy.metainfo.xml | 11 +++++++++++ kodi-pvr-njoy.spec | 27 +++++++++++++++++++++------ sources | 2 +- 4 files changed, 34 insertions(+), 7 deletions(-) --- diff --git a/.gitignore b/.gitignore index 32bfd1c..f6cbf16 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /pvr.njoy-7.0.0.tar.gz /pvr.njoy-7.1.0.tar.gz /pvr.njoy-7.1.1.tar.gz +/pvr.njoy-20.3.0.tar.gz diff --git a/kodi-pvr-njoy.metainfo.xml b/kodi-pvr-njoy.metainfo.xml new file mode 100644 index 0000000..f163789 --- /dev/null +++ b/kodi-pvr-njoy.metainfo.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<component type="addon"> + <id>kodi-pvr-njoy</id> + <extends>kodi.desktop</extends> + <name>Njoy N7 PVR Client</name> + <summary>Njoy N7 PVR Client</summary> + <url type="homepage">https://github.com/xbmc/peripheral.joystick/</url> + <metadata_license>CC0-1.0</metadata_license> + <project_license>GPL-2.0-or-later</project_license> + <update_contact>melmorabity(a)fedoraproject.org</update_contact> +</component> diff --git a/kodi-pvr-njoy.spec b/kodi-pvr-njoy.spec index 05a0684..9cabcba 100644 --- a/kodi-pvr-njoy.spec +++ b/kodi-pvr-njoy.spec @@ -1,25 +1,27 @@ %global kodi_addon pvr.njoy -%global kodi_version 19.0 -%global kodi_codename Matrix +%global kodi_version 20 +%global kodi_codename Nexus Name: kodi-%(tr "." "-" <<<%{kodi_addon}) # Use Epoch to manage upgrades from older upstream # (https://github.com/opdenkamp/xbmc-pvr-addons/) Epoch: 1 -Version: 7.1.1 -Release: 4%{?dist} +Version: 20.3.0 +Release: 1%{?dist} Summary: NJOY PVR for Kodi -License: GPLv2+ +License: GPL-2.0-or-later URL: https://github.com/kodi-pvr/%{kodi_addon}/ Source0: %{url}/archive/%{version}-%{kodi_codename}/%{kodi_addon}-%{version}.tar.gz +Source1: %{name}.metainfo.xml BuildRequires: cmake3 BuildRequires: gcc-c++ BuildRequires: kodi-devel >= %{kodi_version} +BuildRequires: libappstream-glib BuildRequires: pkgconfig(tinyxml) Requires: kodi >= %{kodi_version} -ExcludeArch: %{power64} ppc64le +ExcludeArch: %{power64} %description %{summary}. @@ -37,15 +39,28 @@ ExcludeArch: %{power64} ppc64le %install %cmake3_install +# Install AppData file +install -Dpm 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_metainfodir}/%{name}.metainfo.xml + + +%check +appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/%{name}.metainfo.xml + %files %doc README.md %{kodi_addon}/changelog.txt %license LICENSE.md %{_libdir}/kodi/addons/%{kodi_addon}/ %{_datadir}/kodi/addons/%{kodi_addon}/ +%{_metainfodir}/%{name}.metainfo.xml %changelog +* Sun Jan 29 2023 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 1:20.3.0-1 +- Update to 20.3.0 +- Add AppStream metadata +- Switch to SPDX license identifiers + * Sun Aug 07 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 1:7.1.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg 5.1 diff --git a/sources b/sources index 4d806af..13cbc5d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pvr.njoy-7.1.1.tar.gz) = fceeda6d4f967f250ffbb5dc2a4d0cd9248cf61447ccbeb6152f5812186fcca2d41222038ffd53f7d7361ca06fe92599d7eb44d0850e03e9605d33e89086a201 +SHA512 (pvr.njoy-20.3.0.tar.gz) = 6477fbfe680a56328a8223bd575b12c7b48732fb13d473bff1e69ab843c83d647f27428a7b641aceb991fa5acd947dd781164a000fe7b4005cf76a5f4397b40b

1 year, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits January 2023