Update snap to core24

This commit is contained in:
Ilya Fedin 2024-02-19 02:08:52 +04:00 committed by John Preston
parent 2c4d8418c1
commit dd1cb00c62

View file

@ -2,7 +2,7 @@ name: telegram-desktop
adopt-info: telegram adopt-info: telegram
icon: Telegram/Resources/art/icon512@2x.png icon: Telegram/Resources/art/icon512@2x.png
base: core22 base: core24
grade: stable grade: stable
confinement: strict confinement: strict
compression: lzo compression: lzo
@ -70,12 +70,14 @@ layout:
bind: $SNAP/usr/share/X11 bind: $SNAP/usr/share/X11
/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-3.0: /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-3.0:
bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-3.0 bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-3.0
/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-4.0:
bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-4.0
/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pipewire-0.3: /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pipewire-0.3:
bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pipewire-0.3 bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pipewire-0.3
/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/spa-0.2: /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/spa-0.2:
bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/spa-0.2 bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/spa-0.2
/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/webkit2gtk-4.1: /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/webkitgtk-6.0:
bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/webkit2gtk-4.1 bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/webkitgtk-6.0
package-repositories: package-repositories:
- type: apt - type: apt
@ -94,14 +96,17 @@ parts:
- clang - clang
- libtool-bin - libtool-bin
- python3 - python3
- protobuf-compiler
- libasound2-dev - libasound2-dev
- libavif-dev - libavif-dev
- libboost-regex1.74-dev - libboost-regex-dev
- libfmt-dev - libfmt-dev
- libgirepository1.0-dev - libgirepository1.0-dev
- libglib2.0-dev - libglib2.0-dev
- libheif-dev - libheif-dev
- libopenal-dev
- libopus-dev - libopus-dev
- libprotobuf-dev
- libpulse-dev - libpulse-dev
- libssl-dev - libssl-dev
- libwayland-dev - libwayland-dev
@ -112,15 +117,17 @@ parts:
- zlib1g-dev - zlib1g-dev
stage-packages: stage-packages:
- libasound2 - libasound2
- libavif13 - libavif16
- libboost-regex1.74.0 - libboost-regex1.83.0
- libglib2.0-0 - libglib2.0-0
- libheif1 - libheif1
- libopenal1
- libopus0 - libopus0
- libprotobuf-lite32
- libpulse0 - libpulse0
- libssl3 - libssl3
- libwayland-client0 - libwayland-client0
- libwebkit2gtk-4.1-0 - libwebkitgtk-6.0-4
- libxcb1 - libxcb1
- libxcb-keysyms1 - libxcb-keysyms1
- libxcb-record0 - libxcb-record0
@ -157,8 +164,6 @@ parts:
after: after:
- ffmpeg - ffmpeg
- libjxl - libjxl
- openal
- protobuf
- qt - qt
- rnnoise - rnnoise
- webrtc - webrtc
@ -220,12 +225,12 @@ parts:
- libswresample-dev - libswresample-dev
- libswscale-dev - libswscale-dev
stage-packages: stage-packages:
- libavcodec58 - libavcodec60
- libavfilter7 - libavfilter9
- libavformat58 - libavformat60
- libavutil56 - libavutil58
- libswresample3 - libswresample4
- libswscale5 - libswscale7
- va-driver-all - va-driver-all
- vdpau-driver-all - vdpau-driver-all
override-build: | override-build: |
@ -273,60 +278,6 @@ parts:
after: after:
- patches - patches
openal:
source: https://github.com/kcat/openal-soft.git
source-depth: 1
source-tag: 1.23.1
plugin: cmake
build-environment:
- LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
build-packages:
- libasound2-dev
- libdbus-1-dev
- libpipewire-0.3-dev
- libpulse-dev
stage-packages:
- libasound2
- libdbus-1-3
- libpulse0
- pipewire
cmake-generator: Ninja
cmake-parameters:
- -DCMAKE_BUILD_TYPE=Release
- -DCMAKE_INSTALL_PREFIX=/usr
- -DALSOFT_EXAMPLES=OFF
- -DALSOFT_UTILS=OFF
- -DALSOFT_INSTALL_CONFIG=OFF
prime:
- -./usr/include
- -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/cmake
- -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig
- -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.so
protobuf:
source: https://github.com/protocolbuffers/protobuf.git
source-depth: 1
source-tag: v24.3
plugin: cmake
build-environment:
- LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
build-packages:
- zlib1g-dev
stage-packages:
- zlib1g
cmake-generator: Ninja
cmake-parameters:
- -DCMAKE_BUILD_TYPE=Release
- -DCMAKE_INSTALL_PREFIX=/usr
- -DBUILD_SHARED_LIBS=ON
- -Dprotobuf_BUILD_TESTS=OFF
prime:
- -./usr/bin
- -./usr/include
- -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/cmake
- -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig
- -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.so
qt: qt:
plugin: nil plugin: nil
build-environment: build-environment:
@ -380,7 +331,7 @@ parts:
- libgtk-3-0 - libgtk-3-0
- libharfbuzz0b - libharfbuzz0b
- libice6 - libice6
- libicu70 - libicu74
- liblcms2-2 - liblcms2-2
- libopengl0 - libopengl0
- libpcre2-16-0 - libpcre2-16-0
@ -413,6 +364,7 @@ parts:
- libxkbcommon-x11-0 - libxkbcommon-x11-0
- zlib1g - zlib1g
- mesa-vulkan-drivers - mesa-vulkan-drivers
- xkb-data
override-pull: | override-pull: |
QT=6.7.0 QT=6.7.0
@ -518,10 +470,10 @@ parts:
- libgbm1 - libgbm1
- libgl1 - libgl1
- libglib2.0-0 - libglib2.0-0
- libopenh264-6 - libopenh264-7
- libopus0 - libopus0
- libssl3 - libssl3
- libvpx7 - libvpx8
- libx11-6 - libx11-6
- libxcomposite1 - libxcomposite1
- libxdamage1 - libxdamage1