Now it works

ubuntu · Oct 15, 2024 · a3f599b · a3f599b
1 parent f8f55f1
commit a3f599b
Showing 1 changed file with 34 additions and 20 deletions.
diff --git a/snapcraft.yaml b/snapcraft.yaml
@@ -169,6 +169,7 @@ parts:
       - -Dxcb=enabled
       - -Dtee=enabled
       - -Dzlib=enabled
+      - -Dtests=disabled
     build-environment: *buildenv
     build-packages:
       - libfontconfig1-dev
@@ -185,7 +186,7 @@ parts:
   gobject-introspection:
     after: [ cairo, meson-deps ]
     source: https://gitlab.gnome.org/GNOME/gobject-introspection.git
-    source-tag: '1.82.0'
+    source-tag: '1.80.1'
 # ext:updatesnap
 #   version-format:
 #     ignore-odd-minor: true
@@ -288,7 +289,7 @@ parts:
       - libgraphite2-dev
 
   pango:
-    after: [ harfbuzz, meson-deps ]
+    after: [ libffi, harfbuzz, meson-deps ]
     source: https://gitlab.gnome.org/GNOME/pango.git
     source-tag: '1.54.0'
     source-depth: 1
@@ -298,7 +299,7 @@ parts:
       - -Doptimization=3
       - -Ddebug=true
       - -Dbuild-testsuite=false
-      - -Dgtk_doc=false
+      - -Ddocumentation=false
       - -Dintrospection=enabled
       - -Dbuild-examples=false
     build-environment: *buildenv
@@ -350,21 +351,28 @@ parts:
 #   version-format:
 #     no-9x-revisions: true
     source-depth: 1
-    plugin: autotools
-    autotools-configure-parameters:
+    plugin: meson
+    meson-parameters:
       - --prefix=/usr
-      - --enable-introspection=yes
-      - --enable-vala=yes
-      - --enable-pixbuf-loader
+      - -Doptimization=3
+      - -Ddebug=true
+      - -Dintrospection=enabled
+      - -Dvala=enabled
+      - -Dpixbuf=enabled
+      - -Dpixbuf-loader=enabled
+      - -Ddocs=disabled
+      - -Dtests=false
     build-environment: *buildenv
     build-packages:
-      - cargo
-      #- libcroco3-dev
-    override-stage: |
-      set -eux
+      - libssl-dev
+    override-pull: |
       craftctl default
-      # snapcraft is adding twice $CRAFT_STAGE
-      cp -a $CRAFT_STAGE/$CRAFT_STAGE/* $CRAFT_STAGE/
+      # get cargo
+      curl https://sh.rustup.rs -sSf > cargo.sh
+      sh ./cargo.sh -y
+      export PATH=$PATH:$HOME/.cargo/bin
+      ~/.cargo/bin/cargo install cargo-c
+      cp ~/.cargo/bin/* /usr/local/bin
 
   epoxy:
     after: [ librsvg, meson-deps ]
@@ -483,6 +491,7 @@ parts:
       - --prefix=/usr
       - -Doptimization=3
       - -Ddebug=true
+      - -Dtests=false
     build-environment: *buildenv
 
   gtk3:
@@ -550,12 +559,11 @@ parts:
       - -Dwin32-backend=false
       - -Dmacos-backend=false
       - -Dintrospection=enabled
-      - -Dgtk_doc=false
-      - -Ddemos=false
+      - -Ddocumentation=false
       - -Dbuild-examples=false
       - -Dbuild-tests=false
       - -Dmedia-gstreamer=enabled
-      - -Ddemos=false
+      - -Dbuild-demos=false
       - -Dbuild-testsuite=false
       - -Dbuild-examples=false
       - -Dbuild-tests=false
@@ -716,7 +724,7 @@ parts:
       - doxygen
 
   pangomm:
-    after: [ cairomm, meson-deps ]
+    after: [ pango, libffi,  cairomm, meson-deps ]
     source: https://gitlab.gnome.org/GNOME/pangomm.git
     source-tag: '2.54.0'
     source-depth: 1
@@ -730,8 +738,10 @@ parts:
     build-environment:
       - ACLOCAL_PATH: $CRAFT_STAGE/usr/share/aclocal
       - XDG_DATA_DIRS: $CRAFT_STAGE/usr/share:/usr/share
-      - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/vala-0.56${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+      - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/vala-0.56:$CRAFT_STAGE/usr/lib:$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
       - GDK_PIXBUF_MODULE_FILE: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gdk-pixbuf-2.0/2.10.0/loaders.cache
+      - PKG_CONFIG_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig:$CRAFT_STAGE/usr/lib/pkgconfig:$CRAFT_STAGE/usr/share/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}
+      - CRAFT_EXT_CORE_LEVEL: core24
       - M4PATH: $CRAFT_STAGE/usr/lib/glibmm-2.68/proc/m4
     override-build: |
       set -eux
@@ -757,8 +767,10 @@ parts:
     build-environment:
       - ACLOCAL_PATH: $CRAFT_STAGE/usr/share/aclocal
       - XDG_DATA_DIRS: $CRAFT_STAGE/usr/share:/usr/share
-      - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:$CRAFT_STAGE/usr/lib/vala-0.56${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+      - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/vala-0.56:$CRAFT_STAGE/usr/lib:$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
       - GDK_PIXBUF_MODULE_FILE: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gdk-pixbuf-2.0/2.10.0/loaders.cache
+      - PKG_CONFIG_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig:$CRAFT_STAGE/usr/lib/pkgconfig:$CRAFT_STAGE/usr/share/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}
+      - CRAFT_EXT_CORE_LEVEL: core24
       - M4PATH: $CRAFT_STAGE/usr/lib/glibmm-2.68/proc/m4
 
   gtkmm:
@@ -785,6 +797,8 @@ parts:
       - XDG_DATA_DIRS: $CRAFT_STAGE/usr/share:/usr/share
       - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/vala-0.56:$CRAFT_STAGE/usr/lib:$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
       - GDK_PIXBUF_MODULE_FILE: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gdk-pixbuf-2.0/2.10.0/loaders.cache
+      - PKG_CONFIG_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig:$CRAFT_STAGE/usr/lib/pkgconfig:$CRAFT_STAGE/usr/share/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}
+      - CRAFT_EXT_CORE_LEVEL: core24
       - M4PATH: $CRAFT_STAGE/usr/lib/glibmm-2.68/proc/m4
     override-build: |
       set -eux