Skip to content

Commit

Permalink
[gtkmm] fix unresolved external Gtk::TreeViewColumn::`vbase destructo…
Browse files Browse the repository at this point in the history
…r'(void) in release build by avoiding calling base class constructor from inline code (#12637)
  • Loading branch information
rglbssw committed Aug 5, 2020
1 parent f3221c0 commit c72091e
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 1 deletion.
3 changes: 2 additions & 1 deletion ports/gtkmm/CONTROL
Original file line number Diff line number Diff line change
@@ -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
Expand Down
15 changes: 15 additions & 0 deletions ports/gtkmm/fix_treeviewcolumn.patch
Original file line number Diff line number Diff line change
@@ -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 */);
}
1 change: 1 addition & 0 deletions ports/gtkmm/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit c72091e

Please sign in to comment.