Update desktop-file-utils

Author: TheAssassin

Dockerfile.bionic-aarch64

@@ -16,7 +16,10 @@ RUN bash -x /install-deps-ubuntu.sh
 COPY ./install-cmake.sh /
 RUN bash -x /install-cmake.sh
 
-ARG DESKTOP_FILE_UTILS_VERSION=0.26
+ARG MESON_VERSION=0.63.0
+RUN python3 -m pip install meson=="$MESON_VERSION"
+
+ARG DESKTOP_FILE_UTILS_VERSION=56d220dd679c7c3a8f995a41a27a7d6f3df49dea
 COPY build-desktop-file-utils.sh /
 RUN bash -x /build-desktop-file-utils.sh
 

Dockerfile.bionic-armhf

@@ -16,7 +16,10 @@ RUN bash -x /install-deps-ubuntu.sh
 COPY ./install-cmake.sh /
 RUN bash -x /install-cmake.sh
 
-ARG DESKTOP_FILE_UTILS_VERSION=0.26
+ARG MESON_VERSION=0.63.0
+RUN python3 -m pip install meson=="$MESON_VERSION"
+
+ARG DESKTOP_FILE_UTILS_VERSION=56d220dd679c7c3a8f995a41a27a7d6f3df49dea
 COPY build-desktop-file-utils.sh /
 RUN bash -x /build-desktop-file-utils.sh
 

Dockerfile.bionic-x86_64

@@ -16,7 +16,10 @@ RUN bash -x /install-deps-ubuntu.sh
 COPY ./install-cmake.sh /
 RUN bash -x /install-cmake.sh
 
-ARG DESKTOP_FILE_UTILS_VERSION=0.26
+ARG MESON_VERSION=0.63.0
+RUN python3 -m pip install meson=="$MESON_VERSION"
+
+ARG DESKTOP_FILE_UTILS_VERSION=56d220dd679c7c3a8f995a41a27a7d6f3df49dea
 COPY build-desktop-file-utils.sh /
 RUN bash -x /build-desktop-file-utils.sh
 

Dockerfile.centos7-i386

@@ -45,7 +45,10 @@ ARG ZSYNC_VERSION=0.6.2
 COPY build-zsync.sh /
 RUN bash -x /build-zsync.sh
 
-ARG DESKTOP_FILE_UTILS_VERSION=0.26
+ARG MESON_VERSION=0.63.0
+RUN python3 -m pip install meson=="$MESON_VERSION"
+
+ARG DESKTOP_FILE_UTILS_VERSION=56d220dd679c7c3a8f995a41a27a7d6f3df49dea
 COPY build-desktop-file-utils.sh /
 RUN bash -x /build-desktop-file-utils.sh
 

Dockerfile.centos7-x86_64

@@ -42,7 +42,10 @@ ARG ZSYNC_VERSION=0.6.2
 COPY build-zsync.sh /
 RUN bash -x /build-zsync.sh
 
-ARG DESKTOP_FILE_UTILS_VERSION=0.26
+ARG MESON_VERSION=0.63.0
+RUN python3 -m pip install meson=="$MESON_VERSION"
+
+ARG DESKTOP_FILE_UTILS_VERSION=56d220dd679c7c3a8f995a41a27a7d6f3df49dea
 COPY build-desktop-file-utils.sh /
 RUN bash -x /build-desktop-file-utils.sh
 

build-desktop-file-utils.sh

@@ -2,15 +2,20 @@
 
 set -xe
 
-wget https://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-"$DESKTOP_FILE_UTILS_VERSION".tar.xz -O - | tar xJ
+git clone -n https://github.com/freedesktop/xdg-desktop-file-utils.git desktop-file-utils-"$DESKTOP_FILE_UTILS_VERSION"
 
 cd desktop-file-utils-"$DESKTOP_FILE_UTILS_VERSION"
 
+# this workaround is needed since we use a commit hash at the moment to support 1.5 type desktop entries
+git checkout "$DESKTOP_FILE_UTILS_VERSION"
+
 export CHOST="$DEBARCH"
 
-export CFLAGS="-I/deps/include"
-export CPPFLAGS="$CFLAGS"
-export LDFLAGS="-L/deps/lib"
+flags="-no-pie -static"
+
+export CFLAGS="-I/deps/include $flags"
+export CPPFLAGS="$CFLAGS $flags"
+export LDFLAGS="-L/deps/lib $flags"
 
 ./autogen.sh --prefix=/deps --target="$CHOST" --build="x86_64-linux-gnu" --host="$CHOST"