Added AppStream meta info file for the vncviewer. #1415

JoachimFalk · 2022-01-22T19:23:52Z

Hi Pierre,

Am 20.04.21 um 08:33 schrieb Pierre Ossman:

On 17/04/2021 14:50, Joachim Falk wrote:

in this regard, I just created an appstream metainfo XML file for Debian to be used for TigerVNC viewer.
You might want to add it to the project. File attached.

Thanks. I'm afraid I'm not too familiar with the appstream files or how they should be used.
Do you think you could do a PR with this, with the appropriate additions to CMake to install it where it needs to go?

so done now. A bit late, but better late than never.

Note that the AppStream file still refers to screenshots hosted by https://salsa.debian.org.
I think, it would be best to host them on https://tigervnc.org or maybe on github in the TigerVNC
repository itself like it is done with salsa at the moment.

Best,

Joachim

CendioOssman · 2022-01-27T09:22:11Z

Yeah, the images should probably be somewhere more neutral.

I'm not familiar with AppStream details, so I need some help understand how things should work here.

As far as I understand this is for repositories, so that things like GNOME Software can show more fancy metadata than what is available in e.g. RPM or deb?

So my first confusion is how this is supposed to be packaged. This metadata is needed before install, and your PR makes sure the file is installed locally. Do the distributions extract this file from the RPM or deb file?

If so, can the screen shots also be included locally so we don't have to deal with a URL?

JoachimFalk · 2022-01-27T18:30:44Z

Hi Pierre, Am 27.01.22 um 10:22 schrieb Pierre Ossman (Work account):

Yeah, the images should probably be somewhere more neutral. I'm not familiar with AppStream details, so I need some help understand how things should work here. As far as I understand this is for repositories, so that things like GNOME Software can show more fancy metadata than what is available in e.g. RPM or deb?

Yes.

So my first confusion is how this is supposed to be packaged. This metadata is needed before install, and your PR makes sure the file is installed locally. Do the distributions extract this file from the RPM or deb file?

Yes, exactly. Previously they also tried to generate this meta information from .desktop files. However, Debian no longer does this and warned me that I have to explicitly include an app stream file for the software to still appear in the GNOME Software center.

If so, can the screen shots also be included locally so we don't have to deal with a URL?

I don't think so. I have look into all other app stream files installed on my Debian bullseye machine and all images tags refer to HTTP/HTTPS URLs and not local files. Best, Joachim

CendioOssman

Thanks for the extra details. I have some comments, and then we can get this merged.

CendioOssman · 2022-01-28T08:10:28Z

contrib/packages/rpm/el7/SPECS/tigervnc.spec

@@ -255,6 +255,7 @@ fi
 %doc %{_docdir}/%{name}/README.rst
 %{_bindir}/vncviewer
 %{_datadir}/applications/*
+%{_datadir}/metainfo/*


Please squash this in to the original commit. Less confusion that way.

ACK. Should be integrated now.

CendioOssman · 2022-01-28T08:12:07Z

vncviewer/CMakeLists.txt

@@ -100,8 +100,20 @@ if(UNIX)
      DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop.in
    )
  endif()
-  add_custom_target(desktop ALL DEPENDS vncviewer.desktop)
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/applications)
+  # FIXME: Add translations to org.tigervnc.vncviewer.metainfo.xml


Can we get this sorted? Does intltool and xgettext have support for what we need?

I am not familiar with intltool and xgettext. I may take a look later but not today.

Translations are now supported using either xgettext or intltool.

CendioOssman · 2022-01-28T08:13:21Z

vncviewer/CMakeLists.txt

+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/org.tigervnc.vncviewer.metainfo.xml.in
+  )
+
+  add_custom_target(desktop ALL


Perhaps prudent to rename this, or split things to two targets. This name gets a bit confusing otherwise.

Has been split.

CendioOssman · 2022-01-28T08:16:16Z

vncviewer/org.tigervnc.vncviewer.metainfo.xml.in

+  <name>TigerVNC Viewer</name>
+  <summary>Remote desktop access using the VNC desktop sharing system</summary>
+  <content_rating type="oars-1.1"/>
+  <releases>


I'm not looking forward to maintaining this as well, so I prefer if we remove it. On my Fedora machine it's about half that include this, so it doesn't seem to be considered mandatory. :)

To what are you exactly referring to? The <content_rating type="oars-1.1"/>?

The release information. I would prefer if this file can be kept fairly static.

Release information has been removed.

CendioOssman · 2022-01-28T08:17:48Z

vncviewer/org.tigervnc.vncviewer.metainfo.xml.in

+      The TigerVNC Viewer is a VNC client, which allows you to view a computing `desktop&apos; environment not only on the machine where it is running but from anywhere on the Internet and from a wide variety of machine architectures.
+      VNC stands for Virtual Network Computing, which is, in essence, a remote desktop sharing system.
+      This system is comprised of a VNC client (e.g., this software) and a VNC server, which shares the remote desktop.
+      These VNC servers are available for many operating systems, e.g., Linux, macOS, Windows, etc.


Is this what we also have in the packages? It would probably be best to keep things in sync.

I used my Debian package description for tigervnc-viewer. If you have a text you use to describe your vncviewer package, feel free to post and I will replace. And maybe also update the package description for the Debian tigervnc-viewer package.

Under contrib/ there are packages for both rpm and deb. Pick whichever you think is best, but it would be preferably that we end up with just one variant. :)

Description has been updated with the one from contrib/packages/deb/ubuntu-focal/debian/control

CendioOssman · 2022-01-28T08:18:24Z

vncviewer/org.tigervnc.vncviewer.metainfo.xml.in

+  </releases>
+  <description>
+    <p>
+      The TigerVNC Viewer is a VNC client, which allows you to view a computing `desktop&apos; environment not only on the machine where it is running but from anywhere on the Internet and from a wide variety of machine architectures.


Since this is for modern stuff, perhaps modern quotes (”“) are appropriate? :)

Pending on decision what description to use.

Maybe update the descriptions in the RPMs then? It seems to have been based on this originally.

Yes please. I think all packaging formats should share the same description.

CendioOssman · 2022-01-28T08:41:50Z

vncviewer/org.tigervnc.vncviewer.metainfo.xml.in

+  <screenshots>
+    <screenshot type="default">
+      <caption>TigerVNC Viewer connection to a CentOS machine</caption>
+      <image>https://salsa.debian.org/debian-remote-team/tigervnc/-/raw/157f2c8df7e55faa594da73d5e9490115c7f14cd/debian/tigervnc-connection-linux.jpg</image>


The common method seems to be to refer to the official git repository. So that would probably be best here as well.

We should be able to figure out a permalink here. If you add the files first in one commit, you could refer to that in the commit adding the xml file. Or if it's possible to use the file's hash as the permalink.

First commit now introduces the screenshots into

vncviewer/metainfo/tigervnc-connection-linux.jpg

vncviewer/metainfo/tigervnc-connection-macos.jpg

vncviewer/metainfo/tigervnc-connection-windows.jpg

Resulting in URLs

https://raw.githubusercontent.com/JoachimFalk/tigervnc/741d3edbfab65eda6f033078bc06347fe244ea6a/vncviewer/metainfo/tigervnc-connection-linux.jpg

https://raw.githubusercontent.com/JoachimFalk/tigervnc/741d3edbfab65eda6f033078bc06347fe244ea6a/vncviewer/metainfo/tigervnc-connection-macos.jpg

https://raw.githubusercontent.com/JoachimFalk/tigervnc/741d3edbfab65eda6f033078bc06347fe244ea6a/vncviewer/metainfo/tigervnc-connection-windows.jpg

which, after merge, should result in the following valid URLs:

https://raw.githubusercontent.com/TigerVNC/tigervnc/741d3edbfab65eda6f033078bc06347fe244ea6a/vncviewer/metainfo/tigervnc-connection-linux.jpg

https://raw.githubusercontent.com/TigerVNC/tigervnc/741d3edbfab65eda6f033078bc06347fe244ea6a/vncviewer/metainfo/tigervnc-connection-macos.jpg

https://raw.githubusercontent.com/TigerVNC/tigervnc/741d3edbfab65eda6f033078bc06347fe244ea6a/vncviewer/metainfo/tigervnc-connection-windows.jpg

Great. 👍

All requested changes should now have been integrated into the merge request.

CendioOssman · 2022-03-04T16:02:04Z

Sorry for the delay. This looks good except for problems with the translations. I'll see if I can play around with it and get something working.

CendioOssman · 2022-03-04T16:15:13Z

This seems to fix things properly:

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 025d2c0f..bdd1f326 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y libgnutls28-dev libfltk1.3-dev fluid gettext
+          sudo apt-get install -y libgnutls28-dev libfltk1.3-dev fluid gettext appstream
           sudo apt-get install -y libxtst-dev libxdamage-dev libxfixes-dev libxrandr-dev libpam-dev
           sudo apt-get install -y libavcodec-dev libavutil-dev libswscale-dev
       - name: Configure
diff --git a/contrib/packages/deb/ubuntu-bionic/debian/control b/contrib/packages/deb/ubuntu-bionic/debian/control
index cc3c6497..69a37ad8 100644
--- a/contrib/packages/deb/ubuntu-bionic/debian/control
+++ b/contrib/packages/deb/ubuntu-bionic/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Brian P. Hinz <bphinz@users.sourceforge.net>
 Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 9),dh-autoreconf,po-debconf,dpkg-dev (>= 1.16.1),quilt,lsb-release,pkg-config,bison,flex,xauth,xutils-dev (>= 1:7.6+4),xfonts-utils (>= 1:7.5+1),x11proto-bigreqs-dev (>= 1:1.1.0),x11proto-composite-dev (>= 1:0.4),x11proto-core-dev (>= 7.0.31),x11proto-damage-dev (>= 1.1),x11proto-fixes-dev (>= 1:5.0),x11proto-fonts-dev (>= 2.1.3),x11proto-kb-dev (>= 1.0.3),x11proto-xinerama-dev,x11proto-randr-dev (>= 1.5.0),x11proto-record-dev (>= 1.13.99.1),x11proto-render-dev (>= 2:0.11),x11proto-resource-dev (>= 1.2.0),x11proto-scrnsaver-dev,x11proto-video-dev,x11proto-xcmisc-dev (>= 1.2.0),x11proto-xext-dev (>= 7.2.99.901),x11proto-xf86bigfont-dev (>= 1.2.0),x11proto-xf86dga-dev (>= 2.0.99.1),x11proto-xf86vidmode-dev (>= 2.2.99.1),x11proto-present-dev,x11proto-dri3-dev,xtrans-dev (>= 1.3.5),libxau-dev (>= 1:1.0.5-2),x11proto-input-dev (>= 2.3),x11proto-dri2-dev (>= 2.8),libxdmcp-dev (>= 1:0.99.1),libxfont-dev (>= 1:2.0.1),libxkbfile-dev (>= 1:0.99.1),libpixman-1-dev (>= 0.27.2),libpciaccess-dev (>= 0.12.901),libgcrypt-dev,nettle-dev,libudev-dev (>= 151-3) [linux-any],libselinux1-dev (>= 2.0.80) [linux-any],libaudit-dev [linux-any],x11proto-xf86dri-dev (>= 2.1.0),libdrm-dev (>= 2.4.46) [!hurd-i386],x11proto-gl-dev (>= 1.4.17),libgl1-mesa-dev (>= 9.2),libxmuu-dev (>= 1:0.99.1),libxext-dev (>= 1:0.99.1),libx11-dev (>= 2:1.6),libxrender-dev (>= 1:0.9.0),libxi-dev (>= 2:1.6.99.1),x11proto-dmx-dev (>= 1:2.2.99.1),libdmx-dev (>= 1:1.0.1),libxpm-dev (>= 1:3.5.3),libxaw7-dev (>= 1:0.99.1),libxt-dev (>= 1:0.99.1),libxmu-dev (>= 1:0.99.1),libxtst-dev (>= 1:0.99.1),libxres-dev (>= 1:0.99.1),libxfixes-dev (>= 1:3.0.0),libxv-dev,libxinerama-dev,libxshmfence-dev (>= 1.1) [!hurd-i386],libepoxy-dev [linux-any kfreebsd-any],libegl1-mesa-dev [linux-any kfreebsd-any],libgbm-dev (>= 10.2) [linux-any kfreebsd-any],libxcb1-dev,libxcb-xkb-dev,libxcb-shape0-dev,libxcb-render0-dev,libxcb-render-util0-dev,libxcb-util0-dev,libxcb-image0-dev,libxcb-icccm4-dev,libxcb-shm0-dev,libxcb-keysyms1-dev,libxcb-randr0-dev,libxcb-xv0-dev,libxcb-glx0-dev,libxcb-xf86dri0-dev (>= 1.6),xkb-data,x11-xkb-utils,libbsd-dev,libwayland-dev [linux-any],wayland-protocols (>= 1.9) [linux-any],libdbus-1-dev (>= 1.0) [linux-any],libsystemd-dev [linux-any],libmirclient-dev (>= 0.13.1) [!powerpc !ppc64el !s390x],mir-client-platform-mesa-dev,zlib1g-dev,libjpeg-turbo8-dev,perl-modules,cmake,gnutls-dev,libpam0g-dev,libpng-dev,automake,autoconf,libtool,pkg-config,openjdk-8-jdk,xorg-server-source,libfltk1.3-dev,fluid,curl,bzip2,quilt,libosmesa6-dev,libgl1-mesa-dri,libgl1-mesa-glx,libxft-dev,xfonts-base,libexpat1-dev,libfontconfig1-dev,libglu1-mesa-dev,libxcursor-dev,libxrandr-dev,libcairo2-dev,libavcodec-dev,libavutil-dev,libswscale-dev
+Build-Depends: debhelper (>= 9),dh-autoreconf,po-debconf,dpkg-dev (>= 1.16.1),quilt,appstream,lsb-release,pkg-config,bison,flex,xauth,xutils-dev (>= 1:7.6+4),xfonts-utils (>= 1:7.5+1),x11proto-bigreqs-dev (>= 1:1.1.0),x11proto-composite-dev (>= 1:0.4),x11proto-core-dev (>= 7.0.31),x11proto-damage-dev (>= 1.1),x11proto-fixes-dev (>= 1:5.0),x11proto-fonts-dev (>= 2.1.3),x11proto-kb-dev (>= 1.0.3),x11proto-xinerama-dev,x11proto-randr-dev (>= 1.5.0),x11proto-record-dev (>= 1.13.99.1),x11proto-render-dev (>= 2:0.11),x11proto-resource-dev (>= 1.2.0),x11proto-scrnsaver-dev,x11proto-video-dev,x11proto-xcmisc-dev (>= 1.2.0),x11proto-xext-dev (>= 7.2.99.901),x11proto-xf86bigfont-dev (>= 1.2.0),x11proto-xf86dga-dev (>= 2.0.99.1),x11proto-xf86vidmode-dev (>= 2.2.99.1),x11proto-present-dev,x11proto-dri3-dev,xtrans-dev (>= 1.3.5),libxau-dev (>= 1:1.0.5-2),x11proto-input-dev (>= 2.3),x11proto-dri2-dev (>= 2.8),libxdmcp-dev (>= 1:0.99.1),libxfont-dev (>= 1:2.0.1),libxkbfile-dev (>= 1:0.99.1),libpixman-1-dev (>= 0.27.2),libpciaccess-dev (>= 0.12.901),libgcrypt-dev,nettle-dev,libudev-dev (>= 151-3) [linux-any],libselinux1-dev (>= 2.0.80) [linux-any],libaudit-dev [linux-any],x11proto-xf86dri-dev (>= 2.1.0),libdrm-dev (>= 2.4.46) [!hurd-i386],x11proto-gl-dev (>= 1.4.17),libgl1-mesa-dev (>= 9.2),libxmuu-dev (>= 1:0.99.1),libxext-dev (>= 1:0.99.1),libx11-dev (>= 2:1.6),libxrender-dev (>= 1:0.9.0),libxi-dev (>= 2:1.6.99.1),x11proto-dmx-dev (>= 1:2.2.99.1),libdmx-dev (>= 1:1.0.1),libxpm-dev (>= 1:3.5.3),libxaw7-dev (>= 1:0.99.1),libxt-dev (>= 1:0.99.1),libxmu-dev (>= 1:0.99.1),libxtst-dev (>= 1:0.99.1),libxres-dev (>= 1:0.99.1),libxfixes-dev (>= 1:3.0.0),libxv-dev,libxinerama-dev,libxshmfence-dev (>= 1.1) [!hurd-i386],libepoxy-dev [linux-any kfreebsd-any],libegl1-mesa-dev [linux-any kfreebsd-any],libgbm-dev (>= 10.2) [linux-any kfreebsd-any],libxcb1-dev,libxcb-xkb-dev,libxcb-shape0-dev,libxcb-render0-dev,libxcb-render-util0-dev,libxcb-util0-dev,libxcb-image0-dev,libxcb-icccm4-dev,libxcb-shm0-dev,libxcb-keysyms1-dev,libxcb-randr0-dev,libxcb-xv0-dev,libxcb-glx0-dev,libxcb-xf86dri0-dev (>= 1.6),xkb-data,x11-xkb-utils,libbsd-dev,libwayland-dev [linux-any],wayland-protocols (>= 1.9) [linux-any],libdbus-1-dev (>= 1.0) [linux-any],libsystemd-dev [linux-any],libmirclient-dev (>= 0.13.1) [!powerpc !ppc64el !s390x],mir-client-platform-mesa-dev,zlib1g-dev,libjpeg-turbo8-dev,perl-modules,cmake,gnutls-dev,libpam0g-dev,libpng-dev,automake,autoconf,libtool,pkg-config,openjdk-8-jdk,xorg-server-source,libfltk1.3-dev,fluid,curl,bzip2,quilt,libosmesa6-dev,libgl1-mesa-dri,libgl1-mesa-glx,libxft-dev,xfonts-base,libexpat1-dev,libfontconfig1-dev,libglu1-mesa-dev,libxcursor-dev,libxrandr-dev,libcairo2-dev,libavcodec-dev,libavutil-dev,libswscale-dev
 Homepage: http://www.tigervnc.com
 
 Package: tigervncserver
diff --git a/contrib/packages/deb/ubuntu-focal/debian/control b/contrib/packages/deb/ubuntu-focal/debian/control
index b4837d3f..514f6532 100644
--- a/contrib/packages/deb/ubuntu-focal/debian/control
+++ b/contrib/packages/deb/ubuntu-focal/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Brian P. Hinz <bphinz@users.sourceforge.net>
 Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 9),dh-autoreconf,po-debconf,dpkg-dev (>= 1.16.1),quilt,lsb-release,pkg-config,bison,flex,xauth,xutils-dev (>= 1:7.6+4),xfonts-utils (>= 1:7.5+1),x11proto-bigreqs-dev (>= 1:1.1.0),x11proto-composite-dev (>= 1:0.4),x11proto-core-dev (>= 7.0.31),x11proto-damage-dev (>= 1.1),x11proto-fixes-dev (>= 1:5.0),x11proto-fonts-dev (>= 2.1.3),x11proto-kb-dev (>= 1.0.3),x11proto-xinerama-dev,x11proto-randr-dev (>= 1.5.0),x11proto-record-dev (>= 1.13.99.1),x11proto-render-dev (>= 2:0.11),x11proto-resource-dev (>= 1.2.0),x11proto-scrnsaver-dev,x11proto-video-dev,x11proto-xcmisc-dev (>= 1.2.0),x11proto-xext-dev (>= 7.2.99.901),x11proto-xf86bigfont-dev (>= 1.2.0),x11proto-xf86dga-dev (>= 2.0.99.1),x11proto-xf86vidmode-dev (>= 2.2.99.1),x11proto-present-dev,x11proto-dri3-dev,xtrans-dev (>= 1.3.5),libxau-dev (>= 1:1.0.5-2),x11proto-input-dev (>= 2.3),x11proto-dri2-dev (>= 2.8),libxdmcp-dev (>= 1:0.99.1),libxfont-dev (>= 1:2.0.1),libxkbfile-dev (>= 1:0.99.1),libpixman-1-dev (>= 0.27.2),libpciaccess-dev (>= 0.12.901),libgcrypt-dev,nettle-dev,libudev-dev (>= 151-3) [linux-any],libselinux1-dev (>= 2.0.80) [linux-any],libaudit-dev [linux-any],x11proto-xf86dri-dev (>= 2.1.0),libdrm-dev (>= 2.4.46) [!hurd-i386],x11proto-gl-dev (>= 1.4.17),libgl1-mesa-dev (>= 9.2),libxmuu-dev (>= 1:0.99.1),libxext-dev (>= 1:0.99.1),libx11-dev (>= 2:1.6),libxrender-dev (>= 1:0.9.0),libxi-dev (>= 2:1.6.99.1),x11proto-dmx-dev (>= 1:2.2.99.1),libdmx-dev (>= 1:1.0.1),libxpm-dev (>= 1:3.5.3),libxaw7-dev (>= 1:0.99.1),libxt-dev (>= 1:0.99.1),libxmu-dev (>= 1:0.99.1),libxtst-dev (>= 1:0.99.1),libxres-dev (>= 1:0.99.1),libxfixes-dev (>= 1:3.0.0),libxv-dev,libxinerama-dev,libxshmfence-dev (>= 1.1) [!hurd-i386],libepoxy-dev [linux-any kfreebsd-any],libegl1-mesa-dev [linux-any kfreebsd-any],libgbm-dev (>= 10.2) [linux-any kfreebsd-any],libxcb1-dev,libxcb-xkb-dev,libxcb-shape0-dev,libxcb-render0-dev,libxcb-render-util0-dev,libxcb-util0-dev,libxcb-image0-dev,libxcb-icccm4-dev,libxcb-shm0-dev,libxcb-keysyms1-dev,libxcb-randr0-dev,libxcb-xv0-dev,libxcb-glx0-dev,libxcb-xf86dri0-dev (>= 1.6),xkb-data,x11-xkb-utils,libbsd-dev,libwayland-dev [linux-any],wayland-protocols (>= 1.9) [linux-any],libdbus-1-dev (>= 1.0) [linux-any],libsystemd-dev [linux-any],libmirclient-dev (>= 0.13.1) [!powerpc !ppc64el !s390x],mir-client-platform-mesa-dev,zlib1g-dev,libjpeg-turbo8-dev,perl-modules,cmake,gnutls-dev,libpam0g-dev,libpng-dev,automake,autoconf,libtool,pkg-config,openjdk-8-jdk,xorg-server-source,libfltk1.3-dev,fluid,curl,bzip2,quilt,libosmesa6-dev,libgl1-mesa-dri,libgl1-mesa-glx,libxft-dev,xfonts-base,libexpat1-dev,libfontconfig1-dev,libglu1-mesa-dev,libxcursor-dev,libxrandr-dev,libcairo2-dev,mesa-common-dev,libavcodec-dev,libavutil-dev,libswscale-dev
+Build-Depends: debhelper (>= 9),dh-autoreconf,po-debconf,dpkg-dev (>= 1.16.1),quilt,appstream,lsb-release,pkg-config,bison,flex,xauth,xutils-dev (>= 1:7.6+4),xfonts-utils (>= 1:7.5+1),x11proto-bigreqs-dev (>= 1:1.1.0),x11proto-composite-dev (>= 1:0.4),x11proto-core-dev (>= 7.0.31),x11proto-damage-dev (>= 1.1),x11proto-fixes-dev (>= 1:5.0),x11proto-fonts-dev (>= 2.1.3),x11proto-kb-dev (>= 1.0.3),x11proto-xinerama-dev,x11proto-randr-dev (>= 1.5.0),x11proto-record-dev (>= 1.13.99.1),x11proto-render-dev (>= 2:0.11),x11proto-resource-dev (>= 1.2.0),x11proto-scrnsaver-dev,x11proto-video-dev,x11proto-xcmisc-dev (>= 1.2.0),x11proto-xext-dev (>= 7.2.99.901),x11proto-xf86bigfont-dev (>= 1.2.0),x11proto-xf86dga-dev (>= 2.0.99.1),x11proto-xf86vidmode-dev (>= 2.2.99.1),x11proto-present-dev,x11proto-dri3-dev,xtrans-dev (>= 1.3.5),libxau-dev (>= 1:1.0.5-2),x11proto-input-dev (>= 2.3),x11proto-dri2-dev (>= 2.8),libxdmcp-dev (>= 1:0.99.1),libxfont-dev (>= 1:2.0.1),libxkbfile-dev (>= 1:0.99.1),libpixman-1-dev (>= 0.27.2),libpciaccess-dev (>= 0.12.901),libgcrypt-dev,nettle-dev,libudev-dev (>= 151-3) [linux-any],libselinux1-dev (>= 2.0.80) [linux-any],libaudit-dev [linux-any],x11proto-xf86dri-dev (>= 2.1.0),libdrm-dev (>= 2.4.46) [!hurd-i386],x11proto-gl-dev (>= 1.4.17),libgl1-mesa-dev (>= 9.2),libxmuu-dev (>= 1:0.99.1),libxext-dev (>= 1:0.99.1),libx11-dev (>= 2:1.6),libxrender-dev (>= 1:0.9.0),libxi-dev (>= 2:1.6.99.1),x11proto-dmx-dev (>= 1:2.2.99.1),libdmx-dev (>= 1:1.0.1),libxpm-dev (>= 1:3.5.3),libxaw7-dev (>= 1:0.99.1),libxt-dev (>= 1:0.99.1),libxmu-dev (>= 1:0.99.1),libxtst-dev (>= 1:0.99.1),libxres-dev (>= 1:0.99.1),libxfixes-dev (>= 1:3.0.0),libxv-dev,libxinerama-dev,libxshmfence-dev (>= 1.1) [!hurd-i386],libepoxy-dev [linux-any kfreebsd-any],libegl1-mesa-dev [linux-any kfreebsd-any],libgbm-dev (>= 10.2) [linux-any kfreebsd-any],libxcb1-dev,libxcb-xkb-dev,libxcb-shape0-dev,libxcb-render0-dev,libxcb-render-util0-dev,libxcb-util0-dev,libxcb-image0-dev,libxcb-icccm4-dev,libxcb-shm0-dev,libxcb-keysyms1-dev,libxcb-randr0-dev,libxcb-xv0-dev,libxcb-glx0-dev,libxcb-xf86dri0-dev (>= 1.6),xkb-data,x11-xkb-utils,libbsd-dev,libwayland-dev [linux-any],wayland-protocols (>= 1.9) [linux-any],libdbus-1-dev (>= 1.0) [linux-any],libsystemd-dev [linux-any],libmirclient-dev (>= 0.13.1) [!powerpc !ppc64el !s390x],mir-client-platform-mesa-dev,zlib1g-dev,libjpeg-turbo8-dev,perl-modules,cmake,gnutls-dev,libpam0g-dev,libpng-dev,automake,autoconf,libtool,pkg-config,openjdk-8-jdk,xorg-server-source,libfltk1.3-dev,fluid,curl,bzip2,quilt,libosmesa6-dev,libgl1-mesa-dri,libgl1-mesa-glx,libxft-dev,xfonts-base,libexpat1-dev,libfontconfig1-dev,libglu1-mesa-dev,libxcursor-dev,libxrandr-dev,libcairo2-dev,mesa-common-dev,libavcodec-dev,libavutil-dev,libswscale-dev
 Homepage: http://www.tigervnc.com
 
 Package: tigervncserver
diff --git a/contrib/packages/rpm/el7/SPECS/tigervnc.spec b/contrib/packages/rpm/el7/SPECS/tigervnc.spec
index f735f364..084efe20 100644
--- a/contrib/packages/rpm/el7/SPECS/tigervnc.spec
+++ b/contrib/packages/rpm/el7/SPECS/tigervnc.spec
@@ -17,7 +17,8 @@ Source0:        %{name}-%{version}%{?snap:-%{snap}}.tar.bz2
 Source3:        10-libvnc.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libX11-devel, automake, autoconf, libtool, gettext, gettext-autopoint
+BuildRequires:  libX11-devel, automake, autoconf, libtool
+BuildRequires:  gettext, gettext-autopoint, appstream
 BuildRequires:  libXext-devel, xorg-x11-server-source, libXi-devel
 BuildRequires:  xorg-x11-xtrans-devel, xorg-x11-util-macros, libXtst-devel
 BuildRequires:  libdrm-devel, libXt-devel, pixman-devel
diff --git a/contrib/packages/rpm/el8/SPECS/tigervnc.spec b/contrib/packages/rpm/el8/SPECS/tigervnc.spec
index 6b80007f..1f48ac58 100644
--- a/contrib/packages/rpm/el8/SPECS/tigervnc.spec
+++ b/contrib/packages/rpm/el8/SPECS/tigervnc.spec
@@ -17,7 +17,8 @@ Source0:        %{name}-%{version}%{?snap:-%{snap}}.tar.bz2
 Source3:        10-libvnc.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libX11-devel, automake, autoconf, libtool, gettext, gettext-autopoint
+BuildRequires:  libX11-devel, automake, autoconf, libtool
+BuildRequires:  gettext, gettext-autopoint, appstream
 BuildRequires:  libXext-devel, xorg-x11-server-source, libXi-devel
 BuildRequires:  xorg-x11-xtrans-devel, xorg-x11-util-macros, libXtst-devel
 BuildRequires:  libdrm-devel, libXt-devel, pixman-devel
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index c84fb0e6..052cfb3f 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -14,6 +14,7 @@ if (GETTEXT_XGETTEXT_EXECUTABLE)
     ${PROJECT_SOURCE_DIR}/vncviewer/*.h
     ${PROJECT_SOURCE_DIR}/vncviewer/*.cxx
     ${PROJECT_SOURCE_DIR}/vncviewer/*.desktop.in.in
+    ${PROJECT_SOURCE_DIR}/vncviewer/*.metainfo.xml.in
   )
 
   add_custom_target(translations_update
diff --git a/vncviewer/CMakeLists.txt b/vncviewer/CMakeLists.txt
index 5d558c71..7d4455a8 100644
--- a/vncviewer/CMakeLists.txt
+++ b/vncviewer/CMakeLists.txt
@@ -83,12 +83,6 @@ if(UNIX)
                 -d ${CMAKE_SOURCE_DIR}/po -o vncviewer.desktop
       DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop.in
     )
-    add_custom_command(OUTPUT org.tigervnc.vncviewer.metainfo.xml
-      COMMAND ${GETTEXT_MSGFMT_EXECUTABLE}
-                --xml --template ${CMAKE_CURRENT_SOURCE_DIR}/org.tigervnc.vncviewer.metainfo.xml.in
-                -d ${CMAKE_SOURCE_DIR}/po -o org.tigervnc.vncviewer.metainfo.xml
-      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/org.tigervnc.vncviewer.metainfo.xml.in
-    )
   elseif(INTLTOOL_MERGE_EXECUTABLE)
     add_custom_command(OUTPUT vncviewer.desktop
       COMMAND sed -e 's/^Name/_Name/'
@@ -100,11 +94,28 @@ if(UNIX)
                 vncviewer.desktop.intl vncviewer.desktop
       DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop.in
     )
+  else()
     add_custom_command(OUTPUT vncviewer.desktop
-      COMMAND sed -e 's@<name>@<_name>@;s@</name>@</_name>@'
-                  -e 's@<summary>@<_summary>@;s@</summary>@</_summary>@'
-                  -e 's@<caption>@<_caption>@;s@</caption>@</_caption>@'
-                  -e 's@<p>@<_p>@g;s@</p>@</_p>@g'
+      COMMAND cp vncviewer.desktop.in vncviewer.desktop
+      DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop.in
+    )
+  endif()
+  add_custom_target(desktop ALL DEPENDS vncviewer.desktop)
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/applications)
+
+  if("${GETTEXT_VERSION_STRING}" VERSION_GREATER 0.19.6)
+    add_custom_command(OUTPUT org.tigervnc.vncviewer.metainfo.xml
+      COMMAND ${GETTEXT_MSGFMT_EXECUTABLE}
+                --xml --template ${CMAKE_CURRENT_SOURCE_DIR}/org.tigervnc.vncviewer.metainfo.xml.in
+                -d ${CMAKE_SOURCE_DIR}/po -o org.tigervnc.vncviewer.metainfo.xml
+      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/org.tigervnc.vncviewer.metainfo.xml.in
+    )
+  elseif(INTLTOOL_MERGE_EXECUTABLE)
+    add_custom_command(OUTPUT org.tigervnc.vncviewer.metainfo.xml
+      COMMAND sed -e 's@<name>@<_name>@\;s@</name>@</_name>@'
+                  -e 's@<summary>@<_summary>@\;s@</summary>@</_summary>@'
+                  -e 's@<caption>@<_caption>@\;s@</caption>@</_caption>@'
+                  -e 's@<p>@<_p>@g\;s@</p>@</_p>@g'
                 ${CMAKE_CURRENT_SOURCE_DIR}/org.tigervnc.vncviewer.metainfo.xml.in > org.tigervnc.vncviewer.metainfo.xml.intl
       COMMAND ${INTLTOOL_MERGE_EXECUTABLE}
                 -x ${CMAKE_SOURCE_DIR}/po
@@ -112,18 +123,11 @@ if(UNIX)
       DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/org.tigervnc.vncviewer.metainfo.xml.in
     )
   else()
-    add_custom_command(OUTPUT vncviewer.desktop
-      COMMAND cp vncviewer.desktop.in vncviewer.desktop
-      DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop.in
-    )
     add_custom_command(OUTPUT org.tigervnc.vncviewer.metainfo.xml
       COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/org.tigervnc.vncviewer.metainfo.xml.in org.tigervnc.vncviewer.metainfo.xml
       DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/org.tigervnc.vncviewer.metainfo.xml.in
     )
   endif()
-  add_custom_target(desktop ALL DEPENDS vncviewer.desktop)
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/applications)
-
   add_custom_target(appstream ALL DEPENDS org.tigervnc.vncviewer.metainfo.xml)
   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.tigervnc.vncviewer.metainfo.xml DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/metainfo)

JoachimFalk · 2022-03-06T15:22:43Z

Hi Pierre,

This seems to fix things properly:

[SNIP]

great. I just integreated this. Hopefully this will now pass the regression tests.

Best,

Joachim

CendioOssman · 2022-03-08T14:55:24Z

Crap. It seems CentOS 7 doesn't have the required packages. I see other bug reports with the same issue, but no easy fix. :/

CendioOssman · 2022-03-08T15:17:14Z

I guess a workaround in the CentOS 7 spec file is the easiest way forward. This should fix it:

diff --git a/contrib/packages/rpm/el7/SPECS/tigervnc.spec b/contrib/packages/rpm/el7/SPECS/tigervnc.spec
index 084efe20..1b8c4a44 100644
--- a/contrib/packages/rpm/el7/SPECS/tigervnc.spec
+++ b/contrib/packages/rpm/el7/SPECS/tigervnc.spec
@@ -18,7 +18,7 @@ Source3:        10-libvnc.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libX11-devel, automake, autoconf, libtool
-BuildRequires:  gettext, gettext-autopoint, appstream
+BuildRequires:  gettext, gettext-autopoint
 BuildRequires:  libXext-devel, xorg-x11-server-source, libXi-devel
 BuildRequires:  xorg-x11-xtrans-devel, xorg-x11-util-macros, libXtst-devel
 BuildRequires:  libdrm-devel, libXt-devel, pixman-devel
@@ -141,6 +141,11 @@ runs properly under an environment with SELinux enabled.
 rm -rf $RPM_BUILD_ROOT
 %setup -q -n %{name}-%{version}%{?snap:-%{snap}}
 
+# There is no appstream package on CentOS 7, and hence no metainfo.its
+# that msgfmt needs to generate the metainfo XML file
+sed -i 's@add_custom_target(appstream@#\0@' vncviewer/CMakeLists.txt
+sed -i 's@install(.*metainfo.xml@#\0@' vncviewer/CMakeLists.txt
+
 cp -r /usr/share/xorg-x11-server-source/* unix/xserver
 pushd unix/xserver
 for all in `find . -type f -perm -001`; do
@@ -256,7 +261,6 @@ fi
 %doc %{_docdir}/%{name}/README.rst
 %{_bindir}/vncviewer
 %{_datadir}/applications/*
-%{_datadir}/metainfo/*
 %{_mandir}/man1/vncviewer.1*
 
 %files server

JoachimFalk · 2022-03-08T16:35:29Z

I guess a workaround in the CentOS 7 spec file is the easiest way forward.

OK, lets drop metainfo support for CentOS 7.

CendioOssman · 2022-03-10T15:44:01Z

Great. Thanks for all the hard work!

JoachimFalk marked this pull request as draft January 22, 2022 20:40

JoachimFalk marked this pull request as ready for review January 22, 2022 20:42

CendioOssman requested changes Jan 28, 2022

View reviewed changes

Added screenshots for AppStream meta info file for vncviewer

741d3ed

JoachimFalk closed this Jan 28, 2022

JoachimFalk deleted the feature/appstream-vncviewer branch January 28, 2022 17:30

JoachimFalk restored the feature/appstream-vncviewer branch January 28, 2022 17:43

JoachimFalk reopened this Jan 28, 2022

JoachimFalk force-pushed the feature/appstream-vncviewer branch from da9c192 to ab209f3 Compare January 28, 2022 17:44

JoachimFalk force-pushed the feature/appstream-vncviewer branch 3 times, most recently from 3d2cbd1 to d10332d Compare February 19, 2022 23:07

JoachimFalk force-pushed the feature/appstream-vncviewer branch from d10332d to 00347cd Compare March 6, 2022 15:18

Added AppStream meta info file for the vncviewer

704eff0

JoachimFalk force-pushed the feature/appstream-vncviewer branch from 00347cd to 704eff0 Compare March 8, 2022 16:31

CendioOssman approved these changes Mar 10, 2022

View reviewed changes

CendioOssman merged commit 67217af into TigerVNC:master Mar 10, 2022

JoachimFalk deleted the feature/appstream-vncviewer branch March 16, 2022 13:11

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added AppStream meta info file for the vncviewer. #1415

Added AppStream meta info file for the vncviewer. #1415

JoachimFalk commented Jan 22, 2022

CendioOssman commented Jan 27, 2022

JoachimFalk commented Jan 27, 2022 via email

CendioOssman left a comment

CendioOssman Jan 28, 2022

JoachimFalk Jan 28, 2022

CendioOssman Jan 28, 2022

JoachimFalk Jan 28, 2022

JoachimFalk Feb 19, 2022

CendioOssman Jan 28, 2022

JoachimFalk Jan 28, 2022

CendioOssman Jan 28, 2022

JoachimFalk Jan 28, 2022

CendioOssman Feb 2, 2022

JoachimFalk Feb 19, 2022

CendioOssman Jan 28, 2022

JoachimFalk Jan 28, 2022

CendioOssman Feb 2, 2022

JoachimFalk Feb 19, 2022

CendioOssman Jan 28, 2022

JoachimFalk Jan 28, 2022

JoachimFalk Feb 19, 2022

CendioOssman Mar 4, 2022

CendioOssman Jan 28, 2022

JoachimFalk Jan 28, 2022

CendioOssman Feb 2, 2022

JoachimFalk Feb 19, 2022

CendioOssman commented Mar 4, 2022

CendioOssman commented Mar 4, 2022

JoachimFalk commented Mar 6, 2022

CendioOssman commented Mar 8, 2022

CendioOssman commented Mar 8, 2022

JoachimFalk commented Mar 8, 2022

CendioOssman commented Mar 10, 2022

Added AppStream meta info file for the vncviewer. #1415

Added AppStream meta info file for the vncviewer. #1415

Conversation

JoachimFalk commented Jan 22, 2022

CendioOssman commented Jan 27, 2022

JoachimFalk commented Jan 27, 2022 via email

CendioOssman left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

CendioOssman commented Mar 4, 2022

CendioOssman commented Mar 4, 2022

JoachimFalk commented Mar 6, 2022

CendioOssman commented Mar 8, 2022

CendioOssman commented Mar 8, 2022

JoachimFalk commented Mar 8, 2022

CendioOssman commented Mar 10, 2022