Attachment #58180 for bug #87735

View | Details | Raw Unified | Return to bug 87735
Collapse All | Expand All

Lines 6-12 Link Here

(-)deskutils/kdissert/Makefile (-2 / +8 lines)
6	#	6	#
7		7
8	PORTNAME= kdissert	8	PORTNAME= kdissert
9	PORTVERSION= 1.0.4	9	PORTVERSION= 1.0.5
10	CATEGORIES= deskutils kde	10	CATEGORIES= deskutils kde
11	MASTER_SITES= http://www.kde-apps.org/content/files/	11	MASTER_SITES= http://www.kde-apps.org/content/files/
12	DISTNAME= 12725-${PORTNAME}-${PORTVERSION}	12	DISTNAME= 12725-${PORTNAME}-${PORTVERSION}
Lines 22-27 Link Here
22	USE_KDELIBS_VER= 3	22	USE_KDELIBS_VER= 3
23	USE_REINPLACE= yes	23	USE_REINPLACE= yes
24		24
		25	.include <bsd.port.pre.mk>
		26
		27	.if ${OSVERSION} < 500035
		28	CXXFLAGS+= -fpermissive
		29	.endif
		30
25	post-patch:	31	post-patch:
26	@${REINPLACE_CMD} -e \	32	@${REINPLACE_CMD} -e \
27	's:%%CXX%%:${CXX}:g ; \	33	's:%%CXX%%:${CXX}:g ; \
Lines 39-42 Link Here
39	@cd ${WRKSRC} && scons install	45	@cd ${WRKSRC} && scons install
40	@${STRIP_CMD} ${PREFIX}/bin/kdissert	46	@${STRIP_CMD} ${PREFIX}/bin/kdissert
41		47
42	.include <bsd.port.mk>	48	.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)deskutils/kdissert/distinfo (-2 / +2 lines)
1	MD5 (12725-kdissert-1.0.4.tar.bz2) = 83102305be711399d80ea61bf6f1ec2f	1	MD5 (12725-kdissert-1.0.5.tar.bz2) = cd8262715c6e38e662b155c7e62e4e15
2	SIZE (12725-kdissert-1.0.4.tar.bz2) = 482414	2	SIZE (12725-kdissert-1.0.5.tar.bz2) = 488894




--- 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) {

Return to bug 87735

Line 0 Link Here

(-)deskutils/kdissert/files/patch-src__kdissert__canvasview__DCanvasView.cpp (+18 lines)
	1	--- src/kdissert/canvasview/DCanvasView.cpp.orig Sat Oct 15 22:22:33 2005
	2	+++ src/kdissert/canvasview/DCanvasView.cpp Tue Oct 18 20:47:13 2005
	3	@@ -1466,6 +1466,7 @@
	4	if (x2>canvas()->width()-limit) dx += extend+x2-limit;
	5	if (y2>canvas()->height()-limit) dy += extend+y2-limit;
	6
	7	+#if !(defined(__GNUC__) && (__GNUC__ < 3))
	8	// just for security: check for hard system limits
	9	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()) {
	10	static bool told(false); // should never happen, but say it once...
	11	@@ -1473,6 +1474,7 @@
	12	told = true;
	13	return;
	14	}
	15	+#endif
	16
	17	// expand if necessary
	18	if (dx>0 \|\| dy>0) {

Lines 19-24 Link Here

(-)deskutils/kdissert/pkg-plist (+5 lines)
19	lib/kde3/libkdissprosperslides.so	19	lib/kde3/libkdissprosperslides.so
20	lib/kde3/libkdissstx.la	20	lib/kde3/libkdissstx.la
21	lib/kde3/libkdissstx.so	21	lib/kde3/libkdissstx.so
		22	share/applications/kde/kdissert.desktop
22	share/applnk/Utilities/kdissert.desktop	23	share/applnk/Utilities/kdissert.desktop
23	share/apps/kdissert/kdissertui.rc	24	share/apps/kdissert/kdissertui.rc
24	share/apps/kdissert/pics/nopix.png	25	share/apps/kdissert/pics/nopix.png
Lines 34-42 Link Here
34	share/apps/kdissert/templatedata/kdissstx.tar.gz	35	share/apps/kdissert/templatedata/kdissstx.tar.gz
35	share/apps/kdissert/tips	36	share/apps/kdissert/tips
36	share/apps/kdissertpart/kdissertpart.rc	37	share/apps/kdissertpart/kdissertpart.rc
		38	share/config.kcfg/kdissert.kcfg
		39	share/doc/HTML/en/kdissert/common
37	share/doc/HTML/en/kdissert/index.cache.bz2	40	share/doc/HTML/en/kdissert/index.cache.bz2
38	share/doc/HTML/en/kdissert/index.docbook	41	share/doc/HTML/en/kdissert/index.docbook
39	share/doc/HTML/en/kdissert/screenshot.jpg	42	share/doc/HTML/en/kdissert/screenshot.jpg
		43	share/doc/HTML/fr/kdissert/common
40	share/doc/HTML/fr/kdissert/index.cache.bz2	44	share/doc/HTML/fr/kdissert/index.cache.bz2
41	share/doc/HTML/fr/kdissert/index.docbook	45	share/doc/HTML/fr/kdissert/index.docbook
42	share/icons/hicolor/128x128/actions/kdissert_sort.png	46	share/icons/hicolor/128x128/actions/kdissert_sort.png
Lines 62-67 Link Here
62	share/locale/nl/LC_MESSAGES/kdissert.mo	66	share/locale/nl/LC_MESSAGES/kdissert.mo
63	share/locale/pl/LC_MESSAGES/kdissert.mo	67	share/locale/pl/LC_MESSAGES/kdissert.mo
64	share/mimelnk/application/x-kdissert.desktop	68	share/mimelnk/application/x-kdissert.desktop
		69	share/services/kdissertpart.desktop
65	@dirrm share/doc/HTML/fr/kdissert	70	@dirrm share/doc/HTML/fr/kdissert
66	@dirrm share/doc/HTML/en/kdissert	71	@dirrm share/doc/HTML/en/kdissert
67	@dirrm share/apps/kdissertpart	72	@dirrm share/apps/kdissertpart