root
6 years ago
parent
9ce77efdd5
commit
5872e56d54
Binary file not shown.
Binary file not shown.
@ -1,15 +0,0 @@
|
||||
there's no real need to run AC_CHECK_FILE to see if a file exists. if the
|
||||
static link fails later on, then the static lib didn't exist. this also
|
||||
breaks cross-compiling.
|
||||
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -448,8 +448,6 @@
|
||||
sepol_srcdir="")
|
||||
if test "x${sepol_srcdir}" = "x"; then
|
||||
sepol_srcdir=${sepol_devel_libdir}
|
||||
- AC_CHECK_FILE([${sepol_srcdir}/libsepol.a],,
|
||||
- AC_MSG_ERROR([make sure libsepol-static is installed]))
|
||||
else
|
||||
AC_MSG_CHECKING([for compatible sepol source tree])
|
||||
sepol_version=${sepol_srcdir}/VERSION
|
||||
@ -1,29 +0,0 @@
|
||||
trying to run compiled code fails when cross-compiling.
|
||||
probe the value using the preprocessor instead.
|
||||
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -621,21 +621,8 @@
|
||||
sepol_new_errcodes="yes",
|
||||
sepol_new_errcodes="no")
|
||||
|
||||
-AC_RUN_IFELSE(
|
||||
- [AC_LANG_SOURCE([
|
||||
-#include <sepol/policydb/policydb.h>
|
||||
-#include <stdio.h>
|
||||
-#include <stdlib.h>
|
||||
-int main(void) {
|
||||
- FILE *f = fopen("conftest.data", "w");
|
||||
- if (f != NULL && fprintf(f, "%d", POLICYDB_VERSION_MAX) > 0) {
|
||||
- fclose(f);
|
||||
- exit(EXIT_SUCCESS);
|
||||
- }
|
||||
- exit(EXIT_FAILURE);
|
||||
-}])],
|
||||
- sepol_policy_version_max=`cat conftest.data`,
|
||||
- AC_MSG_FAILURE([could not determine maximum libsepol policy version]))
|
||||
+printf "#include <sepol/policydb/policydb.h>\nPOLICYDB_VERSION_MAX\n" > conftest.c
|
||||
+sepol_policy_version_max=`${CPP} -E -P ${CPPFLAGS} conftest.c | tail -1`
|
||||
AC_DEFINE_UNQUOTED(SEPOL_POLICY_VERSION_MAX, ${sepol_policy_version_max}, [maximum policy version supported by libsepol])
|
||||
CFLAGS="${sepol_save_CFLAGS}"
|
||||
CPPFLAGS="${sepol_save_CPPFLAGS}"
|
||||
@ -1,17 +0,0 @@
|
||||
--- setools-4.0.1/setup.py.orig 2016-05-22 19:50:02.586000000 +0200
|
||||
+++ setools-4.0.1/setup.py 2016-05-22 19:50:56.107000000 +0200
|
||||
@@ -163,11 +163,10 @@
|
||||
'build_lex': LexCommand,
|
||||
'build_ext': BuildExtCommand,
|
||||
'build_qhc': QtHelpCommand},
|
||||
- packages=['setools', 'setools.diff', 'setools.policyrep', 'setoolsgui', 'setoolsgui.apol'],
|
||||
- scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
|
||||
+ packages=['setools', 'setools.diff', 'setools.policyrep'],
|
||||
+ scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
|
||||
data_files=[(join(sys.prefix, 'share/man/man1'), glob.glob("man/*.1") ),
|
||||
- (join(sys.prefix, 'share/setools'), glob.glob("data/*.ui") +
|
||||
- ["data/perm_map", "qhc/apol.qhc"] )],
|
||||
+ (join(sys.prefix, 'share/setools'), ["data/perm_map"] ),],
|
||||
ext_modules=ext_py_mods,
|
||||
test_suite='tests',
|
||||
license='GPLv2+, LGPLv2.1+',
|
||||
Binary file not shown.
@ -1,22 +0,0 @@
|
||||
commit f0bcd186190fe6e67b3f0eaaceb7a99aa6a98865
|
||||
Author: Steven Morgan <stevmorg@cisco.com>
|
||||
Date: Thu Jan 5 12:30:35 2017 -0500
|
||||
|
||||
bb111711 - fix zlib version check - patch by Daniel J. Luke.
|
||||
|
||||
diff --git a/m4/reorganization/libs/libz.m4 b/m4/reorganization/libs/libz.m4
|
||||
index b5c7414..f7b67ca 100644
|
||||
--- a/m4/reorganization/libs/libz.m4
|
||||
+++ b/m4/reorganization/libs/libz.m4
|
||||
@@ -29,9 +29,9 @@ then
|
||||
AC_MSG_ERROR([Please install zlib and zlib-devel packages])
|
||||
else
|
||||
|
||||
- vuln=`grep "ZLIB_VERSION \"1.2.0" $ZLIB_HOME/include/zlib.h`
|
||||
+ vuln=`grep "ZLIB_VERSION \"1.2.0\"" $ZLIB_HOME/include/zlib.h`
|
||||
if test -z "$vuln"; then
|
||||
- vuln=`grep "ZLIB_VERSION \"1.2.1" $ZLIB_HOME/include/zlib.h`
|
||||
+ vuln=`grep "ZLIB_VERSION \"1.2.1\"" $ZLIB_HOME/include/zlib.h`
|
||||
fi
|
||||
|
||||
if test -n "$vuln"; then
|
||||
@ -1,50 +0,0 @@
|
||||
Description: fix compatibility with zlib 1.2.9 and newer
|
||||
Author: Marc Deslauriers <marc.deslauriers@canonical.com>
|
||||
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/clamav/+bug/1692073
|
||||
|
||||
--- a/libclamav/bytecode_api.c 2017-08-08 15:20:06.651685637 -0400
|
||||
+++ b/libclamav/bytecode_api.c 2017-08-15 15:45:14.645714766 -0400
|
||||
@@ -811,8 +811,20 @@ int32_t cli_bcapi_inflate_init(struct cl
|
||||
cli_dbgmsg("bytecode api: inflate_init: invalid buffers!\n");
|
||||
return -1;
|
||||
}
|
||||
- memset(&stream, 0, sizeof(stream));
|
||||
- ret = inflateInit2(&stream, windowBits);
|
||||
+
|
||||
+ b = cli_realloc(ctx->inflates, sizeof(*ctx->inflates)*n);
|
||||
+ if (!b) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+ ctx->inflates = b;
|
||||
+ ctx->ninflates = n;
|
||||
+ b = &b[n-1];
|
||||
+
|
||||
+ b->from = from;
|
||||
+ b->to = to;
|
||||
+ b->needSync = 0;
|
||||
+ memset(&b->stream, 0, sizeof(stream));
|
||||
+ ret = inflateInit2(&b->stream, windowBits);
|
||||
switch (ret) {
|
||||
case Z_MEM_ERROR:
|
||||
cli_dbgmsg("bytecode api: inflateInit2: out of memory!\n");
|
||||
@@ -829,20 +841,6 @@ int32_t cli_bcapi_inflate_init(struct cl
|
||||
cli_dbgmsg("bytecode api: inflateInit2: unknown error %d\n", ret);
|
||||
return -1;
|
||||
}
|
||||
-
|
||||
- b = cli_realloc(ctx->inflates, sizeof(*ctx->inflates)*n);
|
||||
- if (!b) {
|
||||
- inflateEnd(&stream);
|
||||
- return -1;
|
||||
- }
|
||||
- ctx->inflates = b;
|
||||
- ctx->ninflates = n;
|
||||
- b = &b[n-1];
|
||||
-
|
||||
- b->from = from;
|
||||
- b->to = to;
|
||||
- b->needSync = 0;
|
||||
- memcpy(&b->stream, &stream, sizeof(stream));
|
||||
return n-1;
|
||||
}
|
||||
|
||||
@ -1,84 +0,0 @@
|
||||
diff --git a/libclamav/c++/llvm/include/llvm/ADT/StringMap.h b/libclamav/c++/llvm/include/llvm/ADT/StringMap.h
|
||||
index 59ff6aa..1325394 100644
|
||||
--- a/libclamav/c++/llvm/include/llvm/ADT/StringMap.h
|
||||
+++ b/libclamav/c++/llvm/include/llvm/ADT/StringMap.h
|
||||
@@ -169,3 +169,3 @@ public:
|
||||
KeyLength+1;
|
||||
- unsigned Alignment = alignof<StringMapEntry>();
|
||||
+ unsigned Alignment = alignOf<StringMapEntry>();
|
||||
|
||||
diff --git a/libclamav/c++/llvm/include/llvm/CodeGen/SlotIndexes.h b/libclamav/c++/llvm/include/llvm/CodeGen/SlotIndexes.h
|
||||
index 88044c7..86b0f40 100644
|
||||
--- a/libclamav/c++/llvm/include/llvm/CodeGen/SlotIndexes.h
|
||||
+++ b/libclamav/c++/llvm/include/llvm/CodeGen/SlotIndexes.h
|
||||
@@ -417,3 +417,3 @@ namespace llvm {
|
||||
ileAllocator.Allocate(sizeof(IndexListEntry),
|
||||
- alignof<IndexListEntry>()));
|
||||
+ alignOf<IndexListEntry>()));
|
||||
|
||||
diff --git a/libclamav/c++/llvm/include/llvm/Support/AlignOf.h b/libclamav/c++/llvm/include/llvm/Support/AlignOf.h
|
||||
index 6a7a1a6..979e597 100644
|
||||
--- a/libclamav/c++/llvm/include/llvm/Support/AlignOf.h
|
||||
+++ b/libclamav/c++/llvm/include/llvm/Support/AlignOf.h
|
||||
@@ -51,8 +51,8 @@ struct AlignOf {
|
||||
|
||||
-/// alignof - A templated function that returns the mininum alignment of
|
||||
+/// alignOf - A templated function that returns the mininum alignment of
|
||||
/// of a type. This provides no extra functionality beyond the AlignOf
|
||||
/// class besides some cosmetic cleanliness. Example usage:
|
||||
-/// alignof<int>() returns the alignment of an int.
|
||||
+/// alignOf<int>() returns the alignment of an int.
|
||||
template <typename T>
|
||||
-static inline unsigned alignof() { return AlignOf<T>::Alignment; }
|
||||
+static inline unsigned alignOf() { return AlignOf<T>::Alignment; }
|
||||
|
||||
diff --git a/libclamav/c++/llvm/include/llvm/Support/Allocator.h b/libclamav/c++/llvm/include/llvm/Support/Allocator.h
|
||||
index 4a7251f..17caf5e 100644
|
||||
--- a/libclamav/c++/llvm/include/llvm/Support/Allocator.h
|
||||
+++ b/libclamav/c++/llvm/include/llvm/Support/Allocator.h
|
||||
@@ -203,3 +203,3 @@ public:
|
||||
for (char *Ptr = (char*)(Slab+1); Ptr < End; Ptr += sizeof(T)) {
|
||||
- Ptr = Allocator.AlignPtr(Ptr, alignof<T>());
|
||||
+ Ptr = Allocator.AlignPtr(Ptr, alignOf<T>());
|
||||
if (Ptr + sizeof(T) <= End)
|
||||
diff --git a/libclamav/c++/llvm/lib/Analysis/ScalarEvolution.cpp b/libclamav/c++/llvm/lib/Analysis/ScalarEvolution.cpp
|
||||
index b892d85..dc72346 100644
|
||||
--- a/libclamav/c++/llvm/lib/Analysis/ScalarEvolution.cpp
|
||||
+++ b/libclamav/c++/llvm/lib/Analysis/ScalarEvolution.cpp
|
||||
@@ -495,3 +495,3 @@ void SCEVUnknown::print(raw_ostream &OS) const {
|
||||
if (isAlignOf(AllocTy)) {
|
||||
- OS << "alignof(" << *AllocTy << ")";
|
||||
+ OS << "alignOf(" << *AllocTy << ")";
|
||||
return;
|
||||
diff --git a/libclamav/c++/llvm/lib/Target/X86/X86CodeEmitter.cpp b/libclamav/c++/llvm/lib/Target/X86/X86CodeEmitter.cpp
|
||||
index 824021c..757ca50 100644
|
||||
--- a/libclamav/c++/llvm/lib/Target/X86/X86CodeEmitter.cpp
|
||||
+++ b/libclamav/c++/llvm/lib/Target/X86/X86CodeEmitter.cpp
|
||||
@@ -569,3 +569,3 @@ void Emitter<CodeEmitter>::emitMemModRMByte(const MachineInstr &MI,
|
||||
// Calculate what the SS field value should be...
|
||||
- static const unsigned SSTable[] = { ~0, 0, 1, ~0, 2, ~0, ~0, ~0, 3 };
|
||||
+ static const unsigned SSTable[] = { ~0u, 0u, 1u, ~0u, 2u, ~0u, ~0u, ~0u, 3u };
|
||||
unsigned SS = SSTable[Scale.getImm()];
|
||||
diff --git a/libclamav/c++/llvm/lib/Target/X86/X86MCCodeEmitter.cpp b/libclamav/c++/llvm/lib/Target/X86/X86MCCodeEmitter.cpp
|
||||
index 9564fe0..b2b7986 100644
|
||||
--- a/libclamav/c++/llvm/lib/Target/X86/X86MCCodeEmitter.cpp
|
||||
+++ b/libclamav/c++/llvm/lib/Target/X86/X86MCCodeEmitter.cpp
|
||||
@@ -332,3 +332,3 @@ void X86MCCodeEmitter::EmitMemModRMByte(const MCInst &MI, unsigned Op,
|
||||
// Calculate what the SS field value should be...
|
||||
- static const unsigned SSTable[] = { ~0, 0, 1, ~0, 2, ~0, ~0, ~0, 3 };
|
||||
+ static const unsigned SSTable[] = { ~0u, 0u, 1u, ~0u, 2u, ~0u, ~0u, ~0u, 3u };
|
||||
unsigned SS = SSTable[Scale.getImm()];
|
||||
diff --git a/libclamav/mpool.c b/libclamav/mpool.c
|
||||
index cd38e15..b5e537d 100644
|
||||
--- a/libclamav/mpool.c
|
||||
+++ b/libclamav/mpool.c
|
||||
@@ -417,3 +417,3 @@ static size_t from_bits(unsigned int bits) {
|
||||
|
||||
-static inline unsigned int alignof(size_t size)
|
||||
+static inline unsigned int alignOf(size_t size)
|
||||
{
|
||||
@@ -609,3 +609,3 @@ static void* allocate_aligned(struct MPMAP *mpm, size_t size, unsigned align, co
|
||||
void *mpool_malloc(struct MP *mp, size_t size) {
|
||||
- size_t align = alignof(size);
|
||||
+ size_t align = alignOf(size);
|
||||
size_t i, needed = align_increase(size+FRAG_OVERHEAD, align);
|
||||
@ -1,12 +0,0 @@
|
||||
--- clamav-0.99.2/libclamav/regex_pcre.c~ 2017-11-28 14:40:56.484208243 +0100
|
||||
+++ clamav-0.99.2/libclamav/regex_pcre.c 2017-11-28 14:41:07.301207800 +0100
|
||||
@@ -112,7 +112,8 @@ int cli_pcre_addoptions(struct cli_pcre_
|
||||
#if USING_PCRE2
|
||||
int cli_pcre_compile(struct cli_pcre_data *pd, long long unsigned match_limit, long long unsigned match_limit_recursion, unsigned int options, int opt_override)
|
||||
{
|
||||
- int errornum, erroffset;
|
||||
+ int errornum;
|
||||
+ size_t erroffset;
|
||||
pcre2_general_context *gctx;
|
||||
pcre2_compile_context *cctx;
|
||||
|
||||
@ -1,23 +0,0 @@
|
||||
--- a/m4/reorganization/clamdtop.m4
|
||||
+++ b/m4/reorganization/clamdtop.m4
|
||||
@@ -4,12 +4,20 @@
|
||||
|
||||
if test "$enable_clamdtop" != "no"; then
|
||||
|
||||
+PKG_CHECK_MODULES([CURSES],[ncurses],
|
||||
+ [HAVE_LIBNCURSES=yes; CURSES_INCLUDE="<ncurses.h>"],
|
||||
+ [HAVE_LIBNCURSES=no],
|
||||
+)
|
||||
+
|
||||
+if test "X$HAVE_LIBNCURSES" != "Xyes"; then
|
||||
+ HAVE_LIBNCURSES=
|
||||
AC_LIB_FIND([ncurses], [ncurses/ncurses.h],
|
||||
AC_LANG_PROGRAM([#include <ncurses/ncurses.h>],
|
||||
[initscr(); KEY_RESIZE;]),
|
||||
[CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES";
|
||||
CURSES_INCLUDE="<ncurses/ncurses.h>"],
|
||||
[])
|
||||
+fi
|
||||
|
||||
if test "X$HAVE_LIBNCURSES" != "Xyes"; then
|
||||
HAVE_LIBNCURSES=
|
||||
@ -1,186 +0,0 @@
|
||||
Apply proposed changes to fix RAR VMSF_DELTA Filter Signedness error (CVE-2012-6706)
|
||||
|
||||
Cherry picked from commit a7d8447bd9a4d5ae1fa970c1849c8caeb5f1a805 [Link 1] and
|
||||
d4699442bce76574573dc564e7f2177d679b88bd [Link 2].
|
||||
|
||||
Link 1: https://github.com/Cisco-Talos/clamav-devel/commit/a7d8447bd9a4d5ae1fa970c1849c8caeb5f1a805
|
||||
Link 2: https://github.com/Cisco-Talos/clamav-devel/commit/d4699442bce76574573dc564e7f2177d679b88bd
|
||||
|
||||
--- a/libclamunrar/unrarvm.c
|
||||
+++ b/libclamunrar/unrarvm.c
|
||||
@@ -213,17 +213,20 @@ void rarvm_addbits(rarvm_input_t *rarvm_input, int bits)
|
||||
|
||||
unsigned int rarvm_getbits(rarvm_input_t *rarvm_input)
|
||||
{
|
||||
- unsigned int bit_field;
|
||||
+ unsigned int bit_field = 0;
|
||||
|
||||
- if (rarvm_input->in_addr+2 < rarvm_input->buf_size) {
|
||||
+ if (rarvm_input->in_addr < rarvm_input->buf_size) {
|
||||
bit_field = (unsigned int) rarvm_input->in_buf[rarvm_input->in_addr] << 16;
|
||||
- bit_field |= (unsigned int) rarvm_input->in_buf[rarvm_input->in_addr+1] << 8;
|
||||
- bit_field |= (unsigned int) rarvm_input->in_buf[rarvm_input->in_addr+2];
|
||||
- bit_field >>= (8-rarvm_input->in_bit);
|
||||
-
|
||||
- return (bit_field & 0xffff);
|
||||
+ if (rarvm_input->in_addr+1 < rarvm_input->buf_size) {
|
||||
+ bit_field |= (unsigned int) rarvm_input->in_buf[rarvm_input->in_addr+1] << 8;
|
||||
+ if (rarvm_input->in_addr+2 < rarvm_input->buf_size) {
|
||||
+ bit_field |= (unsigned int) rarvm_input->in_buf[rarvm_input->in_addr+2];
|
||||
+ }
|
||||
+ }
|
||||
}
|
||||
- return 0;
|
||||
+ bit_field >>= (8-rarvm_input->in_bit);
|
||||
+
|
||||
+ return (bit_field & 0xffff);
|
||||
}
|
||||
|
||||
unsigned int rarvm_read_data(rarvm_input_t *rarvm_input)
|
||||
@@ -311,10 +314,10 @@ static unsigned int *rarvm_get_operand(rarvm_data_t *rarvm_data,
|
||||
}
|
||||
}
|
||||
|
||||
-static unsigned int filter_itanium_getbits(unsigned char *data, int bit_pos, int bit_count)
|
||||
+static unsigned int filter_itanium_getbits(unsigned char *data, unsigned int bit_pos, unsigned int bit_count)
|
||||
{
|
||||
- int in_addr=bit_pos/8;
|
||||
- int in_bit=bit_pos&7;
|
||||
+ unsigned int in_addr=bit_pos/8;
|
||||
+ unsigned int in_bit=bit_pos&7;
|
||||
unsigned int bit_field=(unsigned int)data[in_addr++];
|
||||
bit_field|=(unsigned int)data[in_addr++] << 8;
|
||||
bit_field|=(unsigned int)data[in_addr++] << 16;
|
||||
@@ -323,10 +326,10 @@ static unsigned int filter_itanium_getbits(unsigned char *data, int bit_pos, int
|
||||
return(bit_field & (0xffffffff>>(32-bit_count)));
|
||||
}
|
||||
|
||||
-static void filter_itanium_setbits(unsigned char *data, unsigned int bit_field, int bit_pos, int bit_count)
|
||||
+static void filter_itanium_setbits(unsigned char *data, unsigned int bit_field, unsigned int bit_pos, unsigned int bit_count)
|
||||
{
|
||||
- int i, in_addr=bit_pos/8;
|
||||
- int in_bit=bit_pos&7;
|
||||
+ unsigned int i, in_addr=bit_pos/8;
|
||||
+ unsigned int in_bit=bit_pos&7;
|
||||
unsigned int and_mask=0xffffffff>>(32-bit_count);
|
||||
and_mask=~(and_mask<<in_bit);
|
||||
|
||||
@@ -343,11 +346,12 @@ static void filter_itanium_setbits(unsigned char *data, unsigned int bit_field,
|
||||
static void execute_standard_filter(rarvm_data_t *rarvm_data, rarvm_standard_filters_t filter_type)
|
||||
{
|
||||
unsigned char *data, cmp_byte2, cur_byte, *src_data, *dest_data;
|
||||
- int i, j, data_size, channels, src_pos, dest_pos, border, width, PosR;
|
||||
- int op_type, cur_channel, byte_count, start_pos, pa, pb, pc;
|
||||
+ unsigned int i, j, data_size, channels, src_pos, dest_pos, border, width, PosR;
|
||||
+ unsigned int op_type, cur_channel, byte_count, start_pos;
|
||||
+ int pa, pb, pc;
|
||||
unsigned int file_offset, cur_pos, predicted;
|
||||
- int32_t offset, addr;
|
||||
- const int file_size=0x1000000;
|
||||
+ uint32_t offset, addr;
|
||||
+ const unsigned int file_size=0x1000000;
|
||||
|
||||
switch(filter_type) {
|
||||
case VMSF_E8:
|
||||
@@ -356,7 +360,7 @@ static void execute_standard_filter(rarvm_data_t *rarvm_data, rarvm_standard_fil
|
||||
data_size = rarvm_data->R[4];
|
||||
file_offset = rarvm_data->R[6];
|
||||
|
||||
- if (((unsigned int)data_size >= VM_GLOBALMEMADDR) || (data_size < 4)) {
|
||||
+ if ((data_size > VM_GLOBALMEMADDR) || (data_size < 4)) {
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -367,12 +371,14 @@ static void execute_standard_filter(rarvm_data_t *rarvm_data, rarvm_standard_fil
|
||||
if (cur_byte==0xe8 || cur_byte==cmp_byte2) {
|
||||
offset = cur_pos+file_offset;
|
||||
addr = GET_VALUE(FALSE, data);
|
||||
- if (addr < 0) {
|
||||
- if (addr+offset >=0 ) {
|
||||
+ // We check 0x80000000 bit instead of '< 0' comparison
|
||||
+ // not assuming int32 presence or uint size and endianness.
|
||||
+ if ((addr & 0x80000000)!=0) { // addr<0
|
||||
+ if (((addr+offset) & 0x80000000)==0) { // addr+offset>=0
|
||||
SET_VALUE(FALSE, data, addr+file_size);
|
||||
}
|
||||
} else {
|
||||
- if (addr<file_size) {
|
||||
+ if (((addr-file_size) & 0x80000000)!=0) { // addr<file_size
|
||||
SET_VALUE(FALSE, data, addr-offset);
|
||||
}
|
||||
}
|
||||
@@ -386,7 +392,7 @@ static void execute_standard_filter(rarvm_data_t *rarvm_data, rarvm_standard_fil
|
||||
data_size = rarvm_data->R[4];
|
||||
file_offset = rarvm_data->R[6];
|
||||
|
||||
- if (((unsigned int)data_size >= VM_GLOBALMEMADDR) || (data_size < 21)) {
|
||||
+ if ((data_size > VM_GLOBALMEMADDR) || (data_size < 21)) {
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -429,7 +435,7 @@ static void execute_standard_filter(rarvm_data_t *rarvm_data, rarvm_standard_fil
|
||||
border = data_size*2;
|
||||
|
||||
SET_VALUE(FALSE, &rarvm_data->mem[VM_GLOBALMEMADDR+0x20], data_size);
|
||||
- if ((unsigned int)data_size >= VM_GLOBALMEMADDR/2) {
|
||||
+ if (data_size > VM_GLOBALMEMADDR/2 || channels > 1024 || channels == 0) {
|
||||
break;
|
||||
}
|
||||
for (cur_channel=0 ; cur_channel < channels ; cur_channel++) {
|
||||
@@ -440,7 +446,7 @@ static void execute_standard_filter(rarvm_data_t *rarvm_data, rarvm_standard_fil
|
||||
}
|
||||
break;
|
||||
case VMSF_RGB: {
|
||||
- const int channels=3;
|
||||
+ const unsigned int channels=3;
|
||||
data_size = rarvm_data->R[4];
|
||||
width = rarvm_data->R[0] - 3;
|
||||
PosR = rarvm_data->R[1];
|
||||
@@ -448,15 +454,14 @@ static void execute_standard_filter(rarvm_data_t *rarvm_data, rarvm_standard_fil
|
||||
dest_data = src_data + data_size;
|
||||
|
||||
SET_VALUE(FALSE, &rarvm_data->mem[VM_GLOBALMEMADDR+0x20], data_size);
|
||||
- if ((unsigned int)data_size >= VM_GLOBALMEMADDR/2) {
|
||||
+ if (data_size > VM_GLOBALMEMADDR/2 || data_size < 3 || width > data_size || PosR > 2) {
|
||||
break;
|
||||
}
|
||||
for (cur_channel=0 ; cur_channel < channels; cur_channel++) {
|
||||
unsigned int prev_byte = 0;
|
||||
for (i=cur_channel ; i<data_size ; i+=channels) {
|
||||
- int upper_pos=i-width;
|
||||
- if (upper_pos >= 3) {
|
||||
- unsigned char *upper_data = dest_data+upper_pos;
|
||||
+ if (i >= width+3) {
|
||||
+ unsigned char *upper_data = dest_data+i-width;
|
||||
unsigned int upper_byte = *upper_data;
|
||||
unsigned int upper_left_byte = *(upper_data-3);
|
||||
predicted = prev_byte+upper_byte-upper_left_byte;
|
||||
@@ -486,13 +491,14 @@ static void execute_standard_filter(rarvm_data_t *rarvm_data, rarvm_standard_fil
|
||||
break;
|
||||
}
|
||||
case VMSF_AUDIO: {
|
||||
- int channels=rarvm_data->R[0];
|
||||
+ unsigned int channels=rarvm_data->R[0];
|
||||
data_size = rarvm_data->R[4];
|
||||
src_data = rarvm_data->mem;
|
||||
dest_data = src_data + data_size;
|
||||
|
||||
SET_VALUE(FALSE, &rarvm_data->mem[VM_GLOBALMEMADDR+0x20], data_size);
|
||||
- if ((unsigned int)data_size >= VM_GLOBALMEMADDR/2) {
|
||||
+ // In fact, audio channels never exceed 4.
|
||||
+ if (data_size > VM_GLOBALMEMADDR/2 || channels > 128 || channels == 0) {
|
||||
break;
|
||||
}
|
||||
for (cur_channel=0 ; cur_channel < channels ; cur_channel++) {
|
||||
@@ -553,7 +559,7 @@ static void execute_standard_filter(rarvm_data_t *rarvm_data, rarvm_standard_fil
|
||||
data_size = rarvm_data->R[4];
|
||||
src_pos = 0;
|
||||
dest_pos = data_size;
|
||||
- if ((unsigned int)data_size >= VM_GLOBALMEMADDR/2) {
|
||||
+ if (data_size > VM_GLOBALMEMADDR/2) {
|
||||
break;
|
||||
}
|
||||
while (src_pos < data_size) {
|
||||
--
|
||||
2.16.2
|
||||
|
||||
@ -1,132 +0,0 @@
|
||||
Author: Manuel Mausz <manuel-clamav@mausz.at>
|
||||
|
||||
http://lists.clamav.net/pipermail/clamav-users/2018-January/005687.html
|
||||
|
||||
--- clamav-0.99.3/libclamav/scanners.c.orig 2018-01-26 14:35:23.299386703 +0100
|
||||
+++ clamav-0.99.3/libclamav/scanners.c 2018-01-26 14:47:44.422451335 +0100
|
||||
@@ -1342,39 +1342,35 @@
|
||||
return CL_CLEAN;
|
||||
}
|
||||
|
||||
- /* dump to disk only if explicitly asked to
|
||||
- * or if necessary to check relative offsets,
|
||||
- * otherwise we can process just in-memory */
|
||||
- if(ctx->engine->keeptmp || (troot && troot->ac_reloff_num > 0)) {
|
||||
- if((ret = cli_gentempfd(ctx->engine->tmpdir, &tmpname, &ofd))) {
|
||||
- cli_dbgmsg("cli_scanscript: Can't generate temporary file/descriptor\n");
|
||||
- return ret;
|
||||
- }
|
||||
- if (ctx->engine->keeptmp)
|
||||
- cli_dbgmsg("cli_scanscript: saving normalized file to %s\n", tmpname);
|
||||
- }
|
||||
-
|
||||
if(!(normalized = cli_malloc(SCANBUFF + maxpatlen))) {
|
||||
cli_dbgmsg("cli_scanscript: Unable to malloc %u bytes\n", SCANBUFF);
|
||||
- free(tmpname);
|
||||
return CL_EMEM;
|
||||
}
|
||||
-
|
||||
text_normalize_init(&state, normalized, SCANBUFF + maxpatlen);
|
||||
- ret = CL_CLEAN;
|
||||
-
|
||||
|
||||
if ((ret = cli_ac_initdata(&tmdata, troot?troot->ac_partsigs:0, troot?troot->ac_lsigs:0, troot?troot->ac_reloff_num:0, CLI_DEFAULT_AC_TRACKLEN))) {
|
||||
- free(tmpname);
|
||||
+ free(normalized);
|
||||
return ret;
|
||||
}
|
||||
|
||||
if ((ret = cli_ac_initdata(&gmdata, groot->ac_partsigs, groot->ac_lsigs, groot->ac_reloff_num, CLI_DEFAULT_AC_TRACKLEN))) {
|
||||
cli_ac_freedata(&tmdata);
|
||||
- free(tmpname);
|
||||
+ free(normalized);
|
||||
return ret;
|
||||
}
|
||||
|
||||
+ /* dump to disk only if explicitly asked to
|
||||
+ * or if necessary to check relative offsets,
|
||||
+ * otherwise we can process just in-memory */
|
||||
+ if(ctx->engine->keeptmp || (troot && troot->ac_reloff_num > 0)) {
|
||||
+ if((ret = cli_gentempfd(ctx->engine->tmpdir, &tmpname, &ofd))) {
|
||||
+ cli_dbgmsg("cli_scanscript: Can't generate temporary file/descriptor\n");
|
||||
+ goto done;
|
||||
+ }
|
||||
+ if (ctx->engine->keeptmp)
|
||||
+ cli_dbgmsg("cli_scanscript: saving normalized file to %s\n", tmpname);
|
||||
+ }
|
||||
+
|
||||
mdata[0] = &tmdata;
|
||||
mdata[1] = &gmdata;
|
||||
|
||||
@@ -1388,9 +1384,8 @@
|
||||
|
||||
if (write(ofd, state.out, state.out_pos) == -1) {
|
||||
cli_errmsg("cli_scanscript: can't write to file %s\n",tmpname);
|
||||
- close(ofd);
|
||||
- free(tmpname);
|
||||
- return CL_EWRITE;
|
||||
+ ret = CL_EWRITE;
|
||||
+ goto done;
|
||||
}
|
||||
text_normalize_reset(&state);
|
||||
}
|
||||
@@ -1409,11 +1404,6 @@
|
||||
funmap(*ctx->fmap);
|
||||
}
|
||||
*ctx->fmap = map;
|
||||
-
|
||||
- /* If we aren't keeping temps, delete the normalized file after scan. */
|
||||
- if(!(ctx->engine->keeptmp))
|
||||
- if (cli_unlink(tmpname)) ret = CL_EUNLINK;
|
||||
-
|
||||
} else {
|
||||
/* Since the above is moderately costly all in all,
|
||||
* do the old stuff if there's no relative offsets. */
|
||||
@@ -1421,11 +1411,8 @@
|
||||
if (troot) {
|
||||
cli_targetinfo(&info, 7, map);
|
||||
ret = cli_ac_caloff(troot, &tmdata, &info);
|
||||
- if (ret) {
|
||||
- cli_ac_freedata(&tmdata);
|
||||
- free(tmpname);
|
||||
- return ret;
|
||||
- }
|
||||
+ if (ret)
|
||||
+ goto done;
|
||||
}
|
||||
|
||||
while(1) {
|
||||
@@ -1466,13 +1453,6 @@
|
||||
|
||||
}
|
||||
|
||||
- if(ctx->engine->keeptmp) {
|
||||
- free(tmpname);
|
||||
- if (ofd >= 0)
|
||||
- close(ofd);
|
||||
- }
|
||||
- free(normalized);
|
||||
-
|
||||
if(ret != CL_VIRUS || SCAN_ALL) {
|
||||
if ((ret = cli_exp_eval(ctx, troot, &tmdata, NULL, NULL)) == CL_VIRUS)
|
||||
viruses_found++;
|
||||
@@ -1481,9 +1461,19 @@
|
||||
viruses_found++;
|
||||
}
|
||||
|
||||
+done:
|
||||
+ free(normalized);
|
||||
cli_ac_freedata(&tmdata);
|
||||
cli_ac_freedata(&gmdata);
|
||||
|
||||
+ if (ofd != -1)
|
||||
+ close(ofd);
|
||||
+ if (tmpname != NULL) {
|
||||
+ if (!ctx->engine->keeptmp)
|
||||
+ if (cli_unlink(tmpname)) ret = CL_EUNLINK;
|
||||
+ free(tmpname);
|
||||
+ }
|
||||
+
|
||||
if (SCAN_ALL && viruses_found)
|
||||
return CL_VIRUS;
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -0,0 +1,147 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
PYTHON_REQ_USE="threads"
|
||||
|
||||
inherit python-single-r1 unpacker
|
||||
|
||||
DESCRIPTION="Commercial version of app-emulation/wine with paid support."
|
||||
HOMEPAGE="http://www.codeweavers.com/products/crossover/"
|
||||
SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
|
||||
|
||||
LICENSE="CROSSOVER-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="-* ~amd64 ~x86"
|
||||
IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
|
||||
RESTRICT="bindist test"
|
||||
QA_FLAGS_IGNORED="opt/cxoffice/.*"
|
||||
QA_PRESTRIPPED="opt/cxoffice/lib/.*
|
||||
opt/cxoffice/bin/cxburner
|
||||
opt/cxoffice/bin/cxntlm_auth
|
||||
opt/cxoffice/bin/wineserver
|
||||
opt/cxoffice/bin/unrar
|
||||
opt/cxoffice/bin/wine-preloader
|
||||
opt/cxoffice/bin/cxdiag
|
||||
opt/cxoffice/bin/cxgettext
|
||||
opt/cxoffice/bin/wineloader
|
||||
"
|
||||
S="${WORKDIR}"
|
||||
|
||||
DEPEND="dev-lang/perl
|
||||
app-arch/unzip
|
||||
${PYTHON_DEPS}"
|
||||
|
||||
RDEPEND="${DEPEND}
|
||||
!prefix? ( sys-libs/glibc )
|
||||
>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
|
||||
dev-python/dbus-python[${PYTHON_USEDEP}]
|
||||
dev-util/desktop-file-utils
|
||||
!app-emulation/crossover-office-pro-bin
|
||||
!app-emulation/crossover-office-bin
|
||||
capi? ( net-libs/libcapi[abi_x86_32(-)] )
|
||||
cups? ( net-print/cups[abi_x86_32(-)] )
|
||||
gsm? ( media-sound/gsm[abi_x86_32(-)] )
|
||||
jpeg? ( virtual/jpeg[abi_x86_32(-)] )
|
||||
lcms? ( media-libs/lcms:2 )
|
||||
ldap? ( net-nds/openldap[abi_x86_32(-)] )
|
||||
gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
|
||||
mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
|
||||
nls? ( sys-devel/gettext[abi_x86_32(-)] )
|
||||
openal? ( media-libs/openal[abi_x86_32(-)] )
|
||||
opengl? (
|
||||
virtual/glu[abi_x86_32(-)]
|
||||
virtual/opengl[abi_x86_32(-)]
|
||||
)
|
||||
png? ( media-libs/libpng:0[abi_x86_32(-)] )
|
||||
scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
|
||||
ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
|
||||
v4l? ( media-libs/libv4l[abi_x86_32(-)] )
|
||||
media-libs/alsa-lib[abi_x86_32(-)]
|
||||
>=media-libs/freetype-2.0.0[abi_x86_32(-)]
|
||||
media-libs/mesa[abi_x86_32(-)]
|
||||
sys-apps/util-linux[abi_x86_32(-)]
|
||||
sys-libs/ncurses:5/5[abi_x86_32(-)]
|
||||
sys-libs/zlib[abi_x86_32(-)]
|
||||
x11-libs/libICE[abi_x86_32(-)]
|
||||
x11-libs/libSM[abi_x86_32(-)]
|
||||
x11-libs/libX11[abi_x86_32(-)]
|
||||
x11-libs/libXau[abi_x86_32(-)]
|
||||
x11-libs/libXdmcp[abi_x86_32(-)]
|
||||
x11-libs/libXext[abi_x86_32(-)]
|
||||
x11-libs/libXi[abi_x86_32(-)]
|
||||
x11-libs/libXrandr[abi_x86_32(-)]
|
||||
x11-libs/libXxf86vm[abi_x86_32(-)]
|
||||
x11-libs/libxcb[abi_x86_32(-)]"
|
||||
|
||||
pkg_nofetch() {
|
||||
einfo "Please visit ${HOMEPAGE}"
|
||||
einfo "and place ${A} in ${DISTDIR}"
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
# self unpacking zip archive; unzip warns about the exe stuff
|
||||
unpack_zip ${A}
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
python_fix_shebang .
|
||||
|
||||
sed -i \
|
||||
-e "s:xdg_install_icons(:&\"${ED}\".:" \
|
||||
-e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
|
||||
-e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
|
||||
"${S}/lib/perl/CXMenuXDG.pm"
|
||||
|
||||
# Remove unnecessary files
|
||||
rm -r license.txt guis/ || die "Could not remove files"
|
||||
use doc || rm -r doc/ || die "Could not remove files"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# Install crossover symlink, bug #476314
|
||||
dosym ../cxoffice/bin/crossover /opt/bin/crossover
|
||||
|
||||
# Install documentation
|
||||
dodoc README changelog.txt
|
||||
rm README changelog.txt || die "Could not remove README and changelog.txt"
|
||||
|
||||
# Install files
|
||||
dodir /opt/cxoffice
|
||||
#cp -r ./* "${ED}opt/cxoffice" \
|
||||
find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
|
||||
|| die "Could not install into ${ED}opt/cxoffice"
|
||||
|
||||
# Install configuration file
|
||||
insinto /opt/cxoffice/etc
|
||||
doins share/crossover/data/cxoffice.conf
|
||||
|
||||
# Install menus
|
||||
# XXX: locate_gui.sh automatically detects *-application-merged directories
|
||||
# This means what we install will vary depending on the contents of
|
||||
# /etc/xdg, which is a QA violation. It is not clear how to resolve this.
|
||||
XDG_DATA_DIRS="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
|
||||
"${ED}opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
|
||||
|| die "Could not install menus"
|
||||
|
||||
rm "${ED}usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
|
||||
"${ED}opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/Uninstall CrossOver Linux.desktop" \
|
||||
|| die "Could not remove uninstall menus"
|
||||
sed -i \
|
||||
-e "s:\"${ED}\".::" \
|
||||
-e "s:${ED}::" \
|
||||
"${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
|
||||
|| die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
|
||||
sed -i -e "s:${ED}:/:" \
|
||||
"${ED}/opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/"*.desktop \
|
||||
"${ED}usr/share/applications/"*"CrossOver.desktop" \
|
||||
|| die "Could not fix paths of *.desktop files"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "${P} is open source software with the exception of the GUI."
|
||||
einfo "Source code can be obtained from:"
|
||||
einfo
|
||||
einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
|
||||
}
|
||||
@ -0,0 +1,147 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
PYTHON_REQ_USE="threads"
|
||||
|
||||
inherit python-single-r1 unpacker
|
||||
|
||||
DESCRIPTION="Commercial version of app-emulation/wine with paid support."
|
||||
HOMEPAGE="http://www.codeweavers.com/products/crossover/"
|
||||
SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
|
||||
|
||||
LICENSE="CROSSOVER-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="-* ~amd64 ~x86"
|
||||
IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
|
||||
RESTRICT="bindist test"
|
||||
QA_FLAGS_IGNORED="opt/cxoffice/.*"
|
||||
QA_PRESTRIPPED="opt/cxoffice/lib/.*
|
||||
opt/cxoffice/bin/cxburner
|
||||
opt/cxoffice/bin/cxntlm_auth
|
||||
opt/cxoffice/bin/wineserver
|
||||
opt/cxoffice/bin/unrar
|
||||
opt/cxoffice/bin/wine-preloader
|
||||
opt/cxoffice/bin/cxdiag
|
||||
opt/cxoffice/bin/cxgettext
|
||||
opt/cxoffice/bin/wineloader
|
||||
"
|
||||
S="${WORKDIR}"
|
||||
|
||||
DEPEND="dev-lang/perl
|
||||
app-arch/unzip
|
||||
${PYTHON_DEPS}"
|
||||
|
||||
RDEPEND="${DEPEND}
|
||||
!prefix? ( sys-libs/glibc )
|
||||
>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
|
||||
dev-python/dbus-python[${PYTHON_USEDEP}]
|
||||
dev-util/desktop-file-utils
|
||||
!app-emulation/crossover-office-pro-bin
|
||||
!app-emulation/crossover-office-bin
|
||||
capi? ( net-libs/libcapi[abi_x86_32(-)] )
|
||||
cups? ( net-print/cups[abi_x86_32(-)] )
|
||||
gsm? ( media-sound/gsm[abi_x86_32(-)] )
|
||||
jpeg? ( virtual/jpeg[abi_x86_32(-)] )
|
||||
lcms? ( media-libs/lcms:2 )
|
||||
ldap? ( net-nds/openldap[abi_x86_32(-)] )
|
||||
gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
|
||||
mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
|
||||
nls? ( sys-devel/gettext[abi_x86_32(-)] )
|
||||
openal? ( media-libs/openal[abi_x86_32(-)] )
|
||||
opengl? (
|
||||
virtual/glu[abi_x86_32(-)]
|
||||
virtual/opengl[abi_x86_32(-)]
|
||||
)
|
||||
png? ( media-libs/libpng:0[abi_x86_32(-)] )
|
||||
scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
|
||||
ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
|
||||
v4l? ( media-libs/libv4l[abi_x86_32(-)] )
|
||||
media-libs/alsa-lib[abi_x86_32(-)]
|
||||
>=media-libs/freetype-2.0.0[abi_x86_32(-)]
|
||||
media-libs/mesa[abi_x86_32(-)]
|
||||
sys-apps/util-linux[abi_x86_32(-)]
|
||||
sys-libs/ncurses:5/5[abi_x86_32(-)]
|
||||
sys-libs/zlib[abi_x86_32(-)]
|
||||
x11-libs/libICE[abi_x86_32(-)]
|
||||
x11-libs/libSM[abi_x86_32(-)]
|
||||
x11-libs/libX11[abi_x86_32(-)]
|
||||
x11-libs/libXau[abi_x86_32(-)]
|
||||
x11-libs/libXdmcp[abi_x86_32(-)]
|
||||
x11-libs/libXext[abi_x86_32(-)]
|
||||
x11-libs/libXi[abi_x86_32(-)]
|
||||
x11-libs/libXrandr[abi_x86_32(-)]
|
||||
x11-libs/libXxf86vm[abi_x86_32(-)]
|
||||
x11-libs/libxcb[abi_x86_32(-)]"
|
||||
|
||||
pkg_nofetch() {
|
||||
einfo "Please visit ${HOMEPAGE}"
|
||||
einfo "and place ${A} in ${DISTDIR}"
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
# self unpacking zip archive; unzip warns about the exe stuff
|
||||
unpack_zip ${A}
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
python_fix_shebang .
|
||||
|
||||
sed -i \
|
||||
-e "s:xdg_install_icons(:&\"${ED}\".:" \
|
||||
-e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
|
||||
-e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
|
||||
"${S}/lib/perl/CXMenuXDG.pm"
|
||||
|
||||
# Remove unnecessary files
|
||||
rm -r license.txt guis/ || die "Could not remove files"
|
||||
use doc || rm -r doc/ || die "Could not remove files"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# Install crossover symlink, bug #476314
|
||||
dosym ../cxoffice/bin/crossover /opt/bin/crossover
|
||||
|
||||
# Install documentation
|
||||
dodoc README changelog.txt
|
||||
rm README changelog.txt || die "Could not remove README and changelog.txt"
|
||||
|
||||
# Install files
|
||||
dodir /opt/cxoffice
|
||||
#cp -r ./* "${ED}opt/cxoffice" \
|
||||
find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
|
||||
|| die "Could not install into ${ED}opt/cxoffice"
|
||||
|
||||
# Install configuration file
|
||||
insinto /opt/cxoffice/etc
|
||||
doins share/crossover/data/cxoffice.conf
|
||||
|
||||
# Install menus
|
||||
# XXX: locate_gui.sh automatically detects *-application-merged directories
|
||||
# This means what we install will vary depending on the contents of
|
||||
# /etc/xdg, which is a QA violation. It is not clear how to resolve this.
|
||||
XDG_DATA_DIRS="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
|
||||
"${ED}opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
|
||||
|| die "Could not install menus"
|
||||
|
||||
rm "${ED}usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
|
||||
"${ED}opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/Uninstall CrossOver Linux.desktop" \
|
||||
|| die "Could not remove uninstall menus"
|
||||
sed -i \
|
||||
-e "s:\"${ED}\".::" \
|
||||
-e "s:${ED}::" \
|
||||
"${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
|
||||
|| die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
|
||||
sed -i -e "s:${ED}:/:" \
|
||||
"${ED}/opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/"*.desktop \
|
||||
"${ED}usr/share/applications/"*"CrossOver.desktop" \
|
||||
|| die "Could not fix paths of *.desktop files"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "${P} is open source software with the exception of the GUI."
|
||||
einfo "Source code can be obtained from:"
|
||||
einfo
|
||||
einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
|
||||
}
|
||||
@ -0,0 +1,147 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
PYTHON_REQ_USE="threads"
|
||||
|
||||
inherit python-single-r1 unpacker
|
||||
|
||||
DESCRIPTION="Commercial version of app-emulation/wine with paid support."
|
||||
HOMEPAGE="http://www.codeweavers.com/products/crossover/"
|
||||
SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
|
||||
|
||||
LICENSE="CROSSOVER-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="-* ~amd64 ~x86"
|
||||
IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
|
||||
RESTRICT="bindist test"
|
||||
QA_FLAGS_IGNORED="opt/cxoffice/.*"
|
||||
QA_PRESTRIPPED="opt/cxoffice/lib/.*
|
||||
opt/cxoffice/bin/cxburner
|
||||
opt/cxoffice/bin/cxntlm_auth
|
||||
opt/cxoffice/bin/wineserver
|
||||
opt/cxoffice/bin/unrar
|
||||
opt/cxoffice/bin/wine-preloader
|
||||
opt/cxoffice/bin/cxdiag
|
||||
opt/cxoffice/bin/cxgettext
|
||||
opt/cxoffice/bin/wineloader
|
||||
"
|
||||
S="${WORKDIR}"
|
||||
|
||||
DEPEND="dev-lang/perl
|
||||
app-arch/unzip
|
||||
${PYTHON_DEPS}"
|
||||
|
||||
RDEPEND="${DEPEND}
|
||||
!prefix? ( sys-libs/glibc )
|
||||
>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
|
||||
dev-python/dbus-python[${PYTHON_USEDEP}]
|
||||
dev-util/desktop-file-utils
|
||||
!app-emulation/crossover-office-pro-bin
|
||||
!app-emulation/crossover-office-bin
|
||||
capi? ( net-libs/libcapi[abi_x86_32(-)] )
|
||||
cups? ( net-print/cups[abi_x86_32(-)] )
|
||||
gsm? ( media-sound/gsm[abi_x86_32(-)] )
|
||||
jpeg? ( virtual/jpeg[abi_x86_32(-)] )
|
||||
lcms? ( media-libs/lcms:2 )
|
||||
ldap? ( net-nds/openldap[abi_x86_32(-)] )
|
||||
gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
|
||||
mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
|
||||
nls? ( sys-devel/gettext[abi_x86_32(-)] )
|
||||
openal? ( media-libs/openal[abi_x86_32(-)] )
|
||||
opengl? (
|
||||
virtual/glu[abi_x86_32(-)]
|
||||
virtual/opengl[abi_x86_32(-)]
|
||||
)
|
||||
png? ( media-libs/libpng:0[abi_x86_32(-)] )
|
||||
scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
|
||||
ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
|
||||
v4l? ( media-libs/libv4l[abi_x86_32(-)] )
|
||||
media-libs/alsa-lib[abi_x86_32(-)]
|
||||
>=media-libs/freetype-2.0.0[abi_x86_32(-)]
|
||||
media-libs/mesa[abi_x86_32(-)]
|
||||
sys-apps/util-linux[abi_x86_32(-)]
|
||||
sys-libs/ncurses:5/5[abi_x86_32(-)]
|
||||
sys-libs/zlib[abi_x86_32(-)]
|
||||
x11-libs/libICE[abi_x86_32(-)]
|
||||
x11-libs/libSM[abi_x86_32(-)]
|
||||
x11-libs/libX11[abi_x86_32(-)]
|
||||
x11-libs/libXau[abi_x86_32(-)]
|
||||
x11-libs/libXdmcp[abi_x86_32(-)]
|
||||
x11-libs/libXext[abi_x86_32(-)]
|
||||
x11-libs/libXi[abi_x86_32(-)]
|
||||
x11-libs/libXrandr[abi_x86_32(-)]
|
||||
x11-libs/libXxf86vm[abi_x86_32(-)]
|
||||
x11-libs/libxcb[abi_x86_32(-)]"
|
||||
|
||||
pkg_nofetch() {
|
||||
einfo "Please visit ${HOMEPAGE}"
|
||||
einfo "and place ${A} in ${DISTDIR}"
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
# self unpacking zip archive; unzip warns about the exe stuff
|
||||
unpack_zip ${A}
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
python_fix_shebang .
|
||||
|
||||
sed -i \
|
||||
-e "s:xdg_install_icons(:&\"${ED}\".:" \
|
||||
-e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
|
||||
-e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
|
||||
"${S}/lib/perl/CXMenuXDG.pm"
|
||||
|
||||
# Remove unnecessary files
|
||||
rm -r license.txt guis/ || die "Could not remove files"
|
||||
use doc || rm -r doc/ || die "Could not remove files"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# Install crossover symlink, bug #476314
|
||||
dosym ../cxoffice/bin/crossover /opt/bin/crossover
|
||||
|
||||
# Install documentation
|
||||
dodoc README changelog.txt
|
||||
rm README changelog.txt || die "Could not remove README and changelog.txt"
|
||||
|
||||
# Install files
|
||||
dodir /opt/cxoffice
|
||||
#cp -r ./* "${ED}opt/cxoffice" \
|
||||
find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
|
||||
|| die "Could not install into ${ED}opt/cxoffice"
|
||||
|
||||
# Install configuration file
|
||||
insinto /opt/cxoffice/etc
|
||||
doins share/crossover/data/cxoffice.conf
|
||||
|
||||
# Install menus
|
||||
# XXX: locate_gui.sh automatically detects *-application-merged directories
|
||||
# This means what we install will vary depending on the contents of
|
||||
# /etc/xdg, which is a QA violation. It is not clear how to resolve this.
|
||||
XDG_DATA_DIRS="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
|
||||
"${ED}opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
|
||||
|| die "Could not install menus"
|
||||
|
||||
rm "${ED}usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
|
||||
"${ED}opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/Uninstall CrossOver Linux.desktop" \
|
||||
|| die "Could not remove uninstall menus"
|
||||
sed -i \
|
||||
-e "s:\"${ED}\".::" \
|
||||
-e "s:${ED}::" \
|
||||
"${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
|
||||
|| die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
|
||||
sed -i -e "s:${ED}:/:" \
|
||||
"${ED}/opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/"*.desktop \
|
||||
"${ED}usr/share/applications/"*"CrossOver.desktop" \
|
||||
|| die "Could not fix paths of *.desktop files"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "${P} is open source software with the exception of the GUI."
|
||||
einfo "Source code can be obtained from:"
|
||||
einfo
|
||||
einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
|
||||
}
|
||||
@ -0,0 +1,147 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
PYTHON_REQ_USE="threads"
|
||||
|
||||
inherit python-single-r1 unpacker
|
||||
|
||||
DESCRIPTION="Commercial version of app-emulation/wine with paid support."
|
||||
HOMEPAGE="http://www.codeweavers.com/products/crossover/"
|
||||
SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
|
||||
|
||||
LICENSE="CROSSOVER-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="-* ~amd64 ~x86"
|
||||
IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
|
||||
RESTRICT="bindist test"
|
||||
QA_FLAGS_IGNORED="opt/cxoffice/.*"
|
||||
QA_PRESTRIPPED="opt/cxoffice/lib/.*
|
||||
opt/cxoffice/bin/cxburner
|
||||
opt/cxoffice/bin/cxntlm_auth
|
||||
opt/cxoffice/bin/wineserver
|
||||
opt/cxoffice/bin/unrar
|
||||
opt/cxoffice/bin/wine-preloader
|
||||
opt/cxoffice/bin/cxdiag
|
||||
opt/cxoffice/bin/cxgettext
|
||||
opt/cxoffice/bin/wineloader
|
||||
"
|
||||
S="${WORKDIR}"
|
||||
|
||||
DEPEND="dev-lang/perl
|
||||
app-arch/unzip
|
||||
${PYTHON_DEPS}"
|
||||
|
||||
RDEPEND="${DEPEND}
|
||||
!prefix? ( sys-libs/glibc )
|
||||
>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
|
||||
dev-python/dbus-python[${PYTHON_USEDEP}]
|
||||
dev-util/desktop-file-utils
|
||||
!app-emulation/crossover-office-pro-bin
|
||||
!app-emulation/crossover-office-bin
|
||||
capi? ( net-libs/libcapi[abi_x86_32(-)] )
|
||||
cups? ( net-print/cups[abi_x86_32(-)] )
|
||||
gsm? ( media-sound/gsm[abi_x86_32(-)] )
|
||||
jpeg? ( virtual/jpeg[abi_x86_32(-)] )
|
||||
lcms? ( media-libs/lcms:2 )
|
||||
ldap? ( net-nds/openldap[abi_x86_32(-)] )
|
||||
gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
|
||||
mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
|
||||
nls? ( sys-devel/gettext[abi_x86_32(-)] )
|
||||
openal? ( media-libs/openal[abi_x86_32(-)] )
|
||||
opengl? (
|
||||
virtual/glu[abi_x86_32(-)]
|
||||
virtual/opengl[abi_x86_32(-)]
|
||||
)
|
||||
png? ( media-libs/libpng:0[abi_x86_32(-)] )
|
||||
scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
|
||||
ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
|
||||
v4l? ( media-libs/libv4l[abi_x86_32(-)] )
|
||||
media-libs/alsa-lib[abi_x86_32(-)]
|
||||
>=media-libs/freetype-2.0.0[abi_x86_32(-)]
|
||||
media-libs/mesa[abi_x86_32(-)]
|
||||
sys-apps/util-linux[abi_x86_32(-)]
|
||||
sys-libs/ncurses:5/5[abi_x86_32(-)]
|
||||
sys-libs/zlib[abi_x86_32(-)]
|
||||
x11-libs/libICE[abi_x86_32(-)]
|
||||
x11-libs/libSM[abi_x86_32(-)]
|
||||
x11-libs/libX11[abi_x86_32(-)]
|
||||
x11-libs/libXau[abi_x86_32(-)]
|
||||
x11-libs/libXdmcp[abi_x86_32(-)]
|
||||
x11-libs/libXext[abi_x86_32(-)]
|
||||
x11-libs/libXi[abi_x86_32(-)]
|
||||
x11-libs/libXrandr[abi_x86_32(-)]
|
||||
x11-libs/libXxf86vm[abi_x86_32(-)]
|
||||
x11-libs/libxcb[abi_x86_32(-)]"
|
||||
|
||||
pkg_nofetch() {
|
||||
einfo "Please visit ${HOMEPAGE}"
|
||||
einfo "and place ${A} in ${DISTDIR}"
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
# self unpacking zip archive; unzip warns about the exe stuff
|
||||
unpack_zip ${A}
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
python_fix_shebang .
|
||||
|
||||
sed -i \
|
||||
-e "s:xdg_install_icons(:&\"${ED}\".:" \
|
||||
-e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
|
||||
-e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
|
||||
"${S}/lib/perl/CXMenuXDG.pm"
|
||||
|
||||
# Remove unnecessary files
|
||||
rm -r license.txt guis/ || die "Could not remove files"
|
||||
use doc || rm -r doc/ || die "Could not remove files"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# Install crossover symlink, bug #476314
|
||||
dosym ../cxoffice/bin/crossover /opt/bin/crossover
|
||||
|
||||
# Install documentation
|
||||
dodoc README changelog.txt
|
||||
rm README changelog.txt || die "Could not remove README and changelog.txt"
|
||||
|
||||
# Install files
|
||||
dodir /opt/cxoffice
|
||||
#cp -r ./* "${ED}opt/cxoffice" \
|
||||
find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
|
||||
|| die "Could not install into ${ED}opt/cxoffice"
|
||||
|
||||
# Install configuration file
|
||||
insinto /opt/cxoffice/etc
|
||||
doins share/crossover/data/cxoffice.conf
|
||||
|
||||
# Install menus
|
||||
# XXX: locate_gui.sh automatically detects *-application-merged directories
|
||||
# This means what we install will vary depending on the contents of
|
||||
# /etc/xdg, which is a QA violation. It is not clear how to resolve this.
|
||||
XDG_DATA_DIRS="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
|
||||
"${ED}opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
|
||||
|| die "Could not install menus"
|
||||
|
||||
rm "${ED}usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
|
||||
"${ED}opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/Uninstall CrossOver Linux.desktop" \
|
||||
|| die "Could not remove uninstall menus"
|
||||
sed -i \
|
||||
-e "s:\"${ED}\".::" \
|
||||
-e "s:${ED}::" \
|
||||
"${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
|
||||
|| die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
|
||||
sed -i -e "s:${ED}:/:" \
|
||||
"${ED}/opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/"*.desktop \
|
||||
"${ED}usr/share/applications/"*"CrossOver.desktop" \
|
||||
|| die "Could not fix paths of *.desktop files"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "${P} is open source software with the exception of the GUI."
|
||||
einfo "Source code can be obtained from:"
|
||||
einfo
|
||||
einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
|
||||
}
|
||||
@ -0,0 +1,146 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
PYTHON_REQ_USE="threads"
|
||||
|
||||
inherit python-single-r1 unpacker
|
||||
|
||||
DESCRIPTION="Commercial version of app-emulation/wine with paid support."
|
||||
HOMEPAGE="http://www.codeweavers.com/products/crossover/"
|
||||
SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
|
||||
|
||||
LICENSE="CROSSOVER-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="-* ~amd64 ~x86"
|
||||
IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l"
|
||||
RESTRICT="bindist test"
|
||||
QA_FLAGS_IGNORED="opt/cxoffice/.*"
|
||||
QA_PRESTRIPPED="opt/cxoffice/lib/.*
|
||||
opt/cxoffice/bin/cxburner
|
||||
opt/cxoffice/bin/cxntlm_auth
|
||||
opt/cxoffice/bin/wineserver
|
||||
opt/cxoffice/bin/unrar
|
||||
opt/cxoffice/bin/wine-preloader
|
||||
opt/cxoffice/bin/cxdiag
|
||||
opt/cxoffice/bin/cxgettext
|
||||
opt/cxoffice/bin/wineloader
|
||||
"
|
||||
S="${WORKDIR}"
|
||||
|
||||
DEPEND="dev-lang/perl
|
||||
app-arch/unzip
|
||||
${PYTHON_DEPS}"
|
||||
|
||||
RDEPEND="${DEPEND}
|
||||
!prefix? ( sys-libs/glibc )
|
||||
>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
|
||||
dev-python/dbus-python[${PYTHON_USEDEP}]
|
||||
dev-util/desktop-file-utils
|
||||
!app-emulation/crossover-office-pro-bin
|
||||
!app-emulation/crossover-office-bin
|
||||
capi? ( net-libs/libcapi[abi_x86_32(-)] )
|
||||
cups? ( net-print/cups[abi_x86_32(-)] )
|
||||
gsm? ( media-sound/gsm[abi_x86_32(-)] )
|
||||
jpeg? ( virtual/jpeg[abi_x86_32(-)] )
|
||||
lcms? ( media-libs/lcms:2 )
|
||||
ldap? ( net-nds/openldap[abi_x86_32(-)] )
|
||||
gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
|
||||
mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
|
||||
nls? ( sys-devel/gettext[abi_x86_32(-)] )
|
||||
openal? ( media-libs/openal[abi_x86_32(-)] )
|
||||
opencl? ( virtual/opencl[abi_x86_32(-)] )
|
||||
opengl? (
|
||||
virtual/glu[abi_x86_32(-)]
|
||||
virtual/opengl[abi_x86_32(-)]
|
||||
)
|
||||
png? ( media-libs/libpng:0[abi_x86_32(-)] )
|
||||
scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
|
||||
ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
|
||||
v4l? ( media-libs/libv4l[abi_x86_32(-)] )
|
||||
media-libs/alsa-lib[abi_x86_32(-)]
|
||||
>=media-libs/freetype-2.0.0[abi_x86_32(-)]
|
||||
media-libs/mesa[abi_x86_32(-)]
|
||||
sys-apps/util-linux[abi_x86_32(-)]
|
||||
sys-libs/ncurses:5/5[abi_x86_32(-)]
|
||||
sys-libs/zlib[abi_x86_32(-)]
|
||||
x11-libs/libICE[abi_x86_32(-)]
|
||||
x11-libs/libSM[abi_x86_32(-)]
|
||||
x11-libs/libX11[abi_x86_32(-)]
|
||||
x11-libs/libXau[abi_x86_32(-)]
|
||||
x11-libs/libXdmcp[abi_x86_32(-)]
|
||||
x11-libs/libXext[abi_x86_32(-)]
|
||||
x11-libs/libXi[abi_x86_32(-)]
|
||||
x11-libs/libXrandr[abi_x86_32(-)]
|
||||
x11-libs/libXxf86vm[abi_x86_32(-)]
|
||||
x11-libs/libxcb[abi_x86_32(-)]"
|
||||
|
||||
pkg_nofetch() {
|
||||
einfo "Please visit ${HOMEPAGE}"
|
||||
einfo "and place ${A} in ${DISTDIR}"
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
# self unpacking zip archive; unzip warns about the exe stuff
|
||||
unpack_zip ${A}
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
python_fix_shebang .
|
||||
|
||||
sed -i \
|
||||
-e "s:xdg_install_icons(:&\"${ED}\".:" \
|
||||
-e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
|
||||
-e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
|
||||
"${S}/lib/perl/CXMenuXDG.pm"
|
||||
|
||||
# Remove unnecessary files
|
||||
rm -r license.txt guis/ || die "Could not remove files"
|
||||
use doc || rm -r doc/ || die "Could not remove files"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# Install crossover symlink, bug #476314
|
||||
dosym ../cxoffice/bin/crossover /opt/bin/crossover
|
||||
|
||||
# Install documentation
|
||||
dodoc README changelog.txt
|
||||
rm README changelog.txt || die "Could not remove README and changelog.txt"
|
||||
|
||||
# Install files
|
||||
dodir /opt/cxoffice
|
||||
#cp -r ./* "${ED}opt/cxoffice" \
|
||||
find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
|
||||
|| die "Could not install into ${ED}opt/cxoffice"
|
||||
|
||||
# Install configuration file
|
||||
insinto /opt/cxoffice/etc
|
||||
doins share/crossover/data/cxoffice.conf
|
||||
|
||||
# Install menus
|
||||
# XXX: locate_gui.sh automatically detects *-application-merged directories
|
||||
# This means what we install will vary depending on the contents of
|
||||
# /etc/xdg, which is a QA violation. It is not clear how to resolve this.
|
||||
XDG_DATA_HOME="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
|
||||
"${ED}opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
|
||||
|| die "Could not install menus"
|
||||
|
||||
rm "${ED}usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
|
||||
|| die "Could not remove uninstall menus"
|
||||
sed -i \
|
||||
-e "s:\"${ED}\".::" \
|
||||
-e "s:${ED}::" \
|
||||
"${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
|
||||
|| die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
|
||||
sed -i -e "s:${ED}:/:" \
|
||||
"${ED}usr/share/applications/"*"CrossOver.desktop" \
|
||||
|| die "Could not fix paths of *.desktop files"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "${P} is open source software with the exception of the GUI."
|
||||
einfo "Source code can be obtained from:"
|
||||
einfo
|
||||
einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
|
||||
}
|
||||
@ -1,13 +1,13 @@
|
||||
DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2
|
||||
DIST wine-2.0.tar.bz2 23662707 BLAKE2B 1d485c1359ce8a0395a9f6378c1f8be33ea2836b80390d1eb1095057a0acedd21708daab16e1851a315391b9f9b0a360879b9d98c73bcc8371c5023e9a8037f5 SHA512 b0a57ba8202d9fc396e5bfb7a7718d6bababbed8f3351e7fdc36afa37f35a871e04903757618f73427aeb71a52b2d323977d79e48f8b38d636f23fd404441186
|
||||
DIST wine-3.6.tar.xz 20005240 BLAKE2B 6dd48180b9aed8a3b69c40b3ed7b2ff5adbebfb591860dda6603d2219f9059bc069df000cd2614c80d34911c451388f0124af3dd8a11b806b227ca8e16659d71 SHA512 31d24cc78734bdb743afcec7df05b641ab0625568361401eaf8cd5e217719c8c51a0ef7ed737a560fe42cb9ecd88f10d35e62a98d9df69b966502a5b0dab5a22
|
||||
DIST wine-3.7.tar.xz 20454036 BLAKE2B 04ac94d5679377c5d0bb37a6d3e8e3ec7c09faa300f8422a09a22b14ef4244d2bb14c80a47cfca5e11526506a8064f0cfa4e28868d7f04669f85ab743dbbb36d SHA512 a699418574dd8f407c064421cf6cdfe3923562c8adf9a7749e716f3853291eab05358ea64f0217c303c26c0f8f59d2116024b7b6978f9a52a055147e689a8694
|
||||
DIST wine-3.8.tar.xz 20473392 BLAKE2B a7873dd15a373491703e16888044cf2ba00121f91a4583fe6dcf687b5179a2d926035cc86c75f70ceca03a508bd4712c58a1662186e0a6e0c139e63e686f8c5d SHA512 387c6bff3eafac7e92030d11c02b3461b4ead059d2aad7f6d903e176f304d2ac0a426132fcd452507868f0d22bb360a30734edf3e73dfd514037458f08406e98
|
||||
DIST wine-3.9.tar.xz 20508952 BLAKE2B 6fbf22673588963c483b7b31e82287c09e15b579b8f57267e2731768f95a1f986954bb473ee0dfa2428802fe9331b8599a01c782dd1152d36ce2002b6a4e6bde SHA512 4c4e5a741a61b9427c175e015177df5806638736f7dfd92098ed95239d41a373cbab876c054d3c948e1db6a7de359db3babd63bc194edc8c2c3be28b58f75e64
|
||||
DIST wine-d3d9-2.0.tar.gz 48373 BLAKE2B 80370a7519141030a7e54c2ea5db410b2bf1cde8d8389618487c52e4ff40f87cf7b0f9087331bb43fa6436e1b9936de9cc00a02b9ab9ce6528635a245e6a8b3f SHA512 a9e2d1c9f2784128e4c53a8dc923070a5057b5ff3d83c2b536a2d2df0bc8433ac92b8ab1c3cdf34158c0e7bfe497ddb5974605fbc1736a92307639d59450c7a1
|
||||
DIST wine-d3d9-3.6.tar.gz 50706 BLAKE2B 6d7af8e428de4d0b3d7ec5fc5d157801d3e807cbf63603d8334a564e34b411f2eabba49744670840b12c54a341a9350d1a87f0260b963c9c9392bd81526350e5 SHA512 67ce67e99c0e1c53f9a81074520465e4c59b6c4bb9a9921ce477d65f4e25b62ae85aa32314cf14a1d10a647da9efc72944e5b1ef9bab344e0aac500589f24106
|
||||
DIST wine-d3d9-3.7.tar.gz 50699 BLAKE2B 1ab795a0636e7654cc1c96e2a0ba40ff7f89eaa2983d68c4a0eabf3a69355e68e833fee63fbbff67ba840a28d34724a841c1c3c6695ae2d8bcaf38f7fbf4fd16 SHA512 9a02e40bda9c26001857355ddfb1ba68afb518158260b0904c5aaef3991e19587dcc107cc34b01b9fbda7e710be488384b020bbf8d56632cce787ffb299bc3f3
|
||||
DIST wine-d3d9-3.8.tar.gz 50700 BLAKE2B 33b71ef6e8839e55a74afa10eaabdbfadee6a99c94d89c402b796516aaa72d094c024a253c9f06f4685b8453f097513fa88f6dc72a4fe230c44d0d960e6d44d3 SHA512 e036f9da5993732415752d1f076eba5fd378ad49949a12d094081ff02454dfd8ce2156a5f418b77aa1426772f0b0785f3b0ffb9fc84e80c6265b6e5b7226bf15
|
||||
DIST wine-d3d9-3.9.tar.gz 50551 BLAKE2B 3f77b541b39172dd606bcd9083bae71e75c7b5cf129132dffe1e2261519c5e330aff92545169ce6148d35d292fda9a7367f3bb3951e9777d68c9c1bfd6659e3f SHA512 bdc0ce6e1d0bb247ae6421b4a3a6c600453647105f679113c7db78984ec7154b0728140facd2e3e1a64f0ff0969ab93c2829e72557c42f7a7ad05faf1c906499
|
||||
DIST wine-staging-2.0.tar.gz 10182575 BLAKE2B 1de645f66fa3e5e0d8ceddf5439fd246510470f63d6331c7029abed7192180b7b8430e43a2e732a30a5fbe0c73ba39b7fafcfc08830c68e679dff90576c3a960 SHA512 51412299259d6e92c8993543d5fdb3239ebe31e0d1d715e0a9e8ce94b3139c0567b08ff1600d41be94f12427cbfccc2f6b6b2ed030535445c95618aaf6578580
|
||||
DIST wine-staging-3.6.tar.gz 9958882 BLAKE2B 9f7d3d6d748f7bceb08a584bc93a1ce97c09d13cf5448ed1fbe1981494e0009e4686f047d8005a059522ec78749dd120f29f7c6562da8578a95a5dda91c23895 SHA512 839731fa3dba91cefd9e0f036b4d688c4786fe8cb19143819457fb9e45a6c14ef3a70630b585abdd424a00036312114034a2529700012ea1863527e45fbfac2a
|
||||
DIST wine-staging-3.7.tar.gz 9951654 BLAKE2B 3d6c9a023f3a4f9da6e506a88490365d4f0959231e7f9e375e8ae46006c3cfd82ca4e65af9df79d9c54cf7ee5e53452b10ac5146f2c0de97a7c4946aefac3cd5 SHA512 4a00b7c61121798b6c4e918aadeb71865e359f6471035b9ed33ae242f3fe70f1977b1c0b3628fb244b5ba4942d771d2ee797bcc087d38192fcd9325e1886ed14
|
||||
DIST wine-staging-3.8.tar.gz 9957202 BLAKE2B 1f85ebc9cf8f5d3c684ce60a59783355ec558e62a8c93564107de2893e82257846be45b3f55fd23f9b317245acc04ee3c4884003572169d6f0efef30145e33f7 SHA512 46ba27b0b9fe5f86d1647f12050715b796604c91487cad6847dce5250ffcfdf8ccf44dcff79c88048221cbf58af92ed72523c09f3591e2c5306bba24ff9d154c
|
||||
DIST wine-staging-3.9.tar.gz 9932873 BLAKE2B 9a0bb5689b1d2cff6e133f0dd94cc13b63f59ef9e5b129aaf48501317a75aadbf27058fe8cc436816501cbe416c285504d9c98504024f9a0606ee4c4afc48e4b SHA512 4f52937621b7e5a3f4b3e52ecba8c7d318c621e76c8e4ce3be176d56b382bf06e3a0453d37c3b725df63f0a7349f53a7c075148c7e1ed89a028696538e31acad
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2
|
||||
DIST wine-2.0.tar.bz2 23662707 BLAKE2B 1d485c1359ce8a0395a9f6378c1f8be33ea2836b80390d1eb1095057a0acedd21708daab16e1851a315391b9f9b0a360879b9d98c73bcc8371c5023e9a8037f5 SHA512 b0a57ba8202d9fc396e5bfb7a7718d6bababbed8f3351e7fdc36afa37f35a871e04903757618f73427aeb71a52b2d323977d79e48f8b38d636f23fd404441186
|
||||
DIST wine-3.6.tar.xz 20005240 BLAKE2B 6dd48180b9aed8a3b69c40b3ed7b2ff5adbebfb591860dda6603d2219f9059bc069df000cd2614c80d34911c451388f0124af3dd8a11b806b227ca8e16659d71 SHA512 31d24cc78734bdb743afcec7df05b641ab0625568361401eaf8cd5e217719c8c51a0ef7ed737a560fe42cb9ecd88f10d35e62a98d9df69b966502a5b0dab5a22
|
||||
DIST wine-3.7.tar.xz 20454036 BLAKE2B 04ac94d5679377c5d0bb37a6d3e8e3ec7c09faa300f8422a09a22b14ef4244d2bb14c80a47cfca5e11526506a8064f0cfa4e28868d7f04669f85ab743dbbb36d SHA512 a699418574dd8f407c064421cf6cdfe3923562c8adf9a7749e716f3853291eab05358ea64f0217c303c26c0f8f59d2116024b7b6978f9a52a055147e689a8694
|
||||
DIST wine-3.8.tar.xz 20473392 BLAKE2B a7873dd15a373491703e16888044cf2ba00121f91a4583fe6dcf687b5179a2d926035cc86c75f70ceca03a508bd4712c58a1662186e0a6e0c139e63e686f8c5d SHA512 387c6bff3eafac7e92030d11c02b3461b4ead059d2aad7f6d903e176f304d2ac0a426132fcd452507868f0d22bb360a30734edf3e73dfd514037458f08406e98
|
||||
DIST wine-3.9.tar.xz 20508952 BLAKE2B 6fbf22673588963c483b7b31e82287c09e15b579b8f57267e2731768f95a1f986954bb473ee0dfa2428802fe9331b8599a01c782dd1152d36ce2002b6a4e6bde SHA512 4c4e5a741a61b9427c175e015177df5806638736f7dfd92098ed95239d41a373cbab876c054d3c948e1db6a7de359db3babd63bc194edc8c2c3be28b58f75e64
|
||||
DIST wine-d3d9-2.0.tar.gz 48373 BLAKE2B 80370a7519141030a7e54c2ea5db410b2bf1cde8d8389618487c52e4ff40f87cf7b0f9087331bb43fa6436e1b9936de9cc00a02b9ab9ce6528635a245e6a8b3f SHA512 a9e2d1c9f2784128e4c53a8dc923070a5057b5ff3d83c2b536a2d2df0bc8433ac92b8ab1c3cdf34158c0e7bfe497ddb5974605fbc1736a92307639d59450c7a1
|
||||
DIST wine-d3d9-3.6.tar.gz 50706 BLAKE2B 6d7af8e428de4d0b3d7ec5fc5d157801d3e807cbf63603d8334a564e34b411f2eabba49744670840b12c54a341a9350d1a87f0260b963c9c9392bd81526350e5 SHA512 67ce67e99c0e1c53f9a81074520465e4c59b6c4bb9a9921ce477d65f4e25b62ae85aa32314cf14a1d10a647da9efc72944e5b1ef9bab344e0aac500589f24106
|
||||
DIST wine-d3d9-3.7.tar.gz 50699 BLAKE2B 1ab795a0636e7654cc1c96e2a0ba40ff7f89eaa2983d68c4a0eabf3a69355e68e833fee63fbbff67ba840a28d34724a841c1c3c6695ae2d8bcaf38f7fbf4fd16 SHA512 9a02e40bda9c26001857355ddfb1ba68afb518158260b0904c5aaef3991e19587dcc107cc34b01b9fbda7e710be488384b020bbf8d56632cce787ffb299bc3f3
|
||||
DIST wine-d3d9-3.8.tar.gz 50700 BLAKE2B 33b71ef6e8839e55a74afa10eaabdbfadee6a99c94d89c402b796516aaa72d094c024a253c9f06f4685b8453f097513fa88f6dc72a4fe230c44d0d960e6d44d3 SHA512 e036f9da5993732415752d1f076eba5fd378ad49949a12d094081ff02454dfd8ce2156a5f418b77aa1426772f0b0785f3b0ffb9fc84e80c6265b6e5b7226bf15
|
||||
DIST wine-d3d9-3.9.tar.gz 50551 BLAKE2B 3f77b541b39172dd606bcd9083bae71e75c7b5cf129132dffe1e2261519c5e330aff92545169ce6148d35d292fda9a7367f3bb3951e9777d68c9c1bfd6659e3f SHA512 bdc0ce6e1d0bb247ae6421b4a3a6c600453647105f679113c7db78984ec7154b0728140facd2e3e1a64f0ff0969ab93c2829e72557c42f7a7ad05faf1c906499
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2
|
||||
DIST wine-2.0.tar.bz2 23662707 BLAKE2B 1d485c1359ce8a0395a9f6378c1f8be33ea2836b80390d1eb1095057a0acedd21708daab16e1851a315391b9f9b0a360879b9d98c73bcc8371c5023e9a8037f5 SHA512 b0a57ba8202d9fc396e5bfb7a7718d6bababbed8f3351e7fdc36afa37f35a871e04903757618f73427aeb71a52b2d323977d79e48f8b38d636f23fd404441186
|
||||
DIST wine-3.6.tar.xz 20005240 BLAKE2B 6dd48180b9aed8a3b69c40b3ed7b2ff5adbebfb591860dda6603d2219f9059bc069df000cd2614c80d34911c451388f0124af3dd8a11b806b227ca8e16659d71 SHA512 31d24cc78734bdb743afcec7df05b641ab0625568361401eaf8cd5e217719c8c51a0ef7ed737a560fe42cb9ecd88f10d35e62a98d9df69b966502a5b0dab5a22
|
||||
DIST wine-3.7.tar.xz 20454036 BLAKE2B 04ac94d5679377c5d0bb37a6d3e8e3ec7c09faa300f8422a09a22b14ef4244d2bb14c80a47cfca5e11526506a8064f0cfa4e28868d7f04669f85ab743dbbb36d SHA512 a699418574dd8f407c064421cf6cdfe3923562c8adf9a7749e716f3853291eab05358ea64f0217c303c26c0f8f59d2116024b7b6978f9a52a055147e689a8694
|
||||
DIST wine-3.8.tar.xz 20473392 BLAKE2B a7873dd15a373491703e16888044cf2ba00121f91a4583fe6dcf687b5179a2d926035cc86c75f70ceca03a508bd4712c58a1662186e0a6e0c139e63e686f8c5d SHA512 387c6bff3eafac7e92030d11c02b3461b4ead059d2aad7f6d903e176f304d2ac0a426132fcd452507868f0d22bb360a30734edf3e73dfd514037458f08406e98
|
||||
DIST wine-3.9.tar.xz 20508952 BLAKE2B 6fbf22673588963c483b7b31e82287c09e15b579b8f57267e2731768f95a1f986954bb473ee0dfa2428802fe9331b8599a01c782dd1152d36ce2002b6a4e6bde SHA512 4c4e5a741a61b9427c175e015177df5806638736f7dfd92098ed95239d41a373cbab876c054d3c948e1db6a7de359db3babd63bc194edc8c2c3be28b58f75e64
|
||||
DIST wine-staging-2.0.tar.gz 10182575 BLAKE2B 1de645f66fa3e5e0d8ceddf5439fd246510470f63d6331c7029abed7192180b7b8430e43a2e732a30a5fbe0c73ba39b7fafcfc08830c68e679dff90576c3a960 SHA512 51412299259d6e92c8993543d5fdb3239ebe31e0d1d715e0a9e8ce94b3139c0567b08ff1600d41be94f12427cbfccc2f6b6b2ed030535445c95618aaf6578580
|
||||
DIST wine-staging-3.6.tar.gz 9958882 BLAKE2B 9f7d3d6d748f7bceb08a584bc93a1ce97c09d13cf5448ed1fbe1981494e0009e4686f047d8005a059522ec78749dd120f29f7c6562da8578a95a5dda91c23895 SHA512 839731fa3dba91cefd9e0f036b4d688c4786fe8cb19143819457fb9e45a6c14ef3a70630b585abdd424a00036312114034a2529700012ea1863527e45fbfac2a
|
||||
DIST wine-staging-3.7.tar.gz 9951654 BLAKE2B 3d6c9a023f3a4f9da6e506a88490365d4f0959231e7f9e375e8ae46006c3cfd82ca4e65af9df79d9c54cf7ee5e53452b10ac5146f2c0de97a7c4946aefac3cd5 SHA512 4a00b7c61121798b6c4e918aadeb71865e359f6471035b9ed33ae242f3fe70f1977b1c0b3628fb244b5ba4942d771d2ee797bcc087d38192fcd9325e1886ed14
|
||||
DIST wine-staging-3.8.tar.gz 9957202 BLAKE2B 1f85ebc9cf8f5d3c684ce60a59783355ec558e62a8c93564107de2893e82257846be45b3f55fd23f9b317245acc04ee3c4884003572169d6f0efef30145e33f7 SHA512 46ba27b0b9fe5f86d1647f12050715b796604c91487cad6847dce5250ffcfdf8ccf44dcff79c88048221cbf58af92ed72523c09f3591e2c5306bba24ff9d154c
|
||||
DIST wine-staging-3.9.tar.gz 9932873 BLAKE2B 9a0bb5689b1d2cff6e133f0dd94cc13b63f59ef9e5b129aaf48501317a75aadbf27058fe8cc436816501cbe416c285504d9c98504024f9a0606ee4c4afc48e4b SHA512 4f52937621b7e5a3f4b3e52ecba8c7d318c621e76c8e4ce3be176d56b382bf06e3a0453d37c3b725df63f0a7349f53a7c075148c7e1ed89a028696538e31acad
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@ -0,0 +1,216 @@
|
||||
Kindly borrowed from Debian.
|
||||
|
||||
14:13 < mst__> _rene_, the toolkit unoapi tests are known to be flaky (in some
|
||||
system dependent way) e.g. on the Win@6 tinderbox it always
|
||||
crashes
|
||||
14:14 < mst__> _rene_, sc.ScAccessible* tests also fail on some systems some of
|
||||
the time
|
||||
|
||||
diff --git a/toolkit/Module_toolkit.mk b/toolkit/Module_toolkit.mk
|
||||
index 25db0b6..14e507c 100644
|
||||
--- a/toolkit/Module_toolkit.mk
|
||||
+++ b/toolkit/Module_toolkit.mk
|
||||
@@ -26,11 +26,11 @@ $(eval $(call gb_Module_add_targets,toolkit,\
|
||||
ifneq ($(OOO_JUNIT_JAR),)
|
||||
$(eval $(call gb_Module_add_subsequentcheck_targets,toolkit,\
|
||||
JunitTest_toolkit_complex \
|
||||
- JunitTest_toolkit_unoapi_1 \
|
||||
- JunitTest_toolkit_unoapi_2 \
|
||||
- JunitTest_toolkit_unoapi_3 \
|
||||
- JunitTest_toolkit_unoapi_4 \
|
||||
))
|
||||
endif
|
||||
+# JunitTest_toolkit_unoapi_1 \
|
||||
+# JunitTest_toolkit_unoapi_2 \
|
||||
+# JunitTest_toolkit_unoapi_3 \
|
||||
+# JunitTest_toolkit_unoapi_4 \
|
||||
|
||||
# vim: set noet sw=4 ts=4:
|
||||
diff --git a/sc/qa/unoapi/sc_1.sce b/sc/qa/unoapi/sc_1.sce
|
||||
index fa1684c..cc8e1a5 100644
|
||||
--- a/sc/qa/unoapi/sc_1.sce
|
||||
+++ b/sc/qa/unoapi/sc_1.sce
|
||||
@@ -24,10 +24,3 @@
|
||||
# i84554 -o sc.AccessibleEditableTextPara_PreviewNote
|
||||
# i88241 -o sc.AccessibleEditableTextPara_HeaderFooter
|
||||
-o sc.AccessibleEditableTextPara_PreviewCell
|
||||
--o sc.ScAccessibleCell
|
||||
-# i91044 -o sc.ScAccessibleCsvCell
|
||||
-# i91044 -o sc.ScAccessibleCsvGrid
|
||||
-# i84641 -o sc.ScAccessibleCsvRuler
|
||||
-# i88330 -o sc.ScAccessibleDocument
|
||||
-# i91045 -o sc.ScAccessibleDocumentPagePreview
|
||||
--o sc.ScAccessiblePageHeader
|
||||
diff --git a/sc/qa/unoapi/sc_2.sce b/sc/qa/unoapi/sc_2.sce
|
||||
index dbfc3e1..d235c5d 100644
|
||||
--- a/sc/qa/unoapi/sc_2.sce
|
||||
+++ b/sc/qa/unoapi/sc_2.sce
|
||||
@@ -15,11 +15,6 @@
|
||||
# except in compliance with the License. You may obtain a copy of
|
||||
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
||||
#
|
||||
-# fdo#FOO -o sc.ScAccessiblePageHeaderArea
|
||||
--o sc.ScAccessiblePreviewCell
|
||||
--o sc.ScAccessiblePreviewHeaderCell
|
||||
--o sc.ScAccessiblePreviewTable
|
||||
-# fdo#45337 -o sc.ScAccessibleSpreadsheet
|
||||
# FIXME_REMOVE_WHEN_RE_BASE_COMPLETE
|
||||
# -o sc.ScAnnotationObj
|
||||
# -o sc.ScAnnotationShapeObj
|
||||
|
||||
12:18 < _rene_> chris_wot: ping?
|
||||
12:18 < chris_wot> heya
|
||||
12:18 < chris_wot> you pinged?
|
||||
12:19 < _rene_> chris_wot: any news on
|
||||
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815292?
|
||||
12:20 < _rene_> (of course the this-night-uploaded rc3 also failed)
|
||||
12:21 < chris_wot> ah, sorry - I've looked at an EMF regression, but I've not
|
||||
gotten any further on that one
|
||||
12:22 < chris_wot> I honestly think that for this one just disable the test for
|
||||
now
|
||||
12:22 < chris_wot> I'll ping the ML
|
||||
|
||||
This seems fixed when opening the original doc.
|
||||
|
||||
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
|
||||
index 54eed4d..78019bd 100644
|
||||
--- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
|
||||
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
|
||||
@@ -1128,30 +1128,30 @@ DECLARE_OOXMLEXPORT_TEST(testTDF93675, "no-numlevel-but-indented.odt")
|
||||
|
||||
|
||||
|
||||
-DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape, "flip_and_rotate.odt")
|
||||
-{
|
||||
- xmlDocPtr pXmlDoc = parseExport("word/document.xml");
|
||||
- if (!pXmlDoc)
|
||||
- return;
|
||||
- // there should be no flipH and flipV attributes in this case
|
||||
- assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipH");
|
||||
- assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipV");
|
||||
- // check rotation angle
|
||||
- assertXPath(pXmlDoc, "//a:xfrm", "rot", "13500000");
|
||||
- // check the first few coordinates of the polygon
|
||||
-#ifndef MACOSX /* Retina-related rounding roundtrip error
|
||||
- * hard to smooth out due to the use of string compare
|
||||
- * instead of number */
|
||||
-#if !defined(_WIN32)
|
||||
- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "x", "2351");
|
||||
- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "y", "3171");
|
||||
- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "x", "1695");
|
||||
- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "y", "3171");
|
||||
- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "x", "1695");
|
||||
- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "y", "1701");
|
||||
-#endif
|
||||
-#endif
|
||||
-}
|
||||
+//DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape, "flip_and_rotate.odt")
|
||||
+//{
|
||||
+// xmlDocPtr pXmlDoc = parseExport("word/document.xml");
|
||||
+// if (!pXmlDoc)
|
||||
+// return;
|
||||
+// // there should be no flipH and flipV attributes in this case
|
||||
+// assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipH");
|
||||
+// assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipV");
|
||||
+// // check rotation angle
|
||||
+// assertXPath(pXmlDoc, "//a:xfrm", "rot", "13500000");
|
||||
+// // check the first few coordinates of the polygon
|
||||
+//#ifndef MACOSX /* Retina-related rounding roundtrip error
|
||||
+// * hard to smooth out due to the use of string compare
|
||||
+// * instead of number */
|
||||
+//#if !defined(_WIN32)
|
||||
+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "x", "2351");
|
||||
+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "y", "3171");
|
||||
+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "x", "1695");
|
||||
+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "y", "3171");
|
||||
+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "x", "1695");
|
||||
+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "y", "1701");
|
||||
+//#endif
|
||||
+//#endif
|
||||
+//}
|
||||
|
||||
|
||||
CPPUNIT_PLUGIN_IMPLEMENT();
|
||||
diff --git a/svx/qa/unoapi/svx.sce b/svx/qa/unoapi/svx.sce
|
||||
index 1c3925f..a16f001 100644
|
||||
--- a/svx/qa/unoapi/svx.sce
|
||||
+++ b/svx/qa/unoapi/svx.sce
|
||||
@@ -25,7 +25,7 @@
|
||||
#i111216 -o svx.AccessiblePresentationGraphicShape
|
||||
#i111216 -o svx.AccessiblePresentationOLEShape
|
||||
#i85539 -o svx.AccessiblePresentationShape
|
||||
--o svx.AccessibleShape
|
||||
+#-o svx.AccessibleShape
|
||||
#i90294 -o svx.GraphicExporter
|
||||
-o svx.SvxDrawPage
|
||||
#i85501 -o svx.SvxGraphCtrlAccessibleContext
|
||||
|
||||
19:26 <@x1sc0> _rene_, since that test is using exact dimensions, it seems it
|
||||
fails on your side probably because the paragraph style is
|
||||
different. 1. I will change the test to avoid the exact
|
||||
dimensions. 2. meantime you can skip that test:
|
||||
https://cgit.freedesktop.org/libreoffice/core/commit/?id=e05f16e6bf36efbaab16dd2ed1427a750ce7cafd
|
||||
19:26 < IZBot> core - disable UI test that does exact comparison
|
||||
19:27 < _rene_> mmh, ok, saw that but that was for a different test, so.. :)
|
||||
19:27 -!- jacobo [~jaragunde@fanzine.igalia.com] has quit [Quit: Leaving.]
|
||||
19:27 < _rene_> thanks, will do
|
||||
|
||||
diff --git a/uitest/writer_tests/tdf79236.py b/uitest/writer_tests/tdf79236.py
|
||||
index 8585e48d8c64..704f42c009a1 100644
|
||||
--- a/uitest/writer_tests/tdf79236.py
|
||||
+++ b/uitest/writer_tests/tdf79236.py
|
||||
@@ -8,8 +8,11 @@ from uitest.framework import UITestCase
|
||||
import time
|
||||
from uitest.uihelper.common import get_state_as_dict, type_text
|
||||
|
||||
+import unittest
|
||||
+
|
||||
class tdf79236(UITestCase):
|
||||
|
||||
+ @unittest.skip("Currently broken")
|
||||
def test_paragraph(self):
|
||||
|
||||
self.ui_test.create_doc_in_start_center("writer")
|
||||
|
||||
14:39 < ztamas> _rene_: chart2dump is used to fail because of font size differences, just use a bigger delta or disable it if it
|
||||
fails for you.
|
||||
14:40 <@sberg_> noelgrandin, no
|
||||
14:40 < noelgrandin> sberg_, sure seems that way both in the debugger and in the resulting SAL_WARN output
|
||||
14:42 < ztamas> _rene_: there were some work on making font rendering consistent on different platforms, but it's not finished
|
||||
yet, I guess
|
||||
diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk
|
||||
index 3273055d5373..cb452139170c 100644
|
||||
--- a/chart2/Module_chart2.mk
|
||||
+++ b/chart2/Module_chart2.mk
|
||||
@@ -33,9 +33,9 @@ $(eval $(call gb_Module_add_slowcheck_targets,chart2,\
|
||||
CppunitTest_chart2_export \
|
||||
CppunitTest_chart2_import \
|
||||
CppunitTest_chart2_trendcalculators \
|
||||
- CppunitTest_chart2_dump \
|
||||
CppunitTest_chart2_pivot_chart_test \
|
||||
))
|
||||
+# CppunitTest_chart2_dump \
|
||||
|
||||
ifeq ($(ENABLE_CHART_TESTS),TRUE)
|
||||
ifeq ($(WITH_FONTS), TRUE)
|
||||
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
|
||||
index 4d65beeb90c4..f3d71501c41a 100644
|
||||
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
|
||||
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
|
||||
@@ -1559,14 +1559,14 @@ DECLARE_OOXMLIMPORT_TEST(testTdf43017, "tdf43017.docx")
|
||||
}
|
||||
|
||||
|
||||
-DECLARE_OOXMLIMPORT_TEST(testTdf112443, "tdf112443.docx")
|
||||
+/*DECLARE_OOXMLIMPORT_TEST(testTdf112443, "tdf112443.docx")
|
||||
{
|
||||
// the position of the flying text frame should be off page
|
||||
// 30624 below its anchor
|
||||
OUString aTop = parseDump("//fly[1]/infos/bounds", "top");
|
||||
CPPUNIT_ASSERT_EQUAL( OUString("30624"), aTop );
|
||||
|
||||
-}
|
||||
+}*/
|
||||
|
||||
DECLARE_OOXMLIMPORT_TEST(testTdf113946, "tdf113946.docx")
|
||||
{
|
||||
@ -0,0 +1,570 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
|
||||
PYTHON_REQ_USE="threads,xml"
|
||||
|
||||
MY_PV="${PV/_alpha/.alpha}"
|
||||
MY_PV="${MY_PV/_beta/.beta}"
|
||||
# experimental ; release ; old
|
||||
# Usually the tarballs are moved a lot so this should make everyone happy.
|
||||
DEV_URI="
|
||||
https://dev-builds.libreoffice.org/pre-releases/src
|
||||
https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
|
||||
https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
|
||||
"
|
||||
ADDONS_URI="https://dev-www.libreoffice.org/src/"
|
||||
|
||||
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
|
||||
# PATCHSET="${P}-patchset-01.tar.xz"
|
||||
|
||||
[[ ${MY_PV} == *9999* ]] && SCM_ECLASS="git-r3"
|
||||
inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils ${SCM_ECLASS}
|
||||
unset SCM_ECLASS
|
||||
|
||||
DESCRIPTION="A full office productivity suite"
|
||||
HOMEPAGE="https://www.libreoffice.org"
|
||||
SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
|
||||
[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
|
||||
|
||||
# Split modules following git/tarballs; Core MUST be first!
|
||||
# Help is used for the image generator
|
||||
# Only release has the tarballs
|
||||
if [[ ${MY_PV} != *9999* ]]; then
|
||||
for i in ${DEV_URI}; do
|
||||
SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
|
||||
SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
|
||||
done
|
||||
unset i
|
||||
fi
|
||||
unset DEV_URI
|
||||
|
||||
# Really required addons
|
||||
# These are bundles that can't be removed for now due to huge patchsets.
|
||||
# If you want them gone, patches are welcome.
|
||||
ADDONS_SRC=(
|
||||
"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
|
||||
# no release for 8 years, should we package it?
|
||||
"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
|
||||
# Does not build with 1.6 rhino at all
|
||||
"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
|
||||
# requirement of rhino
|
||||
"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
|
||||
# not packageable
|
||||
"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
|
||||
)
|
||||
SRC_URI+=" ${ADDONS_SRC[*]}"
|
||||
|
||||
unset ADDONS_URI
|
||||
unset ADDONS_SRC
|
||||
|
||||
# Extensions that need extra work:
|
||||
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
|
||||
|
||||
IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
|
||||
gstreamer +gtk gtk2 kde libressl mysql odk pdfimport postgres test vlc
|
||||
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
|
||||
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}
|
||||
bluetooth? ( dbus )
|
||||
kde? ( gtk )
|
||||
libreoffice_extensions_nlpsolver? ( java )
|
||||
libreoffice_extensions_scripting-beanshell? ( java )
|
||||
libreoffice_extensions_scripting-javascript? ( java )
|
||||
libreoffice_extensions_wiki-publisher? ( java )
|
||||
"
|
||||
|
||||
LICENSE="|| ( LGPL-3 MPL-1.1 )"
|
||||
SLOT="0"
|
||||
[[ ${MY_PV} == *9999* ]] || \
|
||||
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
|
||||
|
||||
COMMON_DEPEND="${PYTHON_DEPS}
|
||||
app-arch/unzip
|
||||
app-arch/zip
|
||||
app-crypt/gpgme[cxx]
|
||||
app-text/hunspell:=
|
||||
>=app-text/libabw-0.1.0
|
||||
>=app-text/libebook-0.1
|
||||
app-text/libepubgen
|
||||
>=app-text/libetonyek-0.1
|
||||
app-text/libexttextcat
|
||||
app-text/liblangtag
|
||||
>=app-text/libmspub-0.1.0
|
||||
>=app-text/libmwaw-0.3.1
|
||||
app-text/libnumbertext
|
||||
>=app-text/libodfgen-0.1.0
|
||||
app-text/libqxp
|
||||
app-text/libstaroffice
|
||||
app-text/libwpd:0.10[tools]
|
||||
app-text/libwpg:0.3
|
||||
>=app-text/libwps-0.4
|
||||
app-text/mythes
|
||||
>=dev-cpp/clucene-2.3.3.4-r2
|
||||
=dev-cpp/libcmis-0.5*
|
||||
dev-db/unixODBC
|
||||
dev-lang/perl
|
||||
dev-libs/boost:=[nls]
|
||||
dev-libs/expat
|
||||
dev-libs/hyphen
|
||||
dev-libs/icu:=
|
||||
dev-libs/libassuan
|
||||
dev-libs/libgpg-error
|
||||
>=dev-libs/liborcus-0.13.3
|
||||
dev-libs/librevenge
|
||||
dev-libs/nspr
|
||||
dev-libs/nss
|
||||
!libressl? ( >=dev-libs/openssl-1.0.0d:0 )
|
||||
libressl? ( dev-libs/libressl )
|
||||
>=dev-libs/redland-1.0.16
|
||||
>=dev-libs/xmlsec-1.2.24[nss]
|
||||
media-gfx/graphite2
|
||||
media-libs/fontconfig
|
||||
media-libs/freetype:2
|
||||
>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
|
||||
media-libs/lcms:2
|
||||
>=media-libs/libcdr-0.1.0
|
||||
>=media-libs/libepoxy-1.3.1[X]
|
||||
>=media-libs/libfreehand-0.1.0
|
||||
media-libs/libpagemaker
|
||||
>=media-libs/libpng-1.4:0=
|
||||
>=media-libs/libvisio-0.1.0
|
||||
media-libs/libzmf
|
||||
net-libs/neon
|
||||
net-misc/curl
|
||||
net-nds/openldap
|
||||
sci-mathematics/lpsolve
|
||||
virtual/glu
|
||||
virtual/jpeg:0
|
||||
virtual/opengl
|
||||
x11-libs/cairo[X]
|
||||
x11-libs/libXinerama
|
||||
x11-libs/libXrandr
|
||||
x11-libs/libXrender
|
||||
bluetooth? ( net-wireless/bluez )
|
||||
coinmp? ( sci-libs/coinor-mp )
|
||||
cups? ( net-print/cups )
|
||||
dbus? ( dev-libs/dbus-glib )
|
||||
eds? (
|
||||
dev-libs/glib:2
|
||||
gnome-base/dconf
|
||||
gnome-extra/evolution-data-server
|
||||
)
|
||||
firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
|
||||
gstreamer? (
|
||||
media-libs/gstreamer:1.0
|
||||
media-libs/gst-plugins-base:1.0
|
||||
)
|
||||
gtk? (
|
||||
dev-libs/glib:2
|
||||
dev-libs/gobject-introspection
|
||||
gnome-base/dconf
|
||||
media-libs/mesa[egl]
|
||||
x11-libs/gtk+:3
|
||||
)
|
||||
gtk2? (
|
||||
x11-libs/gdk-pixbuf
|
||||
>=x11-libs/gtk+-2.24:2
|
||||
)
|
||||
kde? (
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtx11extras:5
|
||||
dev-qt/qtwidgets:5
|
||||
kde-frameworks/kconfig:5
|
||||
kde-frameworks/kcoreaddons:5
|
||||
kde-frameworks/ki18n:5
|
||||
kde-frameworks/kio:5
|
||||
kde-frameworks/kwindowsystem:5
|
||||
)
|
||||
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
|
||||
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
|
||||
mysql? ( dev-db/mysql-connector-c++ )
|
||||
pdfimport? ( app-text/poppler:=[cxx] )
|
||||
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
|
||||
"
|
||||
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
!app-office/libreoffice-bin
|
||||
!app-office/libreoffice-bin-debug
|
||||
!app-office/openoffice
|
||||
media-fonts/dejavu
|
||||
media-fonts/liberation-fonts
|
||||
media-fonts/libertine
|
||||
|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
|
||||
java? ( >=virtual/jre-1.6 )
|
||||
kde? ( kde-frameworks/breeze-icons:* )
|
||||
vlc? ( media-video/vlc )
|
||||
"
|
||||
|
||||
if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
|
||||
PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
|
||||
else
|
||||
# Translations are not reliable on live ebuilds
|
||||
# rather force people to use english only.
|
||||
PDEPEND="!app-office/libreoffice-l10n"
|
||||
fi
|
||||
|
||||
# FIXME: cppunit should be moved to test conditional
|
||||
# after everything upstream is under gbuild
|
||||
# as dmake execute tests right away
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
!<sys-devel/make-3.82
|
||||
>=dev-libs/libatomic_ops-7.2d
|
||||
>=dev-libs/libxml2-2.7.8
|
||||
dev-libs/libxslt
|
||||
dev-perl/Archive-Zip
|
||||
>=dev-util/cppunit-1.14.0
|
||||
>=dev-util/gperf-3
|
||||
dev-util/intltool
|
||||
>=dev-util/mdds-1.2.3:1=
|
||||
media-libs/glm
|
||||
sys-devel/bison
|
||||
sys-devel/flex
|
||||
sys-devel/gettext
|
||||
sys-devel/ucpp
|
||||
sys-libs/zlib
|
||||
virtual/pkgconfig
|
||||
x11-base/xorg-proto
|
||||
x11-libs/libXt
|
||||
x11-libs/libXtst
|
||||
java? (
|
||||
dev-java/ant-core
|
||||
>=virtual/jdk-1.6
|
||||
)
|
||||
odk? ( >=app-doc/doxygen-1.8.4 )
|
||||
test? (
|
||||
app-crypt/gnupg
|
||||
dev-util/cppunit
|
||||
media-fonts/dejavu
|
||||
)
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
# "${WORKDIR}"/${PATCHSET/.tar.xz/}
|
||||
|
||||
# not upstreamable stuff
|
||||
"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
|
||||
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
|
||||
|
||||
# TODO: upstream
|
||||
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
|
||||
)
|
||||
|
||||
S="${WORKDIR}/${PN}-${MY_PV}"
|
||||
|
||||
_check_reqs() {
|
||||
CHECKREQS_MEMORY="512M"
|
||||
if is-flagq "-g*" && ! is-flagq "-g*0" ; then
|
||||
CHECKREQS_DISK_BUILD="22G"
|
||||
else
|
||||
CHECKREQS_DISK_BUILD="6G"
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_pretend() {
|
||||
use java || \
|
||||
ewarn "If you plan to use Base application you should enable java or you will get various crashes."
|
||||
|
||||
if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
|
||||
ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
|
||||
ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
|
||||
ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
|
||||
fi
|
||||
|
||||
if [[ ${MERGE_TYPE} != binary ]]; then
|
||||
_check_reqs
|
||||
check-reqs_pkg_pretend
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
java-pkg-opt-2_pkg_setup
|
||||
python-single-r1_pkg_setup
|
||||
xdg_environment_reset
|
||||
|
||||
if [[ ${MERGE_TYPE} != binary ]]; then
|
||||
_check_reqs
|
||||
check-reqs_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
default
|
||||
|
||||
if [[ ${MY_PV} = *9999* ]]; then
|
||||
local base_uri branch mypv
|
||||
base_uri="https://anongit.freedesktop.org/git"
|
||||
branch="master"
|
||||
mypv=${MY_PV/.9999}
|
||||
[[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
|
||||
git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
|
||||
git-r3_checkout "${base_uri}/${PN}/core"
|
||||
|
||||
git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
|
||||
git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# sandbox violations on many systems, we don't need it. Bug #646406
|
||||
sed -i \
|
||||
-e "/KF5_CONFIG/s/kf5-config/no/" \
|
||||
configure.ac || die "Failed to disable kf5-config"
|
||||
|
||||
AT_M4DIR="m4" eautoreconf
|
||||
# hack in the autogen.sh
|
||||
touch autogen.lastrun
|
||||
|
||||
# system pyuno mess
|
||||
sed -i \
|
||||
-e "s:%eprefix%:${EPREFIX}:g" \
|
||||
-e "s:%libdir%:$(get_libdir):g" \
|
||||
pyuno/source/module/uno.py \
|
||||
pyuno/source/officehelper.py || die
|
||||
# sed in the tests
|
||||
sed -i \
|
||||
-e "s#all : build unitcheck#all : build#g" \
|
||||
solenv/gbuild/Module.mk || die
|
||||
sed -i \
|
||||
-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
|
||||
-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
|
||||
Makefile.in || die
|
||||
|
||||
sed -i \
|
||||
-e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
|
||||
-e "s,\$INSTALLDIRNAME.sh,${PN}," \
|
||||
bin/distro-install-desktop-integration || die
|
||||
|
||||
if use branding; then
|
||||
# hack...
|
||||
mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
|
||||
fi
|
||||
|
||||
# Don't list pdfimport support in desktop when built with none, bug # 605464
|
||||
if ! use pdfimport; then
|
||||
sed -i \
|
||||
-e ":MimeType: s:application/pdf;::" \
|
||||
-e ":Keywords: s:pdf;::" \
|
||||
sysui/desktop/menus/draw.desktop || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
|
||||
# Note: these are for Gentoo use ONLY. For your own distribution, please get
|
||||
# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
|
||||
local google_default_client_id="329227923882.apps.googleusercontent.com"
|
||||
local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
|
||||
|
||||
# optimization flags
|
||||
export GMAKE_OPTIONS="${MAKEOPTS}"
|
||||
# System python enablement:
|
||||
export PYTHON_CFLAGS=$(python_get_CFLAGS)
|
||||
export PYTHON_LIBS=$(python_get_LIBS)
|
||||
|
||||
if use kde; then
|
||||
export QT_SELECT=5 # bug 639620 needs proper fix though
|
||||
export QT5DIR="$(qt5_get_bindir)/../"
|
||||
export MOC5="$(qt5_get_bindir)/moc"
|
||||
fi
|
||||
|
||||
# system headers/libs/...: enforce using system packages
|
||||
# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
|
||||
# --enable-cairo: ensure that cairo is always required
|
||||
# --enable-*-link: link to the library rather than just dlopen on runtime
|
||||
# --enable-release-build: build the libreoffice as release
|
||||
# --disable-fetch-external: prevent dowloading during compile phase
|
||||
# --enable-extension-integration: enable any extension integration support
|
||||
# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
|
||||
# --disable-report-builder: too much java packages pulled in without pkgs
|
||||
# --without-system-sane: just sane.h header that is used for scan in writer,
|
||||
# not linked or anything else, worthless to depend on
|
||||
# --disable-pdfium: not yet packaged
|
||||
local myeconfargs=(
|
||||
--with-system-dicts
|
||||
--with-system-epoxy
|
||||
--with-system-headers
|
||||
--with-system-jars
|
||||
--with-system-libs
|
||||
--enable-cairo-canvas
|
||||
--enable-largefile
|
||||
--enable-mergelibs
|
||||
--enable-neon
|
||||
--enable-python=system
|
||||
--enable-randr
|
||||
--enable-release-build
|
||||
--disable-breakpad
|
||||
--disable-ccache
|
||||
--disable-dependency-tracking
|
||||
--disable-epm
|
||||
--disable-fetch-external
|
||||
--disable-gstreamer-0-10
|
||||
--disable-online-update
|
||||
--disable-pdfium
|
||||
--disable-report-builder
|
||||
--with-alloc=system
|
||||
--with-build-version="Gentoo official package"
|
||||
--enable-extension-integration
|
||||
--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
|
||||
--with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
|
||||
--with-external-thes-dir="${EPREFIX}/usr/share/myspell"
|
||||
--with-external-tar="${DISTDIR}"
|
||||
--with-lang=""
|
||||
--with-parallelism=$(makeopts_jobs)
|
||||
--with-system-ucpp
|
||||
--with-vendor="Gentoo Foundation"
|
||||
--with-x
|
||||
--without-fonts
|
||||
--without-myspell-dicts
|
||||
--without-help
|
||||
--with-helppack-integration
|
||||
--with-system-gpgmepp
|
||||
--without-system-sane
|
||||
$(use_enable bluetooth sdremote-bluetooth)
|
||||
$(use_enable coinmp)
|
||||
$(use_enable cups)
|
||||
$(use_enable dbus)
|
||||
$(use_enable debug)
|
||||
$(use_enable eds evolution2)
|
||||
$(use_enable firebird firebird-sdbc)
|
||||
$(use_enable gstreamer gstreamer-1-0)
|
||||
$(use_enable gtk gtk3)
|
||||
$(use_enable gtk2 gtk)
|
||||
$(use_enable kde gtk3-kde5)
|
||||
$(use_enable kde kde5)
|
||||
$(use_enable kde qt5)
|
||||
$(use_enable mysql ext-mariadb-connector)
|
||||
$(use_enable odk)
|
||||
$(use_enable pdfimport)
|
||||
$(use_enable postgres postgresql-sdbc)
|
||||
$(use_enable vlc)
|
||||
$(use_with coinmp system-coinmp)
|
||||
$(use_with googledrive gdrive-client-id ${google_default_client_id})
|
||||
$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
|
||||
$(use_with java)
|
||||
$(use_with mysql system-mysql-cppconn)
|
||||
$(use_with odk doxygen)
|
||||
)
|
||||
|
||||
if use eds || use gtk; then
|
||||
myeconfargs+=( --enable-dconf --enable-gio )
|
||||
else
|
||||
myeconfargs+=( --disable-dconf --disable-gio )
|
||||
fi
|
||||
|
||||
# libreoffice extensions handling
|
||||
for lo_xt in ${LO_EXTS}; do
|
||||
if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
|
||||
myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
|
||||
else
|
||||
myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
|
||||
fi
|
||||
done
|
||||
|
||||
if use java; then
|
||||
# hsqldb: system one is too new
|
||||
myeconfargs+=(
|
||||
--without-junit
|
||||
--without-system-hsqldb
|
||||
--with-ant-home="${ANT_HOME}"
|
||||
--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
|
||||
--with-jvm-path="${EPREFIX}/usr/lib/"
|
||||
)
|
||||
|
||||
use libreoffice_extensions_scripting-beanshell && \
|
||||
myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
|
||||
|
||||
use libreoffice_extensions_scripting-javascript && \
|
||||
myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
|
||||
fi
|
||||
|
||||
is-flagq "-flto*" && myeconfargs+=( --enable-lto )
|
||||
|
||||
econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# more and more LO stuff tries to use OpenGL, including tests during build
|
||||
# bug 501508, bug 540624, bug 545974 and probably more
|
||||
addpredict /dev/dri
|
||||
addpredict /dev/ati
|
||||
addpredict /dev/nvidiactl
|
||||
|
||||
# hack for offlinehelp, this needs fixing upstream at some point
|
||||
# it is broken because we send --without-help
|
||||
# https://bugs.freedesktop.org/show_bug.cgi?id=46506
|
||||
(
|
||||
grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
|
||||
source "${T}/config_host.mk" 2&> /dev/null
|
||||
|
||||
local path="${WORKDIR}/helpcontent2/source/auxiliary/"
|
||||
mkdir -p "${path}" || die
|
||||
|
||||
echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
|
||||
perl "${S}/helpcontent2/helpers/create_ilst.pl" \
|
||||
-dir=helpcontent2/source/media/helpimg \
|
||||
> "${path}/helpimg.ilst"
|
||||
[[ -s "${path}/helpimg.ilst" ]] || \
|
||||
ewarn "The help images list is empty, something is fishy, report a bug."
|
||||
)
|
||||
|
||||
local target
|
||||
use test && target="build" || target="build-nocheck"
|
||||
|
||||
# this is not a proper make script
|
||||
make ${target} || die
|
||||
}
|
||||
|
||||
src_test() {
|
||||
make unitcheck || die
|
||||
make slowcheck || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# This is not Makefile so no buildserver
|
||||
make DESTDIR="${D}" distro-pack-install -o build -o check || die
|
||||
|
||||
# bug 593514
|
||||
if use gtk; then
|
||||
dosym libreoffice/program/liblibreofficekitgtk.so \
|
||||
/usr/$(get_libdir)/liblibreofficekitgtk.so
|
||||
fi
|
||||
|
||||
# bash completion aliases
|
||||
bashcomp_alias \
|
||||
libreoffice \
|
||||
unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
|
||||
|
||||
if use branding; then
|
||||
insinto /usr/$(get_libdir)/${PN}/program
|
||||
newins "${WORKDIR}/branding-sofficerc" sofficerc
|
||||
dodir /etc/env.d
|
||||
echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
|
||||
fi
|
||||
|
||||
# Hack for offlinehelp, this needs fixing upstream at some point.
|
||||
# It is broken because we send --without-help
|
||||
# https://bugs.freedesktop.org/show_bug.cgi?id=46506
|
||||
insinto /usr/$(get_libdir)/libreoffice/help
|
||||
doins xmlhelp/util/*.xsl
|
||||
|
||||
pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
|
||||
pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
gnome2_icon_cache_update
|
||||
xdg_desktop_database_update
|
||||
xdg_mimeinfo_database_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
gnome2_icon_cache_update
|
||||
xdg_desktop_database_update
|
||||
xdg_mimeinfo_database_update
|
||||
}
|
||||
Binary file not shown.
@ -1 +1,4 @@
|
||||
DIST libimobiledevice-1.2.0-git.patch 187304 BLAKE2B 7c184f823b831b913dbae16a58db1e4b7682fb42e573b1bab3983eb8150feb696795fd59c81ca7582fd56cd953e32489a8ddc502c4cb39a6ac88ff3d018ceace SHA512 cfc433a8eada9357ee5119ccfeb1e7444f10132637a43954174721905207b0e168f49a1728ee16ed6b0a9fd8b9617e8e35b04cf34f775abd1d12b8ecb7dbdbd2
|
||||
DIST libimobiledevice-1.2.0-userpref-GnuTLS-Fix-3.6.0-SHA1-compatibility.patch 2272 BLAKE2B 2f435af75c6f7fe319c76b52feac32d8f1389806835658bae5713d82471d0b2edd01b062871bff5e757795c220e2cd4c77d404c1df0cf9616c2fc2d77364b686 SHA512 a31741cfaae53781a1491fd53514e614e64c676573dc9252adea2fb0d64005eb5fad6483f1848b0246f0fff76c8fb4535f56a6e97c13dd7aa48a29061cabb172
|
||||
DIST libimobiledevice-1.2.0-userpref-GnuTLS-Use-valid-serial-for-3.6.0.patch 2014 BLAKE2B 8a6e51af145cf9983aa92ad7febf8d48a64b81f4f4664079ee7df3d433626141e10af6700ad38aad81bbbf3be03d6b35bae4f10a595e97f6998a06b6b2a4fbd4 SHA512 1c6002f8da5524603b989613fc1b14e526bc6fcbf515890f8c4976fe5e1b3801f04f6b210264624990ff7dd7de01063ad53dbf9ec506a0645098692a948216b9
|
||||
DIST libimobiledevice-1.2.0.tar.bz2 631495 BLAKE2B b04d87906615710e9e143013d27f4a0735e444160cb9dad464cb63d568470397f504680b3faca3995932cc8a80970a5923128d356fad9c98372af4981373ed69 SHA512 0de5f768aeb5d62445892855d84ceaff776f6667733c351ed6c34bf9d500802762d1a06e5efdf57f33cafc9ee788041cd9b6748fb9bad6c2e4ae2f9b9aa93589
|
||||
|
||||
@ -0,0 +1,115 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
PYTHON_COMPAT=( python{2_7,3_4,3_5} )
|
||||
|
||||
inherit autotools python-r1
|
||||
|
||||
DESCRIPTION="Support library to communicate with Apple iPhone/iPod Touch devices"
|
||||
HOMEPAGE="http://www.libimobiledevice.org/"
|
||||
|
||||
# Get patches from Fedora
|
||||
SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2
|
||||
https://src.fedoraproject.org/rpms/libimobiledevice/raw/master/f/0001-userpref-GnuTLS-Fix-3.6.0-SHA1-compatibility.patch -> ${P}-userpref-GnuTLS-Fix-3.6.0-SHA1-compatibility.patch
|
||||
https://src.fedoraproject.org/rpms/libimobiledevice/raw/master/f/0002-userpref-GnuTLS-Use-valid-serial-for-3.6.0.patch -> ${P}-userpref-GnuTLS-Use-valid-serial-for-3.6.0.patch
|
||||
https://src.fedoraproject.org/rpms/libimobiledevice/raw/master/f/344409e1d1ad917d377b256214c5411dda82e6b0...5a85432719fb3d18027d528f87d2a44b76fd3e12.patch -> ${P}-git.patch"
|
||||
|
||||
# While COPYING* doesn't mention 'or any later version', all the headers do, hence use +
|
||||
LICENSE="GPL-2+ LGPL-2.1+"
|
||||
|
||||
SLOT="0/6" # based on SONAME of libimobiledevice.so
|
||||
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
|
||||
IUSE="gnutls libressl python static-libs"
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
RDEPEND="
|
||||
>=app-pda/libplist-1.11:=
|
||||
>=app-pda/libusbmuxd-1.0.9:=
|
||||
gnutls? (
|
||||
dev-libs/libgcrypt:0
|
||||
>=dev-libs/libtasn1-1.1
|
||||
>=net-libs/gnutls-2.2.0 )
|
||||
!gnutls? (
|
||||
!libressl? ( dev-libs/openssl:0= )
|
||||
libressl? ( dev-libs/libressl:0= ) )
|
||||
python? (
|
||||
${PYTHON_DEPS}
|
||||
app-pda/libplist[python(-),${PYTHON_USEDEP}] )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
python? ( >=dev-python/cython-0.17[${PYTHON_USEDEP}] )
|
||||
"
|
||||
|
||||
BUILD_DIR="${S}_build"
|
||||
|
||||
PATCHES=(
|
||||
"${DISTDIR}"/${P}-git.patch
|
||||
"${DISTDIR}"/${P}-userpref-GnuTLS-Fix-3.6.0-SHA1-compatibility.patch
|
||||
"${DISTDIR}"/${P}-userpref-GnuTLS-Use-valid-serial-for-3.6.0.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local ECONF_SOURCE=${S}
|
||||
|
||||
local myeconfargs=( $(use_enable static-libs static) )
|
||||
use gnutls && myeconfargs+=( --disable-openssl )
|
||||
|
||||
do_configure() {
|
||||
mkdir -p "${BUILD_DIR}" || die
|
||||
pushd "${BUILD_DIR}" >/dev/null || die
|
||||
econf "${myeconfargs[@]}" "${@}"
|
||||
popd >/dev/null || die
|
||||
}
|
||||
|
||||
do_configure_python() {
|
||||
# Bug 567916
|
||||
PYTHON_LDFLAGS="$(python_get_LIBS)" do_configure "$@"
|
||||
}
|
||||
|
||||
do_configure --without-cython
|
||||
use python && python_foreach_impl do_configure_python
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
python_compile() {
|
||||
emake -C "${BUILD_DIR}"/cython -j1 \
|
||||
VPATH="${S}/cython:${native_builddir}/cython" \
|
||||
imobiledevice_la_LIBADD="${native_builddir}/src/libimobiledevice.la"
|
||||
}
|
||||
|
||||
local native_builddir=${BUILD_DIR}
|
||||
pushd "${BUILD_DIR}" >/dev/null || die
|
||||
emake -j1
|
||||
use python && python_foreach_impl python_compile
|
||||
popd >/dev/null || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
python_install() {
|
||||
emake -C "${BUILD_DIR}/cython" -j1 \
|
||||
VPATH="${S}/cython:${native_builddir}/cython" \
|
||||
DESTDIR="${D}" install
|
||||
}
|
||||
|
||||
local native_builddir=${BUILD_DIR}
|
||||
pushd "${BUILD_DIR}" >/dev/null || die
|
||||
emake -j1 DESTDIR="${D}" install
|
||||
use python && python_foreach_impl python_install
|
||||
popd >/dev/null || die
|
||||
|
||||
dodoc docs/html/*
|
||||
if use python; then
|
||||
insinto /usr/include/${PN}/cython
|
||||
doins cython/imobiledevice.pxd
|
||||
fi
|
||||
|
||||
find "${D}" -name '*.la' -delete || die
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
@ -0,0 +1 @@
|
||||
DIST libnumbertext-1.0_beta2.tar.gz 407135 BLAKE2B 6fecc6c885fbd9a2a701e5d3c10d38205e2d66a9e1e26609da8dd3ae92d2a954528ba011e7442fee0f4ffb3035ebe9381076a3eaac368e15a98a02508828997c SHA512 0db0e800495507b6173a134b1d2e681c326df56fc6fdaf5ae9e69e9f10ccfde1ad13b2150fb6120d15bd401c348a58570cbcad1b0be01fd80e24b67a67fd236a
|
||||
@ -0,0 +1,35 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit autotools
|
||||
|
||||
DESCRIPTION="Number to number name and money text conversion libraries"
|
||||
HOMEPAGE="https://github.com/Numbertext/libnumbertext"
|
||||
SRC_URI="https://github.com/Numbertext/${PN}/archive/${PV/_/.}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-3+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="debug doc test"
|
||||
|
||||
RDEPEND=""
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
S="${WORKDIR}/${P/_/.}"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
--disable-werror
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
find "${D}" -name '*.la' -delete || die
|
||||
}
|
||||
@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>office@gentoo.org</email>
|
||||
<name>Gentoo Office project</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
Binary file not shown.
Binary file not shown.
@ -1,14 +0,0 @@
|
||||
Fix building with dlopen() not available.
|
||||
|
||||
--- configure.ac
|
||||
+++ configure.ac
|
||||
@@ -102,6 +102,9 @@
|
||||
[], [enable_dynamic_extensions=yes])
|
||||
if test x"$enable_dynamic_extensions" != "xno"; then
|
||||
AC_SEARCH_LIBS(dlopen, dl)
|
||||
+ if test "${ac_cv_search_dlopen}" = "no" ; then
|
||||
+ DYNAMIC_EXTENSION_FLAGS=-DSQLITE_OMIT_LOAD_EXTENSION=1
|
||||
+ fi
|
||||
else
|
||||
DYNAMIC_EXTENSION_FLAGS=-DSQLITE_OMIT_LOAD_EXTENSION=1
|
||||
fi
|
||||
@ -1,158 +0,0 @@
|
||||
Link executables against libsqlite3.so.
|
||||
Increase timeout for fuzzcheck.
|
||||
Fix building with dlopen() not available.
|
||||
|
||||
--- Makefile.in
|
||||
+++ Makefile.in
|
||||
@@ -565,6 +565,7 @@
|
||||
#
|
||||
SHELL_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS4
|
||||
# SHELL_OPT += -DSQLITE_ENABLE_FTS5
|
||||
+SHELL_OPT += -DSQLITE_ENABLE_DBSTAT_VTAB
|
||||
SHELL_OPT += -DSQLITE_ENABLE_EXPLAIN_COMMENTS
|
||||
SHELL_OPT += -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
|
||||
SHELL_OPT += -DSQLITE_ENABLE_STMTVTAB
|
||||
@@ -591,25 +592,25 @@
|
||||
|
||||
libtclsqlite3.la: tclsqlite.lo libsqlite3.la
|
||||
$(LTLINK) -no-undefined -o $@ tclsqlite.lo \
|
||||
- libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
|
||||
+ libsqlite3.la @TCL_STUB_LIB_SPEC@ \
|
||||
-rpath "$(TCLLIBDIR)" \
|
||||
-version-info "8:6:8" \
|
||||
-avoid-version
|
||||
|
||||
-sqlite3$(TEXE): $(TOP)/src/shell.c sqlite3.c
|
||||
- $(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \
|
||||
- $(TOP)/src/shell.c sqlite3.c \
|
||||
- $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
|
||||
+sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la
|
||||
+ $(LTLINK) $(READLINE_FLAGS) -o $@ \
|
||||
+ $(TOP)/src/shell.c libsqlite3.la \
|
||||
+ $(LIBREADLINE)
|
||||
|
||||
-sqldiff$(TEXE): $(TOP)/tool/sqldiff.c sqlite3.lo sqlite3.h
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.lo $(TLIBS)
|
||||
+sqldiff$(TEXE): $(TOP)/tool/sqldiff.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c libsqlite3.la
|
||||
|
||||
-dbhash$(TEXE): $(TOP)/tool/dbhash.c sqlite3.lo sqlite3.h
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/dbhash.c sqlite3.lo $(TLIBS)
|
||||
+dbhash$(TEXE): $(TOP)/tool/dbhash.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/dbhash.c libsqlite3.la
|
||||
|
||||
-scrub$(TEXE): $(TOP)/ext/misc/scrub.c sqlite3.lo
|
||||
+scrub$(TEXE): $(TOP)/ext/misc/scrub.c libsqlite3.la
|
||||
$(LTLINK) -o $@ -I. -DSCRUB_STANDALONE \
|
||||
- $(TOP)/ext/misc/scrub.c sqlite3.lo $(TLIBS)
|
||||
+ $(TOP)/ext/misc/scrub.c libsqlite3.la
|
||||
|
||||
srcck1$(BEXE): $(TOP)/tool/srcck1.c
|
||||
$(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c
|
||||
@@ -685,7 +686,7 @@
|
||||
# Rule to build the amalgamation
|
||||
#
|
||||
sqlite3.lo: sqlite3.c
|
||||
- $(LTCOMPILE) $(TEMP_STORE) -c sqlite3.c
|
||||
+ $(LTCOMPILE) $(SHELL_OPT) $(TEMP_STORE) -c sqlite3.c
|
||||
|
||||
# Rules to build the LEMON compiler generator
|
||||
#
|
||||
@@ -1115,13 +1116,13 @@
|
||||
|
||||
# Fuzz testing
|
||||
fuzztest: fuzzcheck$(TEXE) $(FUZZDATA)
|
||||
- ./fuzzcheck$(TEXE) $(FUZZDATA)
|
||||
+ ./fuzzcheck$(TEXE) --timeout 3600 $(FUZZDATA)
|
||||
|
||||
fastfuzztest: fuzzcheck$(TEXE) $(FUZZDATA)
|
||||
- ./fuzzcheck$(TEXE) --limit-mem 100M $(FUZZDATA)
|
||||
+ ./fuzzcheck$(TEXE) --limit-mem 100M --timeout 3600 $(FUZZDATA)
|
||||
|
||||
valgrindfuzz: fuzzcheck$(TEXT) $(FUZZDATA)
|
||||
- valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA)
|
||||
+ valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 3600 $(FUZZDATA)
|
||||
|
||||
# The veryquick.test TCL tests.
|
||||
#
|
||||
@@ -1151,36 +1152,35 @@
|
||||
smoketest: $(TESTPROGS) fuzzcheck$(TEXE)
|
||||
./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS)
|
||||
|
||||
-sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl
|
||||
+sqlite3_analyzer.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl
|
||||
echo "#define TCLSH 2" > $@
|
||||
- echo "#define SQLITE_ENABLE_DBSTAT_VTAB 1" >> $@
|
||||
- cat sqlite3.c $(TOP)/src/tclsqlite.c >> $@
|
||||
+ cat $(TOP)/src/tclsqlite.c >> $@
|
||||
echo "static const char *tclsh_main_loop(void){" >> $@
|
||||
echo "static const char *zMainloop = " >> $@
|
||||
$(TCLSH_CMD) $(TOP)/tool/tostr.tcl $(TOP)/tool/spaceanal.tcl >> $@
|
||||
echo "; return zMainloop; }" >> $@
|
||||
|
||||
-sqlite3_analyzer$(TEXE): sqlite3_analyzer.c
|
||||
- $(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS)
|
||||
+sqlite3_analyzer$(TEXE): sqlite3_analyzer.c libsqlite3.la
|
||||
+ $(LTLINK) sqlite3_analyzer.c -o $@ libsqlite3.la $(LIBTCL)
|
||||
|
||||
-dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c sqlite3.lo
|
||||
+dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c libsqlite3.la
|
||||
$(LTLINK) -DDBDUMP_STANDALONE -o $@ \
|
||||
- $(TOP)/ext/misc/dbdump.c sqlite3.lo $(TLIBS)
|
||||
+ $(TOP)/ext/misc/dbdump.c libsqlite3.la
|
||||
|
||||
-showdb$(TEXE): $(TOP)/tool/showdb.c sqlite3.lo
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS)
|
||||
+showdb$(TEXE): $(TOP)/tool/showdb.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/showdb.c libsqlite3.la
|
||||
|
||||
-showstat4$(TEXE): $(TOP)/tool/showstat4.c sqlite3.lo
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/showstat4.c sqlite3.lo $(TLIBS)
|
||||
+showstat4$(TEXE): $(TOP)/tool/showstat4.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/showstat4.c libsqlite3.la
|
||||
|
||||
-showjournal$(TEXE): $(TOP)/tool/showjournal.c sqlite3.lo
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/showjournal.c sqlite3.lo $(TLIBS)
|
||||
+showjournal$(TEXE): $(TOP)/tool/showjournal.c
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/showjournal.c
|
||||
|
||||
-showwal$(TEXE): $(TOP)/tool/showwal.c sqlite3.lo
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/showwal.c sqlite3.lo $(TLIBS)
|
||||
+showwal$(TEXE): $(TOP)/tool/showwal.c
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/showwal.c
|
||||
|
||||
-changeset$(TEXE): $(TOP)/ext/session/changeset.c sqlite3.lo
|
||||
- $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c sqlite3.lo $(TLIBS)
|
||||
+changeset$(TEXE): $(TOP)/ext/session/changeset.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c libsqlite3.la
|
||||
|
||||
rollback-test$(TEXE): $(TOP)/tool/rollback-test.c sqlite3.lo
|
||||
$(LTLINK) -o $@ $(TOP)/tool/rollback-test.c sqlite3.lo $(TLIBS)
|
||||
@@ -1199,11 +1199,11 @@
|
||||
kvtest$(TEXE): $(TOP)/test/kvtest.c sqlite3.c
|
||||
$(LTLINK) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(TLIBS)
|
||||
|
||||
-rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo
|
||||
- $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.lo $(TLIBS)
|
||||
+rbu$(EXE): $(TOP)/ext/rbu/rbu.c libsqlite3.la
|
||||
+ $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c libsqlite3.la
|
||||
|
||||
-loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
|
||||
- $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS)
|
||||
+loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
|
||||
+ $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@
|
||||
|
||||
# This target will fail if the SQLite amalgamation contains any exported
|
||||
# symbols that do not begin with "sqlite3_". It is run as part of the
|
||||
--- configure.ac
|
||||
+++ configure.ac
|
||||
@@ -584,6 +584,9 @@
|
||||
if test "${use_loadextension}" = "yes" ; then
|
||||
OPT_FEATURE_FLAGS=""
|
||||
AC_SEARCH_LIBS(dlopen, dl)
|
||||
+ if test "${ac_cv_search_dlopen}" = "no" ; then
|
||||
+ OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
|
||||
+ fi
|
||||
else
|
||||
OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
|
||||
fi
|
||||
@ -1,33 +0,0 @@
|
||||
https://sqlite.org/src/info/42f0777555675875
|
||||
|
||||
--- ext/misc/csv.c
|
||||
+++ ext/misc/csv.c
|
||||
@@ -78,7 +78,7 @@
|
||||
int nAlloc; /* Space allocated for z[] */
|
||||
int nLine; /* Current line number */
|
||||
int bNotFirst; /* True if prior text has been seen */
|
||||
- char cTerm; /* Character that terminated the most recent field */
|
||||
+ int cTerm; /* Character that terminated the most recent field */
|
||||
size_t iIn; /* Next unread character in the input buffer */
|
||||
size_t nIn; /* Number of characters in the input buffer */
|
||||
char *zIn; /* The input buffer */
|
||||
@@ -166,7 +166,7 @@
|
||||
if( p->in!=0 ) return csv_getc_refill(p);
|
||||
return EOF;
|
||||
}
|
||||
- return p->zIn[p->iIn++];
|
||||
+ return ((unsigned char*)p->zIn)[p->iIn++];
|
||||
}
|
||||
|
||||
/* Increase the size of p->z and append character c to the end.
|
||||
--- test/releasetest.tcl
|
||||
+++ test/releasetest.tcl
|
||||
@@ -114,7 +114,7 @@
|
||||
}
|
||||
"Debug-One" {
|
||||
--disable-shared
|
||||
- -O2
|
||||
+ -O2 -funsigned-char
|
||||
-DSQLITE_DEBUG=1
|
||||
-DSQLITE_MEMDEBUG=1
|
||||
-DSQLITE_MUTEX_NOOP=1
|
||||
@ -1,95 +0,0 @@
|
||||
https://www.sqlite.org/src/info/87ccdf9cbb928455
|
||||
|
||||
--- test/fts3conf.test
|
||||
+++ test/fts3conf.test
|
||||
@@ -136,47 +136,49 @@
|
||||
do_execsql_test 2.2.3 { SELECT * FROM t1 } {{a b c} {a b c}}
|
||||
fts3_integrity 2.2.4 db t1
|
||||
|
||||
-do_execsql_test 3.1 {
|
||||
- CREATE VIRTUAL TABLE t3 USING fts4;
|
||||
- REPLACE INTO t3(docid, content) VALUES (1, 'one two');
|
||||
- SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'one'
|
||||
-} {X'0100000002000000'}
|
||||
-
|
||||
-do_execsql_test 3.2 {
|
||||
- REPLACE INTO t3(docid, content) VALUES (2, 'one two three four');
|
||||
- SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'four'
|
||||
-} {X'0200000003000000'}
|
||||
-
|
||||
-do_execsql_test 3.3 {
|
||||
- REPLACE INTO t3(docid, content) VALUES (1, 'one two three four five six');
|
||||
- SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'six'
|
||||
-} {X'0200000005000000'}
|
||||
-
|
||||
-do_execsql_test 3.4 {
|
||||
- UPDATE OR REPLACE t3 SET docid = 2 WHERE docid=1;
|
||||
- SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'six'
|
||||
-} {X'0100000006000000'}
|
||||
-
|
||||
-do_execsql_test 3.5 {
|
||||
- UPDATE OR REPLACE t3 SET docid = 3 WHERE docid=2;
|
||||
- SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'six'
|
||||
-} {X'0100000006000000'}
|
||||
-
|
||||
-do_execsql_test 3.6 {
|
||||
- REPLACE INTO t3(docid, content) VALUES (3, 'one two');
|
||||
- SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'one'
|
||||
-} {X'0100000002000000'}
|
||||
-
|
||||
-do_execsql_test 3.7 {
|
||||
- REPLACE INTO t3(docid, content) VALUES (NULL, 'one two three four');
|
||||
- REPLACE INTO t3(docid, content) VALUES (NULL, 'one two three four five six');
|
||||
- SELECT docid FROM t3;
|
||||
-} {3 4 5}
|
||||
-
|
||||
-do_execsql_test 3.8 {
|
||||
- UPDATE OR REPLACE t3 SET docid = 5, content='three four' WHERE docid = 4;
|
||||
- SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'one'
|
||||
-} {X'0200000002000000'}
|
||||
+if {$tcl_platform(byteOrder)=="littleEndian"} {
|
||||
+ do_execsql_test 3.1 {
|
||||
+ CREATE VIRTUAL TABLE t3 USING fts4;
|
||||
+ REPLACE INTO t3(docid, content) VALUES (1, 'one two');
|
||||
+ SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'one'
|
||||
+ } {X'0100000002000000'}
|
||||
+
|
||||
+ do_execsql_test 3.2 {
|
||||
+ REPLACE INTO t3(docid, content) VALUES (2, 'one two three four');
|
||||
+ SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'four'
|
||||
+ } {X'0200000003000000'}
|
||||
+
|
||||
+ do_execsql_test 3.3 {
|
||||
+ REPLACE INTO t3(docid, content) VALUES (1, 'one two three four five six');
|
||||
+ SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'six'
|
||||
+ } {X'0200000005000000'}
|
||||
+
|
||||
+ do_execsql_test 3.4 {
|
||||
+ UPDATE OR REPLACE t3 SET docid = 2 WHERE docid=1;
|
||||
+ SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'six'
|
||||
+ } {X'0100000006000000'}
|
||||
+
|
||||
+ do_execsql_test 3.5 {
|
||||
+ UPDATE OR REPLACE t3 SET docid = 3 WHERE docid=2;
|
||||
+ SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'six'
|
||||
+ } {X'0100000006000000'}
|
||||
+
|
||||
+ do_execsql_test 3.6 {
|
||||
+ REPLACE INTO t3(docid, content) VALUES (3, 'one two');
|
||||
+ SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'one'
|
||||
+ } {X'0100000002000000'}
|
||||
+
|
||||
+ do_execsql_test 3.7 {
|
||||
+ REPLACE INTO t3(docid, content) VALUES(NULL,'one two three four');
|
||||
+ REPLACE INTO t3(docid, content) VALUES(NULL,'one two three four five six');
|
||||
+ SELECT docid FROM t3;
|
||||
+ } {3 4 5}
|
||||
+
|
||||
+ do_execsql_test 3.8 {
|
||||
+ UPDATE OR REPLACE t3 SET docid = 5, content='three four' WHERE docid = 4;
|
||||
+ SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'one'
|
||||
+ } {X'0200000002000000'}
|
||||
+}
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
# Test that the xSavepoint is invoked correctly if the first write
|
||||
@ -1,153 +0,0 @@
|
||||
Link executables against libsqlite3.so.
|
||||
Increase timeout for fuzzcheck.
|
||||
Fix building with dlopen() not available.
|
||||
|
||||
--- /Makefile.in
|
||||
+++ /Makefile.in
|
||||
@@ -600,25 +600,25 @@
|
||||
|
||||
libtclsqlite3.la: tclsqlite.lo libsqlite3.la
|
||||
$(LTLINK) -no-undefined -o $@ tclsqlite.lo \
|
||||
- libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
|
||||
+ libsqlite3.la @TCL_STUB_LIB_SPEC@ \
|
||||
-rpath "$(TCLLIBDIR)" \
|
||||
-version-info "8:6:8" \
|
||||
-avoid-version
|
||||
|
||||
-sqlite3$(TEXE): shell.c sqlite3.c
|
||||
- $(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \
|
||||
- shell.c sqlite3.c \
|
||||
- $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
|
||||
+sqlite3$(TEXE): shell.c libsqlite3.la
|
||||
+ $(LTLINK) $(READLINE_FLAGS) -o $@ \
|
||||
+ shell.c libsqlite3.la \
|
||||
+ $(LIBREADLINE)
|
||||
|
||||
-sqldiff$(TEXE): $(TOP)/tool/sqldiff.c sqlite3.lo sqlite3.h
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.lo $(TLIBS)
|
||||
+sqldiff$(TEXE): $(TOP)/tool/sqldiff.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c libsqlite3.la
|
||||
|
||||
-dbhash$(TEXE): $(TOP)/tool/dbhash.c sqlite3.lo sqlite3.h
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/dbhash.c sqlite3.lo $(TLIBS)
|
||||
+dbhash$(TEXE): $(TOP)/tool/dbhash.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/dbhash.c libsqlite3.la
|
||||
|
||||
-scrub$(TEXE): $(TOP)/ext/misc/scrub.c sqlite3.lo
|
||||
+scrub$(TEXE): $(TOP)/ext/misc/scrub.c libsqlite3.la
|
||||
$(LTLINK) -o $@ -I. -DSCRUB_STANDALONE \
|
||||
- $(TOP)/ext/misc/scrub.c sqlite3.lo $(TLIBS)
|
||||
+ $(TOP)/ext/misc/scrub.c libsqlite3.la
|
||||
|
||||
srcck1$(BEXE): $(TOP)/tool/srcck1.c
|
||||
$(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c
|
||||
@@ -694,7 +694,7 @@
|
||||
# Rule to build the amalgamation
|
||||
#
|
||||
sqlite3.lo: sqlite3.c
|
||||
- $(LTCOMPILE) $(TEMP_STORE) -c sqlite3.c
|
||||
+ $(LTCOMPILE) $(SHELL_OPT) $(TEMP_STORE) -c sqlite3.c
|
||||
|
||||
# Rules to build the LEMON compiler generator
|
||||
#
|
||||
@@ -1145,13 +1145,13 @@
|
||||
|
||||
# Fuzz testing
|
||||
fuzztest: fuzzcheck$(TEXE) $(FUZZDATA)
|
||||
- ./fuzzcheck$(TEXE) $(FUZZDATA)
|
||||
+ ./fuzzcheck$(TEXE) --timeout 3600 $(FUZZDATA)
|
||||
|
||||
fastfuzztest: fuzzcheck$(TEXE) $(FUZZDATA)
|
||||
- ./fuzzcheck$(TEXE) --limit-mem 100M $(FUZZDATA)
|
||||
+ ./fuzzcheck$(TEXE) --limit-mem 100M --timeout 3600 $(FUZZDATA)
|
||||
|
||||
valgrindfuzz: fuzzcheck$(TEXT) $(FUZZDATA)
|
||||
- valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA)
|
||||
+ valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 3600 $(FUZZDATA)
|
||||
|
||||
# The veryquick.test TCL tests.
|
||||
#
|
||||
@@ -1181,30 +1181,30 @@
|
||||
smoketest: $(TESTPROGS) fuzzcheck$(TEXE)
|
||||
./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS)
|
||||
|
||||
-sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in
|
||||
+sqlite3_analyzer.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in
|
||||
$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in >sqlite3_analyzer.c
|
||||
|
||||
-sqlite3_analyzer$(TEXE): sqlite3_analyzer.c
|
||||
- $(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS)
|
||||
+sqlite3_analyzer$(TEXE): sqlite3_analyzer.c libsqlite3.la
|
||||
+ $(LTLINK) sqlite3_analyzer.c -o $@ libsqlite3.la $(LIBTCL)
|
||||
|
||||
-dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c sqlite3.lo
|
||||
+dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c libsqlite3.la
|
||||
$(LTLINK) -DDBDUMP_STANDALONE -o $@ \
|
||||
- $(TOP)/ext/misc/dbdump.c sqlite3.lo $(TLIBS)
|
||||
+ $(TOP)/ext/misc/dbdump.c libsqlite3.la
|
||||
|
||||
-showdb$(TEXE): $(TOP)/tool/showdb.c sqlite3.lo
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS)
|
||||
+showdb$(TEXE): $(TOP)/tool/showdb.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/showdb.c libsqlite3.la
|
||||
|
||||
-showstat4$(TEXE): $(TOP)/tool/showstat4.c sqlite3.lo
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/showstat4.c sqlite3.lo $(TLIBS)
|
||||
+showstat4$(TEXE): $(TOP)/tool/showstat4.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/showstat4.c libsqlite3.la
|
||||
|
||||
-showjournal$(TEXE): $(TOP)/tool/showjournal.c sqlite3.lo
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/showjournal.c sqlite3.lo $(TLIBS)
|
||||
+showjournal$(TEXE): $(TOP)/tool/showjournal.c
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/showjournal.c
|
||||
|
||||
-showwal$(TEXE): $(TOP)/tool/showwal.c sqlite3.lo
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/showwal.c sqlite3.lo $(TLIBS)
|
||||
+showwal$(TEXE): $(TOP)/tool/showwal.c
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/showwal.c
|
||||
|
||||
-changeset$(TEXE): $(TOP)/ext/session/changeset.c sqlite3.lo
|
||||
- $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c sqlite3.lo $(TLIBS)
|
||||
+changeset$(TEXE): $(TOP)/ext/session/changeset.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c libsqlite3.la
|
||||
|
||||
rollback-test$(TEXE): $(TOP)/tool/rollback-test.c sqlite3.lo
|
||||
$(LTLINK) -o $@ $(TOP)/tool/rollback-test.c sqlite3.lo $(TLIBS)
|
||||
@@ -1223,11 +1223,11 @@
|
||||
kvtest$(TEXE): $(TOP)/test/kvtest.c sqlite3.c
|
||||
$(LTLINK) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(TLIBS)
|
||||
|
||||
-rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo
|
||||
- $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.lo $(TLIBS)
|
||||
+rbu$(EXE): $(TOP)/ext/rbu/rbu.c libsqlite3.la
|
||||
+ $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c libsqlite3.la
|
||||
|
||||
-loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
|
||||
- $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS)
|
||||
+loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
|
||||
+ $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@
|
||||
|
||||
# This target will fail if the SQLite amalgamation contains any exported
|
||||
# symbols that do not begin with "sqlite3_". It is run as part of the
|
||||
--- /configure.ac
|
||||
+++ /configure.ac
|
||||
@@ -584,6 +584,9 @@
|
||||
if test "${use_loadextension}" = "yes" ; then
|
||||
OPT_FEATURE_FLAGS=""
|
||||
AC_SEARCH_LIBS(dlopen, dl)
|
||||
+ if test "${ac_cv_search_dlopen}" = "no" ; then
|
||||
+ OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
|
||||
+ fi
|
||||
else
|
||||
OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
|
||||
fi
|
||||
--- /tool/sqlite3_analyzer.c.in
|
||||
+++ /tool/sqlite3_analyzer.c.in
|
||||
@@ -14,7 +14,6 @@
|
||||
#define SQLITE_DEFAULT_MEMSTATUS 0
|
||||
#define SQLITE_MAX_EXPR_DEPTH 0
|
||||
#define SQLITE_OMIT_LOAD_EXTENSION 1
|
||||
-INCLUDE sqlite3.c
|
||||
INCLUDE $ROOT/src/tclsqlite.c
|
||||
|
||||
const char *sqlite3_analyzer_init_proc(Tcl_Interp *interp){
|
||||
@ -1,405 +0,0 @@
|
||||
Move some code to libsqlite3.so to avoid duplication.
|
||||
Link executables against libsqlite3.so.
|
||||
Increase timeout for fuzzcheck.
|
||||
Fix building with dlopen() not available.
|
||||
|
||||
--- /Makefile.in
|
||||
+++ /Makefile.in
|
||||
@@ -307,6 +307,9 @@
|
||||
# Source code for extensions
|
||||
#
|
||||
SRC += \
|
||||
+ $(TOP)/ext/expert/sqlite3expert.c \
|
||||
+ $(TOP)/ext/expert/sqlite3expert.h
|
||||
+SRC += \
|
||||
$(TOP)/ext/fts1/fts1.c \
|
||||
$(TOP)/ext/fts1/fts1.h \
|
||||
$(TOP)/ext/fts1/fts1_hash.c \
|
||||
@@ -355,8 +358,11 @@
|
||||
$(TOP)/ext/rbu/sqlite3rbu.h \
|
||||
$(TOP)/ext/rbu/sqlite3rbu.c
|
||||
SRC += \
|
||||
+ $(TOP)/ext/misc/appendvfs.c \
|
||||
$(TOP)/ext/misc/json1.c \
|
||||
- $(TOP)/ext/misc/stmt.c
|
||||
+ $(TOP)/ext/misc/sqlar.c \
|
||||
+ $(TOP)/ext/misc/stmt.c \
|
||||
+ $(TOP)/ext/misc/zipfile.c
|
||||
|
||||
# Generated source code files
|
||||
#
|
||||
@@ -425,7 +431,6 @@
|
||||
# Statically linked extensions
|
||||
#
|
||||
TESTSRC += \
|
||||
- $(TOP)/ext/expert/sqlite3expert.c \
|
||||
$(TOP)/ext/expert/test_expert.c \
|
||||
$(TOP)/ext/misc/amatch.c \
|
||||
$(TOP)/ext/misc/carray.c \
|
||||
@@ -447,8 +452,7 @@
|
||||
$(TOP)/ext/misc/spellfix.c \
|
||||
$(TOP)/ext/misc/totype.c \
|
||||
$(TOP)/ext/misc/unionvtab.c \
|
||||
- $(TOP)/ext/misc/wholenumber.c \
|
||||
- $(TOP)/ext/misc/zipfile.c
|
||||
+ $(TOP)/ext/misc/wholenumber.c
|
||||
|
||||
# Source code to the library files needed by the test fixture
|
||||
#
|
||||
@@ -610,25 +614,25 @@
|
||||
|
||||
libtclsqlite3.la: tclsqlite.lo libsqlite3.la
|
||||
$(LTLINK) -no-undefined -o $@ tclsqlite.lo \
|
||||
- libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
|
||||
+ libsqlite3.la @TCL_STUB_LIB_SPEC@ \
|
||||
-rpath "$(TCLLIBDIR)" \
|
||||
-version-info "8:6:8" \
|
||||
-avoid-version
|
||||
|
||||
-sqlite3$(TEXE): shell.c sqlite3.c
|
||||
- $(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \
|
||||
- shell.c sqlite3.c \
|
||||
- $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
|
||||
+sqlite3$(TEXE): shell.c libsqlite3.la
|
||||
+ $(LTLINK) $(READLINE_FLAGS) -o $@ \
|
||||
+ shell.c libsqlite3.la \
|
||||
+ $(LIBREADLINE)
|
||||
|
||||
-sqldiff$(TEXE): $(TOP)/tool/sqldiff.c sqlite3.lo sqlite3.h
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.lo $(TLIBS)
|
||||
+sqldiff$(TEXE): $(TOP)/tool/sqldiff.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c libsqlite3.la
|
||||
|
||||
-dbhash$(TEXE): $(TOP)/tool/dbhash.c sqlite3.lo sqlite3.h
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/dbhash.c sqlite3.lo $(TLIBS)
|
||||
+dbhash$(TEXE): $(TOP)/tool/dbhash.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/dbhash.c libsqlite3.la
|
||||
|
||||
-scrub$(TEXE): $(TOP)/ext/misc/scrub.c sqlite3.lo
|
||||
+scrub$(TEXE): $(TOP)/ext/misc/scrub.c libsqlite3.la
|
||||
$(LTLINK) -o $@ -I. -DSCRUB_STANDALONE \
|
||||
- $(TOP)/ext/misc/scrub.c sqlite3.lo $(TLIBS)
|
||||
+ $(TOP)/ext/misc/scrub.c libsqlite3.la
|
||||
|
||||
srcck1$(BEXE): $(TOP)/tool/srcck1.c
|
||||
$(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c
|
||||
@@ -704,7 +708,7 @@
|
||||
# Rule to build the amalgamation
|
||||
#
|
||||
sqlite3.lo: sqlite3.c
|
||||
- $(LTCOMPILE) $(TEMP_STORE) -c sqlite3.c
|
||||
+ $(LTCOMPILE) $(SHELL_OPT) $(TEMP_STORE) -c sqlite3.c
|
||||
|
||||
# Rules to build the LEMON compiler generator
|
||||
#
|
||||
@@ -995,14 +999,9 @@
|
||||
# Source files that go into making shell.c
|
||||
SHELL_SRC = \
|
||||
$(TOP)/src/shell.c.in \
|
||||
- $(TOP)/ext/misc/appendvfs.c \
|
||||
$(TOP)/ext/misc/shathree.c \
|
||||
$(TOP)/ext/misc/fileio.c \
|
||||
$(TOP)/ext/misc/completion.c \
|
||||
- $(TOP)/ext/misc/sqlar.c \
|
||||
- $(TOP)/ext/expert/sqlite3expert.c \
|
||||
- $(TOP)/ext/expert/sqlite3expert.h \
|
||||
- $(TOP)/ext/misc/zipfile.c \
|
||||
$(TOP)/src/test_windirent.c
|
||||
|
||||
shell.c: $(SHELL_SRC) $(TOP)/tool/mkshellc.tcl
|
||||
@@ -1161,13 +1160,13 @@
|
||||
|
||||
# Fuzz testing
|
||||
fuzztest: fuzzcheck$(TEXE) $(FUZZDATA)
|
||||
- ./fuzzcheck$(TEXE) $(FUZZDATA)
|
||||
+ ./fuzzcheck$(TEXE) --timeout 3600 $(FUZZDATA)
|
||||
|
||||
fastfuzztest: fuzzcheck$(TEXE) $(FUZZDATA)
|
||||
- ./fuzzcheck$(TEXE) --limit-mem 100M $(FUZZDATA)
|
||||
+ ./fuzzcheck$(TEXE) --limit-mem 100M --timeout 3600 $(FUZZDATA)
|
||||
|
||||
valgrindfuzz: fuzzcheck$(TEXT) $(FUZZDATA)
|
||||
- valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA)
|
||||
+ valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 3600 $(FUZZDATA)
|
||||
|
||||
# The veryquick.test TCL tests.
|
||||
#
|
||||
@@ -1197,24 +1196,23 @@
|
||||
smoketest: $(TESTPROGS) fuzzcheck$(TEXE)
|
||||
./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS)
|
||||
|
||||
-sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in
|
||||
+sqlite3_analyzer.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in
|
||||
$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in >sqlite3_analyzer.c
|
||||
|
||||
-sqlite3_analyzer$(TEXE): sqlite3_analyzer.c
|
||||
- $(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS)
|
||||
+sqlite3_analyzer$(TEXE): sqlite3_analyzer.c libsqlite3.la
|
||||
+ $(LTLINK) sqlite3_analyzer.c -o $@ libsqlite3.la $(LIBTCL)
|
||||
|
||||
-sqltclsh.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/ext/misc/appendvfs.c $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in
|
||||
+sqltclsh.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in
|
||||
$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in >sqltclsh.c
|
||||
|
||||
-sqltclsh$(TEXE): sqltclsh.c
|
||||
- $(LTLINK) sqltclsh.c -o $@ $(LIBTCL) $(TLIBS)
|
||||
+sqltclsh$(TEXE): sqltclsh.c libsqlite3.la
|
||||
+ $(LTLINK) sqltclsh.c -o $@ libsqlite3.la $(LIBTCL)
|
||||
|
||||
-sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c
|
||||
- $(LTLINK) $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c -o sqlite3_expert $(TLIBS)
|
||||
+sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/expert.c libsqlite3.la
|
||||
+ $(LTLINK) $(TOP)/ext/expert/expert.c -o sqlite3_expert libsqlite3.la
|
||||
|
||||
CHECKER_DEPS =\
|
||||
$(TOP)/tool/mkccode.tcl \
|
||||
- sqlite3.c \
|
||||
$(TOP)/src/tclsqlite.c \
|
||||
$(TOP)/ext/repair/sqlite3_checker.tcl \
|
||||
$(TOP)/ext/repair/checkindex.c \
|
||||
@@ -1225,30 +1223,30 @@
|
||||
sqlite3_checker.c: $(CHECKER_DEPS)
|
||||
$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/ext/repair/sqlite3_checker.c.in >$@
|
||||
|
||||
-sqlite3_checker$(TEXE): sqlite3_checker.c
|
||||
- $(LTLINK) sqlite3_checker.c -o $@ $(LIBTCL) $(TLIBS)
|
||||
+sqlite3_checker$(TEXE): sqlite3_checker.c libsqlite3.la
|
||||
+ $(LTLINK) sqlite3_checker.c -o $@ libsqlite3.la $(LIBTCL)
|
||||
|
||||
-dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c sqlite3.lo
|
||||
+dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c libsqlite3.la
|
||||
$(LTLINK) -DDBDUMP_STANDALONE -o $@ \
|
||||
- $(TOP)/ext/misc/dbdump.c sqlite3.lo $(TLIBS)
|
||||
+ $(TOP)/ext/misc/dbdump.c libsqlite3.la
|
||||
|
||||
-showdb$(TEXE): $(TOP)/tool/showdb.c sqlite3.lo
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS)
|
||||
+showdb$(TEXE): $(TOP)/tool/showdb.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/showdb.c libsqlite3.la
|
||||
|
||||
-showstat4$(TEXE): $(TOP)/tool/showstat4.c sqlite3.lo
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/showstat4.c sqlite3.lo $(TLIBS)
|
||||
+showstat4$(TEXE): $(TOP)/tool/showstat4.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/showstat4.c libsqlite3.la
|
||||
|
||||
-showjournal$(TEXE): $(TOP)/tool/showjournal.c sqlite3.lo
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/showjournal.c sqlite3.lo $(TLIBS)
|
||||
+showjournal$(TEXE): $(TOP)/tool/showjournal.c
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/showjournal.c
|
||||
|
||||
-showwal$(TEXE): $(TOP)/tool/showwal.c sqlite3.lo
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/showwal.c sqlite3.lo $(TLIBS)
|
||||
+showwal$(TEXE): $(TOP)/tool/showwal.c
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/showwal.c
|
||||
|
||||
showshm$(TEXE): $(TOP)/tool/showshm.c
|
||||
$(LTLINK) -o $@ $(TOP)/tool/showshm.c
|
||||
|
||||
-changeset$(TEXE): $(TOP)/ext/session/changeset.c sqlite3.lo
|
||||
- $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c sqlite3.lo $(TLIBS)
|
||||
+changeset$(TEXE): $(TOP)/ext/session/changeset.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c libsqlite3.la
|
||||
|
||||
rollback-test$(TEXE): $(TOP)/tool/rollback-test.c sqlite3.lo
|
||||
$(LTLINK) -o $@ $(TOP)/tool/rollback-test.c sqlite3.lo $(TLIBS)
|
||||
@@ -1267,11 +1265,11 @@
|
||||
kvtest$(TEXE): $(TOP)/test/kvtest.c sqlite3.c
|
||||
$(LTLINK) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(TLIBS)
|
||||
|
||||
-rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo
|
||||
- $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.lo $(TLIBS)
|
||||
+rbu$(EXE): $(TOP)/ext/rbu/rbu.c libsqlite3.la
|
||||
+ $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c libsqlite3.la
|
||||
|
||||
-loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
|
||||
- $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS)
|
||||
+loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
|
||||
+ $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@
|
||||
|
||||
# This target will fail if the SQLite amalgamation contains any exported
|
||||
# symbols that do not begin with "sqlite3_". It is run as part of the
|
||||
--- /configure.ac
|
||||
+++ /configure.ac
|
||||
@@ -590,6 +590,9 @@
|
||||
if test "${use_loadextension}" = "yes" ; then
|
||||
OPT_FEATURE_FLAGS=""
|
||||
AC_SEARCH_LIBS(dlopen, dl)
|
||||
+ if test "${ac_cv_search_dlopen}" = "no" ; then
|
||||
+ OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
|
||||
+ fi
|
||||
else
|
||||
OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
|
||||
fi
|
||||
--- /ext/misc/sqlar.c
|
||||
+++ /ext/misc/sqlar.c
|
||||
@@ -14,6 +14,8 @@
|
||||
** for working with sqlar archives and used by the shell tool's built-in
|
||||
** sqlar support.
|
||||
*/
|
||||
+#ifdef SQLITE_HAVE_ZLIB
|
||||
+
|
||||
#include "sqlite3ext.h"
|
||||
SQLITE_EXTENSION_INIT1
|
||||
#include <zlib.h>
|
||||
@@ -119,3 +121,5 @@
|
||||
}
|
||||
return rc;
|
||||
}
|
||||
+
|
||||
+#endif /* SQLITE_HAVE_ZLIB */
|
||||
--- /ext/misc/zipfile.c
|
||||
+++ /ext/misc/zipfile.c
|
||||
@@ -24,6 +24,8 @@
|
||||
** * No support for zip64 extensions
|
||||
** * Only the "inflate/deflate" (zlib) compression method is supported
|
||||
*/
|
||||
+#ifdef SQLITE_HAVE_ZLIB
|
||||
+
|
||||
#include "sqlite3ext.h"
|
||||
SQLITE_EXTENSION_INIT1
|
||||
#include <stdio.h>
|
||||
@@ -1665,3 +1667,5 @@
|
||||
(void)pzErrMsg; /* Unused parameter */
|
||||
return zipfileRegister(db);
|
||||
}
|
||||
+
|
||||
+#endif /* SQLITE_HAVE_ZLIB */
|
||||
--- /ext/repair/sqlite3_checker.c.in
|
||||
+++ /ext/repair/sqlite3_checker.c.in
|
||||
@@ -2,6 +2,7 @@
|
||||
** Read an SQLite database file and analyze its space utilization. Generate
|
||||
** text on standard output.
|
||||
*/
|
||||
+#define SQLITE_CORE 1
|
||||
#define TCLSH_INIT_PROC sqlite3_checker_init_proc
|
||||
#define SQLITE_ENABLE_DBPAGE_VTAB 1
|
||||
#define SQLITE_ENABLE_JSON1 1
|
||||
@@ -14,7 +15,7 @@
|
||||
#define SQLITE_OMIT_SHARED_CACHE 1
|
||||
#define SQLITE_DEFAULT_MEMSTATUS 0
|
||||
#define SQLITE_MAX_EXPR_DEPTH 0
|
||||
-INCLUDE sqlite3.c
|
||||
+#include "sqlite3.h"
|
||||
INCLUDE $ROOT/src/tclsqlite.c
|
||||
INCLUDE $ROOT/ext/misc/btreeinfo.c
|
||||
INCLUDE $ROOT/ext/repair/checkindex.c
|
||||
--- /src/shell.c.in
|
||||
+++ /src/shell.c.in
|
||||
@@ -61,6 +61,7 @@
|
||||
#include <stdio.h>
|
||||
#include <assert.h>
|
||||
#include "sqlite3.h"
|
||||
+#include "ext/expert/sqlite3expert.h"
|
||||
typedef sqlite3_int64 i64;
|
||||
typedef sqlite3_uint64 u64;
|
||||
typedef unsigned char u8;
|
||||
@@ -124,6 +125,10 @@
|
||||
# define SHELL_USE_LOCAL_GETLINE 1
|
||||
#endif
|
||||
|
||||
+#ifdef SQLITE_HAVE_ZLIB
|
||||
+#include <zlib.h>
|
||||
+#endif
|
||||
+
|
||||
|
||||
#if defined(_WIN32) || defined(WIN32)
|
||||
# include <io.h>
|
||||
@@ -963,13 +968,6 @@
|
||||
INCLUDE ../ext/misc/shathree.c
|
||||
INCLUDE ../ext/misc/fileio.c
|
||||
INCLUDE ../ext/misc/completion.c
|
||||
-INCLUDE ../ext/misc/appendvfs.c
|
||||
-#ifdef SQLITE_HAVE_ZLIB
|
||||
-INCLUDE ../ext/misc/zipfile.c
|
||||
-INCLUDE ../ext/misc/sqlar.c
|
||||
-#endif
|
||||
-INCLUDE ../ext/expert/sqlite3expert.h
|
||||
-INCLUDE ../ext/expert/sqlite3expert.c
|
||||
|
||||
#if defined(SQLITE_ENABLE_SESSION)
|
||||
/*
|
||||
@@ -3467,7 +3465,9 @@
|
||||
sqlite3_shathree_init(p->db, 0, 0);
|
||||
sqlite3_completion_init(p->db, 0, 0);
|
||||
#ifdef SQLITE_HAVE_ZLIB
|
||||
+ extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *);
|
||||
sqlite3_zipfile_init(p->db, 0, 0);
|
||||
+ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
|
||||
sqlite3_sqlar_init(p->db, 0, 0);
|
||||
#endif
|
||||
sqlite3_create_function(p->db, "shell_add_schema", 3, SQLITE_UTF8, 0,
|
||||
@@ -5316,6 +5316,7 @@
|
||||
}
|
||||
sqlite3_fileio_init(cmd.db, 0, 0);
|
||||
#ifdef SQLITE_HAVE_ZLIB
|
||||
+ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
|
||||
sqlite3_sqlar_init(cmd.db, 0, 0);
|
||||
#endif
|
||||
sqlite3_create_function(cmd.db, "shell_putsnl", 1, SQLITE_UTF8, cmd.p,
|
||||
@@ -8222,6 +8223,7 @@
|
||||
#endif
|
||||
}
|
||||
data.out = stdout;
|
||||
+ extern int sqlite3_appendvfs_init(sqlite3 *, char **, const sqlite3_api_routines *);
|
||||
sqlite3_appendvfs_init(0,0,0);
|
||||
|
||||
/* Go ahead and open the database file if it already exists. If the
|
||||
--- /tool/mksqlite3c.tcl
|
||||
+++ /tool/mksqlite3c.tcl
|
||||
@@ -116,6 +116,7 @@
|
||||
rtree.h
|
||||
sqlite3session.h
|
||||
sqlite3.h
|
||||
+ sqlite3expert.h
|
||||
sqlite3ext.h
|
||||
sqlite3rbu.h
|
||||
sqliteicu.h
|
||||
@@ -399,6 +400,10 @@
|
||||
json1.c
|
||||
fts5.c
|
||||
stmt.c
|
||||
+ appendvfs.c
|
||||
+ sqlar.c
|
||||
+ sqlite3expert.c
|
||||
+ zipfile.c
|
||||
} {
|
||||
copy_file tsrc/$file
|
||||
}
|
||||
--- /tool/sqlite3_analyzer.c.in
|
||||
+++ /tool/sqlite3_analyzer.c.in
|
||||
@@ -14,9 +14,6 @@
|
||||
#define SQLITE_DEFAULT_MEMSTATUS 0
|
||||
#define SQLITE_MAX_EXPR_DEPTH 0
|
||||
#define SQLITE_OMIT_LOAD_EXTENSION 1
|
||||
-#ifndef USE_EXTERNAL_SQLITE
|
||||
-INCLUDE sqlite3.c
|
||||
-#endif
|
||||
INCLUDE $ROOT/src/tclsqlite.c
|
||||
|
||||
const char *sqlite3_analyzer_init_proc(Tcl_Interp *interp){
|
||||
--- /tool/sqltclsh.c.in
|
||||
+++ /tool/sqltclsh.c.in
|
||||
@@ -27,19 +27,17 @@
|
||||
#define SQLITE_OMIT_SHARED_CACHE 1
|
||||
#define SQLITE_DEFAULT_MEMSTATUS 0
|
||||
#define SQLITE_MAX_EXPR_DEPTH 0
|
||||
-INCLUDE sqlite3.c
|
||||
-INCLUDE $ROOT/ext/misc/appendvfs.c
|
||||
-#ifdef SQLITE_HAVE_ZLIB
|
||||
-INCLUDE $ROOT/ext/misc/zipfile.c
|
||||
-INCLUDE $ROOT/ext/misc/sqlar.c
|
||||
-#endif
|
||||
+#include "sqlite3.h"
|
||||
INCLUDE $ROOT/src/tclsqlite.c
|
||||
|
||||
const char *sqlite3_tclapp_init_proc(Tcl_Interp *interp){
|
||||
(void)interp;
|
||||
+ extern int sqlite3_appendvfs_init(sqlite3 *,char **, const sqlite3_api_routines *);
|
||||
sqlite3_appendvfs_init(0,0,0);
|
||||
#ifdef SQLITE_HAVE_ZLIB
|
||||
+ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
|
||||
sqlite3_auto_extension((void(*)(void))sqlite3_sqlar_init);
|
||||
+ extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *);
|
||||
sqlite3_auto_extension((void(*)(void))sqlite3_zipfile_init);
|
||||
#endif
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
https://sqlite.org/src/info/6185d190e250faae
|
||||
|
||||
--- /src/sqlite3ext.h
|
||||
+++ /src/sqlite3ext.h
|
||||
@@ -563,8 +563,8 @@
|
||||
#define sqlite3_value_pointer sqlite3_api->value_pointer
|
||||
/* Version 3.22.0 and later */
|
||||
#define sqlite3_vtab_nochange sqlite3_api->vtab_nochange
|
||||
-#define sqlite3_value_nochange sqltie3_api->value_nochange
|
||||
-#define sqlite3_vtab_collation sqltie3_api->vtab_collation
|
||||
+#define sqlite3_value_nochange sqlite3_api->value_nochange
|
||||
+#define sqlite3_vtab_collation sqlite3_api->vtab_collation
|
||||
#endif /* !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) */
|
||||
|
||||
#if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION)
|
||||
@ -1,249 +0,0 @@
|
||||
https://sqlite.org/src/info/e4766cabdf64d8e9
|
||||
https://sqlite.org/src/info/d9e59cfb8476e1ec
|
||||
https://sqlite.org/src/info/ba0631de60ca38bf
|
||||
https://sqlite.org/src/info/b685d3231097fb90
|
||||
|
||||
--- /test/fts3rank.test
|
||||
+++ /test/fts3rank.test
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
set testdir [file dirname $argv0]
|
||||
source $testdir/tester.tcl
|
||||
-set testprefix fts3expr5
|
||||
+set testprefix fts3rank
|
||||
|
||||
# If SQLITE_ENABLE_FTS3 is defined, omit this file.
|
||||
ifcapable !fts3 {
|
||||
@@ -56,9 +56,14 @@
|
||||
SELECT * FROM t1 ORDER BY rank(x'0000000000000000') DESC, rowid
|
||||
} {0 {{one two} one {one two} three {one two} two}}
|
||||
|
||||
-do_catchsql_test 1.5 {
|
||||
- SELECT * FROM t1 ORDER BY rank(x'0100000001000000') DESC, rowid
|
||||
-} {1 {invalid matchinfo blob passed to function rank()}}
|
||||
+if {$tcl_platform(byteOrder)=="littleEndian"} {
|
||||
+ do_catchsql_test 1.5le {
|
||||
+ SELECT * FROM t1 ORDER BY rank(x'0100000001000000') DESC, rowid
|
||||
+ } {1 {invalid matchinfo blob passed to function rank()}}
|
||||
+} else {
|
||||
+ do_catchsql_test 1.5be {
|
||||
+ SELECT * FROM t1 ORDER BY rank(x'0000000100000001') DESC, rowid
|
||||
+ } {1 {invalid matchinfo blob passed to function rank()}}
|
||||
+}
|
||||
|
||||
finish_test
|
||||
-
|
||||
--- /test/func6.test
|
||||
+++ /test/func6.test
|
||||
@@ -33,54 +33,125 @@
|
||||
CREATE TABLE t2(x TEXT PRIMARY KEY, y) WITHOUT ROWID;
|
||||
INSERT INTO t2(x,y) SELECT a, b FROM t1;
|
||||
}
|
||||
+
|
||||
+# Load the contents of $file from disk and return it encoded as a hex
|
||||
+# string.
|
||||
+proc loadhex {file} {
|
||||
+ set fd [open $file]
|
||||
+ fconfigure $fd -translation binary -encoding binary
|
||||
+ set data [read $fd]
|
||||
+ close $fd
|
||||
+ binary encode hex $data
|
||||
+}
|
||||
+
|
||||
+# Each argument is either an integer between 0 and 65535, a text value, or
|
||||
+# an empty string representing an SQL NULL. This command builds an SQLite
|
||||
+# record containing the values passed as arguments and returns it encoded
|
||||
+# as a hex string.
|
||||
+proc hexrecord {args} {
|
||||
+ set hdr ""
|
||||
+ set body ""
|
||||
+ foreach x $args {
|
||||
+ if {$x==""} {
|
||||
+ append hdr 00
|
||||
+ } elseif {[string is integer $x]==0} {
|
||||
+ set n [string length $x]
|
||||
+ append hdr [format %02x [expr $n*2 + 13]]
|
||||
+ append body [binary encode hex $x]
|
||||
+ } elseif {$x == 0} {
|
||||
+ append hdr 08
|
||||
+ } elseif {$x == 1} {
|
||||
+ append hdr 09
|
||||
+ } elseif {$x <= 127} {
|
||||
+ append hdr 01
|
||||
+ append body [format %02x $x]
|
||||
+ } else {
|
||||
+ append hdr 02
|
||||
+ append body [format %04x $x]
|
||||
+ }
|
||||
+ }
|
||||
+ set res [format %02x [expr 1 + [string length $hdr]/2]]
|
||||
+ append res $hdr
|
||||
+ append res $body
|
||||
+}
|
||||
+
|
||||
+# Argument $off is an offset into the database image encoded as a hex string
|
||||
+# in argument $hexdb. This command returns 0 if the offset contains the hex
|
||||
+# $hexrec, or throws an exception otherwise.
|
||||
+#
|
||||
+proc offset_contains_record {off hexdb hexrec} {
|
||||
+ set n [string length $hexrec]
|
||||
+ set off [expr $off*2]
|
||||
+ if { [string compare $hexrec [string range $hexdb $off [expr $off+$n-1]]] } {
|
||||
+ error "record not found!"
|
||||
+ }
|
||||
+ return 0
|
||||
+}
|
||||
+
|
||||
+# This command is the implementation of SQL function "offrec()". The first
|
||||
+# argument to this is an offset value. The remaining values are used to
|
||||
+# formulate an SQLite record. If database file test.db does not contain
|
||||
+# an equivalent record at the specified offset, an exception is thrown.
|
||||
+# Otherwise, 0 is returned.
|
||||
+#
|
||||
+proc offrec {args} {
|
||||
+ set offset [lindex $args 0]
|
||||
+ set rec [hexrecord {*}[lrange $args 1 end]]
|
||||
+ offset_contains_record $offset $::F $rec
|
||||
+}
|
||||
+set F [loadhex test.db]
|
||||
+db func offrec offrec
|
||||
+
|
||||
+# Test the sanity of the tests.
|
||||
+do_execsql_test func6-105 {
|
||||
+ SELECT sqlite_offset(d) FROM t1 ORDER BY rowid LIMIT 1;
|
||||
+} {8179}
|
||||
+do_test func6-106 {
|
||||
+ set r [hexrecord abc001 1 999 {}]
|
||||
+ offset_contains_record 8179 $F $r
|
||||
+} 0
|
||||
+
|
||||
+set z100 [string trim [string repeat "0 " 100]]
|
||||
+
|
||||
+# Test offsets within table b-tree t1.
|
||||
do_execsql_test func6-110 {
|
||||
- SELECT a, sqlite_offset(d)/4096 + 1,
|
||||
- sqlite_offset(d)%4096 FROM t1
|
||||
- ORDER BY rowid LIMIT 2;
|
||||
-} {abc001 2 4084 abc002 2 4069}
|
||||
+ SELECT offrec(sqlite_offset(d), a, b, c, d) FROM t1 ORDER BY rowid
|
||||
+} $z100
|
||||
+
|
||||
do_execsql_test func6-120 {
|
||||
SELECT a, typeof(sqlite_offset(+a)) FROM t1
|
||||
ORDER BY rowid LIMIT 2;
|
||||
} {abc001 null abc002 null}
|
||||
+
|
||||
+# Test offsets within index b-tree t1a.
|
||||
do_execsql_test func6-130 {
|
||||
- SELECT a, sqlite_offset(a)/4096+1,
|
||||
- sqlite_offset(a)%4096
|
||||
- FROM t1
|
||||
- ORDER BY a LIMIT 2;
|
||||
-} {abc001 3 4087 abc002 3 4076}
|
||||
+ SELECT offrec(sqlite_offset(a), a, rowid) FROM t1 ORDER BY a
|
||||
+} $z100
|
||||
+
|
||||
+# Test offsets within table b-tree t1 with a temp b-tree ORDER BY.
|
||||
do_execsql_test func6-140 {
|
||||
- SELECT a, sqlite_offset(d)/4096+1,
|
||||
- sqlite_offset(d)%4096
|
||||
- FROM t1
|
||||
- ORDER BY a LIMIT 2;
|
||||
-} {abc001 2 4084 abc002 2 4069}
|
||||
+ SELECT offrec(sqlite_offset(d), a, b, c, d) FROM t1 ORDER BY a
|
||||
+} $z100
|
||||
+
|
||||
+# Test offsets from both index t1a and table t1 in the same query.
|
||||
do_execsql_test func6-150 {
|
||||
- SELECT a,
|
||||
- sqlite_offset(a)/4096+1,
|
||||
- sqlite_offset(a)%4096,
|
||||
- sqlite_offset(d)/4096+1,
|
||||
- sqlite_offset(d)%4096
|
||||
- FROM t1
|
||||
- ORDER BY a LIMIT 2;
|
||||
-} {abc001 3 4087 2 4084 abc002 3 4076 2 4069}
|
||||
-do_execsql_test func6-160 {
|
||||
- SELECT b,
|
||||
- sqlite_offset(b)/4096+1,
|
||||
- sqlite_offset(b)%4096,
|
||||
- sqlite_offset(c)/4096+1,
|
||||
- sqlite_offset(c)%4096,
|
||||
- sqlite_offset(d)/4096+1,
|
||||
- sqlite_offset(d)%4096
|
||||
- FROM t1
|
||||
- ORDER BY b LIMIT 2;
|
||||
-} {1 4 4090 4 4090 2 4084 2 4 4081 4 4081 2 4069}
|
||||
+ SELECT offrec(sqlite_offset(a), a, rowid),
|
||||
+ offrec(sqlite_offset(d), a, b, c, d)
|
||||
+ FROM t1 ORDER BY a
|
||||
+} [concat $z100 $z100]
|
||||
|
||||
+# Test offsets from both index t1bc and table t1 in the same query.
|
||||
+do_execsql_test func6-160 {
|
||||
+ SELECT offrec(sqlite_offset(b), b, c, rowid),
|
||||
+ offrec(sqlite_offset(c), b, c, rowid),
|
||||
+ offrec(sqlite_offset(d), a, b, c, d)
|
||||
+ FROM t1
|
||||
+ ORDER BY b
|
||||
+} [concat $z100 $z100 $z100]
|
||||
|
||||
+# Test offsets in WITHOUT ROWID table t2.
|
||||
do_execsql_test func6-200 {
|
||||
- SELECT y, sqlite_offset(y)/4096+1,
|
||||
- sqlite_offset(y)%4096
|
||||
- FROM t2
|
||||
- ORDER BY x LIMIT 2;
|
||||
-} {1 5 4087 2 5 4076}
|
||||
+ SELECT offrec( sqlite_offset(y), x, y ) FROM t2 ORDER BY x
|
||||
+} $z100
|
||||
|
||||
finish_test
|
||||
--- /test/walro2.test
|
||||
+++ /test/walro2.test
|
||||
@@ -39,6 +39,18 @@
|
||||
}
|
||||
}
|
||||
|
||||
+# Most systems allocate the *-shm file in 32KB trunks. But on UNIX systems
|
||||
+# for which the getpagesize() call returns greater than 32K, the *-shm
|
||||
+# file is allocated in page-sized units (since you cannot mmap part of
|
||||
+# a page). The following code sets variable $MINSHMSZ to the smallest
|
||||
+# possible *-shm file (i.e. the greater of 32KB and the system page-size).
|
||||
+#
|
||||
+do_execsql_test 0.0 {
|
||||
+ PRAGMA journal_mode = wal;
|
||||
+ CREATE TABLE t1(x);
|
||||
+} {wal}
|
||||
+set MINSHMSZ [file size test.db-shm]
|
||||
+
|
||||
foreach bZeroShm {0 1} {
|
||||
set TN [expr $bZeroShm+1]
|
||||
do_multiclient_test tn {
|
||||
@@ -169,7 +181,7 @@
|
||||
} {a b c d e f g h 1 2}
|
||||
do_test $TN.3.2.2 {
|
||||
list [file size test.db-wal] [file size test.db-shm]
|
||||
- } {0 32768}
|
||||
+ } [list 0 $MINSHMSZ]
|
||||
|
||||
do_test $TN.3.3.0 {
|
||||
code2 { sqlite3 db2 test.db }
|
||||
@@ -182,7 +194,7 @@
|
||||
code2 { db2 close }
|
||||
code1 { db close }
|
||||
list [file size test.db-wal] [file size test.db-shm]
|
||||
- } [list [wal_file_size 4 1024] 32768]
|
||||
+ } [list [wal_file_size 4 1024] $MINSHMSZ]
|
||||
do_test $TN.3.3.1 {
|
||||
code1 { sqlite3 db file:test.db?readonly_shm=1 }
|
||||
sql1 { SELECT * FROM t1 }
|
||||
@@ -196,7 +208,7 @@
|
||||
}
|
||||
code2 { db2 close }
|
||||
list [file size test.db-wal] [file size test.db-shm]
|
||||
- } [list [wal_file_size 4 1024] 32768]
|
||||
+ } [list [wal_file_size 4 1024] $MINSHMSZ]
|
||||
do_test $TN.3.3.3 {
|
||||
sql1 { SELECT * FROM t1 }
|
||||
} {i ii}
|
||||
Binary file not shown.
Binary file not shown.
@ -1 +1,2 @@
|
||||
DIST commons-codec-1.11.tar.gz 369538 BLAKE2B 6b77cb3c69c81a9684b298ac5233b788d6651ecc96b70ac7fda9face5af5a60970c5bb2531fd285d20dce7732829f7470b9e4941d63025faf47247410f1ffba2 SHA512 b3159308f28b2fc50208421412d8cc81f439cc07dc3d071df7b50f2d862aab65b3d20bc8eb2906367a05ecf5138c56b5f12c6cf9c224def8b8286fe12ac5346f
|
||||
DIST commons-codec-1.7-src.tar.gz 291251 BLAKE2B b8fecdb9b88a21ceb3106a13332493617ecd2c8064c84a1514dec1c1c254e18116ff4926f7445bef4171000ba77da411efd6a93fe80a4795e887832035373e10 SHA512 31358283ac2827cb05486b8ff1512242153f61deb086f7fe145ee3ca38d96e43fba080a1e89a3b8cd44d09761015ff4dbe5226d29b7f9fcd59e68ca7701b28d6
|
||||
|
||||
@ -0,0 +1,54 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
JAVA_PKG_IUSE="doc source"
|
||||
|
||||
inherit java-pkg-2 java-ant-2
|
||||
|
||||
DESCRIPTION="Implementations of common encoders and decoders in Java"
|
||||
HOMEPAGE="https://commons.apache.org/codec"
|
||||
SRC_URI="mirror://apache/commons/codec/source/${P}-src.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND="
|
||||
>=virtual/jre-1.6"
|
||||
|
||||
DEPEND="
|
||||
>=virtual/jdk-1.6
|
||||
test? (
|
||||
dev-java/ant-junit:0
|
||||
dev-java/junit:4
|
||||
)"
|
||||
|
||||
S="${WORKDIR}/${P}-src"
|
||||
|
||||
JAVA_ANT_ENCODING="ISO-8859-1"
|
||||
EANT_TEST_GENTOO_CLASSPATH="junit-4"
|
||||
|
||||
JAVA_ANT_REWRITE_CLASSPATH="yes"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
DOCS=( RELEASE-NOTES.txt NOTICE.txt )
|
||||
|
||||
src_prepare() {
|
||||
cp "${FILESDIR}/${P}-build.xml" "${S}/build.xml" || die
|
||||
default
|
||||
}
|
||||
|
||||
src_test() {
|
||||
java-pkg-2_src_test
|
||||
}
|
||||
|
||||
src_install() {
|
||||
java-pkg_newjar "target/${P}.jar"
|
||||
|
||||
use doc && java-pkg_dojavadoc target/site/apidocs
|
||||
use source && java-pkg_dosrc src/main/java/*
|
||||
}
|
||||
@ -0,0 +1,200 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
|
||||
<!-- ====================================================================== -->
|
||||
<!-- -->
|
||||
<!-- Any modifications will be overwritten. -->
|
||||
<!-- -->
|
||||
<!-- Generated by Maven Ant Plugin on 5/27/18 9:10 AM -->
|
||||
<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
|
||||
<!-- -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<project name="commons-codec-from-maven" default="package" basedir=".">
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Build environment properties -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<property file="maven-build.properties"/>
|
||||
|
||||
<property name="maven.build.finalName" value="commons-codec-1.11"/>
|
||||
<property name="maven.build.dir" value="target"/>
|
||||
<property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
|
||||
<property name="maven.build.srcDir.0" value="src/main/java"/>
|
||||
<property name="maven.build.resourceDir.0" value="src/main/resources"/>
|
||||
<property name="maven.build.resourceDir.1" value="."/>
|
||||
<property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
|
||||
<property name="maven.build.testDir.0" value="src/test/java"/>
|
||||
<property name="maven.build.testResourceDir.0" value="src/test/resources"/>
|
||||
<property name="maven.build.testResourceDir.1" value="."/>
|
||||
<property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
|
||||
<property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
|
||||
|
||||
<property name="maven.settings.offline" value="false"/>
|
||||
<property name="maven.settings.interactiveMode" value="true"/>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Defining classpaths -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<path id="build.classpath"/>
|
||||
<path id="build.test.classpath">
|
||||
<pathelement location="${maven.repo.local}/junit/junit/4.12/junit-4.12.jar"/>
|
||||
<pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
|
||||
<pathelement location="${maven.repo.local}/org/apache/commons/commons-lang3/3.5/commons-lang3-3.5.jar"/>
|
||||
</path>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Cleaning up target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="clean" description="Clean the output directory">
|
||||
<delete dir="${maven.build.dir}"/>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Compilation target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="compile" description="Compile the code">
|
||||
<mkdir dir="${maven.build.outputDir}"/>
|
||||
<javac destdir="${maven.build.outputDir}"
|
||||
encoding="UTF-8"
|
||||
nowarn="false"
|
||||
debug="true"
|
||||
optimize="false"
|
||||
deprecation="true"
|
||||
target="1.6"
|
||||
verbose="false"
|
||||
fork="false"
|
||||
source="1.6">
|
||||
<src>
|
||||
<pathelement location="${maven.build.srcDir.0}"/>
|
||||
</src>
|
||||
<classpath refid="build.classpath"/>
|
||||
</javac>
|
||||
<copy todir="${maven.build.outputDir}">
|
||||
<fileset dir="${maven.build.resourceDir.0}"/>
|
||||
</copy>
|
||||
<mkdir dir="${maven.build.outputDir}/META-INF"/>
|
||||
<copy todir="${maven.build.outputDir}/META-INF">
|
||||
<fileset dir="${maven.build.resourceDir.1}">
|
||||
<include name="NOTICE.txt"/>
|
||||
<include name="LICENSE.txt"/>
|
||||
</fileset>
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Run all tests -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="test"
|
||||
description="Run the test cases">
|
||||
<mkdir dir="${maven.test.reports}"/>
|
||||
<junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
|
||||
<sysproperty key="basedir" value="."/>
|
||||
<formatter type="xml"/>
|
||||
<formatter type="plain" usefile="false"/>
|
||||
<classpath>
|
||||
<path refid="build.test.classpath"/>
|
||||
<pathelement location="${maven.build.outputDir}"/>
|
||||
<pathelement location="${maven.build.testOutputDir}"/>
|
||||
</classpath>
|
||||
<batchtest todir="${maven.test.reports}" unless="test">
|
||||
<fileset dir="${maven.build.testDir.0}">
|
||||
<include name="**/Test*.java"/>
|
||||
<include name="**/*Test.java"/>
|
||||
<include name="**/*TestCase.java"/>
|
||||
<exclude name="**/*AbstractTest.java"/>
|
||||
<exclude name="**/*PerformanceTest.java"/>
|
||||
</fileset>
|
||||
</batchtest>
|
||||
<batchtest todir="${maven.test.reports}" if="test">
|
||||
<fileset dir="${maven.build.testDir.0}">
|
||||
<include name="**/${test}.java"/>
|
||||
<exclude name="**/*AbstractTest.java"/>
|
||||
<exclude name="**/*PerformanceTest.java"/>
|
||||
</fileset>
|
||||
</batchtest>
|
||||
</junit>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Javadoc target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="javadoc" description="Generates the Javadoc of the application">
|
||||
<javadoc sourcepath="${maven.build.srcDir.0}"
|
||||
packagenames="*"
|
||||
destdir="${maven.reporting.outputDirectory}/apidocs"
|
||||
access="protected"
|
||||
old="false"
|
||||
verbose="false"
|
||||
encoding="UTF-8"
|
||||
version="true"
|
||||
use="true"
|
||||
author="true"
|
||||
splitindex="false"
|
||||
nodeprecated="false"
|
||||
nodeprecatedlist="false"
|
||||
notree="false"
|
||||
noindex="false"
|
||||
nohelp="false"
|
||||
nonavbar="false"
|
||||
serialwarn="false"
|
||||
charset="ISO-8859-1"
|
||||
docencoding="UTF-8"
|
||||
source="1.6"
|
||||
linksource="true"
|
||||
breakiterator="false">
|
||||
<link href="http://docs.oracle.com/javase/7/docs/api/"/>
|
||||
<link href="http://docs.oracle.com/javaee/6/api/"/>
|
||||
</javadoc>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Package target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<!--
|
||||
<target name="package" depends="compile" description="Package the application">
|
||||
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
|
||||
compress="true"
|
||||
index="false"
|
||||
manifest="/var/tmp/portage/dev-java/commons-codec-1.11/work/commons-codec-1.11-src/target/osgi/MANIFEST.MF"
|
||||
basedir="${maven.build.outputDir}"
|
||||
excludes="**/package.html">
|
||||
<manifest>
|
||||
<attribute name="Main-Class"/>
|
||||
</manifest>
|
||||
</jar>
|
||||
</target>
|
||||
-->
|
||||
|
||||
<target name="package" depends="compile" description="Package the application">
|
||||
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
|
||||
compress="true"
|
||||
index="false"
|
||||
basedir="${maven.build.outputDir}"
|
||||
excludes="**/package.html">
|
||||
</jar>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- A dummy target for the package named after the type it creates -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="jar" depends="package" description="Builds the jar for the application"/>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Download dependencies target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
</project>
|
||||
@ -1,3 +1 @@
|
||||
DIST cssparser-0.9.22.jar 245363 BLAKE2B ffe6838f3499d4c44097cbaabc79e2526f2c3052c9bbae4de63668ba3f01a7cffee71dbc230d416d5cd818f679b59205013eddfe79d97c9177276abf4b08f527 SHA512 33dd8906d967bdafeefb6cea9d03fc746cf350102e8e53360284638cdc3d55f254c616d2d3ab5d1849fd92e6924c9751ebff72942f0855b6fdd4ab309a509485
|
||||
DIST cssparser-0.9.23.jar 245655 BLAKE2B dfe78fde6fc706f0bfcb710c6b9dae599156dc819a1c4bf46b22bd2f9affc8da8b2e9ebecbc8e30249a48ff26da7f4c754f9bb869e3e6b7b7c1a5c311a094400 SHA512 a6799156eaa6cbd41b2969ea64fb4bc5105a866a2cdade73bef5e4a3f5b585f7f9cf0cf7f34329ef17f1b258d2d35e675f107bb81b793fdb2edf0c7c9d49da1d
|
||||
DIST cssparser-0.9.24.jar 250147 BLAKE2B bf4948bbfd58863b9bcdb3cb71192f323764f56a14e2384cc0b5d526ef6bf2bf4fce330880aa1bee7ffe45ae576999a98165fcba84e75ef402e3edfd5341e28f SHA512 bf86710473ae256fe8b24a6bf3babbe815fb1373de6acafe2695e09bb2ff11e63ec182d608861d7c7a39574bd00fc8627b48536644cd545ed45ae57e130e4bd3
|
||||
DIST cssparser-0.9.25.jar 256517 BLAKE2B 5281f70dd4e293aaf4aad44efc46107372756b03962057df8701947ec71478c40ace0728099122a0166e902a00075d7d89e6e93b50d8bc16d7f563a3553ad9c2 SHA512 94dffa2ff1edc01c183d2de4f77f106a9409ec5d1e68e9af4f3cd427b76c9d80c942a4d312c3e40ef5c8bd444975eedba173bf0eb730cf517a818dd69421a7bb
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
JAVA_PKG_IUSE="doc source"
|
||||
|
||||
inherit java-pkg-2 java-pkg-simple
|
||||
|
||||
DESCRIPTION="API for parsing CSS 2 in Java"
|
||||
HOMEPAGE="http://cssparser.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${P}-sources.jar -> ${P}.jar"
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
CDEPEND="dev-java/sac:0"
|
||||
|
||||
DEPEND="
|
||||
${CDEPEND}
|
||||
>=virtual/jdk-1.6"
|
||||
|
||||
RDEPEND="
|
||||
${CDEPEND}
|
||||
>=virtual/jre-1.6"
|
||||
|
||||
JAVA_GENTOO_CLASSPATH="sac"
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue