- Update to 0.99.4 release

- Fix build with clang/libc++

9 files changed, 81 insertions, 67 deletions

diff --git a/deskutils/fbreader/Makefile b/deskutils/fbreader/Makefile
index cfa25979eeb2..628fdfeb430d 100644
--- a/deskutils/fbreader/Makefile
+++ b/deskutils/fbreader/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	fbreader
-PORTVERSION=	0.12.10
-PORTREVISION=	3
+PORTVERSION=	0.99.4
 DISTVERSIONPREFIX=	sources-
 CATEGORIES=	deskutils
-MASTER_SITES=	http://www.fbreader.org/files/sources/ \
+MASTER_SITES=	http://www.fbreader.org/files/desktop/ \
 		http://old.fbreader.org/
 EXTRACT_SUFX=	.tgz
 
@@ -14,9 +13,9 @@ MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	Powerful e-book reader
 
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
-		expat.6:${PORTSDIR}/textproc/expat2 \
-		fribidi.3:${PORTSDIR}/converters/fribidi \
-		linebreak.2:${PORTSDIR}/textproc/liblinebreak
+		expat:${PORTSDIR}/textproc/expat2 \
+		fribidi:${PORTSDIR}/converters/fribidi \
+		unibreak:${PORTSDIR}/textproc/libunibreak
 
 .if defined(WITH_GTK2)
 UI=		gtk
diff --git a/deskutils/fbreader/distinfo b/deskutils/fbreader/distinfo
index 1811edcb1ccf..7183e357faa8 100644
--- a/deskutils/fbreader/distinfo
+++ b/deskutils/fbreader/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fbreader-sources-0.12.10.tgz) = 328aec454db80e225aa0b5c31adef74bf62a14357482947e87e9731686b3c624
-SIZE (fbreader-sources-0.12.10.tgz) = 2337798
+SHA256 (fbreader-sources-0.99.4.tgz) = 3d7c31d5ea314589d2a963290ad16f4d3d631a41e802b8b39f8be0c9f71eb8e9
+SIZE (fbreader-sources-0.99.4.tgz) = 2345664
diff --git a/deskutils/fbreader/files/patch-fbreader__src__fbreader__FBReaderActions.cpp b/deskutils/fbreader/files/patch-fbreader__src__fbreader__FBReaderActions.cpp
new file mode 100644
index 000000000000..94eac4cac0c0
--- /dev/null
+++ b/deskutils/fbreader/files/patch-fbreader__src__fbreader__FBReaderActions.cpp
@@ -0,0 +1,10 @@
+--- ./fbreader/src/fbreader/FBReaderActions.cpp.orig	2010-04-02 00:14:24.000000000 +1100
++++ ./fbreader/src/fbreader/FBReaderActions.cpp	2013-09-12 00:34:03.722065220 +1100
+@@ -18,6 +18,7 @@
+  */
+ 
+ #include <algorithm>
++#include <cstdlib>
+ 
+ #include <ZLStringUtil.h>
+ #include <ZLDialogManager.h>
diff --git a/deskutils/fbreader/files/patch-fbreader__src__fbreader__FBView.cpp b/deskutils/fbreader/files/patch-fbreader__src__fbreader__FBView.cpp
new file mode 100644
index 000000000000..a62f56f8cb39
--- /dev/null
+++ b/deskutils/fbreader/files/patch-fbreader__src__fbreader__FBView.cpp
@@ -0,0 +1,10 @@
+--- ./fbreader/src/fbreader/FBView.cpp.orig	2010-04-02 00:14:24.000000000 +1100
++++ ./fbreader/src/fbreader/FBView.cpp	2013-09-12 00:33:47.204357243 +1100
+@@ -18,6 +18,7 @@
+  */
+ 
+ #include <cmath>
++#include <cstdlib>
+ #include <algorithm>
+ 
+ #include <ZLUnicodeUtil.h>
diff --git a/deskutils/fbreader/files/patch-fbreader__src__formats__html__HtmlReader.cpp b/deskutils/fbreader/files/patch-fbreader__src__formats__html__HtmlReader.cpp
new file mode 100644
index 000000000000..d673b1ce2abc
--- /dev/null
+++ b/deskutils/fbreader/files/patch-fbreader__src__formats__html__HtmlReader.cpp
@@ -0,0 +1,10 @@
+--- ./fbreader/src/formats/html/HtmlReader.cpp.orig	2010-04-02 00:14:24.000000000 +1100
++++ ./fbreader/src/formats/html/HtmlReader.cpp	2013-09-12 00:31:39.434367202 +1100
+@@ -19,6 +19,7 @@
+ 
+ #include <algorithm>
+ #include <cctype>
++#include <cstdlib>
+ 
+ #include <ZLInputStream.h>
+ #include <ZLXMLReader.h>
diff --git a/deskutils/fbreader/files/patch-fbreader__src__library__Library.cpp b/deskutils/fbreader/files/patch-fbreader__src__library__Library.cpp
deleted file mode 100644
index 414c3741ebed..000000000000
--- a/deskutils/fbreader/files/patch-fbreader__src__library__Library.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./fbreader/src/library/Library.cpp	2010-04-01 15:14:24.000000000 +0200
-+++ ./fbreader/src/library/Library.cpp	2010-04-13 13:34:06.000000000 +0200
-@@ -39,7 +39,7 @@
- shared_ptr<Library> Library::ourInstance;
- const size_t Library::MaxRecentListSize = 10;
- 
--Library::Library &Library::Instance() {
-+Library &Library::Instance() {
- 	if (ourInstance.isNull()) {
- 		ourInstance = new Library();
- 	}
diff --git a/deskutils/fbreader/files/patch-zlibrary__src__text__ZLTextAreaStyle.cpp b/deskutils/fbreader/files/patch-zlibrary__src__text__ZLTextAreaStyle.cpp
new file mode 100644
index 000000000000..efa48872f013
--- /dev/null
+++ b/deskutils/fbreader/files/patch-zlibrary__src__text__ZLTextAreaStyle.cpp
@@ -0,0 +1,10 @@
+--- ./zlibrary/text/src/area/ZLTextAreaStyle.cpp.orig	2010-04-02 00:14:24.000000000 +1100
++++ ./zlibrary/text/src/area/ZLTextAreaStyle.cpp	2013-09-12 00:26:19.181817507 +1100
+@@ -18,6 +18,7 @@
+  */
+ 
+ #include <algorithm>
++#include <cstdlib>
+ 
+ #include <ZLUnicodeUtil.h>
+ #include <ZLPaintContext.h>
diff --git a/deskutils/fbreader/files/patch-zlibrary__src__unix__time__ZLUnixTime.cpp b/deskutils/fbreader/files/patch-zlibrary__src__unix__time__ZLUnixTime.cpp
index d0756a47712c..13b761770d11 100644
--- a/deskutils/fbreader/files/patch-zlibrary__src__unix__time__ZLUnixTime.cpp
+++ b/deskutils/fbreader/files/patch-zlibrary__src__unix__time__ZLUnixTime.cpp
@@ -1,6 +1,6 @@
 --- ./zlibrary/core/src/unix/time/ZLUnixTime.cpp.orig	2010-01-30 04:35:22.000000000 +1000
 +++ ./zlibrary/core/src/unix/time/ZLUnixTime.cpp	2010-02-02 01:23:23.000000000 +1000
-@@ -17,35 +17,39 @@
+@@ -17,17 +17,16 @@
   * 02110-1301, USA.
   */
  
@@ -15,38 +15,10 @@
  ZLTime ZLUnixTimeManager::currentTime() const {
 -	struct timeb timeB;
 -	ftime(&timeB);
--	return ZLTime(timeB.time, timeB.millitm);
+-	return ZLTime((long)timeB.time, timeB.millitm);
 +	struct timeval timeB;
 +	gettimeofday(&timeB,NULL);
-+	return ZLTime(timeB.tv_sec, timeB.tv_usec/1000);
++	return ZLTime((long)timeB.tv_sec, timeB.tv_usec/1000);
  }
  
  short ZLUnixTimeManager::hoursBySeconds(long seconds) const {
--	return localtime(&seconds)->tm_hour;
-+	time_t st = seconds;
-+	return localtime(&st)->tm_hour;
- }
- 
- short ZLUnixTimeManager::minutesBySeconds(long seconds) const {
--	return localtime(&seconds)->tm_min;
-+	time_t st = seconds;
-+	return localtime(&st)->tm_min;
- }
- 
- short ZLUnixTimeManager::yearBySeconds(long seconds) const {
--	return localtime(&seconds)->tm_year + 1900;
-+	time_t st = seconds;
-+	return localtime(&st)->tm_year + 1900;
- }
- 
- short ZLUnixTimeManager::monthBySeconds(long seconds) const {
--	return localtime(&seconds)->tm_mon + 1;
-+	time_t st = seconds;
-+	return localtime(&st)->tm_mon + 1;
- }
- 
- short ZLUnixTimeManager::dayOfMonthBySeconds(long seconds) const {
--	return localtime(&seconds)->tm_mday;
-+	time_t st = seconds;
-+	return localtime(&st)->tm_mday;
- }
diff --git a/deskutils/fbreader/pkg-plist b/deskutils/fbreader/pkg-plist
index 162ab8d95471..2c181243d45d 100644
--- a/deskutils/fbreader/pkg-plist
+++ b/deskutils/fbreader/pkg-plist
@@ -1,9 +1,13 @@
 bin/FBReader
-lib/libzlcore.so.0.13
-lib/libzlcore.so.0.12.10
-lib/libzltext.so.0.13
-lib/libzltext.so.0.12.10
-lib/zlibrary/ui/zlui-%%UI%%.so
+lib/libzlcore.so
+lib/libzlcore.so.0.99
+lib/libzlcore.so.0.99.4
+lib/libzltext.so
+lib/libzltext.so.0.99
+lib/libzltext.so.0.99.4
+lib/libzlui.so
+lib/libzlui.so.0.99
+lib/libzlui.so.0.99.4
 share/FBReader/default/config.xml
 share/FBReader/default/external.xml
 share/FBReader/default/fullscreen_toolbar.xml
@@ -16,12 +20,14 @@ share/FBReader/formats/html/html.ent
 share/FBReader/formats/xhtml/xhtml-lat1.ent
 share/FBReader/formats/xhtml/xhtml-special.ent
 share/FBReader/formats/xhtml/xhtml-symbol.ent
+share/FBReader/help/MiniHelp.bg.fb2
 share/FBReader/help/MiniHelp.cs.fb2
 share/FBReader/help/MiniHelp.de.fb2
 share/FBReader/help/MiniHelp.en.fb2
 share/FBReader/help/MiniHelp.es.fb2
 share/FBReader/help/MiniHelp.fi.fb2
 share/FBReader/help/MiniHelp.fr.fb2
+share/FBReader/help/MiniHelp.he.fb2
 share/FBReader/help/MiniHelp.hu.fb2
 share/FBReader/help/MiniHelp.id.fb2
 share/FBReader/help/MiniHelp.it.fb2
@@ -32,25 +38,22 @@ share/FBReader/help/MiniHelp.sv.fb2
 share/FBReader/help/MiniHelp.uk.fb2
 share/FBReader/help/MiniHelp.vi.fb2
 share/FBReader/help/MiniHelp.zh.fb2
-share/FBReader/network/booksonboard.com.xml
-share/FBReader/network/certificates/litres.ru.crt
-share/FBReader/network/feedbooks.com.xml
-share/FBReader/network/litres.ru.xml
-share/FBReader/network/manybooks.net.xml
-share/FBReader/network/shucang.com.xml
-share/FBReader/network/smashwords.com.xml
 share/FBReader/resources/ar.xml
+share/FBReader/resources/bg.xml
 share/FBReader/resources/cs.xml
 share/FBReader/resources/de.xml
 share/FBReader/resources/en.xml
+share/FBReader/resources/eo.xml
 share/FBReader/resources/es.xml
 share/FBReader/resources/fi.xml
 share/FBReader/resources/fr.xml
+share/FBReader/resources/he.xml
 share/FBReader/resources/hu.xml
 share/FBReader/resources/id.xml
 share/FBReader/resources/it.xml
 share/FBReader/resources/lt.xml
 share/FBReader/resources/nl.xml
+share/FBReader/resources/pl.xml
 share/FBReader/resources/ru.xml
 share/FBReader/resources/sv.xml
 share/FBReader/resources/uk.xml
@@ -60,17 +63,21 @@ share/applications/FBReader.desktop
 share/pixmaps/FBReader.png
 share/pixmaps/FBReader/addBook.png
 share/pixmaps/FBReader/advancedSearchOnNetwork.png
+share/pixmaps/FBReader/back_button.png
+share/pixmaps/FBReader/back_button_disabled.png
 share/pixmaps/FBReader/bookInfo.png
 share/pixmaps/FBReader/booktree-author.png
 share/pixmaps/FBReader/booktree-book.png
+share/pixmaps/FBReader/booktree-catalog.png
 share/pixmaps/FBReader/booktree-tag.png
 share/pixmaps/FBReader/byAuthor.png
 share/pixmaps/FBReader/byTag.png
 share/pixmaps/FBReader/fb2.png
-share/pixmaps/FBReader/feed-litres.png
 share/pixmaps/FBReader/findNext.png
 share/pixmaps/FBReader/findPrevious.png
 share/pixmaps/FBReader/folder.png
+share/pixmaps/FBReader/forward_button.png
+share/pixmaps/FBReader/forward_button_disabled.png
 share/pixmaps/FBReader/gotoHome.png
 share/pixmaps/FBReader/html.png
 share/pixmaps/FBReader/mobipocket.png
@@ -80,15 +87,21 @@ share/pixmaps/FBReader/palm.png
 share/pixmaps/FBReader/plucker.png
 share/pixmaps/FBReader/preferences.png
 share/pixmaps/FBReader/redo.png
+share/pixmaps/FBReader/refresh-icon-1.png
+share/pixmaps/FBReader/refresh-icon-2.png
+share/pixmaps/FBReader/refresh-icon.svg
 share/pixmaps/FBReader/rotate.png
 share/pixmaps/FBReader/rtf.png
 share/pixmaps/FBReader/search.png
+share/pixmaps/FBReader/search_icon.png
 share/pixmaps/FBReader/searchresult.png
 share/pixmaps/FBReader/showHelp.png
 share/pixmaps/FBReader/showLibrary.png
 share/pixmaps/FBReader/showNetLibrary.png
+share/pixmaps/FBReader/showNetworkLibrary.png
 share/pixmaps/FBReader/showReading.png
 share/pixmaps/FBReader/showRecent.png
+share/pixmaps/FBReader/spinner.gif
 share/pixmaps/FBReader/tcr.png
 share/pixmaps/FBReader/toc.png
 share/pixmaps/FBReader/undo.png
@@ -123,33 +136,34 @@ share/zlibrary/hyphenationPatterns.zip
 share/zlibrary/keynames-%%UI%%.xml
 share/zlibrary/languagePatterns.zip
 share/zlibrary/resources/ar.xml
+share/zlibrary/resources/bg.xml
 share/zlibrary/resources/cs.xml
 share/zlibrary/resources/de.xml
 share/zlibrary/resources/en.xml
+share/zlibrary/resources/eo.xml
 share/zlibrary/resources/es.xml
 share/zlibrary/resources/fi.xml
 share/zlibrary/resources/fr.xml
+share/zlibrary/resources/he.xml
 share/zlibrary/resources/hu.xml
 share/zlibrary/resources/id.xml
 share/zlibrary/resources/it.xml
 share/zlibrary/resources/lt.xml
 share/zlibrary/resources/nl.xml
+share/zlibrary/resources/pl.xml
 share/zlibrary/resources/ru.xml
 share/zlibrary/resources/sv.xml
 share/zlibrary/resources/uk.xml
 share/zlibrary/resources/vi.xml
 share/zlibrary/resources/zh.xml
+share/zlibrary/style.qss
 share/zlibrary/unicode.xml.gz
-@dirrm lib/zlibrary/ui
-@dirrm lib/zlibrary
 @dirrm share/FBReader/default
 @dirrm share/FBReader/formats/fb2
 @dirrm share/FBReader/formats/html
 @dirrm share/FBReader/formats/xhtml
 @dirrm share/FBReader/formats
 @dirrm share/FBReader/help
-@dirrm share/FBReader/network/certificates
-@dirrm share/FBReader/network
 @dirrm share/FBReader/resources
 @dirrm share/FBReader
 @dirrm share/pixmaps/FBReader