openpkg
/
openpkg-packages
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

upgrading package: graphviz 2.41.20171026.1811 -> 2.50.0

master
Dr. Ralf S. Engelschall 4 years ago
parent
d120160424
commit
b7dfe174e5
2 changed files with 31 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 58
      graphviz/graphviz.patch
  2. 13
      graphviz/graphviz.spec

58
graphviz/graphviz.patch
Unescape View File

@ -1,16 +1,7 @@
Index: configure Index: configure
--- configure.orig 2017-12-01 06:44:35.000000000 +0100 --- configure.orig 2021-12-04 21:10:38.000000000 +0100
+++ configure 2019-01-19 01:10:20.718390000 +0100 +++ configure 2021-12-29 10:45:11.203283000 +0100
@@ -20451,7 +20451,7 @@ @@ -22272,7 +22272,9 @@
if test "x$GUILE" = "x"; then
use_guile="No (guile not available)"
else
- GUILE_VERSION=`$GUILE --version | sed -n '1 s/^.* \+\([0-9\.]\+\)$/\1/ p'`
+ GUILE_VERSION=`$GUILE --version | sed -n '1 s/^.* \([0-9\.]*\)$/\1/ p'`
GUILE_VERSION_MAJOR=`echo $GUILE_VERSION | cut -d '.' -f 1`
GUILE_VERSION_MINOR=`echo $GUILE_VERSION | cut -d '.' -f 2`
if test 0$GUILE_VERSION_MAJOR -lt 2; then
@@ -21019,7 +21019,9 @@
LUA_INCLUDES="" LUA_INCLUDES=""
LUA_LIBS="" LUA_LIBS=""
@ -21,7 +12,7 @@ Index: configure
if test -n "$lua_inc"; then if test -n "$lua_inc"; then
CFLAGS="$CFLAGS -I$lua_inc" CFLAGS="$CFLAGS -I$lua_inc"
@@ -21038,13 +21040,13 @@ @@ -22291,13 +22293,13 @@
pkgconfig_lua_found=`$PKG_CONFIG --exists lua$l 2>/dev/null` pkgconfig_lua_found=`$PKG_CONFIG --exists lua$l 2>/dev/null`
if test "x$?" = "x0" ; then if test "x$?" = "x0" ; then
LUA_VERSION=`$PKG_CONFIG --modversion lua$l` LUA_VERSION=`$PKG_CONFIG --modversion lua$l`
@ -37,13 +28,12 @@ Index: configure
LUA_LIBS="$LUA_LFLAGS "`$PKG_CONFIG --libs lualib$l` LUA_LIBS="$LUA_LFLAGS "`$PKG_CONFIG --libs lualib$l`
fi fi
break break
Index: lib/expr/Makefile
Index: lib/ortho/trapezoid.c Index: lib/ortho/trapezoid.c
--- lib/ortho/trapezoid.c.orig 2017-08-19 06:44:12.000000000 +0200 --- lib/ortho/trapezoid.c.orig 2021-12-04 21:10:28.000000000 +0100
+++ lib/ortho/trapezoid.c 2019-01-16 07:58:14.973760000 +0100 +++ lib/ortho/trapezoid.c 2021-12-29 10:45:11.203563000 +0100
@@ -26,6 +26,11 @@ @@ -22,6 +22,11 @@
#include <memory.h> #include <common/types.h>
#include <trap.h> #include <ortho/trap.h>
+#include <sys/param.h> +#include <sys/param.h>
+#if __FreeBSD_version <= 704101 || (__FreeBSD_version >= 800000 && __FreeBSD_version < 802502) || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027) +#if __FreeBSD_version <= 704101 || (__FreeBSD_version >= 800000 && __FreeBSD_version < 802502) || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027)
@ -54,25 +44,25 @@ Index: lib/ortho/trapezoid.c
#define T_X 1 #define T_X 1
Index: lib/sfio/sfhdr.h Index: lib/sfio/sfhdr.h
--- lib/sfio/sfhdr.h.orig 2019-01-16 07:58:14.973994000 +0100 --- lib/sfio/sfhdr.h.orig 2021-12-29 10:45:11.203778000 +0100
+++ lib/sfio/sfhdr.h 2019-01-19 01:10:46.827497000 +0100 +++ lib/sfio/sfhdr.h 2021-12-29 10:45:50.621184000 +0100
@@ -31,6 +31,10 @@ @@ -27,6 +27,10 @@
#include "sfio_t.h" #include <sfio/sfio_t.h>
#include "config.h" #include "config.h"
+#ifndef va_copy +#ifndef va_copy
+#define va_copy(to,fr) ((to)=(fr)) +#define va_copy(to,fr) ((to)=(fr))
+#endif +#endif
+ +
#include <vthread.h>
#if defined(__mips) && __mips == 2 && !defined(_NO_LARGEFILE64_SOURCE) #if defined(__mips) && __mips == 2 && !defined(_NO_LARGEFILE64_SOURCE)
Index: plugin/gd/gvrender_gd.c #define _NO_LARGEFILE64_SOURCE 1
--- plugin/gd/gvrender_gd.c.orig 2017-04-07 06:44:57.000000000 +0200
+++ plugin/gd/gvrender_gd.c 2019-01-16 07:58:14.974240000 +0100
@@ -32,6 +32,10 @@
#endif #endif
Index: plugin/gd/gvrender_gd.c
--- plugin/gd/gvrender_gd.c.orig 2021-12-04 21:10:28.000000000 +0100
+++ plugin/gd/gvrender_gd.c 2021-12-29 10:45:11.204036000 +0100
@@ -23,6 +23,10 @@
#define NOTUSED(x) (void) (x)
+#ifndef HAVE_GD_FONTCONFIG +#ifndef HAVE_GD_FONTCONFIG
+#define HAVE_GD_FONTCONFIG +#define HAVE_GD_FONTCONFIG
@ -82,11 +72,11 @@ Index: plugin/gd/gvrender_gd.c
FORMAT_GIF, FORMAT_GIF,
FORMAT_JPEG, FORMAT_JPEG,
Index: plugin/gd/gvtextlayout_gd.c Index: plugin/gd/gvtextlayout_gd.c
--- plugin/gd/gvtextlayout_gd.c.orig 2019-01-16 07:58:14.974379000 +0100 --- plugin/gd/gvtextlayout_gd.c.orig 2021-12-04 21:10:28.000000000 +0100
+++ plugin/gd/gvtextlayout_gd.c 2019-01-19 01:11:11.709694000 +0100 +++ plugin/gd/gvtextlayout_gd.c 2021-12-29 10:45:11.204155000 +0100
@@ -19,6 +19,10 @@ @@ -17,6 +17,10 @@
#include "gvplugin_textlayout.h" #include <gd.h>
#include "gd.h" #include <cgraph/strcasecmp.h>
+#ifndef HAVE_GD_FONTCONFIG +#ifndef HAVE_GD_FONTCONFIG
+#define HAVE_GD_FONTCONFIG +#define HAVE_GD_FONTCONFIG

13
graphviz/graphviz.spec
Unescape View File

@ -22,7 +22,7 @@
## ##
# package versions # package versions
%define V_graphviz 2.41.20171026.1811 %define V_graphviz 2.50.0
%define V_graphviz_perl_base 2.24 %define V_graphviz_perl_base 2.24
%define V_graphviz_perl_data_structure 0.20 %define V_graphviz_perl_data_structure 0.20
@ -37,14 +37,14 @@ Class: BASE
Group: Diagram Group: Diagram
License: GPL License: GPL
Version: %{V_graphviz} Version: %{V_graphviz}
Release: 20190119 Release: 20211229
# package options # package options
%option with_perl no %option with_perl no
%option with_pango no %option with_pango no
# list of sources # list of sources
Source0: http://204.178.9.49/pub/graphviz/development/SOURCES/graphviz-%{V_graphviz}.tar.gz Source0: https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/%{V_graphviz}/graphviz-%{V_graphviz}.tar.gz
Source1: http://www.cpan.org/modules/by-module/GraphViz/GraphViz-%{V_graphviz_perl_base}.tgz Source1: http://www.cpan.org/modules/by-module/GraphViz/GraphViz-%{V_graphviz_perl_base}.tgz
Source2: http://www.cpan.org/modules/by-module/GraphViz/GraphViz-Data-Structure-%{V_graphviz_perl_data_structure}.tar.gz Source2: http://www.cpan.org/modules/by-module/GraphViz/GraphViz-Data-Structure-%{V_graphviz_perl_data_structure}.tar.gz
Patch0: graphviz.patch Patch0: graphviz.patch
@ -52,8 +52,8 @@ Patch0: graphviz.patch
# build information # build information
BuildPreReq: OpenPKG, openpkg >= 20160101, gcc, make, flex, bison, autoconf, automake BuildPreReq: OpenPKG, openpkg >= 20160101, gcc, make, flex, bison, autoconf, automake
PreReq: OpenPKG, openpkg >= 20160101 PreReq: OpenPKG, openpkg >= 20160101
BuildPreReq: freetype, png, zlib, jpeg, gd BuildPreReq: freetype, png, zlib, jpeg, gd, poppler
PreReq: freetype, png, zlib, jpeg, gd PreReq: freetype, png, zlib, jpeg, gd, poppler
%if "%{with_perl}" == "yes" %if "%{with_perl}" == "yes"
BuildPreReq: perl, perl-sys, perl-openpkg BuildPreReq: perl, perl-sys, perl-openpkg
PreReq: perl, perl-sys PreReq: perl, perl-sys
@ -74,7 +74,7 @@ PreReq: pango, cairo
%track %track
prog graphviz = { prog graphviz = {
version = %{V_graphviz} version = %{V_graphviz}
url = https://graphviz.gitlab.io/_pages/Download/Download_source.html url = https://graphviz.org/download/source/
regex = graphviz-(\d+\.\d+(\.\d+)*)\.tar.gz regex = graphviz-(\d+\.\d+(\.\d+)*)\.tar.gz
} }
prog graphviz:GraphViz = { prog graphviz:GraphViz = {
@ -119,6 +119,7 @@ PreReq: pango, cairo
--with-gdlibdir=%{l_prefix}/lib \ --with-gdlibdir=%{l_prefix}/lib \
--with-zincludedir=%{l_prefix}/include \ --with-zincludedir=%{l_prefix}/include \
--with-zlibdir=%{l_prefix}/lib \ --with-zlibdir=%{l_prefix}/lib \
--with-poppler \
--without-gtk \ --without-gtk \
--disable-swig \ --disable-swig \
--disable-sharp \ --disable-sharp \

Write Preview
Loading…
Cancel
Save