pidgin/builders

Updates for the talkatu xvfb -> broadway change

2020-09-05, Gary Kramlich
d6e2f711f3da
Parents d95a773dcc11
Children 6eb31c3b1d11
Updates for the talkatu xvfb -> broadway change
8 files changed, 15 insertions(+), 10 deletions(-)
  • +1 -1
    Dockerfile.debian-bullseye-amd64
  • +1 -1
    Dockerfile.debian-buster-amd64
  • +1 -1
    Dockerfile.mingw-w64-x86_64
  • +1 -1
    Dockerfile.pvs-studio
  • +1 -1
    Dockerfile.subproject-build
  • +1 -1
    Dockerfile.subproject-build-clang
  • +1 -1
    Dockerfile.ubuntu-focal-amd64
  • +8 -3
    appimage/build.sh
    • --- a/Dockerfile.debian-bullseye-amd64 Thu Aug 27 22:28:43 2020 -0500
    +++ b/Dockerfile.debian-bullseye-amd64 Sat Sep 05 22:36:17 2020 -0500
    @@ -16,7 +16,7 @@
    libavahi-glib-dev libavahi-client-dev \
    libjson-glib-dev libdbus-glib-1-dev libgmime-3.0-dev \
    libgladeui-dev libgspell-1-dev libgumbo-dev libcmark-dev \
    - help2man xvfb xauth \
    + libgtk-3-dev libgtk-3-bin help2man \
    gtk-doc-tools \
    libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev \
    gstreamer1.0-plugins-good gstreamer1.0-plugins-bad \
    --- a/Dockerfile.debian-buster-amd64 Thu Aug 27 22:28:43 2020 -0500
    +++ b/Dockerfile.debian-buster-amd64 Sat Sep 05 22:36:17 2020 -0500
    @@ -17,7 +17,7 @@
    libavahi-glib-dev libavahi-client-dev \
    libjson-glib-dev libdbus-glib-1-dev libgmime-3.0-dev \
    libgladeui-dev libgspell-1-dev libgumbo-dev libcmark-dev \
    - help2man xvfb xauth \
    + libgtk-3-dev libgtk-3-bin help2man \
    gtk-doc-tools \
    libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev \
    gstreamer1.0-plugins-good gstreamer1.0-plugins-bad \
    --- a/Dockerfile.mingw-w64-x86_64 Thu Aug 27 22:28:43 2020 -0500
    +++ b/Dockerfile.mingw-w64-x86_64 Sat Sep 05 22:36:17 2020 -0500
    @@ -9,7 +9,7 @@
    ca-certificates build-essential gettext xz-utils pkg-config zip \
    mingw-w64 mingw-w64-x86-64-dev mingw-w64-tools \
    mercurial meson ninja-build help2man git \
    - wine wine32 wine64 xauth xvfb \
    + wine wine32 wine64 \
    libglib2.0-dev gobject-introspection \
    && \
    apt-get clean && \
    --- a/Dockerfile.pvs-studio Thu Aug 27 22:28:43 2020 -0500
    +++ b/Dockerfile.pvs-studio Sat Sep 05 22:36:17 2020 -0500
    @@ -1,6 +1,6 @@
    FROM pidgin/builders:subproject-build
    -ENV PVS_STUDIO_DOWNLOAD_URL=https://files.viva64.com/pvs-studio-7.08.39765.52-x86_64.tgz
    +ENV PVS_STUDIO_DOWNLOAD_URL=https://files.viva64.com/pvs-studio-7.09.41421.64-x86_64.tgz
    MAINTAINER Gary Kramlich <grim@reaperworld.com>
    --- a/Dockerfile.subproject-build Thu Aug 27 22:28:43 2020 -0500
    +++ b/Dockerfile.subproject-build Sat Sep 05 22:36:17 2020 -0500
    @@ -14,7 +14,7 @@
    libavahi-glib-dev libavahi-client-dev \
    libjson-glib-dev libdbus-glib-1-dev libgmime-3.0-dev \
    libgladeui-dev libgspell-1-dev libgumbo-dev libcmark-dev \
    - help2man xvfb xauth \
    + libgtk-3-dev libgtk-3-bin help2man \
    gtk-doc-tools \
    libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev \
    gstreamer1.0-plugins-good gstreamer1.0-plugins-bad \
    --- a/Dockerfile.subproject-build-clang Thu Aug 27 22:28:43 2020 -0500
    +++ b/Dockerfile.subproject-build-clang Sat Sep 05 22:36:17 2020 -0500
    @@ -14,7 +14,7 @@
    libavahi-glib-dev libavahi-client-dev \
    libjson-glib-dev libdbus-glib-1-dev libgmime-3.0-dev \
    libgladeui-dev libgspell-1-dev libgumbo-dev libcmark-dev \
    - help2man xvfb xauth \
    + libgtk-3-dev libgtk-3-bin help2man \
    gtk-doc-tools \
    libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev \
    gstreamer1.0-plugins-good gstreamer1.0-plugins-bad \
    --- a/Dockerfile.ubuntu-focal-amd64 Thu Aug 27 22:28:43 2020 -0500
    +++ b/Dockerfile.ubuntu-focal-amd64 Sat Sep 05 22:36:17 2020 -0500
    @@ -24,7 +24,7 @@
    libavahi-glib-dev libavahi-client-dev \
    libjson-glib-dev libdbus-glib-1-dev libgmime-3.0-dev \
    libgladeui-dev libgspell-1-dev libgumbo-dev libcmark-dev \
    - help2man xvfb xauth \
    + libgtk-3-dev libgtk-3-bin help2man \
    gtk-doc-tools \
    libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev \
    gstreamer1.0-plugins-good gstreamer1.0-plugins-bad \
    --- a/appimage/build.sh Thu Aug 27 22:28:43 2020 -0500
    +++ b/appimage/build.sh Sat Sep 05 22:36:17 2020 -0500
    @@ -15,13 +15,18 @@
    # along with this program; if not, see <http://www.gnu.org/licenses/>.
    TARGET="${TARGET:-unknown}"
    -RECIPE="${RECIPE:-packaging/AppImageBuilder.yml}"
    +RECIPE="${RECIPE:-pidgin3}"
    +RECIPE_PATH="${RECIPE_PATH:-packaging/${RECIPE}.AppImageBuilder.yml}"
    +
    +BUILD_NUMBER="${BUILD_NUMBER:-0}"
    +COMMIT="${HG_COMMIT_SHORT:-unknown-rev}"
    +VERSION="${VERSION:-${BUILD_NUMBER}~${COMMIT_SHORT}}"
    cd "${HOME}"
    -meson -Dconsoleui=False --prefix=/usr --buildtype=release "${CONVEY_WORKSPACE}" build
    +meson ${CONFIGURE_ARGS} --prefix=/usr --buildtype=release "${CONVEY_WORKSPACE}" build
    DESTDIR=$(pwd)/AppDir ninja -C build install
    -appimage-builder --skip-tests --recipe "${CONVEY_WORKSPACE}/${RECIPE}"
    +appimage-builder --skip-tests --recipe "${CONVEY_WORKSPACE}/${RECIPE_PATH}"
    mkdir -p "${CONVEY_WORKSPACE}/${TARGET}"
    mv *.AppImage "${CONVEY_WORKSPACE}/${TARGET}/"