aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortsdgeos <aacid@kde.org>2021-10-07 10:50:08 +0200
committerGitHub <noreply@github.com>2021-10-07 09:50:08 +0100
commitad0829ccf7d9f4e88d551bd70cf174d4bb2da8e7 (patch)
tree3b597fe9e5581deeb127cefebffdd77f352b8643
parenta05a9b32bdaa0110420ca25625b99cc592408728 (diff)
downloadoss-fuzz-ad0829ccf7d9f4e88d551bd70cf174d4bb2da8e7.tar.gz
poppler: Use a newer glib (#6566)
-rw-r--r--projects/poppler/Dockerfile4
-rwxr-xr-xprojects/poppler/build.sh2
2 files changed, 3 insertions, 3 deletions
diff --git a/projects/poppler/Dockerfile b/projects/poppler/Dockerfile
index fa5fd17de..dd7160d65 100644
--- a/projects/poppler/Dockerfile
+++ b/projects/poppler/Dockerfile
@@ -27,8 +27,8 @@ RUN git clone --depth 1 https://gitlab.freedesktop.org/fontconfig/fontconfig.git
RUN git clone --depth 1 https://gitlab.freedesktop.org/cairo/cairo.git
RUN git clone --depth 1 --branch=5.15 git://code.qt.io/qt/qtbase.git
RUN git clone --depth 1 https://gitlab.gnome.org/GNOME/pango.git
-ADD https://ftp.gnome.org/pub/gnome/sources/glib/2.64/glib-2.64.2.tar.xz $SRC
-RUN tar xvJf $SRC/glib-2.64.2.tar.xz
+ADD https://ftp.gnome.org/pub/gnome/sources/glib/2.70/glib-2.70.0.tar.xz $SRC
+RUN tar xvJf $SRC/glib-2.70.0.tar.xz
RUN wget https://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_1_76_0.tar.bz2
RUN git clone --depth 1 --single-branch https://gitlab.freedesktop.org/poppler/poppler.git
diff --git a/projects/poppler/build.sh b/projects/poppler/build.sh
index 955a2a68a..02915b70d 100755
--- a/projects/poppler/build.sh
+++ b/projects/poppler/build.sh
@@ -67,7 +67,7 @@ if [ "$SANITIZER" != "memory" ]; then
ninja -C _builddir install
popd
- pushd $SRC/glib-2.64.2
+ pushd $SRC/glib-2.70.0
meson \
--prefix=$PREFIX \
--libdir=lib \