Skip to content

Commit

Permalink
Revert "revert to gi-1.0 for typelib generation"
Browse files Browse the repository at this point in the history
This reverts commit 9abc92f.
  • Loading branch information
DerryAlex committed Nov 2, 2024
1 parent f8109e5 commit e701b66
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 10 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/typelib.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ 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 gobject-introspection
sudo apt-get build-dep libglib2.0-dev-bin
- name: Generate typelibs
run: |
Expand Down
12 changes: 4 additions & 8 deletions lib/girepository-1.0/ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,13 @@

gir_version="0.20.1"

# apt-get source glib2.0
# cd $(ls -F | grep 'glib2.0' | grep '/$')
apt-get source gobject-introspection
cd $(ls -F | grep 'gobject-introspection' | grep '/$')
apt-get source glib2.0
cd $(ls -F | grep 'glib2.0' | 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}
Expand All @@ -35,8 +32,7 @@ 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 .
g-ir-compiler ${gir} -o ../${typelib} --includedir .
gi-compile-repository ${gir} -o ../${typelib} --includedir .
done

cd ..

0 comments on commit e701b66

Please sign in to comment.