diff options
Diffstat (limited to 'www/epiphany-extensions')
3 files changed, 5 insertions, 165 deletions
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile index fe708118f..92cbae6ef 100644 --- a/www/epiphany-extensions/Makefile +++ b/www/epiphany-extensions/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom$ +# $MCom: ports/www/epiphany-extensions/Makefile,v 1.127 2010/06/06 10:04:03 kwm Exp $ # PORTNAME= epiphany-extensions @@ -18,7 +18,7 @@ COMMENT= A set of add-ons for the Epiphany web browser BUILD_DEPENDS= epiphany:${PORTSDIR}/www/epiphany LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre \ - webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 + webkitgtk-1.0.13:${PORTSDIR}/www/webkit-gtk2 RUN_DEPENDS= epiphany:${PORTSDIR}/www/epiphany USE_GETTEXT= yes @@ -31,8 +31,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" EPHY_EXTENSIONS=really-all -#EPHY_VERSION= ${PORTVERSION:R} -EPHY_VERSION= 2.31 +EPHY_VERSION= ${PORTVERSION:R} PLIST_SUB= VERSION=${EPHY_VERSION} EPHY_VERSION=${EPHY_VERSION} @@ -50,10 +49,9 @@ CONFIGURE_ARGS+= --disable-opensp CONFIGURE_ARGS+=--with-extensions="${EPHY_EXTENSIONS}" post-patch: -# @${REINPLACE_CMD} -e 's|$$($$PKG_CONFIG --variable=extensionsdir epiphany-$$_epiphany_api_version)|${PREFIX}/lib/epiphany/${PORTVERSION:R}/extensions|g' \ - @${REINPLACE_CMD} -e 's|$$($$PKG_CONFIG --variable=extensionsdir epiphany-$$_epiphany_api_version)|${PREFIX}/lib/epiphany/2.31/extensions|g' \ + @${REINPLACE_CMD} -e 's|$$($$PKG_CONFIG --variable=extensionsdir epiphany-$$_epiphany_api_version)|${PREFIX}/lib/epiphany/${PORTVERSION:R}/extensions|g' \ -e 's|$$($$PKG_CONFIG --variable=icondir epiphany-$$EPIPHANY_API_VERSION)|${PREFIX}/share/epiphany/icons|g' \ - -e 's|EPIPHANY_API_VERSION=2.29|EPIPHANY_API_VERSION=2.31|g' \ + -e 's|EPIPHANY_API_VERSION=2.29|EPIPHANY_API_VERSION=2.30|g' \ ${WRKSRC}/configure .include <bsd.port.post.mk> diff --git a/www/epiphany-extensions/files/patch-extensions_adblock_ephy-adblock-extension.c b/www/epiphany-extensions/files/patch-extensions_adblock_ephy-adblock-extension.c deleted file mode 100644 index edc55423b..000000000 --- a/www/epiphany-extensions/files/patch-extensions_adblock_ephy-adblock-extension.c +++ /dev/null @@ -1,70 +0,0 @@ -From 979a0e24a1ebe245004942433d3076746f51d5cc Mon Sep 17 00:00:00 2001 -From: Diego Escalante Urrelo <descalante@igalia.com> -Date: Tue, 18 May 2010 21:22:49 +0000 -Subject: adblock: disable statusbar use - -As per Epiphany's master changes. ---- -diff --git a/extensions/adblock/ephy-adblock-extension.c b/extensions/adblock/ephy-adblock-extension.c -index a9cef07..dddc232 100644 ---- extensions/adblock/ephy-adblock-extension.c -+++ extensions/adblock/ephy-adblock-extension.c -@@ -231,6 +231,7 @@ static const GtkActionEntry edit_entries[] = { - G_CALLBACK (ephy_adblock_extension_edit_cb) } - }; - -+#if 0 - static gboolean - ephy_adblock_statusbar_icon_clicked_cb (GtkWidget *widget, - GdkEventButton *event, -@@ -355,6 +356,7 @@ destroy_statusbar_icon (EphyWindow *window) - - ephy_statusbar_remove_widget (statusbar, evbox); - } -+#endif - - static void - ephy_adblock_extension_edit_cb (GtkAction *action, EphyWindow *window) -@@ -393,8 +395,9 @@ switch_page_cb (GtkNotebook *notebook, - /* FIXME: this shouldn't happen anymore with gtk 2.10 ! Test & remove */ - if (gtk_widget_get_realized (GTK_WIDGET (window)) == FALSE) - return; /* on startup */ -- -+#if 0 - update_statusbar (window); -+#endif - } - - static void -@@ -441,7 +444,9 @@ impl_attach_window (EphyExtension *ext, - g_object_set_data (G_OBJECT (window), EXTENSION_KEY, ext); - - /* The ad blocked icon */ -+#if 0 - create_statusbar_icon (window); -+#endif - - notebook = ephy_window_get_notebook (window); - -@@ -474,7 +479,9 @@ impl_detach_window (EphyExtension *ext, - g_signal_handlers_disconnect_by_func - (notebook, G_CALLBACK (switch_page_cb), window); - -+#if 0 - destroy_statusbar_icon (window); -+#endif - } - - static void -@@ -509,7 +516,9 @@ num_blocked_cb (AdBlocker *blocker, - - if (embed == ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window))) - { -+#if 0 - update_statusbar (window); -+#endif - } - } - --- -cgit v0.8.3.1 diff --git a/www/epiphany-extensions/files/patch-extensions_rss_ephy-rss-extension.c b/www/epiphany-extensions/files/patch-extensions_rss_ephy-rss-extension.c deleted file mode 100644 index af775f47c..000000000 --- a/www/epiphany-extensions/files/patch-extensions_rss_ephy-rss-extension.c +++ /dev/null @@ -1,88 +0,0 @@ -From 18127fcbb9010d79d5fbe765685af9fcfcf5ff1b Mon Sep 17 00:00:00 2001 -From: Diego Escalante Urrelo <descalante@igalia.com> -Date: Tue, 18 May 2010 21:22:33 +0000 -Subject: rss: disable statusbar use - -As per Epiphany's master changes. ---- -diff --git a/extensions/rss/ephy-rss-extension.c b/extensions/rss/ephy-rss-extension.c -index 2a42fa6..f799b66 100644 ---- extensions/rss/ephy-rss-extension.c -+++ extensions/rss/ephy-rss-extension.c -@@ -57,8 +57,10 @@ static GType type = 0; - - static void ephy_rss_display_cb (GtkAction *action, - EphyWindow *window); -+#if 0 - static void ephy_rss_update_statusbar (EphyWindow *window, - gboolean show); -+#endif - static void ephy_rss_update_action (EphyWindow *window); - static void ephy_rss_feed_subscribe_cb (GtkAction *action, - EphyWindow *window); -@@ -251,6 +253,7 @@ ephy_rss_ge_content_cb (EphyEmbed *embed, - ephy_rss_update_action (window); - } - -+#if 0 - static void - ephy_rss_update_statusbar (EphyWindow *window, - gboolean show) -@@ -263,6 +266,7 @@ ephy_rss_update_statusbar (EphyWindow *window, - - g_object_set (data->evbox, "visible", show, NULL); - } -+#endif - - /* Update the menu item availability */ - static void -@@ -289,7 +293,9 @@ ephy_rss_update_action (EphyWindow *window) - - g_object_set (data->info_action, "sensitive", show, NULL); - -+#if 0 - ephy_rss_update_statusbar (window, show); -+#endif - - g_object_set (data->subscribe_action, - "sensitive", show, -@@ -360,6 +366,7 @@ impl_detach_tab (EphyExtension *extension, - g_object_set_data (G_OBJECT (embed), FEEDLIST_DATA_KEY, NULL); - } - -+#if 0 - static gboolean - ephy_rss_statusbar_icon_clicked_cb (GtkWidget *widget, - GdkEventButton *event, -@@ -414,6 +421,7 @@ ephy_rss_destroy_statusbar_icon (EphyWindow *window, - - ephy_statusbar_remove_widget (statusbar, GTK_WIDGET (data->evbox)); - } -+#endif - - /* Create the menu item to subscribe to an rss feed */ - static void -@@ -468,8 +476,10 @@ impl_attach_window (EphyExtension *ext, - - g_object_set_data (G_OBJECT (window), EPHY_RSS_EXTENSION_DATA_KEY, extension); - -+#if 0 - /* Create the status bar icon */ - ephy_rss_create_statusbar_icon (window, data); -+#endif - - /* Register for tab switch events */ - ephy_rss_sync_active_tab (window, NULL, NULL); -@@ -498,8 +508,10 @@ impl_detach_window (EphyExtension *ext, - g_signal_handlers_disconnect_by_func - (window, G_CALLBACK (ephy_rss_sync_active_tab), NULL); - -+#if 0 - /* Remove the status bar icon */ - ephy_rss_destroy_statusbar_icon (window, data); -+#endif - - /* Destroy data */ - g_object_set_data (G_OBJECT (window), WINDOW_DATA_KEY, NULL); --- -cgit v0.8.3.1 |