mirror of https://github.com/microsoft/vcpkg.git
parent
207c2810b0
commit
be660920b3
|
|
@ -1,40 +0,0 @@
|
|||
diff --git a/gtk/gtkmm/meson.build b/gtk/gtkmm/meson.build
|
||||
index bf6c5804d..3b2ae866d 100644
|
||||
--- a/gtk/gtkmm/meson.build
|
||||
+++ b/gtk/gtkmm/meson.build
|
||||
@@ -489,6 +489,10 @@ if is_host_windows
|
||||
extra_gtkmm_objects += gtkmm_res
|
||||
endif
|
||||
|
||||
+if meson.get_compiler('cpp').get_id() == 'msvc'
|
||||
+ gtkmm_cpp_args += ['-std:c++17']
|
||||
+endif
|
||||
+
|
||||
gtkmm_library = library(gtkmm_libname, extra_gtkmm_objects,
|
||||
gtk_gen_sources, built_dummy_h_file_target, gtkmm_extra_used_cc_files,
|
||||
include_directories: extra_include_dirs,
|
||||
diff --git a/gtk/src/expressionwatch.hg b/gtk/src/expressionwatch.hg
|
||||
index 78308d221..04e593f8b 100644
|
||||
--- a/gtk/src/expressionwatch.hg
|
||||
+++ b/gtk/src/expressionwatch.hg
|
||||
@@ -16,6 +16,7 @@
|
||||
|
||||
_CONFIGINCLUDE(gtkmmconfig.h)
|
||||
|
||||
+#include <optional>
|
||||
#include <glibmm/object.h>
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
diff --git a/untracked/gtk/gtkmm/expressionwatch.h b/untracked/gtk/gtkmm/expressionwatch.h
|
||||
index 3a80efd64..279870ed7 100644
|
||||
--- a/untracked/gtk/gtkmm/expressionwatch.h
|
||||
+++ b/untracked/gtk/gtkmm/expressionwatch.h
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
#include <gtkmmconfig.h>
|
||||
|
||||
-
|
||||
+#include <optional>
|
||||
#include <glibmm/ustring.h>
|
||||
#include <sigc++/sigc++.h>
|
||||
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
diff --git a/untracked/gtk/gtkmm/expression.h b/untracked/gtk/gtkmm/expression.h
|
||||
index fc3bf1e5b..ff70c720a 100644
|
||||
--- a/untracked/gtk/gtkmm/expression.h
|
||||
+++ b/untracked/gtk/gtkmm/expression.h
|
||||
@@ -377,7 +377,7 @@ private:
|
||||
namespace Expression_Private
|
||||
{
|
||||
|
||||
-void watch_callback(gpointer data);
|
||||
+GTKMM_API void watch_callback(gpointer data);
|
||||
|
||||
template<class T, class... ATs>
|
||||
class Invoker
|
||||
@@ -406,7 +406,7 @@ void closure_marshal(GClosure* closure,
|
||||
gpointer invocation_hint,
|
||||
gpointer marshal_data);
|
||||
|
||||
-void closure_callback_func();
|
||||
+GTKMM_API void closure_callback_func();
|
||||
|
||||
template<class TI>
|
||||
void closure_destroy(gpointer data, GClosure* closure);
|
||||
diff --git a/untracked/gtk/gtkmm/expressionwatch.h b/untracked/gtk/gtkmm/expressionwatch.h
|
||||
index 279870ed7..e9c760664 100644
|
||||
--- a/untracked/gtk/gtkmm/expressionwatch.h
|
||||
+++ b/untracked/gtk/gtkmm/expressionwatch.h
|
||||
@@ -83,7 +83,7 @@ public:
|
||||
};
|
||||
|
||||
template<class T>
|
||||
-class GTKMM_API ExpressionWatch final : public ExpressionWatchBase
|
||||
+class ExpressionWatch final : public ExpressionWatchBase
|
||||
{
|
||||
public:
|
||||
/** Evaluates the watched expression and on success returns the result.
|
||||
|
|
@ -1,17 +1,14 @@
|
|||
vcpkg_fail_port_install(ON_TARGET "uwp")
|
||||
|
||||
vcpkg_download_distfile(ARCHIVE
|
||||
URLS "https://ftp.gnome.org/pub/GNOME/sources/gtkmm/4.0/gtkmm-4.0.0.tar.xz"
|
||||
FILENAME "gtkmm-4.0.0.tar.xz"
|
||||
SHA512 16893b6caa39f1b65a4140296d8d25c0d5e5f8a6ab808086783e7222bc1f5e8b94d17d48e4b718a12f0e0291010d445f4da9f88b7f494ec36adb22752d932743
|
||||
URLS "https://ftp.gnome.org/pub/GNOME/sources/gtkmm/4.0/gtkmm-4.0.1.tar.xz"
|
||||
FILENAME "gtkmm-4.0.1.tar.xz"
|
||||
SHA512 5b9f9f32fe85ee7a281c9d3d3b266b1265924926058d778f48302808812cad7047c09440c317497fa0069816984d3556868a703a5488e0bfd8cd26fc64afcb1b
|
||||
)
|
||||
|
||||
vcpkg_extract_source_archive_ex(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
ARCHIVE ${ARCHIVE}
|
||||
PATCHES
|
||||
build.patch
|
||||
gtkapi.patch #upstream patch to fix dllimport issue
|
||||
)
|
||||
|
||||
vcpkg_configure_meson(
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "gtkmm",
|
||||
"version": "4.0.0",
|
||||
"version": "4.0.1",
|
||||
"description": "gtkmm is the official C++ interface for the popular GUI library GTK+.",
|
||||
"homepage": "https://www.gtkmm.org/",
|
||||
"supports": "!uwp",
|
||||
|
|
|
|||
|
|
@ -2397,7 +2397,7 @@
|
|||
"port-version": 0
|
||||
},
|
||||
"gtkmm": {
|
||||
"baseline": "4.0.0",
|
||||
"baseline": "4.0.1",
|
||||
"port-version": 0
|
||||
},
|
||||
"gts": {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "14e153bf596fcdfa4376218e20d2a140f33bae8e",
|
||||
"version": "4.0.1",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "9ba1569a4f12bb1a9aab5fe14c6f6ae23cea20f8",
|
||||
"version": "4.0.0",
|
||||
|
|
|
|||
Loading…
Reference in New Issue