ports/167536: [UPDATE] www/midori to 0.4.5, compatible with Vala 0.12.x
Olivier Duchateau
duchateau.olivier at gmail.com
Wed May 2 21:20:10 UTC 2012
>Number: 167536
>Category: ports
>Synopsis: [UPDATE] www/midori to 0.4.5, compatible with Vala 0.12.x
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed May 02 21:20:09 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Olivier Duchateau
>Release: FreeBSD 8.2-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
Update of http://www.freebsd.org/cgi/query-pr.cgi?pr=166958
- Patch to avoid to install new extension 'external-download-manager.vala', because it's incompatible with Vala 0.12.x (default version in ports tree).
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -urN /usr/ports/www/midori/Makefile midori/Makefile
--- /usr/ports/www/midori/Makefile 2012-03-26 23:11:55.000000000 +0200
+++ midori/Makefile 2012-05-02 22:14:11.000000000 +0200
@@ -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 @@
.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>
diff -urN /usr/ports/www/midori/distinfo midori/distinfo
--- /usr/ports/www/midori/distinfo 2012-03-10 11:39:32.000000000 +0100
+++ midori/distinfo 2012-05-02 22:14:11.000000000 +0200
@@ -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
diff -urN /usr/ports/www/midori/files/patch-extensions__wscript_build midori/files/patch-extensions__wscript_build
--- /usr/ports/www/midori/files/patch-extensions__wscript_build 1970-01-01 01:00:00.000000000 +0100
+++ midori/files/patch-extensions__wscript_build 2012-05-02 22:14:11.000000000 +0200
@@ -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):
diff -urN /usr/ports/www/midori/files/patch-midori_midori-websettings.c midori/files/patch-midori_midori-websettings.c
--- /usr/ports/www/midori/files/patch-midori_midori-websettings.c 2012-03-26 23:11:55.000000000 +0200
+++ midori/files/patch-midori_midori-websettings.c 1970-01-01 01:00:00.000000000 +0100
@@ -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;
- }
diff -urN /usr/ports/www/midori/files/patch-wscript midori/files/patch-wscript
--- /usr/ports/www/midori/files/patch-wscript 1970-01-01 01:00:00.000000000 +0100
+++ midori/files/patch-wscript 2012-05-02 22:14:11.000000000 +0200
@@ -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'):
diff -urN /usr/ports/www/midori/pkg-plist midori/pkg-plist
--- /usr/ports/www/midori/pkg-plist 2012-03-10 11:39:32.000000000 +0100
+++ midori/pkg-plist 2012-05-02 22:14:11.000000000 +0200
@@ -44,7 +44,6 @@
%%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 @@
%%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
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list