From a46abf7ba0b646752b3992a988907c2e9c8fa8bb Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 26 Jan 2022 23:14:22 +1000
Subject: [PATCH] gtk3: use haiku iconset by default

---
 x11-libs/gtk3/gtk3-3.24.30.recipe           |  3 +-
 x11-libs/gtk3/patches/gtk3-3.24.30.patchset | 41 ++++++++++++++++-----
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/x11-libs/gtk3/gtk3-3.24.30.recipe b/x11-libs/gtk3/gtk3-3.24.30.recipe
index c74e65425..7f2efb955 100644
--- a/x11-libs/gtk3/gtk3-3.24.30.recipe
+++ b/x11-libs/gtk3/gtk3-3.24.30.recipe
@@ -5,7 +5,7 @@ ranging from small one-off projects to complete application suites."
 HOMEPAGE="https://www.gtk.org"
 COPYRIGHT="GNOME Desktop"
 LICENSE="GNU LGPL v2"
-REVISION="4"
+REVISION="5"
 SOURCE_URI="https://ftp.gnome.org/pub/gnome/sources/gtk+/3.24/gtk+-$portVersion.tar.xz"
 CHECKSUM_SHA256="ba75bfff320ad1f4cfbee92ba813ec336322cc3c660d406aad014b07087a3ba9"
 SOURCE_DIR="gtk+-$portVersion"
@@ -32,6 +32,7 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	haiku_svg_icon_theme
 	shared_mime_info$secondaryArchSuffix
 	libepoxy${secondaryArchSuffix}
 	pango$secondaryArchSuffix
diff --git a/x11-libs/gtk3/patches/gtk3-3.24.30.patchset b/x11-libs/gtk3/patches/gtk3-3.24.30.patchset
index 778034a78..f2ea004b3 100644
--- a/x11-libs/gtk3/patches/gtk3-3.24.30.patchset
+++ b/x11-libs/gtk3/patches/gtk3-3.24.30.patchset
@@ -1,4 +1,4 @@
-From fe95490ba2235b99f9f0fc9da8f4d7f0acf44588 Mon Sep 17 00:00:00 2001
+From 7faf7bdb157110975b7312691e786ca737487a7c Mon Sep 17 00:00:00 2001
 From: Augustin Cavalier <waddlesplash@gmail.com>
 Date: Tue, 18 Jan 2022 18:43:52 -0500
 Subject: Disable code that uses direct X11 requests.
@@ -405,7 +405,7 @@ index f7be90f..b6ccc73 100644
 2.30.2
 
 
-From 2816591a9f61322cb4f7f31354b3e1ea03cbcc54 Mon Sep 17 00:00:00 2001
+From 4e16e7eebd8518a485ea9dca4b872ca0f434fbd1 Mon Sep 17 00:00:00 2001
 From: Augustin Cavalier <waddlesplash@gmail.com>
 Date: Tue, 18 Jan 2022 18:46:39 -0500
 Subject: Make it possible to build without XI2.
@@ -560,7 +560,7 @@ index 96edea6..002d206 100644
 2.30.2
 
 
-From 9e15243f3ce8169d0497d38cb63ea2ccab0aaa03 Mon Sep 17 00:00:00 2001
+From ae1208e0e1e201a0abc98522c875d0f5021ce08d Mon Sep 17 00:00:00 2001
 From: Augustin Cavalier <waddlesplash@gmail.com>
 Date: Tue, 18 Jan 2022 18:48:40 -0500
 Subject: Disable GLX.
@@ -776,7 +776,7 @@ index 48237d1..79d786e 100644
 2.30.2
 
 
-From 406a7f87764fa334f76f7eb69afb6c1686a18f9f Mon Sep 17 00:00:00 2001
+From f324f93a943cf45ed842f6821bdb87e5f8288b9b Mon Sep 17 00:00:00 2001
 From: Augustin Cavalier <waddlesplash@gmail.com>
 Date: Tue, 18 Jan 2022 18:49:39 -0500
 Subject: Build without ATK-bridge.
@@ -815,7 +815,7 @@ index 7f0e520..78b979b 100644
 2.30.2
 
 
-From cbb7cbdd3d832d91533c632305d2c553105f79dd Mon Sep 17 00:00:00 2001
+From d4c5484f070af803592211f6cca9b014350d317f Mon Sep 17 00:00:00 2001
 From: Augustin Cavalier <waddlesplash@gmail.com>
 Date: Tue, 18 Jan 2022 18:50:15 -0500
 Subject: Disable another XI2 usage.
@@ -839,7 +839,7 @@ index 7e08f47..2ce9544 100644
 2.30.2
 
 
-From b63567bfa1f06d3f898c62aa4d3ce4fe3505c00d Mon Sep 17 00:00:00 2001
+From 6234d5fecc236fc22e797225b5a7d917ce8863e8 Mon Sep 17 00:00:00 2001
 From: Augustin Cavalier <waddlesplash@gmail.com>
 Date: Tue, 18 Jan 2022 18:51:09 -0500
 Subject: Rework keyboard handling code to be more compatible with Xlibe.
@@ -1021,7 +1021,7 @@ index 577e4a1..8fc265d 100644
 2.30.2
 
 
-From 3f53be9c9b46356f451ad361b0b6bb1a244f47fd Mon Sep 17 00:00:00 2001
+From 4a80c50a8cb38aba5b792a1a7254bac894531459 Mon Sep 17 00:00:00 2001
 From: Augustin Cavalier <waddlesplash@gmail.com>
 Date: Tue, 18 Jan 2022 18:52:45 -0500
 Subject: Atoms are pointer-width not integer-width.
@@ -1057,7 +1057,7 @@ index 7a8046e..4a4712d 100644
 2.30.2
 
 
-From 683d93e2baa44a2c6b8931881d2aaa2a2f54cdf1 Mon Sep 17 00:00:00 2001
+From dd8a375af5ea8de028db75ecfcec81c6a087f095 Mon Sep 17 00:00:00 2001
 From: Augustin Cavalier <waddlesplash@gmail.com>
 Date: Tue, 18 Jan 2022 20:01:57 -0500
 Subject: Pretend for one test we are not using X11.
@@ -1079,7 +1079,7 @@ index 24540e3..5fd75b5 100644
 2.30.2
 
 
-From 537946cd871d1ff6ff5d3014a97c56379685d98a Mon Sep 17 00:00:00 2001
+From aa7ef4d72741aa6aa0f1df84b9e34176d7fe67a0 Mon Sep 17 00:00:00 2001
 From: Augustin Cavalier <waddlesplash@gmail.com>
 Date: Tue, 18 Jan 2022 20:20:22 -0500
 Subject: HACK: gtkiconhelper: Do not crash when failing to find the fallback
@@ -1106,3 +1106,26 @@ index f6e3e29..83a9c87 100644
 -- 
 2.30.2
 
+
+From 49df1cb0482d9e2ced5abb08b81957b17d59af94 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Wed, 26 Jan 2022 22:58:51 +1000
+Subject: Use haiku icon theme by default
+
+
+diff --git a/gtk/gtksettingsprivate.h b/gtk/gtksettingsprivate.h
+index 47f75a6..3dbf348 100644
+--- a/gtk/gtksettingsprivate.h
++++ b/gtk/gtksettingsprivate.h
+@@ -24,7 +24,7 @@
+ G_BEGIN_DECLS
+ 
+ #define DEFAULT_THEME_NAME      "Adwaita"
+-#define DEFAULT_ICON_THEME      "Adwaita"
++#define DEFAULT_ICON_THEME      "haiku"
+ 
+ void                _gtk_settings_set_property_value_from_rc (GtkSettings            *settings,
+                                                               const gchar            *name,
+-- 
+2.30.2
+