Attachment 151170 Details for Bug 196409 – Proposed patch (since 370129 revision)

[patch] Proposed patch (since 370129 revision)

djview4.diff (text/plain), 3.24 KB, created by lightside on 2015-01-01 01:03:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2015-01-01 01:03:38 UTC

Size: 3.24 KB

patch

obsolete

>diff -ruN djview4.orig/Makefile djview4/Makefile
>--- djview4.orig/Makefile	2014-10-06 01:30:26.000000000 +0400
>+++ djview4/Makefile	2015-01-01 03:38:00.000000000 +0400
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	djview
> PORTVERSION=	4.9
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	graphics
> MASTER_SITES=	SF/djvu/DjView/${PORTVERSION}
> 
>@@ -11,21 +11,22 @@
> COMMENT=	Standalone Djvu viewer and plugin based on Qt4 toolkit
> 
> LICENSE=	GPLv2
>+LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-LIB_DEPENDS=	libdjvulibre.so:${PORTSDIR}/graphics/djvulibre
>+LIB_DEPENDS=	libdjvulibre.so:${PORTSDIR}/graphics/djvulibre \
>+		libtiff.so:${PORTSDIR}/graphics/tiff
> 
> GNU_CONFIGURE=	yes
>-USES=		pkgconfig webplugin:native libtool
>-USE_QT4=	gui network rcc_build uic_build moc_build qmake_build
>+USES=		desktop-file-utils libtool pkgconfig webplugin:native
>+USE_QT4=	gui linguist network rcc_build uic_build moc_build qmake_build
> USE_XORG=	sm ice xt
> QT_NONSTANDARD=	yes
> CONFIGURE_ARGS=	--x-includes="${LOCALBASE}/include" \
>-		--x-libraries="${LOCALBASE}/lib"
>+		--x-libraries="${LOCALBASE}/lib" --disable-desktopfiles
> CONFIGURE_ENV=	QMAKE="${QMAKE}" \
> 		QMAKESPEC="${QMAKESPEC}"
>+CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
>-CFLAGS+=	-I${LOCALBASE}/include
>-CXXFLAGS+=	-I${LOCALBASE}/include
> MAKE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
> 
> WRKSRC=		${WRKDIR}/djview4-${PORTVERSION}
>@@ -36,7 +37,21 @@
> post-patch:
> 	@${REINPLACE_CMD} -e 's,/netscape/,/djview4/,' \
> 		${WRKSRC}/nsdejavu/Makefile.in ${WRKSRC}/nsdejavu/nsdejavu.1.in
>-	@${REINPLACE_CMD} -e 's,@NSDEJAVU_LIBS@,@NSDEJAVU_LIBS@ -lXt -lXext,g' \
>+	@${REINPLACE_CMD} -e 's,@NSDEJAVU_LIBS@,& -lXt -lXext,g' \
> 		${WRKSRC}/nsdejavu/Makefile.in
> 
>+post-install:
>+.for f in ${WEBPLUGIN_FILES}
>+	@${STRIP_CMD} ${STAGEDIR}${WEBPLUGIN_DIR}/${f}
>+.endfor
>+.for d in 32 64
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${d}x${d}/apps
>+	${INSTALL_DATA} ${WRKSRC}/desktopfiles/hi${d}-djview4.png \
>+		${STAGEDIR}${PREFIX}/share/icons/hicolor/${d}x${d}/apps/djvulibre-djview4.png
>+.endfor
>+	${INSTALL_DATA} ${WRKSRC}/desktopfiles/hi64-djview4.png \
>+		${STAGEDIR}${PREFIX}/share/pixmaps/djvulibre-djview4.png
>+	${INSTALL_DATA} ${WRKSRC}/desktopfiles/djvulibre-djview4.desktop \
>+		${STAGEDIR}${PREFIX}/share/applications
>+
> .include <bsd.port.mk>
>diff -ruN djview4.orig/pkg-plist djview4/pkg-plist
>--- djview4.orig/pkg-plist	2014-10-20 21:04:20.000000000 +0400
>+++ djview4/pkg-plist	2015-01-01 03:38:12.000000000 +0400
>@@ -4,10 +4,14 @@
> man/man1/djview.1.gz
> man/man1/djview4.1.gz
> man/man1/nsdejavu.1.gz
>-share/djvu/djview4/desktop/djvulibre-djview4.desktop
>-share/djvu/djview4/desktop/hi-djview4.svgz
>-share/djvu/djview4/desktop/hi32-djview4.png
>-share/djvu/djview4/desktop/hi64-djview4.png
>-share/djvu/djview4/desktop/prebuilt-hi32-djview4.png
>-share/djvu/djview4/desktop/prebuilt-hi64-djview4.png
>-share/djvu/djview4/desktop/register-djview-menu
>+share/applications/djvulibre-djview4.desktop
>+share/djvu/djview4/djview_cs.qm
>+share/djvu/djview4/djview_de.qm
>+share/djvu/djview4/djview_fr.qm
>+share/djvu/djview4/djview_ru.qm
>+share/djvu/djview4/djview_uk.qm
>+share/djvu/djview4/djview_zh_cn.qm
>+share/djvu/djview4/djview_zh_tw.qm
>+share/icons/hicolor/32x32/apps/djvulibre-djview4.png
>+share/icons/hicolor/64x64/apps/djvulibre-djview4.png
>+share/pixmaps/djvulibre-djview4.png

Actions: View | Diff

Attachments on bug 196409: 151170 | 151171 | 151344 | 153493 | 153494 | 153498 | 161463