Date: Thursday, December 27, 2018 @ 00:08:38 Author: bgyorgy Revision: 418187
upgpkg: gnucash 3.3-2 Fix AppStream metadata Added: gnucash/trunk/0001-Appdata-remove-old-property.patch gnucash/trunk/0001-Fixes-to-the-appdata-file.patch Modified: gnucash/trunk/PKGBUILD ----------------------------------------+ 0001-Appdata-remove-old-property.patch | 39 +++++++++++++++++++++++++++++++ 0001-Fixes-to-the-appdata-file.patch | 24 +++++++++++++++++++ PKGBUILD | 20 +++++++++++++-- 3 files changed, 80 insertions(+), 3 deletions(-) Added: 0001-Appdata-remove-old-property.patch =================================================================== --- 0001-Appdata-remove-old-property.patch (rev 0) +++ 0001-Appdata-remove-old-property.patch 2018-12-27 00:08:38 UTC (rev 418187) @@ -0,0 +1,39 @@ +From e61d5c472a5d0ad1f1a7ee7abf023e91ae43daae Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <[email protected]> +Date: Thu, 27 Dec 2018 00:12:39 +0100 +Subject: [PATCH] Appdata: remove old property + +Use the non-legacy metainfo directory for the appdata file. +--- + gnucash/gnome/CMakeLists.txt | 2 +- + gnucash/gnome/gnucash.appdata.xml.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gnucash/gnome/CMakeLists.txt b/gnucash/gnome/CMakeLists.txt +index 3e99c19bc..f47c9779d 100644 +--- a/gnucash/gnome/CMakeLists.txt ++++ b/gnucash/gnome/CMakeLists.txt +@@ -180,7 +180,7 @@ endif() + + add_custom_target(gnucash-appdata ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml) + +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/appdata) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo) + + #======= + +diff --git a/gnucash/gnome/gnucash.appdata.xml.in b/gnucash/gnome/gnucash.appdata.xml.in +index 5318b7774..d82c786e2 100644 +--- a/gnucash/gnome/gnucash.appdata.xml.in ++++ b/gnucash/gnome/gnucash.appdata.xml.in +@@ -1,6 +1,6 @@ + <?xml version="1.0" encoding="UTF-8"?> + <component> +- <id type="desktop">org.gnucash.GnuCash</id> ++ <id>org.gnucash.GnuCash</id> + <launchable type="desktop-id">gnucash.desktop</launchable> + <metadata_license>CC0-1.0</metadata_license> + <project_license>GPL-2.0+</project_license> +-- +2.20.1 + Added: 0001-Fixes-to-the-appdata-file.patch =================================================================== --- 0001-Fixes-to-the-appdata-file.patch (rev 0) +++ 0001-Fixes-to-the-appdata-file.patch 2018-12-27 00:08:38 UTC (rev 418187) @@ -0,0 +1,24 @@ +From ff5e7657d5cbd6916ff05e753215f21482492b51 Mon Sep 17 00:00:00 2001 +From: Kalev Lember <[email protected]> +Date: Thu, 6 Dec 2018 09:16:41 +0100 +Subject: [PATCH] Fixes to the appdata file + +Rename the ID from org.gnucash.Gnucash to org.gnucash.GnuCash to match +flathub, and add a launchable ID to link it to the desktop file. +--- + gnucash/gnome/gnucash.appdata.xml.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/gnucash/gnome/gnucash.appdata.xml.in b/gnucash/gnome/gnucash.appdata.xml.in +index d8f0665811..5318b7774d 100644 +--- a/gnucash/gnome/gnucash.appdata.xml.in ++++ b/gnucash/gnome/gnucash.appdata.xml.in +@@ -1,6 +1,7 @@ + <?xml version="1.0" encoding="UTF-8"?> + <component> +- <id type="desktop">org.gnucash.Gnucash</id> ++ <id type="desktop">org.gnucash.GnuCash</id> ++ <launchable type="desktop-id">gnucash.desktop</launchable> + <metadata_license>CC0-1.0</metadata_license> + <project_license>GPL-2.0+</project_license> + <name>GnuCash</name> Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-12-26 23:11:36 UTC (rev 418186) +++ PKGBUILD 2018-12-27 00:08:38 UTC (rev 418187) @@ -4,7 +4,7 @@ pkgname=gnucash pkgver=3.3 -pkgrel=1 +pkgrel=2 pkgdesc='Personal and small-business financial-accounting application' arch=(x86_64) url='https://gnucash.org/' @@ -16,9 +16,23 @@ 'perl-date-manip: stock information lookups' 'perl-finance-quote: stock information lookups') options=(!emptydirs) -source=(https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) -sha256sums=('491735df36cb7ba9d04de28e28df53c3e5d928bda52009708d2f83ab9a42f820') +source=(https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz + 0001-Fixes-to-the-appdata-file.patch + 0001-Appdata-remove-old-property.patch) +sha256sums=('491735df36cb7ba9d04de28e28df53c3e5d928bda52009708d2f83ab9a42f820' + 'c3a198a51ec2da93353e1b3082f3d5f32b07abc8eab178a9c4747b19e9710dca' + '483e9c868db591996edcd061b28ff60db3bba369a28c23142434d774b75a940c') +prepare() { + cd $pkgname-$pkgver + + # Fixes to the appdata file + # https://github.com/Gnucash/gnucash/pull/440 + # https://github.com/Gnucash/gnucash/pull/444 + patch -Np1 -i ../0001-Fixes-to-the-appdata-file.patch + patch -Np1 -i ../0001-Appdata-remove-old-property.patch +} + build() { cd $pkgname-$pkgver
