cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to liferea 1.6.0, switches from xulrunner to webkit for

Browse Source 
rendering. Diff from Aaron Stellman (thanks!) with some tweaks by me,
tested by & looks good to MAINTAINER.
This commit is contained in:
landry 2009-11-26 12:48:10 +00:00
parent 37cb4113df
commit 86ec40daed
6 changed files with 82 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
www/liferea/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.30 2009/11/24 09:01:47 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.31 2009/11/26 12:48:10 landry Exp $
SHARED_ONLY= Yes
COMMENT= simple GTK desktop news aggregator
DISTNAME= liferea-1.4.19
PKGNAME= ${DISTNAME}p7
DISTNAME= liferea-1.6.0
CATEGORIES= www x11
HOMEPAGE= http://liferea.sourceforge.net/
@ -19,38 +18,33 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp \
Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo \
dbus-1 expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 \
glib-2.0 glitz gmodule-2.0 gobject-2.0 gthread-2.0 \
gtk-x11-2.0 m nspr4 pango-1.0 pangocairo-1.0 pangoft2-1.0 \
pcre pixman-1 plc4 plds4 png pthread pthread-stubs xcb xml2 z \
gio-2.0 tasn1
Xext Xfixes Xi Xinerama Xrandr Xrender Xt atk-1.0 c \
cairo dbus-1 dbus-glib-1 expat fontconfig freetype \
gailutil gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 \
glitz gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0 \
jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 \
png pthread pthread-stubs stdc++ xcb xml2 z gcrypt gpg-error \
tasn1 sqlite3 icudata icui18n icuuc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=liferea/}
MODULES= devel/gettext \
textproc/intltool \
devel/gconf2
BUILD_DEPENDS= :xulrunner-devel->=1.8,<1.9:devel/xulrunner/1.8,-devel
LIB_DEPENDS= xulrunner/gtkembedmoz,xulrunner/xpcom:xulrunner->=1.8,<1.9:devel/xulrunner/1.8,-main \
notify.>=2::devel/libnotify \
LIB_DEPENDS= gnutls.>=12::security/gnutls \
lua.>=5::lang/lua \
notify.>=2::devel/libnotify \
xslt.>=3.3::textproc/libxslt \
dbus-glib-1::x11/dbus-glib \
gnutls.>=12::security/gnutls \
gcrypt.>=12::security/libgcrypt \
gpg-error.>=1::security/libgpg-error \
sqlite3::databases/sqlite3 \
glade-2.0.::devel/libglade2
glade-2.0.::devel/libglade2 \
soup-2.4::devel/libsoup,-main \
enchant.>=6::textproc/enchant \
webkit-1.0::www/webkit
RUN_DEPENDS= ::devel/desktop-file-utils \
::x11/hicolor-icon-theme
FAKE_FLAGS= htmldocdir="${PREFIX}/share/doc/liferea/html"
CFLAGS+= -I${LOCALBASE}/xulrunner/include/webbrwsr/ \
-I${LOCALBASE}/xulrunner/include/dom/ \
-I${LOCALBASE}/xulrunner/include/pref/ \
-I${LOCALBASE}/xulrunner/include/necko/
USE_X11= Yes
USE_LIBTOOL= Yes
@ -60,16 +54,9 @@ CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--docdir=${PREFIX}/share/doc/liferea \
--enable-dbus \
--disable-gecko \
--disable-gtkhtml2 \
--disable-webkit \
--enable-xulrunner \
--enable-gnutls \
--with-gnutls-libs=${LOCALBASE}/lib \
--enable-libnotify \
--enable-lua
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
MOZILLA_LIB_ROOT="${LOCALBASE}/xulrunner"
LDFLAGS="-L${LOCALBASE}/lib"
.include <bsd.port.mk>

10
www/liferea/distinfo
View File

@ -1,5 +1,5 @@
MD5 (liferea-1.4.19.tar.gz) = 4OHgBx05NkuowslcB6cgOg==
RMD160 (liferea-1.4.19.tar.gz) = KrQhDqZbaBH/InC88rCgWHS9GEo=
SHA1 (liferea-1.4.19.tar.gz) = 9X162UdYPum8M++GK5eq9kLeayU=
SHA256 (liferea-1.4.19.tar.gz) = jQB5xbouualIB2hf1dhBT++FkKLfZ16BssQPQQr6kHk=
SIZE (liferea-1.4.19.tar.gz) = 1633509
MD5 (liferea-1.6.0.tar.gz) = fFMhAdPJz9cbdtOoqCYi+g==
RMD160 (liferea-1.6.0.tar.gz) = YtsfGiNzlmq8yJImx5O8/lQWO+E=
SHA1 (liferea-1.6.0.tar.gz) = GtvMKcQwcOA6lB0VDvyAW+2XzJk=
SHA256 (liferea-1.6.0.tar.gz) = q/X46bSkBcT8x6KB4xskku+twGbPkpgLfVN/luWunCA=
SIZE (liferea-1.6.0.tar.gz) = 1743248

25
www/liferea/patches/patch-configure
View File

@ -1,25 +0,0 @@
$OpenBSD: patch-configure,v 1.1 2009/11/19 15:35:53 jasper Exp $
Disable xulrunner 1.9, which will be picked up before 1.8, if's installed.
--- configure.orig Wed Sep 3 20:44:43 2008
+++ configure Thu Nov 19 16:33:18 2009
@@ -24495,7 +24495,8 @@ fi
if test "x$enable_xulrunner" = "xyes" ; then
-
+# Force disable xulrunner 1.9, which will be picked up when installed
+if false; then
{ echo "$as_me:$LINENO: checking for XulRunner 1.9+ support" >&5
echo $ECHO_N "checking for XulRunner 1.9+ support... $ECHO_C" >&6; }
@@ -24569,7 +24570,7 @@ else
echo "${ECHO_T}yes" >&6; }
XULRUNNER_PROVIDER=libxul-embedding
fi
-
+fi # Force disable 1.9
if test "x$XULRUNNER_PROVIDER" = "x" ; then
{ echo "$as_me:$LINENO: checking for XulRunner 1.8 support" >&5
echo $ECHO_N "checking for XulRunner 1.8 support... $ECHO_C" >&6; }

30
www/liferea/patches/patch-src_ui_liferea_shell_c Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-src_ui_liferea_shell_c,v 1.1 2009/11/26 12:48:10 landry Exp $
--- src/ui/liferea_shell.c.orig Mon Nov 16 21:07:40 2009
+++ src/ui/liferea_shell.c Mon Nov 16 21:09:26 2009
@@ -681,7 +681,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);
}
@@ -689,7 +689,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);
}
@@ -697,7 +697,7 @@ on_quick_reference_activate (GtkMenuItem *menuitem, gp
static void
on_faq_activate (GtkMenuItem *menuitem, gpointer user_data)
{
- 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);
}

27
www/liferea/patches/patch-src_ui_ui_mainwindow_c
View File

@ -1,27 +0,0 @@
$OpenBSD: patch-src_ui_ui_mainwindow_c,v 1.2 2007/12/16 13:55:14 jasper Exp $
--- src/ui/ui_mainwindow.c.orig Wed Nov 21 23:07:14 2007
+++ src/ui/ui_mainwindow.c Sun Dec 16 14:47:37 2007
@@ -212,20 +212,20 @@ on_homepagebtn_clicked (GtkButton *button, gpointer us
}
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"));
ui_tabs_new(filename, _("Help Topics"), TRUE);
g_free(filename);
}
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"));
ui_tabs_new(filename, _("Quick Reference"), TRUE);
g_free(filename);
}
void on_faq_activate(GtkMenuItem *menuitem, gpointer user_data) {
- 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"));
ui_tabs_new(filename, _("FAQ"), TRUE);
g_free(filename);
}

64
www/liferea/pkg/PLIST
View File

@ -1,11 +1,7 @@
@comment $OpenBSD: PLIST,v 1.10 2009/06/07 06:44:42 ajacoutot Exp $
bin/liferea
@comment $OpenBSD: PLIST,v 1.11 2009/11/26 12:48:10 landry Exp $
@bin bin/liferea
bin/liferea-add-feed
@bin bin/liferea-bin
lib/liferea/
lib/liferea/liblihtmlx.a
lib/liferea/liblihtmlx.la
lib/liferea/liblihtmlx.so
lib/liferea/liblinotiflibnotify.a
lib/liferea/liblinotiflibnotify.la
lib/liferea/liblinotiflibnotify.so
@ -27,33 +23,33 @@ share/doc/liferea/html/enclosures_de.html
share/doc/liferea/html/enclosures_en.html
share/doc/liferea/html/faq_de.html
share/doc/liferea/html/faq_en.html
share/doc/liferea/html/faq_ja.html
share/doc/liferea/html/folders_de.html
share/doc/liferea/html/folders_en.html
share/doc/liferea/html/greader_de.html
share/doc/liferea/html/greader_en.html
share/doc/liferea/html/headlines_de.html
share/doc/liferea/html/headlines_en.html
share/doc/liferea/html/help_feed_default.png
share/doc/liferea/html/help_feed_error.png
share/doc/liferea/html/help_feed_prop_adv_1.4.0.png
share/doc/liferea/html/help_feed_prop_cache_1.4.0.png
share/doc/liferea/html/help_feed_prop_downl_1.4.0.png
share/doc/liferea/html/help_feed_prop_general_1.4.0.png
share/doc/liferea/html/help_feed_prop_source_1.4.0.png
share/doc/liferea/html/help_feed_prop_adv_1.6.0.png
share/doc/liferea/html/help_feed_prop_cache_1.6.0.png
share/doc/liferea/html/help_feed_prop_downl_1.6.0.png
share/doc/liferea/html/help_feed_prop_general_1.6.0.png
share/doc/liferea/html/help_feed_prop_source_1.6.0.png
share/doc/liferea/html/help_folder.png
share/doc/liferea/html/help_item_flag.png
share/doc/liferea/html/help_item_unread.png
share/doc/liferea/html/help_opml.png
share/doc/liferea/html/help_prefs_browser_1.4.0.png
share/doc/liferea/html/help_prefs_enclosures_1.4.0.png
share/doc/liferea/html/help_prefs_feeds_1.4.0.png
share/doc/liferea/html/help_prefs_folders_1.4.0.png
share/doc/liferea/html/help_prefs_gui_1.4.0.png
share/doc/liferea/html/help_prefs_headlines_1.4.0.png
share/doc/liferea/html/help_prefs_proxy_1.4.0.png
share/doc/liferea/html/help_search_1.4.0.png
share/doc/liferea/html/help_source_add_1.4.0.png
share/doc/liferea/html/help_subscribe_1.4.0.png
share/doc/liferea/html/help_vfolder_1.4.0.png
share/doc/liferea/html/help_prefs_browser_1.6.0.png
share/doc/liferea/html/help_prefs_enclosures_1.6.0.png
share/doc/liferea/html/help_prefs_feeds_1.6.0.png
share/doc/liferea/html/help_prefs_folders_1.6.0.png
share/doc/liferea/html/help_prefs_gui_1.6.0.png
share/doc/liferea/html/help_prefs_headlines_1.6.0.png
share/doc/liferea/html/help_prefs_proxy_1.6.0.png
share/doc/liferea/html/help_search_1.6.0.png
share/doc/liferea/html/help_subscribe_1.6.0.png
share/doc/liferea/html/help_vfolder_1.6.0.png
share/doc/liferea/html/newsbin_de.html
share/doc/liferea/html/newsbin_en.html
share/doc/liferea/html/preferences_de.html
@ -61,19 +57,22 @@ share/doc/liferea/html/preferences_en.html
share/doc/liferea/html/reference.css
share/doc/liferea/html/reference_de.html
share/doc/liferea/html/reference_en.html
share/doc/liferea/html/reference_ja.html
share/doc/liferea/html/reference_nl.html
share/doc/liferea/html/searching_de.html
share/doc/liferea/html/searching_en.html
share/doc/liferea/html/subscriptions_de.html
share/doc/liferea/html/subscriptions_en.html
share/doc/liferea/html/topics_de.html
share/doc/liferea/html/topics_en.html
share/doc/liferea/html/topics_ja.html
share/doc/liferea/html/updating_de.html
share/doc/liferea/html/updating_en.html
share/icons/hicolor/16x16/apps/liferea.png
share/icons/hicolor/22x22/apps/liferea.png
share/icons/hicolor/24x24/apps/liferea.png
share/icons/hicolor/32x32/apps/liferea.png
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/css/
share/liferea/css/adblock.css
@ -82,9 +81,7 @@ share/liferea/dtd/
share/liferea/dtd/html.ent
share/liferea/google_source.glade
share/liferea/liferea.glade
share/liferea/media/
share/liferea/media/xspf_license.txt
share/liferea/media/xspf_player_slim.swf
share/liferea/new_subscription.glade
share/liferea/node_source.glade
share/liferea/opml/
share/liferea/opml/feedlist.opml
@ -94,6 +91,7 @@ share/liferea/opml/feedlist_de.opml
share/liferea/opml/feedlist_es.opml
share/liferea/opml/feedlist_eu.opml
share/liferea/opml/feedlist_fr.opml
share/liferea/opml/feedlist_it.opml
share/liferea/opml/feedlist_nl.opml
share/liferea/opml/feedlist_pl.opml
share/liferea/opml/feedlist_pt.opml
@ -101,7 +99,6 @@ share/liferea/opml/feedlist_pt_BR.opml
share/liferea/opml/feedlist_ru.opml
share/liferea/opml/feedlist_sk.opml
share/liferea/opml/feedlist_sv.opml
share/liferea/opml/feedlist_tr.opml
share/liferea/opml_source.glade
share/liferea/pixmaps/
share/liferea/pixmaps/arrow.png
@ -119,17 +116,14 @@ 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/grayflag.png
share/liferea/pixmaps/liferea.png
share/liferea/pixmaps/folder_empty.png
share/liferea/pixmaps/newsbin.png
share/liferea/pixmaps/ocs.png
share/liferea/pixmaps/offline.png
share/liferea/pixmaps/online.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/xslt/
share/liferea/xslt/feed.xml
share/liferea/xslt/feed.xml.in