View | Details | Raw Unified | Return to bug 187819 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-17 / +26 lines)
Lines 1-13 Link Here
1
# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
1
# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	fbreader
4
PORTNAME=	FBReader
5
PORTVERSION=	0.99.4
5
PORTVERSION=	0.99.6
6
DISTVERSIONPREFIX=	sources-
7
CATEGORIES=	deskutils
6
CATEGORIES=	deskutils
8
MASTER_SITES=	http://www.fbreader.org/files/desktop/ \
9
		http://old.fbreader.org/
10
EXTRACT_SUFX=	.tgz
11
7
12
MAINTAINER=	fluffy@FreeBSD.org
8
MAINTAINER=	fluffy@FreeBSD.org
13
COMMENT=	Powerful e-book reader
9
COMMENT=	Powerful e-book reader
Lines 17-31 Link Here
17
		libfribidi.so:${PORTSDIR}/converters/fribidi \
13
		libfribidi.so:${PORTSDIR}/converters/fribidi \
18
		libunibreak.so:${PORTSDIR}/textproc/libunibreak
14
		libunibreak.so:${PORTSDIR}/textproc/libunibreak
19
15
20
.if defined(WITH_GTK2)
16
OPTIONS_SINGLE=	UI
21
UI=		gtk
17
OPTIONS_SINGLE_UI=	GTK2 QT4
22
USE_GNOME=	gtk20
18
OPTIONS_DEFAULT=	QT4
23
.else
24
UI=		qt4
25
USE_QT4=	gui corelib imageformats network moc_build
26
LDFLAGS+=	-L${QT_LIBDIR}
27
.endif
28
19
20
USE_GITHUB=	yes
21
GH_ACCOUNT=	geometer
22
GH_PROJECT=	FBReader
23
GH_COMMIT=	7abc80d
24
GH_TAGNAME=	0.99.6-freebsdport
25
29
.if defined(WITH_DEBUG)
26
.if defined(WITH_DEBUG)
30
STATUS=		debug
27
STATUS=		debug
31
.else
28
.else
Lines 32-44 Link Here
32
STATUS=		release
29
STATUS=		release
33
.endif
30
.endif
34
31
35
USES=		iconv gmake pkgconfig
32
USES=		iconv gmake pkgconfig compiler
36
USE_SQLITE=	yes
33
USE_SQLITE=	yes
37
USE_LDCONFIG=	yes
34
USE_LDCONFIG=	yes
38
35
36
.include <bsd.port.options.mk>
37
38
.if ${PORT_OPTIONS:MGTK2}
39
UI=		gtk
40
USE_GNOME=	gtk20
41
.else
42
UI=		qt4
43
USE_QT4=	gui corelib imageformats network moc_build
44
LDFLAGS+=	-L${QT_LIBDIR}
45
.endif
46
39
INSTALL_TARGET=	do_install
47
INSTALL_TARGET=	do_install
40
PLIST_SUB=	UI=${UI}
48
PLIST_SUB=	UI=${UI}
41
WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
42
49
43
CFLAGS+=	-I${LOCALBASE}/include
50
CFLAGS+=	-I${LOCALBASE}/include
44
LDFLAGS+=	-L${LOCALBASE}/lib
51
LDFLAGS+=	-L${LOCALBASE}/lib
Lines 52-59 Link Here
52
		-e '/^CC/d;/^LD/d;/QTINCLUDE/s,-I.*$$,-I${QT_INCDIR},;s,libpng ,libpng15 ,' \
59
		-e '/^CC/d;/^LD/d;/QTINCLUDE/s,-I.*$$,-I${QT_INCDIR},;s,libpng ,libpng15 ,' \
53
		${WRKSRC}/makefiles/arch/desktop.mk
60
		${WRKSRC}/makefiles/arch/desktop.mk
54
	@${REINPLACE_CMD} -e 's,-O3,,;s,-ldl,${ICONV_LIB},' \
61
	@${REINPLACE_CMD} -e 's,-O3,,;s,-ldl,${ICONV_LIB},' \
55
		${WRKSRC}/makefiles/config.mk ${WRKSRC}/zlibrary/core/Makefile
62
		 ${WRKSRC}/makefiles/config.mk ${WRKSRC}/zlibrary/core/Makefile
63
	@${REINPLACE_CMD} -e 's/-llinebreak/-lunibreak/g' ${WRKSRC}/zlibrary/text/Makefile
56
	@${REINPLACE_CMD} -e 's,/usr,${PREFIX},' ${WRKSRC}/fbreader/desktop/Makefile
64
	@${REINPLACE_CMD} -e 's,/usr,${PREFIX},' ${WRKSRC}/fbreader/desktop/Makefile
65
	${REINPLACE_CMD} -e 's/-llinebreak/-lunibreak/g' ${WRKSRC}/makefiles/*.mk
57
	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} \
66
	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} \
58
		-e 's,make ,gmake ,'
67
		-e 's,make ,gmake ,'
59
68
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (fbreader-sources-0.99.4.tgz) = 3d7c31d5ea314589d2a963290ad16f4d3d631a41e802b8b39f8be0c9f71eb8e9
1
SHA256 (FBReader-0.99.6.tar.gz) = b1c9baac7281dce8eaa5e54c64e798ea00cfa1e4f9d712efed79a5cd6702c30c
2
SIZE (fbreader-sources-0.99.4.tgz) = 2345664
2
SIZE (FBReader-0.99.6.tar.gz) = 24848140
(-)files/patch-fbreader__src__fbreader__FBReaderActions.cpp (-3 / +4 lines)
Lines 1-10 Link Here
1
--- ./fbreader/src/fbreader/FBReaderActions.cpp.orig	2010-04-02 00:14:24.000000000 +1100
1
--- ./fbreader/src/fbreader/FBReaderActions.cpp.orig	2014-03-19 23:09:10.000000000 +0200
2
+++ ./fbreader/src/fbreader/FBReaderActions.cpp	2013-09-12 00:34:03.722065220 +1100
2
+++ ./fbreader/src/fbreader/FBReaderActions.cpp	2014-03-19 23:08:26.000000000 +0200
3
@@ -18,6 +18,7 @@
3
@@ -18,6 +18,8 @@
4
  */
4
  */
5
 
5
 
6
 #include <algorithm>
6
 #include <algorithm>
7
+#include <cstdlib>
7
+#include <cstdlib>
8
+
8
 
9
 
9
 #include <ZLStringUtil.h>
10
 #include <ZLStringUtil.h>
10
 #include <ZLDialogManager.h>
11
 #include <ZLDialogManager.h>
(-)pkg-plist (-84 / +76 lines)
Lines 1-74 Link Here
1
bin/FBReader
1
bin/FBReader
2
lib/libzlcore.so
2
lib/libzlcore.so.0.14
3
lib/libzlcore.so.0.99
3
lib/libzlcore.so.0.14.0
4
lib/libzlcore.so.0.99.4
4
lib/libzltext.so.0.14
5
lib/libzltext.so
5
lib/libzltext.so.0.14.0
6
lib/libzltext.so.0.99
6
lib/zlibrary/ui/zlui-%%UI%%.so
7
lib/libzltext.so.0.99.4
7
%%DATADIR%%/default/config.xml
8
lib/libzlui.so
8
%%DATADIR%%/default/external.xml
9
lib/libzlui.so.0.99
9
%%DATADIR%%/default/fullscreen_toolbar.xml
10
lib/libzlui.so.0.99.4
10
%%DATADIR%%/default/keymap.xml
11
share/FBReader/default/config.xml
11
%%DATADIR%%/default/styles.xml
12
share/FBReader/default/external.xml
12
%%DATADIR%%/default/toolbar.xml
13
share/FBReader/default/fullscreen_toolbar.xml
13
%%DATADIR%%/formats/fb2/FBReaderVersion.ent
14
share/FBReader/default/keymap.xml
14
%%DATADIR%%/formats/fb2/fb2genres.xml
15
share/FBReader/default/styles.xml
15
%%DATADIR%%/formats/html/html.ent
16
share/FBReader/default/toolbar.xml
16
%%DATADIR%%/formats/xhtml/xhtml-lat1.ent
17
share/FBReader/formats/fb2/FBReaderVersion.ent
17
%%DATADIR%%/formats/xhtml/xhtml-special.ent
18
share/FBReader/formats/fb2/fb2genres.xml
18
%%DATADIR%%/formats/xhtml/xhtml-symbol.ent
19
share/FBReader/formats/html/html.ent
19
%%DATADIR%%/help/MiniHelp.bg.fb2
20
share/FBReader/formats/xhtml/xhtml-lat1.ent
20
%%DATADIR%%/help/MiniHelp.cs.fb2
21
share/FBReader/formats/xhtml/xhtml-special.ent
21
%%DATADIR%%/help/MiniHelp.de.fb2
22
share/FBReader/formats/xhtml/xhtml-symbol.ent
22
%%DATADIR%%/help/MiniHelp.en.fb2
23
share/FBReader/help/MiniHelp.bg.fb2
23
%%DATADIR%%/help/MiniHelp.es.fb2
24
share/FBReader/help/MiniHelp.cs.fb2
24
%%DATADIR%%/help/MiniHelp.fi.fb2
25
share/FBReader/help/MiniHelp.de.fb2
25
%%DATADIR%%/help/MiniHelp.fr.fb2
26
share/FBReader/help/MiniHelp.en.fb2
26
%%DATADIR%%/help/MiniHelp.hu.fb2
27
share/FBReader/help/MiniHelp.es.fb2
27
%%DATADIR%%/help/MiniHelp.id.fb2
28
share/FBReader/help/MiniHelp.fi.fb2
28
%%DATADIR%%/help/MiniHelp.it.fb2
29
share/FBReader/help/MiniHelp.fr.fb2
29
%%DATADIR%%/help/MiniHelp.lt.fb2
30
share/FBReader/help/MiniHelp.he.fb2
30
%%DATADIR%%/help/MiniHelp.nl.fb2
31
share/FBReader/help/MiniHelp.hu.fb2
31
%%DATADIR%%/help/MiniHelp.ru.fb2
32
share/FBReader/help/MiniHelp.id.fb2
32
%%DATADIR%%/help/MiniHelp.sv.fb2
33
share/FBReader/help/MiniHelp.it.fb2
33
%%DATADIR%%/help/MiniHelp.uk.fb2
34
share/FBReader/help/MiniHelp.lt.fb2
34
%%DATADIR%%/help/MiniHelp.vi.fb2
35
share/FBReader/help/MiniHelp.nl.fb2
35
%%DATADIR%%/help/MiniHelp.zh.fb2
36
share/FBReader/help/MiniHelp.ru.fb2
36
%%DATADIR%%/network/booksonboard.com.xml
37
share/FBReader/help/MiniHelp.sv.fb2
37
%%DATADIR%%/network/certificates/litres.ru.crt
38
share/FBReader/help/MiniHelp.uk.fb2
38
%%DATADIR%%/network/feedbooks.com.xml
39
share/FBReader/help/MiniHelp.vi.fb2
39
%%DATADIR%%/network/litres.ru.xml
40
share/FBReader/help/MiniHelp.zh.fb2
40
%%DATADIR%%/network/manybooks.net.xml
41
share/FBReader/resources/ar.xml
41
%%DATADIR%%/network/shucang.com.xml
42
share/FBReader/resources/bg.xml
42
%%DATADIR%%/network/smashwords.com.xml
43
share/FBReader/resources/cs.xml
43
%%DATADIR%%/resources/ar.xml
44
share/FBReader/resources/de.xml
44
%%DATADIR%%/resources/bg.xml
45
share/FBReader/resources/en.xml
45
%%DATADIR%%/resources/cs.xml
46
share/FBReader/resources/eo.xml
46
%%DATADIR%%/resources/de.xml
47
share/FBReader/resources/es.xml
47
%%DATADIR%%/resources/en.xml
48
share/FBReader/resources/fi.xml
48
%%DATADIR%%/resources/eo.xml
49
share/FBReader/resources/fr.xml
49
%%DATADIR%%/resources/es.xml
50
share/FBReader/resources/he.xml
50
%%DATADIR%%/resources/fi.xml
51
share/FBReader/resources/hu.xml
51
%%DATADIR%%/resources/fr.xml
52
share/FBReader/resources/id.xml
52
%%DATADIR%%/resources/hu.xml
53
share/FBReader/resources/it.xml
53
%%DATADIR%%/resources/id.xml
54
share/FBReader/resources/lt.xml
54
%%DATADIR%%/resources/it.xml
55
share/FBReader/resources/nl.xml
55
%%DATADIR%%/resources/lt.xml
56
share/FBReader/resources/pl.xml
56
%%DATADIR%%/resources/nl.xml
57
share/FBReader/resources/ru.xml
57
%%DATADIR%%/resources/pl.xml
58
share/FBReader/resources/sv.xml
58
%%DATADIR%%/resources/ru.xml
59
share/FBReader/resources/uk.xml
59
%%DATADIR%%/resources/sv.xml
60
share/FBReader/resources/vi.xml
60
%%DATADIR%%/resources/uk.xml
61
share/FBReader/resources/zh.xml
61
%%DATADIR%%/resources/vi.xml
62
%%DATADIR%%/resources/zh.xml
62
share/applications/FBReader.desktop
63
share/applications/FBReader.desktop
63
share/pixmaps/FBReader.png
64
share/pixmaps/FBReader.png
64
share/pixmaps/FBReader/addBook.png
65
share/pixmaps/FBReader/addBook.png
65
share/pixmaps/FBReader/advancedSearchOnNetwork.png
66
share/pixmaps/FBReader/advancedSearchOnNetwork.png
66
share/pixmaps/FBReader/back_button.png
67
share/pixmaps/FBReader/back_button_disabled.png
68
share/pixmaps/FBReader/bookInfo.png
67
share/pixmaps/FBReader/bookInfo.png
69
share/pixmaps/FBReader/booktree-author.png
68
share/pixmaps/FBReader/booktree-author.png
70
share/pixmaps/FBReader/booktree-book.png
69
share/pixmaps/FBReader/booktree-book.png
71
share/pixmaps/FBReader/booktree-catalog.png
72
share/pixmaps/FBReader/booktree-tag.png
70
share/pixmaps/FBReader/booktree-tag.png
73
share/pixmaps/FBReader/byAuthor.png
71
share/pixmaps/FBReader/byAuthor.png
74
share/pixmaps/FBReader/byTag.png
72
share/pixmaps/FBReader/byTag.png
Lines 76-83 Link Here
76
share/pixmaps/FBReader/findNext.png
74
share/pixmaps/FBReader/findNext.png
77
share/pixmaps/FBReader/findPrevious.png
75
share/pixmaps/FBReader/findPrevious.png
78
share/pixmaps/FBReader/folder.png
76
share/pixmaps/FBReader/folder.png
79
share/pixmaps/FBReader/forward_button.png
80
share/pixmaps/FBReader/forward_button_disabled.png
81
share/pixmaps/FBReader/gotoHome.png
77
share/pixmaps/FBReader/gotoHome.png
82
share/pixmaps/FBReader/html.png
78
share/pixmaps/FBReader/html.png
83
share/pixmaps/FBReader/mobipocket.png
79
share/pixmaps/FBReader/mobipocket.png
Lines 87-107 Link Here
87
share/pixmaps/FBReader/plucker.png
83
share/pixmaps/FBReader/plucker.png
88
share/pixmaps/FBReader/preferences.png
84
share/pixmaps/FBReader/preferences.png
89
share/pixmaps/FBReader/redo.png
85
share/pixmaps/FBReader/redo.png
90
share/pixmaps/FBReader/refresh-icon-1.png
91
share/pixmaps/FBReader/refresh-icon-2.png
92
share/pixmaps/FBReader/refresh-icon.svg
93
share/pixmaps/FBReader/rotate.png
86
share/pixmaps/FBReader/rotate.png
94
share/pixmaps/FBReader/rtf.png
87
share/pixmaps/FBReader/rtf.png
95
share/pixmaps/FBReader/search.png
88
share/pixmaps/FBReader/search.png
96
share/pixmaps/FBReader/search_icon.png
97
share/pixmaps/FBReader/searchresult.png
89
share/pixmaps/FBReader/searchresult.png
98
share/pixmaps/FBReader/showHelp.png
90
share/pixmaps/FBReader/showHelp.png
99
share/pixmaps/FBReader/showLibrary.png
91
share/pixmaps/FBReader/showLibrary.png
100
share/pixmaps/FBReader/showNetLibrary.png
92
share/pixmaps/FBReader/showNetLibrary.png
101
share/pixmaps/FBReader/showNetworkLibrary.png
102
share/pixmaps/FBReader/showReading.png
93
share/pixmaps/FBReader/showReading.png
103
share/pixmaps/FBReader/showRecent.png
94
share/pixmaps/FBReader/showRecent.png
104
share/pixmaps/FBReader/spinner.gif
105
share/pixmaps/FBReader/tcr.png
95
share/pixmaps/FBReader/tcr.png
106
share/pixmaps/FBReader/toc.png
96
share/pixmaps/FBReader/toc.png
107
share/pixmaps/FBReader/undo.png
97
share/pixmaps/FBReader/undo.png
Lines 144-150 Link Here
144
share/zlibrary/resources/es.xml
134
share/zlibrary/resources/es.xml
145
share/zlibrary/resources/fi.xml
135
share/zlibrary/resources/fi.xml
146
share/zlibrary/resources/fr.xml
136
share/zlibrary/resources/fr.xml
147
share/zlibrary/resources/he.xml
148
share/zlibrary/resources/hu.xml
137
share/zlibrary/resources/hu.xml
149
share/zlibrary/resources/id.xml
138
share/zlibrary/resources/id.xml
150
share/zlibrary/resources/it.xml
139
share/zlibrary/resources/it.xml
Lines 156-173 Link Here
156
share/zlibrary/resources/uk.xml
145
share/zlibrary/resources/uk.xml
157
share/zlibrary/resources/vi.xml
146
share/zlibrary/resources/vi.xml
158
share/zlibrary/resources/zh.xml
147
share/zlibrary/resources/zh.xml
159
share/zlibrary/style.qss
160
share/zlibrary/unicode.xml.gz
148
share/zlibrary/unicode.xml.gz
161
@dirrm share/FBReader/default
149
@dirrm share/zlibrary/resources
162
@dirrm share/FBReader/formats/fb2
150
@dirrm share/zlibrary/encodings
163
@dirrm share/FBReader/formats/html
164
@dirrm share/FBReader/formats/xhtml
165
@dirrm share/FBReader/formats
166
@dirrm share/FBReader/help
167
@dirrm share/FBReader/resources
168
@dirrm share/FBReader
169
@dirrm share/pixmaps/FBReader
170
@dirrm share/zlibrary/default
151
@dirrm share/zlibrary/default
171
@dirrm share/zlibrary/encodings
172
@dirrm share/zlibrary/resources
173
@dirrm share/zlibrary
152
@dirrm share/zlibrary
153
@dirrm share/pixmaps/FBReader
154
@dirrm %%DATADIR%%/resources
155
@dirrm %%DATADIR%%/network/certificates
156
@dirrm %%DATADIR%%/network
157
@dirrm %%DATADIR%%/help
158
@dirrm %%DATADIR%%/formats/xhtml
159
@dirrm %%DATADIR%%/formats/html
160
@dirrm %%DATADIR%%/formats/fb2
161
@dirrm %%DATADIR%%/formats
162
@dirrm %%DATADIR%%/default
163
@dirrm %%DATADIR%%
164
@dirrm lib/zlibrary/ui
165
@dirrm lib/zlibrary

Return to bug 187819