cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unbreak build with Clang.

Browse Source 
Still wondering how things were supposed to work with GCC.
This commit is contained in:
zhuk 2017-05-27 09:51:12 +00:00
parent 08a2e05f77
commit 97400a62dc
2 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
productivity/vym/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.23 2016/12/25 14:34:39 zhuk Exp $
# $OpenBSD: Makefile,v 1.24 2017/05/27 09:51:12 zhuk Exp $
COMMENT= generate and manipulate maps of your thoughts
DISTNAME= vym-2.5.0
CATEGORIES= productivity x11
REVISION= 0
REVISION= 1
HOMEPAGE= http://www.insilmaril.de/vym/

39
productivity/vym/patches/patch-exports_cpp Normal file
View File

@ -0,0 +1,39 @@
$OpenBSD: patch-exports_cpp,v 1.1 2017/05/27 09:51:12 zhuk Exp $
Unbreak build with Clang.
Index: exports.cpp
--- exports.cpp.orig
+++ exports.cpp
@@ -556,10 +556,11 @@ void ExportKDE4Bookmarks::doExport()
dia.setShowAgainName("/exports/overwrite/KDE4Bookmarks");
if (dia.exec()==QDialog::Accepted)
{
- model->exportXML(tmpDir.path(),false);
+ QString fpath = tmpDir.path()+"/"+model->getMapName()+".xml";
+ model->exportXML(tmpDir.path(),fpath,false);
XSLTProc p;
- p.setInputFile (tmpDir.path()+"/"+model->getMapName()+".xml");
+ p.setInputFile (fpath);
p.setOutputFile (tmpDir.home().path()+"/.kde4/share/apps/konqueror/bookmarks.xml");
p.setXSLFile (vymBaseDir.path()+"/styles/vym2kdebookmarks.xsl");
p.process();
@@ -586,7 +587,8 @@ void ExportFirefoxBookmarks::doExport()
dia.setShowAgainName("/vym/warnings/overwriteImportBookmarks");
if (dia.exec()==QDialog::Accepted)
{
- model->exportXML(tmpDir.path(),false);
+ QString fpath = tmpDir.path()+"/"+model->getMapName()+".xml";
+ model->exportXML(tmpDir.path(),fpath,false);
/*
XSLTProc p;
@@ -998,7 +1000,7 @@ void ExportHTML::doExport(bool useDialog)
////////////////////////////////////////////////////////////////////////
void ExportTaskjuggler::doExport()
{
- model->exportXML(tmpDir.path(),false);
+ model->exportXML(tmpDir.path(),"",false);
XSLTProc p;
p.setInputFile (tmpDir.path()+"/"+model->getMapName()+".xml");