Update to evolution-plugin-rss-0.2.2.

This commit is contained in:
ajacoutot 2010-12-29 19:50:46 +00:00
parent 1649d52d71
commit 38c7253ef8
5 changed files with 52 additions and 43 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.23 2010/11/19 07:23:06 espie Exp $
# $OpenBSD: Makefile,v 1.24 2010/12/29 19:50:46 ajacoutot Exp $
SHARED_ONLY= Yes
@ -6,11 +6,12 @@ COMMENT= RSS-reader plugin for GNOME
GNOME_PROJECT= evolution-rss
GNOME_VERSION= 0.2.0
PKGNAME= evolution-plugin-rss-${GNOME_VERSION}
PKGNAME= evolution-plugin-rss-0.2.2
# XXX merged and tweaked from upstream
# from upstream git
MASTER_SITES0= http://www.bsdfrog.org/OpenBSD/distfiles/
PATCHFILES= ep-rss-20101001.diff:0
PATCHFILES= ep-rss-EVOLUTION_RSS_0_2_2_CORRECTED.diff:0
PATCH_DIST_STRIP= -p1
CATEGORIES= mail
@ -32,6 +33,12 @@ WANTLIB += ORBit-2 c dbus-1 dbus-glib-1 gcrypt gio-2.0 glib-2.0
WANTLIB += gmodule-2.0 gnome-keyring gnutls gobject-2.0 gpg-error
WANTLIB += gthread-2.0 m pcre proxy pthread soup-2.4 soup-gnome-2.4
WANTLIB += sqlite3 stdc++ tasn1 xml2 z
WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 cairo drm
WANTLIB += enchant expat fontconfig freetype gailutil gdk-x11-2.0
WANTLIB += gdk_pixbuf-2.0 gtk-x11-2.0 gtkhtml-3.14 gtkhtml-editor-3.14
WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png
WANTLIB += pthread-stubs xcb xcb-render xcb-shm
MASTER_SITES= http://gnome.eu.org/
EXTRACT_SUFX= .tar.gz
@ -47,7 +54,10 @@ LIB_DEPENDS= devel/libsoup,-gnome
MODGCONF2_LIBDEP= Yes
MODGCONF2_SCHEMAS_DIR= evolution-rss
CONFIGURE_STYLE= gnu
AUTOCONF_VERSION= 2.62
AUTOMAKE_VERSION= 1.9
CONFIGURE_STYLE= autoconf automake
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--disable-gecko \
--disable-webkit \
@ -55,4 +65,7 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
pre-configure:
perl -pi -e 's,sed -i -e,perl -pi -e,g' ${WRKSRC}/src/Makefile.in
.include <bsd.port.mk>

View File

@ -1,10 +1,10 @@
MD5 (ep-rss-20101001.diff) = eDRMpPs/oLT9R+RCyz8AXw==
MD5 (ep-rss-EVOLUTION_RSS_0_2_2_CORRECTED.diff) = 1eH1oWLY1n11Tkcp//4IUg==
MD5 (evolution-rss-0.2.0.tar.gz) = jVuhzOUIHcd35pqDaVp5Yg==
RMD160 (ep-rss-20101001.diff) = HCzPesTEhnOFDHt2z8MWctM3Ino=
RMD160 (ep-rss-EVOLUTION_RSS_0_2_2_CORRECTED.diff) = w2qhS/DC/gMWO4CLbCtetfWFPA8=
RMD160 (evolution-rss-0.2.0.tar.gz) = O9Dq8bA614tAf5BQzGqY41xogq0=
SHA1 (ep-rss-20101001.diff) = SKfvjkbhPgCqfBMKDmUvLF0Ocvk=
SHA1 (ep-rss-EVOLUTION_RSS_0_2_2_CORRECTED.diff) = Hpi07nvvWfYJdos46NlkpuC6Eic=
SHA1 (evolution-rss-0.2.0.tar.gz) = ii7crMdJgyLpGBbg6uc2oR2LC00=
SHA256 (ep-rss-20101001.diff) = qihKT2lmgF8DhO81q+jG4w6v1RDq7ykssFTerTkfOGc=
SHA256 (ep-rss-EVOLUTION_RSS_0_2_2_CORRECTED.diff) = W65aoDY3V3/b+1tvOVkXzP9sNZKM96qj4dBYh604/KQ=
SHA256 (evolution-rss-0.2.0.tar.gz) = H4ppDpclulwJzla1m+6kyRygAI+We3cPJBXCXlEsPr8=
SIZE (ep-rss-20101001.diff) = 54465
SIZE (ep-rss-EVOLUTION_RSS_0_2_2_CORRECTED.diff) = 40391
SIZE (evolution-rss-0.2.0.tar.gz) = 662994

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-configure,v 1.7 2010/10/01 13:42:57 ajacoutot Exp $
XXX make it compile with gtk+2 2.22 (*_DISABLE_DEPRECATED)
--- configure.orig Wed Jul 21 06:57:38 2010
+++ configure Thu Sep 30 17:40:56 2010
@@ -4250,7 +4250,6 @@ fi
-DPANGO_DISABLE_DEPRECATED
-DGDK_PIXBUF_DISABLE_DEPRECATED
-DGDK_DISABLE_DEPRECATED
- -DGTK_DISABLE_DEPRECATED
-DG_DISABLE_SINGLE_INCLUDES
-DGTK_DISABLE_SINGLE_INCLUDES
-Wall -Wextra

View File

@ -1,19 +0,0 @@
$OpenBSD: patch-src_Makefile_in,v 1.6 2010/09/30 16:13:32 ajacoutot Exp $
--- src/Makefile.in.orig Thu Sep 30 17:43:10 2010
+++ src/Makefile.in Thu Sep 30 17:43:42 2010
@@ -1017,11 +1017,11 @@ uninstall-am: uninstall-binPROGRAMS uninstall-errorDAT
$< > $@
%.schemas.in: %.schemas.in.in
sed -e "s#\@bindir\@#@bindir@#g" $< > $@
-@HAVE_BONOBO_TRUE@ sed -i -e 's!^src\/GNOME_Evolution_RSS.server.in.in!!g' $(top_srcdir)/po/POTFILES.skip
-@HAVE_BONOBO_TRUE@ sed -i -e 's!^#src\/GNOME_Evolution_RSS.server.in.in!!g' $(top_srcdir)/po/POTFILES.in
+@HAVE_BONOBO_TRUE@ perl -p -i -e 's!^src\/GNOME_Evolution_RSS.server.in.in!!g' $(top_srcdir)/po/POTFILES.skip
+@HAVE_BONOBO_TRUE@ perl -p -i -e 's!^#src\/GNOME_Evolution_RSS.server.in.in!!g' $(top_srcdir)/po/POTFILES.in
@HAVE_BONOBO_TRUE@ echo 'src/GNOME_Evolution_RSS.server.in.in' >> $(top_srcdir)/po/POTFILES.in
-@HAVE_BONOBO_FALSE@ sed -i -e 's!^#src\/GNOME_Evolution_RSS.server.in.in!!g' $(top_srcdir)/po/POTFILES.in
-@HAVE_BONOBO_FALSE@ sed -i -e 's!^src\/GNOME_Evolution_RSS.server.in.in!!g' $(top_srcdir)/po/POTFILES.in
+@HAVE_BONOBO_FALSE@ perl -p -i -e 's!^#src\/GNOME_Evolution_RSS.server.in.in!!g' $(top_srcdir)/po/POTFILES.in
+@HAVE_BONOBO_FALSE@ perl -p -i -e 's!^src\/GNOME_Evolution_RSS.server.in.in!!g' $(top_srcdir)/po/POTFILES.in
@HAVE_BONOBO_FALSE@ echo 'src/GNOME_Evolution_RSS.server.in.in' >> $(top_srcdir)/po/POTFILES.skip
@EVO_SERVER_RULE@

View File

@ -0,0 +1,29 @@
$OpenBSD: patch-src_rss_c,v 1.7 2010/12/29 19:50:46 ajacoutot Exp $
--- src/rss.c.orig Wed Dec 29 18:05:09 2010
+++ src/rss.c Wed Dec 29 18:06:39 2010
@@ -1476,6 +1476,7 @@ webkit_click (GtkEntry *entry,
return TRUE;
}
+#ifdef HAVE_WEBKIT
void webkit_hook_actions(void);
void
@@ -1505,6 +1506,7 @@ webkit_hook_actions(void)
G_CALLBACK (embed_zoom_100_cb), NULL);
#endif
}
+#endif
#if 0
#if EVOLUTION_VERSION >= 22900
@@ -5055,7 +5057,9 @@ e_plugin_ui_init (GtkUIManager *ui_manager,
rss_shell_view);
#if EVOLUTION_VERSION >= 22900
/* rss_search_bar_hook();*/
+#ifdef HAVE_WEBKIT
webkit_hook_actions();
+#endif
#endif
return TRUE;
}