Mon Aug 22 11:24:07 2011 UTC ()
Fix build with gcc-4.5.
Include desktopdb.mk.
Bump PKGREVISION.


(wiz)
diff -r1.14 -r1.15 pkgsrc/misc/fbreader/Makefile
diff -r1.3 -r1.4 pkgsrc/misc/fbreader/distinfo
diff -r0 -r1.1 pkgsrc/misc/fbreader/patches/patch-zlibrary_text_src_view_ZLTextStyle.h
cvs diff -r1.14 -r1.15 pkgsrc/misc/fbreader/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/fbreader/Makefile 2011/04/22 13:44:09 1.14
+++ pkgsrc/misc/fbreader/Makefile 2011/08/22 11:24:06 1.15
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.14 2011/04/22 13:44:09 obache Exp $ 1# $NetBSD: Makefile,v 1.15 2011/08/22 11:24:06 wiz Exp $
2# 2#
3 3
4DISTNAME= fbreader-sources-0.10.7 4DISTNAME= fbreader-sources-0.10.7
5PKGNAME= ${DISTNAME:S/-sources//} 5PKGNAME= ${DISTNAME:S/-sources//}
6PKGREVISION= 7 6PKGREVISION= 8
7CATEGORIES= misc 7CATEGORIES= misc
8MASTER_SITES= http://www.fbreader.org/ 8MASTER_SITES= http://www.fbreader.org/
9EXTRACT_SUFX= .tgz 9EXTRACT_SUFX= .tgz
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.fbreader.org/ 12HOMEPAGE= http://www.fbreader.org/
13COMMENT= Ebook reader software 13COMMENT= Ebook reader software
14LICENSE= gnu-gpl-v2 AND modified-bsd 14LICENSE= gnu-gpl-v2 AND modified-bsd
15 15
16PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
17 17
18WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 18WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
19USE_LANGUAGES= c c++ 19USE_LANGUAGES= c c++
@@ -27,17 +27,18 @@ MAKE_ENV+= TARGET_ARCH=desktop @@ -27,17 +27,18 @@ MAKE_ENV+= TARGET_ARCH=desktop
27.include "../../mk/bsd.prefs.mk" 27.include "../../mk/bsd.prefs.mk"
28 28
29.if ${OPSYS} == "SunOS" || ${OPSYS} == "NetBSD" 29.if ${OPSYS} == "SunOS" || ${OPSYS} == "NetBSD"
30CPPFLAGS+= -DDO_ICONV_CAST 30CPPFLAGS+= -DDO_ICONV_CAST
31.endif 31.endif
32 32
33.include "options.mk" 33.include "options.mk"
34 34
35.include "../../archivers/bzip2/buildlink3.mk" 35.include "../../archivers/bzip2/buildlink3.mk"
36.include "../../converters/fribidi/buildlink3.mk" 36.include "../../converters/fribidi/buildlink3.mk"
37.include "../../devel/zlib/buildlink3.mk" 37.include "../../devel/zlib/buildlink3.mk"
38.include "../../mk/jpeg.buildlink3.mk" 38.include "../../mk/jpeg.buildlink3.mk"
39.include "../../graphics/png/buildlink3.mk" 39.include "../../graphics/png/buildlink3.mk"
 40.include "../../sysutils/desktop-file-utils/desktopdb.mk"
40.include "../../textproc/expat/buildlink3.mk" 41.include "../../textproc/expat/buildlink3.mk"
41.include "../../textproc/liblinebreak/buildlink3.mk" 42.include "../../textproc/liblinebreak/buildlink3.mk"
42.include "../../www/curl/buildlink3.mk" 43.include "../../www/curl/buildlink3.mk"
43.include "../../mk/bsd.pkg.mk" 44.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/misc/fbreader/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/fbreader/distinfo 2010/04/05 18:50:48 1.3
+++ pkgsrc/misc/fbreader/distinfo 2011/08/22 11:24:06 1.4
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1$NetBSD: distinfo,v 1.3 2010/04/05 18:50:48 wiz Exp $ 1$NetBSD: distinfo,v 1.4 2011/08/22 11:24:06 wiz Exp $
2 2
3SHA1 (fbreader-sources-0.10.7.tgz) = d47a2fa46d43057cac9408db1f2c409f0d3a9942 3SHA1 (fbreader-sources-0.10.7.tgz) = d47a2fa46d43057cac9408db1f2c409f0d3a9942
4RMD160 (fbreader-sources-0.10.7.tgz) = dec4d8ee716697dd021535295c9fe62970f059a2 4RMD160 (fbreader-sources-0.10.7.tgz) = dec4d8ee716697dd021535295c9fe62970f059a2
5Size (fbreader-sources-0.10.7.tgz) = 1600984 bytes 5Size (fbreader-sources-0.10.7.tgz) = 1600984 bytes
6SHA1 (patch-aa) = c76391244ee4a5f2efb1729157638ddb1ca97d3e 6SHA1 (patch-aa) = c76391244ee4a5f2efb1729157638ddb1ca97d3e
7SHA1 (patch-ab) = b2b2efd7389a847429003e460bd3ccfe4fb27722 7SHA1 (patch-ab) = b2b2efd7389a847429003e460bd3ccfe4fb27722
8SHA1 (patch-ac) = 95c7a7bee4cfc017cdf52ac04895d78fde2530df 8SHA1 (patch-ac) = 95c7a7bee4cfc017cdf52ac04895d78fde2530df
9SHA1 (patch-ae) = 29b33b9440e013cf87ae02ec4d32826f62e6b2ba 9SHA1 (patch-ae) = 29b33b9440e013cf87ae02ec4d32826f62e6b2ba
10SHA1 (patch-af) = dad6ecbf5ca5663d11ea4a5dbb0bed1ab3cae6d8 10SHA1 (patch-af) = dad6ecbf5ca5663d11ea4a5dbb0bed1ab3cae6d8
11SHA1 (patch-ag) = 19e92bd82df3cfb134ff17c9bdbb59028aceff95 11SHA1 (patch-ag) = 19e92bd82df3cfb134ff17c9bdbb59028aceff95
12SHA1 (patch-ah) = 1a154c4650eefd8d255e3b17583e401000c07a54 12SHA1 (patch-ah) = 1a154c4650eefd8d255e3b17583e401000c07a54
13SHA1 (patch-ai) = d62ca84596a94f1ec020d419eb0c4f0a28422e1e 13SHA1 (patch-ai) = d62ca84596a94f1ec020d419eb0c4f0a28422e1e
14SHA1 (patch-aj) = 5db2865b8975eb9972ec78ebc0914a81bd382b4c 14SHA1 (patch-aj) = 5db2865b8975eb9972ec78ebc0914a81bd382b4c
 15SHA1 (patch-zlibrary_text_src_view_ZLTextStyle.h) = a4b82ee22148ef3a5f381fb85583ac6f838a24d1
File Added: pkgsrc/misc/fbreader/patches/Attic/patch-zlibrary_text_src_view_ZLTextStyle.h
$NetBSD: patch-zlibrary_text_src_view_ZLTextStyle.h,v 1.1 2011/08/22 11:24:07 wiz Exp $

Fix build with gcc-4.5.

--- zlibrary/text/src/view/ZLTextStyle.h.orig	2009-03-30 12:56:07.000000000 +0000
+++ zlibrary/text/src/view/ZLTextStyle.h
@@ -304,7 +304,7 @@ public:
 
 private:
 	ZLTextPositionIndicatorInfo(const ZLTextPositionIndicatorInfo&);
-	const ZLTextPositionIndicatorInfo operator = (const ZLTextPositionIndicatorInfo&);
+	const ZLTextPositionIndicatorInfo &operator = (const ZLTextPositionIndicatorInfo&);
 };
 
 class ZLTextStyleCollection {