From owner-svn-ports-head@FreeBSD.ORG Wed Jul 9 23:29:02 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5387230A; Wed, 9 Jul 2014 23:29:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4051E2649; Wed, 9 Jul 2014 23:29:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s69NT2fZ089427; Wed, 9 Jul 2014 23:29:02 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s69NT158089424; Wed, 9 Jul 2014 23:29:01 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201407092329.s69NT158089424@svn.freebsd.org> From: William Grzybowski Date: Wed, 9 Jul 2014 23:29:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361419 - in head/math/qalculate: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jul 2014 23:29:02 -0000 Author: wg Date: Wed Jul 9 23:29:01 2014 New Revision: 361419 URL: http://svnweb.freebsd.org/changeset/ports/361419 QAT: https://qat.redports.org/buildarchive/r361419/ Log: math/qalculate: fix build with clang - Convert lib depends to new syntax - Add LICENSE - USES pathfix PR: 191372 Submitted by: tkato432 yahoo com Added: head/math/qalculate/files/patch-src__callbacks.cc (contents, props changed) Modified: head/math/qalculate/Makefile Modified: head/math/qalculate/Makefile ============================================================================== --- head/math/qalculate/Makefile Wed Jul 9 23:03:04 2014 (r361418) +++ head/math/qalculate/Makefile Wed Jul 9 23:29:01 2014 (r361419) @@ -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 Added: head/math/qalculate/files/patch-src__callbacks.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/qalculate/files/patch-src__callbacks.cc Wed Jul 9 23:29:01 2014 (r361419) @@ -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(); +