From d3e309b23bdc770be2e61e7e5dc5c5bd74965163 Mon Sep 17 00:00:00 2001
From: Stephan Lachnit <stephanlachnit@protonmail.com>
Date: Wed, 26 Feb 2020 11:10:21 +0100
Subject: [PATCH] use upstream inih r48

Signed-off-by: Stephan Lachnit <stephanlachnit@protonmail.com>
---
 .gitmodules          | 2 +-
 README.md            | 2 +-
 meson.build          | 2 +-
 scripts/mkrelease.sh | 4 ----
 subprojects/inih     | 2 +-
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index bc84daf7..4f4dc5d4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "subprojects/inih"]
 	path = subprojects/inih
-	url = https://github.com/FeralInteractive/inih.git
+	url = https://github.com/benhoyt/inih.git
diff --git a/README.md b/README.md
index d24698fa..9a10ec4e 100644
--- a/README.md
+++ b/README.md
@@ -85,7 +85,7 @@ GameMode depends on `meson` for building and `systemd` for internal communicatio
 
 #### Ubuntu/Debian (you may also need `dbus-user-session`)
 ```bash
-apt install meson libsystemd-dev pkg-config ninja-build git libdbus-1-dev
+apt install meson libsystemd-dev pkg-config ninja-build git libdbus-1-dev libinih-dev
 ```
 #### Arch
 ```bash
diff --git a/meson.build b/meson.build
index e714e0c1..a4fe8178 100644
--- a/meson.build
+++ b/meson.build
@@ -159,7 +159,7 @@ if with_daemon == true
     # inih currently only needed by the daemon
     inih_dependency = dependency(
         'inih',
-        fallback : ['inih', 'inih_dependency']
+        fallback : ['inih', 'inih_dep']
     )
 
     subdir('daemon')
diff --git a/scripts/mkrelease.sh b/scripts/mkrelease.sh
index 37afda9a..56bf6042 100755
--- a/scripts/mkrelease.sh
+++ b/scripts/mkrelease.sh
@@ -4,11 +4,7 @@ set -e
 # Simple script to construct a redistributable and complete tarball of the
 # gamemode tree, including the git submodules, so that it can be trivially
 # packaged by distributions banning networking during build.
-#
-# Modified from Ikey Doherty's release scripts for use within
-# Feral Interactive's gamemode project.
 git submodule init
-git submodule update
 
 # Bump in tandem with meson.build, run script once new tag is up.
 VERSION="1.6-dev"
diff --git a/subprojects/inih b/subprojects/inih
index 745ada67..35121712 160000
--- a/subprojects/inih
+++ b/subprojects/inih
@@ -1 +1 @@
-Subproject commit 745ada6724038cde32ff6390b32426cbdd5e532b
+Subproject commit 351217124ddb3e3fe2b982248a04c672350bb0af