* update graphviz to 12.1.1-1
This commit is contained in:
parent
c93b65a903
commit
75e14a0411
@ -1,32 +0,0 @@
|
||||
From 00e64ef3b5cd5a06414070c530c957f03b9cbf9d Mon Sep 17 00:00:00 2001
|
||||
From: Mark Hansen <markhansen@google.com>
|
||||
Date: Mon, 26 Sep 2022 20:43:39 +1000
|
||||
Subject: [PATCH] Stop using now-hidden gs_error_names symbol
|
||||
|
||||
GhostScript hid their gs_error_names symbol as part of a global by-default hiding of non-API symbols.
|
||||
|
||||
It will probably take a while for GhostScript to get a public API for these symbols back into a release, so let's stop using the symbol for now, until then.
|
||||
|
||||
Fixes #2280
|
||||
---
|
||||
plugin/gs/gvloadimage_gs.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/plugin/gs/gvloadimage_gs.c b/plugin/gs/gvloadimage_gs.c
|
||||
index e909c6f32..d852663af 100644
|
||||
--- a/plugin/gs/gvloadimage_gs.c
|
||||
+++ b/plugin/gs/gvloadimage_gs.c
|
||||
@@ -86,8 +86,8 @@ static void gs_error(GVJ_t * job, const char *name, const char *funstr, int err)
|
||||
else
|
||||
errsrc = "Ghostscript internal error";
|
||||
|
||||
- job->common->errorfn("%s: %s() returned: %d \"%s\" (%s)\n",
|
||||
- name, funstr, err, gs_error_names[-err - 1], errsrc);
|
||||
+ job->common->errorfn("%s: %s() returned: %d (%s)\n",
|
||||
+ name, funstr, err, errsrc);
|
||||
}
|
||||
|
||||
static int gvloadimage_process_file(GVJ_t *job, usershape_t *us, void *instance)
|
||||
--
|
||||
GitLab
|
||||
|
||||
@ -1,81 +0,0 @@
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -560,8 +560,8 @@
|
||||
use_xlib="Yes"
|
||||
#no x11.pc on centos4
|
||||
# PKG_CHECK_MODULES(X11, [x11])
|
||||
- PKG_CHECK_MODULES(XRENDER, [xrender],HAVE_XRENDER="yes" ,HAVE_XRENDER="no")
|
||||
fi
|
||||
+PKG_CHECK_MODULES(XRENDER, [xrender],HAVE_XRENDER="yes" ,HAVE_XRENDER="no")
|
||||
AM_CONDITIONAL(WITH_X, [test "x$use_xlib" = "xYes"])
|
||||
AM_CONDITIONAL(WITH_XRENDER, [test "x$,HAVE_XRENDER" = "xyes"])
|
||||
|
||||
@@ -1924,6 +1924,10 @@
|
||||
# so we set HAVE_LIBXPMFORLEFTY instead of the usual HAVE_LIBXPM
|
||||
#
|
||||
|
||||
+AC_ARG_WITH(lefty,
|
||||
+ [AS_HELP_STRING([--with-lefty=yes],[build lefty])],
|
||||
+ [],[with_xaw=yes])
|
||||
+
|
||||
AC_ARG_WITH(Xpmincludedir,
|
||||
[AS_HELP_STRING([--with-Xpmincludedir=DIR],[use Xpm includes from DIR])],
|
||||
[XPM_INCLUDES="-I$withval"])
|
||||
@@ -1931,6 +1935,17 @@
|
||||
[AS_HELP_STRING([--with-Xpmlibdir=DIR],[use Xpm libraries from DIR])],
|
||||
[XPM_LIBS="-L$withval"])
|
||||
|
||||
+AC_ARG_WITH(Xawincludedir,
|
||||
+ [AS_HELP_STRING([--with-Xawincludedir=DIR],[use Xaw includes from DIR])],
|
||||
+ [XAW_INCLUDES="-I$withval"])
|
||||
+AC_ARG_WITH(Xawlibdir,
|
||||
+ [AS_HELP_STRING([--with-Xawlibdir=DIR],[use Xaw libraries from DIR])],
|
||||
+ [XAW_LIBS="-L$withval"])
|
||||
+
|
||||
+if test "x$with_xaw" != "xyes"; then
|
||||
+ use_lefty="No (disabled)"
|
||||
+else
|
||||
+
|
||||
save_CPPFLAGS=$CPPFLAGS
|
||||
save_LDFLAGS=$LDFLAGS
|
||||
CPPFLAGS="$CPPFLAGS $XPM_INCLUDES $X_CFLAGS"
|
||||
@@ -1941,18 +1956,10 @@
|
||||
AC_MSG_WARN(Optional Xpm library not available), [-lXmu -lXt -lX11 -lXext $SOCKET_LIBS])
|
||||
LDFLAGS=$save_LDFLAGS
|
||||
CPPFLAGS=$save_CPPFLAGS
|
||||
-AC_SUBST([XPM_INCLUDES])
|
||||
-AC_SUBST([XPM_LIBS])
|
||||
|
||||
dnl -----------------------------------
|
||||
dnl INCLUDES and LIBS for XAW
|
||||
|
||||
-AC_ARG_WITH(Xawincludedir,
|
||||
- [AS_HELP_STRING([--with-Xawincludedir=DIR],[use Xaw includes from DIR])],
|
||||
- [XAW_INCLUDES="-I$withval"])
|
||||
-AC_ARG_WITH(Xawlibdir,
|
||||
- [AS_HELP_STRING([--with-Xawlibdir=DIR],[use Xaw libraries from DIR])],
|
||||
- [XAW_LIBS="-L$withval"])
|
||||
save_CPPFLAGS=$CPPFLAGS
|
||||
save_LDFLAGS=$LDFLAGS
|
||||
CPPFLAGS="$CPPFLAGS $XAW_INCLUDES $X_CFLAGS"
|
||||
@@ -1978,12 +1985,17 @@
|
||||
fi
|
||||
LDFLAGS=$save_LDFLAGS
|
||||
CPPFLAGS=$save_CPPFLAGS
|
||||
+
|
||||
+fi
|
||||
+
|
||||
+AC_SUBST([XPM_INCLUDES])
|
||||
+AC_SUBST([XPM_LIBS])
|
||||
AC_SUBST([XAW_INCLUDES])
|
||||
AC_SUBST([XAW_LIBS])
|
||||
-AM_CONDITIONAL(WITH_XAW, [test "x$with_xaw" != "xno"])
|
||||
-if test "x$with_xaw" = "xno"; then
|
||||
+AM_CONDITIONAL(WITH_XAW, [test "x$with_xaw" = "xyes"])
|
||||
+if test "x$with_xaw" != "xyes"; then
|
||||
if test "x$no_x" != "xyes"; then
|
||||
- AC_MSG_WARN(Lefty cannot be built)
|
||||
+ AC_MSG_WARN(Lefty will not be built)
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -1,113 +0,0 @@
|
||||
diff --git a/cmd/gvedit/csettings.cpp b/cmd/gvedit/csettings.cpp
|
||||
index abd321b61768126ab76c43609bf2f96f303f2a82..3c28818ef346bfdb78e46d567b0c2b968e3cf924 100644
|
||||
--- a/cmd/gvedit/csettings.cpp
|
||||
+++ b/cmd/gvedit/csettings.cpp
|
||||
@@ -16,7 +16,7 @@
|
||||
#include "csettings.h"
|
||||
#include "qmessagebox.h"
|
||||
#include "qfiledialog.h"
|
||||
-#include <QtGui>
|
||||
+#include <QtWidgets>
|
||||
#include <qfile.h>
|
||||
#include "mdichild.h"
|
||||
#include "string.h"
|
||||
diff --git a/cmd/gvedit/imageviewer.h b/cmd/gvedit/imageviewer.h
|
||||
index 5145c6a693cea2927b5ffb05719825bdbd289f14..9786aafe6066a341f4b023d620c102a798f98eb0 100644
|
||||
--- a/cmd/gvedit/imageviewer.h
|
||||
+++ b/cmd/gvedit/imageviewer.h
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
#ifndef IMAGEVIEWER_H
|
||||
#define IMAGEVIEWER_H
|
||||
-#include <QtGui>
|
||||
+#include <QtWidgets>
|
||||
#include <QMainWindow>
|
||||
#include <QPrinter>
|
||||
|
||||
diff --git a/cmd/gvedit/mainwindow.cpp b/cmd/gvedit/mainwindow.cpp
|
||||
index c5c9dbd6d8f89335768099d5ee559bbdcb534ef5..0caab977ba04e37a23898f18930b1365d1ffceea 100644
|
||||
--- a/cmd/gvedit/mainwindow.cpp
|
||||
+++ b/cmd/gvedit/mainwindow.cpp
|
||||
@@ -11,7 +11,7 @@
|
||||
* Contributors: See CVS logs. Details at http://www.graphviz.org/
|
||||
*************************************************************************/
|
||||
|
||||
-#include <QtGui>
|
||||
+#include <QtWidgets>
|
||||
#include <qframe.h>
|
||||
#include "mainwindow.h"
|
||||
#include "mdichild.h"
|
||||
diff --git a/cmd/gvedit/mdichild.cpp b/cmd/gvedit/mdichild.cpp
|
||||
index f416b6532980834c4d2a5cde9e8fc6a6bae3b337..457d34b0841f50e3d60b720129a5c6e58072a8a4 100644
|
||||
--- a/cmd/gvedit/mdichild.cpp
|
||||
+++ b/cmd/gvedit/mdichild.cpp
|
||||
@@ -12,7 +12,7 @@
|
||||
*************************************************************************/
|
||||
|
||||
|
||||
-#include <QtGui>
|
||||
+#include <QtWidgets>
|
||||
|
||||
#include "mdichild.h"
|
||||
#include "mainwindow.h"
|
||||
diff --git a/cmd/gvedit/ui_settings.h b/cmd/gvedit/ui_settings.h
|
||||
index 79c73d84fed1ba6d695d9742c94125ce19ac36be..e5c274a90273e2ddbd55e0489f96bc942e3446ac 100644
|
||||
--- a/cmd/gvedit/ui_settings.h
|
||||
+++ b/cmd/gvedit/ui_settings.h
|
||||
@@ -10,22 +10,22 @@
|
||||
#ifndef UI_SETTINGS_H
|
||||
#define UI_SETTINGS_H
|
||||
|
||||
-#include <QtCore/QVariant>
|
||||
-#include <QtGui/QAction>
|
||||
-#include <QtGui/QApplication>
|
||||
-#include <QtGui/QButtonGroup>
|
||||
-#include <QtGui/QComboBox>
|
||||
-#include <QtGui/QDialog>
|
||||
-#include <QtGui/QFrame>
|
||||
-#include <QtGui/QHBoxLayout>
|
||||
-#include <QtGui/QHeaderView>
|
||||
-#include <QtGui/QLabel>
|
||||
-#include <QtGui/QLineEdit>
|
||||
-#include <QtGui/QPushButton>
|
||||
-#include <QtGui/QSpacerItem>
|
||||
-#include <QtGui/QTextEdit>
|
||||
-#include <QtGui/QVBoxLayout>
|
||||
-#include <QtGui/QWidget>
|
||||
+#include <QVariant>
|
||||
+#include <QAction>
|
||||
+#include <QApplication>
|
||||
+#include <QButtonGroup>
|
||||
+#include <QComboBox>
|
||||
+#include <QDialog>
|
||||
+#include <QFrame>
|
||||
+#include <QHBoxLayout>
|
||||
+#include <QHeaderView>
|
||||
+#include <QLabel>
|
||||
+#include <QLineEdit>
|
||||
+#include <QPushButton>
|
||||
+#include <QSpacerItem>
|
||||
+#include <QTextEdit>
|
||||
+#include <QVBoxLayout>
|
||||
+#include <QWidget>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index c80fd64dcf68889b8f04fb48eb5e9f7666f8c43a..811e46dae4bc665eb85f52b7ba271f4c3a22ff9c 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2332,10 +2332,10 @@ if test "x$with_qt" != "xyes"; then
|
||||
use_qt="No (disabled)"
|
||||
else
|
||||
|
||||
- AC_CHECK_PROGS(QMAKE,qmake-qt4 qmake-qt3 qmake,false)
|
||||
+ AC_CHECK_PROGS(QMAKE,qmake-qt5 qmake,false)
|
||||
if test "$QMAKE" != "false"; then
|
||||
- PKG_CHECK_MODULES(QTCORE, [QtCore],[
|
||||
- PKG_CHECK_MODULES(QTGUI, [QtGui],[
|
||||
+ PKG_CHECK_MODULES(QTCORE, [Qt5Core],[
|
||||
+ PKG_CHECK_MODULES(QTGUI, [Qt5Widgets Qt5PrintSupport],[
|
||||
use_qt="Yes"
|
||||
],[
|
||||
use_qt="No (QtGui not available)"
|
||||
Loading…
x
Reference in New Issue
Block a user