@@ -, +, @@ --- ext_libraries/serf/makefile.mk | 2 +- ext_libraries/serf/serf-1.2.0.ldl.patch | 11 ------ ext_libraries/serf/serf-1.2.0.libs.patch | 11 ------ ext_libraries/serf/serf-1.2.0.logging.patch | 27 -------------- ext_libraries/serf/serf-1.2.1.ldl.patch | 11 ++++++ ext_libraries/serf/serf-1.2.1.libs.patch | 11 ++++++ ext_libraries/serf/serf-1.2.1.logging.patch | 27 ++++++++++++++ ext_libraries/serf/serf_version.mk | 2 +- ext_libraries/serf/win/Library_serf.mk | 58 ++++++++++++++--------------- ext_libraries/serf/win/Package_inc.mk | 2 +- main/external_deps.lst | 6 +-- 11 files changed, 84 insertions(+), 84 deletions(-) delete mode 100644 ext_libraries/serf/serf-1.2.0.ldl.patch delete mode 100644 ext_libraries/serf/serf-1.2.0.libs.patch delete mode 100644 ext_libraries/serf/serf-1.2.0.logging.patch create mode 100644 ext_libraries/serf/serf-1.2.1.ldl.patch create mode 100644 ext_libraries/serf/serf-1.2.1.libs.patch create mode 100644 ext_libraries/serf/serf-1.2.1.logging.patch --- a/ext_libraries/serf/makefile.mk +++ a/ext_libraries/serf/makefile.mk @@ -44,7 +44,7 @@ LIBSERFVERSION=$(SERF_MAJOR).$(SERF_MINOR).$(SERF_MICRO) TARFILE_NAME=$(PRJNAME)-$(LIBSERFVERSION) # This is the SHA1 checksum, not MD5 but tg_ext.mk does not now about this and, # thankfully, does not care. -TARFILE_MD5=30b29bd9214d50887abcc20cf82096aaaf5d1d61 +TARFILE_MD5=f65fbbd72926c8e7cf0dbd4ada03b0d226f461fd PATCH_FILES= --- a/ext_libraries/serf/serf-1.2.0.ldl.patch +++ a/ext_libraries/serf/serf-1.2.0.ldl.patch @@ -1,11 +0,0 @@ --- a/ext_libraries/serf/serf-1.2.0.libs.patch 2012-12-13 16:43:09.000000000 -0300 +++ a/ext_libraries/serf/serf-1.2.0.libs.patch @@ -1,11 +0,0 @@ --- a/ext_libraries/serf/serf-1.2.0.logging.patch 2012-12-08 16:45:28.000000000 -0300 +++ a/ext_libraries/serf/serf-1.2.0.logging.patch @@ -1,27 +0,0 @@ --- a/ext_libraries/serf/serf-1.2.1.ldl.patch 2012-11-09 12:31:43.000000000 -0300 +++ a/ext_libraries/serf/serf-1.2.1.ldl.patch @@ -0,0 +1,11 @@ +--- misc/serf-1.2.1/Makefile.in 2013-06-03 15:21:14.000000000 -0300 @@ -0,0 +1,11 @@ +--- misc/serf-1.2.1/configure.in 2013-06-03 14:52:41.000000000 -0300 @@ -0,0 +1,27 @@ +--- misc/serf-1.2.1/serf_private.h 2013-06-03 14:22:51.000000000 -0300 @@ -21,4 +21,4 @@ SERF_MAJOR=1 SERF_MINOR=2 -SERF_MICRO=0 +SERF_MICRO=1 --- a/ext_libraries/serf/win/Library_serf.mk +++ a/ext_libraries/serf/win/Library_serf.mk @@ -59,33 +59,33 @@ $(eval $(call gb_Library_add_linked_libs,serf,\ )) $(eval $(call gb_Library_add_cobjects,serf,\ - serf/$(INPATH)/misc/build/serf-1.2.0/auth/auth \ - serf/$(INPATH)/misc/build/serf-1.2.0/auth/auth_basic \ - serf/$(INPATH)/misc/build/serf-1.2.0/auth/auth_digest \ - serf/$(INPATH)/misc/build/serf-1.2.0/auth/auth_kerb \ - serf/$(INPATH)/misc/build/serf-1.2.0/auth/auth_kerb_gss \ - serf/$(INPATH)/misc/build/serf-1.2.0/auth/auth_kerb_sspi \ - serf/$(INPATH)/misc/build/serf-1.2.0/buckets/aggregate_buckets \ - serf/$(INPATH)/misc/build/serf-1.2.0/buckets/allocator \ - serf/$(INPATH)/misc/build/serf-1.2.0/buckets/barrier_buckets \ - serf/$(INPATH)/misc/build/serf-1.2.0/buckets/buckets \ - serf/$(INPATH)/misc/build/serf-1.2.0/buckets/bwtp_buckets \ - serf/$(INPATH)/misc/build/serf-1.2.0/buckets/chunk_buckets \ - serf/$(INPATH)/misc/build/serf-1.2.0/buckets/dechunk_buckets \ - serf/$(INPATH)/misc/build/serf-1.2.0/buckets/deflate_buckets \ - serf/$(INPATH)/misc/build/serf-1.2.0/buckets/file_buckets \ - serf/$(INPATH)/misc/build/serf-1.2.0/buckets/headers_buckets \ - serf/$(INPATH)/misc/build/serf-1.2.0/buckets/iovec_buckets \ - serf/$(INPATH)/misc/build/serf-1.2.0/buckets/limit_buckets \ - serf/$(INPATH)/misc/build/serf-1.2.0/buckets/mmap_buckets \ - serf/$(INPATH)/misc/build/serf-1.2.0/buckets/request_buckets \ - serf/$(INPATH)/misc/build/serf-1.2.0/buckets/response_body_buckets \ - serf/$(INPATH)/misc/build/serf-1.2.0/buckets/response_buckets \ - serf/$(INPATH)/misc/build/serf-1.2.0/buckets/simple_buckets \ - serf/$(INPATH)/misc/build/serf-1.2.0/buckets/socket_buckets \ - serf/$(INPATH)/misc/build/serf-1.2.0/buckets/ssl_buckets \ - serf/$(INPATH)/misc/build/serf-1.2.0/context \ - serf/$(INPATH)/misc/build/serf-1.2.0/incoming \ - serf/$(INPATH)/misc/build/serf-1.2.0/outgoing \ - serf/$(INPATH)/misc/build/serf-1.2.0/ssltunnel \ + 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 \ )) --- a/ext_libraries/serf/win/Package_inc.mk +++ a/ext_libraries/serf/win/Package_inc.mk @@ -19,7 +19,7 @@ # * # *************************************************************/ -$(eval $(call gb_Package_Package,serf_inc,$(EXT_LIBRARIES)/serf/$(INPATH)/misc/build/serf-1.2.0)) +$(eval $(call gb_Package_Package,serf_inc,$(EXT_LIBRARIES)/serf/$(INPATH)/misc/build/serf-1.2.1)) $(eval $(call gb_Package_add_files, serf_inc, inc/serf, \ serf.h \ serf_bucket_types.h \ --- a/main/external_deps.lst +++ a/main/external_deps.lst @@ -126,9 +126,9 @@ if ( true ) URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if ( true ) - SHA1 = 30b29bd9214d50887abcc20cf82096aaaf5d1d61 - name = serf-1.2.0.tar.bz2 - URL1 = http://serf.googlecode.com/files/serf-1.2.0.tar.bz2 + SHA1 = f65fbbd72926c8e7cf0dbd4ada03b0d226f461fd + name = serf-1.2.1.tar.bz2 + URL1 = http://serf.googlecode.com/files/serf-1.2.1.tar.bz2 URL2 = $(OOO_EXTRAS)$(SHA1)-$(name) if (SOLAR_JAVA==TRUE && (ENABLE_MEDIAWIKI==YES || ENABLE_REPORTBUILDER==YES)) --