Update to epiphany-3.4.0.1.

This commit is contained in:
ajacoutot 2012-04-03 15:40:29 +00:00
parent 010583df4b
commit be2246b968
7 changed files with 60 additions and 134 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.75 2011/12/03 23:20:53 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.76 2012/04/03 15:40:29 ajacoutot Exp $
SHARED_ONLY= Yes
@ -10,8 +10,7 @@ COMMENT= GNOME web browser based on webkit
# www/epiphany-extensions
GNOME_PROJECT= epiphany
GNOME_VERSION= 3.2.1
REVISION= 2
GNOME_VERSION= 3.4.0.1
M= ${GNOME_VERSION:C/^([0-9]+\.[0-9]+).*/\1/}
SUBST_VARS= M
@ -31,45 +30,43 @@ 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 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 += m notify pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
WANTLIB += pixman-1 png pthread pthread-stubs seed-gtk3 soup-2.4
WANTLIB += avahi-client avahi-common avahi-glib avahi-gobject
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 geoclue gio-2.0 girepository-1.0
WANTLIB += glib-2.0 gmodule-2.0 gnome-keyring gobject-2.0 gpg-error
WANTLIB += gstapp-0.10 gstaudio-0.10 gstbase-0.10 gstfft-0.10
WANTLIB += gstinterfaces-0.10 gstpbutils-0.10 gstreamer-0.10 gstvideo-0.10
WANTLIB += gthread-2.0 gtk-3 icudata icui18n icuuc javascriptcoregtk-3.0
WANTLIB += jpeg m notify orc-0.4 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 \
devel/gsettings-desktop-schemas \
x11/gtk+2,-guic
devel/gsettings-desktop-schemas
LIB_DEPENDS= textproc/libxslt \
devel/libexecinfo \
devel/libnotify>=0.7.2 \
devel/libnotify \
devel/libsoup,-gnome \
x11/gnome/seed>=3.2.0p0
x11/gnome/seed
MODULES= devel/dconf \
devel/gettext \
x11/gnome
LIBTOOL_FLAGS= --tag=disable-static
MODGNOME_DESKTOP_FILE= Yes
MODGNOME_ICON_CACHE= Yes
MODGNOME_TOOLS= goi yelp
MODGNOME_TOOLS= goi yelp
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= --disable-static \
--disable-zeroconf \
--with-distributor-name="OpenBSD ports" \
--with-ca-file=/etc/ssl/cert.pem \
--disable-nss \
--enable-seed \
--disable-nss
--with-distributor-name="OpenBSD ports"
MODGNOME_CPPFLAGS= -I${X11BASE}/include
CONFIGURE_ENV= HOME=/tmp
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (epiphany-3.2.1.tar.xz) = sHpHZWoH9pXHDrVrYo+d9w==
RMD160 (epiphany-3.2.1.tar.xz) = loMYcmA7UYYOMVwYQoVUnYhqyT4=
SHA1 (epiphany-3.2.1.tar.xz) = u4L5iQvCc3QTkwWkGVKXSCap2rg=
SHA256 (epiphany-3.2.1.tar.xz) = Wt4Q2b7M4cpDww11X9pHfFWVocBRQEfwf31LgXohVP4=
SIZE (epiphany-3.2.1.tar.xz) = 5101156
MD5 (epiphany-3.4.0.1.tar.xz) = Os0elvndfZL0BB3e+TS7/g==
RMD160 (epiphany-3.4.0.1.tar.xz) = Vl2lyoQhszc0OS+r+P7SrJtNf/M=
SHA1 (epiphany-3.4.0.1.tar.xz) = UGmZqH1mI8mMnJN55Gco2zcR+qA=
SHA256 (epiphany-3.4.0.1.tar.xz) = SKz6bvyAbMawL3g92Ss2ujvflNHhrgK+1piG9F5ABTM=
SIZE (epiphany-3.4.0.1.tar.xz) = 5118028

View File

@ -1,17 +0,0 @@
$OpenBSD: patch-data_ui_epiphany-ui_xml,v 1.1 2011/10/17 16:56:28 jasper Exp $
Remove non-functioning and confusing button untill the underlying issue
has been addressed.
https://bugzilla.gnome.org/show_bug.cgi?id=661762
--- data/ui/epiphany-ui.xml.orig Mon Oct 17 18:46:51 2011
+++ data/ui/epiphany-ui.xml Mon Oct 17 18:47:13 2011
@@ -13,7 +13,6 @@
<menuitem name="FilePrintMenu" action="FilePrint"/>
<menuitem name="FileSendToMenu" action="FileSendTo"/>
<separator name="FileSep3"/>
- <menuitem name="FileWorkOfflineItem" action="FileWorkOffline"/>
<menuitem name="FileCloseWindowMenu" action="FileCloseTab"/>
</menu>

View File

@ -1,7 +1,7 @@
$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.
$OpenBSD: patch-lib_Makefile_in,v 1.2 2012/04/03 15:40:29 ajacoutot Exp $
--- lib/Makefile.in.orig Tue Mar 27 22:25:08 2012
+++ lib/Makefile.in Sun Apr 1 15:39:59 2012
@@ -487,7 +487,8 @@ ephy_profile_migrator_SOURCES = ephy-profile-migrator.
ephy_profile_migrator_CFLAGS = \
$(DEPENDENCIES_CFLAGS) \
$(NSS_CFLAGS) \
@ -9,5 +9,5 @@ $OpenBSD: patch-lib_Makefile_in,v 1.1 2011/10/13 06:56:30 jasper Exp $
+ $(AM_CFLAGS) \
+ -lexecinfo
ephy_profile_migrator_LDADD = $(DEPENDENCIES_LIBS) $(am__append_2)
ephy_profile_migrator_CPPFLAGS = \
ephy_profile_migrator_LDADD = \
$(top_builddir)/lib/history/libephyhistory.la libephymisc.la \

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-src_Makefile_in,v 1.4 2011/10/13 13:10:58 jasper Exp $
--- src/Makefile.in.orig Fri Oct 7 23:03:34 2011
+++ src/Makefile.in Fri Oct 7 23:04:28 2011
@@ -524,7 +524,7 @@ epiphany_LDADD = libephymain.la \
$(top_builddir)/lib/widgets/libephywidgets.la \
$OpenBSD: patch-src_Makefile_in,v 1.5 2012/04/03 15:40:29 ajacoutot Exp $
--- src/Makefile.in.orig Tue Mar 27 22:25:08 2012
+++ src/Makefile.in Sun Apr 1 15:39:59 2012
@@ -522,7 +522,7 @@ epiphany_LDADD = libephymain.la \
$(top_builddir)/lib/history/libephyhistory.la \
$(top_builddir)/lib/libephymisc.la \
$(top_builddir)/lib/egg/libegg.la $(DEPENDENCIES_LIBS) \
- $(LIBINTL) $(am__append_5) $(am__append_6)

View File

@ -1,12 +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 \
$OpenBSD: patch-tests_Makefile_in,v 1.2 2012/04/03 15:40:29 ajacoutot Exp $
--- tests/Makefile.in.orig Tue Mar 27 22:25:09 2012
+++ tests/Makefile.in Sun Apr 1 15:39:59 2012
@@ -409,7 +409,7 @@ LDADD = $(top_builddir)/src/libephymain.la \
$(top_builddir)/lib/history/libephyhistory.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
ephy-download-test.c

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.23 2011/12/03 23:20:52 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.24 2012/04/03 15:40:29 ajacoutot Exp $
@bin bin/ephy-profile-migrator
@bin bin/epiphany
include/epiphany/
@ -20,7 +20,6 @@ include/epiphany/${M}/epiphany/ephy-embed-utils.h
include/epiphany/${M}/epiphany/ephy-embed.h
include/epiphany/${M}/epiphany/ephy-extension.h
include/epiphany/${M}/epiphany/ephy-extensions-manager.h
include/epiphany/${M}/epiphany/ephy-history.h
include/epiphany/${M}/epiphany/ephy-lib-type-builtins.h
include/epiphany/${M}/epiphany/ephy-link.h
include/epiphany/${M}/epiphany/ephy-loader.h
@ -36,98 +35,31 @@ include/epiphany/${M}/epiphany/ephy-type-builtins.h
include/epiphany/${M}/epiphany/ephy-web-view.h
include/epiphany/${M}/epiphany/ephy-window.h
include/epiphany/${M}/epiphany/epiphany.h
lib/girepository-1.0/EphyEgg-${M}.typelib
lib/girepository-1.0/Epiphany-${M}.typelib
lib/pkgconfig/epiphany-${M}.pc
@man man/man1/epiphany.1
share/GConf/gsettings/epiphany.convert
share/aclocal/epiphany.m4
share/applications/bme.desktop
share/applications/epiphany.desktop
share/dbus-1/services/org.gnome.Epiphany.service
share/epiphany/
share/epiphany/about.ini
share/epiphany/art/
share/epiphany/default-bookmarks.rdf
share/epiphany/epiphany-bookmark-editor-ui.xml
share/epiphany/epiphany-bookmarks-html.xsl
share/epiphany/epiphany-bookmarksbar.xml
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
share/epiphany/glade/epiphany-application-menu.ui
share/epiphany/glade/epiphany.ui
share/epiphany/glade/form-signing-dialog.ui
share/epiphany/glade/prefs-dialog.ui
share/epiphany/glade/print.ui
share/epiphany/icons/
share/epiphany/icons/hicolor/
share/epiphany/icons/hicolor/16x16/
share/epiphany/icons/hicolor/16x16/actions/
share/epiphany/icons/hicolor/16x16/actions/bookmark-view.png
share/epiphany/icons/hicolor/16x16/actions/history-view.png
share/epiphany/icons/hicolor/16x16/actions/location-entry.png
share/epiphany/icons/hicolor/16x16/places/
share/epiphany/icons/hicolor/16x16/places/bookmark-web.png
share/epiphany/icons/hicolor/16x16/status/
share/epiphany/icons/hicolor/16x16/status/lock-broken.png
share/epiphany/icons/hicolor/16x16/status/lock-insecure.png
share/epiphany/icons/hicolor/16x16/status/lock-secure-checked.png
share/epiphany/icons/hicolor/16x16/status/lock-secure.png
share/epiphany/icons/hicolor/16x16/status/popup-hidden.png
share/epiphany/icons/hicolor/22x22/
share/epiphany/icons/hicolor/22x22/actions/
share/epiphany/icons/hicolor/22x22/actions/bookmark-view.png
share/epiphany/icons/hicolor/22x22/actions/history-view.png
share/epiphany/icons/hicolor/22x22/actions/location-entry.png
share/epiphany/icons/hicolor/22x22/places/
share/epiphany/icons/hicolor/22x22/places/bookmark-web.png
share/epiphany/icons/hicolor/22x22/status/
share/epiphany/icons/hicolor/22x22/status/popup-hidden.png
share/epiphany/icons/hicolor/24x24/
share/epiphany/icons/hicolor/24x24/actions/
share/epiphany/icons/hicolor/24x24/actions/bookmark-view.png
share/epiphany/icons/hicolor/24x24/actions/history-view.png
share/epiphany/icons/hicolor/24x24/actions/location-entry.png
share/epiphany/icons/hicolor/24x24/places/
share/epiphany/icons/hicolor/24x24/places/bookmark-web.png
share/epiphany/icons/hicolor/24x24/status/
share/epiphany/icons/hicolor/24x24/status/lock-broken.png
share/epiphany/icons/hicolor/24x24/status/lock-insecure.png
share/epiphany/icons/hicolor/24x24/status/lock-secure-checked.png
share/epiphany/icons/hicolor/24x24/status/lock-secure.png
share/epiphany/icons/hicolor/24x24/status/popup-hidden.png
share/epiphany/icons/hicolor/32x32/
share/epiphany/icons/hicolor/32x32/actions/
share/epiphany/icons/hicolor/32x32/actions/bookmark-view.png
share/epiphany/icons/hicolor/32x32/actions/history-view.png
share/epiphany/icons/hicolor/32x32/actions/location-entry.png
share/epiphany/icons/hicolor/32x32/actions/location-entry.svg
share/epiphany/icons/hicolor/32x32/status/
share/epiphany/icons/hicolor/32x32/status/popup-hidden.png
share/epiphany/icons/hicolor/48x48/
share/epiphany/icons/hicolor/48x48/status/
share/epiphany/icons/hicolor/48x48/status/lock-broken.png
share/epiphany/icons/hicolor/48x48/status/lock-insecure.png
share/epiphany/icons/hicolor/48x48/status/lock-secure-checked.png
share/epiphany/icons/hicolor/48x48/status/lock-secure.png
share/epiphany/icons/hicolor/scalable/
share/epiphany/icons/hicolor/scalable/actions/
share/epiphany/icons/hicolor/scalable/actions/bookmark-view.svg
share/epiphany/icons/hicolor/scalable/actions/history-view.svg
share/epiphany/icons/hicolor/scalable/actions/location-entry.svg
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
share/gir-1.0/Epiphany-${M}.gir
share/glib-2.0/schemas/org.gnome.Epiphany.enums.xml
share/glib-2.0/schemas/org.gnome.epiphany.gschema.xml
@ -212,6 +144,13 @@ share/gnome/help/epiphany/fr/figures/ephy-addressbar-smartbookmark-screenshot.pn
share/gnome/help/epiphany/fr/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
share/gnome/help/epiphany/fr/figures/ephy-history-window-screenshot.png
share/gnome/help/epiphany/fr/figures/ephy-screenshot.png
share/gnome/help/epiphany/gl/
share/gnome/help/epiphany/gl/epiphany.xml
share/gnome/help/epiphany/gl/figures/
share/gnome/help/epiphany/gl/figures/ephy-addressbar-smartbookmark-screenshot.png
share/gnome/help/epiphany/gl/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
share/gnome/help/epiphany/gl/figures/ephy-history-window-screenshot.png
share/gnome/help/epiphany/gl/figures/ephy-screenshot.png
share/gnome/help/epiphany/it/
share/gnome/help/epiphany/it/epiphany.xml
share/gnome/help/epiphany/it/figures/
@ -261,6 +200,13 @@ share/gnome/help/epiphany/sv/figures/ephy-addressbar-smartbookmark-screenshot.pn
share/gnome/help/epiphany/sv/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
share/gnome/help/epiphany/sv/figures/ephy-history-window-screenshot.png
share/gnome/help/epiphany/sv/figures/ephy-screenshot.png
share/gnome/help/epiphany/te/
share/gnome/help/epiphany/te/epiphany.xml
share/gnome/help/epiphany/te/figures/
share/gnome/help/epiphany/te/figures/ephy-addressbar-smartbookmark-screenshot.png
share/gnome/help/epiphany/te/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
share/gnome/help/epiphany/te/figures/ephy-history-window-screenshot.png
share/gnome/help/epiphany/te/figures/ephy-screenshot.png
share/gnome/help/epiphany/uk/
share/gnome/help/epiphany/uk/epiphany.xml
share/gnome/help/epiphany/uk/figures/
@ -276,7 +222,6 @@ share/gnome/help/epiphany/zh_CN/figures/ephy-bookmarkbar-smartbookmark-screensho
share/gnome/help/epiphany/zh_CN/figures/ephy-history-window-screenshot.png
share/gnome/help/epiphany/zh_CN/figures/ephy-screenshot.png
share/gtk-doc/html/epiphany/
share/icons/hicolor/48x48/apps/epiphany-bookmarks.png
share/locale/am/LC_MESSAGES/epiphany.mo
share/locale/an/
share/locale/an/LC_MESSAGES/
@ -329,6 +274,7 @@ share/locale/is/LC_MESSAGES/epiphany.mo
share/locale/it/LC_MESSAGES/epiphany.mo
share/locale/ja/LC_MESSAGES/epiphany.mo
share/locale/ka/LC_MESSAGES/epiphany.mo
share/locale/km/LC_MESSAGES/epiphany.mo
share/locale/kn/LC_MESSAGES/epiphany.mo
share/locale/ko/LC_MESSAGES/epiphany.mo
share/locale/ku/LC_MESSAGES/epiphany.mo
@ -395,6 +341,7 @@ share/omf/epiphany/epiphany-es.omf
share/omf/epiphany/epiphany-eu.omf
share/omf/epiphany/epiphany-fi.omf
share/omf/epiphany/epiphany-fr.omf
share/omf/epiphany/epiphany-gl.omf
share/omf/epiphany/epiphany-it.omf
share/omf/epiphany/epiphany-ja.omf
share/omf/epiphany/epiphany-nl.omf
@ -402,11 +349,10 @@ share/omf/epiphany/epiphany-oc.omf
share/omf/epiphany/epiphany-ru.omf
share/omf/epiphany/epiphany-sl.omf
share/omf/epiphany/epiphany-sv.omf
share/omf/epiphany/epiphany-te.omf
share/omf/epiphany/epiphany-uk.omf
share/omf/epiphany/epiphany-zh_CN.omf
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
@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/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
@unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null