Date: Tuesday, May 4, 2021 @ 19:05:29 Author: bgyorgy Revision: 927405
upgpkg: iptux 0.8.1-1: Update to version 0.8.1 Modified: iptux/trunk/PKGBUILD Deleted: iptux/trunk/appstream.patch -----------------+ PKGBUILD | 12 +--- appstream.patch | 145 ------------------------------------------------------ 2 files changed, 3 insertions(+), 154 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-05-04 19:03:22 UTC (rev 927404) +++ PKGBUILD 2021-05-04 19:05:29 UTC (rev 927405) @@ -2,7 +2,7 @@ # Contributor: Kevin Guan <kevinguan...@gmail.com> pkgname=iptux -pkgver=0.8.0 +pkgver=0.8.1 pkgrel=1 pkgdesc='LAN messenger and file sender, an IP Messenger client' arch=('x86_64') @@ -11,15 +11,9 @@ depends=('google-glog' 'gtk3' 'jsoncpp' 'libsigc++') makedepends=('appstream' 'gflags' 'meson') checkdepends=('xorg-server-xvfb') -source=("https://github.com/iptux-src/$pkgname/archive/v$pkgver/$pkgname-$pkgver.tar.gz" - 'appstream.patch') -sha256sums=('ecaf1ff2b9486db753419a63aea52062fd46ecbdf32784ae96fae51eabc74407' - '515b839bda7e67aedb3561ca86bac0d9354cfbd1d4613d9ac306c32b034e4de0') +source=("https://github.com/iptux-src/$pkgname/archive/v$pkgver/$pkgname-$pkgver.tar.gz") +sha256sums=('4d433065fee53d6135cdda67541b50ca33b68195b3d0c070f1fc5d4ed9c8c435') -prepare() { - patch -d $pkgname-$pkgver -Np1 -i ../appstream.patch -} - build() { arch-meson $pkgname-$pkgver build meson compile -C build Deleted: appstream.patch =================================================================== --- appstream.patch 2021-05-04 19:03:22 UTC (rev 927404) +++ appstream.patch 2021-05-04 19:05:29 UTC (rev 927405) @@ -1,145 +0,0 @@ -diff --git a/po/POTFILES b/po/POTFILES -index 0493a12f..6c8739d8 100644 ---- a/po/POTFILES -+++ b/po/POTFILES -@@ -1,5 +1,6 @@ - ./examples/count-bot/main.cpp --./share/applications/io.github.iptux-src.iptux.desktop.in -+./share/applications/io.github.iptux_src.iptux.desktop.in -+./share/metainfo/io.github.iptux_src.iptux.metainfo.xml - ./src/iptux-core/CoreThread.cpp - ./src/iptux-core/Event.cpp - ./src/iptux-core/Exception.cpp -diff --git a/share/applications/io.github.iptux-src.iptux.desktop.in b/share/applications/io.github.iptux_src.iptux.desktop.in -similarity index 100% -rename from share/applications/io.github.iptux-src.iptux.desktop.in -rename to share/applications/io.github.iptux_src.iptux.desktop.in -diff --git a/share/applications/meson.build b/share/applications/meson.build -index 0e135e4d..fda04fff 100644 ---- a/share/applications/meson.build -+++ b/share/applications/meson.build -@@ -1,8 +1,8 @@ - i18n = import('i18n') --i18n.merge_file('io.github.iptux-src.iptux.desktop', -+i18n.merge_file('io.github.iptux_src.iptux.desktop', - type: 'desktop', -- output: 'io.github.iptux-src.iptux.desktop', -- input: 'io.github.iptux-src.iptux.desktop.in', -+ output: 'io.github.iptux_src.iptux.desktop', -+ input: 'io.github.iptux_src.iptux.desktop.in', - po_dir: join_paths(meson.source_root(), 'po'), - install: true, - install_dir: 'share/applications' -diff --git a/share/meson.build b/share/meson.build -index 7e49da6c..a6d362f6 100644 ---- a/share/meson.build -+++ b/share/meson.build -@@ -1,3 +1,4 @@ - install_subdir('iptux', install_dir: 'share') - install_subdir('icons', install_dir: 'share') - subdir('applications') -+subdir('metainfo') -diff --git a/share/metainfo/io.github.iptux_src.iptux.metainfo.xml b/share/metainfo/io.github.iptux_src.iptux.metainfo.xml -new file mode 100644 -index 00000000..1cf78c9e ---- /dev/null -+++ b/share/metainfo/io.github.iptux_src.iptux.metainfo.xml -@@ -0,0 +1,29 @@ -+<?xml version="1.0" encoding="UTF-8"?> -+<component type="desktop-application"> -+ <id>io.github.iptux_src.iptux</id> -+ -+ <name>iptux</name> -+ <summary>LAN communication software</summary> -+ -+ <metadata_license>CC0-1.0</metadata_license> -+ <project_license>GPL-2.0-or-later</project_license> -+ -+ <description> -+ <p> -+ iptux is an “IP Messenger” client. -+ </p> -+ <p> -+ It can: -+ <ul> -+ <li>auto-detect other clients on the intranet.</li> -+ <li>send messages to other clients.</li> -+ <li>send files to other clients.</li> -+ </ul> -+ </p> -+ <p> -+ It is (supposedly) compatible with 飞鸽传书 (Feige) and 飞秋 (FeiQ) from China, and with the original “IP Messenger” clients from Japan as listed on http://ipmsg.org/ including g2ipmsg and xipmsg in Debian. -+ </p> -+ </description> -+ -+ <launchable type="desktop-id">io.github.iptux_src.iptux.desktop</launchable> -+</component> -diff --git a/share/metainfo/meson.build b/share/metainfo/meson.build -new file mode 100644 -index 00000000..09553851 ---- /dev/null -+++ b/share/metainfo/meson.build -@@ -0,0 +1,25 @@ -+# Validate MetaInfo file -+metainfo_file = 'io.github.iptux_src.iptux.metainfo.xml' -+ascli_exe = find_program('appstreamcli', required: false) -+if ascli_exe.found() -+ test('validate metainfo file', -+ ascli_exe, -+ args: ['validate', -+ '--no-net', -+ '--pedantic', -+ metainfo_file] -+ ) -+endif -+ -+ -+# Localize a MetaInfo file and install it -+i18n = import('i18n') -+ -+i18n.merge_file( -+ input: metainfo_file, -+ output: 'io.github.iptux_src.iptux.metainfo.xml', -+ type: 'xml', -+ po_dir: join_paths (meson.source_root(), 'po'), -+ install: true, -+ install_dir: join_paths (get_option ('datadir'), 'metainfo') -+) -diff --git a/share/metainfo/io.github.iptux_src.iptux.metainfo.xml b/share/metainfo/io.github.iptux_src.iptux.metainfo.xml -index 1cf78c9e..e3852c16 100644 ---- a/share/metainfo/io.github.iptux_src.iptux.metainfo.xml -+++ b/share/metainfo/io.github.iptux_src.iptux.metainfo.xml -@@ -14,14 +14,16 @@ - </p> - <p> - It can: -- <ul> -- <li>auto-detect other clients on the intranet.</li> -- <li>send messages to other clients.</li> -- <li>send files to other clients.</li> -- </ul> - </p> -+ <ul> -+ <li>auto-detect other clients on the intranet.</li> -+ <li>send messages to other clients.</li> -+ <li>send files to other clients.</li> -+ </ul> - <p> -- It is (supposedly) compatible with 飞鸽传书 (Feige) and 飞秋 (FeiQ) from China, and with the original “IP Messenger” clients from Japan as listed on http://ipmsg.org/ including g2ipmsg and xipmsg in Debian. -+ It is (supposedly) compatible with 飞鸽传书 (Feige) and 飞秋 (FeiQ) from China, -+ and with the original “IP Messenger” clients from Japan, including g2ipmsg and -+ xipmsg in Debian. - </p> - </description> - -diff --git a/share/metainfo/meson.build b/share/metainfo/meson.build -index 09553851..c5124770 100644 ---- a/share/metainfo/meson.build -+++ b/share/metainfo/meson.build -@@ -1,5 +1,5 @@ - # Validate MetaInfo file --metainfo_file = 'io.github.iptux_src.iptux.metainfo.xml' -+metainfo_file = files('io.github.iptux_src.iptux.metainfo.xml') - ascli_exe = find_program('appstreamcli', required: false) - if ascli_exe.found() - test('validate metainfo file',