temp/evince: stop using Purism fork (MR 2600)
This commit is contained in:
Pablo Correa Gómez
Dylan Van Assche
parent
f19dec52d8
commit
741133fc3f
2 changed files with 68 additions and 24 deletions
40
temp/evince/0001-data-List-compatible-form-factors.patch
Normal file
40
temp/evince/0001-data-List-compatible-form-factors.patch
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
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,8 +1,8 @@
|
|||
# Forked from Alpine to apply Purism's mobile patches
|
||||
# Forked from Alpine to apply adaptiveness patches
|
||||
pkgname=evince
|
||||
pkgver=9999_git20210416
|
||||
pkgver=9999_git20211009
|
||||
_pkgver=41.2
|
||||
pkgrel=0
|
||||
_commit="8bb5c846bbb36bac47fbfba0f0e5a29802d133b8"
|
||||
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
|
||||
|
|
@ -10,13 +10,24 @@ 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 libhandy1-dev"
|
||||
tiff-dev gobject-introspection-dev libxml2-dev libspectre-dev"
|
||||
makedepends="$depends_dev itstool meson libexecinfo-dev 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"
|
||||
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"
|
||||
source="https://source.puri.sm/Librem5/evince/-/archive/$_commit/evince-$_commit.tar.gz"
|
||||
builddir="$srcdir/$pkgname-$_commit"
|
||||
|
||||
_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
|
||||
$_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:
|
||||
|
|
@ -24,32 +35,20 @@ builddir="$srcdir/$pkgname-$_commit"
|
|||
# 3.24.0-r2:
|
||||
# - CVE-2017-1000083
|
||||
|
||||
prepare() {
|
||||
default_prepare
|
||||
|
||||
grep "\.patch$" debian/patches/series \
|
||||
| xargs -I {} -t -r -n1 patch -p1 -i debian/patches/{}
|
||||
}
|
||||
|
||||
build() {
|
||||
meson \
|
||||
--prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--mandir=/usr/share/man \
|
||||
--localstatedir=/var \
|
||||
--buildtype=plain \
|
||||
abuild-meson \
|
||||
-Dsystemduserunitdir=no \
|
||||
-Dgtk_doc=false \
|
||||
output
|
||||
ninja -C output
|
||||
meson compile ${JOBS:+-j ${JOBS}} -C output
|
||||
}
|
||||
|
||||
check() {
|
||||
ninja -C output test
|
||||
meson test --no-rebuild -v -C output
|
||||
}
|
||||
|
||||
package() {
|
||||
DESTDIR="$pkgdir" ninja -C output install
|
||||
DESTDIR="$pkgdir" meson install --no-rebuild -C output
|
||||
}
|
||||
|
||||
nautilus() {
|
||||
|
|
@ -73,5 +72,10 @@ doc() {
|
|||
}
|
||||
|
||||
sha512sums="
|
||||
4af47ad7498f88838f42946fecbd8ac450935c6071a44c9dcc2769ba9896a0e1410bee7dbc16ce977817862ddb19f7992732abbc6726187f4c987d50b2f0ecf5 evince-8bb5c846bbb36bac47fbfba0f0e5a29802d133b8.tar.gz
|
||||
6ea6b823ee9742b3a666c9d68993e057a032e4a841edbf16c7c4bccf38b5af13295bcbee0ad0bc8fab11d76186294917dff3bbe40ba271e1a550b6a562a67f0f evince-41.2.tar.xz
|
||||
a00c1c11b94bf2035051e1e0319016ddaec74c2b7156b6c2b94e7b45e73174bc3612b50006bd14baa7f7da9dc80c96eb944395226856eb3234902f4886668c18 0001-data-List-compatible-form-factors.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