Hello community, here is the log from the commit of package midori for openSUSE:Factory checked in at 2012-11-12 16:05:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/midori (Old) and /work/SRC/openSUSE:Factory/.midori.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "midori", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/midori/midori.changes 2012-05-16 21:08:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.midori.new/midori.changes 2012-11-12 16:05:31.000000000 +0100 @@ -1,0 +2,35 @@ +Mon Nov 12 10:50:21 UTC 2012 - g...@opensuse.org + +- added midori-fix-build-with-glib-lt-2.32.patch in order to fix + the build with glib < 2.32 + +------------------------------------------------------------------- +Sun Nov 11 16:39:21 UTC 2012 - g...@opensuse.org + +- added midori-work-around-vala-storing-uint64-in-pointer.patch in + order to work around vala trying to store a uint64 in a pointer + (lp#1053386) + +------------------------------------------------------------------- +Thu Sep 20 07:27:59 UTC 2012 - g...@opensuse.org + +- update to version 0.4.7 + + improved download functionality + * panel and statusbar consistently verify file integrity, + show size, remaining time and speed of a file + * an icon and expected file size are displayed before saving a + file + * external download managers are available in the preferences + * the origin of the file is clearly visible in order to counter + phishing sites which fake downloads + * optionally whole websites can now be saved including any + images, scripts and other resources + + SSL errors are now fatal by default and the colorful URL bar + has been removed + + GCR support has been added allowing detailed inspection of + certificates and sharing of trusted certificates between + applications using GCR + + HSTS support was added + + see the included ChangeLog for a detailed list of all changes + +------------------------------------------------------------------- Old: ---- midori-0.4.6.tar.bz2 New: ---- midori-0.4.7.tar.bz2 midori-fix-build-with-glib-lt-2.32.patch midori-work-around-vala-storing-uint64-in-pointer.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ midori.spec ++++++ --- /var/tmp/diff_new_pack.qF9Tht/_old 2012-11-12 16:05:32.000000000 +0100 +++ /var/tmp/diff_new_pack.qF9Tht/_new 2012-11-12 16:05:32.000000000 +0100 @@ -17,7 +17,7 @@ Name: midori -Version: 0.4.6 +Version: 0.4.7 Release: 0 Summary: Lightweight Webkit-based Web Browser License: LGPL-2.1 @@ -26,6 +26,10 @@ Source: http://archive.xfce.org/src/apps/%{name}/0.4/%{name}-%{version}.tar.bz2 # PATCH-FIX-OPENSUSE midori-0.4.2-workaround-vala-bug.patch g...@opensuse.org -- Works around a prolem with Vala generating a function for string.replace() that potentially returns random data Patch0: midori-0.4.2-workaround-vala-bug.patch +# PATCH-FIX-UPSTREAM midori-fix-build-with-glib-lt-2.32.patch g...@opensuse.org -- Fix build with glib < 2.32 +Patch1: midori-fix-build-with-glib-lt-2.32.patch +# PATCH-FIX-UPSTREAM midori-work-around-vala-storing-uint64-in-pointer.patch lp#1053386 g...@opensuse.org -- Work around vala trying to store a uint64 in a pointer +Patch2: midori-work-around-vala-storing-uint64-in-pointer.patch BuildRequires: docutils BuildRequires: gtk-doc BuildRequires: intltool @@ -35,17 +39,21 @@ BuildRequires: update-desktop-files # for valac BuildRequires: vala >= 0.14 +BuildRequires: pkgconfig(gcr-3) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gmodule-2.0) BuildRequires: pkgconfig(gthread-2.0) BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(javascriptcoregtk-1.0) +BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(sqlite3) +BuildRequires: pkgconfig(unique-1.0) BuildRequires: pkgconfig(webkit-1.0) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xscrnsaver) +BuildRequires: pkgconfig(zeitgeist-1.0) Requires: %{name}-branding = %{version} Recommends: %{name}-lang = %{version} Recommends: ca-certificates @@ -91,6 +99,8 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 awk '/^\[/ && $0 != "[Desktop Entry]" { exit } { print }' data/midori.desktop.in \ >data/midori.desktop.in.new mv data/midori.desktop.in.new data/midori.desktop.in @@ -172,6 +182,7 @@ %dir %{_datadir}/vala/vapi %{_datadir}/vala/vapi/history-list.* %{_datadir}/vala/vapi/external-download-manager.* +%{_datadir}/vala/vapi/delayed-load.* %files branding-upstream %defattr(-,root,root) ++++++ midori-0.4.2-workaround-vala-bug.patch ++++++ --- /var/tmp/diff_new_pack.qF9Tht/_old 2012-11-12 16:05:32.000000000 +0100 +++ /var/tmp/diff_new_pack.qF9Tht/_new 2012-11-12 16:05:32.000000000 +0100 @@ -1,8 +1,8 @@ -Index: midori-0.4.2/katze/midori-uri.vala +Index: midori-0.4.7/katze/midori-uri.vala =================================================================== ---- midori-0.4.2.orig/katze/midori-uri.vala -+++ midori-0.4.2/katze/midori-uri.vala -@@ -54,7 +54,13 @@ namespace Midori { +--- midori-0.4.7.orig/katze/midori-uri.vala ++++ midori-0.4.7/katze/midori-uri.vala +@@ -57,7 +57,13 @@ namespace Midori { string? unescaped = GLib.Uri.unescape_string (uri, "+"); if (unescaped == null) return uri; ++++++ midori-0.4.6.tar.bz2 -> midori-0.4.7.tar.bz2 ++++++ ++++ 120496 lines of diff (skipped) ++++++ midori-fix-build-with-glib-lt-2.32.patch ++++++ Index: midori-0.4.7/midori/midori-download.vala =================================================================== --- midori-0.4.7.orig/midori/midori-download.vala +++ midori-0.4.7/midori/midori-download.vala @@ -42,6 +42,12 @@ namespace Midori { return download.progress; } +#if !HAVE_GLIB_2_32 + private static string format_size (uint64 size) { + return format_size_for_display ((int64)size); + } +#endif + public static string get_tooltip (WebKit.Download download) { string filename = Path.get_basename (download.destination_uri); /* i18n: Download tooltip (size): 4KB of 43MB */ @@ -65,7 +71,6 @@ namespace Midori { string minutes_ = ngettext ("%d minute", "%d minutes", minutes).printf (minutes); string seconds_ = ngettext ("%d second", "%d seconds", seconds).printf (seconds); double last_time = download.get_data<int> ("last-time"); - uint64 last_size = download.get_data<uint64> ("last-size"); string eta = ""; if (estimated > 0) { @@ -82,7 +87,8 @@ namespace Midori { eta = _(" - %s remaining").printf (eta); } - string speed; + string speed = ""; + uint64 last_size = download.get_data<uint64> ("last-size"); if (elapsed != last_time) { speed = format_size ((uint64)( (current_size - last_size) / (elapsed - last_time))); @@ -92,6 +98,7 @@ namespace Midori { speed = _("?B"); /* i18n: Download tooltip (transfer rate): (130KB/s) */ speed = _(" (%s/s)").printf (speed); + if (elapsed - last_time > 5.0) { download.set_data<int> ("last-time", (int)elapsed); download.set_data<uint64> ("last-size", current_size); Index: midori-0.4.7/wscript =================================================================== --- midori-0.4.7.orig/wscript +++ midori-0.4.7/wscript @@ -242,6 +242,8 @@ def configure (conf): check_pkg ('gmodule-2.0', '2.8.0', False) check_pkg ('gthread-2.0', '2.8.0', False) check_pkg ('gio-2.0', '2.22.0') + if check_version (conf.check_cfg (modversion='gio-2.0'), 2, 32, 0): + conf.env.append_value ('VALAFLAGS', '-D HAVE_GLIB_2_32') args = '' if Options.platform == 'win32': args = '--define-variable=target=win32' ++++++ midori-work-around-vala-storing-uint64-in-pointer.patch ++++++ Index: midori-0.4.7/midori/midori-download.vala =================================================================== --- midori-0.4.7.orig/midori/midori-download.vala +++ midori-0.4.7/midori/midori-download.vala @@ -88,12 +88,14 @@ namespace Midori { } string speed = ""; +#if 0 uint64 last_size = download.get_data<uint64> ("last-size"); if (elapsed != last_time) { speed = format_size ((uint64)( (current_size - last_size) / (elapsed - last_time))); } else +#endif /* i18n: Unknown number of bytes, used for transfer rate like ?B/s */ speed = _("?B"); /* i18n: Download tooltip (transfer rate): (130KB/s) */ @@ -101,7 +103,9 @@ namespace Midori { if (elapsed - last_time > 5.0) { download.set_data<int> ("last-time", (int)elapsed); +#if 0 download.set_data<uint64> ("last-size", current_size); +#endif } return "%s\n%s %s%s".printf (filename, size, speed, eta); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
