Re: graphviz.SlackBuild

Re: graphviz.SlackBuild

[Duncan Roe]

Hi Adrius,

Do you still want to maintain the graphviz SBo package?

If not, I would be happy to take it over.

In case you do want to keep graphviz, the next email is a patch for Current that
gets to version 2.50. The new download home has versioned tarballs.

Cheers ... Duncan.

On Thu, Sep 10, 2020 at 02:04:31PM +1000, Duncan Roe wrote:
> Hi Audrius,
>
> Would you be able to upgrade the graphviz SlackBuild to 2.44.1 given a
> SlackBuild for libc-client?

libc-client is no longer required again.
>
[...]

[PATCH 1/1] graphics/graphviz: Updated for version 2.50

[Duncan Roe]

Remove patch files - no longer required.

Signed-off-by: Duncan Roe <duncan_roe@optusnet.com.au>
---
 graphics/graphviz/ghostscript918.patch | 18 ------------------
 graphics/graphviz/graphviz.SlackBuild  | 10 ++--------
 graphics/graphviz/graphviz.info        |  4 ++--
 graphics/graphviz/php_5.4_compat.patch | 17 -----------------
 4 files changed, 4 insertions(+), 45 deletions(-)
 delete mode 100644 graphics/graphviz/ghostscript918.patch
 delete mode 100644 graphics/graphviz/php_5.4_compat.patch

diff --git a/graphics/graphviz/ghostscript918.patch b/graphics/graphviz/ghostscript918.patch
deleted file mode 100644
index 189c5134ae..0000000000
--- a/graphics/graphviz/ghostscript918.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -uprb graphviz-2.38.0.orig/plugin/gs/gvloadimage_gs.c graphviz-2.38.0/plugin/gs/gvloadimage_gs.c
---- graphviz-2.38.0.orig/plugin/gs/gvloadimage_gs.c	2014-04-13 23:40:25.000000000 +0300
-+++ graphviz-2.38.0/plugin/gs/gvloadimage_gs.c	2015-11-11 00:08:32.916123704 +0200
-@@ -72,11 +72,11 @@ static void gs_error(GVJ_t * job, const
- 
-     assert (err < 0);
- 
--    if (err >= e_VMerror) 
-+    if (err >= gs_error_VMerror)
- 	errsrc = "PostScript Level 1"; 
--    else if (err >= e_unregistered)
-+    else if (err >= gs_error_unregistered)
- 	errsrc = "PostScript Level 2";
--    else if (err >= e_invalidid)
-+    else if (err >= gs_error_invalidid)
- 	errsrc = "DPS error";
-     else
- 	errsrc = "Ghostscript internal error";
diff --git a/graphics/graphviz/graphviz.SlackBuild b/graphics/graphviz/graphviz.SlackBuild
index 64d99cc85c..2fbafc1441 100644
--- a/graphics/graphviz/graphviz.SlackBuild
+++ b/graphics/graphviz/graphviz.SlackBuild
@@ -27,7 +27,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=graphviz
-VERSION=${VERSION:-2.40.1}
+VERSION=${VERSION:-2.50.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -72,7 +72,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -84,12 +84,6 @@ find -L . \
 # Install PHP bindings to proper location.
 sed -i 's|/php/modules|/php/extensions|' configure
 
-# Fix for php-5.4
-patch -p1 -i $CWD/php_5.4_compat.patch
-
-# Patch from Arch (thanks!)
-patch -p1 -i $CWD/ghostscript918.patch
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" \
diff --git a/graphics/graphviz/graphviz.info b/graphics/graphviz/graphviz.info
index 9d3fe12952..385a70af79 100644
--- a/graphics/graphviz/graphviz.info
+++ b/graphics/graphviz/graphviz.info
@@ -1,8 +1,8 @@
 PRGNAM="graphviz"
 VERSION="2.40.1"
 HOMEPAGE="https://www.graphviz.org/"
-DOWNLOAD="https://graphviz.gitlab.io/pub/graphviz/stable/SOURCES/graphviz.tar.gz"
-MD5SUM="4ea6fd64603536406166600bcc296fc8"
+DOWNLOAD="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/2.50.0/graphviz-2.50.0.tar.xz"
+MD5SUM="ccc1c011d79fcdfccc1cb4be8a81edef"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/graphics/graphviz/php_5.4_compat.patch b/graphics/graphviz/php_5.4_compat.patch
deleted file mode 100644
index 58c2993b36..0000000000
--- a/graphics/graphviz/php_5.4_compat.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur graphviz-2.28.0.orig/tclpkg/gv/gv_php_init.c graphviz-2.28.0/tclpkg/gv/gv_php_init.c
---- graphviz-2.28.0.orig/tclpkg/gv/gv_php_init.c	2011-01-25 17:30:51.000000000 +0100
-+++ graphviz-2.28.0/tclpkg/gv/gv_php_init.c	2012-05-30 04:10:40.657221055 +0200
-@@ -19,11 +19,13 @@
- 
- static size_t gv_string_writer (GVJ_t *job, const char *s, size_t len)
- {
-+    TSRMLS_FETCH();
-     return PHPWRITE(s, len);
- }
- 
- static size_t gv_channel_writer (GVJ_t *job, const char *s, size_t len)
- {
-+    TSRMLS_FETCH();
-     return PHPWRITE(s, len);
- }
- 
-- 
2.17.5

Re: graphviz.SlackBuild

[Duncan Roe]

Hi Pablo,

Sorry about this post - please ignore

(ran git send-email in wrong CWD)

Cheers ... Duncan.

On Fri, Dec 17, 2021 at 07:02:28PM +1100, Duncan Roe wrote:
> Hi Adrius,
>
> Do you still want to maintain the graphviz SBo package?
>
[...]

Re: [PATCH 1/1] graphics/graphviz: Updated for version 2.50

[Duncan Roe]

Hi Pablo,

Sorry also about this one (same git send-email), please ignore

Cheers ... Duncan.

On Fri, Dec 17, 2021 at 07:02:29PM +1100, Duncan Roe wrote:
> Remove patch files - no longer required.
>
[...]