diff options
| author |   Matteo Bernardini | 2021-08-10 09:21:15 +0200 |
|---|---|---|
| committer |   Willy Sudiarto Raharjo | 2021-08-14 16:18:00 +0200 |
| commit | 841ae7d17209f19e94603ddac9a0023330f99e80 (patch) | |
| tree | f2096fdc9b2e366d2cdfe941aabcf6ca579166d0 | |
| parent | 27e9d5d32f3b800fecd7e6aab27f09f80ad5be09 (diff) | |
| download | slackbuilds-841ae7d17209f19e94603ddac9a0023330f99e80.tar.gz | |
graphics/inkscape: Updated for version 1.1.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | graphics/inkscape/glib-2.68.patch | 47 | ||||
| -rw-r--r-- | graphics/inkscape/inkscape.SlackBuild | 12 | ||||
| -rw-r--r-- | graphics/inkscape/inkscape.info | 6 |
3 files changed, 11 insertions, 54 deletions
diff --git a/graphics/inkscape/glib-2.68.patch b/graphics/inkscape/glib-2.68.patch deleted file mode 100644 index bc23d7df01..0000000000 --- a/graphics/inkscape/glib-2.68.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/src/3rdparty/autotrace/autotrace.h b/src/3rdparty/autotrace/autotrace.h -index 2ce6f272a997cee8c7839412a520106d5584ce4c..e56be9a74c4308cacc4043ef0855edae9cdef0a6 100644 ---- a/src/3rdparty/autotrace/autotrace.h -+++ b/src/3rdparty/autotrace/autotrace.h -@@ -23,6 +23,9 @@ - - #include <stdio.h> - -+#include "types.h" -+#include "color.h" -+ - #ifdef __cplusplus - extern "C" { - #endif /* __cplusplus */ -@@ -35,9 +38,6 @@ extern "C" { - * Typedefs - * ===================================================================== */ - --#include "types.h" --#include "color.h" -- - /* Third degree is the highest we deal with. */ - enum _at_polynomial_degree { - AT_LINEARTYPE = 1, -diff --git a/src/3rdparty/autotrace/color.h b/src/3rdparty/autotrace/color.h -index e50ab30ae04d1861c4d9aa0f393650d2f2c102da..88651db9f73571cdc5f14cdf4645e8fa69e03912 100644 ---- a/src/3rdparty/autotrace/color.h -+++ b/src/3rdparty/autotrace/color.h -@@ -24,6 +24,10 @@ - #include <glib.h> - #include <glib-object.h> - -+#ifdef __cplusplus -+extern "C" { -+#endif /* __cplusplus */ -+ - typedef struct _at_color at_color; - struct _at_color { - guint8 r; -@@ -43,4 +47,7 @@ void at_color_free(at_color * color); - GType at_color_get_type(void); - #define AT_TYPE_COLOR (at_color_get_type ()) - -+#ifdef __cplusplus -+} -+#endif /* __cplusplus */ - #endif /* not AT_COLOR_H */ diff --git a/graphics/inkscape/inkscape.SlackBuild b/graphics/inkscape/inkscape.SlackBuild index d2ff1c4ffd..3c5182be72 100644 --- a/graphics/inkscape/inkscape.SlackBuild +++ b/graphics/inkscape/inkscape.SlackBuild @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=inkscape -VERSION=${VERSION:-1.0.2} -EXTRAVER=${EXTRAVER:-2021-01-15_e86c870879} +VERSION=${VERSION:-1.1} +EXTRAVER=${EXTRAVER:-2021-05-24_c4e8f9ed74} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -80,8 +80,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -patch -p1 < $CWD/glib-2.68.patch - # strip invalid tag sed -i /url/d org.inkscape.Inkscape.appdata.xml.in @@ -119,6 +117,12 @@ cd build make install DESTDIR=$PKG cd .. +# From this version on inkscape install its separate library in +# /usr/lib$LIBDIRSUFFIX/$PRGNAM that's not on the binary LD_LIBRARY_PATH +# at runtime: just create an handy symlink without moving it in case +# something else look for it there +( cd $PKG/usr/lib$LIBDIRSUFFIX ; ln -s $PRGNAM/* . ) + find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/graphics/inkscape/inkscape.info b/graphics/inkscape/inkscape.info index 9e0d9b3bb9..aede4aa381 100644 --- a/graphics/inkscape/inkscape.info +++ b/graphics/inkscape/inkscape.info @@ -1,8 +1,8 @@ PRGNAM="inkscape" -VERSION="1.0.2" +VERSION="1.1" HOMEPAGE="http://www.inkscape.org/" -DOWNLOAD="https://inkscape.org/gallery/item/23820/inkscape-1.0.2.tar.xz" -MD5SUM="ec90e0c1e4c7e3dba8f46b16c73462b3" +DOWNLOAD="https://media.inkscape.org/dl/resources/file/inkscape-1.1.tar.xz" +MD5SUM="45e38e25fb93c7c91c51b84b9e4cf0ee" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="GraphicsMagick gdl dos2unix double-conversion libcdr lxml numpy potrace pstoedit scour" |