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

Update to midori 0.2.7, diff from Remi Pointel (thanks!)

Browse Source 
Few tweaks: PLIST sorting, convert to new LIB_DEPENDS style.
This commit is contained in:
landry 2010-08-22 14:14:52 +00:00
parent c88a60ecd4
commit 4547ea6404
5 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
www/midori/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.21 2010/05/27 22:04:17 landry Exp $
# $OpenBSD: Makefile,v 1.22 2010/08/22 14:14:52 landry Exp $
COMMENT = lightweight web browser
XFCE_VERSION = 0.2.6
XFCE_VERSION = 0.2.7
XFCE_GOODIE = midori
MAINTAINER = Landry Breuil <gaston@gcu.info>
@ -20,11 +20,11 @@ USE_X11 = Yes
DESKTOP_FILES = Yes
NO_REGRESS = Yes
LIB_DEPENDS = webkit-1.0:webkit->=1.1.15v0:www/webkit \
notify::devel/libnotify \
sqlite3::databases/sqlite3 \
unique-1.0::devel/libunique \
soup-2.4:libsoup->=2.28.0:devel/libsoup
LIB_DEPENDS = :webkit->=1.1.15v0:www/webkit \
::devel/libnotify \
::databases/sqlite3 \
::devel/libunique \
:libsoup->=2.28.0:devel/libsoup
# pick sqlite
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include"
@ -39,7 +39,8 @@ WANTLIB = X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
gmodule-2.0 gnutls gobject-2.0 gthread-2.0 gtk-x11-2.0 intl \
m pango-1.0 pangocairo-1.0 pangoft2-1.0 pthread sqlite3 z \
dbus-1 dbus-glib-1 cairo pixman-1 png pthread-stubs xcb xml2 \
Xss xcb-render xcb-render-util
Xss xcb-render xcb-render-util webkit-1.0 notify sqlite3 \
unique-1.0 soup-2.4
.include <bsd.port.mk>

10
www/midori/distinfo
View File

@ -1,5 +1,5 @@
MD5 (midori-0.2.6.tar.bz2) = JJ3bNIXYJG4P2iXdc1lT8A==
RMD160 (midori-0.2.6.tar.bz2) = kIYzDO3D26FUdNwMaRn7/+un0pY=
SHA1 (midori-0.2.6.tar.bz2) = xw9tdeLqKUfc8FIBGSuUBbtANvQ=
SHA256 (midori-0.2.6.tar.bz2) = LakCZdtEsjFh6beOpfeKQtuKEM+q59z2KHyICksqbbI=
SIZE (midori-0.2.6.tar.bz2) = 712959
MD5 (midori-0.2.7.tar.bz2) = Y4oWQktESDfTGXI95ZQqMw==
RMD160 (midori-0.2.7.tar.bz2) = 8MnIc1j6rOm/zfvHPg8WwHzYoqc=
SHA1 (midori-0.2.7.tar.bz2) = YeaoAuClYTlLBr11sAd1SdGDTVU=
SHA256 (midori-0.2.7.tar.bz2) = sdzEec65OMjZzeoJjI1y1WO85QEMJ/vKpMmS0Q8tgJw=
SIZE (midori-0.2.7.tar.bz2) = 771673

8
www/midori/patches/patch-midori_main_c
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-midori_main_c,v 1.1 2010/05/20 19:01:14 landry Exp $
$OpenBSD: patch-midori_main_c,v 1.2 2010/08/22 14:14:52 landry Exp $
use path to our root ca list for ssl cert validation
--- midori/main.c.orig Thu May 20 20:46:29 2010
+++ midori/main.c Thu May 20 20:47:41 2010
@@ -849,8 +849,7 @@ midori_soup_session_prepare (SoupSession* sessio
--- midori/main.c.orig Mon Aug 16 21:31:14 2010
+++ midori/main.c Sun Aug 22 15:00:14 2010
@@ -836,8 +836,7 @@ midori_soup_session_prepare (SoupSession* sessio
#if WEBKIT_CHECK_VERSION (1, 1, 14) && defined (HAVE_LIBSOUP_2_29_91)
const gchar* certificate_files[] =
{

8
www/midori/patches/patch-wscript
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-wscript,v 1.9 2010/05/20 19:01:14 landry Exp $
$OpenBSD: patch-wscript,v 1.10 2010/08/22 14:14:52 landry Exp $
We don't need those files installed..
--- wscript.orig Sun May 16 20:32:33 2010
+++ wscript Thu May 20 20:12:21 2010
--- wscript.orig Mon Aug 16 21:31:14 2010
+++ wscript Sun Aug 22 15:00:14 2010
@@ -67,7 +67,7 @@ def rc_file(self, node):
self.compiled_tasks.append (rctask)
rc_file = extension ('.rc')(rc_file)
@ -11,7 +11,7 @@ We don't need those files installed..
def configure (conf):
def option_checkfatal (option, desc):
@@ -449,12 +449,8 @@ def build (bld):
@@ -413,12 +413,8 @@ def build (bld):
bld.add_group ()

12
www/midori/pkg/PLIST
View File

@ -1,23 +1,26 @@
@comment $OpenBSD: PLIST,v 1.16 2010/05/27 22:04:17 landry Exp $
@comment $OpenBSD: PLIST,v 1.17 2010/08/22 14:14:52 landry Exp $
@bin bin/midori
include/midori-0.2/
include/midori-0.2/extensions/
include/midori-0.2/extensions/external-applications.h
include/midori-0.2/extensions/history-list.h
lib/midori/
lib/midori/libadblock.so
lib/midori/libaddons.so
lib/midori/libcolorful-tabs.so
lib/midori/libcookie-manager.so
lib/midori/libcopy-tabs.so
lib/midori/libexternal-applications.so
lib/midori/libfeed-panel.so
lib/midori/libformhistory.so
lib/midori/libhistory-list.so
lib/midori/libmouse-gestures.so
lib/midori/libpage-holder.so
lib/midori/libshortcuts.so
lib/midori/libstatus-clock.so
lib/midori/libstatusbar-features.so
lib/midori/libtab-panel.so
lib/midori/libtab-switcher.so
lib/midori/libtabs-minimized.so
lib/midori/libtoolbar-editor.so
lib/midori/libweb-cache.so
share/applications/midori.desktop
@ -45,6 +48,9 @@ share/icons/hicolor/32x32/status/news-feed.png
share/icons/hicolor/48x48/apps/midori.png
share/icons/hicolor/48x48/categories/extension.png
share/icons/hicolor/48x48/status/news-feed.png
share/icons/hicolor/scalable/apps/midori.svg
share/icons/hicolor/scalable/categories/extension.svg
share/icons/hicolor/scalable/status/news-feed.svg
share/locale/ast/LC_MESSAGES/midori.mo
share/locale/ca/LC_MESSAGES/midori.mo
share/locale/cs/LC_MESSAGES/midori.mo
@ -96,6 +102,8 @@ share/vala/
share/vala/vapi/
share/vala/vapi/external-applications.deps
share/vala/vapi/external-applications.vapi
share/vala/vapi/history-list.deps
share/vala/vapi/history-list.vapi
@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
@exec %D/bin/update-desktop-database