From e98573c411c085036d78a8593174a9dd1abb781b Mon Sep 17 00:00:00 2001
From: Andreas Motl <andreas@getkotori.org>
Date: Sun, 21 Feb 2021 13:12:13 +0100
Subject: [PATCH] Add compatibility for glib>=2.62 (replace GTimeVal by
 GDateTime)

When building on macOS Catalina with glib installed through Homebrew,
there is already glib 2.66.7.

However, GTimeVal has been deprecated since glib 2.62 and should be
replaced by GDateTime [1].

[1] https://developer.gnome.org/glib/stable/glib-Date-and-Time-Functions.html#GTimeVal
---
 bindings/cxx/classes.cpp                           | 14 +++++++-------
 bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp |  4 ++--
 configure.ac                                       |  5 ++++-
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp
index f9f792734..8bfbb47f5 100644
--- a/bindings/cxx/classes.cpp
+++ b/bindings/cxx/classes.cpp
@@ -287,12 +287,12 @@ shared_ptr<UserDevice> Context::create_user_device(
 		default_delete<UserDevice>{}};
 }
 
-shared_ptr<Packet> Context::create_header_packet(Glib::TimeVal start_time)
+shared_ptr<Packet> Context::create_header_packet(Glib::DateTime start_time)
 {
 	auto header = g_new(struct sr_datafeed_header, 1);
 	header->feed_version = 1;
-	header->starttime.tv_sec = start_time.tv_sec;
-	header->starttime.tv_usec = start_time.tv_usec;
+	header->starttime.tv_sec = start_time.get_second();
+	header->starttime.tv_usec = start_time.get_microsecond();
 	auto packet = g_new(struct sr_datafeed_packet, 1);
 	packet->type = SR_DF_HEADER;
 	packet->payload = header;
@@ -1154,11 +1154,11 @@ int Header::feed_version() const
 	return _structure->feed_version;
 }
 
-Glib::TimeVal Header::start_time() const
+Glib::DateTime Header::start_time() const
 {
-	return Glib::TimeVal(
-		_structure->starttime.tv_sec,
-		_structure->starttime.tv_usec);
+	Glib::DateTime dt = Glib::DateTime();
+	dt.add_seconds(_structure->starttime.tv_sec + (_structure->starttime.tv_usec / 1000 / 1000));
+	return dt;
 }
 
 Meta::Meta(const struct sr_datafeed_meta *structure) :
diff --git a/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp b/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp
index 97e54e173..d090c3799 100644
--- a/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp
+++ b/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp
@@ -274,7 +274,7 @@ class SR_API Context : public UserOwned<Context>
 	std::shared_ptr<UserDevice> create_user_device(
 		std::string vendor, std::string model, std::string version);
 	/** Create a header packet. */
-	std::shared_ptr<Packet> create_header_packet(Glib::TimeVal start_time);
+	std::shared_ptr<Packet> create_header_packet(Glib::DateTime start_time);
 	/** Create a meta packet. */
 	std::shared_ptr<Packet> create_meta_packet(
 		std::map<const ConfigKey *, Glib::VariantBase> config);
@@ -711,7 +711,7 @@ class SR_API Header :
 	/* Feed version number. */
 	int feed_version() const;
 	/* Start time of this session. */
-	Glib::TimeVal start_time() const;
+	Glib::DateTime start_time() const;
 private:
 	explicit Header(const struct sr_datafeed_header *structure);
 	~Header();
diff --git a/configure.ac b/configure.ac
index 26621fd9c..8d6f46980 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,6 +71,7 @@ SR_PKG_VERSION_SET([SR_PACKAGE_VERSION], [AC_PACKAGE_VERSION])
 SR_LIB_VERSION_SET([SR_LIB_VERSION], [4:0:0])
 
 AM_CONDITIONAL([WIN32], [test -z "${host_os##mingw*}" || test -z "${host_os##cygwin*}"])
+AM_CONDITIONAL([MACOS], [test -z "${host_os##darwin*}"])
 
 #############################
 ##  Optional dependencies  ##
@@ -371,7 +372,9 @@ AS_IF([test "x$HAVE_CXX11" != x1],
 	[SR_APPEND([sr_cxx_missing], [', '], ['C++11'])])
 
 # The C++ bindings need glibmm.
-SR_PKG_CHECK([glibmm], [SR_PKGLIBS_CXX], [glibmm-2.4 >= 2.32.0])
+AM_COND_IF([MACOS],
+	[SR_PKG_CHECK([glibmm], [SR_PKGLIBS_CXX], [glibmm-2.68 >= 2.32.0])],
+	[SR_PKG_CHECK([glibmm], [SR_PKGLIBS_CXX], [glibmm-2.4 >= 2.32.0])])
 AS_IF([test "x$sr_have_glibmm" != xyes],
 	[SR_APPEND([sr_cxx_missing], [', '], [glibmm])])