The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-22 18:47:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[glibmm] Fix build error on Linux (#9562)

Browse Source
This commit is contained in:
NancyLi1013 2020-01-06 10:44:07 -08:00 committed by dan-shaw
parent 0ee4f000bd
commit 615cb6aa24
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/glibmm/CONTROL
View File

@ -1,5 +1,5 @@
Source: glibmm Source: glibmm
Version: 2.52.1-10 Version: 2.52.1-11
Description: This is glibmm, a C++ API for parts of glib that are useful for C++. Description: This is glibmm, a C++ API for parts of glib that are useful for C++.
Homepage: https://www.gtkmm.org. Homepage: https://www.gtkmm.org.
Build-Depends: zlib, pcre, libffi, gettext, libiconv, glib, libsigcpp Build-Depends: zlib, pcre, libffi, gettext, libiconv, glib, libsigcpp

13
ports/glibmm/fix-thread.h.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/glib/glibmm/threads.h b/glib/glibmm/threads.h
index 5350a99..cc48c01 100644
--- a/glib/glibmm/threads.h
+++ b/glib/glibmm/threads.h
@@ -657,7 +657,7 @@ public:
*/
inline void replace(T* data);
- GPrivate* gobj() { return gobject_; }
+ GPrivate* gobj() { return &gobject_; }
private:
GPrivate gobject_;

11
ports/glibmm/portfile.cmake
View File

@ -1,9 +1,5 @@
include(vcpkg_common_functions)
# Glib uses winapi functions not available in WindowsStore # Glib uses winapi functions not available in WindowsStore
if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore) vcpkg_fail_port_install(ON_TARGET "UWP")
message(FATAL_ERROR "Error: UWP builds are currently not supported.")
endif()
vcpkg_download_distfile(ARCHIVE vcpkg_download_distfile(ARCHIVE
URLS "http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.52/glibmm-2.52.1.tar.xz" URLS "http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.52/glibmm-2.52.1.tar.xz"
@ -17,6 +13,7 @@ vcpkg_extract_source_archive_ex(
PATCHES PATCHES
glibmm-api-variant.patch glibmm-api-variant.patch
fix-define-glibmmconfig.patch fix-define-glibmmconfig.patch
fix-thread.h.patch
) )
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
@ -35,5 +32,5 @@ vcpkg_install_cmake()
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
# Handle copyright and readme # Handle copyright and readme
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/glibmm RENAME copyright) file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/glibmm RENAME readme.txt) file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME readme.txt)