Skip to content

Commit 99b9fb0

Browse files
committed
Linux: librsvg no longer requires libcroco
1 parent 6d523c6 commit 99b9fb0

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Use of libraries under the terms of the LGPLv3 is via the
5858
| glib | LGPLv3 |
5959
| harfbuzz | MIT Licence |
6060
| lcms | MIT Licence |
61-
| libcroco | LGPLv3 |
61+
| libcroco | LGPLv3 (Windows only) |
6262
| libexif | LGPLv3 |
6363
| libffi | MIT Licence |
6464
| libgsf | LGPLv3 |

build/lin.sh

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ VERSION_PIXMAN=0.38.4
3939
VERSION_CAIRO=1.16.0
4040
VERSION_FRIBIDI=1.0.8
4141
VERSION_PANGO=1.44.7
42-
VERSION_CROCO=0.6.13
4342
VERSION_SVG=2.47.1
4443
VERSION_GIF=5.1.4
4544

@@ -79,7 +78,6 @@ version_latest "pixman" "$VERSION_PIXMAN" "3648"
7978
#version_latest "cairo" "$VERSION_CAIRO" "247" # latest version in release monitoring does not exist
8079
version_latest "fribidi" "$VERSION_FRIBIDI" "857"
8180
version_latest "pango" "$VERSION_PANGO" "11783"
82-
version_latest "croco" "$VERSION_CROCO" "11787"
8381
version_latest "svg" "$VERSION_SVG" "5420"
8482
#version_latest "gif" "$VERSION_GIF" "1158" # v5.1.5+ provides a Makefile only so will require custom cross-compilation setup
8583
if [ "$ALL_AT_VERSION_LATEST" = "false" ]; then exit 1; fi
@@ -250,12 +248,6 @@ CFLAGS= CXXFLAGS= meson setup _build --buildtype=release --strip --libdir=lib --
250248
ninja -C _build
251249
ninja -C _build install
252250

253-
mkdir ${DEPS}/croco
254-
curl -Lks https://download.gnome.org/sources/libcroco/$(without_patch $VERSION_CROCO)/libcroco-${VERSION_CROCO}.tar.xz | tar xJC ${DEPS}/croco --strip-components=1
255-
cd ${DEPS}/croco
256-
./configure --host=${CHOST} --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking
257-
make install-strip
258-
259251
mkdir ${DEPS}/svg
260252
curl -Lks https://download.gnome.org/sources/librsvg/$(without_patch $VERSION_SVG)/librsvg-${VERSION_SVG}.tar.xz | tar xJC ${DEPS}/svg --strip-components=1
261253
cd ${DEPS}/svg
@@ -296,7 +288,6 @@ find ${TARGET}/lib -type f -name "*.so*" -exec sh -c "patchelf --set-rpath '\$OR
296288
cd ${TARGET}
297289
printf "{\n\
298290
\"cairo\": \"${VERSION_CAIRO}\",\n\
299-
\"croco\": \"${VERSION_CROCO}\",\n\
300291
\"exif\": \"${VERSION_EXIF}\",\n\
301292
\"expat\": \"${VERSION_EXPAT}\",\n\
302293
\"ffi\": \"${VERSION_FFI}\",\n\

0 commit comments

Comments
 (0)