inkscape: 1.0.2 -> 1.1
This commit is contained in:
Danny Rawlins
parent
3405a4b251
commit
bcc344423b
File diff suppressed because it is too large
Load Diff
|
|
@ -1,9 +1,6 @@
|
|||
untrusted comment: verify with /etc/ports/contrib.pub
|
||||
RWSagIOpLGJF36x/lDYvIxkMujbNcw15dA1QXLSh4a/GUg0WoxhjSMqowSBnzHTVzlmG8KKt5gNQFe+vI4vZ7FhX2jf61s24twg=
|
||||
SHA256 (Pkgfile) = 173cec183906c3ee59109bb2d86ffe04d981ab6efa3f1e732c25d98dbb55dd65
|
||||
SHA256 (.footprint) = a24437cdb60a602d0ed1b310589bc543f0144abb6e7790630cab834fc4128dd3
|
||||
SHA256 (inkscape-1.0.2.tar.xz) = da3e230511a08cbf21e86710d161458594fea87867e9157b67ed01a04ea2798a
|
||||
SHA256 (poppler-21.05.0.tar.xz) = dafd537b680fad1215bc40fc53d1f38e8449d7c185bc60d5a89e1d26c90dbd8c
|
||||
SHA256 (avoid-syntaxwarning-in-python-extension.patch) = 266a1f8ad9ef8f457b334532e7a0ca8523a577ff09909ac6926120e79de41221
|
||||
SHA256 (check-for-atomic.patch) = 0cb8b48ace0fb6756c931312591b5ad7681bd95e0a6eb40ad2639daca6d3603c
|
||||
SHA256 (python3.patch) = 42fd4106576cbdbbdae8566326cace33669740cc066487d637b9797c71d62b96
|
||||
RWSagIOpLGJF31Ql1ovz8YMtzzslgb9F4J62kcXa4GboyL74g4xo9+cxB6t21v1tu2LRHjsQsJIvmecj52s4ka9qLQ4CDGohTA8=
|
||||
SHA256 (Pkgfile) = 2260fe92600cd216d989804c3c2d8f7c5e596afb2fd6ceb64a92686de122c4e5
|
||||
SHA256 (.footprint) = aac767626b117d415ad0bdedbece6c76c865068cb9e248c97442d14d68db07aa
|
||||
SHA256 (inkscape-1.1.tar.xz) = 71e6e8ce3fdf702f59dbc4a276665eb982eb7822b029bbdbeced2df4301795e6
|
||||
SHA256 (poppler-21.06.1.tar.xz) = 86b09e5a02de40081a3916ef8711c5128eaf4b1fc59d5f87d0ec66f04f595db4
|
||||
|
|
|
|||
|
|
@ -4,15 +4,12 @@
|
|||
# Depends on: boehm-gc boost double-conversion graphicsmagick gsl gtkmm3 libsoup libxslt poppler-glib popt potrace gdl
|
||||
|
||||
name=inkscape
|
||||
version=1.0.2
|
||||
_pversion=21.05.0
|
||||
_psoversion=110
|
||||
version=1.1
|
||||
_pversion=21.06.1
|
||||
_psoversion=111
|
||||
release=5
|
||||
source=(https://media.inkscape.org/dl/resources/file/$name-$version.tar.xz
|
||||
https://poppler.freedesktop.org/poppler-$_pversion.tar.xz
|
||||
avoid-syntaxwarning-in-python-extension.patch
|
||||
check-for-atomic.patch
|
||||
python3.patch)
|
||||
https://poppler.freedesktop.org/poppler-$_pversion.tar.xz)
|
||||
|
||||
poppler() {
|
||||
cmake -S poppler-$_pversion -B build-poppler -G Ninja \
|
||||
|
|
@ -44,10 +41,6 @@ poppler() {
|
|||
build() {
|
||||
[ ! -e "/usr/lib/libpoppler.so.$_psoversion" ] && poppler
|
||||
|
||||
patch -d $name-${version}_* -p1 -i $SRC/avoid-syntaxwarning-in-python-extension.patch
|
||||
patch -d $name-${version}_* -p1 -i $SRC/check-for-atomic.patch
|
||||
patch -d $name-${version}_* -p1 -i $SRC/python3.patch
|
||||
|
||||
# https://gitlab.gnome.org/GNOME/glib/-/issues/2331
|
||||
CFLAGS+=' -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_46 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_66'
|
||||
CXXFLAGS+=' -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_46 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_66'
|
||||
|
|
@ -63,6 +56,7 @@ build() {
|
|||
DESTDIR=$PKG cmake --install build
|
||||
|
||||
rm -r $PKG/usr/share/man/?? \
|
||||
$PKG/usr/share/man/zh_TW \
|
||||
$PKG/usr/share/locale \
|
||||
$PKG/usr/share/inkscape/doc
|
||||
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
Author: Mattia Rizzolo <mattia@debian.org>
|
||||
Description: Avoid SyntaxWarning in a python extension
|
||||
I also reckon the chances of the check actually passing while using `is` to be quite low…
|
||||
Forwarded: no, this is already upstream but not (yet) in the 1.0.x branch.
|
||||
Last-Updated: 2020-09-10
|
||||
|
||||
--- a/share/extensions/interp.py
|
||||
+++ b/share/extensions/interp.py
|
||||
@@ -112,7 +112,7 @@
|
||||
else:
|
||||
fillstyle = 'color'
|
||||
|
||||
- if strokestyle is 'color':
|
||||
+ if strokestyle == 'color':
|
||||
if sst['stroke'] == 'none':
|
||||
sst['stroke-width'] = '0.0'
|
||||
sst['stroke-opacity'] = '0.0'
|
||||
@@ -122,7 +122,7 @@
|
||||
est['stroke-opacity'] = '0.0'
|
||||
est['stroke'] = sst['stroke']
|
||||
|
||||
- if fillstyle is 'color':
|
||||
+ if fillstyle == 'color':
|
||||
if sst['fill'] == 'none':
|
||||
sst['fill-opacity'] = '0.0'
|
||||
sst['fill'] = est['fill']
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
diff -urN inkscape-1.0_2020-05-01_4035a4fb49.orig/src/preferences.h inkscape-1.0_2020-05-01_4035a4fb49/src/preferences.h
|
||||
--- inkscape-1.0_2020-05-01_4035a4fb49.orig/src/preferences.h 2020-05-01 13:18:52.000000000 +0000
|
||||
+++ inkscape-1.0_2020-05-01_4035a4fb49/src/preferences.h 2020-08-20 23:20:11.501230191 +0000
|
||||
@@ -14,6 +14,7 @@
|
||||
#ifndef INKSCAPE_PREFSTORE_H
|
||||
#define INKSCAPE_PREFSTORE_H
|
||||
|
||||
+#include <atomic>
|
||||
#include <climits>
|
||||
#include <cfloat>
|
||||
#include <glibmm/ustring.h>
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
Description: Don't consider `python` a valid python[23]? interpreter.
|
||||
Just to be safe, don't even try to look it up.
|
||||
Should be safe to drop the patch once python2 is not around anymore.
|
||||
Author: Mattia Rizzolo <mattia@debian.org>
|
||||
Forwarded: not-needed
|
||||
Last-Update: 2020-05-07
|
||||
|
||||
--- a/src/extension/implementation/script.cpp
|
||||
+++ b/src/extension/implementation/script.cpp
|
||||
@@ -80,9 +80,11 @@
|
||||
{ "python", {"python-interpreter", {"python3" }}},
|
||||
#else
|
||||
{ "perl", {"perl-interpreter", {"perl" }}},
|
||||
- { "python", {"python-interpreter", {"python3", "python" }}},
|
||||
+ /* don't consider `python` a valid python(3) interpreter */
|
||||
+ { "python", {"python-interpreter", {"python3" }}},
|
||||
#endif
|
||||
- { "python2", {"python2-interpreter", {"python2", "python" }}},
|
||||
+ /* don't consider `python` a valid python(2) interpreter either */
|
||||
+ { "python2", {"python2-interpreter", {"python2" }}},
|
||||
{ "ruby", {"ruby-interpreter", {"ruby" }}},
|
||||
{ "shell", {"shell-interpreter", {"sh" }}},
|
||||
};
|
||||
Loading…
Reference in New Issue
Block a user