rm disabled-packages/cups, since packages/cups exists
This commit is contained in:
parent
4e756545ff
commit
03a01c0a8f
@ -1,22 +0,0 @@
|
||||
TERMUX_PKG_HOMEPAGE=https://www.cups.org
|
||||
TERMUX_PKG_VERSION=2.2.4
|
||||
TERMUX_PKG_DEPENDS=krb5
|
||||
TERMUX_PKG_SRCURL=https://github.com/apple/cups/releases/download/v$TERMUX_PKG_VERSION/cups-$TERMUX_PKG_VERSION-source.tar.gz
|
||||
TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas"
|
||||
TERMUX_PKG_SHA256=596d4db72651c335469ae5f37b0da72ac9f97d73e30838d787065f559dea98cc
|
||||
TERMUX_PKG_DEPENDS="libandroid-support, libcrypt"
|
||||
TERMUX_PKG_FOLDERNAME=cups-$TERMUX_PKG_VERSION
|
||||
TERMUX_PKG_BUILD_IN_SRC=true
|
||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
|
||||
--disable-option-checking
|
||||
--disable-gssapi
|
||||
--with-components=core
|
||||
"
|
||||
|
||||
termux_step_pre_configure() {
|
||||
LDFLAGS="$LDFLAGS -llog -lcrypt"
|
||||
}
|
||||
|
||||
termux_step_post_make_install() {
|
||||
mv "$TERMUX_PREFIX"/lib64/libcups.so* "$TERMUX_PREFIX"/lib/
|
||||
}
|
@ -1,19 +0,0 @@
|
||||
--- ./cups/thread.c 2017-06-30 21:14:38.000000000 +0530
|
||||
+++ ../thread.c 2017-09-24 10:12:11.169628258 +0530
|
||||
@@ -18,6 +18,7 @@
|
||||
|
||||
#include "cups-private.h"
|
||||
#include "thread-private.h"
|
||||
+#include <signal.h>
|
||||
|
||||
|
||||
#if defined(HAVE_PTHREAD_H)
|
||||
@@ -150,7 +151,7 @@
|
||||
void
|
||||
_cupsThreadCancel(_cups_thread_t thread)/* I - Thread ID */
|
||||
{
|
||||
- pthread_cancel(thread);
|
||||
+ pthread_kill(thread, SIGTERM);
|
||||
}
|
||||
|
||||
|
@ -1,12 +0,0 @@
|
||||
--- ./cups/file.c 2016-10-04 01:25:40.000000000 +0530
|
||||
+++ ../file.c 2016-12-11 09:51:21.994431659 +0530
|
||||
@@ -39,6 +39,9 @@
|
||||
static ssize_t cups_read(cups_file_t *fp, char *buf, size_t bytes);
|
||||
static ssize_t cups_write(cups_file_t *fp, const char *buf, size_t bytes);
|
||||
|
||||
+#ifdef __ANDROID__
|
||||
+#include "lockf.cpp"
|
||||
+#endif
|
||||
|
||||
#ifndef WIN32
|
||||
/*
|
@ -1,92 +0,0 @@
|
||||
--- /dev/null 2016-12-11 08:33:21.825618476 +0530
|
||||
+++ ./cups/lockf.cpp 2016-12-11 09:44:20.050966252 +0530
|
||||
@@ -0,0 +1,89 @@
|
||||
+/*
|
||||
+ * Copyright (C) 2016 The Android Open Source Project
|
||||
+ * All rights reserved.
|
||||
+ *
|
||||
+ * Redistribution and use in source and binary forms, with or without
|
||||
+ * modification, are permitted provided that the following conditions
|
||||
+ * are met:
|
||||
+ * * Redistributions of source code must retain the above copyright
|
||||
+ * notice, this list of conditions and the following disclaimer.
|
||||
+ * * Redistributions in binary form must reproduce the above copyright
|
||||
+ * notice, this list of conditions and the following disclaimer in
|
||||
+ * the documentation and/or other materials provided with the
|
||||
+ * distribution.
|
||||
+ *
|
||||
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
||||
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
||||
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
|
||||
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
+ * SUCH DAMAGE.
|
||||
+ */
|
||||
+#include <unistd.h>
|
||||
+#include <errno.h>
|
||||
+#include <fcntl.h>
|
||||
+#include <string.h>
|
||||
+
|
||||
+#ifndef _BITS_LOCKF_H_
|
||||
+#define _BITS_LOCKF_H_
|
||||
+
|
||||
+#include <sys/cdefs.h>
|
||||
+
|
||||
+#define F_ULOCK 0
|
||||
+#define F_LOCK 1
|
||||
+#define F_TLOCK 2
|
||||
+#define F_TEST 3
|
||||
+
|
||||
+__BEGIN_DECLS
|
||||
+
|
||||
+#if defined(__USE_FILE_OFFSET64)
|
||||
+int lockf(int, int, off_t) __RENAME(lockf64);
|
||||
+#else
|
||||
+int lockf(int, int, off_t);
|
||||
+#endif
|
||||
+int lockf64(int, int, off64_t);
|
||||
+
|
||||
+__END_DECLS
|
||||
+
|
||||
+#endif
|
||||
+
|
||||
+
|
||||
+int lockf64(int fd, int cmd, off64_t length) {
|
||||
+ // Translate POSIX lockf into fcntl.
|
||||
+ struct flock fl;
|
||||
+ memset(&fl, 0, sizeof(fl));
|
||||
+ fl.l_whence = SEEK_CUR;
|
||||
+ fl.l_start = 0;
|
||||
+ fl.l_len = length;
|
||||
+ if (cmd == F_ULOCK) {
|
||||
+ fl.l_type = F_UNLCK;
|
||||
+ cmd = F_SETLK64;
|
||||
+ return fcntl(fd, F_SETLK64, &fl);
|
||||
+ }
|
||||
+ if (cmd == F_LOCK) {
|
||||
+ fl.l_type = F_WRLCK;
|
||||
+ return fcntl(fd, F_SETLKW64, &fl);
|
||||
+ }
|
||||
+ if (cmd == F_TLOCK) {
|
||||
+ fl.l_type = F_WRLCK;
|
||||
+ return fcntl(fd, F_SETLK64, &fl);
|
||||
+ }
|
||||
+ if (cmd == F_TEST) {
|
||||
+ fl.l_type = F_RDLCK;
|
||||
+ if (fcntl(fd, F_GETLK64, &fl) == -1) return -1;
|
||||
+ if (fl.l_type == F_UNLCK || fl.l_pid == getpid()) return 0;
|
||||
+ errno = EACCES;
|
||||
+ return -1;
|
||||
+ }
|
||||
+ errno = EINVAL;
|
||||
+ return -1;
|
||||
+}
|
||||
+int lockf(int fd, int cmd, off_t length) {
|
||||
+ return lockf64(fd, cmd, length);
|
||||
+}
|
Loading…
Reference in New Issue
Block a user