Note: this PR obsoletes ports/184007 (shotwell 0.15) shotwell 0.15.1 is out. While updating, enable staging, convert to new LIB_DEPENDS, fix dependency on libgee, and introduce OPTION to allow linking against an OpenMP enabled libraw. Fix: In case some the patch gets broken in transit: http://burggraben.net/hacks/shotwell.diff.gz svn status: M Makefile M distinfo M files/patch-Makefile M files/patch-src-camera-CameraTable.vala M pkg-plist svn diff: Regards, Christoph--tPHTfMv2Kub6wN5wDwk0AskrbStxfBOn1LCQ2jwHhSf7ulHD Content-Type: text/plain; name="file.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="file.diff" Index: Makefile =================================================================== --- Makefile (revision 338781) +++ Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= shotwell -PORTVERSION= 0.14.1 +PORTVERSION= 0.15.1 CATEGORIES= graphics gnome MASTER_SITES= http://www.yorba.org/download/shotwell/${PORTVERSION:R}/ @@ -14,16 +14,16 @@ BUILD_DEPENDS= vala>=0.18.0:${PORTSDIR}/lang/vala \ bash:${PORTSDIR}/shells/bash 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 \ - gexiv2:${PORTSDIR}/graphics/gexiv2 \ - exif:${PORTSDIR}/graphics/libexif \ - gphoto2:${PORTSDIR}/graphics/libgphoto2 \ - webkitgtk-3.0:${PORTSDIR}/www/webkit-gtk3 \ - unique-1.0:${PORTSDIR}/x11-toolkits/unique \ - raw:${PORTSDIR}/graphics/libraw \ - rest:${PORTSDIR}/devel/librest + libgee-0.8.so:${PORTSDIR}/devel/libgee \ + libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib \ + libsoup-2.4.so:${PORTSDIR}/devel/libsoup \ + libgexiv2.so:${PORTSDIR}/graphics/gexiv2 \ + libexif.so:${PORTSDIR}/graphics/libexif \ + libgphoto2.so:${PORTSDIR}/graphics/libgphoto2 \ + libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3 \ + libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique \ + libraw.so:${PORTSDIR}/graphics/libraw \ + librest-0.7.so:${PORTSDIR}/devel/librest USE_XZ= yes USES= shebangfix gettext desktop-file-utils gmake pkgconfig @@ -35,11 +35,20 @@ CONFIGURE_ENV+= --define=NO_CAMERA INSTALLS_ICONS= yes +OPTIONS_DEFINE= OPENMP +OPTIONS_DEFAULT= +OPENMP_DESC= libraw uses OpenMP (implies GCC 4.6+) + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MOPENMP} +USE_GCC= yes +.endif + SHEBANG_FILES= ${WRKSRC}/${CONFIGURE_SCRIPT} ${WRKSRC}/chkver GLIB_SCHEMAS= org.yorba.shotwell.gschema.xml org.yorba.shotwell-extras.gschema.xml -NO_STAGE= yes post-configure: @${REINPLACE_CMD} -E \ -e 's|share/shotwell|${DATADIR_REL}|g' \ Index: distinfo =================================================================== --- distinfo (revision 338781) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (shotwell-0.14.1.tar.xz) = 045c4833e23374b649e735661cedbbff8368624b6719547013db2c21c8402fef -SIZE (shotwell-0.14.1.tar.xz) = 1624784 +SHA256 (shotwell-0.15.1.tar.xz) = eb48a0398774f172feaa4461146cc81a99540147bd8751c1e2091b21d4c20b8b +SIZE (shotwell-0.15.1.tar.xz) = 1676428 Index: files/patch-Makefile =================================================================== --- files/patch-Makefile (revision 338781) +++ files/patch-Makefile (working copy) @@ -1,6 +1,6 @@ ---- Makefile.orig 2013-04-03 16:16:24.000000000 -0300 -+++ Makefile 2013-06-12 22:39:11.000000000 -0300 -@@ -300,7 +300,6 @@ +--- Makefile.orig 2013-11-09 18:33:15.000000000 +0100 ++++ Makefile 2013-11-09 18:46:05.000000000 +0100 +@@ -315,7 +315,6 @@ gstreamer-base-1.0 \ gstreamer-pbutils-1.0 \ gtk+-3.0 \ @@ -8,15 +8,15 @@ libexif \ libgphoto2 \ json-glib-1.0 \ -@@ -332,7 +331,6 @@ +@@ -347,7 +346,6 @@ gstreamer-plugins-base-1.0 >= 1.0.0 \ gstreamer-pbutils-1.0 >= 1.0.0 \ - gtk+-3.0 >= 3.0.11 \ + gtk+-3.0 >= 3.6.0 \ - gudev-1.0 >= 145 \ libexif >= 0.6.16 \ libgphoto2 >= 2.4.2 \ libraw >= 0.13.2 \ -@@ -453,6 +451,9 @@ +@@ -461,6 +459,9 @@ # Required for gudev-1.0 CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE @@ -23,10 +23,10 @@ +# do not forget about libintl +LDFLAGS += -lintl + - define check_valadate_version - @ pkg-config $(VALADATE_PKG_NAME) --atleast-version=$(MIN_VALADATE_VERSION) || ( echo 'Shotwell testing requires Valadate $(MIN_VALADATE_VERSION) or greater. You are running' `pkg-config --modversion $(VALADATE_PKG_NAME)` '\b.'; exit 1 ) - endef -@@ -570,8 +571,8 @@ + all: pkgcheck valacheck desktop + + ifdef ENABLE_BUILD_FOR_GLADE +@@ -591,8 +592,8 @@ glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas endif ifndef DISABLE_GSETTINGS_CONVERT_INSTALL Index: files/patch-src-camera-CameraTable.vala =================================================================== --- files/patch-src-camera-CameraTable.vala (revision 338781) +++ files/patch-src-camera-CameraTable.vala (working copy) @@ -1,5 +1,5 @@ ---- ./src/camera/CameraTable.vala.orig 2013-04-20 21:27:30.000000000 +0200 -+++ ./src/camera/CameraTable.vala 2013-04-20 21:31:02.000000000 +0200 +--- src/camera/CameraTable.vala.orig 2013-11-09 18:20:35.000000000 +0100 ++++ src/camera/CameraTable.vala 2013-11-09 18:24:57.000000000 +0100 @@ -26,7 +26,6 @@ private static CameraTable instance = null; @@ -8,7 +8,7 @@ private OneShotScheduler camera_update_scheduler = null; private GPhoto.Context null_context = new GPhoto.Context(); private GPhoto.CameraAbilitiesList abilities_list; -@@ -44,7 +43,6 @@ +@@ -43,7 +42,6 @@ on_update_cameras); // listen for interesting events on the specified subsystems @@ -16,11 +16,10 @@ volume_monitor = VolumeMonitor.get(); volume_monitor.volume_changed.connect(on_volume_changed); volume_monitor.volume_added.connect(on_volume_changed); -@@ -111,32 +109,7 @@ - +@@ -111,31 +109,7 @@ private string[] get_all_usb_cameras() { string[] cameras = new string[0]; -- + - GLib.List<GUdev.Device> device_list = client.query_by_subsystem(null); - foreach (GUdev.Device device in device_list) { - string device_file = device.get_device_file(); @@ -46,11 +45,11 @@ - } - } - -+ // this would require udev, so we'll just return an empty array ++ // this would require udev, so we'll just return an empty array return cameras; } -@@ -213,23 +186,7 @@ +@@ -212,23 +186,7 @@ "/dev/bus/usb/%s".printf(port.substring(4).replace(",", "/")) : null; } @@ -71,11 +70,11 @@ - } - return null; - } -+ // get_name_for_uuid() and get_icon_for_uuid() are not used (udev removal) ++ // get_name_for_uuid() and get_icon_for_uuid() are not used (udev removal) private void update_camera_table() throws GPhotoError { // need to do this because virtual ports come and go in the USB world (and probably others) -@@ -336,22 +293,7 @@ +@@ -334,22 +292,7 @@ } // Get display name for camera. @@ -95,11 +94,11 @@ - display_name = device.get_property("ID_MODEL"); - } - } -+ // we use a default name, as everything else requires udev ++ // we use a default name, as everything else requires udev if (null == display_name) { // Default to GPhoto detected name. display_name = name; -@@ -396,13 +338,7 @@ +@@ -394,13 +337,7 @@ } } @@ -110,7 +109,7 @@ - // update to occur when they come in all at once - camera_update_scheduler.after_timeout(UPDATE_DELAY_MSEC, true); - } -+ // on_udev_event() removed as "udev related" ++ // on_udev_event() removed as "udev related" public void on_volume_changed(Volume volume) { camera_update_scheduler.after_timeout(UPDATE_DELAY_MSEC, true); Index: pkg-plist =================================================================== --- pkg-plist (revision 338781) +++ pkg-plist (working copy) @@ -1,5 +1,4 @@ bin/shotwell -bin/shotwell-video-thumbnailer lib/shotwell/plugins/builtin/f-spot-24.png lib/shotwell/plugins/builtin/facebook.png lib/shotwell/plugins/builtin/facebook_publishing_options_pane.glade @@ -7,8 +6,6 @@ lib/shotwell/plugins/builtin/flickr_pin_entry_pane.glade lib/shotwell/plugins/builtin/flickr_publishing_options_pane.glade lib/shotwell/plugins/builtin/picasa.png -lib/shotwell/plugins/builtin/picasa_auth_code_entry_pane.glade -lib/shotwell/plugins/builtin/picasa_not_set_up_pane.glade lib/shotwell/plugins/builtin/picasa_publishing_options_pane.glade lib/shotwell/plugins/builtin/piwigo.png lib/shotwell/plugins/builtin/piwigo_authentication_pane.glade @@ -19,10 +16,14 @@ lib/shotwell/plugins/builtin/shotwell-transitions.so lib/shotwell/plugins/builtin/slideshow-plugin.png lib/shotwell/plugins/builtin/tumblr.png +lib/shotwell/plugins/builtin/tumblr_authentication_pane.glade +lib/shotwell/plugins/builtin/tumblr_publishing_options_pane.glade lib/shotwell/plugins/builtin/yandex_publish_model.glade lib/shotwell/plugins/builtin/youtube.png lib/shotwell/plugins/builtin/youtube_publishing_options_pane.glade libexec/shotwell/shotwell-settings-migrator +libexec/shotwell/shotwell-video-thumbnailer +share/appdata/shotwell.appdata.xml share/applications/shotwell-viewer.desktop share/applications/shotwell.desktop share/gnome/help/shotwell/C/edit-adjustments.page @@ -72,6 +73,7 @@ share/icons/hicolor/24x24/apps/shotwell.svg share/icons/hicolor/scalable/apps/shotwell.svg share/locale/af/LC_MESSAGES/shotwell.mo +share/locale/af_ZA/LC_MESSAGES/shotwell.mo share/locale/ar/LC_MESSAGES/shotwell-extras.mo share/locale/ar/LC_MESSAGES/shotwell.mo share/locale/as/LC_MESSAGES/shotwell-extras.mo @@ -82,6 +84,8 @@ share/locale/bg/LC_MESSAGES/shotwell.mo share/locale/bn/LC_MESSAGES/shotwell-extras.mo share/locale/bn/LC_MESSAGES/shotwell.mo +share/locale/bn_IN/LC_MESSAGES/shotwell-extras.mo +share/locale/bn_IN/LC_MESSAGES/shotwell.mo share/locale/ca/LC_MESSAGES/shotwell-extras.mo share/locale/ca/LC_MESSAGES/shotwell.mo share/locale/cs/LC_MESSAGES/shotwell-extras.mo @@ -107,6 +111,7 @@ share/locale/fr/LC_MESSAGES/shotwell.mo share/locale/gl/LC_MESSAGES/shotwell-extras.mo share/locale/gl/LC_MESSAGES/shotwell.mo +share/locale/gu/LC_MESSAGES/shotwell-extras.mo share/locale/gu/LC_MESSAGES/shotwell.mo share/locale/he/LC_MESSAGES/shotwell-extras.mo share/locale/he/LC_MESSAGES/shotwell.mo @@ -119,6 +124,8 @@ share/locale/ia/LC_MESSAGES/shotwell.mo share/locale/id/LC_MESSAGES/shotwell-extras.mo share/locale/id/LC_MESSAGES/shotwell.mo +share/locale/id_ID/LC_MESSAGES/shotwell-extras.mo +share/locale/id_ID/LC_MESSAGES/shotwell.mo share/locale/it/LC_MESSAGES/shotwell-extras.mo share/locale/it/LC_MESSAGES/shotwell.mo share/locale/ja/LC_MESSAGES/shotwell-extras.mo @@ -130,6 +137,7 @@ share/locale/kn/LC_MESSAGES/shotwell.mo share/locale/ko/LC_MESSAGES/shotwell-extras.mo share/locale/ko/LC_MESSAGES/shotwell.mo +share/locale/ky/LC_MESSAGES/shotwell.mo share/locale/lt/LC_MESSAGES/shotwell-extras.mo share/locale/lt/LC_MESSAGES/shotwell.mo share/locale/lv/LC_MESSAGES/shotwell-extras.mo @@ -144,6 +152,8 @@ share/locale/nb/LC_MESSAGES/shotwell.mo share/locale/nl/LC_MESSAGES/shotwell-extras.mo share/locale/nl/LC_MESSAGES/shotwell.mo +share/locale/nn_NO/LC_MESSAGES/shotwell-extras.mo +share/locale/nn_NO/LC_MESSAGES/shotwell.mo share/locale/or/LC_MESSAGES/shotwell-extras.mo share/locale/or/LC_MESSAGES/shotwell.mo share/locale/pa/LC_MESSAGES/shotwell-extras.mo @@ -168,14 +178,19 @@ share/locale/sv/LC_MESSAGES/shotwell.mo share/locale/ta/LC_MESSAGES/shotwell-extras.mo share/locale/ta/LC_MESSAGES/shotwell.mo +share/locale/ta_IN/LC_MESSAGES/shotwell.mo share/locale/te/LC_MESSAGES/shotwell-extras.mo share/locale/te/LC_MESSAGES/shotwell.mo +share/locale/te_IN/LC_MESSAGES/shotwell.mo share/locale/th/LC_MESSAGES/shotwell-extras.mo share/locale/th/LC_MESSAGES/shotwell.mo share/locale/tr/LC_MESSAGES/shotwell-extras.mo share/locale/tr/LC_MESSAGES/shotwell.mo +share/locale/tr_TR/LC_MESSAGES/shotwell-extras.mo +share/locale/tr_TR/LC_MESSAGES/shotwell.mo share/locale/uk/LC_MESSAGES/shotwell-extras.mo share/locale/uk/LC_MESSAGES/shotwell.mo +share/locale/vi/LC_MESSAGES/shotwell-extras.mo share/locale/vi/LC_MESSAGES/shotwell.mo share/locale/zh_CN/LC_MESSAGES/shotwell-extras.mo share/locale/zh_CN/LC_MESSAGES/shotwell.mo @@ -205,6 +220,7 @@ %%DATADIR%%/icons/merge.svg %%DATADIR%%/icons/multiple-events.png %%DATADIR%%/icons/multiple-tags.png +%%DATADIR%%/icons/no-event.png %%DATADIR%%/icons/noninterpretable-video.png %%DATADIR%%/icons/one-event.png %%DATADIR%%/icons/one-star-filter-plus.svg @@ -255,20 +271,138 @@ @dirrm %%DATADIR%%/ui @dirrm %%DATADIR%%/icons @dirrm %%DATADIR%% +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/vi/LC_MESSAGES +@dirrmtry share/locale/vi +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/tr_TR/LC_MESSAGES +@dirrmtry share/locale/tr_TR +@dirrmtry share/locale/tr/LC_MESSAGES +@dirrmtry share/locale/tr +@dirrmtry share/locale/th/LC_MESSAGES +@dirrmtry share/locale/th +@dirrmtry share/locale/te_IN/LC_MESSAGES +@dirrmtry share/locale/te_IN @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te +@dirrmtry share/locale/ta_IN/LC_MESSAGES +@dirrmtry share/locale/ta_IN +@dirrmtry share/locale/ta/LC_MESSAGES +@dirrmtry share/locale/ta +@dirrmtry share/locale/sv/LC_MESSAGES +@dirrmtry share/locale/sv +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/ru/LC_MESSAGES +@dirrmtry share/locale/ru +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt_BR/LC_MESSAGES +@dirrmtry share/locale/pt_BR +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/pa/LC_MESSAGES +@dirrmtry share/locale/pa +@dirrmtry share/locale/or/LC_MESSAGES +@dirrmtry share/locale/or +@dirrmtry share/locale/nn_NO/LC_MESSAGES +@dirrmtry share/locale/nn_NO +@dirrmtry share/locale/nl/LC_MESSAGES +@dirrmtry share/locale/nl +@dirrmtry share/locale/nb/LC_MESSAGES +@dirrmtry share/locale/nb @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr +@dirrmtry share/locale/ml/LC_MESSAGES +@dirrmtry share/locale/ml +@dirrmtry share/locale/mk/LC_MESSAGES +@dirrmtry share/locale/mk +@dirrmtry share/locale/lv/LC_MESSAGES +@dirrmtry share/locale/lv +@dirrmtry share/locale/lt/LC_MESSAGES +@dirrmtry share/locale/lt +@dirrmtry share/locale/ky/LC_MESSAGES +@dirrmtry share/locale/ky +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/kn/LC_MESSAGES +@dirrmtry share/locale/kn @dirrmtry share/locale/km/LC_MESSAGES @dirrmtry share/locale/km @dirrmtry share/locale/kk/LC_MESSAGES @dirrmtry share/locale/kk +@dirrmtry share/locale/ja/LC_MESSAGES +@dirrmtry share/locale/ja +@dirrmtry share/locale/it/LC_MESSAGES +@dirrmtry share/locale/it +@dirrmtry share/locale/id_ID/LC_MESSAGES +@dirrmtry share/locale/id_ID +@dirrmtry share/locale/id/LC_MESSAGES +@dirrmtry share/locale/id @dirrmtry share/locale/ia/LC_MESSAGES @dirrmtry share/locale/ia +@dirrmtry share/locale/hu/LC_MESSAGES +@dirrmtry share/locale/hu +@dirrmtry share/locale/hr/LC_MESSAGES +@dirrmtry share/locale/hr +@dirrmtry share/locale/hi/LC_MESSAGES +@dirrmtry share/locale/hi +@dirrmtry share/locale/he/LC_MESSAGES +@dirrmtry share/locale/he +@dirrmtry share/locale/gu/LC_MESSAGES +@dirrmtry share/locale/gu +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fr/LC_MESSAGES +@dirrmtry share/locale/fr +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/eu/LC_MESSAGES +@dirrmtry share/locale/eu +@dirrmtry share/locale/et/LC_MESSAGES +@dirrmtry share/locale/et +@dirrmtry share/locale/es/LC_MESSAGES +@dirrmtry share/locale/es +@dirrmtry share/locale/eo/LC_MESSAGES +@dirrmtry share/locale/eo +@dirrmtry share/locale/en_GB/LC_MESSAGES +@dirrmtry share/locale/en_GB +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/de/LC_MESSAGES +@dirrmtry share/locale/de +@dirrmtry share/locale/da/LC_MESSAGES +@dirrmtry share/locale/da +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/bn/LC_MESSAGES +@dirrmtry share/locale/bn +@dirrmtry share/locale/bg/LC_MESSAGES +@dirrmtry share/locale/bg @dirrmtry share/locale/ast/LC_MESSAGES @dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as +@dirrmtry share/locale/ar/LC_MESSAGES +@dirrmtry share/locale/ar +@dirrmtry share/locale/af_ZA/LC_MESSAGES +@dirrmtry share/locale/af_ZA +@dirrmtry share/locale/af/LC_MESSAGES +@dirrmtry share/locale/af @dirrm share/gnome/help/shotwell/C/figures @dirrm share/gnome/help/shotwell/C @dirrm share/gnome/help/shotwell
Responsible Changed From-To: freebsd-ports-bugs->lx Over to maintainer (via the GNATS Auto Assign Tool)
Here's an updated version of the patch, against today's svn. Yes, there's "-lc++" and "USE_GCC" together in that OPENMP conditional - whithout that, shotwell crashes when trying to read information from RAW files. Diff available via http: http://burggraben.net/hacks/shotwell-current.diff.gz svn status M Makefile M distinfo M files/patch-Makefile D files/patch-git_89aa167 M files/patch-src-camera-CameraTable.vala M pkg-plist svn diff Index: Makefile =================================================================== --- Makefile (revision 341445) +++ Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= shotwell -PORTVERSION= 0.14.1 -PORTREVISION= 1 +PORTVERSION= 0.15.1 CATEGORIES= graphics gnome MASTER_SITES= http://www.yorba.org/download/shotwell/${PORTVERSION:R}/ @@ -15,16 +14,16 @@ BUILD_DEPENDS= vala>=0.18.0:${PORTSDIR}/lang/vala \ bash:${PORTSDIR}/shells/bash 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 \ - gexiv2:${PORTSDIR}/graphics/gexiv2 \ - exif:${PORTSDIR}/graphics/libexif \ - gphoto2:${PORTSDIR}/graphics/libgphoto2 \ - webkitgtk-3.0:${PORTSDIR}/www/webkit-gtk3 \ - unique-1.0:${PORTSDIR}/x11-toolkits/unique \ - raw:${PORTSDIR}/graphics/libraw \ - rest:${PORTSDIR}/devel/librest + libgee-0.8.so:${PORTSDIR}/devel/libgee \ + libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib \ + libsoup-2.4.so:${PORTSDIR}/devel/libsoup \ + libgexiv2.so:${PORTSDIR}/graphics/gexiv2 \ + libexif.so:${PORTSDIR}/graphics/libexif \ + libgphoto2.so:${PORTSDIR}/graphics/libgphoto2 \ + libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3 \ + libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique \ + libraw.so:${PORTSDIR}/graphics/libraw \ + librest-0.7.so:${PORTSDIR}/devel/librest USE_XZ= yes USES= shebangfix gettext desktop-file-utils gmake pkgconfig @@ -36,11 +35,21 @@ CONFIGURE_ENV+= --define=NO_CAMERA INSTALLS_ICONS= yes +OPTIONS_DEFINE= OPENMP +OPTIONS_DEFAULT= +OPENMP_DESC= libraw uses OpenMP (implies GCC 4.6+) + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MOPENMP} +USE_GCC= yes +LDFLAGS+= -lc++ +.endif + SHEBANG_FILES= ${WRKSRC}/${CONFIGURE_SCRIPT} ${WRKSRC}/chkver GLIB_SCHEMAS= org.yorba.shotwell.gschema.xml org.yorba.shotwell-extras.gschema.xml -NO_STAGE= yes post-configure: @${REINPLACE_CMD} -E \ -e 's|share/shotwell|${DATADIR_REL}|g' \ Index: distinfo =================================================================== --- distinfo (revision 341445) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (shotwell-0.14.1.tar.xz) = 045c4833e23374b649e735661cedbbff8368624b6719547013db2c21c8402fef -SIZE (shotwell-0.14.1.tar.xz) = 1624784 +SHA256 (shotwell-0.15.1.tar.xz) = eb48a0398774f172feaa4461146cc81a99540147bd8751c1e2091b21d4c20b8b +SIZE (shotwell-0.15.1.tar.xz) = 1676428 Index: files/patch-Makefile =================================================================== --- files/patch-Makefile (revision 341445) +++ files/patch-Makefile (working copy) @@ -1,6 +1,6 @@ ---- Makefile.orig 2013-04-03 16:16:24.000000000 -0300 -+++ Makefile 2013-06-12 22:39:11.000000000 -0300 -@@ -300,7 +300,6 @@ +--- Makefile.orig 2013-11-09 18:33:15.000000000 +0100 ++++ Makefile 2013-11-09 18:46:05.000000000 +0100 +@@ -315,7 +315,6 @@ gstreamer-base-1.0 \ gstreamer-pbutils-1.0 \ gtk+-3.0 \ @@ -8,15 +8,15 @@ libexif \ libgphoto2 \ json-glib-1.0 \ -@@ -332,7 +331,6 @@ +@@ -347,7 +346,6 @@ gstreamer-plugins-base-1.0 >= 1.0.0 \ gstreamer-pbutils-1.0 >= 1.0.0 \ - gtk+-3.0 >= 3.0.11 \ + gtk+-3.0 >= 3.6.0 \ - gudev-1.0 >= 145 \ libexif >= 0.6.16 \ libgphoto2 >= 2.4.2 \ libraw >= 0.13.2 \ -@@ -453,6 +451,9 @@ +@@ -461,6 +459,9 @@ # Required for gudev-1.0 CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE @@ -23,10 +23,10 @@ +# do not forget about libintl +LDFLAGS += -lintl + - define check_valadate_version - @ pkg-config $(VALADATE_PKG_NAME) --atleast-version=$(MIN_VALADATE_VERSION) || ( echo 'Shotwell testing requires Valadate $(MIN_VALADATE_VERSION) or greater. You are running' `pkg-config --modversion $(VALADATE_PKG_NAME)` '\b.'; exit 1 ) - endef -@@ -570,8 +571,8 @@ + all: pkgcheck valacheck desktop + + ifdef ENABLE_BUILD_FOR_GLADE +@@ -591,8 +592,8 @@ glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas endif ifndef DISABLE_GSETTINGS_CONVERT_INSTALL Index: files/patch-git_89aa167 =================================================================== --- files/patch-git_89aa167 (revision 341445) +++ files/patch-git_89aa167 (working copy) @@ -1,54 +0,0 @@ -commit 89aa167726d12f9ae0b53c01a2fdc54601fc3cc5 -Author: Jim Nelson <jim@yorba.org> -Date: Wed May 29 11:52:09 2013 -0700 - - Build with LibRaw 0.15: Closes #7012 - - LibRaw 0.15 removed document-mode processing, which, as their release - notes say, "no one uses". Compile error were nothing more than - missing symbols -- Shotwell wasn't using it either. - ---- src/photos/GRaw.vala -+++ src/photos/GRaw.vala -@@ -21,12 +21,6 @@ public enum Colorspace { - XYZ = 5 - } - --public enum DocMode { -- STANDARD = 0, -- GRAYSCALE = 1, -- GRAYSCALE_NO_WHITE_BALANCE = 2 --} -- - public errordomain Exception { - UNSPECIFIED, - UNSUPPORTED_FILE, -@@ -167,10 +161,6 @@ public class Processor { - throw_exception("adjust_sizes_info_only", proc.adjust_sizes_info_only()); - } - -- public void document_mode_processing() throws Exception { -- throw_exception("document_mode_processing", proc.document_mode_processing()); -- } -- - public unowned LibRaw.ImageOther get_image_other() { - return proc.get_image_other(); - } -@@ -244,7 +234,6 @@ public class Processor { - // threshold - output_params->half_size = half_size; - // four_color_rgb -- output_params->document_mode = GRaw.DocMode.STANDARD; - output_params->highlight = GRaw.HighlightMode.CLIP; - output_params->use_auto_wb = true; - output_params->use_camera_wb = true; ---- vapi/libraw.vapi -+++ vapi/libraw.vapi -@@ -104,7 +104,6 @@ public struct OutputParams { - public float threshold; - public bool half_size; - public bool four_color_rgb; -- public int document_mode; - public int highlight; - public bool use_auto_wb; - public bool use_camera_wb; Index: files/patch-src-camera-CameraTable.vala =================================================================== --- files/patch-src-camera-CameraTable.vala (revision 341445) +++ files/patch-src-camera-CameraTable.vala (working copy) @@ -1,5 +1,5 @@ ---- ./src/camera/CameraTable.vala.orig 2013-04-20 21:27:30.000000000 +0200 -+++ ./src/camera/CameraTable.vala 2013-04-20 21:31:02.000000000 +0200 +--- src/camera/CameraTable.vala.orig 2013-11-09 18:20:35.000000000 +0100 ++++ src/camera/CameraTable.vala 2013-11-09 18:24:57.000000000 +0100 @@ -26,7 +26,6 @@ private static CameraTable instance = null; @@ -8,7 +8,7 @@ private OneShotScheduler camera_update_scheduler = null; private GPhoto.Context null_context = new GPhoto.Context(); private GPhoto.CameraAbilitiesList abilities_list; -@@ -44,7 +43,6 @@ +@@ -43,7 +42,6 @@ on_update_cameras); // listen for interesting events on the specified subsystems @@ -16,11 +16,10 @@ volume_monitor = VolumeMonitor.get(); volume_monitor.volume_changed.connect(on_volume_changed); volume_monitor.volume_added.connect(on_volume_changed); -@@ -111,32 +109,7 @@ - +@@ -111,31 +109,7 @@ private string[] get_all_usb_cameras() { string[] cameras = new string[0]; -- + - GLib.List<GUdev.Device> device_list = client.query_by_subsystem(null); - foreach (GUdev.Device device in device_list) { - string device_file = device.get_device_file(); @@ -46,11 +45,11 @@ - } - } - -+ // this would require udev, so we'll just return an empty array ++ // this would require udev, so we'll just return an empty array return cameras; } -@@ -213,23 +186,7 @@ +@@ -212,23 +186,7 @@ "/dev/bus/usb/%s".printf(port.substring(4).replace(",", "/")) : null; } @@ -71,11 +70,11 @@ - } - return null; - } -+ // get_name_for_uuid() and get_icon_for_uuid() are not used (udev removal) ++ // get_name_for_uuid() and get_icon_for_uuid() are not used (udev removal) private void update_camera_table() throws GPhotoError { // need to do this because virtual ports come and go in the USB world (and probably others) -@@ -336,22 +293,7 @@ +@@ -334,22 +292,7 @@ } // Get display name for camera. @@ -95,11 +94,11 @@ - display_name = device.get_property("ID_MODEL"); - } - } -+ // we use a default name, as everything else requires udev ++ // we use a default name, as everything else requires udev if (null == display_name) { // Default to GPhoto detected name. display_name = name; -@@ -396,13 +338,7 @@ +@@ -394,13 +337,7 @@ } } @@ -110,7 +109,7 @@ - // update to occur when they come in all at once - camera_update_scheduler.after_timeout(UPDATE_DELAY_MSEC, true); - } -+ // on_udev_event() removed as "udev related" ++ // on_udev_event() removed as "udev related" public void on_volume_changed(Volume volume) { camera_update_scheduler.after_timeout(UPDATE_DELAY_MSEC, true); Index: pkg-plist =================================================================== --- pkg-plist (revision 341445) +++ pkg-plist (working copy) @@ -1,5 +1,4 @@ bin/shotwell -bin/shotwell-video-thumbnailer lib/shotwell/plugins/builtin/f-spot-24.png lib/shotwell/plugins/builtin/facebook.png lib/shotwell/plugins/builtin/facebook_publishing_options_pane.glade @@ -7,8 +6,6 @@ lib/shotwell/plugins/builtin/flickr_pin_entry_pane.glade lib/shotwell/plugins/builtin/flickr_publishing_options_pane.glade lib/shotwell/plugins/builtin/picasa.png -lib/shotwell/plugins/builtin/picasa_auth_code_entry_pane.glade -lib/shotwell/plugins/builtin/picasa_not_set_up_pane.glade lib/shotwell/plugins/builtin/picasa_publishing_options_pane.glade lib/shotwell/plugins/builtin/piwigo.png lib/shotwell/plugins/builtin/piwigo_authentication_pane.glade @@ -19,10 +16,14 @@ lib/shotwell/plugins/builtin/shotwell-transitions.so lib/shotwell/plugins/builtin/slideshow-plugin.png lib/shotwell/plugins/builtin/tumblr.png +lib/shotwell/plugins/builtin/tumblr_authentication_pane.glade +lib/shotwell/plugins/builtin/tumblr_publishing_options_pane.glade lib/shotwell/plugins/builtin/yandex_publish_model.glade lib/shotwell/plugins/builtin/youtube.png lib/shotwell/plugins/builtin/youtube_publishing_options_pane.glade libexec/shotwell/shotwell-settings-migrator +libexec/shotwell/shotwell-video-thumbnailer +share/appdata/shotwell.appdata.xml share/applications/shotwell-viewer.desktop share/applications/shotwell.desktop share/gnome/help/shotwell/C/edit-adjustments.page @@ -72,6 +73,7 @@ share/icons/hicolor/24x24/apps/shotwell.svg share/icons/hicolor/scalable/apps/shotwell.svg share/locale/af/LC_MESSAGES/shotwell.mo +share/locale/af_ZA/LC_MESSAGES/shotwell.mo share/locale/ar/LC_MESSAGES/shotwell-extras.mo share/locale/ar/LC_MESSAGES/shotwell.mo share/locale/as/LC_MESSAGES/shotwell-extras.mo @@ -82,6 +84,8 @@ share/locale/bg/LC_MESSAGES/shotwell.mo share/locale/bn/LC_MESSAGES/shotwell-extras.mo share/locale/bn/LC_MESSAGES/shotwell.mo +share/locale/bn_IN/LC_MESSAGES/shotwell-extras.mo +share/locale/bn_IN/LC_MESSAGES/shotwell.mo share/locale/ca/LC_MESSAGES/shotwell-extras.mo share/locale/ca/LC_MESSAGES/shotwell.mo share/locale/cs/LC_MESSAGES/shotwell-extras.mo @@ -107,6 +111,7 @@ share/locale/fr/LC_MESSAGES/shotwell.mo share/locale/gl/LC_MESSAGES/shotwell-extras.mo share/locale/gl/LC_MESSAGES/shotwell.mo +share/locale/gu/LC_MESSAGES/shotwell-extras.mo share/locale/gu/LC_MESSAGES/shotwell.mo share/locale/he/LC_MESSAGES/shotwell-extras.mo share/locale/he/LC_MESSAGES/shotwell.mo @@ -119,6 +124,8 @@ share/locale/ia/LC_MESSAGES/shotwell.mo share/locale/id/LC_MESSAGES/shotwell-extras.mo share/locale/id/LC_MESSAGES/shotwell.mo +share/locale/id_ID/LC_MESSAGES/shotwell-extras.mo +share/locale/id_ID/LC_MESSAGES/shotwell.mo share/locale/it/LC_MESSAGES/shotwell-extras.mo share/locale/it/LC_MESSAGES/shotwell.mo share/locale/ja/LC_MESSAGES/shotwell-extras.mo @@ -130,6 +137,7 @@ share/locale/kn/LC_MESSAGES/shotwell.mo share/locale/ko/LC_MESSAGES/shotwell-extras.mo share/locale/ko/LC_MESSAGES/shotwell.mo +share/locale/ky/LC_MESSAGES/shotwell.mo share/locale/lt/LC_MESSAGES/shotwell-extras.mo share/locale/lt/LC_MESSAGES/shotwell.mo share/locale/lv/LC_MESSAGES/shotwell-extras.mo @@ -144,6 +152,8 @@ share/locale/nb/LC_MESSAGES/shotwell.mo share/locale/nl/LC_MESSAGES/shotwell-extras.mo share/locale/nl/LC_MESSAGES/shotwell.mo +share/locale/nn_NO/LC_MESSAGES/shotwell-extras.mo +share/locale/nn_NO/LC_MESSAGES/shotwell.mo share/locale/or/LC_MESSAGES/shotwell-extras.mo share/locale/or/LC_MESSAGES/shotwell.mo share/locale/pa/LC_MESSAGES/shotwell-extras.mo @@ -168,14 +178,19 @@ share/locale/sv/LC_MESSAGES/shotwell.mo share/locale/ta/LC_MESSAGES/shotwell-extras.mo share/locale/ta/LC_MESSAGES/shotwell.mo +share/locale/ta_IN/LC_MESSAGES/shotwell.mo share/locale/te/LC_MESSAGES/shotwell-extras.mo share/locale/te/LC_MESSAGES/shotwell.mo +share/locale/te_IN/LC_MESSAGES/shotwell.mo share/locale/th/LC_MESSAGES/shotwell-extras.mo share/locale/th/LC_MESSAGES/shotwell.mo share/locale/tr/LC_MESSAGES/shotwell-extras.mo share/locale/tr/LC_MESSAGES/shotwell.mo +share/locale/tr_TR/LC_MESSAGES/shotwell-extras.mo +share/locale/tr_TR/LC_MESSAGES/shotwell.mo share/locale/uk/LC_MESSAGES/shotwell-extras.mo share/locale/uk/LC_MESSAGES/shotwell.mo +share/locale/vi/LC_MESSAGES/shotwell-extras.mo share/locale/vi/LC_MESSAGES/shotwell.mo share/locale/zh_CN/LC_MESSAGES/shotwell-extras.mo share/locale/zh_CN/LC_MESSAGES/shotwell.mo @@ -205,6 +220,7 @@ %%DATADIR%%/icons/merge.svg %%DATADIR%%/icons/multiple-events.png %%DATADIR%%/icons/multiple-tags.png +%%DATADIR%%/icons/no-event.png %%DATADIR%%/icons/noninterpretable-video.png %%DATADIR%%/icons/one-event.png %%DATADIR%%/icons/one-star-filter-plus.svg @@ -255,20 +271,138 @@ @dirrm %%DATADIR%%/ui @dirrm %%DATADIR%%/icons @dirrm %%DATADIR%% +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/vi/LC_MESSAGES +@dirrmtry share/locale/vi +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/tr_TR/LC_MESSAGES +@dirrmtry share/locale/tr_TR +@dirrmtry share/locale/tr/LC_MESSAGES +@dirrmtry share/locale/tr +@dirrmtry share/locale/th/LC_MESSAGES +@dirrmtry share/locale/th +@dirrmtry share/locale/te_IN/LC_MESSAGES +@dirrmtry share/locale/te_IN @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te +@dirrmtry share/locale/ta_IN/LC_MESSAGES +@dirrmtry share/locale/ta_IN +@dirrmtry share/locale/ta/LC_MESSAGES +@dirrmtry share/locale/ta +@dirrmtry share/locale/sv/LC_MESSAGES +@dirrmtry share/locale/sv +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/ru/LC_MESSAGES +@dirrmtry share/locale/ru +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt_BR/LC_MESSAGES +@dirrmtry share/locale/pt_BR +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/pa/LC_MESSAGES +@dirrmtry share/locale/pa +@dirrmtry share/locale/or/LC_MESSAGES +@dirrmtry share/locale/or +@dirrmtry share/locale/nn_NO/LC_MESSAGES +@dirrmtry share/locale/nn_NO +@dirrmtry share/locale/nl/LC_MESSAGES +@dirrmtry share/locale/nl +@dirrmtry share/locale/nb/LC_MESSAGES +@dirrmtry share/locale/nb @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr +@dirrmtry share/locale/ml/LC_MESSAGES +@dirrmtry share/locale/ml +@dirrmtry share/locale/mk/LC_MESSAGES +@dirrmtry share/locale/mk +@dirrmtry share/locale/lv/LC_MESSAGES +@dirrmtry share/locale/lv +@dirrmtry share/locale/lt/LC_MESSAGES +@dirrmtry share/locale/lt +@dirrmtry share/locale/ky/LC_MESSAGES +@dirrmtry share/locale/ky +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/kn/LC_MESSAGES +@dirrmtry share/locale/kn @dirrmtry share/locale/km/LC_MESSAGES @dirrmtry share/locale/km @dirrmtry share/locale/kk/LC_MESSAGES @dirrmtry share/locale/kk +@dirrmtry share/locale/ja/LC_MESSAGES +@dirrmtry share/locale/ja +@dirrmtry share/locale/it/LC_MESSAGES +@dirrmtry share/locale/it +@dirrmtry share/locale/id_ID/LC_MESSAGES +@dirrmtry share/locale/id_ID +@dirrmtry share/locale/id/LC_MESSAGES +@dirrmtry share/locale/id @dirrmtry share/locale/ia/LC_MESSAGES @dirrmtry share/locale/ia +@dirrmtry share/locale/hu/LC_MESSAGES +@dirrmtry share/locale/hu +@dirrmtry share/locale/hr/LC_MESSAGES +@dirrmtry share/locale/hr +@dirrmtry share/locale/hi/LC_MESSAGES +@dirrmtry share/locale/hi +@dirrmtry share/locale/he/LC_MESSAGES +@dirrmtry share/locale/he +@dirrmtry share/locale/gu/LC_MESSAGES +@dirrmtry share/locale/gu +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fr/LC_MESSAGES +@dirrmtry share/locale/fr +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/eu/LC_MESSAGES +@dirrmtry share/locale/eu +@dirrmtry share/locale/et/LC_MESSAGES +@dirrmtry share/locale/et +@dirrmtry share/locale/es/LC_MESSAGES +@dirrmtry share/locale/es +@dirrmtry share/locale/eo/LC_MESSAGES +@dirrmtry share/locale/eo +@dirrmtry share/locale/en_GB/LC_MESSAGES +@dirrmtry share/locale/en_GB +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/de/LC_MESSAGES +@dirrmtry share/locale/de +@dirrmtry share/locale/da/LC_MESSAGES +@dirrmtry share/locale/da +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/bn/LC_MESSAGES +@dirrmtry share/locale/bn +@dirrmtry share/locale/bg/LC_MESSAGES +@dirrmtry share/locale/bg @dirrmtry share/locale/ast/LC_MESSAGES @dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as +@dirrmtry share/locale/ar/LC_MESSAGES +@dirrmtry share/locale/ar +@dirrmtry share/locale/af_ZA/LC_MESSAGES +@dirrmtry share/locale/af_ZA +@dirrmtry share/locale/af/LC_MESSAGES +@dirrmtry share/locale/af @dirrm share/gnome/help/shotwell/C/figures @dirrm share/gnome/help/shotwell/C @dirrm share/gnome/help/shotwell Regards, Christoph -- Spare Space
Author: lx Date: Tue Jan 28 19:51:21 2014 New Revision: 341650 URL: http://svnweb.freebsd.org/changeset/ports/341650 QAT: https://qat.redports.org/buildarchive/r341650/ Log: Update to 0.15.1. PR: ports/185495 Submitted by: Christoph Moench-Tegeder Reviewed by: lx@ Modified: head/graphics/shotwell/Makefile head/graphics/shotwell/distinfo head/graphics/shotwell/files/patch-Makefile head/graphics/shotwell/files/patch-src-camera-CameraTable.vala head/graphics/shotwell/pkg-plist Modified: head/graphics/shotwell/Makefile ============================================================================== --- head/graphics/shotwell/Makefile Tue Jan 28 19:50:49 2014 (r341649) +++ head/graphics/shotwell/Makefile Tue Jan 28 19:51:21 2014 (r341650) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= shotwell -PORTVERSION= 0.14.1 -PORTREVISION= 1 +PORTVERSION= 0.15.1 CATEGORIES= graphics gnome MASTER_SITES= http://www.yorba.org/download/shotwell/${PORTVERSION:R}/ @@ -15,16 +14,16 @@ LICENSE= LGPL21 BUILD_DEPENDS= vala>=0.18.0:${PORTSDIR}/lang/vala \ bash:${PORTSDIR}/shells/bash 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 \ - gexiv2:${PORTSDIR}/graphics/gexiv2 \ - exif:${PORTSDIR}/graphics/libexif \ - gphoto2:${PORTSDIR}/graphics/libgphoto2 \ - webkitgtk-3.0:${PORTSDIR}/www/webkit-gtk3 \ - unique-1.0:${PORTSDIR}/x11-toolkits/unique \ - raw:${PORTSDIR}/graphics/libraw \ - rest:${PORTSDIR}/devel/librest + libgee-0.8.so:${PORTSDIR}/devel/libgee \ + libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib \ + libsoup-2.4.so:${PORTSDIR}/devel/libsoup \ + libgexiv2.so:${PORTSDIR}/graphics/gexiv2 \ + libexif.so:${PORTSDIR}/graphics/libexif \ + libgphoto2.so:${PORTSDIR}/graphics/libgphoto2 \ + libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3 \ + libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique \ + libraw.so:${PORTSDIR}/graphics/libraw \ + librest-0.7.so:${PORTSDIR}/devel/librest USE_XZ= yes USES= shebangfix gettext desktop-file-utils gmake pkgconfig @@ -36,11 +35,21 @@ CONFIGURE_ARGS= --prefix=${PREFIX} --dis CONFIGURE_ENV+= --define=NO_CAMERA INSTALLS_ICONS= yes +OPTIONS_DEFINE= OPENMP +OPTIONS_DEFAULT= +OPENMP_DESC= libraw uses OpenMP (implies GCC 4.6+) + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MOPENMP} +USE_GCC= yes +LDFLAGS+= -lc++ +.endif + SHEBANG_FILES= ${WRKSRC}/${CONFIGURE_SCRIPT} ${WRKSRC}/chkver GLIB_SCHEMAS= org.yorba.shotwell.gschema.xml org.yorba.shotwell-extras.gschema.xml -NO_STAGE= yes post-configure: @${REINPLACE_CMD} -E \ -e 's|share/shotwell|${DATADIR_REL}|g' \ Modified: head/graphics/shotwell/distinfo ============================================================================== --- head/graphics/shotwell/distinfo Tue Jan 28 19:50:49 2014 (r341649) +++ head/graphics/shotwell/distinfo Tue Jan 28 19:51:21 2014 (r341650) @@ -1,2 +1,2 @@ -SHA256 (shotwell-0.14.1.tar.xz) = 045c4833e23374b649e735661cedbbff8368624b6719547013db2c21c8402fef -SIZE (shotwell-0.14.1.tar.xz) = 1624784 +SHA256 (shotwell-0.15.1.tar.xz) = eb48a0398774f172feaa4461146cc81a99540147bd8751c1e2091b21d4c20b8b +SIZE (shotwell-0.15.1.tar.xz) = 1676428 Modified: head/graphics/shotwell/files/patch-Makefile ============================================================================== --- head/graphics/shotwell/files/patch-Makefile Tue Jan 28 19:50:49 2014 (r341649) +++ head/graphics/shotwell/files/patch-Makefile Tue Jan 28 19:51:21 2014 (r341650) @@ -1,6 +1,6 @@ ---- Makefile.orig 2013-04-03 16:16:24.000000000 -0300 -+++ Makefile 2013-06-12 22:39:11.000000000 -0300 -@@ -300,7 +300,6 @@ +--- Makefile.orig 2013-11-09 18:33:15.000000000 +0100 ++++ Makefile 2013-11-09 18:46:05.000000000 +0100 +@@ -315,7 +315,6 @@ gstreamer-base-1.0 \ gstreamer-pbutils-1.0 \ gtk+-3.0 \ @@ -8,25 +8,25 @@ libexif \ libgphoto2 \ json-glib-1.0 \ -@@ -332,7 +331,6 @@ +@@ -347,7 +346,6 @@ gstreamer-plugins-base-1.0 >= 1.0.0 \ gstreamer-pbutils-1.0 >= 1.0.0 \ - gtk+-3.0 >= 3.0.11 \ + gtk+-3.0 >= 3.6.0 \ - gudev-1.0 >= 145 \ libexif >= 0.6.16 \ libgphoto2 >= 2.4.2 \ libraw >= 0.13.2 \ -@@ -453,6 +451,9 @@ +@@ -461,6 +459,9 @@ # Required for gudev-1.0 CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE +# do not forget about libintl +LDFLAGS += -lintl + - define check_valadate_version - @ pkg-config $(VALADATE_PKG_NAME) --atleast-version=$(MIN_VALADATE_VERSION) || ( echo 'Shotwell testing requires Valadate $(MIN_VALADATE_VERSION) or greater. You are running' `pkg-config --modversion $(VALADATE_PKG_NAME)` '\b.'; exit 1 ) - endef -@@ -570,8 +571,8 @@ + all: pkgcheck valacheck desktop + + ifdef ENABLE_BUILD_FOR_GLADE +@@ -591,8 +592,8 @@ glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas endif ifndef DISABLE_GSETTINGS_CONVERT_INSTALL Modified: head/graphics/shotwell/files/patch-src-camera-CameraTable.vala ============================================================================== --- head/graphics/shotwell/files/patch-src-camera-CameraTable.vala Tue Jan 28 19:50:49 2014 (r341649) +++ head/graphics/shotwell/files/patch-src-camera-CameraTable.vala Tue Jan 28 19:51:21 2014 (r341650) @@ -1,5 +1,5 @@ ---- ./src/camera/CameraTable.vala.orig 2013-04-20 21:27:30.000000000 +0200 -+++ ./src/camera/CameraTable.vala 2013-04-20 21:31:02.000000000 +0200 +--- src/camera/CameraTable.vala.orig 2013-11-09 18:20:35.000000000 +0100 ++++ src/camera/CameraTable.vala 2013-11-09 18:24:57.000000000 +0100 @@ -26,7 +26,6 @@ private static CameraTable instance = null; @@ -8,7 +8,7 @@ private OneShotScheduler camera_update_scheduler = null; private GPhoto.Context null_context = new GPhoto.Context(); private GPhoto.CameraAbilitiesList abilities_list; -@@ -44,7 +43,6 @@ +@@ -43,7 +42,6 @@ on_update_cameras); // listen for interesting events on the specified subsystems @@ -16,11 +16,10 @@ volume_monitor = VolumeMonitor.get(); volume_monitor.volume_changed.connect(on_volume_changed); volume_monitor.volume_added.connect(on_volume_changed); -@@ -111,32 +109,7 @@ - +@@ -111,31 +109,7 @@ private string[] get_all_usb_cameras() { string[] cameras = new string[0]; -- + - GLib.List<GUdev.Device> device_list = client.query_by_subsystem(null); - foreach (GUdev.Device device in device_list) { - string device_file = device.get_device_file(); @@ -46,11 +45,11 @@ - } - } - -+ // this would require udev, so we'll just return an empty array ++ // this would require udev, so we'll just return an empty array return cameras; } -@@ -213,23 +186,7 @@ +@@ -212,23 +186,7 @@ "/dev/bus/usb/%s".printf(port.substring(4).replace(",", "/")) : null; } @@ -71,11 +70,11 @@ - } - return null; - } -+ // get_name_for_uuid() and get_icon_for_uuid() are not used (udev removal) ++ // get_name_for_uuid() and get_icon_for_uuid() are not used (udev removal) private void update_camera_table() throws GPhotoError { // need to do this because virtual ports come and go in the USB world (and probably others) -@@ -336,22 +293,7 @@ +@@ -334,22 +292,7 @@ } // Get display name for camera. @@ -95,11 +94,11 @@ - display_name = device.get_property("ID_MODEL"); - } - } -+ // we use a default name, as everything else requires udev ++ // we use a default name, as everything else requires udev if (null == display_name) { // Default to GPhoto detected name. display_name = name; -@@ -396,13 +338,7 @@ +@@ -394,13 +337,7 @@ } } @@ -110,7 +109,7 @@ - // update to occur when they come in all at once - camera_update_scheduler.after_timeout(UPDATE_DELAY_MSEC, true); - } -+ // on_udev_event() removed as "udev related" ++ // on_udev_event() removed as "udev related" public void on_volume_changed(Volume volume) { camera_update_scheduler.after_timeout(UPDATE_DELAY_MSEC, true); Modified: head/graphics/shotwell/pkg-plist ============================================================================== --- head/graphics/shotwell/pkg-plist Tue Jan 28 19:50:49 2014 (r341649) +++ head/graphics/shotwell/pkg-plist Tue Jan 28 19:51:21 2014 (r341650) @@ -1,5 +1,4 @@ bin/shotwell -bin/shotwell-video-thumbnailer lib/shotwell/plugins/builtin/f-spot-24.png lib/shotwell/plugins/builtin/facebook.png lib/shotwell/plugins/builtin/facebook_publishing_options_pane.glade @@ -7,8 +6,6 @@ lib/shotwell/plugins/builtin/flickr.png lib/shotwell/plugins/builtin/flickr_pin_entry_pane.glade lib/shotwell/plugins/builtin/flickr_publishing_options_pane.glade lib/shotwell/plugins/builtin/picasa.png -lib/shotwell/plugins/builtin/picasa_auth_code_entry_pane.glade -lib/shotwell/plugins/builtin/picasa_not_set_up_pane.glade lib/shotwell/plugins/builtin/picasa_publishing_options_pane.glade lib/shotwell/plugins/builtin/piwigo.png lib/shotwell/plugins/builtin/piwigo_authentication_pane.glade @@ -19,10 +16,14 @@ lib/shotwell/plugins/builtin/shotwell-pu lib/shotwell/plugins/builtin/shotwell-transitions.so lib/shotwell/plugins/builtin/slideshow-plugin.png lib/shotwell/plugins/builtin/tumblr.png +lib/shotwell/plugins/builtin/tumblr_authentication_pane.glade +lib/shotwell/plugins/builtin/tumblr_publishing_options_pane.glade lib/shotwell/plugins/builtin/yandex_publish_model.glade lib/shotwell/plugins/builtin/youtube.png lib/shotwell/plugins/builtin/youtube_publishing_options_pane.glade libexec/shotwell/shotwell-settings-migrator +libexec/shotwell/shotwell-video-thumbnailer +share/appdata/shotwell.appdata.xml share/applications/shotwell-viewer.desktop share/applications/shotwell.desktop share/gnome/help/shotwell/C/edit-adjustments.page @@ -72,6 +73,7 @@ share/icons/hicolor/16x16/apps/shotwell. share/icons/hicolor/24x24/apps/shotwell.svg share/icons/hicolor/scalable/apps/shotwell.svg share/locale/af/LC_MESSAGES/shotwell.mo +share/locale/af_ZA/LC_MESSAGES/shotwell.mo share/locale/ar/LC_MESSAGES/shotwell-extras.mo share/locale/ar/LC_MESSAGES/shotwell.mo share/locale/as/LC_MESSAGES/shotwell-extras.mo @@ -82,6 +84,8 @@ share/locale/bg/LC_MESSAGES/shotwell-ext share/locale/bg/LC_MESSAGES/shotwell.mo share/locale/bn/LC_MESSAGES/shotwell-extras.mo share/locale/bn/LC_MESSAGES/shotwell.mo +share/locale/bn_IN/LC_MESSAGES/shotwell-extras.mo +share/locale/bn_IN/LC_MESSAGES/shotwell.mo share/locale/ca/LC_MESSAGES/shotwell-extras.mo share/locale/ca/LC_MESSAGES/shotwell.mo share/locale/cs/LC_MESSAGES/shotwell-extras.mo @@ -107,6 +111,7 @@ share/locale/fr/LC_MESSAGES/shotwell-ext share/locale/fr/LC_MESSAGES/shotwell.mo share/locale/gl/LC_MESSAGES/shotwell-extras.mo share/locale/gl/LC_MESSAGES/shotwell.mo +share/locale/gu/LC_MESSAGES/shotwell-extras.mo share/locale/gu/LC_MESSAGES/shotwell.mo share/locale/he/LC_MESSAGES/shotwell-extras.mo share/locale/he/LC_MESSAGES/shotwell.mo @@ -119,6 +124,8 @@ share/locale/hu/LC_MESSAGES/shotwell.mo share/locale/ia/LC_MESSAGES/shotwell.mo share/locale/id/LC_MESSAGES/shotwell-extras.mo share/locale/id/LC_MESSAGES/shotwell.mo +share/locale/id_ID/LC_MESSAGES/shotwell-extras.mo +share/locale/id_ID/LC_MESSAGES/shotwell.mo share/locale/it/LC_MESSAGES/shotwell-extras.mo share/locale/it/LC_MESSAGES/shotwell.mo share/locale/ja/LC_MESSAGES/shotwell-extras.mo @@ -130,6 +137,7 @@ share/locale/kn/LC_MESSAGES/shotwell-ext share/locale/kn/LC_MESSAGES/shotwell.mo share/locale/ko/LC_MESSAGES/shotwell-extras.mo share/locale/ko/LC_MESSAGES/shotwell.mo +share/locale/ky/LC_MESSAGES/shotwell.mo share/locale/lt/LC_MESSAGES/shotwell-extras.mo share/locale/lt/LC_MESSAGES/shotwell.mo share/locale/lv/LC_MESSAGES/shotwell-extras.mo @@ -144,6 +152,8 @@ share/locale/nb/LC_MESSAGES/shotwell-ext share/locale/nb/LC_MESSAGES/shotwell.mo share/locale/nl/LC_MESSAGES/shotwell-extras.mo share/locale/nl/LC_MESSAGES/shotwell.mo +share/locale/nn_NO/LC_MESSAGES/shotwell-extras.mo +share/locale/nn_NO/LC_MESSAGES/shotwell.mo share/locale/or/LC_MESSAGES/shotwell-extras.mo share/locale/or/LC_MESSAGES/shotwell.mo share/locale/pa/LC_MESSAGES/shotwell-extras.mo @@ -168,14 +178,19 @@ share/locale/sv/LC_MESSAGES/shotwell-ext share/locale/sv/LC_MESSAGES/shotwell.mo share/locale/ta/LC_MESSAGES/shotwell-extras.mo share/locale/ta/LC_MESSAGES/shotwell.mo +share/locale/ta_IN/LC_MESSAGES/shotwell.mo share/locale/te/LC_MESSAGES/shotwell-extras.mo share/locale/te/LC_MESSAGES/shotwell.mo +share/locale/te_IN/LC_MESSAGES/shotwell.mo share/locale/th/LC_MESSAGES/shotwell-extras.mo share/locale/th/LC_MESSAGES/shotwell.mo share/locale/tr/LC_MESSAGES/shotwell-extras.mo share/locale/tr/LC_MESSAGES/shotwell.mo +share/locale/tr_TR/LC_MESSAGES/shotwell-extras.mo +share/locale/tr_TR/LC_MESSAGES/shotwell.mo share/locale/uk/LC_MESSAGES/shotwell-extras.mo share/locale/uk/LC_MESSAGES/shotwell.mo +share/locale/vi/LC_MESSAGES/shotwell-extras.mo share/locale/vi/LC_MESSAGES/shotwell.mo share/locale/zh_CN/LC_MESSAGES/shotwell-extras.mo share/locale/zh_CN/LC_MESSAGES/shotwell.mo @@ -205,6 +220,7 @@ share/GConf/gsettings/shotwell.convert %%DATADIR%%/icons/merge.svg %%DATADIR%%/icons/multiple-events.png %%DATADIR%%/icons/multiple-tags.png +%%DATADIR%%/icons/no-event.png %%DATADIR%%/icons/noninterpretable-video.png %%DATADIR%%/icons/one-event.png %%DATADIR%%/icons/one-star-filter-plus.svg @@ -255,20 +271,138 @@ share/GConf/gsettings/shotwell.convert @dirrm %%DATADIR%%/ui @dirrm %%DATADIR%%/icons @dirrm %%DATADIR%% +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/vi/LC_MESSAGES +@dirrmtry share/locale/vi +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/tr_TR/LC_MESSAGES +@dirrmtry share/locale/tr_TR +@dirrmtry share/locale/tr/LC_MESSAGES +@dirrmtry share/locale/tr +@dirrmtry share/locale/th/LC_MESSAGES +@dirrmtry share/locale/th +@dirrmtry share/locale/te_IN/LC_MESSAGES +@dirrmtry share/locale/te_IN @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te +@dirrmtry share/locale/ta_IN/LC_MESSAGES +@dirrmtry share/locale/ta_IN +@dirrmtry share/locale/ta/LC_MESSAGES +@dirrmtry share/locale/ta +@dirrmtry share/locale/sv/LC_MESSAGES +@dirrmtry share/locale/sv +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/ru/LC_MESSAGES +@dirrmtry share/locale/ru +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt_BR/LC_MESSAGES +@dirrmtry share/locale/pt_BR +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/pa/LC_MESSAGES +@dirrmtry share/locale/pa +@dirrmtry share/locale/or/LC_MESSAGES +@dirrmtry share/locale/or +@dirrmtry share/locale/nn_NO/LC_MESSAGES +@dirrmtry share/locale/nn_NO +@dirrmtry share/locale/nl/LC_MESSAGES +@dirrmtry share/locale/nl +@dirrmtry share/locale/nb/LC_MESSAGES +@dirrmtry share/locale/nb @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr +@dirrmtry share/locale/ml/LC_MESSAGES +@dirrmtry share/locale/ml +@dirrmtry share/locale/mk/LC_MESSAGES +@dirrmtry share/locale/mk +@dirrmtry share/locale/lv/LC_MESSAGES +@dirrmtry share/locale/lv +@dirrmtry share/locale/lt/LC_MESSAGES +@dirrmtry share/locale/lt +@dirrmtry share/locale/ky/LC_MESSAGES +@dirrmtry share/locale/ky +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/kn/LC_MESSAGES +@dirrmtry share/locale/kn @dirrmtry share/locale/km/LC_MESSAGES @dirrmtry share/locale/km @dirrmtry share/locale/kk/LC_MESSAGES @dirrmtry share/locale/kk +@dirrmtry share/locale/ja/LC_MESSAGES +@dirrmtry share/locale/ja +@dirrmtry share/locale/it/LC_MESSAGES +@dirrmtry share/locale/it +@dirrmtry share/locale/id_ID/LC_MESSAGES +@dirrmtry share/locale/id_ID +@dirrmtry share/locale/id/LC_MESSAGES +@dirrmtry share/locale/id @dirrmtry share/locale/ia/LC_MESSAGES @dirrmtry share/locale/ia +@dirrmtry share/locale/hu/LC_MESSAGES +@dirrmtry share/locale/hu +@dirrmtry share/locale/hr/LC_MESSAGES +@dirrmtry share/locale/hr +@dirrmtry share/locale/hi/LC_MESSAGES +@dirrmtry share/locale/hi +@dirrmtry share/locale/he/LC_MESSAGES +@dirrmtry share/locale/he +@dirrmtry share/locale/gu/LC_MESSAGES +@dirrmtry share/locale/gu +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fr/LC_MESSAGES +@dirrmtry share/locale/fr +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/eu/LC_MESSAGES +@dirrmtry share/locale/eu +@dirrmtry share/locale/et/LC_MESSAGES +@dirrmtry share/locale/et +@dirrmtry share/locale/es/LC_MESSAGES +@dirrmtry share/locale/es +@dirrmtry share/locale/eo/LC_MESSAGES +@dirrmtry share/locale/eo +@dirrmtry share/locale/en_GB/LC_MESSAGES +@dirrmtry share/locale/en_GB +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/de/LC_MESSAGES +@dirrmtry share/locale/de +@dirrmtry share/locale/da/LC_MESSAGES +@dirrmtry share/locale/da +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/bn/LC_MESSAGES +@dirrmtry share/locale/bn +@dirrmtry share/locale/bg/LC_MESSAGES +@dirrmtry share/locale/bg @dirrmtry share/locale/ast/LC_MESSAGES @dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as +@dirrmtry share/locale/ar/LC_MESSAGES +@dirrmtry share/locale/ar +@dirrmtry share/locale/af_ZA/LC_MESSAGES +@dirrmtry share/locale/af_ZA +@dirrmtry share/locale/af/LC_MESSAGES +@dirrmtry share/locale/af @dirrm share/gnome/help/shotwell/C/figures @dirrm share/gnome/help/shotwell/C @dirrm share/gnome/help/shotwell _______________________________________________ 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, thanks!