Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps: fix libsoup3 dependency issue and bump dependencies #221

Merged
merged 3 commits into from
Jun 12, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 26 additions & 54 deletions snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ parts:
ninja:
plugin: nil
source: https://github.com/ninja-build/ninja.git
source-tag: 'v1.11.1'
source-tag: 'v1.12.1'
source-depth: 1
override-build: |
rm -rf build
Expand All @@ -58,7 +58,7 @@ parts:
after: [ ninja ]
plugin: nil
source: https://github.com/mesonbuild/meson.git
source-tag: '1.4.0'
source-tag: '1.4.1'
source-depth: 1
override-build: |
python3 -m pip install --break-system-packages .
Expand Down Expand Up @@ -112,7 +112,7 @@ parts:
glib:
after: [ libffi, meson-deps ]
source: https://gitlab.gnome.org/GNOME/glib.git
source-tag: '2.80.0'
source-tag: '2.80.2'
# ext:updatesnap
# version-format:
# ignore-odd-minor: true
Expand Down Expand Up @@ -189,7 +189,7 @@ parts:
gobject-introspection:
after: [ cairo, meson-deps ]
source: https://gitlab.gnome.org/GNOME/gobject-introspection.git
source-tag: '1.80.0'
source-tag: '1.80.1'
# ext:updatesnap
# version-format:
# ignore-odd-minor: true
Expand All @@ -213,7 +213,7 @@ parts:
vala:
after: [ gobject-introspection ]
source: https://gitlab.gnome.org/GNOME/vala.git
source-tag: '0.56.16'
source-tag: '0.56.17'
source-depth: 1
# ext:updatesnap
# version-format:
Expand Down Expand Up @@ -250,7 +250,7 @@ parts:
fribidi:
after: [ meson-deps ]
source: https://github.com/fribidi/fribidi.git
source-tag: 'v1.0.13'
source-tag: 'v1.0.14'
source-depth: 1
plugin: meson
meson-parameters:
Expand All @@ -263,7 +263,7 @@ parts:
harfbuzz:
after: [ fribidi, meson-deps ]
source: https://github.com/harfbuzz/harfbuzz.git
source-tag: '8.3.1' # developers declared that they won't break ABI
source-tag: '8.5.0' # developers declared that they won't break ABI
source-depth: 1
plugin: meson
meson-parameters:
Expand Down Expand Up @@ -294,7 +294,7 @@ parts:
pango:
after: [ harfbuzz, meson-deps ]
source: https://gitlab.gnome.org/GNOME/pango.git
source-tag: '1.52.1'
source-tag: '1.52.2'
source-depth: 1
plugin: meson
meson-parameters:
Expand All @@ -315,7 +315,7 @@ parts:
gdk-pixbuf:
after: [ pango, meson-deps ]
source: https://gitlab.gnome.org/GNOME/gdk-pixbuf.git
source-tag: '2.42.10'
source-tag: '2.42.12'
source-depth: 1
plugin: meson
meson-parameters:
Expand Down Expand Up @@ -348,7 +348,7 @@ parts:
librsvg:
after: [ gdk-pixbuf, vala ]
source: https://gitlab.gnome.org/GNOME/librsvg.git
source-tag: '2.58.0' # they left the odd->unstable even->stable scheme, and now tags are stable
source-tag: '2.58.1' # they left the odd->unstable even->stable scheme, and now tags are stable
# ext:updatesnap
# version-format:
# no-9x-revisions: true
Expand Down Expand Up @@ -477,7 +477,7 @@ parts:
wayland-protocols:
after: [ meson-deps ]
source: https://gitlab.freedesktop.org/wayland/wayland-protocols.git
source-tag: '1.34'
source-tag: '1.36'
source-depth: 1
build-packages:
- libwayland-dev
Expand All @@ -491,7 +491,7 @@ parts:
gtk3:
after: [ wayland-protocols, meson-deps ]
source: https://gitlab.gnome.org/GNOME/gtk.git
source-tag: '3.24.41'
source-tag: '3.24.42'
# ext:updatesnap
# version-format:
# ignore-odd-minor: true
Expand Down Expand Up @@ -537,7 +537,7 @@ parts:
gtk4:
after: [ wayland-protocols, meson-deps ]
source: https://gitlab.gnome.org/GNOME/gtk.git
source-tag: '4.14.1'
source-tag: '4.14.4'
# ext:updatesnap
# version-format:
# ignore-odd-minor: true
Expand Down Expand Up @@ -582,6 +582,7 @@ parts:
- libvulkan-dev
- libwayland-dev
- glslc
- libgraphene-1.0-dev
stage:
- -usr/bin/wayland-scanner
- -usr/lib/*/libwayland-client.so.0.20.0
Expand All @@ -601,43 +602,9 @@ parts:
mkdir -p $CRAFT_PART_INSTALL/usr/share
cp -r usr/share/locale-langpack $CRAFT_PART_INSTALL/usr/share/


poppler:
after: [ cairo, gdk-pixbuf, glib, gobject-introspection, gtk3, meson-deps ]
source: https://gitlab.freedesktop.org/poppler/poppler.git
source-tag: 'poppler-24.03.0'
# ext:updatesnap
# version-format:
# format: 'poppler-%M.%m.%R'
source-depth: 1
plugin: cmake
cmake-parameters:
- -DCMAKE_INSTALL_PREFIX=/usr
- -Doptimization=3
- -Ddebug=true
- -DBUILD_GTK_TESTS=OFF
- -DBUILD_QT5_TESTS=OFF
- -DBUILD_QT6_TESTS=OFF
- -DBUILD_CPP_TESTS=OFF
- -DBUILD_MANUAL_TESTS=OFF
- -DENABLE_QT5=OFF
- -DENABLE_QT6=OFF
- -DENABLE_GLIB=ON
- -DENABLE_GTK_DOC=OFF
- -DENABLE_GPGME=OFF
- -DENABLE_GOBJECT_INTROSPECTION=ON
build-environment: *buildenv
build-packages:
- libboost1.74-dev
- libcurl4-openssl-dev
- libopenjp2-7-dev
- libnss3-dev
- liblcms2-dev


libadwaita:
source: https://gitlab.gnome.org/GNOME/libadwaita.git
source-tag: '1.5.0'
source-tag: '1.5.1'
source-depth: 1
after: [ meson-deps, gtk4 ]
plugin: meson
Expand Down Expand Up @@ -830,7 +797,7 @@ parts:
gtksourceview:
after: [ gtkmm, meson-deps ]
source: https://gitlab.gnome.org/GNOME/gtksourceview.git
source-tag: '5.12.0'
source-tag: '5.12.1'
# ext:updatesnap
# version-format:
# ignore-odd-minor: true
Expand Down Expand Up @@ -970,7 +937,7 @@ parts:
after: [ cogl, meson-deps ]
source: https://github.com/linuxwacom/libwacom
source-type: git
source-tag: 'libwacom-2.10.0'
source-tag: 'libwacom-2.11.0'
# ext:updatesnap
# version-format:
# format: 'libwacom-%M.%m.%R'
Expand Down Expand Up @@ -1003,7 +970,7 @@ parts:
- libevdev-dev

clutter:
after: [ cogl, libinput, meson-deps ]
after: [ cogl, json-glib, libinput, meson-deps ]
source: https://gitlab.gnome.org/GNOME/clutter.git
source-tag: '1.26.4'
# ext:updatesnap
Expand Down Expand Up @@ -1134,7 +1101,7 @@ parts:
pygobject:
after: [ pycairo, meson-deps ]
source: https://gitlab.gnome.org/GNOME/pygobject.git
source-tag: '3.48.1'
source-tag: '3.48.2'
source-depth: 1
plugin: meson
meson-parameters:
Expand Down Expand Up @@ -1290,7 +1257,7 @@ parts:
libayatana-ido:
after: [glib, gtk3]
source: https://github.com/AyatanaIndicators/ayatana-ido.git
source-tag: '0.10.1'
source-tag: '0.10.2'
source-depth: 1
plugin: cmake
build-environment: *buildenv
Expand Down Expand Up @@ -1367,7 +1334,7 @@ parts:
done

debs:
after: [ libgnome-games-support, libadwaita, libgweather, poppler, libayatana-appindicator ]
after: [ libgnome-games-support, libadwaita, libgweather, libayatana-appindicator, libsoup3 ]
plugin: nil
stage-packages:
- appstream
Expand Down Expand Up @@ -1514,6 +1481,11 @@ parts:
- zlib1g-dev
- zlib1g
- libwebp-dev
- libigdgmm-dev
- libpoppler-dev
- libpoppler-glib-dev
- gir1.2-poppler-0.18

override-build: |
set -eux
craftctl default
Expand Down
Loading