From a361af5c10af435824e86cf350b7ecbb7af38134 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sat, 17 Feb 2018 16:02:13 +1100
Subject: [PATCH] libgee: fix updates and style

---
 src/libgee-test.c |  4 ++++
 src/libgee.mk     | 13 ++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/libgee-test.c b/src/libgee-test.c
index 55991ef3..41d61a5f 100644
--- a/src/libgee-test.c
+++ b/src/libgee-test.c
@@ -1,3 +1,7 @@
+/*
+ * This file is part of MXE. See LICENSE.md for licensing information.
+ */
+
 #include <assert.h>
 #include <glib.h>
 #include <glib-object.h>
diff --git a/src/libgee.mk b/src/libgee.mk
index 33662f3e..84866013 100644
--- a/src/libgee.mk
+++ b/src/libgee.mk
@@ -13,21 +13,20 @@ $(PKG)_DEPS     := cc glib
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'https://git.gnome.org/browse/libgee/refs/tags' | \
     grep '<a href=' | \
-    $(SED) -n "s,.*<a href='[^']*/tag/?h=LIBGEE_\\([0-9]*_[0-9]*_[^<]*\\)'.*,\\1,p" | \
-    $(SED) 's,_,.,g' | \
+    $(SED) -n "s,.*libgee-\([0-9]\+\.[0-9]*[02468]\.[^']*\)\.tar.*,\1,p" | \
+    $(SORT) -Vr | \
     head -1
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && ./configure \
+    cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \
         $(MXE_CONFIGURE_OPTS) \
         MAKE=$(MAKE)
-    $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
-    $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi \
         '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-libgee.exe' \
-        `'$(TARGET)-pkg-config' gee-0.8 gio-2.0 glib-2.0 --cflags --libs`
+        `'$(TARGET)-pkg-config' gee-0.8 gio-2.0 --cflags --libs`
 endef
-