temp/evince: drop aport (MR 3484)
Upstream has evince 43 now, which seems to be adapted (tested on the
Librem 5), and the old evince in this package depends on a package that
no longer exists:
ERROR: unable to select packages:
so:libgnome-desktop-3.so.19 (no such package):
required by: evince-9999_git20211009-r2[so:libgnome-desktop-3.so.19]
This commit is contained in:
Clayton Craft
Newbyte
parent
ce46e963cf
commit
32ea00d3f9
3 changed files with 0 additions and 175 deletions
|
|
@ -1,40 +0,0 @@
|
||||||
From 312e33d8fe474f16e43fea7f8c496006d51b5caf Mon Sep 17 00:00:00 2001
|
|
||||||
From: Adrien Plazas <kekun.plazas@laposte.net>
|
|
||||||
Date: Fri, 6 Nov 2020 15:04:19 +0100
|
|
||||||
Subject: [PATCH 1/5] data: List compatible form-factors
|
|
||||||
|
|
||||||
This will allow the app to be available in Phosh and PureOS Store.
|
|
||||||
---
|
|
||||||
data/org.gnome.Evince.desktop.in.in | 2 ++
|
|
||||||
org.gnome.Evince.appdata.xml.in | 4 ++++
|
|
||||||
2 files changed, 6 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/data/org.gnome.Evince.desktop.in.in b/data/org.gnome.Evince.desktop.in.in
|
|
||||||
index e7bcf31e..ce471436 100644
|
|
||||||
--- a/data/org.gnome.Evince.desktop.in.in
|
|
||||||
+++ b/data/org.gnome.Evince.desktop.in.in
|
|
||||||
@@ -13,6 +13,8 @@ Icon=@PACKAGE_ICON_NAME@
|
|
||||||
Categories=GNOME;GTK;Office;Viewer;Graphics;2DGraphics;VectorGraphics;
|
|
||||||
MimeType=@EVINCE_MIME_TYPES@;
|
|
||||||
Actions=new-window;
|
|
||||||
+# Translators: Do NOT translate or transliterate this text (these are enum types)!
|
|
||||||
+X-Purism-FormFactor=Workstation;Mobile;
|
|
||||||
|
|
||||||
[Desktop Action new-window]
|
|
||||||
Name=New Window
|
|
||||||
diff --git a/org.gnome.Evince.appdata.xml.in b/org.gnome.Evince.appdata.xml.in
|
|
||||||
index 20175f5e..5b40af5e 100644
|
|
||||||
--- a/org.gnome.Evince.appdata.xml.in
|
|
||||||
+++ b/org.gnome.Evince.appdata.xml.in
|
|
||||||
@@ -252,4 +252,8 @@
|
|
||||||
<release version="3.32.0" date="2019-03-14" />
|
|
||||||
<release version="3.30.3" date="2019-09-29" />
|
|
||||||
</releases>
|
|
||||||
+ <custom>
|
|
||||||
+ <value key="Purism::form_factor">workstation</value>
|
|
||||||
+ <value key="Purism::form_factor">mobile</value>
|
|
||||||
+ </custom>
|
|
||||||
</component>
|
|
||||||
--
|
|
||||||
2.25.1
|
|
||||||
|
|
||||||
|
|
@ -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,83 +0,0 @@
|
||||||
# Forked from Alpine to apply adaptiveness patches
|
|
||||||
pkgname=evince
|
|
||||||
pkgver=9999_git20211009
|
|
||||||
_pkgver=41.2
|
|
||||||
pkgrel=2
|
|
||||||
pkgdesc="simple document viewer for GTK+"
|
|
||||||
url="https://wiki.gnome.org/Apps/Evince"
|
|
||||||
arch="all !s390x !mips !mips64" # Limited by adwaita-icon-theme needing librsvg
|
|
||||||
license="GPL-2.0-or-later"
|
|
||||||
depends="adwaita-icon-theme gsettings-desktop-schemas"
|
|
||||||
depends_dev="gtk+3.0-dev poppler-dev libsm-dev libevent-dev libxrandr-dev
|
|
||||||
libx11-dev libxcursor-dev libxcomposite-dev libxi-dev util-linux-dev
|
|
||||||
tiff-dev gobject-introspection-dev libxml2-dev libspectre-dev"
|
|
||||||
makedepends="$depends_dev itstool meson nautilus-dev
|
|
||||||
adwaita-icon-theme-dev gtk-doc yelp-tools appstream-glib-dev
|
|
||||||
libgxps-dev gspell-dev gstreamer-dev libsecret-dev gst-plugins-base-dev
|
|
||||||
djvulibre-dev libhandy1-dev"
|
|
||||||
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-nautilus $pkgname-libs"
|
|
||||||
|
|
||||||
_purism_commit="8bb5c846bbb36bac47fbfba0f0e5a29802d133b8"
|
|
||||||
_purism_patches="https://source.puri.sm/Librem5/evince/-/raw/$_purism_commit/debian/patches"
|
|
||||||
|
|
||||||
# Order is important "toolbar-Allow-to-toggle" must go before "toolbar-Allow-hiding"
|
|
||||||
source="https://download.gnome.org/sources/evince/${_pkgver%.*}/evince-$_pkgver.tar.xz
|
|
||||||
0001-data-List-compatible-form-factors.patch
|
|
||||||
0002-remove-incorrect-args-for-i18n.merge_file.patch
|
|
||||||
$_purism_patches/properties-view-Reduce-the-label-width-chars.patch
|
|
||||||
$_purism_patches/toolbar-Allow-to-toggle-the-sidebar-button.patch
|
|
||||||
$_purism_patches/toolbar-Allow-hiding-zoom-annotation-and-page-widgets.patch
|
|
||||||
$_purism_patches/window-Port-it-to-phones.patch"
|
|
||||||
builddir="$srcdir/$pkgname-$_pkgver"
|
|
||||||
|
|
||||||
# secfixes:
|
|
||||||
# 3.32.0-r1:
|
|
||||||
# - CVE-2019-11459
|
|
||||||
# 3.24.0-r2:
|
|
||||||
# - CVE-2017-1000083
|
|
||||||
|
|
||||||
build() {
|
|
||||||
abuild-meson \
|
|
||||||
-Dsystemduserunitdir=no \
|
|
||||||
-Dgtk_doc=false \
|
|
||||||
output
|
|
||||||
meson compile ${JOBS:+-j ${JOBS}} -C output
|
|
||||||
}
|
|
||||||
|
|
||||||
check() {
|
|
||||||
meson test --no-rebuild -v -C output
|
|
||||||
}
|
|
||||||
|
|
||||||
package() {
|
|
||||||
DESTDIR="$pkgdir" meson install --no-rebuild -C output
|
|
||||||
}
|
|
||||||
|
|
||||||
nautilus() {
|
|
||||||
pkgdesc="$pkgname (Nautilus extension)"
|
|
||||||
install_if="$pkgname=$pkgver-r$pkgrel nautilus"
|
|
||||||
|
|
||||||
mkdir -p "$subpkgdir"/usr/lib
|
|
||||||
mv "$pkgdir"/usr/lib/nautilus "$subpkgdir"/usr/lib
|
|
||||||
}
|
|
||||||
|
|
||||||
libs() {
|
|
||||||
default_libs
|
|
||||||
mv "$pkgdir"/usr/lib/* "$subpkgdir"/usr/lib/
|
|
||||||
}
|
|
||||||
|
|
||||||
doc() {
|
|
||||||
default_doc
|
|
||||||
if [ -d "$pkgdir"/usr/share/help ]; then
|
|
||||||
mv "$pkgdir"/usr/share/help "$subpkgdir"/usr/share/
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
sha512sums="
|
|
||||||
6ea6b823ee9742b3a666c9d68993e057a032e4a841edbf16c7c4bccf38b5af13295bcbee0ad0bc8fab11d76186294917dff3bbe40ba271e1a550b6a562a67f0f evince-41.2.tar.xz
|
|
||||||
a00c1c11b94bf2035051e1e0319016ddaec74c2b7156b6c2b94e7b45e73174bc3612b50006bd14baa7f7da9dc80c96eb944395226856eb3234902f4886668c18 0001-data-List-compatible-form-factors.patch
|
|
||||||
d66898c917eb34a042cdbad58e9122678372479228340180269e0f479f8743ddc83f59c7ea2a813fc2662dd2ff1b9da9dd194e1a879885d054dec5c5fd1b2877 0002-remove-incorrect-args-for-i18n.merge_file.patch
|
|
||||||
f13c96ec09cb7d63796ce7f5e3fae0dc997ae654450dc627cbb8ab24faca78d07ac466118e0b57d533e909071adc0b8634a85ed51d7137ab8ff60ea8478ab81b properties-view-Reduce-the-label-width-chars.patch
|
|
||||||
90e44a422258822fb303dd5985d1757507e99ee9631c217b66820cb4683db487f51cfd9b0577971c37f81086217a4b1a15663652c76a831099f293f85048bd64 toolbar-Allow-to-toggle-the-sidebar-button.patch
|
|
||||||
0331cb2dfc3ad09fbf41aaff09f0ea0742fbd9e9736797f7f37e13d7bfa1f54504897252a07f2e75983f5706f8421b593037f254fc2179afc007a6380f88ac36 toolbar-Allow-hiding-zoom-annotation-and-page-widgets.patch
|
|
||||||
9fd3ba5e97ed54c6df262f310a6ce7138cb1601b969e506a4add099f6b195a40040a3fd594cd269c07f70f05638687dbc33b9cf707ac57242b75cc8bc6726817 window-Port-it-to-phones.patch
|
|
||||||
"
|
|
||||||
Loading…
Add table
Reference in a new issue