# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1555598255 -10800
# Node ID 1ab1022f15c724963692b036c17bbe44ec2202f1
# Parent  8f42e5ca1910c3b51a5785dc85848d8e253c65c8
3) libfm: up (1.3.1)

diff -r 8f42e5ca1910 -r 1ab1022f15c7 libfm-dev/receipt
--- a/libfm-dev/receipt	Thu Apr 18 17:35:09 2019 +0300
+++ b/libfm-dev/receipt	Thu Apr 18 17:37:35 2019 +0300
@@ -1,22 +1,22 @@
 # SliTaz package receipt.
 
 PACKAGE="libfm-dev"
-VERSION="1.2.5"
+VERSION="1.3.1"
 CATEGORY="development"
 SHORT_DESC="File management support (GTK+ GUI development files)"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://pcmanfm.sourceforge.net"
 WANTED="libfm"
 HOST_ARCH="i486 arm"
 
-DEPENDS="libfm pkg-config glib-dev libgio-dev"
+DEPENDS="libfm libfm-gtk pkg-config glib-dev libgio-dev"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	cp -a $install/usr/include $fs/usr
-	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
-	cp -a $install/usr/lib/*a $fs/usr/lib
+	cp -a $install/usr/include       $fs/usr/
+	cp -a $install/usr/lib/pkgconfig $fs/usr/lib/
+	cp -a $install/usr/lib/*.la      $fs/usr/lib/
 }
diff -r 8f42e5ca1910 -r 1ab1022f15c7 libfm-gtk/receipt
--- a/libfm-gtk/receipt	Thu Apr 18 17:35:09 2019 +0300
+++ b/libfm-gtk/receipt	Thu Apr 18 17:37:35 2019 +0300
@@ -1,10 +1,10 @@
 # SliTaz package receipt.
 
 PACKAGE="libfm-gtk"
-VERSION="1.2.5"
+VERSION="1.3.1"
 CATEGORY="system-tools"
 SHORT_DESC="File management support (GTK+2 GUI library)"
-MAINTAINER="al.bobylev@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://pcmanfm.sourceforge.net"
 
@@ -15,9 +15,9 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib/libfm/modules $fs/usr/share/libfm
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/lib/libfm-gtk.so* $fs/usr/lib
-	cp -a $install/usr/lib/libfm/modules/gtk* $fs/usr/lib/libfm/modules
-	cp -a $install/usr/share/applications $fs/usr/share
-	cp -a $install/usr/share/libfm/images $install/usr/share/libfm/ui $fs/usr/share/libfm
+	cp -a $install/usr/bin                    $fs/usr/
+	cp -a $install/usr/lib/libfm-gtk.so*      $fs/usr/lib/
+	cp -a $install/usr/lib/libfm/modules/gtk* $fs/usr/lib/libfm/modules/
+	cp -a $install/usr/share/applications     $fs/usr/share/
+	cp -a $install/usr/share/libfm/images $install/usr/share/libfm/ui $fs/usr/share/libfm/
 }
diff -r 8f42e5ca1910 -r 1ab1022f15c7 libfm/receipt
--- a/libfm/receipt	Thu Apr 18 17:35:09 2019 +0300
+++ b/libfm/receipt	Thu Apr 18 17:37:35 2019 +0300
@@ -1,16 +1,16 @@
 # SliTaz package receipt.
 
 PACKAGE="libfm"
-VERSION="1.2.5"
+VERSION="1.3.1"
 CATEGORY="system-tools"
 SHORT_DESC="File management support (core library)"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WEB_SITE="http://pcmanfm.sourceforge.net"
-WGET_URL="$SF_MIRROR/pcmanfm/files/$TARBALL"
-EXTRA_SOURCE_FILES="$PACKAGE-reversepatch_SF949_7daeaf3.u" # Really fix segfault
-WGET_URL2="https://github.com/lxde/libfm/commit/7daeaf3.patch"
+WGET_URL="$SF_MIRROR/pcmanfm/$TARBALL"
+#EXTRA_SOURCE_FILES="$PACKAGE-reversepatch_SF949_7daeaf3.u" # Really fix segfault
+#WGET_URL2="https://github.com/lxde/libfm/commit/7daeaf3.patch"
 #WGETURL3="https://github.com/lxde/libfm/commit/2c00984.patch" #narrow icon cell
 HOST_ARCH="i486 arm"
 GENERIC_MENUS="no"
@@ -28,28 +28,29 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	[ -s $SOURCES_REPOSITORY/$EXTRA_SOURCE_FILES ] || \
-		wget -O $SOURCES_REPOSITORY/$EXTRA_SOURCE_FILES $WGET_URL2
-	patch -p1 -R -i $SOURCES_REPOSITORY/$EXTRA_SOURCE_FILES
-	# fix freeze when using custom action with "inode/directory":
-	sed 's|TRUE, 0.5, 0.0|FALSE, 0.0f, 0.0f|' -i src/gtk/fm-standard-view.c
+#	[ -s $SOURCES_REPOSITORY/$EXTRA_SOURCE_FILES ] || \
+#		wget -O $SOURCES_REPOSITORY/$EXTRA_SOURCE_FILES $WGET_URL2
+#	patch -p1 -R -i $SOURCES_REPOSITORY/$EXTRA_SOURCE_FILES
+#	# fix freeze when using custom action with "inode/directory":
+#	sed 's|TRUE, 0.5, 0.0|FALSE, 0.0f, 0.0f|' -i src/gtk/fm-standard-view.c
 	./configure \
 		--sysconfdir=/etc \
+		--disable-static \
 		$CONFIGURE_ARGS &&
-	make && make install
+	make && make install || return 1
+
+	# remove libfm-extra files (already provided by libfm-extra package)
+	rm $install/usr/lib/libfm-extra.* $install/usr/lib/pkgconfig/libfm-extra.pc
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib/libfm/modules $fs/usr/share/libfm
-	cp -a $install/etc $fs
-	cp -a $install/usr/lib/libfm.so* $fs/usr/lib
-	cp -a $install/usr/lib/libfm-extra.so* $fs/usr/lib
-	cp -a $install/usr/lib/libfm/modules/vfs* $fs/usr/lib/libfm/modules
-	cp -a $install/usr/share/libfm/*.list $fs/usr/share/libfm
-	sed "s|application/deb;$|&application/x-xz-compressed-tar;|" -i \
-		$fs/usr/share/libfm/archivers.list
+	cp -a $install/etc                        $fs/
+	cp -a $install/usr/lib/libfm.so*          $fs/usr/lib/
+	cp -a $install/usr/lib/libfm/modules/vfs* $fs/usr/lib/libfm/modules/
+	cp -a $install/usr/share/libfm/*.list     $fs/usr/share/libfm/
 	# define terminal
 	sed -i 2i\ 'terminal=terminal' $fs/etc/xdg/libfm/libfm.conf
 	# set small & pane icon size to 16