* [PR PATCH] electron24: s/libgnome-keyring/libsecret/
@ 2024-03-29 13:58 sgn
2024-03-30 0:48 ` [PR PATCH] [Updated] " sgn
2024-03-30 3:27 ` [PR PATCH] [Merged]: " sgn
0 siblings, 2 replies; 3+ messages in thread
From: sgn @ 2024-03-29 13:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1290 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages electron24-gnome-keyring
https://github.com/void-linux/void-packages/pull/49591
electron24: s/libgnome-keyring/libsecret/
<!-- Uncomment relevant sections and delete options which are not applicable -->
[ci-skip]
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/49591.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-electron24-gnome-keyring-49591.patch --]
[-- Type: text/x-diff, Size: 10296 bytes --]
From 95207e1500cb3e578dfab936638f75f369c7d0ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 29 Mar 2024 20:55:47 +0700
Subject: [PATCH] electron24: s/libgnome-keyring/libsecret/
---
srcpkgs/electron24/patches/fix-include.patch | 252 +++++++++++++++++++
srcpkgs/electron24/template | 11 +-
2 files changed, 258 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/electron24/patches/fix-include.patch
diff --git a/srcpkgs/electron24/patches/fix-include.patch b/srcpkgs/electron24/patches/fix-include.patch
new file mode 100644
index 00000000000000..af644db18e7d34
--- /dev/null
+++ b/srcpkgs/electron24/patches/fix-include.patch
@@ -0,0 +1,252 @@
+--- a/src/base/debug/profiler.h
++++ b/src/base/debug/profiler.h
+@@ -6,7 +6,7 @@
+ #define BASE_DEBUG_PROFILER_H_
+
+ #include <stddef.h>
+-
++#include <stdint.h>
+ #include <string>
+
+ #include "base/base_export.h"
+--- a/src/cc/trees/target_property.cc
++++ b/src/cc/trees/target_property.cc
+@@ -5,6 +5,7 @@
+ #include "cc/trees/target_property.h"
+
+ #include "ui/gfx/animation/keyframe/target_property.h"
++#include <cstdint>
+
+ namespace cc {
+
+--- a/src/components/crash/core/app/crash_reporter_client.h
++++ b/src/components/crash/core/app/crash_reporter_client.h
+@@ -5,6 +5,7 @@
+ #ifndef COMPONENTS_CRASH_CORE_APP_CRASH_REPORTER_CLIENT_H_
+ #define COMPONENTS_CRASH_CORE_APP_CRASH_REPORTER_CLIENT_H_
+
++#include <cstdint>
+ #include <map>
+ #include <string>
+
+--- a/src/components/feature_engagement/internal/event_storage_validator.h
++++ b/src/components/feature_engagement/internal/event_storage_validator.h
+@@ -5,6 +5,7 @@
+ #ifndef COMPONENTS_FEATURE_ENGAGEMENT_INTERNAL_EVENT_STORAGE_VALIDATOR_H_
+ #define COMPONENTS_FEATURE_ENGAGEMENT_INTERNAL_EVENT_STORAGE_VALIDATOR_H_
+
++#include <cstdint>
+ #include <string>
+
+ namespace feature_engagement {
+--- a/src/components/password_manager/core/browser/generation/password_generator.h
++++ b/src/components/password_manager/core/browser/generation/password_generator.h
+@@ -5,6 +5,7 @@
+ #ifndef COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_GENERATION_PASSWORD_GENERATOR_H_
+ #define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_GENERATION_PASSWORD_GENERATOR_H_
+
++#include <cstdint>
+ #include <string>
+
+
+--- a/src/components/viz/common/view_transition_element_resource_id.h
++++ b/src/components/viz/common/view_transition_element_resource_id.h
+@@ -5,6 +5,7 @@
+ #ifndef COMPONENTS_VIZ_COMMON_VIEW_TRANSITION_ELEMENT_RESOURCE_ID_H_
+ #define COMPONENTS_VIZ_COMMON_VIEW_TRANSITION_ELEMENT_RESOURCE_ID_H_
+
++#include <cstdint>
+ #include <string>
+ #include <vector>
+
+--- a/src/device/base/synchronization/one_writer_seqlock.h
++++ b/src/device/base/synchronization/one_writer_seqlock.h
+@@ -6,6 +6,7 @@
+ #define DEVICE_BASE_SYNCHRONIZATION_ONE_WRITER_SEQLOCK_H_
+
+ #include <atomic>
++#include <cstdint>
+ #include <type_traits>
+
+ #include "base/atomicops.h"
+--- a/src/gpu/config/gpu_feature_info.h
++++ b/src/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>
+
+--- a/src/net/cert/pki/string_util.h
++++ b/src/net/cert/pki/string_util.h
+@@ -7,6 +7,7 @@
+
+ #include "net/base/net_export.h"
+
++#include <cstdint>
+ #include <string_view>
+ #include <vector>
+
+--- a/src/net/cookies/cookie_inclusion_status.h
++++ b/src/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 <bitset>
+ #include <ostream>
+ #include <string>
+--- a/src/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h
++++ b/src/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h
+@@ -5,6 +5,7 @@
+ #ifndef QUICHE_QUIC_CORE_CRYPTO_QUIC_HKDF_H_
+ #define QUICHE_QUIC_CORE_CRYPTO_QUIC_HKDF_H_
+
++#include <cstdint>
+ #include <vector>
+
+ #include "absl/strings/string_view.h"
+--- a/src/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h
++++ b/src/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h
+@@ -5,6 +5,7 @@
+ #ifndef QUICHE_QUIC_CORE_QUIC_CONNECTION_ID_H_
+ #define QUICHE_QUIC_CORE_QUIC_CONNECTION_ID_H_
+
++#include <cstdint>
+ #include <string>
+ #include <vector>
+
+--- a/src/third_party/dawn/src/dawn/native/stream/ByteVectorSink.h
++++ b/src/third_party/dawn/src/dawn/native/stream/ByteVectorSink.h
+@@ -15,6 +15,7 @@
+ #ifndef SRC_DAWN_NATIVE_STREAM_BYTEVECTORSINK_H_
+ #define SRC_DAWN_NATIVE_STREAM_BYTEVECTORSINK_H_
+
++#include <cstdint>
+ #include <ostream>
+ #include <vector>
+
+--- a/src/third_party/maldoca/src/maldoca/ole/header.h
++++ b/src/third_party/maldoca/src/maldoca/ole/header.h
+@@ -43,6 +43,7 @@
+ #ifndef MALDOCA_OLE_HEADER_H_
+ #define MALDOCA_OLE_HEADER_H_
+
++#include <cstdint>
+ #include "absl/strings/string_view.h"
+
+ namespace maldoca {
+--- a/src/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.h
++++ b/src/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.h
+@@ -5,6 +5,7 @@
+ #ifndef DISCOVERY_DNSSD_PUBLIC_DNS_SD_TXT_RECORD_H_
+ #define DISCOVERY_DNSSD_PUBLIC_DNS_SD_TXT_RECORD_H_
+
++#include <cstdint>
+ #include <functional>
+ #include <map>
+ #include <set>
+--- a/src/third_party/openscreen/src/util/base64.h
++++ b/src/third_party/openscreen/src/util/base64.h
+@@ -5,6 +5,7 @@
+ #ifndef UTIL_BASE64_H_
+ #define UTIL_BASE64_H_
+
++#include <cstdint>
+ #include <string>
+ #include <vector>
+
+--- a/src/third_party/perfetto/include/perfetto/ext/base/uuid.h
++++ b/src/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"
+--- a/src/third_party/ruy/src/ruy/profiler/instrumentation.h
++++ b/src/third_party/ruy/src/ruy/profiler/instrumentation.h
+@@ -20,6 +20,7 @@ limitations under the License.
+ #include <cstdio>
+ #include <mutex>
+ #include <vector>
++#include <string>
+ #endif
+
+ namespace ruy {
+--- a/src/third_party/swiftshader/src/System/LRUCache.hpp
++++ b/src/third_party/swiftshader/src/System/LRUCache.hpp
+@@ -18,6 +18,7 @@
+ #include "System/Debug.hpp"
+
+ #include <cstddef>
++#include <cstdint>
+ #include <functional>
+ #include <unordered_set>
+ #include <vector>
+--- a/src/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.cc
++++ b/src/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.cc
+@@ -17,6 +17,7 @@ limitations under the License.
+
+ #include <assert.h>
+ #include <math.h>
++#include <stdint.h>
+
+ #include "third_party/fft2d/fft.h"
+
+--- a/src/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
++++ b/src/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
+@@ -2389,6 +2389,7 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeV
+ #undef VMA_IMPLEMENTATION
+
+ #include <cstdint>
++#include <cstdio>
+ #include <cstdlib>
+ #include <cstring>
+ #include <utility>
+--- a/src/third_party/webrtc/rtc_base/third_party/base64/base64.h
++++ b/src/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>
+
+--- a/src/ui/base/prediction/kalman_filter.h
++++ b/src/ui/base/prediction/kalman_filter.h
+@@ -5,6 +5,7 @@
+ #ifndef UI_BASE_PREDICTION_KALMAN_FILTER_H_
+ #define UI_BASE_PREDICTION_KALMAN_FILTER_H_
+
++#include <cstdint>
+ #include "base/component_export.h"
+ #include "ui/gfx/geometry/matrix3_f.h"
+
+--- a/src/ui/events/types/scroll_types.h
++++ b/src/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 {
+--- a/src/ui/gfx/geometry/linear_gradient.h
++++ b/src/ui/gfx/geometry/linear_gradient.h
+@@ -6,6 +6,7 @@
+ #define UI_GFX_LINEAR_GRADIENT_H_
+
+ #include <array>
++#include <cstdint>
+ #include <string>
+
+ #include "ui/gfx/geometry/geometry_skia_export.h"
diff --git a/srcpkgs/electron24/template b/srcpkgs/electron24/template
index 7b4e28812f483e..eafb9a0c696131 100644
--- a/srcpkgs/electron24/template
+++ b/srcpkgs/electron24/template
@@ -1,7 +1,7 @@
# Template file for 'electron24'
pkgname=electron24
version=24.3.0
-revision=2
+revision=3
_nodever=18.14.0
_chromiumver=112.0.5615.165
archs="x86_64* aarch64*"
@@ -14,7 +14,7 @@ hostmakedepends="$(vopt_if clang "clang lld") pkgconf perl gperf bison ninja nod
alsa-lib-devel re2-devel snappy-devel mit-krb5-devel $(vopt_if pulseaudio pulseaudio-devel)
$(vopt_if sndio sndio-devel) jq python3.11"
makedepends="libpng-devel gtk+-devel gtk+3-devel nss-devel pciutils-devel
- libXi-devel libgcrypt-devel libgnome-keyring-devel cups-devel elfutils-devel
+ libXi-devel libgcrypt-devel libsecret-devel cups-devel elfutils-devel
libXcomposite-devel speech-dispatcher-devel libXrandr-devel mit-krb5-devel
libXScrnSaver-devel alsa-lib-devel snappy-devel libdrm-devel
libxml2-devel libxslt-devel $(vopt_if pulseaudio pulseaudio-devel) libexif-devel
@@ -131,7 +131,7 @@ _git_init() {
}
-post_patch() {
+pre_patch() {
cd $wrksrc
for x in $FILESDIR/patches/*.patch; do
case "${x##*/}" in
@@ -206,7 +206,7 @@ post_patch() {
}
pre_configure() {
- ln -s "/usr/bin/python3.11" "${XBPS_WRAPPERDIR}/python3"
+ ln -sf "/usr/bin/python3.11" "${XBPS_WRAPPERDIR}/python3"
cd "$wrksrc/$build_wrksrc"
@@ -226,7 +226,8 @@ pre_configure() {
# compile gn early, so it can be used to generate gni stuff
msg_normal "Bootstrapping GN\n"
CC="${CC_FOR_BUILD:-$CC}" CXX="${CXX_FOR_BUILD:-$CXX}" LD="${LD_FOR_BUILD:-$LD}" \
- CFLAGS="${CFLAGS_FOR_BUILD:-$CFLAGS}" CXXFLAGS="${CXXFLAGS_FOR_BUILD:-$CXXFLAGS}" \
+ CFLAGS="${CFLAGS_FOR_BUILD:-$CFLAGS}" \
+ CXXFLAGS="${CXXFLAGS_FOR_BUILD:-$CXXFLAGS} -Wno-error=redundant-move" \
LDFLAGS="${XBPS_LDFLAGS}" \
python3.11 tools/gn/bootstrap/bootstrap.py -s -v --skip-generate-buildfiles
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] electron24: s/libgnome-keyring/libsecret/
2024-03-29 13:58 [PR PATCH] electron24: s/libgnome-keyring/libsecret/ sgn
@ 2024-03-30 0:48 ` sgn
2024-03-30 3:27 ` [PR PATCH] [Merged]: " sgn
1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2024-03-30 0:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1304 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages electron24-gnome-keyring
https://github.com/void-linux/void-packages/pull/49591
electron24: s/libgnome-keyring/libsecret/
<!-- Uncomment relevant sections and delete options which are not applicable -->
[ci-skip][skip-ci]
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/49591.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-electron24-gnome-keyring-49591.patch --]
[-- Type: text/x-diff, Size: 13111 bytes --]
From 22eb0a8d5c910e839ad39c35c5572851bb9978d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 29 Mar 2024 20:55:47 +0700
Subject: [PATCH] electron24: s/libgnome-keyring/libsecret/
---
srcpkgs/electron24/patches/fix-include.patch | 303 +++++++++++++++++++
srcpkgs/electron24/patches/libxml2.patch | 22 ++
srcpkgs/electron24/template | 11 +-
3 files changed, 331 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/electron24/patches/fix-include.patch
create mode 100644 srcpkgs/electron24/patches/libxml2.patch
diff --git a/srcpkgs/electron24/patches/fix-include.patch b/srcpkgs/electron24/patches/fix-include.patch
new file mode 100644
index 00000000000000..2a8b26b84c8b74
--- /dev/null
+++ b/srcpkgs/electron24/patches/fix-include.patch
@@ -0,0 +1,303 @@
+--- a/src/base/debug/profiler.h
++++ b/src/base/debug/profiler.h
+@@ -6,7 +6,7 @@
+ #define BASE_DEBUG_PROFILER_H_
+
+ #include <stddef.h>
+-
++#include <stdint.h>
+ #include <string>
+
+ #include "base/base_export.h"
+--- a/src/cc/trees/target_property.cc
++++ b/src/cc/trees/target_property.cc
+@@ -5,6 +5,7 @@
+ #include "cc/trees/target_property.h"
+
+ #include "ui/gfx/animation/keyframe/target_property.h"
++#include <cstdint>
+
+ namespace cc {
+
+--- a/src/components/crash/core/app/crash_reporter_client.h
++++ b/src/components/crash/core/app/crash_reporter_client.h
+@@ -5,6 +5,7 @@
+ #ifndef COMPONENTS_CRASH_CORE_APP_CRASH_REPORTER_CLIENT_H_
+ #define COMPONENTS_CRASH_CORE_APP_CRASH_REPORTER_CLIENT_H_
+
++#include <cstdint>
+ #include <map>
+ #include <string>
+
+--- a/src/components/feature_engagement/internal/event_storage_validator.h
++++ b/src/components/feature_engagement/internal/event_storage_validator.h
+@@ -5,6 +5,7 @@
+ #ifndef COMPONENTS_FEATURE_ENGAGEMENT_INTERNAL_EVENT_STORAGE_VALIDATOR_H_
+ #define COMPONENTS_FEATURE_ENGAGEMENT_INTERNAL_EVENT_STORAGE_VALIDATOR_H_
+
++#include <cstdint>
+ #include <string>
+
+ namespace feature_engagement {
+--- a/src/components/password_manager/core/browser/generation/password_generator.h
++++ b/src/components/password_manager/core/browser/generation/password_generator.h
+@@ -5,6 +5,7 @@
+ #ifndef COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_GENERATION_PASSWORD_GENERATOR_H_
+ #define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_GENERATION_PASSWORD_GENERATOR_H_
+
++#include <cstdint>
+ #include <string>
+
+
+--- a/src/components/viz/common/view_transition_element_resource_id.h
++++ b/src/components/viz/common/view_transition_element_resource_id.h
+@@ -5,6 +5,7 @@
+ #ifndef COMPONENTS_VIZ_COMMON_VIEW_TRANSITION_ELEMENT_RESOURCE_ID_H_
+ #define COMPONENTS_VIZ_COMMON_VIEW_TRANSITION_ELEMENT_RESOURCE_ID_H_
+
++#include <cstdint>
+ #include <string>
+ #include <vector>
+
+--- a/src/device/base/synchronization/one_writer_seqlock.h
++++ b/src/device/base/synchronization/one_writer_seqlock.h
+@@ -6,6 +6,7 @@
+ #define DEVICE_BASE_SYNCHRONIZATION_ONE_WRITER_SEQLOCK_H_
+
+ #include <atomic>
++#include <cstdint>
+ #include <type_traits>
+
+ #include "base/atomicops.h"
+--- a/src/gpu/config/gpu_feature_info.h
++++ b/src/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>
+
+--- a/src/net/cert/pki/string_util.h
++++ b/src/net/cert/pki/string_util.h
+@@ -7,6 +7,7 @@
+
+ #include "net/base/net_export.h"
+
++#include <cstdint>
+ #include <string_view>
+ #include <vector>
+
+--- a/src/net/cookies/cookie_inclusion_status.h
++++ b/src/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 <bitset>
+ #include <ostream>
+ #include <string>
+--- a/src/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h
++++ b/src/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h
+@@ -5,6 +5,7 @@
+ #ifndef QUICHE_QUIC_CORE_CRYPTO_QUIC_HKDF_H_
+ #define QUICHE_QUIC_CORE_CRYPTO_QUIC_HKDF_H_
+
++#include <cstdint>
+ #include <vector>
+
+ #include "absl/strings/string_view.h"
+--- a/src/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h
++++ b/src/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h
+@@ -5,6 +5,7 @@
+ #ifndef QUICHE_QUIC_CORE_QUIC_CONNECTION_ID_H_
+ #define QUICHE_QUIC_CORE_QUIC_CONNECTION_ID_H_
+
++#include <cstdint>
+ #include <string>
+ #include <vector>
+
+--- a/src/third_party/dawn/src/dawn/native/stream/ByteVectorSink.h
++++ b/src/third_party/dawn/src/dawn/native/stream/ByteVectorSink.h
+@@ -15,6 +15,7 @@
+ #ifndef SRC_DAWN_NATIVE_STREAM_BYTEVECTORSINK_H_
+ #define SRC_DAWN_NATIVE_STREAM_BYTEVECTORSINK_H_
+
++#include <cstdint>
+ #include <ostream>
+ #include <vector>
+
+--- a/src/third_party/maldoca/src/maldoca/ole/header.h
++++ b/src/third_party/maldoca/src/maldoca/ole/header.h
+@@ -43,6 +43,7 @@
+ #ifndef MALDOCA_OLE_HEADER_H_
+ #define MALDOCA_OLE_HEADER_H_
+
++#include <cstdint>
+ #include "absl/strings/string_view.h"
+
+ namespace maldoca {
+--- a/src/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.h
++++ b/src/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.h
+@@ -5,6 +5,7 @@
+ #ifndef DISCOVERY_DNSSD_PUBLIC_DNS_SD_TXT_RECORD_H_
+ #define DISCOVERY_DNSSD_PUBLIC_DNS_SD_TXT_RECORD_H_
+
++#include <cstdint>
+ #include <functional>
+ #include <map>
+ #include <set>
+--- a/src/third_party/openscreen/src/util/base64.h
++++ b/src/third_party/openscreen/src/util/base64.h
+@@ -5,6 +5,7 @@
+ #ifndef UTIL_BASE64_H_
+ #define UTIL_BASE64_H_
+
++#include <cstdint>
+ #include <string>
+ #include <vector>
+
+--- a/src/third_party/perfetto/include/perfetto/ext/base/uuid.h
++++ b/src/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"
+--- a/src/third_party/ruy/src/ruy/profiler/instrumentation.h
++++ b/src/third_party/ruy/src/ruy/profiler/instrumentation.h
+@@ -20,6 +20,7 @@ limitations under the License.
+ #include <cstdio>
+ #include <mutex>
+ #include <vector>
++#include <string>
+ #endif
+
+ namespace ruy {
+--- a/src/third_party/swiftshader/src/System/LRUCache.hpp
++++ b/src/third_party/swiftshader/src/System/LRUCache.hpp
+@@ -18,6 +18,7 @@
+ #include "System/Debug.hpp"
+
+ #include <cstddef>
++#include <cstdint>
+ #include <functional>
+ #include <unordered_set>
+ #include <vector>
+--- a/src/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.cc
++++ b/src/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.cc
+@@ -17,6 +17,7 @@ limitations under the License.
+
+ #include <assert.h>
+ #include <math.h>
++#include <stdint.h>
+
+ #include "third_party/fft2d/fft.h"
+
+--- a/src/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
++++ b/src/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
+@@ -2389,6 +2389,7 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeV
+ #undef VMA_IMPLEMENTATION
+
+ #include <cstdint>
++#include <cstdio>
+ #include <cstdlib>
+ #include <cstring>
+ #include <utility>
+--- a/src/third_party/webrtc/rtc_base/third_party/base64/base64.h
++++ b/src/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>
+
+--- a/src/ui/base/prediction/kalman_filter.h
++++ b/src/ui/base/prediction/kalman_filter.h
+@@ -5,6 +5,7 @@
+ #ifndef UI_BASE_PREDICTION_KALMAN_FILTER_H_
+ #define UI_BASE_PREDICTION_KALMAN_FILTER_H_
+
++#include <cstdint>
+ #include "base/component_export.h"
+ #include "ui/gfx/geometry/matrix3_f.h"
+
+--- a/src/ui/events/types/scroll_types.h
++++ b/src/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 {
+--- a/src/ui/gfx/geometry/linear_gradient.h
++++ b/src/ui/gfx/geometry/linear_gradient.h
+@@ -6,6 +6,7 @@
+ #define UI_GFX_LINEAR_GRADIENT_H_
+
+ #include <array>
++#include <cstdint>
+ #include <string>
+
+ #include "ui/gfx/geometry/geometry_skia_export.h"
+--- a/src/components/autofill/core/browser/autofill_ablation_study.h
++++ b/src/components/autofill/core/browser/autofill_ablation_study.h
+@@ -5,6 +5,7 @@
+ #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_ABLATION_STUDY_H_
+ #define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_ABLATION_STUDY_H_
+
++#include <cstdint>
+ #include <string>
+
+ class GURL;
+--- a/src/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h
++++ b/src/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h
+@@ -6,6 +6,7 @@
+ #define THIRD_PARTY_BLINK_PUBLIC_COMMON_BLUETOOTH_WEB_BLUETOOTH_DEVICE_ID_H_
+
+ #include <array>
++#include <cstdint>
+ #include <string>
+
+ #include "third_party/blink/public/common/common_export.h"
+--- a/src/gin/time_clamper.h
++++ b/src/gin/time_clamper.h
+@@ -6,6 +6,7 @@
+ #define GIN_TIME_CLAMPER_H_
+
+ #include <algorithm>
++#include <cstdint>
+
+ #include "base/rand_util.h"
+ #include "base/time/time.h"
+--- a/src/pdf/document_attachment_info.h
++++ b/src/pdf/document_attachment_info.h
+@@ -5,6 +5,7 @@
+ #ifndef PDF_DOCUMENT_ATTACHMENT_INFO_H_
+ #define PDF_DOCUMENT_ATTACHMENT_INFO_H_
+
++#include <cstdint>
+ #include <string>
+
+
+--- a/src/third_party/pdfium/constants/annotation_flags.h
++++ b/src/third_party/pdfium/constants/annotation_flags.h
+@@ -5,6 +5,8 @@
+ #ifndef CONSTANTS_ANNOTATION_FLAGS_H_
+ #define CONSTANTS_ANNOTATION_FLAGS_H_
+
++#include <stdint.h>
++
+ namespace pdfium {
+ namespace annotation_flags {
+
diff --git a/srcpkgs/electron24/patches/libxml2.patch b/srcpkgs/electron24/patches/libxml2.patch
new file mode 100644
index 00000000000000..91e0b5cd563263
--- /dev/null
+++ b/srcpkgs/electron24/patches/libxml2.patch
@@ -0,0 +1,22 @@
+--- a/src/third_party/blink/renderer/core/xml/xslt_processor.h
++++ b/src/third_party/blink/renderer/core/xml/xslt_processor.h
+@@ -77,7 +77,7 @@ class XSLTProcessor final : public Scrip
+
+ void reset();
+
+- static void ParseErrorFunc(void* user_data, xmlError*);
++ static void ParseErrorFunc(void* user_data, const xmlError*);
+ static void GenericErrorFunc(void* user_data, const char* msg, ...);
+
+ // Only for libXSLT callbacks
+--- a/src/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc
++++ b/src/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc
+@@ -65,7 +65,7 @@ void XSLTProcessor::GenericErrorFunc(voi
+ // It would be nice to do something with this error message.
+ }
+
+-void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) {
++void XSLTProcessor::ParseErrorFunc(void* user_data, const xmlError* error) {
+ FrameConsole* console = static_cast<FrameConsole*>(user_data);
+ if (!console)
+ return;
diff --git a/srcpkgs/electron24/template b/srcpkgs/electron24/template
index 7b4e28812f483e..eafb9a0c696131 100644
--- a/srcpkgs/electron24/template
+++ b/srcpkgs/electron24/template
@@ -1,7 +1,7 @@
# Template file for 'electron24'
pkgname=electron24
version=24.3.0
-revision=2
+revision=3
_nodever=18.14.0
_chromiumver=112.0.5615.165
archs="x86_64* aarch64*"
@@ -14,7 +14,7 @@ hostmakedepends="$(vopt_if clang "clang lld") pkgconf perl gperf bison ninja nod
alsa-lib-devel re2-devel snappy-devel mit-krb5-devel $(vopt_if pulseaudio pulseaudio-devel)
$(vopt_if sndio sndio-devel) jq python3.11"
makedepends="libpng-devel gtk+-devel gtk+3-devel nss-devel pciutils-devel
- libXi-devel libgcrypt-devel libgnome-keyring-devel cups-devel elfutils-devel
+ libXi-devel libgcrypt-devel libsecret-devel cups-devel elfutils-devel
libXcomposite-devel speech-dispatcher-devel libXrandr-devel mit-krb5-devel
libXScrnSaver-devel alsa-lib-devel snappy-devel libdrm-devel
libxml2-devel libxslt-devel $(vopt_if pulseaudio pulseaudio-devel) libexif-devel
@@ -131,7 +131,7 @@ _git_init() {
}
-post_patch() {
+pre_patch() {
cd $wrksrc
for x in $FILESDIR/patches/*.patch; do
case "${x##*/}" in
@@ -206,7 +206,7 @@ post_patch() {
}
pre_configure() {
- ln -s "/usr/bin/python3.11" "${XBPS_WRAPPERDIR}/python3"
+ ln -sf "/usr/bin/python3.11" "${XBPS_WRAPPERDIR}/python3"
cd "$wrksrc/$build_wrksrc"
@@ -226,7 +226,8 @@ pre_configure() {
# compile gn early, so it can be used to generate gni stuff
msg_normal "Bootstrapping GN\n"
CC="${CC_FOR_BUILD:-$CC}" CXX="${CXX_FOR_BUILD:-$CXX}" LD="${LD_FOR_BUILD:-$LD}" \
- CFLAGS="${CFLAGS_FOR_BUILD:-$CFLAGS}" CXXFLAGS="${CXXFLAGS_FOR_BUILD:-$CXXFLAGS}" \
+ CFLAGS="${CFLAGS_FOR_BUILD:-$CFLAGS}" \
+ CXXFLAGS="${CXXFLAGS_FOR_BUILD:-$CXXFLAGS} -Wno-error=redundant-move" \
LDFLAGS="${XBPS_LDFLAGS}" \
python3.11 tools/gn/bootstrap/bootstrap.py -s -v --skip-generate-buildfiles
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: electron24: s/libgnome-keyring/libsecret/
2024-03-29 13:58 [PR PATCH] electron24: s/libgnome-keyring/libsecret/ sgn
2024-03-30 0:48 ` [PR PATCH] [Updated] " sgn
@ 2024-03-30 3:27 ` sgn
1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2024-03-30 3:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1139 bytes --]
There's a merged pull request on the void-packages repository
electron24: s/libgnome-keyring/libsecret/
https://github.com/void-linux/void-packages/pull/49591
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
[ci-skip][skip-ci]
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-03-30 3:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-29 13:58 [PR PATCH] electron24: s/libgnome-keyring/libsecret/ sgn
2024-03-30 0:48 ` [PR PATCH] [Updated] " sgn
2024-03-30 3:27 ` [PR PATCH] [Merged]: " sgn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).