Thu May 30 01:31:56 PDT 2013

2 files changed, 111 insertions, 5 deletions

diff --git a/extra/gnome-disk-utility/PKGBUILD b/extra/gnome-disk-utility/PKGBUILD
index 539c077fa..76b52c8a7 100644
--- a/extra/gnome-disk-utility/PKGBUILD
+++ b/extra/gnome-disk-utility/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 183379 2013-04-21 22:09:51Z heftig $
+# $Id: PKGBUILD 186559 2013-05-29 01:23:46Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Silvio Knizek (killermoehre)
 
 pkgname=gnome-disk-utility
-pkgver=3.8.0
-pkgrel=2
+pkgver=3.8.2
+pkgrel=1
 pkgdesc="Disk Management Utility for GNOME"
 arch=(i686 x86_64)
 license=(GPL)
@@ -14,8 +14,17 @@ depends=(udisks2 gtk3 libsecret libpwquality libcanberra libdvdread libnotify hi
 makedepends=(intltool docbook-xsl gnome-settings-daemon)
 options=('!libtool' '!emptydirs')
 install=gnome-disk-utility.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('2657aad8d06e5511bc34ee5ec1ff9426f70b7140b8687be528f693175759bd5e')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        typefixes.patch)
+sha256sums=('6a64de6f40ddfebfe7566f3ef7856c1cb33fab7d21d9be43db74f014309298c3'
+            '0a1f2f80f1c741119639b3b2b8cf32d6261b126baa85189309d6473e171894d2')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  # Gets rid of warnings and compilation errors on i686
+  patch -Np1 -i ../typefixes.patch
+}
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-disk-utility/typefixes.patch b/extra/gnome-disk-utility/typefixes.patch
new file mode 100644
index 000000000..79439e4de
--- /dev/null
+++ b/extra/gnome-disk-utility/typefixes.patch
@@ -0,0 +1,97 @@
+diff -u -r gnome-disk-utility-3.8.2/src/disks/gducreatediskimagedialog.c gnome-disk-utility-3.8.2-typefixes/src/disks/gducreatediskimagedialog.c
+--- gnome-disk-utility-3.8.2/src/disks/gducreatediskimagedialog.c	2013-05-14 07:15:48.000000000 +0200
++++ gnome-disk-utility-3.8.2-typefixes/src/disks/gducreatediskimagedialog.c	2013-05-29 03:17:37.201963964 +0200
+@@ -610,7 +610,7 @@
+                                   error))
+     {
+       g_prefix_error (error,
+-                      "Error writing %" G_GUINT64_FORMAT " bytes to offset %" G_GUINT64_FORMAT ": ",
++                      "Error writing %" G_GSIZE_FORMAT " bytes to offset %" G_GUINT64_FORMAT ": ",
+                       num_bytes_to_write,
+                       offset);
+       goto out;
+diff -u -r gnome-disk-utility-3.8.2/src/disks/gducreatefilesystemwidget.c gnome-disk-utility-3.8.2-typefixes/src/disks/gducreatefilesystemwidget.c
+--- gnome-disk-utility-3.8.2/src/disks/gducreatefilesystemwidget.c	2013-05-14 07:15:48.000000000 +0200
++++ gnome-disk-utility-3.8.2-typefixes/src/disks/gducreatefilesystemwidget.c	2013-05-29 03:18:30.224935009 +0200
+@@ -429,7 +429,7 @@
+   if (widget->drive != NULL && udisks_drive_get_removable (widget->drive))
+     {
+       /* default FAT for flash and disks/media smaller than 20G (assumed to be flash cards) */
+-      if (is_flash (widget->drive) || udisks_drive_get_size (widget->drive) < 20L * 1000L*1000L*1000L)
++      if (is_flash (widget->drive) || udisks_drive_get_size (widget->drive) < (guint64)(20ULL * 1000ULL*1000ULL*1000ULL))
+         {
+           gtk_combo_box_set_active_id (GTK_COMBO_BOX (widget->type_combobox), "vfat");
+         }
+diff -u -r gnome-disk-utility-3.8.2/src/disks/gduformatdiskdialog.c gnome-disk-utility-3.8.2-typefixes/src/disks/gduformatdiskdialog.c
+--- gnome-disk-utility-3.8.2/src/disks/gduformatdiskdialog.c	2013-05-14 07:15:48.000000000 +0200
++++ gnome-disk-utility-3.8.2-typefixes/src/disks/gduformatdiskdialog.c	2013-05-29 03:17:37.338629696 +0200
+@@ -293,7 +293,7 @@
+   /* Default to MBR for removable drives < 2TB... GPT otherwise */
+   if (data->drive != NULL &&
+       udisks_drive_get_removable (data->drive) &&
+-      udisks_drive_get_size (data->drive) < 2 * 1000L*1000L*1000L*1000L)
++      udisks_drive_get_size (data->drive) < (guint64)(2ULL * 1000ULL*1000ULL*1000ULL*1000ULL))
+     {
+       gtk_combo_box_set_active_id (GTK_COMBO_BOX (data->type_combobox), "dos");
+     }
+diff -u -r gnome-disk-utility-3.8.2/src/disks/gdupartitiondialog.c gnome-disk-utility-3.8.2-typefixes/src/disks/gdupartitiondialog.c
+--- gnome-disk-utility-3.8.2/src/disks/gdupartitiondialog.c	2013-05-14 07:15:48.000000000 +0200
++++ gnome-disk-utility-3.8.2-typefixes/src/disks/gdupartitiondialog.c	2013-05-29 03:17:37.338629696 +0200
+@@ -91,11 +91,11 @@
+       if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->bootable_checkbutton)))
+         flags |= (1UL<<2);
+       if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->readonly_checkbutton)))
+-        flags |= (1UL<<60);
++        flags |= (1ULL<<60);
+       if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->hidden_checkbutton)))
+-        flags |= (1UL<<62);
++        flags |= (1ULL<<62);
+       if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->do_not_automount_checkbutton)))
+-        flags |= (1UL<<63);
++        flags |= (1ULL<<63);
+     }
+   else if (g_strcmp0 (data->partition_table_type, "dos") == 0)
+     {
+@@ -245,9 +245,9 @@
+       flags = udisks_partition_get_flags (data->partition);
+       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->system_checkbutton),           (flags & (1UL<< 0)) != 0);
+       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->bootable_checkbutton),         (flags & (1UL<< 2)) != 0);
+-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->readonly_checkbutton),         (flags & (1UL<<60)) != 0);
+-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->hidden_checkbutton),           (flags & (1UL<<62)) != 0);
+-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->do_not_automount_checkbutton), (flags & (1UL<<63)) != 0);
++      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->readonly_checkbutton),         (flags & (1ULL<<60)) != 0);
++      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->hidden_checkbutton),           (flags & (1ULL<<62)) != 0);
++      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->do_not_automount_checkbutton), (flags & (1ULL<<63)) != 0);
+     }
+   else if (g_strcmp0 (data->partition_table_type, "dos") == 0)
+     {
+diff -u -r gnome-disk-utility-3.8.2/src/disks/gdurestorediskimagedialog.c gnome-disk-utility-3.8.2-typefixes/src/disks/gdurestorediskimagedialog.c
+--- gnome-disk-utility-3.8.2/src/disks/gdurestorediskimagedialog.c	2013-05-14 07:15:48.000000000 +0200
++++ gnome-disk-utility-3.8.2-typefixes/src/disks/gdurestorediskimagedialog.c	2013-05-29 03:17:37.485295361 +0200
+@@ -587,7 +587,7 @@
+                                     &error))
+         {
+           g_prefix_error (&error,
+-                          "Error reading %" G_GUINT64_FORMAT " bytes from offset %" G_GUINT64_FORMAT ": ",
++                          "Error reading %" G_GSIZE_FORMAT " bytes from offset %" G_GUINT64_FORMAT ": ",
+                           num_bytes_to_read,
+                           num_bytes_completed);
+           goto out;
+@@ -595,7 +595,7 @@
+       if (num_bytes_read != num_bytes_to_read)
+         {
+           g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED,
+-                       "Requested %" G_GUINT64_FORMAT " bytes from offset %" G_GUINT64_FORMAT " but only read %" G_GUINT64_FORMAT " bytes",
++                       "Requested %" G_GSIZE_FORMAT " bytes from offset %" G_GUINT64_FORMAT " but only read %" G_GSIZE_FORMAT " bytes",
+                        num_bytes_read,
+                        num_bytes_completed,
+                        num_bytes_to_read);
+@@ -610,7 +610,7 @@
+             goto copy_write_again;
+ 
+           g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED,
+-                       "Error writing %" G_GUINT64_FORMAT " bytes to offset %" G_GUINT64_FORMAT ": %m",
++                       "Error writing %" G_GSIZE_FORMAT " bytes to offset %" G_GUINT64_FORMAT ": %m",
+                        num_bytes_read,
+                        num_bytes_completed);
+           goto out;