From tkato432@yahoo.com  Wed Apr 17 18:02:19 2013
Return-Path: <tkato432@yahoo.com>
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id 76911138
	for <FreeBSD-gnats-submit@FreeBSD.org>; Wed, 17 Apr 2013 18:02:13 +0000 (UTC)
	(envelope-from tkato432@yahoo.com)
Received: from msa102lp.auone-net.jp (msa102lp.auone-net.jp [222.3.140.165])
	by mx1.freebsd.org (Postfix) with ESMTP id 017C19C0
	for <FreeBSD-gnats-submit@FreeBSD.org>; Wed, 17 Apr 2013 18:02:12 +0000 (UTC)
Received: from localhost.localdomain (ZT029082.ppp.dion.ne.jp [59.128.29.82])
	by msa102lp.auone-net.jp (au one net msa) with ESMTP id A27344AC036
	for <FreeBSD-gnats-submit@FreeBSD.org>; Thu, 18 Apr 2013 03:02:06 +0900 (JST)
Message-Id: <20130418024239.3fdd9ec1cc06f01e71bf1336@yahoo.com>
Date: Thu, 18 Apr 2013 02:42:39 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: graphics/shotwell: Fix build

>Number:         177913
>Category:       ports
>Synopsis:       graphics/shotwell: Fix build
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    lx
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 17 18:10:01 UTC 2013
>Closed-Date:    Tue May 21 02:13:47 UTC 2013
>Last-Modified:  Tue May 21 02:20:00 UTC 2013
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p11 i386
>Organization:
>Environment:
>Description:
- Fix build:

New file:
files/patch-src__Dialogs.vala
files/patch-src__DirectoryMonitor.vala
files/patch-src__EditingTools.vala
files/patch-src__Photo.vala
files/patch-src__Printing.vala
files/patch-src__VideoSupport.vala
files/patch-src__db__PhotoTable.vala
files/patch-src__sidebar__Tree.vala
files/patch-src__util__file.vala

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/graphics/shotwell/Makefile graphics/shotwell/Makefile
--- /usr/ports/graphics/shotwell/Makefile	2013-03-15 04:23:36.000000000 +0900
+++ graphics/shotwell/Makefile	2013-04-06 08:27:28.000000000 +0900
@@ -13,8 +13,7 @@
 LICENSE=	LGPL21
 
 BUILD_DEPENDS=	vala>=0.12.0:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	sqlite3:${PORTSDIR}/databases/sqlite3 \
-		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
+LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
 		gee:${PORTSDIR}/devel/libgee06 \
 		json-glib-1.0:${PORTSDIR}/devel/json-glib \
 		soup-2.4:${PORTSDIR}/devel/libsoup \
@@ -28,6 +27,7 @@
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	gnomehier gconf2 gtk20 desktopfileutils librsvg2
+USE_SQLITE=	3
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
@@ -47,12 +47,17 @@
 post-configure:
 	@${REINPLACE_CMD} -E \
 		-e 's|share/shotwell|${DATADIR_REL}|g ; \
+		    s|--fatal-warnings||g ; \
 		    s|%%GCONF_CONFIG_SOURCE%%|${GCONF_CONFIG_SOURCE}|g' \
 			${WRKSRC}/${MAKEFILE}
 
 	@${REINPLACE_CMD} -E \
 		-e 's|\-n ||g' \
 			${WRKSRC}/configure.mk
+
+	@${REINPLACE_CMD} -E \
+		-e 's|--fatal-warnings||g' \
+			${WRKSRC}/plugins/Makefile.plugin.mk
 # attempt at a DATADIR safe port
 	@${REINPLACE_CMD} -E \
 		-e 's|\.get_child\("share")\.get_child\("shotwell")|${SHOTWELL_DATADIR}|' \
diff -urN /usr/ports/graphics/shotwell/files/patch-src__Dialogs.vala graphics/shotwell/files/patch-src__Dialogs.vala
--- /usr/ports/graphics/shotwell/files/patch-src__Dialogs.vala	1970-01-01 09:00:00.000000000 +0900
+++ graphics/shotwell/files/patch-src__Dialogs.vala	2013-04-06 07:50:04.000000000 +0900
@@ -0,0 +1,20 @@
+--- src/Dialogs.vala.orig
++++ src/Dialogs.vala
+@@ -419,7 +419,7 @@
+         ok_button.sensitive = (pixels_entry.get_text_length() > 0) && (int.parse(pixels_entry.get_text()) > 0);
+     }
+     
+-    private void on_pixels_insert_text(string text, int length, void *position) {
++    private void on_pixels_insert_text(string text, int length, ref int position) {
+         // This is necessary because SignalHandler.block_by_func() is not properly bound
+         if (in_insert)
+             return;
+@@ -438,7 +438,7 @@
+         }
+         
+         if (new_text.length > 0)
+-            pixels_entry.insert_text(new_text, (int) new_text.length, position);
++            pixels_entry.insert_text(new_text, (int) new_text.length, ref position);
+         
+         Signal.stop_emission_by_name(pixels_entry, "insert-text");
+         
diff -urN /usr/ports/graphics/shotwell/files/patch-src__DirectoryMonitor.vala graphics/shotwell/files/patch-src__DirectoryMonitor.vala
--- /usr/ports/graphics/shotwell/files/patch-src__DirectoryMonitor.vala	1970-01-01 09:00:00.000000000 +0900
+++ graphics/shotwell/files/patch-src__DirectoryMonitor.vala	2013-04-06 08:08:01.000000000 +0900
@@ -0,0 +1,22 @@
+--- src/DirectoryMonitor.vala.orig
++++ src/DirectoryMonitor.vala
+@@ -276,8 +276,7 @@
+             
+             // get all the interesting matchable items from the supplied FileInfo
+             int64 match_size = match.get_size();
+-            TimeVal match_time;
+-            match.get_modification_time(out match_time);
++            TimeVal match_time = match.get_modification_time();
+             
+             foreach (File file in map.keys) {
+                 FileInfo info = map.get(file);
+@@ -290,8 +289,7 @@
+                 if (match_size != info.get_size())
+                     continue;
+                 
+-                TimeVal time;
+-                info.get_modification_time(out time);
++                TimeVal time = info.get_modification_time();
+                 
+                 if (time.tv_sec != match_time.tv_sec)
+                     continue;
diff -urN /usr/ports/graphics/shotwell/files/patch-src__EditingTools.vala graphics/shotwell/files/patch-src__EditingTools.vala
--- /usr/ports/graphics/shotwell/files/patch-src__EditingTools.vala	1970-01-01 09:00:00.000000000 +0900
+++ graphics/shotwell/files/patch-src__EditingTools.vala	2013-04-06 08:08:17.000000000 +0900
@@ -0,0 +1,32 @@
+--- src/EditingTools.vala.orig
++++ src/EditingTools.vala
+@@ -773,15 +773,15 @@
+         return false;
+     }
+ 
+-    private void on_width_insert_text(string text, int length, void *position) {
+-        on_entry_insert_text(crop_tool_window.custom_width_entry, text, length, position);
++    private void on_width_insert_text(string text, int length, ref int position) {
++        on_entry_insert_text(crop_tool_window.custom_width_entry, text, length, ref position);
+     }
+ 
+-    private void on_height_insert_text(string text, int length, void *position) {
+-        on_entry_insert_text(crop_tool_window.custom_height_entry, text, length, position);
++    private void on_height_insert_text(string text, int length, ref int position) {
++        on_entry_insert_text(crop_tool_window.custom_height_entry, text, length, ref position);
+     }
+ 
+-    private void on_entry_insert_text(Gtk.Entry sender, string text, int length, void *position) {
++    private void on_entry_insert_text(Gtk.Entry sender, string text, int length, ref int position) {
+         if (entry_insert_in_progress)
+             return;
+             
+@@ -799,7 +799,7 @@
+         }
+         
+         if (new_text.length > 0)
+-            sender.insert_text(new_text, (int) new_text.length, position);
++            sender.insert_text(new_text, (int) new_text.length, ref position);
+ 
+         Signal.stop_emission_by_name(sender, "insert-text");
+         
diff -urN /usr/ports/graphics/shotwell/files/patch-src__Photo.vala graphics/shotwell/files/patch-src__Photo.vala
--- /usr/ports/graphics/shotwell/files/patch-src__Photo.vala	1970-01-01 09:00:00.000000000 +0900
+++ graphics/shotwell/files/patch-src__Photo.vala	2013-04-06 08:26:31.000000000 +0900
@@ -0,0 +1,129 @@
+--- src/Photo.vala.orig
++++ src/Photo.vala
+@@ -273,7 +273,7 @@
+         }
+     }
+     
+-    private struct BackingReaders {
++    private class BackingReaders {
+         public PhotoFileReader master;
+         public PhotoFileReader developer;
+         public PhotoFileReader editable;
+@@ -281,9 +281,9 @@
+     
+     // because fetching individual items from the database is high-overhead, store all of
+     // the photo row in memory
+-    private PhotoRow row;
++    protected PhotoRow row;
+     private BackingPhotoRow editable = new BackingPhotoRow();
+-    private BackingReaders readers = BackingReaders();
++    private BackingReaders readers = new BackingReaders();
+     private PixelTransformer transformer = null;
+     private PixelTransformationBundle adjustments = null;
+     // because file_title is determined by data in row, it should only be accessed when row is locked
+@@ -301,7 +301,7 @@
+     
+     // This pointer is used to determine which BackingPhotoRow in the PhotoRow to be using at
+     // any time.  It should only be accessed -- read or write -- when row is locked.
+-    private BackingPhotoRow? backing_photo_row = null;
++    protected BackingPhotoRow? backing_photo_row = null;
+     
+     // This is fired when the photo's editable file is replaced.  The image it generates may or
+     // may not be the same; the altered signal is best for that.  null is passed if the editable
+@@ -553,8 +553,7 @@
+         File file = File.new_for_path(bpr.filepath);
+         FileInfo info = file.query_info(DirectoryMonitor.SUPPLIED_ATTRIBUTES,
+             FileQueryInfoFlags.NOFOLLOW_SYMLINKS, null);
+-        TimeVal timestamp;
+-        info.get_modification_time(out timestamp);
++        TimeVal timestamp = info.get_modification_time();
+         
+         PhotoFileInterrogator interrogator = new PhotoFileInterrogator(
+             file, PhotoFileSniffer.Options.GET_ALL);
+@@ -992,8 +991,7 @@
+             return ImportResult.UNSUPPORTED_FORMAT;
+         }
+         
+-        TimeVal timestamp;
+-        info.get_modification_time(out timestamp);
++        TimeVal timestamp = info.get_modification_time();
+         
+         // if all MD5s supplied, don't sniff for them
+         if (params.exif_md5 != null && params.thumbnail_md5 != null && params.full_md5 != null)
+@@ -1148,8 +1146,7 @@
+             return null;
+         }
+         
+-        TimeVal modification_time = TimeVal();
+-        info.get_modification_time(out modification_time);
++        TimeVal modification_time = info.get_modification_time();
+         
+         backing.filepath = file.get_path();
+         backing.timestamp = modification_time.tv_sec;
+@@ -1196,7 +1193,7 @@
+     }
+     
+     private class ReimportRawDevelopmentStateImpl : ReimportRawDevelopmentState {
+-        class DevToReimport {
++        public class DevToReimport {
+             public BackingPhotoRow backing = new BackingPhotoRow();
+             public PhotoMetadata? metadata;
+             
+@@ -1483,8 +1480,7 @@
+     
+     // Use this only if the master file's modification time has been changed (i.e. touched)
+     public void set_master_timestamp(FileInfo info) {
+-        TimeVal modification;
+-        info.get_modification_time(out modification);
++        TimeVal modification = info.get_modification_time();
+         
+         try {
+             lock (row) {
+@@ -1508,8 +1504,7 @@
+     
+     // Use this only if the editable file's modification time has been changed (i.e. touched)
+     public void update_editable_modification_time(FileInfo info) throws DatabaseError {
+-        TimeVal modification;
+-        info.get_modification_time(out modification);
++        TimeVal modification = info.get_modification_time();
+         
+         bool altered = false;
+         lock (row) {
+@@ -2067,8 +2062,7 @@
+             error("Unable to read file information for %s: %s", to_string(), err.message);
+         }
+         
+-        TimeVal timestamp = TimeVal();
+-        info.get_modification_time(out timestamp);
++        TimeVal timestamp = info.get_modification_time();
+         
+         // interrogate file for photo information
+         PhotoFileInterrogator interrogator = new PhotoFileInterrogator(file);
+@@ -2679,7 +2673,7 @@
+     }
+ 
+     // All instances are against the coordinate system of the unrotated photo.
+-    private void add_raw_redeye_instance(RedeyeInstance redeye) {
++    public void add_raw_redeye_instance(RedeyeInstance redeye) {
+         KeyValueMap map = get_transformation("redeye");
+         if (map == null) {
+             map = new KeyValueMap("redeye");
+@@ -3443,8 +3437,7 @@
+                 return;
+             }
+             
+-            TimeVal timestamp;
+-            info.get_modification_time(out timestamp);
++            TimeVal timestamp = info.get_modification_time();
+         
+             BackingPhotoTable.get_instance().update_attributes(editable_id, timestamp.tv_sec,
+                 info.get_size());
+@@ -4567,7 +4560,7 @@
+         import_keywords = null;
+     }
+     
+-    protected override void notify_altered(Alteration alteration) {
++    public override void notify_altered(Alteration alteration) {
+         // generate new thumbnails in the background
+         if (!block_thumbnail_generation && alteration.has_subject("image"))
+             thumbnail_scheduler.at_priority_idle(Priority.LOW);
diff -urN /usr/ports/graphics/shotwell/files/patch-src__Printing.vala graphics/shotwell/files/patch-src__Printing.vala
--- /usr/ports/graphics/shotwell/files/patch-src__Printing.vala	1970-01-01 09:00:00.000000000 +0900
+++ graphics/shotwell/files/patch-src__Printing.vala	2013-04-06 08:08:38.000000000 +0900
@@ -0,0 +1,38 @@
+--- src/Printing.vala.orig
++++ src/Printing.vala
+@@ -536,7 +536,7 @@
+     }
+ 
+     private void on_ppi_entry_insert_text(Gtk.Editable editable, string text, int length,
+-        void *position) {
++        ref int position) {
+         Gtk.Entry sender = (Gtk.Entry) editable;
+         
+         if (is_text_insertion_in_progress)
+@@ -554,7 +554,7 @@
+         }
+ 
+         if (new_text.length > 0)
+-            sender.insert_text(new_text, (int) new_text.length, position);
++            sender.insert_text(new_text, (int) new_text.length, ref position);
+ 
+         Signal.stop_emission_by_name(sender, "insert-text");
+ 
+@@ -616,7 +616,7 @@
+         return Measurement(double.parse(custom_height_entry.get_text()), get_user_unit_choice());
+     }
+ 
+-    private void on_entry_insert_text(Gtk.Editable editable, string text, int length, void *position) {
++    private void on_entry_insert_text(Gtk.Editable editable, string text, int length, ref int position) {
+         Gtk.Entry sender = (Gtk.Entry) editable;
+         
+         if (is_text_insertion_in_progress)
+@@ -640,7 +640,7 @@
+         }
+ 
+         if (new_text.length > 0)
+-            sender.insert_text(new_text, (int) new_text.length, position);
++            sender.insert_text(new_text, (int) new_text.length, ref position);
+ 
+         Signal.stop_emission_by_name(sender, "insert-text");
+ 
diff -urN /usr/ports/graphics/shotwell/files/patch-src__VideoSupport.vala graphics/shotwell/files/patch-src__VideoSupport.vala
--- /usr/ports/graphics/shotwell/files/patch-src__VideoSupport.vala	1970-01-01 09:00:00.000000000 +0900
+++ graphics/shotwell/files/patch-src__VideoSupport.vala	2013-04-06 08:08:51.000000000 +0900
@@ -0,0 +1,32 @@
+--- src/VideoSupport.vala.orig
++++ src/VideoSupport.vala
+@@ -83,8 +83,7 @@
+             return ImportResult.UNSUPPORTED_FORMAT;
+         }
+         
+-        TimeVal timestamp;
+-        info.get_modification_time(out timestamp);
++        TimeVal timestamp = info.get_modification_time();
+         
+         // make sure params has a valid md5
+         assert(params.md5 != null);
+@@ -720,8 +719,7 @@
+     }
+     
+     public void set_master_timestamp(FileInfo info) {
+-        TimeVal time_val;
+-        info.get_modification_time(out time_val);
++        TimeVal time_val = info.get_modification_time();
+         
+         try {
+             lock (backing_row) {
+@@ -1068,8 +1066,7 @@
+         if (video.get_filesize() != info.get_size())
+             return;
+         
+-        TimeVal modification;
+-        info.get_modification_time(out modification);
++        TimeVal modification = info.get_modification_time();
+         
+         if (video.get_timestamp() == modification.tv_sec)
+             matching_master.add(video);
diff -urN /usr/ports/graphics/shotwell/files/patch-src__db__PhotoTable.vala graphics/shotwell/files/patch-src__db__PhotoTable.vala
--- /usr/ports/graphics/shotwell/files/patch-src__db__PhotoTable.vala	1970-01-01 09:00:00.000000000 +0900
+++ graphics/shotwell/files/patch-src__db__PhotoTable.vala	2013-04-06 08:09:05.000000000 +0900
@@ -0,0 +1,22 @@
+--- src/db/PhotoTable.vala.orig
++++ src/db/PhotoTable.vala
+@@ -1034,8 +1034,7 @@
+         if (filesize != info.get_size())
+             return false;
+         
+-        TimeVal modification;
+-        info.get_modification_time(out modification);
++        TimeVal modification = info.get_modification_time();
+         
+         return timestamp == modification.tv_sec;
+     }
+@@ -1044,8 +1043,7 @@
+         if (filesize != info.get_size())
+             return false;
+         
+-        TimeVal modification;
+-        info.get_modification_time(out modification);
++        TimeVal modification = info.get_modification_time();
+         
+         return timestamp != modification.tv_sec;
+     }
diff -urN /usr/ports/graphics/shotwell/files/patch-src__sidebar__Tree.vala graphics/shotwell/files/patch-src__sidebar__Tree.vala
--- /usr/ports/graphics/shotwell/files/patch-src__sidebar__Tree.vala	1970-01-01 09:00:00.000000000 +0900
+++ graphics/shotwell/files/patch-src__sidebar__Tree.vala	2013-04-06 08:09:27.000000000 +0900
@@ -0,0 +1,22 @@
+--- src/sidebar/Tree.vala.orig
++++ src/sidebar/Tree.vala
+@@ -545,7 +545,8 @@
+         if (only_children)
+             return;
+         
+-        store.remove(wrapper.get_iter());
++        Gtk.TreeIter iter = wrapper.get_iter();
++        store.remove(ref iter);
+         
+         if (selected_wrapper == wrapper)
+             selected_wrapper = null;
+@@ -637,7 +638,8 @@
+         bool selected = (get_current_path().compare(wrapper.get_path()) == 0);
+         
+         // remove from current position in tree
+-        store.remove(wrapper.get_iter());
++        Gtk.TreeIter iter = wrapper.get_iter();
++        store.remove(ref iter);
+         
+         Sidebar.Entry? parent = branch.get_parent(entry);
+         assert(parent != null);
diff -urN /usr/ports/graphics/shotwell/files/patch-src__util__file.vala graphics/shotwell/files/patch-src__util__file.vala
--- /usr/ports/graphics/shotwell/files/patch-src__util__file.vala	1970-01-01 09:00:00.000000000 +0900
+++ graphics/shotwell/files/patch-src__util__file.vala	2013-04-06 08:09:40.000000000 +0900
@@ -0,0 +1,12 @@
+--- src/util/file.vala.orig
++++ src/util/file.vala
+@@ -155,8 +155,7 @@
+     FileInfo info = file.query_info(FILE_ATTRIBUTE_TIME_MODIFIED, FileQueryInfoFlags.NOFOLLOW_SYMLINKS, 
+         null);
+ 
+-    TimeVal timestamp = TimeVal();
+-    info.get_modification_time(out timestamp);
++    TimeVal timestamp = info.get_modification_time();
+     
+     return timestamp.tv_sec;
+ }
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->lx 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Apr 17 18:10:47 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177913 

From: Mark Linimon <linimon@lonesome.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/177913: graphics/shotwell: Fix build
Date: Fri, 26 Apr 2013 23:05:43 -0500

 ----- Forwarded message from David Thiel <lx@redundancy.redundancy.org> -----
 
 Date: Thu, 25 Apr 2013 15:51:54 -0700
 From: David Thiel <lx@redundancy.redundancy.org>
 To: freebsd-ports-bugs@FreeBSD.org
 Subject: Re: ports/177913: graphics/shotwell: Fix build
 User-Agent: Mutt/1.5.21 (2010-09-15)
 
 This doesn't work for me on 9.1:
 
 /usr/ports/graphics/shotwell/work/shotwell-0.11.6/thumbnailer/shotwell-video-thumbnailer.vala:22:
 warning: 'g_thread_init' is deprecated (declared at
 /usr/local/include/glib-2.0/glib/deprecated/gthread.h:260)
 Compilation succeeded - 3 warning(s)
 cc src/unit/Unit.o src/util/Util.o src/util/file.o src/util/image.o
 src/util/misc.o src/util/string.o src/util/system.o
 
 (snip)
 
 src/.unitize/_LibraryInternals.o src/.unitize/_DirectInternals.o
 src/.unitize/_CoreInternals.o src/.unitize/_SidebarInternals.o
 src/.unitize/_EventsInternals.o src/.unitize/_TagsInternals.o
 src/.unitize/_FacesInternals.o src/.unitize/_CameraInternals.o
 src/.unitize/_SearchesInternals.o src/.unitize/_ConfigInternals.o
 src/.unitize/_Library_unitize_entry.o
 src/.unitize/_Direct_unitize_entry.o -O2 -pipe -fno-strict-aliasing
 -fPIC -DG_UDEV_API_IS_SUBJECT_TO_CHANGE   `pkg-config --libs atk gdk-2.0
 gdk-x11-2.0 gee-1.0 gexiv2 gio-unix-2.0 glib-2.0 gmodule-2.0
 gstreamer-0.10 gstreamer-base-0.10 gstreamer-pbutils-0.10 gtk+-2.0
 libexif libgphoto2 libsoup-2.4 libxml-2.0 sqlite3 unique-1.0 webkit-1.0
 gconf-2.0  gthread-2.0` `pkg-config --libs libraw` -export-dynamic -o
 shotwell
 /usr/local/lib/libraw.so: undefined reference to
 `std::ctype<char>::_M_widen_init( const@GLIBCXX_3.4.11'
 gmake: *** [shotwell] Error 1
 *** [do-build] Error code 1
 
 Stop in /usr/ports/graphics/shotwell.
 
 ----- End forwarded message -----

From: KATO Tsuguru <tkato432@yahoo.com>
To: bug-followup@FreeBSD.org
Cc: lx@redundancy.redundancy.org
Subject: Re: ports/177913: graphics/shotwell: Fix build
Date: Wed, 15 May 2013 02:58:06 +0900

 Please check with installing graphics/libraw without enabling
 OPENMP option.
 
 Although it won't fail to build shotwell with OPENMP-fied libraw
 if the same C++ compiler would be used, there seems to be no valid
 way to consider how dependent ports/packages were built at
 present.
State-Changed-From-To: open->closed 
State-Changed-By: lx 
State-Changed-When: Tue May 21 02:13:31 UTC 2013 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177913 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/177913: commit references a PR
Date: Tue, 21 May 2013 02:13:01 +0000 (UTC)

 Author: lx
 Date: Tue May 21 02:12:51 2013
 New Revision: 318636
 URL: http://svnweb.freebsd.org/changeset/ports/318636
 
 Log:
   Unbreak build.
   
   PR:	ports/177913
   Submitted by:	KATO Tsuguru
 
 Added:
   head/graphics/shotwell/files/patch-src__Dialogs.vala   (contents, props changed)
   head/graphics/shotwell/files/patch-src__DirectoryMonitor.vala   (contents, props changed)
   head/graphics/shotwell/files/patch-src__EditingTools.vala   (contents, props changed)
   head/graphics/shotwell/files/patch-src__Photo.vala   (contents, props changed)
   head/graphics/shotwell/files/patch-src__Printing.vala   (contents, props changed)
   head/graphics/shotwell/files/patch-src__VideoSupport.vala   (contents, props changed)
   head/graphics/shotwell/files/patch-src__db__PhotoTable.vala   (contents, props changed)
   head/graphics/shotwell/files/patch-src__sidebar__Tree.vala   (contents, props changed)
   head/graphics/shotwell/files/patch-src__util__file.vala   (contents, props changed)
 Modified:
   head/graphics/shotwell/Makefile
 
 Modified: head/graphics/shotwell/Makefile
 ==============================================================================
 --- head/graphics/shotwell/Makefile	Tue May 21 01:43:38 2013	(r318635)
 +++ head/graphics/shotwell/Makefile	Tue May 21 02:12:51 2013	(r318636)
 @@ -13,8 +13,7 @@ COMMENT=	Open source photo manager for G
  LICENSE=	LGPL21
  
  BUILD_DEPENDS=	vala>=0.12.0:${PORTSDIR}/lang/vala
 -LIB_DEPENDS=	sqlite3:${PORTSDIR}/databases/sqlite3 \
 -		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
 +LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
  		gee:${PORTSDIR}/devel/libgee06 \
  		json-glib-1.0:${PORTSDIR}/devel/json-glib \
  		soup-2.4:${PORTSDIR}/devel/libsoup \
 @@ -28,6 +27,7 @@ LIB_DEPENDS=	sqlite3:${PORTSDIR}/databas
  USE_BZIP2=	yes
  USES=		gettext
  USE_GNOME=	gnomehier gconf2 gtk20 desktopfileutils librsvg2
 +USE_SQLITE=	3
  USE_GMAKE=	yes
  HAS_CONFIGURE=	yes
  CONFIGURE_ARGS=	--prefix=${PREFIX} \
 @@ -47,12 +47,17 @@ post-patch:
  post-configure:
  	@${REINPLACE_CMD} -E \
  		-e 's|share/shotwell|${DATADIR_REL}|g ; \
 +		    s|--fatal-warnings||g ; \
  		    s|%%GCONF_CONFIG_SOURCE%%|${GCONF_CONFIG_SOURCE}|g' \
  			${WRKSRC}/${MAKEFILE}
  
  	@${REINPLACE_CMD} -E \
  		-e 's|\-n ||g' \
  			${WRKSRC}/configure.mk
 +
 +	@${REINPLACE_CMD} -E \
 +		-e 's|--fatal-warnings||g' \
 +			${WRKSRC}/plugins/Makefile.plugin.mk
  # attempt at a DATADIR safe port
  	@${REINPLACE_CMD} -E \
  		-e 's|\.get_child\("share")\.get_child\("shotwell")|${SHOTWELL_DATADIR}|' \
 
 Added: head/graphics/shotwell/files/patch-src__Dialogs.vala
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/graphics/shotwell/files/patch-src__Dialogs.vala	Tue May 21 02:12:51 2013	(r318636)
 @@ -0,0 +1,20 @@
 +--- src/Dialogs.vala.orig
 ++++ src/Dialogs.vala
 +@@ -419,7 +419,7 @@
 +         ok_button.sensitive = (pixels_entry.get_text_length() > 0) && (int.parse(pixels_entry.get_text()) > 0);
 +     }
 +     
 +-    private void on_pixels_insert_text(string text, int length, void *position) {
 ++    private void on_pixels_insert_text(string text, int length, ref int position) {
 +         // This is necessary because SignalHandler.block_by_func() is not properly bound
 +         if (in_insert)
 +             return;
 +@@ -438,7 +438,7 @@
 +         }
 +         
 +         if (new_text.length > 0)
 +-            pixels_entry.insert_text(new_text, (int) new_text.length, position);
 ++            pixels_entry.insert_text(new_text, (int) new_text.length, ref position);
 +         
 +         Signal.stop_emission_by_name(pixels_entry, "insert-text");
 +         
 
 Added: head/graphics/shotwell/files/patch-src__DirectoryMonitor.vala
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/graphics/shotwell/files/patch-src__DirectoryMonitor.vala	Tue May 21 02:12:51 2013	(r318636)
 @@ -0,0 +1,22 @@
 +--- src/DirectoryMonitor.vala.orig
 ++++ src/DirectoryMonitor.vala
 +@@ -276,8 +276,7 @@
 +             
 +             // get all the interesting matchable items from the supplied FileInfo
 +             int64 match_size = match.get_size();
 +-            TimeVal match_time;
 +-            match.get_modification_time(out match_time);
 ++            TimeVal match_time = match.get_modification_time();
 +             
 +             foreach (File file in map.keys) {
 +                 FileInfo info = map.get(file);
 +@@ -290,8 +289,7 @@
 +                 if (match_size != info.get_size())
 +                     continue;
 +                 
 +-                TimeVal time;
 +-                info.get_modification_time(out time);
 ++                TimeVal time = info.get_modification_time();
 +                 
 +                 if (time.tv_sec != match_time.tv_sec)
 +                     continue;
 
 Added: head/graphics/shotwell/files/patch-src__EditingTools.vala
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/graphics/shotwell/files/patch-src__EditingTools.vala	Tue May 21 02:12:51 2013	(r318636)
 @@ -0,0 +1,32 @@
 +--- src/EditingTools.vala.orig
 ++++ src/EditingTools.vala
 +@@ -773,15 +773,15 @@
 +         return false;
 +     }
 + 
 +-    private void on_width_insert_text(string text, int length, void *position) {
 +-        on_entry_insert_text(crop_tool_window.custom_width_entry, text, length, position);
 ++    private void on_width_insert_text(string text, int length, ref int position) {
 ++        on_entry_insert_text(crop_tool_window.custom_width_entry, text, length, ref position);
 +     }
 + 
 +-    private void on_height_insert_text(string text, int length, void *position) {
 +-        on_entry_insert_text(crop_tool_window.custom_height_entry, text, length, position);
 ++    private void on_height_insert_text(string text, int length, ref int position) {
 ++        on_entry_insert_text(crop_tool_window.custom_height_entry, text, length, ref position);
 +     }
 + 
 +-    private void on_entry_insert_text(Gtk.Entry sender, string text, int length, void *position) {
 ++    private void on_entry_insert_text(Gtk.Entry sender, string text, int length, ref int position) {
 +         if (entry_insert_in_progress)
 +             return;
 +             
 +@@ -799,7 +799,7 @@
 +         }
 +         
 +         if (new_text.length > 0)
 +-            sender.insert_text(new_text, (int) new_text.length, position);
 ++            sender.insert_text(new_text, (int) new_text.length, ref position);
 + 
 +         Signal.stop_emission_by_name(sender, "insert-text");
 +         
 
 Added: head/graphics/shotwell/files/patch-src__Photo.vala
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/graphics/shotwell/files/patch-src__Photo.vala	Tue May 21 02:12:51 2013	(r318636)
 @@ -0,0 +1,129 @@
 +--- src/Photo.vala.orig
 ++++ src/Photo.vala
 +@@ -273,7 +273,7 @@
 +         }
 +     }
 +     
 +-    private struct BackingReaders {
 ++    private class BackingReaders {
 +         public PhotoFileReader master;
 +         public PhotoFileReader developer;
 +         public PhotoFileReader editable;
 +@@ -281,9 +281,9 @@
 +     
 +     // because fetching individual items from the database is high-overhead, store all of
 +     // the photo row in memory
 +-    private PhotoRow row;
 ++    protected PhotoRow row;
 +     private BackingPhotoRow editable = new BackingPhotoRow();
 +-    private BackingReaders readers = BackingReaders();
 ++    private BackingReaders readers = new BackingReaders();
 +     private PixelTransformer transformer = null;
 +     private PixelTransformationBundle adjustments = null;
 +     // because file_title is determined by data in row, it should only be accessed when row is locked
 +@@ -301,7 +301,7 @@
 +     
 +     // This pointer is used to determine which BackingPhotoRow in the PhotoRow to be using at
 +     // any time.  It should only be accessed -- read or write -- when row is locked.
 +-    private BackingPhotoRow? backing_photo_row = null;
 ++    protected BackingPhotoRow? backing_photo_row = null;
 +     
 +     // This is fired when the photo's editable file is replaced.  The image it generates may or
 +     // may not be the same; the altered signal is best for that.  null is passed if the editable
 +@@ -553,8 +553,7 @@
 +         File file = File.new_for_path(bpr.filepath);
 +         FileInfo info = file.query_info(DirectoryMonitor.SUPPLIED_ATTRIBUTES,
 +             FileQueryInfoFlags.NOFOLLOW_SYMLINKS, null);
 +-        TimeVal timestamp;
 +-        info.get_modification_time(out timestamp);
 ++        TimeVal timestamp = info.get_modification_time();
 +         
 +         PhotoFileInterrogator interrogator = new PhotoFileInterrogator(
 +             file, PhotoFileSniffer.Options.GET_ALL);
 +@@ -992,8 +991,7 @@
 +             return ImportResult.UNSUPPORTED_FORMAT;
 +         }
 +         
 +-        TimeVal timestamp;
 +-        info.get_modification_time(out timestamp);
 ++        TimeVal timestamp = info.get_modification_time();
 +         
 +         // if all MD5s supplied, don't sniff for them
 +         if (params.exif_md5 != null && params.thumbnail_md5 != null && params.full_md5 != null)
 +@@ -1148,8 +1146,7 @@
 +             return null;
 +         }
 +         
 +-        TimeVal modification_time = TimeVal();
 +-        info.get_modification_time(out modification_time);
 ++        TimeVal modification_time = info.get_modification_time();
 +         
 +         backing.filepath = file.get_path();
 +         backing.timestamp = modification_time.tv_sec;
 +@@ -1196,7 +1193,7 @@
 +     }
 +     
 +     private class ReimportRawDevelopmentStateImpl : ReimportRawDevelopmentState {
 +-        class DevToReimport {
 ++        public class DevToReimport {
 +             public BackingPhotoRow backing = new BackingPhotoRow();
 +             public PhotoMetadata? metadata;
 +             
 +@@ -1483,8 +1480,7 @@
 +     
 +     // Use this only if the master file's modification time has been changed (i.e. touched)
 +     public void set_master_timestamp(FileInfo info) {
 +-        TimeVal modification;
 +-        info.get_modification_time(out modification);
 ++        TimeVal modification = info.get_modification_time();
 +         
 +         try {
 +             lock (row) {
 +@@ -1508,8 +1504,7 @@
 +     
 +     // Use this only if the editable file's modification time has been changed (i.e. touched)
 +     public void update_editable_modification_time(FileInfo info) throws DatabaseError {
 +-        TimeVal modification;
 +-        info.get_modification_time(out modification);
 ++        TimeVal modification = info.get_modification_time();
 +         
 +         bool altered = false;
 +         lock (row) {
 +@@ -2067,8 +2062,7 @@
 +             error("Unable to read file information for %s: %s", to_string(), err.message);
 +         }
 +         
 +-        TimeVal timestamp = TimeVal();
 +-        info.get_modification_time(out timestamp);
 ++        TimeVal timestamp = info.get_modification_time();
 +         
 +         // interrogate file for photo information
 +         PhotoFileInterrogator interrogator = new PhotoFileInterrogator(file);
 +@@ -2679,7 +2673,7 @@
 +     }
 + 
 +     // All instances are against the coordinate system of the unrotated photo.
 +-    private void add_raw_redeye_instance(RedeyeInstance redeye) {
 ++    public void add_raw_redeye_instance(RedeyeInstance redeye) {
 +         KeyValueMap map = get_transformation("redeye");
 +         if (map == null) {
 +             map = new KeyValueMap("redeye");
 +@@ -3443,8 +3437,7 @@
 +                 return;
 +             }
 +             
 +-            TimeVal timestamp;
 +-            info.get_modification_time(out timestamp);
 ++            TimeVal timestamp = info.get_modification_time();
 +         
 +             BackingPhotoTable.get_instance().update_attributes(editable_id, timestamp.tv_sec,
 +                 info.get_size());
 +@@ -4567,7 +4560,7 @@
 +         import_keywords = null;
 +     }
 +     
 +-    protected override void notify_altered(Alteration alteration) {
 ++    public override void notify_altered(Alteration alteration) {
 +         // generate new thumbnails in the background
 +         if (!block_thumbnail_generation && alteration.has_subject("image"))
 +             thumbnail_scheduler.at_priority_idle(Priority.LOW);
 
 Added: head/graphics/shotwell/files/patch-src__Printing.vala
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/graphics/shotwell/files/patch-src__Printing.vala	Tue May 21 02:12:51 2013	(r318636)
 @@ -0,0 +1,38 @@
 +--- src/Printing.vala.orig
 ++++ src/Printing.vala
 +@@ -536,7 +536,7 @@
 +     }
 + 
 +     private void on_ppi_entry_insert_text(Gtk.Editable editable, string text, int length,
 +-        void *position) {
 ++        ref int position) {
 +         Gtk.Entry sender = (Gtk.Entry) editable;
 +         
 +         if (is_text_insertion_in_progress)
 +@@ -554,7 +554,7 @@
 +         }
 + 
 +         if (new_text.length > 0)
 +-            sender.insert_text(new_text, (int) new_text.length, position);
 ++            sender.insert_text(new_text, (int) new_text.length, ref position);
 + 
 +         Signal.stop_emission_by_name(sender, "insert-text");
 + 
 +@@ -616,7 +616,7 @@
 +         return Measurement(double.parse(custom_height_entry.get_text()), get_user_unit_choice());
 +     }
 + 
 +-    private void on_entry_insert_text(Gtk.Editable editable, string text, int length, void *position) {
 ++    private void on_entry_insert_text(Gtk.Editable editable, string text, int length, ref int position) {
 +         Gtk.Entry sender = (Gtk.Entry) editable;
 +         
 +         if (is_text_insertion_in_progress)
 +@@ -640,7 +640,7 @@
 +         }
 + 
 +         if (new_text.length > 0)
 +-            sender.insert_text(new_text, (int) new_text.length, position);
 ++            sender.insert_text(new_text, (int) new_text.length, ref position);
 + 
 +         Signal.stop_emission_by_name(sender, "insert-text");
 + 
 
 Added: head/graphics/shotwell/files/patch-src__VideoSupport.vala
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/graphics/shotwell/files/patch-src__VideoSupport.vala	Tue May 21 02:12:51 2013	(r318636)
 @@ -0,0 +1,32 @@
 +--- src/VideoSupport.vala.orig
 ++++ src/VideoSupport.vala
 +@@ -83,8 +83,7 @@
 +             return ImportResult.UNSUPPORTED_FORMAT;
 +         }
 +         
 +-        TimeVal timestamp;
 +-        info.get_modification_time(out timestamp);
 ++        TimeVal timestamp = info.get_modification_time();
 +         
 +         // make sure params has a valid md5
 +         assert(params.md5 != null);
 +@@ -720,8 +719,7 @@
 +     }
 +     
 +     public void set_master_timestamp(FileInfo info) {
 +-        TimeVal time_val;
 +-        info.get_modification_time(out time_val);
 ++        TimeVal time_val = info.get_modification_time();
 +         
 +         try {
 +             lock (backing_row) {
 +@@ -1068,8 +1066,7 @@
 +         if (video.get_filesize() != info.get_size())
 +             return;
 +         
 +-        TimeVal modification;
 +-        info.get_modification_time(out modification);
 ++        TimeVal modification = info.get_modification_time();
 +         
 +         if (video.get_timestamp() == modification.tv_sec)
 +             matching_master.add(video);
 
 Added: head/graphics/shotwell/files/patch-src__db__PhotoTable.vala
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/graphics/shotwell/files/patch-src__db__PhotoTable.vala	Tue May 21 02:12:51 2013	(r318636)
 @@ -0,0 +1,22 @@
 +--- src/db/PhotoTable.vala.orig
 ++++ src/db/PhotoTable.vala
 +@@ -1034,8 +1034,7 @@
 +         if (filesize != info.get_size())
 +             return false;
 +         
 +-        TimeVal modification;
 +-        info.get_modification_time(out modification);
 ++        TimeVal modification = info.get_modification_time();
 +         
 +         return timestamp == modification.tv_sec;
 +     }
 +@@ -1044,8 +1043,7 @@
 +         if (filesize != info.get_size())
 +             return false;
 +         
 +-        TimeVal modification;
 +-        info.get_modification_time(out modification);
 ++        TimeVal modification = info.get_modification_time();
 +         
 +         return timestamp != modification.tv_sec;
 +     }
 
 Added: head/graphics/shotwell/files/patch-src__sidebar__Tree.vala
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/graphics/shotwell/files/patch-src__sidebar__Tree.vala	Tue May 21 02:12:51 2013	(r318636)
 @@ -0,0 +1,22 @@
 +--- src/sidebar/Tree.vala.orig
 ++++ src/sidebar/Tree.vala
 +@@ -545,7 +545,8 @@
 +         if (only_children)
 +             return;
 +         
 +-        store.remove(wrapper.get_iter());
 ++        Gtk.TreeIter iter = wrapper.get_iter();
 ++        store.remove(ref iter);
 +         
 +         if (selected_wrapper == wrapper)
 +             selected_wrapper = null;
 +@@ -637,7 +638,8 @@
 +         bool selected = (get_current_path().compare(wrapper.get_path()) == 0);
 +         
 +         // remove from current position in tree
 +-        store.remove(wrapper.get_iter());
 ++        Gtk.TreeIter iter = wrapper.get_iter();
 ++        store.remove(ref iter);
 +         
 +         Sidebar.Entry? parent = branch.get_parent(entry);
 +         assert(parent != null);
 
 Added: head/graphics/shotwell/files/patch-src__util__file.vala
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/graphics/shotwell/files/patch-src__util__file.vala	Tue May 21 02:12:51 2013	(r318636)
 @@ -0,0 +1,12 @@
 +--- src/util/file.vala.orig
 ++++ src/util/file.vala
 +@@ -155,8 +155,7 @@
 +     FileInfo info = file.query_info(FILE_ATTRIBUTE_TIME_MODIFIED, FileQueryInfoFlags.NOFOLLOW_SYMLINKS, 
 +         null);
 + 
 +-    TimeVal timestamp = TimeVal();
 +-    info.get_modification_time(out timestamp);
 ++    TimeVal timestamp = info.get_modification_time();
 +     
 +     return timestamp.tv_sec;
 + }
 _______________________________________________
 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"
 
>Unformatted:
