From 0c7350e2e637aa07b4b1e926e84192030df8ff50 Mon Sep 17 00:00:00 2001
From: Michael Vetter <jubalh@iodoru.org>
Date: Mon, 30 May 2022 18:06:13 +0200
Subject: [PATCH] Make qrencode optional and add to CI

---
 Dockerfile.arch       |  3 ++-
 Dockerfile.debian     |  3 ++-
 Dockerfile.fedora     |  3 ++-
 Dockerfile.tumbleweed |  3 ++-
 Dockerfile.ubuntu     |  3 ++-
 ci-build.sh           |  4 ++--
 configure.ac          | 15 ++++++++++-----
 7 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/Dockerfile.arch b/Dockerfile.arch
index 7a7b2553..d4c4e0a1 100644
--- a/Dockerfile.arch
+++ b/Dockerfile.arch
@@ -27,7 +27,8 @@ RUN pacman -Syu --noconfirm && pacman -S --needed --noconfirm \
   python \
   wget \
   sqlite \
-  gdk-pixbuf2
+  gdk-pixbuf2 \
+  qrencode
 
 RUN mkdir -p /usr/src/{stabber,profanity}
 
diff --git a/Dockerfile.debian b/Dockerfile.debian
index ae002148..6da1f414 100644
--- a/Dockerfile.debian
+++ b/Dockerfile.debian
@@ -28,7 +28,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   python3-dev \
   python-dev-is-python3 \
   libsqlite3-dev \
-  libgdk-pixbuf-2.0-dev
+  libgdk-pixbuf-2.0-dev \
+  libqrencode-dev
 
 RUN mkdir -p /usr/src/{stabber,libstrophe,profanity}
 WORKDIR /usr/src
diff --git a/Dockerfile.fedora b/Dockerfile.fedora
index 8238fd48..b885bebb 100644
--- a/Dockerfile.fedora
+++ b/Dockerfile.fedora
@@ -35,7 +35,8 @@ RUN dnf install -y \
   readline-devel \
   openssl-devel \
   sqlite-devel \
-  gdk-pixbuf2-devel
+  gdk-pixbuf2-devel \
+  qrencode-devel
 
 # https://github.com/openSUSE/docker-containers-build/issues/26
 ENV LANG en_US.UTF-8
diff --git a/Dockerfile.tumbleweed b/Dockerfile.tumbleweed
index 8c75e8a4..5fc134dc 100644
--- a/Dockerfile.tumbleweed
+++ b/Dockerfile.tumbleweed
@@ -35,7 +35,8 @@ RUN zypper --non-interactive in --no-recommends \
   python38-devel \
   readline-devel \
   sqlite3-devel \
-  gdk-pixbuf-devel
+  gdk-pixbuf-devel \
+  qrencode-devel
 
 # https://github.com/openSUSE/docker-containers-build/issues/26
 ENV LANG en_US.UTF-8
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index 6ca0d721..853544c0 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -29,7 +29,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   python3-dev \
   python-dev-is-python3 \
   libsqlite3-dev \
-  libgdk-pixbuf-2.0-dev
+  libgdk-pixbuf-2.0-dev \
+  libqrencode-dev
 
 RUN mkdir -p /usr/src/{stabber,libstrophe,profanity}
 WORKDIR /usr/src
diff --git a/ci-build.sh b/ci-build.sh
index a26693f2..0e84cae9 100755
--- a/ci-build.sh
+++ b/ci-build.sh
@@ -44,7 +44,7 @@ case $(uname | tr '[:upper:]' '[:lower:]') in
         tests=(
         "--enable-notifications --enable-icons-and-clipboard --enable-otr --enable-pgp
         --enable-omemo --enable-plugins --enable-c-plugins
-        --enable-python-plugins --with-xscreensaver --enable-gdk-pixbuf"
+        --enable-python-plugins --with-xscreensaver --enable-omemo-qrcode --enable-gdk-pixbuf"
         "--disable-notifications --disable-icons-and-clipboard --disable-otr --disable-pgp
         --disable-omemo --disable-plugins --disable-c-plugins
         --disable-python-plugins --without-xscreensaver"
@@ -52,7 +52,7 @@ case $(uname | tr '[:upper:]' '[:lower:]') in
         "--disable-icons-and-clipboard"
         "--disable-otr"
         "--disable-pgp"
-        "--disable-omemo"
+        "--disable-omemo --disable-omemo-qrcode"
         "--disable-pgp --disable-otr"
         "--disable-pgp --disable-otr --disable-omemo"
         "--disable-plugins"
diff --git a/configure.ac b/configure.ac
index 0f997dde..8fe1ff4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -347,11 +347,16 @@ AS_IF([test "x$with_themes" = xno -o "x$with_themes" = xyes -o "x$with_themes" =
 AC_SUBST(THEMES_PATH)
 AM_CONDITIONAL([THEMES_INSTALL], "$THEMES_INSTALL")
 
-dnl feature: omemo qrcode
-AS_IF([test "x$omemo_qrcode" != xno],
-    [PKG_CHECK_MODULES([libqrencode], [libqrencode],
-        [AC_DEFINE([HAVE_QRENCODE], [1], [qrcode module])]
-        [LIBS="-lqrencode $LIBS"]], []))
+if test "x$enable_omemo_qrcode" != xno; then
+    AC_DEFINE([HAVE_QRENCODE], [1], [Have QRencode])
+
+    PKG_CHECK_MODULES([libqrencode], [libqrencode],
+        [LIBS="$libqrencode_LIBS $LIBS" CFLAGS="$libqrencode_CFLAGS $cflags"],
+        [AC_DEFINE([HAVE_QRENCODE], [0], [Dont have QRencode])
+         AS_IF([test "x$enable_qrcode" = xyes],
+               [AC_MSG_ERROR([libqrencode not found])],
+               [AC_MSG_NOTICE([librencode not found])])])
+fi
 
 ## Tests