diff --git a/common/shlibs b/common/shlibs index 77a3c32638..1e91416221 100644 --- a/common/shlibs +++ b/common/shlibs @@ -575,8 +575,6 @@ libexempi.so.3 exempi exempi-devel libatasmart.so.4 libatasmart libatasmart-devel libsgutils2.so.2 libsgutils sg3_utils-devel liblvm2app.so.2.2 liblvm2app liblvm2app-devel -libgdu.so.0 gnome-disk-utility gnome-disk-utility-devel -libgdu-gtk.so.0 gnome-disk-utility gnome-disk-utility-devel libcpufreq.so.0 libcpufreq libcpufreq-devel libgucharmap_2_90.so.7 gucharmap gucharmap-devel libgphoto2.so.2 libgphoto2 libgphoto2-devel diff --git a/srcpkgs/gnome-disk-utility-devel b/srcpkgs/gnome-disk-utility-devel deleted file mode 120000 index 6f66846e60..0000000000 --- a/srcpkgs/gnome-disk-utility-devel +++ /dev/null @@ -1 +0,0 @@ -gnome-disk-utility \ No newline at end of file diff --git a/srcpkgs/gnome-disk-utility/depends b/srcpkgs/gnome-disk-utility/depends deleted file mode 100644 index 0edbddbd1a..0000000000 --- a/srcpkgs/gnome-disk-utility/depends +++ /dev/null @@ -1,2 +0,0 @@ -abi_depends=">=2.91.6" -api_depends="${abi_depends}" diff --git a/srcpkgs/gnome-disk-utility/gnome-disk-utility-devel.template b/srcpkgs/gnome-disk-utility/gnome-disk-utility-devel.template deleted file mode 100644 index 2b91366781..0000000000 --- a/srcpkgs/gnome-disk-utility/gnome-disk-utility-devel.template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'gnome-disk-utility-devel'. -# -short_desc="${sourcepkg} (development files)" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - -revision=1 - -Add_dependency run glib-devel -Add_dependency run gnome-disk-utility - -do_install() -{ - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib -} diff --git a/srcpkgs/gnome-disk-utility/gnome-disk-utility.rshlibs b/srcpkgs/gnome-disk-utility/gnome-disk-utility.rshlibs index adf01bab92..0cd574d12a 100644 --- a/srcpkgs/gnome-disk-utility/gnome-disk-utility.rshlibs +++ b/srcpkgs/gnome-disk-utility/gnome-disk-utility.rshlibs @@ -1,4 +1,3 @@ -libunique-3.0.so.0 libgtk-3.so.0 libgdk-3.so.0 libgio-2.0.so.0 @@ -6,25 +5,9 @@ libgobject-2.0.so.0 libglib-2.0.so.0 libpthread.so.0 libc.so.6 -libnotify.so.4 -libgthread-2.0.so.0 -libdbus-glib-1.so.2 -libdbus-1.so.3 -libgnome-keyring.so.0 -libatasmart.so.4 -libavahi-ui-gtk3.so.0 -libavahi-common.so.3 -libavahi-client.so.3 -libavahi-glib.so.1 -libnautilus-extension.so.1 -libatk-1.0.so.0 -libpangoft2-1.0.so.0 libpangocairo-1.0.so.0 libgdk_pixbuf-2.0.so.0 -libcairo-gobject.so.2 libcairo.so.2 libpango-1.0.so.0 -libfreetype.so.6 -libfontconfig.so.1 -libgmodule-2.0.so.0 -librt.so.1 +libm.so.6 +libudisks2.so.0 diff --git a/srcpkgs/gnome-disk-utility/patches/fix-freeze.patch b/srcpkgs/gnome-disk-utility/patches/fix-freeze.patch deleted file mode 100644 index c25a63077c..0000000000 --- a/srcpkgs/gnome-disk-utility/patches/fix-freeze.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 82489b51443e1280dfb9fb251ea2693df1809aec Mon Sep 17 00:00:00 2001 -From: Pascal Terjan -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 ---- src/gdu/gdu-pool.c.orig -+++ 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 - diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template index 7bc0fd54ed..47ff0ef241 100644 --- a/srcpkgs/gnome-disk-utility/template +++ b/srcpkgs/gnome-disk-utility/template @@ -1,16 +1,14 @@ # Template file for 'gnome-disk-utility' pkgname=gnome-disk-utility -version=3.0.2 -revision=3 -distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2" +version=3.3.93 +distfiles="${GNOME_SITE}/$pkgname/3.3/$pkgname-$version.tar.xz" build_style=gnu-configure -configure_args="--disable-scrollkeeper --disable-gtk-doc ---disable-static" +configure_args="--disable-static" short_desc="GNOME libraries and applications for dealing with storage devices" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -checksum=1d80c313782f0d7f78d40c60687033f510126b09c67367a28f1bf272ef2dafc0 +checksum=714d6a986ae04762d1a4ee6696ae3869f301e82a23701e2d4378e4263e04f20f long_desc=" palimpsest (from the gnome-disk-utility project) is a tool to manage disk drives and media: @@ -19,36 +17,15 @@ long_desc=" * Mount and unmount partitions. * Query S.M.A.R.T. attributes. - It utilizes udisks." + It utilizes udisks2." gtk_iconcache_dirs="/usr/share/icons/hicolor" -subpackages="$pkgname-devel" + +Add_dependency run hicolor-icon-theme +Add_dependency run desktop-file-utils Add_dependency build pkg-config Add_dependency build intltool Add_dependency build gnome-doc-utils -Add_dependency build dbus-glib-devel -Add_dependency build dbus-devel -Add_dependency build libgnome-keyring-devel -Add_dependency build libatasmart-devel -Add_dependency build avahi-ui-libs-devel -Add_dependency build avahi-libs-devel -Add_dependency build avahi-glib-libs-devel -Add_dependency build nautilus-devel Add_dependency build gtk+3-devel -Add_dependency build atk-devel -Add_dependency build glib-devel -Add_dependency build pango-devel -Add_dependency build gdk-pixbuf-devel -Add_dependency build libpng-devel -Add_dependency build cairo-devel -Add_dependency build freetype-devel -Add_dependency build fontconfig-devel -Add_dependency build libunique-devel -Add_dependency build libX11-devel -Add_dependency build libnotify-devel -Add_dependency build gdbm-devel - -Add_dependency full udisks -Add_dependency full hicolor-icon-theme -Add_dependency full desktop-file-utils +Add_dependency build udisks2-devel