Update to 1.0.5

PR:		ports/87735
Submitted by:	Ports Fury
This commit is contained in:
Volker Stolz 2005-10-28 13:29:21 +00:00
parent b2a7e219ac
commit 4b826d98ce
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=146579
8 changed files with 66 additions and 8 deletions

View File

@ -6,7 +6,7 @@
#
PORTNAME= kdissert
PORTVERSION= 1.0.4
PORTVERSION= 1.0.5
CATEGORIES= deskutils kde
MASTER_SITES= http://www.kde-apps.org/content/files/
DISTNAME= 12725-${PORTNAME}-${PORTVERSION}
@ -22,6 +22,12 @@ USE_BZIP2= yes
USE_KDELIBS_VER= 3
USE_REINPLACE= yes
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500035
CXXFLAGS+= -fpermissive
.endif
post-patch:
@${REINPLACE_CMD} -e \
's:%%CXX%%:${CXX}:g ; \
@ -39,4 +45,4 @@ do-install:
@cd ${WRKSRC} && scons install
@${STRIP_CMD} ${PREFIX}/bin/kdissert
.include <bsd.port.mk>
.include <bsd.port.post.mk>

View File

@ -1,2 +1,2 @@
MD5 (12725-kdissert-1.0.4.tar.bz2) = 83102305be711399d80ea61bf6f1ec2f
SIZE (12725-kdissert-1.0.4.tar.bz2) = 482414
MD5 (12725-kdissert-1.0.5.tar.bz2) = 18ff5d04d633cf3b4e3fbf869c18dd2f
SIZE (12725-kdissert-1.0.5.tar.bz2) = 489281

View File

@ -0,0 +1,18 @@
--- src/kdissert/canvasview/DCanvasView.cpp.orig Sat Oct 15 22:22:33 2005
+++ src/kdissert/canvasview/DCanvasView.cpp Tue Oct 18 20:47:13 2005
@@ -1466,6 +1466,7 @@
if (x2>canvas()->width()-limit) dx += extend+x2-limit;
if (y2>canvas()->height()-limit) dy += extend+y2-limit;
+#if !(defined(__GNUC__) && (__GNUC__ < 3))
// just for security: check for hard system limits
if (((double)canvas()->width()+dx) > (double)std::numeric_limits<typeof(canvas()->width())>::max() || ((double)canvas()->height()+dy) > (double)std::numeric_limits<typeof(canvas()->height())>::max()) {
static bool told(false); // should never happen, but say it once...
@@ -1473,6 +1474,7 @@
told = true;
return;
}
+#endif
// expand if necessary
if (dx>0 || dy>0) {

View File

@ -19,6 +19,7 @@ lib/kde3/libkdissprosperslides.la
lib/kde3/libkdissprosperslides.so
lib/kde3/libkdissstx.la
lib/kde3/libkdissstx.so
share/applications/kde/kdissert.desktop
share/applnk/Utilities/kdissert.desktop
share/apps/kdissert/kdissertui.rc
share/apps/kdissert/pics/nopix.png
@ -34,9 +35,12 @@ share/apps/kdissert/templatedata/kdissprosperslides.tar.gz
share/apps/kdissert/templatedata/kdissstx.tar.gz
share/apps/kdissert/tips
share/apps/kdissertpart/kdissertpart.rc
share/config.kcfg/kdissert.kcfg
share/doc/HTML/en/kdissert/common
share/doc/HTML/en/kdissert/index.cache.bz2
share/doc/HTML/en/kdissert/index.docbook
share/doc/HTML/en/kdissert/screenshot.jpg
share/doc/HTML/fr/kdissert/common
share/doc/HTML/fr/kdissert/index.cache.bz2
share/doc/HTML/fr/kdissert/index.docbook
share/icons/hicolor/128x128/actions/kdissert_sort.png
@ -62,6 +66,7 @@ share/locale/it/LC_MESSAGES/kdissert.mo
share/locale/nl/LC_MESSAGES/kdissert.mo
share/locale/pl/LC_MESSAGES/kdissert.mo
share/mimelnk/application/x-kdissert.desktop
share/services/kdissertpart.desktop
@dirrm share/doc/HTML/fr/kdissert
@dirrm share/doc/HTML/en/kdissert
@dirrm share/apps/kdissertpart

View File

@ -6,7 +6,7 @@
#
PORTNAME= kdissert
PORTVERSION= 1.0.4
PORTVERSION= 1.0.5
CATEGORIES= deskutils kde
MASTER_SITES= http://www.kde-apps.org/content/files/
DISTNAME= 12725-${PORTNAME}-${PORTVERSION}
@ -22,6 +22,12 @@ USE_BZIP2= yes
USE_KDELIBS_VER= 3
USE_REINPLACE= yes
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500035
CXXFLAGS+= -fpermissive
.endif
post-patch:
@${REINPLACE_CMD} -e \
's:%%CXX%%:${CXX}:g ; \
@ -39,4 +45,4 @@ do-install:
@cd ${WRKSRC} && scons install
@${STRIP_CMD} ${PREFIX}/bin/kdissert
.include <bsd.port.mk>
.include <bsd.port.post.mk>

View File

@ -1,2 +1,2 @@
MD5 (12725-kdissert-1.0.4.tar.bz2) = 83102305be711399d80ea61bf6f1ec2f
SIZE (12725-kdissert-1.0.4.tar.bz2) = 482414
MD5 (12725-kdissert-1.0.5.tar.bz2) = 18ff5d04d633cf3b4e3fbf869c18dd2f
SIZE (12725-kdissert-1.0.5.tar.bz2) = 489281

View File

@ -0,0 +1,18 @@
--- src/kdissert/canvasview/DCanvasView.cpp.orig Sat Oct 15 22:22:33 2005
+++ src/kdissert/canvasview/DCanvasView.cpp Tue Oct 18 20:47:13 2005
@@ -1466,6 +1466,7 @@
if (x2>canvas()->width()-limit) dx += extend+x2-limit;
if (y2>canvas()->height()-limit) dy += extend+y2-limit;
+#if !(defined(__GNUC__) && (__GNUC__ < 3))
// just for security: check for hard system limits
if (((double)canvas()->width()+dx) > (double)std::numeric_limits<typeof(canvas()->width())>::max() || ((double)canvas()->height()+dy) > (double)std::numeric_limits<typeof(canvas()->height())>::max()) {
static bool told(false); // should never happen, but say it once...
@@ -1473,6 +1474,7 @@
told = true;
return;
}
+#endif
// expand if necessary
if (dx>0 || dy>0) {

View File

@ -19,6 +19,7 @@ lib/kde3/libkdissprosperslides.la
lib/kde3/libkdissprosperslides.so
lib/kde3/libkdissstx.la
lib/kde3/libkdissstx.so
share/applications/kde/kdissert.desktop
share/applnk/Utilities/kdissert.desktop
share/apps/kdissert/kdissertui.rc
share/apps/kdissert/pics/nopix.png
@ -34,9 +35,12 @@ share/apps/kdissert/templatedata/kdissprosperslides.tar.gz
share/apps/kdissert/templatedata/kdissstx.tar.gz
share/apps/kdissert/tips
share/apps/kdissertpart/kdissertpart.rc
share/config.kcfg/kdissert.kcfg
share/doc/HTML/en/kdissert/common
share/doc/HTML/en/kdissert/index.cache.bz2
share/doc/HTML/en/kdissert/index.docbook
share/doc/HTML/en/kdissert/screenshot.jpg
share/doc/HTML/fr/kdissert/common
share/doc/HTML/fr/kdissert/index.cache.bz2
share/doc/HTML/fr/kdissert/index.docbook
share/icons/hicolor/128x128/actions/kdissert_sort.png
@ -62,6 +66,7 @@ share/locale/it/LC_MESSAGES/kdissert.mo
share/locale/nl/LC_MESSAGES/kdissert.mo
share/locale/pl/LC_MESSAGES/kdissert.mo
share/mimelnk/application/x-kdissert.desktop
share/services/kdissertpart.desktop
@dirrm share/doc/HTML/fr/kdissert
@dirrm share/doc/HTML/en/kdissert
@dirrm share/apps/kdissertpart