diff options
author | wiz <wiz@pkgsrc.org> | 2009-01-18 17:39:37 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2009-01-18 17:39:37 +0000 |
commit | 9449a7dc56112b14c20cb8448803d46e9e66f4aa (patch) | |
tree | 5c9b68b1d83ca8a1383bc45befd54e2aeef5f011 /misc/fbreader/patches | |
parent | df2cd7dabe864b2bcdbf2a03089e8139677313c1 (diff) | |
download | pkgsrc-9449a7dc56112b14c20cb8448803d46e9e66f4aa.tar.gz |
Initial import of fbreader-0.10.1:
FBReader is an e-book reader for various platforms.
Main features:
* Supported formats are
* fb2 e-book format (style attributes are not supported yet).
* HTML format (tables are not supported).
* CHM format (tables are not supported).
* plucker format (tables are not supported).
* Palmdoc (aportis doc).
* zTxt (Weasel format).
* TCR (psion text) format.
* RTF format (stylesheets and tables are not supported).
* OEB format (css and tables are not supported).
* OpenReader format (css and tables are not supported).
* Non-DRM'ed mobipocket format (tables are not supported).
* Plain text format.
* Direct reading from tar, zip, gzip and bzip2 archives. (Multiple books
in one archive are supported.)
* Automatic library building.
* Automatic language and character encoding detection is supported.
* Automatically generated contents table.
* Embedded images support.
* Footnotes/hyperlinks support.
* Position indicator.
* Keeps the last open book and the last read positions for all opened
books between runs.
* List of last opened books.
* Automatic hyphenations.
* Text search.
* Full-screen mode.
* Screen rotation by 90, 180 and 270 degrees.
Diffstat (limited to 'misc/fbreader/patches')
-rw-r--r-- | misc/fbreader/patches/patch-aa | 40 | ||||
-rw-r--r-- | misc/fbreader/patches/patch-ab | 32 | ||||
-rw-r--r-- | misc/fbreader/patches/patch-ac | 22 | ||||
-rw-r--r-- | misc/fbreader/patches/patch-ad | 22 | ||||
-rw-r--r-- | misc/fbreader/patches/patch-ae | 13 | ||||
-rw-r--r-- | misc/fbreader/patches/patch-af | 13 | ||||
-rw-r--r-- | misc/fbreader/patches/patch-ag | 13 | ||||
-rw-r--r-- | misc/fbreader/patches/patch-ah | 15 | ||||
-rw-r--r-- | misc/fbreader/patches/patch-ai | 12 | ||||
-rw-r--r-- | misc/fbreader/patches/patch-aj | 15 |
10 files changed, 197 insertions, 0 deletions
diff --git a/misc/fbreader/patches/patch-aa b/misc/fbreader/patches/patch-aa new file mode 100644 index 00000000000..3265ddf40de --- /dev/null +++ b/misc/fbreader/patches/patch-aa @@ -0,0 +1,40 @@ +$NetBSD: patch-aa,v 1.1.1.1 2009/01/18 17:39:37 wiz Exp $ + +--- build_packages.sh.orig 2009-01-11 01:44:33.000000000 +0100 ++++ build_packages.sh +@@ -3,7 +3,7 @@ + version=`cat fbreader/VERSION` + tmpdir=fbreader-$version + +-if [ "$1" == "-non-GPL" ]; then ++if [ "$1" = "-non-GPL" ]; then + distdir=distributions-nonGPL + pkgdir=packages-nonGPL + prepare_nonGPL=true +@@ -35,7 +35,7 @@ create_tmpdir() { + rm -rf `find $tmpdir -name ".svn"` + make -C $tmpdir distclean 1> /dev/null 2>&1 + +- if [ "$prepare_nonGPL" == "true" ]; then ++ if [ "$prepare_nonGPL" = "true" ]; then + pushd $tmpdir > /dev/null; + echo -en "Removing Arabic localization... "; + rm -rf fbreader/data/resources/ar.xml zlibrary/core/data/resources/ar.xml fbreader/data/help/MiniHelp.*.ar.fb2; +@@ -114,7 +114,7 @@ build_package() { + esac; + } + +-if [ $1 == all ]; then ++if [ $1 = all ]; then + create_tmpdir + for pkgtype in $distdir/*; do + for archtype in $pkgtype/*; do +@@ -128,7 +128,7 @@ else + pkgtype=`echo $1 | cut -d "-" -f 2`; + extra=`echo $1 | cut -d "-" -f 3`; + +- if [ "$pkgtype" != "" -a "$extra" == "" -a -d $distdir/$pkgtype/$archtype ]; then ++ if [ "$pkgtype" != "" -a "$extra" = "" -a -d $distdir/$pkgtype/$archtype ]; then + create_tmpdir + build_package $archtype $pkgtype + remove_tmpdir diff --git a/misc/fbreader/patches/patch-ab b/misc/fbreader/patches/patch-ab new file mode 100644 index 00000000000..5baba4f4f60 --- /dev/null +++ b/misc/fbreader/patches/patch-ab @@ -0,0 +1,32 @@ +$NetBSD: patch-ab,v 1.1.1.1 2009/01/18 17:39:37 wiz Exp $ + +--- zlibrary/core/src/unix/time/ZLUnixTime.cpp.orig 2008-03-22 13:00:31.000000000 +0000 ++++ zlibrary/core/src/unix/time/ZLUnixTime.cpp +@@ -17,21 +17,21 @@ + * 02110-1301, USA. + */ + +-#include <sys/timeb.h> ++#include <sys/time.h> + #include <time.h> + + #include "ZLUnixTime.h" + + ZLTime ZLUnixTimeManager::currentTime() const { +- struct timeb timeB; +- ftime(&timeB); +- return ZLTime(timeB.time, timeB.millitm); ++ struct timeval timeV; ++ gettimeofday(&timeV, NULL); ++ return ZLTime(timeV.tv_sec, 1000*timeV.tv_usec); + } + + short ZLUnixTimeManager::hoursBySeconds(long seconds) const { +- return localtime(&seconds)->tm_hour; ++ return localtime((time_t*)&seconds)->tm_hour; + } + + short ZLUnixTimeManager::minutesBySeconds(long seconds) const { +- return localtime(&seconds)->tm_min; ++ return localtime((time_t*)&seconds)->tm_min; + } diff --git a/misc/fbreader/patches/patch-ac b/misc/fbreader/patches/patch-ac new file mode 100644 index 00000000000..9940c3a4a6f --- /dev/null +++ b/misc/fbreader/patches/patch-ac @@ -0,0 +1,22 @@ +$NetBSD: patch-ac,v 1.1.1.1 2009/01/18 17:39:37 wiz Exp $ + +--- fbreader/src/formats/fb2/FB2BookReader.cpp.orig 2008-03-22 13:00:31.000000000 +0000 ++++ fbreader/src/formats/fb2/FB2BookReader.cpp +@@ -65,7 +65,7 @@ void FB2BookReader::startElementHandler( + myModelReader.addHyperlinkLabel(id); + } + switch (tag) { +- case _P: ++ case _PP: + if (mySectionStarted) { + mySectionStarted = false; + } else if (myInsideTitle) { +@@ -218,7 +218,7 @@ void FB2BookReader::startElementHandler( + + void FB2BookReader::endElementHandler(int tag) { + switch (tag) { +- case _P: ++ case _PP: + myModelReader.endParagraph(); + break; + case _V: diff --git a/misc/fbreader/patches/patch-ad b/misc/fbreader/patches/patch-ad new file mode 100644 index 00000000000..1e0896a4266 --- /dev/null +++ b/misc/fbreader/patches/patch-ad @@ -0,0 +1,22 @@ +$NetBSD: patch-ad,v 1.1.1.1 2009/01/18 17:39:37 wiz Exp $ + +--- zlibrary/core/src/unix/iconv/IConvEncodingConverter.cpp.orig 2009-01-11 01:44:33.000000000 +0100 ++++ zlibrary/core/src/unix/iconv/IConvEncodingConverter.cpp +@@ -89,7 +89,7 @@ iconvlabel: + #ifdef DO_ICONV_CAST + iconv(myIConverter, (const char**)&in, &inSize, &out, &outSize); + #else // DO_ICONV_CAST +- iconv(myIConverter, &in, &inSize, &out, &outSize); ++ iconv(myIConverter, (const char **)&in, &inSize, &out, &outSize); + #endif // DO_ICONV_CAST + if (inSize != 0) { + if (myBuffer.empty()) { +@@ -132,7 +132,7 @@ bool IConvEncodingConverter::fillTable(i + #ifdef DO_ICONV_CAST + iconv(myIConverter, (const char**)&in, &inSize, &out, &outSize); + #else // DO_ICONV_CAST +- iconv(myIConverter, &in, &inSize, &out, &outSize); ++ iconv(myIConverter, (const char **)&in, &inSize, &out, &outSize); + #endif // DO_ICONV_CAST + if (inSize == 0) { + ZLUnicodeUtil::Ucs4Char ch; diff --git a/misc/fbreader/patches/patch-ae b/misc/fbreader/patches/patch-ae new file mode 100644 index 00000000000..9e3840c1402 --- /dev/null +++ b/misc/fbreader/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.1.1.1 2009/01/18 17:39:37 wiz Exp $ + +--- fbreader/src/formats/fb2/FB2Reader.cpp.orig 2008-03-22 13:00:31.000000000 +0000 ++++ fbreader/src/formats/fb2/FB2Reader.cpp +@@ -31,7 +31,7 @@ void FB2Reader::endElementHandler(const + } + + static const FB2Reader::Tag TAGS[] = { +- {"p", FB2Reader::_P}, ++ {"p", FB2Reader::_PP}, + {"subtitle", FB2Reader::_SUBTITLE}, + {"cite", FB2Reader::_CITE}, + {"text-author", FB2Reader::_TEXT_AUTHOR}, diff --git a/misc/fbreader/patches/patch-af b/misc/fbreader/patches/patch-af new file mode 100644 index 00000000000..4260d1b623d --- /dev/null +++ b/misc/fbreader/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1.1.1 2009/01/18 17:39:37 wiz Exp $ + +--- fbreader/src/formats/fb2/FB2Reader.h.orig 2008-03-22 13:00:31.000000000 +0000 ++++ fbreader/src/formats/fb2/FB2Reader.h +@@ -44,7 +44,7 @@ private: + + public: + enum TagCode { +- _P, ++ _PP, + _SUBTITLE, + _CITE, + _TEXT_AUTHOR, diff --git a/misc/fbreader/patches/patch-ag b/misc/fbreader/patches/patch-ag new file mode 100644 index 00000000000..800200d3228 --- /dev/null +++ b/misc/fbreader/patches/patch-ag @@ -0,0 +1,13 @@ +$NetBSD: patch-ag,v 1.1.1.1 2009/01/18 17:39:37 wiz Exp $ + +--- zlibrary/core/Makefile.orig 2008-03-22 13:00:31.000000000 +0000 ++++ zlibrary/core/Makefile +@@ -44,7 +44,7 @@ $(TARGET): .objects + @echo -n "Creating $@ ..." + @$(RM_QUIET) $(TARGET) + ifeq "$(ZLSHARED)" "yes" +- @$(LD) $(LDFLAGS) -shared -Wl,-soname,$(TARGET_SONAME) -o $(TARGET) -lc $(patsubst %, %/*.o, $(SUBDIRS)) $(XML_LIB) $(ARCHIVER_LIB) -ldl ++ @$(LD) $(LDFLAGS) -shared -Wl,-soname,$(TARGET_SONAME) -o $(TARGET) -lc $(patsubst %, %/*.o, $(SUBDIRS)) $(XML_LIB) $(ARCHIVER_LIB) + @ln -sf $(TARGET) $(TARGET_SONAME) + @ln -sf $(TARGET) $(TARGET_SHORTNAME) + else diff --git a/misc/fbreader/patches/patch-ah b/misc/fbreader/patches/patch-ah new file mode 100644 index 00000000000..56675978fe9 --- /dev/null +++ b/misc/fbreader/patches/patch-ah @@ -0,0 +1,15 @@ +$NetBSD: patch-ah,v 1.1.1.1 2009/01/18 17:39:37 wiz Exp $ + +--- makefiles/config.mk.orig 2009-01-11 01:44:33.000000000 +0100 ++++ makefiles/config.mk +@@ -33,8 +33,8 @@ ZINCLUDE = -I $(ROOTDIR)/zlibrary/core/i + ZLSHARED ?= yes + + ifeq "$(ZLSHARED)" "yes" +- CORE_LIBS = -lm -L$(ROOTDIR)/zlibrary/core -lzlcore $(XML_LIB) $(ARCHIVER_LIB) -ldl +- TEXT_LIBS = -lzltext ++ CORE_LIBS = -lm -L$(ROOTDIR)/zlibrary/core -lzlcore $(XML_LIB) $(ARCHIVER_LIB) ++ TEXT_LIBS = -lzltext -llinebreak + else + CORE_LIBS = -lm -L$(ROOTDIR)/zlibrary/ui -L$(ROOTDIR)/zlibrary/core -lzlcore -lzlui-$(UI_TYPE) -lzlcore $(UILIBS) $(XML_LIB) $(ARCHIVER_LIB) + TEXT_LIBS = -lzltext -llinebreak -lfribidi diff --git a/misc/fbreader/patches/patch-ai b/misc/fbreader/patches/patch-ai new file mode 100644 index 00000000000..c467acf2fc0 --- /dev/null +++ b/misc/fbreader/patches/patch-ai @@ -0,0 +1,12 @@ +$NetBSD: patch-ai,v 1.1.1.1 2009/01/18 17:39:37 wiz Exp $ + +--- makefiles/arch/desktop.mk.orig 2008-03-22 13:00:31.000000000 +0000 ++++ makefiles/arch/desktop.mk +@@ -11,7 +11,6 @@ AR = ar rsu + LD = g++ + + CFLAGS = -pipe -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG +-LDFLAGS = + + ifeq "$(UI_TYPE)" "qt" + MOC = moc-qt3 diff --git a/misc/fbreader/patches/patch-aj b/misc/fbreader/patches/patch-aj new file mode 100644 index 00000000000..bd9748d3c01 --- /dev/null +++ b/misc/fbreader/patches/patch-aj @@ -0,0 +1,15 @@ +$NetBSD: patch-aj,v 1.1.1.1 2009/01/18 17:39:37 wiz Exp $ + +--- fbreader/desktop/Makefile.orig 2008-03-22 13:00:31.000000000 +0000 ++++ fbreader/desktop/Makefile +@@ -6,8 +6,8 @@ TARGET = FBReader + SHARE_FBREADER = $(DESTDIR)$(SHAREDIR)/FBReader + + install: +- @install -d $(DESTDIR)/usr/share/applications +- @install -m 0644 desktop $(DESTDIR)/usr/share/applications/$(TARGET).desktop ++ @install -d $(DESTDIR)${INSTALLDIR}/share/applications ++ @install -m 0644 desktop $(DESTDIR)${INSTALLDIR}/share/applications/$(TARGET).desktop + @install -d $(DESTDIR)$(IMAGEDIR) + @install -m 0644 ../data/icons/application/$(TARGET_ARCH).png $(DESTDIR)$(IMAGEDIR)/FBReader.png + @install -m 0644 ../data/default/config.desktop.xml $(SHARE_FBREADER)/default/config.xml |