Attachment #80843 for issue #121823

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

Lines 44-50 LIBSERFVERSION=$(SERF_MAJOR).$(SERF_MINOR).$(SERF_MICRO) Link Here

(-)a/ext_libraries/serf/makefile.mk (-1 / +1 lines)
44	TARFILE_NAME=$(PRJNAME)-$(LIBSERFVERSION)	44	TARFILE_NAME=$(PRJNAME)-$(LIBSERFVERSION)
45	# This is the SHA1 checksum, not MD5 but tg_ext.mk does not now about this and,	45	# This is the SHA1 checksum, not MD5 but tg_ext.mk does not now about this and,
46	# thankfully, does not care.	46	# thankfully, does not care.
47	TARFILE_MD5=30b29bd9214d50887abcc20cf82096aaaf5d1d61	47	TARFILE_MD5=f65fbbd72926c8e7cf0dbd4ada03b0d226f461fd
48		48
49	PATCH_FILES=	49	PATCH_FILES=
50		50

Lines 1-11 Link Here

(-)a/ext_libraries/serf/serf-1.2.0.ldl.patch

Lines 1-11 Link Here

(-)a/ext_libraries/serf/serf-1.2.0.libs.patch

Lines 1-27 Link Here

(-)a/ext_libraries/serf/serf-1.2.0.logging.patch

Line 0 Link Here

(-)a/ext_libraries/serf/serf_version.mk (-1 / +4 lines)
		1	--- misc/serf-1.2.1/Makefile.in 2013-06-03 15:21:14.000000000 -0300
Line 0 Link Here
		1	--- misc/serf-1.2.1/configure.in 2013-06-03 14:52:41.000000000 -0300
Line 0 Link Here
		1	--- misc/serf-1.2.1/serf_private.h 2013-06-03 14:22:51.000000000 -0300
Lines 21-24 Link Here
21		21
22	SERF_MAJOR=1	22	SERF_MAJOR=1
23	SERF_MINOR=2	23	SERF_MINOR=2
24	SERF_MICRO=0	24	SERF_MICRO=1




))

$(eval $(call gb_Library_add_cobjects,serf,\
	serf/$(INPATH)/misc/build/serf-1.2.1/auth/auth \
	serf/$(INPATH)/misc/build/serf-1.2.1/auth/auth_basic \
	serf/$(INPATH)/misc/build/serf-1.2.1/auth/auth_digest \
	serf/$(INPATH)/misc/build/serf-1.2.1/auth/auth_kerb \
	serf/$(INPATH)/misc/build/serf-1.2.1/auth/auth_kerb_gss \
	serf/$(INPATH)/misc/build/serf-1.2.1/auth/auth_kerb_sspi \
	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/aggregate_buckets \
	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/allocator \
	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/barrier_buckets \
	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/buckets \
	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/bwtp_buckets \
	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/chunk_buckets \
	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/dechunk_buckets \
	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/deflate_buckets \
	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/file_buckets \
	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/headers_buckets \
	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/iovec_buckets \
	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/limit_buckets \
	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/mmap_buckets \
	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/request_buckets \
	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/response_body_buckets \
	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/response_buckets \
	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/simple_buckets \
	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/socket_buckets \
	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/ssl_buckets \
	serf/$(INPATH)/misc/build/serf-1.2.1/context \
	serf/$(INPATH)/misc/build/serf-1.2.1/incoming \
	serf/$(INPATH)/misc/build/serf-1.2.1/outgoing \
	serf/$(INPATH)/misc/build/serf-1.2.1/ssltunnel \
))

Lines 19-25 Link Here

(-)a/ext_libraries/serf/win/Package_inc.mk (-1 / +1 lines)
19	# *	19	# *
20	# *************************************************************/	20	# *************************************************************/
21		21
22	$(eval $(call gb_Package_Package,serf_inc,$(EXT_LIBRARIES)/serf/$(INPATH)/misc/build/serf-1.2.0))	22	$(eval $(call gb_Package_Package,serf_inc,$(EXT_LIBRARIES)/serf/$(INPATH)/misc/build/serf-1.2.1))
23	$(eval $(call gb_Package_add_files, serf_inc, inc/serf, \	23	$(eval $(call gb_Package_add_files, serf_inc, inc/serf, \
24	serf.h \	24	serf.h \
25	serf_bucket_types.h \	25	serf_bucket_types.h \

Lines 126-134 if ( true ) Link Here

(-)a/main/external_deps.lst (-4 / +3 lines)
126	URL2 = $(OOO_EXTRAS)$(MD5)-$(name)	126	URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
127		127
128	if ( true )	128	if ( true )
129	SHA1 = 30b29bd9214d50887abcc20cf82096aaaf5d1d61	129	SHA1 = f65fbbd72926c8e7cf0dbd4ada03b0d226f461fd
130	name = serf-1.2.0.tar.bz2	130	name = serf-1.2.1.tar.bz2
131	URL1 = http://serf.googlecode.com/files/serf-1.2.0.tar.bz2	131	URL1 = http://serf.googlecode.com/files/serf-1.2.1.tar.bz2
132	URL2 = $(OOO_EXTRAS)$(SHA1)-$(name)	132	URL2 = $(OOO_EXTRAS)$(SHA1)-$(name)
133		133
134	if (SOLAR_JAVA==TRUE && (ENABLE_MEDIAWIKI==YES \|\| ENABLE_REPORTBUILDER==YES))	134	if (SOLAR_JAVA==TRUE && (ENABLE_MEDIAWIKI==YES \|\| ENABLE_REPORTBUILDER==YES))
135	-

Return to issue 121823

Lines 59-91 $(eval $(call gb_Library_add_linked_libs,serf,\ Link Here

(-)a/ext_libraries/serf/win/Library_serf.mk (-29 / +29 lines)
59	))	59	))
60		60
61	$(eval $(call gb_Library_add_cobjects,serf,\	61	$(eval $(call gb_Library_add_cobjects,serf,\
62	serf/$(INPATH)/misc/build/serf-1.2.0/auth/auth \	62	serf/$(INPATH)/misc/build/serf-1.2.1/auth/auth \
63	serf/$(INPATH)/misc/build/serf-1.2.0/auth/auth_basic \	63	serf/$(INPATH)/misc/build/serf-1.2.1/auth/auth_basic \
64	serf/$(INPATH)/misc/build/serf-1.2.0/auth/auth_digest \	64	serf/$(INPATH)/misc/build/serf-1.2.1/auth/auth_digest \
65	serf/$(INPATH)/misc/build/serf-1.2.0/auth/auth_kerb \	65	serf/$(INPATH)/misc/build/serf-1.2.1/auth/auth_kerb \
66	serf/$(INPATH)/misc/build/serf-1.2.0/auth/auth_kerb_gss \	66	serf/$(INPATH)/misc/build/serf-1.2.1/auth/auth_kerb_gss \
67	serf/$(INPATH)/misc/build/serf-1.2.0/auth/auth_kerb_sspi \	67	serf/$(INPATH)/misc/build/serf-1.2.1/auth/auth_kerb_sspi \
68	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/aggregate_buckets \	68	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/aggregate_buckets \
69	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/allocator \	69	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/allocator \
70	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/barrier_buckets \	70	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/barrier_buckets \
71	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/buckets \	71	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/buckets \
72	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/bwtp_buckets \	72	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/bwtp_buckets \
73	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/chunk_buckets \	73	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/chunk_buckets \
74	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/dechunk_buckets \	74	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/dechunk_buckets \
75	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/deflate_buckets \	75	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/deflate_buckets \
76	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/file_buckets \	76	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/file_buckets \
77	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/headers_buckets \	77	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/headers_buckets \
78	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/iovec_buckets \	78	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/iovec_buckets \
79	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/limit_buckets \	79	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/limit_buckets \
80	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/mmap_buckets \	80	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/mmap_buckets \
81	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/request_buckets \	81	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/request_buckets \
82	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/response_body_buckets \	82	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/response_body_buckets \
83	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/response_buckets \	83	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/response_buckets \
84	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/simple_buckets \	84	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/simple_buckets \
85	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/socket_buckets \	85	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/socket_buckets \
86	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/ssl_buckets \	86	serf/$(INPATH)/misc/build/serf-1.2.1/buckets/ssl_buckets \
87	serf/$(INPATH)/misc/build/serf-1.2.0/context \	87	serf/$(INPATH)/misc/build/serf-1.2.1/context \
88	serf/$(INPATH)/misc/build/serf-1.2.0/incoming \	88	serf/$(INPATH)/misc/build/serf-1.2.1/incoming \
89	serf/$(INPATH)/misc/build/serf-1.2.0/outgoing \	89	serf/$(INPATH)/misc/build/serf-1.2.1/outgoing \
90	serf/$(INPATH)/misc/build/serf-1.2.0/ssltunnel \	90	serf/$(INPATH)/misc/build/serf-1.2.1/ssltunnel \
91	))	91	))