Original sources are using nested funcions in one of the files. Fixing that. Generated with FreeBSD Port Tools 0.99_11 (mode: change, diff: ports)
Responsible Changed From-To: freebsd-ports-bugs->rm I will take it.
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 <samm@os2.kiev.ua> (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); _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed, thank you!
Author: rm Date: Wed Feb 19 19:23:38 2014 New Revision: 345134 URL: http://svnweb.freebsd.org/changeset/ports/345134 QAT: https://qat.redports.org/buildarchive/r345134/ Log: MFH: r345132 - fix build with clang - support staging - convert desktopfileutils dependency to USES I got a merge conflict, so desktopfileutils issue was not included into this commit. Not sure if this what I supposed to do. PR: 186771 Submitted by: Alex Samorukov <samm@os2.kiev.ua> (maintainer) Approved by: portmgr (erwin) Added: branches/2014Q1/graphics/rawstudio/files/patch-rs-macros.h - copied unchanged from r345132, head/graphics/rawstudio/files/patch-rs-macros.h branches/2014Q1/graphics/rawstudio/files/patch-rs-tag-gui.c - copied unchanged from r345132, head/graphics/rawstudio/files/patch-rs-tag-gui.c Modified: branches/2014Q1/graphics/rawstudio/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/graphics/rawstudio/Makefile ============================================================================== --- branches/2014Q1/graphics/rawstudio/Makefile Wed Feb 19 19:07:51 2014 (r345133) +++ branches/2014Q1/graphics/rawstudio/Makefile Wed Feb 19 19:23:38 2014 (r345134) @@ -32,7 +32,6 @@ USE_GNOME= gtk20 libxml2 gconf2 desktopf USE_SQLITE= 3 USE_LDCONFIG= yes -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's, libssl,,' ${WRKSRC}/configure Copied: branches/2014Q1/graphics/rawstudio/files/patch-rs-macros.h (from r345132, head/graphics/rawstudio/files/patch-rs-macros.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/rawstudio/files/patch-rs-macros.h Wed Feb 19 19:23:38 2014 (r345134, copy of r345132, head/graphics/rawstudio/files/patch-rs-macros.h) @@ -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 Copied: branches/2014Q1/graphics/rawstudio/files/patch-rs-tag-gui.c (from r345132, head/graphics/rawstudio/files/patch-rs-tag-gui.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/rawstudio/files/patch-rs-tag-gui.c Wed Feb 19 19:23:38 2014 (r345134, copy of r345132, head/graphics/rawstudio/files/patch-rs-tag-gui.c) @@ -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); _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"