aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Make qrencode optional and add to CI

Browse Source
This commit is contained in:
Michael Vetter 2022-05-30 18:06:13 +02:00
parent 42fb8f86d9
commit 0c7350e2e6
7 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile.arch
View File

@ -27,7 +27,8 @@ RUN pacman -Syu --noconfirm && pacman -S --needed --noconfirm \
python \ python \
wget \ wget \
sqlite \ sqlite \
gdk-pixbuf2 gdk-pixbuf2 \
qrencode
RUN mkdir -p /usr/src/{stabber,profanity} RUN mkdir -p /usr/src/{stabber,profanity}

3
Dockerfile.debian
View File

@ -28,7 +28,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
python3-dev \ python3-dev \
python-dev-is-python3 \ python-dev-is-python3 \
libsqlite3-dev \ libsqlite3-dev \
libgdk-pixbuf-2.0-dev libgdk-pixbuf-2.0-dev \
libqrencode-dev
RUN mkdir -p /usr/src/{stabber,libstrophe,profanity} RUN mkdir -p /usr/src/{stabber,libstrophe,profanity}
WORKDIR /usr/src WORKDIR /usr/src

3
Dockerfile.fedora
View File

@ -35,7 +35,8 @@ RUN dnf install -y \
readline-devel \ readline-devel \
openssl-devel \ openssl-devel \
sqlite-devel \ sqlite-devel \
gdk-pixbuf2-devel gdk-pixbuf2-devel \
qrencode-devel
# https://github.com/openSUSE/docker-containers-build/issues/26 # https://github.com/openSUSE/docker-containers-build/issues/26
ENV LANG en_US.UTF-8 ENV LANG en_US.UTF-8

3
Dockerfile.tumbleweed
View File

@ -35,7 +35,8 @@ RUN zypper --non-interactive in --no-recommends \
python38-devel \ python38-devel \
readline-devel \ readline-devel \
sqlite3-devel \ sqlite3-devel \
gdk-pixbuf-devel gdk-pixbuf-devel \
qrencode-devel
# https://github.com/openSUSE/docker-containers-build/issues/26 # https://github.com/openSUSE/docker-containers-build/issues/26
ENV LANG en_US.UTF-8 ENV LANG en_US.UTF-8

3
Dockerfile.ubuntu
View File

@ -29,7 +29,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
python3-dev \ python3-dev \
python-dev-is-python3 \ python-dev-is-python3 \
libsqlite3-dev \ libsqlite3-dev \
libgdk-pixbuf-2.0-dev libgdk-pixbuf-2.0-dev \
libqrencode-dev
RUN mkdir -p /usr/src/{stabber,libstrophe,profanity} RUN mkdir -p /usr/src/{stabber,libstrophe,profanity}
WORKDIR /usr/src WORKDIR /usr/src

4
ci-build.sh
View File

@ -44,7 +44,7 @@ case $(uname | tr '[:upper:]' '[:lower:]') in
tests=( tests=(
"--enable-notifications --enable-icons-and-clipboard --enable-otr --enable-pgp "--enable-notifications --enable-icons-and-clipboard --enable-otr --enable-pgp
--enable-omemo --enable-plugins --enable-c-plugins --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-notifications --disable-icons-and-clipboard --disable-otr --disable-pgp
--disable-omemo --disable-plugins --disable-c-plugins --disable-omemo --disable-plugins --disable-c-plugins
--disable-python-plugins --without-xscreensaver" --disable-python-plugins --without-xscreensaver"
@ -52,7 +52,7 @@ case $(uname | tr '[:upper:]' '[:lower:]') in
"--disable-icons-and-clipboard" "--disable-icons-and-clipboard"
"--disable-otr" "--disable-otr"
"--disable-pgp" "--disable-pgp"
"--disable-omemo" "--disable-omemo --disable-omemo-qrcode"
"--disable-pgp --disable-otr" "--disable-pgp --disable-otr"
"--disable-pgp --disable-otr --disable-omemo" "--disable-pgp --disable-otr --disable-omemo"
"--disable-plugins" "--disable-plugins"

15
configure.ac
View File

@ -347,11 +347,16 @@ AS_IF([test "x$with_themes" = xno -o "x$with_themes" = xyes -o "x$with_themes" =
AC_SUBST(THEMES_PATH) AC_SUBST(THEMES_PATH)
AM_CONDITIONAL([THEMES_INSTALL], "$THEMES_INSTALL") AM_CONDITIONAL([THEMES_INSTALL], "$THEMES_INSTALL")
dnl feature: omemo qrcode if test "x$enable_omemo_qrcode" != xno; then
AS_IF([test "x$omemo_qrcode" != xno], AC_DEFINE([HAVE_QRENCODE], [1], [Have QRencode])
[PKG_CHECK_MODULES([libqrencode], [libqrencode],
[AC_DEFINE([HAVE_QRENCODE], [1], [qrcode module])] PKG_CHECK_MODULES([libqrencode], [libqrencode],
[LIBS="-lqrencode $LIBS"]], [])) [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 ## Tests