summaryrefslogtreecommitdiff
path: root/misc/fbreader
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2011-08-22 11:24:06 +0000
committerwiz <wiz@pkgsrc.org>2011-08-22 11:24:06 +0000
commitfef67d203f08dc846e3745f5281c04c7747453a6 (patch)
tree8cc21b4b5ad1d39d1ecd1e06e0bbb453a64883b1 /misc/fbreader
parentbd7959dafe09220ba1d111b8393ce430aa7c8831 (diff)
downloadpkgsrc-fef67d203f08dc846e3745f5281c04c7747453a6.tar.gz
Fix build with gcc-4.5.
Include desktopdb.mk. Bump PKGREVISION.
Diffstat (limited to 'misc/fbreader')
-rw-r--r--misc/fbreader/Makefile5
-rw-r--r--misc/fbreader/distinfo3
-rw-r--r--misc/fbreader/patches/patch-zlibrary_text_src_view_ZLTextStyle.h15
3 files changed, 20 insertions, 3 deletions
diff --git a/misc/fbreader/Makefile b/misc/fbreader/Makefile
index df8a88cf647..eb7c27df5ad 100644
--- a/misc/fbreader/Makefile
+++ b/misc/fbreader/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2011/04/22 13:44:09 obache Exp $
+# $NetBSD: Makefile,v 1.15 2011/08/22 11:24:06 wiz Exp $
#
DISTNAME= fbreader-sources-0.10.7
PKGNAME= ${DISTNAME:S/-sources//}
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= misc
MASTER_SITES= http://www.fbreader.org/
EXTRACT_SUFX= .tgz
@@ -37,6 +37,7 @@ CPPFLAGS+= -DDO_ICONV_CAST
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../textproc/expat/buildlink3.mk"
.include "../../textproc/liblinebreak/buildlink3.mk"
.include "../../www/curl/buildlink3.mk"
diff --git a/misc/fbreader/distinfo b/misc/fbreader/distinfo
index d75fee20e5d..e4ee85a1ffe 100644
--- a/misc/fbreader/distinfo
+++ b/misc/fbreader/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2010/04/05 18:50:48 wiz Exp $
+$NetBSD: distinfo,v 1.4 2011/08/22 11:24:06 wiz Exp $
SHA1 (fbreader-sources-0.10.7.tgz) = d47a2fa46d43057cac9408db1f2c409f0d3a9942
RMD160 (fbreader-sources-0.10.7.tgz) = dec4d8ee716697dd021535295c9fe62970f059a2
@@ -12,3 +12,4 @@ SHA1 (patch-ag) = 19e92bd82df3cfb134ff17c9bdbb59028aceff95
SHA1 (patch-ah) = 1a154c4650eefd8d255e3b17583e401000c07a54
SHA1 (patch-ai) = d62ca84596a94f1ec020d419eb0c4f0a28422e1e
SHA1 (patch-aj) = 5db2865b8975eb9972ec78ebc0914a81bd382b4c
+SHA1 (patch-zlibrary_text_src_view_ZLTextStyle.h) = a4b82ee22148ef3a5f381fb85583ac6f838a24d1
diff --git a/misc/fbreader/patches/patch-zlibrary_text_src_view_ZLTextStyle.h b/misc/fbreader/patches/patch-zlibrary_text_src_view_ZLTextStyle.h
new file mode 100644
index 00000000000..f0b5d9974dc
--- /dev/null
+++ b/misc/fbreader/patches/patch-zlibrary_text_src_view_ZLTextStyle.h
@@ -0,0 +1,15 @@
+$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 {