Update to geary 0.2.2.

Based on a diff from Juan Francisco Cantero, added gettext MODULE and run
depends on gnome-keyring.
This commit is contained in:
landry 2012-12-11 13:33:06 +00:00
parent 70b24a11f9
commit 482e51b430
5 changed files with 110 additions and 25 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.1.1.1 2012/09/01 18:16:24 landry Exp $
# $OpenBSD: Makefile,v 1.2 2012/12/11 13:33:06 landry Exp $
COMMENT = lightweight mail user agent
DISTNAME = geary-0.1.20120901
DISTNAME = geary-0.2.2
MAINTAINER = Landry Breuil <landry@openbsd.org>
CATEGORIES = mail
@ -13,9 +13,10 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
HOMEPAGE = http://redmine.yorba.org/projects/geary/wiki
MASTER_SITES = http://rhaalovely.net/stuff/
MODULES = devel/cmake devel/dconf x11/gnome
HOMEPAGE = http://yorba.org/geary/
MASTER_SITES = http://yorba.org/download/geary/stable/
EXTRACT_SUFX = .tar.xz
MODULES = devel/cmake devel/dconf x11/gnome devel/gettext
MODGNOME_TOOLS = yelp vala
MODGNOME_DESKTOP_FILE = Yes
@ -26,6 +27,8 @@ CONFIGURE_ARGS =-DGSETTINGS_COMPILE=OFF \
-DICON_UPDATE=OFF \
-DDESKTOP_UPDATE=OFF
RUN_DEPENDS = x11/gnome/keyring
LIB_DEPENDS = mail/gmime \
www/webkit,gtk3 \
audio/libcanberra \
@ -35,9 +38,12 @@ LIB_DEPENDS = mail/gmime \
WANTLIB += GL X11 Xrender atk-1.0 c cairo cairo-gobject expat sqlite3
WANTLIB += fontconfig freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
WANTLIB += gnome-keyring gobject-2.0 gthread-2.0 gtk-3 iconv intl
WANTLIB += gnome-keyring gobject-2.0 gthread-2.0 gtk-3 Xext
WANTLIB += javascriptcoregtk-3.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pixman-1 png pthread-stubs soup-2.4 webkitgtk-3.0 xcb gee
WANTLIB += xcb-render xcb-shm z canberra gmime-2.6 notify unique-3.0
pre-configure:
${SUBST_CMD} ${WRKSRC}/src/client/geary-application.vala
.include <bsd.port.mk>

View File

@ -1,5 +1,2 @@
MD5 (geary-0.1.20120901.tar.gz) = sfm5AUa1QrR9H5rkh0FDuQ==
RMD160 (geary-0.1.20120901.tar.gz) = 4GnGvixAvEmJhz+NYLVUiV1CeY4=
SHA1 (geary-0.1.20120901.tar.gz) = m5J35ETNZ5UH4FWgck8GXqS4QHM=
SHA256 (geary-0.1.20120901.tar.gz) = tejkm/UGDjXlfK+MxMcehUX2jgoqrDCUgDvF4PYkoJc=
SIZE (geary-0.1.20120901.tar.gz) = 2084195
SHA256 (geary-0.2.2.tar.xz) = vmklgdgLhd1gTWMoPRgTELurqCJs6QqfHaXZSjf/AA0=
SIZE (geary-0.2.2.tar.xz) = 372932

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-cmake_FindIntltool_cmake,v 1.1 2012/12/11 13:33:06 landry Exp $
http://redmine.yorba.org/issues/6125
--- cmake/FindIntltool.cmake.orig Mon Dec 10 00:44:48 2012
+++ cmake/FindIntltool.cmake Mon Dec 10 00:45:45 2012
@@ -17,7 +17,7 @@ if (INTLTOOL_MERGE_FOUND)
${INTLTOOL_MERGE_EXECUTABLE} --desktop-style ${CMAKE_SOURCE_DIR}/${po_dir}
${CMAKE_CURRENT_SOURCE_DIR}/${desktop_id}.desktop.in ${desktop_id}.desktop
)
- install (FILES ${CMAKE_CURRENT_BINARY_DIR}/geary.desktop DESTINATION /usr/share/applications)
+ install (FILES ${CMAKE_CURRENT_BINARY_DIR}/geary.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
endmacro (INTLTOOL_MERGE_DESKTOP desktop_id po_dir)
endif (INTLTOOL_MERGE_FOUND)

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_client_geary-application_vala,v 1.1 2012/12/11 13:33:06 landry Exp $
--- src/client/geary-application.vala.orig Mon Dec 10 22:17:01 2012
+++ src/client/geary-application.vala Mon Dec 10 22:17:13 2012
@@ -74,7 +74,7 @@ along with Geary; if not, write to the Free Software F
public Configuration config { get; private set; }
public File system_desktop_file_directory { get; private set;
- default = File.new_for_path("/usr/share/applications/"); }
+ default = File.new_for_path("${LOCALBASE}/share/applications/"); }
private static GearyApplication _instance = null;

View File

@ -1,21 +1,28 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2012/09/01 18:16:24 landry Exp $
@comment $OpenBSD: PLIST,v 1.2 2012/12/11 13:33:06 landry Exp $
@conflict postler-*
@pkgpath mail/postler
@bin bin/geary
share/applications/geary.desktop
share/geary/
share/geary/icons/
share/geary/icons/16x16/
share/geary/icons/16x16/format-text-none.svg
share/geary/icons/16x16/mail-archive.svg
share/geary/icons/16x16/tag-new.svg
share/geary/icons/16x16/tag.svg
share/geary/icons/16x16/tags.svg
share/geary/icons/24x24/
share/geary/icons/24x24/edit-mark.svg
share/geary/icons/24x24/format-text-none.svg
share/geary/icons/24x24/mail-archive.svg
share/geary/icons/24x24/mail-move.svg
share/geary/icons/24x24/tag-new.svg
share/geary/icons/24x24/tag.svg
share/geary/icons/application-menu.svg
share/geary/icons/archive-insert.svg
share/geary/icons/archive.svg
share/geary/icons/geary.png
share/geary/icons/mail-inbox.png
share/geary/icons/mail-outbox.svg
share/geary/icons/mail-sent.png
share/geary/icons/menu-down.svg
share/geary/icons/multiple-tags.png
share/geary/icons/non-starred-grey.png
share/geary/icons/one-tag.png
share/geary/icons/remove-formatting.png
share/geary/icons/starred.png
share/geary/sql/
share/geary/sql/version-001.sql
@ -44,17 +51,67 @@ share/gnome/help/geary/
share/gnome/help/geary/C/
share/gnome/help/geary/C/archive.page
share/gnome/help/geary/C/bugs.page
share/gnome/help/geary/C/conversation.page
share/gnome/help/geary/C/editor.page
share/gnome/help/geary/C/figures/
share/gnome/help/geary/C/figures/Mail.png
share/gnome/help/geary/C/figures/geary.svg
share/gnome/help/geary/C/index.page
share/gnome/help/geary/C/label.page
share/gnome/help/geary/C/limits.page
share/gnome/help/geary/C/send.page
share/gnome/help/geary/C/overview.page
share/gnome/help/geary/C/preferences.page
share/gnome/help/geary/C/shortcuts.page
share/gnome/help/geary/C/spell.page
share/gnome/help/geary/C/star.page
share/icons/hicolor/scalable/apps/geary.png
share/gnome/help/geary/C/write.page
share/icons/hicolor/128x128/apps/geary.svg
share/icons/hicolor/16x16/apps/geary.svg
share/icons/hicolor/32x32/apps/geary.svg
share/icons/hicolor/48x48/apps/geary.svg
share/icons/hicolor/64x64/apps/geary.svg
share/locale/ca/LC_MESSAGES/geary.mo
share/locale/ca_ES/
share/locale/ca_ES/LC_MESSAGES/
share/locale/ca_ES/LC_MESSAGES/geary.mo
share/locale/cs/LC_MESSAGES/geary.mo
share/locale/de/LC_MESSAGES/geary.mo
share/locale/el_GR/
share/locale/el_GR/LC_MESSAGES/
share/locale/el_GR/LC_MESSAGES/geary.mo
share/locale/en_CA/LC_MESSAGES/geary.mo
share/locale/en_GB/LC_MESSAGES/geary.mo
share/locale/eo/LC_MESSAGES/geary.mo
share/locale/es/LC_MESSAGES/geary.mo
share/locale/es_ES/
share/locale/es_ES/LC_MESSAGES/
share/locale/es_ES/LC_MESSAGES/geary.mo
share/locale/fi/LC_MESSAGES/geary.mo
share/locale/fr/LC_MESSAGES/geary.mo
share/locale/he/LC_MESSAGES/geary.mo
share/locale/id/LC_MESSAGES/geary.mo
share/locale/it/LC_MESSAGES/geary.mo
share/locale/km_KH/
share/locale/km_KH/LC_MESSAGES/
share/locale/km_KH/LC_MESSAGES/geary.mo
share/locale/nb/LC_MESSAGES/geary.mo
share/locale/nl_NL/
share/locale/nl_NL/LC_MESSAGES/
share/locale/nl_NL/LC_MESSAGES/geary.mo
share/locale/pl/LC_MESSAGES/geary.mo
share/locale/pt/LC_MESSAGES/geary.mo
share/locale/pt_BR/LC_MESSAGES/geary.mo
share/locale/ro_RO/
share/locale/ro_RO/LC_MESSAGES/
share/locale/ro_RO/LC_MESSAGES/geary.mo
share/locale/sl/LC_MESSAGES/geary.mo
share/locale/sr/LC_MESSAGES/geary.mo
share/locale/sv/LC_MESSAGES/geary.mo
share/locale/te/LC_MESSAGES/geary.mo
share/locale/tr/LC_MESSAGES/geary.mo
share/locale/tr_TR/
share/locale/tr_TR/LC_MESSAGES/
share/locale/tr_TR/LC_MESSAGES/geary.mo
share/locale/uk/LC_MESSAGES/geary.mo
share/locale/vi/LC_MESSAGES/geary.mo
share/locale/zh_CN/LC_MESSAGES/geary.mo
share/locale/zh_TW/LC_MESSAGES/geary.mo
@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
@exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null