Bladeren bron

use upstream inih r48

Signed-off-by: Stephan Lachnit <stephanlachnit@protonmail.com>
Stephan Lachnit 5 jaren geleden
bovenliggende
commit
d3e309b23b
5 gewijzigde bestanden met toevoegingen van 4 en 8 verwijderingen
  1. 1 1
      .gitmodules
  2. 1 1
      README.md
  3. 1 1
      meson.build
  4. 0 4
      scripts/mkrelease.sh
  5. 1 1
      subprojects/inih

+ 1 - 1
.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

+ 1 - 1
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

+ 1 - 1
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')

+ 0 - 4
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"

+ 1 - 1
subprojects/inih

@@ -1 +1 @@
-Subproject commit 745ada6724038cde32ff6390b32426cbdd5e532b
+Subproject commit 351217124ddb3e3fe2b982248a04c672350bb0af