Date: Tuesday, April 30, 2019 @ 21:44:08
Author: arojas
Revision: 352331
archrelease: copy trunk to extra-x86_64
Added:
graphviz/repos/extra-x86_64/PKGBUILD
(from rev 352330, graphviz/trunk/PKGBUILD)
graphviz/repos/extra-x86_64/ghostscript918.patch
(from rev 352330, graphviz/trunk/ghostscript918.patch)
graphviz/repos/extra-x86_64/graphviz-qt5.patch
(from rev 352330, graphviz/trunk/graphviz-qt5.patch)
graphviz/repos/extra-x86_64/install
(from rev 352330, graphviz/trunk/install)
Deleted:
graphviz/repos/extra-x86_64/PKGBUILD
graphviz/repos/extra-x86_64/ghostscript918.patch
graphviz/repos/extra-x86_64/install
----------------------+
PKGBUILD | 117 +++++++++++++++++++++++++------------------------
ghostscript918.patch | 36 +++++++--------
graphviz-qt5.patch | 113 +++++++++++++++++++++++++++++++++++++++++++++++
install | 24 +++++-----
4 files changed, 204 insertions(+), 86 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-04-30 21:43:26 UTC (rev 352330)
+++ PKGBUILD 2019-04-30 21:44:08 UTC (rev 352331)
@@ -1,56 +0,0 @@
-# Maintainer: Gaetan Bisson <bis...@archlinux.org>
-# Contributor: kevin <ke...@archlinux.org>
-# Contributor: John Proctor <jproc...@prium.net>
-
-pkgname=graphviz
-pkgver=2.40.1
-pkgrel=14
-pkgdesc='Graph visualization software'
-url='http://www.graphviz.org/'
-license=('EPL')
-arch=('x86_64')
-depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts'
'gsfonts' 'libnsl')
-makedepends=('swig' 'mono' 'guile' 'lua' 'ocaml' 'perl' 'python2' 'r' 'tk'
'qt4' 'gtk2')
-optdepends=('mono: sharp bindings'
- 'guile: guile bindings'
- 'lua: lua bindings'
- 'ocaml: ocaml bindings'
- 'perl: perl bindings'
- 'python2: python bindings'
- 'r: r bindings'
- 'tcl: tcl bindings'
- 'qt4: gvedit'
- 'gtk2: gtk output plugin'
- 'xterm: vimdot')
-
-# http://www.graphviz.org/Download_source.php
-source=("https://graphviz.gitlab.io/pub/graphviz/stable/SOURCES/graphviz.tar.gz";
- 'ghostscript918.patch')
-sha256sums=('ca5218fade0204d59947126c38439f432853543b0818d9d728c589dfe7f3a421'
- '0083d126e27f2223ec4226fc1d71c9c84106968a0fdf65de838aee1e4882bfdb')
-
-install=install
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 -i ../ghostscript918.patch
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- export PYTHON=python2
- export LIBPOSTFIX=/
-
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- # Deduplicates TCL libraries
- cd "${pkgdir}/usr/lib/tcl8.6"
- rm -fr graphviz
- ln -s ../graphviz/tcl graphviz
-}
Copied: graphviz/repos/extra-x86_64/PKGBUILD (from rev 352330,
graphviz/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-04-30 21:44:08 UTC (rev 352331)
@@ -0,0 +1,61 @@
+# Maintainer: Gaetan Bisson <bis...@archlinux.org>
+# Contributor: kevin <ke...@archlinux.org>
+# Contributor: John Proctor <jproc...@prium.net>
+
+pkgname=graphviz
+pkgver=2.40.1
+pkgrel=15
+pkgdesc='Graph visualization software'
+url='https://www.graphviz.org/'
+license=('EPL')
+arch=('x86_64')
+depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts'
'gsfonts' 'libnsl')
+makedepends=('swig' 'mono' 'guile' 'lua' 'ocaml' 'perl' 'python2' 'r' 'tk'
'qt5-base' 'gtk2')
+optdepends=('mono: sharp bindings'
+ 'guile: guile bindings'
+ 'lua: lua bindings'
+ 'ocaml: ocaml bindings'
+ 'perl: perl bindings'
+ 'python2: python bindings'
+ 'r: r bindings'
+ 'tcl: tcl bindings'
+ 'qt5-base: gvedit'
+ 'gtk2: gtk output plugin'
+ 'xterm: vimdot')
+
+# http://www.graphviz.org/Download_source.php
+source=("https://graphviz.gitlab.io/pub/graphviz/stable/SOURCES/graphviz.tar.gz";
+ 'graphviz-qt5.patch'
+ 'ghostscript918.patch')
+sha256sums=('ca5218fade0204d59947126c38439f432853543b0818d9d728c589dfe7f3a421'
+ '447de21d9c54aaa28a8ae6e35e7de1d3cc2fb45e4c3e5ca9e246e6e219d72735'
+ '0083d126e27f2223ec4226fc1d71c9c84106968a0fdf65de838aee1e4882bfdb')
+
+install=install
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i ../ghostscript918.patch
+ patch -p1 -i ../graphviz-qt5.patch # Port to Qt5
+ ./autogen.sh
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ export PYTHON=python2
+ export LIBPOSTFIX=/
+ export CXXFLAGS+=' -fPIC'
+
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+
+ # Deduplicates TCL libraries
+ cd "${pkgdir}/usr/lib/tcl8.6"
+ rm -fr graphviz
+ ln -s ../graphviz/tcl graphviz
+}
Deleted: ghostscript918.patch
===================================================================
--- ghostscript918.patch 2019-04-30 21:43:26 UTC (rev 352330)
+++ ghostscript918.patch 2019-04-30 21:44:08 UTC (rev 352331)
@@ -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";
Copied: graphviz/repos/extra-x86_64/ghostscript918.patch (from rev 352330,
graphviz/trunk/ghostscript918.patch)
===================================================================
--- ghostscript918.patch (rev 0)
+++ ghostscript918.patch 2019-04-30 21:44:08 UTC (rev 352331)
@@ -0,0 +1,18 @@
+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";
Copied: graphviz/repos/extra-x86_64/graphviz-qt5.patch (from rev 352330,
graphviz/trunk/graphviz-qt5.patch)
===================================================================
--- graphviz-qt5.patch (rev 0)
+++ graphviz-qt5.patch 2019-04-30 21:44:08 UTC (rev 352331)
@@ -0,0 +1,113 @@
+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)"
Deleted: install
===================================================================
--- install 2019-04-30 21:43:26 UTC (rev 352330)
+++ install 2019-04-30 21:44:08 UTC (rev 352331)
@@ -1,12 +0,0 @@
-post_install() {
- rm -f usr/lib/graphviz/config{,6}
- usr/bin/dot -c
-}
-
-post_upgrade() {
- post_install
-}
-
-pre_remove() {
- rm -f usr/lib/graphviz/config{,6}
-}
Copied: graphviz/repos/extra-x86_64/install (from rev 352330,
graphviz/trunk/install)
===================================================================
--- install (rev 0)
+++ install 2019-04-30 21:44:08 UTC (rev 352331)
@@ -0,0 +1,12 @@
+post_install() {
+ rm -f usr/lib/graphviz/config{,6}
+ usr/bin/dot -c
+}
+
+post_upgrade() {
+ post_install
+}
+
+pre_remove() {
+ rm -f usr/lib/graphviz/config{,6}
+}
