From owner-svn-ports-head@FreeBSD.ORG Wed Feb 19 19:03:45 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E43AC711; Wed, 19 Feb 2014 19:03:44 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C4ED91836; Wed, 19 Feb 2014 19:03:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1JJ3iLg016602; Wed, 19 Feb 2014 19:03:44 GMT (envelope-from rm@svn.freebsd.org) Received: (from rm@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1JJ3iBN016597; Wed, 19 Feb 2014 19:03:44 GMT (envelope-from rm@svn.freebsd.org) Message-Id: <201402191903.s1JJ3iBN016597@svn.freebsd.org> From: Ruslan Makhmatkhanov Date: Wed, 19 Feb 2014 19:03:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r345132 - in head/graphics/rawstudio: . 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.17 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, 19 Feb 2014 19:03:45 -0000 Author: rm Date: Wed Feb 19 19:03:43 2014 New Revision: 345132 URL: http://svnweb.freebsd.org/changeset/ports/345132 QAT: https://qat.redports.org/buildarchive/r345132/ Log: - fix build with clang - support staging - convert desktopfileutils dependency to USES PR: 186771 Submitted by: Alex Samorukov (maintainer) MFH: 2014Q1 Added: head/graphics/rawstudio/files/patch-rs-macros.h (contents, props changed) head/graphics/rawstudio/files/patch-rs-tag-gui.c (contents, props changed) Modified: head/graphics/rawstudio/Makefile Modified: head/graphics/rawstudio/Makefile ============================================================================== --- head/graphics/rawstudio/Makefile Wed Feb 19 18:42:43 2014 (r345131) +++ head/graphics/rawstudio/Makefile Wed Feb 19 19:03:43 2014 (r345132) @@ -26,12 +26,11 @@ BUILD_DEPENDS= ${LOCALBASE}/include/fftw GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -USES= gettext gmake pkgconfig -USE_GNOME= gtk20 libxml2 gconf2 desktopfileutils gnomehack +USES= desktop-file-utils gettext gmake pkgconfig +USE_GNOME= gtk20 libxml2 gconf2 gnomehack USE_SQLITE= 3 USE_LDCONFIG= yes -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's, libssl,,' ${WRKSRC}/configure Added: head/graphics/rawstudio/files/patch-rs-macros.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/rawstudio/files/patch-rs-macros.h Wed Feb 19 19:03:43 2014 (r345132) @@ -0,0 +1,16 @@ +--- librawstudio/rs-macros.h 2014-02-19 06:34:15.000000000 +0100 ++++ librawstudio/rs-macros.h 2014-02-19 06:34:21.000000000 +0100 +@@ -51,12 +51,12 @@ + #if __GNUC__ >= 3 + #define likely(x) __builtin_expect (!!(x), 1) + #define unlikely(x) __builtin_expect (!!(x), 0) +-#define align(x) __attribute__ ((aligned (x))) ++// #define align(x) __attribute__ ((aligned (x))) + #define __deprecated __attribute__ ((deprecated)) + #else + #define likely(x) (x) + #define unlikely(x) (x) +-#define align(x) ++// #define align(x) + #define __deprecated + #endif Added: head/graphics/rawstudio/files/patch-rs-tag-gui.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/rawstudio/files/patch-rs-tag-gui.c Wed Feb 19 19:03:43 2014 (r345132) @@ -0,0 +1,28 @@ +--- src/rs-tag-gui.c.orig 2011-02-15 18:28:05.000000000 +0100 ++++ src/rs-tag-gui.c 2014-02-14 18:36:48.000000000 +0100 +@@ -93,11 +93,6 @@ + return box; + } + +-GtkWidget * +-rs_library_tag_entry_new(RSLibrary *library) +-{ +- g_assert(RS_IS_LIBRARY(library)); +- + gboolean + selected(GtkEntryCompletion *completion, GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data) + { +@@ -179,6 +174,13 @@ + return found; + } + ++ ++GtkWidget * ++rs_library_tag_entry_new(RSLibrary *library) ++{ ++ g_assert(RS_IS_LIBRARY(library)); ++ ++ + GtkWidget *entry = gtk_entry_new(); + GtkEntryCompletion *completion = gtk_entry_completion_new(); + GtkListStore *store = gtk_list_store_new(1, G_TYPE_STRING);