diff options
| author | Jack Nagel | 2012-09-04 13:43:37 -0500 |
|---|---|---|
| committer | Jack Nagel | 2012-09-04 14:30:42 -0500 |
| commit | 607333af3538ab290057075fcaa2d52f2451a1f5 (patch) | |
| tree | c3fa92c5a4bc376973269ab5b6cf899a83b367de /Library/Formula | |
| parent | a9f156399dceff9c55a2f4763d05e2dc6424a3f3 (diff) | |
| download | homebrew-607333af3538ab290057075fcaa2d52f2451a1f5.tar.bz2 | |
pan: fix compilation on 64-bit
Fixes #14336.
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/pan.rb | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/Library/Formula/pan.rb b/Library/Formula/pan.rb index 2bafda34f..0002b516d 100644 --- a/Library/Formula/pan.rb +++ b/Library/Formula/pan.rb @@ -13,6 +13,9 @@ class Pan < Formula depends_on 'd-bus' => :optional depends_on 'gnutls' => :optional + # Fix compilation on 64-bit; see https://bugzilla.gnome.org/show_bug.cgi?id=673813 + def patches; DATA end + def install ENV.append 'LDFLAGS', ' -liconv ' # iconv detection is broken. @@ -23,3 +26,29 @@ class Pan < Formula system "make install" end end + +__END__ +diff --git a/pan/gui/gui.cc b/pan/gui/gui.cc +index 2e01ae8..fa7d500 100644 +--- a/pan/gui/gui.cc ++++ b/pan/gui/gui.cc +@@ -2223,8 +2223,8 @@ GUI :: set_queue_size_label (unsigned int running, + + // build the tooltip + // todo : perhaps fix this for mac osx automatically.... +- gulong queued, unused, stopped; +- guint64 KiB_remain; ++ unsigned long queued, unused, stopped; ++ uint64_t KiB_remain; + double KiBps; + int hr, min, sec; + _queue.get_stats (queued, unused, stopped, +@@ -2232,7 +2232,7 @@ GUI :: set_queue_size_label (unsigned int running, + hr, min, sec); + + g_snprintf (tip, sizeof(tip), _("%lu tasks, %s, %.1f KiBps, ETA %d:%02d:%02d"), +- (running+queued), render_bytes(KiB_remain), KiBps, hr, min, sec); ++ static_cast<gulong>(running+queued), render_bytes(static_cast<guint64>(KiB_remain)), KiBps, hr, min, sec); + + // update the gui + gtk_label_set_text (GTK_LABEL(_queue_size_label), str); |
