Hello community, here is the log from the commit of package midori for openSUSE:Factory checked in at 2013-04-17 23:07:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-04-08 14:54:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.midori.new/midori.changes 2013-04-17 23:07:17.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Apr 17 11:27:22 UTC 2013 - [email protected] + +- replace midori-work-around-vala-storing-uint64-in-pointer.patch + with midori-fix-storing-uint64-in-pointer.patch which contains an + actual fix + +------------------------------------------------------------------- Old: ---- midori-work-around-vala-storing-uint64-in-pointer.patch New: ---- midori-fix-storing-uint64-in-pointer.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ midori.spec ++++++ --- /var/tmp/diff_new_pack.BKYDeo/_old 2013-04-17 23:07:18.000000000 +0200 +++ /var/tmp/diff_new_pack.BKYDeo/_new 2013-04-17 23:07:18.000000000 +0200 @@ -23,9 +23,9 @@ License: LGPL-2.1 Group: Productivity/Networking/Web/Browsers Url: http://twotoasts.de/index.php?/pages/midori_summary.html -Source: http://archive.xfce.org/src/apps/%{name}/0.4/%{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM midori-work-around-vala-storing-uint64-in-pointer.patch lp#1053386 [email protected] -- Work around vala trying to store a uint64 in a pointer -Patch0: midori-work-around-vala-storing-uint64-in-pointer.patch +Source: http://archive.xfce.org/src/apps/%{name}/0.5/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM midori-fix-storing-uint64-in-pointer.patch lp#1053386 [email protected] -- Do not store a uint64 in a pointer (backported from upstream git) +Patch0: midori-fix-storing-uint64-in-pointer.patch BuildRequires: docutils BuildRequires: gtk-doc BuildRequires: intltool ++++++ midori-fix-storing-uint64-in-pointer.patch ++++++ >From 8a1d08d4f5488ec6e3399410e69726bcb446a39a Mon Sep 17 00:00:00 2001 From: Christian Dywan <[email protected]> Date: Tue, 16 Apr 2013 22:14:38 +0000 Subject: Ensure that download last-size is stored as a pointer Fixes: https://bugs.launchpad.net/midori/+bug/1053386 --- diff --git a/midori/midori-download.vala b/midori/midori-download.vala index 951332b..bbf485e 100644 --- a/midori/midori-download.vala +++ b/midori/midori-download.vala @@ -97,7 +97,7 @@ namespace Midori { } string speed = ""; - uint64 last_size = download.get_data<uint64> ("last-size"); + uint64? last_size = download.get_data<uint64?> ("last-size"); if (elapsed != last_time) { speed = format_size ((uint64)( (current_size - last_size) / (elapsed - last_time))); @@ -110,7 +110,7 @@ namespace Midori { if (elapsed - last_time > 5.0) { download.set_data<int> ("last-time", (int)elapsed); - download.set_data<uint64> ("last-size", current_size); + download.set_data<uint64?> ("last-size", current_size); } return "%s\n%s %s%s".printf (filename, size, speed, eta); -- cgit v0.9.1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
