mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 12:26:08 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[gtkmm] fix unresolved external Gtk::TreeViewColumn::`vbase destructor'(void) in release build by avoiding calling base class constructor from inline code (#12637)

Browse Source
This commit is contained in:
Rolf Gebhardt 2020-08-05 19:37:40 +02:00 committed by GitHub
parent f3221c0405
commit c72091e7f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ports/gtkmm/CONTROL
View File

@ -1,5 +1,6 @@
Source: gtkmm Source: gtkmm
Version: 3.22.2-2 Version: 3.22.2
Port-Version: 4
Homepage: https://www.gtkmm.org/ Homepage: https://www.gtkmm.org/
Description: gtkmm is the official C++ interface for the popular GUI library GTK+. 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 Build-Depends: glib, atk, gtk, gdk-pixbuf, pango, cairo, libepoxy, gettext, glibmm, atkmm, cairomm, pangomm

15
ports/gtkmm/fix_treeviewcolumn.patch Normal file
View File

@ -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
ports/gtkmm/portfile.cmake
View File

@ -17,6 +17,7 @@ vcpkg_extract_source_archive_ex(
ARCHIVE ${ARCHIVE} ARCHIVE ${ARCHIVE}
PATCHES PATCHES
fix_properties.patch fix_properties.patch
fix_treeviewcolumn.patch
) )
file(COPY ${CMAKE_CURRENT_LIST_DIR}/msvc_recommended_pragmas.h DESTINATION ${SOURCE_PATH}/MSVC_Net2013) file(COPY ${CMAKE_CURRENT_LIST_DIR}/msvc_recommended_pragmas.h DESTINATION ${SOURCE_PATH}/MSVC_Net2013)