diff options
| author | Dima Panov <fluffy@FreeBSD.org> | 2012-06-12 15:44:44 +0000 |
|---|---|---|
| committer | Dima Panov <fluffy@FreeBSD.org> | 2012-06-12 15:44:44 +0000 |
| commit | 7a0a8929bea1c510b4f30261d294a78b556b49d7 (patch) | |
| tree | c473e4db1d3deb0abdf6eac410b06ee6144283fd /deskutils/fbreader | |
| parent | bc010169fe07c26b473260ceb9070953dd579208 (diff) | |
| download | ports-7a0a8929bea1c510b4f30261d294a78b556b49d7.tar.gz ports-7a0a8929bea1c510b4f30261d294a78b556b49d7.zip | |
- Fix C++ code to allow build with modern compilers (clang/gcc46+)
- Chase libpng15 update
Notes
Notes:
svn path=/head/; revision=299118
Diffstat (limited to 'deskutils/fbreader')
| -rw-r--r-- | deskutils/fbreader/Makefile | 4 | ||||
| -rw-r--r-- | deskutils/fbreader/files/patch-fbreader__src__library__Library.cpp | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/deskutils/fbreader/Makefile b/deskutils/fbreader/Makefile index 146702dd4294..09768945c6ba 100644 --- a/deskutils/fbreader/Makefile +++ b/deskutils/fbreader/Makefile @@ -7,7 +7,7 @@ PORTNAME= fbreader PORTVERSION= 0.12.10 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= sources- CATEGORIES= deskutils MASTER_SITES= http://www.fbreader.org/ @@ -53,7 +53,7 @@ MAKE_ARGS+= MAKE=${GMAKE} LIBDIR=${PREFIX}/lib post-patch: @${REINPLACE_CMD} -e '/^CFLAGS/s,-pipe.*$$,${CFLAGS} -DDO_ICONV_CAST -DLIBICONV_PLUG,' \ - -e '/^CC/d;/^LD/d;/QTINCLUDE/s,-I.*$$,-I${QT_INCDIR},;s,libpng ,libpng14 ,' \ + -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,-liconv,' \ ${WRKSRC}/makefiles/config.mk ${WRKSRC}/zlibrary/core/Makefile diff --git a/deskutils/fbreader/files/patch-fbreader__src__library__Library.cpp b/deskutils/fbreader/files/patch-fbreader__src__library__Library.cpp new file mode 100644 index 000000000000..414c3741ebed --- /dev/null +++ b/deskutils/fbreader/files/patch-fbreader__src__library__Library.cpp @@ -0,0 +1,11 @@ +--- ./fbreader/src/library/Library.cpp 2010-04-01 15:14:24.000000000 +0200 ++++ ./fbreader/src/library/Library.cpp 2010-04-13 13:34:06.000000000 +0200 +@@ -39,7 +39,7 @@ + shared_ptr<Library> Library::ourInstance; + const size_t Library::MaxRecentListSize = 10; + +-Library::Library &Library::Instance() { ++Library &Library::Instance() { + if (ourInstance.isNull()) { + ourInstance = new Library(); + } |