Attachment 229758 Details for Bug 260079 – [patch] update graphics/leptonica to 1.82.0, tweaks for portlint/portclippy

[patch] [patch] update graphics/leptonica to 1.82.0, tweaks for portlint/portclippy

pr-leptonica-update-1.82.0.diff (text/plain), 3.83 KB, created by John Hein on 2021-11-27 17:53:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2021-11-27 17:53:17 UTC

Size: 3.83 KB

patch

obsolete

>diff --git a/graphics/leptonica/Makefile b/graphics/leptonica/Makefile
>index 65dcce42271d..6a5fda72f007 100644
>--- a/graphics/leptonica/Makefile
>+++ b/graphics/leptonica/Makefile
>@@ -1,8 +1,7 @@
> # Created by: Hiroto Kagotani <hiroto.kagotani@gmail.com>
> 
> PORTNAME=	leptonica
>-PORTVERSION=	1.76.0
>-PORTREVISION=	1
>+PORTVERSION=	1.82.0
> CATEGORIES=	graphics
> 
> MAINTAINER=	hiroto.kagotani@gmail.com
>@@ -11,17 +10,16 @@ COMMENT=	C library for efficient image processing and image analysis operations
> LICENSE=	BSD2CLAUSE
> LICENSE_FILE=	${WRKSRC}/leptonica-license.txt
> 
>-CONFLICTS=	leptonlib
>-
> USES=		autoreconf cpe libtool localbase:ldflags pathfix pkgconfig
>-
> USE_GITHUB=	yes
> GH_ACCOUNT=	DanBloomberg
>+USE_LDCONFIG=	yes
> 
> GNU_CONFIGURE=	yes
>-USE_LDCONFIG=	yes
> INSTALL_TARGET=	install-strip
> 
>+CONFLICTS=	leptonlib
>+
> OPTIONS_DEFINE=		BIN GIF JPEG JPEG2000 PNG TIFF WEBP ZLIB
> OPTIONS_DEFAULT=	BIN GIF JPEG PNG TIFF WEBP ZLIB
> OPTIONS_SUB=		yes
>@@ -30,10 +28,10 @@ BIN_DESC=		Build additional programs
> BIN_CONFIGURE_ENABLE=	programs
> GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
> GIF_CONFIGURE_WITH=	giflib
>-JPEG_USES=		jpeg
>-JPEG_CONFIGURE_WITH=	jpeg
> JPEG2000_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
> JPEG2000_CONFIGURE_WITH=libopenjpeg
>+JPEG_USES=		jpeg
>+JPEG_CONFIGURE_WITH=	jpeg
> PNG_LIB_DEPENDS=	libpng.so:graphics/png
> PNG_CONFIGURE_WITH=	libpng
> TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
>diff --git a/graphics/leptonica/distinfo b/graphics/leptonica/distinfo
>index 31fd7266c77f..b92bc71f9d55 100644
>--- a/graphics/leptonica/distinfo
>+++ b/graphics/leptonica/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1526412216
>-SHA256 (DanBloomberg-leptonica-1.76.0_GH0.tar.gz) = ff98ffef6103cda0e400676f81113a8157569ac0f453c6e03a1a27b305ba25a7
>-SIZE (DanBloomberg-leptonica-1.76.0_GH0.tar.gz) = 11557709
>+TIMESTAMP = 1637693394
>+SHA256 (DanBloomberg-leptonica-1.82.0_GH0.tar.gz) = 40fa9ac1e815b91e0fa73f0737e60c9eec433a95fa123f95f2573dd3127dd669
>+SIZE (DanBloomberg-leptonica-1.82.0_GH0.tar.gz) = 13115749
>diff --git a/graphics/leptonica/files/patch-src-Makefile.am b/graphics/leptonica/files/patch-src-Makefile.am
>deleted file mode 100644
>index e7cbe0b53f27..000000000000
>--- a/graphics/leptonica/files/patch-src-Makefile.am
>+++ /dev/null
>@@ -1,9 +0,0 @@
>---- src/Makefile.am.orig	2018-05-02 22:12:19 UTC
>-+++ src/Makefile.am
>-@@ -1,5 +1,5 @@
>- AM_CFLAGS = $(DEBUG_FLAGS)
>--AM_CPPFLAGS = $(ZLIB_CFLAGS) $(LIBPNG_CFLAGS) $(JPEG_CFLAGS) $(LIBTIFF_CFLAGS) $(LIBWEBP_CFLAGS) $(LIBJP2K_CFLAGS)
>-+AM_CPPFLAGS = $(LIBJP2K_CFLAGS) $(ZLIB_CFLAGS) $(LIBPNG_CFLAGS) $(JPEG_CFLAGS) $(LIBTIFF_CFLAGS) $(LIBWEBP_CFLAGS)
>- 
>- lib_LTLIBRARIES = liblept.la
>- liblept_la_LIBADD = $(LIBM) $(ZLIB_LIBS) $(LIBPNG_LIBS) $(JPEG_LIBS) $(GIFLIB_LIBS) $(LIBTIFF_LIBS) $(LIBWEBP_LIBS) $(LIBJP2K_LIBS) $(GDI_LIBS)
>diff --git a/graphics/leptonica/pkg-plist b/graphics/leptonica/pkg-plist
>index 52d022df9ece..f72a08748694 100644
>--- a/graphics/leptonica/pkg-plist
>+++ b/graphics/leptonica/pkg-plist
>@@ -6,6 +6,7 @@
> %%BIN%%bin/converttopdf
> %%BIN%%bin/converttops
> %%BIN%%bin/fileinfo
>+%%BIN%%bin/imagetops
> %%BIN%%bin/xtractprotos
> include/leptonica/allheaders.h
> include/leptonica/alltypes.h
>@@ -17,10 +18,12 @@ include/leptonica/bmf.h
> include/leptonica/bmfdata.h
> include/leptonica/bmp.h
> include/leptonica/ccbord.h
>+include/leptonica/colorfill.h
> include/leptonica/dewarp.h
> include/leptonica/endianness.h
> include/leptonica/environ.h
> include/leptonica/gplot.h
>+include/leptonica/hashmap.h
> include/leptonica/heap.h
> include/leptonica/imageio.h
> include/leptonica/jbclass.h
>@@ -38,8 +41,12 @@ include/leptonica/stack.h
> include/leptonica/stringcode.h
> include/leptonica/sudoku.h
> include/leptonica/watershed.h
>+lib/cmake/LeptonicaConfig-version.cmake
>+lib/cmake/LeptonicaConfig.cmake
> lib/liblept.a
> lib/liblept.so
> lib/liblept.so.5
>-lib/liblept.so.5.0.3
>+lib/liblept.so.5.0.4
>+lib/libleptonica.a
>+lib/libleptonica.so
> libdata/pkgconfig/lept.pc

Flags:

jcfyecrayz: maintainer-approval? (hiroto.kagotani)

Actions: View | Diff

Attachments on bug 260079: 229758 | 229788 | 229806 | 229815 | 229910 | 230746