Update shotwell using shotwell-gtk3.
This commit is contained in:
wiz
parent
4d9f0d472f
commit
55677ed08f
14 changed files with 237 additions and 718 deletions
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.694 2014/11/09 06:27:48 obache Exp $
|
||||
# $NetBSD: Makefile,v 1.695 2014/11/25 10:07:18 wiz Exp $
|
||||
#
|
||||
|
||||
COMMENT= Graphics tools and libraries
|
||||
|
|
@ -453,7 +453,6 @@ SUBDIR+= scidavis
|
|||
SUBDIR+= scigraphica
|
||||
SUBDIR+= scrot
|
||||
SUBDIR+= shotwell
|
||||
SUBDIR+= shotwell-gtk3
|
||||
SUBDIR+= showimg
|
||||
SUBDIR+= silgraphite
|
||||
SUBDIR+= silgraphite-ft
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
Shotwell is a photo organizer for the GNOME desktop. It lets you import photos
|
||||
from disk or camera, organize them in various ways, view them in full-window or
|
||||
fullscreen mode, and export them to share with others.
|
||||
|
|
@ -1,52 +0,0 @@
|
|||
# $NetBSD: Makefile,v 1.33 2014/11/24 16:08:38 wiz Exp $
|
||||
|
||||
DISTNAME= shotwell-0.20.2
|
||||
CATEGORIES= graphics
|
||||
MASTER_SITES= https://download.gnome.org/sources/shotwell/0.20/
|
||||
EXTRACT_SUFX= .tar.xz
|
||||
|
||||
MAINTAINER= pkgrsc-users@NetBSD.org
|
||||
HOMEPAGE= https://wiki.gnome.org/Apps/Shotwell
|
||||
COMMENT= Shotwell is a photo organizer for the GNOME desktop
|
||||
LICENSE= gnu-lgpl-v2.1
|
||||
|
||||
BUILD_DEPENDS+= gnome-doc-utils-[0-9]*:../../textproc/gnome-doc-utils
|
||||
|
||||
HAS_CONFIGURE= yes
|
||||
USE_TOOLS+= gmake bash pkg-config msgfmt
|
||||
|
||||
CONFIG_SHELL= bash
|
||||
CONFIGURE_ARGS+= --prefix=${PREFIX}
|
||||
CONFIGURE_ARGS+= --assume-pkgs
|
||||
CONFIGURE_ENV+= --define=NO_CAMERA
|
||||
MAKE_ENV+= VALAC=${VALAC}
|
||||
|
||||
REPLACE_SH+= configure
|
||||
|
||||
.include "../../multimedia/gstreamer1/buildlink3.mk"
|
||||
.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
|
||||
.include "../../databases/sqlite3/buildlink3.mk"
|
||||
.include "../../devel/glib2/schemas.mk"
|
||||
.include "../../devel/libgee/buildlink3.mk"
|
||||
.include "../../devel/libgphoto2/buildlink3.mk"
|
||||
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
|
||||
.include "../../graphics/libexif/buildlink3.mk"
|
||||
BUILDLINK_API_DEPENDS.libgexiv2+= libgexiv2>=0.4.1
|
||||
.include "../../graphics/libgexiv2/buildlink3.mk"
|
||||
# 0.13.2 added shared libs
|
||||
BUILDLINK_ABI_DEPENDS.libraw+= libraw>=0.13.2
|
||||
.include "../../graphics/libraw/buildlink3.mk"
|
||||
# Required for dealing with .svg icons. Spotted on a clean box
|
||||
.include "../../graphics/librsvg/buildlink3.mk"
|
||||
BUILDLINK_DEPMETHOD.vala= build
|
||||
.include "../../lang/vala/buildlink3.mk"
|
||||
.include "../../net/libsoup24/buildlink3.mk"
|
||||
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
|
||||
.include "../../sysutils/dbus-glib/buildlink3.mk"
|
||||
.include "../../textproc/libxml2/buildlink3.mk"
|
||||
.include "../../textproc/json-glib/buildlink3.mk"
|
||||
.include "../../www/webkit1-gtk3/buildlink3.mk"
|
||||
.include "../../www/librest07/buildlink3.mk"
|
||||
.include "../../x11/gtk3/buildlink3.mk"
|
||||
.include "../../x11/libunique3/buildlink3.mk"
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
|
@ -1,333 +0,0 @@
|
|||
@comment $NetBSD: PLIST,v 1.6 2014/11/24 16:08:38 wiz Exp $
|
||||
bin/shotwell
|
||||
lib/shotwell/plugins/builtin/f-spot-24.png
|
||||
lib/shotwell/plugins/builtin/facebook.png
|
||||
lib/shotwell/plugins/builtin/facebook_publishing_options_pane.glade
|
||||
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/gallery3.png
|
||||
lib/shotwell/plugins/builtin/gallery3_authentication_pane.glade
|
||||
lib/shotwell/plugins/builtin/gallery3_publishing_options_pane.glade
|
||||
lib/shotwell/plugins/builtin/picasa.png
|
||||
lib/shotwell/plugins/builtin/picasa_publishing_options_pane.glade
|
||||
lib/shotwell/plugins/builtin/piwigo.png
|
||||
lib/shotwell/plugins/builtin/piwigo_authentication_pane.glade
|
||||
lib/shotwell/plugins/builtin/piwigo_publishing_options_pane.glade
|
||||
lib/shotwell/plugins/builtin/rajce.png
|
||||
lib/shotwell/plugins/builtin/rajce_authentication_pane.glade
|
||||
lib/shotwell/plugins/builtin/rajce_publishing_options_pane.glade
|
||||
lib/shotwell/plugins/builtin/shotwell-data-imports.so
|
||||
lib/shotwell/plugins/builtin/shotwell-publishing-extras.so
|
||||
lib/shotwell/plugins/builtin/shotwell-publishing.so
|
||||
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/glib-2.0/schemas/org.yorba.shotwell-extras.gschema.xml
|
||||
share/glib-2.0/schemas/org.yorba.shotwell.gschema.xml
|
||||
share/gnome/help/shotwell/C/edit-adjustments.page
|
||||
share/gnome/help/shotwell/C/edit-crop.page
|
||||
share/gnome/help/shotwell/C/edit-enhance.page
|
||||
share/gnome/help/shotwell/C/edit-external.page
|
||||
share/gnome/help/shotwell/C/edit-nondestructive.page
|
||||
share/gnome/help/shotwell/C/edit-redeye.page
|
||||
share/gnome/help/shotwell/C/edit-rotate.page
|
||||
share/gnome/help/shotwell/C/edit-straighten.page
|
||||
share/gnome/help/shotwell/C/edit-time-date.page
|
||||
share/gnome/help/shotwell/C/edit-undo.page
|
||||
share/gnome/help/shotwell/C/figures/crop_thirds.jpg
|
||||
share/gnome/help/shotwell/C/figures/edit_toolbar.png
|
||||
share/gnome/help/shotwell/C/figures/editing_overview.png
|
||||
share/gnome/help/shotwell/C/figures/shotwell_logo.png
|
||||
share/gnome/help/shotwell/C/figures/trash_process.png
|
||||
share/gnome/help/shotwell/C/formats.page
|
||||
share/gnome/help/shotwell/C/import-camera.page
|
||||
share/gnome/help/shotwell/C/import-f-spot.page
|
||||
share/gnome/help/shotwell/C/import-file.page
|
||||
share/gnome/help/shotwell/C/import-memorycard.page
|
||||
share/gnome/help/shotwell/C/index.page
|
||||
share/gnome/help/shotwell/C/organize-event.page
|
||||
share/gnome/help/shotwell/C/organize-flag.page
|
||||
share/gnome/help/shotwell/C/organize-rating.page
|
||||
share/gnome/help/shotwell/C/organize-remove.page
|
||||
share/gnome/help/shotwell/C/organize-search.page
|
||||
share/gnome/help/shotwell/C/organize-tag.page
|
||||
share/gnome/help/shotwell/C/organize-title.page
|
||||
share/gnome/help/shotwell/C/other-files.page
|
||||
share/gnome/help/shotwell/C/other-missing.page
|
||||
share/gnome/help/shotwell/C/other-multiple.page
|
||||
share/gnome/help/shotwell/C/other-plugins.page
|
||||
share/gnome/help/shotwell/C/raw.page
|
||||
share/gnome/help/shotwell/C/running.page
|
||||
share/gnome/help/shotwell/C/share-background.page
|
||||
share/gnome/help/shotwell/C/share-export.page
|
||||
share/gnome/help/shotwell/C/share-print.page
|
||||
share/gnome/help/shotwell/C/share-send.page
|
||||
share/gnome/help/shotwell/C/share-slideshow.page
|
||||
share/gnome/help/shotwell/C/share-upload.page
|
||||
share/gnome/help/shotwell/C/view-displaying.page
|
||||
share/gnome/help/shotwell/C/view-information.page
|
||||
share/gnome/help/shotwell/C/view-sidebar.page
|
||||
share/gnome/help/shotwell/el/edit-adjustments.page
|
||||
share/gnome/help/shotwell/el/edit-crop.page
|
||||
share/gnome/help/shotwell/el/edit-enhance.page
|
||||
share/gnome/help/shotwell/el/edit-external.page
|
||||
share/gnome/help/shotwell/el/edit-nondestructive.page
|
||||
share/gnome/help/shotwell/el/edit-redeye.page
|
||||
share/gnome/help/shotwell/el/edit-rotate.page
|
||||
share/gnome/help/shotwell/el/edit-straighten.page
|
||||
share/gnome/help/shotwell/el/edit-time-date.page
|
||||
share/gnome/help/shotwell/el/edit-undo.page
|
||||
share/gnome/help/shotwell/el/formats.page
|
||||
share/gnome/help/shotwell/el/import-camera.page
|
||||
share/gnome/help/shotwell/el/import-f-spot.page
|
||||
share/gnome/help/shotwell/el/import-file.page
|
||||
share/gnome/help/shotwell/el/import-memorycard.page
|
||||
share/gnome/help/shotwell/el/index.page
|
||||
share/gnome/help/shotwell/el/organize-event.page
|
||||
share/gnome/help/shotwell/el/organize-flag.page
|
||||
share/gnome/help/shotwell/el/organize-rating.page
|
||||
share/gnome/help/shotwell/el/organize-remove.page
|
||||
share/gnome/help/shotwell/el/organize-search.page
|
||||
share/gnome/help/shotwell/el/organize-tag.page
|
||||
share/gnome/help/shotwell/el/organize-title.page
|
||||
share/gnome/help/shotwell/el/other-files.page
|
||||
share/gnome/help/shotwell/el/other-missing.page
|
||||
share/gnome/help/shotwell/el/other-multiple.page
|
||||
share/gnome/help/shotwell/el/other-plugins.page
|
||||
share/gnome/help/shotwell/el/raw.page
|
||||
share/gnome/help/shotwell/el/running.page
|
||||
share/gnome/help/shotwell/el/share-background.page
|
||||
share/gnome/help/shotwell/el/share-export.page
|
||||
share/gnome/help/shotwell/el/share-print.page
|
||||
share/gnome/help/shotwell/el/share-send.page
|
||||
share/gnome/help/shotwell/el/share-slideshow.page
|
||||
share/gnome/help/shotwell/el/share-upload.page
|
||||
share/gnome/help/shotwell/el/view-displaying.page
|
||||
share/gnome/help/shotwell/el/view-information.page
|
||||
share/gnome/help/shotwell/el/view-sidebar.page
|
||||
share/gnome/help/shotwell/es/edit-adjustments.page
|
||||
share/gnome/help/shotwell/es/edit-crop.page
|
||||
share/gnome/help/shotwell/es/edit-enhance.page
|
||||
share/gnome/help/shotwell/es/edit-external.page
|
||||
share/gnome/help/shotwell/es/edit-nondestructive.page
|
||||
share/gnome/help/shotwell/es/edit-redeye.page
|
||||
share/gnome/help/shotwell/es/edit-rotate.page
|
||||
share/gnome/help/shotwell/es/edit-straighten.page
|
||||
share/gnome/help/shotwell/es/edit-time-date.page
|
||||
share/gnome/help/shotwell/es/edit-undo.page
|
||||
share/gnome/help/shotwell/es/formats.page
|
||||
share/gnome/help/shotwell/es/import-camera.page
|
||||
share/gnome/help/shotwell/es/import-f-spot.page
|
||||
share/gnome/help/shotwell/es/import-file.page
|
||||
share/gnome/help/shotwell/es/import-memorycard.page
|
||||
share/gnome/help/shotwell/es/index.page
|
||||
share/gnome/help/shotwell/es/organize-event.page
|
||||
share/gnome/help/shotwell/es/organize-flag.page
|
||||
share/gnome/help/shotwell/es/organize-rating.page
|
||||
share/gnome/help/shotwell/es/organize-remove.page
|
||||
share/gnome/help/shotwell/es/organize-search.page
|
||||
share/gnome/help/shotwell/es/organize-tag.page
|
||||
share/gnome/help/shotwell/es/organize-title.page
|
||||
share/gnome/help/shotwell/es/other-files.page
|
||||
share/gnome/help/shotwell/es/other-missing.page
|
||||
share/gnome/help/shotwell/es/other-multiple.page
|
||||
share/gnome/help/shotwell/es/other-plugins.page
|
||||
share/gnome/help/shotwell/es/raw.page
|
||||
share/gnome/help/shotwell/es/running.page
|
||||
share/gnome/help/shotwell/es/share-background.page
|
||||
share/gnome/help/shotwell/es/share-export.page
|
||||
share/gnome/help/shotwell/es/share-print.page
|
||||
share/gnome/help/shotwell/es/share-send.page
|
||||
share/gnome/help/shotwell/es/share-slideshow.page
|
||||
share/gnome/help/shotwell/es/share-upload.page
|
||||
share/gnome/help/shotwell/es/view-displaying.page
|
||||
share/gnome/help/shotwell/es/view-information.page
|
||||
share/gnome/help/shotwell/es/view-sidebar.page
|
||||
share/gnome/help/shotwell/hu/edit-adjustments.page
|
||||
share/gnome/help/shotwell/hu/edit-crop.page
|
||||
share/gnome/help/shotwell/hu/edit-enhance.page
|
||||
share/gnome/help/shotwell/hu/edit-external.page
|
||||
share/gnome/help/shotwell/hu/edit-nondestructive.page
|
||||
share/gnome/help/shotwell/hu/edit-redeye.page
|
||||
share/gnome/help/shotwell/hu/edit-rotate.page
|
||||
share/gnome/help/shotwell/hu/edit-straighten.page
|
||||
share/gnome/help/shotwell/hu/edit-time-date.page
|
||||
share/gnome/help/shotwell/hu/edit-undo.page
|
||||
share/gnome/help/shotwell/hu/formats.page
|
||||
share/gnome/help/shotwell/hu/import-camera.page
|
||||
share/gnome/help/shotwell/hu/import-f-spot.page
|
||||
share/gnome/help/shotwell/hu/import-file.page
|
||||
share/gnome/help/shotwell/hu/import-memorycard.page
|
||||
share/gnome/help/shotwell/hu/index.page
|
||||
share/gnome/help/shotwell/hu/organize-event.page
|
||||
share/gnome/help/shotwell/hu/organize-flag.page
|
||||
share/gnome/help/shotwell/hu/organize-rating.page
|
||||
share/gnome/help/shotwell/hu/organize-remove.page
|
||||
share/gnome/help/shotwell/hu/organize-search.page
|
||||
share/gnome/help/shotwell/hu/organize-tag.page
|
||||
share/gnome/help/shotwell/hu/organize-title.page
|
||||
share/gnome/help/shotwell/hu/other-files.page
|
||||
share/gnome/help/shotwell/hu/other-missing.page
|
||||
share/gnome/help/shotwell/hu/other-multiple.page
|
||||
share/gnome/help/shotwell/hu/other-plugins.page
|
||||
share/gnome/help/shotwell/hu/raw.page
|
||||
share/gnome/help/shotwell/hu/running.page
|
||||
share/gnome/help/shotwell/hu/share-background.page
|
||||
share/gnome/help/shotwell/hu/share-export.page
|
||||
share/gnome/help/shotwell/hu/share-print.page
|
||||
share/gnome/help/shotwell/hu/share-send.page
|
||||
share/gnome/help/shotwell/hu/share-slideshow.page
|
||||
share/gnome/help/shotwell/hu/share-upload.page
|
||||
share/gnome/help/shotwell/hu/view-displaying.page
|
||||
share/gnome/help/shotwell/hu/view-information.page
|
||||
share/gnome/help/shotwell/hu/view-sidebar.page
|
||||
share/icons/hicolor/16x16/apps/shotwell.svg
|
||||
share/icons/hicolor/24x24/apps/shotwell.svg
|
||||
share/icons/hicolor/scalable/apps/shotwell.svg
|
||||
share/locale/af/LC_MESSAGES/shotwell.mo
|
||||
share/locale/ar/LC_MESSAGES/shotwell.mo
|
||||
share/locale/as/LC_MESSAGES/shotwell.mo
|
||||
share/locale/ast/LC_MESSAGES/shotwell.mo
|
||||
share/locale/bg/LC_MESSAGES/shotwell.mo
|
||||
share/locale/bn/LC_MESSAGES/shotwell.mo
|
||||
share/locale/bn_IN/LC_MESSAGES/shotwell.mo
|
||||
share/locale/ca/LC_MESSAGES/shotwell.mo
|
||||
share/locale/cs/LC_MESSAGES/shotwell.mo
|
||||
share/locale/da/LC_MESSAGES/shotwell.mo
|
||||
share/locale/de/LC_MESSAGES/shotwell.mo
|
||||
share/locale/el/LC_MESSAGES/shotwell.mo
|
||||
share/locale/en_GB/LC_MESSAGES/shotwell.mo
|
||||
share/locale/eo/LC_MESSAGES/shotwell.mo
|
||||
share/locale/es/LC_MESSAGES/shotwell.mo
|
||||
share/locale/et/LC_MESSAGES/shotwell.mo
|
||||
share/locale/eu/LC_MESSAGES/shotwell.mo
|
||||
share/locale/fi/LC_MESSAGES/shotwell.mo
|
||||
share/locale/fr/LC_MESSAGES/shotwell.mo
|
||||
share/locale/gd/LC_MESSAGES/shotwell.mo
|
||||
share/locale/gl/LC_MESSAGES/shotwell.mo
|
||||
share/locale/gu/LC_MESSAGES/shotwell.mo
|
||||
share/locale/he/LC_MESSAGES/shotwell.mo
|
||||
share/locale/hi/LC_MESSAGES/shotwell.mo
|
||||
share/locale/hr/LC_MESSAGES/shotwell.mo
|
||||
share/locale/hu/LC_MESSAGES/shotwell.mo
|
||||
share/locale/ia/LC_MESSAGES/shotwell.mo
|
||||
share/locale/id/LC_MESSAGES/shotwell.mo
|
||||
share/locale/it/LC_MESSAGES/shotwell.mo
|
||||
share/locale/ja/LC_MESSAGES/shotwell.mo
|
||||
share/locale/kk/LC_MESSAGES/shotwell.mo
|
||||
share/locale/km/LC_MESSAGES/shotwell.mo
|
||||
share/locale/kn/LC_MESSAGES/shotwell.mo
|
||||
share/locale/ko/LC_MESSAGES/shotwell.mo
|
||||
share/locale/ky/LC_MESSAGES/shotwell.mo
|
||||
share/locale/lt/LC_MESSAGES/shotwell.mo
|
||||
share/locale/lv/LC_MESSAGES/shotwell.mo
|
||||
share/locale/mk/LC_MESSAGES/shotwell.mo
|
||||
share/locale/ml/LC_MESSAGES/shotwell.mo
|
||||
share/locale/mr/LC_MESSAGES/shotwell.mo
|
||||
share/locale/nb/LC_MESSAGES/shotwell.mo
|
||||
share/locale/nl/LC_MESSAGES/shotwell.mo
|
||||
share/locale/nn/LC_MESSAGES/shotwell.mo
|
||||
share/locale/or/LC_MESSAGES/shotwell.mo
|
||||
share/locale/pa/LC_MESSAGES/shotwell.mo
|
||||
share/locale/pl/LC_MESSAGES/shotwell.mo
|
||||
share/locale/pt/LC_MESSAGES/shotwell.mo
|
||||
share/locale/pt_BR/LC_MESSAGES/shotwell.mo
|
||||
share/locale/ro/LC_MESSAGES/shotwell.mo
|
||||
share/locale/ru/LC_MESSAGES/shotwell.mo
|
||||
share/locale/sk/LC_MESSAGES/shotwell.mo
|
||||
share/locale/sl/LC_MESSAGES/shotwell.mo
|
||||
share/locale/sr/LC_MESSAGES/shotwell.mo
|
||||
share/locale/sr@latin/LC_MESSAGES/shotwell.mo
|
||||
share/locale/sv/LC_MESSAGES/shotwell.mo
|
||||
share/locale/ta/LC_MESSAGES/shotwell.mo
|
||||
share/locale/te/LC_MESSAGES/shotwell.mo
|
||||
share/locale/th/LC_MESSAGES/shotwell.mo
|
||||
share/locale/tr/LC_MESSAGES/shotwell.mo
|
||||
share/locale/uk/LC_MESSAGES/shotwell.mo
|
||||
share/locale/vi/LC_MESSAGES/shotwell.mo
|
||||
share/locale/zh_CN/LC_MESSAGES/shotwell.mo
|
||||
share/locale/zh_HK/LC_MESSAGES/shotwell.mo
|
||||
share/locale/zh_TW/LC_MESSAGES/shotwell.mo
|
||||
share/shotwell/icons/all-rejected.png
|
||||
share/shotwell/icons/crop-pivot-reticle.png
|
||||
share/shotwell/icons/crop.svg
|
||||
share/shotwell/icons/drag_nub.png
|
||||
share/shotwell/icons/enhance.png
|
||||
share/shotwell/icons/filter-flagged.png
|
||||
share/shotwell/icons/filter-photos.png
|
||||
share/shotwell/icons/filter-raw.png
|
||||
share/shotwell/icons/filter-videos.png
|
||||
share/shotwell/icons/five-star-filter.svg
|
||||
share/shotwell/icons/five-stars.svg
|
||||
share/shotwell/icons/flag-page.png
|
||||
share/shotwell/icons/flag-trinket.png
|
||||
share/shotwell/icons/four-star-filter-plus.svg
|
||||
share/shotwell/icons/four-stars.svg
|
||||
share/shotwell/icons/generic-plugin.png
|
||||
share/shotwell/icons/image-adjust.svg
|
||||
share/shotwell/icons/import-all.png
|
||||
share/shotwell/icons/import.svg
|
||||
share/shotwell/icons/make-primary.svg
|
||||
share/shotwell/icons/merge.svg
|
||||
share/shotwell/icons/multiple-events.png
|
||||
share/shotwell/icons/multiple-tags.png
|
||||
share/shotwell/icons/no-event.png
|
||||
share/shotwell/icons/noninterpretable-video.png
|
||||
share/shotwell/icons/one-event.png
|
||||
share/shotwell/icons/one-star-filter-plus.svg
|
||||
share/shotwell/icons/one-star.svg
|
||||
share/shotwell/icons/one-tag.png
|
||||
share/shotwell/icons/pin-toolbar.svg
|
||||
share/shotwell/icons/publish.png
|
||||
share/shotwell/icons/redeye.png
|
||||
share/shotwell/icons/rejected.svg
|
||||
share/shotwell/icons/shotwell-16.svg
|
||||
share/shotwell/icons/shotwell-24.svg
|
||||
share/shotwell/icons/shotwell-street.jpg
|
||||
share/shotwell/icons/shotwell.ico
|
||||
share/shotwell/icons/shotwell.svg
|
||||
share/shotwell/icons/slideshow-extension-point.png
|
||||
share/shotwell/icons/sprocket.png
|
||||
share/shotwell/icons/straighten.svg
|
||||
share/shotwell/icons/three-star-filter-plus.svg
|
||||
share/shotwell/icons/three-stars.svg
|
||||
share/shotwell/icons/two-star-filter-plus.svg
|
||||
share/shotwell/icons/two-stars.svg
|
||||
share/shotwell/icons/videos-page.png
|
||||
share/shotwell/icons/zoom-in.png
|
||||
share/shotwell/icons/zoom-out.png
|
||||
share/shotwell/ui/collection.ui
|
||||
share/shotwell/ui/direct.ui
|
||||
share/shotwell/ui/direct_context.ui
|
||||
share/shotwell/ui/event.ui
|
||||
share/shotwell/ui/events_directory.ui
|
||||
share/shotwell/ui/fullscreen.ui
|
||||
share/shotwell/ui/import.ui
|
||||
share/shotwell/ui/import_queue.ui
|
||||
share/shotwell/ui/media.ui
|
||||
share/shotwell/ui/offline.ui
|
||||
share/shotwell/ui/photo.ui
|
||||
share/shotwell/ui/photo_context.ui
|
||||
share/shotwell/ui/savedsearch.ui
|
||||
share/shotwell/ui/search_bar.ui
|
||||
share/shotwell/ui/search_sidebar_context.ui
|
||||
share/shotwell/ui/set_background_dialog.glade
|
||||
share/shotwell/ui/set_background_slideshow_dialog.glade
|
||||
share/shotwell/ui/shotwell.glade
|
||||
share/shotwell/ui/shotwell.xml
|
||||
share/shotwell/ui/sidebar_default_context.ui
|
||||
share/shotwell/ui/tag_sidebar_context.ui
|
||||
share/shotwell/ui/tags.ui
|
||||
share/shotwell/ui/top.ui
|
||||
share/shotwell/ui/trash.ui
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
$NetBSD: distinfo,v 1.8 2014/11/24 16:08:38 wiz Exp $
|
||||
|
||||
SHA1 (shotwell-0.20.2.tar.xz) = f69ea2a2fc6ae1dad0f56bf85d1a3275dd8a6f1e
|
||||
RMD160 (shotwell-0.20.2.tar.xz) = 25c282de74f5dd35f0f44f05067eec4db6f4d33e
|
||||
Size (shotwell-0.20.2.tar.xz) = 1815580 bytes
|
||||
SHA1 (patch-aa) = 23f6982e1ba135c706afc6983c48602f6060dfad
|
||||
SHA1 (patch-ab) = e4951475348523f407fe4960fcee861e8cbc29ed
|
||||
SHA1 (patch-ac) = 0183761f3ab30788703e54aecba72b194e0d770a
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
$NetBSD: patch-aa,v 1.5 2014/11/24 16:08:38 wiz Exp $
|
||||
|
||||
--- Makefile.orig 2013-11-19 02:16:36.000000000 +0000
|
||||
+++ Makefile
|
||||
@@ -315,7 +315,6 @@ EXT_PKGS = \
|
||||
gstreamer-base-1.0 \
|
||||
gstreamer-pbutils-1.0 \
|
||||
gtk+-3.0 \
|
||||
- gudev-1.0 \
|
||||
libexif \
|
||||
libgphoto2 \
|
||||
json-glib-1.0 \
|
||||
@@ -347,7 +346,6 @@ EXT_PKG_VERSIONS = \
|
||||
gstreamer-plugins-base-1.0 >= 1.0.0 \
|
||||
gstreamer-pbutils-1.0 >= 1.0.0 \
|
||||
gtk+-3.0 >= 3.6.0 \
|
||||
- gudev-1.0 >= 145 \
|
||||
libexif >= 0.6.16 \
|
||||
libgphoto2 >= 2.4.2 \
|
||||
libraw >= 0.13.2 \
|
||||
@@ -461,7 +459,7 @@ PLUGIN_CFLAGS += $(PROFILE_FLAGS) $(REQU
|
||||
# Required for gudev-1.0
|
||||
CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE
|
||||
|
||||
-all: pkgcheck valacheck desktop
|
||||
+all: pkgcheck desktop
|
||||
|
||||
ifdef ENABLE_BUILD_FOR_GLADE
|
||||
all: $(PLUGINS_DIR) lib$(PROGRAM).so $(PROGRAM) $(PC_FILE)
|
||||
@@ -535,7 +533,7 @@ ifndef DISABLE_DESKTOP_VALIDATE
|
||||
else rm -f misc/shotwell.desktop.errors; \
|
||||
fi
|
||||
endif
|
||||
-
|
||||
+
|
||||
misc/shotwell-viewer.desktop: misc/shotwell-viewer.desktop.head $(EXPANDED_CORE_PO_FILES)
|
||||
cp misc/shotwell-viewer.desktop.head misc/shotwell-viewer.desktop
|
||||
$(foreach lang,$(CORE_SUPPORTED_LANGUAGES), echo X-GNOME-FullName[$(lang)]=`TEXTDOMAINDIR=locale-langpack \
|
||||
@@ -736,7 +732,6 @@ $(PLUGINS_SO) $(EXTRA_PLUGINS_SO): $(PLU
|
||||
|
||||
.PHONY: $(PLUGINS_DIR)
|
||||
$(PLUGINS_DIR): $(PLUGIN_VAPI) $(PLUGIN_HEADER) $(PLUGIN_DEPS)
|
||||
- $(call check_valac_version)
|
||||
@$(MAKE) --directory=$@ PLUGINS_VERSION="$(VERSION)" USER_VALAFLAGS="$(USER_VALAFLAGS)" \
|
||||
PLUGIN_CFLAGS="$(PLUGIN_CFLAGS)"
|
||||
|
||||
|
|
@ -1,116 +0,0 @@
|
|||
$NetBSD: patch-ab,v 1.1.1.1 2012/04/11 11:48:30 drochner Exp $
|
||||
|
||||
--- src/camera/CameraTable.vala.orig 2012-03-28 22:35:57.000000000 +0000
|
||||
+++ src/camera/CameraTable.vala
|
||||
@@ -26,7 +26,6 @@ public class CameraTable {
|
||||
|
||||
private static CameraTable instance = null;
|
||||
|
||||
- private GUdev.Client client = new GUdev.Client(SUBSYSTEMS);
|
||||
private OneShotScheduler camera_update_scheduler = null;
|
||||
private GPhoto.Context null_context = new GPhoto.Context();
|
||||
private GPhoto.CameraAbilitiesList abilities_list;
|
||||
@@ -44,7 +43,6 @@ public class CameraTable {
|
||||
on_update_cameras);
|
||||
|
||||
// listen for interesting events on the specified subsystems
|
||||
- client.uevent.connect(on_udev_event);
|
||||
volume_monitor = VolumeMonitor.get();
|
||||
volume_monitor.volume_changed.connect(on_volume_changed);
|
||||
volume_monitor.volume_added.connect(on_volume_changed);
|
||||
@@ -105,31 +103,6 @@ public class CameraTable {
|
||||
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();
|
||||
- if(
|
||||
- // only keep devices that have a non-null device file and that
|
||||
- // have both the ID_GPHOTO2 and GPHOTO2_DRIVER properties set
|
||||
- (device_file != null) &&
|
||||
- (device.has_property("ID_GPHOTO2")) &&
|
||||
- (device.has_property("GPHOTO2_DRIVER"))
|
||||
- ) {
|
||||
- int camera_bus, camera_device;
|
||||
- // extract the bus and device IDs from the device file string
|
||||
- // TODO: is it safe to parse the absolute path or should we be
|
||||
- // smarter and use a regex to only pick up the end of the path?
|
||||
- if (device_file.scanf("/dev/bus/usb/%d/%d", out camera_bus, out camera_device) < 2) {
|
||||
- critical("get_all_usb_cameras: Failed to scanf device file %s", device_file);
|
||||
-
|
||||
- continue;
|
||||
- }
|
||||
- string camera = "usb:%.3d,%.3d".printf(camera_bus, camera_device);
|
||||
- debug("USB camera detected at %s", camera);
|
||||
- cameras += camera;
|
||||
- }
|
||||
- }
|
||||
-
|
||||
return cameras;
|
||||
}
|
||||
|
||||
@@ -206,24 +179,6 @@ public class CameraTable {
|
||||
"/dev/bus/usb/%s".printf(port.substring(4).replace(",", "/")) : null;
|
||||
}
|
||||
|
||||
- private string? get_name_for_uuid(string uuid) {
|
||||
- foreach (Volume volume in volume_monitor.get_volumes()) {
|
||||
- if (volume.get_identifier(VolumeIdentifier.UUID) == uuid) {
|
||||
- return volume.get_name();
|
||||
- }
|
||||
- }
|
||||
- return null;
|
||||
- }
|
||||
-
|
||||
- private GLib.Icon? get_icon_for_uuid(string uuid) {
|
||||
- foreach (Volume volume in volume_monitor.get_volumes()) {
|
||||
- if (volume.get_identifier(VolumeIdentifier.UUID) == uuid) {
|
||||
- return volume.get_icon();
|
||||
- }
|
||||
- }
|
||||
- return null;
|
||||
- }
|
||||
-
|
||||
private void update_camera_table() throws GPhotoError {
|
||||
// need to do this because virtual ports come and go in the USB world (and probably others)
|
||||
GPhoto.PortInfoList port_info_list;
|
||||
@@ -313,23 +268,6 @@ public class CameraTable {
|
||||
continue;
|
||||
}
|
||||
|
||||
- // Get display name for camera.
|
||||
- string path = get_port_path(port);
|
||||
- if (null != path) {
|
||||
- GUdev.Device device = client.query_by_device_file(path);
|
||||
- string serial = device.get_property("ID_SERIAL_SHORT");
|
||||
- if (null != serial) {
|
||||
- // Try to get the name and icon.
|
||||
- display_name = get_name_for_uuid(serial);
|
||||
- icon = get_icon_for_uuid(serial);
|
||||
- }
|
||||
- if (null == display_name) {
|
||||
- display_name = device.get_sysfs_attr("product");
|
||||
- }
|
||||
- if (null == display_name) {
|
||||
- display_name = device.get_property("ID_MODEL");
|
||||
- }
|
||||
- }
|
||||
if (null == display_name) {
|
||||
// Default to GPhoto detected name.
|
||||
display_name = name;
|
||||
@@ -367,14 +305,6 @@ public class CameraTable {
|
||||
}
|
||||
}
|
||||
|
||||
- private void on_udev_event(string action, GUdev.Device device) {
|
||||
- debug("udev event: %s on %s", action, device.get_name());
|
||||
-
|
||||
- // Device add/removes often arrive in pairs; this allows for a single
|
||||
- // update to occur when they come in all at once
|
||||
- camera_update_scheduler.after_timeout(UPDATE_DELAY_MSEC, true);
|
||||
- }
|
||||
-
|
||||
public void on_volume_changed(Volume volume) {
|
||||
camera_update_scheduler.after_timeout(UPDATE_DELAY_MSEC, true);
|
||||
}
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
$NetBSD: patch-ac,v 1.2 2013/12/04 12:57:47 drochner Exp $
|
||||
|
||||
--- configure.orig 2013-11-19 02:02:29.000000000 +0000
|
||||
+++ configure
|
||||
@@ -176,10 +176,10 @@ done
|
||||
|
||||
# detect version of libgphoto2 the compilation host has installed
|
||||
pkg-config --atleast-version 2.5 libgphoto2
|
||||
-if [ $? == 1 ]
|
||||
+if [ $? = 1 ]
|
||||
then
|
||||
pkg-config --atleast-version 2.4 libgphoto2
|
||||
- if [ $? == 1 ]
|
||||
+ if [ $? = 1 ]
|
||||
then
|
||||
printf "No compatible libGPhoto installation found. Configuration cannot continue.\n";
|
||||
exit 1
|
||||
|
|
@ -1,16 +1,17 @@
|
|||
# $NetBSD: Makefile,v 1.62 2014/10/29 09:18:50 prlw1 Exp $
|
||||
# $NetBSD: Makefile,v 1.63 2014/11/25 10:07:18 wiz Exp $
|
||||
|
||||
DISTNAME= shotwell-0.11.6
|
||||
PKGREVISION= 28
|
||||
DISTNAME= shotwell-0.20.2
|
||||
CATEGORIES= graphics
|
||||
MASTER_SITES= http://yorba.org/download/shotwell/0.11/
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
MASTER_SITES= https://download.gnome.org/sources/shotwell/0.20/
|
||||
EXTRACT_SUFX= .tar.xz
|
||||
|
||||
MAINTAINER= pkgrsc-users@NetBSD.org
|
||||
HOMEPAGE= http://yorba.org/shotwell/
|
||||
HOMEPAGE= https://wiki.gnome.org/Apps/Shotwell
|
||||
COMMENT= Shotwell is a photo organizer for the GNOME desktop
|
||||
LICENSE= gnu-lgpl-v2.1
|
||||
|
||||
BUILD_DEPENDS+= gnome-doc-utils-[0-9]*:../../textproc/gnome-doc-utils
|
||||
|
||||
HAS_CONFIGURE= yes
|
||||
USE_TOOLS+= gmake bash pkg-config msgfmt
|
||||
|
||||
|
|
@ -22,29 +23,30 @@ MAKE_ENV+= VALAC=${VALAC}
|
|||
|
||||
REPLACE_SH+= configure
|
||||
|
||||
.include "../../multimedia/gstreamer1/buildlink3.mk"
|
||||
.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
|
||||
.include "../../databases/sqlite3/buildlink3.mk"
|
||||
.include "../../devel/GConf/buildlink3.mk"
|
||||
.include "../../devel/glib2/schemas.mk"
|
||||
.include "../../devel/libgee0.6/buildlink3.mk"
|
||||
.include "../../devel/libgee/buildlink3.mk"
|
||||
.include "../../devel/libgphoto2/buildlink3.mk"
|
||||
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
|
||||
.include "../../graphics/libexif/buildlink3.mk"
|
||||
BUILDLINK_API_DEPENDS.libgexiv2+= libgexiv2>=0.4.1
|
||||
.include "../../graphics/libgexiv2/buildlink3.mk"
|
||||
# 0.13.2 added shared libs
|
||||
BUILDLINK_ABI_DEPENDS.libraw+= libraw>=0.13.2
|
||||
.include "../../graphics/libraw013/buildlink3.mk"
|
||||
.include "../../graphics/libraw/buildlink3.mk"
|
||||
# Required for dealing with .svg icons. Spotted on a clean box
|
||||
.include "../../graphics/librsvg/buildlink3.mk"
|
||||
BUILDLINK_API_DEPENDS.vala+= vala012>=0.11.7
|
||||
BUILDLINK_API_DEPENDS.vala+= vala012<0.14
|
||||
BUILDLINK_DEPMETHOD.vala= build
|
||||
.include "../../lang/vala012/buildlink3.mk"
|
||||
.include "../../lang/vala/buildlink3.mk"
|
||||
.include "../../net/libsoup24/buildlink3.mk"
|
||||
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
|
||||
.include "../../sysutils/dbus-glib/buildlink3.mk"
|
||||
.include "../../textproc/libxml2/buildlink3.mk"
|
||||
.include "../../textproc/json-glib/buildlink3.mk"
|
||||
.include "../../www/webkit1-gtk/buildlink3.mk"
|
||||
.include "../../x11/gtk2/buildlink3.mk"
|
||||
.include "../../x11/libunique/buildlink3.mk"
|
||||
.include "../../www/webkit1-gtk3/buildlink3.mk"
|
||||
.include "../../www/librest07/buildlink3.mk"
|
||||
.include "../../x11/gtk3/buildlink3.mk"
|
||||
.include "../../x11/libunique3/buildlink3.mk"
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
|
|
|||
|
|
@ -1,18 +1,36 @@
|
|||
@comment $NetBSD: PLIST,v 1.5 2011/09/12 18:15:03 drochner Exp $
|
||||
@comment $NetBSD: PLIST,v 1.6 2014/11/25 10:07:18 wiz Exp $
|
||||
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
|
||||
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/gallery3.png
|
||||
lib/shotwell/plugins/builtin/gallery3_authentication_pane.glade
|
||||
lib/shotwell/plugins/builtin/gallery3_publishing_options_pane.glade
|
||||
lib/shotwell/plugins/builtin/picasa.png
|
||||
lib/shotwell/plugins/builtin/picasa_publishing_options_pane.glade
|
||||
lib/shotwell/plugins/builtin/piwigo.png
|
||||
lib/shotwell/plugins/builtin/piwigo_authentication_pane.glade
|
||||
lib/shotwell/plugins/builtin/piwigo_publishing_options_pane.glade
|
||||
lib/shotwell/plugins/builtin/rajce.png
|
||||
lib/shotwell/plugins/builtin/rajce_authentication_pane.glade
|
||||
lib/shotwell/plugins/builtin/rajce_publishing_options_pane.glade
|
||||
lib/shotwell/plugins/builtin/shotwell-data-imports.so
|
||||
lib/shotwell/plugins/builtin/shotwell-publishing-extras.so
|
||||
lib/shotwell/plugins/builtin/shotwell-publishing.so
|
||||
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/glib-2.0/schemas/org.yorba.shotwell-extras.gschema.xml
|
||||
|
|
@ -24,6 +42,7 @@ share/gnome/help/shotwell/C/edit-external.page
|
|||
share/gnome/help/shotwell/C/edit-nondestructive.page
|
||||
share/gnome/help/shotwell/C/edit-redeye.page
|
||||
share/gnome/help/shotwell/C/edit-rotate.page
|
||||
share/gnome/help/shotwell/C/edit-straighten.page
|
||||
share/gnome/help/shotwell/C/edit-time-date.page
|
||||
share/gnome/help/shotwell/C/edit-undo.page
|
||||
share/gnome/help/shotwell/C/figures/crop_thirds.jpg
|
||||
|
|
@ -47,6 +66,8 @@ share/gnome/help/shotwell/C/organize-title.page
|
|||
share/gnome/help/shotwell/C/other-files.page
|
||||
share/gnome/help/shotwell/C/other-missing.page
|
||||
share/gnome/help/shotwell/C/other-multiple.page
|
||||
share/gnome/help/shotwell/C/other-plugins.page
|
||||
share/gnome/help/shotwell/C/raw.page
|
||||
share/gnome/help/shotwell/C/running.page
|
||||
share/gnome/help/shotwell/C/share-background.page
|
||||
share/gnome/help/shotwell/C/share-export.page
|
||||
|
|
@ -57,100 +78,186 @@ share/gnome/help/shotwell/C/share-upload.page
|
|||
share/gnome/help/shotwell/C/view-displaying.page
|
||||
share/gnome/help/shotwell/C/view-information.page
|
||||
share/gnome/help/shotwell/C/view-sidebar.page
|
||||
share/gnome/help/shotwell/el/edit-adjustments.page
|
||||
share/gnome/help/shotwell/el/edit-crop.page
|
||||
share/gnome/help/shotwell/el/edit-enhance.page
|
||||
share/gnome/help/shotwell/el/edit-external.page
|
||||
share/gnome/help/shotwell/el/edit-nondestructive.page
|
||||
share/gnome/help/shotwell/el/edit-redeye.page
|
||||
share/gnome/help/shotwell/el/edit-rotate.page
|
||||
share/gnome/help/shotwell/el/edit-straighten.page
|
||||
share/gnome/help/shotwell/el/edit-time-date.page
|
||||
share/gnome/help/shotwell/el/edit-undo.page
|
||||
share/gnome/help/shotwell/el/formats.page
|
||||
share/gnome/help/shotwell/el/import-camera.page
|
||||
share/gnome/help/shotwell/el/import-f-spot.page
|
||||
share/gnome/help/shotwell/el/import-file.page
|
||||
share/gnome/help/shotwell/el/import-memorycard.page
|
||||
share/gnome/help/shotwell/el/index.page
|
||||
share/gnome/help/shotwell/el/organize-event.page
|
||||
share/gnome/help/shotwell/el/organize-flag.page
|
||||
share/gnome/help/shotwell/el/organize-rating.page
|
||||
share/gnome/help/shotwell/el/organize-remove.page
|
||||
share/gnome/help/shotwell/el/organize-search.page
|
||||
share/gnome/help/shotwell/el/organize-tag.page
|
||||
share/gnome/help/shotwell/el/organize-title.page
|
||||
share/gnome/help/shotwell/el/other-files.page
|
||||
share/gnome/help/shotwell/el/other-missing.page
|
||||
share/gnome/help/shotwell/el/other-multiple.page
|
||||
share/gnome/help/shotwell/el/other-plugins.page
|
||||
share/gnome/help/shotwell/el/raw.page
|
||||
share/gnome/help/shotwell/el/running.page
|
||||
share/gnome/help/shotwell/el/share-background.page
|
||||
share/gnome/help/shotwell/el/share-export.page
|
||||
share/gnome/help/shotwell/el/share-print.page
|
||||
share/gnome/help/shotwell/el/share-send.page
|
||||
share/gnome/help/shotwell/el/share-slideshow.page
|
||||
share/gnome/help/shotwell/el/share-upload.page
|
||||
share/gnome/help/shotwell/el/view-displaying.page
|
||||
share/gnome/help/shotwell/el/view-information.page
|
||||
share/gnome/help/shotwell/el/view-sidebar.page
|
||||
share/gnome/help/shotwell/es/edit-adjustments.page
|
||||
share/gnome/help/shotwell/es/edit-crop.page
|
||||
share/gnome/help/shotwell/es/edit-enhance.page
|
||||
share/gnome/help/shotwell/es/edit-external.page
|
||||
share/gnome/help/shotwell/es/edit-nondestructive.page
|
||||
share/gnome/help/shotwell/es/edit-redeye.page
|
||||
share/gnome/help/shotwell/es/edit-rotate.page
|
||||
share/gnome/help/shotwell/es/edit-straighten.page
|
||||
share/gnome/help/shotwell/es/edit-time-date.page
|
||||
share/gnome/help/shotwell/es/edit-undo.page
|
||||
share/gnome/help/shotwell/es/formats.page
|
||||
share/gnome/help/shotwell/es/import-camera.page
|
||||
share/gnome/help/shotwell/es/import-f-spot.page
|
||||
share/gnome/help/shotwell/es/import-file.page
|
||||
share/gnome/help/shotwell/es/import-memorycard.page
|
||||
share/gnome/help/shotwell/es/index.page
|
||||
share/gnome/help/shotwell/es/organize-event.page
|
||||
share/gnome/help/shotwell/es/organize-flag.page
|
||||
share/gnome/help/shotwell/es/organize-rating.page
|
||||
share/gnome/help/shotwell/es/organize-remove.page
|
||||
share/gnome/help/shotwell/es/organize-search.page
|
||||
share/gnome/help/shotwell/es/organize-tag.page
|
||||
share/gnome/help/shotwell/es/organize-title.page
|
||||
share/gnome/help/shotwell/es/other-files.page
|
||||
share/gnome/help/shotwell/es/other-missing.page
|
||||
share/gnome/help/shotwell/es/other-multiple.page
|
||||
share/gnome/help/shotwell/es/other-plugins.page
|
||||
share/gnome/help/shotwell/es/raw.page
|
||||
share/gnome/help/shotwell/es/running.page
|
||||
share/gnome/help/shotwell/es/share-background.page
|
||||
share/gnome/help/shotwell/es/share-export.page
|
||||
share/gnome/help/shotwell/es/share-print.page
|
||||
share/gnome/help/shotwell/es/share-send.page
|
||||
share/gnome/help/shotwell/es/share-slideshow.page
|
||||
share/gnome/help/shotwell/es/share-upload.page
|
||||
share/gnome/help/shotwell/es/view-displaying.page
|
||||
share/gnome/help/shotwell/es/view-information.page
|
||||
share/gnome/help/shotwell/es/view-sidebar.page
|
||||
share/gnome/help/shotwell/hu/edit-adjustments.page
|
||||
share/gnome/help/shotwell/hu/edit-crop.page
|
||||
share/gnome/help/shotwell/hu/edit-enhance.page
|
||||
share/gnome/help/shotwell/hu/edit-external.page
|
||||
share/gnome/help/shotwell/hu/edit-nondestructive.page
|
||||
share/gnome/help/shotwell/hu/edit-redeye.page
|
||||
share/gnome/help/shotwell/hu/edit-rotate.page
|
||||
share/gnome/help/shotwell/hu/edit-straighten.page
|
||||
share/gnome/help/shotwell/hu/edit-time-date.page
|
||||
share/gnome/help/shotwell/hu/edit-undo.page
|
||||
share/gnome/help/shotwell/hu/formats.page
|
||||
share/gnome/help/shotwell/hu/import-camera.page
|
||||
share/gnome/help/shotwell/hu/import-f-spot.page
|
||||
share/gnome/help/shotwell/hu/import-file.page
|
||||
share/gnome/help/shotwell/hu/import-memorycard.page
|
||||
share/gnome/help/shotwell/hu/index.page
|
||||
share/gnome/help/shotwell/hu/organize-event.page
|
||||
share/gnome/help/shotwell/hu/organize-flag.page
|
||||
share/gnome/help/shotwell/hu/organize-rating.page
|
||||
share/gnome/help/shotwell/hu/organize-remove.page
|
||||
share/gnome/help/shotwell/hu/organize-search.page
|
||||
share/gnome/help/shotwell/hu/organize-tag.page
|
||||
share/gnome/help/shotwell/hu/organize-title.page
|
||||
share/gnome/help/shotwell/hu/other-files.page
|
||||
share/gnome/help/shotwell/hu/other-missing.page
|
||||
share/gnome/help/shotwell/hu/other-multiple.page
|
||||
share/gnome/help/shotwell/hu/other-plugins.page
|
||||
share/gnome/help/shotwell/hu/raw.page
|
||||
share/gnome/help/shotwell/hu/running.page
|
||||
share/gnome/help/shotwell/hu/share-background.page
|
||||
share/gnome/help/shotwell/hu/share-export.page
|
||||
share/gnome/help/shotwell/hu/share-print.page
|
||||
share/gnome/help/shotwell/hu/share-send.page
|
||||
share/gnome/help/shotwell/hu/share-slideshow.page
|
||||
share/gnome/help/shotwell/hu/share-upload.page
|
||||
share/gnome/help/shotwell/hu/view-displaying.page
|
||||
share/gnome/help/shotwell/hu/view-information.page
|
||||
share/gnome/help/shotwell/hu/view-sidebar.page
|
||||
share/icons/hicolor/16x16/apps/shotwell.svg
|
||||
share/icons/hicolor/24x24/apps/shotwell.svg
|
||||
share/icons/hicolor/scalable/apps/shotwell.svg
|
||||
share/locale/ar/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/af/LC_MESSAGES/shotwell.mo
|
||||
share/locale/ar/LC_MESSAGES/shotwell.mo
|
||||
share/locale/ast/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/as/LC_MESSAGES/shotwell.mo
|
||||
share/locale/ast/LC_MESSAGES/shotwell.mo
|
||||
share/locale/bg/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/bg/LC_MESSAGES/shotwell.mo
|
||||
share/locale/bn/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/bn/LC_MESSAGES/shotwell.mo
|
||||
share/locale/ca/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/bn_IN/LC_MESSAGES/shotwell.mo
|
||||
share/locale/ca/LC_MESSAGES/shotwell.mo
|
||||
share/locale/cs/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/cs/LC_MESSAGES/shotwell.mo
|
||||
share/locale/da/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/da/LC_MESSAGES/shotwell.mo
|
||||
share/locale/de/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/de/LC_MESSAGES/shotwell.mo
|
||||
share/locale/el/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/el/LC_MESSAGES/shotwell.mo
|
||||
share/locale/en_GB/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/en_GB/LC_MESSAGES/shotwell.mo
|
||||
share/locale/es/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/eo/LC_MESSAGES/shotwell.mo
|
||||
share/locale/es/LC_MESSAGES/shotwell.mo
|
||||
share/locale/et/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/et/LC_MESSAGES/shotwell.mo
|
||||
share/locale/eu/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/eu/LC_MESSAGES/shotwell.mo
|
||||
share/locale/fi/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/fi/LC_MESSAGES/shotwell.mo
|
||||
share/locale/fr/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/fr/LC_MESSAGES/shotwell.mo
|
||||
share/locale/gl/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/gd/LC_MESSAGES/shotwell.mo
|
||||
share/locale/gl/LC_MESSAGES/shotwell.mo
|
||||
share/locale/he/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/gu/LC_MESSAGES/shotwell.mo
|
||||
share/locale/he/LC_MESSAGES/shotwell.mo
|
||||
share/locale/hr/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/hi/LC_MESSAGES/shotwell.mo
|
||||
share/locale/hr/LC_MESSAGES/shotwell.mo
|
||||
share/locale/hu/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/hu/LC_MESSAGES/shotwell.mo
|
||||
share/locale/id/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/ia/LC_MESSAGES/shotwell.mo
|
||||
share/locale/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
|
||||
share/locale/ja/LC_MESSAGES/shotwell.mo
|
||||
share/locale/kk/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/kk/LC_MESSAGES/shotwell.mo
|
||||
share/locale/ko/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/km/LC_MESSAGES/shotwell.mo
|
||||
share/locale/kn/LC_MESSAGES/shotwell.mo
|
||||
share/locale/ko/LC_MESSAGES/shotwell.mo
|
||||
share/locale/lt/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/ky/LC_MESSAGES/shotwell.mo
|
||||
share/locale/lt/LC_MESSAGES/shotwell.mo
|
||||
share/locale/lv/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/lv/LC_MESSAGES/shotwell.mo
|
||||
share/locale/mk/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/mk/LC_MESSAGES/shotwell.mo
|
||||
share/locale/nb/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/ml/LC_MESSAGES/shotwell.mo
|
||||
share/locale/mr/LC_MESSAGES/shotwell.mo
|
||||
share/locale/nb/LC_MESSAGES/shotwell.mo
|
||||
share/locale/nl/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/nl/LC_MESSAGES/shotwell.mo
|
||||
share/locale/pa/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/nn/LC_MESSAGES/shotwell.mo
|
||||
share/locale/or/LC_MESSAGES/shotwell.mo
|
||||
share/locale/pa/LC_MESSAGES/shotwell.mo
|
||||
share/locale/pl/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/pl/LC_MESSAGES/shotwell.mo
|
||||
share/locale/pt/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/pt/LC_MESSAGES/shotwell.mo
|
||||
share/locale/pt_BR/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/pt_BR/LC_MESSAGES/shotwell.mo
|
||||
share/locale/ro/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/ro/LC_MESSAGES/shotwell.mo
|
||||
share/locale/ru/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/ru/LC_MESSAGES/shotwell.mo
|
||||
share/locale/sk/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/sk/LC_MESSAGES/shotwell.mo
|
||||
share/locale/sl/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/sl/LC_MESSAGES/shotwell.mo
|
||||
share/locale/sr/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/sr/LC_MESSAGES/shotwell.mo
|
||||
share/locale/sv/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/sr@latin/LC_MESSAGES/shotwell.mo
|
||||
share/locale/sv/LC_MESSAGES/shotwell.mo
|
||||
share/locale/ta/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/ta/LC_MESSAGES/shotwell.mo
|
||||
share/locale/te/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/te/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/uk/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/uk/LC_MESSAGES/shotwell.mo
|
||||
share/locale/zh_CN/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/vi/LC_MESSAGES/shotwell.mo
|
||||
share/locale/zh_CN/LC_MESSAGES/shotwell.mo
|
||||
share/locale/zh_TW/LC_MESSAGES/shotwell-extras.mo
|
||||
share/locale/zh_HK/LC_MESSAGES/shotwell.mo
|
||||
share/locale/zh_TW/LC_MESSAGES/shotwell.mo
|
||||
share/shotwell/icons/all-rejected.png
|
||||
share/shotwell/icons/crop-pivot-reticle.png
|
||||
|
|
@ -175,6 +282,7 @@ share/shotwell/icons/make-primary.svg
|
|||
share/shotwell/icons/merge.svg
|
||||
share/shotwell/icons/multiple-events.png
|
||||
share/shotwell/icons/multiple-tags.png
|
||||
share/shotwell/icons/no-event.png
|
||||
share/shotwell/icons/noninterpretable-video.png
|
||||
share/shotwell/icons/one-event.png
|
||||
share/shotwell/icons/one-star-filter-plus.svg
|
||||
|
|
@ -184,8 +292,6 @@ share/shotwell/icons/pin-toolbar.svg
|
|||
share/shotwell/icons/publish.png
|
||||
share/shotwell/icons/redeye.png
|
||||
share/shotwell/icons/rejected.svg
|
||||
share/shotwell/icons/searchbox-clear.svg
|
||||
share/shotwell/icons/searchbox-find.svg
|
||||
share/shotwell/icons/shotwell-16.svg
|
||||
share/shotwell/icons/shotwell-24.svg
|
||||
share/shotwell/icons/shotwell-street.jpg
|
||||
|
|
@ -193,6 +299,7 @@ share/shotwell/icons/shotwell.ico
|
|||
share/shotwell/icons/shotwell.svg
|
||||
share/shotwell/icons/slideshow-extension-point.png
|
||||
share/shotwell/icons/sprocket.png
|
||||
share/shotwell/icons/straighten.svg
|
||||
share/shotwell/icons/three-star-filter-plus.svg
|
||||
share/shotwell/icons/three-stars.svg
|
||||
share/shotwell/icons/two-star-filter-plus.svg
|
||||
|
|
@ -202,6 +309,7 @@ share/shotwell/icons/zoom-in.png
|
|||
share/shotwell/icons/zoom-out.png
|
||||
share/shotwell/ui/collection.ui
|
||||
share/shotwell/ui/direct.ui
|
||||
share/shotwell/ui/direct_context.ui
|
||||
share/shotwell/ui/event.ui
|
||||
share/shotwell/ui/events_directory.ui
|
||||
share/shotwell/ui/fullscreen.ui
|
||||
|
|
@ -210,13 +318,16 @@ share/shotwell/ui/import_queue.ui
|
|||
share/shotwell/ui/media.ui
|
||||
share/shotwell/ui/offline.ui
|
||||
share/shotwell/ui/photo.ui
|
||||
share/shotwell/ui/photo_context.ui
|
||||
share/shotwell/ui/savedsearch.ui
|
||||
share/shotwell/ui/search_bar.ui
|
||||
share/shotwell/ui/search_sidebar_context.ui
|
||||
share/shotwell/ui/set_background_dialog.glade
|
||||
share/shotwell/ui/set_background_slideshow_dialog.glade
|
||||
share/shotwell/ui/shotwell.glade
|
||||
share/shotwell/ui/shotwell.xml
|
||||
share/shotwell/ui/sidebar_default_context.ui
|
||||
share/shotwell/ui/tag_sidebar_context.ui
|
||||
share/shotwell/ui/tags.ui
|
||||
share/shotwell/ui/top.ui
|
||||
share/shotwell/ui/trash.ui
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: distinfo,v 1.14 2012/02/09 19:17:13 drochner Exp $
|
||||
$NetBSD: distinfo,v 1.15 2014/11/25 10:07:18 wiz Exp $
|
||||
|
||||
SHA1 (shotwell-0.11.6.tar.bz2) = 2dd2b46dc56f6562522f75bd79eefdc80cbb2a49
|
||||
RMD160 (shotwell-0.11.6.tar.bz2) = d3a93a90f5feea65a630f8f30585a3ebbe558635
|
||||
Size (shotwell-0.11.6.tar.bz2) = 1570860 bytes
|
||||
SHA1 (patch-aa) = 9df29602ba465d2ad401fd9ca7ca55b1d6e3c788
|
||||
SHA1 (patch-ab) = 59c223fd7f8a9cb3136b7db2c882834c8d79f363
|
||||
SHA1 (patch-ac) = 1d1474140a30a1dc90639cd8c411d03336f7a290
|
||||
SHA1 (shotwell-0.20.2.tar.xz) = f69ea2a2fc6ae1dad0f56bf85d1a3275dd8a6f1e
|
||||
RMD160 (shotwell-0.20.2.tar.xz) = 25c282de74f5dd35f0f44f05067eec4db6f4d33e
|
||||
Size (shotwell-0.20.2.tar.xz) = 1815580 bytes
|
||||
SHA1 (patch-aa) = 23f6982e1ba135c706afc6983c48602f6060dfad
|
||||
SHA1 (patch-ab) = e4951475348523f407fe4960fcee861e8cbc29ed
|
||||
SHA1 (patch-ac) = 0183761f3ab30788703e54aecba72b194e0d770a
|
||||
|
|
|
|||
|
|
@ -1,54 +1,42 @@
|
|||
$NetBSD: patch-aa,v 1.9 2011/10/22 13:51:02 gls Exp $
|
||||
$NetBSD: patch-aa,v 1.10 2014/11/25 10:07:18 wiz Exp $
|
||||
|
||||
--- Makefile.orig 2011-10-13 19:26:06.000000000 +0000
|
||||
--- Makefile.orig 2013-11-19 02:16:36.000000000 +0000
|
||||
+++ Makefile
|
||||
@@ -273,7 +273,6 @@ EXT_PKGS = \
|
||||
gstreamer-base-0.10 \
|
||||
gstreamer-pbutils-0.10 \
|
||||
gtk+-2.0 \
|
||||
@@ -315,7 +315,6 @@ EXT_PKGS = \
|
||||
gstreamer-base-1.0 \
|
||||
gstreamer-pbutils-1.0 \
|
||||
gtk+-3.0 \
|
||||
- gudev-1.0 \
|
||||
libexif \
|
||||
libgphoto2 \
|
||||
libsoup-2.4 \
|
||||
@@ -309,7 +308,6 @@ EXT_PKG_VERSIONS = \
|
||||
gstreamer-base-0.10 >= 0.10.28 \
|
||||
gstreamer-pbutils-0.10 >= 0.10.32 \
|
||||
gtk+-2.0 >= 2.18.0 \
|
||||
json-glib-1.0 \
|
||||
@@ -347,7 +346,6 @@ EXT_PKG_VERSIONS = \
|
||||
gstreamer-plugins-base-1.0 >= 1.0.0 \
|
||||
gstreamer-pbutils-1.0 >= 1.0.0 \
|
||||
gtk+-3.0 >= 3.6.0 \
|
||||
- gudev-1.0 >= 145 \
|
||||
libexif >= 0.6.16 \
|
||||
libgphoto2 >= 2.4.2 \
|
||||
libsoup-2.4 >= 2.26.0 \
|
||||
@@ -434,7 +432,7 @@ CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHA
|
||||
# if not available.
|
||||
LIBRAW_CONFIG=./libraw-config
|
||||
libraw >= 0.13.2 \
|
||||
@@ -461,7 +459,7 @@ PLUGIN_CFLAGS += $(PROFILE_FLAGS) $(REQU
|
||||
# Required for gudev-1.0
|
||||
CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE
|
||||
|
||||
-define check_valac_version
|
||||
+define xcheck_valac_version
|
||||
@ ./chkver min $(VALAC_VERSION) $(MIN_VALAC_VERSION) || ( echo 'Shotwell requires Vala compiler $(MIN_VALAC_VERSION) or greater. You are running' $(VALAC_VERSION) '\b.'; exit 1 )
|
||||
$(if $(MAX_VALAC_VERSION),\
|
||||
@ ./chkver max $(VALAC_VERSION) $(MAX_VALAC_VERSION) || ( echo 'Shotwell cannot be built by Vala compiler $(MAX_VALAC_VERSION) or greater. You are running' $(VALAC_VERSION) '\b.'; exit 1 ),)
|
||||
@@ -660,7 +658,6 @@ $(UNITIZE_INITS) $(UNITIZE_ENTRIES): $(U
|
||||
-all: pkgcheck valacheck desktop
|
||||
+all: pkgcheck desktop
|
||||
|
||||
# EXPANDED_SRC_FILES includes UNITIZE_INITS and UNITIZE_ENTRY
|
||||
$(VALA_STAMP): $(EXPANDED_SRC_FILES) $(EXPANDED_VAPI_FILES) $(EXPANDED_SRC_HEADER_FILES)
|
||||
- $(call check_valac_version)
|
||||
@echo Compiling Vala code...
|
||||
@mkdir -p $(BUILD_DIR)
|
||||
@$(VALAC) --ccode --directory=$(BUILD_DIR) --basedir=src \
|
||||
@@ -677,10 +674,10 @@ $(EXPANDED_C_FILES): $(VALA_STAMP)
|
||||
@
|
||||
|
||||
$(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile
|
||||
- $(CC) -c $(VALA_CFLAGS) `$(LIBRAW_CONFIG) --cflags` $(CFLAGS) -o $@ $<
|
||||
+ $(CC) -c $(VALA_CFLAGS) $(CFLAGS) `pkg-config --cflags libraw` -o $@ $<
|
||||
|
||||
$(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) $(THUMBNAILER_BIN)
|
||||
- $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -o $@
|
||||
+ $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `pkg-config --libs libraw` $(EXPORT_FLAGS) -o $@
|
||||
glib-compile-schemas misc
|
||||
|
||||
$(THUMBNAILER_BIN): $(EXPANDED_THUMBNAILER_SRC_FILES)
|
||||
@@ -691,7 +688,6 @@ $(PLUGINS_SO) $(EXTRA_PLUGINS_SO): $(PLU
|
||||
ifdef ENABLE_BUILD_FOR_GLADE
|
||||
all: $(PLUGINS_DIR) lib$(PROGRAM).so $(PROGRAM) $(PC_FILE)
|
||||
@@ -535,7 +533,7 @@ ifndef DISABLE_DESKTOP_VALIDATE
|
||||
else rm -f misc/shotwell.desktop.errors; \
|
||||
fi
|
||||
endif
|
||||
-
|
||||
+
|
||||
misc/shotwell-viewer.desktop: misc/shotwell-viewer.desktop.head $(EXPANDED_CORE_PO_FILES)
|
||||
cp misc/shotwell-viewer.desktop.head misc/shotwell-viewer.desktop
|
||||
$(foreach lang,$(CORE_SUPPORTED_LANGUAGES), echo X-GNOME-FullName[$(lang)]=`TEXTDOMAINDIR=locale-langpack \
|
||||
@@ -736,7 +732,6 @@ $(PLUGINS_SO) $(EXTRA_PLUGINS_SO): $(PLU
|
||||
|
||||
.PHONY: $(PLUGINS_DIR)
|
||||
$(PLUGINS_DIR): $(PLUGIN_VAPI) $(PLUGIN_HEADER) $(PLUGIN_DEPS)
|
||||
|
|
@ -56,12 +44,3 @@ $NetBSD: patch-aa,v 1.9 2011/10/22 13:51:02 gls Exp $
|
|||
@$(MAKE) --directory=$@ PLUGINS_VERSION="$(VERSION)" USER_VALAFLAGS="$(USER_VALAFLAGS)" \
|
||||
PLUGIN_CFLAGS="$(PLUGIN_CFLAGS)"
|
||||
|
||||
@@ -709,7 +705,7 @@ docs:
|
||||
glade: lib$(PROGRAM).so
|
||||
|
||||
lib$(PROGRAM).so: $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP)
|
||||
- $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -shared -o $@
|
||||
+ $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(LDFLAGS) `pkg-config --libs libraw` $(EXPORT_FLAGS) -shared -o $@
|
||||
|
||||
.PHONY: pkgcheck
|
||||
pkgcheck:
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
$NetBSD: patch-ab,v 1.5 2011/10/22 13:51:02 gls Exp $
|
||||
$NetBSD: patch-ab,v 1.6 2014/11/25 10:07:18 wiz Exp $
|
||||
|
||||
--- src/camera/CameraTable.vala.orig 2011-10-13 19:22:54.000000000 +0000
|
||||
--- src/camera/CameraTable.vala.orig 2012-03-28 22:35:57.000000000 +0000
|
||||
+++ src/camera/CameraTable.vala
|
||||
@@ -26,7 +26,6 @@ public class CameraTable {
|
||||
|
||||
|
|
@ -50,13 +50,13 @@ $NetBSD: patch-ab,v 1.5 2011/10/22 13:51:02 gls Exp $
|
|||
return cameras;
|
||||
}
|
||||
|
||||
@@ -204,24 +177,6 @@ public class CameraTable {
|
||||
@@ -206,24 +179,6 @@ public class CameraTable {
|
||||
"/dev/bus/usb/%s".printf(port.substring(4).replace(",", "/")) : null;
|
||||
}
|
||||
|
||||
- private string? get_name_for_uuid(string uuid) {
|
||||
- foreach (Volume volume in volume_monitor.get_volumes()) {
|
||||
- if (volume.get_identifier(VOLUME_IDENTIFIER_KIND_UUID) == uuid) {
|
||||
- if (volume.get_identifier(VolumeIdentifier.UUID) == uuid) {
|
||||
- return volume.get_name();
|
||||
- }
|
||||
- }
|
||||
|
|
@ -65,7 +65,7 @@ $NetBSD: patch-ab,v 1.5 2011/10/22 13:51:02 gls Exp $
|
|||
-
|
||||
- private GLib.Icon? get_icon_for_uuid(string uuid) {
|
||||
- foreach (Volume volume in volume_monitor.get_volumes()) {
|
||||
- if (volume.get_identifier(VOLUME_IDENTIFIER_KIND_UUID) == uuid) {
|
||||
- if (volume.get_identifier(VolumeIdentifier.UUID) == uuid) {
|
||||
- return volume.get_icon();
|
||||
- }
|
||||
- }
|
||||
|
|
@ -75,7 +75,7 @@ $NetBSD: patch-ab,v 1.5 2011/10/22 13:51:02 gls Exp $
|
|||
private void update_camera_table() throws GPhotoError {
|
||||
// need to do this because virtual ports come and go in the USB world (and probably others)
|
||||
GPhoto.PortInfoList port_info_list;
|
||||
@@ -311,23 +266,6 @@ public class CameraTable {
|
||||
@@ -313,23 +268,6 @@ public class CameraTable {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
@ -99,7 +99,7 @@ $NetBSD: patch-ab,v 1.5 2011/10/22 13:51:02 gls Exp $
|
|||
if (null == display_name) {
|
||||
// Default to GPhoto detected name.
|
||||
display_name = name;
|
||||
@@ -365,14 +303,6 @@ public class CameraTable {
|
||||
@@ -367,14 +305,6 @@ public class CameraTable {
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,17 @@
|
|||
$NetBSD: patch-ac,v 1.5 2012/02/09 19:17:13 drochner Exp $
|
||||
$NetBSD: patch-ac,v 1.6 2014/11/25 10:07:18 wiz Exp $
|
||||
|
||||
--- plugins/Makefile.plugin.mk.orig 2011-11-03 21:25:02.000000000 +0000
|
||||
+++ plugins/Makefile.plugin.mk
|
||||
@@ -10,7 +10,9 @@
|
||||
# NOTE: This file is called from the cwd of each directory, hence the relative paths should be
|
||||
# read as such.
|
||||
--- configure.orig 2013-11-19 02:02:29.000000000 +0000
|
||||
+++ configure
|
||||
@@ -176,10 +176,10 @@ done
|
||||
|
||||
+ifndef VALAC
|
||||
VALAC := valac
|
||||
+endif
|
||||
MAKE_FILES := Makefile ../Makefile.plugin.mk ../plugins.mk
|
||||
HEADER_FILES := ../shotwell-plugin-dev-1.0.vapi ../shotwell-plugin-dev-1.0.h \
|
||||
../shotwell-plugin-dev-1.0.deps
|
||||
# detect version of libgphoto2 the compilation host has installed
|
||||
pkg-config --atleast-version 2.5 libgphoto2
|
||||
-if [ $? == 1 ]
|
||||
+if [ $? = 1 ]
|
||||
then
|
||||
pkg-config --atleast-version 2.4 libgphoto2
|
||||
- if [ $? == 1 ]
|
||||
+ if [ $? = 1 ]
|
||||
then
|
||||
printf "No compatible libGPhoto installation found. Configuration cannot continue.\n";
|
||||
exit 1
|
||||
|
|
|
|||
Loading…
Reference in a new issue