<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/80d414b2717ce322c6d1c59213caa8d0a68cdc8e">https://github.com/macports/macports-ports/commit/80d414b2717ce322c6d1c59213caa8d0a68cdc8e</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 80d414b vsd2svg: patch to use libvisio-0.1, librevenge
</span>80d414b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 80d414b2717ce322c6d1c59213caa8d0a68cdc8e
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Tue Dec 17 18:50:06 2019 -0800
<span style='display:block; white-space:pre;color:#404040;'> vsd2svg: patch to use libvisio-0.1, librevenge
</span>---
graphics/vsd2svg/Portfile | 12 +-
.../vsd2svg/files/patch-support-libvisio-0.1.diff | 161 +++++++++++++++++++++
2 files changed, 171 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/vsd2svg/Portfile b/graphics/vsd2svg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 623e317..b8c206c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/vsd2svg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/vsd2svg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span>
name vsd2svg
version 0.1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> license GPL-2+
categories graphics
maintainers {devans @dbevans} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,10 +18,17 @@ description A commandline tool to convert files in VSD (Visio) forma
</span> long_description ${description} VSD is the format used by Visio.
checksums sha256 15d113e7aabeed58a708f0a3209b9b590ac51284738440124e58198997a10f65 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 ce07daa11886a6acdedaaee935978ff5a8483614
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 ce07daa11886a6acdedaaee935978ff5a8483614 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 123952
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:libvisio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:libvisio-0.1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:librevenge
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-support-libvisio-0.1.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoreconf.args -fvi
</span>
livecheck.regex /${name}-(\[0-9.\]+)${extract.suffix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/vsd2svg/files/patch-support-libvisio-0.1.diff b/graphics/vsd2svg/files/patch-support-libvisio-0.1.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..184a71e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/vsd2svg/files/patch-support-libvisio-0.1.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,161 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+commit fca28533281ee3875e1444998e36e2ae348266fa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Felipe Weckx <felipe@weckx.net>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri Aug 15 09:33:38 2014 -0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ support to librevenge and libvisio >= 0.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/NEWS b/NEWS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 943f0cc..93ac894 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- NEWS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ NEWS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++2014-08-14 vsd2svg 0.2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Update to work with libvisio-0.1 and librevenge
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2012-09-02 vsd2svg 0.0.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * First working version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/configure.ac b/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9fd7fc1..3bc64ff 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,7 +4,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_PREREQ([2.67])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m4_define([vsd2svg_version_major],[0])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-m4_define([vsd2svg_version_minor],[1])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++m4_define([vsd2svg_version_minor],[2])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m4_define([vsd2svg_version_micro],[0])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m4_define([vsd2svg_version],[vsd2svg_version_major.vsd2svg_version_minor.vsd2svg_version_micro])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -49,7 +49,8 @@ AC_CONFIG_FILES([Makefile build/Makefile build/win32/Makefile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/Makefile])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Checks for libraries.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-PKG_CHECK_MODULES([libvisio],[libvisio-0.0])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PKG_CHECK_MODULES([libvisio],[libvisio-0.1])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PKG_CHECK_MODULES([librevenge],[librevenge-0.0 librevenge-stream-0.0 librevenge-generators-0.0])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Checks for header files.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_HEADERS([windows.h], [AM_CONDITIONAL([WINDOWS_H], true)],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/installer/rpm/mingw32-vsd2svg.spec b/installer/rpm/mingw32-vsd2svg.spec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0eec9b5..09fae22 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- installer/rpm/mingw32-vsd2svg.spec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ installer/rpm/mingw32-vsd2svg.spec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8,7 +8,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Name: mingw32-vsd2svg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Summary: Convert VSD files into SVG files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Version: 0.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Version: 0.2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Release: 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ License: GPLv2+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Group: Graphics
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/Makefile.am b/src/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 43c8874..00e5904 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,14 +3,14 @@ if WINDOWS_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bin_PROGRAMS += vsd2svg-win
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vsd2svg_win_DEPENDENCIES = @VSD2SVG_WIN_WIN32_RESOURCE@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vsd2svg_win_SOURCES = vsd2svg-win.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- vsd2svg_win_LDADD = $(libvisio_LIBS) -lcomdlg32 @VSD2SVG_WIN_WIN32_RESOURCE@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vsd2svg_win_LDADD = $(libvisio_LIBS) $(librevenge_LIBS) -lcomdlg32 @VSD2SVG_WIN_WIN32_RESOURCE@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vsd2svg_win_LDFLAGS = -mwindows
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AM_CPPFLAGS = $(libvisio_CFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AM_CPPFLAGS = $(libvisio_CFLAGS) $(librevenge_CFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vsd2svg_SOURCES = vsd2svg.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-vsd2svg_LDADD = $(libvisio_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++vsd2svg_LDADD = $(libvisio_LIBS) $(librevenge_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if WINDOWS_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @VSD2SVG_WIN_WIN32_RESOURCE@ : vsd2svg-win.rc $(vsd2svg_win_OBJECTS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/vsd2svg-win.cpp b/src/vsd2svg-win.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f8162db..a8f8f41 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/vsd2svg-win.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/vsd2svg-win.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,19 +28,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <iostream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/stat.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <librevenge-stream/librevenge-stream.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <librevenge-generators/librevenge-generators.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <librevenge/librevenge.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <libvisio/libvisio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <libwpd-stream/libwpd-stream.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <libwpd/libwpd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <windows.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <config.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <vsd2svg-win.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using namespace std;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-char gszVersion[] = "vsd2svg-win 0.1.0";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++char gszVersion[] = "vsd2svg-win 0.2.0";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned giDrawingPageCount = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-libvisio::VSDStringVector output;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++librevenge::RVNGStringVector output;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LPSTR lpCmdLine, int nCmdShow)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -116,7 +116,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- WPXFileStream input(szTmpVisio);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ librevenge::RVNGFileStream input(szTmpVisio);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!libvisio::VisioDocument::isSupported(&input)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MessageBox(NULL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -128,7 +128,8 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (!libvisio::VisioDocument::generateSVG(&input, output)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ librevenge::RVNGSVGDrawingGenerator generator(output, "svg");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!libvisio::VisioDocument::parse(&input, &generator)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MessageBox(NULL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "ERROR: SVG generation failed!",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gszVersion, MB_ICONERROR);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/vsd2svg.cpp b/src/vsd2svg.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9be3a84..bf26886 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/vsd2svg.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/vsd2svg.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,9 +27,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <fstream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <iostream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/stat.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <librevenge-stream/librevenge-stream.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <librevenge-generators/librevenge-generators.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <librevenge/librevenge.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <libvisio/libvisio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <libwpd-stream/libwpd-stream.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <libwpd/libwpd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <strings.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <config.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73,7 +74,7 @@ int main(int argc, char *argv[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- WPXFileStream input(argv[1 + allpages]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ librevenge::RVNGFileStream input(argv[1 + allpages]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!libvisio::VisioDocument::isSupported(&input)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cerr <<
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -82,8 +83,9 @@ int main(int argc, char *argv[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- libvisio::VSDStringVector output;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (!libvisio::VisioDocument::generateSVG(&input, output)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ librevenge::RVNGStringVector output;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ librevenge::RVNGSVGDrawingGenerator generator(output, "svg");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!libvisio::VisioDocument::parse(&input, &generator)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cerr << "ERROR: SVG Generation failed!" << endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span></pre><pre style='margin:0'>
</pre>