diff options
| author | wg <wg@FreeBSD.org> | 2014-07-09 23:29:01 +0000 |
|---|---|---|
| committer | wg <wg@FreeBSD.org> | 2014-07-09 23:29:01 +0000 |
| commit | 73d4ea496d190b9930e019204e20d10c77f672aa (patch) | |
| tree | 1c121229429a3a5aeb62326d8f40559591737bc9 | |
| parent | 456cbd69927205860b22eff482d4124fe55b0bd6 (diff) | |
| download | FreeBSD-ports-73d4ea496d190b9930e019204e20d10c77f672aa.zip FreeBSD-ports-73d4ea496d190b9930e019204e20d10c77f672aa.tar.gz | |
math/qalculate: fix build with clang
- Convert lib depends to new syntax
- Add LICENSE
- USES pathfix
PR: 191372
Submitted by: tkato432 yahoo com
| -rw-r--r-- | math/qalculate/Makefile | 16 | ||||
| -rw-r--r-- | math/qalculate/files/patch-src__callbacks.cc | 58 |
2 files changed, 69 insertions, 5 deletions
diff --git a/math/qalculate/Makefile b/math/qalculate/Makefile index 20dcf0d..8ed1e91 100644 --- a/math/qalculate/Makefile +++ b/math/qalculate/Makefile @@ -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> diff --git a/math/qalculate/files/patch-src__callbacks.cc b/math/qalculate/files/patch-src__callbacks.cc new file mode 100644 index 0000000..112a4f9 --- /dev/null +++ b/math/qalculate/files/patch-src__callbacks.cc @@ -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(); + |
