On Wed, Feb 01, 2012 at 11:41:00PM +0100, viq wrote: > Yes, I know we're in lock,
Not anymore, ping. > but someone may find it interesting, as this > version claims support of Google Reader and TinyTinyRSS. That I didn't > try, but normal operation works well for me from what I tried. > > Apply with -E as patches were removed. > -- > viq > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/www/liferea/Makefile,v > retrieving revision 1.47 > diff -u -d -r1.47 Makefile > --- Makefile 3 Dec 2011 18:35:11 -0000 1.47 > +++ Makefile 1 Feb 2012 22:38:44 -0000 > @@ -4,11 +4,9 @@ > > COMMENT= simple GTK desktop news aggregator > > -DISTNAME= liferea-1.6.5 > +DISTNAME= liferea-1.8.0 > CATEGORIES= www x11 > > -REVISION= 7 > - > HOMEPAGE= http://liferea.sourceforge.net/ > > MAINTAINER= Wiktor Izdebski <[email protected]> > @@ -23,12 +21,12 @@ > WANTLIB += Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender Xt Xxf86vm > WANTLIB += atk-1.0 c cairo dbus-1 dbus-glib-1 drm enchant expat > WANTLIB += fontconfig freetype gailutil gdk-x11-2.0 gdk_pixbuf-2.0 > -WANTLIB += gio-2.0 glade-2.0 glib-2.0 gmodule-2.0 gobject-2.0 > +WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 > WANTLIB += gstapp-0.10 gstbase-0.10 gstpbutils-0.10 gstreamer-0.10 > WANTLIB += gstvideo-0.10 gthread-2.0 gtk-x11-2.0 icudata icui18n > -WANTLIB += icuuc jpeg lua m notify pango-1.0 pangocairo-1.0 pangoft2-1.0 > +WANTLIB += icuuc jpeg json-glib-1.0 m notify pango-1.0 pangocairo-1.0 > pangoft2-1.0 > WANTLIB += pcre pixman-1 png pthread pthread-stubs soup-2.4 sqlite3 > -WANTLIB += stdc++ webkitgtk-1.0 xcb xcb-render xcb-shm xml2 xslt > +WANTLIB += stdc++ unique-1.0 webkitgtk-1.0 xcb xcb-render xcb-shm xml2 xslt > WANTLIB += z gstinterfaces-0.10 ffi javascriptcoregtk-1.0 > > MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=liferea/} > @@ -36,16 +34,19 @@ > MODULES= devel/gettext \ > textproc/intltool \ > devel/gconf2 > -LIB_DEPENDS= lang/lua \ > - devel/libnotify>=0.7.2 \ > +LIB_DEPENDS= devel/libnotify>=0.7.2 \ > textproc/libxslt \ > devel/libglade2 \ > devel/libsoup,-main \ > + devel/libunique \ > + devel/json-glib \ > + databases/sqlite3 \ > textproc/enchant \ > www/webkit>=1.6.1v0 > > RUN_DEPENDS= devel/desktop-file-utils \ > - x11/gtk+2,-guic > + x11/gtk+2,-guic \ > + x11/hicolor-icon-theme > > FAKE_FLAGS= htmldocdir="${PREFIX}/share/doc/liferea/html" > > @@ -56,9 +57,7 @@ > CONFIGURE_STYLE= gnu > CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ > --docdir=${PREFIX}/share/doc/liferea \ > - --enable-dbus \ > - --enable-libnotify \ > - --enable-lua > + --enable-libnotify > CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ > LDFLAGS="-L${LOCALBASE}/lib" > > Index: distinfo > =================================================================== > RCS file: /cvs/ports/www/liferea/distinfo,v > retrieving revision 1.18 > diff -u -d -r1.18 distinfo > --- distinfo 7 Apr 2011 12:07:02 -0000 1.18 > +++ distinfo 1 Feb 2012 22:38:44 -0000 > @@ -1,5 +1,5 @@ > -MD5 (liferea-1.6.5.tar.gz) = taLAgD7sXQr/C5ykEU6vFg== > -RMD160 (liferea-1.6.5.tar.gz) = d7OEWVp1eYOrnT+O2R2CRiiZFnA= > -SHA1 (liferea-1.6.5.tar.gz) = 8k29DoHFqDCfDRmFMhH8Av+BhHc= > -SHA256 (liferea-1.6.5.tar.gz) = OllL2Ky9y8I29inyvuY/+6DdzDj7QG+LqJYpljqHfr0= > -SIZE (liferea-1.6.5.tar.gz) = 1784724 > +MD5 (liferea-1.8.0.tar.gz) = YxPjBJtYa+EQyUApAGCf4A== > +RMD160 (liferea-1.8.0.tar.gz) = 0zIsGAe7/r2WOHRkv5OFRarJqd8= > +SHA1 (liferea-1.8.0.tar.gz) = tzHnASgTBHggfpBZ/J7DOufZU1g= > +SHA256 (liferea-1.8.0.tar.gz) = C19K+gz1ubk85eBpdHZGtnTuQU5uDmN9l1wJrPeY7jc= > +SIZE (liferea-1.8.0.tar.gz) = 1870394 > Index: patches/patch-src_notification_libnotify_c > =================================================================== > RCS file: patches/patch-src_notification_libnotify_c > diff -N patches/patch-src_notification_libnotify_c > --- patches/patch-src_notification_libnotify_c 21 Apr 2011 07:06:43 > -0000 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,25 +0,0 @@ > -$OpenBSD: patch-src_notification_libnotify_c,v 1.1 2011/04/21 07:06:43 > ajacoutot Exp $ > - > -Fix with libnotify>=0.7 > -(notify_notification_new has lost its widget argument) > - > ---- src/notification/libnotify.c.orig Tue Apr 19 14:46:12 2011 > -+++ src/notification/libnotify.c Tue Apr 19 14:46:23 2011 > -@@ -150,7 +150,7 @@ static void notif_libnotify_callback_show_details ( No > - // notify_notification_update ( n, node_get_title(node_p), > labelText_now_p, NULL); > - // notify_notification_clear_actions(n); > - > -- n = notify_notification_new (node_get_title(node_p), > labelText_now_p, NULL, NULL); > -+ n = notify_notification_new (node_get_title(node_p), > labelText_now_p, NULL); > - > - notify_notification_set_icon_from_pixbuf > (n,node_get_icon(node_p)); > - > -@@ -244,7 +244,7 @@ notif_libnotify_node_has_new_items (nodePtr node, gboo > - > - labelSummary_p = g_strdup_printf (ngettext ("%s has %d new / updated > headline\n", "%s has %d new / updated headlines\n", item_count), > - node_get_title (node), item_count); > -- n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL, > NULL); > -+ n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL); > - g_free(labelSummary_p); > - > - notify_notification_set_icon_from_pixbuf (n, node_get_icon (node)); > Index: patches/patch-src_ui_liferea_shell_c > =================================================================== > RCS file: /cvs/ports/www/liferea/patches/patch-src_ui_liferea_shell_c,v > retrieving revision 1.2 > diff -u -d -r1.2 patch-src_ui_liferea_shell_c > --- patches/patch-src_ui_liferea_shell_c 7 Apr 2011 12:07:02 -0000 > 1.2 > +++ patches/patch-src_ui_liferea_shell_c 1 Feb 2012 22:38:44 -0000 > @@ -1,30 +1,12 @@ > -$OpenBSD: patch-src_ui_liferea_shell_c,v 1.2 2011/04/07 12:07:02 pea Exp $ > ---- src/ui/liferea_shell.c.orig Sun Sep 26 05:13:15 2010 > -+++ src/ui/liferea_shell.c Wed Mar 23 10:53:57 2011 > -@@ -682,7 +682,7 @@ on_about_activate (GtkMenuItem *menuitem, gpointer use > - static void > - on_topics_activate (GtkMenuItem *menuitem, gpointer user_data) > - { > -- gchar *filename = g_strdup_printf ("file://" PACKAGE_DATA_DIR "/" > PACKAGE "/doc/html/%s", _("topics_en.html")); > -+ gchar *filename = g_strdup_printf ("file://" PACKAGE_DATA_DIR "/doc/" > PACKAGE "/html/%s", _("topics_en.html")); > - browser_tabs_add_new (filename, _("Help Topics"), TRUE); > - g_free (filename); > - } > -@@ -690,7 +690,7 @@ on_topics_activate (GtkMenuItem *menuitem, gpointer us > - static void > - on_quick_reference_activate (GtkMenuItem *menuitem, gpointer user_data) > - { > -- gchar *filename = g_strdup_printf ("file://" PACKAGE_DATA_DIR "/" > PACKAGE "/doc/html/%s", _("reference_en.html")); > -+ gchar *filename = g_strdup_printf ("file://" PACKAGE_DATA_DIR "/doc/" > PACKAGE "/html/%s", _("reference_en.html")); > - browser_tabs_add_new (filename, _("Quick Reference"), TRUE); > - g_free (filename); > - } > -@@ -698,7 +698,7 @@ on_quick_reference_activate (GtkMenuItem *menuitem, gp > +$OpenBSD$ > +--- src/ui/liferea_shell.c.orig Tue Sep 6 00:27:11 2011 > ++++ src/ui/liferea_shell.c Tue Sep 6 00:28:34 2011 > +@@ -670,7 +670,7 @@ on_about_activate (GtkMenuItem *menuitem, gpointer use > static void > - on_faq_activate (GtkMenuItem *menuitem, gpointer user_data) > + liferea_shell_add_html_tab (const gchar *file, const gchar *name) > { > -- gchar *filename = g_strdup_printf ("file://" PACKAGE_DATA_DIR "/" > PACKAGE "/doc/html/%s", _("faq_en.html")); > -+ gchar *filename = g_strdup_printf ("file://" PACKAGE_DATA_DIR "/doc/" > PACKAGE "/html/%s", _("faq_en.html")); > - browser_tabs_add_new (filename, _("FAQ"), TRUE); > - g_free (filename); > - } > +- gchar *filepattern = g_strdup_printf (PACKAGE_DATA_DIR "/" PACKAGE > "/doc/html/%s", file); > ++ gchar *filepattern = g_strdup_printf (PACKAGE_DATA_DIR "/doc/" PACKAGE > "/html/%s", file); > + gchar *filename = common_get_localized_filename (filepattern); > + gchar *fileuri = g_strdup_printf ("file://%s", filename); > + > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/www/liferea/pkg/PLIST,v > retrieving revision 1.14 > diff -u -d -r1.14 PLIST > --- pkg/PLIST 3 Dec 2011 18:35:11 -0000 1.14 > +++ pkg/PLIST 1 Feb 2012 22:38:44 -0000 > @@ -1,13 +1,6 @@ > @comment $OpenBSD: PLIST,v 1.14 2011/12/03 18:35:11 ajacoutot Exp $ > @bin bin/liferea > bin/liferea-add-feed > -lib/liferea/ > -lib/liferea/liblinotiflibnotify.a > -lib/liferea/liblinotiflibnotify.la > -lib/liferea/liblinotiflibnotify.so > -lib/liferea/libliscrlua.a > -lib/liferea/libliscrlua.la > -lib/liferea/libliscrlua.so > @man man/man1/liferea.1 > man/pl/ > man/pl/man1/ > @@ -72,26 +65,28 @@ > share/icons/hicolor/48x48/apps/liferea.png > share/icons/hicolor/scalable/apps/liferea.svg > share/liferea/ > -share/liferea/auth.glade > -share/liferea/bloglines_source.glade > +share/liferea/auth.ui > share/liferea/css/ > share/liferea/css/adblock.css > share/liferea/css/liferea.css > +share/liferea/css/user.css > share/liferea/dtd/ > share/liferea/dtd/html.ent > -share/liferea/google_source.glade > -share/liferea/liferea.glade > -share/liferea/new_subscription.glade > -share/liferea/node_source.glade > +share/liferea/google_source.ui > +share/liferea/liferea.ui > +share/liferea/new_subscription.ui > +share/liferea/node_source.ui > share/liferea/opml/ > -share/liferea/opml/feedlist.opml > share/liferea/opml/feedlist_bg.opml > share/liferea/opml/feedlist_ca.opml > share/liferea/opml/feedlist_de.opml > +share/liferea/opml/feedlist_en.opml > share/liferea/opml/feedlist_es.opml > share/liferea/opml/feedlist_eu.opml > share/liferea/opml/feedlist_fr.opml > share/liferea/opml/feedlist_gl.opml > +share/liferea/opml/feedlist_he.opml > +share/liferea/opml/feedlist_hu.opml > share/liferea/opml/feedlist_it.opml > share/liferea/opml/feedlist_nl.opml > share/liferea/opml/feedlist_pl.opml > @@ -100,9 +95,8 @@ > share/liferea/opml/feedlist_ru.opml > share/liferea/opml/feedlist_sk.opml > share/liferea/opml/feedlist_sv.opml > -share/liferea/opml_source.glade > +share/liferea/opml_source.ui > share/liferea/pixmaps/ > -share/liferea/pixmaps/arrow.png > share/liferea/pixmaps/attachment.png > share/liferea/pixmaps/available.png > share/liferea/pixmaps/available_offline.png > @@ -110,41 +104,29 @@ > share/liferea/pixmaps/comments.png > share/liferea/pixmaps/default.png > share/liferea/pixmaps/directory.png > -share/liferea/pixmaps/edit.png > share/liferea/pixmaps/empty.png > share/liferea/pixmaps/empty_offline.png > -share/liferea/pixmaps/fl_bloglines.png > -share/liferea/pixmaps/fl_google.png > share/liferea/pixmaps/fl_opml.png > share/liferea/pixmaps/flag.png > -share/liferea/pixmaps/folder_empty.png > share/liferea/pixmaps/grayflag.png > share/liferea/pixmaps/newsbin.png > -share/liferea/pixmaps/read.xpm > -share/liferea/pixmaps/tag.png > -share/liferea/pixmaps/technorati.png > share/liferea/pixmaps/unread.png > share/liferea/pixmaps/vfolder.png > -share/liferea/simple_subscription.glade > +share/liferea/simple_subscription.ui > +share/liferea/ttrss_source.ui > share/liferea/xslt/ > share/liferea/xslt/feed.xml > -share/liferea/xslt/feed.xml.in > share/liferea/xslt/folder.xml > -share/liferea/xslt/folder.xml.in > share/liferea/xslt/i18n-filter.xslt > share/liferea/xslt/item.xml > -share/liferea/xslt/item.xml.in > share/liferea/xslt/newsbin.xml > -share/liferea/xslt/newsbin.xml.in > share/liferea/xslt/source.xml > -share/liferea/xslt/source.xml.in > share/liferea/xslt/vfolder.xml > -share/liferea/xslt/vfolder.xml.in > @unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` > %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > > /dev/null > -${SCHEMAS_INSTDIR}/ > -${SCHEMAS_INSTDIR}/liferea.schemas > @exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` > %D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas > > /dev/null > @exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || > true > @unexec-delete %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor > 2>/dev/null || true > @exec %D/bin/update-desktop-database > @unexec-delete %D/bin/update-desktop-database > +${SCHEMAS_INSTDIR}/ > +${SCHEMAS_INSTDIR}/liferea.schemas -- viq
pgpLatJeRl1jF.pgp
Description: PGP signature
