From ec347f5b469f22faa6c70ac62c519ac006df8fb3 Mon Sep 17 00:00:00 2001
From: Dmitry Maksyoma <ledestin@gmail.com>
Date: Thu, 9 Mar 2023 23:20:18 +1300
Subject: [PATCH] Support newest libjpeg-turbo on Fedora 37

---
 builder/dockerfile.fedora_thirtyseven.build    | 7 +++++--
 builder/dockerfile.fedora_thirtyseven.rpm.test | 3 +--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/builder/dockerfile.fedora_thirtyseven.build b/builder/dockerfile.fedora_thirtyseven.build
index e3c75b4..4557431 100644
--- a/builder/dockerfile.fedora_thirtyseven.build
+++ b/builder/dockerfile.fedora_thirtyseven.build
@@ -27,8 +27,6 @@ RUN \
     glibc-devel \
     libdrm-devel \
     libepoxy-devel \
-    libjpeg-turbo-devel \
-    libjpeg-turbo-static \
     libmd-devel \
     libpciaccess-devel \
     libtool \
@@ -75,6 +73,11 @@ RUN \
     xorg-x11-xtrans-devel \
     xsltproc
 
+ENV SCRIPTS_DIR=/tmp/scripts
+COPY builder/scripts $SCRIPTS_DIR
+RUN $SCRIPTS_DIR/build-webp
+RUN $SCRIPTS_DIR/build-libjpeg-turbo
+
 RUN useradd -m docker && echo "docker:docker" | chpasswd
 
 COPY --chown=docker:docker . /src/
diff --git a/builder/dockerfile.fedora_thirtyseven.rpm.test b/builder/dockerfile.fedora_thirtyseven.rpm.test
index 2bce89f..5c7dea3 100644
--- a/builder/dockerfile.fedora_thirtyseven.rpm.test
+++ b/builder/dockerfile.fedora_thirtyseven.rpm.test
@@ -31,8 +31,7 @@ WORKDIR $HOME
 
 RUN dnf install -y openssl xterm gettext wget
 RUN dnf install -y nss_wrapper
-RUN dnf install -y xorg-x11-xauth xorg-x11-xkb-utils \
-  xkeyboard-config xorg-x11-server-utils
+RUN dnf install -y xorg-x11-xauth xkeyboard-config
 # xorg-x11-server-Xorg
 # RUN dnf install -y @xfce-desktop-environment
 RUN dnf erase -y pm-utils xscreensaver*