Sat Dec 3 09:06:37 2016 UTC ()
fbreader: include <sys/time.h> for gettimeofday. this is needed by
linux.

fix PR pkg/51684


(maya)
diff -r1.11 -r1.12 pkgsrc/misc/fbreader/distinfo
diff -r1.3 -r1.4 pkgsrc/misc/fbreader/patches/patch-ab
cvs diff -r1.11 -r1.12 pkgsrc/misc/fbreader/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/fbreader/distinfo 2015/11/03 23:49:35 1.11
+++ pkgsrc/misc/fbreader/distinfo 2016/12/03 09:06:37 1.12
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: distinfo,v 1.11 2015/11/03 23:49:35 agc Exp $ 1$NetBSD: distinfo,v 1.12 2016/12/03 09:06:37 maya Exp $
2 2
3SHA1 (fbreader-sources-0.99.4.tgz) = 7e6f0acbac5d8111fcda14a576ae4fdc93eef292 3SHA1 (fbreader-sources-0.99.4.tgz) = 7e6f0acbac5d8111fcda14a576ae4fdc93eef292
4RMD160 (fbreader-sources-0.99.4.tgz) = 90825fcb6b026785dd3a7329899b54a02b08e4ed 4RMD160 (fbreader-sources-0.99.4.tgz) = 90825fcb6b026785dd3a7329899b54a02b08e4ed
5SHA512 (fbreader-sources-0.99.4.tgz) = d4b11d7ab03df002ad4212db805b10b80a24ea4384e92122b12c25a3f817a0eb343509ae30e31d68417fd4ce27f77e043235436f0081ff2c785a2830d6211dc7 5SHA512 (fbreader-sources-0.99.4.tgz) = d4b11d7ab03df002ad4212db805b10b80a24ea4384e92122b12c25a3f817a0eb343509ae30e31d68417fd4ce27f77e043235436f0081ff2c785a2830d6211dc7
6Size (fbreader-sources-0.99.4.tgz) = 2345664 bytes 6Size (fbreader-sources-0.99.4.tgz) = 2345664 bytes
7SHA1 (patch-ab) = 4fcbbc7c9fe7fe2e9d841d226ba69624e36e08a5 7SHA1 (patch-ab) = a23a87f2ea3e44471d93c83cdb9e65a5840e38f5
8SHA1 (patch-ah) = 8b30ee01cdb05d1680ce45cb57ba37011c33fa6c 8SHA1 (patch-ah) = 8b30ee01cdb05d1680ce45cb57ba37011c33fa6c
9SHA1 (patch-ai) = a8f5a4e181fd34840d18d39fc9f7bf17a9e053d0 9SHA1 (patch-ai) = a8f5a4e181fd34840d18d39fc9f7bf17a9e053d0
10SHA1 (patch-fbreader_Makefile) = b34214a6a725527f312969c12f3c79fcda193233 10SHA1 (patch-fbreader_Makefile) = b34214a6a725527f312969c12f3c79fcda193233
11SHA1 (patch-fbreader_src_fbreader_FBReaderActions.cpp) = ac2d5937d3628abd6db2e4b2fe869d95262d2689 11SHA1 (patch-fbreader_src_fbreader_FBReaderActions.cpp) = ac2d5937d3628abd6db2e4b2fe869d95262d2689
12SHA1 (patch-fbreader_src_fbreader_FBView.cpp) = f9018b813b92d31c67e13eb68d6e50c8a7637a5c 12SHA1 (patch-fbreader_src_fbreader_FBView.cpp) = f9018b813b92d31c67e13eb68d6e50c8a7637a5c
13SHA1 (patch-fbreader_src_formats_html_HtmlReader.cpp) = fe0ebe4dff97a11581a6d7b079f8f19f4e3be019 13SHA1 (patch-fbreader_src_formats_html_HtmlReader.cpp) = fe0ebe4dff97a11581a6d7b079f8f19f4e3be019
14SHA1 (patch-makefiles_qsubdir.mk) = a139410def61e793b193cb54716b9ffb339b5692 14SHA1 (patch-makefiles_qsubdir.mk) = a139410def61e793b193cb54716b9ffb339b5692
15SHA1 (patch-makefiles_subdir.mk) = b9c7d0339e86b9cd6010d4156f35233320a14436 15SHA1 (patch-makefiles_subdir.mk) = b9c7d0339e86b9cd6010d4156f35233320a14436
16SHA1 (patch-zlibrary_core_Makefile) = 141543c94a63f9c56858c43f07892e05b060bf01 16SHA1 (patch-zlibrary_core_Makefile) = 141543c94a63f9c56858c43f07892e05b060bf01
17SHA1 (patch-zlibrary_text_Makefile) = aa7d8a7e3d170e903af704edafe49297e158fd51 17SHA1 (patch-zlibrary_text_Makefile) = aa7d8a7e3d170e903af704edafe49297e158fd51
18SHA1 (patch-zlibrary_text_src_area_ZLTextAreaStyle.cpp) = ec87bd8072c2385df6e224c7cb1a914bef595f78 18SHA1 (patch-zlibrary_text_src_area_ZLTextAreaStyle.cpp) = ec87bd8072c2385df6e224c7cb1a914bef595f78
19SHA1 (patch-zlibrary_ui_Makefile) = 9586070b53f415ec757fb6648c66c36684e801ea 19SHA1 (patch-zlibrary_ui_Makefile) = 9586070b53f415ec757fb6648c66c36684e801ea
cvs diff -r1.3 -r1.4 pkgsrc/misc/fbreader/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/misc/fbreader/patches/patch-ab 2012/10/01 12:47:30 1.3
+++ pkgsrc/misc/fbreader/patches/patch-ab 2016/12/03 09:06:37 1.4
@@ -1,27 +1,29 @@ @@ -1,27 +1,29 @@
1$NetBSD: patch-ab,v 1.3 2012/10/01 12:47:30 wiz Exp $ 1$NetBSD: patch-ab,v 1.4 2016/12/03 09:06:37 maya Exp $
2 2
3Avoid ancient function that needs libcompat. 3Avoid ancient function that needs libcompat.
 4include sys/time.h for gettimeofday (needed by linux)
4 5
5--- zlibrary/core/src/unix/time/ZLUnixTime.cpp.orig 2012-09-06 20:58:48.000000000 +0000 6--- zlibrary/core/src/unix/time/ZLUnixTime.cpp.orig 2012-11-30 12:41:25.000000000 +0000
6+++ zlibrary/core/src/unix/time/ZLUnixTime.cpp 7+++ zlibrary/core/src/unix/time/ZLUnixTime.cpp
7@@ -17,7 +17,6 @@ 8@@ -17,17 +17,17 @@
8 * 02110-1301, USA. 9 * 02110-1301, USA.
9 */ 10 */
10  11
11-#include <sys/timeb.h> 12-#include <sys/timeb.h>
12 #include <time.h> 13 #include <time.h>
 14+#include <sys/time.h>
13  15
14 #include <ZLTime.h> 16 #include <ZLTime.h>
15@@ -25,9 +24,9 @@ 17
16 #include "ZLUnixTime.h" 18 #include "ZLUnixTime.h"
17  19
18 ZLTime ZLUnixTimeManager::currentTime() const { 20 ZLTime ZLUnixTimeManager::currentTime() const {
19- struct timeb timeB; 21- struct timeb timeB;
20- ftime(&timeB); 22- ftime(&timeB);
21- return ZLTime((long)timeB.time, timeB.millitm); 23- return ZLTime((long)timeB.time, timeB.millitm);
22+ struct timeval timeB; 24+ struct timeval timeB;
23+ gettimeofday(&timeB,NULL); 25+ gettimeofday(&timeB,NULL);
24+ return ZLTime(timeB.tv_sec, timeB.tv_usec/1000); 26+ return ZLTime(timeB.tv_sec, timeB.tv_usec/1000);
25 } 27 }
26  28
27 short ZLUnixTimeManager::hoursBySeconds(long seconds) const { 29 short ZLUnixTimeManager::hoursBySeconds(long seconds) const {