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

- update to 3.2.0

Browse Source 
ok aja@
This commit is contained in:
jasper 2011-10-13 06:56:30 +00:00
parent 92bc618106
commit f4f6959dfa
13 changed files with 91 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
www/epiphany-extensions/Makefile
View File

@ -1,14 +1,13 @@
# $OpenBSD: Makefile,v 1.38 2011/09/28 09:51:36 jasper Exp $
# $OpenBSD: Makefile,v 1.39 2011/10/13 06:58:37 jasper Exp $
COMMENT= collection of extensions for Epiphany
GNOME_PROJECT= epiphany-extensions
GNOME_VERSION= 3.0.0
REVISION= 8
GNOME_VERSION= 3.2.0
# sync with www/epiphany
M= ${GNOME_VERSION:R}
SUBST_VARS= M
M= ${GNOME_VERSION:R}
SUBST_VARS= M
CATEGORIES= www
@ -23,26 +22,24 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
EXTRACT_SUFX= .tar.bz2
WANTLIB += GL ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp
WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xt Xxf86vm atk-1.0
WANTLIB += cairo cairo-gobject drm enchant expat fontconfig freetype
WANTLIB += gailutil-3 gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
WANTLIB += gobject-2.0 gstapp-0.10 gstbase-0.10 gstinterfaces-0.10
WANTLIB += cairo cairo-gobject drm enchant expat ffi fontconfig
WANTLIB += freetype gailutil-3 gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
WANTLIB += gmodule-2.0 gobject-2.0 gstapp-0.10 gstbase-0.10 gstinterfaces-0.10
WANTLIB += gstpbutils-0.10 gstreamer-0.10 gstvideo-0.10 gthread-2.0
WANTLIB += gtk-3 icudata icui18n icuuc jpeg m pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread-stubs soup-2.4
WANTLIB += sqlite3 stdc++ webkitgtk-3.0 xcb xcb-render xcb-shm
WANTLIB += xml2 xslt z
WANTLIB += gtk-3 icudata icui18n icuuc javascriptcoregtk-3.0 jpeg
WANTLIB += kvm m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
WANTLIB += png pthread-stubs soup-2.4 sqlite3 stdc++ webkitgtk-3.0
WANTLIB += xcb xcb-render xcb-shm xml2 xslt z
MODULES= devel/dconf \
devel/gettext \
x11/gnome
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= www/epiphany>=3.0.3
LIB_DEPENDS= www/webkit,gtk3
RUN_DEPENDS= www/epiphany>=3.2.0
LIB_DEPENDS= www/webkit,gtk3>=1.6.1v0
LIBTOOL_FLAGS= --tag=disable-static
@ -52,7 +49,4 @@ CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= --disable-static \
--enable-opensp=no
# prevents implicit declarations by not setting *_DISABLE_DEPRECATED
CONFIGURE_ARGS += --disable-maintainer-mode
.include <bsd.port.mk>

10
www/epiphany-extensions/distinfo
View File

@ -1,5 +1,5 @@
MD5 (epiphany-extensions-3.0.0.tar.bz2) = o0ckIv+TsEPDJlCoTiylUg==
RMD160 (epiphany-extensions-3.0.0.tar.bz2) = uw0qPTq49BUPzmsflWIYVRBVW0g=
SHA1 (epiphany-extensions-3.0.0.tar.bz2) = BgPLlUUyJl+i87l2UQmnkhbJEZk=
SHA256 (epiphany-extensions-3.0.0.tar.bz2) = yZhN4JErMH/s0CMhNcDj2MfwhZhnuWkyIf8S0cSDtyQ=
SIZE (epiphany-extensions-3.0.0.tar.bz2) = 1598864
MD5 (epiphany-extensions-3.2.0.tar.xz) = q+enPXvgQUouoMC2NPEgkw==
RMD160 (epiphany-extensions-3.2.0.tar.xz) = lpLhis4X9ArF71Br/GfFYWGWeOw=
SHA1 (epiphany-extensions-3.2.0.tar.xz) = Dp658Xbjx8RdV/eIVmGvmG9Fju4=
SHA256 (epiphany-extensions-3.2.0.tar.xz) = BwfJEJvGBw9fTm7zqWU+GK1SAOtX85aFK0wTy6xpuq4=
SIZE (epiphany-extensions-3.2.0.tar.xz) = 1403132

17
www/epiphany-extensions/patches/patch-extensions_adblock_adblock-pattern_c
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-extensions_adblock_adblock-pattern_c,v 1.1 2011/09/12 07:26:20 ajacoutot Exp $
From feabc53b368c244215d3ba507abe76071f9ef81f Mon Sep 17 00:00:00 2001
From: Tim-Philipp Müller <tim@centricular.net>
Date: Sun, 29 May 2011 19:36:40 +0000
Subject: adblock: reset error to NULL if list regexp could not be parsed
--- extensions/adblock/adblock-pattern.c.orig Thu Aug 26 14:44:24 2010
+++ extensions/adblock/adblock-pattern.c Fri Jun 10 21:41:08 2011
@@ -79,6 +79,7 @@ adblock_pattern_load_from_file (GHashTable *patterns,
"Error: %s",
line, error->message);
g_error_free (error);
+ error = NULL;
continue;
}

4
www/epiphany-extensions/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.12 2011/09/12 07:26:20 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.13 2011/10/13 06:58:37 jasper Exp $
lib/epiphany/
lib/epiphany/${M}/
lib/epiphany/${M}/extensions/
@ -249,6 +249,7 @@ share/locale/ja/LC_MESSAGES/epiphany-extensions-${M}.mo
share/locale/kn/LC_MESSAGES/epiphany-extensions-${M}.mo
share/locale/ko/LC_MESSAGES/epiphany-extensions-${M}.mo
share/locale/lt/LC_MESSAGES/epiphany-extensions-${M}.mo
share/locale/lv/LC_MESSAGES/epiphany-extensions-${M}.mo
share/locale/ml/LC_MESSAGES/epiphany-extensions-${M}.mo
share/locale/mr/LC_MESSAGES/epiphany-extensions-${M}.mo
share/locale/nb/LC_MESSAGES/epiphany-extensions-${M}.mo
@ -281,7 +282,6 @@ share/locale/wa/LC_MESSAGES/epiphany-extensions-${M}.mo
share/locale/zh_CN/LC_MESSAGES/epiphany-extensions-${M}.mo
share/locale/zh_HK/LC_MESSAGES/epiphany-extensions-${M}.mo
share/locale/zh_TW/LC_MESSAGES/epiphany-extensions-${M}.mo
share/omf/
share/omf/epiphany-extensions/
share/omf/epiphany-extensions/epiphany-extensions-C.omf
share/omf/epiphany-extensions/epiphany-extensions-de.omf

28
www/epiphany/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.70 2011/09/28 09:51:36 jasper Exp $
# $OpenBSD: Makefile,v 1.71 2011/10/13 06:56:30 jasper Exp $
SHARED_ONLY= Yes
@ -10,8 +10,7 @@ COMMENT= GNOME web browser based on webkit
# www/epiphany-extensions
GNOME_PROJECT= epiphany
GNOME_VERSION= 3.0.4
REVISION= 0
GNOME_VERSION= 3.2.0
M= ${GNOME_VERSION:C/^([0-9]+\.[0-9]+).*/\1/}
SUBST_VARS= M
@ -31,17 +30,16 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB += GL ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp
WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xt Xxf86vm atk-1.0
WANTLIB += c cairo cairo-gobject dbus-1 dbus-glib-1 drm enchant
WANTLIB += execinfo expat ffi fontconfig freetype gailutil-3 gcrypt
WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 girepository-1.0 glib-2.0
WANTLIB += gmodule-2.0 gnome-keyring gobject-2.0 gpg-error gstapp-0.10
WANTLIB += gstbase-0.10 gstinterfaces-0.10 gstpbutils-0.10 gstreamer-0.10
WANTLIB += gstvideo-0.10 gthread-2.0 gtk-3 icudata icui18n icuuc
WANTLIB += jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
WANTLIB += png pthread pthread-stubs seed-gtk3 soup-2.4 soup-gnome-2.4
WANTLIB += sqlite3 startup-notification-1 stdc++ webkitgtk-3.0
WANTLIB += xcb xcb-atom xcb-aux xcb-event xcb-render xcb-shm xml2
WANTLIB += xslt z
WANTLIB += c cairo cairo-gobject dbus-1 drm enchant execinfo expat
WANTLIB += ffi fontconfig freetype gailutil-3 gcrypt gdk-3 gdk_pixbuf-2.0
WANTLIB += gio-2.0 girepository-1.0 glib-2.0 gmodule-2.0 gnome-keyring
WANTLIB += gobject-2.0 gpg-error gstapp-0.10 gstbase-0.10 gstinterfaces-0.10
WANTLIB += gstpbutils-0.10 gstreamer-0.10 gstvideo-0.10 gthread-2.0
WANTLIB += gtk-3 icudata icui18n icuuc javascriptcoregtk-3.0 jpeg
WANTLIB += kvm m notify pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre pixman-1 png pthread pthread-stubs seed-gtk3 soup-2.4
WANTLIB += soup-gnome-2.4 sqlite3 stdc++ webkitgtk-3.0 xcb xcb-render
WANTLIB += xcb-shm xml2 xslt z
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= devel/iso-codes \
@ -51,7 +49,7 @@ LIB_DEPENDS= textproc/libxslt \
devel/libnotify>=0.7.2 \
devel/libsoup,-gnome \
devel/startup-notification \
x11/gnome/seed
x11/gnome/seed>=3.2.0p0
MODULES= devel/dconf \
devel/gettext \

10
www/epiphany/distinfo
View File

@ -1,5 +1,5 @@
MD5 (epiphany-3.0.4.tar.xz) = 2IxvufN/LeAeiiHRlNEr7w==
RMD160 (epiphany-3.0.4.tar.xz) = tuNfGpI3o/S4SS/E6MG2nWI4qvo=
SHA1 (epiphany-3.0.4.tar.xz) = rKEVDA6ay1MutjGSRlOSmpBG4+s=
SHA256 (epiphany-3.0.4.tar.xz) = PPwlxMk549+WDCjmwn5+eGReESHYY07L0wdnLfHzczM=
SIZE (epiphany-3.0.4.tar.xz) = 5082008
MD5 (epiphany-3.2.0.tar.xz) = sX6VVoDNzNBr0u50HPZx7A==
RMD160 (epiphany-3.2.0.tar.xz) = iEQdnAKPXKoRCcNgfvzfL+Z73UI=
SHA1 (epiphany-3.2.0.tar.xz) = Ip3H8eDUiRE7PSc2IHVNFxw9zWM=
SHA256 (epiphany-3.2.0.tar.xz) = 5UAsuLUtPeXAn+sBu/KKG9PCDyYKLglWydEy9BBA5dI=
SIZE (epiphany-3.2.0.tar.xz) = 5104056

13
www/epiphany/patches/patch-lib_Makefile_in Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-lib_Makefile_in,v 1.1 2011/10/13 06:56:30 jasper Exp $
--- lib/Makefile.in.orig Fri Oct 7 22:59:30 2011
+++ lib/Makefile.in Fri Oct 7 23:00:22 2011
@@ -489,7 +489,8 @@ ephy_profile_migrator_SOURCES = ephy-profile-migrator.
ephy_profile_migrator_CFLAGS = \
$(DEPENDENCIES_CFLAGS) \
$(NSS_CFLAGS) \
- $(AM_CFLAGS)
+ $(AM_CFLAGS) \
+ -lexecinfo
ephy_profile_migrator_LDADD = $(DEPENDENCIES_LIBS) $(am__append_2)
ephy_profile_migrator_CPPFLAGS = \

20
www/epiphany/patches/patch-src_Makefile_in
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-src_Makefile_in,v 1.2 2011/09/12 07:26:20 ajacoutot Exp $
commit 16607f8b5e182389b6a228079a577cfca2ea9cf2
Author: Jasper Lievisse Adriaanse <jasper@humppa.nl>
Date: Mon Jun 20 19:36:42 2011 +0200
Don't bypass g-ir-scanner's --pkg, especially when that's already passed.
https://bugzilla.gnome.org/show_bug.cgi?id=653031
--- src/Makefile.in.orig Mon Jun 20 19:33:27 2011
+++ src/Makefile.in Mon Jun 20 19:33:35 2011
@@ -1575,7 +1575,6 @@ stamp-ephy-dbus-client-bindings.h: $(top_srcdir)/data/
@HAVE_INTROSPECTION_TRUE@ --pkg=gtk+-3.0 \
@HAVE_INTROSPECTION_TRUE@ --pkg=libxml-2.0 \
@HAVE_INTROSPECTION_TRUE@ --output=$@ \
-@HAVE_INTROSPECTION_TRUE@ `pkg-config --libs libxml-2.0 gtk+-3.0` \
@HAVE_INTROSPECTION_TRUE@ $(top_srcdir)/lib/egg/egg-editable-toolbar.h \
@HAVE_INTROSPECTION_TRUE@ $(top_srcdir)/lib/egg/egg-toolbars-model.h \
@HAVE_INTROSPECTION_TRUE@ $(top_srcdir)/lib/egg/egg-editable-toolbar.c \

15
www/epiphany/patches/patch-src_ephy-extensions-manager_c
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_ephy-extensions-manager_c,v 1.1 2011/09/12 07:26:20 ajacoutot Exp $
ephy-extensions-manager: plug leak
From upstream git: 6d839481ccf0e1718f98df27b7cf6890d8059d5b
--- src/ephy-extensions-manager.c.orig Sun May 15 00:36:43 2011
+++ src/ephy-extensions-manager.c Sun May 15 00:37:05 2011
@@ -917,6 +917,7 @@ ephy_extensions_manager_load_dir (EphyExtensionsManage
directory = g_file_new_for_path (path);
monitor = g_file_monitor_directory (directory, 0, NULL, NULL);
+ g_object_unref (directory);
if (monitor != NULL)
{

15
www/epiphany/patches/patch-src_ephy-home-action_c
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_ephy-home-action_c,v 1.1 2011/09/12 07:26:20 ajacoutot Exp $
ephy-home-action: plug leak
From upstream git: 4b60d82f3722d98414fa3b03cac8b081fb79e429
--- src/ephy-home-action.c.orig Sun May 15 00:37:46 2011
+++ src/ephy-home-action.c Sun May 15 00:38:59 2011
@@ -168,6 +168,7 @@ ephy_home_action_activate (GtkAction *action)
action_name_association (action, action_name, address, FALSE);
g_free (address);
+ g_free (action_name);
}
static void

25
www/epiphany/patches/patch-src_ephy-shell_c Normal file
View File

@ -0,0 +1,25 @@
$OpenBSD: patch-src_ephy-shell_c,v 1.1 2011/10/13 06:56:30 jasper Exp $
From 1cb7fb1109aecedd224d03fda202165adf3423a7 Mon Sep 17 00:00:00 2001
From: Ionut Biru <ibiru@archlinux.org>
Date: Mon, 26 Sep 2011 18:12:40 +0000
Subject: Don't crash when network manager is not available
--- src/ephy-shell.c.orig Sat Sep 17 15:28:08 2011
+++ src/ephy-shell.c Fri Oct 7 22:53:03 2011
@@ -470,10 +470,11 @@ impl_get_embed_single (EphyEmbedShell *embed_shell)
priv->embed_single_connected = TRUE;
/* Now we need the net monitor */
- ephy_shell_get_net_monitor (shell);
- ephy_shell_sync_network_status (priv->nm_proxy,
- ephy_network_manager_get_state (priv->nm_proxy),
- shell);
+ if (ephy_shell_get_net_monitor (shell)) {
+ ephy_shell_sync_network_status (priv->nm_proxy,
+ ephy_network_manager_get_state (priv->nm_proxy),
+ shell);
+ }
}
return embed_single;

12
www/epiphany/patches/patch-tests_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-tests_Makefile_in,v 1.1 2011/10/13 06:56:30 jasper Exp $
--- tests/Makefile.in.orig Fri Oct 7 23:06:09 2011
+++ tests/Makefile.in Fri Oct 7 23:07:06 2011
@@ -358,7 +358,7 @@ LDADD = $(top_builddir)/src/libephymain.la \
$(top_builddir)/lib/widgets/libephywidgets.la \
$(top_builddir)/lib/libephymisc.la \
$(top_builddir)/lib/egg/libegg.la $(DBUS_LIBS) \
- $(DEPENDENCIES_LIBS) $(am__append_2)
+ $(DEPENDENCIES_LIBS) $(am__append_2) -lexecinfo
test_ephy_download_SOURCES = \
ephy-download.c

5
www/epiphany/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.21 2011/09/12 07:26:20 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.22 2011/10/13 06:56:30 jasper Exp $
@bin bin/ephy-profile-migrator
@bin bin/epiphany
include/epiphany/
@ -8,7 +8,6 @@ include/epiphany/${M}/epiphany/ephy-adblock-manager.h
include/epiphany/${M}/epiphany/ephy-adblock.h
include/epiphany/${M}/epiphany/ephy-bookmarks-type-builtins.h
include/epiphany/${M}/epiphany/ephy-bookmarks.h
include/epiphany/${M}/epiphany/ephy-dbus.h
include/epiphany/${M}/epiphany/ephy-dialog.h
include/epiphany/${M}/epiphany/ephy-download.h
include/epiphany/${M}/epiphany/ephy-embed-container.h
@ -57,6 +56,7 @@ share/epiphany/epiphany-fs-toolbar.xml
share/epiphany/epiphany-history-window-ui.xml
share/epiphany/epiphany-toolbar.xml
share/epiphany/epiphany-ui.xml
share/epiphany/epiphany.css
share/epiphany/epiphany.xhtml
share/epiphany/glade/
share/epiphany/glade/certificate-dialogs.ui
@ -124,6 +124,7 @@ share/epiphany/icons/hicolor/scalable/status/
share/epiphany/icons/hicolor/scalable/status/popup-hidden.svg
share/epiphany/mime-types-permissions.xml
share/epiphany/pages/
share/epiphany/pages/about.css
share/epiphany/pages/error.html
share/epiphany/pages/recovery.html
share/gir-1.0/EphyEgg-${M}.gir