diff --git a/media-gfx/graphviz/graphviz-2.40.1.recipe b/media-gfx/graphviz/graphviz-2.44.0.recipe similarity index 95% rename from media-gfx/graphviz/graphviz-2.40.1.recipe rename to media-gfx/graphviz/graphviz-2.44.0.recipe index de4b1520e..d7bfba70d 100644 --- a/media-gfx/graphviz/graphviz-2.40.1.recipe +++ b/media-gfx/graphviz/graphviz-2.44.0.recipe @@ -12,11 +12,11 @@ Graphviz has many useful features for concrete diagrams, such as options for \ colors, fonts, tabular node layouts, line styles, hyperlinks, rolland custom \ shapes." HOMEPAGE="https://www.graphviz.org/" -COPYRIGHT="1994-2017 AT&T Corp." +COPYRIGHT="1994-2020 AT&T Corp." LICENSE="EPL v1.0" -REVISION="3" -SOURCE_URI="https://graphviz.gitlab.io/pub/graphviz/stable/SOURCES/graphviz.tar.gz" -CHECKSUM_SHA256="ca5218fade0204d59947126c38439f432853543b0818d9d728c589dfe7f3a421" +REVISION="1" +SOURCE_URI="https://www2.graphviz.org/Packages/stable/portable_source/graphviz-$portVersion.tar.gz" +CHECKSUM_SHA256="9aabd13a8018b708ab3c822de2326c19d0a52ed59f50a6b0f9318c07e2a6d93b" SOURCE_FILENAME="graphviz-$portVersion.tar.gz" PATCHES="graphviz-$portVersion.patchset" diff --git a/media-gfx/graphviz/patches/graphviz-2.40.1.patchset b/media-gfx/graphviz/patches/graphviz-2.44.0.patchset similarity index 54% rename from media-gfx/graphviz/patches/graphviz-2.40.1.patchset rename to media-gfx/graphviz/patches/graphviz-2.44.0.patchset index 56a5da2f1..053aa7797 100644 --- a/media-gfx/graphviz/patches/graphviz-2.40.1.patchset +++ b/media-gfx/graphviz/patches/graphviz-2.44.0.patchset @@ -1,14 +1,14 @@ -From 36f72f0bc9c1908134d8bee4e12bf45cfa1cabcf Mon Sep 17 00:00:00 2001 +From 52c8dbbe777e75c3d312d8019a1f671a8e0d0876 Mon Sep 17 00:00:00 2001 From: begasus Date: Sun, 25 Feb 2018 15:09:25 +0100 Subject: set Haiku font directories diff --git a/configure.ac b/configure.ac -index 51166c3..59c89a5 100644 +index 5e098aa..36b95d5 100644 --- a/configure.ac +++ b/configure.ac -@@ -133,6 +133,7 @@ UWIN=no +@@ -144,6 +144,7 @@ UWIN=no CYGWIN=no MINGW32=no DARWIN9=no @@ -16,7 +16,7 @@ index 51166c3..59c89a5 100644 case "${host_os}" in *uwin* ) UWIN=yes -@@ -181,6 +182,16 @@ case "${host_os}" in +@@ -185,6 +186,16 @@ case "${host_os}" in ;; esac ;; @@ -33,32 +33,32 @@ index 51166c3..59c89a5 100644 * ) # This sucks! Whatever happened to standards for file system layout? (Good job its no longer used unless fontconfig is unavailable.) DEFAULT_FONTPATH="/usr/share/fonts/sun/TrueType:/usr/share/fonts/TrueType:/usr/X11/lib/X11/fonts/TrueType:/usr/share/fonts/sun/Type1:/usr/openwin/lib/X11/fonts/Type1:/usr/share/fonts/X11/Type1:/usr/share/fonts/default/Type1:/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:/usr/common/share/fonts/ttf"; PATHSEPARATOR=":" -@@ -422,7 +433,7 @@ AC_CHECK_HEADERS(malloc.h \ - errno.h unistd.h strings.h \ +@@ -449,7 +460,7 @@ AC_CHECK_HEADERS(malloc.h \ + unistd.h strings.h stat.h vfork.h \ sys/time.h sys/types.h sys/select.h \ - sys/stat.h sys/mman.h \ + sys/stat.h sys/mman.h sys/vfork.h \ - sys/ioctl.h sys/inotify.h crt_externs.h) + sys/ioctl.h sys/inotify.h crt_externs.h sysexits.h) - AC_HEADER_TIME - AC_HEADER_DIRENT - AC_HEADER_STDBOOL + + # Internationalization macros + # AM_GNU_GETTEXT -- -2.16.2 +2.26.0 -From 153b82a722a04872484f9af6b67481ab4661f677 Mon Sep 17 00:00:00 2001 +From 1e5062602f2f984c5cc17c312254337c9e2d83b2 Mon Sep 17 00:00:00 2001 From: begasus Date: Sun, 25 Feb 2018 15:14:43 +0100 Subject: undef _hdr_malloc for Haiku diff --git a/lib/vmalloc/vmhdr.h b/lib/vmalloc/vmhdr.h -index a44793f..c71d6e3 100644 +index 441d9da..d898a09 100644 --- a/lib/vmalloc/vmhdr.h +++ b/lib/vmalloc/vmhdr.h -@@ -39,6 +39,10 @@ extern "C" { - - #include "FEATURE/vmalloc" +@@ -38,6 +38,10 @@ extern "C" { + # include + #endif // HAVE_SYS_TYPES_H +#ifdef __HAIKU__ + #undef _hdr_malloc @@ -68,17 +68,17 @@ index a44793f..c71d6e3 100644 #undef malloc #undef realloc -- -2.16.2 +2.26.0 -From ad68852fef2a28a874529b81447557e39d296615 Mon Sep 17 00:00:00 2001 +From 92d4f1109623efd92fd27fe6d492597756d877ab Mon Sep 17 00:00:00 2001 From: begasus Date: Sun, 25 Feb 2018 15:17:14 +0100 Subject: set default font for Haiku diff --git a/lib/common/const.h b/lib/common/const.h -index 605dabd..884bc49 100644 +index 2c745c2..76f2902 100644 --- a/lib/common/const.h +++ b/lib/common/const.h @@ -66,6 +66,8 @@ @@ -86,33 +86,91 @@ index 605dabd..884bc49 100644 #if defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) || defined(__IPHONE_OS_VERSION_MIN_REQUIRED) #define DEFAULT_FONTNAME "TimesNewRomanPSMT" +#elif defined (__HAIKU__) -+ #define DEFAULT_FONTNAME "DejaVuSans" ++ #define DEFAULT_FONTNAME "NotoSans" #else #define DEFAULT_FONTNAME "Times-Roman" #endif -- -2.16.2 +2.26.0 -From 0101b5128196e9b26b523c3c689ef5f440a6b4ec Mon Sep 17 00:00:00 2001 +From 0cf7d3dc8e6613fd029b6a9e8478c943c28e2eaa Mon Sep 17 00:00:00 2001 From: begasus Date: Mon, 26 Feb 2018 19:20:59 +0100 Subject: Don't define waitpid unless necessary diff --git a/lib/sfio/sfhdr.h b/lib/sfio/sfhdr.h -index 9558c03..6930ff6 100644 +index d3b3329..be6ad0f 100644 --- a/lib/sfio/sfhdr.h +++ b/lib/sfio/sfhdr.h -@@ -906,7 +906,7 @@ extern "C" { - #endif +@@ -812,7 +812,7 @@ extern "C" { + #endif /* _WIN32 */ extern time_t time(time_t *); - extern int waitpid(int, int *, int); + extern pid_t waitpid(pid_t, int *, int); - #ifndef WIN32 + #ifndef _WIN32 extern void _exit(int); #endif -- -2.16.2 +2.26.0 + + +From d542280d5cdd3a27b8243055e412777a86e18408 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Sat, 13 Jun 2020 13:02:14 +1000 +Subject: Use system declaration for sbrk and getpagesize + + +diff --git a/lib/vmalloc/vmhdr.h b/lib/vmalloc/vmhdr.h +index d898a09..6a3435f 100644 +--- a/lib/vmalloc/vmhdr.h ++++ b/lib/vmalloc/vmhdr.h +@@ -418,9 +418,9 @@ extern "C" { + #define _Vmpfclose (_Vmextern.vm_pfclose) + + extern Vmextern_t _Vmextern; +- ++#ifndef __HAIKU__ + extern size_t getpagesize(void); +- ++#endif + #ifndef _WIN32 + extern void abort(void); + extern ssize_t write(int, const void *, size_t); +@@ -448,7 +448,7 @@ extern "C" { + extern void _cleanup(void); + + /* for vmdcsbrk.c */ +-#if !defined(_WIN32) ++#if !defined(_WIN32) && !defined(__HAIKU__) + extern Vmuchar_t *sbrk(ssize_t); + #endif + +-- +2.26.0 + + +From c12c329ab172dd3363dba6cedabf0aab62d8d53c Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Sat, 13 Jun 2020 13:03:04 +1000 +Subject: Remove mstats + + +diff --git a/configure.ac b/configure.ac +index 36b95d5..8914236 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -482,7 +482,7 @@ LIBS=$save_LIBS + + # Checks for library functions + AC_CHECK_FUNCS([lrand48 drand48 srand48 setmode setenv getenv \ +- cbrt vsnprintf _NSGetEnviron mallopt mallinfo mstats getpagesize \ ++ cbrt vsnprintf _NSGetEnviron mallopt mallinfo getpagesize \ + ftruncate lseek64 stat64 vfork unlink waitpid select]) + + AC_REPLACE_FUNCS([strcasecmp strncasecmp strcasestr]) +-- +2.26.0