Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (3588b229654bf299c6b41ec044937a5dec3b1c08)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (3588b229654bf299c6b41ec044937a5dec3b1c08)
  • Date: Mon, 8 Aug 2022 10:57:28 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

shell-term-fm/fm/DETAILS | 5 +++-
shell-term-fm/fm/HISTORY | 6 ++++
shell-term-fm/fm/patches/0001-Fix-Makefile.patch | 28
++++++++++++++++-------
3 files changed, 30 insertions(+), 9 deletions(-)

New commits:
commit 3588b229654bf299c6b41ec044937a5dec3b1c08
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

fm: Add missing documentation for installing

commit 78b54e3a0bf670e6dd2c0a3b7bb66e421f8fbae6
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

fm: Make LICENSE SPDX-compliant

commit ddd0686fae57115aed54c466dcc94237a15acd16
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

fm: Install icons; PATCHLEVEL++

diff --git a/shell-term-fm/fm/DETAILS b/shell-term-fm/fm/DETAILS
index 7641ac7..bf8e2b7 100755
--- a/shell-term-fm/fm/DETAILS
+++ b/shell-term-fm/fm/DETAILS
@@ -1,12 +1,15 @@
SPELL=fm
VERSION=0.2.2
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.uwyn.com/download/$SPELL/$SOURCE
WEB_SITE=http://www.uwyn.com/projects/fm/
ENTERED=20020802

SOURCE_HASH=sha512:40d4afefbf560f2620f277ffddd5c6e710d7d3a6d52449391ee13e1163e3d154ddc48fbfedbb834dba3b1d83c95ab4e33ea3fc830d874c4de8dd8c728effad0f
- LICENSE[0]=GPL2
+ LICENSE[0]=GPL-2.0-or-later
+ DOCS+=' KEYBOARD_NAVIGATION'
+ DOC_DIRS=html
KEYWORDS="console"
SHORT="Fm is a gtk+ file manager"
cat << EOF
diff --git a/shell-term-fm/fm/HISTORY b/shell-term-fm/fm/HISTORY
index 48c2247..7b2c1f5 100644
--- a/shell-term-fm/fm/HISTORY
+++ b/shell-term-fm/fm/HISTORY
@@ -1,3 +1,9 @@
+2022-08-08 Ismael Luceno <ismael AT sourcemage.org>
+ * patches/0001-Fix-Makefile.patch: added installation of icons
+ * DETAILS: PATCHLEVEL++
+ made LICENSE SPDX-compliant
+ added missing documentation for installing
+
2022-08-07 Ismael Luceno <ismael AT sourcemage.org>
* PRE_BUILD, patches/0001-Fix-Makefile.patch: Fixed Makefile
* INSTALL: removed, no longer needed
diff --git a/shell-term-fm/fm/patches/0001-Fix-Makefile.patch
b/shell-term-fm/fm/patches/0001-Fix-Makefile.patch
index db6799b..39cb59a 100644
--- a/shell-term-fm/fm/patches/0001-Fix-Makefile.patch
+++ b/shell-term-fm/fm/patches/0001-Fix-Makefile.patch
@@ -1,7 +1,7 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 7697c6192864e548d0c3992d8dc2e5ac9e4747ae Mon Sep 17 00:00:00 2001
From: Ismael Luceno <ismael AT iodev.co.uk>
-Subject: Fix Makefile
-Date: Sun, 7 Aug 2022 21:06:15 +0200
+Date: Sun, 7 Aug 2022 21:06:15 +0200
+Subject: [PATCH] Fix Makefile

* Remove rules covered by default rules
* Respect and use CFLAGS and LIBS
@@ -9,14 +9,14 @@ Date: Sun, 7 Aug 2022 21:06:15 +0200

Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
---
- Makefile | 43 ++++++++++---------------------------------
- 1 file changed, 10 insertions(+), 33 deletions(-)
+ Makefile | 52 +++++++++++++++++++---------------------------------
+ 1 file changed, 19 insertions(+), 33 deletions(-)

diff --git a/Makefile b/Makefile
-index 75c377bfdd4c..5bff930cce3f 100644
+index 75c377bfdd4c..a74d60c61868 100644
--- a/Makefile
+++ b/Makefile
-@@ -2,58 +2,35 @@ exe = fm
+@@ -2,58 +2,44 @@ exe = fm
objects = aboutwindow.o aboutwindow_signals.o accelkey.o ctreecolumn.o
filetype.o fileutils.o fm.o fmdialog.o fmwindow.o fmwindow_signals.o layout.o
preferences.o preferenceswindow.o preferenceswindow_signals.o rowstyle.o
glibconfig = glib-config
gtkconfig = gtk-config
@@ -82,6 +82,18 @@ index 75c377bfdd4c..5bff930cce3f 100644
+DESTDIR =
+prefix = /usr
+bindir = ${prefix}/bin
++datarootdir = ${prefix}/share
++datadir = ${datarootdir}
++sysicondir = ${datarootdir}/icons
++appicondir = ${datadir}/pixmaps/fm
+.PHONY: install
+install:
-+ install -m555 -s ${exe} ${DESTDIR}${bindir}
++ install -d ${DESTDIR}${bindir} \
++ ${DESTDIR}${sysicondir} \
++ ${DESTDIR}${appicondir}
++ install -m555 -s ${exe} ${DESTDIR}${bindir}/
++ install -m444 fm.png ${DESTDIR}${sysicondir}/
++ install -m444 *.xpm ${DESTDIR}${appicondir}/
+--
+2.37.1
+



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (3588b229654bf299c6b41ec044937a5dec3b1c08), Ismael Luceno, 08/08/2022

Archive powered by MHonArc 2.6.24.

Top of Page