Update to evolution-plugin-rss-0.2.90 (git made tarball, with some local

patches). This unbreaks runtime now.
This commit is contained in:
ajacoutot 2011-04-22 14:13:56 +00:00
parent 62b5480b14
commit e232d4558b
5 changed files with 48 additions and 87 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.27 2011/04/06 21:03:33 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.28 2011/04/22 14:13:56 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= RSS-reader plugin for GNOME
GNOME_PROJECT= evolution-rss
GNOME_VERSION= 0.2.3
GNOME_VERSION= 0.2.90
PKGNAME= evolution-plugin-rss-${GNOME_VERSION}
CATEGORIES= mail
@ -24,16 +24,21 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += ORBit-2 c dbus-1 dbus-glib-1 gcrypt gio-2.0 glib-2.0
WANTLIB += gmodule-2.0 gnome-keyring gobject-2.0 gpg-error
WANTLIB += gthread-2.0 m pcre pthread soup-2.4 soup-gnome-2.4
WANTLIB += sqlite3 stdc++ 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
WANTLIB += GL ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage
WANTLIB += Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm
WANTLIB += asn1 atk-1.0 c cairo camel-1.2 camel-provider-1.2 com_err
WANTLIB += crypto dbus-1 dbus-glib-1 drm ebook-1.2 edataserver-1.2
WANTLIB += edataserverui-1.2 enchant execinfo expat fontconfig
WANTLIB += freetype gailutil gcrypt gdk-x11-2.0 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gnome-desktop-2 gnome-keyring
WANTLIB += gobject-2.0 gpg-error gssapi gthread-2.0 gtk-x11-2.0
WANTLIB += gtkhtml-3.14 gtkhtml-editor-3.14 krb5 m nspr4 nss3
WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
WANTLIB += plc4 plds4 png pthread pthread-stubs smime3 soup-2.4
WANTLIB += soup-gnome-2.4 sqlite3 ssl3 startup-notification-1
WANTLIB += stdc++ unique-1.0 xcb xcb-atom xcb-aux xcb-event xcb-render
WANTLIB += xcb-shm xml2 z lib/evolution/${EVO_VERSION}/eshell
WANTLIB += lib/evolution/${EVO_VERSION}/eutil
MASTER_SITES= http://gnome.eu.org/
EXTRACT_SUFX= .tar.gz
@ -42,9 +47,8 @@ MODULES= devel/gettext \
x11/gnome \
devel/gconf2
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= mail/evolution>=2.32.0
LIB_DEPENDS= devel/libsoup,-gnome
LIB_DEPENDS= devel/libsoup,-gnome \
mail/evolution
MODGCONF2_LIBDEP= Yes
MODGCONF2_SCHEMAS_DIR= evolution-rss
@ -60,6 +64,26 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
FAKE_FLAGS+= itlocaledir="${PREFIX}/share/locale/"
# XXX remove this chunk when updating to a 'real' release
# (using a homemade tarball with patches from upstream git and local changes)
MASTER_SITES= http://distfiles.bsdfrog.org/
BUILD_DEPENDS += x11/gnome/common \
${MODGNU_AUTOMAKE_DEPENDS} \
${MODGNU_AUTOCONF_DEPENDS}
USE_LIBTOOL= gnu
CONFIGURE_STYLE= # empty
do-configure:
perl -pi -e 's,sed -i -e,perl -pi -e,g' ${WRKSRC}/src/Makefile.am
echo AC_PROG_LIBTOOL >> ${WRKSRC}/configure.ac
@cd ${WRKSRC} && \
AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
CONFIGURE_ENV=${CONFIGURE_ENV} \
./autogen.sh ${CONFIGURE_ARGS} --disable-maintainer-mode
# end XXX
pre-configure:
perl -pi -e 's,sed -i -e,perl -pi -e,g' ${WRKSRC}/src/Makefile.in

View File

@ -1,5 +1,5 @@
MD5 (evolution-rss-0.2.3.tar.gz) = u/glw2VerrrcQpFBqPQI0A==
RMD160 (evolution-rss-0.2.3.tar.gz) = Npd3eog+ODgMa1PAytXSps2h8mQ=
SHA1 (evolution-rss-0.2.3.tar.gz) = KW03eqYlmA213FtNNM/2bq50MC8=
SHA256 (evolution-rss-0.2.3.tar.gz) = q+DsxOZdqZpx1o1qR9HfKbR/nZg+ilTI1uj31haVyTc=
SIZE (evolution-rss-0.2.3.tar.gz) = 689624
MD5 (evolution-rss-0.2.90.tar.gz) = P8KbNB45uzY+bjacPjKH2g==
RMD160 (evolution-rss-0.2.90.tar.gz) = m0vnPerGYD9jfmE593yksjEVvOU=
SHA1 (evolution-rss-0.2.90.tar.gz) = F9chzvNEhE4QM4BA6un4a7Bn5A4=
SHA256 (evolution-rss-0.2.90.tar.gz) = mX6L4b3IGtvSS5mbMG/8s7DSfu6efnN9Lh79faJlvtc=
SIZE (evolution-rss-0.2.90.tar.gz) = 313521

View File

@ -1,24 +0,0 @@
$OpenBSD: patch-src_rss-config-factory_c,v 1.5 2011/03/07 19:40:44 ajacoutot Exp $
GtkFunction -> GSourceFunc: fix build with newer glib2/gtk+2
--- src/rss-config-factory.c.orig Wed Feb 2 08:16:25 2011
+++ src/rss-config-factory.c Wed Feb 2 08:16:32 2011
@@ -271,7 +271,7 @@ rep_check_cb (GtkWidget *widget, gpointer data)
g_source_remove(rf->rc_id);
rf->rc_id = g_timeout_add (
60 * 1000 * gtk_spin_button_get_value((GtkSpinButton *)data),
- (GtkFunction) update_articles,
+ (GSourceFunc) update_articles,
(gpointer)1);
}
}
@@ -290,7 +290,7 @@ rep_check_timeout_cb (GtkWidget *widget, gpointer data
g_source_remove(rf->rc_id);
rf->rc_id = g_timeout_add (
60 * 1000 * gtk_spin_button_get_value((GtkSpinButton *)widget),
- (GtkFunction) update_articles,
+ (GSourceFunc) update_articles,
(gpointer)1);
}
}

View File

@ -1,42 +0,0 @@
$OpenBSD: patch-src_rss_c,v 1.9 2011/04/06 21:03:33 ajacoutot Exp $
GtkFunction -> GSourceFunc: fix build with newer glib2/gtk+2
--- src/rss.c.orig Sat Jan 29 15:00:49 2011
+++ src/rss.c Wed Apr 6 22:46:02 2011
@@ -877,7 +877,7 @@ network_timeout(void)
nettime_id = g_timeout_add (
(guint)(timeout)*1000,
- (GtkFunction) timeout_soup,
+ (GSourceFunc) timeout_soup,
0);
}
@@ -4404,7 +4404,7 @@ custom_fetch_feed(gpointer key, gpointer value, gpoint
}
time_id = g_timeout_add (
ttl * 60 * 1000 * ttl_multiply,
- (GtkFunction) custom_update_articles,
+ (GSourceFunc) custom_update_articles,
cdata);
g_hash_table_replace(custom_timeout,
g_strdup(lookup_key(key)),
@@ -4614,7 +4614,7 @@ void org_gnome_cooly_rss_startup(void *ep, ESEventTarg
//as I don't know how to set this I'll setup a 10 secs timeout
//and return false for disableation
g_timeout_add (3 * 1000,
- (GtkFunction) update_articles,
+ (GSourceFunc) update_articles,
0);
}
timeout = gconf_client_get_float(
@@ -4623,7 +4623,7 @@ void org_gnome_cooly_rss_startup(void *ep, ESEventTarg
NULL);
if (gconf_client_get_bool (rss_gconf, GCONF_KEY_REP_CHECK, NULL)) {
rf->rc_id = g_timeout_add (60 * 1000 * timeout,
- (GtkFunction) update_articles,
+ (GSourceFunc) update_articles,
(gpointer)1);
}
custom_feed_timeout();

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.9 2010/09/30 16:13:32 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.10 2011/04/22 14:13:56 ajacoutot Exp $
@bin bin/evolution-import-rss
@comment lib/evolution/${EVO_VERSION}/plugins/liborg-gnome-evolution-rss.a
@comment lib/evolution/${EVO_VERSION}/plugins/liborg-gnome-evolution-rss.la
@ -19,7 +19,10 @@ share/evolution/${EVO_VERSION}/ui/rss-html-rendering.ui
share/evolution/${EVO_VERSION}/ui/rss-main.ui
share/locale/as/LC_MESSAGES/evolution-rss.mo
share/locale/bn_IN/LC_MESSAGES/evolution-rss.mo
share/locale/ca/LC_MESSAGES/evolution-rss.mo
share/locale/ca@valencia/LC_MESSAGES/evolution-rss.mo
share/locale/cs/LC_MESSAGES/evolution-rss.mo
share/locale/da/LC_MESSAGES/evolution-rss.mo
share/locale/de/LC_MESSAGES/evolution-rss.mo
share/locale/el/LC_MESSAGES/evolution-rss.mo
share/locale/en_AU/LC_MESSAGES/evolution-rss.mo