[crux-commits] ports/contrib (3.6): [notify] libfm-extra: 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 08692238880f9b06f609e66aade390e90a960dc6
Author: Danny Rawlins <contact at romster.me>
Date:   Sun Feb 14 21:23:00 2021 +1100

    [notify] libfm-extra: 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-extra/.footprint b/libfm-extra/.footprint
index dd64b005a..dc1e0e374 100644
--- a/libfm-extra/.footprint
+++ b/libfm-extra/.footprint
@@ -1,15 +1,14 @@
 drwxr-xr-x	root/root	usr/
 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-extra.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
+drwxr-xr-x	root/root	usr/include/libfm/
+-rw-r--r--	root/root	usr/include/libfm/fm-extra.h
+-rw-r--r--	root/root	usr/include/libfm/fm-version.h
+-rw-r--r--	root/root	usr/include/libfm/fm-xml-file.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-extra.la
+-rw-r--r--	root/root	usr/lib/libfm-extra.so
+lrwxrwxrwx	root/root	usr/lib/libfm-extra.so.4 -> libfm-extra.so.4.1.3
+-rw-r--r--	root/root	usr/lib/libfm-extra.so.4.1.3
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libfm-extra.pc
diff --git a/libfm-extra/.signature b/libfm-extra/.signature
index 84753e3f0..8af8abbb3 100644
--- a/libfm-extra/.signature
+++ b/libfm-extra/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF337tGAj8yYt/5W+Ysdbdizgs25oMZBmTFdQRtmqW1418kGKgNM4WnobiLfkGnIU5qRxyOakO0EJ8zliciuKE+A8=
-SHA256 (Pkgfile) = 257edf50a2da743bfcd60fd9d9a53a6a7b3afbe49314afbc434177e7f1f8dfa6
-SHA256 (.footprint) = c30076eeb021812d802c98e725eee379a858695b0956fd5e27ca236b97701b94
-SHA256 (libfm-1.3.1.tar.xz) = 96b1244bde41ca0eef0332cfb5c67bb16725dfd102128f3e6f74fadc13a1cfe4
+RWSagIOpLGJF35n43wUvjUTjtmtcxOBCE3gI5sojDAdRPb0BBmClPbfowjjZruMkEg9nxBoHhv4MExLVp+koZodKEp+cMiqjJwI=
+SHA256 (Pkgfile) = a5212d9e194eee841174b31b91936f462165d7c8cd52b39c22874ed7a0488d89
+SHA256 (.footprint) = 61bf3f71c4fe896a4b9ee943770c64e383af0ab46b518f189a9cd0f9d82e89ed
+SHA256 (libfm-1.3.2.tar.xz) = a5042630304cf8e5d8cff9d565c6bd546f228b48c960153ed366a34e87cad1e5
diff --git a/libfm-extra/Pkgfile b/libfm-extra/Pkgfile
index 3ccfc396a..97c19ead1 100644
--- a/libfm-extra/Pkgfile
+++ b/libfm-extra/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on: glib intltool
 
 name=libfm-extra
-version=1.3.1
+version=1.3.2
 release=1
 source=(https://downloads.sourceforge.net/pcmanfm/libfm-$version.tar.xz)
 
@@ -17,9 +17,17 @@ build() {
 		--with-extra-only \
 		--with-gtk=no
 
+	# https://bugzilla.gnome.org/show_bug.cgi?id=656231
 	sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
 
 	make
-	make DESTDIR=$PKG install
+	make DESTDIR="$SRC/libfm-extra" install
 
+	install -d $PKG/usr/include/libfm $PKG/usr/lib/pkgconfig
+	install -m 644 -t $PKG/usr/include/libfm $SRC/libfm-extra/usr/include/libfm/fm-{extra,version,xml-file}.h
+	install -m 644 -t $PKG/usr/lib $SRC/libfm-extra/usr/lib/libfm-extra.*
+	install -m 644 -t $PKG/usr/lib/pkgconfig $SRC/libfm-extra/usr/lib/pkgconfig/libfm-extra.pc
+
+	rm $PKG/usr/lib/libfm-extra.so.4
+	ln -s libfm-extra.so.4.1.3 $PKG/usr/lib/libfm-extra.so.4
 }


More information about the crux-commits mailing list