Attachment 160645 Details for Bug 202843 – deskutils_recoll.diff

[patch] deskutils_recoll.diff

deskutils_recoll.diff (text/plain), 7.53 KB, created by tkato432 on 2015-09-02 18:31:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2015-09-02 18:31:36 UTC

Size: 7.53 KB

patch

obsolete

>diff -urN /usr/ports/deskutils/recoll/Makefile deskutils/recoll/Makefile
>--- /usr/ports/deskutils/recoll/Makefile	2015-08-24 03:55:51.942770000 +0900
>+++ deskutils/recoll/Makefile	2015-09-03 00:00:00.000000000 +0900
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/deskutils/recoll/Makefile 392317 2015-07-16 20:10:25Z arved $
> 
> PORTNAME=	recoll
>-PORTVERSION=	1.21.0
>+PORTVERSION=	1.21.1
> CATEGORIES=	deskutils
> MASTER_SITES=	http://www.lesbonscomptes.com/${PORTNAME}/
> 
>@@ -10,18 +10,19 @@
> COMMENT=	Personal full text search package, based on Xapian
> 
> LICENSE=	GPLv2
>+#LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-BUILD_DEPENDS=	xapian-core>=0:${PORTSDIR}/databases/xapian-core
>-RUN_DEPENDS:=	${BUILD_DEPENDS} \
>+BUILD_DEPENDS=	xapian-core>0:${PORTSDIR}/databases/xapian-core
>+RUN_DEPENDS:=	unrar:${PORTSDIR}/archivers/unrar \
> 		antiword:${PORTSDIR}/textproc/antiword \
> 		catdoc:${PORTSDIR}/textproc/catdoc \
> 		wpd2html:${PORTSDIR}/textproc/libwpd010 \
>-		xsltproc:${PORTSDIR}/textproc/libxslt \
>-		unrar:${PORTSDIR}/archivers/unrar \
>-		unrtf:${PORTSDIR}/textproc/unrtf
>+		unrtf:${PORTSDIR}/textproc/unrtf \
>+		${BUILD_DEPENDS}
> 
> USES=		bison gmake iconv shebangfix
> SHEBANG_FILES=	filters/rclimg desktop/hotrecoll.py
>+USE_GNOME=	libxslt:run
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--enable-pic
> 
>@@ -38,14 +39,14 @@
> ASPELL_LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell
> ASPELL_CONFIGURE_WITH=	aspell
> CHM_DESC=		CHM via CHMLIB
>-CHM_RUN_DEPENDS=	pychm:${PORTSDIR}/textproc/pychm
>+CHM_RUN_DEPENDS=	pychm>0:${PORTSDIR}/textproc/pychm
> DJVU_RUN_DEPENDS=	djvutxt:${PORTSDIR}/graphics/djvulibre
> IMAGE_DESC=		Store personal tags or textual descriptions in images
>-IMAGE_RUN_DEPENDS=	exiftool:${PORTSDIR}/graphics/p5-Image-ExifTool-devel
>+IMAGE_RUN_DEPENDS=	exiftool:${PORTSDIR}/graphics/p5-Image-ExifTool
> KONQUEROR_DESC=		Konqueror webarchive format with Python
>-KONQUEROR_RUN_DEPENDS=	kwebkitpart:${PORTSDIR}/www/kwebkitpart
>-LATEX_RUN_DEPENDS=	detex:${PORTSDIR}/print/detex \
>-			dvips:${PORTSDIR}/print/tex-dvipsk
>+KONQUEROR_RUN_DEPENDS=	kwebkitpart>0:${PORTSDIR}/www/kwebkitpart
>+LATEX_USE=		tex=dvipsk:run
>+#LATEX_RUN_DEPENDS=	detex:${PORTSDIR}/print/detex
> PDF_RUN_DEPENDS=	xpdf:${PORTSDIR}/graphics/xpdf
> PS_RUN_DEPENDS=		pstotext:${PORTSDIR}/print/pstotext
> PYTHON_USES=		python
>diff -urN /usr/ports/deskutils/recoll/distinfo deskutils/recoll/distinfo
>--- /usr/ports/deskutils/recoll/distinfo	2015-08-24 03:55:51.955500000 +0900
>+++ deskutils/recoll/distinfo	2015-09-03 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (recoll-1.21.0.tar.gz) = 0450d85d5065d22e87ae600571e3be23a5ff2000f533c15f819a5bd77164a1be
>-SIZE (recoll-1.21.0.tar.gz) = 2234834
>+SHA256 (recoll-1.21.1.tar.gz) = 74d09fabe7b53a7b6bc8bb3b5d8428d64e092c0cc2a7ea0559be681c9a26f1a9
>+SIZE (recoll-1.21.1.tar.gz) = 2236877
>diff -urN /usr/ports/deskutils/recoll/files/patch-mk-commondefs deskutils/recoll/files/patch-mk-commondefs
>--- /usr/ports/deskutils/recoll/files/patch-mk-commondefs	2015-08-24 03:55:51.973338000 +0900
>+++ deskutils/recoll/files/patch-mk-commondefs	1970-01-01 09:00:00.000000000 +0900
>@@ -1,11 +0,0 @@
>---- mk/commondefs.orig	2015-07-16 19:52:37 UTC
>-+++ mk/commondefs
>-@@ -15,7 +15,7 @@ COMMONCXXFLAGS = -I. \
>- # the sys file or localdefs
>- SYSPICFLAGS = -fPIC -DPIC
>- 
>--LIBRECOLL = -L$(depth)/lib -lrecoll -Wl,-rpath=$(libdir)/recoll
>-+LIBRECOLL = -L$(depth)/lib -lrecoll -liconv -Wl,-rpath=$(libdir)/recoll
>- 
>- RANLIB = test -f
>- AR=ar
>diff -urN /usr/ports/deskutils/recoll/files/patch-query-Makefile deskutils/recoll/files/patch-query-Makefile
>--- /usr/ports/deskutils/recoll/files/patch-query-Makefile	2015-08-24 03:55:51.980844000 +0900
>+++ deskutils/recoll/files/patch-query-Makefile	1970-01-01 09:00:00.000000000 +0900
>@@ -1,11 +0,0 @@
>---- query/Makefile.orig	2015-07-16 19:59:24 UTC
>-+++ query/Makefile
>-@@ -13,7 +13,7 @@ wasaparse.tab.cpp : wasaparse.y
>- XADUMP_OBJS= xadump.o 
>- xadump : $(XADUMP_OBJS)
>- 	$(CXX) $(ALL_CXXFLAGS) -o xadump $(XADUMP_OBJS) \
>--	       $(depth)/lib/librecoll.a $(LIBICONV) $(LIBXAPIAN) $(LIBSYS)
>-+	       $(depth)/lib/librecoll.a -liconv $(LIBICONV) $(LIBXAPIAN) $(LIBSYS)
>- xadump.o : xadump.cpp 
>- 	$(CXX) $(ALL_CXXFLAGS) -c xadump.cpp
>- 
>diff -urN /usr/ports/deskutils/recoll/files/patch-utils-Makefile deskutils/recoll/files/patch-utils-Makefile
>--- /usr/ports/deskutils/recoll/files/patch-utils-Makefile	2015-08-24 03:55:51.972416000 +0900
>+++ deskutils/recoll/files/patch-utils-Makefile	1970-01-01 09:00:00.000000000 +0900
>@@ -1,11 +0,0 @@
>---- utils/Makefile.orig	2015-07-16 19:56:54 UTC
>-+++ utils/Makefile
>-@@ -4,7 +4,7 @@ include $(depth)/mk/sysconf
>- # Use a static link for some of the utility programs so that they can be
>- # executed independantly of the installed version of recoll. None of them
>- # are part of the official distrib anyway
>--LIBRECOLL = ../lib/librecoll.a
>-+LIBRECOLL = ../lib/librecoll.a -liconv
>- 
>- PROGS = pxattr trclosefrom trecrontab \
>-       trnetcon trcopyfile trcircache trmd5 trreadfile trfileudi \
>diff -urN /usr/ports/deskutils/recoll/files/patch-utils-md5.h deskutils/recoll/files/patch-utils-md5.h
>--- /usr/ports/deskutils/recoll/files/patch-utils-md5.h	2015-08-24 03:55:51.990153000 +0900
>+++ deskutils/recoll/files/patch-utils-md5.h	1970-01-01 09:00:00.000000000 +0900
>@@ -1,13 +0,0 @@
>---- utils/md5.h.orig	2015-07-16 19:46:26 UTC
>-+++ utils/md5.h
>-@@ -19,6 +19,10 @@
>- #define	MD5_DIGEST_LENGTH		16
>- #define	MD5_DIGEST_STRING_LENGTH	(MD5_DIGEST_LENGTH * 2 + 1)
>- 
>-+typedef uint32_t u_int32_t;
>-+typedef uint64_t u_int64_t;
>-+typedef uint8_t u_int8_t;
>-+
>- typedef struct MD5Context {
>- 	u_int32_t state[4];			/* state */
>- 	u_int64_t count;			/* number of bits, mod 2^64 */
>diff -urN /usr/ports/deskutils/recoll/pkg-descr deskutils/recoll/pkg-descr
>--- /usr/ports/deskutils/recoll/pkg-descr	2015-08-24 03:55:51.964051000 +0900
>+++ deskutils/recoll/pkg-descr	2015-09-03 00:00:00.000000000 +0900
>@@ -3,17 +3,17 @@
> feature-rich interface.
> 
> Features:
>-    * Free, GPL license.
>-    * Easy installation, few dependancies. No database daemon, web server,
>-      desktop environment or exotic language necessary.
>-    * Will run on most Unix-based systems
>-    * Qt 4 GUI, plus command line.
>-    * Searches most common document types, emails and their attachments.
>-      Transparently handles decompression (gzip, bzip2).
>-    * Powerful query facilities, with boolean searches, phrases, proximity,
>-      wildcards, filter on file types and directory tree.
>-    * Multi-language and multi-character set with Unicode based internals.
>-    * Extensive documentation, with a complete user manual and manual pages
>-      for each command.
>+ * Free, GPL license.
>+ * Easy installation, few dependancies. No database daemon, web server,
>+   desktop environment or exotic language necessary.
>+ * Will run on most Unix-based systems
>+ * Qt 4 GUI, plus command line.
>+ * Searches most common document types, emails and their attachments.
>+   Transparently handles decompression (gzip, bzip2).
>+ * Powerful query facilities, with boolean searches, phrases, proximity,
>+   wildcards, filter on file types and directory tree.
>+ * Multi-language and multi-character set with Unicode based internals.
>+ * Extensive documentation, with a complete user manual and manual pages
>+   for each command.
> 
> WWW: http://www.lesbonscomptes.com/recoll/
>diff -urN /usr/ports/deskutils/recoll/pkg-plist deskutils/recoll/pkg-plist
>--- /usr/ports/deskutils/recoll/pkg-plist	2015-08-24 03:55:51.934661000 +0900
>+++ deskutils/recoll/pkg-plist	2015-09-03 00:00:00.000000000 +0900
>@@ -125,3 +125,4 @@
> %%DATADIR%%/translations/recoll_xx.qm
> %%DATADIR%%/translations/recoll_zh.qm
> %%DATADIR%%/translations/recoll_zh_CN.qm
>+%%NO_QT4%%@dir share/icons/hicolor/48x48/apps

Actions: View | Diff

Attachments on bug 202843: 160645