about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlexey Yerin <yyp@disroot.org>2023-10-04 21:01:43 +0300
committerAlexey Yerin <yyp@disroot.org>2023-10-04 21:01:43 +0300
commitc137ce659bd2449c430c0a5ac7f932f2286c250c (patch)
tree40cb6a80520987e22a4d33ad21fc603fe1a522b5
parent07cff557463d13bbd1baa970f609c8dbb13e16a8 (diff)
Remove manual gobject-introspection build
gobject-introspection-dev or similar package provides those files.
-rw-r--r--README.md19
-rwxr-xr-xgenerate19
-rwxr-xr-xgenerate419
3 files changed, 18 insertions, 39 deletions
diff --git a/README.md b/README.md
index 559c6cf..e59fc47 100644
--- a/README.md
+++ b/README.md
@@ -6,29 +6,18 @@ GTK family of libraries (GTK+, GDK, Pango, etc).
 Dependencies:
 * An up-to-date [Hare] toolchain
 * [hare-fastxml]
-* Development files for the desired GTK version and its dependencies. Make sure
-`/usr/share/gir-1.0` is included.
-
-A few core libraries do not ship GIR XML files by default. They can be obtained
-from gobject-introspection:
-
-```
-git clone https://gitlab.gnome.org/GNOME/gobject-introspection.git
-meson setup build/
-ninja -C build/
-
-# The path where this is downloaded will be used later
-```
+* Development files for GObject-Introspection, the desired GTK version and its
+dependencies. Make sure `/usr/share/gir-1.0` is included.
 
 ### GTK 3
 ```
-./generate <path to gobject-introspection>
+./generate
 make install
 ```
 
 ### GTK 4
 ```
-./generate4 <path to gobject-introspection>
+./generate4
 make install4
 ```
 
diff --git a/generate b/generate
index 7f62ada..aa3d372 100755
--- a/generate
+++ b/generate
@@ -1,10 +1,5 @@
 #!/bin/sh
 
-if [ $# -lt 1 ]; then
-	printf "Usage: generate <gobject introspection root>\n" >&2
-	exit 1
-fi
-GI="$1"
 BIND=./bindings
 
 mkdir -p "$BIND"/glib "$BIND"/gobject "$BIND"/gio "$BIND"/gmodule "$BIND"/atk \
@@ -25,16 +20,16 @@ hare build cmd/hare-gi && ./hare-gi -B \
 	-m Gdk,gdk,"$BIND"/gdk/_generated.ha \
 	-m xlib,xlib,"$BIND"/xlib/_generated.ha \
 	-m Gtk,gtk,"$BIND"/gtk/_generated.ha \
-	"$GI"/build/gir/GLib-2.0.gir \
-	"$GI"/build/gir/GObject-2.0.gir \
-	"$GI"/build/gir/Gio-2.0.gir \
-	"$GI"/build/gir/GModule-2.0.gir \
+	/usr/share/gir-1.0/GLib-2.0.gir \
+	/usr/share/gir-1.0/GObject-2.0.gir \
+	/usr/share/gir-1.0/Gio-2.0.gir \
+	/usr/share/gir-1.0/GModule-2.0.gir \
 	/usr/share/gir-1.0/Atk-1.0.gir \
 	/usr/share/gir-1.0/GdkPixbuf-2.0.gir \
-	"$GI"/build/gir/freetype2-2.0.gir \
+	/usr/share/gir-1.0/freetype2-2.0.gir \
 	/usr/share/gir-1.0/HarfBuzz-0.0.gir \
-	"$GI"/build/gir/cairo-1.0.gir \
+	/usr/share/gir-1.0/cairo-1.0.gir \
 	/usr/share/gir-1.0/Pango-1.0.gir \
 	/usr/share/gir-1.0/Gdk-3.0.gir \
-	"$GI"/build/gir/xlib-2.0.gir \
+	/usr/share/gir-1.0/xlib-2.0.gir \
 	/usr/share/gir-1.0/Gtk-3.0.gir
diff --git a/generate4 b/generate4
index 8fcff42..23061f0 100755
--- a/generate4
+++ b/generate4
@@ -1,10 +1,5 @@
 #!/bin/sh
 
-if [ $# -lt 1 ]; then
-	printf "Usage: generate4 <gobject introspection root>\n" >&2
-	exit 1
-fi
-GI="$1"
 BIND=./bindings
 
 mkdir -p "$BIND"/glib "$BIND"/gobject "$BIND"/gio "$BIND"/gmodule "$BIND"/atk \
@@ -29,19 +24,19 @@ hare build cmd/hare-gi && ./hare-gi -B \
 	-m Graphene,graphene,"$BIND"/graphene/_generated.ha \
 	-m Gsk,gsk,"$BIND"/gsk/_generated.ha \
 	-m Gtk,gtk4,"$BIND"/gtk4/_generated.ha \
-	"$GI"/build/gir/GLib-2.0.gir \
-	"$GI"/build/gir/GObject-2.0.gir \
-	"$GI"/build/gir/Gio-2.0.gir \
-	"$GI"/build/gir/GModule-2.0.gir \
+	/usr/share/gir-1.0/GLib-2.0.gir \
+	/usr/share/gir-1.0/GObject-2.0.gir \
+	/usr/share/gir-1.0/Gio-2.0.gir \
+	/usr/share/gir-1.0/GModule-2.0.gir \
 	/usr/share/gir-1.0/Atk-1.0.gir \
 	/usr/share/gir-1.0/GdkPixbuf-2.0.gir \
-	"$GI"/build/gir/freetype2-2.0.gir \
+	/usr/share/gir-1.0/freetype2-2.0.gir \
 	/usr/share/gir-1.0/HarfBuzz-0.0.gir \
-	"$GI"/build/gir/cairo-1.0.gir \
+	/usr/share/gir-1.0/cairo-1.0.gir \
 	/usr/share/gir-1.0/Pango-1.0.gir \
 	/usr/share/gir-1.0/PangoCairo-1.0.gir \
 	/usr/share/gir-1.0/Gdk-4.0.gir \
-	"$GI"/build/gir/xlib-2.0.gir \
+	/usr/share/gir-1.0/xlib-2.0.gir \
 	/usr/share/gir-1.0/Graphene-1.0.gir \
 	/usr/share/gir-1.0/Gsk-4.0.gir \
 	/usr/share/gir-1.0/Gtk-4.0.gir