sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (8d5649892d0e23bb5bb10e0581e9d85e74712203)
- From: Vlad Glagolev <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (8d5649892d0e23bb5bb10e0581e9d85e74712203)
- Date: Tue, 24 Sep 2013 10:07:12 -0500
GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:
disk/pmount/BUILD | 7 +++--
disk/pmount/CONFIGURE | 2 -
disk/pmount/DEPENDS | 21 ++++++++++++-----
disk/pmount/DETAILS | 13 ++++------
disk/pmount/FINAL | 5 ++++
disk/pmount/HISTORY | 13 ++++++++++
disk/pmount/INSTALL | 14 +++++++----
disk/pmount/PRE_BUILD | 2 -
disk/pmount/PRE_INSTALL | 7 +++--
shell-term-fm/spacefm/BUILD | 3 ++
shell-term-fm/spacefm/CONFIGURE | 7 +++++
shell-term-fm/spacefm/DEPENDS | 48
++++++++++++++++++++++++++++++++++++++--
shell-term-fm/spacefm/DETAILS | 4 +--
shell-term-fm/spacefm/FINAL | 1
shell-term-fm/spacefm/HISTORY | 11 ++++++++-
shell-term-fm/spacefm/PRE_BUILD | 6 +++++
16 files changed, 130 insertions(+), 34 deletions(-)
New commits:
commit 8d5649892d0e23bb5bb10e0581e9d85e74712203
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
spacefm: => 0.8.7
commit ee9c7461181cae33a42fdb827e3912a72c5498fe
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
pmount: => 0.9.23
diff --git a/disk/pmount/BUILD b/disk/pmount/BUILD
index 482831a..7e7f955 100755
--- a/disk/pmount/BUILD
+++ b/disk/pmount/BUILD
@@ -1,4 +1,5 @@
-if [[ $CRYPT == "y" ]]; then
- sed -i -e "s|/sbin/cryptsetup|`which cryptsetup`|" src/policy.h
-fi &&
+if is_depends_enabled $SPELL cryptsetup-luks; then
+ OPTS="--with-cryptsetup-prog=`which cryptsetup` $OPTS"
+fi &&
+
default_build
diff --git a/disk/pmount/CONFIGURE b/disk/pmount/CONFIGURE
deleted file mode 100755
index 4635f88..0000000
--- a/disk/pmount/CONFIGURE
+++ /dev/null
@@ -1,2 +0,0 @@
-config_query PMOUNT "Enable usage of pmount by hal instead of fstab
definitions (answer 'n' if you use gnome-volume-manager) " y &&
-config_query CRYPT "Enable prompting for passphrases of encrypted
partitions" n
diff --git a/disk/pmount/DEPENDS b/disk/pmount/DEPENDS
index f3bf708..22e7659 100755
--- a/disk/pmount/DEPENDS
+++ b/disk/pmount/DEPENDS
@@ -1,6 +1,15 @@
-depends dbus
&&
-depends hal
&&
-depends sysfsutils
&&
-if [[ $CRYPT == "y" ]]; then
- depends cryptsetup-luks
-fi
+depends util-linux &&
+depends which &&
+
+optional_depends hal \
+ "--enable-hal" \
+ "--disable-hal" \
+ "to build pmount-hal frontend" &&
+
+if is_depends_enabled $SPELL hal; then
+ depends dbus
+fi &&
+
+optional_depends cryptsetup-luks "" "" "to enable prompting for passphrases
of encrypted partitions" &&
+
+suggest_depends ntfs-3g "" "" "for ability to mount NTFS volumes"
diff --git a/disk/pmount/DETAILS b/disk/pmount/DETAILS
index 5dd04a1..c771c42 100755
--- a/disk/pmount/DETAILS
+++ b/disk/pmount/DETAILS
@@ -1,17 +1,14 @@
SPELL=pmount
- VERSION=0.9.20
- SOURCE=${SPELL}_${VERSION}.orig.tar.gz
- SOURCE2=${SPELL}_${VERSION}-3.diff.gz
-
SOURCE_HASH=sha512:94bb65f5690605fa8857bda942728bfaa59d7dc519c2cd80fead273da8fa21945e1f4c3eac6319a00e61e9f24be2fc180420f245b5dba56eb0e87b943d9c56e3
-
SOURCE2_HASH=sha512:bc040d7e0547943f825b2c32ba10dacd2fa0c24d7f2f723eb01043cee95c1fcea5516f8cc6fe860add71176b21b83c408d510d0cc3bd0c3aa25ce83aed824eb0
+ VERSION=0.9.23
+ SOURCE=${SPELL}_${VERSION}.orig.tar.bz2
+
SOURCE_HASH=sha512:a9d762fb9bd3f525d52b29a33c09c10a09f90fabdeed8f3658cb3fe8cbdbf237b2c9165b7c93a7170b9de5c65c513c1629b1fca638563a66d091c518782db92d
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://ftp.debian.org/debian/pool/main/p/pmount/$SOURCE
- SOURCE2_URL[0]=http://ftp.debian.org/debian/pool/main/p/pmount/$SOURCE2
+ SOURCE_URL[0]=http://ftp.debian.org/debian/pool/main/p/$SPELL/$SOURCE
WEB_SITE=http://packages.debian.org/unstable/source/pmount
ENTERED=20050512
LICENSE[0]=GPL
KEYWORDS="disk"
- SHORT="Wrapper around the standard mount program"
+ SHORT="wrapper around the standard mount program"
cat << EOF
pmount is a wrapper around the standard mount program which permits normal
users to mount removable devices without a matching /etc/fstab entry. This
diff --git a/disk/pmount/FINAL b/disk/pmount/FINAL
new file mode 100755
index 0000000..4fb2187
--- /dev/null
+++ b/disk/pmount/FINAL
@@ -0,0 +1,5 @@
+if [[ ! -d "$INSTALL_ROOT/media" ]]; then
+ install -vd "$INSTALL_ROOT/media"
+fi &&
+
+message "\n${MESSAGE_COLOR}Don't forget to add the users allowed to pmount
in plugdev group${DEFAULT_COLOR}\n"
diff --git a/disk/pmount/HISTORY b/disk/pmount/HISTORY
index 18d2367..4b55b94 100644
--- a/disk/pmount/HISTORY
+++ b/disk/pmount/HISTORY
@@ -1,3 +1,16 @@
+2013-09-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.9.23; updated source url and source
+ extension; fixed short description
+ * BUILD: removed dirty hacks
+ * DEPENDS: hal and dbus are optional; removed obsolete sysfsutils
+ dependency; added ntfs-3g suggest dependency; added missing generic
+ dependencies; removed tabs
+ * CONFIGURE: dropped, not needed anymore
+ * INSTALL: removed tabs
+ * PRE_BUILD: removed patching with the non-required 2nd source
+ * PRE_INSTALL: changed hal condition
+ * FINAL: added, to install /media directory and show post-cast message
+
2010-02-27 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: updated to 0.9.20
diff --git a/disk/pmount/INSTALL b/disk/pmount/INSTALL
index 69c96a5..ccbb595 100755
--- a/disk/pmount/INSTALL
+++ b/disk/pmount/INSTALL
@@ -1,7 +1,11 @@
-make PREFIX=$INSTALL_ROOT/usr install &&
+make PREFIX=$INSTALL_ROOT/usr install &&
+
chgrp plugdev ${INSTALL_ROOT}/usr/bin/pmount \
- ${INSTALL_ROOT}/usr/bin/pmount-hal \
- ${INSTALL_ROOT}/usr/bin/pumount &&
+ ${INSTALL_ROOT}/usr/bin/pumount &&
+
+if is_depends_enabled $SPELL hal; then
+ chgrp plugdev ${INSTALL_ROOT}/usr/bin/pmount-hal
+fi &&
+
chmod 4750 ${INSTALL_ROOT}/usr/bin/pmount \
- ${INSTALL_ROOT}/usr/bin/pumount &&
-message "\nDon't forget to add the users allowed to pmount in plugdev
group\n"
+ ${INSTALL_ROOT}/usr/bin/pumount
diff --git a/disk/pmount/PRE_BUILD b/disk/pmount/PRE_BUILD
index df515b4..8d6a8dc 100755
--- a/disk/pmount/PRE_BUILD
+++ b/disk/pmount/PRE_BUILD
@@ -1,5 +1,3 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-unpack_file 2 &&
-gunzip -c $SOURCE_CACHE/$SOURCE2 | patch -p0 &&
patch -p1 < $SCRIPT_DIRECTORY/pmount-0.9.13-no_close.patch
diff --git a/disk/pmount/PRE_INSTALL b/disk/pmount/PRE_INSTALL
index bbb6929..7cd79a5 100755
--- a/disk/pmount/PRE_INSTALL
+++ b/disk/pmount/PRE_INSTALL
@@ -1,6 +1,7 @@
-default_pre_install &&
-create_group plugdev &&
-if [ "$PMOUNT" == "y" ]; then
+default_pre_install &&
+create_group plugdev &&
+
+if is_depends_enabled $SPELL hal; then
usermod -G plugdev -a haldaemon &&
mkdir -p ${INSTALL_ROOT}/etc/hal/device.d &&
ln -sfn ${INSTALL_ROOT}/usr/bin/pmount-hal
${INSTALL_ROOT}/etc/hal/device.d/60-pmount.hal
diff --git a/shell-term-fm/spacefm/BUILD b/shell-term-fm/spacefm/BUILD
new file mode 100755
index 0000000..1b815c4
--- /dev/null
+++ b/shell-term-fm/spacefm/BUILD
@@ -0,0 +1,3 @@
+OPTS="$SPACEFM_OPTS $OPTS" &&
+
+default_build
diff --git a/shell-term-fm/spacefm/CONFIGURE b/shell-term-fm/spacefm/CONFIGURE
new file mode 100755
index 0000000..f1617a3
--- /dev/null
+++ b/shell-term-fm/spacefm/CONFIGURE
@@ -0,0 +1,7 @@
+config_query_list SPACEFM_GTK "Which GTK+ version do you want for user
interface?" \
+ gtk+2 \
+ gtk+3 &&
+
+config_query_option SPACEFM_OPTS "Enable desktop integrations such as
icons?" y \
+ "--enable-desktop-integration" \
+ "--disable-desktop-integration"
diff --git a/shell-term-fm/spacefm/DEPENDS b/shell-term-fm/spacefm/DEPENDS
index b7d6bb0..2f39184 100755
--- a/shell-term-fm/spacefm/DEPENDS
+++ b/shell-term-fm/spacefm/DEPENDS
@@ -1,2 +1,46 @@
-depends gtk+2 &&
-depends UDEV
+. "$GRIMOIRE/FUNCTIONS" &&
+
+depends UDEV &&
+
+depends $SPACEFM_GTK "--with-${SPACEFM_GTK/gtk+/gtk}" &&
+
+optional_depends startup-notification \
+ "--enable-startup-notification" \
+ "--disable-startup-notification" \
+ "for use of libstartup-notification" &&
+
+optional_depends gettext \
+ "--enable-nls" \
+ "--disable-nls" \
+ "for Native Language Support" &&
+
+if [[ $(get_kernel_config CONFIG_INOTIFY_USER) == "y" ||
+ $(get_kernel_config CONFIG_INOTIFY_USER) == "m" ]]; then
+ config_query_option SPACEFM_OPTS "Include Linux inotify kernel support
(file system monitoring)?" y \
+ "--enable-inotify" \
+ "--disable-inotify"
+else
+ optional_depends FAM \
+ "--enable-inotify" \
+ "--disable-inotify" \
+ "for file system monitoring support"
+fi &&
+
+optional_depends hal \
+ "--enable-hal" \
+ "--disable-hal" \
+ "to build with Linux HAL support (${PROBLEM_COLOR}disables
udisks*${DEFAULT_COLOR})" &&
+
+if is_depends_enabled $SPELL hal; then
+ depends dbus-glib
+else
+ suggest_depends udisks "" "" "for mounting via udisks" &&
+ suggest_depends udisks2 "" "" "for mounting via udisks2"
+fi &&
+
+# TODO: add udevil spell
+# suggest_depends udevil "" "" "for mounting via udevil" &&
+
+suggest_depends pmount "" "" "for mounting via pmount" &&
+
+suggest_depends eject "" "" "for device ejecting ability"
diff --git a/shell-term-fm/spacefm/DETAILS b/shell-term-fm/spacefm/DETAILS
index b767f92..6fc4a11 100755
--- a/shell-term-fm/spacefm/DETAILS
+++ b/shell-term-fm/spacefm/DETAILS
@@ -1,8 +1,8 @@
SPELL=spacefm
- VERSION=0.8.0
+ VERSION=0.8.7
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:90c19958e9f6f292ee3d53e18b773cb6641de7150b543da81a6d80ecdf73df154dbb023ee3f475c84bd9c3b8ce3c2ca864182374a7aec7ace2b1a0aebc49ca88
+
SOURCE_HASH=sha512:339fd7b4c2becf30c5b9bef0977575c778a340fb15fa51359080162dc0f07528913e5e80d74df1bc0a90cd30f84d9c693491008f1a7281e235e6408130ffd8bf
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://ignorantguru.github.com/spacefm/
LICENSE[0]=GPL
diff --git a/shell-term-fm/spacefm/FINAL b/shell-term-fm/spacefm/FINAL
new file mode 100755
index 0000000..b374499
--- /dev/null
+++ b/shell-term-fm/spacefm/FINAL
@@ -0,0 +1 @@
+gtk-update-icon-cache -q -t -f "$INSTALL_ROOT/usr/share/icons/hicolor"
diff --git a/shell-term-fm/spacefm/HISTORY b/shell-term-fm/spacefm/HISTORY
index 28f978e..844aa98 100644
--- a/shell-term-fm/spacefm/HISTORY
+++ b/shell-term-fm/spacefm/HISTORY
@@ -1,4 +1,13 @@
-2013-07-28 Treeve Jelbert <treeve AT sourcemage.org>
+2013-09-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.8.7
+ * BUILD: added, to keep SPACEFM_OPTS
+ * CONFIGURE: added, to select between gtk+2/gtk+3 and for desktop
+ integration flags
+ * DEPENDS: added missing dependencies
+ * PRE_BUILD: added, to fix sha*sum paths
+ * FINAL: added, as recommended in README
+
+2013-07-28 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: udev => UDEV
2012-09-15 Ladislav Hagara <hgr AT vabo.cz>
diff --git a/shell-term-fm/spacefm/PRE_BUILD b/shell-term-fm/spacefm/PRE_BUILD
new file mode 100755
index 0000000..97441b4
--- /dev/null
+++ b/shell-term-fm/spacefm/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+# fix sha*sum paths
+sedit "s:/usr/bin/sha256sum:/bin/sha256sum:" src/vfs/vfs-file-task.c &&
+sedit
"s:/usr/bin/sha256sum:/bin/sha256sum:;s:/usr/bin/sha512sum:/bin/sha512sum:"
src/spacefm-auth
- [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (8d5649892d0e23bb5bb10e0581e9d85e74712203), Vlad Glagolev, 09/24/2013
Archive powered by MHonArc 2.6.24.