diff options
| author | Rolf Gebhardt <61502851+rglbssw@users.noreply.github.com> | 2020-08-05 19:37:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-05 10:37:40 -0700 |
| commit | c72091e7f6e15e8e667794b1c7063260f3a6c820 (patch) | |
| tree | c88fb747baef128b18ea482371bbc08d5694a2d0 | |
| parent | f3221c0405b6f99c6eff113cb4ca8c81c3ad3a84 (diff) | |
| download | vcpkg-c72091e7f6e15e8e667794b1c7063260f3a6c820.tar.gz vcpkg-c72091e7f6e15e8e667794b1c7063260f3a6c820.zip | |
[gtkmm] fix unresolved external Gtk::TreeViewColumn::`vbase destructor'(void) in release build by avoiding calling base class constructor from inline code (#12637)
| -rw-r--r-- | ports/gtkmm/CONTROL | 3 | ||||
| -rw-r--r-- | ports/gtkmm/fix_treeviewcolumn.patch | 15 | ||||
| -rw-r--r-- | ports/gtkmm/portfile.cmake | 1 |
3 files changed, 18 insertions, 1 deletions
diff --git a/ports/gtkmm/CONTROL b/ports/gtkmm/CONTROL index ecdab2cc3..71a648f15 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 000000000..8daf91afb --- /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 23e939608..feedbf288 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) |