Updated to 2.47

3 files changed, 8 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 13458fb27f53..15ab35eb8c47 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,16 @@
 # Generated by mksrcinfo v8
-# Mon Oct 24 11:13:03 UTC 2016
+# Tue Nov 29 11:33:21 UTC 2016
 pkgbase = gwyddion
 	pkgdesc = A data visualization and processing tool for scanning probe miscroscopy (SPM, i.e. AFM, STM, MFM, SNOM/NSOM, ...) and profilometry, useful also for general image and 2D data analysis
-	pkgver = 2.46
+	pkgver = 2.47
 	pkgrel = 1
 	url = http://gwyddion.net/
-	install = gwyddion.install
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = pkgconfig
-	depends = gtk2
 	depends = gtkglext
-	depends = desktop-file-utils
 	depends = pygtk
-	depends = hicolor-icon-theme
 	depends = openexr
 	depends = fftw
 	depends = libunique
@@ -29,10 +25,8 @@ pkgbase = gwyddion
 	optdepends = libwebp: WebP format support for the image export
 	optdepends = libzip: import of APE DAX, NanoObserver, NanoScanTech, OpenGPS and Sensofar PLUX data files
 	optdepends = cfitsio: import of Flexible Image Transport System (FITS) files
-	source = http://downloads.sourceforge.net/sourceforge/gwyddion/gwyddion-2.46.tar.xz
-	source = http://gwyddion.net/download/2.46/gwyddion-2.46-jpkscan-no-minizip.patch
-	sha256sums = 3f2600288b38e0253fccaff67a632c7dadbdec7f645200f0d86e1131662490e9
-	sha256sums = 53b30f10cb1d708bf6213a789259dd9748790c5e6670cd8b2c5ba3c205e48a67
+	source = http://downloads.sourceforge.net/sourceforge/gwyddion/gwyddion-2.47.tar.xz
+	sha256sums = e948abb3d281d49d3684e4c15d88c424dde11c71647bdbbba0a1d9fce74fa656
 
 pkgname = gwyddion
 
diff --git a/PKGBUILD b/PKGBUILD
index 96b6ba7d53d8..fe2cb20b36f7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,15 +2,14 @@
 # http://packages.gentoo.org/package/sci-visualization/gwyddion
 
 pkgname=gwyddion
-pkgver=2.46
+pkgver=2.47
 pkgrel=1
 pkgdesc="A data visualization and processing tool for scanning probe miscroscopy (SPM, i.e. AFM, STM, MFM, SNOM/NSOM, ...) and profilometry, useful also for general image and 2D data analysis"
 #A modular program for SPM (scanning probe microscopy) and other 2D (height field) data visualization and analysis"
 url="http://gwyddion.net/"
 license=("GPL")
 arch=('i686' 'x86_64')
-depends=(gtk2 gtkglext desktop-file-utils pygtk
-         hicolor-icon-theme openexr fftw libunique)
+depends=(gtkglext pygtk openexr fftw libunique)
 #depends=('freeglut' 'gtksourceview')
 makedepends=('pkgconfig')
 optdepends=('libxml2: import of SPML and APE DAX data files'
@@ -24,11 +23,8 @@ optdepends=('libxml2: import of SPML and APE DAX data files'
             'libwebp: WebP format support for the image export'
             'libzip: import of APE DAX, NanoObserver, NanoScanTech, OpenGPS and Sensofar PLUX data files'
             'cfitsio: import of Flexible Image Transport System (FITS) files')
-install=gwyddion.install
-source=(http://downloads.sourceforge.net/sourceforge/gwyddion/$pkgname-$pkgver.tar.xz
-        http://gwyddion.net/download/2.46/gwyddion-2.46-jpkscan-no-minizip.patch)
-sha256sums=('3f2600288b38e0253fccaff67a632c7dadbdec7f645200f0d86e1131662490e9'
-            '53b30f10cb1d708bf6213a789259dd9748790c5e6670cd8b2c5ba3c205e48a67')
+source=(http://downloads.sourceforge.net/sourceforge/gwyddion/$pkgname-$pkgver.tar.xz)
+sha256sums=('e948abb3d281d49d3684e4c15d88c424dde11c71647bdbbba0a1d9fce74fa656')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -39,7 +35,6 @@ prepare() {
       sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
   done
 
-  patch -Np1 -i "${srcdir}/gwyddion-2.46-jpkscan-no-minizip.patch"
 
 }
 
diff --git a/gwyddion.install b/gwyddion.install
deleted file mode 100644
index 05f59ae256c9..000000000000
--- a/gwyddion.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=gwyddion
-
-post_install() {
-  gconfpkg --install $pkgname
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  gconfpkg --uninstall $pkgname
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}