Attachment 144125 Details for Bug 191372 – math_qalculate.diff

[patch] math_qalculate.diff

math_qalculate.diff (text/plain), 3.61 KB, created by tkato432 on 2014-06-25 18:41:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2014-06-25 18:41:35 UTC

Size: 3.61 KB

patch

obsolete

>diff -urN /usr/ports/math/qalculate/Makefile math/qalculate/Makefile
>--- /usr/ports/math/qalculate/Makefile	2014-06-21 17:46:36.000000000 +0900
>+++ math/qalculate/Makefile	2014-06-26 00:00:00.000000000 +0900
>@@ -3,25 +3,31 @@
> 
> PORTNAME=	qalculate
> PORTVERSION=	0.9.7
>+DISTVERSIONPREFIX=	gtk-
> PORTREVISION=	2
> CATEGORIES=	math
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-gtk/${PORTNAME}-gtk-${PORTVERSION}
>-DISTNAME=	${PORTNAME}-gtk-${PORTVERSION}
> 
> MAINTAINER=	ports@FreeBSD.org
>-COMMENT=	A multi-purpose desktop calculator (Gnome frontend)
>+COMMENT=	Multi-purpose desktop calculator (Gnome frontend)
> 
>-LIB_DEPENDS=	qalculate.5:${PORTSDIR}/math/libqalculate
>-RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot \
>-		wget:${PORTSDIR}/ftp/wget
>+LICENSE=	GPLv2
> 
>-USE_GNOME=	gnomehack gnomeprefix intlhack libglade2 libgnome
>-USES=		gettext gmake
>+LIB_DEPENDS=	libqalculate.so:${PORTSDIR}/math/libqalculate
>+RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget \
>+		gnuplot:${PORTSDIR}/math/gnuplot
>+
>+USES=		gettext gmake pathfix
>+USE_GNOME=	gnomehier libglade2 libgnome
> GNU_CONFIGURE=	yes
> INSTALLS_OMF=	yes
> 
>-NO_STAGE=	yes
> post-patch:
>-	@${REINPLACE_CMD} -e 's/^GMSGFMT = @GMSGFMT@/GMSGFMT = msgfmt/' ${WRKSRC}/po/Makefile.in.in
>+	@${REINPLACE_CMD} -e \
>+		'/^Icon/s|=$.*$|=${PREFIX}/share/pixmaps/\1|' \
>+		${WRKSRC}/data/qalculate-gtk.desktop.in
>+	@${REINPLACE_CMD} -e \
>+		's/^GMSGFMT = @GMSGFMT@/GMSGFMT = msgfmt/' \
>+		${WRKSRC}/po/Makefile.in.in
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/math/qalculate/files/patch-src__callbacks.cc math/qalculate/files/patch-src__callbacks.cc
>--- /usr/ports/math/qalculate/files/patch-src__callbacks.cc	1970-01-01 09:00:00.000000000 +0900
>+++ math/qalculate/files/patch-src__callbacks.cc	2014-06-26 00:00:00.000000000 +0900
>@@ -0,0 +1,58 @@
>+--- src/callbacks.cc.orig
>++++ src/callbacks.cc
>+@@ -346,7 +346,7 @@
>+ 			it->sort();
>+ 		}
>+ 	}
>+-	bool operator < (tree_struct &s1) const {
>++	bool operator < (const tree_struct &s1) const {
>+ 		return item < s1.item;	
>+ 	}	
>+ };
>+@@ -388,12 +388,12 @@
>+ }
>+ 
>+ void show_message(const gchar *text, GtkWidget *win) {
>+-	GtkWidget *edialog = gtk_message_dialog_new(GTK_WINDOW(win), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, text);
>++	GtkWidget *edialog = gtk_message_dialog_new(GTK_WINDOW(win), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", text);
>+ 	gtk_dialog_run(GTK_DIALOG(edialog));
>+ 	gtk_widget_destroy(edialog);
>+ }
>+ bool ask_question(const gchar *text, GtkWidget *win) {
>+-	GtkWidget *edialog = gtk_message_dialog_new(GTK_WINDOW(win), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_YES_NO, text);
>++	GtkWidget *edialog = gtk_message_dialog_new(GTK_WINDOW(win), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_YES_NO, "%s", text);
>+ 	int question_answer = gtk_dialog_run(GTK_DIALOG(edialog));
>+ 	gtk_widget_destroy(edialog);
>+ 	return question_answer == GTK_RESPONSE_YES;
>+@@ -654,6 +654,7 @@
>+ 					GTK_DIALOG_DESTROY_WITH_PARENT,
>+ 					GTK_MESSAGE_INFO,
>+ 					GTK_BUTTONS_CLOSE,
>++					"%s",
>+ 					CALCULATOR->message()->message().c_str());
>+ 			gtk_dialog_run(GTK_DIALOG(edialog));
>+ 			gtk_widget_destroy(edialog);
>+@@ -667,6 +668,7 @@
>+ 					GTK_DIALOG_DESTROY_WITH_PARENT,
>+ 					GTK_MESSAGE_ERROR,
>+ 					GTK_BUTTONS_CLOSE,
>++					"%s",
>+ 					str.c_str());
>+ 		} else {
>+ 			edialog = gtk_message_dialog_new(
>+@@ -674,6 +676,7 @@
>+ 					GTK_DIALOG_DESTROY_WITH_PARENT,
>+ 					GTK_MESSAGE_WARNING,
>+ 					GTK_BUTTONS_CLOSE,
>++					"%s",
>+ 					str.c_str());
>+ 		}
>+ 
>+@@ -9405,6 +9408,7 @@
>+ 	} else {
>+ 		first_time = true;
>+ 	}
>++	fclose(file);
>+ 	if(show_keypad) show_history = false;
>+ 	set_saved_mode();
>+

Actions: View | Diff

Attachments on bug 191372: 144125