mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 17:59:20 -04:00
Update to 0.4.5
Changelog: http://mail.xfce.org/pipermail/xfce/2012-April/030296.html PR: ports/167536 Submitted by: Olivier Duchateau
This commit is contained in:
Rene Ladan
parent
e0675a36f9
commit
ab28b4a770
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=296245
6 changed files with 30 additions and 58 deletions
|
|
@ -7,8 +7,7 @@
|
|||
#
|
||||
|
||||
PORTNAME= midori
|
||||
PORTVERSION= 0.4.4
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 0.4.5
|
||||
CATEGORIES= www xfce
|
||||
MASTER_SITES= ${MASTER_SITE_XFCE}
|
||||
MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R}
|
||||
|
|
@ -87,8 +86,8 @@ post-install:
|
|||
.if defined(WITH_APIDOCS)
|
||||
${MKDIR} ${DOCSDIR}/api/katze/html
|
||||
${MKDIR} ${DOCSDIR}/api/midori/html
|
||||
(cd ${WRKSRC}/_build_/docs/api/katze/html && ${COPYTREE_SHARE} \* ${DOCSDIR}/api/katze/html)
|
||||
(cd ${WRKSRC}/_build_/docs/api/midori/html && ${COPYTREE_SHARE} \* ${DOCSDIR}/api/midori/html)
|
||||
(cd ${WRKSRC}/_build/docs/api/katze/html && ${COPYTREE_SHARE} \* ${DOCSDIR}/api/katze/html)
|
||||
(cd ${WRKSRC}/_build/docs/api/midori/html && ${COPYTREE_SHARE} \* ${DOCSDIR}/api/midori/html)
|
||||
.endif
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
SHA256 (xfce4/midori-0.4.4.tar.bz2) = fadd43f76c1c9f6a16483e60a804e58fb6817c6a595b1acdd59bcbdd7b35bca2
|
||||
SIZE (xfce4/midori-0.4.4.tar.bz2) = 939294
|
||||
SHA256 (xfce4/midori-0.4.5.tar.bz2) = 7b57cf3ebb56eef586351f2ae9f71ec9683aedff0b79a071b70b811d9876ff84
|
||||
SIZE (xfce4/midori-0.4.5.tar.bz2) = 950950
|
||||
|
|
|
|||
12
www/midori/files/patch-extensions__wscript_build
Normal file
12
www/midori/files/patch-extensions__wscript_build
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
--- extensions/wscript_build.orig 2012-04-14 21:17:35.000000000 +0200
|
||||
+++ extensions/wscript_build 2012-05-02 22:02:34.000000000 +0200
|
||||
@@ -4,7 +4,8 @@
|
||||
|
||||
import os
|
||||
|
||||
-extensions = os.listdir ('extensions')
|
||||
+exclude_files = ['external-download-manager.vala']
|
||||
+extensions = [i for i in os.listdir ('extensions') if i not in exclude_files]
|
||||
for extension in extensions:
|
||||
folder = 'extensions' + os.sep + extension
|
||||
if os.path.isdir (folder):
|
||||
|
|
@ -1,50 +0,0 @@
|
|||
--- midori/midori-websettings.c.orig 2012-03-08 23:34:45.000000000 +0100
|
||||
+++ midori/midori-websettings.c 2012-03-23 15:48:54.000000000 +0100
|
||||
@@ -27,6 +27,11 @@
|
||||
#include <sys/utsname.h>
|
||||
#endif
|
||||
|
||||
+#if defined(__FreeBSD__)
|
||||
+#include <sys/types.h>
|
||||
+#include <sys/sysctl.h>
|
||||
+#endif
|
||||
+
|
||||
struct _MidoriWebSettings
|
||||
{
|
||||
WebKitWebSettings parent_instance;
|
||||
@@ -347,16 +352,26 @@
|
||||
static gboolean
|
||||
midori_web_settings_low_memory_profile ()
|
||||
{
|
||||
- gchar* contents;
|
||||
- const gchar* total;
|
||||
- if (!g_file_get_contents ("/proc/meminfo", &contents, NULL, NULL))
|
||||
- return FALSE;
|
||||
- if (contents && (total = strstr (contents, "MemTotal:")) && *total)
|
||||
- {
|
||||
- const gchar* value = katze_skip_whitespace (total + 9);
|
||||
- gdouble mem_total = g_ascii_strtoll (value, NULL, 0);
|
||||
- return mem_total / 1024.0 < 352 + 1;
|
||||
- }
|
||||
+ #ifdef __FreeBSD__
|
||||
+ size_t size;
|
||||
+ int mem_total;
|
||||
+ size = sizeof mem_total;
|
||||
+
|
||||
+ sysctlbyname("hw.realmem", &mem_total, &size, NULL, 0);
|
||||
+
|
||||
+ return mem_total / 1048576 < 352;
|
||||
+ #else
|
||||
+ gchar* contents;
|
||||
+ const gchar* total;
|
||||
+ if (!g_file_get_contents ("/proc/meminfo", &contents, NULL, NULL))
|
||||
+ return FALSE;
|
||||
+ if (contents && (total = strstr (contents, "MemTotal:")) && *total)
|
||||
+ {
|
||||
+ const gchar* value = katze_skip_whitespace (total + 9);
|
||||
+ gdouble mem_total = g_ascii_strtoll (value, NULL, 0);
|
||||
+ return mem_total / 1024.0 < 352 + 1;
|
||||
+ }
|
||||
+ #endif
|
||||
return FALSE;
|
||||
}
|
||||
13
www/midori/files/patch-wscript
Normal file
13
www/midori/files/patch-wscript
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
--- wscript.orig 2012-04-14 21:17:35.000000000 +0200
|
||||
+++ wscript 2012-05-02 19:15:37.000000000 +0200
|
||||
@@ -104,8 +104,8 @@
|
||||
conf.check_tool ('compiler_cc')
|
||||
conf.check_tool ('vala')
|
||||
conf.check_tool ('glib2')
|
||||
- if not check_version (conf.env['VALAC_VERSION'], 0, 14, 0):
|
||||
- Utils.pprint ('RED', 'Vala 0.14.0 or later is required.')
|
||||
+ if not check_version (conf.env['VALAC_VERSION'], 0, 12, 0):
|
||||
+ Utils.pprint ('RED', 'Vala 0.12.0 or later is required.')
|
||||
sys.exit (1)
|
||||
|
||||
if option_enabled ('nls'):
|
||||
|
|
@ -44,7 +44,6 @@ share/applications/midori-private.desktop
|
|||
%%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze-katze-separatoraction.html
|
||||
%%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze-katze-throbber.html
|
||||
%%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze-katze-utils.html
|
||||
%%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze.devhelp
|
||||
%%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze.devhelp2
|
||||
%%APIDOCS%%%%DOCSDIR%%/api/katze/html/left.png
|
||||
%%APIDOCS%%%%DOCSDIR%%/api/katze/html/right.png
|
||||
|
|
@ -75,7 +74,6 @@ share/applications/midori-private.desktop
|
|||
%%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori-midori.html
|
||||
%%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori-socket.html
|
||||
%%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori-sokoke.html
|
||||
%%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori.devhelp
|
||||
%%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori.devhelp2
|
||||
%%APIDOCS%%%%DOCSDIR%%/api/midori/html/right.png
|
||||
%%APIDOCS%%%%DOCSDIR%%/api/midori/html/style.css
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue