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

Update to midori 0.5.8.

Browse Source 
Enable webkit2 support in the gtk3 flavor to ease testing, now that it
sort-of works... and move some of the plugins not yet ported to
PFRAG.no-gtk3. Sync WANTLIB while here..
This commit is contained in:
landry 2014-04-21 19:31:57 +00:00
parent 08667fdeed
commit fcf80314b3
5 changed files with 46 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
www/midori/Makefile
View File

@ -1,13 +1,11 @@
# $OpenBSD: Makefile,v 1.64 2014/03/25 09:40:32 landry Exp $
# $OpenBSD: Makefile,v 1.65 2014/04/21 19:31:57 landry Exp $
SHARED_ONLY = Yes
COMMENT = lightweight web browser
XFCE_VERSION = 0.5.7
XFCE_VERSION = 0.5.8
XFCE_GOODIE = midori
DISTNAME = ${XFCE_GOODIE}_${XFCE_VERSION}_all_
PKGNAME = ${XFCE_GOODIE}-${XFCE_VERSION}
WRKDIST = ${WRKDIR}/${PKGNAME}
WRKDIST = ${WRKDIR}
HOMEPAGE = http://www.midori-browser.org
MAINTAINER = Landry Breuil <landry@openbsd.org>
@ -30,15 +28,15 @@ FLAVOR ?=
CONFIGURE_ARGS = -DUSE_ZEITGEIST:Bool=No
.if ${FLAVOR:Mgtk3}
CONFIGURE_ARGS += -DUSE_GTK3:Bool=Yes
CONFIGURE_ARGS += -DUSE_GTK3:Bool=Yes -DHALF_BRO_INCOM_WEBKIT2:Bool=Yes
LIB_DEPENDS = www/webkit,gtk3 \
x11/gnome/gcr
WANTLIB += cairo-gobject gck-1 gcr-3 gcr-base-3 gdk-3 gtk-3 javascriptcoregtk-3.0
WANTLIB += p11-kit webkitgtk-3.0
WANTLIB += p11-kit webkit2gtk-3.0
.else
LIB_DEPENDS = www/webkit>=1.8.1v0
WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes
WANTLIB += Xcomposite Xcursor Xdamage Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender
WANTLIB += gdk-x11-2.0 gtk-x11-2.0 javascriptcoregtk-1.0
WANTLIB += webkitgtk-1.0
@ -54,7 +52,7 @@ RUN_DEPENDS += multimedia/gstreamer1/plugins-libav
BUILD_DEPENDS = lang/vala \
x11/gnome/librsvg
WANTLIB += Xss atk-1.0 c cairo
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

4
www/midori/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (midori_0.5.7_all_.tar.bz2) = KHW7KqiooMzjQhePBHANTrzNE78bKtTLO6n+x+K9C00=
SIZE (midori_0.5.7_all_.tar.bz2) = 1191260
SHA256 (midori-0.5.8.tar.bz2) = rxkTX9TEsENF3001kueTnCD5tA6sokVQ5sthl1Gqk4E=
SIZE (midori-0.5.8.tar.bz2) = 1267130

20
www/midori/patches/patch-CMakeLists_txt
View File

@ -1,13 +1,17 @@
$OpenBSD: patch-CMakeLists_txt,v 1.1 2013/11/21 16:10:46 landry Exp $
Ensure Xrender is found.
--- CMakeLists.txt.orig Wed Nov 20 02:26:52 2013
+++ CMakeLists.txt Thu Nov 21 15:23:12 2013
@@ -77,7 +77,7 @@ if (X11)
find_library (XSS Xss /usr/lib/X11R6/lib)
$OpenBSD: patch-CMakeLists_txt,v 1.2 2014/04/21 19:31:57 landry Exp $
also find -lfreetype2 during linking
--- CMakeLists.txt.orig Thu Apr 3 23:23:17 2014
+++ CMakeLists.txt Mon Apr 21 19:30:18 2014
@@ -74,10 +74,10 @@ find_library (X11 X11)
if (X11)
# Pass /usr/X11R6/include for OpenBSD
find_file (SCRNSAVER X11/extensions/scrnsaver.h /usr/X11R6/include)
- find_library (XSS Xss /usr/lib/X11R6/lib)
+ find_library (XSS Xss /usr/X11R6/lib)
if (SCRNSAVER AND XSS)
add_definitions("-DHAVE_X11_EXTENSIONS_SCRNSAVER_H")
- set(OPTS_LIBRARIES "${OPTS_LIBRARIES};${XSS}")
+ set(OPTS_LIBRARIES "${OPTS_LIBRARIES};${XSS};-L${X11BASE}/lib")
- set(OPTS_LIBRARIES "${OPTS_LIBRARIES};${XSS};${X11}")
+ set(OPTS_LIBRARIES "${OPTS_LIBRARIES};${XSS};${X11};-L${X11BASE}/lib")
endif ()
endif ()

7
www/midori/pkg/PFRAG.no-gtk3 Normal file
View File

@ -0,0 +1,7 @@
@comment $OpenBSD: PFRAG.no-gtk3,v 1.1 2014/04/21 19:31:57 landry Exp $
lib/midori/libaddons.so
lib/midori/libcookie-permissions.so
lib/midori/libexternal-download-manager.so
lib/midori/libformhistory.so
lib/midori/libnojs.so
lib/midori/libnsplugin-manager.so

25
www/midori/pkg/PLIST
View File

@ -1,24 +1,21 @@
@comment $OpenBSD: PLIST,v 1.34 2014/03/25 09:40:32 landry Exp $
@comment $OpenBSD: PLIST,v 1.35 2014/04/21 19:31:57 landry Exp $
@bin bin/midori
@lib lib/libmidori-core.so.${LIBmidori-core_VERSION}
lib/midori/
lib/midori/libadblock.so
lib/midori/libaddons.so
lib/midori/libapps.so
lib/midori/libcolorful-tabs.so
lib/midori/libcookie-manager.so
lib/midori/libcookie-permissions.so
lib/midori/libcopy-tabs.so
lib/midori/libdelayed-load.so
lib/midori/libdevpet.so
lib/midori/libexternal-download-manager.so
lib/midori/libdomain-keys.so
lib/midori/libfeed-panel.so
lib/midori/libflummi.so
lib/midori/libformhistory.so
lib/midori/libhistory-list.so
lib/midori/libmouse-gestures.so
lib/midori/libnojs.so
lib/midori/libnsplugin-manager.so
lib/midori/libnotes.so
lib/midori/libopen-with.so
lib/midori/libshortcuts.so
lib/midori/libstatus-clock.so
lib/midori/libstatusbar-features.so
@ -59,12 +56,16 @@ share/icons/hicolor/22x22/status/internet-news-reader.png
share/icons/hicolor/scalable/apps/midori.svg
share/icons/hicolor/scalable/categories/extension.svg
share/icons/hicolor/scalable/status/internet-news-reader.svg
share/locale/am/LC_MESSAGES/midori.mo
share/locale/ar/LC_MESSAGES/midori.mo
share/locale/ast/LC_MESSAGES/midori.mo
share/locale/be/LC_MESSAGES/midori.mo
share/locale/bg/LC_MESSAGES/midori.mo
share/locale/bs/LC_MESSAGES/midori.mo
share/locale/ca/LC_MESSAGES/midori.mo
share/locale/ckb/
share/locale/ckb/LC_MESSAGES/
share/locale/ckb/LC_MESSAGES/midori.mo
share/locale/cs/LC_MESSAGES/midori.mo
share/locale/cy/LC_MESSAGES/midori.mo
share/locale/da/LC_MESSAGES/midori.mo
@ -90,6 +91,7 @@ share/locale/id/LC_MESSAGES/midori.mo
share/locale/it/LC_MESSAGES/midori.mo
share/locale/ja/LC_MESSAGES/midori.mo
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/lt/LC_MESSAGES/midori.mo
@ -108,6 +110,7 @@ share/locale/ro/LC_MESSAGES/midori.mo
share/locale/ru/LC_MESSAGES/midori.mo
share/locale/sk/LC_MESSAGES/midori.mo
share/locale/sl/LC_MESSAGES/midori.mo
share/locale/sq/LC_MESSAGES/midori.mo
share/locale/sr/LC_MESSAGES/midori.mo
share/locale/sr@latin/LC_MESSAGES/midori.mo
share/locale/sv/LC_MESSAGES/midori.mo
@ -121,6 +124,12 @@ share/locale/zh_TW/LC_MESSAGES/midori.mo
share/midori/
share/midori/res/
share/midori/res/about.css
share/midori/res/adblock/
share/midori/res/adblock.list
share/midori/res/adblock/blocked.png
share/midori/res/adblock/disabled.png
share/midori/res/adblock/element_hider.js
share/midori/res/adblock/enabled.png
share/midori/res/autosuggestcontrol.css
share/midori/res/autosuggestcontrol.js
share/midori/res/bookmarks/
@ -141,6 +150,8 @@ share/midori/res/nojs/
share/midori/res/nojs/nojs-statusicon-allowed.png
share/midori/res/nojs/nojs-statusicon-denied.png
share/midori/res/nojs/nojs-statusicon-mixed.png
share/midori/res/notes/
share/midori/res/notes/Create.sql
share/midori/res/speeddial-head.html
share/midori/res/tabby/
share/midori/res/tabby/Create.sql