diff options
| author | Michael Forney <mforney@mforney.org> | 2016-12-11 16:04:20 -0800 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2016-12-13 23:10:30 -0800 |
| commit | 293f5a93b77d92fd65db7f3d0df654f102e46cfb (patch) | |
| tree | 6ecd1170e3dd793862dd852814dc1b4cd5e44260 /pkg/sshfs/patch/0003-Use-bool-instead-of-gboolean.patch | |
| parent | 9a506a6834df01a26795cea222b410f206efa9fa (diff) | |
Move to flat package hierarchy
Note to self: never try to move submodules again
To migrate your existing submodules (more or less):
set -x
set -e
mkdir .git/modules/pkg
for old in */*/src ; do
new="pkg/${old#*/}"
if ! [ -f "$old/.git" ] || [ "${old%%/*}" = pkg ] ; then
continue
fi
git -C ".git/modules/$old" config core.worktree "../../../../../$new"
rmdir "$new"
mv "$old" "$new"
sed -e "s,$old,$new," "$new/.git" > "$new/.git.tmp"
mv "$new/.git.tmp" "$new/.git"
mkdir ".git/modules/${new%/src}"
mv ".git/modules/$old" ".git/modules/$new"
rm "${old%/src}"/*.ninja
mv "${old%/src}"/*.tar.{gz,xz,bz2} "${new%/src}/"
rmdir "${old%/src}" || true
done
sed -e 's,^\[submodule "[^/]*/,[submodule "pkg/,' .git/config > .git/config.tmp
mv .git/config.tmp .git/config
Diffstat (limited to 'pkg/sshfs/patch/0003-Use-bool-instead-of-gboolean.patch')
| -rw-r--r-- | pkg/sshfs/patch/0003-Use-bool-instead-of-gboolean.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/pkg/sshfs/patch/0003-Use-bool-instead-of-gboolean.patch b/pkg/sshfs/patch/0003-Use-bool-instead-of-gboolean.patch new file mode 100644 index 00000000..39d1e544 --- /dev/null +++ b/pkg/sshfs/patch/0003-Use-bool-instead-of-gboolean.patch @@ -0,0 +1,33 @@ +From b8324473e35fbcfec302955456f545572521872b Mon Sep 17 00:00:00 2001 +From: Michael Forney <mforney@mforney.org> +Date: Sun, 5 Jun 2016 17:28:40 -0700 +Subject: [PATCH] Use bool instead of gboolean + +--- + sshfs.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/sshfs.c b/sshfs.c +index 32db6f4..f43ae5a 100644 +--- a/sshfs.c ++++ b/sshfs.c +@@ -16,6 +16,7 @@ + # include <fuse_darwin.h> + #endif + #include <assert.h> ++#include <stdbool.h> + #include <stdio.h> + #include <stdlib.h> + #include <unistd.h> +@@ -1975,7 +1976,7 @@ static int sftp_request_send(uint8_t type, struct iovec *iov, size_t count, + + err = -EIO; + if (sftp_send_iov(type, req->id, iov, count) == -1) { +- gboolean rmed; ++ bool rmed; + + pthread_mutex_lock(&sshfs.lock); + rmed = !!request_table_lookup(&sshfs.reqtab, req->id); +-- +2.9.0 + |