Reviewed-by: Andrea Bolognani <abologna@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- guests/vars/mappings.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index 7b97546..d48556c 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -336,6 +336,12 @@ mappings: OpenSUSE: dbus-1-devel cross-policy-deb: foreign + libgcrypt: + deb: libgcrypt20-dev + pkg: libgcrypt + rpm: libgcrypt-devel + cross-policy-deb: foreign + libgovirt: rpm: libgovirt-devel CentOS8: @@ -526,6 +532,9 @@ mappings: mingw32-libarchive: Fedora: mingw32-libarchive + mingw32-libgcrypt: + Fedora: mingw32-libgcrypt + mingw32-libgovirt: Fedora: mingw32-libgovirt @@ -607,6 +616,9 @@ mappings: mingw64-libarchive: Fedora: mingw64-libarchive + mingw64-libgcrypt: + Fedora: mingw64-libgcrypt + mingw64-libgovirt: Fedora: mingw64-libgovirt -- 2.23.0

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- guests/vars/mappings.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index 368ff59..1298a40 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -177,6 +177,12 @@ mappings: gdb: default: gdb + gdk-pixbuf: + rpm: gdk-pixbuf2-devel + deb: libgdk-pixbuf2.0-dev + pkg: gdk-pixbuf2 + cross-policy-deb: foreign + gettext: default: gettext @@ -502,6 +508,9 @@ mappings: mingw32-gcc: Fedora: mingw32-gcc + mingw32-gdk-pixbuf: + Fedora: mingw32-gdk-pixbuf + mingw32-gettext: Fedora: mingw32-gettext @@ -586,6 +595,9 @@ mappings: mingw64-gcc: Fedora: mingw64-gcc + mingw64-gdk-pixbuf: + Fedora: mingw64-gdk-pixbuf + mingw64-gettext: Fedora: mingw64-gettext -- 2.23.0

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- guests/host_vars/libvirt-centos-7/main.yml | 1 + guests/host_vars/libvirt-centos-8/main.yml | 1 + guests/host_vars/libvirt-debian-10/main.yml | 1 + guests/host_vars/libvirt-debian-9/main.yml | 1 + guests/host_vars/libvirt-debian-sid/main.yml | 1 + guests/host_vars/libvirt-fedora-30/main.yml | 3 +++ guests/host_vars/libvirt-fedora-31/main.yml | 1 + guests/host_vars/libvirt-fedora-rawhide/main.yml | 1 + guests/host_vars/libvirt-freebsd-11/main.yml | 1 + guests/host_vars/libvirt-freebsd-12/main.yml | 1 + guests/host_vars/libvirt-freebsd-current/main.yml | 1 + guests/host_vars/libvirt-ubuntu-1604/main.yml | 1 + guests/host_vars/libvirt-ubuntu-1804/main.yml | 1 + guests/vars/projects/gtk-vnc+mingw32.yml | 7 +++++++ guests/vars/projects/gtk-vnc+mingw64.yml | 7 +++++++ guests/vars/projects/gtk-vnc.yml | 12 ++++++++++++ 16 files changed, 41 insertions(+) create mode 100644 guests/vars/projects/gtk-vnc+mingw32.yml create mode 100644 guests/vars/projects/gtk-vnc+mingw64.yml create mode 100644 guests/vars/projects/gtk-vnc.yml diff --git a/guests/host_vars/libvirt-centos-7/main.yml b/guests/host_vars/libvirt-centos-7/main.yml index e0579ad..becd297 100644 --- a/guests/host_vars/libvirt-centos-7/main.yml +++ b/guests/host_vars/libvirt-centos-7/main.yml @@ -1,5 +1,6 @@ --- projects: + - gtk-vnc - libosinfo - libvirt - libvirt-cim diff --git a/guests/host_vars/libvirt-centos-8/main.yml b/guests/host_vars/libvirt-centos-8/main.yml index aae2313..cb49e9c 100644 --- a/guests/host_vars/libvirt-centos-8/main.yml +++ b/guests/host_vars/libvirt-centos-8/main.yml @@ -1,5 +1,6 @@ --- projects: + - gtk-vnc - libosinfo - libvirt - libvirt-dbus diff --git a/guests/host_vars/libvirt-debian-10/main.yml b/guests/host_vars/libvirt-debian-10/main.yml index 633f421..c5d0047 100644 --- a/guests/host_vars/libvirt-debian-10/main.yml +++ b/guests/host_vars/libvirt-debian-10/main.yml @@ -1,5 +1,6 @@ --- projects: + - gtk-vnc - libosinfo - libvirt - libvirt-dbus diff --git a/guests/host_vars/libvirt-debian-9/main.yml b/guests/host_vars/libvirt-debian-9/main.yml index 6b685a4..3addcd4 100644 --- a/guests/host_vars/libvirt-debian-9/main.yml +++ b/guests/host_vars/libvirt-debian-9/main.yml @@ -1,5 +1,6 @@ --- projects: + - gtk-vnc - libosinfo - libvirt - libvirt-dbus diff --git a/guests/host_vars/libvirt-debian-sid/main.yml b/guests/host_vars/libvirt-debian-sid/main.yml index 3808383..a60dd1b 100644 --- a/guests/host_vars/libvirt-debian-sid/main.yml +++ b/guests/host_vars/libvirt-debian-sid/main.yml @@ -1,5 +1,6 @@ --- projects: + - gtk-vnc - libosinfo - libvirt - libvirt-dbus diff --git a/guests/host_vars/libvirt-fedora-30/main.yml b/guests/host_vars/libvirt-fedora-30/main.yml index e395f32..e4ad7ea 100644 --- a/guests/host_vars/libvirt-fedora-30/main.yml +++ b/guests/host_vars/libvirt-fedora-30/main.yml @@ -1,5 +1,8 @@ --- projects: + - gtk-vnc + - gtk-vnc+mingw32 + - gtk-vnc+mingw64 - libosinfo - libosinfo+mingw32 - libosinfo+mingw64 diff --git a/guests/host_vars/libvirt-fedora-31/main.yml b/guests/host_vars/libvirt-fedora-31/main.yml index 5d9a1b5..e605873 100644 --- a/guests/host_vars/libvirt-fedora-31/main.yml +++ b/guests/host_vars/libvirt-fedora-31/main.yml @@ -1,5 +1,6 @@ --- projects: + - gtk-vnc - libosinfo - libvirt - libvirt-cim diff --git a/guests/host_vars/libvirt-fedora-rawhide/main.yml b/guests/host_vars/libvirt-fedora-rawhide/main.yml index fc39363..1a3338c 100644 --- a/guests/host_vars/libvirt-fedora-rawhide/main.yml +++ b/guests/host_vars/libvirt-fedora-rawhide/main.yml @@ -1,5 +1,6 @@ --- projects: + - gtk-vnc - libosinfo - libvirt - libvirt-cim diff --git a/guests/host_vars/libvirt-freebsd-11/main.yml b/guests/host_vars/libvirt-freebsd-11/main.yml index e9f6d03..2de64ef 100644 --- a/guests/host_vars/libvirt-freebsd-11/main.yml +++ b/guests/host_vars/libvirt-freebsd-11/main.yml @@ -1,5 +1,6 @@ --- projects: + - gtk-vnc - libosinfo - libvirt - libvirt-dbus diff --git a/guests/host_vars/libvirt-freebsd-12/main.yml b/guests/host_vars/libvirt-freebsd-12/main.yml index ba3ba62..2e3b935 100644 --- a/guests/host_vars/libvirt-freebsd-12/main.yml +++ b/guests/host_vars/libvirt-freebsd-12/main.yml @@ -1,5 +1,6 @@ --- projects: + - gtk-vnc - libosinfo - libvirt - libvirt-dbus diff --git a/guests/host_vars/libvirt-freebsd-current/main.yml b/guests/host_vars/libvirt-freebsd-current/main.yml index 74e1856..9b63d30 100644 --- a/guests/host_vars/libvirt-freebsd-current/main.yml +++ b/guests/host_vars/libvirt-freebsd-current/main.yml @@ -1,5 +1,6 @@ --- projects: + - gtk-vnc - libosinfo - libvirt - libvirt-dbus diff --git a/guests/host_vars/libvirt-ubuntu-1604/main.yml b/guests/host_vars/libvirt-ubuntu-1604/main.yml index 4f803a5..2754282 100644 --- a/guests/host_vars/libvirt-ubuntu-1604/main.yml +++ b/guests/host_vars/libvirt-ubuntu-1604/main.yml @@ -1,5 +1,6 @@ --- projects: + - gtk-vnc - libosinfo - libvirt - libvirt-dbus diff --git a/guests/host_vars/libvirt-ubuntu-1804/main.yml b/guests/host_vars/libvirt-ubuntu-1804/main.yml index 9070157..027acba 100644 --- a/guests/host_vars/libvirt-ubuntu-1804/main.yml +++ b/guests/host_vars/libvirt-ubuntu-1804/main.yml @@ -1,5 +1,6 @@ --- projects: + - gtk-vnc - libosinfo - libvirt - libvirt-dbus diff --git a/guests/vars/projects/gtk-vnc+mingw32.yml b/guests/vars/projects/gtk-vnc+mingw32.yml new file mode 100644 index 0000000..56dddfe --- /dev/null +++ b/guests/vars/projects/gtk-vnc+mingw32.yml @@ -0,0 +1,7 @@ +--- +packages: + - mingw32-gdk-pixbuf + - mingw32-glib2 + - mingw32-gnutls + - mingw32-gtk3 + - mingw32-libgcrypt diff --git a/guests/vars/projects/gtk-vnc+mingw64.yml b/guests/vars/projects/gtk-vnc+mingw64.yml new file mode 100644 index 0000000..93e413b --- /dev/null +++ b/guests/vars/projects/gtk-vnc+mingw64.yml @@ -0,0 +1,7 @@ +--- +packages: + - mingw64-gdk-pixbuf + - mingw64-glib2 + - mingw64-gnutls + - mingw64-gtk3 + - mingw64-libgcrypt diff --git a/guests/vars/projects/gtk-vnc.yml b/guests/vars/projects/gtk-vnc.yml new file mode 100644 index 0000000..32b1f5a --- /dev/null +++ b/guests/vars/projects/gtk-vnc.yml @@ -0,0 +1,12 @@ +--- +packages: + - cyrus-sasl + - gdk-pixbuf + - glib2 + - gnutls + - gobject-introspection + - gtk3 + - intltool + - libgcrypt + - pulseaudio + - vala -- 2.23.0

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- guests/playbooks/build/jobs/defaults.yml | 2 ++ .../build/projects/gtk-vnc+mingw32.yml | 12 ++++++++++ .../build/projects/gtk-vnc+mingw64.yml | 12 ++++++++++ guests/playbooks/build/projects/gtk-vnc.yml | 19 ++++++++++++++++ jenkins/jobs/defaults.yaml | 2 ++ jenkins/projects/gtk-vnc+mingw32.yaml | 12 ++++++++++ jenkins/projects/gtk-vnc+mingw64.yaml | 12 ++++++++++ jenkins/projects/gtk-vnc.yaml | 22 +++++++++++++++++++ 8 files changed, 93 insertions(+) create mode 100644 guests/playbooks/build/projects/gtk-vnc+mingw32.yml create mode 100644 guests/playbooks/build/projects/gtk-vnc+mingw64.yml create mode 100644 guests/playbooks/build/projects/gtk-vnc.yml create mode 100644 jenkins/projects/gtk-vnc+mingw32.yaml create mode 100644 jenkins/projects/gtk-vnc+mingw64.yaml create mode 100644 jenkins/projects/gtk-vnc.yaml diff --git a/guests/playbooks/build/jobs/defaults.yml b/guests/playbooks/build/jobs/defaults.yml index 5e4ec03..5cbc440 100644 --- a/guests/playbooks/build/jobs/defaults.yml +++ b/guests/playbooks/build/jobs/defaults.yml @@ -46,6 +46,8 @@ mingw64_local_env: | mingw64_autogen_args: --host=x86_64-w64-mingw32 mingw64_meson_args: --cross-file=/usr/share/mingw/toolchain-mingw64.meson git_urls: + gtk-vnc: + default: https://gitlab.gnome.org/GNOME/gtk-vnc.git libosinfo: default: https://gitlab.com/libosinfo/libosinfo.git libvirt-cim: diff --git a/guests/playbooks/build/projects/gtk-vnc+mingw32.yml b/guests/playbooks/build/projects/gtk-vnc+mingw32.yml new file mode 100644 index 0000000..2328a1d --- /dev/null +++ b/guests/playbooks/build/projects/gtk-vnc+mingw32.yml @@ -0,0 +1,12 @@ +--- +- set_fact: + name: gtk-vnc+mingw32 + machines: '{{ mingw_machines }}' + archive_format: xz + git_url: '{{ git_urls["gtk-vnc"][git_remote] }}' + +- include: '{{ playbook_base }}/jobs/prepare.yml' +- include: '{{ playbook_base }}/jobs/meson-build-job.yml' + vars: + local_env: '{{ mingw32_local_env }}' + meson_args: '{{ mingw32_meson_args }}' diff --git a/guests/playbooks/build/projects/gtk-vnc+mingw64.yml b/guests/playbooks/build/projects/gtk-vnc+mingw64.yml new file mode 100644 index 0000000..c69e957 --- /dev/null +++ b/guests/playbooks/build/projects/gtk-vnc+mingw64.yml @@ -0,0 +1,12 @@ +--- +- set_fact: + name: gtk-vnc+mingw64 + machines: '{{ mingw_machines }}' + archive_format: xz + git_url: '{{ git_urls["gtk-vnc"][git_remote] }}' + +- include: '{{ playbook_base }}/jobs/prepare.yml' +- include: '{{ playbook_base }}/jobs/meson-build-job.yml' + vars: + local_env: '{{ mingw64_local_env }}' + meson_args: '{{ mingw64_meson_args }}' diff --git a/guests/playbooks/build/projects/gtk-vnc.yml b/guests/playbooks/build/projects/gtk-vnc.yml new file mode 100644 index 0000000..260cf71 --- /dev/null +++ b/guests/playbooks/build/projects/gtk-vnc.yml @@ -0,0 +1,19 @@ +--- +- set_fact: + name: gtk-vnc + machines: '{{ all_machines }}' + archive_format: xz + git_url: '{{ git_urls["gtk-vnc"][git_remote] }}' + +- include: '{{ playbook_base }}/jobs/prepare.yml' +- include: '{{ playbook_base }}/jobs/meson-build-job.yml' +- include: '{{ playbook_base }}/jobs/meson-check-job.yml' +- include: '{{ playbook_base }}/jobs/meson-rpm-job.yml' + vars: + # RPM build is still not possible on CentOS7 as it does not + # have the needed RPM macros for meson. + machines: + - libvirt-centos-8 + - libvirt-fedora-30 + - libvirt-fedora-31 + - libvirt-fedora-rawhide diff --git a/jenkins/jobs/defaults.yaml b/jenkins/jobs/defaults.yaml index 676ecbf..2d9ffef 100644 --- a/jenkins/jobs/defaults.yaml +++ b/jenkins/jobs/defaults.yaml @@ -42,6 +42,8 @@ mingw64_autogen_args: --host=x86_64-w64-mingw32 mingw64_meson_args: --cross-file=/usr/share/mingw/toolchain-mingw64.meson git_urls: + gtk-vnc: + default: https://gitlab.gnome.org/GNOME/gtk-vnc.git libosinfo: default: https://gitlab.com/libosinfo/libosinfo.git libvirt-cim: diff --git a/jenkins/projects/gtk-vnc+mingw32.yaml b/jenkins/projects/gtk-vnc+mingw32.yaml new file mode 100644 index 0000000..bfb12da --- /dev/null +++ b/jenkins/projects/gtk-vnc+mingw32.yaml @@ -0,0 +1,12 @@ +--- +- project: + name: gtk-vnc+mingw32 + machines: '{mingw_machines}' + title: GTK-VNC MinGW (32-bit) + archive_format: xz + git_url: '{git_urls[gtk-vnc][default]}' + jobs: + - meson-build-job: + parent_jobs: + local_env: '{mingw32_local_env}' + meson_args: '{mingw32_meson_args}' diff --git a/jenkins/projects/gtk-vnc+mingw64.yaml b/jenkins/projects/gtk-vnc+mingw64.yaml new file mode 100644 index 0000000..7f68694 --- /dev/null +++ b/jenkins/projects/gtk-vnc+mingw64.yaml @@ -0,0 +1,12 @@ +--- +- project: + name: gtk-vnc+mingw64 + machines: '{mingw_machines}' + title: GTK-VNC MinGW (64-bit) + archive_format: xz + git_url: '{git_urls[gtk-vnc][default]}' + jobs: + - meson-build-job: + parent_jobs: + local_env: '{mingw64_local_env}' + meson_args: '{mingw64_meson_args}' diff --git a/jenkins/projects/gtk-vnc.yaml b/jenkins/projects/gtk-vnc.yaml new file mode 100644 index 0000000..c8b18da --- /dev/null +++ b/jenkins/projects/gtk-vnc.yaml @@ -0,0 +1,22 @@ +--- +- project: + name: gtk-vnc + machines: '{all_machines}' + title: GTK-VNC + archive_format: xz + git_url: '{git_urls[gtk-vnc][default]}' + jobs: + - meson-build-job: + parent_jobs: + - meson-check-job: + parent_jobs: 'gtk-vnc-build' + - meson-rpm-job: + parent_jobs: 'gtk-vnc-check' + machines: '{rpm_machines}' + # RPM build is still not possible on CentOS7 as it does not + # have the needed RPM macros for meson. + machines: + - libvirt-centos-8 + - libvirt-fedora-30 + - libvirt-fedora-31 + - libvirt-fedora-rawhide -- 2.23.0

Reviewed-by: Andrea Bolognani <abologna@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- guests/playbooks/build/jobs/defaults.yml | 1 + guests/vars/projects/virt-viewer+mingw32.yml | 1 - guests/vars/projects/virt-viewer+mingw64.yml | 1 - guests/vars/projects/virt-viewer.yml | 1 - jenkins/jobs/defaults.yaml | 1 + jenkins/projects/virt-viewer+mingw32.yaml | 4 +++- jenkins/projects/virt-viewer+mingw64.yaml | 4 +++- jenkins/projects/virt-viewer.yaml | 4 +++- 8 files changed, 11 insertions(+), 6 deletions(-) diff --git a/guests/playbooks/build/jobs/defaults.yml b/guests/playbooks/build/jobs/defaults.yml index 5cbc440..65dee78 100644 --- a/guests/playbooks/build/jobs/defaults.yml +++ b/guests/playbooks/build/jobs/defaults.yml @@ -32,6 +32,7 @@ strip_buildrequires: | sed -i -e 's/BuildRequires: *libvirt.*//' *.spec* sed -i -e 's/BuildRequires: *osinfo-db.*//' *.spec* sed -i -e 's/BuildRequires: *perl(Sys::Virt).*//' *.spec* + sed -i -e 's/BuildRequires: *pkgconfig(gtk-vnc-.*).*//' *.spec* sed -i -e 's/BuildRequires: *pkgconfig(libvirt.*).*//' *.spec* mingw32_local_env: | export VIRT_PREFIX="$VIRT_PREFIX/i686-w64-mingw32/sys-root/mingw" diff --git a/guests/vars/projects/virt-viewer+mingw32.yml b/guests/vars/projects/virt-viewer+mingw32.yml index 2b914c3..608d722 100644 --- a/guests/vars/projects/virt-viewer+mingw32.yml +++ b/guests/vars/projects/virt-viewer+mingw32.yml @@ -6,7 +6,6 @@ packages: - mingw32-gstreamer1-plugins-bad-free - mingw32-gstreamer1-plugins-good - mingw32-gtk3 - - mingw32-gtk-vnc2 - mingw32-libgovirt - mingw32-libusbx - mingw32-rest diff --git a/guests/vars/projects/virt-viewer+mingw64.yml b/guests/vars/projects/virt-viewer+mingw64.yml index 6b42a7f..3aa5893 100644 --- a/guests/vars/projects/virt-viewer+mingw64.yml +++ b/guests/vars/projects/virt-viewer+mingw64.yml @@ -6,7 +6,6 @@ packages: - mingw64-gstreamer1-plugins-bad-free - mingw64-gstreamer1-plugins-good - mingw64-gtk3 - - mingw64-gtk-vnc2 - mingw64-libgovirt - mingw64-libusbx - mingw64-rest diff --git a/guests/vars/projects/virt-viewer.yml b/guests/vars/projects/virt-viewer.yml index c03d50b..fe754cb 100644 --- a/guests/vars/projects/virt-viewer.yml +++ b/guests/vars/projects/virt-viewer.yml @@ -1,7 +1,6 @@ --- packages: - glib2 - - gtk-vnc2 - gtk3 - libgovirt - libxml2 diff --git a/jenkins/jobs/defaults.yaml b/jenkins/jobs/defaults.yaml index 2d9ffef..ec429ed 100644 --- a/jenkins/jobs/defaults.yaml +++ b/jenkins/jobs/defaults.yaml @@ -28,6 +28,7 @@ sed -i -e 's/BuildRequires: *libvirt.*//' *.spec* sed -i -e 's/BuildRequires: *osinfo-db.*//' *.spec* sed -i -e 's/BuildRequires: *perl(Sys::Virt).*//' *.spec* + sed -i -e 's/BuildRequires: *pkgconfig(gtk-vnc-.*).*//' *.spec* sed -i -e 's/BuildRequires: *pkgconfig(libvirt.*).*//' *.spec* mingw32_local_env: | export VIRT_PREFIX="$VIRT_PREFIX/i686-w64-mingw32/sys-root/mingw" diff --git a/jenkins/projects/virt-viewer+mingw32.yaml b/jenkins/projects/virt-viewer+mingw32.yaml index c9c74ea..7d4738a 100644 --- a/jenkins/projects/virt-viewer+mingw32.yaml +++ b/jenkins/projects/virt-viewer+mingw32.yaml @@ -7,6 +7,8 @@ git_url: '{git_urls[virt-viewer][default]}' jobs: - autotools-build-job: - parent_jobs: 'libvirt-glib+mingw32-build' + parent_jobs: + - 'libvirt-glib+mingw32-build' + - 'gtk-vnc+mingw32-build' local_env: '{mingw32_local_env}' autogen_args: '{mingw32_autogen_args}' diff --git a/jenkins/projects/virt-viewer+mingw64.yaml b/jenkins/projects/virt-viewer+mingw64.yaml index c3b570f..dfbd70d 100644 --- a/jenkins/projects/virt-viewer+mingw64.yaml +++ b/jenkins/projects/virt-viewer+mingw64.yaml @@ -7,6 +7,8 @@ git_url: '{git_urls[virt-viewer][default]}' jobs: - autotools-build-job: - parent_jobs: 'libvirt-glib+mingw64-build' + parent_jobs: + - 'libvirt-glib+mingw64-build' + - 'gtk-vnc+mingw64-build' local_env: '{mingw64_local_env}' autogen_args: '{mingw64_autogen_args}' diff --git a/jenkins/projects/virt-viewer.yaml b/jenkins/projects/virt-viewer.yaml index 6469b9f..123f95e 100644 --- a/jenkins/projects/virt-viewer.yaml +++ b/jenkins/projects/virt-viewer.yaml @@ -7,7 +7,9 @@ git_url: '{git_urls[virt-viewer][default]}' jobs: - autotools-build-job: - parent_jobs: 'libvirt-glib-build' + parent_jobs: + - 'libvirt-glib-build' + - 'gtk-vnc-build' - autotools-syntax-check-job: parent_jobs: 'virt-viewer-build' - autotools-check-job: -- 2.23.0