From c71d16fe1931afa9f03437329c7dc36340d71e54 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 21:02:53 -0700 Subject: [PATCH] evince: update to 42.3. --- srcpkgs/evince/patches/docs-cross.patch | 28 +++++++++++++ srcpkgs/evince/patches/meson-0.61.patch | 52 ------------------------- srcpkgs/evince/template | 27 +++++++------ 3 files changed, 43 insertions(+), 64 deletions(-) create mode 100644 srcpkgs/evince/patches/docs-cross.patch delete mode 100644 srcpkgs/evince/patches/meson-0.61.patch diff --git a/srcpkgs/evince/patches/docs-cross.patch b/srcpkgs/evince/patches/docs-cross.patch new file mode 100644 index 00000000000..dbb8ce7324b --- /dev/null +++ b/srcpkgs/evince/patches/docs-cross.patch @@ -0,0 +1,28 @@ +From 26051aa87e50e075e3acd87c9a698f2026efb5f7 Mon Sep 17 00:00:00 2001 +From: Michal Vasilek +Date: Wed, 6 Jul 2022 12:47:04 +0200 +Subject: [PATCH] build: fix docs cross build + +gi-docgen is a binary that runs on the host, so the meson should search +for it on the host +--- + meson.build | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index b5dbea53a..1e3115f05 100644 +--- a/meson.build ++++ b/meson.build +@@ -169,7 +169,8 @@ m_dep = cc.find_library('m') + + gidocgen_dep = dependency('gi-docgen', version: '>= 2021.1', + fallback: ['gi-docgen', 'dummy_dep'], +- required: get_option('gtk_doc')) ++ required: get_option('gtk_doc'), ++ native: true) + + # Although GTK+ 3.10 includes hi-dpi functionality, it does not require a cairo with + # cairo_surface_set_device_scale(), which we also need if we're to support hi-dpi, +-- +GitLab + diff --git a/srcpkgs/evince/patches/meson-0.61.patch b/srcpkgs/evince/patches/meson-0.61.patch deleted file mode 100644 index baed9dc1af8..00000000000 --- a/srcpkgs/evince/patches/meson-0.61.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 1060b24d051607f14220f148d2f7723b29897a54 Mon Sep 17 00:00:00 2001 -From: r-value -Date: Wed, 17 Nov 2021 18:22:45 +0800 -Subject: [PATCH] Remove incorrect args for i18n.merge_file - -`i18n.merge_file` has been ignoring positional arguments for -a time and explicitly rejects with error since meson 0.60.0 ---- - backend/meson.build | 1 - - data/meson.build | 1 - - meson.build | 1 - - 3 files changed, 3 deletions(-) - -diff --git a/backend/meson.build b/backend/meson.build -index e44c1d6d7..ab3df9acf 100644 ---- a/backend/meson.build -+++ b/backend/meson.build -@@ -50,7 +50,6 @@ foreach backend, backend_mime_types: backends - ) - - i18n.merge_file( -- appstream, - input: appstream_in, - output: appstream, - po_dir: po_dir, -diff --git a/data/meson.build b/data/meson.build -index 8a308b853..afc302098 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -15,7 +15,6 @@ foreach desktop: desktops - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/meson.build b/meson.build -index 34c86661f..f74efb3c4 100644 ---- a/meson.build -+++ b/meson.build -@@ -492,7 +492,6 @@ install_headers( - appdata = ev_namespace + '.appdata.xml' - - i18n.merge_file( -- appdata, - input: appdata + '.in', - output: appdata, - po_dir: po_dir, --- -GitLab - diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template index 1fbba2b8c8b..228f202a23b 100644 --- a/srcpkgs/evince/template +++ b/srcpkgs/evince/template @@ -1,14 +1,13 @@ # Template file for 'evince' pkgname=evince -version=41.3 +version=42.3 revision=1 build_helper="gir" build_style=meson configure_args="$(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc) - -Dcomics=enabled -Dps=enabled -Dxps=enabled -Ddvi=disabled - -Dt1lib=disabled" -hostmakedepends="adwaita-icon-theme gettext gtk-doc glib-devel - itstool pkg-config perl-XML-Parser appstream-glib" + -Dcomics=enabled -Ddjvu=enabled -Dps=enabled -Dxps=enabled -Ddvi=disabled -Dpdf=enabled" +hostmakedepends="adwaita-icon-theme gettext $(vopt_if gtk_doc gi-docgen) + glib-devel itstool pkg-config perl-XML-Parser appstream-glib" # XXX missing packages for DVI backend. makedepends="adwaita-icon-theme djvulibre-devel gnome-desktop-devel libSM-devel libgxps-devel libsecret-devel libspectre-devel nautilus-devel @@ -18,15 +17,19 @@ short_desc="GNOME Document viewer for multiple document formats" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Evince" +changelog="https://gitlab.gnome.org/GNOME/evince/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=3346b01f9bdc8f2d5ffea92f110a090c64a3624942b5b543aad4592a9de33bb0 +checksum=49aecf845c946c96db17ba89d75c8002c5ae8963f504a9b0626d12675914645e build_options="gir gtk_doc" -build_options_default="gir" +build_options_default="gir gtk_doc" -if [ -z "$CROSS_BUILD" ]; then - build_options_default+=" gtk_doc" -fi +pre_build() { + # help gi-docgen find gi files on cross + if [ -n "$CROSS_BUILD" ]; then + export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/ + fi +} libevince_package() { short_desc+=" - runtime libraries" @@ -39,14 +42,14 @@ libevince_package() { } evince-devel_package() { - depends="gtk+3-devel libevince>=${version}_${revision}" + depends="gtk+3-devel libglib-devel libevince>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/*.so" if [ "$build_option_gtk_doc" ]; then - vmove usr/share/gtk-doc + vmove usr/share/doc fi if [ "$build_option_gir" ]; then vmove usr/share/gir-1.0