fix(rsvg)

fixes #2907
fixes #3072
fixes #3302
fixes #3304

projects/gnome.org/gdk-pixbuf/package.yml

@@ -10,7 +10,7 @@ dependencies:
   ijg.org: 9
   gnome.org/glib: 2
   libpng.org: 1
-  freedesktop.org/shared-mime-info: 2  #FIXME only on Linux
+  freedesktop.org/shared-mime-info: 2 #FIXME only on Linux
 
 build:
   dependencies:
@@ -19,7 +19,7 @@ build:
     ninja-build.org: 1
     freedesktop.org/pkg-config: ^0.29
     gnome.org/gobject-introspection: 1
-    python.org: 3  #FIXME rq’d by gnome.org/gobject-introspection but should be added by tea-env
+    python.org: 3 #FIXME rq’d by gnome.org/gobject-introspection but should be added by tea-env
   working-directory: build
   script: |
     if test {{ hw.platform }} == linux; then
@@ -35,7 +35,12 @@ build:
       ..
     ninja
     ninja install
-  # ^^ man pages break the build due to needing some other dep
+    # ^^ man pages break the build due to needing some other dep
+
+    cd {{prefix}}/include
+    mv gdk-pixbuf-{{version.major}}.0/* .
+    rmdir gdk-pixbuf-{{version.major}}.0
+    ln -s . gdk-pixbuf-{{version.major}}.0
 
 #TODO we should read pkg config and add to the env ffs
 test:

projects/gnome.org/glib/package.yml

@@ -45,6 +45,9 @@ build:
 
     rm *.bak
 
+    cd ../../include
+    ln -s ../lib/glib-{{version.major}}.0/include/* .
+
   #REF https://github.com/Homebrew/homebrew-core/blob/d0e65698ccd502335bea68ce879ae02e1735db0d/Formula/glib.rb#L66-L67
   #FIXME hardcoded paths ^^
   env:

projects/gnome.org/librsvg/package.yml

@@ -7,7 +7,7 @@ versions:
   ignore: [2.55.90] # https://gitlab.gnome.org/GNOME/librsvg/-/issues/923 - sigh
 
 dependencies:
-  cairographics.org: 1
+  cairographics.org: ^1.18
   gnome.org/pango: 1
   gnome.org/gdk-pixbuf: 2
   gnome.org/glib: 2
@@ -22,24 +22,29 @@ build:
     freedesktop.org/pkg-config: ^0.29
     gnome.org/gobject-introspection: 1
     python.org: 3
-  script: |
-    ./configure \
-      --prefix={{ prefix }} \
-      --enable-pixbuf-loader=yes \
-      --enable-introspection=yes \
-      --disable-Bsymbolic
-    make --jobs {{hw.concurrency}} install
+  script:
+    - ./configure $ARGS
+    - make --jobs {{hw.concurrency}} install
+
+    - run: |
+        mv librsvg-{{version.major}}.0/* .
+        rmdir librsvg-{{version.major}}.0
+        ln -s . librsvg-{{version.major}}.0
+      working-directory: ${{prefix}}/include
+  env:
+    ARGS:
+      - --prefix={{ prefix }}
+      - --enable-pixbuf-loader=yes
+      - --enable-introspection=yes
+      - --disable-Bsymbolic
 
 test:
   dependencies:
     freedesktop.org/pkg-config: ^0.29
     tea.xyz/gx/cc: c99
   script: |
-    cc test.c $CFLAGS $LDFLAGS
+    cc test.c -lrsvg-{{version.major}}
     ./a.out
-  env:
-    CFLAGS: $(pkg-config --cflags librsvg-2.0)  #FIXME should be in env automatically
-    LDFLAGS: $(pkg-config --libs librsvg-2.0)
 
 provides:
   - bin/rsvg-convert