Skip to content
This repository was archived by the owner on Jan 24, 2024. It is now read-only.

Commit 116e603

Browse files
shipilevmrserb
authored andcommitted
8314730: GHA: Drop libfreetype6-dev transitional package in favor of libfreetype-dev
Reviewed-by: andrew, erikj
1 parent 16bf01d commit 116e603

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.github/workflows/build-cross-compile.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ jobs:
137137
sudo debootstrap
138138
--arch=${{ matrix.debian-arch }}
139139
--verbose
140-
--include=fakeroot,symlinks,build-essential,libx11-dev,libxext-dev,libxrender-dev,libxrandr-dev,libxtst-dev,libxt-dev,libcups2-dev,libfontconfig1-dev,libasound2-dev,libfreetype6-dev,libpng-dev
140+
--include=fakeroot,symlinks,build-essential,libx11-dev,libxext-dev,libxrender-dev,libxrandr-dev,libxtst-dev,libxt-dev,libcups2-dev,libfontconfig1-dev,libasound2-dev,libfreetype-dev,libpng-dev
141141
--resolve-deps
142142
--variant=minbase
143143
$(test -n "${{ matrix.debian-keyring }}" && echo "--keyring=${{ matrix.debian-keyring }}")

.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ jobs:
150150
apt-architecture: 'i386'
151151
# Some multilib libraries do not have proper inter-dependencies, so we have to
152152
# install their dependencies manually.
153-
apt-extra-packages: 'libfreetype6-dev:i386 libtiff-dev:i386 libcupsimage2-dev:i386 libc6-i386 libgcc-s1:i386 libstdc++6:i386'
153+
apt-extra-packages: 'libfreetype-dev:i386 libtiff-dev:i386 libcupsimage2-dev:i386 libc6-i386 libgcc-s1:i386 libstdc++6:i386'
154154
extra-conf-options: '--with-target-bits=32'
155155
configure-arguments: ${{ github.event.inputs.configure-arguments }}
156156
make-arguments: ${{ github.event.inputs.make-arguments }}

0 commit comments

Comments
 (0)