ports/76271: Update port: deskutils/vym
Gerrit Beine
tux at pinguru.net
Sat Jan 15 12:00:50 UTC 2005
>Number: 76271
>Category: ports
>Synopsis: Update port: deskutils/vym
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Jan 15 12:00:47 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Gerrit Beine
>Release: FreeBSD 5.3-RELEASE
>Organization:
pitcom GmbH
>Environment:
FreeBSD asus.site 5.3-RELEASE FreeBSD 5.3-RELEASE #0: Fri Nov 12 23:43:33 CET 2004 root at asus.site:/usr/src/sys/i386/compile/ASUS i386
>Description:
Update to version 1.6.0
Replaced all calls of lrint to (long)rint, I hope this fixes the compiling bug on AMD64.
The files patch-mainwindow.cpp and patch-mapeditor.cpp are no longer required.
>How-To-Repeat:
>Fix:
diff -Nur /usr/ports/deskutils/vym/Makefile vym/Makefile
--- /usr/ports/deskutils/vym/Makefile Fri Oct 22 17:20:32 2004
+++ vym/Makefile Sat Jan 15 12:14:05 2005
@@ -2,11 +2,11 @@
# Date created: 17 Oct 2004
# Whom: Gerrit Beine <tux at pinguru.net>
#
-# $FreeBSD: ports/deskutils/vym/Makefile,v 1.1 2004/10/22 15:20:32 tobez Exp $
+# $FreeBSD$
#
PORTNAME= vym
-PORTVERSION= 1.5.0
+PORTVERSION= 1.6.0
CATEGORIES= deskutils
MASTER_SITES= http://www.insilmaril.de/vym/download/
MASTER_SITE_SUBDIR= ${PORTVERSION}
diff -Nur /usr/ports/deskutils/vym/distinfo vym/distinfo
--- /usr/ports/deskutils/vym/distinfo Fri Oct 22 17:20:32 2004
+++ vym/distinfo Sat Jan 15 12:14:22 2005
@@ -1,2 +1,2 @@
-MD5 (vym-1.5.0.tar.gz) = 3343b35d1b072e5359c76b9625a21cbb
-SIZE (vym-1.5.0.tar.gz) = 326937
+MD5 (vym-1.6.0.tar.gz) = e0e2c6058c750d6429ee37652bc5f843
+SIZE (vym-1.6.0.tar.gz) = 538617
diff -Nur /usr/ports/deskutils/vym/files/patch-floatimageobj.cpp vym/files/patch-floatimageobj.cpp
--- /usr/ports/deskutils/vym/files/patch-floatimageobj.cpp Fri Oct 22 17:20:32 2004
+++ vym/files/patch-floatimageobj.cpp Sat Jan 15 12:36:08 2005
@@ -1,15 +1,19 @@
---- floatimageobj.cpp.orig Sun Sep 26 22:45:56 2004
-+++ floatimageobj.cpp Sun Oct 17 17:12:27 2004
-@@ -2,6 +2,12 @@
+--- floatimageobj.cpp.orig Tue Oct 19 18:31:12 2004
++++ floatimageobj.cpp Sat Jan 15 12:25:08 2005
+@@ -1,6 +1,6 @@
++#include <math.h>
+ #include "floatimageobj.h"
#include "branchobj.h"
- #include <math.h>
+-#include <math.h>
-+#if !defined(HAVE_LRINTF)
-+static inline long int lrint(double x)
-+{
-+ return (long)(rint(x));
-+}
-+#endif
/////////////////////////////////////////////////////////////////
- // FloatImageObj
+@@ -67,7 +67,7 @@
+
+ int FloatImageObj::z ()
+ {
+- return lrint (icon->z());
++ return (long)rint (icon->z());
+ }
+
+ bool FloatImageObj::load (const QString &fn)
diff -Nur /usr/ports/deskutils/vym/files/patch-linkablemapobj.cpp vym/files/patch-linkablemapobj.cpp
--- /usr/ports/deskutils/vym/files/patch-linkablemapobj.cpp Fri Oct 22 17:20:32 2004
+++ vym/files/patch-linkablemapobj.cpp Sat Jan 15 12:41:47 2005
@@ -1,33 +1,85 @@
---- linkablemapobj.cpp.orig Fri Sep 24 16:50:15 2004
-+++ linkablemapobj.cpp Thu Oct 21 17:22:44 2004
-@@ -6,6 +6,12 @@
+--- linkablemapobj.cpp.orig Tue Jan 4 10:49:50 2005
++++ linkablemapobj.cpp Sat Jan 15 12:41:45 2005
+@@ -1,4 +1,4 @@
+-//#include <math.h>
++#include <math.h>
- #include "version.h"
+ #include "linkablemapobj.h"
+ #include "branchobj.h"
+@@ -456,10 +456,10 @@
+ double vy=p2y - p1y;
-+#if !defined(HAVE_LRINTF)
-+static inline long int lrint(double x)
-+{
-+ return (long)(rint(x));
-+}
-+#endif
-
- /////////////////////////////////////////////////////////////////
- // LinkableMapObj
-@@ -400,7 +406,7 @@
- lrint(p1y) );
+ // Draw the horizontal line below heading (from ChildPos to ParPos)
+- bottomline->setPoints (lrint(childPos.x()),
+- lrint(childPos.y()),
+- lrint(p1x),
+- lrint(p1y) );
++ bottomline->setPoints ((long)rint(childPos.x()),
++ (long)rint(childPos.y()),
++ (long)rint(p1x),
++ (long)rint(p1y) );
double a; // angle
-- if (abs(vx)<0.000001)
-+ if (fabs(vx)<0.000001)
- a=M_PI_2;
+ if (vx > -0.000001 && vx < 0.000001)
+@@ -467,7 +467,7 @@
else
a=atan( vy / vx );
-@@ -611,7 +617,7 @@
- double pny;
- double m;
+ // "turning point" for drawing polygonal links
+- QPoint tp (-lrint(sin (a)*thickness_start), lrint(cos (a)*thickness_start));
++ QPoint tp (-(long)rint(sin (a)*thickness_start), (long)rint(cos (a)*thickness_start));
+
+ QCanvasLine *cl;
-- if (abs(vx) <0.0001)
-+ if (fabs(vx) <0.0001)
- m=0;
- else
+@@ -477,10 +477,10 @@
+ switch (style)
+ {
+ case StyleLine:
+- l->setPoints( lrint (parPos.x()),
+- lrint(parPos.y()),
+- lrint(p2x),
+- lrint(p2y) );
++ l->setPoints( (long)rint (parPos.x()),
++ (long)rint(parPos.y()),
++ (long)rint(p2x),
++ (long)rint(p2y) );
+ break;
+ case StyleParabel:
+ parabel (pa0, p1x,p1y,p2x,p2y);
+@@ -492,15 +492,15 @@
+ }
+ break;
+ case StylePolyLine:
+- pa0[0]=QPoint (lrint(p2x+tp.x()), lrint(p2y+tp.y()));
+- pa0[1]=QPoint (lrint(p2x-tp.x()), lrint(p2y-tp.y()));
+- pa0[2]=QPoint (lrint (parPos.x()), lrint(parPos.y()) );
++ pa0[0]=QPoint ((long)rint(p2x+tp.x()), (long)rint(p2y+tp.y()));
++ pa0[1]=QPoint ((long)rint(p2x-tp.x()), (long)rint(p2y-tp.y()));
++ pa0[2]=QPoint ((long)rint (parPos.x()), (long)rint(parPos.y()) );
+ p->setPoints (pa0);
+ // here too, draw line to avoid missing pixels
+- l->setPoints( lrint (parPos.x()),
+- lrint(parPos.y()),
+- lrint(p2x),
+- lrint(p2y) );
++ l->setPoints( (long)rint (parPos.x()),
++ (long)rint(parPos.y()),
++ (long)rint(p2x),
++ (long)rint(p2y) );
+ break;
+ case StylePolyParabel:
+ parabel (pa1, p1x,p1y,p2x+tp.x(),p2y+tp.y());
+@@ -680,12 +680,12 @@
m=(vy / (vx*vx));
+ dx=vx/(arcsegs);
+ int i;
+- ya.setPoint (0,QPoint (lrint(p1x),lrint(p1y)));
++ ya.setPoint (0,QPoint ((long)rint(p1x),(long)rint(p1y)));
+ for (i=1;i<=arcsegs;i++)
+ {
+ pnx=p1x+dx;
+ pny=m*(pnx-parPos.x())*(pnx-parPos.x())+parPos.y();
+- ya.setPoint (i,QPoint (lrint(pnx),lrint(pny)));
++ ya.setPoint (i,QPoint ((long)rint(pnx),(long)rint(pny)));
+ p1x=pnx;
+ p1y=pny;
+ }
diff -Nur /usr/ports/deskutils/vym/files/patch-mainwindow.cpp vym/files/patch-mainwindow.cpp
--- /usr/ports/deskutils/vym/files/patch-mainwindow.cpp Fri Oct 22 17:20:32 2004
+++ vym/files/patch-mainwindow.cpp Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
---- mainwindow.cpp.orig Tue Sep 28 14:13:06 2004
-+++ mainwindow.cpp Sun Oct 17 23:49:36 2004
-@@ -53,6 +53,8 @@
- #include "showtextdialog.h"
- #include "process.h"
-
-+#include <unistd.h>
-+
- extern TextEditor *textEditor;
- extern Main *mainWindow;
- extern int statusbarTime;
diff -Nur /usr/ports/deskutils/vym/files/patch-mapeditor.cpp vym/files/patch-mapeditor.cpp
--- /usr/ports/deskutils/vym/files/patch-mapeditor.cpp Fri Oct 22 17:20:32 2004
+++ vym/files/patch-mapeditor.cpp Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
---- mapeditor.cpp.orig Sun Sep 26 22:45:57 2004
-+++ mapeditor.cpp Sun Oct 17 23:49:21 2004
-@@ -53,6 +53,8 @@
- #include "icons/flag-flash.xpm"
- #include "icons/flag-lifebelt.xpm"
-
-+#include <unistd.h>
-+
- extern TextEditor *textEditor;
- extern int statusbarTime;
- extern Main *mainWindow;
diff -Nur /usr/ports/deskutils/vym/files/patch-misc.cpp vym/files/patch-misc.cpp
--- /usr/ports/deskutils/vym/files/patch-misc.cpp Fri Oct 22 17:20:32 2004
+++ vym/files/patch-misc.cpp Sat Jan 15 12:36:37 2005
@@ -1,15 +1,18 @@
--- misc.cpp.orig Sun Sep 26 22:45:57 2004
-+++ misc.cpp Sun Oct 17 17:11:40 2004
-@@ -5,6 +5,12 @@
-
- #include "misc.h"
-
-+#if !defined(HAVE_LRINTF)
-+static inline long int lrint(double x)
-+{
-+ return (long)(rint(x));
-+}
-+#endif
-
- ostream &operator<< (ostream &stream, QPoint const &p)
- {
++++ misc.cpp Sat Jan 15 12:30:23 2005
+@@ -223,13 +223,13 @@
+ if (pix.width()>max_w)
+ {
+ r=max_w / pix.width();
+- pix.resize(lrint(pix.width()*r), lrint(pix.height()*r));
++ pix.resize((long)rint(pix.width()*r), (long)rint(pix.height()*r));
+ // TODO not a resize, but a shrink/enlarge is needed here...
+ }
+ if (pix.height()>max_h)
+ {
+ r=max_h / pix.height();
+- pix.resize(lrint(pix.width()*r), lrint(pix.height()*r));
++ pix.resize((long)rint(pix.width()*r), (long)rint(pix.height()*r));
+ // TODO not a resize, but a shrink/enlarge is needed here...
+ }
+ setPixmap( pix );
diff -Nur /usr/ports/deskutils/vym/pkg-plist vym/pkg-plist
--- /usr/ports/deskutils/vym/pkg-plist Fri Oct 22 17:20:32 2004
+++ vym/pkg-plist Sat Jan 15 12:50:06 2005
@@ -11,23 +11,11 @@
%%DATADIR%%/styles/vym2html.xsl
%%DATADIR%%/styles/vym2txt.xsl
%%DATADIR%%/styles/vym2xhtml.xsl
-%%PORTDOCS%%%%DOCSDIR%%/tex/branches-flags.png
-%%PORTDOCS%%%%DOCSDIR%%/tex/branches.png
-%%PORTDOCS%%%%DOCSDIR%%/tex/color-buttons.png
-%%PORTDOCS%%%%DOCSDIR%%/tex/default-flags.png
-%%PORTDOCS%%%%DOCSDIR%%/tex/example1.png
-%%PORTDOCS%%%%DOCSDIR%%/tex/find-window.png
-%%PORTDOCS%%%%DOCSDIR%%/tex/flag-url.png
-%%PORTDOCS%%%%DOCSDIR%%/tex/flag-vymlink.png
-%%PORTDOCS%%%%DOCSDIR%%/tex/formatfixedfont.png
-%%PORTDOCS%%%%DOCSDIR%%/tex/move-buttons.png
-%%PORTDOCS%%%%DOCSDIR%%/tex/vym.tex
-%%PORTDOCS%%%%DOCSDIR%%/tex/windows.png
-%%PORTDOCS%%%%DOCSDIR%%/tex/zoom-buttons.png
+%%PORTDOCS%%%%DOCSDIR%%/vym.pdf
%%PORTDOCS%%%%EXAMPLESDIR%%/liveform.vym
+%%PORTDOCS%%%%EXAMPLESDIR%%/math.vym
%%PORTDOCS%%%%EXAMPLESDIR%%/time-management.vym
%%PORTDOCS%%%%EXAMPLESDIR%%/todo.vym
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/tex
%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
@dirrm %%DATADIR%%/scripts
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list