pidgin/builders

Remove SILC from everything and some other random clean ups

19 months ago, Gary Kramlich
ea000228c46f
Parents 2de2f8c8bb9e
Children cae81cbdcb49
Remove SILC from everything and some other random clean ups
4 files changed, 1 insertions(+), 42 deletions(-)
  • +0 -14
    Dockerfile.debian-bookworm-amd64
  • +0 -13
    Dockerfile.fedora-36-amd64
  • +0 -14
    Dockerfile.ubuntu-kinetic-amd64
  • +1 -1
    build-subproject.sh
    • --- a/Dockerfile.debian-bookworm-amd64 Thu Oct 06 22:43:55 2022 -0500
    +++ b/Dockerfile.debian-bookworm-amd64 Wed Oct 26 03:23:56 2022 -0500
    @@ -16,7 +16,6 @@
    gobject-introspection \
    gstreamer1.0-plugins-bad \
    gstreamer1.0-plugins-good \
    - gtk-doc-tools \
    help2man \
    intltool \
    json-glib-tools \
    @@ -41,7 +40,6 @@
    libgtk-4-bin \
    libgtk-4-dev \
    libgumbo-dev \
    - libhandy-1-dev \
    libidn11-dev \
    libjson-glib-dev \
    libkf5wallet-dev \
    @@ -75,18 +73,6 @@
    apt-get clean && \
    rm -rf /var/lib/apt/lists
    -RUN set -ex && \
    - cd /tmp && \
    - wget https://downloads.sourceforge.net/project/silc/silc/toolkit/sources/silc-toolkit-1.1.12.tar.bz2 && \
    - tar jxf silc-toolkit-1.1.12.tar.bz2 && \
    - cd silc-toolkit-1.1.12 && \
    - ./configure && \
    - make -s && \
    - make install && \
    - ldconfig && \
    - cd .. && \
    - rm -rf silc-toolkit*
    -
    COPY build-subproject.sh /usr/local/bin/build.sh
    CMD ["build.sh"]
    --- a/Dockerfile.fedora-36-amd64 Thu Oct 06 22:43:55 2022 -0500
    +++ b/Dockerfile.fedora-36-amd64 Wed Oct 26 03:23:56 2022 -0500
    @@ -22,7 +22,6 @@
    gstreamer1-devel \
    gstreamer1-plugins-base-devel \
    gstreamer1-plugins-good \
    - gtk-doc \
    gtk4-devel \
    gumbo-parser-devel \
    help2man \
    @@ -57,18 +56,6 @@
    vala \
    wget
    -RUN set -ex && \
    - cd /tmp && \
    - wget https://downloads.sourceforge.net/project/silc/silc/toolkit/sources/silc-toolkit-1.1.12.tar.bz2 && \
    - tar jxf silc-toolkit-1.1.12.tar.bz2 && \
    - cd silc-toolkit-1.1.12 && \
    - ./configure && \
    - make -s && \
    - make install && \
    - ldconfig && \
    - cd .. && \
    - rm -rf silc-toolkit*
    -
    COPY build-subproject.sh /usr/local/bin/build.sh
    CMD ["build.sh"]
    --- a/Dockerfile.ubuntu-kinetic-amd64 Thu Oct 06 22:43:55 2022 -0500
    +++ b/Dockerfile.ubuntu-kinetic-amd64 Wed Oct 26 03:23:56 2022 -0500
    @@ -26,7 +26,6 @@
    gobject-introspection \
    gstreamer1.0-plugins-bad \
    gstreamer1.0-plugins-good \
    - gtk-doc-tools \
    help2man \
    intltool \
    json-glib-tools \
    @@ -51,7 +50,6 @@
    libgtk-4-bin \
    libgtk-4-dev \
    libgumbo-dev \
    - libhandy-1-dev \
    libidn11-dev \
    libjson-glib-dev \
    libkf5wallet-dev \
    @@ -88,18 +86,6 @@
    apt-get clean && \
    rm -rf /var/lib/apt/lists
    -RUN set -ex && \
    - cd /tmp && \
    - wget https://downloads.sourceforge.net/project/silc/silc/toolkit/sources/silc-toolkit-1.1.12.tar.bz2 && \
    - tar jxf silc-toolkit-1.1.12.tar.bz2 && \
    - cd silc-toolkit-1.1.12 && \
    - ./configure && \
    - make -s && \
    - make install && \
    - ldconfig && \
    - cd .. && \
    - rm -rf silc-toolkit*
    -
    COPY build-subproject.sh /usr/local/bin/build.sh
    CMD ["build.sh"]
    --- a/build-subproject.sh Thu Oct 06 22:43:55 2022 -0500
    +++ b/build-subproject.sh Wed Oct 26 03:23:56 2022 -0500
    @@ -8,7 +8,7 @@
    export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/lib/x86_64-linux-gnu/pkgconfig
    -meson -Dsilc=enabled -Ddoc=true "${BUILD_DIR}"
    +meson -Ddoc=true "${BUILD_DIR}"
    ninja -C "${BUILD_DIR}" test
    ninja -C "${BUILD_DIR}" pidgin-pot
    ninja -C "${BUILD_DIR}" doc