diff --git a/net-im/kaidan/Makefile b/net-im/kaidan/Makefile index d7fc79aa0c6c..a1c44649ecfb 100644 --- a/net-im/kaidan/Makefile +++ b/net-im/kaidan/Makefile @@ -2,6 +2,7 @@ PORTNAME= kaidan DISTVERSION= 0.5.0 +PORTREVISION= 1 CATEGORIES= net-im kde MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION} @@ -9,7 +10,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= User-friendly XMPP client for every device LIB_DEPENDS= libqxmpp.so:net-im/qxmpp-qt5 \ - libZXingCore.so:textproc/zxing-cpp + libZXing.so:textproc/zxing-cpp USES= cmake compiler:c++11-lang desktop-file-utils kde:5 \ pkgconfig qt:5 tar:xz diff --git a/net/kitinerary/Makefile b/net/kitinerary/Makefile index 4466f4bd5d8b..7e75b34a2d26 100644 --- a/net/kitinerary/Makefile +++ b/net/kitinerary/Makefile @@ -2,7 +2,7 @@ PORTNAME= kitinerary DISTVERSION= ${KDE_APPLICATIONS_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net kde kde-applications MAINTAINER= kde@FreeBSD.org @@ -11,7 +11,7 @@ COMMENT= Data Model and Extraction System for Travel Reservation information LICENSE= LGPL21 LIB_DEPENDS= libpoppler.so:graphics/poppler \ - libZXingCore.so:textproc/zxing-cpp + libZXing.so:textproc/zxing-cpp USES= compiler:c++11-lang cmake gettext gnome kde:5 pkgconfig qt:5 tar:xz USE_GNOME= libxml2 diff --git a/textproc/zxing-cpp/Makefile b/textproc/zxing-cpp/Makefile index 83d87c4bbdf5..a502194c6aca 100644 --- a/textproc/zxing-cpp/Makefile +++ b/textproc/zxing-cpp/Makefile @@ -3,8 +3,7 @@ PORTNAME= zxing-cpp DISTVERSIONPREFIX= v -DISTVERSION= 1.0.8 -PORTREVISION= 1 +DISTVERSION= 1.1.0 CATEGORIES= textproc MAINTAINER= kde@FreeBSD.org diff --git a/textproc/zxing-cpp/distinfo b/textproc/zxing-cpp/distinfo index b0c84e7f9c37..98c2dc2cd1cd 100644 --- a/textproc/zxing-cpp/distinfo +++ b/textproc/zxing-cpp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1589647728 -SHA256 (nu-book-zxing-cpp-v1.0.8_GH0.tar.gz) = 9154b5456904e47bd4c38462d57e4b7897bfb20cb2bc2e8c958453e40e73c8b2 -SIZE (nu-book-zxing-cpp-v1.0.8_GH0.tar.gz) = 128506816 +TIMESTAMP = 1596285987 +SHA256 (nu-book-zxing-cpp-v1.1.0_GH0.tar.gz) = 283574a817a6efdb38e4f0480fb7697e9b1f90b55d6b16e92e1a2d2af9c43506 +SIZE (nu-book-zxing-cpp-v1.1.0_GH0.tar.gz) = 128856890 diff --git a/textproc/zxing-cpp/files/patch-core_src_LogMatrix.h b/textproc/zxing-cpp/files/patch-core_src_LogMatrix.h new file mode 100644 index 000000000000..3f331a4a9d38 --- /dev/null +++ b/textproc/zxing-cpp/files/patch-core_src_LogMatrix.h @@ -0,0 +1,10 @@ +--- core/src/LogMatrix.h.orig 2020-08-01 12:51:07 UTC ++++ core/src/LogMatrix.h +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + + namespace ZXing { + diff --git a/textproc/zxing-cpp/pkg-plist b/textproc/zxing-cpp/pkg-plist index 534f821a40ab..a6f1e37ea046 100644 --- a/textproc/zxing-cpp/pkg-plist +++ b/textproc/zxing-cpp/pkg-plist @@ -3,6 +3,8 @@ include/ZXing/BinaryBitmap.h include/ZXing/BitArray.h include/ZXing/BitHacks.h include/ZXing/BitMatrix.h +include/ZXing/BitMatrixCursor.h +include/ZXing/BitMatrixIO.h include/ZXing/BitSource.h include/ZXing/ByteArray.h include/ZXing/ByteMatrix.h @@ -13,16 +15,22 @@ include/ZXing/DecodeHints.h include/ZXing/DecodeStatus.h include/ZXing/DecoderResult.h include/ZXing/DetectorResult.h +include/ZXing/GTIN.h include/ZXing/GenericGF.h include/ZXing/GenericGFPoly.h include/ZXing/GenericLuminanceSource.h include/ZXing/GlobalHistogramBinarizer.h include/ZXing/GridSampler.h include/ZXing/HybridBinarizer.h +include/ZXing/LogMatrix.h include/ZXing/LuminanceSource.h +include/ZXing/Matrix.h include/ZXing/MultiFormatReader.h include/ZXing/MultiFormatWriter.h +include/ZXing/Pattern.h include/ZXing/PerspectiveTransform.h +include/ZXing/Point.h +include/ZXing/Quadrilateral.h include/ZXing/ReadBarcode.h include/ZXing/Reader.h include/ZXing/ReedSolomonDecoder.h @@ -33,11 +41,12 @@ include/ZXing/ResultPoint.h include/ZXing/TextDecoder.h include/ZXing/TextEncoder.h include/ZXing/TextUtfEncoding.h +include/ZXing/TritMatrix.h include/ZXing/WhiteRectDetector.h include/ZXing/ZXBigInteger.h include/ZXing/ZXConfig.h include/ZXing/ZXContainerAlgorithms.h -include/ZXing/ZXFilesystem.h +include/ZXing/ZXFlags.h include/ZXing/ZXNullable.h include/ZXing/ZXNumeric.h include/ZXing/ZXStrConvWorkaround.h @@ -158,9 +167,10 @@ include/ZXing/textcodec/KRHangulMapping.h include/ZXing/textcodec/KRTextDecoder.h include/ZXing/textcodec/KRTextEncoder.h lib/cmake/ZXing/ZXingConfig.cmake +lib/cmake/ZXing/ZXingConfigVersion.cmake lib/cmake/ZXing/ZXingTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/ZXing/ZXingTargets.cmake -lib/libZXingCore.so -lib/libZXingCore.so.1 -lib/libZXingCore.so.1.0.7 +lib/libZXing.so +lib/libZXing.so.1 +lib/libZXing.so.1.1.0 libdata/pkgconfig/zxing.pc