pidgin/pidgin

Fix the appimage build

2022-01-08, Gary Kramlich
74367c40a2b4
Parents 293ee44d15a7
Children 02bef3334429
Fix the appimage build

This required some tweaks in the image which I already pushed, but these
changes make it work with both convey 0.13 and 0.15-dev

Testing Done:
Build on my dev machine with convey 0.15-dev and on one of the build agents with convey 0.13

I did also run the appimage and verify that it does in fact work!

Reviewed at https://reviews.imfreedom.org/r/1194/
2 files changed, 10 insertions(+), 9 deletions(-)
  • +5 -4
    convey.yaml
  • +5 -5
    packaging/Pidgin3.AppImageBuilder.yml
    • --- a/convey.yaml Mon Jan 03 23:11:14 2022 -0600
    +++ b/convey.yaml Sat Jan 08 15:22:11 2022 -0600
    @@ -53,17 +53,18 @@
    type: docker/export
    files: build-${TARGET}:${TARGET}
    + bare-export:
    + type: docker/export
    + files: ${TARGET}:${TARGET}
    +
    plans:
    pidgin3-appimage-x86_64:
    environment:
    - TARGET=appimage-x86_64
    - - BUILD_NUMBER=0
    - - COMMIT_SHORT=${HG_COMMIT_SHORT}
    - - VERSION=${BUILD_NUMBER}~${COMMIT_SHORT}
    - RECIPE=Pidgin3
    - CONFIGURE_ARGS=-Dconsoleui=False
    stages:
    - - tasks: [import, build, export]
    + - tasks: [import, build, bare-export]
    clang:
    environment: [TARGET=clang]
    --- a/packaging/Pidgin3.AppImageBuilder.yml Mon Jan 03 23:11:14 2022 -0600
    +++ b/packaging/Pidgin3.AppImageBuilder.yml Sat Jan 08 15:22:11 2022 -0600
    @@ -11,8 +11,8 @@
    apt:
    arch: amd64
    sources:
    - - sourceline: 'deb [arch=amd64] http://deb.debian.org/debian/ bullseye main'
    - key_url: 'https://ftp-master.debian.org/keys/archive-key-10.asc'
    + - sourceline: 'deb [arch=amd64] http://deb.debian.org/debian/ bookworm main'
    + key_url: 'https://ftp-master.debian.org/keys/archive-key-11.asc'
    include:
    - dictionaries-common
    - gir1.2-gdkpixbuf-2.0
    @@ -25,7 +25,7 @@
    - libavahi-client3
    - libavahi-glib1
    - libcanberra0
    - - libcmark0.29.0
    + - libcmark0.30.2
    - libfarstream-0.2-5
    - libfontconfig1
    - libfreetype6
    @@ -39,7 +39,8 @@
    - libgstreamer1.0-0
    - libgtk-3-0
    - libgumbo1
    - - libidn11
    + - libhandy-1-0
    + - libidn12
    - libidn2-0
    - libjson-glib-1.0-0
    # - libkf5wallet5 # 57mb
    @@ -73,4 +74,3 @@
    XDG_DATA_DIRS: $APPDIR/share:$XDG_DATA_DIRS
    AppImage:
    arch: x86_64
    -