# This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # DESCR # Makefile # PLIST # distinfo # options.mk # patches/patch-ab # patches/patch-ah # patches/patch-fbreader_Makefile # patches/patch-fbreader_src_fbreader_FBReaderActions.cpp # patches/patch-fbreader_src_fbreader_FBView.cpp # patches/patch-fbreader_src_formats_doc_OleStorage.cpp # patches/patch-fbreader_src_formats_html_HtmlReader.cpp # patches/patch-makefiles_arch_desktop.mk # patches/patch-makefiles_qsubdir.mk # patches/patch-makefiles_subdir.mk # patches/patch-zlibrary_core_Makefile # patches/patch-zlibrary_text_Makefile # patches/patch-zlibrary_text_src_area_ZLTextAreaStyle.cpp # patches/patch-zlibrary_ui_Makefile # patches/patch-zlibrary_ui_src_qt4_application_LineEditParameter.cpp # patches/patch-zlibrary_ui_src_qt4_application_ZLQtApplicationWindow.cpp # patches/patch-zlibrary_ui_src_qt4_application_ZLQtApplicationWindow.h # patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtDialog.cpp # patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtDialog.h # patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtDialogContent.cpp # patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtDialogManager.cpp # patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtOpenFileDialog.cpp # patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtOptionView.cpp # patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtOptionsDialog.cpp # patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtOptionsDialog.h # patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtProgressDialog.cpp # patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtProgressDialog.h # patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtTreeDialog.cpp # patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtTreeDialog.h # patches/patch-zlibrary_ui_src_qt4_library_ZLQApplication.h # patches/patch-zlibrary_ui_src_qt4_library_ZLibrary.cpp # patches/patch-zlibrary_ui_src_qt4_network_ZLQtNetworkManager.cpp # patches/patch-zlibrary_ui_src_qt4_tree_QtWaitingSpinner.h # patches/patch-zlibrary_ui_src_qt4_tree_ZLQtItemsListWidget.cpp # patches/patch-zlibrary_ui_src_qt4_tree_ZLQtItemsListWidget.h # patches/patch-zlibrary_ui_src_qt4_tree_ZLQtPreviewWidget.cpp # patches/patch-zlibrary_ui_src_qt4_tree_ZLQtPreviewWidget.h # patches/patch-zlibrary_ui_src_qt4_tree_ZLQtSearchField.cpp # patches/patch-zlibrary_ui_src_qt4_tree_ZLQtSearchField.h # patches/patch-zlibrary_ui_src_qt4_view_ZLQtViewWidget.cpp # patches/patch-zlibrary_ui_src_qt4_view_ZLQtViewWidget.h # echo x - DESCR sed 's/^X//' >DESCR << 'END-of-DESCR' XFBReader is an e-book reader for various platforms. X XMain features: X * Supported formats are X * fb2 e-book format (style attributes are not supported yet). X * HTML format (tables are not supported). X * CHM format (tables are not supported). X * plucker format (tables are not supported). X * Palmdoc (aportis doc). X * zTxt (Weasel format). X * TCR (psion text) format. X * RTF format (stylesheets and tables are not supported). X * OEB format (css and tables are not supported). X * OpenReader format (css and tables are not supported). X * Non-DRM'ed mobipocket format (tables are not supported). X * Plain text format. X * Direct reading from tar, zip, gzip and bzip2 archives. (Multiple books X in one archive are supported.) X * Automatic library building. X * Automatic language and character encoding detection is supported. X * Automatically generated contents table. X * Embedded images support. X * Footnotes/hyperlinks support. X...and more! END-of-DESCR echo x - Makefile sed 's/^X//' >Makefile << 'END-of-Makefile' X# $NetBSD: Makefile,v 1.72 2019/08/22 12:23:30 ryoon Exp $ X XDISTNAME= fbreader-sources-0.99.4 XPKGNAME= ${DISTNAME:S/-sources//} XPKGREVISION= 35 XCATEGORIES= misc XMASTER_SITES= http://www.fbreader.org/files/desktop/ XEXTRACT_SUFX= .tgz X XMAINTAINER= pkgsrc-users@NetBSD.org XHOMEPAGE= http://www.fbreader.org/ XCOMMENT= Ebook reader software XLICENSE= gnu-gpl-v2 AND modified-bsd X XWRKSRC= ${WRKDIR}/${PKGNAME_NOREV} XUSE_LANGUAGES= c c++ XUSE_LIBTOOL= yes XUSE_TOOLS+= gmake pkg-config X XMAKE_ENV+= INSTALLDIR=${PREFIX} XMAKE_ENV+= DESTDIR=${DESTDIR} XMAKE_ENV+= TARGET_ARCH=desktop X XLDADD+= -L${PREFIX}/lib X X.include "../../mk/bsd.prefs.mk" X X.if ${OPSYS} == "SunOS" XCPPFLAGS+= -DDO_ICONV_CAST X.endif X X.include "options.mk" X X.include "../../archivers/bzip2/buildlink3.mk" X.include "../../converters/fribidi/buildlink3.mk" X.include "../../databases/sqlite3/buildlink3.mk" X.include "../../devel/zlib/buildlink3.mk" X.include "../../mk/jpeg.buildlink3.mk" X.include "../../graphics/png/buildlink3.mk" X.include "../../sysutils/desktop-file-utils/desktopdb.mk" X.include "../../textproc/expat/buildlink3.mk" X.include "../../textproc/liblinebreak/buildlink3.mk" X.include "../../www/curl/buildlink3.mk" X.include "../../x11/libSM/buildlink3.mk" X.include "../../x11/libICE/buildlink3.mk" X.include "../../x11/libXrender/buildlink3.mk" X.include "../../fonts/fontconfig/buildlink3.mk" X.include "../../graphics/freetype2/buildlink3.mk" X.include "../../x11/libXext/buildlink3.mk" X.include "../../x11/libX11/buildlink3.mk" X.include "../../security/openssl/buildlink3.mk" X.include "../../textproc/expat/buildlink3.mk" X.include "../../mk/bsd.pkg.mk" END-of-Makefile echo x - PLIST sed 's/^X//' >PLIST << 'END-of-PLIST' X@comment $NetBSD: PLIST,v 1.5 2013/06/27 14:21:09 ryoon Exp $ Xbin/FBReader Xlib/libzlcore.la Xlib/libzltext.la Xlib/libzlui.la 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/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.he.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/he.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/pixmaps/FBReader.png Xshare/pixmaps/FBReader/addBook.png Xshare/pixmaps/FBReader/advancedSearchOnNetwork.png Xshare/pixmaps/FBReader/back_button.png Xshare/pixmaps/FBReader/back_button_disabled.png Xshare/pixmaps/FBReader/bookInfo.png Xshare/pixmaps/FBReader/booktree-author.png Xshare/pixmaps/FBReader/booktree-book.png Xshare/pixmaps/FBReader/booktree-catalog.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/forward_button.png Xshare/pixmaps/FBReader/forward_button_disabled.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/refresh-icon-1.png Xshare/pixmaps/FBReader/refresh-icon-2.png Xshare/pixmaps/FBReader/refresh-icon.svg Xshare/pixmaps/FBReader/rotate.png Xshare/pixmaps/FBReader/rtf.png Xshare/pixmaps/FBReader/search.png Xshare/pixmaps/FBReader/search_icon.png Xshare/pixmaps/FBReader/searchresult.png Xshare/pixmaps/FBReader/showHelp.png Xshare/pixmaps/FBReader/showLibrary.png Xshare/pixmaps/FBReader/showNetLibrary.png Xshare/pixmaps/FBReader/showNetworkLibrary.png Xshare/pixmaps/FBReader/showReading.png Xshare/pixmaps/FBReader/showRecent.png Xshare/pixmaps/FBReader/spinner.gif 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 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-qt4.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/he.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/style.qss Xshare/zlibrary/unicode.xml.gz END-of-PLIST echo x - distinfo sed 's/^X//' >distinfo << 'END-of-distinfo' X$NetBSD: distinfo,v 1.14 2019/09/10 16:38:31 maya Exp $ X XSHA1 (fbreader-sources-0.99.4.tgz) = 7e6f0acbac5d8111fcda14a576ae4fdc93eef292 XRMD160 (fbreader-sources-0.99.4.tgz) = 90825fcb6b026785dd3a7329899b54a02b08e4ed XSHA512 (fbreader-sources-0.99.4.tgz) = d4b11d7ab03df002ad4212db805b10b80a24ea4384e92122b12c25a3f817a0eb343509ae30e31d68417fd4ce27f77e043235436f0081ff2c785a2830d6211dc7 XSize (fbreader-sources-0.99.4.tgz) = 2345664 bytes XSHA1 (patch-ab) = a23a87f2ea3e44471d93c83cdb9e65a5840e38f5 XSHA1 (patch-ah) = e9185be8e8020feb7dc9f3335879fe6862b95f18 XSHA1 (patch-fbreader_Makefile) = 3c0d3205f47f10b62ed5783ddce6a823aa8154a7 XSHA1 (patch-fbreader_src_fbreader_FBReaderActions.cpp) = ac2d5937d3628abd6db2e4b2fe869d95262d2689 XSHA1 (patch-fbreader_src_fbreader_FBView.cpp) = f9018b813b92d31c67e13eb68d6e50c8a7637a5c XSHA1 (patch-fbreader_src_formats_doc_OleStorage.cpp) = 177d42ebe721a2de1e3342fd35a8e4b4c0c93677 XSHA1 (patch-fbreader_src_formats_html_HtmlReader.cpp) = fe0ebe4dff97a11581a6d7b079f8f19f4e3be019 XSHA1 (patch-makefiles_arch_desktop.mk) = 11f0ac26844905969b9b056cf8d9e8ac7cb2d508 XSHA1 (patch-makefiles_qsubdir.mk) = a139410def61e793b193cb54716b9ffb339b5692 XSHA1 (patch-makefiles_subdir.mk) = b9c7d0339e86b9cd6010d4156f35233320a14436 XSHA1 (patch-zlibrary_core_Makefile) = 141543c94a63f9c56858c43f07892e05b060bf01 XSHA1 (patch-zlibrary_text_Makefile) = aa7d8a7e3d170e903af704edafe49297e158fd51 XSHA1 (patch-zlibrary_text_src_area_ZLTextAreaStyle.cpp) = ec87bd8072c2385df6e224c7cb1a914bef595f78 XSHA1 (patch-zlibrary_ui_Makefile) = 9586070b53f415ec757fb6648c66c36684e801ea XSHA1 (patch-zlibrary_ui_src_qt4_application_LineEditParameter.cpp) = 8378b763a7936cde20e2275dba3a999c6048efa3 XSHA1 (patch-zlibrary_ui_src_qt4_application_ZLQtApplicationWindow.cpp) = 5800c500dae97b90c860d33fc5f45f5cf535e2ef XSHA1 (patch-zlibrary_ui_src_qt4_application_ZLQtApplicationWindow.h) = 419f70f511e82f959c4e504c9ddc538b9c1ed99a XSHA1 (patch-zlibrary_ui_src_qt4_dialogs_ZLQtDialog.cpp) = 271bc68fe30a444606c60609b618817bfa578080 XSHA1 (patch-zlibrary_ui_src_qt4_dialogs_ZLQtDialog.h) = 5fa9fa70a67a0cf8c9bb0583f924a59fd5f7f339 XSHA1 (patch-zlibrary_ui_src_qt4_dialogs_ZLQtDialogContent.cpp) = a2172b2c9e317271cfb163100feffcf7ec800c39 XSHA1 (patch-zlibrary_ui_src_qt4_dialogs_ZLQtDialogManager.cpp) = 87715e6e4b310f4b98c0c6313732c2ddde203605 XSHA1 (patch-zlibrary_ui_src_qt4_dialogs_ZLQtOpenFileDialog.cpp) = 9cbb1790d5009a003b6f08d7546d637cc8cca1bc XSHA1 (patch-zlibrary_ui_src_qt4_dialogs_ZLQtOptionView.cpp) = bd91d641862baf704a978d62e58b8f1af3bc3c74 XSHA1 (patch-zlibrary_ui_src_qt4_dialogs_ZLQtOptionsDialog.cpp) = d7525c179ccc1e157102ac2a805765e0f6f46ade XSHA1 (patch-zlibrary_ui_src_qt4_dialogs_ZLQtOptionsDialog.h) = 5368918f2b6da0c2209ff0f0720369e9fe7089b7 XSHA1 (patch-zlibrary_ui_src_qt4_dialogs_ZLQtProgressDialog.cpp) = 6b6d3d5bbb751c65c98dab961311a505800c3990 XSHA1 (patch-zlibrary_ui_src_qt4_dialogs_ZLQtProgressDialog.h) = ddcaed7878503b7115ee84df4573bbc07dd935fc XSHA1 (patch-zlibrary_ui_src_qt4_dialogs_ZLQtTreeDialog.cpp) = 2fba33ee8ee09530316c51df90ee77b5bdb2e414 XSHA1 (patch-zlibrary_ui_src_qt4_dialogs_ZLQtTreeDialog.h) = a447a2af76650ec263fe53fa05ac26d9d5e8d511 XSHA1 (patch-zlibrary_ui_src_qt4_library_ZLQApplication.h) = 9d2600e0014022d97400cf9ff6a58c0044555180 XSHA1 (patch-zlibrary_ui_src_qt4_library_ZLibrary.cpp) = 6dd894258f985801c7de95aefe663b155a572474 XSHA1 (patch-zlibrary_ui_src_qt4_network_ZLQtNetworkManager.cpp) = c1d5537247b990e48b73d761cc014cb4082e2363 XSHA1 (patch-zlibrary_ui_src_qt4_tree_QtWaitingSpinner.h) = afd905204de952a94856452dbb4d974b087a8653 XSHA1 (patch-zlibrary_ui_src_qt4_tree_ZLQtItemsListWidget.cpp) = 3e5b72a7a7ef902444a7157a2d8032cb75977b0f XSHA1 (patch-zlibrary_ui_src_qt4_tree_ZLQtItemsListWidget.h) = b200ad46d97b039426791ca3583ff353d5bebff4 XSHA1 (patch-zlibrary_ui_src_qt4_tree_ZLQtPreviewWidget.cpp) = e857c7b55f2e0e4a55b340e7f6b45cd2e873ba9a XSHA1 (patch-zlibrary_ui_src_qt4_tree_ZLQtPreviewWidget.h) = c8c463d1568da3d43aa620d13ca095d66ec779ca XSHA1 (patch-zlibrary_ui_src_qt4_tree_ZLQtSearchField.cpp) = 01407f623e26f4977c3dd98b8fbb799f3e32bc82 XSHA1 (patch-zlibrary_ui_src_qt4_tree_ZLQtSearchField.h) = 22e6be3c9a5fed4513eb0be3c2dc3db03106a381 XSHA1 (patch-zlibrary_ui_src_qt4_view_ZLQtViewWidget.cpp) = 757b7eef4145c0fe1ff425785c38c511d44b20cb XSHA1 (patch-zlibrary_ui_src_qt4_view_ZLQtViewWidget.h) = d2b18a118d574d39474b8651e0607b2c203967c8 END-of-distinfo echo x - options.mk sed 's/^X//' >options.mk << 'END-of-options.mk' X# $NetBSD: options.mk,v 1.3 2017/09/26 09:43:28 wiz Exp $ X XPKG_OPTIONS_VAR= PKG_OPTIONS.fbreader XPKG_OPTIONS_REQUIRED_GROUPS= gui XPKG_OPTIONS_GROUP.gui= gtk2 qt5 XPKG_SUPPORTED_OPTIONS= debug XPKG_SUGGESTED_OPTIONS= qt5 X X.include "../../mk/bsd.options.mk" X X.if !empty(PKG_OPTIONS:Mdebug) XMAKE_ENV+= TARGET_STATUS=debug X.else XMAKE_ENV+= TARGET_STATUS=release X.endif X X.if !empty(PKG_OPTIONS:Mgtk2) X.include "../../x11/gtk2/buildlink3.mk" XMAKE_ENV+= UI_TYPE=gtk XUSE_TOOLS+= pkg-config X.endif X X.if !empty(PKG_OPTIONS:Mqt5) X.include "../../x11/qt5-qtbase/buildlink3.mk" XMAKE_ENV+= UI_TYPE=qt5 X.endif END-of-options.mk echo x - patches/patch-ab sed 's/^X//' >patches/patch-ab << 'END-of-patches/patch-ab' X$NetBSD: patch-ab,v 1.4 2016/12/03 09:06:37 maya Exp $ X XAvoid ancient function that needs libcompat. Xinclude sys/time.h for gettimeofday (needed by linux) X X--- zlibrary/core/src/unix/time/ZLUnixTime.cpp.orig 2012-11-30 12:41:25.000000000 +0000 X+++ zlibrary/core/src/unix/time/ZLUnixTime.cpp X@@ -17,17 +17,17 @@ X * 02110-1301, USA. X */ X X-#include X #include X+#include X X #include 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(timeB.tv_sec, timeB.tv_usec/1000); X } X X short ZLUnixTimeManager::hoursBySeconds(long seconds) const { END-of-patches/patch-ab echo x - patches/patch-ah sed 's/^X//' >patches/patch-ah << 'END-of-patches/patch-ah' X$NetBSD: patch-ah,v 1.3 2012/10/01 12:40:36 ryoon Exp $ X X* Use liblinebreak instead of libunibreak X X--- makefiles/config.mk.orig 2012-11-30 12:41:25.000000000 +0000 X+++ makefiles/config.mk X@@ -46,7 +46,7 @@ ifeq "$(ZLSHARED)" "yes" X ZLUI_LIB = -L$(ROOTDIR)/zlibrary/ui -lzlui X else X CORE_LIBS = -lm -L$(ROOTDIR)/zlibrary/ui -L$(ROOTDIR)/zlibrary/core -lzlcore -lzlui -lzlcore $(UILIBS) $(XML_LIBS) $(ARCHIVER_LIBS) X- TEXT_LIBS = -L$(ROOTDIR)/zlibrary/text -lzltext $(EXTERNAL_LIBS) -lunibreak -lfribidi X+ TEXT_LIBS = -L$(ROOTDIR)/zlibrary/text -lzltext $(EXTERNAL_LIBS) $(shell pkg-config --libs fribidi) -llinebreak X endif X X ifneq "$(BUILD_RESOURCE_OBJECT)" "yes" END-of-patches/patch-ah echo x - patches/patch-fbreader_Makefile sed 's/^X//' >patches/patch-fbreader_Makefile << 'END-of-patches/patch-fbreader_Makefile' X$NetBSD: patch-fbreader_Makefile,v 1.1 2013/06/27 14:21:09 ryoon Exp $ X X* Link to -lX11 etc. X* Libtoolized. X X--- fbreader/Makefile.orig 2012-11-30 12:41:25.000000000 +0000 X+++ fbreader/Makefile X@@ -22,7 +22,7 @@ all: .resources X fi; \ X done; X @echo -n 'Linking $(TARGET) ...' X- @$(LD) $(LDFLAGS) -o $(TARGET) `find src -name *.o` $(TEXT_LIBS) $(CORE_LIBS) $(ZLUI_LIB) -lsqlite3 X+ @${LIBTOOL} --mode=link --tag=CC $(LD) $(LDFLAGS) $(LDADD) -o $(TARGET) `find src -name *.lo` $(TEXT_LIBS) $(CORE_LIBS) $(ZLUI_LIB) -lsqlite3 -rpath ${BUILDLINK_X11_DIR}/lib X @echo ' OK' X X FBSHAREDIR = $(DESTDIR)$(SHAREDIR)/FBReader X@@ -35,7 +35,7 @@ APPIMAGEDIR_REAL = $(subst %application_ X X do_install: X @install -d $(DESTDIR)$(BINDIR) X- @install $(TARGET) $(DESTDIR)$(BINDIR)/FBReader X+ @${LIBTOOL} --mode=install install $(TARGET) $(DESTDIR)$(BINDIR) X @install -d $(FBSHAREDIR) X @install -d $(FBSHAREDIR)/help X @./scripts/install_help.sh $(VARIANT) $(FBSHAREDIR)/help END-of-patches/patch-fbreader_Makefile echo x - patches/patch-fbreader_src_fbreader_FBReaderActions.cpp sed 's/^X//' >patches/patch-fbreader_src_fbreader_FBReaderActions.cpp << 'END-of-patches/patch-fbreader_src_fbreader_FBReaderActions.cpp' X$NetBSD: patch-fbreader_src_fbreader_FBReaderActions.cpp,v 1.1 2013/05/06 15:04:55 joerg Exp $ X X--- fbreader/src/fbreader/FBReaderActions.cpp.orig 2013-05-04 15:09:20.000000000 +0000 X+++ fbreader/src/fbreader/FBReaderActions.cpp X@@ -18,6 +18,7 @@ X */ X X #include X+#include X X #include X #include END-of-patches/patch-fbreader_src_fbreader_FBReaderActions.cpp echo x - patches/patch-fbreader_src_fbreader_FBView.cpp sed 's/^X//' >patches/patch-fbreader_src_fbreader_FBView.cpp << 'END-of-patches/patch-fbreader_src_fbreader_FBView.cpp' X$NetBSD: patch-fbreader_src_fbreader_FBView.cpp,v 1.1 2013/05/06 15:04:55 joerg Exp $ X X--- fbreader/src/fbreader/FBView.cpp.orig 2013-05-04 15:09:39.000000000 +0000 X+++ fbreader/src/fbreader/FBView.cpp X@@ -18,6 +18,7 @@ X */ X X #include X+#include X #include X X #include END-of-patches/patch-fbreader_src_fbreader_FBView.cpp echo x - patches/patch-fbreader_src_formats_doc_OleStorage.cpp sed 's/^X//' >patches/patch-fbreader_src_formats_doc_OleStorage.cpp << 'END-of-patches/patch-fbreader_src_formats_doc_OleStorage.cpp' X$NetBSD: patch-fbreader_src_formats_doc_OleStorage.cpp,v 1.1 2019/09/09 13:31:53 maya Exp $ X XFix narrowing conversion error X X--- fbreader/src/formats/doc/OleStorage.cpp.orig 2012-11-30 12:41:25.000000000 +0000 X+++ fbreader/src/formats/doc/OleStorage.cpp X@@ -59,7 +59,8 @@ bool OleStorage::init(shared_ptrpatches/patch-fbreader_src_formats_html_HtmlReader.cpp << 'END-of-patches/patch-fbreader_src_formats_html_HtmlReader.cpp' X$NetBSD: patch-fbreader_src_formats_html_HtmlReader.cpp,v 1.1 2013/05/06 15:04:55 joerg Exp $ X X--- fbreader/src/formats/html/HtmlReader.cpp.orig 2013-05-04 15:08:25.000000000 +0000 X+++ fbreader/src/formats/html/HtmlReader.cpp X@@ -19,6 +19,7 @@ X X #include X #include X+#include X X #include X #include END-of-patches/patch-fbreader_src_formats_html_HtmlReader.cpp echo x - patches/patch-makefiles_arch_desktop.mk sed 's/^X//' >patches/patch-makefiles_arch_desktop.mk << 'END-of-patches/patch-makefiles_arch_desktop.mk' X$NetBSD$ X X--- makefiles/arch/desktop.mk.orig 2012-11-30 12:41:25.000000000 +0000 X+++ makefiles/arch/desktop.mk X@@ -17,8 +17,8 @@ LDFLAGS = X EXTERNAL_INCLUDE = $(shell pkg-config --cflags fribidi) X X ifeq "$(UI_TYPE)" "qt" X- MOC = moc-qt3 X- QTINCLUDE = -I /usr/include/qt3 X+ MOC = moc X+ QTINCLUDE = $(shell pkg-config --cflags Qt5Gui Qt5Widgets Qt5Network) X else X MOC = $(shell pkg-config QtCore --variable=moc_location) X QTINCLUDE = -I $(shell pkg-config --cflags QtCore) X@@ -27,11 +27,7 @@ endif X GTKINCLUDE = $(shell pkg-config --cflags gtk+-2.0 libpng xft) X X ifeq "$(UI_TYPE)" "qt" X- UILIBS = -lqt-mt X-endif X- X-ifeq "$(UI_TYPE)" "qt4" X- UILIBS = $(shell pkg-config --libs QtCore QtGui QtNetwork) X+ UILIBS = $(shell pkg-config --libs Qt5Gui Qt5Widgets Qt5Network) X endif X X ifeq "$(UI_TYPE)" "gtk" END-of-patches/patch-makefiles_arch_desktop.mk echo x - patches/patch-makefiles_qsubdir.mk sed 's/^X//' >patches/patch-makefiles_qsubdir.mk << 'END-of-patches/patch-makefiles_qsubdir.mk' X$NetBSD: patch-makefiles_qsubdir.mk,v 1.1 2013/06/27 14:21:09 ryoon Exp $ X X* Libtoolized X X--- makefiles/qsubdir.mk.orig 2012-11-30 12:41:25.000000000 +0000 X+++ makefiles/qsubdir.mk X@@ -5,14 +5,14 @@ INCLUDE = $(QTINCLUDE) $(ZINCLUDE) $(EXT X X HEADERS = $(wildcard *.h) X SOURCES = $(wildcard *.cpp) X-OBJMOC = $(patsubst %.cpp, %.o, $(SRCMOC)) X-OBJECTS = $(patsubst %.cpp, %.o, $(SOURCES)) X+OBJMOC = $(patsubst %.cpp, %.lo, $(SRCMOC)) X+OBJECTS = $(patsubst %.cpp, %.lo, $(SOURCES)) X X-.SUFFIXES: .cpp .moc.cpp .moc.o .o .h X+.SUFFIXES: .cpp .moc.cpp .moc.lo .lo .h X X-.cpp.o: X+.cpp.lo: X @echo -n 'Compiling $@ ...' X- @$(CC) -MMD -c $(CFLAGS) $(INCLUDE) $< X+ @${LIBTOOL} --mode=compile --tag=CXX $(CC) -MMD -c $(CFLAGS) $(INCLUDE) $< X @echo ' OK' X X .h.moc.cpp: X@@ -23,6 +23,6 @@ OBJECTS = $(patsubst %.cpp, %.o, $(SOURC X all: $(OBJECTS) $(OBJMOC) X X clean: X- @$(RM) *.o *.moc.cpp *.d X+ @$(RM) *.lo *.moc.cpp *.d X X -include *.d END-of-patches/patch-makefiles_qsubdir.mk echo x - patches/patch-makefiles_subdir.mk sed 's/^X//' >patches/patch-makefiles_subdir.mk << 'END-of-patches/patch-makefiles_subdir.mk' X$NetBSD: patch-makefiles_subdir.mk,v 1.1 2013/06/27 14:21:09 ryoon Exp $ X X* Libtoolized. X X--- makefiles/subdir.mk.orig 2012-11-30 12:41:25.000000000 +0000 X+++ makefiles/subdir.mk X@@ -6,43 +6,43 @@ HEADERS = $(wildcard *.h) X SOURCES_CPP = $(wildcard *.cpp) X SOURCES_OBJCPP = $(wildcard *.M) X SOURCES_OBJC = $(wildcard *.m) X-OBJECTS = $(patsubst %.cpp, %.o, $(SOURCES_CPP)) $(patsubst %.M, %.o, $(SOURCES_OBJCPP)) $(patsubst %.m, %.o, $(SOURCES_OBJC)) X+OBJECTS = $(patsubst %.cpp, %.lo, $(SOURCES_CPP)) $(patsubst %.M, %.lo, $(SOURCES_OBJCPP)) $(patsubst %.m, %.lo, $(SOURCES_OBJC)) X X-.SUFFIXES: .cpp .M .m .o .h X+.SUFFIXES: .cpp .M .m .lo .h X X-.cpp.o: X+.cpp.lo: X @echo -n 'Compiling $@ ...' X ifdef CFLAGS_NOARCH X- @$(CC) -MM $(CFLAGS_PRE) $(INCLUDE) $< -o `basename $< .cpp`.d X- @$(CC) -c $(CFLAGS) $(INCLUDE) $< X+ @${LIBTOOL} --mode=compile --tag=CC $(CC) -MM $(CFLAGS_PRE) $(INCLUDE) $< -o `basename $< .cpp`.d X+ @${LIBTOOL} --mode=compile --tag=CC $(CC) -c $(CFLAGS) $(INCLUDE) $< X else X- @$(CC) -MMD -c $(CFLAGS) $(INCLUDE) $< X+ @${LIBTOOL} --mode=compile --tag=CC $(CC) -MMD -c $(CFLAGS) $(INCLUDE) $< X endif X @echo ' OK' X X .M.o: X @echo -n 'Compiling $@ ...' X ifdef CFLAGS_NOARCH X- @$(CC) -MM $(CFLAGS_PRE) $(INCLUDE) $< -o `basename $< .M`.d X- @$(CC) -c $(CFLAGS) $(INCLUDE) $< X+ @${LIBTOOL} --mode=compile --tag=CC $(CC) -MM $(CFLAGS_PRE) $(INCLUDE) $< -o `basename $< .M`.d X+ @${LIBTOOL} --mode=compile --tag=CC $(CC) -c $(CFLAGS) $(INCLUDE) $< X else X- @$(CC) -MMD -c $(CFLAGS) $(INCLUDE) $< X+ @${LIBTOOL} --mode=compile --tag=CC $(CC) -MMD -c $(CFLAGS) $(INCLUDE) $< X endif X @echo ' OK' X X .m.o: X @echo -n 'Compiling $@ ...' X ifdef CFLAGS_NOARCH X- @$(CC) -MM $(CFLAGS_PRE) $(INCLUDE) $< -o `basename $< .m`.d X- @$(CC) -c $(CFLAGS) $(INCLUDE) $< X+ @${LIBTOOL} --mode=compile --tag=CC $(CC) -MM $(CFLAGS_PRE) $(INCLUDE) $< -o `basename $< .m`.d X+ @${LIBTOOL} --mode=compile --tag=CC $(CC) -c $(CFLAGS) $(INCLUDE) $< X else X- @$(CC) -MMD -c $(CFLAGS) $(INCLUDE) $< X+ @${LIBTOOL} --mode=compile --tag=CC $(CC) -MMD -c $(CFLAGS) $(INCLUDE) $< X endif X @echo ' OK' X X all: $(OBJECTS) X X clean: X- @$(RM) *.o *.s *.ld *.d X+ @$(RM) *.lo *.s *.ld *.d X X -include *.d END-of-patches/patch-makefiles_subdir.mk echo x - patches/patch-zlibrary_core_Makefile sed 's/^X//' >patches/patch-zlibrary_core_Makefile << 'END-of-patches/patch-zlibrary_core_Makefile' X$NetBSD: patch-zlibrary_core_Makefile,v 1.2 2015/04/02 21:23:22 joerg Exp $ X X* Libtoolized. X X--- zlibrary/core/Makefile.orig 2012-11-30 12:41:25.000000000 +0000 X+++ zlibrary/core/Makefile X@@ -11,7 +11,7 @@ ifeq "$(ZLSHARED)" "yes" X TARGET_SONAME = libzlcore.$(SOVERSION).dylib X TARGET_SHORTNAME = libzlcore.dylib X else X- TARGET = libzlcore.so.$(VERSION) X+ TARGET = libzlcore.la X TARGET_SONAME = libzlcore.so.$(SOVERSION) X TARGET_SHORTNAME = libzlcore.so X endif X@@ -50,10 +50,8 @@ $(TARGET): .objects X @echo -n 'Creating $@ ...' X @$(RM_QUIET) $(TARGET) X ifeq "$(ZLSHARED)" "yes" X- @$(LD) $(LDFLAGS) -shared -Wl,-soname,$(TARGET_SONAME) -o $(TARGET) -lc $(patsubst %, %/*.o, $(SUBDIRS)) $(XML_LIBS) $(ARCHIVER_LIBS) X+ @${LIBTOOL} --mode=link --tag=CXX $(LD) $(LDFLAGS) -Wl,-soname,$(TARGET_SONAME) -o $(TARGET) -lc $(patsubst %, %/*.lo, $(SUBDIRS)) $(XML_LIBS) $(ARCHIVER_LIBS) -rpath ${PREFIX}/lib X #@$(LD) $(LDFLAGS) -dynamiclib -dylinker_install_name $(TARGET_SONAME) -o $(TARGET) -lc $(patsubst %, %/*.o, $(SUBDIRS)) $(XML_LIBS) $(ARCHIVER_LIBS) $(ZLUI_LIB) -ldl -liconv X- @ln -sf $(TARGET) $(TARGET_SONAME) X- @ln -sf $(TARGET) $(TARGET_SHORTNAME) X else X @$(AR) $(TARGET) $(patsubst %, %/*.o, $(SUBDIRS)) X endif X@@ -83,9 +81,7 @@ do_install: X fi X ifeq "$(ZLSHARED)" "yes" X @install -d $(DESTDIR)$(LIBDIR) X- @install $(TARGET) $(DESTDIR)$(LIBDIR) X- @ln -sf $(TARGET) $(DESTDIR)$(LIBDIR)/$(TARGET_SONAME) X- @ln -sf $(TARGET) $(DESTDIR)$(LIBDIR)/$(TARGET_SHORTNAME) X+ @${LIBTOOL} --mode=install install $(TARGET) $(DESTDIR)$(LIBDIR) X endif X X do_install_dev: END-of-patches/patch-zlibrary_core_Makefile echo x - patches/patch-zlibrary_text_Makefile sed 's/^X//' >patches/patch-zlibrary_text_Makefile << 'END-of-patches/patch-zlibrary_text_Makefile' X$NetBSD: patch-zlibrary_text_Makefile,v 1.3 2015/04/02 21:23:22 joerg Exp $ X X* Use liblinebreak instead of libunibreak X* Libtoolized. X X--- zlibrary/text/Makefile.orig 2012-11-30 12:41:25.000000000 +0000 X+++ zlibrary/text/Makefile X@@ -11,7 +11,7 @@ ifeq "$(ZLSHARED)" "yes" X TARGET_SONAME = libzltext.$(SOVERSION).dylib X TARGET_SHORTNAME = libzltext.dylib X else X- TARGET = libzltext.so.$(VERSION) X+ TARGET = libzltext.la X TARGET_SONAME = libzltext.so.$(SOVERSION) X TARGET_SHORTNAME = libzltext.so X endif X@@ -34,10 +34,8 @@ $(TARGET): .objects X @echo -n 'Creating $@ ...' X @$(RM_QUIET) $(TARGET) X ifeq "$(ZLSHARED)" "yes" X- @$(LD) $(LDFLAGS) -shared -Wl,-soname,$(TARGET_SONAME) -o $(TARGET) $(patsubst %, %/*.o, $(SUBDIRS)) $(CORE_LIBS) -lunibreak -lfribidi X+ @${LIBTOOL} --mode=link --tag=CXX $(LD) $(LDFLAGS) -shared -Wl,-soname,$(TARGET_SONAME) -o $(TARGET) $(patsubst %, %/*.lo, $(SUBDIRS)) $(CORE_LIBS) -llinebreak -lfribidi -rpath ${PREFIX}/lib X #@$(LD) $(LDFLAGS) -dynamiclib -dylinker_install_name $(TARGET_SONAME) -o $(TARGET) $(patsubst %, %/*.o, $(SUBDIRS)) $(CORE_LIBS) $(EXTERNAL_LIBS) -llinebreak -lfribidi X- @ln -sf $(TARGET) $(TARGET_SONAME) X- @ln -sf $(TARGET) $(TARGET_SHORTNAME) X else X @$(AR) $(TARGET) $(patsubst %, %/*.o, $(SUBDIRS)) X endif X@@ -50,9 +48,7 @@ do_install: X @install -m 0644 $(wildcard data/hyphenationPatterns.zip) $(SHARE_ZLIBRARY) X ifeq "$(ZLSHARED)" "yes" X @install -d $(DESTDIR)$(LIBDIR) X- @install $(TARGET) $(DESTDIR)$(LIBDIR) X- @ln -sf $(TARGET) $(DESTDIR)$(LIBDIR)/$(TARGET_SONAME) X- @ln -sf $(TARGET) $(DESTDIR)$(LIBDIR)/$(TARGET_SHORTNAME) X+ @${LIBTOOL} --mode=install install $(TARGET) $(DESTDIR)$(LIBDIR) X endif X X do_install_dev: END-of-patches/patch-zlibrary_text_Makefile echo x - patches/patch-zlibrary_text_src_area_ZLTextAreaStyle.cpp sed 's/^X//' >patches/patch-zlibrary_text_src_area_ZLTextAreaStyle.cpp << 'END-of-patches/patch-zlibrary_text_src_area_ZLTextAreaStyle.cpp' X$NetBSD: patch-zlibrary_text_src_area_ZLTextAreaStyle.cpp,v 1.1 2013/05/06 15:04:55 joerg Exp $ X X--- zlibrary/text/src/area/ZLTextAreaStyle.cpp.orig 2013-05-04 15:07:13.000000000 +0000 X+++ zlibrary/text/src/area/ZLTextAreaStyle.cpp X@@ -18,6 +18,7 @@ X */ X X #include X+#include X X #include X #include END-of-patches/patch-zlibrary_text_src_area_ZLTextAreaStyle.cpp echo x - patches/patch-zlibrary_ui_Makefile sed 's/^X//' >patches/patch-zlibrary_ui_Makefile << 'END-of-patches/patch-zlibrary_ui_Makefile' X$NetBSD: patch-zlibrary_ui_Makefile,v 1.2 2015/04/02 21:23:22 joerg Exp $ X X* Libtoolized. X X--- zlibrary/ui/Makefile.orig 2012-11-30 12:41:25.000000000 +0000 X+++ zlibrary/ui/Makefile X@@ -11,7 +11,7 @@ ifeq "$(ZLSHARED)" "yes" X TARGET_SONAME = libzlui.$(SOVERSION).dylib X TARGET_SHORTNAME = libzlui.dylib X else X- TARGET = libzlui.so.$(VERSION) X+ TARGET = libzlui.la X TARGET_SONAME = libzlui.so.$(SOVERSION) X TARGET_SHORTNAME = libzlui.so X endif X@@ -117,10 +117,8 @@ $(TARGET): .objects X @echo -n 'Creating $@ ...' X @$(RM_QUIET) $(TARGET) X ifeq "$(ZLSHARED)" "yes" X- @$(LD) $(LDFLAGS) -shared -Wl,-soname,$(TARGET_SONAME) -o $(TARGET) $(patsubst %, %/*.o, $(SUBDIRS) $(QTSUBDIRS) $(GTKSUBDIRS)) $(UILIBS) $(CORE_LIBS) X+ @${LIBTOOL} --mode=link --tag=CXX $(LD) $(LDFLAGS) -shared -Wl,-soname,$(TARGET_SONAME) -o $(TARGET) $(patsubst %, %/*.lo, $(SUBDIRS) $(QTSUBDIRS) $(GTKSUBDIRS)) $(UILIBS) $(CORE_LIBS) -rpath ${PREFIX}/lib X #@$(LD) $(LDFLAGS) -dynamiclib -dylinker_install_name $(TARGET_SONAME) -o $(TARGET) $(patsubst %, %/*.o, $(SUBDIRS) $(QTSUBDIRS) $(GTKSUBDIRS)) $(UILIBS) $(CORE_LIBS) X- @ln -sf $(TARGET) $(TARGET_SONAME) X- @ln -sf $(TARGET) $(TARGET_SHORTNAME) X else X @$(AR) $(TARGET) $(patsubst %, %/*.o, $(SUBDIRS) $(QTSUBDIRS) $(GTKSUBDIRS)) X endif X@@ -143,9 +141,7 @@ do_install: X @install -m 0644 data/style.$(TARGET_ARCH).qss $(SHARE_ZLIBRARY)/style.qss X ifeq "$(ZLSHARED)" "yes" X @install -d $(DESTDIR)$(LIBDIR) X- @install $(TARGET) $(DESTDIR)$(LIBDIR) X- @ln -sf $(TARGET) $(DESTDIR)$(LIBDIR)/$(TARGET_SONAME) X- @ln -sf $(TARGET) $(DESTDIR)$(LIBDIR)/$(TARGET_SHORTNAME) X+ @${LIBTOOL} --mode=install install $(TARGET) $(DESTDIR)$(LIBDIR) X endif X X do_install_dev: END-of-patches/patch-zlibrary_ui_Makefile echo x - patches/patch-zlibrary_ui_src_qt4_application_LineEditParameter.cpp sed 's/^X//' >patches/patch-zlibrary_ui_src_qt4_application_LineEditParameter.cpp << 'END-of-patches/patch-zlibrary_ui_src_qt4_application_LineEditParameter.cpp' X$NetBSD$ X X--- zlibrary/ui/src/qt4/application/LineEditParameter.cpp.orig 2012-11-30 12:41:25.000000000 +0000 X+++ zlibrary/ui/src/qt4/application/LineEditParameter.cpp X@@ -17,9 +17,9 @@ X * 02110-1301, USA. X */ X X-#include X-#include X-#include X+#include X+#include X+#include X #include X X #include "ZLQtApplicationWindow.h" END-of-patches/patch-zlibrary_ui_src_qt4_application_LineEditParameter.cpp echo x - patches/patch-zlibrary_ui_src_qt4_application_ZLQtApplicationWindow.cpp sed 's/^X//' >patches/patch-zlibrary_ui_src_qt4_application_ZLQtApplicationWindow.cpp << 'END-of-patches/patch-zlibrary_ui_src_qt4_application_ZLQtApplicationWindow.cpp' X$NetBSD$ X X--- zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp.orig 2012-11-30 12:41:25.000000000 +0000 X+++ zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp X@@ -17,17 +17,17 @@ X * 02110-1301, USA. X */ X X-#include X+#include X #include X #include X #include X-#include X-#include X-#include X-#include X-#include X+#include X+#include X+#include X+#include X+#include X #include X-#include X+#include X #include X X #include END-of-patches/patch-zlibrary_ui_src_qt4_application_ZLQtApplicationWindow.cpp echo x - patches/patch-zlibrary_ui_src_qt4_application_ZLQtApplicationWindow.h sed 's/^X//' >patches/patch-zlibrary_ui_src_qt4_application_ZLQtApplicationWindow.h << 'END-of-patches/patch-zlibrary_ui_src_qt4_application_ZLQtApplicationWindow.h' X$NetBSD$ X X--- zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h.orig 2012-11-30 12:41:25.000000000 +0000 X+++ zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h X@@ -22,8 +22,8 @@ X X #include X X-#include X-#include X+#include X+#include X #include X X class QDockWidget; END-of-patches/patch-zlibrary_ui_src_qt4_application_ZLQtApplicationWindow.h echo x - patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtDialog.cpp sed 's/^X//' >patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtDialog.cpp << 'END-of-patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtDialog.cpp' X$NetBSD$ X X--- zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp.orig 2012-11-30 12:41:25.000000000 +0000 X+++ zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp X@@ -17,8 +17,8 @@ X * 02110-1301, USA. X */ X X-#include X-#include X+#include X+#include X X #include X END-of-patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtDialog.cpp echo x - patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtDialog.h sed 's/^X//' >patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtDialog.h << 'END-of-patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtDialog.h' X$NetBSD$ X X--- zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h.orig 2012-11-30 12:41:25.000000000 +0000 X+++ zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h X@@ -20,8 +20,8 @@ X #ifndef __ZLQTDIALOG_H__ X #define __ZLQTDIALOG_H__ X X-#include X-#include X+#include X+#include X X #include X END-of-patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtDialog.h echo x - patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtDialogContent.cpp sed 's/^X//' >patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtDialogContent.cpp << 'END-of-patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtDialogContent.cpp' X$NetBSD$ X X--- zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp.orig 2012-11-30 12:41:25.000000000 +0000 X+++ zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp X@@ -17,10 +17,10 @@ X * 02110-1301, USA. X */ X X-#include X-#include X-#include X-#include X+#include X+#include X+#include X+#include X X #include "ZLQtDialogContent.h" X #include "ZLQtOptionView.h" END-of-patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtDialogContent.cpp echo x - patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtDialogManager.cpp sed 's/^X//' >patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtDialogManager.cpp << 'END-of-patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtDialogManager.cpp' X$NetBSD$ X X--- zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp.orig 2012-11-30 12:41:25.000000000 +0000 X+++ zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp X@@ -17,11 +17,11 @@ X * 02110-1301, USA. X */ X X-#include X-#include X-#include X+#include X+#include X+#include X #include X-#include X+#include X X #include "ZLQtDialogManager.h" X #include "ZLQtDialog.h" END-of-patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtDialogManager.cpp echo x - patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtOpenFileDialog.cpp sed 's/^X//' >patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtOpenFileDialog.cpp << 'END-of-patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtOpenFileDialog.cpp' X$NetBSD$ X X--- zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp.orig 2012-11-30 12:41:25.000000000 +0000 X+++ zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp X@@ -17,7 +17,7 @@ X * 02110-1301, USA. X */ X X-#include X+#include X X #include "ZLQtOpenFileDialog.h" X END-of-patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtOpenFileDialog.cpp echo x - patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtOptionView.cpp sed 's/^X//' >patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtOptionView.cpp << 'END-of-patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtOptionView.cpp' X$NetBSD$ X X--- zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp.orig 2012-11-30 12:41:25.000000000 +0000 X+++ zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp X@@ -19,16 +19,16 @@ X X #include X X-#include X-#include X-#include X-#include X-#include X-#include X-#include X-#include X-#include X-#include X+#include X+#include X+#include X+#include X+#include X+#include X+#include X+#include X+#include X+#include X X #include X #include END-of-patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtOptionView.cpp echo x - patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtOptionsDialog.cpp sed 's/^X//' >patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtOptionsDialog.cpp << 'END-of-patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtOptionsDialog.cpp' X$NetBSD$ X X--- zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp.orig 2012-11-30 12:41:25.000000000 +0000 X+++ zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp X@@ -17,11 +17,11 @@ X * 02110-1301, USA. X */ X X-#include X-#include X-#include X-#include X-#include X+#include X+#include X+#include X+#include X+#include X #include X X #include END-of-patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtOptionsDialog.cpp echo x - patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtOptionsDialog.h sed 's/^X//' >patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtOptionsDialog.h << 'END-of-patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtOptionsDialog.h' X$NetBSD$ X X--- zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h.orig 2012-11-30 12:41:25.000000000 +0000 X+++ zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h X@@ -20,9 +20,9 @@ X #ifndef __ZLQTOPTIONSDIALOG_H__ X #define __ZLQTOPTIONSDIALOG_H__ X X-#include X-#include X-#include X+#include X+#include X+#include X X #include "../../../../core/src/desktop/dialogs/ZLDesktopOptionsDialog.h" X END-of-patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtOptionsDialog.h echo x - patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtProgressDialog.cpp sed 's/^X//' >patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtProgressDialog.cpp << 'END-of-patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtProgressDialog.cpp' X$NetBSD$ X X--- zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp.orig 2012-11-30 12:41:25.000000000 +0000 X+++ zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp X@@ -19,11 +19,11 @@ X X #include X X-#include X-#include X-#include X-#include X-#include X+#include X+#include X+#include X+#include X+#include X #include X X #include "../dialogs/ZLQtDialogManager.h" END-of-patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtProgressDialog.cpp echo x - patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtProgressDialog.h sed 's/^X//' >patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtProgressDialog.h << 'END-of-patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtProgressDialog.h' X$NetBSD$ X X--- zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h.orig 2012-11-30 12:41:25.000000000 +0000 X+++ zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h X@@ -22,11 +22,11 @@ X X #include X X-#include X+#include X #include X-#include X-#include X-#include X+#include X+#include X+#include X #include X X #include END-of-patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtProgressDialog.h echo x - patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtTreeDialog.cpp sed 's/^X//' >patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtTreeDialog.cpp << 'END-of-patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtTreeDialog.cpp' X$NetBSD$ X X--- zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp.orig 2012-11-30 12:41:25.000000000 +0000 X+++ zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp X@@ -19,12 +19,12 @@ X X #include X X-#include X-#include X-#include X-#include X #include X #include X+#include X+#include X+#include X+#include X X #include X #include END-of-patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtTreeDialog.cpp echo x - patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtTreeDialog.h sed 's/^X//' >patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtTreeDialog.h << 'END-of-patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtTreeDialog.h' X$NetBSD$ X X--- zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h.orig 2012-11-30 12:41:25.000000000 +0000 X+++ zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h X@@ -24,12 +24,12 @@ X #include X #include X X-#include X-#include X-#include X-#include X-#include X-#include X+#include X+#include X+#include X+#include X+#include X+#include X X #include X END-of-patches/patch-zlibrary_ui_src_qt4_dialogs_ZLQtTreeDialog.h echo x - patches/patch-zlibrary_ui_src_qt4_library_ZLQApplication.h sed 's/^X//' >patches/patch-zlibrary_ui_src_qt4_library_ZLQApplication.h << 'END-of-patches/patch-zlibrary_ui_src_qt4_library_ZLQApplication.h' X$NetBSD$ X X--- zlibrary/ui/src/qt4/library/ZLQApplication.h.orig 2012-11-30 12:41:25.000000000 +0000 X+++ zlibrary/ui/src/qt4/library/ZLQApplication.h X@@ -20,7 +20,7 @@ X #ifndef __ZLQAPPLICATION_H__ X #define __ZLQAPPLICATION_H__ X X-#include X+#include X X class ZLQApplication : public QApplication { X END-of-patches/patch-zlibrary_ui_src_qt4_library_ZLQApplication.h echo x - patches/patch-zlibrary_ui_src_qt4_library_ZLibrary.cpp sed 's/^X//' >patches/patch-zlibrary_ui_src_qt4_library_ZLibrary.cpp << 'END-of-patches/patch-zlibrary_ui_src_qt4_library_ZLibrary.cpp' X$NetBSD$ X X--- zlibrary/ui/src/qt4/library/ZLibrary.cpp.orig 2012-11-30 12:41:25.000000000 +0000 X+++ zlibrary/ui/src/qt4/library/ZLibrary.cpp X@@ -19,7 +19,7 @@ X X #include X #include X-#include X+#include X #include X X #include X@@ -72,7 +72,7 @@ bool ZLQApplication::event(QEvent *e) { X void ZLQtLibraryImplementation::init(int &argc, char **&argv) { X new ZLQApplication(argc, argv); X X- QTextCodec::setCodecForCStrings(QTextCodec::codecForName("utf-8")); X+ QTextCodec::setCodecForLocale(QTextCodec::codecForName("utf-8")); X X ZLibrary::parseArguments(argc, argv); X END-of-patches/patch-zlibrary_ui_src_qt4_library_ZLibrary.cpp echo x - patches/patch-zlibrary_ui_src_qt4_network_ZLQtNetworkManager.cpp sed 's/^X//' >patches/patch-zlibrary_ui_src_qt4_network_ZLQtNetworkManager.cpp << 'END-of-patches/patch-zlibrary_ui_src_qt4_network_ZLQtNetworkManager.cpp' X$NetBSD$ X X--- zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp.orig 2012-11-30 12:41:25.000000000 +0000 X+++ zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp X@@ -24,7 +24,9 @@ X #include X #include X #include X+#include X X+#include X #include X #include X #include X@@ -149,12 +151,12 @@ void ZLQtNetworkManager::prepareReply(ZL X QNetworkReply *reply = NULL; X if (!scope.request->postParameters().empty()) { X QByteArray data; X- QUrl tmp; X+ QUrlQuery tmp; X typedef std::pair string_pair; X foreach (const string_pair &pair, scope.request->postParameters()) { X tmp.addQueryItem(QString::fromStdString(pair.first), QString::fromStdString(pair.second)); X } X- data = tmp.encodedQuery(); X+ data = tmp.query(QUrl::FullyEncoded).toUtf8(); //encodedQuery(); X reply = const_cast(myManager).post(networkRequest, data); X } else { X reply = const_cast(myManager).get(networkRequest); END-of-patches/patch-zlibrary_ui_src_qt4_network_ZLQtNetworkManager.cpp echo x - patches/patch-zlibrary_ui_src_qt4_tree_QtWaitingSpinner.h sed 's/^X//' >patches/patch-zlibrary_ui_src_qt4_tree_QtWaitingSpinner.h << 'END-of-patches/patch-zlibrary_ui_src_qt4_tree_QtWaitingSpinner.h' X$NetBSD$ X X--- zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h.orig 2012-11-30 12:41:25.000000000 +0000 X+++ zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h X@@ -3,7 +3,7 @@ X X #include X X-#include X+#include X #include X X class QtWaitingSpinner : public QWidget { END-of-patches/patch-zlibrary_ui_src_qt4_tree_QtWaitingSpinner.h echo x - patches/patch-zlibrary_ui_src_qt4_tree_ZLQtItemsListWidget.cpp sed 's/^X//' >patches/patch-zlibrary_ui_src_qt4_tree_ZLQtItemsListWidget.cpp << 'END-of-patches/patch-zlibrary_ui_src_qt4_tree_ZLQtItemsListWidget.cpp' X$NetBSD$ X X--- zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp.orig 2012-11-30 12:41:25.000000000 +0000 X+++ zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp X@@ -17,14 +17,14 @@ X * 02110-1301, USA. X */ X X-#include X-#include X #include X #include X #include X #include X-#include X #include X+#include X+#include X+#include X X #include X END-of-patches/patch-zlibrary_ui_src_qt4_tree_ZLQtItemsListWidget.cpp echo x - patches/patch-zlibrary_ui_src_qt4_tree_ZLQtItemsListWidget.h sed 's/^X//' >patches/patch-zlibrary_ui_src_qt4_tree_ZLQtItemsListWidget.h << 'END-of-patches/patch-zlibrary_ui_src_qt4_tree_ZLQtItemsListWidget.h' X$NetBSD$ X X--- zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h.orig 2012-11-30 12:41:25.000000000 +0000 X+++ zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h X@@ -20,12 +20,12 @@ X #ifndef __ZLQTITEMSLISTWIDGET_H__ X #define __ZLQTITEMSLISTWIDGET_H__ X X-#include X-#include X-#include X-#include X-#include X-#include X+#include X+#include X+#include X+#include X+#include X+#include X X #include X END-of-patches/patch-zlibrary_ui_src_qt4_tree_ZLQtItemsListWidget.h echo x - patches/patch-zlibrary_ui_src_qt4_tree_ZLQtPreviewWidget.cpp sed 's/^X//' >patches/patch-zlibrary_ui_src_qt4_tree_ZLQtPreviewWidget.cpp << 'END-of-patches/patch-zlibrary_ui_src_qt4_tree_ZLQtPreviewWidget.cpp' X$NetBSD$ X X--- zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp.orig 2012-11-30 12:41:25.000000000 +0000 X+++ zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp X@@ -17,10 +17,10 @@ X * 02110-1301, USA. X */ X X-#include X-#include X-#include X-#include X+#include X+#include X+#include X+#include X X #include X END-of-patches/patch-zlibrary_ui_src_qt4_tree_ZLQtPreviewWidget.cpp echo x - patches/patch-zlibrary_ui_src_qt4_tree_ZLQtPreviewWidget.h sed 's/^X//' >patches/patch-zlibrary_ui_src_qt4_tree_ZLQtPreviewWidget.h << 'END-of-patches/patch-zlibrary_ui_src_qt4_tree_ZLQtPreviewWidget.h' X$NetBSD$ X X--- zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h.orig 2012-11-30 12:41:25.000000000 +0000 X+++ zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h X@@ -20,11 +20,11 @@ X #ifndef __ZLQTPREVIEWWIDGET_H__ X #define __ZLQTPREVIEWWIDGET_H__ X X-#include X-#include X-#include X-#include X-#include X+#include X+#include X+#include X+#include X+#include X #include X X #include END-of-patches/patch-zlibrary_ui_src_qt4_tree_ZLQtPreviewWidget.h echo x - patches/patch-zlibrary_ui_src_qt4_tree_ZLQtSearchField.cpp sed 's/^X//' >patches/patch-zlibrary_ui_src_qt4_tree_ZLQtSearchField.cpp << 'END-of-patches/patch-zlibrary_ui_src_qt4_tree_ZLQtSearchField.cpp' X$NetBSD$ X X--- zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp.orig 2012-11-30 12:41:25.000000000 +0000 X+++ zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp X@@ -18,9 +18,9 @@ X */ X X #include X-#include X-#include X-#include X+#include X+#include X+#include X X #include X #include END-of-patches/patch-zlibrary_ui_src_qt4_tree_ZLQtSearchField.cpp echo x - patches/patch-zlibrary_ui_src_qt4_tree_ZLQtSearchField.h sed 's/^X//' >patches/patch-zlibrary_ui_src_qt4_tree_ZLQtSearchField.h << 'END-of-patches/patch-zlibrary_ui_src_qt4_tree_ZLQtSearchField.h' X$NetBSD$ X X--- zlibrary/ui/src/qt4/tree/ZLQtSearchField.h.orig 2012-11-30 12:41:25.000000000 +0000 X+++ zlibrary/ui/src/qt4/tree/ZLQtSearchField.h X@@ -21,8 +21,8 @@ X #define __ZLQTSEARCHFIELD_H__ X X #include X-#include X-#include X+#include X+#include X X #include "QtWaitingSpinner.h" X #include "ZLQtItemsListWidget.h" END-of-patches/patch-zlibrary_ui_src_qt4_tree_ZLQtSearchField.h echo x - patches/patch-zlibrary_ui_src_qt4_view_ZLQtViewWidget.cpp sed 's/^X//' >patches/patch-zlibrary_ui_src_qt4_view_ZLQtViewWidget.cpp << 'END-of-patches/patch-zlibrary_ui_src_qt4_view_ZLQtViewWidget.cpp' X$NetBSD$ X X--- zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp.orig 2012-11-30 12:41:25.000000000 +0000 X+++ zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp X@@ -19,8 +19,8 @@ X X #include X X-#include X-#include X+#include X+#include X #include X #include X #include X@@ -185,11 +185,11 @@ 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->setVisible(enabled && myShowScrollBarAtRight); X+ myLeftScrollBar->setVisible(enabled && !myShowScrollBarAtRight); X } else { X- myBottomScrollBar->setShown(enabled && myShowScrollBarAtBottom); X- myTopScrollBar->setShown(enabled && !myShowScrollBarAtBottom); X+ myBottomScrollBar->setVisible(enabled && myShowScrollBarAtBottom); X+ myTopScrollBar->setVisible(enabled && !myShowScrollBarAtBottom); X } X } X END-of-patches/patch-zlibrary_ui_src_qt4_view_ZLQtViewWidget.cpp echo x - patches/patch-zlibrary_ui_src_qt4_view_ZLQtViewWidget.h sed 's/^X//' >patches/patch-zlibrary_ui_src_qt4_view_ZLQtViewWidget.h << 'END-of-patches/patch-zlibrary_ui_src_qt4_view_ZLQtViewWidget.h' X$NetBSD$ X X--- zlibrary/ui/src/qt4/view/ZLQtViewWidget.h.orig 2012-11-30 12:41:25.000000000 +0000 X+++ zlibrary/ui/src/qt4/view/ZLQtViewWidget.h X@@ -20,7 +20,7 @@ X #ifndef __ZLQTVIEWWIDGET_H__ X #define __ZLQTVIEWWIDGET_H__ X X-#include X+#include X X #include "../../../../core/src/view/ZLViewWidget.h" X #include END-of-patches/patch-zlibrary_ui_src_qt4_view_ZLQtViewWidget.h exit