From bebf8e4a03192dd5b66b03d0002a6ea5b84aea00 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Fri, 31 Mar 2023 21:05:36 +0400 Subject: [PATCH] Update glibmm in snap to 2.76.0 --- snap/snapcraft.yaml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 96dceef89e..d9a21688be 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -110,7 +110,6 @@ parts: - python3 - libasound2-dev - libavif-dev - - libglib2.0-dev - libheif-dev - libopus-dev - libpulse-dev @@ -123,7 +122,6 @@ parts: stage-packages: - libasound2 - libavif13 - - libglib2.0-0 - libheif1 - libopus0 - libpulse0 @@ -194,6 +192,8 @@ parts: source-subdir: qt plugin: make make-parameters: ["FLAVOR=qt5"] + build-environment: + - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} build-packages: - build-essential - dpkg-dev @@ -252,16 +252,13 @@ parts: glibmm: source: https://github.com/GNOME/glibmm.git source-depth: 1 - source-tag: 2.72.1 + source-tag: 2.76.0 plugin: meson build-packages: - meson - mm-common - ninja-build - - libglib2.0-dev - libxml-parser-perl - stage-packages: - - libglib2.0-0 meson-parameters: - --buildtype=release - --prefix=/usr @@ -416,7 +413,6 @@ parts: - libegl-dev - libfontconfig1-dev - libfreetype-dev - - libglib2.0-dev - libglx-dev - libgtk-3-dev - libharfbuzz-dev @@ -454,7 +450,6 @@ parts: - libegl1 - libfontconfig1 - libfreetype6 - - libglib2.0-0 - libglx0 - libgtk-3-0 - libharfbuzz0b @@ -533,6 +528,7 @@ parts: - -./usr/mkspecs - -./usr/modules after: + - glibmm - mozjpeg - openssl - patches @@ -570,7 +566,6 @@ parts: - libegl-dev - libgbm-dev - libgl-dev - - libglib2.0-dev - libopenh264-dev - libopus-dev - libpipewire-0.3-dev @@ -588,7 +583,6 @@ parts: - libegl1 - libgbm1 - libgl1 - - libglib2.0-0 - libopenh264-6 - libopus0 - libvpx7 @@ -611,5 +605,6 @@ parts: - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.a after: - ffmpeg + - glibmm - mozjpeg - openssl