From 50e3ba7e01250a8e88e47a0ddb219524e49e4232 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Wed, 20 Mar 2019 17:14:46 +0200 Subject: [PATCH] drop submodule 'unstable-packages' No longer cross-repository dependencies. --- x11-packages/capstone | 1 - x11-packages/dtc | 1 - x11-packages/geoip2-database | 1 - x11-packages/giflib | 1 - x11-packages/i3/build.sh | 6 +- .../i3/i3-4.15_i3-dump-log_main.c.patch | 12 -- x11-packages/i3/i3-4.15_src_log.c.patch | 12 -- x11-packages/i3/i3-4.15_src_main.c.patch | 12 -- .../i3/posix-shm-implementation.patch | 148 ++++++++++++++++++ x11-packages/libcap | 1 - x11-packages/liblua52 | 1 - x11-packages/libmaxminddb | 1 - x11-packages/libnfs | 1 - x11-packages/libposix-shm | 1 - x11-packages/poppler-glib | 1 - x11-packages/xournal/build.sh | 4 +- x11-packages/yajl | 1 - 17 files changed, 153 insertions(+), 52 deletions(-) delete mode 120000 x11-packages/capstone delete mode 120000 x11-packages/dtc delete mode 120000 x11-packages/geoip2-database delete mode 120000 x11-packages/giflib delete mode 100644 x11-packages/i3/i3-4.15_i3-dump-log_main.c.patch delete mode 100644 x11-packages/i3/i3-4.15_src_log.c.patch delete mode 100644 x11-packages/i3/i3-4.15_src_main.c.patch create mode 100644 x11-packages/i3/posix-shm-implementation.patch delete mode 120000 x11-packages/libcap delete mode 120000 x11-packages/liblua52 delete mode 120000 x11-packages/libmaxminddb delete mode 120000 x11-packages/libnfs delete mode 120000 x11-packages/libposix-shm delete mode 120000 x11-packages/poppler-glib delete mode 120000 x11-packages/yajl diff --git a/x11-packages/capstone b/x11-packages/capstone deleted file mode 120000 index 00e3538a3..000000000 --- a/x11-packages/capstone +++ /dev/null @@ -1 +0,0 @@ -../unstable-packages/packages/capstone \ No newline at end of file diff --git a/x11-packages/dtc b/x11-packages/dtc deleted file mode 120000 index 80dc11622..000000000 --- a/x11-packages/dtc +++ /dev/null @@ -1 +0,0 @@ -../unstable-packages/packages/dtc \ No newline at end of file diff --git a/x11-packages/geoip2-database b/x11-packages/geoip2-database deleted file mode 120000 index a31feff90..000000000 --- a/x11-packages/geoip2-database +++ /dev/null @@ -1 +0,0 @@ -../unstable-packages/packages/geoip2-database \ No newline at end of file diff --git a/x11-packages/giflib b/x11-packages/giflib deleted file mode 120000 index 92f2c55ab..000000000 --- a/x11-packages/giflib +++ /dev/null @@ -1 +0,0 @@ -../unstable-packages/packages/giflib \ No newline at end of file diff --git a/x11-packages/i3/build.sh b/x11-packages/i3/build.sh index 4f2dc09e0..8cf56f3cd 100644 --- a/x11-packages/i3/build.sh +++ b/x11-packages/i3/build.sh @@ -3,10 +3,10 @@ TERMUX_PKG_DESCRIPTION="An improved dynamic tiling window manager" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="Leonid Plyushch @xeffyr" TERMUX_PKG_VERSION=4.16 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://i3wm.org/downloads/i3-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=cc60a5f518c5e37b4143b644a840bb2ad2a63ea7a771954c332cd5637db655b4 -TERMUX_PKG_DEPENDS="glib, i3status, libandroid-glob, libandroid-shmem, libcairo-x, libev, libposix-shm, libxcb, libxkbcommon, pango-x, pcre, perl, startup-notification, xcb-util, xcb-util-cursor, xcb-util-keysyms, xcb-util-wm, xcb-util-xrm, yajl" +TERMUX_PKG_DEPENDS="glib, i3status, libandroid-glob, libandroid-shmem, libcairo-x, libev, libxcb, libxkbcommon, pango-x, pcre, perl, startup-notification, xcb-util, xcb-util-cursor, xcb-util-keysyms, xcb-util-wm, xcb-util-xrm, yajl" TERMUX_PKG_CONFFILES=" i3/config @@ -14,5 +14,5 @@ i3/config.keycodes " termux_step_pre_configure() { - export LIBS="-lposix-shm -landroid-glob -landroid-shmem" + export LIBS="-landroid-glob -landroid-shmem" } diff --git a/x11-packages/i3/i3-4.15_i3-dump-log_main.c.patch b/x11-packages/i3/i3-4.15_i3-dump-log_main.c.patch deleted file mode 100644 index f7f793413..000000000 --- a/x11-packages/i3/i3-4.15_i3-dump-log_main.c.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr i3-4.15/i3-dump-log/main.c i3-4.15.mod/i3-dump-log/main.c ---- i3-4.15/i3-dump-log/main.c 2018-03-10 19:29:14.000000000 +0200 -+++ i3-4.15.mod/i3-dump-log/main.c 2018-06-21 19:48:29.556920631 +0300 -@@ -27,6 +27,8 @@ - #include - #include - -+#include -+ - #include "libi3.h" - #include "shmlog.h" - #include diff --git a/x11-packages/i3/i3-4.15_src_log.c.patch b/x11-packages/i3/i3-4.15_src_log.c.patch deleted file mode 100644 index c34a1d306..000000000 --- a/x11-packages/i3/i3-4.15_src_log.c.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr i3-4.15/src/log.c i3-4.15.mod/src/log.c ---- i3-4.15/src/log.c 2018-03-10 19:29:14.000000000 +0200 -+++ i3-4.15.mod/src/log.c 2018-06-21 19:48:29.573587298 +0300 -@@ -24,6 +24,8 @@ - #include - #endif - -+#include -+ - #include "util.h" - #include "log.h" - #include "i3.h" diff --git a/x11-packages/i3/i3-4.15_src_main.c.patch b/x11-packages/i3/i3-4.15_src_main.c.patch deleted file mode 100644 index 147bb674c..000000000 --- a/x11-packages/i3/i3-4.15_src_main.c.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr i3-4.15/src/main.c i3-4.15.mod/src/main.c ---- i3-4.15/src/main.c 2018-03-10 19:29:14.000000000 +0200 -+++ i3-4.15.mod/src/main.c 2018-06-21 19:48:29.576920631 +0300 -@@ -21,6 +21,8 @@ - #include - #include "shmlog.h" - -+#include -+ - #ifdef I3_ASAN_ENABLED - #include - #endif diff --git a/x11-packages/i3/posix-shm-implementation.patch b/x11-packages/i3/posix-shm-implementation.patch new file mode 100644 index 000000000..f0fc6fbe1 --- /dev/null +++ b/x11-packages/i3/posix-shm-implementation.patch @@ -0,0 +1,148 @@ +diff -uNr i3-4.16/i3-dump-log/main.c i3-4.16.mod/i3-dump-log/main.c +--- i3-4.16/i3-dump-log/main.c 2018-11-04 15:47:34.000000000 +0200 ++++ i3-4.16.mod/i3-dump-log/main.c 2019-03-20 17:12:26.815477041 +0200 +@@ -91,6 +91,44 @@ + va_end(args); + } + ++static int shm_open(const char *name, int oflag, mode_t mode) { ++ size_t namelen; ++ char *fname; ++ int fd; ++ ++ /* Construct the filename. */ ++ while (name[0] == '/') ++name; ++ ++ if (name[0] == '\0') { ++ /* The name "/" is not supported. */ ++ errno = EINVAL; ++ return -1; ++ } ++ ++ namelen = strlen(name); ++ fname = (char *) alloca(sizeof("@TERMUX_PREFIX@/tmp/") - 1 + namelen + 1); ++ memcpy(fname, "@TERMUX_PREFIX@/tmp/", sizeof("@TERMUX_PREFIX@/tmp/") - 1); ++ memcpy(fname + sizeof("@TERMUX_PREFIX@/tmp/") - 1, name, namelen + 1); ++ ++ fd = open(fname, oflag, mode); ++ if (fd != -1) { ++ /* We got a descriptor. Now set the FD_CLOEXEC bit. */ ++ int flags = fcntl(fd, F_GETFD, 0); ++ flags |= FD_CLOEXEC; ++ flags = fcntl(fd, F_SETFD, flags); ++ ++ if (flags == -1) { ++ /* Something went wrong. We cannot return the descriptor. */ ++ int save_errno = errno; ++ close(fd); ++ fd = -1; ++ errno = save_errno; ++ } ++ } ++ ++ return fd; ++} ++ + int main(int argc, char *argv[]) { + int o, option_index = 0; + bool verbose = false; +diff -uNr i3-4.16/src/log.c i3-4.16.mod/src/log.c +--- i3-4.16/src/log.c 2018-11-04 15:47:34.000000000 +0200 ++++ i3-4.16.mod/src/log.c 2019-03-20 17:11:22.943719028 +0200 +@@ -118,6 +118,65 @@ + atexit(purge_zerobyte_logfile); + } + ++static int shm_unlink(const char *name) { ++ size_t namelen; ++ char *fname; ++ ++ /* Construct the filename. */ ++ while (name[0] == '/') ++name; ++ ++ if (name[0] == '\0') { ++ /* The name "/" is not supported. */ ++ errno = EINVAL; ++ return -1; ++ } ++ ++ namelen = strlen(name); ++ fname = (char *) alloca(sizeof("@TERMUX_PREFIX@/tmp/") - 1 + namelen + 1); ++ memcpy(fname, "@TERMUX_PREFIX@/tmp/", sizeof("@TERMUX_PREFIX@/tmp/") - 1); ++ memcpy(fname + sizeof("@TERMUX_PREFIX@/tmp/") - 1, name, namelen + 1); ++ ++ return unlink(fname); ++} ++ ++static int shm_open(const char *name, int oflag, mode_t mode) { ++ size_t namelen; ++ char *fname; ++ int fd; ++ ++ /* Construct the filename. */ ++ while (name[0] == '/') ++name; ++ ++ if (name[0] == '\0') { ++ /* The name "/" is not supported. */ ++ errno = EINVAL; ++ return -1; ++ } ++ ++ namelen = strlen(name); ++ fname = (char *) alloca(sizeof("@TERMUX_PREFIX@/tmp/") - 1 + namelen + 1); ++ memcpy(fname, "@TERMUX_PREFIX@/tmp/", sizeof("@TERMUX_PREFIX@/tmp/") - 1); ++ memcpy(fname + sizeof("@TERMUX_PREFIX@/tmp/") - 1, name, namelen + 1); ++ ++ fd = open(fname, oflag, mode); ++ if (fd != -1) { ++ /* We got a descriptor. Now set the FD_CLOEXEC bit. */ ++ int flags = fcntl(fd, F_GETFD, 0); ++ flags |= FD_CLOEXEC; ++ flags = fcntl(fd, F_SETFD, flags); ++ ++ if (flags == -1) { ++ /* Something went wrong. We cannot return the descriptor. */ ++ int save_errno = errno; ++ close(fd); ++ fd = -1; ++ errno = save_errno; ++ } ++ } ++ ++ return fd; ++} ++ + /* + * Opens the logbuffer. + * +diff -uNr i3-4.16/src/main.c i3-4.16.mod/src/main.c +--- i3-4.16/src/main.c 2018-11-04 15:47:34.000000000 +0200 ++++ i3-4.16.mod/src/main.c 2019-03-20 17:08:46.144848996 +0200 +@@ -155,6 +155,27 @@ + } + } + ++static int shm_unlink(const char *name) { ++ size_t namelen; ++ char *fname; ++ ++ /* Construct the filename. */ ++ while (name[0] == '/') ++name; ++ ++ if (name[0] == '\0') { ++ /* The name "/" is not supported. */ ++ errno = EINVAL; ++ return -1; ++ } ++ ++ namelen = strlen(name); ++ fname = (char *) alloca(sizeof("@TERMUX_PREFIX@/tmp/") - 1 + namelen + 1); ++ memcpy(fname, "@TERMUX_PREFIX@/tmp/", sizeof("@TERMUX_PREFIX@/tmp/") - 1); ++ memcpy(fname + sizeof("@TERMUX_PREFIX@/tmp/") - 1, name, namelen + 1); ++ ++ return unlink(fname); ++} ++ + /* + * Exit handler which destroys the main_loop. Will trigger cleanup handlers. + * diff --git a/x11-packages/libcap b/x11-packages/libcap deleted file mode 120000 index 64bbc5978..000000000 --- a/x11-packages/libcap +++ /dev/null @@ -1 +0,0 @@ -../unstable-packages/packages/libcap \ No newline at end of file diff --git a/x11-packages/liblua52 b/x11-packages/liblua52 deleted file mode 120000 index 67b595ed6..000000000 --- a/x11-packages/liblua52 +++ /dev/null @@ -1 +0,0 @@ -../unstable-packages/packages/liblua52 \ No newline at end of file diff --git a/x11-packages/libmaxminddb b/x11-packages/libmaxminddb deleted file mode 120000 index 498ae857f..000000000 --- a/x11-packages/libmaxminddb +++ /dev/null @@ -1 +0,0 @@ -../unstable-packages/packages/libmaxminddb \ No newline at end of file diff --git a/x11-packages/libnfs b/x11-packages/libnfs deleted file mode 120000 index db80e4a7e..000000000 --- a/x11-packages/libnfs +++ /dev/null @@ -1 +0,0 @@ -../unstable-packages/packages/libnfs \ No newline at end of file diff --git a/x11-packages/libposix-shm b/x11-packages/libposix-shm deleted file mode 120000 index 1c4007d19..000000000 --- a/x11-packages/libposix-shm +++ /dev/null @@ -1 +0,0 @@ -../unstable-packages/packages/libposix-shm \ No newline at end of file diff --git a/x11-packages/poppler-glib b/x11-packages/poppler-glib deleted file mode 120000 index f875fb13e..000000000 --- a/x11-packages/poppler-glib +++ /dev/null @@ -1 +0,0 @@ -../unstable-packages/packages/poppler-glib \ No newline at end of file diff --git a/x11-packages/xournal/build.sh b/x11-packages/xournal/build.sh index c3f954521..83e208a14 100644 --- a/x11-packages/xournal/build.sh +++ b/x11-packages/xournal/build.sh @@ -3,10 +3,10 @@ TERMUX_PKG_DESCRIPTION="Notetaking and sketching application" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="Leonid Plyushch @xeffyr" TERMUX_PKG_VERSION=0.4.8.2016 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/xournal/xournal-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=b25898dbd7a149507f37a16769202d69fbebd4a000d766923bbd32c5c7462826 -TERMUX_PKG_DEPENDS="atk, desktop-file-utils, fontconfig, freetype, glib, gtk2, hicolor-icon-theme, libandroid-shmem, libart-lgpl, libcairo, libgnomecanvas, pango-x, poppler-glib, libx11, shared-mime-info" +TERMUX_PKG_DEPENDS="atk, desktop-file-utils, fontconfig, freetype, glib, gtk2, hicolor-icon-theme, libandroid-shmem, libart-lgpl, libcairo, libgnomecanvas, pango-x, poppler, libx11, shared-mime-info" TERMUX_PKG_RM_AFTER_INSTALL="lib/locale" termux_step_pre_configure() { diff --git a/x11-packages/yajl b/x11-packages/yajl deleted file mode 120000 index 99a04e837..000000000 --- a/x11-packages/yajl +++ /dev/null @@ -1 +0,0 @@ -../unstable-packages/packages/yajl \ No newline at end of file