From 4d1eaacbd1b95757048727156665b5f69bfc93a6 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 2 Sep 2022 22:34:30 +0200 Subject: [PATCH 1/2] gnome: remove gnome-books from apps gnome-books is archived --- srcpkgs/gnome/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template index 7f17687741ce..31535e9971c6 100644 --- a/srcpkgs/gnome/template +++ b/srcpkgs/gnome/template @@ -1,7 +1,7 @@ # Template file for 'gnome' pkgname=gnome version=42.0 -revision=2 +revision=3 build_style=meta short_desc="GNOME meta-package for Void Linux" maintainer="Enno Boland " @@ -46,7 +46,6 @@ _apps_depends=" evolution>=3.44.0 ghex>=${version} gitg>=41 - gnome-books>=40.0 gnome-boxes>=${version} gnome-builder>=${version} gnome-calculator>=${version} From f3a8b3641202df00bed589793e59c178a10bb692 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 2 Sep 2022 22:35:05 +0200 Subject: [PATCH 2/2] gnome-books: remove package archived upstream, doesn't build with meson 0.63 --- srcpkgs/gnome-books/patches/meson-0.61.patch | 33 -------------------- srcpkgs/gnome-books/template | 18 ----------- srcpkgs/removed-packages/template | 1 + 3 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 srcpkgs/gnome-books/patches/meson-0.61.patch delete mode 100644 srcpkgs/gnome-books/template diff --git a/srcpkgs/gnome-books/patches/meson-0.61.patch b/srcpkgs/gnome-books/patches/meson-0.61.patch deleted file mode 100644 index 0e6ba9befd96..000000000000 --- a/srcpkgs/gnome-books/patches/meson-0.61.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 2663dcdaaaa71f067a4c2d0005eecc0fdf940bf5 Mon Sep 17 00:00:00 2001 -From: Michal Vasilek -Date: Wed, 9 Mar 2022 17:46:00 +0100 -Subject: [PATCH] meson: remove positional args from i18n.merge_file - -This causes the build to fail with meson 0.61+ ---- - data/meson.build | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index bc6edfb4..5061554d 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -54,7 +54,6 @@ sources += gnome.compile_resources( - appdata = 'org.gnome.Books.appdata.xml' - - appdata_file = i18n.merge_file( -- appdata, - input: appdata + '.in', - output: appdata, - po_dir: po_dir, -@@ -74,7 +73,6 @@ if appstream_util.found() - desktop = 'org.gnome.Books.desktop' - - desktop_file = i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop + '.in', - output: desktop, --- -2.35.1 - diff --git a/srcpkgs/gnome-books/template b/srcpkgs/gnome-books/template deleted file mode 100644 index f03b170589b4..000000000000 --- a/srcpkgs/gnome-books/template +++ /dev/null @@ -1,18 +0,0 @@ -# Template file for 'gnome-books' -pkgname=gnome-books -version=40.0 -revision=2 -build_helper="gir" -build_style=meson -hostmakedepends="pkg-config vala glib-devel librsvg docbook-xsl libxslt - gettext appstream-glib desktop-file-utils" -makedepends="gjs-devel gtk+3-devel libglib-devel webkit2gtk-devel - gnome-desktop-devel evince-devel libgepub-devel tracker3-devel" -depends="gjs libgepub libtracker3" -short_desc="E-book manager application for GNOME" -maintainer="Enno Boland " -license="GPL-2.0-or-later" -homepage="https://wiki.gnome.org/Apps/Books" -changelog="https://gitlab.gnome.org/GNOME/gnome-books/-/raw/master/NEWS" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=85e56f4e4a5e91fb615c18f32a29c4e672faf885d68959571a10c5262aa28130 diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 9c847ea1672c..5167b39dc07d 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -104,6 +104,7 @@ replaces=" gmpc-devel<=11.8.16_3 gmpc<=11.8.16_3 gnac<=0.2.4.1_4 + gnome-books<=40.0_2 gnome-doc-utils<=0.20.10_9 gnome-documents<=3.34.0_2 gnome-games<=40.0_1