Update to libfm 1.2.5

2 files changed, 41 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e2b284dba4dc..8a98cf3bb5fd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,26 @@
 pkgbase = libfm-directory_thumbnails
 	pkgdesc = Library for file management. Patched to allow directory thumbnails.
-	pkgver = 1.2.4
-	pkgrel = 2
-	url = https://github.com/lxde/libfm
+	pkgver = 1.2.5
+	pkgrel = 1
+	url = https://sourceforge.net/projects/pcmanfm/
 	arch = i686
 	arch = x86_64
 	license = GPL2
-	makedepends = git
 	makedepends = gtk-doc
-	makedepends = libexif
 	makedepends = intltool
 	makedepends = vala
+	depends = gtk2
+	depends = libexif
+	depends = libfm-extra=1.2.5
 	depends = menu-cache
-	provides = libfm=1.2.4
-	provides = libfm-extra=1.2.4
-	conflicts = libfm=1.2.4
-	conflicts = libfm-extra=1.2.4
-	source = git+https://github.com/lxde/libfm.git
+	provides = libfm=1.2.5
+	conflicts = libfm=1.2.5
+	source = https://downloads.sourceforge.net/pcmanfm/libfm-1.2.5.tar.xz
 	source = https://sourceforge.net/p/pcmanfm/bugs/1020/attachment/directory_thumbnails.patch
 	source = https://github.com/tsujan/libfm/commit/49150d1f66e1be15ac9fdcb4416e4f0cd06a9dd3.patch
-	sha256sums = SKIP
+	sha256sums = c706bb1020cf5f2d6f5a9226f692ce1985947134dcf2bde64278bd0420779b5a
 	sha256sums = 7065c345ae29762a6e3d75c6757b999c5d609a967f61522c15f6e85d8b4bc9ef
-	sha256sums = b288c7ba468e954f67dddc05c8447e1c6192c08069d564fa40724781a1caa709
+	sha256sums = 531a17d3673149b48622221fff997e1dd1d9eeea604902207ce95e8bcfee679d
 
 pkgname = libfm-directory_thumbnails
 
diff --git a/PKGBUILD b/PKGBUILD
index d85a83e51230..292f843d9dbe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,36 @@
 # Maintainer: Gabriel Cavallo <gabrielcavallo@mail.com>
 
-_name=libfm
 pkgname=libfm-directory_thumbnails
-pkgver=1.2.4
-pkgrel=2
+pkgver=1.2.5
+pkgrel=1
 pkgdesc='Library for file management. Patched to allow directory thumbnails.'
-depends=('menu-cache')
-makedepends=('git' 'gtk-doc' 'libexif' 'intltool' 'vala')
-provides=("$_name=$pkgver" "$_name-extra=$pkgver")
-conflicts=("$_name=$pkgver" "$_name-extra=$pkgver")
-url="https://github.com/lxde/$_name"
+depends=('gtk2' 'libexif' "libfm-extra=$pkgver" 'menu-cache')
+makedepends=('gtk-doc' 'intltool' 'vala')
+provides=("libfm=$pkgver")
+conflicts=("libfm=$pkgver")
+url='https://sourceforge.net/projects/pcmanfm/'
 arch=('i686' 'x86_64')
 license=('GPL2')
-source=("git+https://github.com/lxde/$_name.git"
-        "https://sourceforge.net/p/pcmanfm/bugs/1020/attachment/directory_thumbnails.patch"
+source=("https://downloads.sourceforge.net/pcmanfm/libfm-$pkgver.tar.xz"
+        'https://sourceforge.net/p/pcmanfm/bugs/1020/attachment/directory_thumbnails.patch'
         "https://github.com/tsujan/libfm/commit/49150d1f66e1be15ac9fdcb4416e4f0cd06a9dd3.patch")
-sha256sums=('SKIP'
+sha256sums=('c706bb1020cf5f2d6f5a9226f692ce1985947134dcf2bde64278bd0420779b5a'
             '7065c345ae29762a6e3d75c6757b999c5d609a967f61522c15f6e85d8b4bc9ef'
-            'b288c7ba468e954f67dddc05c8447e1c6192c08069d564fa40724781a1caa709')
+            '531a17d3673149b48622221fff997e1dd1d9eeea604902207ce95e8bcfee679d')
 
 prepare() {
-	cd "$srcdir/$_name"
-	patch -Np1 < "../directory_thumbnails.patch"
+	cd "$srcdir/libfm-$pkgver"
+	patch -Np1 < '../directory_thumbnails.patch'
 	patch -Np1 < "../49150d1f66e1be15ac9fdcb4416e4f0cd06a9dd3.patch"
 }
 
 build() {
-	cd "$srcdir/$_name"
-	./autogen.sh
+	cd "$srcdir/libfm-$pkgver"
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
-		--without-gtk \
-		--disable-gtk-doc \
-		--disable-udisks \
 		--enable-actions \
+		--enable-gtk-doc \
+		--with-gnu-ld
 
 	# https://bugzilla.gnome.org/show_bug.cgi?id=656231
 	sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
@@ -42,11 +39,24 @@ build() {
 }
 
 package() {
-	cd "$srcdir/$_name"
+	cd "$srcdir/libfm-$pkgver"
 
 	make DESTDIR="$pkgdir/" install
 
 	# Temporary fix to FS#32361
 	rm -rf "$pkgdir"/usr/include/libfm
 	mv "$pkgdir"/usr/include/libfm-1.0/ "$pkgdir"/usr/include/libfm
+
+	# libfm-extra
+	rm -rf "$pkgdir"/usr/include/libfm/fm-{extra,version,xml-file}.h \
+	       "$pkgdir"/usr/lib/libfm-extra.* \
+	       "$pkgdir"/usr/lib/pkgconfig/libfm-extra.pc
+
+	# libfm-gtk2
+	rm -rf "$pkgdir"/usr/bin \
+	       "$pkgdir"/usr/lib/libfm-gtk.* \
+	       "$pkgdir"/usr/lib/libfm/modules/gtk-* \
+	       "$pkgdir"/usr/lib/pkgconfig/libfm-gtk.pc \
+	       "$pkgdir"/usr/share/applications \
+	       "$pkgdir"/usr/share/man
 }