diff options
| author | hans <hans@pkgsrc.org> | 2011-11-29 15:12:07 +0000 |
|---|---|---|
| committer | hans <hans@pkgsrc.org> | 2011-11-29 15:12:07 +0000 |
| commit | 59c642b4a731a782566e007a8a56fce1de9eb832 (patch) | |
| tree | fea003c4d412999127be2c5bd7ef63445a446303 /comms/libopensync | |
| parent | 69291b7877152dcafbc98275feb021062bff3a91 (diff) | |
| download | pkgsrc-59c642b4a731a782566e007a8a56fce1de9eb832.tar.gz | |
Fix a warnings about assigned but unused variable, which caused the
build to fail.
Diffstat (limited to 'comms/libopensync')
| -rw-r--r-- | comms/libopensync/distinfo | 5 | ||||
| -rw-r--r-- | comms/libopensync/patches/patch-ad | 13 | ||||
| -rw-r--r-- | comms/libopensync/patches/patch-opensync_opensync_time.c | 22 |
3 files changed, 36 insertions, 4 deletions
diff --git a/comms/libopensync/distinfo b/comms/libopensync/distinfo index bae629675ca..855b5e61f1d 100644 --- a/comms/libopensync/distinfo +++ b/comms/libopensync/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2011/07/21 15:35:55 joerg Exp $ +$NetBSD: distinfo,v 1.6 2011/11/29 15:12:07 hans Exp $ SHA1 (libopensync-0.22.tar.bz2) = 47860a8c6621aa89fbff2af2517787747af7cc30 RMD160 (libopensync-0.22.tar.bz2) = a1e9715d037a7c474b80d609e6c96a24cbb6692f @@ -6,6 +6,7 @@ Size (libopensync-0.22.tar.bz2) = 489978 bytes SHA1 (patch-aa) = 4bcf03611850719042bafd794fc413cef159a702 SHA1 (patch-ab) = 057f995d58c98eba96e22671d9c8ee0ec8270b3e SHA1 (patch-ac) = f6a8c12e9344a7f68439b06f8797bfa30106d0e3 -SHA1 (patch-ad) = 2020bdc4d4ed38e25c4376aefc4b81ed00a3a786 +SHA1 (patch-ad) = a9ea7b8d4774fac2a237090b4e7768cf5ec5da27 SHA1 (patch-ae) = 39b5cf27a5b1722f5d8550b97deb1a8763a4ace1 SHA1 (patch-af) = 07666352a1cd68ae00b10fc5eefeb8001673abe7 +SHA1 (patch-opensync_opensync_time.c) = cb6cf27e1ba3fcd6a0cb139759d4da7306817e10 diff --git a/comms/libopensync/patches/patch-ad b/comms/libopensync/patches/patch-ad index 6ad17e5a24a..e3d44fac71b 100644 --- a/comms/libopensync/patches/patch-ad +++ b/comms/libopensync/patches/patch-ad @@ -1,8 +1,17 @@ -$NetBSD: patch-ad,v 1.1 2007/12/11 13:35:37 yyamano Exp $ +$NetBSD: patch-ad,v 1.2 2011/11/29 15:12:08 hans Exp $ --- tools/osynctest.c.orig 2007-03-27 20:49:19.000000000 +0900 +++ tools/osynctest.c -@@ -212,7 +212,7 @@ void modify_data(OSyncMember *member, co +@@ -81,8 +81,6 @@ double writetime; + double _second() /* note that some compilers like AIX xlf do not require the trailing '_' */ + { + struct timeval tp; +- int rtn; +- rtn=gettimeofday(&tp, NULL); + + return ((double)tp.tv_sec+(1.e-6)*tp.tv_usec); + } +@@ -212,7 +210,7 @@ void modify_data(OSyncMember *member, co const char *de = NULL; while ((de = g_dir_read_name(dir))) { diff --git a/comms/libopensync/patches/patch-opensync_opensync_time.c b/comms/libopensync/patches/patch-opensync_opensync_time.c new file mode 100644 index 00000000000..d655a8057e3 --- /dev/null +++ b/comms/libopensync/patches/patch-opensync_opensync_time.c @@ -0,0 +1,22 @@ +$NetBSD: patch-opensync_opensync_time.c,v 1.1 2011/11/29 15:12:08 hans Exp $ + +--- opensync/opensync_time.c.orig 2007-03-27 13:49:18.000000000 +0200 ++++ opensync/opensync_time.c 2011-11-28 20:41:03.626682362 +0100 +@@ -889,16 +889,13 @@ osync_bool osync_time_isdst(const char * + osync_trace(TRACE_ENTRY, "%s(%s, %p)", __func__, vtime, tzid); + + int year; +- char *newyear = NULL; +- time_t newyear_t, timestamp; ++ time_t timestamp; + struct tm *std_changetime, *dst_changetime; + time_t dstStamp, stdStamp; + xmlNode *current = NULL; + + sscanf(vtime, "%4d%*2d%*2dT%*2d%*d%*2d%*c", &year); + +- newyear = g_strdup_printf("%4d0101T000000", year); +- newyear_t = osync_time_vtime2unix(newyear, 0); + timestamp = osync_time_vtime2unix(vtime, 0); + + /* Handle XML Timezone field */ |