void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace usage of deprecated CRAFT_ARCH_TRIPLET

Browse source
This commit is contained in:
Ilya Fedin 2024-02-17 01:27:32 +04:00 • committed by John Preston
parent 1146ecfd45
commit 5bf6a93086
1 changed files with 49 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
snap/snapcraft.yaml
View file

@ -68,14 +68,14 @@ layout:
bind: $SNAP/usr/share/pipewire bind: $SNAP/usr/share/pipewire
/usr/share/X11: /usr/share/X11:
bind: $SNAP/usr/share/X11 bind: $SNAP/usr/share/X11
/usr/lib/$CRAFT_ARCH_TRIPLET/gtk-3.0: /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-3.0:
bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET/gtk-3.0 bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-3.0
/usr/lib/$CRAFT_ARCH_TRIPLET/pipewire-0.3: /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pipewire-0.3:
bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET/pipewire-0.3 bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pipewire-0.3
/usr/lib/$CRAFT_ARCH_TRIPLET/spa-0.2: /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/spa-0.2:
bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET/spa-0.2 bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/spa-0.2
/usr/lib/$CRAFT_ARCH_TRIPLET/webkit2gtk-4.1: /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/webkit2gtk-4.1:
bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET/webkit2gtk-4.1 bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/webkit2gtk-4.1
package-repositories: package-repositories:
- type: apt - type: apt
@ -88,7 +88,7 @@ parts:
source-type: git source-type: git
parse-info: [usr/share/metainfo/org.telegram.desktop.metainfo.xml] parse-info: [usr/share/metainfo/org.telegram.desktop.metainfo.xml]
build-environment: build-environment:
- LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
build-packages: build-packages:
- clang - clang
@ -153,7 +153,7 @@ parts:
craftctl default craftctl default
rm -rf "$CRAFT_PART_INSTALL/usr/share/icons" rm -rf "$CRAFT_PART_INSTALL/usr/share/icons"
stage: stage:
- -./usr/lib/$CRAFT_ARCH_TRIPLET/libjpeg.so.8.2.2 - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libjpeg.so.8.2.2
after: after:
- ffmpeg - ffmpeg
- libjxl - libjxl
@ -196,7 +196,7 @@ parts:
plugin: make plugin: make
make-parameters: ["FLAVOR=qt5"] make-parameters: ["FLAVOR=qt5"]
build-environment: build-environment:
- LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
build-packages: build-packages:
- build-essential - build-essential
- dpkg-dev - dpkg-dev
@ -220,9 +220,9 @@ parts:
update-icon-caches "$theme" update-icon-caches "$theme"
fi fi
done done
GTK_PATH=$PWD/usr/lib/$CRAFT_ARCH_TRIPLET/gtk-3.0 /usr/lib/$CRAFT_ARCH_TRIPLET/libgtk-3-0/gtk-query-immodules-3.0 > usr/lib/$CRAFT_ARCH_TRIPLET/gtk-3.0/3.0.0/immodules/immodules.cache GTK_PATH=$PWD/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-3.0 /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libgtk-3-0/gtk-query-immodules-3.0 > usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-3.0/3.0.0/immodules/immodules.cache
stage: stage:
- -./usr/lib/$CRAFT_ARCH_TRIPLET/libjpeg.so.8.2.2 - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libjpeg.so.8.2.2
after: after:
- telegram - telegram
@ -246,12 +246,12 @@ parts:
- vdpau-driver-all - vdpau-driver-all
override-build: | override-build: |
craftctl default craftctl default
mv "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET/blas/"* "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET" mv "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/blas/"* "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR"
rmdir "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET/blas" rmdir "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/blas"
mv "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET/lapack/"* "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET" mv "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/lapack/"* "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR"
rmdir "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET/lapack" rmdir "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/lapack"
stage: stage:
- -./usr/lib/$CRAFT_ARCH_TRIPLET/libjpeg.so.8.2.2 - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libjpeg.so.8.2.2
after: after:
- mozjpeg - mozjpeg
@ -270,8 +270,8 @@ parts:
- -Dtests=false - -Dtests=false
prime: prime:
- -./usr/include - -./usr/include
- -./usr/lib/$CRAFT_ARCH_TRIPLET/pkgconfig - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig
- -./usr/lib/$CRAFT_ARCH_TRIPLET/*.so - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.so
after: after:
- meson-deps - meson-deps
@ -296,8 +296,8 @@ parts:
- -Dsigc++-3.0:validation=false - -Dsigc++-3.0:validation=false
prime: prime:
- -./usr/include - -./usr/include
- -./usr/lib/$CRAFT_ARCH_TRIPLET/pkgconfig - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig
- -./usr/lib/$CRAFT_ARCH_TRIPLET/*.so - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.so
after: after:
- meson-deps - meson-deps
- glib - glib
@ -326,13 +326,13 @@ parts:
- -DJPEGXL_ENABLE_OPENEXR=OFF - -DJPEGXL_ENABLE_OPENEXR=OFF
- -DJPEGXL_ENABLE_SKCMS=OFF - -DJPEGXL_ENABLE_SKCMS=OFF
stage: stage:
- -./usr/lib/$CRAFT_ARCH_TRIPLET/libbrotli* - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libbrotli*
prime: prime:
- -./usr/bin - -./usr/bin
- -./usr/include - -./usr/include
- -./usr/lib/$CRAFT_ARCH_TRIPLET/pkgconfig - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig
- -./usr/lib/$CRAFT_ARCH_TRIPLET/*.a - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.a
- -./usr/lib/$CRAFT_ARCH_TRIPLET/*.so - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.so
- -./usr/share - -./usr/share
mozjpeg: mozjpeg:
@ -352,8 +352,8 @@ parts:
prime: prime:
- -./usr/bin - -./usr/bin
- -./usr/include - -./usr/include
- -./usr/lib/$CRAFT_ARCH_TRIPLET/pkgconfig - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig
- -./usr/lib/$CRAFT_ARCH_TRIPLET/*.so - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.so
- -./usr/share - -./usr/share
openal: openal:
@ -382,9 +382,9 @@ parts:
- -DALSOFT_INSTALL_CONFIG=OFF - -DALSOFT_INSTALL_CONFIG=OFF
prime: prime:
- -./usr/include - -./usr/include
- -./usr/lib/$CRAFT_ARCH_TRIPLET/cmake - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/cmake
- -./usr/lib/$CRAFT_ARCH_TRIPLET/pkgconfig - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig
- -./usr/lib/$CRAFT_ARCH_TRIPLET/*.so - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.so
protobuf: protobuf:
source: https://github.com/protocolbuffers/protobuf.git source: https://github.com/protocolbuffers/protobuf.git
@ -406,9 +406,9 @@ parts:
prime: prime:
- -./usr/bin - -./usr/bin
- -./usr/include - -./usr/include
- -./usr/lib/$CRAFT_ARCH_TRIPLET/cmake - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/cmake
- -./usr/lib/$CRAFT_ARCH_TRIPLET/pkgconfig - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig
- -./usr/lib/$CRAFT_ARCH_TRIPLET/*.so - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.so
qt: qt:
plugin: nil plugin: nil
@ -509,7 +509,7 @@ parts:
override-build: | override-build: |
./configure \ ./configure \
-prefix /usr \ -prefix /usr \
-libdir /usr/lib/$CRAFT_ARCH_TRIPLET \ -libdir /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR \
-release \ -release \
-opensource \ -opensource \
-confirm-license \ -confirm-license \
@ -524,18 +524,18 @@ parts:
cmake --build . -j$CRAFT_PARALLEL_BUILD_COUNT cmake --build . -j$CRAFT_PARALLEL_BUILD_COUNT
DESTDIR="$CRAFT_PART_INSTALL" cmake --install . DESTDIR="$CRAFT_PART_INSTALL" cmake --install .
stage: stage:
- -./usr/lib/$CRAFT_ARCH_TRIPLET/libjpeg.so.8.2.2 - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libjpeg.so.8.2.2
prime: prime:
- -./usr/bin - -./usr/bin
- -./usr/doc - -./usr/doc
- -./usr/include - -./usr/include
- -./usr/lib/$CRAFT_ARCH_TRIPLET/cmake - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/cmake
- -./usr/lib/$CRAFT_ARCH_TRIPLET/metatypes - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/metatypes
- -./usr/lib/$CRAFT_ARCH_TRIPLET/pkgconfig - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig
- -./usr/lib/$CRAFT_ARCH_TRIPLET/*.a - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.a
- -./usr/lib/$CRAFT_ARCH_TRIPLET/*.la - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
- -./usr/lib/$CRAFT_ARCH_TRIPLET/*.prl - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
- -./usr/lib/$CRAFT_ARCH_TRIPLET/*.so - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.so
- -./usr/libexec - -./usr/libexec
- -./usr/mkspecs - -./usr/mkspecs
- -./usr/modules - -./usr/modules
@ -553,15 +553,15 @@ parts:
- CFLAGS: -O2 -s - CFLAGS: -O2 -s
autotools-configure-parameters: autotools-configure-parameters:
- --prefix=/usr - --prefix=/usr
- --libdir=\${exec_prefix}/lib/$CRAFT_ARCH_TRIPLET - --libdir=\${exec_prefix}/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
- --disable-static - --disable-static
- --disable-examples - --disable-examples
- --disable-doc - --disable-doc
prime: prime:
- -./usr/include - -./usr/include
- -./usr/lib/$CRAFT_ARCH_TRIPLET/pkgconfig - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig
- -./usr/lib/$CRAFT_ARCH_TRIPLET/*.la - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
- -./usr/lib/$CRAFT_ARCH_TRIPLET/*.so - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.so
- -./usr/share - -./usr/share
systemd: systemd:
@ -621,8 +621,8 @@ parts:
- -DCMAKE_INSTALL_PREFIX=/usr - -DCMAKE_INSTALL_PREFIX=/usr
prime: prime:
- -./usr/include - -./usr/include
- -./usr/lib/$CRAFT_ARCH_TRIPLET/cmake - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/cmake
- -./usr/lib/$CRAFT_ARCH_TRIPLET/*.a - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.a
after: after:
- ffmpeg - ffmpeg
- glib - glib