revert to gi-1.0 for typelib generation

DerryAlex · Nov 2, 2024 · 9abc92f · 9abc92f
1 parent ad6a087
commit 9abc92f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/typelib.yml b/.github/workflows/typelib.yml
@@ -30,7 +30,8 @@ jobs:
           sudo sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/ubuntu.sources
           sudo apt-get update
           sudo apt-get install gir1.2-girepository-3.0-dev
-          sudo apt-get build-dep libglib2.0-dev-bin
+          # sudo apt-get build-dep libglib2.0-dev-bin
+          sudo apt-get build-dep gobject-introspection
       
       - name: Generate typelibs
         run: |

diff --git a/lib/girepository-1.0/ci.sh b/lib/girepository-1.0/ci.sh
@@ -2,13 +2,16 @@
 
 gir_version="0.20.1"
 
-apt-get source glib2.0
-cd $(ls -F | grep 'glib2.0' | grep '/$')
+# apt-get source glib2.0
+# cd $(ls -F | grep 'glib2.0' | grep '/$')
+apt-get source gobject-introspection
+cd $(ls -F | grep 'gobject-introspection' | grep '/$')
 patch girepository/girnode.c ../girnode.patch || exit 1
 meson setup build && cd build
 meson compile
-export PATH=$(pwd)/girepository/compiler:$(pwd)/girepository/decompiler:$(pwd)/girepository/inspector:${PATH}
+# export PATH=$(pwd)/girepository/compiler:$(pwd)/girepository/decompiler:$(pwd)/girepository/inspector:${PATH}
 cd ../..
+export PATH=$(pwd)/tools:${PATH}
 
 git clone https://github.com/gtk-rs/gir-files.git && cd gir-files
 git checkout ${gir_version}
@@ -32,7 +35,8 @@ sed -i 's/gconstpointer/gpointer/g' Pango-1.0.gir
 for gir in $(ls *.gir)
 do
     typelib=$(echo ${gir} | sed 's/.gir/.typelib/')
-    gi-compile-repository ${gir} -o ../${typelib} --includedir .
+    # gi-compile-repository ${gir} -o ../${typelib} --includedir .
+    g-ir-compiler ${gir} -o ../${typelib} --includedir .
 done
 
 cd ..