Attachment #148509 for bug #194494

View | Details | Raw Unified | Return to bug 194494
Collapse All | Expand All




# $FreeBSD: head/deskutils/osmo/Makefile 357277 2014-06-10 07:39:01Z olgeni $

PORTNAME=	osmo
PORTVERSION=	0.2.12
PORTREVISION=	7
CATEGORIES=	deskutils
MASTER_SITES=	SF/${PORTNAME}-pim/${PORTNAME}-pim/${PORTNAME}-${PORTVERSION}

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Personal organizer

LICENSE=	GPLv2 # (or later)

LIB_DEPENDS=	libical.so:${PORTSDIR}/devel/libical \
		libnotify.so:${PORTSDIR}/devel/libnotify \
		libical.so:${PORTSDIR}/devel/libical \
		libtar.so:${PORTSDIR}/devel/libtar \
		libgringotts.so:${PORTSDIR}/security/libgringotts \
		libgtkspell.so:${PORTSDIR}/textproc/gtkspell \
		libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2

USE_GNOME=	gtk20
USES=		gettext gmake pkgconfig
USE_GNOME=	gtk20 libxml2
USE_SQLITE=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	LIBARCHIVE_CFLAGS=" " LIBARCHIVE_LIBS="-larchive"
INSTALLS_ICONS=	yes

POFILES=	bg ca cs da de el en_GB es fi fr hu it ja lt nl pl pt \
		ru sv tr uk zh_CN

CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib

POFILES=	bg ca cs da de el en_GB es fi fr gl gl_ES hu it ja lt nl \
		pl pt pt_BR ro ru sv te tr uk ur ur_PK zh_CN
		${WRKSRC}/src/Makefile.in

post-build:
# workaround to problem in po makefile
.for p in ${POFILES}
	(cd ${WRKSRC}/po && ${LOCALBASE}/bin/msgfmt -c ${p}.po -o ${p}.mo)
.endfor

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)deskutils/osmo/distinfo (-2 / +2 lines)
1	SHA256 (osmo-0.2.10.tar.gz) = 4e911c52ac64a088f8a812b354084e7adedd1b54cb0435995a2cdc1d194d0845	1	SHA256 (osmo-0.2.12.tar.gz) = 93bda51614f92e4193840451612e792219f7d8c90d78bdc7ea6d6c14a2be6b78
2	SIZE (osmo-0.2.10.tar.gz) = 851833	2	SIZE (osmo-0.2.12.tar.gz) = 907452

Line 0 Link Here

(-)deskutils/osmo/files/patch-src__backup.c (+17 lines)
	1	--- src/backup.c.orig 2014-10-19 00:26:19.000000000 +0900
	2	+++ src/backup.c 2014-10-19 00:32:50.000000000 +0900
	3	@@ -41,6 +41,14 @@
	4	#include <archive.h>
	5	#include <archive_entry.h>
	6
	7	+#ifdef __FreeBSD__
	8	+#include <sys/param.h>
	9	+#if __FreeBSD_version <= 1000008 /* r232154: bump for libarchive update */
	10	+#define archive_read_support_filter_all(x) \
	11	+ archive_read_support_compression_all(x)
	12	+#endif
	13	+#endif
	14	+
	15	/------------------------------------------------------------------------------/
	16
	17	int




--- src/check_events.c.orig	2011-08-12 15:17:59.000000000 +0200
+++ src/check_events.c	2011-08-12 15:20:36.000000000 +0200
@@ -454,9 +454,9 @@
 					a->date = 0;
 
 					if (textdesc != NULL)
-						a->notify = notify_notification_new (item->summary, textdesc, GTK_STOCK_DIALOG_WARNING, NULL);
+						a->notify = notify_notification_new (item->summary, textdesc, GTK_STOCK_DIALOG_WARNING);
 					else
-						a->notify = notify_notification_new (item->summary, text, GTK_STOCK_DIALOG_WARNING, NULL);
+						a->notify = notify_notification_new (item->summary, text, GTK_STOCK_DIALOG_WARNING);
 
 					g_free (textdesc);
 					g_free (text);
@@ -483,9 +483,7 @@
 #endif /* HAVE_LIBNOTIFY */
 
 					if (gtk_status_icon_get_visible (appGUI->osmo_trayicon)) {
-#ifdef HAVE_LIBNOTIFY
-						notify_notification_attach_to_status_icon (a->notify, appGUI->osmo_trayicon);
-#endif /* HAVE_LIBNOTIFY */
+
 				        gtk_status_icon_set_from_stock (appGUI->osmo_trayicon, OSMO_STOCK_SYSTRAY_TASK);
 
 						if (config.blink_on_events) {
@@ -532,9 +530,9 @@
 					a->time = -1;
 					a->date = 0;
 					if (textdesc != NULL)
-						a->notify = notify_notification_new (_("Alarm warning!"), textdesc, GTK_STOCK_DIALOG_INFO, NULL);
+						a->notify = notify_notification_new (_("Alarm warning!"), textdesc, GTK_STOCK_DIALOG_INFO);
 					else
-						a->notify = notify_notification_new (_("Alarm warning!"), text, GTK_STOCK_DIALOG_INFO, NULL);
+						a->notify = notify_notification_new (_("Alarm warning!"), text, GTK_STOCK_DIALOG_INFO);
 
 					notify_notification_set_timeout (a->notify, NOTIFY_EXPIRES_NEVER);
 					notify_notification_set_urgency (a->notify, NOTIFY_URGENCY_NORMAL);
@@ -545,9 +543,7 @@
 #endif /* HAVE_LIBNOTIFY */
 
 					if (gtk_status_icon_get_visible (appGUI->osmo_trayicon)) {
-#ifdef HAVE_LIBNOTIFY
-						notify_notification_attach_to_status_icon (a->notify, appGUI->osmo_trayicon);
-#endif /* HAVE_LIBNOTIFY */
+
 				        gtk_status_icon_set_from_stock (appGUI->osmo_trayicon, OSMO_STOCK_SYSTRAY_TASK);
 
 						if (config.blink_on_events) {

Lines 17-22 Link Here

(-)deskutils/osmo/pkg-plist (+7 lines)
17	share/locale/es/LC_MESSAGES/osmo.mo	17	share/locale/es/LC_MESSAGES/osmo.mo
18	share/locale/fi/LC_MESSAGES/osmo.mo	18	share/locale/fi/LC_MESSAGES/osmo.mo
19	share/locale/fr/LC_MESSAGES/osmo.mo	19	share/locale/fr/LC_MESSAGES/osmo.mo
		20	share/locale/gl/LC_MESSAGES/osmo.mo
		21	share/locale/gl_ES/LC_MESSAGES/osmo.mo
20	share/locale/hu/LC_MESSAGES/osmo.mo	22	share/locale/hu/LC_MESSAGES/osmo.mo
21	share/locale/it/LC_MESSAGES/osmo.mo	23	share/locale/it/LC_MESSAGES/osmo.mo
22	share/locale/ja/LC_MESSAGES/osmo.mo	24	share/locale/ja/LC_MESSAGES/osmo.mo
Lines 24-33 Link Here
24	share/locale/nl/LC_MESSAGES/osmo.mo	26	share/locale/nl/LC_MESSAGES/osmo.mo
25	share/locale/pl/LC_MESSAGES/osmo.mo	27	share/locale/pl/LC_MESSAGES/osmo.mo
26	share/locale/pt/LC_MESSAGES/osmo.mo	28	share/locale/pt/LC_MESSAGES/osmo.mo
		29	share/locale/pt_BR/LC_MESSAGES/osmo.mo
		30	share/locale/ro/LC_MESSAGES/osmo.mo
27	share/locale/ru/LC_MESSAGES/osmo.mo	31	share/locale/ru/LC_MESSAGES/osmo.mo
28	share/locale/sv/LC_MESSAGES/osmo.mo	32	share/locale/sv/LC_MESSAGES/osmo.mo
		33	share/locale/te/LC_MESSAGES/osmo.mo
29	share/locale/tr/LC_MESSAGES/osmo.mo	34	share/locale/tr/LC_MESSAGES/osmo.mo
30	share/locale/uk/LC_MESSAGES/osmo.mo	35	share/locale/uk/LC_MESSAGES/osmo.mo
		36	share/locale/ur/LC_MESSAGES/osmo.mo
		37	share/locale/ur_PK/LC_MESSAGES/osmo.mo
31	share/locale/zh_CN/LC_MESSAGES/osmo.mo	38	share/locale/zh_CN/LC_MESSAGES/osmo.mo
32	share/pixmaps/osmo.png	39	share/pixmaps/osmo.png
33	share/sounds/osmo/alarm.wav	40	share/sounds/osmo/alarm.wav

Return to bug 194494

Lines 2-43 Link Here

(-)deskutils/osmo/Makefile (-22 / +17 lines)
2	# $FreeBSD: head/deskutils/osmo/Makefile 357277 2014-06-10 07:39:01Z olgeni $	2	# $FreeBSD: head/deskutils/osmo/Makefile 357277 2014-06-10 07:39:01Z olgeni $
3		3
4	PORTNAME= osmo	4	PORTNAME= osmo
5	PORTVERSION= 0.2.10	5	PORTVERSION= 0.2.12
6	PORTREVISION= 7
7	CATEGORIES= deskutils	6	CATEGORIES= deskutils
8	MASTER_SITES= SF/${PORTNAME}-pim/${PORTNAME}-pim/${PORTNAME}-${PORTVERSION}/	7	MASTER_SITES= SF/${PORTNAME}-pim/${PORTNAME}-pim/${PORTNAME}-${PORTVERSION}
9		8
10	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= ports@FreeBSD.org
11	COMMENT= Personal organizer	10	COMMENT= Personal organizer
12		11
13	LIB_DEPENDS= libxml2.so:${PORTSDIR}/textproc/libxml2 \	12	LICENSE= GPLv2 # (or later)
		13
		14	LIB_DEPENDS= libical.so:${PORTSDIR}/devel/libical \
14	libnotify.so:${PORTSDIR}/devel/libnotify \	15	libnotify.so:${PORTSDIR}/devel/libnotify \
15	libical.so:${PORTSDIR}/devel/libical \
16	libtar.so:${PORTSDIR}/devel/libtar \
17	libgringotts.so:${PORTSDIR}/security/libgringotts \	16	libgringotts.so:${PORTSDIR}/security/libgringotts \
18	libgtkhtml-2.so:${PORTSDIR}/www/libgtkhtml	17	libgtkspell.so:${PORTSDIR}/textproc/gtkspell \
		18	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
19		19
20	USE_GNOME= gtk20
21	USES= gettext gmake pkgconfig	20	USES= gettext gmake pkgconfig
22	INSTALLS_ICONS= yes	21	USE_GNOME= gtk20 libxml2
23		22	USE_SQLITE= yes
24	GNU_CONFIGURE= yes	23	GNU_CONFIGURE= yes
25	LDFLAGS+= -L${LOCALBASE}/lib -lintl	24	CONFIGURE_ENV= LIBARCHIVE_CFLAGS=" " LIBARCHIVE_LIBS="-larchive"
26	CFLAGS+= -I${LOCALBASE}/include/libical	25	INSTALLS_ICONS= yes
27
28	POFILES= bg ca cs da de el en_GB es fi fr hu it ja lt nl pl pt \
29	ru sv tr uk zh_CN
30		26
31	MSGFMT= ${LOCALBASE}/bin/msgfmt	27	CPPFLAGS+= -I${LOCALBASE}/include
		28	LDFLAGS+= -L${LOCALBASE}/lib
32		29
33	post-patch:	30	POFILES= bg ca cs da de el en_GB es fi fr gl gl_ES hu it ja lt nl \
34	@${REINPLACE_CMD} -e 's\|-DGTK_DISABLE_DEPRECATED\|\|g' \	31	pl pt pt_BR ro ru sv te tr uk ur ur_PK zh_CN
35	${WRKSRC}/src/Makefile.in
36		32
37	pre-install:	33	post-build:
38	# workaround to problem in po makefile
39	.for p in ${POFILES}	34	.for p in ${POFILES}
40	${MSGFMT} -c ${WRKSRC}/po/$p.po -o ${WRKSRC}/po/$p.mo	35	(cd ${WRKSRC}/po && ${LOCALBASE}/bin/msgfmt -c ${p}.po -o ${p}.mo)
41	.endfor	36	.endfor
42		37
43	.include <bsd.port.mk>	38	.include <bsd.port.mk>

Lines 1-48 Link Here

(-)deskutils/osmo/files/patch-src__check_events.c (-48 lines)
1	--- src/check_events.c.orig 2011-08-12 15:17:59.000000000 +0200
2	+++ src/check_events.c 2011-08-12 15:20:36.000000000 +0200
3	@@ -454,9 +454,9 @@
4	a->date = 0;
5
6	if (textdesc != NULL)
7	- a->notify = notify_notification_new (item->summary, textdesc, GTK_STOCK_DIALOG_WARNING, NULL);
8	+ a->notify = notify_notification_new (item->summary, textdesc, GTK_STOCK_DIALOG_WARNING);
9	else
10	- a->notify = notify_notification_new (item->summary, text, GTK_STOCK_DIALOG_WARNING, NULL);
11	+ a->notify = notify_notification_new (item->summary, text, GTK_STOCK_DIALOG_WARNING);
12
13	g_free (textdesc);
14	g_free (text);
15	@@ -483,9 +483,7 @@
16	#endif /* HAVE_LIBNOTIFY */
17
18	if (gtk_status_icon_get_visible (appGUI->osmo_trayicon)) {
19	-#ifdef HAVE_LIBNOTIFY
20	- notify_notification_attach_to_status_icon (a->notify, appGUI->osmo_trayicon);
21	-#endif /* HAVE_LIBNOTIFY */
22	+
23	gtk_status_icon_set_from_stock (appGUI->osmo_trayicon, OSMO_STOCK_SYSTRAY_TASK);
24
25	if (config.blink_on_events) {
26	@@ -532,9 +530,9 @@
27	a->time = -1;
28	a->date = 0;
29	if (textdesc != NULL)
30	- a->notify = notify_notification_new (_("Alarm warning!"), textdesc, GTK_STOCK_DIALOG_INFO, NULL);
31	+ a->notify = notify_notification_new (_("Alarm warning!"), textdesc, GTK_STOCK_DIALOG_INFO);
32	else
33	- a->notify = notify_notification_new (_("Alarm warning!"), text, GTK_STOCK_DIALOG_INFO, NULL);
34	+ a->notify = notify_notification_new (_("Alarm warning!"), text, GTK_STOCK_DIALOG_INFO);
35
36	notify_notification_set_timeout (a->notify, NOTIFY_EXPIRES_NEVER);
37	notify_notification_set_urgency (a->notify, NOTIFY_URGENCY_NORMAL);
38	@@ -545,9 +543,7 @@
39	#endif /* HAVE_LIBNOTIFY */
40
41	if (gtk_status_icon_get_visible (appGUI->osmo_trayicon)) {
42	-#ifdef HAVE_LIBNOTIFY
43	- notify_notification_attach_to_status_icon (a->notify, appGUI->osmo_trayicon);
44	-#endif /* HAVE_LIBNOTIFY */
45	+
46	gtk_status_icon_set_from_stock (appGUI->osmo_trayicon, OSMO_STOCK_SYSTRAY_TASK);
47
48	if (config.blink_on_events) {