summaryrefslogtreecommitdiff
path: root/x11/gtk+3/patches
diff options
context:
space:
mode:
authorVineet Kumar <git@vineetk.net>2026-06-15 14:54:51 -0400
committerVineet Kumar <git@vineetk.net>2026-06-15 14:54:51 -0400
commite81f04fa53e7e01afdc834d9c22b5c982c98f59b (patch)
tree763d6d68516ca9d184ddd2402978adcc4027a99d /x11/gtk+3/patches
parent92e45e47c29ec037842c4a34ebc0c14143d413ff (diff)
remove all ports to start from clean slateHEADmaster
This is due to the following two reasons: 1. it's very out of date compared with current ports tree (like by 2+ years!) - some of the ports here were mainly just updates I didn't upstream, which have since now been part of openbsd, like verilator 2. removing dependencies is a lot of headache to stay in sync and/or for ports I no longer use - e.g. dbus is very difficult to remove in a desktop while patching to remove from gtk and downstream - I don't want to spend more time reducing number of dependencies when I can be working instead. I no longer have as much free time as I did in high school :(
Diffstat (limited to 'x11/gtk+3/patches')
-rw-r--r--x11/gtk+3/patches/CVS/Entries6
-rw-r--r--x11/gtk+3/patches/CVS/Repository1
-rw-r--r--x11/gtk+3/patches/CVS/Root1
-rw-r--r--x11/gtk+3/patches/patch-config_h_in13
-rw-r--r--x11/gtk+3/patches/patch-config_h_meson13
-rw-r--r--x11/gtk+3/patches/patch-configure41
-rw-r--r--x11/gtk+3/patches/patch-gail-3_0_pc_in11
-rw-r--r--x11/gtk+3/patches/patch-gtk_a11y_gtkaccessibility_c21
-rw-r--r--x11/gtk+3/patches/patch-gtk_gtkfilechooserwidget_c15
-rw-r--r--x11/gtk+3/patches/patch-gtk_gtkmountoperation-x11_c52
-rw-r--r--x11/gtk+3/patches/patch-gtk_gtkplacessidebar_c45
-rw-r--r--x11/gtk+3/patches/patch-gtk_gtksettings_c12
-rw-r--r--x11/gtk+3/patches/patch-gtk_updateiconcache_c15
-rw-r--r--x11/gtk+3/patches/patch-meson_build24
-rw-r--r--x11/gtk+3/patches/patch-meson_options_txt12
15 files changed, 0 insertions, 282 deletions
diff --git a/x11/gtk+3/patches/CVS/Entries b/x11/gtk+3/patches/CVS/Entries
deleted file mode 100644
index 8adaa80..0000000
--- a/x11/gtk+3/patches/CVS/Entries
+++ /dev/null
@@ -1,6 +0,0 @@
1/patch-gtk_gtkfilechooserwidget_c/1.9/Fri Mar 11 20:16:01 2022//
2/patch-gtk_gtkmountoperation-x11_c/1.18/Fri Mar 11 20:16:02 2022//
3/patch-gtk_gtkplacessidebar_c/1.5/Fri Mar 4 07:57:18 2022//
4/patch-gtk_gtksettings_c/1.25/Fri Mar 11 20:16:02 2022//
5/patch-gtk_updateiconcache_c/1.4/Fri Mar 11 20:16:02 2022//
6D
diff --git a/x11/gtk+3/patches/CVS/Repository b/x11/gtk+3/patches/CVS/Repository
deleted file mode 100644
index 42893d9..0000000
--- a/x11/gtk+3/patches/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
1ports/x11/gtk+3/patches
diff --git a/x11/gtk+3/patches/CVS/Root b/x11/gtk+3/patches/CVS/Root
deleted file mode 100644
index 3811072..0000000
--- a/x11/gtk+3/patches/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
1/cvs
diff --git a/x11/gtk+3/patches/patch-config_h_in b/x11/gtk+3/patches/patch-config_h_in
deleted file mode 100644
index b91b060..0000000
--- a/x11/gtk+3/patches/patch-config_h_in
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: config.h.in
2--- config.h.in.orig
3+++ config.h.in
4@@ -10,6 +10,9 @@
5 /* Disable deprecation warnings from glib */
6 #undef GLIB_DISABLE_DEPRECATION_WARNINGS
7
8+/* Define to use atk-bridge-2.0 */
9+#undef HAVE_ATK_BRIDGE
10+
11 /* Define to 1 if you have the `bind_textdomain_codeset' function. */
12 #undef HAVE_BIND_TEXTDOMAIN_CODESET
13
diff --git a/x11/gtk+3/patches/patch-config_h_meson b/x11/gtk+3/patches/patch-config_h_meson
deleted file mode 100644
index d3bdf41..0000000
--- a/x11/gtk+3/patches/patch-config_h_meson
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: config.h.meson
2--- config.h.meson.orig
3+++ config.h.meson
4@@ -11,6 +11,9 @@
5 /* Disable deprecation warnings from glib */
6 #mesondefine GLIB_DISABLE_DEPRECATION_WARNINGS
7
8+/* Define to use atk-bridge-2.0 */
9+#mesondefine HAVE_ATK_BRIDGE
10+
11 /* Define to 1 if you have the `bind_textdomain_codeset' function. */
12 #mesondefine HAVE_BIND_TEXTDOMAIN_CODESET
13
diff --git a/x11/gtk+3/patches/patch-configure b/x11/gtk+3/patches/patch-configure
deleted file mode 100644
index 9ae57f7..0000000
--- a/x11/gtk+3/patches/patch-configure
+++ /dev/null
@@ -1,41 +0,0 @@
1Index: configure
2--- configure.orig
3+++ configure
4@@ -1099,6 +1099,7 @@ enable_glibtest
5 enable_modules
6 with_included_immodules
7 with_x
8+with_atk_bridge
9 enable_win32_gles
10 enable_cups
11 enable_papi
12@@ -1884,6 +1885,7 @@ Optional Packages:
13 --with-included-immodules=MODULE1,MODULE2,...
14 build the specified input methods into gtk
15 --with-x use the X Window System
16+ --without-atk-bridge Do not use AT-SPI ATK bridge
17 --with-html-dir=PATH path to installed docs
18 --with-xml-catalog=CATALOG
19 path to xml catalog to use
20@@ -28718,8 +28720,20 @@ fi
21 # Check for Accessibility Toolkit flags
22 ########################################
23
24-if test x$enable_x11_backend = xyes; then
25+
26+# Check whether --with-atk-bridge was given.
27+if test "${with_atk_bridge+set}" = set; then :
28+ withval=$with_atk_bridge; :
29+else
30+ with_atk_bridge=$enable_x11_backend
31+fi
32+
33+
34+if test x$with_atk_bridge != xno; then
35 ATK_PACKAGES="atk atk-bridge-2.0"
36+
37+$as_echo "#define HAVE_ATK_BRIDGE 1" >>confdefs.h
38+
39 else
40 ATK_PACKAGES="atk"
41 fi
diff --git a/x11/gtk+3/patches/patch-gail-3_0_pc_in b/x11/gtk+3/patches/patch-gail-3_0_pc_in
deleted file mode 100644
index 60a1699..0000000
--- a/x11/gtk+3/patches/patch-gail-3_0_pc_in
+++ /dev/null
@@ -1,11 +0,0 @@
1Index: gail-3.0.pc.in
2--- gail-3.0.pc.in.orig
3+++ gail-3.0.pc.in
4@@ -6,6 +6,6 @@ includedir=@includedir@
5 Name: Gail
6 Description: GNOME Accessibility Implementation Library
7 Version: @VERSION@
8-Requires: atk gtk+-3.0
9+Requires: gtk+-3.0
10 Libs: -L${libdir} -lgailutil-3
11 Cflags: -I${includedir}/gail-3.0
diff --git a/x11/gtk+3/patches/patch-gtk_a11y_gtkaccessibility_c b/x11/gtk+3/patches/patch-gtk_a11y_gtkaccessibility_c
deleted file mode 100644
index 581b258..0000000
--- a/x11/gtk+3/patches/patch-gtk_a11y_gtkaccessibility_c
+++ /dev/null
@@ -1,21 +0,0 @@
1Index: gtk/a11y/gtkaccessibility.c
2--- gtk/a11y/gtkaccessibility.c.orig
3+++ gtk/a11y/gtkaccessibility.c
4@@ -37,7 +37,7 @@
5 #include <gtk/gtktogglebutton.h>
6 #include <gtk/gtkaccessible.h>
7
8-#ifdef GDK_WINDOWING_X11
9+#ifdef HAVE_ATK_BRIDGE
10 #include <atk-bridge.h>
11 #endif
12
13@@ -988,7 +988,7 @@ _gtk_accessibility_init (void)
14 _gtk_accessibility_override_atk_util ();
15 do_window_event_initialization ();
16
17-#ifdef GDK_WINDOWING_X11
18+#ifdef HAVE_ATK_BRIDGE
19 atk_bridge_adaptor_init (NULL, NULL);
20 #endif
21
diff --git a/x11/gtk+3/patches/patch-gtk_gtkfilechooserwidget_c b/x11/gtk+3/patches/patch-gtk_gtkfilechooserwidget_c
deleted file mode 100644
index e7118f8..0000000
--- a/x11/gtk+3/patches/patch-gtk_gtkfilechooserwidget_c
+++ /dev/null
@@ -1,15 +0,0 @@
1unveil(2): check if the XDG directories exist before showing them on the sidebar
2
3Index: gtk/gtkfilechooserwidget.c
4--- gtk/gtkfilechooserwidget.c.orig
5+++ gtk/gtkfilechooserwidget.c
6@@ -8229,7 +8229,8 @@ desktop_folder_handler (GtkFileChooserWidget *impl)
7 * See http://freedesktop.org/wiki/Software/xdg-user-dirs
8 */
9 name = g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP);
10- if (!g_strcmp0 (name, g_get_home_dir ()))
11+ if (!g_strcmp0 (name, g_get_home_dir ()) ||
12+ !g_file_test (name, G_FILE_TEST_IS_DIR))
13 return;
14
15 gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (impl), name);
diff --git a/x11/gtk+3/patches/patch-gtk_gtkmountoperation-x11_c b/x11/gtk+3/patches/patch-gtk_gtkmountoperation-x11_c
deleted file mode 100644
index 42d953e..0000000
--- a/x11/gtk+3/patches/patch-gtk_gtkmountoperation-x11_c
+++ /dev/null
@@ -1,52 +0,0 @@
1From 7d8be1c1ffc31523e2de09d4829169b78dd391e4 Mon Sep 17 00:00:00 2001
2From: Antoine Jacoutot <ajacoutot@openbsd.org>
3Date: Fri, 17 May 2019 11:55:16 +0000
4Subject: [PATCH] pid_get_parent: fix potential leak of kp
5
6From 0334ea1c889331adb02d361670e24b3f85b5b0d6 Mon Sep 17 00:00:00 2001
7From: Antoine Jacoutot <ajacoutot@gnome.org>
8Date: Mon, 13 May 2019 20:47:46 +0200
9Subject: [PATCH] pid_get_parent: fix for OpenBSD
10
11Index: gtk/gtkmountoperation-x11.c
12--- gtk/gtkmountoperation-x11.c.orig
13+++ gtk/gtkmountoperation-x11.c
14@@ -720,22 +720,32 @@ pid_get_command_line (GPid pid)
15 static GPid
16 pid_get_parent (GPid pid)
17 {
18- struct kinfo_proc kp;
19+ struct kinfo_proc *kp = NULL;
20 size_t len;
21- GPid ppid;
22+ GPid ppid = 0;
23
24+ /* fail if trying to get the parent of the init process (no such thing) */
25+ if (pid == 1)
26+ goto out;
27+
28 int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, pid,
29 sizeof(struct kinfo_proc), 0 };
30
31 if (sysctl (mib, G_N_ELEMENTS (mib), NULL, &len, NULL, 0) == -1)
32- return (-1);
33+ goto out;
34+
35 mib[5] = (len / sizeof(struct kinfo_proc));
36
37- if (sysctl (mib, G_N_ELEMENTS (mib), &kp, &len, NULL, 0) < 0)
38- return -1;
39+ kp = g_malloc0 (len);
40
41- ppid = kp.p_ppid;
42+ if (sysctl (mib, G_N_ELEMENTS (mib), kp, &len, NULL, 0) < 0)
43+ goto out;
44
45+ ppid = kp->p_ppid;
46+
47+out:
48+ if (kp)
49+ g_free (kp);
50 return ppid;
51 }
52
diff --git a/x11/gtk+3/patches/patch-gtk_gtkplacessidebar_c b/x11/gtk+3/patches/patch-gtk_gtkplacessidebar_c
deleted file mode 100644
index ce97e17..0000000
--- a/x11/gtk+3/patches/patch-gtk_gtkplacessidebar_c
+++ /dev/null
@@ -1,45 +0,0 @@
1unveil(2): check if the XDG directories exist before showing them on the sidebar
2
3Index: gtk/gtkplacessidebar.c
4--- gtk/gtkplacessidebar.c.orig
5+++ gtk/gtkplacessidebar.c
6@@ -657,6 +657,7 @@ add_special_dirs (GtkPlacesSidebar *sidebar)
7 */
8 if (path == NULL ||
9 path_is_home_dir (path) ||
10+ !g_file_test (path, G_FILE_TEST_IS_DIR) ||
11 g_list_find_custom (dirs, path, (GCompareFunc) g_strcmp0) != NULL)
12 continue;
13
14@@ -709,7 +710,8 @@ get_desktop_directory_uri (void)
15 /* "To disable a directory, point it to the homedir."
16 * See http://freedesktop.org/wiki/Software/xdg-user-dirs
17 */
18- if (path_is_home_dir (name))
19+ if ((name == NULL) || path_is_home_dir (name) ||
20+ !g_file_test (name, G_FILE_TEST_IS_DIR))
21 return NULL;
22
23 return g_filename_to_uri (name, NULL, NULL);
24@@ -1091,6 +1093,11 @@ update_places (GtkPlacesSidebar *sidebar)
25
26 /* home folder */
27 home_uri = get_home_directory_uri ();
28+#if defined(__OpenBSD__)
29+ if (!g_file_test (home_uri, G_FILE_TEST_IS_DIR))
30+ goto skip_home;
31+#endif
32+
33 start_icon = g_themed_icon_new_with_default_fallbacks (ICON_NAME_HOME);
34 add_place (sidebar, PLACES_BUILT_IN,
35 SECTION_COMPUTER,
36@@ -1100,6 +1107,9 @@ update_places (GtkPlacesSidebar *sidebar)
37 g_object_unref (start_icon);
38 g_free (home_uri);
39
40+#if defined(__OpenBSD__)
41+skip_home:
42+#endif
43 /* desktop */
44 if (sidebar->show_desktop)
45 {
diff --git a/x11/gtk+3/patches/patch-gtk_gtksettings_c b/x11/gtk+3/patches/patch-gtk_gtksettings_c
deleted file mode 100644
index c6384b2..0000000
--- a/x11/gtk+3/patches/patch-gtk_gtksettings_c
+++ /dev/null
@@ -1,12 +0,0 @@
1Index: gtk/gtksettings.c
2--- gtk/gtksettings.c.orig
3+++ gtk/gtksettings.c
4@@ -503,7 +503,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
5 g_param_spec_string ("gtk-key-theme-name",
6 P_("Key Theme Name"),
7 P_("Name of key theme to load"),
8- NULL,
9+ "Emacs",
10 GTK_PARAM_READWRITE),
11 NULL);
12 g_assert (result == PROP_KEY_THEME_NAME);
diff --git a/x11/gtk+3/patches/patch-gtk_updateiconcache_c b/x11/gtk+3/patches/patch-gtk_updateiconcache_c
deleted file mode 100644
index cb2429d..0000000
--- a/x11/gtk+3/patches/patch-gtk_updateiconcache_c
+++ /dev/null
@@ -1,15 +0,0 @@
1Index: gtk/updateiconcache.c
2--- gtk/updateiconcache.c.orig
3+++ gtk/updateiconcache.c
4@@ -1725,6 +1725,11 @@ main (int argc, char **argv)
5 path = g_locale_to_utf8 (path, -1, NULL, NULL, NULL);
6 #endif
7
8+ if (pledge("stdio rpath wpath cpath fattr", NULL) == -1) {
9+ g_printerr (_("pledge\n"));
10+ exit (1);
11+ }
12+
13 if (validate)
14 {
15 gchar *file = g_build_filename (path, CACHE_NAME, NULL);
diff --git a/x11/gtk+3/patches/patch-meson_build b/x11/gtk+3/patches/patch-meson_build
deleted file mode 100644
index aae9372..0000000
--- a/x11/gtk+3/patches/patch-meson_build
+++ /dev/null
@@ -1,24 +0,0 @@
1Index: meson.build
2--- meson.build.orig
3+++ meson.build
4@@ -582,7 +582,7 @@ if x11_enabled
5 xfixes_dep = dependency('xfixes', required: false)
6 xcomposite_dep = dependency('xcomposite', required: false)
7 fontconfig_dep = dependency('fontconfig', fallback: ['fontconfig', 'fontconfig_dep'])
8- atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req)
9+ atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req, required: get_option('atk-bridge'))
10
11 backend_immodules += ['xim']
12
13@@ -601,7 +601,10 @@ if x11_enabled
14 x11_pkgs += ['xdamage']
15 endif
16
17- atk_pkgs += ['atk-bridge-2.0']
18+ if atkbridge_dep.found()
19+ atk_pkgs += ['atk-bridge-2.0']
20+ cdata.set('HAVE_ATK_BRIDGE', 1)
21+ endif
22
23 cdata.set('HAVE_XDAMAGE', xdamage_dep.found() ? 1 : false)
24 cdata.set('HAVE_XCURSOR', xcursor_dep.found() ? 1 : false)
diff --git a/x11/gtk+3/patches/patch-meson_options_txt b/x11/gtk+3/patches/patch-meson_options_txt
deleted file mode 100644
index 90394be..0000000
--- a/x11/gtk+3/patches/patch-meson_options_txt
+++ /dev/null
@@ -1,12 +0,0 @@
1Index: meson_options.txt
2--- meson_options.txt.orig
3+++ meson_options.txt
4@@ -11,6 +11,8 @@ option('quartz_backend', type: 'boolean', value: true,
5 description : 'Enable the macOS gdk backend (only when building on macOS)')
6
7 # Optional dependencies
8+option('atk-bridge', type: 'boolean', value: 'true',
9+ description : 'Enable AT-SPI ATK bridge support')
10 option('xinerama', type: 'combo', choices : ['yes', 'no', 'auto'], value : 'auto',
11 description : 'Enable support for the Xinerama extension')
12 option('cloudproviders', type: 'boolean', value: false,