[arch-commits] Commit in gnome-disk-utility/repos (12 files)
Jan Steffens
heftig at archlinux.org
Sat Oct 1 17:02:00 UTC 2011
Date: Saturday, October 1, 2011 @ 13:02:00
Author: heftig
Revision: 139202
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
gnome-disk-utility/repos/extra-i686/PKGBUILD
(from rev 139201, gnome-disk-utility/trunk/PKGBUILD)
gnome-disk-utility/repos/extra-i686/fix-freeze.patch
(from rev 139201, gnome-disk-utility/trunk/fix-freeze.patch)
gnome-disk-utility/repos/extra-i686/gnome-disk-utility.install
(from rev 139201, gnome-disk-utility/trunk/gnome-disk-utility.install)
gnome-disk-utility/repos/extra-x86_64/PKGBUILD
(from rev 139201, gnome-disk-utility/trunk/PKGBUILD)
gnome-disk-utility/repos/extra-x86_64/fix-freeze.patch
(from rev 139201, gnome-disk-utility/trunk/fix-freeze.patch)
gnome-disk-utility/repos/extra-x86_64/gnome-disk-utility.install
(from rev 139201, gnome-disk-utility/trunk/gnome-disk-utility.install)
Deleted:
gnome-disk-utility/repos/extra-i686/PKGBUILD
gnome-disk-utility/repos/extra-i686/fix-freeze.patch
gnome-disk-utility/repos/extra-i686/gnome-disk-utility.install
gnome-disk-utility/repos/extra-x86_64/PKGBUILD
gnome-disk-utility/repos/extra-x86_64/fix-freeze.patch
gnome-disk-utility/repos/extra-x86_64/gnome-disk-utility.install
-----------------------------------------+
extra-i686/PKGBUILD | 84 ++++++++++++++++++------------
extra-i686/fix-freeze.patch | 64 +++++++++++-----------
extra-i686/gnome-disk-utility.install | 22 +++----
extra-x86_64/PKGBUILD | 84 ++++++++++++++++++------------
extra-x86_64/fix-freeze.patch | 64 +++++++++++-----------
extra-x86_64/gnome-disk-utility.install | 22 +++----
6 files changed, 190 insertions(+), 150 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2011-10-01 17:00:01 UTC (rev 139201)
+++ extra-i686/PKGBUILD 2011-10-01 17:02:00 UTC (rev 139202)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=gnome-disk-utility
-pkgver=3.0.2
-pkgrel=1
-pkgdesc="GNOME libraries and applications for dealing with storage devices"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org"
-depends=('dbus-glib' 'libgnome-keyring' 'libunique3' 'udisks' 'libnotify' 'hicolor-icon-theme' 'avahi')
-makedepends=('gtk-doc' 'intltool')
-options=('!libtool' '!emptydirs')
-install=gnome-disk-utility.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
- fix-freeze.patch)
-sha256sums=('7983f12ba04e84f164d0cae54bb06ed9b3ebe6c0a1c606d63d067fc395aeb0a5'
- '818b70360978968457d2c50738347c6726ed8d0c007eb57074881a7e33652526')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i "${srcdir}/fix-freeze.patch"
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --libexecdir=/usr/lib/gnome-disk-utility \
- --disable-scrollkeeper --disable-nautilus --disable-gtk-doc
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: gnome-disk-utility/repos/extra-i686/PKGBUILD (from rev 139201, gnome-disk-utility/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-10-01 17:02:00 UTC (rev 139202)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Silvio Knizek (killermoehre)
+
+pkgbase=gnome-disk-utility
+pkgname=(gnome-disk-utility libgdu)
+pkgver=3.0.2
+pkgrel=2
+pkgdesc="GNOME libraries and applications for dealing with storage devices"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.gnome.org"
+makedepends=('dbus-glib' 'libgnome-keyring' 'udisks' 'libunique3' 'libnotify' 'avahi'
+ 'hicolor-icon-theme' 'gtk-doc' 'intltool')
+options=('!libtool' '!emptydirs')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz
+ fix-freeze.patch)
+sha256sums=('7983f12ba04e84f164d0cae54bb06ed9b3ebe6c0a1c606d63d067fc395aeb0a5'
+ '818b70360978968457d2c50738347c6726ed8d0c007eb57074881a7e33652526')
+
+build() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ patch -Np1 -i "${srcdir}/fix-freeze.patch"
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --libexecdir=/usr/lib/gnome-disk-utility \
+ --disable-scrollkeeper --disable-nautilus --disable-static
+ make
+}
+
+package_gnome-disk-utility() {
+ depends=("libgdu=$pkgver-$pkgrel" 'libunique3' 'libnotify' 'hicolor-icon-theme' 'avahi')
+ groups=('gnome-extra')
+ install=gnome-disk-utility.install
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+
+### Split libgdu
+
+ mkdir -p "$srcdir"/libgdu/usr/{include/gnome-disk-utility,lib/pkgconfig}
+
+ mv "$pkgdir"/usr/lib/libgdu.so* "$srcdir/libgdu/usr/lib"
+ mv {"$pkgdir","$srcdir/libgdu"}/usr/include/gnome-disk-utility/gdu
+ mv {"$pkgdir","$srcdir/libgdu"}/usr/lib/pkgconfig/gdu.pc
+}
+
+package_libgdu() {
+ pkgdesc="$pkgdesc (library)"
+ depends=('dbus-glib' 'libgnome-keyring' 'udisks')
+
+ mv "$srcdir"/libgdu/* "$pkgdir"
+}
Deleted: extra-i686/fix-freeze.patch
===================================================================
--- extra-i686/fix-freeze.patch 2011-10-01 17:00:01 UTC (rev 139201)
+++ extra-i686/fix-freeze.patch 2011-10-01 17:02:00 UTC (rev 139202)
@@ -1,32 +0,0 @@
-From 82489b51443e1280dfb9fb251ea2693df1809aec Mon Sep 17 00:00:00 2001
-From: Pascal Terjan <pterjan at mandriva.com>
-Date: Mon, 3 May 2010 14:01:22 +0200
-Subject: [PATCH] Force GduPresentable ids to be UTF-8 (#616198)
-
-GduPresentable created in gdu pool include intheir id some strings
-in local encoding like _("Peripheral Devices"). This patch
-enforces them to be UTF-8.
-
-This fixes a crash of gvfs-gdu-volume-monitor when USB devices are
-available on a non UTF-8 system.
----
- src/gdu/gdu-pool.c | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/src/gdu/gdu-pool.c b/src/gdu/gdu-pool.c
-index bd5eccf..cf6be53 100644
---- a/src/gdu/gdu-pool.c
-+++ b/src/gdu/gdu-pool.c
-@@ -473,6 +473,9 @@ gdu_pool_class_init (GduPoolClass *klass)
- g_cclosure_marshal_VOID__OBJECT,
- G_TYPE_NONE, 1,
- GDU_TYPE_PRESENTABLE);
-+#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
-+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-+#endif
- }
-
- static void
---
-1.7.1
-
Copied: gnome-disk-utility/repos/extra-i686/fix-freeze.patch (from rev 139201, gnome-disk-utility/trunk/fix-freeze.patch)
===================================================================
--- extra-i686/fix-freeze.patch (rev 0)
+++ extra-i686/fix-freeze.patch 2011-10-01 17:02:00 UTC (rev 139202)
@@ -0,0 +1,32 @@
+From 82489b51443e1280dfb9fb251ea2693df1809aec Mon Sep 17 00:00:00 2001
+From: Pascal Terjan <pterjan at mandriva.com>
+Date: Mon, 3 May 2010 14:01:22 +0200
+Subject: [PATCH] Force GduPresentable ids to be UTF-8 (#616198)
+
+GduPresentable created in gdu pool include intheir id some strings
+in local encoding like _("Peripheral Devices"). This patch
+enforces them to be UTF-8.
+
+This fixes a crash of gvfs-gdu-volume-monitor when USB devices are
+available on a non UTF-8 system.
+---
+ src/gdu/gdu-pool.c | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/src/gdu/gdu-pool.c b/src/gdu/gdu-pool.c
+index bd5eccf..cf6be53 100644
+--- a/src/gdu/gdu-pool.c
++++ b/src/gdu/gdu-pool.c
+@@ -473,6 +473,9 @@ gdu_pool_class_init (GduPoolClass *klass)
+ g_cclosure_marshal_VOID__OBJECT,
+ G_TYPE_NONE, 1,
+ GDU_TYPE_PRESENTABLE);
++#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
++ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
++#endif
+ }
+
+ static void
+--
+1.7.1
+
Deleted: extra-i686/gnome-disk-utility.install
===================================================================
--- extra-i686/gnome-disk-utility.install 2011-10-01 17:00:01 UTC (rev 139201)
+++ extra-i686/gnome-disk-utility.install 2011-10-01 17:02:00 UTC (rev 139202)
@@ -1,11 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_remove() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
Copied: gnome-disk-utility/repos/extra-i686/gnome-disk-utility.install (from rev 139201, gnome-disk-utility/trunk/gnome-disk-utility.install)
===================================================================
--- extra-i686/gnome-disk-utility.install (rev 0)
+++ extra-i686/gnome-disk-utility.install 2011-10-01 17:02:00 UTC (rev 139202)
@@ -0,0 +1,11 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_remove() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2011-10-01 17:00:01 UTC (rev 139201)
+++ extra-x86_64/PKGBUILD 2011-10-01 17:02:00 UTC (rev 139202)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=gnome-disk-utility
-pkgver=3.0.2
-pkgrel=1
-pkgdesc="GNOME libraries and applications for dealing with storage devices"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org"
-depends=('dbus-glib' 'libgnome-keyring' 'libunique3' 'udisks' 'libnotify' 'hicolor-icon-theme' 'avahi')
-makedepends=('gtk-doc' 'intltool')
-options=('!libtool' '!emptydirs')
-install=gnome-disk-utility.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
- fix-freeze.patch)
-sha256sums=('7983f12ba04e84f164d0cae54bb06ed9b3ebe6c0a1c606d63d067fc395aeb0a5'
- '818b70360978968457d2c50738347c6726ed8d0c007eb57074881a7e33652526')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i "${srcdir}/fix-freeze.patch"
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --libexecdir=/usr/lib/gnome-disk-utility \
- --disable-scrollkeeper --disable-nautilus --disable-gtk-doc
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: gnome-disk-utility/repos/extra-x86_64/PKGBUILD (from rev 139201, gnome-disk-utility/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2011-10-01 17:02:00 UTC (rev 139202)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Silvio Knizek (killermoehre)
+
+pkgbase=gnome-disk-utility
+pkgname=(gnome-disk-utility libgdu)
+pkgver=3.0.2
+pkgrel=2
+pkgdesc="GNOME libraries and applications for dealing with storage devices"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.gnome.org"
+makedepends=('dbus-glib' 'libgnome-keyring' 'udisks' 'libunique3' 'libnotify' 'avahi'
+ 'hicolor-icon-theme' 'gtk-doc' 'intltool')
+options=('!libtool' '!emptydirs')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz
+ fix-freeze.patch)
+sha256sums=('7983f12ba04e84f164d0cae54bb06ed9b3ebe6c0a1c606d63d067fc395aeb0a5'
+ '818b70360978968457d2c50738347c6726ed8d0c007eb57074881a7e33652526')
+
+build() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ patch -Np1 -i "${srcdir}/fix-freeze.patch"
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --libexecdir=/usr/lib/gnome-disk-utility \
+ --disable-scrollkeeper --disable-nautilus --disable-static
+ make
+}
+
+package_gnome-disk-utility() {
+ depends=("libgdu=$pkgver-$pkgrel" 'libunique3' 'libnotify' 'hicolor-icon-theme' 'avahi')
+ groups=('gnome-extra')
+ install=gnome-disk-utility.install
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+
+### Split libgdu
+
+ mkdir -p "$srcdir"/libgdu/usr/{include/gnome-disk-utility,lib/pkgconfig}
+
+ mv "$pkgdir"/usr/lib/libgdu.so* "$srcdir/libgdu/usr/lib"
+ mv {"$pkgdir","$srcdir/libgdu"}/usr/include/gnome-disk-utility/gdu
+ mv {"$pkgdir","$srcdir/libgdu"}/usr/lib/pkgconfig/gdu.pc
+}
+
+package_libgdu() {
+ pkgdesc="$pkgdesc (library)"
+ depends=('dbus-glib' 'libgnome-keyring' 'udisks')
+
+ mv "$srcdir"/libgdu/* "$pkgdir"
+}
Deleted: extra-x86_64/fix-freeze.patch
===================================================================
--- extra-x86_64/fix-freeze.patch 2011-10-01 17:00:01 UTC (rev 139201)
+++ extra-x86_64/fix-freeze.patch 2011-10-01 17:02:00 UTC (rev 139202)
@@ -1,32 +0,0 @@
-From 82489b51443e1280dfb9fb251ea2693df1809aec Mon Sep 17 00:00:00 2001
-From: Pascal Terjan <pterjan at mandriva.com>
-Date: Mon, 3 May 2010 14:01:22 +0200
-Subject: [PATCH] Force GduPresentable ids to be UTF-8 (#616198)
-
-GduPresentable created in gdu pool include intheir id some strings
-in local encoding like _("Peripheral Devices"). This patch
-enforces them to be UTF-8.
-
-This fixes a crash of gvfs-gdu-volume-monitor when USB devices are
-available on a non UTF-8 system.
----
- src/gdu/gdu-pool.c | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/src/gdu/gdu-pool.c b/src/gdu/gdu-pool.c
-index bd5eccf..cf6be53 100644
---- a/src/gdu/gdu-pool.c
-+++ b/src/gdu/gdu-pool.c
-@@ -473,6 +473,9 @@ gdu_pool_class_init (GduPoolClass *klass)
- g_cclosure_marshal_VOID__OBJECT,
- G_TYPE_NONE, 1,
- GDU_TYPE_PRESENTABLE);
-+#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
-+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-+#endif
- }
-
- static void
---
-1.7.1
-
Copied: gnome-disk-utility/repos/extra-x86_64/fix-freeze.patch (from rev 139201, gnome-disk-utility/trunk/fix-freeze.patch)
===================================================================
--- extra-x86_64/fix-freeze.patch (rev 0)
+++ extra-x86_64/fix-freeze.patch 2011-10-01 17:02:00 UTC (rev 139202)
@@ -0,0 +1,32 @@
+From 82489b51443e1280dfb9fb251ea2693df1809aec Mon Sep 17 00:00:00 2001
+From: Pascal Terjan <pterjan at mandriva.com>
+Date: Mon, 3 May 2010 14:01:22 +0200
+Subject: [PATCH] Force GduPresentable ids to be UTF-8 (#616198)
+
+GduPresentable created in gdu pool include intheir id some strings
+in local encoding like _("Peripheral Devices"). This patch
+enforces them to be UTF-8.
+
+This fixes a crash of gvfs-gdu-volume-monitor when USB devices are
+available on a non UTF-8 system.
+---
+ src/gdu/gdu-pool.c | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/src/gdu/gdu-pool.c b/src/gdu/gdu-pool.c
+index bd5eccf..cf6be53 100644
+--- a/src/gdu/gdu-pool.c
++++ b/src/gdu/gdu-pool.c
+@@ -473,6 +473,9 @@ gdu_pool_class_init (GduPoolClass *klass)
+ g_cclosure_marshal_VOID__OBJECT,
+ G_TYPE_NONE, 1,
+ GDU_TYPE_PRESENTABLE);
++#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
++ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
++#endif
+ }
+
+ static void
+--
+1.7.1
+
Deleted: extra-x86_64/gnome-disk-utility.install
===================================================================
--- extra-x86_64/gnome-disk-utility.install 2011-10-01 17:00:01 UTC (rev 139201)
+++ extra-x86_64/gnome-disk-utility.install 2011-10-01 17:02:00 UTC (rev 139202)
@@ -1,11 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_remove() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
Copied: gnome-disk-utility/repos/extra-x86_64/gnome-disk-utility.install (from rev 139201, gnome-disk-utility/trunk/gnome-disk-utility.install)
===================================================================
--- extra-x86_64/gnome-disk-utility.install (rev 0)
+++ extra-x86_64/gnome-disk-utility.install 2011-10-01 17:02:00 UTC (rev 139202)
@@ -0,0 +1,11 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_remove() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
More information about the arch-commits
mailing list