From e1409325241dafbf64f702032808549d5cb8e7cc Mon Sep 17 00:00:00 2001
From: "W. Michael Petullo" <mike@flyn.org>
Date: Sun, 7 Jan 2018 20:45:41 -0500
Subject: [PATCH] libgee: update to 0.20.0

Signed-off-by: W. Michael Petullo <mike@flyn.org>
---
 libs/libgee/Makefile                          |  6 ++---
 .../libgee-0.18.0-no-introspection.patch      | 27 ++++++++++---------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/libs/libgee/Makefile b/libs/libgee/Makefile
index 1c6bcb018f..645bf307a3 100644
--- a/libs/libgee/Makefile
+++ b/libs/libgee/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libgee
-PKG_VERSION:=0.18.0
+PKG_VERSION:=0.20.0
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
@@ -17,8 +17,8 @@ PKG_LICENSE:=LGPL-2.1
 PKG_LICENSE_FILES:=COPYING
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@GNOME/libgee/0.18/
-PKG_HASH:=4ad99ef937d071b4883c061df40bfe233f7649d50c354cf81235f180b4244399
+PKG_SOURCE_URL:=@GNOME/libgee/0.20/
+PKG_HASH:=21308ba3ed77646dda2e724c0e8d5a2f8d101fb05e078975a532d7887223c2bb
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
diff --git a/libs/libgee/patches/libgee-0.18.0-no-introspection.patch b/libs/libgee/patches/libgee-0.18.0-no-introspection.patch
index caa6e16e6c..fd30e4507a 100644
--- a/libs/libgee/patches/libgee-0.18.0-no-introspection.patch
+++ b/libs/libgee/patches/libgee-0.18.0-no-introspection.patch
@@ -1,10 +1,11 @@
-diff -u --recursive libgee-0.18.0-vanilla/configure.ac libgee-0.18.0/configure.ac
---- libgee-0.18.0-vanilla/configure.ac	2015-03-23 23:24:39.000000000 -0400
-+++ libgee-0.18.0/configure.ac	2015-10-18 07:25:39.474698663 -0400
-@@ -64,10 +64,6 @@
+diff -u --recursive libgee-0.20.0-vanilla/configure.ac libgee-0.20.0/configure.ac
+--- libgee-0.20.0-vanilla/configure.ac	2018-01-07 20:42:52.827537620 -0500
++++ libgee-0.20.0/configure.ac	2018-01-07 20:43:25.128645499 -0500
+@@ -65,11 +65,6 @@
                enable_consistency_check=$enableval, enable_consistency_check=no)
  AS_IF([test "x$enable_consistency_check" != xno], [VALA_ADD_VALAFLAGS(-D CONSISTENCY_CHECKS)])
  
+-AX_REQUIRE_DEFINED([GOBJECT_INTROSPECTION_CHECK])
 -GOBJECT_INTROSPECTION_CHECK([0.9.0])
 -
 -VALA_CHECK([0.25.1])
@@ -12,9 +13,9 @@ diff -u --recursive libgee-0.18.0-vanilla/configure.ac libgee-0.18.0/configure.a
  AC_OUTPUT([Makefile
             gee-0.8.pc
             benchmark/Makefile
-diff -u --recursive libgee-0.18.0-vanilla/gee/Makefile.am libgee-0.18.0/gee/Makefile.am
---- libgee-0.18.0-vanilla/gee/Makefile.am	2015-03-16 11:23:57.000000000 -0400
-+++ libgee-0.18.0/gee/Makefile.am	2015-10-18 10:41:49.759314756 -0400
+diff -u --recursive libgee-0.20.0-vanilla/gee/Makefile.am libgee-0.20.0/gee/Makefile.am
+--- libgee-0.20.0-vanilla/gee/Makefile.am	2018-01-07 20:42:52.829537627 -0500
++++ libgee-0.20.0/gee/Makefile.am	2018-01-07 20:43:48.332722990 -0500
 @@ -146,29 +146,6 @@
  	gee-0.8.vapi \
  	$(NULL)
@@ -45,10 +46,10 @@ diff -u --recursive libgee-0.18.0-vanilla/gee/Makefile.am libgee-0.18.0/gee/Make
  MOSTLYCLEANFILES = \
  	$(libgee_0_8_la_VALASOURCES:.vala=.c) \
  	libgee_0_8_la_vala.stamp \
-diff -u --recursive libgee-0.18.0-vanilla/gee/Makefile.in libgee-0.18.0/gee/Makefile.in
---- libgee-0.18.0-vanilla/gee/Makefile.in	2015-03-23 23:25:03.000000000 -0400
-+++ libgee-0.18.0/gee/Makefile.in	2015-10-18 11:02:34.888709559 -0400
-@@ -285,14 +285,6 @@
+diff -u --recursive libgee-0.20.0-vanilla/gee/Makefile.in libgee-0.20.0/gee/Makefile.in
+--- libgee-0.20.0-vanilla/gee/Makefile.in	2018-01-07 20:42:52.830537630 -0500
++++ libgee-0.20.0/gee/Makefile.in	2018-01-07 20:44:18.433823516 -0500
+@@ -297,14 +297,6 @@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -63,7 +64,7 @@ diff -u --recursive libgee-0.18.0-vanilla/gee/Makefile.in libgee-0.18.0/gee/Make
  LCOV = @LCOV@
  LD = @LD@
  LDFLAGS = @LDFLAGS@
-@@ -531,25 +523,6 @@
+@@ -544,25 +536,6 @@
  	gee-0.8.vapi \
  	$(NULL)
  
@@ -89,7 +90,7 @@ diff -u --recursive libgee-0.18.0-vanilla/gee/Makefile.in libgee-0.18.0/gee/Make
  MOSTLYCLEANFILES = \
  	$(libgee_0_8_la_VALASOURCES:.vala=.c) \
  	libgee_0_8_la_vala.stamp \
-@@ -1607,9 +1580,6 @@
+@@ -1621,9 +1594,6 @@
  
  $(libgee_0_8_la_VALASOURCES:.vala=.c): libgee_0_8_la_vala.stamp
  gee-0.8.vapi gee-internals-0.8.vapi gee.h gee-internals.h: libgee_0_8_la_vala.stamp