Date: Fri, 21 Mar 2014 17:37:01 +0200 (EET) From: Johannes Jost Meixner <xmj@chaot.net> To: FreeBSD-gnats-submit@freebsd.org Cc: fluffy@FreeBSD.org Subject: ports/187819: [PATCH] deskutils/FBReader: update to 0.99.6 Message-ID: <17752249537734545428.enqueue@mx12.chaot.net> Resent-Message-ID: <201403211540.s2LFe07n084102@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 187819 >Category: ports >Synopsis: [PATCH] deskutils/FBReader: update to 0.99.6 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Mar 21 15:40:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Johannes Jost Meixner >Release: FreeBSD 11.0-CURRENT amd64 >Organization: Goldener Grund OUe >Environment: System: FreeBSD mx12.chaot.net 11.0-CURRENT FreeBSD 11.0-CURRENT #6: Wed Mar 19 11:02:48 EET 2014 >Description: - Update to 0.99.6 - Change master-site to github as the release there is newer - Make the UI choice a single option, with Qt4 as default to main backwards compat. - Set PORTNAME to uppercase to match binaries and datadir Port maintainer (fluffy@FreeBSD.org) is cc'd. portlint: 0 fatal errors and 2 warnings found. port test: ok testport: ok redports: https://redports.org/buildarchive/20140321150600-42877/ Generated with FreeBSD Port Tools 1.00.2014.03.12 (mode: update, diff: SVN) >How-To-Repeat: >Fix: --- FBReader-0.99.6.patch begins here --- Index: Makefile =================================================================== --- Makefile (revision 348737) +++ Makefile (working copy) @@ -1,13 +1,9 @@ # Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org> # $FreeBSD$ -PORTNAME= fbreader -PORTVERSION= 0.99.4 -DISTVERSIONPREFIX= sources- +PORTNAME= FBReader +PORTVERSION= 0.99.6 CATEGORIES= deskutils -MASTER_SITES= http://www.fbreader.org/files/desktop/ \ - http://old.fbreader.org/ -EXTRACT_SUFX= .tgz MAINTAINER= fluffy@FreeBSD.org COMMENT= Powerful e-book reader @@ -17,15 +13,16 @@ libfribidi.so:${PORTSDIR}/converters/fribidi \ libunibreak.so:${PORTSDIR}/textproc/libunibreak -.if defined(WITH_GTK2) -UI= gtk -USE_GNOME= gtk20 -.else -UI= qt4 -USE_QT4= gui corelib imageformats network moc_build -LDFLAGS+= -L${QT_LIBDIR} -.endif +OPTIONS_SINGLE= UI +OPTIONS_SINGLE_UI= GTK2 QT4 +OPTIONS_DEFAULT= QT4 +USE_GITHUB= yes +GH_ACCOUNT= geometer +GH_PROJECT= FBReader +GH_COMMIT= 7abc80d +GH_TAGNAME= 0.99.6-freebsdport + .if defined(WITH_DEBUG) STATUS= debug .else @@ -32,13 +29,23 @@ STATUS= release .endif -USES= iconv gmake pkgconfig +USES= iconv gmake pkgconfig compiler USE_SQLITE= yes USE_LDCONFIG= yes +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MGTK2} +UI= gtk +USE_GNOME= gtk20 +.else +UI= qt4 +USE_QT4= gui corelib imageformats network moc_build +LDFLAGS+= -L${QT_LIBDIR} +.endif + INSTALL_TARGET= do_install PLIST_SUB= UI=${UI} -WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -52,8 +59,10 @@ -e '/^CC/d;/^LD/d;/QTINCLUDE/s,-I.*$$,-I${QT_INCDIR},;s,libpng ,libpng15 ,' \ ${WRKSRC}/makefiles/arch/desktop.mk @${REINPLACE_CMD} -e 's,-O3,,;s,-ldl,${ICONV_LIB},' \ - ${WRKSRC}/makefiles/config.mk ${WRKSRC}/zlibrary/core/Makefile + ${WRKSRC}/makefiles/config.mk ${WRKSRC}/zlibrary/core/Makefile + @${REINPLACE_CMD} -e 's/-llinebreak/-lunibreak/g' ${WRKSRC}/zlibrary/text/Makefile @${REINPLACE_CMD} -e 's,/usr,${PREFIX},' ${WRKSRC}/fbreader/desktop/Makefile + ${REINPLACE_CMD} -e 's/-llinebreak/-lunibreak/g' ${WRKSRC}/makefiles/*.mk @${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} \ -e 's,make ,gmake ,' Index: distinfo =================================================================== --- distinfo (revision 348737) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (fbreader-sources-0.99.4.tgz) = 3d7c31d5ea314589d2a963290ad16f4d3d631a41e802b8b39f8be0c9f71eb8e9 -SIZE (fbreader-sources-0.99.4.tgz) = 2345664 +SHA256 (FBReader-0.99.6.tar.gz) = b1c9baac7281dce8eaa5e54c64e798ea00cfa1e4f9d712efed79a5cd6702c30c +SIZE (FBReader-0.99.6.tar.gz) = 24848140 Index: files/patch-fbreader__src__fbreader__FBReaderActions.cpp =================================================================== --- files/patch-fbreader__src__fbreader__FBReaderActions.cpp (revision 348737) +++ files/patch-fbreader__src__fbreader__FBReaderActions.cpp (working copy) @@ -1,10 +1,11 @@ ---- ./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 @@ +--- ./fbreader/src/fbreader/FBReaderActions.cpp.orig 2014-03-19 23:09:10.000000000 +0200 ++++ ./fbreader/src/fbreader/FBReaderActions.cpp 2014-03-19 23:08:26.000000000 +0200 +@@ -18,6 +18,8 @@ */ #include <algorithm> +#include <cstdlib> ++ #include <ZLStringUtil.h> #include <ZLDialogManager.h> Index: pkg-plist =================================================================== --- pkg-plist (revision 348737) +++ pkg-plist (working copy) @@ -1,74 +1,72 @@ bin/FBReader -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 -share/FBReader/default/keymap.xml -share/FBReader/default/styles.xml -share/FBReader/default/toolbar.xml -share/FBReader/formats/fb2/FBReaderVersion.ent -share/FBReader/formats/fb2/fb2genres.xml -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 -share/FBReader/help/MiniHelp.lt.fb2 -share/FBReader/help/MiniHelp.nl.fb2 -share/FBReader/help/MiniHelp.ru.fb2 -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/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 -share/FBReader/resources/vi.xml -share/FBReader/resources/zh.xml +lib/libzlcore.so.0.14 +lib/libzlcore.so.0.14.0 +lib/libzltext.so.0.14 +lib/libzltext.so.0.14.0 +lib/zlibrary/ui/zlui-%%UI%%.so +%%DATADIR%%/default/config.xml +%%DATADIR%%/default/external.xml +%%DATADIR%%/default/fullscreen_toolbar.xml +%%DATADIR%%/default/keymap.xml +%%DATADIR%%/default/styles.xml +%%DATADIR%%/default/toolbar.xml +%%DATADIR%%/formats/fb2/FBReaderVersion.ent +%%DATADIR%%/formats/fb2/fb2genres.xml +%%DATADIR%%/formats/html/html.ent +%%DATADIR%%/formats/xhtml/xhtml-lat1.ent +%%DATADIR%%/formats/xhtml/xhtml-special.ent +%%DATADIR%%/formats/xhtml/xhtml-symbol.ent +%%DATADIR%%/help/MiniHelp.bg.fb2 +%%DATADIR%%/help/MiniHelp.cs.fb2 +%%DATADIR%%/help/MiniHelp.de.fb2 +%%DATADIR%%/help/MiniHelp.en.fb2 +%%DATADIR%%/help/MiniHelp.es.fb2 +%%DATADIR%%/help/MiniHelp.fi.fb2 +%%DATADIR%%/help/MiniHelp.fr.fb2 +%%DATADIR%%/help/MiniHelp.hu.fb2 +%%DATADIR%%/help/MiniHelp.id.fb2 +%%DATADIR%%/help/MiniHelp.it.fb2 +%%DATADIR%%/help/MiniHelp.lt.fb2 +%%DATADIR%%/help/MiniHelp.nl.fb2 +%%DATADIR%%/help/MiniHelp.ru.fb2 +%%DATADIR%%/help/MiniHelp.sv.fb2 +%%DATADIR%%/help/MiniHelp.uk.fb2 +%%DATADIR%%/help/MiniHelp.vi.fb2 +%%DATADIR%%/help/MiniHelp.zh.fb2 +%%DATADIR%%/network/booksonboard.com.xml +%%DATADIR%%/network/certificates/litres.ru.crt +%%DATADIR%%/network/feedbooks.com.xml +%%DATADIR%%/network/litres.ru.xml +%%DATADIR%%/network/manybooks.net.xml +%%DATADIR%%/network/shucang.com.xml +%%DATADIR%%/network/smashwords.com.xml +%%DATADIR%%/resources/ar.xml +%%DATADIR%%/resources/bg.xml +%%DATADIR%%/resources/cs.xml +%%DATADIR%%/resources/de.xml +%%DATADIR%%/resources/en.xml +%%DATADIR%%/resources/eo.xml +%%DATADIR%%/resources/es.xml +%%DATADIR%%/resources/fi.xml +%%DATADIR%%/resources/fr.xml +%%DATADIR%%/resources/hu.xml +%%DATADIR%%/resources/id.xml +%%DATADIR%%/resources/it.xml +%%DATADIR%%/resources/lt.xml +%%DATADIR%%/resources/nl.xml +%%DATADIR%%/resources/pl.xml +%%DATADIR%%/resources/ru.xml +%%DATADIR%%/resources/sv.xml +%%DATADIR%%/resources/uk.xml +%%DATADIR%%/resources/vi.xml +%%DATADIR%%/resources/zh.xml 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 @@ -76,8 +74,6 @@ 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 @@ -87,21 +83,15 @@ 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 @@ -144,7 +134,6 @@ 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 @@ -156,18 +145,21 @@ share/zlibrary/resources/uk.xml share/zlibrary/resources/vi.xml share/zlibrary/resources/zh.xml -share/zlibrary/style.qss share/zlibrary/unicode.xml.gz -@dirrm share/FBReader/default -@dirrm share/FBReader/formats/fb2 -@dirrm share/FBReader/formats/html -@dirrm share/FBReader/formats/xhtml -@dirrm share/FBReader/formats -@dirrm share/FBReader/help -@dirrm share/FBReader/resources -@dirrm share/FBReader -@dirrm share/pixmaps/FBReader +@dirrm share/zlibrary/resources +@dirrm share/zlibrary/encodings @dirrm share/zlibrary/default -@dirrm share/zlibrary/encodings -@dirrm share/zlibrary/resources @dirrm share/zlibrary +@dirrm share/pixmaps/FBReader +@dirrm %%DATADIR%%/resources +@dirrm %%DATADIR%%/network/certificates +@dirrm %%DATADIR%%/network +@dirrm %%DATADIR%%/help +@dirrm %%DATADIR%%/formats/xhtml +@dirrm %%DATADIR%%/formats/html +@dirrm %%DATADIR%%/formats/fb2 +@dirrm %%DATADIR%%/formats +@dirrm %%DATADIR%%/default +@dirrm %%DATADIR%% +@dirrm lib/zlibrary/ui +@dirrm lib/zlibrary --- FBReader-0.99.6.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?17752249537734545428.enqueue>