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

Add pixbuf building to CI

Browse Source
This commit is contained in:
Michael Vetter 2022-05-27 14:04:44 +02:00
parent d510f3a430
commit 3aafffded9
7 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile.arch
View File

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

3
Dockerfile.debian
View File

@ -27,7 +27,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
pkg-config \ pkg-config \
python3-dev \ python3-dev \
python-dev-is-python3 \ python-dev-is-python3 \
libsqlite3-dev libsqlite3-dev \
libgdk-pixbuf-2.0-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

@ -34,7 +34,8 @@ RUN dnf install -y \
python3-devel \ python3-devel \
readline-devel \ readline-devel \
openssl-devel \ openssl-devel \
sqlite-devel sqlite-devel \
gdk-pixbuf2-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

@ -34,7 +34,8 @@ RUN zypper --non-interactive in --no-recommends \
python38 \ python38 \
python38-devel \ python38-devel \
readline-devel \ readline-devel \
sqlite3-devel sqlite3-devel \
gdk-pixbuf-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

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

3
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-python-plugins --with-xscreensaver --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"
@ -60,6 +60,7 @@ case $(uname | tr '[:upper:]' '[:lower:]') in
"--disable-c-plugins" "--disable-c-plugins"
"--disable-c-plugins --disable-python-plugins" "--disable-c-plugins --disable-python-plugins"
"--without-xscreensaver" "--without-xscreensaver"
"--disable-gdk-pixbuf"
"") "")
;; ;;
darwin*) darwin*)

3
configure.ac
View File

@ -311,7 +311,8 @@ fi
dnl feature: pixbuf / used for scaling avatars before uploading via `/avatar set` dnl feature: pixbuf / used for scaling avatars before uploading via `/avatar set`
AS_IF([test "x$enable_pixbuf" != xno], AS_IF([test "x$enable_pixbuf" != xno],
[PKG_CHECK_MODULES([gdk_pixbuf], [gdk-pixbuf-2.0 >= 2.4], [PKG_CHECK_MODULES([gdk_pixbuf], [gdk-pixbuf-2.0 >= 2.4],
[AC_DEFINE([HAVE_PIXBUF], [1], [gdk-pixbuf module])], [AC_DEFINE([HAVE_PIXBUF], [1], [gdk-pixbuf module])
LIBS="$gdk_pixbuf_LIBS $LIBS" CFLAGS="$gdk_pixbuf_CFLAGS $CFLAGS"],
[AS_IF([test "x$enable_pixbuf" = xyes], [AS_IF([test "x$enable_pixbuf" = xyes],
[AC_MSG_ERROR([gdk-pixbuf-2.0 >= 2.4 is required to scale avatars before uploading])], [AC_MSG_ERROR([gdk-pixbuf-2.0 >= 2.4 is required to scale avatars before uploading])],
[AC_MSG_NOTICE([gdk-pixbuf-2.0 >= 2.4 not found, GDK Pixbuf support not enabled])])])]) [AC_MSG_NOTICE([gdk-pixbuf-2.0 >= 2.4 not found, GDK Pixbuf support not enabled])])])])