Attachment 153606 Details for Bug 198088 – Proposed patch (after bug 196409)

[patch] Proposed patch (after bug 196409)

djview4_after_196409.diff (text/plain), 8.28 KB, created by lightside on 2015-02-28 03:58:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2015-02-28 03:58:18 UTC

Size: 8.28 KB

patch

obsolete

>diff -ruN djview4.orig/Makefile djview4/Makefile
>--- djview4.orig/Makefile	2015-02-25 08:49:00.000000000 +0400
>+++ djview4/Makefile	2015-02-28 06:49:44.000000000 +0400
>@@ -2,55 +2,55 @@
> # $FreeBSD: head/graphics/djview4/Makefile 370129 2014-10-05 21:30:26Z tijl $
> 
> PORTNAME=	djview
>-PORTVERSION=	4.9
>-PORTREVISION=	4
>+PORTVERSION=	4.10
> CATEGORIES=	graphics
> MASTER_SITES=	SF/djvu/DjView/${PORTVERSION}
> 
> MAINTAINER=	ports@FreeBSD.org
>-COMMENT=	Standalone Djvu viewer and plugin based on Qt4 toolkit
>+COMMENT=	Standalone Djvu viewer and plugin based on Qt toolkit
> 
> LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>+BUILD_DEPENDS=	rsvg-convert:${PORTSDIR}/graphics/librsvg2
> LIB_DEPENDS=	libdjvulibre.so:${PORTSDIR}/graphics/djvulibre \
> 		libtiff.so:${PORTSDIR}/graphics/tiff
> 
>+INSTALL_TARGET=	install-strip
> GNU_CONFIGURE=	yes
>-USES=		desktop-file-utils libtool pkgconfig webplugin:native
>-USE_QT4=	gui network linguisttools_build moc_build qmake_build rcc_build \
>-		uic_build
>+USES=		autoreconf desktop-file-utils gmake libtool pkgconfig \
>+		webplugin:native
> USE_XORG=	sm ice xt
>-QT_NONSTANDARD=	yes
> CONFIGURE_ARGS=	--x-includes="${LOCALBASE}/include" \
>-		--x-libraries="${LOCALBASE}/lib" --disable-desktopfiles
>-CONFIGURE_ENV=	QMAKE="${QMAKE}" \
>-		QMAKESPEC="${QMAKESPEC}"
>+		--x-libraries="${LOCALBASE}/lib"
>+CONFIGURE_ENV=	LRELEASE="${LRELEASE}" LUPDATE="${LUPDATE}"
>+
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
>-MAKE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
>-
>-WRKSRC=		${WRKDIR}/djview4-${PORTVERSION}
> 
> WEBPLUGIN_DIR=		${PREFIX}/lib/djview4/plugins
> WEBPLUGIN_FILES=	nsdejavu.so
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's,/netscape/,/djview4/,' \
>-		${WRKSRC}/nsdejavu/Makefile.in ${WRKSRC}/nsdejavu/nsdejavu.1.in
>-	@${REINPLACE_CMD} -e 's,@NSDEJAVU_LIBS@,& -lXt -lXext,g' \
>-		${WRKSRC}/nsdejavu/Makefile.in
>+OPTIONS_SINGLE=	QT
>+OPTIONS_SINGLE_QT=	QT4 QT5
>+OPTIONS_DEFAULT=	QT5
>+
>+QT4_USE=	QT4=gui,network,opengl,linguisttools_build,moc_build,qmake_build,rcc_build,uic_build
>+QT5_USE=	QT5=gui,network,opengl,printsupport,widgets,buildtools_build,linguisttools_build,qmake_build
>+
>+post-patch: .SILENT
>+# Allow to strip binary
>+	${REINPLACE_CMD} -e '/^bin_/s/SCRIPTS/PROGRAMS/' \
>+		${WRKSRC}/src/Makefile.am
>+# Change plugins directory
>+# Add GLIB cflags and libs (including -lX*)
>+	${REINPLACE_CMD} -e '/^pluginsdir/s/mozilla/djview4/ ; \
>+		/NSDEJAVU_CFLAGS/s|$$| $$$GLIB_CFLAGS$| ; \
>+		/NSDEJAVU_LIBS/s|$$| $$$GLIB_LIBS$ -lXt -lXext|' \
>+		${WRKSRC}/nsdejavu/Makefile.am
> 
> 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/djvulibre-djview4.desktop \
>-		${STAGEDIR}${PREFIX}/share/applications
>+# Create a symbolic link to match desktop file exec name
>+	(cd ${STAGEDIR}${PREFIX}/bin && ${LN} -sf ${PORTNAME} ${PORTNAME}4)
> 
> .include <bsd.port.mk>
>diff -ruN djview4.orig/distinfo djview4/distinfo
>--- djview4.orig/distinfo	2014-01-22 19:30:13.000000000 +0400
>+++ djview4/distinfo	2015-02-25 01:44:04.000000000 +0400
>@@ -1,2 +1,2 @@
>-SHA256 (djview-4.9.tar.gz) = d150f557aaa073356d77c1f5e566a6a566281df5f92395b6822139f0e5c90e0c
>-SIZE (djview-4.9.tar.gz) = 930676
>+SHA256 (djview-4.10.tar.gz) = 7caf7ee249edd994092b32a5573f111b2337ec99159083a5cf1a20432633ba7f
>+SIZE (djview-4.10.tar.gz) = 1077198
>diff -ruN djview4.orig/files/patch-desktopfiles_Makefile.in djview4/files/patch-desktopfiles_Makefile.in
>--- djview4.orig/files/patch-desktopfiles_Makefile.in	2014-01-22 21:40:44.000000000 +0400
>+++ djview4/files/patch-desktopfiles_Makefile.in	1970-01-01 03:00:00.000000000 +0300
>@@ -1,34 +0,0 @@
>---- desktopfiles/Makefile.in.orig	2012-04-09 20:56:55.000000000 -0700
>-+++ desktopfiles/Makefile.in	2012-04-21 20:39:20.000000000 -0700
>-@@ -50,14 +50,14 @@
>- 
>- hi32-djview4.png hi64-djview4.png: djview.svg
>- 	s=`echo $@ | sed -e 's/[a-z]*$[0-9]*$.*/\1/'`; \
>--	  ${RSVG} -w $${s} -h $${s} -o $@ $< \
>--	  || ${CONVERT} -geometry $${s}x$${s} -depth 8 -background none $< $@ \
>-+	  ${RSVG} -w $${s} -h $${s} -o $@ $> \
>-+	  || ${CONVERT} -geometry $${s}x$${s} -depth 8 -background none $> $@ \
>- 	  || ${INKSCAPE} --without-gui --export-width=$${s} \
>--                         --export-height=$${s} --export-png=$@ $< \
>-+                         --export-height=$${s} --export-png=$@ $> \
>- 	  || cp ${srcdir}/prebuilt-$@ $@
>- 
>- hi-djview4.svgz: djview.svg
>--	gzip <$< >$@
>-+	gzip <${.ALLSRC} >$@
>- 
>- register-djview-menu: register-djview-menu.in
>- 	sed < ${srcdir}/register-djview-menu.in > register-djview-menu \
>-@@ -74,10 +74,10 @@
>- 
>- install-djview-files: FORCE
>- 	${INSTALL} -d ${DESTDIR}${datadir_djview}
>--	${INSTALL_PROGRAM} register-djview-menu ${DESTDIR}${datadir_djview}
>-+	${INSTALL_SCRIPT} register-djview-menu ${DESTDIR}${datadir_djview}
>- 	${INSTALL_DATA} *djview4.png ${DESTDIR}${datadir_djview}
>- 	${INSTALL_DATA} *djview4.svgz ${DESTDIR}${datadir_djview}
>--	${INSTALL_PROGRAM} ${srcdir}/*djview4.desktop ${DESTDIR}${datadir_djview}
>-+	${INSTALL_DATA} ${srcdir}/*djview4.desktop ${DESTDIR}${datadir_djview}
>- 	-@echo "Run ${datadir_djview}/register-djview-menu install"
>- 	-@echo " to register the djview3 menu entries."
>- 
>diff -ruN djview4.orig/files/patch-src_Makefile.am djview4/files/patch-src_Makefile.am
>--- djview4.orig/files/patch-src_Makefile.am	1970-01-01 03:00:00.000000000 +0300
>+++ djview4/files/patch-src_Makefile.am	2015-02-28 03:37:27.000000000 +0400
>@@ -0,0 +1,53 @@
>+# Origin: http://sourceforge.net/p/djvu/djview-git/ci/e664af/tree/src/Makefile.am?diff=975258
>+# Commit message: simplified lrelease rule
>+--- src/Makefile.am
>++++ src/Makefile.am
>+@@ -36,17 +36,14 @@
>+ 
>+ lrelease_verbose = $(lrelease_verbose_@AM_V@)
>+ lrelease_verbose_ = $(lrelease_verbose_@AM_DEFAULT_V@)
>+-lrelease_verbose_0 = @
>++lrelease_verbose_0 = @echo "  LRELEASE" $@;
>+ 
>+-$(qmake_qm): qm.dir/lrelease-stamp
>+-	$(lrelease_verbose)cmp -s qm.dir/$@ $@ || cp qm.dir/$@ $@
>++$(qmake_qm): djview
>+ 
>+-qm.dir/lrelease-stamp: $(qmake_ts) djview
>+-	$(lrelease_verbose)test -d qm.dir || $(MKDIR) qm.dir ; \
>+-	 for ts in $(qmake_ts); do cp $(srcdir)/$$ts qm.dir; done ; \
>+-	 for ts in $(qmake_ts); do echo "TRANSLATIONS += $$ts" ; done > qm.dir/ts.pro
>+-	$(lrelease_verbose)cd qm.dir && $(LRELEASE) ts.pro
>+-	$(lrelease_verbose)touch $@
>++SUFFIXES=.ts .qm
>++
>++.ts.qm:
>++	$(lrelease_verbose)$(LRELEASE) -silent $< -qm $@
>+ 
>+ # invoke qmake
>+ 
>+@@ -72,20 +69,15 @@
>+ 
>+ # cleaning
>+ 
>+-mostlyclean-local: mostlyclean-qmake mostlyclean-qm
>++mostlyclean-local: mostlyclean-qmake
>+ 
>+ mostlyclean-qmake:
>+ 	-test "${srcdir}" == "." || ${RM} djview.pro
>+ 	-test -f Makefile.qmake && ${MAKE} -f Makefile.qmake clean
>+ 	-$(RM) Makefile.qmake
>+ 
>+-mostlyclean-qm:
>+-	-${RM} *.qm qm.dir/*
>+-	-${RMDIR} qm.dir
>++.PHONY: mostlyclean-qmake mostlyclean-qm 
>++
>++MOSTLYCLEANFILES = djview $(qmake_qm)
>+ 
>+ 
>+-.PHONY: mostlyclean-qmake mostlyclean-qm 
>+-
>+-MOSTLYCLEANFILES = djview
>+-
>+-
>diff -ruN djview4.orig/pkg-descr djview4/pkg-descr
>--- djview4.orig/pkg-descr	2014-01-22 19:44:51.000000000 +0400
>+++ djview4/pkg-descr	2015-02-28 04:04:52.000000000 +0400
>@@ -1,4 +1,4 @@
>-Standalone Djvu viewer and plugin based on the Qt4 toolkit. Uses djvulibre
>+Standalone Djvu viewer and plugin based on the Qt toolkit. Uses djvulibre
> for rendering.
> 
> Author:	Leon Bottou <leonb@users.sf.net>
>diff -ruN djview4.orig/pkg-plist djview4/pkg-plist
>--- djview4.orig/pkg-plist	2015-01-05 09:56:07.000000000 +0400
>+++ djview4/pkg-plist	2015-02-27 04:33:48.000000000 +0400
>@@ -2,15 +2,16 @@
> bin/djview4
> lib/djview4/plugins/nsdejavu.so
> man/man1/djview.1.gz
>-man/man1/djview4.1.gz
> man/man1/nsdejavu.1.gz
> share/applications/djvulibre-djview4.desktop
> share/djvu/djview4/djview_cs.qm
> share/djvu/djview4/djview_de.qm
>+share/djvu/djview4/djview_es.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/icons/hicolor/32x32/mimetypes/djvulibre-djview4.png
>+share/icons/hicolor/64x64/mimetypes/djvulibre-djview4.png
>+share/icons/hicolor/scalable/mimetypes/djvulibre-djview4.svgz

Actions: View | Diff

Attachments on bug 198088: 153599 | 153600 | 153601 | 153602 | 153603 | 153604 | 153605 | 153606 | 153703 | 153704 | 161476 | 161477 | 161478 | 161479 | 161480 | 161481 | 161482 | 161490 | 161491 | 161492 | 161493