Attachment 149374 Details for Bug 194992 – poppler-qt5

[patch] poppler-qt5

poppler-qt5.diff (text/plain), 5.58 KB, created by Max Brazhnikov on 2014-11-13 11:50:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Max Brazhnikov

Created: 2014-11-13 11:50:55 UTC

Size: 5.58 KB

patch

obsolete

>Index: graphics/poppler/Makefile
>===================================================================
>--- graphics/poppler/Makefile	(revision 372511)
>+++ graphics/poppler/Makefile	(working copy)
>@@ -66,11 +66,10 @@
> CONFIGURE_ARGS+=--disable-poppler-qt4
> .endif
> 
>-# needs checking when Qt5 is available
> .if ${SLAVEPORT}==qt5
> CONFIGURE_ARGS+=--enable-poppler-qt5
>-CONFIGURE_ENV+=	ac_cv_prog_MOCQT4=${LOCALBASE}/bin/moc-qt5
>-USE_QT5=	gui corelib xml qtestlib moc_build
>+CONFIGURE_ENV+=	MOCQT5=${MOC}
>+USE_QT5=	core gui widgets xml buildtools_build testlib_build
> BUILD_WRKSRC=	${WRKSRC}/qt5
> INSTALL_WRKSRC=	${WRKSRC}/qt5
> .else
>Index: graphics/poppler/files/patch-configure
>===================================================================
>--- graphics/poppler/files/patch-configure	(revision 372511)
>+++ graphics/poppler/files/patch-configure	(working copy)
>@@ -1,6 +1,6 @@
>---- configure.orig	2012-08-08 11:59:15.000000000 +0200
>-+++ configure	2012-08-08 11:59:45.000000000 +0200
>-@@ -20271,8 +20271,8 @@
>+--- configure.orig	2014-01-02 21:56:50 UTC
>++++ configure
>+@@ -20610,8 +20610,8 @@
>  
>            ac_save_USER_INCLUDES="$USER_INCLUDES"
>    ac_save_USER_LDFLAGS="$USER_LDFLAGS"
>@@ -11,3 +11,30 @@
>  
>  
>  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libjpeg6b" >&5
>+@@ -23259,7 +23259,7 @@
>+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt5 moc" >&5
>+ $as_echo_n "checking for Qt5 moc... " >&6; }
>+   mocversion=`$MOCQT5 -v 2>&1`
>+-  mocversiongrep=`echo $mocversion | grep "Qt 5"`
>++  mocversiongrep=`echo $mocversion | grep "moc 5"`
>+   if test x"$mocversiongrep" != x"$mocversion"; then
>+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>+ $as_echo "no" >&6; }
>+@@ -23359,7 +23359,7 @@
>+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt5 moc-qt5" >&5
>+ $as_echo_n "checking for Qt5 moc-qt5... " >&6; }
>+     mocversion=`$MOCQT52 -v 2>&1`
>+-    mocversiongrep=`echo $mocversion | grep "Qt 5"`
>++    mocversiongrep=`echo $mocversion | grep "moc 5"`
>+     if test x"$mocversiongrep" != x"$mocversion"; then
>+       if test -n "$ac_tool_prefix"; then
>+   # Extract the first word of "${ac_tool_prefix}qtchooser", so it can be a program name with args.
>+@@ -23457,7 +23457,7 @@
>+ $as_echo_n "checking for qtchooser... " >&6; }
>+       qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2`
>+       mocversion=`$qt5tooldir/moc -v 2>&1`
>+-      mocversiongrep=`echo $mocversion | grep "Qt 5"`
>++      mocversiongrep=`echo $mocversion | grep "moc 5"`
>+       if test x"$mocversiongrep" != x"$mocversion"; then
>+         # no valid moc found
>+         enable_poppler_qt5=no;
>Index: graphics/poppler/files/patch-qt5__Makefile.in
>===================================================================
>--- graphics/poppler/files/patch-qt5__Makefile.in	(revision 0)
>+++ graphics/poppler/files/patch-qt5__Makefile.in	(working copy)
>@@ -0,0 +1,11 @@
>+--- qt5/Makefile.in.orig	2014-01-02 21:56:51 UTC
>++++ qt5/Makefile.in
>+@@ -384,7 +384,7 @@
>+ top_builddir = @top_builddir@
>+ top_srcdir = @top_srcdir@
>+ win32_libs = @win32_libs@
>+-SUBDIRS = src tests demos
>++SUBDIRS = src
>+ all: all-recursive
>+ 
>+ .SUFFIXES:
>Index: graphics/poppler/files/patch-qt5__src__Makefile.in
>===================================================================
>--- graphics/poppler/files/patch-qt5__src__Makefile.in	(revision 0)
>+++ graphics/poppler/files/patch-qt5__src__Makefile.in	(working copy)
>@@ -0,0 +1,20 @@
>+--- qt5/src/Makefile.in.orig	2014-01-02 21:56:51 UTC
>++++ qt5/src/Makefile.in
>+@@ -129,7 +129,7 @@
>+ LTLIBRARIES = $(lib_LTLIBRARIES)
>+ am__DEPENDENCIES_1 =
>+ libpoppler_qt5_la_DEPENDENCIES =  \
>+-	$(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1)
>++	$(am__DEPENDENCIES_1)
>+ am_libpoppler_qt5_la_OBJECTS = libpoppler_qt5_la-poppler-document.lo \
>+ 	libpoppler_qt5_la-poppler-page.lo \
>+ 	libpoppler_qt5_la-poppler-fontinfo.lo \
>+@@ -505,7 +505,7 @@
>+ 	-Dpoppler_qt5_EXPORTS -fPIC
>+ 
>+ libpoppler_qt5_la_LIBADD = \
>+-	$(top_builddir)/poppler/libpoppler.la	\
>++	-lpoppler	\
>+ 	$(POPPLER_QT5_LIBS)
>+ 
>+ libpoppler_qt5_la_LDFLAGS = -version-info 1:0:0 @create_shared_lib@ @auto_import_flags@
>Index: graphics/poppler-qt5/Makefile
>===================================================================
>--- graphics/poppler-qt5/Makefile	(revision 0)
>+++ graphics/poppler-qt5/Makefile	(working copy)
>@@ -0,0 +1,13 @@
>+# $FreeBSD$
>+
>+PORTREVISION=	0
>+PKGNAMESUFFIX=	-qt5
>+
>+MAINTAINER=	gnome@FreeBSD.org
>+COMMENT=	Qt 5 bindings to poppler
>+
>+MASTERDIR=	${.CURDIR}/../../graphics/poppler
>+SLAVEPORT=	qt5
>+PLIST=		${.CURDIR}/pkg-plist
>+
>+.include "${MASTERDIR}/Makefile"
>Index: graphics/poppler-qt5/pkg-plist
>===================================================================
>--- graphics/poppler-qt5/pkg-plist	(revision 0)
>+++ graphics/poppler-qt5/pkg-plist	(working copy)
>@@ -0,0 +1,14 @@
>+include/poppler/qt5/poppler-annotation.h
>+include/poppler/qt5/poppler-export.h
>+include/poppler/qt5/poppler-form.h
>+include/poppler/qt5/poppler-link.h
>+include/poppler/qt5/poppler-media.h
>+include/poppler/qt5/poppler-optcontent.h
>+include/poppler/qt5/poppler-page-transition.h
>+include/poppler/qt5/poppler-qt5.h
>+lib/libpoppler-qt5.a
>+lib/libpoppler-qt5.la
>+lib/libpoppler-qt5.so
>+lib/libpoppler-qt5.so.1
>+lib/libpoppler-qt5.so.1.0.0
>+libdata/pkgconfig/poppler-qt5.pc
>Index: graphics/Makefile
>===================================================================
>--- graphics/Makefile	(revision 372511)
>+++ graphics/Makefile	(working copy)
>@@ -804,6 +804,7 @@
>     SUBDIR += poppler-data
>     SUBDIR += poppler-glib
>     SUBDIR += poppler-qt4
>+    SUBDIR += poppler-qt5
>     SUBDIR += poppler-utils
>     SUBDIR += pornview
>     SUBDIR += potrace

Actions: View | Diff

Attachments on bug 194992: 149374