Attachment 58180 Details for Bug 87735 – file.diff

[patch] file.diff

file.diff (text/plain), 3.58 KB, created by tkato432 on 2005-10-20 18:10:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2005-10-20 18:10:14 UTC

Size: 3.58 KB

patch

obsolete

>diff -urN /usr/ports/deskutils/kdissert/Makefile deskutils/kdissert/Makefile
>--- /usr/ports/deskutils/kdissert/Makefile	Mon Oct 10 22:29:51 2005
>+++ deskutils/kdissert/Makefile	Tue Oct 18 21:43:37 2005
>@@ -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_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 @@
> 	@cd ${WRKSRC} && scons install
> 	@${STRIP_CMD} ${PREFIX}/bin/kdissert
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff -urN /usr/ports/deskutils/kdissert/distinfo deskutils/kdissert/distinfo
>--- /usr/ports/deskutils/kdissert/distinfo	Mon Oct 10 22:29:51 2005
>+++ deskutils/kdissert/distinfo	Tue Oct 18 20:21:56 2005
>@@ -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) = cd8262715c6e38e662b155c7e62e4e15
>+SIZE (12725-kdissert-1.0.5.tar.bz2) = 488894
>diff -urN /usr/ports/deskutils/kdissert/files/patch-src__kdissert__canvasview__DCanvasView.cpp deskutils/kdissert/files/patch-src__kdissert__canvasview__DCanvasView.cpp
>--- /usr/ports/deskutils/kdissert/files/patch-src__kdissert__canvasview__DCanvasView.cpp	Thu Jan  1 09:00:00 1970
>+++ deskutils/kdissert/files/patch-src__kdissert__canvasview__DCanvasView.cpp	Tue Oct 18 21:06:32 2005
>@@ -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) {
>diff -urN /usr/ports/deskutils/kdissert/pkg-plist deskutils/kdissert/pkg-plist
>--- /usr/ports/deskutils/kdissert/pkg-plist	Mon Oct 10 22:29:51 2005
>+++ deskutils/kdissert/pkg-plist	Tue Oct 18 21:38:12 2005
>@@ -19,6 +19,7 @@
> 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/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/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

Actions: View | Diff

Attachments on bug 87735: 58180