CVS commit: [pkgsrc-2022Q4] pkgsrc/converters/wkhtmltopdf

["S.P.Zeidler" <spz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   spz
Date:           Mon Jan 23 16:29:57 UTC 2023

Modified Files:
        pkgsrc/converters/wkhtmltopdf [pkgsrc-2022Q4]: Makefile distinfo
        pkgsrc/converters/wkhtmltopdf/patches [pkgsrc-2022Q4]:
            patch-src_image_image.pro patch-src_lib_lib.pro
            patch-src_pdf_pdf.pro

Log Message:
revert erroneous commit to the pkgsrc-2022Q4 branch as requested by manu@
in admin ticket #265306


To generate a diff of this commit:
cvs rdiff -u -r1.14.4.1 -r1.14.4.2 pkgsrc/converters/wkhtmltopdf/Makefile
cvs rdiff -u -r1.6.10.1 -r1.6.10.2 pkgsrc/converters/wkhtmltopdf/distinfo
cvs rdiff -u -r1.2.22.1 -r1.2.22.2 \
    pkgsrc/converters/wkhtmltopdf/patches/patch-src_image_image.pro \
    pkgsrc/converters/wkhtmltopdf/patches/patch-src_pdf_pdf.pro
cvs rdiff -u -r1.1.44.1 -r1.1.44.2 \
    pkgsrc/converters/wkhtmltopdf/patches/patch-src_lib_lib.pro

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/converters/wkhtmltopdf/Makefile
diff -u pkgsrc/converters/wkhtmltopdf/Makefile:1.14.4.1 pkgsrc/converters/wkhtmltopdf/Makefile:1.14.4.2
--- pkgsrc/converters/wkhtmltopdf/Makefile:1.14.4.1     Fri Jan 20 16:20:42 2023
+++ pkgsrc/converters/wkhtmltopdf/Makefile      Mon Jan 23 16:29:57 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14.4.1 2023/01/20 16:20:42 manu Exp $
+# $NetBSD: Makefile,v 1.14.4.2 2023/01/23 16:29:57 spz Exp $
 
 DISTNAME=      wkhtmltox-0.12.4
 PKGNAME=       wkhtmltopdf-0.12.4
-PKGREVISION=   11
+PKGREVISION=   10
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=wkhtmltopdf/}
 GITHUB_PROJECT=        wkhtmltopdf
 GITHUB_RELEASE=        ${PKGVERSION_NOREV}
@@ -20,7 +20,6 @@ PYTHON_VERSIONS_ACCEPTED=     27
 
 BUILDLINK_TRANSFORM+=  opt:-std=gnu++11:-std=gnu++98 
 CXXFLAGS+=     -std=gnu++98
-CXXFLAHS+=     {COMPILER_RPATH_FLAG}${X11BASE}/lib
 
 SUBST_CLASSES+=                x11
 SUBST_MESSAGE.x11=     Fixing x11 options.

Index: pkgsrc/converters/wkhtmltopdf/distinfo
diff -u pkgsrc/converters/wkhtmltopdf/distinfo:1.6.10.1 pkgsrc/converters/wkhtmltopdf/distinfo:1.6.10.2
--- pkgsrc/converters/wkhtmltopdf/distinfo:1.6.10.1     Fri Jan 20 16:20:42 2023
+++ pkgsrc/converters/wkhtmltopdf/distinfo      Mon Jan 23 16:29:57 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6.10.1 2023/01/20 16:20:42 manu Exp $
+$NetBSD: distinfo,v 1.6.10.2 2023/01/23 16:29:57 spz Exp $
 
 BLAKE2s (wkhtmltox-0.12.4.tar.bz2) = eb5c7d59b73b60e5eca704615ba59936547ab979b45b9c2e6dccc8ec07d02cf8
 SHA512 (wkhtmltox-0.12.4.tar.bz2) = 1526c6138d6276d0f6188737a67848b8ae9c16016c119eb00bbdaf7159464f8799c53ca9a997ea40eea4c2d1cadc35a10607564949fd39a3b7b7e6745a3dbdcb
@@ -36,6 +36,6 @@ SHA1 (patch-qt_src_network_ssl_qsslsocke
 SHA1 (patch-qt_src_network_ssl_qsslsocket_openssl_symbols_p.h) = fb7c20333199a00cc233a4a7ccbc29894eb806c1
 SHA1 (patch-qt_src_plugins_platforms_xlib_xlib.pro) = 18516ea36e61c57d2acc3f5fa06890ab7a88fbe6
 SHA1 (patch-qt_src_xmlpatterns_api_qcoloroutput_p.h) = d196f51a8168d335a00d3663418cab27f6076ca9
-SHA1 (patch-src_image_image.pro) = 3ab013cdb8ae93a481f7eb70a80c8e25a22ae23d
-SHA1 (patch-src_lib_lib.pro) = 0a8457b7779d6a85dad17adc7cc0575cecc818e6
-SHA1 (patch-src_pdf_pdf.pro) = 7141bb755434bf7336006370f407c875a9eb46a8
+SHA1 (patch-src_image_image.pro) = 1684d98030a1f163a905f8216629f09f453771eb
+SHA1 (patch-src_lib_lib.pro) = a3b1958c2bc63b79a195325cb226de37eecc17a0
+SHA1 (patch-src_pdf_pdf.pro) = 54d60872137de6b7d6188a2ca1260bccd170c3a9

Index: pkgsrc/converters/wkhtmltopdf/patches/patch-src_image_image.pro
diff -u pkgsrc/converters/wkhtmltopdf/patches/patch-src_image_image.pro:1.2.22.1 pkgsrc/converters/wkhtmltopdf/patches/patch-src_image_image.pro:1.2.22.2
--- pkgsrc/converters/wkhtmltopdf/patches/patch-src_image_image.pro:1.2.22.1    Fri Jan 20 16:20:42 2023
+++ pkgsrc/converters/wkhtmltopdf/patches/patch-src_image_image.pro     Mon Jan 23 16:29:57 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_image_image.pro,v 1.2.22.1 2023/01/20 16:20:42 manu Exp $
+$NetBSD: patch-src_image_image.pro,v 1.2.22.2 2023/01/23 16:29:57 spz Exp $
 
 --- src/image/image.pro.orig   2017-09-10 15:04:52.049437840 +0000
 +++ src/image/image.pro
@@ -6,7 +6,7 @@ $NetBSD: patch-src_image_image.pro,v 1.2
  # You should have received a copy of the GNU Lesser General Public License
  # along with wkhtmltopdf.  If not, see <http:#www.gnu.org/licenses/>.
  
-+LIBS+= ${COMPILER_RPATH_FLAG}${X11BASE}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib
++LIBS+= ${COMPILER_RPATH_FLAG}${X11PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib
 +
  include(../../common.pri)
  
Index: pkgsrc/converters/wkhtmltopdf/patches/patch-src_pdf_pdf.pro
diff -u pkgsrc/converters/wkhtmltopdf/patches/patch-src_pdf_pdf.pro:1.2.22.1 pkgsrc/converters/wkhtmltopdf/patches/patch-src_pdf_pdf.pro:1.2.22.2
--- pkgsrc/converters/wkhtmltopdf/patches/patch-src_pdf_pdf.pro:1.2.22.1        Fri Jan 20 16:20:42 2023
+++ pkgsrc/converters/wkhtmltopdf/patches/patch-src_pdf_pdf.pro Mon Jan 23 16:29:57 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_pdf_pdf.pro,v 1.2.22.1 2023/01/20 16:20:42 manu Exp $
+$NetBSD: patch-src_pdf_pdf.pro,v 1.2.22.2 2023/01/23 16:29:57 spz Exp $
 
 --- src/pdf/pdf.pro.orig       2017-09-10 12:26:34.883613832 +0000
 +++ src/pdf/pdf.pro
@@ -6,7 +6,7 @@ $NetBSD: patch-src_pdf_pdf.pro,v 1.2.22.
  DEPENDPATH += . ../shared
  INCLUDEPATH += . ../shared
  
-+LIBS+= ${COMPILER_RPATH_FLAG}${X11BASE}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib
++LIBS+= ${COMPILER_RPATH_FLAG}${X11PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib
 +
  unix {
      man.path=$$INSTALLBASE/share/man/man1

Index: pkgsrc/converters/wkhtmltopdf/patches/patch-src_lib_lib.pro
diff -u pkgsrc/converters/wkhtmltopdf/patches/patch-src_lib_lib.pro:1.1.44.1 pkgsrc/converters/wkhtmltopdf/patches/patch-src_lib_lib.pro:1.1.44.2
--- pkgsrc/converters/wkhtmltopdf/patches/patch-src_lib_lib.pro:1.1.44.1        Fri Jan 20 16:20:42 2023
+++ pkgsrc/converters/wkhtmltopdf/patches/patch-src_lib_lib.pro Mon Jan 23 16:29:57 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_lib_lib.pro,v 1.1.44.1 2023/01/20 16:20:42 manu Exp $
+$NetBSD: patch-src_lib_lib.pro,v 1.1.44.2 2023/01/23 16:29:57 spz Exp $
 
 --- src/lib/lib.pro.orig       2017-09-10 12:16:27.317023665 +0000
 +++ src/lib/lib.pro
@@ -6,7 +6,7 @@ $NetBSD: patch-src_lib_lib.pro,v 1.1.44.
  TEMPLATE = lib
  CONFIG += dll
  
-+LIBS+= ${COMPILER_RPATH_FLAG}${X11BASE}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib
++LIBS+= ${COMPILER_RPATH_FLAG}${X11PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib
 +
  include(../../common.pri)
  include(lib.pri)