[crux-commits] ports/contrib (3.6): [notify] libfm: 1.3.1 -> 1.3.2 be sure to update libfm force install it then force install libfm-extra, or remove libfm and update libfm-extra first to avoid a file conflict

crux at crux.nu crux at crux.nu
Sun Feb 14 10:23:54 UTC 2021


commit 0904d138d2054b15a9779a25f30d825f3643c49c
Author: Danny Rawlins <contact at romster.me>
Date:   Sun Feb 14 21:23:15 2021 +1100

    [notify] libfm: 1.3.1 -> 1.3.2
    be sure to update libfm force install it then force install libfm-extra, or remove libfm and update libfm-extra first to avoid a file conflict

diff --git a/libfm/.footprint b/libfm/.footprint
index 622207f0b..dd20c5999 100644
--- a/libfm/.footprint
+++ b/libfm/.footprint
@@ -7,94 +7,90 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/libfm-pref-apps
 -rwxr-xr-x	root/root	usr/bin/lxshortcut
 drwxr-xr-x	root/root	usr/include/
-lrwxrwxrwx	root/root	usr/include/libfm -> libfm-1.0
-drwxr-xr-x	root/root	usr/include/libfm-1.0/
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-action.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-actions.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-app-chooser-combo-box.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-app-chooser-dlg.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-app-info.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-app-menu-view.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-archiver.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-bookmarks.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-cell-renderer-pixbuf.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-cell-renderer-text.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-clipboard.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-config.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-deep-count-job.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-dir-list-job.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-dir-tree-model.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-dir-tree-view.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-dnd-auto-scroll.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-dnd-dest.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-dnd-src.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-dummy-monitor.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-extra.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-file-info-job.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-file-info.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-file-launcher.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-file-menu.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-file-ops-job-change-attr.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-file-ops-job-delete.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-file-ops-job-xfer.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-file-ops-job.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-file-properties.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-file.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-folder-config.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-folder-model.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-folder-view.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-folder.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-gtk-file-launcher.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-gtk-marshal.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-gtk-utils.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-gtk.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-icon-pixbuf.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-icon.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-job.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-list.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-marshal.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-menu-tool-item.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-mime-type.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-module.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-monitor.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-nav-history.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-path-bar.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-path-entry.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-path.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-places-model.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-places-view.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-progress-dlg.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-seal.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-side-pane.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-simple-job.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-sortable.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-standard-view.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-tab-label.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-templates.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-terminal.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-thumbnail-loader.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-thumbnail.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-thumbnailer.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-utils.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-version.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm-xml-file.h
--rw-r--r--	root/root	usr/include/libfm-1.0/fm.h
+drwxr-xr-x	root/root	usr/include/libfm/
+-rw-r--r--	root/root	usr/include/libfm/fm-action.h
+-rw-r--r--	root/root	usr/include/libfm/fm-actions.h
+-rw-r--r--	root/root	usr/include/libfm/fm-app-chooser-combo-box.h
+-rw-r--r--	root/root	usr/include/libfm/fm-app-chooser-dlg.h
+-rw-r--r--	root/root	usr/include/libfm/fm-app-info.h
+-rw-r--r--	root/root	usr/include/libfm/fm-app-menu-view.h
+-rw-r--r--	root/root	usr/include/libfm/fm-archiver.h
+-rw-r--r--	root/root	usr/include/libfm/fm-bookmarks.h
+-rw-r--r--	root/root	usr/include/libfm/fm-cell-renderer-pixbuf.h
+-rw-r--r--	root/root	usr/include/libfm/fm-cell-renderer-text.h
+-rw-r--r--	root/root	usr/include/libfm/fm-clipboard.h
+-rw-r--r--	root/root	usr/include/libfm/fm-config.h
+-rw-r--r--	root/root	usr/include/libfm/fm-deep-count-job.h
+-rw-r--r--	root/root	usr/include/libfm/fm-dir-list-job.h
+-rw-r--r--	root/root	usr/include/libfm/fm-dir-tree-model.h
+-rw-r--r--	root/root	usr/include/libfm/fm-dir-tree-view.h
+-rw-r--r--	root/root	usr/include/libfm/fm-dnd-auto-scroll.h
+-rw-r--r--	root/root	usr/include/libfm/fm-dnd-dest.h
+-rw-r--r--	root/root	usr/include/libfm/fm-dnd-src.h
+-rw-r--r--	root/root	usr/include/libfm/fm-dummy-monitor.h
+-rw-r--r--	root/root	usr/include/libfm/fm-file-info-job.h
+-rw-r--r--	root/root	usr/include/libfm/fm-file-info.h
+-rw-r--r--	root/root	usr/include/libfm/fm-file-launcher.h
+-rw-r--r--	root/root	usr/include/libfm/fm-file-menu.h
+-rw-r--r--	root/root	usr/include/libfm/fm-file-ops-job-change-attr.h
+-rw-r--r--	root/root	usr/include/libfm/fm-file-ops-job-delete.h
+-rw-r--r--	root/root	usr/include/libfm/fm-file-ops-job-xfer.h
+-rw-r--r--	root/root	usr/include/libfm/fm-file-ops-job.h
+-rw-r--r--	root/root	usr/include/libfm/fm-file-properties.h
+-rw-r--r--	root/root	usr/include/libfm/fm-file.h
+-rw-r--r--	root/root	usr/include/libfm/fm-folder-config.h
+-rw-r--r--	root/root	usr/include/libfm/fm-folder-model.h
+-rw-r--r--	root/root	usr/include/libfm/fm-folder-view.h
+-rw-r--r--	root/root	usr/include/libfm/fm-folder.h
+-rw-r--r--	root/root	usr/include/libfm/fm-gtk-file-launcher.h
+-rw-r--r--	root/root	usr/include/libfm/fm-gtk-marshal.h
+-rw-r--r--	root/root	usr/include/libfm/fm-gtk-utils.h
+-rw-r--r--	root/root	usr/include/libfm/fm-gtk.h
+-rw-r--r--	root/root	usr/include/libfm/fm-icon-pixbuf.h
+-rw-r--r--	root/root	usr/include/libfm/fm-icon.h
+-rw-r--r--	root/root	usr/include/libfm/fm-job.h
+-rw-r--r--	root/root	usr/include/libfm/fm-list.h
+-rw-r--r--	root/root	usr/include/libfm/fm-marshal.h
+-rw-r--r--	root/root	usr/include/libfm/fm-menu-tool-item.h
+-rw-r--r--	root/root	usr/include/libfm/fm-mime-type.h
+-rw-r--r--	root/root	usr/include/libfm/fm-module.h
+-rw-r--r--	root/root	usr/include/libfm/fm-monitor.h
+-rw-r--r--	root/root	usr/include/libfm/fm-nav-history.h
+-rw-r--r--	root/root	usr/include/libfm/fm-path-bar.h
+-rw-r--r--	root/root	usr/include/libfm/fm-path-entry.h
+-rw-r--r--	root/root	usr/include/libfm/fm-path.h
+-rw-r--r--	root/root	usr/include/libfm/fm-places-model.h
+-rw-r--r--	root/root	usr/include/libfm/fm-places-view.h
+-rw-r--r--	root/root	usr/include/libfm/fm-progress-dlg.h
+-rw-r--r--	root/root	usr/include/libfm/fm-seal.h
+-rw-r--r--	root/root	usr/include/libfm/fm-side-pane.h
+-rw-r--r--	root/root	usr/include/libfm/fm-simple-job.h
+-rw-r--r--	root/root	usr/include/libfm/fm-sortable.h
+-rw-r--r--	root/root	usr/include/libfm/fm-standard-view.h
+-rw-r--r--	root/root	usr/include/libfm/fm-tab-label.h
+-rw-r--r--	root/root	usr/include/libfm/fm-templates.h
+-rw-r--r--	root/root	usr/include/libfm/fm-terminal.h
+-rw-r--r--	root/root	usr/include/libfm/fm-thumbnail-loader.h
+-rw-r--r--	root/root	usr/include/libfm/fm-thumbnail.h
+-rw-r--r--	root/root	usr/include/libfm/fm-thumbnailer.h
+-rw-r--r--	root/root	usr/include/libfm/fm-utils.h
+-rw-r--r--	root/root	usr/include/libfm/fm.h
 drwxr-xr-x	root/root	usr/lib/
--rw-r--r--	root/root	usr/lib/libfm-extra.a
--rwxr-xr-x	root/root	usr/lib/libfm-extra.la
-lrwxrwxrwx	root/root	usr/lib/libfm-extra.so -> libfm-extra.so.4.1.2
-lrwxrwxrwx	root/root	usr/lib/libfm-extra.so.4 -> libfm-extra.so.4.1.2
--rwxr-xr-x	root/root	usr/lib/libfm-extra.so.4.1.2
 -rw-r--r--	root/root	usr/lib/libfm-gtk.a
 -rwxr-xr-x	root/root	usr/lib/libfm-gtk.la
-lrwxrwxrwx	root/root	usr/lib/libfm-gtk.so -> libfm-gtk.so.4.1.2
-lrwxrwxrwx	root/root	usr/lib/libfm-gtk.so.4 -> libfm-gtk.so.4.1.2
--rwxr-xr-x	root/root	usr/lib/libfm-gtk.so.4.1.2
+lrwxrwxrwx	root/root	usr/lib/libfm-gtk.so -> libfm-gtk.so.4.1.3
+lrwxrwxrwx	root/root	usr/lib/libfm-gtk.so.4 -> libfm-gtk.so.4.1.3
+-rwxr-xr-x	root/root	usr/lib/libfm-gtk.so.4.1.3
+-rw-r--r--	root/root	usr/lib/libfm-gtk3.a
+-rwxr-xr-x	root/root	usr/lib/libfm-gtk3.la
+lrwxrwxrwx	root/root	usr/lib/libfm-gtk3.so -> libfm-gtk3.so.4.1.3
+lrwxrwxrwx	root/root	usr/lib/libfm-gtk3.so.4 -> libfm-gtk3.so.4.1.3
+-rwxr-xr-x	root/root	usr/lib/libfm-gtk3.so.4.1.3
 -rw-r--r--	root/root	usr/lib/libfm.a
 -rwxr-xr-x	root/root	usr/lib/libfm.la
-lrwxrwxrwx	root/root	usr/lib/libfm.so -> libfm.so.4.1.2
-lrwxrwxrwx	root/root	usr/lib/libfm.so.4 -> libfm.so.4.1.2
--rwxr-xr-x	root/root	usr/lib/libfm.so.4.1.2
+lrwxrwxrwx	root/root	usr/lib/libfm.so -> libfm.so.4.1.3
+lrwxrwxrwx	root/root	usr/lib/libfm.so.4 -> libfm.so.4.1.3
+-rwxr-xr-x	root/root	usr/lib/libfm.so.4.1.3
 drwxr-xr-x	root/root	usr/lib/libfm/
 drwxr-xr-x	root/root	usr/lib/libfm/modules/
 -rwxr-xr-x	root/root	usr/lib/libfm/modules/gtk-fileprop-x-desktop.so
@@ -104,8 +100,8 @@ drwxr-xr-x	root/root	usr/lib/libfm/modules/
 -rwxr-xr-x	root/root	usr/lib/libfm/modules/vfs-menu.so
 -rwxr-xr-x	root/root	usr/lib/libfm/modules/vfs-search.so
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
--rw-r--r--	root/root	usr/lib/pkgconfig/libfm-extra.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libfm-gtk.pc
+-rw-r--r--	root/root	usr/lib/pkgconfig/libfm-gtk3.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libfm.pc
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
diff --git a/libfm/.signature b/libfm/.signature
index 233c906b0..fb885dab2 100644
--- a/libfm/.signature
+++ b/libfm/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF31ATmTyvEs8eswuN4t4If+BL1P6x6PwetEdTktKvhFw4imMDE1Bw2X5D3dVziVm42/vCyU1P5q3UMFejCIRdmA8=
-SHA256 (Pkgfile) = 8e57fa8adffdc537dcb873cbcde98b1443df373e8b58ac1711b4bd71e3fad851
-SHA256 (.footprint) = c42534b3c8a14abbe041cd2b63d3531d84beb600c91b96ddc78fdf05c19a2d9b
-SHA256 (libfm-1.3.1.tar.xz) = 96b1244bde41ca0eef0332cfb5c67bb16725dfd102128f3e6f74fadc13a1cfe4
+RWSagIOpLGJF35Q/ujkC1PyuFof7xFuhlu9vEELHOae0mLL11eV4levPcKfze1sTMBoGBWX8p+ARhzkaFhYDgCnDh8GJGqsoPgE=
+SHA256 (Pkgfile) = fb4b584af3478b0c4df037cd47d61123aee8e7e8afb422b4ca4a3a64accd4ea0
+SHA256 (.footprint) = fc655dd07430e96baca62c9b582dddd1cb8e0139443ea320f5105b8e1ecb6ca0
+SHA256 (libfm-1.3.2.tar.xz) = a5042630304cf8e5d8cff9d565c6bd546f228b48c960153ed366a34e87cad1e5
diff --git a/libfm/Pkgfile b/libfm/Pkgfile
index 8949491eb..a11a37e96 100644
--- a/libfm/Pkgfile
+++ b/libfm/Pkgfile
@@ -1,21 +1,24 @@
 # Description: Library for file management.
 # URL: https://wiki.lxde.org/en/PCManFM
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Depends on: gtk menu-cache xorg-libxdamage
+# Depends on: gtk gtk3 menu-cache xorg-libxdamage libfm-extra
 
 name=libfm
-version=1.3.1
-release=2
+version=1.3.2
+release=1
 source=(https://downloads.sourceforge.net/pcmanfm/$name-$version.tar.xz)
 
 build() {
 	cd $name-$version
-
 	# https://github.com/lxde/libfm/issues/35
 	sed -i 's/create=xarchiver --add-to %F/create=xarchiver --compress %F/' data/archivers.list
-
 	autoreconf -fi
+	cd -
 
+	cp -r $name-$version gtk3
+	cp -r $name-$version gtk2
+
+	cd $SRC/gtk2
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
@@ -29,12 +32,25 @@ build() {
 	make
 	make DESTDIR=$PKG install
 
+	cd $SRC/gtk3
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--with-gnu-ld \
+		--disable-nls \
+		--disable-gtk-doc-html \
+		--with-gtk=3
+
+	make
+	make DESTDIR=$PKG install
+
 	rm -r $PKG/usr/share/locale
 
-	if [[ -h $PKG/usr/include/libfm/libfm-1.0 ]]; then
-		rm -r $PKG/usr/include/libfm
-		cd $PKG/usr/include/
-		ln -s libfm-1.0 libfm
-	fi
-}
+	rm -r $PKG/usr/include/libfm
+	mv $PKG/usr/include/libfm-1.0/ $PKG/usr/include/libfm
 
+	# In libfm-extra
+	rm -r $PKG/usr/include/libfm/fm-{extra,version,xml-file}.h \
+		$PKG/usr/lib/libfm-extra.* \
+		$PKG/usr/lib/pkgconfig/libfm-extra.pc
+}


More information about the crux-commits mailing list