Attachment #80961 for issue #121754

View | Details | Raw Unified | Return to issue 121754
Collapse All | Expand All

Lines 60-69 Link Here

(-)external_deps.lst (-3 / +2 lines)
60	URL2 = $(OOO_EXTRAS)$(MD5)-$(name)	60	URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
61		61
62	if (SOLAR_JAVA == TRUE)	62	if (SOLAR_JAVA == TRUE)
63	MD5 = 17410483b5b5f267aa18b7e00b65e6e0	63	MD5 = d54bda6913099b1f1e953f920bf1f5c5
64	name = hsqldb_1_8_0.zip	64	name = hsqldb_1_8_0.zip
65	URL1 = http://sourceforge.net/projects/hsqldb/files/hsqldb/hsqldb_1_8_0/hsqldb_1_8_0_10.zip/download	65	URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
66	URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
67		66
68	if ( true )	67	if ( true )
69	MD5 = 1756c4fa6c616ae15973c104cd8cb256	68	MD5 = 1756c4fa6c616ae15973c104cd8cb256




# --- Files --------------------------------------------------------

TARFILE_NAME=hsqldb_$(HSQLDB_VERSION)
TARFILE_MD5=d54bda6913099b1f1e953f920bf1f5c5

TARFILE_ROOTDIR=hsqldb


			src$/org$/hsqldb$/Library.java

PATCH_FILES=patches$/i96823.patch \
			patches$/i97032.patch
			patches$/i103528.patch \
			patches$/i104901.patch

.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=

Lines 1-27 Link Here

(-)hsqldb/patches/i104901.patch

Lines 1-11 Link Here

(-)hsqldb/patches/i103528.patch (-11 lines)
1	--- misc/hsqldb/src/org/hsqldb/Library.java
2	+++ misc/build/hsqldb/src/org/hsqldb/Library.java
3	@@ -1957,7 +1957,7 @@
4	functionMap.put("bitand", bitand);
5	functionMap.put("bitlength", bitLength);
6	functionMap.put("bitor", bitor);
7	- functionMap.put("bitxor", bitor);
8	+ functionMap.put("bitxor", bitxor);
9	functionMap.put("character", character);
10	functionMap.put("concat", concat);
11	functionMap.put("cot", cot);

Return to issue 121754

Lines 41-47 Link Here

(-)hsqldb/makefile.mk (-4 / +2 lines)
41	# --- Files --------------------------------------------------------	41	# --- Files --------------------------------------------------------
42		42
43	TARFILE_NAME=hsqldb_$(HSQLDB_VERSION)	43	TARFILE_NAME=hsqldb_$(HSQLDB_VERSION)
44	TARFILE_MD5=17410483b5b5f267aa18b7e00b65e6e0	44	TARFILE_MD5=d54bda6913099b1f1e953f920bf1f5c5
45		45
46	TARFILE_ROOTDIR=hsqldb	46	TARFILE_ROOTDIR=hsqldb
47		47
Lines 50-58 Link Here
50	src$/org$/hsqldb$/Library.java	50	src$/org$/hsqldb$/Library.java
51		51
52	PATCH_FILES=patches$/i96823.patch \	52	PATCH_FILES=patches$/i96823.patch \
53	patches$/i97032.patch \	53	patches$/i97032.patch
54	patches$/i103528.patch \
55	patches$/i104901.patch
56		54
57	.IF "$(JAVACISGCJ)"=="yes"	55	.IF "$(JAVACISGCJ)"=="yes"
58	JAVA_HOME=	56	JAVA_HOME=