Update to midori 0.4.3, see
http://git.xfce.org/apps/midori/tree/ChangeLog for a list of improvements. Repair install of config files under $SYSCONFDIR/xdg/midori/ If it doesn't start after update, wipe .cache/midori.
This commit is contained in:
landry
parent
4936c91b94
commit
2bb215dd06
@ -1,10 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.44 2011/12/03 23:20:53 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.45 2011/12/24 07:47:23 landry Exp $
|
||||
|
||||
COMMENT = lightweight web browser
|
||||
|
||||
XFCE_VERSION = 0.4.1
|
||||
XFCE_VERSION = 0.4.3
|
||||
XFCE_GOODIE = midori
|
||||
REVISION = 0
|
||||
|
||||
MAINTAINER = Landry Breuil <landry@openbsd.org>
|
||||
CATEGORIES = www
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (midori-0.4.1.tar.bz2) = M93iA81xrisdKtzH9XOfZQ==
|
||||
RMD160 (midori-0.4.1.tar.bz2) = XrL4AH1hb0aFF6bKSsw6OHjpYbI=
|
||||
SHA1 (midori-0.4.1.tar.bz2) = DEmUWbEEn+q/htzon0kCATmp79k=
|
||||
SHA256 (midori-0.4.1.tar.bz2) = s8d9229WKg6j0ub7t1bKDcFYrYQQ9LYPjlmYwvcwXwc=
|
||||
SIZE (midori-0.4.1.tar.bz2) = 905412
|
||||
MD5 (midori-0.4.3.tar.bz2) = kAA3VXuCgY150t0cWn1/0g==
|
||||
RMD160 (midori-0.4.3.tar.bz2) = l/ckTWxc/DiSBAdED79+NkmLn8Q=
|
||||
SHA1 (midori-0.4.3.tar.bz2) = ji9WMDgv8gaYR88kSJioBY46VbA=
|
||||
SHA256 (midori-0.4.3.tar.bz2) = /KSg6rAzWPINdwAGnb8vqvj6XBGqrZf0IIrqYI9L7Z8=
|
||||
SIZE (midori-0.4.3.tar.bz2) = 928660
|
||||
|
||||
@ -1,17 +1,18 @@
|
||||
$OpenBSD: patch-midori_main_c,v 1.10 2011/10/13 06:53:30 jasper Exp $
|
||||
$OpenBSD: patch-midori_main_c,v 1.11 2011/12/24 07:47:23 landry Exp $
|
||||
|
||||
use path to our root ca list for ssl cert validation
|
||||
|
||||
--- midori/main.c.orig Mon Oct 10 00:41:47 2011
|
||||
+++ midori/main.c Wed Oct 12 10:17:53 2011
|
||||
@@ -996,10 +996,7 @@ midori_load_soup_session (gpointer settings)
|
||||
#if defined (HAVE_LIBSOUP_2_29_91)
|
||||
--- midori/main.c.orig Sat Dec 17 23:47:28 2011
|
||||
+++ midori/main.c Thu Dec 22 21:04:10 2011
|
||||
@@ -999,11 +999,7 @@ midori_load_soup_session (gpointer settings)
|
||||
#elif defined (HAVE_LIBSOUP_2_29_91)
|
||||
const gchar* certificate_files[] =
|
||||
{
|
||||
- "/etc/pki/tls/certs/ca-bundle.crt",
|
||||
- "/etc/ssl/certs/ca-certificates.crt",
|
||||
- "/etc/ssl/certs/ca-bundle.crt",
|
||||
- "/usr/local/share/certs/ca-root-nss.crt",
|
||||
- "/usr/local/share/certs/ca-root-nss.crt", /* FreeBSD */
|
||||
- "/var/lib/ca-certificates/ca-bundle.pem", /* openSUSE */
|
||||
+ "/etc/ssl/cert.pem",
|
||||
NULL
|
||||
};
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
$OpenBSD: patch-wscript,v 1.17 2011/10/13 06:53:30 jasper Exp $
|
||||
$OpenBSD: patch-wscript,v 1.18 2011/12/24 07:47:23 landry Exp $
|
||||
|
||||
We don't need those files installed..
|
||||
Fix paths to config files.
|
||||
|
||||
--- wscript.orig Mon Oct 10 00:41:47 2011
|
||||
+++ wscript Wed Oct 12 10:17:53 2011
|
||||
@@ -68,7 +68,7 @@ def rc_file(self, node):
|
||||
--- wscript.orig Sat Dec 17 23:47:28 2011
|
||||
+++ wscript Sat Dec 24 07:53:38 2011
|
||||
@@ -70,7 +70,7 @@ def rc_file(self, node):
|
||||
self.compiled_tasks.append (rctask)
|
||||
rc_file = extension ('.rc')(rc_file)
|
||||
Task.simple_task_type ('winrc', '${WINRC} -o${TGT} ${SRC}', color='BLUE',
|
||||
@ -13,7 +13,7 @@ We don't need those files installed..
|
||||
|
||||
def configure (conf):
|
||||
def option_checkfatal (option, desc):
|
||||
@@ -415,7 +415,7 @@ def build (bld):
|
||||
@@ -440,7 +440,7 @@ def build (bld):
|
||||
'AUTHORS COPYING ChangeLog EXPAT README data/faq.html data/faq.css')
|
||||
|
||||
# Install default configuration
|
||||
@ -22,3 +22,12 @@ We don't need those files installed..
|
||||
|
||||
if bld.env['INTLTOOL']:
|
||||
obj = bld.new_task_gen ('intltool_po')
|
||||
@@ -512,7 +512,7 @@ def build (bld):
|
||||
for extension in extensions:
|
||||
source = 'data/extensions/' + extension + '/config'
|
||||
if os.path.exists (source):
|
||||
- bld.install_files ('${SYSCONFDIR}/xdg/' + APPNAME + \
|
||||
+ bld.install_files ('${MDATADIR}/examples/' + APPNAME + \
|
||||
'/extensions/' + extension, source)
|
||||
|
||||
if Options.commands['check'] or bld.env['tests']:
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.25 2011/12/03 23:20:52 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.26 2011/12/24 07:47:23 landry Exp $
|
||||
@bin bin/midori
|
||||
include/midori-0.4/
|
||||
include/midori-0.4/extensions/
|
||||
@ -31,7 +31,16 @@ share/doc/midori/README
|
||||
share/doc/midori/faq.css
|
||||
share/doc/midori/faq.html
|
||||
share/examples/midori/
|
||||
@sample ${SYSCONFDIR}/xdg/
|
||||
@sample ${SYSCONFDIR}/xdg/midori/
|
||||
share/examples/midori/extensions/
|
||||
@sample ${SYSCONFDIR}/xdg/midori/extensions/
|
||||
share/examples/midori/extensions/adblock/
|
||||
@sample ${SYSCONFDIR}/xdg/midori/extensions/adblock/
|
||||
share/examples/midori/extensions/adblock/config
|
||||
@sample ${SYSCONFDIR}/xdg/midori/extensions/adblock/config
|
||||
share/examples/midori/search
|
||||
@sample ${SYSCONFDIR}/xdg/midori/search
|
||||
share/icons/hicolor/16x16/apps/midori.png
|
||||
share/icons/hicolor/16x16/categories/extension.png
|
||||
share/icons/hicolor/16x16/status/news-feed.png
|
||||
@ -92,9 +101,10 @@ share/midori/
|
||||
share/midori/res/
|
||||
share/midori/res/autosuggestcontrol.css
|
||||
share/midori/res/autosuggestcontrol.js
|
||||
share/midori/res/close.png
|
||||
share/midori/res/error.html
|
||||
share/midori/res/logo-shade.png
|
||||
share/midori/res/speeddial-head.html
|
||||
share/midori/res/speeddial-head-0.4.3.html
|
||||
share/vala/vapi/history-list.deps
|
||||
share/vala/vapi/history-list.vapi
|
||||
@exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user