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

Revert "Use latest mesa in snap" #27849

Merged
merged 2 commits into from
May 4, 2024
Merged
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion Telegram/build/docker/centos_env/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ FROM builder AS patches
RUN git init patches \
&& cd patches \
&& git remote add origin {{ GIT }}/desktop-app/patches.git \
&& git fetch --depth=1 origin ce5098d9bd638ec264fd8cf69ef3ef31d8139d18 \
&& git fetch --depth=1 origin 44f5103860dfa3f9b9675730231af6fbe28cde93 \
&& git reset --hard FETCH_HEAD \
&& rm -rf .git

Expand Down
6 changes: 1 addition & 5 deletions snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,6 @@ layout:
/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/webkitgtk-6.0:
bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/webkitgtk-6.0

package-repositories:
- type: apt
ppa: kisak/kisak-mesa

parts:
telegram:
plugin: cmake
Expand Down Expand Up @@ -171,7 +167,7 @@ parts:
patches:
source: https://github.com/desktop-app/patches.git
source-depth: 1
source-commit: ce5098d9bd638ec264fd8cf69ef3ef31d8139d18
source-commit: 44f5103860dfa3f9b9675730231af6fbe28cde93
plugin: dump
override-pull: |
craftctl default
Expand Down
Loading