#!/bin/sh
# This is a shell archive
echo x fbreader
mkdir -p fbreader > /dev/null 2>&1
echo x fbreader/files
mkdir -p fbreader/files > /dev/null 2>&1
echo x fbreader/Makefile
sed 's/^X//' > fbreader/Makefile << 'SHAR_END'
X# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
X# $FreeBSD: head/deskutils/fbreader/Makefile 495881 2019-03-16 15:13:52Z tcberner $
X
XPORTNAME=	fbreader
XPORTVERSION=	0.99.6
XDISTVERSIONSUFFIX=	-freebsdport
XPORTREVISION=	5
XCATEGORIES=	deskutils
XPKGNAMESUFFIX=	-${FLAVOR}
X
XMAINTAINER=	johannes@perceivon.net
XCOMMENT=	Powerful e-book reader
X
XLICENSE=	GPLv2+
X
XLIB_DEPENDS=	libcurl.so:ftp/curl \
X		libexpat.so:textproc/expat2 \
X		libfribidi.so:converters/fribidi \
X		libunibreak.so:textproc/libunibreak
X
XFLAVORS=	qt gtk2
XFLAVOR?=	${FLAVORS:[1]}
X
XUSES=		compiler gmake iconv localbase pkgconfig sqlite
XUSE_LDCONFIG=	yes
X
Xgtk2_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
X			libfreetype.so:print/freetype2 \
X			libpng16.so:graphics/png
X
XUSE_GITHUB=	yes
XGH_ACCOUNT=	geometer
XGH_PROJECT=	FBReader
X
X.if defined(WITH_DEBUG)
XSTATUS=		debug
X.else
XSTATUS=		release
X.endif
X
XINSTALL_TARGET=	do_install
X
XMAKE_ENV+=	TARGET_ARCH=desktop TARGET_STATUS=${STATUS} \
X		ROOTDIR=${WRKSRC} INSTALLDIR=${PREFIX} LIBDIR=${PREFIX}/lib \
X		LD="${CXX}"
XMAKE_ARGS+=	MAKE=${MAKE_CMD} LIBDIR=${PREFIX}/lib
X
Xgtk2_CONFLICTS=	${PORTNAME} ${PORTNAME}-qt
Xqt_CONFLICTS=	${PORTNAME} ${PORTNAME}-gtk2
X
X.if ${FLAVOR} == gtk2
XMAKE_ENV+=	UI_TYPE=gtk
XUSES+=	gnome jpeg
XUSE_GNOME=	gtk20 cairo gdkpixbuf2
XPLIST_SUB=	UITYPE=gtk
X.else
XUSES+=	qt:5
XUSE_QT=	core gui widgets qmake_build buildtools_build
XMAKE_ENV+=	UI_TYPE=qt4
XPLIST_SUB=	UITYPE=qt4
X.endif
X
Xpost-patch:
X	@${REINPLACE_CMD} -e '/^CC/d;/^LD/d;/QTINCLUDE/s,-I.*$$,-I${QT_INCDIR},' \
X		${WRKSRC}/makefiles/arch/desktop.mk
X	@${REINPLACE_CMD} -e 's,-O3,,;s,-ldl,${ICONV_LIB},' \
X		${WRKSRC}/makefiles/config.mk ${WRKSRC}/zlibrary/core/Makefile
X	@${REINPLACE_CMD} -e 's/-llinebreak/-lunibreak/g' ${WRKSRC}/zlibrary/text/Makefile
X	@${REINPLACE_CMD} -e 's/-llinebreak/-lunibreak/g' ${WRKSRC}/makefiles/*.mk
X	@${REINPLACE_CMD} -e 's,/usr,${PREFIX},' ${WRKSRC}/fbreader/desktop/Makefile
X	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} \
X		-e 's,make ,$$(MAKE) ,' -e '/$$(LDFLAGS)/s/$$/ $$(LIBS)/'
X
Xpre-configure:
X# This cannot be done in post-patch because build dependencies are installed
X# after patching and they can pull in libiconv which can affect CFLAGS in
X# Mk/Uses/iconv.mk.
X	@${REINPLACE_CMD} 's|^CFLAGS =.*$$|CFLAGS = ${CFLAGS}|' \
X		${WRKSRC}/makefiles/arch/desktop.mk
X
X.include <bsd.port.mk>
SHAR_END
echo x fbreader/pkg-plist
sed 's/^X//' > fbreader/pkg-plist << 'SHAR_END'
Xbin/FBReader
Xlib/libzlcore.so.0.14
Xlib/libzlcore.so.0.14.0
Xlib/libzltext.so.0.14
Xlib/libzltext.so.0.14.0
Xshare/FBReader/default/config.xml
Xshare/FBReader/default/external.xml
Xshare/FBReader/default/fullscreen_toolbar.xml
Xshare/FBReader/default/keymap.xml
Xshare/FBReader/default/styles.xml
Xshare/FBReader/default/toolbar.xml
Xshare/FBReader/formats/fb2/FBReaderVersion.ent
Xshare/FBReader/formats/fb2/fb2genres.xml
Xshare/FBReader/formats/html/html.ent
Xshare/FBReader/formats/xhtml/xhtml-lat1.ent
Xshare/FBReader/formats/xhtml/xhtml-special.ent
Xshare/FBReader/formats/xhtml/xhtml-symbol.ent
Xshare/FBReader/network/booksonboard.com.xml
Xshare/FBReader/network/certificates/litres.ru.crt
Xshare/FBReader/network/feedbooks.com.xml
Xshare/FBReader/network/litres.ru.xml
Xshare/FBReader/network/manybooks.net.xml
Xshare/FBReader/network/shucang.com.xml
Xshare/FBReader/network/smashwords.com.xml
Xshare/FBReader/help/MiniHelp.bg.fb2
Xshare/FBReader/help/MiniHelp.cs.fb2
Xshare/FBReader/help/MiniHelp.de.fb2
Xshare/FBReader/help/MiniHelp.en.fb2
Xshare/FBReader/help/MiniHelp.es.fb2
Xshare/FBReader/help/MiniHelp.fi.fb2
Xshare/FBReader/help/MiniHelp.fr.fb2
Xshare/FBReader/help/MiniHelp.hu.fb2
Xshare/FBReader/help/MiniHelp.id.fb2
Xshare/FBReader/help/MiniHelp.it.fb2
Xshare/FBReader/help/MiniHelp.lt.fb2
Xshare/FBReader/help/MiniHelp.nl.fb2
Xshare/FBReader/help/MiniHelp.ru.fb2
Xshare/FBReader/help/MiniHelp.sv.fb2
Xshare/FBReader/help/MiniHelp.uk.fb2
Xshare/FBReader/help/MiniHelp.vi.fb2
Xshare/FBReader/help/MiniHelp.zh.fb2
Xshare/FBReader/resources/ar.xml
Xshare/FBReader/resources/bg.xml
Xshare/FBReader/resources/cs.xml
Xshare/FBReader/resources/de.xml
Xshare/FBReader/resources/en.xml
Xshare/FBReader/resources/eo.xml
Xshare/FBReader/resources/es.xml
Xshare/FBReader/resources/fi.xml
Xshare/FBReader/resources/fr.xml
Xshare/FBReader/resources/hu.xml
Xshare/FBReader/resources/id.xml
Xshare/FBReader/resources/it.xml
Xshare/FBReader/resources/lt.xml
Xshare/FBReader/resources/nl.xml
Xshare/FBReader/resources/pl.xml
Xshare/FBReader/resources/ru.xml
Xshare/FBReader/resources/sv.xml
Xshare/FBReader/resources/uk.xml
Xshare/FBReader/resources/vi.xml
Xshare/FBReader/resources/zh.xml
Xshare/applications/FBReader.desktop
Xshare/pixmaps/FBReader.png
Xshare/pixmaps/FBReader/addBook.png
Xshare/pixmaps/FBReader/advancedSearchOnNetwork.png
Xshare/pixmaps/FBReader/bookInfo.png
Xshare/pixmaps/FBReader/booktree-author.png
Xshare/pixmaps/FBReader/booktree-book.png
Xshare/pixmaps/FBReader/booktree-tag.png
Xshare/pixmaps/FBReader/byAuthor.png
Xshare/pixmaps/FBReader/byTag.png
Xshare/pixmaps/FBReader/fb2.png
Xshare/pixmaps/FBReader/findNext.png
Xshare/pixmaps/FBReader/findPrevious.png
Xshare/pixmaps/FBReader/folder.png
Xshare/pixmaps/FBReader/gotoHome.png
Xshare/pixmaps/FBReader/html.png
Xshare/pixmaps/FBReader/mobipocket.png
Xshare/pixmaps/FBReader/oeb.png
Xshare/pixmaps/FBReader/openreader.png
Xshare/pixmaps/FBReader/palm.png
Xshare/pixmaps/FBReader/plucker.png
Xshare/pixmaps/FBReader/preferences.png
Xshare/pixmaps/FBReader/redo.png
Xshare/pixmaps/FBReader/rotate.png
Xshare/pixmaps/FBReader/rtf.png
Xshare/pixmaps/FBReader/search.png
Xshare/pixmaps/FBReader/searchresult.png
Xshare/pixmaps/FBReader/showHelp.png
Xshare/pixmaps/FBReader/showLibrary.png
Xshare/pixmaps/FBReader/showNetLibrary.png
Xshare/pixmaps/FBReader/showReading.png
Xshare/pixmaps/FBReader/showRecent.png
Xshare/pixmaps/FBReader/tcr.png
Xshare/pixmaps/FBReader/toc.png
Xshare/pixmaps/FBReader/undo.png
Xshare/pixmaps/FBReader/unknown.png
Xshare/pixmaps/FBReader/upfolder.png
Xshare/pixmaps/FBReader/weasel.png
Xshare/pixmaps/FBReader/zipfolder.png
Xlib/zlibrary/ui/zlui-%%UITYPE%%.so
Xshare/zlibrary/default/config.xml
Xshare/zlibrary/encodings/Big5
Xshare/zlibrary/encodings/Encodings.xml
Xshare/zlibrary/encodings/GBK
Xshare/zlibrary/encodings/IBM866
Xshare/zlibrary/encodings/ISO-8859-1
Xshare/zlibrary/encodings/ISO-8859-10
Xshare/zlibrary/encodings/ISO-8859-11
Xshare/zlibrary/encodings/ISO-8859-13
Xshare/zlibrary/encodings/ISO-8859-14
Xshare/zlibrary/encodings/ISO-8859-15
Xshare/zlibrary/encodings/ISO-8859-16
Xshare/zlibrary/encodings/ISO-8859-2
Xshare/zlibrary/encodings/ISO-8859-3
Xshare/zlibrary/encodings/ISO-8859-4
Xshare/zlibrary/encodings/ISO-8859-5
Xshare/zlibrary/encodings/ISO-8859-6
Xshare/zlibrary/encodings/ISO-8859-7
Xshare/zlibrary/encodings/ISO-8859-8
Xshare/zlibrary/encodings/ISO-8859-9
Xshare/zlibrary/encodings/KOI8-R
Xshare/zlibrary/encodings/windows-1251
Xshare/zlibrary/encodings/windows-1252
Xshare/zlibrary/hyphenationPatterns.zip
Xshare/zlibrary/keynames-%%UITYPE%%.xml
Xshare/zlibrary/languagePatterns.zip
Xshare/zlibrary/resources/ar.xml
Xshare/zlibrary/resources/bg.xml
Xshare/zlibrary/resources/cs.xml
Xshare/zlibrary/resources/de.xml
Xshare/zlibrary/resources/en.xml
Xshare/zlibrary/resources/eo.xml
Xshare/zlibrary/resources/es.xml
Xshare/zlibrary/resources/fi.xml
Xshare/zlibrary/resources/fr.xml
Xshare/zlibrary/resources/hu.xml
Xshare/zlibrary/resources/id.xml
Xshare/zlibrary/resources/it.xml
Xshare/zlibrary/resources/lt.xml
Xshare/zlibrary/resources/nl.xml
Xshare/zlibrary/resources/pl.xml
Xshare/zlibrary/resources/ru.xml
Xshare/zlibrary/resources/sv.xml
Xshare/zlibrary/resources/uk.xml
Xshare/zlibrary/resources/vi.xml
Xshare/zlibrary/resources/zh.xml
Xshare/zlibrary/unicode.xml.gz
SHAR_END
echo x fbreader/distinfo
sed 's/^X//' > fbreader/distinfo << 'SHAR_END'
XSHA256 (geometer-FBReader-0.99.6-freebsdport_GH0.tar.gz) = 2be23f2c823f91aa015b9d5bedeaef914924c39d2f1bcb3ee5133b610ab5c13d
XSIZE (geometer-FBReader-0.99.6-freebsdport_GH0.tar.gz) = 24850408
SHAR_END
echo x fbreader/pkg-descr
sed 's/^X//' > fbreader/pkg-descr << 'SHAR_END'
XFBReader is a book reader. Main features:
X* Supported formats: fb2, HTML, CHM, plucker, Palmdoc, zTxt, TCR, RTF,
X  OEB, OpenReader, mobipocket, plain text.
X* Direct reading from tar, zip, gzip and bzip2 archives.
X* Supported encodings: utf-8, us-ascii, windows-1251, windows-1252,
X  koi8-r, ibm866, iso-8859-*, Big5, GBK.
X* Automatically generated contents table.
X* Embedded images support.
X* Footnotes/hyperlinks support.
X* Position indicator.
X* Keeps the last open book and the last read positions for all opened
X  books between runs.
X* List of last opened books.
X* Automatic hyphenations. Liang's algorithm is used. Patterns for Czech,
X  English, Esperanto, French, German and Russian are included in the
X  current version.
X* Text search.
X* Full-screen mode.
X* Screen rotation by 90, 180 and 270 degrees.
X
XWWW: http://www.fbreader.org/
SHAR_END
echo x fbreader/files/patch-qt5support
sed 's/^X//' > fbreader/files/patch-qt5support << 'SHAR_END'
X--- zlibrary/ui/src/qt4/application/LineEditParameter.cpp.orig	2014-01-11 12:45:25 UTC
X+++ zlibrary/ui/src/qt4/application/LineEditParameter.cpp
X@@ -17,9 +17,16 @@
X  * 02110-1301, USA.
X  */
X 
X+#include <QtCore/QtGlobal>
X+#if QT_VERSION >= 0x050000
X+#include <QtWidgets/QBoxLayout>
X+#include <QtWidgets/QLineEdit>
X+#include <QtWidgets/QToolBar>
X+#else
X #include <QtGui/QBoxLayout>
X #include <QtGui/QLineEdit>
X #include <QtGui/QToolBar>
X+#endif
X #include <QtGui/QKeyEvent>
X 
X #include "ZLQtApplicationWindow.h"
X--- zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp.orig	2014-01-11 12:45:25 UTC
X+++ zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp
X@@ -17,17 +17,28 @@
X  * 02110-1301, USA.
X  */
X 
X+#include <QtCore/QtGlobal>
X+#if QT_VERSION >= 0x050000
X+#include <QtWidgets/QApplication>
X+#include <QtWidgets/QToolBar>
X+#include <QtWidgets/QMenuBar>
X+#include <QtWidgets/QMenu>
X+#include <QtWidgets/QToolButton>
X+#include <QtWidgets/QLayout>
X+#include <QtWidgets/QDockWidget>
X+#else
X #include <QtGui/QApplication>
X-#include <QtGui/QPixmap>
X-#include <QtGui/QImage>
X-#include <QtGui/QIcon>
X #include <QtGui/QToolBar>
X #include <QtGui/QMenuBar>
X #include <QtGui/QMenu>
X #include <QtGui/QToolButton>
X #include <QtGui/QLayout>
X-#include <QtGui/QWheelEvent>
X #include <QtGui/QDockWidget>
X+#endif
X+#include <QtGui/QPixmap>
X+#include <QtGui/QImage>
X+#include <QtGui/QIcon>
X+#include <QtGui/QWheelEvent>
X #include <QtCore/QObjectList>
X 
X #include <ZLibrary.h>
X--- zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h.orig	2014-01-11 12:45:25 UTC
X+++ zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h
X@@ -22,8 +22,14 @@
X 
X #include <map>
X 
X+#include <QtCore/QtGlobal>
X+#if QT_VERSION >= 0x050000
X+#include <QtWidgets/QMainWindow>
X+#include <QtWidgets/QAction>
X+#else
X #include <QtGui/QMainWindow>
X #include <QtGui/QAction>
X+#endif
X #include <QtGui/QCursor>
X 
X class QDockWidget;
X--- zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp.orig	2014-01-11 12:45:25 UTC
X+++ zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp
X@@ -17,8 +17,14 @@
X  * 02110-1301, USA.
X  */
X 
X+#include <QtCore/QtGlobal>
X+#if QT_VERSION >= 0x050000
X+#include <QtWidgets/QApplication>
X+#include <QtWidgets/QPushButton>
X+#else
X #include <QtGui/QApplication>
X #include <QtGui/QPushButton>
X+#endif
X 
X #include <ZLDialogManager.h>
X 
X--- zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h.orig	2014-01-11 12:45:25 UTC
X+++ zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h
X@@ -20,8 +20,14 @@
X #ifndef __ZLQTDIALOG_H__
X #define __ZLQTDIALOG_H__
X 
X+#include <QtCore/QtGlobal>
X+#if QT_VERSION >= 0x050000
X+#include <QtWidgets/QDialog>
X+#include <QtWidgets/QLayout>
X+#else
X #include <QtGui/QDialog>
X #include <QtGui/QLayout>
X+#endif
X 
X #include <ZLDialog.h>
X 
X--- zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp.orig	2014-01-11 12:45:25 UTC
X+++ zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp
X@@ -17,10 +17,18 @@
X  * 02110-1301, USA.
X  */
X 
X+#include <QtCore/QtGlobal>
X+#if QT_VERSION >= 0x050000
X+#include <QtWidgets/QApplication>
X+#include <QtWidgets/QDesktopWidget>
X+#include <QtWidgets/QWidget>
X+#include <QtWidgets/QLayout>
X+#else
X #include <QtGui/QApplication>
X #include <QtGui/QDesktopWidget>
X #include <QtGui/QWidget>
X #include <QtGui/QLayout>
X+#endif
X 
X #include "ZLQtDialogContent.h"
X #include "ZLQtOptionView.h"
X--- zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp.orig	2014-01-11 12:45:25 UTC
X+++ zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp
X@@ -17,11 +17,19 @@
X  * 02110-1301, USA.
X  */
X 
X+#include <QtCore/QtGlobal>
X+#if QT_VERSION >= 0x050000
X+#include <QtWidgets/QApplication>
X+#include <QtWidgets/QMessageBox>
X+#include <QtWidgets/QFileDialog>
X+#include <QtWidgets/QDesktopWidget>
X+#else
X #include <QtGui/QApplication>
X #include <QtGui/QMessageBox>
X #include <QtGui/QFileDialog>
X-#include <QtGui/QClipboard>
X #include <QtGui/QDesktopWidget>
X+#endif
X+#include <QtGui/QClipboard>
X 
X #include "ZLQtDialogManager.h"
X #include "ZLQtDialog.h"
X--- zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp.orig	2014-01-11 12:45:25 UTC
X+++ zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp
X@@ -17,7 +17,12 @@
X  * 02110-1301, USA.
X  */
X 
X+#include <QtCore/QtGlobal>
X+#if QT_VERSION >= 0x050000
X+#include <QtWidgets/QFileDialog>
X+#else
X #include <QtGui/QFileDialog>
X+#endif
X 
X #include "ZLQtOpenFileDialog.h"
X 
X--- zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp.orig	2014-01-11 12:45:25 UTC
X+++ zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp
X@@ -19,6 +19,19 @@
X 
X #include <cctype>
X 
X+#include <QtCore/QtGlobal>
X+#if QT_VERSION >= 0x050000
X+#include <QtWidgets/QCheckBox>
X+#include <QtWidgets/QComboBox>
X+#include <QtWidgets/QLabel>
X+#include <QtWidgets/QGroupBox>
X+#include <QtWidgets/QRadioButton>
X+#include <QtWidgets/QPushButton>
X+#include <QtWidgets/QSpinBox>
X+#include <QtWidgets/QLineEdit>
X+#include <QtWidgets/QSlider>
X+#include <QtWidgets/QLayout>
X+#else
X #include <QtGui/QCheckBox>
X #include <QtGui/QComboBox>
X #include <QtGui/QLabel>
X@@ -29,6 +42,7 @@
X #include <QtGui/QLineEdit>
X #include <QtGui/QSlider>
X #include <QtGui/QLayout>
X+#endif
X 
X #include <ZLStringUtil.h>
X #include <ZLDialogManager.h>
X--- zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp.orig	2014-01-11 12:45:25 UTC
X+++ zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp
X@@ -17,11 +17,20 @@
X  * 02110-1301, USA.
X  */
X 
X+#include <QtCore/QtGlobal>
X+#if QT_VERSION >= 0x050000
X+#include <QtWidgets/QApplication>
X+#include <QtWidgets/QDesktopWidget>
X+#include <QtWidgets/QLayout>
X+#include <QtWidgets/QPushButton>
X+#include <QtWidgets/QButtonGroup>
X+#else
X #include <QtGui/QApplication>
X #include <QtGui/QDesktopWidget>
X #include <QtGui/QLayout>
X #include <QtGui/QPushButton>
X #include <QtGui/QButtonGroup>
X+#endif
X #include <QtGui/QResizeEvent>
X 
X #include <ZLDialogManager.h>
X--- zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h.orig	2014-01-11 12:45:25 UTC
X+++ zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h
X@@ -20,9 +20,16 @@
X #ifndef __ZLQTOPTIONSDIALOG_H__
X #define __ZLQTOPTIONSDIALOG_H__
X 
X+#include <QtCore/QtGlobal>
X+#if QT_VERSION >= 0x050000
X+#include <QtWidgets/QWidget>
X+#include <QtWidgets/QTabWidget>
X+#include <QtWidgets/QDialog>
X+#else
X #include <QtGui/QWidget>
X #include <QtGui/QTabWidget>
X #include <QtGui/QDialog>
X+#endif
X 
X #include "../../../../core/src/desktop/dialogs/ZLDesktopOptionsDialog.h"
X 
X--- zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp.orig	2014-01-11 12:45:25 UTC
X+++ zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp
X@@ -19,12 +19,21 @@
X 
X #include <unistd.h>
X 
X+#include <QtCore/QtGlobal>
X+#if QT_VERSION >= 0x050000
X+#include <QtWidgets/QApplication>
X+#include <QtWidgets/QDesktopWidget>
X+#include <QtWidgets/QWidget>
X+#include <QtWidgets/QLabel>
X+#include <QtWidgets/QLayout>
X+#else
X #include <QtGui/QApplication>
X-#include <QtGui/QCursor>
X #include <QtGui/QDesktopWidget>
X #include <QtGui/QWidget>
X #include <QtGui/QLabel>
X #include <QtGui/QLayout>
X+#endif
X+#include <QtGui/QCursor>
X 
X #include "ZLQtProgressDialog.h"
X #include "ZLQtUtil.h"
X--- zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h.orig	2014-01-11 12:45:25 UTC
X+++ zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h
X@@ -22,7 +22,12 @@
X 
X #include <string>
X 
X+#include <QtCore/QtGlobal>
X+#if QT_VERSION >= 0x050000
X+#include <QtWidgets/QWidget>
X+#else
X #include <QtGui/QWidget>
X+#endif
X #include <QtGui/QCursor>
X 
X #include <ZLProgressDialog.h>
X--- zlibrary/ui/src/qt4/library/ZLibrary.cpp.orig	2014-01-11 12:45:25 UTC
X+++ zlibrary/ui/src/qt4/library/ZLibrary.cpp
X@@ -17,7 +17,12 @@
X  * 02110-1301, USA.
X  */
X 
X+#include <QtCore/QtGlobal>
X+#if QT_VERSION >= 0x050000
X+#include <QtWidgets/QApplication>
X+#else
X #include <QtGui/QApplication>
X+#endif
X 
X #include <ZLApplication.h>
X #include <ZLibrary.h>
X--- zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp.orig	2014-01-11 12:45:25 UTC
X+++ zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp
X@@ -19,8 +19,14 @@
X 
X #include <algorithm>
X 
X+#include <QtCore/QtGlobal>
X+#if QT_VERSION >= 0x050000
X+#include <QtWidgets/QLayout>
X+#include <QtWidgets/QScrollBar>
X+#else
X #include <QtGui/QLayout>
X #include <QtGui/QScrollBar>
X+#endif
X #include <QtGui/QPainter>
X #include <QtGui/QPixmap>
X #include <QtGui/QMouseEvent>
X@@ -184,11 +190,35 @@ void ZLQtViewWidget::repaint()	{
X 
X void ZLQtViewWidget::setScrollbarEnabled(ZLView::Direction direction, bool enabled) {
X 	if (direction == ZLView::VERTICAL) {
X-		myRightScrollBar->setShown(enabled && myShowScrollBarAtRight);
X-		myLeftScrollBar->setShown(enabled && !myShowScrollBarAtRight);
X+		myRightScrollBar->
X+#if QT_VERSION >= 0x050000
X+			setVisible
X+#else
X+			setShown
X+#endif
X+			(enabled && myShowScrollBarAtRight);
X+		myLeftScrollBar->
X+#if QT_VERSION >= 0x050000
X+			setVisible
X+#else
X+			setShown
X+#endif
X+			(enabled && !myShowScrollBarAtRight);
X 	} else {
X-		myBottomScrollBar->setShown(enabled && myShowScrollBarAtBottom);
X-		myTopScrollBar->setShown(enabled && !myShowScrollBarAtBottom);
X+		myBottomScrollBar->
X+#if QT_VERSION >= 0x050000
X+			setVisible
X+#else
X+			setShown
X+#endif
X+			(enabled && myShowScrollBarAtBottom);
X+		myTopScrollBar->
X+#if QT_VERSION >= 0x050000
X+			setVisible
X+#else
X+			setShown
X+#endif
X+			(enabled && !myShowScrollBarAtBottom);
X 	}
X }
X 
X--- zlibrary/ui/src/qt4/view/ZLQtViewWidget.h.orig	2014-01-11 12:45:25 UTC
X+++ zlibrary/ui/src/qt4/view/ZLQtViewWidget.h
X@@ -20,7 +20,12 @@
X #ifndef __ZLQTVIEWWIDGET_H__
X #define __ZLQTVIEWWIDGET_H__
X 
X+#include <QtCore/QtGlobal>
X+#if QT_VERSION >= 0x050000
X+#include <QtWidgets/QWidget>
X+#else
X #include <QtGui/QWidget>
X+#endif
X 
X #include "../../../../core/src/view/ZLViewWidget.h"
X #include <ZLApplication.h>
SHAR_END
echo x fbreader/files/patch-fbreader_src_database_booksdb_BooksDB.cpp
sed 's/^X//' > fbreader/files/patch-fbreader_src_database_booksdb_BooksDB.cpp << 'SHAR_END'
XBooksDB.cpp:148:10: error: no viable conversion from returned value of type 'bool' to function return type 'shared_ptr<Book>'
X                return false;
X                       ^~~~~
X/wrkdirs/usr/ports/deskutils/fbreader/work/FBReader-0.99.6-freebsdport/fbreader/../zlibrary/core/include/shared_ptr.h:57:3: note: candidate constructor not viable: no known conversion from 'bool' to 'Book *' for 1st argument
X                shared_ptr(T *t);
X                ^
X/wrkdirs/usr/ports/deskutils/fbreader/work/FBReader-0.99.6-freebsdport/fbreader/../zlibrary/core/include/shared_ptr.h:58:3: note: candidate constructor not viable: no known conversion from 'bool' to 'const shared_ptr<Book> &' for 1st argument
X                shared_ptr(const shared_ptr<T> &t);
X                ^
X/wrkdirs/usr/ports/deskutils/fbreader/work/FBReader-0.99.6-freebsdport/fbreader/../zlibrary/core/include/shared_ptr.h:59:3: note: candidate constructor not viable: no known conversion from 'bool' to 'const weak_ptr<Book> &' for 1st argument
X                shared_ptr(const weak_ptr<T> &t);
X                ^
X1 error generated.
X
X--- fbreader/src/database/booksdb/BooksDB.cpp.orig	2014-01-11 12:45:25 UTC
X+++ fbreader/src/database/booksdb/BooksDB.cpp
X@@ -145,7 +145,7 @@ shared_ptr<Book> BooksDB::loadBook(const std::string &
X 
X 	myFindFileId->setFileName(fileName);
X 	if (!myFindFileId->run()) {
X-		return false;
X+		return 0;
X 	}
X 	((DBIntValue&)*myLoadBook->parameter("@file_id").value()) = myFindFileId->fileId();
X 	shared_ptr<DBDataReader> reader = myLoadBook->executeReader();
SHAR_END
echo x fbreader/files/patch-makefiles_arch_desktop.mk
sed 's/^X//' > fbreader/files/patch-makefiles_arch_desktop.mk << 'SHAR_END'
X--- makefiles/arch/desktop.mk.orig	2014-01-11 12:45:25 UTC
X+++ makefiles/arch/desktop.mk
X@@ -14,7 +14,7 @@ endif
X   MOC = moc-qt3
X   QTINCLUDE = -I /usr/include/qt3
X else
X-  MOC = moc-qt4
X+  MOC = moc
X   QTINCLUDE = -I /usr/include/qt4
X endif
X 
X@@ -28,7 +25,7 @@ ifeq "$(UI_TYPE)" "qt"
X endif
X 
X ifeq "$(UI_TYPE)" "qt4"
X-  UILIBS = -lQtGui
X+  UILIBS = $(shell pkg-config --libs Qt5Widgets)
X endif
X 
X ifeq "$(UI_TYPE)" "gtk"
SHAR_END
echo x fbreader/files/patch-fbreader__src__fbreader__FBReaderActions.cpp
sed 's/^X//' > fbreader/files/patch-fbreader__src__fbreader__FBReaderActions.cpp << 'SHAR_END'
X--- fbreader/src/fbreader/FBReaderActions.cpp.orig	2014-01-11 12:45:25 UTC
X+++ fbreader/src/fbreader/FBReaderActions.cpp
X@@ -18,6 +18,7 @@
X  */
X 
X #include <algorithm>
X+#include <cstdlib>
X 
X #include <ZLStringUtil.h>
X #include <ZLDialogManager.h>
SHAR_END
echo x fbreader/files/patch-fbreader__src__fbreader__FBView.cpp
sed 's/^X//' > fbreader/files/patch-fbreader__src__fbreader__FBView.cpp << 'SHAR_END'
X--- fbreader/src/fbreader/FBView.cpp.orig	2014-01-11 12:45:25 UTC
X+++ fbreader/src/fbreader/FBView.cpp
X@@ -18,6 +18,7 @@
X  */
X 
X #include <cmath>
X+#include <cstdlib>
X #include <algorithm>
X 
X #include <ZLUnicodeUtil.h>
SHAR_END
echo x fbreader/files/patch-fbreader__src__formats__html__HtmlReader.cpp
sed 's/^X//' > fbreader/files/patch-fbreader__src__formats__html__HtmlReader.cpp << 'SHAR_END'
X--- fbreader/src/formats/html/HtmlReader.cpp.orig	2014-01-11 12:45:25 UTC
X+++ fbreader/src/formats/html/HtmlReader.cpp
X@@ -19,6 +19,7 @@
X 
X #include <algorithm>
X #include <cctype>
X+#include <cstdlib>
X 
X #include <ZLInputStream.h>
X #include <ZLXMLReader.h>
SHAR_END
echo x fbreader/files/patch-zlibrary_core_src_unix_curl_ZLCurlNetworkManager.cpp
sed 's/^X//' > fbreader/files/patch-zlibrary_core_src_unix_curl_ZLCurlNetworkManager.cpp << 'SHAR_END'
X--- zlibrary/core/src/unix/curl/ZLCurlNetworkManager.cpp.orig	2014-01-11 12:45:25 UTC
X+++ zlibrary/core/src/unix/curl/ZLCurlNetworkManager.cpp
X@@ -285,9 +285,11 @@ std::string ZLCurlNetworkManager::perform(const ZLExec
X #endif
X 					errors.insert(ZLStringUtil::printf(errorResource["peerFailedVerificationMessage"].value(), ZLNetworkUtil::hostFromUrl(url)));
X 					break;
X+#if LIBCURL_VERSION_NUM < 0x073e00
X 				case CURLE_SSL_CACERT:
X 					errors.insert(ZLStringUtil::printf(errorResource["sslCertificateAuthorityMessage"].value(), ZLNetworkUtil::hostFromUrl(url)));
X 					break;
X+#endif
X 				case CURLE_SSL_CACERT_BADFILE:
X 					errors.insert(ZLStringUtil::printf(errorResource["sslBadCertificateFileMessage"].value(), request.sslCertificate().Path));
X 					break;
SHAR_END
echo x fbreader/files/patch-zlibrary_core_src_unix_time_ZLUnixTime.cpp
sed 's/^X//' > fbreader/files/patch-zlibrary_core_src_unix_time_ZLUnixTime.cpp << 'SHAR_END'
X--- zlibrary/core/src/unix/time/ZLUnixTime.cpp.orig	2014-01-11 12:45:25 UTC
X+++ zlibrary/core/src/unix/time/ZLUnixTime.cpp
X@@ -17,17 +17,16 @@
X  * 02110-1301, USA.
X  */
X 
X-#include <sys/timeb.h>
X-#include <time.h>
X+#include <sys/time.h>
X 
X #include <ZLTime.h>
X 
X #include "ZLUnixTime.h"
X 
X ZLTime ZLUnixTimeManager::currentTime() const {
X-	struct timeb timeB;
X-	ftime(&timeB);
X-	return ZLTime((long)timeB.time, timeB.millitm);
X+	struct timeval timeB;
X+	gettimeofday(&timeB,NULL);
X+	return ZLTime((long)timeB.tv_sec, timeB.tv_usec/1000);
X }
X 
X short ZLUnixTimeManager::hoursBySeconds(long seconds) const {
SHAR_END
echo x fbreader/files/patch-zlibrary_text_src_area_ZLTextAreaStyle.cpp
sed 's/^X//' > fbreader/files/patch-zlibrary_text_src_area_ZLTextAreaStyle.cpp << 'SHAR_END'
X--- zlibrary/text/src/area/ZLTextAreaStyle.cpp.orig	2014-01-11 12:45:25 UTC
X+++ zlibrary/text/src/area/ZLTextAreaStyle.cpp
X@@ -18,6 +18,7 @@
X  */
X 
X #include <algorithm>
X+#include <cstdlib>
X 
X #include <ZLUnicodeUtil.h>
X #include <ZLPaintContext.h>
SHAR_END
exit