mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00
Code Issues Releases Activity

math/qalculate: fix build with clang

Browse Source 
- Convert lib depends to new syntax
- Add LICENSE
- USES pathfix

PR:		191372
Submitted by:	tkato432 yahoo com
This commit is contained in:
William Grzybowski 2014-07-09 23:29:01 +00:00
parent 1cee02cf4d
commit fc9556ced8
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=361419
2 changed files with 69 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
math/qalculate/Makefile
View File

@ -11,17 +11,23 @@ DISTNAME= ${PORTNAME}-gtk-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Multi-purpose desktop calculator (Gnome frontend)
LIB_DEPENDS= qalculate.5:${PORTSDIR}/math/libqalculate
LICENSE= GPLv2
LIB_DEPENDS= libqalculate.so:${PORTSDIR}/math/libqalculate
RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot \
wget:${PORTSDIR}/ftp/wget
USE_GNOME= gnomehack gnomeprefix intlhack libglade2 libgnome
USES= gettext gmake
USE_GNOME= gnomehier libglade2 libgnome
USES= gettext gmake pathfix
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>

58
math/qalculate/files/patch-src__callbacks.cc Normal file
View File

@ -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();