openpkg
/
openpkg-packages
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

upgrading package: groonga 10.0.6 -> 10.0.7

master
Dr. Ralf S. Engelschall 5 years ago
parent
c203ddd1c1
commit
5f2c685a48
2 changed files with 33 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 58
      groonga/groonga.patch
  2. 4
      groonga/groonga.spec

58
groonga/groonga.patch
Unescape View File

@ -1,7 +1,7 @@
Index: configure
--- configure.orig 2019-04-26 10:31:51.000000000 +0200
+++ configure 2019-04-26 17:23:03.623014000 +0200
@@ -4682,9 +4682,9 @@
--- configure.orig 2020-09-30 02:30:43.000000000 +0200
+++ configure 2020-09-30 09:02:59.218284000 +0200
@@ -4819,9 +4819,9 @@
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
if test "$GCC" = yes; then
@ -13,7 +13,7 @@ Index: configure
fi
else
if test "$GCC" = yes; then
@@ -5838,9 +5838,9 @@
@@ -5975,9 +5975,9 @@
CXXFLAGS=$ac_save_CXXFLAGS
elif test $ac_cv_prog_cxx_g = yes; then
if test "$GXX" = yes; then
@ -25,7 +25,7 @@ Index: configure
fi
else
if test "$GXX" = yes; then
@@ -7075,9 +7075,9 @@
@@ -7214,9 +7214,9 @@
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
if test "$GCC" = yes; then
@ -37,7 +37,7 @@ Index: configure
fi
else
if test "$GCC" = yes; then
@@ -7692,7 +7692,7 @@
@@ -7831,7 +7831,7 @@
NO_STRICT_ALIASING_CFLAGS=""
NO_FLOAT_EQUAL_CFLAGS=""
NO_BAD_FUNCTION_CAST_CFLAGS=""
@ -47,9 +47,9 @@ Index: configure
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if gcc supports -Wall" >&5
Index: lib/ii.c
--- lib/ii.c.orig 2019-04-24 06:50:46.000000000 +0200
+++ lib/ii.c 2019-04-26 17:24:38.488412000 +0200
@@ -2390,7 +2390,7 @@
--- lib/ii.c.orig 2020-09-29 09:16:08.000000000 +0200
+++ lib/ii.c 2020-09-30 09:05:21.643346000 +0200
@@ -2468,7 +2468,7 @@
"<%" GRN_FMT_SIZE ">",
context,
POS_LOFFSET_HEADER);
@ -58,7 +58,7 @@ Index: lib/ii.c
}
if ((POS_LOFFSET_TERM % 4) != 0) {
ERR(GRN_OPERATION_NOT_SUPPORTED,
@@ -2398,10 +2398,10 @@
@@ -2476,10 +2476,10 @@
"<%" GRN_FMT_SIZE ">",
context,
POS_LOFFSET_TERM);
@ -71,8 +71,8 @@ Index: lib/ii.c
}
#define POS_IS_EMBED(pos) ((pos) & 1)
@@ -4632,11 +4632,11 @@
buffer_merge(ctx, ii, lseg, h, sb, sc, db, &dc);
@@ -4882,11 +4882,11 @@
buffer_merge(ctx, ii, lseg, h, sb, sc, db, &dc, &merging_data);
if (ctx->rc == GRN_SUCCESS) {
const uint32_t actual_chunk_size = db->header.chunk_size;
- bool need_chunk_free = true;
@ -85,17 +85,19 @@ Index: lib/ii.c
}
}
if (ctx->rc == GRN_SUCCESS) {
@@ -4649,7 +4649,7 @@
@@ -4899,8 +4899,8 @@
dc = NULL;
buffer_segment_update(ii, lseg, ds);
ii->header.common->total_chunk_size += actual_chunk_size;
- need_chunk_free = false;
- merging_data.succeeded = true;
+ need_chunk_free = GRN_FALSE;
+ merging_data.succeeded = GRN_TRUE;
if (scn != GRN_II_PSEG_NOT_ASSIGNED) {
chunk_free(ctx, ii, scn, 0, sb->header.chunk_size);
chunk_free(ctx, ii, scn, sb->header.chunk_size);
ii->header.common->total_chunk_size -= sb->header.chunk_size;
@@ -5030,11 +5030,11 @@
buffer_merge(ctx, ii, lseg, h, sb, sc, db0, &dc0);
@@ -5284,11 +5284,11 @@
buffer_merge(ctx, ii, lseg, h, sb, sc, db0, &dc0, &merging_data);
if (ctx->rc == GRN_SUCCESS) {
const uint32_t actual_db0_chunk_size = db0->header.chunk_size;
- bool need_db0_chunk_free = false;
@ -108,8 +110,8 @@ Index: lib/ii.c
}
}
if (ctx->rc == GRN_SUCCESS) {
@@ -5049,11 +5049,11 @@
buffer_merge(ctx, ii, lseg, h, sb, sc, db1, &dc1);
@@ -5303,11 +5303,11 @@
buffer_merge(ctx, ii, lseg, h, sb, sc, db1, &dc1, &merging_data);
if (ctx->rc == GRN_SUCCESS) {
const uint32_t actual_db1_chunk_size = db1->header.chunk_size;
- bool need_db1_chunk_free = false;
@ -122,21 +124,23 @@ Index: lib/ii.c
}
}
if (ctx->rc == GRN_SUCCESS) {
@@ -5074,8 +5074,8 @@
@@ -5328,9 +5328,9 @@
ii->header.common->total_chunk_size +=
actual_db0_chunk_size +
actual_db1_chunk_size;
- need_db0_chunk_free = false;
- need_db1_chunk_free = false;
- merging_data.succeeded = true;
+ need_db0_chunk_free = GRN_FALSE;
+ need_db1_chunk_free = GRN_FALSE;
+ merging_data.succeeded = GRN_TRUE;
if (scn != GRN_II_PSEG_NOT_ASSIGNED) {
chunk_free(ctx, ii, scn, 0, sb->header.chunk_size);
chunk_free(ctx, ii, scn, sb->header.chunk_size);
ii->header.common->total_chunk_size -=
Index: src/Makefile.in
--- src/Makefile.in.orig 2019-04-26 10:31:54.000000000 +0200
+++ src/Makefile.in 2019-04-26 17:23:03.627787000 +0200
@@ -546,8 +546,9 @@
--- src/Makefile.in.orig 2020-09-30 02:30:45.000000000 +0200
+++ src/Makefile.in 2020-09-30 09:02:59.220541000 +0200
@@ -561,8 +561,9 @@
nodist_EXTRA_groonga_SOURCES = $(NONEXISTENT_CXX_SOURCE)
groonga_CFLAGS = $(AM_CFLAGS) $(LIBEDIT_CFLAGS)
@ -147,7 +151,7 @@ Index: src/Makefile.in
$(LIBEDIT_LIBS) \
$(MESSAGE_PACK_LIBS)
@@ -555,16 +556,18 @@
@@ -570,16 +571,18 @@
grnslap.c
nodist_EXTRA_grnslap_SOURCES = $(NONEXISTENT_CXX_SOURCE)
@ -169,9 +173,9 @@ Index: src/Makefile.in
grndb_SOURCES = \
Index: src/suggest/Makefile.in
--- src/suggest/Makefile.in.orig 2019-04-26 10:31:54.000000000 +0200
+++ src/suggest/Makefile.in 2019-04-26 17:23:03.628132000 +0200
@@ -547,8 +547,9 @@
--- src/suggest/Makefile.in.orig 2020-09-30 02:30:45.000000000 +0200
+++ src/suggest/Makefile.in 2020-09-30 09:02:59.220739000 +0200
@@ -561,8 +561,9 @@
groonga_suggest_create_dataset_CFLAGS = \
$(AM_CFLAGS)

4
groonga/groonga.spec
Unescape View File

@ -31,8 +31,8 @@ Distribution: OpenPKG Community
Class: EVAL
Group: Database
License: GPL
Version: 10.0.6
Release: 20200830
Version: 10.0.7
Release: 20200930
# package options
%option with_zlib no

Write Preview
Loading…
Cancel
Save