sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drop submodule 'unstable-packages'

Browse Source 
No longer cross-repository dependencies.
This commit is contained in:
Leonid Pliushch 2019-03-20 17:14:46 +02:00 committed by Yaksh Bariya
parent 7a8a5a67a0
commit 50e3ba7e01
No known key found for this signature in database
GPG Key ID: F7486BA7D3D27581
17 changed files with 153 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
x11-packages/capstone
View File

@ -1 +0,0 @@
../unstable-packages/packages/capstone

1
x11-packages/dtc
View File

@ -1 +0,0 @@
../unstable-packages/packages/dtc

1
x11-packages/geoip2-database
View File

@ -1 +0,0 @@
../unstable-packages/packages/geoip2-database

1
x11-packages/giflib
View File

@ -1 +0,0 @@
../unstable-packages/packages/giflib

6
x11-packages/i3/build.sh
View File

@ -3,10 +3,10 @@ TERMUX_PKG_DESCRIPTION="An improved dynamic tiling window manager"
TERMUX_PKG_LICENSE="BSD 3-Clause"
TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @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"
}

12
x11-packages/i3/i3-4.15_i3-dump-log_main.c.patch
View File

@ -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 <sys/stat.h>
#include <signal.h>
+#include <posix-shm.h>
+
#include "libi3.h"
#include "shmlog.h"
#include <i3/ipc.h>

12
x11-packages/i3/i3-4.15_src_log.c.patch
View File

@ -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 <pthread.h>
#endif
+#include <posix-shm.h>
+
#include "util.h"
#include "log.h"
#include "i3.h"

12
x11-packages/i3/i3-4.15_src_main.c.patch
View File

@ -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 <libgen.h>
#include "shmlog.h"
+#include <posix-shm.h>
+
#ifdef I3_ASAN_ENABLED
#include <sanitizer/lsan_interface.h>
#endif

148
x11-packages/i3/posix-shm-implementation.patch Normal file
View File

@ -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.
*

1
x11-packages/libcap
View File

@ -1 +0,0 @@
../unstable-packages/packages/libcap

1
x11-packages/liblua52
View File

@ -1 +0,0 @@
../unstable-packages/packages/liblua52

1
x11-packages/libmaxminddb
View File

@ -1 +0,0 @@
../unstable-packages/packages/libmaxminddb

1
x11-packages/libnfs
View File

@ -1 +0,0 @@
../unstable-packages/packages/libnfs

1
x11-packages/libposix-shm
View File

@ -1 +0,0 @@
../unstable-packages/packages/libposix-shm

1
x11-packages/poppler-glib
View File

@ -1 +0,0 @@
../unstable-packages/packages/poppler-glib

4
x11-packages/xournal/build.sh
View File

@ -3,10 +3,10 @@ TERMUX_PKG_DESCRIPTION="Notetaking and sketching application"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @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() {

1
x11-packages/yajl
View File

@ -1 +0,0 @@
../unstable-packages/packages/yajl