From 67947cb4c150af8859e16134fc7eb8555f6bd55c Mon Sep 17 00:00:00 2001
From: Rolf Gebhardt <rolf.gebhardt@lbs-sw.de>
Date: Wed, 29 Jul 2020 14:06:57 +0200
Subject: [PATCH] [gtkmm] fix unresolved external Gtk::TreeViewColumn::`vbase
 destructor'(void) in release build by avoiding calling base class constructor
 from inline code

---
 ports/gtkmm/CONTROL                  |  3 ++-
 ports/gtkmm/fix_treeviewcolumn.patch | 15 +++++++++++++++
 ports/gtkmm/portfile.cmake           |  1 +
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 ports/gtkmm/fix_treeviewcolumn.patch

diff --git a/ports/gtkmm/CONTROL b/ports/gtkmm/CONTROL
index ecdab2cc3853dc..71a648f1578a12 100644
--- a/ports/gtkmm/CONTROL
+++ b/ports/gtkmm/CONTROL
@@ -1,5 +1,6 @@
 Source: gtkmm
-Version: 3.22.2-2
+Version: 3.22.2
+Port-Version: 4
 Homepage: https://www.gtkmm.org/
 Description: gtkmm is the official C++ interface for the popular GUI library GTK+.
 Build-Depends: glib, atk, gtk, gdk-pixbuf, pango, cairo, libepoxy, gettext, glibmm, atkmm, cairomm, pangomm
diff --git a/ports/gtkmm/fix_treeviewcolumn.patch b/ports/gtkmm/fix_treeviewcolumn.patch
new file mode 100644
index 00000000000000..8daf91afbd00a9
--- /dev/null
+++ b/ports/gtkmm/fix_treeviewcolumn.patch
@@ -0,0 +1,15 @@
+diff --git a/gtk/gtkmm/treeviewcolumn.h b/gtk/gtkmm/treeviewcolumn.h
+index f2a77c1..c66302a 100644
+--- a/gtk/gtkmm/treeviewcolumn.h
++++ b/gtk/gtkmm/treeviewcolumn.h
+@@ -1026,9 +1026,7 @@ void TreeViewColumn::pack_end(const TreeModelColumn<T_ModelColumnType>& column,
+ template <class T_ModelColumnType> inline
+ TreeViewColumn::TreeViewColumn(const Glib::ustring& title,
+                                const TreeModelColumn<T_ModelColumnType>& column)
+-:
+-  Glib::ObjectBase(nullptr), // not (yet) a custom class
+-  Gtk::Object(Glib::ConstructParams(class_init_(), "title", title.c_str(), nullptr))
++: TreeViewColumn (title)
+ {
+   pack_start(column, true /* expand */);
+ }
diff --git a/ports/gtkmm/portfile.cmake b/ports/gtkmm/portfile.cmake
index 23e939608dbe89..feedbf2886b706 100644
--- a/ports/gtkmm/portfile.cmake
+++ b/ports/gtkmm/portfile.cmake
@@ -17,6 +17,7 @@ vcpkg_extract_source_archive_ex(
     ARCHIVE ${ARCHIVE}
     PATCHES
         fix_properties.patch
+        fix_treeviewcolumn.patch
 )
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/msvc_recommended_pragmas.h DESTINATION ${SOURCE_PATH}/MSVC_Net2013)