evince: update to 42.3.
This commit is contained in:
parent
9c35eaac03
commit
c71d16fe19
|
@ -0,0 +1,28 @@
|
||||||
|
From 26051aa87e50e075e3acd87c9a698f2026efb5f7 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Michal Vasilek <michal@vasilek.cz>
|
||||||
|
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
|
||||||
|
|
|
@ -1,52 +0,0 @@
|
||||||
From 1060b24d051607f14220f148d2f7723b29897a54 Mon Sep 17 00:00:00 2001
|
|
||||||
From: r-value <i@rvalue.moe>
|
|
||||||
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
|
|
||||||
|
|
|
@ -1,14 +1,13 @@
|
||||||
# Template file for 'evince'
|
# Template file for 'evince'
|
||||||
pkgname=evince
|
pkgname=evince
|
||||||
version=41.3
|
version=42.3
|
||||||
revision=1
|
revision=1
|
||||||
build_helper="gir"
|
build_helper="gir"
|
||||||
build_style=meson
|
build_style=meson
|
||||||
configure_args="$(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc)
|
configure_args="$(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc)
|
||||||
-Dcomics=enabled -Dps=enabled -Dxps=enabled -Ddvi=disabled
|
-Dcomics=enabled -Ddjvu=enabled -Dps=enabled -Dxps=enabled -Ddvi=disabled -Dpdf=enabled"
|
||||||
-Dt1lib=disabled"
|
hostmakedepends="adwaita-icon-theme gettext $(vopt_if gtk_doc gi-docgen)
|
||||||
hostmakedepends="adwaita-icon-theme gettext gtk-doc glib-devel
|
glib-devel itstool pkg-config perl-XML-Parser appstream-glib"
|
||||||
itstool pkg-config perl-XML-Parser appstream-glib"
|
|
||||||
# XXX missing packages for DVI backend.
|
# XXX missing packages for DVI backend.
|
||||||
makedepends="adwaita-icon-theme djvulibre-devel gnome-desktop-devel libSM-devel
|
makedepends="adwaita-icon-theme djvulibre-devel gnome-desktop-devel libSM-devel
|
||||||
libgxps-devel libsecret-devel libspectre-devel nautilus-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 <gottox@voidlinux.org>"
|
maintainer="Enno Boland <gottox@voidlinux.org>"
|
||||||
license="GPL-2.0-or-later"
|
license="GPL-2.0-or-later"
|
||||||
homepage="https://wiki.gnome.org/Apps/Evince"
|
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"
|
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
|
||||||
checksum=3346b01f9bdc8f2d5ffea92f110a090c64a3624942b5b543aad4592a9de33bb0
|
checksum=49aecf845c946c96db17ba89d75c8002c5ae8963f504a9b0626d12675914645e
|
||||||
|
|
||||||
build_options="gir gtk_doc"
|
build_options="gir gtk_doc"
|
||||||
build_options_default="gir"
|
build_options_default="gir gtk_doc"
|
||||||
|
|
||||||
if [ -z "$CROSS_BUILD" ]; then
|
pre_build() {
|
||||||
build_options_default+=" gtk_doc"
|
# help gi-docgen find gi files on cross
|
||||||
fi
|
if [ -n "$CROSS_BUILD" ]; then
|
||||||
|
export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
libevince_package() {
|
libevince_package() {
|
||||||
short_desc+=" - runtime libraries"
|
short_desc+=" - runtime libraries"
|
||||||
|
@ -39,14 +42,14 @@ libevince_package() {
|
||||||
}
|
}
|
||||||
|
|
||||||
evince-devel_package() {
|
evince-devel_package() {
|
||||||
depends="gtk+3-devel libevince>=${version}_${revision}"
|
depends="gtk+3-devel libglib-devel libevince>=${version}_${revision}"
|
||||||
short_desc+=" - development files"
|
short_desc+=" - development files"
|
||||||
pkg_install() {
|
pkg_install() {
|
||||||
vmove usr/include
|
vmove usr/include
|
||||||
vmove usr/lib/pkgconfig
|
vmove usr/lib/pkgconfig
|
||||||
vmove "usr/lib/*.so"
|
vmove "usr/lib/*.so"
|
||||||
if [ "$build_option_gtk_doc" ]; then
|
if [ "$build_option_gtk_doc" ]; then
|
||||||
vmove usr/share/gtk-doc
|
vmove usr/share/doc
|
||||||
fi
|
fi
|
||||||
if [ "$build_option_gir" ]; then
|
if [ "$build_option_gir" ]; then
|
||||||
vmove usr/share/gir-1.0
|
vmove usr/share/gir-1.0
|
||||||
|
|
Loading…
Reference in New Issue