svn commit: r327228 - in head/deskutils/fbreader: . files
Dima Panov
fluffy at FreeBSD.org
Sat Sep 14 07:02:40 UTC 2013
Author: fluffy
Date: Sat Sep 14 07:02:38 2013
New Revision: 327228
URL: http://svnweb.freebsd.org/changeset/ports/327228
Log:
- Update to 0.99.4 release
- Fix build with clang/libc++
Added:
head/deskutils/fbreader/files/patch-fbreader__src__fbreader__FBReaderActions.cpp (contents, props changed)
head/deskutils/fbreader/files/patch-fbreader__src__fbreader__FBView.cpp (contents, props changed)
head/deskutils/fbreader/files/patch-fbreader__src__formats__html__HtmlReader.cpp (contents, props changed)
head/deskutils/fbreader/files/patch-zlibrary__src__text__ZLTextAreaStyle.cpp (contents, props changed)
Deleted:
head/deskutils/fbreader/files/patch-fbreader__src__library__Library.cpp
Modified:
head/deskutils/fbreader/Makefile
head/deskutils/fbreader/distinfo
head/deskutils/fbreader/files/patch-zlibrary__src__unix__time__ZLUnixTime.cpp
head/deskutils/fbreader/pkg-plist
Modified: head/deskutils/fbreader/Makefile
==============================================================================
--- head/deskutils/fbreader/Makefile Sat Sep 14 06:56:19 2013 (r327227)
+++ head/deskutils/fbreader/Makefile Sat Sep 14 07:02:38 2013 (r327228)
@@ -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 at 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
Modified: head/deskutils/fbreader/distinfo
==============================================================================
--- head/deskutils/fbreader/distinfo Sat Sep 14 06:56:19 2013 (r327227)
+++ head/deskutils/fbreader/distinfo Sat Sep 14 07:02:38 2013 (r327228)
@@ -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
Added: head/deskutils/fbreader/files/patch-fbreader__src__fbreader__FBReaderActions.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/deskutils/fbreader/files/patch-fbreader__src__fbreader__FBReaderActions.cpp Sat Sep 14 07:02:38 2013 (r327228)
@@ -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>
Added: head/deskutils/fbreader/files/patch-fbreader__src__fbreader__FBView.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/deskutils/fbreader/files/patch-fbreader__src__fbreader__FBView.cpp Sat Sep 14 07:02:38 2013 (r327228)
@@ -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>
Added: head/deskutils/fbreader/files/patch-fbreader__src__formats__html__HtmlReader.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/deskutils/fbreader/files/patch-fbreader__src__formats__html__HtmlReader.cpp Sat Sep 14 07:02:38 2013 (r327228)
@@ -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>
Added: head/deskutils/fbreader/files/patch-zlibrary__src__text__ZLTextAreaStyle.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/deskutils/fbreader/files/patch-zlibrary__src__text__ZLTextAreaStyle.cpp Sat Sep 14 07:02:38 2013 (r327228)
@@ -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>
Modified: head/deskutils/fbreader/files/patch-zlibrary__src__unix__time__ZLUnixTime.cpp
==============================================================================
--- head/deskutils/fbreader/files/patch-zlibrary__src__unix__time__ZLUnixTime.cpp Sat Sep 14 06:56:19 2013 (r327227)
+++ head/deskutils/fbreader/files/patch-zlibrary__src__unix__time__ZLUnixTime.cpp Sat Sep 14 07:02:38 2013 (r327228)
@@ -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;
- }
Modified: head/deskutils/fbreader/pkg-plist
==============================================================================
--- head/deskutils/fbreader/pkg-plist Sat Sep 14 06:56:19 2013 (r327227)
+++ head/deskutils/fbreader/pkg-plist Sat Sep 14 07:02:38 2013 (r327228)
@@ -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
- at dirrm lib/zlibrary/ui
- at 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
- at dirrm share/FBReader/network/certificates
- at dirrm share/FBReader/network
@dirrm share/FBReader/resources
@dirrm share/FBReader
@dirrm share/pixmaps/FBReader
More information about the svn-ports-head
mailing list