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

Update to midori 0.5.10. Fix WANTLIB while here.

Browse Source
This commit is contained in:
landry 2015-06-26 08:03:24 +00:00
parent dba44d6717
commit e3dd8401ab
4 changed files with 16 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
www/midori/Makefile
View File

@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.72 2015/04/11 08:39:58 nigel Exp $
# $OpenBSD: Makefile,v 1.73 2015/06/26 08:03:24 landry Exp $
SHARED_ONLY = Yes
COMMENT = lightweight web browser
XFCE_VERSION = 0.5.9
XFCE_VERSION = 0.5.10
XFCE_GOODIE = midori
DISTNAME = midori_0.5.9_all_
WRKDIST = ${WRKDIR}/${PKGNAME}
REVISION = 2
DISTNAME = midori_0.5.10_all_
WRKDIST = ${WRKDIR}
HOMEPAGE = http://www.midori-browser.org
MAINTAINER = Landry Breuil <landry@openbsd.org>
@ -33,8 +32,7 @@ CONFIGURE_ARGS = -DUSE_ZEITGEIST:Bool=No
CONFIGURE_ARGS += -DUSE_GTK3:Bool=Yes
LIB_DEPENDS = www/webkit,gtk3>=2.4.8p3v1 \
x11/gnome/gcr
WANTLIB += cairo-gobject gck-1 gcr-ui-3 gcr-base-3 gdk-3 gtk-3 javascriptcoregtk-3.0
WANTLIB += p11-kit webkitgtk-3.0
WANTLIB += cairo-gobject gcr-ui-3 gdk-3 gtk-3 javascriptcoregtk-3.0 webkitgtk-3.0
.else
LIB_DEPENDS = www/webkit>=1.8.1v0
@ -45,8 +43,7 @@ WANTLIB += webkitgtk-1.0
.endif
LIB_DEPENDS += devel/libnotify \
devel/libsoup>=2.28.0
LIB_DEPENDS += devel/libsoup>=2.28.0
# webkit browsing
RUN_DEPENDS += multimedia/gstreamer1/plugins-libav
@ -57,13 +54,11 @@ BUILD_DEPENDS = lang/vala \
WANTLIB += X11 Xss atk-1.0 c cairo
WANTLIB += fontconfig freetype gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
WANTLIB += m notify pango-1.0 xml2 z
WANTLIB += m pango-1.0 xml2 z gck-1 gcr-base-3 p11-kit
WANTLIB += pangocairo-1.0 pangoft2-1.0 pthread
WANTLIB += soup-2.4 sqlite3 soup-gnome-2.4
pre-configure:
${SUBST_CMD} ${WRKSRC}/CMakeLists.txt
# CMake Error: CMake can not determine linker language for target: history-list.orig ????
rm ${WRKSRC}/extensions/history-list.vala.orig
.include <bsd.port.mk>

4
www/midori/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (midori_0.5.9_all_.tar.bz2) = saUwnZJupOOU9KOVUgI7BCfPIwU3k9Ml49rvzu0oLsA=
SIZE (midori_0.5.9_all_.tar.bz2) = 1332192
SHA256 (midori_0.5.10_all_.tar.bz2) = cCNE9o1/A0hmpGOY41s8FqWl8+QxpdkW6l78Pqqj5G8=
SIZE (midori_0.5.10_all_.tar.bz2) = 1379519

24
www/midori/patches/patch-extensions_history-list_vala
View File

@ -1,24 +0,0 @@
$OpenBSD: patch-extensions_history-list_vala,v 1.1 2015/03/31 06:45:36 jasper Exp $
error: `ListStore' is an ambiguous reference between `GLib.ListStore' and `Gtk.ListStore'
--- extensions/history-list.vala.orig Tue Mar 31 08:39:44 2015
+++ extensions/history-list.vala Tue Mar 31 08:39:53 2015
@@ -319,7 +319,7 @@ namespace HistoryList {
}
private void create_widgets () {
- ListStore model;
+ Gtk.ListStore model;
TreeIter iter;
TreeIter? active_iter = null;
@@ -331,7 +331,7 @@ namespace HistoryList {
var tab_closing_behavior = this.hl_manager.get_integer ("TabClosingBehavior");
- model = new ListStore (2, typeof (string), typeof (int));
+ model = new Gtk.ListStore (2, typeof (string), typeof (int));
model.append (out iter);
model.set (iter, TabClosingBehaviorModel.TEXT, _("Do nothing"),

8
www/midori/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.37 2015/03/16 19:37:08 landry Exp $
@comment $OpenBSD: PLIST,v 1.38 2015/06/26 08:03:24 landry Exp $
!%%gtk3%%
@bin bin/midori
@lib lib/libmidori-core.so.${LIBmidori-core_VERSION}
@ -101,6 +101,9 @@ share/locale/kk/LC_MESSAGES/midori.mo
share/locale/km/LC_MESSAGES/midori.mo
share/locale/ko/LC_MESSAGES/midori.mo
share/locale/ky/LC_MESSAGES/midori.mo
share/locale/lb/
share/locale/lb/LC_MESSAGES/
share/locale/lb/LC_MESSAGES/midori.mo
share/locale/lt/LC_MESSAGES/midori.mo
share/locale/lv/LC_MESSAGES/midori.mo
share/locale/ml/LC_MESSAGES/midori.mo
@ -130,8 +133,11 @@ share/locale/th/LC_MESSAGES/midori.mo
share/locale/tr/LC_MESSAGES/midori.mo
share/locale/ug/LC_MESSAGES/midori.mo
share/locale/uk/LC_MESSAGES/midori.mo
share/locale/ur/LC_MESSAGES/midori.mo
share/locale/uz/LC_MESSAGES/midori.mo
share/locale/vi/LC_MESSAGES/midori.mo
share/locale/zh_CN/LC_MESSAGES/midori.mo
share/locale/zh_HK/LC_MESSAGES/midori.mo
share/locale/zh_TW/LC_MESSAGES/midori.mo
share/midori/
share/midori/res/