mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-08 21:00:05 +02:00
GTK4, enable 32bit, disable riscv64 (#12700)
This commit is contained in:
Schrijvers Luc
GitHub
@@ -12,8 +12,8 @@ SOURCE_DIR="gtk-$portVersion"
|
||||
PATCHES="gtk4-$portVersion.patchset"
|
||||
ADDITIONAL_FILES="compile-schemas.sh"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
SECONDARY_ARCHITECTURES="?x86"
|
||||
ARCHITECTURES="all !x86_gcc2 ?riscv64"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
POST_INSTALL_SCRIPTS="
|
||||
$relativePostInstallDir/compile-schemas.sh
|
||||
@@ -126,7 +126,7 @@ BUILD_PREREQUIRES="
|
||||
cmd:ninja
|
||||
cmd:patch
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
cmd:sassc
|
||||
cmd:sassc$secondaryArchSuffix
|
||||
cmd:wayland_scanner
|
||||
cmd:update_mime_database$secondaryArchSuffix
|
||||
"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 49910dcd6b5348b9267316044f69bed4d0a8ce2f Mon Sep 17 00:00:00 2001
|
||||
From 22aed0d3daa806613bfa6e8a4d83c5e52e4076fd Mon Sep 17 00:00:00 2001
|
||||
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
|
||||
Date: Mon, 3 Feb 2025 17:31:15 +0100
|
||||
Subject: gdk/wayland: Use forgotten include guards
|
||||
@@ -71,7 +71,7 @@ index 15d2666..570bad7 100644
|
||||
2.48.1
|
||||
|
||||
|
||||
From 911a9c059930653d43583c89128fccefe9edd4fc Mon Sep 17 00:00:00 2001
|
||||
From f7c5b22f11b985abcf250bffc03d41eae794bf85 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Fri, 18 Nov 2022 12:45:53 +1000
|
||||
Subject: Add input-event-codes.h from linux
|
||||
@@ -1110,7 +1110,7 @@ index 2ba47a4..188e8bc 100644
|
||||
2.48.1
|
||||
|
||||
|
||||
From 77a1bc5b78d0f8cc27d13da63cf29c543ef2821b Mon Sep 17 00:00:00 2001
|
||||
From 6c6c1d528d5db24ec9080d1e9b14e3981ec5eb7d Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Richards <electrodeyt@gmail.com>
|
||||
Date: Sun, 1 Sep 2024 17:52:27 +0000
|
||||
Subject: Disable shadows
|
||||
@@ -1135,7 +1135,7 @@ index eadba52..9b5e8bf 100644
|
||||
2.48.1
|
||||
|
||||
|
||||
From d75331302652a695087b0475eeed8d45abd0f7d7 Mon Sep 17 00:00:00 2001
|
||||
From 681cfb8ea42005672a7aaf18a3f35ddbb39afbfe Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Richards <electrodeyt@gmail.com>
|
||||
Date: Sun, 1 Sep 2024 17:55:31 +0000
|
||||
Subject: Disable header for dialogs by default
|
||||
@@ -1161,7 +1161,7 @@ index 53a9e47..c1c29dd 100644
|
||||
2.48.1
|
||||
|
||||
|
||||
From 6cccc9346d8f56ba992c9bff7bde41fb98bd0b18 Mon Sep 17 00:00:00 2001
|
||||
From f05830369a9531ba8982f11803880ac5bf4aaa0d Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Richards <electrodeyt@gmail.com>
|
||||
Date: Sun, 22 Sep 2024 18:18:48 +0000
|
||||
Subject: Patch XDG path stuff 1
|
||||
@@ -1192,7 +1192,7 @@ index 0e2cd19..497e2db 100644
|
||||
2.48.1
|
||||
|
||||
|
||||
From 9f702d7af9fe5c022089f242abbda34e75b29c5e Mon Sep 17 00:00:00 2001
|
||||
From 0bcf854e60bceded4720e807d370cc3affb84076 Mon Sep 17 00:00:00 2001
|
||||
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
|
||||
Date: Mon, 3 Feb 2025 17:21:32 +0000
|
||||
Subject: gdk/wayland: Copy strsep() from musl
|
||||
@@ -1225,7 +1225,7 @@ index 64ff93e..3bf6c63 100644
|
||||
2.48.1
|
||||
|
||||
|
||||
From e20f29fca8e6e3fe9d539ccbc0c978ec046ce86e Mon Sep 17 00:00:00 2001
|
||||
From c0ec26a937d0fcddea30996b036e71d7e0cbd70e Mon Sep 17 00:00:00 2001
|
||||
From: Luc Schrijvers <begasus@gmail.com>
|
||||
Date: Sat, 14 Jun 2025 12:11:07 +0200
|
||||
Subject: Revert: Determine direction from language
|
||||
@@ -1298,3 +1298,193 @@ index 86f7307..18e2892 100644
|
||||
--
|
||||
2.48.1
|
||||
|
||||
|
||||
From c98001cb85eaa20e4df46189483beee31b9ad09a Mon Sep 17 00:00:00 2001
|
||||
From: Begasus <begasus@gmail.com>
|
||||
Date: Thu, 7 Aug 2025 09:30:00 +0200
|
||||
Subject: 32bit build fixes
|
||||
|
||||
|
||||
diff --git a/gtk/a11y/atspi/meson.build b/gtk/a11y/atspi/meson.build
|
||||
index 05be90c..30e0cd5 100644
|
||||
--- a/gtk/a11y/atspi/meson.build
|
||||
+++ b/gtk/a11y/atspi/meson.build
|
||||
@@ -38,7 +38,7 @@ foreach xml: atspi_xml
|
||||
'--interface-prefix=org.a11y.atspi',
|
||||
'--c-namespace=Atspi',
|
||||
'--pragma-once',
|
||||
- '--interface-info-header',
|
||||
+ '--header',
|
||||
'--output=@OUTPUT@',
|
||||
'@INPUT@',
|
||||
],
|
||||
@@ -52,7 +52,7 @@ foreach xml: atspi_xml
|
||||
gdbus_codegen,
|
||||
'--interface-prefix=org.a11y.atspi',
|
||||
'--c-namespace=Atspi',
|
||||
- '--interface-info-body',
|
||||
+ '--body',
|
||||
'--output=@OUTPUT@',
|
||||
'@INPUT@',
|
||||
],
|
||||
diff --git a/gtk/a11y/gtkatspicache.c b/gtk/a11y/gtkatspicache.c
|
||||
index de60110..e8222d6 100644
|
||||
--- a/gtk/a11y/gtkatspicache.c
|
||||
+++ b/gtk/a11y/gtkatspicache.c
|
||||
@@ -163,8 +163,8 @@ collect_root (GtkAtSpiCache *self,
|
||||
|
||||
GVariantBuilder interfaces = G_VARIANT_BUILDER_INIT (G_VARIANT_TYPE ("as"));
|
||||
|
||||
- g_variant_builder_add (&interfaces, "s", atspi_accessible_interface.name);
|
||||
- g_variant_builder_add (&interfaces, "s", atspi_application_interface.name);
|
||||
+ g_variant_builder_add (&interfaces, "s", atspi_accessible_interface_info);
|
||||
+ g_variant_builder_add (&interfaces, "s", atspi_accessible_interface_info);
|
||||
g_variant_builder_add (builder, "@as", g_variant_builder_end (&interfaces));
|
||||
|
||||
g_variant_builder_add (builder, "s", g_get_prgname () ? g_get_prgname () : "Unnamed");
|
||||
@@ -344,7 +344,7 @@ gtk_at_spi_cache_constructed (GObject *gobject)
|
||||
|
||||
g_dbus_connection_register_object (self->connection,
|
||||
self->cache_path,
|
||||
- (GDBusInterfaceInfo *) &atspi_cache_interface,
|
||||
+ (GDBusInterfaceInfo *) &atspi_cache_interface_info,
|
||||
&cache_vtable,
|
||||
self,
|
||||
NULL,
|
||||
diff --git a/gtk/a11y/gtkatspicontext.c b/gtk/a11y/gtkatspicontext.c
|
||||
index 52da24a..650a3f6 100644
|
||||
--- a/gtk/a11y/gtkatspicontext.c
|
||||
+++ b/gtk/a11y/gtkatspicontext.c
|
||||
@@ -1289,11 +1289,11 @@ gtk_at_spi_context_register_object (GtkAtSpiContext *self)
|
||||
GVariantBuilder interfaces = G_VARIANT_BUILDER_INIT (G_VARIANT_TYPE_STRING_ARRAY);
|
||||
const GDBusInterfaceVTable *vtable;
|
||||
|
||||
- g_variant_builder_add (&interfaces, "s", atspi_accessible_interface.name);
|
||||
+ g_variant_builder_add (&interfaces, "s", atspi_accessible_interface_info);
|
||||
self->registration_ids[self->n_registered_objects] =
|
||||
g_dbus_connection_register_object (self->connection,
|
||||
self->context_path,
|
||||
- (GDBusInterfaceInfo *) &atspi_accessible_interface,
|
||||
+ (GDBusInterfaceInfo *) &atspi_accessible_interface_info,
|
||||
&accessible_vtable,
|
||||
self,
|
||||
NULL,
|
||||
@@ -1303,11 +1303,11 @@ gtk_at_spi_context_register_object (GtkAtSpiContext *self)
|
||||
vtable = gtk_atspi_get_component_vtable (accessible);
|
||||
if (vtable)
|
||||
{
|
||||
- g_variant_builder_add (&interfaces, "s", atspi_component_interface.name);
|
||||
+ g_variant_builder_add (&interfaces, "s", atspi_component_interface_info);
|
||||
self->registration_ids[self->n_registered_objects] =
|
||||
g_dbus_connection_register_object (self->connection,
|
||||
self->context_path,
|
||||
- (GDBusInterfaceInfo *) &atspi_component_interface,
|
||||
+ (GDBusInterfaceInfo *) &atspi_component_interface_info,
|
||||
vtable,
|
||||
self,
|
||||
NULL,
|
||||
@@ -1318,11 +1318,11 @@ gtk_at_spi_context_register_object (GtkAtSpiContext *self)
|
||||
vtable = gtk_atspi_get_text_vtable (accessible);
|
||||
if (vtable)
|
||||
{
|
||||
- g_variant_builder_add (&interfaces, "s", atspi_text_interface.name);
|
||||
+ g_variant_builder_add (&interfaces, "s", atspi_text_interface_info);
|
||||
self->registration_ids[self->n_registered_objects] =
|
||||
g_dbus_connection_register_object (self->connection,
|
||||
self->context_path,
|
||||
- (GDBusInterfaceInfo *) &atspi_text_interface,
|
||||
+ (GDBusInterfaceInfo *) &atspi_text_interface_info,
|
||||
vtable,
|
||||
self,
|
||||
NULL,
|
||||
@@ -1333,11 +1333,11 @@ gtk_at_spi_context_register_object (GtkAtSpiContext *self)
|
||||
vtable = gtk_atspi_get_editable_text_vtable (accessible);
|
||||
if (vtable)
|
||||
{
|
||||
- g_variant_builder_add (&interfaces, "s", atspi_editable_text_interface.name);
|
||||
+ g_variant_builder_add (&interfaces, "s", atspi_editable_text_interface_info);
|
||||
self->registration_ids[self->n_registered_objects] =
|
||||
g_dbus_connection_register_object (self->connection,
|
||||
self->context_path,
|
||||
- (GDBusInterfaceInfo *) &atspi_editable_text_interface,
|
||||
+ (GDBusInterfaceInfo *) &atspi_editable_text_interface_info,
|
||||
vtable,
|
||||
self,
|
||||
NULL,
|
||||
@@ -1347,11 +1347,11 @@ gtk_at_spi_context_register_object (GtkAtSpiContext *self)
|
||||
vtable = gtk_atspi_get_value_vtable (accessible);
|
||||
if (vtable)
|
||||
{
|
||||
- g_variant_builder_add (&interfaces, "s", atspi_value_interface.name);
|
||||
+ g_variant_builder_add (&interfaces, "s", atspi_value_interface_info);
|
||||
self->registration_ids[self->n_registered_objects] =
|
||||
g_dbus_connection_register_object (self->connection,
|
||||
self->context_path,
|
||||
- (GDBusInterfaceInfo *) &atspi_value_interface,
|
||||
+ (GDBusInterfaceInfo *) &atspi_value_interface_info,
|
||||
vtable,
|
||||
self,
|
||||
NULL,
|
||||
@@ -1366,11 +1366,11 @@ gtk_at_spi_context_register_object (GtkAtSpiContext *self)
|
||||
GTK_AT_CONTEXT (self)->accessible_role);
|
||||
if (vtable)
|
||||
{
|
||||
- g_variant_builder_add (&interfaces, "s", atspi_selection_interface.name);
|
||||
+ g_variant_builder_add (&interfaces, "s", atspi_selection_interface_info);
|
||||
self->registration_ids[self->n_registered_objects] =
|
||||
g_dbus_connection_register_object (self->connection,
|
||||
self->context_path,
|
||||
- (GDBusInterfaceInfo *) &atspi_selection_interface,
|
||||
+ (GDBusInterfaceInfo *) &atspi_selection_interface_info,
|
||||
vtable,
|
||||
self,
|
||||
NULL,
|
||||
@@ -1381,11 +1381,11 @@ gtk_at_spi_context_register_object (GtkAtSpiContext *self)
|
||||
vtable = gtk_atspi_get_action_vtable (accessible);
|
||||
if (vtable)
|
||||
{
|
||||
- g_variant_builder_add (&interfaces, "s", atspi_action_interface.name);
|
||||
+ g_variant_builder_add (&interfaces, "s", atspi_action_interface_info);
|
||||
self->registration_ids[self->n_registered_objects] =
|
||||
g_dbus_connection_register_object (self->connection,
|
||||
self->context_path,
|
||||
- (GDBusInterfaceInfo *) &atspi_action_interface,
|
||||
+ (GDBusInterfaceInfo *) &atspi_action_interface_info,
|
||||
vtable,
|
||||
self,
|
||||
NULL,
|
||||
diff --git a/gtk/a11y/gtkatspiroot.c b/gtk/a11y/gtkatspiroot.c
|
||||
index 5dbd90e..fda92cf 100644
|
||||
--- a/gtk/a11y/gtkatspiroot.c
|
||||
+++ b/gtk/a11y/gtkatspiroot.c
|
||||
@@ -362,8 +362,8 @@ handle_accessible_method (GDBusConnection *connection,
|
||||
{
|
||||
GVariantBuilder builder = G_VARIANT_BUILDER_INIT (G_VARIANT_TYPE ("as"));
|
||||
|
||||
- g_variant_builder_add (&builder, "s", atspi_accessible_interface.name);
|
||||
- g_variant_builder_add (&builder, "s", atspi_application_interface.name);
|
||||
+ g_variant_builder_add (&builder, "s", atspi_accessible_interface_info);
|
||||
+ g_variant_builder_add (&builder, "s", atspi_accessible_interface_info);
|
||||
|
||||
g_dbus_method_invocation_return_value (invocation, g_variant_new ("(as)", &builder));
|
||||
}
|
||||
@@ -848,14 +848,14 @@ root_register (gpointer user_data)
|
||||
|
||||
g_dbus_connection_register_object (self->connection,
|
||||
self->root_path,
|
||||
- (GDBusInterfaceInfo *) &atspi_application_interface,
|
||||
+ (GDBusInterfaceInfo *) &atspi_application_interface_info,
|
||||
&root_application_vtable,
|
||||
self,
|
||||
NULL,
|
||||
NULL);
|
||||
g_dbus_connection_register_object (self->connection,
|
||||
self->root_path,
|
||||
- (GDBusInterfaceInfo *) &atspi_accessible_interface,
|
||||
+ (GDBusInterfaceInfo *) &atspi_accessible_interface_info,
|
||||
&root_accessible_vtable,
|
||||
self,
|
||||
NULL,
|
||||
--
|
||||
2.48.1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user