diff --git a/community/gnome-maps/APKBUILD b/community/gnome-maps/APKBUILD index e04899317ea806d5fedd67d19e3784cbfb8c1354..4a1eb433e01cec612f6c04068326b8d872b2f60e 100644 --- a/community/gnome-maps/APKBUILD +++ b/community/gnome-maps/APKBUILD @@ -1,19 +1,18 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: Rasmus Thomsen <oss@cogitri.dev> pkgname=gnome-maps -pkgver=3.32.2.1 +pkgver=3.34.0 pkgrel=0 pkgdesc="A simple map client" url="https://wiki.gnome.org/Apps/Maps" arch="all !s390x" # gjs missing license="GPL-2.0-or-later" -depends="gfbgraph" +depends="gfbgraph gjs geoclue" makedepends="meson glib-dev gjs-dev gtk+3.0-dev gobject-introspection-dev geoclue-dev libgee-dev folks-dev geocode-glib-dev libchamplain-dev libxml2-dev rest-dev" checkdepends="appstream-glib desktop-file-utils" subpackages="$pkgname-lang" -source="https://download.gnome.org/sources/gnome-maps/${pkgver%.*.*}/gnome-maps-${pkgver}.tar.xz - Add-validation-tests-for-desktop-and-appdata.patch" +source="https://download.gnome.org/sources/gnome-maps/${pkgver%.*}/gnome-maps-$pkgver.tar.xz" build() { meson \ @@ -34,5 +33,4 @@ package() { DESTDIR="$pkgdir" ninja -C output install } -sha512sums="484277dbbf244c5f50f8761c26db8ab31a2294152bc0f7fd81d921802f67cb6fa98e7f2871439c896fb06d5fc11e41cc4a960fa5f552e436e8e756efed80a821 gnome-maps-3.32.2.1.tar.xz -88017be4f6bb46c6ee28fbf475038300fe9ddacf4dc9484225278239b89b3c91b97a8c7d0194a48c503327affe8e10d600d44514a5813ffc56846c446e9434c5 Add-validation-tests-for-desktop-and-appdata.patch" +sha512sums="c2d03d91670d9ad3e4d7481b7bb4314521a136fcc3292766dc4c7bee712f5b9ef18738780419cfd6ffe24a0fe26d1b74952485a33be2eb968831f0234d46aa17 gnome-maps-3.34.0.tar.xz" diff --git a/community/gnome-maps/Add-validation-tests-for-desktop-and-appdata.patch b/community/gnome-maps/Add-validation-tests-for-desktop-and-appdata.patch deleted file mode 100644 index 1c0307b44dcd3a43e3539401860cf074302d0fd8..0000000000000000000000000000000000000000 --- a/community/gnome-maps/Add-validation-tests-for-desktop-and-appdata.patch +++ /dev/null @@ -1,55 +0,0 @@ -Upstream: Yes -Reason: Actually run tests -diff --git a/data/meson.build b/data/meson.build -index 349ff25..2be4ee7 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -13,7 +13,7 @@ install_data( - - desktop = app_id + '.desktop' - --custom_target('desktop-file', -+desktop_file = custom_target('desktop-file', - input: desktop + '.in', - output: desktop, - install: true, -@@ -32,7 +32,7 @@ install_data( - - appdata = app_id + '.appdata.xml' - --i18n.merge_file( -+appdata_file = i18n.merge_file( - appdata, - input: appdata + '.in', - output: appdata, -@@ -53,4 +53,28 @@ configure_file( - install_dir: join_paths(datadir, 'dbus-1', 'services') - ) - --subdir('icons') -+desktop_file_validate = find_program('desktop-file-validate', required: false) -+if desktop_file_validate.found() -+ test( -+ 'validate-desktop', -+ desktop_file_validate, -+ args: [ -+ desktop_file.full_path() -+ ] -+ ) -+endif -+ -+appstream_util = find_program('appstream-util', required: false) -+if appstream_util.found() -+ test( -+ 'validate-appdata', -+ appstream_util, -+ args: [ -+ 'validate-relax', -+ '--nonet', -+ appdata_file.full_path() -+ ] -+ ) -+endif -+ -+subdir('icons') -\ No newline at end of file