From 9cc50a08dc5563fb8cbc0067f770948098afeedf Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xavier.claessens@collabora.com>
Date: Thu, 7 Jun 2018 11:27:54 -0400
Subject: [PATCH 1/2] Dockerfile: Reorder packages in alphabetical order

---
 .gitlab-ci/Dockerfile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 56585d8a1..50f42152a 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -18,21 +18,21 @@ RUN dnf -y install \
     libmount-devel \
     libselinux-devel \
     libxslt \
+    make \
+    mingw64-gcc \
+    mingw64-gcc-c++ \
+    mingw64-gettext \
+    mingw64-libffi \
+    mingw64-zlib \
     ninja-build \
     pcre-devel \
     python3 \
     python3-pip \
     python3-wheel \
     systemtap-sdt-devel \
-    zlib-devel \
-    wget \
     unzip \
-    make \
-    mingw64-gcc \
-    mingw64-gcc-c++ \
-    mingw64-gettext \
-    mingw64-zlib \
-    mingw64-libffi \
+    wget \
+    zlib-devel \
  && dnf clean all
 
 RUN pip3 install meson

From 7016aedde88c539c0eda689c2852170c9ce96b37 Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xavier.claessens@collabora.com>
Date: Thu, 7 Jun 2018 11:23:17 -0400
Subject: [PATCH 2/2] ci: Build fam module on linux

---
 .gitlab-ci.yml        | 2 +-
 .gitlab-ci/Dockerfile | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 20d6c3696..8a3dca782 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ fedora-meson-x86_64:
   variables:
     CFLAGS: "-coverage -ftest-coverage -fprofile-arcs"
   script:
-    - meson --buildtype debug --werror -Dsystemtap=true -Ddtrace=true _build .
+    - meson --buildtype debug --werror -Dsystemtap=true -Ddtrace=true -Dfam=true _build .
     - ninja -C _build
     - meson test -C _build --timeout-multiplier ${MESON_TEST_TIMEOUT_MULTIPLIER}
     - mkdir -p _coverage
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 50f42152a..cdb54eb16 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -4,6 +4,7 @@ RUN dnf -y install \
     desktop-file-utils \
     elfutils-libelf-devel \
     findutils \
+    gamin-devel \
     gcc \
     gcc-c++ \
     gettext \