]>
granicus.if.org Git - graphviz/log
John Ellson [Fri, 28 Jul 2017 14:55:48 +0000 (10:55 -0400)]
use author info from git
John Ellson [Fri, 28 Jul 2017 12:59:54 +0000 (08:59 -0400)]
Merge branch 'master' of github.com:/ellson/graphviz
John Ellson [Thu, 27 Jul 2017 13:42:06 +0000 (09:42 -0400)]
fixomg PYTHON conditionals
John Ellson [Thu, 27 Jul 2017 04:03:44 +0000 (00:03 -0400)]
lets try those PYTHON settings one more time
John Ellson [Wed, 26 Jul 2017 23:27:02 +0000 (19:27 -0400)]
python fix for el6
John Ellson [Wed, 26 Jul 2017 23:11:09 +0000 (19:11 -0400)]
dummy - turn off LICENSE for rhel
John Ellson [Wed, 26 Jul 2017 22:46:28 +0000 (18:46 -0400)]
%lincense doesn't work on rhel
John Ellson [Wed, 26 Jul 2017 22:41:34 +0000 (18:41 -0400)]
%lincense doesn't work on rhel
John Ellson [Wed, 26 Jul 2017 22:12:33 +0000 (18:12 -0400)]
Merge branch 'master' of github.com:/ellson/graphviz
John Ellson [Wed, 26 Jul 2017 22:11:59 +0000 (18:11 -0400)]
incorporate bits from Redhat's spec, merge back into one
John Ellson [Wed, 26 Jul 2017 19:47:05 +0000 (15:47 -0400)]
fix -Tvisio from RH patch
John Ellson [Wed, 26 Jul 2017 05:08:19 +0000 (01:08 -0400)]
fix TCL_EXEC_PREFIX
John Ellson [Tue, 25 Jul 2017 20:56:43 +0000 (16:56 -0400)]
generalize 'make rpm'
John Ellson [Tue, 25 Jul 2017 20:45:52 +0000 (16:45 -0400)]
spec fixes
John Ellson [Tue, 25 Jul 2017 17:07:25 +0000 (13:07 -0400)]
WIP - splitting RHEL and Fedora graphviz.spec files
John Ellson [Sat, 22 Jul 2017 06:46:47 +0000 (02:46 -0400)]
more enable lasi
John Ellson [Sat, 22 Jul 2017 05:56:45 +0000 (01:56 -0400)]
make lasi unconditional
John Ellson [Fri, 21 Jul 2017 19:30:21 +0000 (15:30 -0400)]
put pdf in right dir
John Ellson [Fri, 21 Jul 2017 19:15:21 +0000 (15:15 -0400)]
text too long
John Ellson [Fri, 21 Jul 2017 18:40:10 +0000 (14:40 -0400)]
add missing man pages
John Ellson [Fri, 21 Jul 2017 18:22:52 +0000 (14:22 -0400)]
messing with ldconfig
John Ellson [Fri, 21 Jul 2017 18:13:42 +0000 (14:13 -0400)]
try enabling ppc64 extras on fedora - should be good by now
John Ellson [Fri, 21 Jul 2017 17:26:43 +0000 (13:26 -0400)]
more spec fixes
John Ellson [Fri, 21 Jul 2017 15:53:43 +0000 (11:53 -0400)]
don't use %changelog in %changelog text
John Ellson [Fri, 21 Jul 2017 15:24:48 +0000 (11:24 -0400)]
add Provides to graphviz.spec
John Ellson [Fri, 21 Jul 2017 13:42:55 +0000 (09:42 -0400)]
try to punt the .spec %changelog to make rpmlint happy
John Ellson [Thu, 20 Jul 2017 20:55:09 +0000 (16:55 -0400)]
use %global instead of %define to fix scopt of %release
John Ellson [Thu, 20 Jul 2017 20:50:40 +0000 (16:50 -0400)]
various rpmlint complaints
John Ellson [Thu, 20 Jul 2017 20:36:07 +0000 (16:36 -0400)]
replace tabs with spaces (rpmlint complaint)
John Ellson [Thu, 20 Jul 2017 20:31:39 +0000 (16:31 -0400)]
add version to Obsoletes: for rpmlint
John Ellson [Thu, 20 Jul 2017 20:28:17 +0000 (16:28 -0400)]
remove exectale perms on .[ch] files - reported by rpmlint
John Ellson [Thu, 20 Jul 2017 16:42:57 +0000 (12:42 -0400)]
disable ocaml, sharp, lasi on rhel - missing deps
John Ellson [Thu, 20 Jul 2017 16:33:25 +0000 (12:33 -0400)]
disable ocaml, sharp, lasi on rhel - missing deps
John Ellson [Thu, 20 Jul 2017 16:24:25 +0000 (12:24 -0400)]
disable ocaml, sharp, lasi on rhel - missing deps
John Ellson [Thu, 20 Jul 2017 16:05:08 +0000 (12:05 -0400)]
disable ocaml, sharp, lasi on rhel - missing deps
John Ellson [Thu, 20 Jul 2017 15:57:16 +0000 (11:57 -0400)]
disable ocaml, sharp, lasi on rhel - missing deps
John Ellson [Thu, 20 Jul 2017 15:16:05 +0000 (11:16 -0400)]
enable lasi on all distros
John Ellson [Thu, 20 Jul 2017 15:03:46 +0000 (11:03 -0400)]
remove support for el <6 and fc <23
John Ellson [Wed, 19 Jul 2017 15:20:18 +0000 (11:20 -0400)]
trying to fix rpm build on fc23, fc24
John Ellson [Wed, 19 Jul 2017 04:20:31 +0000 (00:20 -0400)]
don't run swig if python3.pc is missing
John Ellson [Wed, 19 Jul 2017 03:42:29 +0000 (23:42 -0400)]
deal with missing python3.pc on ubuntu
John Ellson [Tue, 18 Jul 2017 20:59:52 +0000 (16:59 -0400)]
complete python -> python2 and python3
John Ellson [Tue, 18 Jul 2017 20:26:11 +0000 (16:26 -0400)]
python -> python2 and python3 (incomplete)
John Ellson [Tue, 18 Jul 2017 20:25:26 +0000 (16:25 -0400)]
ignore cmake generted files
John Ellson [Tue, 18 Jul 2017 14:39:34 +0000 (10:39 -0400)]
re-enable php now that swig-3.0.11 is available
John Ellson [Tue, 18 Jul 2017 00:49:37 +0000 (20:49 -0400)]
Merge pull request #1256 from ErwinJanssen/prune
Cleanup and pruning
Erwin Janssen [Thu, 13 Jul 2017 19:20:08 +0000 (21:20 +0200)]
Update macro checks in lib/sfio
Some macro's are checked by value when a `defined(MACRO)` would be more
appropriate. Other checks could be chagned into an `#ifdef`.
Erwin Janssen [Thu, 13 Jul 2017 11:10:45 +0000 (13:10 +0200)]
Remove lib/sfio/features/stdio
This file is never used in the build process and can therefore be removed.
Erwin Janssen [Mon, 10 Jul 2017 13:38:35 +0000 (15:38 +0200)]
Move type checks features/sfio to configure.ac
The following type checks have been moved:
- off64_t
- struct stat64
Erwin Janssen [Sat, 3 Jun 2017 09:47:10 +0000 (11:47 +0200)]
Move two checks from features/sfio into the code
Two checks in features/sfio performed a sizeof comparison to set a
define. This comparison could be moved into the code, where sizeof
comparisons are already being used.
Erwin Janssen [Fri, 2 Jun 2017 23:07:50 +0000 (01:07 +0200)]
Replace _hdr_stat with HAVE_STAT_H
The check for <stat.h> is already included in configure.ac, so
this could be used instead of the check in features/sfio.
Erwin Janssen [Fri, 2 Jun 2017 22:48:05 +0000 (00:48 +0200)]
Removed two unused checks from features/sfio
The results of the checks for 'exit cleanup' and 'vax asm' are never
used anywere, so they can be removed.
Erwin Janssen [Fri, 2 Jun 2017 21:47:13 +0000 (23:47 +0200)]
Replace _sys_stat with HAVE_SYS_STAT_H
The check for <sys/stat.h> is already included in configure.ac, so
this could be used instead of the check in features/sfio.
Erwin Janssen [Tue, 30 May 2017 20:42:27 +0000 (22:42 +0200)]
Move function checks features/sfio to configure.ac
The following function checks have been moved:
- ftruncate
- lseek64
- getpagesize (was already present in configure.ac)
- select (check for 5 arg interface no longer required)
- stat64
- unlink
- vfork
- waitpid
The following function checks have been removed becuase they were
not used:
- remove
Erwin Janssen [Mon, 29 May 2017 14:38:30 +0000 (16:38 +0200)]
Remove check for log2
The function `log2` is part of the standard C library, so checking for
it's presence is not required.
Erwin Janssen [Mon, 29 May 2017 14:11:33 +0000 (16:11 +0200)]
Remove usage of `NO_POSTSCRIPT_ALIAS`
This value is a remaining artifact from when libgd was included in the
Graphviz source. Since this is no longer the case, this value can be
removed.
Erwin Janssen [Mon, 29 May 2017 12:18:02 +0000 (14:18 +0200)]
Remove MSWIN32 define in favor of _WIN32
Instead of using the the `MSWIN32` define set by the user, rely on the
define `_WIN32`, which is set by the compiler.
Some whitespace was also trimmed.
John Ellson [Wed, 12 Jul 2017 00:19:57 +0000 (20:19 -0400)]
Revert "Remove old hacks used when coordintes were integers."
This reverts commit
0f82197c80980b96ac00633b5c5852a4c9abc3cd .
That commit was the casue of Issue #1255
John Ellson [Thu, 6 Jul 2017 14:47:51 +0000 (10:47 -0400)]
Merge pull request #1254 from ErwinJanssen/format-number-svg
Fix issue #1249
Erwin Janssen [Thu, 6 Jul 2017 08:05:09 +0000 (10:05 +0200)]
Modify `gvprintdouble()`
Use the name technique in `gvprintdouble` as in `xdot_fmt_num`. This
prevents strange characters in the SVG output when numbers get larger.
Updated the references files to reflect this change.
John Ellson [Tue, 4 Jul 2017 23:29:14 +0000 (19:29 -0400)]
Merge pull request #1253 from bmwiedemann/date
Allow to override build date
Bernhard M. Wiedemann [Tue, 4 Jul 2017 06:29:08 +0000 (08:29 +0200)]
Allow to override build date
that gets written to man pages
in order to allow for reproducible builds.
See https://reproducible-builds.org/ for why this is good
and https://reproducible-builds.org/specs/source-date-epoch/
for the definition of this variable.
John Ellson [Mon, 26 Jun 2017 15:16:47 +0000 (11:16 -0400)]
Merge pull request #1251 from ErwinJanssen/link-tred-visual-studio
Link tred to the common library on Visual Studio
Erwin Janssen [Sun, 25 Jun 2017 06:49:43 +0000 (08:49 +0200)]
Link tred to the common library on Visual Studio
An earlier change added features from lib/common to tred, but the
additional linking step for the Visual Studio build was not yet added.
John Ellson [Sat, 17 Jun 2017 15:26:56 +0000 (11:26 -0400)]
Merge pull request #1247 from krf/cmake-changes
CMake fixes (make compile; add graphviz_version.h)
John Ellson [Thu, 15 Jun 2017 23:32:03 +0000 (19:32 -0400)]
add timing,h to noinst_HEADERS so that it gets included in the sources for rpm builds
Kevin Funk [Wed, 14 Jun 2017 06:56:23 +0000 (08:56 +0200)]
CMake: Use FeatureSummary
Now prints information about detected/unavailable packages:
Excerpt:
```
-- The following OPTIONAL packages have been found:
* Cairo
* PkgConfig
* EXPAT
* GD
...
```
Kevin Funk [Tue, 13 Jun 2017 20:28:26 +0000 (22:28 +0200)]
CMake: Generate & install graphviz_version.h
Don't encode build date stamp in it to be able to create reproducable
builds. Slightly different to the autotools version:
Here's the diff to to the autotools based version:
```
---
/home/kfunk/opt/graphviz-autotools/include/graphviz/graphviz_version.h
2017-06-13 22:16:17.
447416244 +0200
+++ graphviz_version.h 2017-06-13 22:27:29.
343298754 +0200
@@ -2,7 +2,7 @@
#define GVPLUGIN_VERSION 6
#define PACKAGE_BUGREPORT "http://www.graphviz.org/"
#define PACKAGE_NAME "graphviz"
-#define PACKAGE_STRING "graphviz 2.41.
20170613 .1957"
+#define PACKAGE_STRING "graphviz 2.41.0"
#define PACKAGE_TARNAME "graphviz"
#define PACKAGE_URL ""
-#define PACKAGE_VERSION "2.41.
20170613 .1957"
+#define PACKAGE_VERSION "2.41.0"
```
Kevin Funk [Tue, 13 Jun 2017 19:57:40 +0000 (21:57 +0200)]
CMake: tred: Make compile
```
FAILED: cmd/tools/tred
: && cc -fPIC -g cmd/tools/CMakeFiles/tred.dir/tred.c.o -o cmd/tools/tred
-Wl,-rpath,/home/kfunk/devel/build/graphviz/lib/cgraph:/home/kfunk/devel/build/graphviz/lib/cdt:
-rdynamic lib/cgraph/libcgraph.so.6.0.0 lib/ingraphs/libingraphs.a
lib/cdt/libcdt.so.5.0.0 && :
/home/kfunk/devel/src/graphviz/cmd/tools/tred.c:284: error: undefined
reference to 'start_timer'
/home/kfunk/devel/src/graphviz/cmd/tools/tred.c:287: error: undefined
reference to 'elapsed_sec'
```
Emden R. Gansner [Sun, 11 Jun 2017 17:27:47 +0000 (13:27 -0400)]
Merge branch 'master' of https://github.com/ellson/graphviz
Emden R. Gansner [Sun, 11 Jun 2017 17:24:41 +0000 (13:24 -0400)]
ddd
Emden Gansner [Tue, 6 Jun 2017 17:21:58 +0000 (13:21 -0400)]
Fix error messages to use CmdName rather than hard-coded and incorrect "gc".
Emden Gansner [Mon, 5 Jun 2017 17:07:00 +0000 (13:07 -0400)]
Update tred man page to reflect added flag.
Emden Gansner [Mon, 5 Jun 2017 13:58:47 +0000 (09:58 -0400)]
Forgot to add timing.h include file in common.
Emden R. Gansner [Sun, 4 Jun 2017 20:19:51 +0000 (16:19 -0400)]
Fix the tred algorithm for better performance, making it roughly quadratic.
Also replace the recursive DFS with an explicit stack to prevent stack overflow.
The latter is probably not necessary, as real-life DAGs shouldn't have that many layers.
John Ellson [Wed, 24 May 2017 21:23:59 +0000 (17:23 -0400)]
Merge pull request #1243 from ErwinJanssen/cmake
64bit support for the CMake build on Windows
Erwin Janssen [Thu, 18 May 2017 10:37:48 +0000 (12:37 +0200)]
Install Pango on Travis CI
Erwin Janssen [Thu, 18 May 2017 10:12:14 +0000 (12:12 +0200)]
Improve FindPangoCairo for linux
Add the location and suffixes of the header files, which were not yet
found by Cmake on Linux.
Erwin Janssen [Thu, 18 May 2017 09:03:10 +0000 (11:03 +0200)]
Add plugin/pango to CMake build
Enables the pango plugin for both x86 and x64.
Erwin Janssen [Thu, 18 May 2017 08:31:55 +0000 (10:31 +0200)]
Update Cairo and Pango dependencies for Windows
Update the libraries and dependencies for Cairo, Pango and Pangocairo to
the latest version available, both for x86 and x64. This also eliminates
the need for the pangomodules.exe to be called.
Erwin Janssen [Sun, 14 May 2017 14:11:45 +0000 (16:11 +0200)]
Convert current Visual Studio build from MT to MD
The CMake build generates MD code (which required a vcredist to be bundled
with the binaries). The current Visual Studio build generated MT code
(which doesn't require a vcredist). Both types require different 3rd party
libraries, so for consistancy reasons, the current Visual Studio build is
converted to MD.
Erwin Janssen [Sun, 14 May 2017 10:33:59 +0000 (12:33 +0200)]
Replace ltdl with compatibility header on Windows
Using libtool on Win64 proved to be a pain, because native Windows
binaryies for 64bit where not found. Instead, it's also possible to use
the native Windows API to load libraries. The new ltdl.h header provides
compatibility functions for this, so minimal source code changes were
required.
Erwin Janssen [Sun, 14 May 2017 08:58:29 +0000 (10:58 +0200)]
Don't exports libtool symbols from gvc
These symbols are not part of the Graphviz source, but of libtool.
Erwin Janssen [Tue, 11 Apr 2017 20:02:12 +0000 (22:02 +0200)]
Add 64bit dependencies for lib/gvc
These dependencies had the following changes:
- rxspencer became a lib-only library
- libexpat became expat
- The 64bit version of ltdl required cygwin1.dll
Erwin Janssen [Tue, 11 Apr 2017 18:57:07 +0000 (20:57 +0200)]
Use static zlib on Windows build
The windows dependencies submodule now includes the static version of
zlib when building Graphviz. Some third party DLLs might still require a
zlib.dll however, but this will be added when required.
Erwin Janssen [Sat, 8 Apr 2017 12:32:24 +0000 (14:32 +0200)]
Add Win64 CMake build to Appveyor
Erwin Janssen [Sat, 8 Apr 2017 12:17:44 +0000 (14:17 +0200)]
Set different dependency dir if 64bit VS generator
When including "Win64" in the Visual Studio generator name, a 64bit
solution is created. For this the x64 dependencies are needed, so a
different dependency directory must be specified.
Erwin Janssen [Fri, 7 Apr 2017 14:32:36 +0000 (16:32 +0200)]
Move Windows dependencies to x86 directory
The current Windows dependencies are all 32bit. To compile a 64bit
Graphviz, 64bit dependencies are required. In order to have both the
32bit and 64bit libraries, we store the 32bit libraries in the x86
folder.
Erwin Janssen [Sun, 14 May 2017 20:43:48 +0000 (22:43 +0200)]
Remove HAVE_PANGOCAIRO check from plugin/pango
The check to see if pangocairo is present should be done before including
this project in the build. Now, when pangocairo is not found, this tries
to compile when it shouldn't, resulting in strange errors.
emden [Sat, 13 May 2017 17:47:37 +0000 (13:47 -0400)]
Merge pull request #1241 from ErwinJanssen/fix/regression-reference
Update SVG reference output
Erwin Janssen [Sat, 13 May 2017 08:14:27 +0000 (10:14 +0200)]
Update SVG reference output
A recent change caused the SVG colors to be specified by name, rather than
by hex code. This updates the reference output accordingly.
Emden Gansner [Thu, 11 May 2017 21:39:27 +0000 (17:39 -0400)]
Add dtclose(map) line which was accidentally removed in the previous revision.
Emden Gansner [Thu, 11 May 2017 18:59:16 +0000 (14:59 -0400)]
Fix bug where a node whose name starts with "cluster" gets lost in JSON output.
John Ellson [Thu, 4 May 2017 11:41:27 +0000 (07:41 -0400)]
Merge pull request #1236 from Chiel92/expose_forgotten_cgraph_functions
Expose forgotten cgraph functions.
Chiel ten Brinke [Thu, 4 May 2017 08:49:41 +0000 (10:49 +0200)]
Expose forgotten cgraph functions.
Emden Gansner [Wed, 3 May 2017 17:15:41 +0000 (13:15 -0400)]
Just use strcmp, rather than streq.
Emden Gansner [Wed, 3 May 2017 17:05:59 +0000 (13:05 -0400)]
Fix incorrect bsearch for colors. This basically rolls back the changes from
e653d8054fe3c2313944a2a88f3ad7c374bd9b21 and
a155276b30da0619979d0b7d5ae22cb05b9b7d16 .
Emden Gansner [Wed, 3 May 2017 16:00:37 +0000 (12:00 -0400)]
Fix incorrect code that should short-circuit the analysis for colors black, white and lightgrey.
It should have been && rather than ||. Just use streq.
Emden R. Gansner [Sun, 30 Apr 2017 20:08:29 +0000 (16:08 -0400)]
Add info on new imagepos attribute to attrs.html page.
John Ellson [Thu, 27 Apr 2017 15:23:09 +0000 (11:23 -0400)]
Merge pull request #1233 from apocalyptech/master
Add 'imagepos' node attribute to control image placement