talkatu/talkatu

Fix up some cicd and packaging stuff

20 months ago, Gary Kramlich
6d14e7a81995
Parents 033dcb62164a
Children 3aa90ca156f5
Fix up some cicd and packaging stuff

Testing Done:
Ran all of the build images locally.

Reviewed at https://reviews.imfreedom.org/r/1673/
3 files changed, 18 insertions(+), 21 deletions(-)
  • +3 -3
    convey.yml
  • +4 -6
    packaging/debian/control
  • +11 -12
    packaging/talkatu.spec.in
    • --- a/convey.yml Sun Aug 28 22:44:59 2022 -0500
    +++ b/convey.yml Mon Aug 29 00:32:39 2022 -0500
    @@ -16,7 +16,7 @@
    - debian-bookworm-arm64
    - debian-bookworm-armhf
    - debian-bookworm-i386
    - - fedora-34-amd64
    + - fedora-36-amd64
    - fedora-rawhide-amd64
    - scanbuild
    - valgrind
    @@ -67,8 +67,8 @@
    stages:
    - tasks: [docs-clean, import, docs-build, docs-export]
    - fedora-34-amd64:
    - environment: TARGET=fedora-34-amd64
    + fedora-36-amd64:
    + environment: TARGET=fedora-36-amd64
    stages:
    - tasks: [import, build, export]
    fedora-rawhide-amd64:
    --- a/packaging/debian/control Sun Aug 28 22:44:59 2022 -0500
    +++ b/packaging/debian/control Mon Aug 29 00:32:39 2022 -0500
    @@ -4,10 +4,9 @@
    Maintainer: Gary Kramlich <grim@reaperworld.com>
    Build-Depends: debhelper-compat (=12),
    meson, libglib2.0-dev,
    - libgtk-3-dev, libgtk-3-bin,
    + libgtk-4-dev, libgtk-4-bin,
    gettext, help2man,
    gobject-introspection,
    - libgspell-1-dev, libgladeui-dev,
    libgumbo-dev, libcmark-dev,
    valac
    Homepage: https://keep.imfreedom.org/talkatu/talkatu/
    @@ -21,8 +20,7 @@
    ${shlibs:Depends},
    libtalkatu-common (=${source:Version}),
    libglib2.0-0 (>=2.40.0),
    - libgtk-3-0 (>=3.10.0),
    - libgspell-1-1,
    + libgtk-4-1 (>=4.6.0),
    libgumbo1,
    libcmark0
    Description: GTK widgets for chat applications
    @@ -38,7 +36,7 @@
    libtalkatu0 (=${binary:Version}),
    gir1.2-talkatu-0.0 (=${binary:Version}),
    libglib2.0-dev,
    - libgtk-3-dev
    + libgtk-4-dev
    Description: Development files for the talkatu library
    Talkatu provides support for parsing and rendering plain text, HTML, and
    Markdown inside of GTK.
    @@ -73,7 +71,7 @@
    ${shlibs:Depends},
    libtalkatu0 (=${binary:Version}),
    libglib2.0-0 (>=2.40.0),
    - libgtk-3-0 (>=3.10.0)
    + libgtk-4-0 (>=4.6.0)
    Description: Demo for the talkatu library
    Talkatu provides support for parsing and rendering plain text, HTML, and
    Markdown inside of GTK.
    --- a/packaging/talkatu.spec.in Sun Aug 28 22:44:59 2022 -0500
    +++ b/packaging/talkatu.spec.in Mon Aug 29 00:32:39 2022 -0500
    @@ -10,18 +10,17 @@
    Url: https://keep.imfreedom.org/talkatu/talkatu
    Group: Development/Libraries
    -BuildRequires: meson >= 0.37.0
    -BuildRequires: glib2-devel >= 2.20.0
    -BuildRequires: gobject-introspection-devel
    -BuildRequires: gettext
    -BuildRequires: gtk3-devel
    -BuildRequires: help2man
    -BuildRequires: glade-devel
    -BuildRequires: cmark-devel
    -BuildRequires: gi-docgen
    -BuildRequires: gumbo-parser-devel
    -BuildRequires: gspell-devel
    -BuildRequires: vala
    +BuildRequires: cmark-devel
    +BuildRequires: gettext
    +BuildRequires: gi-docgen
    +BuildRequires: glib2-devel >= 2.20.0
    +BuildRequires: gobject-introspection-devel
    +BuildRequires: gtk4-devel
    +BuildRequires: gumbo-parser-devel
    +BuildRequires: help2man
    +BuildRequires: libadwaita-devel
    +BuildRequires: meson >= 0.37.0
    +BuildRequires: vala
    %if 0%{?suse_version} > 0
    # avoid "directories not owned by a package" error