pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/editors/texmaker

Module Name:    pkgsrc
Committed By:   nros
Date:           Sat Sep  9 09:49:56 UTC 2023

Modified Files:
        pkgsrc/editors/texmaker: Makefile distinfo
        pkgsrc/editors/texmaker/patches: patch-texmaker.pro
Added Files:
        pkgsrc/editors/texmaker/patches:
            patch-pdfium_core_fxcodec_codec_fx__codec__flate.cpp
            patch-pdfium_core_fxcodec_codec_fx__codec__icc.cpp
            patch-pdfium_core_fxcodec_codec_fx__codec__jpx__opj.cpp
            patch-pdfium_third__party_libtiff_tif__pixarlog.c
            patch-pdfium_third__party_libtiff_tif__zip.c

Log Message:
texmaker: use pkgsrc lcms and zlib, bump pkgrevision


To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 pkgsrc/editors/texmaker/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/editors/texmaker/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxcodec_codec_fx__codec__flate.cpp \
    pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxcodec_codec_fx__codec__icc.cpp \
    pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxcodec_codec_fx__codec__jpx__opj.cpp \
    pkgsrc/editors/texmaker/patches/patch-pdfium_third__party_libtiff_tif__pixarlog.c \
    pkgsrc/editors/texmaker/patches/patch-pdfium_third__party_libtiff_tif__zip.c
cvs rdiff -u -r1.2 -r1.3 pkgsrc/editors/texmaker/patches/patch-texmaker.pro

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


Modified files:

Index: pkgsrc/editors/texmaker/Makefile
diff -u pkgsrc/editors/texmaker/Makefile:1.131 pkgsrc/editors/texmaker/Makefile:1.132
--- pkgsrc/editors/texmaker/Makefile:1.131      Fri Sep  8 13:40:58 2023
+++ pkgsrc/editors/texmaker/Makefile    Sat Sep  9 09:49:56 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.131 2023/09/08 13:40:58 nros Exp $
+# $NetBSD: Makefile,v 1.132 2023/09/09 09:49:56 nros Exp $
 
 DISTNAME=      texmaker-5.1.4
+PKGREVISION=   1
 CATEGORIES=    editors
 MASTER_SITES=  http://www.xm1math.net/texmaker/
 EXTRACT_SUFX=  .tar.bz2
@@ -42,6 +43,8 @@ SUBST_VARS.fonts+=    X11BASE
 
 DEPENDS+=      xdg-utils-[0-9]*:../../misc/xdg-utils
 
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/lcms2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"

Index: pkgsrc/editors/texmaker/distinfo
diff -u pkgsrc/editors/texmaker/distinfo:1.22 pkgsrc/editors/texmaker/distinfo:1.23
--- pkgsrc/editors/texmaker/distinfo:1.22       Fri Sep  8 13:40:58 2023
+++ pkgsrc/editors/texmaker/distinfo    Sat Sep  9 09:49:56 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2023/09/08 13:40:58 nros Exp $
+$NetBSD: distinfo,v 1.23 2023/09/09 09:49:56 nros Exp $
 
 BLAKE2s (texmaker-5.1.4.tar.bz2) = 0b9facc6622b7f247241ebf4491ee6c71f23bf8161b6020db8f350181f083c56
 SHA512 (texmaker-5.1.4.tar.bz2) = 6ae4be7ae9be98e494480d4574e783a5568f0dcc9c631ccbc9bf00cca9f69dc672ba72060c064748a4446d20302af89e3bc6f14e8977d1f1ddbd20458fcf6d4e
@@ -6,12 +6,18 @@ Size (texmaker-5.1.4.tar.bz2) = 15277027
 SHA1 (patch-latexeditor.h) = 2168a70e6911aff17e10997948fbc555d18cd567
 SHA1 (patch-latexeditorview.h) = b1a474fb47af2fd78b468328d7582ac79f4e81bb
 SHA1 (patch-latexhighlighter.h) = 0268fc657fae4071a5c8392df270f3666621457e
+SHA1 (patch-pdfium_core_fxcodec_codec_fx__codec__flate.cpp) = 21fe6dc2934d76748284fa811cb8b52ab286907e
+SHA1 (patch-pdfium_core_fxcodec_codec_fx__codec__icc.cpp) = df4f4578b0ed02f6be0b1a93a67b15968290a2ca
+SHA1 (patch-pdfium_core_fxcodec_codec_fx__codec__jpx__opj.cpp) = 1f86c79a9b681ad34d467b360bea6cf82fdd86c8
 SHA1 (patch-pdfium_core_fxcodec_codec_fx__codec__png.cpp) = 78255906cbc72bc539c41120e23765fcf4baa87f
 SHA1 (patch-pdfium_core_fxcrt_fx__system.h) = d79065ef0ef64748f99cd04774f137aaf358c4a9
 SHA1 (patch-pdfium_core_fxge_apple_fx__mac__imp.cpp) = eb21c8516bae912ab2ddcbbe15fb570ac5dc9984
 SHA1 (patch-pdfium_core_fxge_ge_fx__ge__linux.cpp) = a332a849a4a0966abb0cc6c8e14442a5b9d917c7
 SHA1 (patch-pdfium_third__party_libopenjpeg20_opj__malloc.h) = b782865712ce4fc695fcc0803dd3d051c2952a9e
+SHA1 (patch-pdfium_third__party_libtiff_tif__pixarlog.c) = bb9ee479566f36bfdd3b463928694473260f767b
+SHA1 (patch-pdfium_third__party_libtiff_tif__zip.c) = 27d57959c8687a54c1e533837fb25dae5c3c17f3
 SHA1 (patch-pdfium_xfa_fgas_font_cfgas__fontmgr.cpp) = 50b4b262a75582810ddb62a360f71311cb3f442c
 SHA1 (patch-spellerdialog.h) = 89487a11158f43a4e2a2bab898817d23e4ad8b68
+SHA1 (patch-texmaker.cpp) = 23bd4e079d69666a558002a0c1597e66dee085a8
 SHA1 (patch-texmaker.h) = 34f14f84325d175af63a18c0825ecf622164e936
-SHA1 (patch-texmaker.pro) = 10a629c34f796847d4cac909cdb290c1bc841db9
+SHA1 (patch-texmaker.pro) = 3f136f3c73e042da75e123e89780cc67b2892de1

Index: pkgsrc/editors/texmaker/patches/patch-texmaker.pro
diff -u pkgsrc/editors/texmaker/patches/patch-texmaker.pro:1.2 pkgsrc/editors/texmaker/patches/patch-texmaker.pro:1.3
--- pkgsrc/editors/texmaker/patches/patch-texmaker.pro:1.2      Tue Oct 26 17:56:54 2021
+++ pkgsrc/editors/texmaker/patches/patch-texmaker.pro  Sat Sep  9 09:49:56 2023
@@ -1,20 +1,21 @@
-$NetBSD: patch-texmaker.pro,v 1.2 2021/10/26 17:56:54 nros Exp $
+$NetBSD: patch-texmaker.pro,v 1.3 2023/09/09 09:49:56 nros Exp $
 
-* use pkgsrc (system) freetype2, hunspell, libjpeg and libpng
+* use pkgsrc (system) freetype2, hunspell, lcms2, libjpeg, libpng
+  and zlib
 
---- texmaker.pro.orig  2021-09-02 18:08:25.000000000 +0000
+--- texmaker.pro.orig  2023-04-30 12:59:36.000000000 +0000
 +++ texmaker.pro
 @@ -31,6 +31,9 @@ QT += webenginewidgets
  CONFIG        += qt hide_symbols warn_off rtti_off exceptions_off c++11 release
  CONFIG -= precompile_header
  
 +CONFIG += link_pkgconfig
-+PKGCONFIG = freetype2 hunspell libjpeg libpng16
++PKGCONFIG = freetype2 hunspell lcms2 libjpeg libpng16 zlib
 +
  gcc {
      QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter
  }
-@@ -45,15 +48,13 @@ DEFINES += \
+@@ -45,17 +48,14 @@ DEFINES += \
      PNG_USE_READ_MACROS \
      V8_DEPRECATION_WARNINGS \
      NOMINMAX \
@@ -29,9 +30,11 @@ $NetBSD: patch-texmaker.pro,v 1.2 2021/1
 -    pdfium/third_party/freetype/include \
 -    pdfium/third_party/freetype/include/freetype \
      pdfium/fpdfsdk \
-     pdfium/third_party/zlib_v128
+-    pdfium/third_party/zlib_v128
  
-@@ -127,24 +128,6 @@ HEADERS   += texmaker.h \
+ ###############################
+ 
+@@ -127,24 +127,6 @@ HEADERS   += texmaker.h \
        x11fontdialog.h \
        quickbeamerdialog.h \
        cmdparser.h \
@@ -56,7 +59,7 @@ $NetBSD: patch-texmaker.pro,v 1.2 2021/1
        singleapp/qtlocalpeer.h \
        singleapp/qtlockedfile.h \
        singleapp/qtsingleapplication.h \
-@@ -190,20 +173,6 @@ HEADERS   += texmaker.h \
+@@ -190,22 +172,6 @@ HEADERS   += texmaker.h \
      pdfium/third_party/base/numerics/safe_math.h \
      pdfium/third_party/base/numerics/safe_math_impl.h \
      pdfium/third_party/base/stl_util.h \
@@ -74,10 +77,12 @@ $NetBSD: patch-texmaker.pro,v 1.2 2021/1
 -    pdfium/third_party/libjpeg/jpeglib.h \
 -    pdfium/third_party/libjpeg/jversion.h \
 -    pdfium/third_party/libjpeg/transupp.h \
-     pdfium/third_party/lcms/include/lcms2.h \
-     pdfium/third_party/lcms/include/lcms2_plugin.h \
+-    pdfium/third_party/lcms/include/lcms2.h \
+-    pdfium/third_party/lcms/include/lcms2_plugin.h \
      pdfium/third_party/agg23/agg_basics.h \
-@@ -216,18 +185,6 @@ HEADERS   += texmaker.h \
+     pdfium/third_party/agg23/agg_clip_liang_barsky.h \
+     pdfium/third_party/agg23/agg_conv_dash.h \
+@@ -216,18 +182,6 @@ HEADERS   += texmaker.h \
      pdfium/third_party/agg23/agg_renderer_scanline.h \
      pdfium/third_party/agg23/agg_rendering_buffer.h \
      pdfium/third_party/agg23/agg_scanline_u.h \
@@ -96,7 +101,7 @@ $NetBSD: patch-texmaker.pro,v 1.2 2021/1
      pdfium/fpdfsdk/cba_annotiterator.h \
      pdfium/fpdfsdk/cfx_systemhandler.h \
      pdfium/fpdfsdk/cpdfsdk_annot.h \
-@@ -567,16 +524,6 @@ SOURCES   += main.cpp \
+@@ -567,16 +521,6 @@ SOURCES   += main.cpp \
        svnhelper.cpp \
        x11fontdialog.cpp \
        cmdparser.cpp \
@@ -113,7 +118,7 @@ $NetBSD: patch-texmaker.pro,v 1.2 2021/1
        singleapp/qtlocalpeer.cpp \
        singleapp/qtlockedfile.cpp \
        singleapp/qtsingleapplication.cpp \
-@@ -616,46 +563,6 @@ SOURCES   += main.cpp \
+@@ -616,72 +560,6 @@ SOURCES   += main.cpp \
      pdfium/third_party/bigint/BigIntegerUtils.cc \
      pdfium/third_party/bigint/BigUnsigned.cc \
      pdfium/third_party/bigint/BigUnsignedInABase.cc \
@@ -157,10 +162,56 @@ $NetBSD: patch-texmaker.pro,v 1.2 2021/1
 -    pdfium/third_party/libjpeg/fpdfapi_jmemmgr.c \
 -    pdfium/third_party/libjpeg/fpdfapi_jmemnobs.c \
 -    pdfium/third_party/libjpeg/fpdfapi_jutils.c \
-     pdfium/third_party/lcms/src/cmsalpha.c \
-     pdfium/third_party/lcms/src/cmscam02.c \
-     pdfium/third_party/lcms/src/cmscgats.c \
-@@ -721,23 +628,6 @@ SOURCES   += main.cpp \
+-    pdfium/third_party/lcms/src/cmsalpha.c \
+-    pdfium/third_party/lcms/src/cmscam02.c \
+-    pdfium/third_party/lcms/src/cmscgats.c \
+-    pdfium/third_party/lcms/src/cmscnvrt.c \
+-    pdfium/third_party/lcms/src/cmserr.c \
+-    pdfium/third_party/lcms/src/cmsgamma.c \
+-    pdfium/third_party/lcms/src/cmsgmt.c \
+-    pdfium/third_party/lcms/src/cmshalf.c \
+-    pdfium/third_party/lcms/src/cmsintrp.c \
+-    pdfium/third_party/lcms/src/cmsio0.c \
+-    pdfium/third_party/lcms/src/cmsio1.c \
+-    pdfium/third_party/lcms/src/cmslut.c \
+-    pdfium/third_party/lcms/src/cmsmd5.c \
+-    pdfium/third_party/lcms/src/cmsmtrx.c \
+-    pdfium/third_party/lcms/src/cmsnamed.c \
+-    pdfium/third_party/lcms/src/cmsopt.c \
+-    pdfium/third_party/lcms/src/cmspack.c \
+-    pdfium/third_party/lcms/src/cmspcs.c \
+-    pdfium/third_party/lcms/src/cmsplugin.c \
+-    pdfium/third_party/lcms/src/cmsps2.c \
+-    pdfium/third_party/lcms/src/cmssamp.c \
+-    pdfium/third_party/lcms/src/cmssm.c \
+-    pdfium/third_party/lcms/src/cmstypes.c \
+-    pdfium/third_party/lcms/src/cmsvirt.c \
+-    pdfium/third_party/lcms/src/cmswtpnt.c \
+-    pdfium/third_party/lcms/src/cmsxform.c \
+     pdfium/third_party/libopenjpeg20/bio.c \
+     pdfium/third_party/libopenjpeg20/cio.c \
+     pdfium/third_party/libopenjpeg20/dwt.c \
+@@ -701,43 +579,11 @@ SOURCES  += main.cpp \
+     pdfium/third_party/libopenjpeg20/t2.c \
+     pdfium/third_party/libopenjpeg20/tcd.c \
+     pdfium/third_party/libopenjpeg20/tgt.c \
+-    pdfium/third_party/zlib_v128/adler32.c \
+-    pdfium/third_party/zlib_v128/compress.c \
+-    pdfium/third_party/zlib_v128/crc32.c \
+-    pdfium/third_party/zlib_v128/deflate.c \
+-    pdfium/third_party/zlib_v128/gzclose.c \
+-    pdfium/third_party/zlib_v128/gzlib.c \
+-    pdfium/third_party/zlib_v128/gzread.c \
+-    pdfium/third_party/zlib_v128/gzwrite.c \
+-    pdfium/third_party/zlib_v128/infback.c \
+-    pdfium/third_party/zlib_v128/inffast.c \
+-    pdfium/third_party/zlib_v128/inflate.c \
+-    pdfium/third_party/zlib_v128/inftrees.c \
+-    pdfium/third_party/zlib_v128/trees.c \
+-    pdfium/third_party/zlib_v128/uncompr.c \
+-    pdfium/third_party/zlib_v128/zutil.c \
+     pdfium/third_party/agg23/agg_curves.cpp \
+     pdfium/third_party/agg23/agg_path_storage.cpp \
      pdfium/third_party/agg23/agg_rasterizer_scanline_aa.cpp \
      pdfium/third_party/agg23/agg_vcgen_dash.cpp \
      pdfium/third_party/agg23/agg_vcgen_stroke.cpp \

Added files:

Index: pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxcodec_codec_fx__codec__flate.cpp
diff -u /dev/null pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxcodec_codec_fx__codec__flate.cpp:1.1
--- /dev/null   Sat Sep  9 09:49:56 2023
+++ pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxcodec_codec_fx__codec__flate.cpp        Sat Sep  9 09:49:56 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-pdfium_core_fxcodec_codec_fx__codec__flate.cpp,v 1.1 2023/09/09 09:49:56 nros Exp $
+
+Use pkgsrc zlib
+
+--- pdfium/core/fxcodec/codec/fx_codec_flate.cpp.orig  2023-09-08 18:32:51.006233364 +0000
++++ pdfium/core/fxcodec/codec/fx_codec_flate.cpp
+@@ -11,7 +11,7 @@
+ 
+ #include "core/fxcodec/fx_codec.h"
+ #include "core/fxcrt/fx_ext.h"
+-#include "third_party/zlib_v128/zlib.h"
++#include <zlib.h>
+ 
+ extern "C" {
+ static void* my_alloc_func(void* opaque,
Index: pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxcodec_codec_fx__codec__icc.cpp
diff -u /dev/null pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxcodec_codec_fx__codec__icc.cpp:1.1
--- /dev/null   Sat Sep  9 09:49:56 2023
+++ pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxcodec_codec_fx__codec__icc.cpp  Sat Sep  9 09:49:56 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-pdfium_core_fxcodec_codec_fx__codec__icc.cpp,v 1.1 2023/09/09 09:49:56 nros Exp $
+
+Use pkgsrc lcms2
+
+--- pdfium/core/fxcodec/codec/fx_codec_icc.cpp.orig    2023-09-08 16:30:26.678351870 +0000
++++ pdfium/core/fxcodec/codec/fx_codec_icc.cpp
+@@ -6,7 +6,7 @@
+ 
+ #include "core/fxcodec/codec/codec_int.h"
+ #include "core/fxcodec/fx_codec.h"
+-#include "third_party/lcms/include/lcms2.h"
++#include <lcms2.h>
+ 
+ const uint32_t N_COMPONENT_LAB = 3;
+ const uint32_t N_COMPONENT_GRAY = 1;
Index: pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxcodec_codec_fx__codec__jpx__opj.cpp
diff -u /dev/null pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxcodec_codec_fx__codec__jpx__opj.cpp:1.1
--- /dev/null   Sat Sep  9 09:49:56 2023
+++ pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxcodec_codec_fx__codec__jpx__opj.cpp     Sat Sep  9 09:49:56 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-pdfium_core_fxcodec_codec_fx__codec__jpx__opj.cpp,v 1.1 2023/09/09 09:49:56 nros Exp $
+
+use pkgsrc lcms2
+
+--- pdfium/core/fxcodec/codec/fx_codec_jpx_opj.cpp.orig        2023-09-08 16:31:13.446248295 +0000
++++ pdfium/core/fxcodec/codec/fx_codec_jpx_opj.cpp
+@@ -13,7 +13,7 @@
+ #include "core/fxcodec/fx_codec.h"
+ #include "core/fxcrt/fx_memory.h"
+ #include "core/fxcrt/fx_safe_types.h"
+-#include "third_party/lcms/include/lcms2.h"
++#include <lcms2.h>
+ #include "third_party/libopenjpeg20/openjpeg.h"
+ #include "third_party/libopenjpeg20/opj_malloc.h"
+ 
Index: pkgsrc/editors/texmaker/patches/patch-pdfium_third__party_libtiff_tif__pixarlog.c
diff -u /dev/null pkgsrc/editors/texmaker/patches/patch-pdfium_third__party_libtiff_tif__pixarlog.c:1.1
--- /dev/null   Sat Sep  9 09:49:56 2023
+++ pkgsrc/editors/texmaker/patches/patch-pdfium_third__party_libtiff_tif__pixarlog.c   Sat Sep  9 09:49:56 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-pdfium_third__party_libtiff_tif__pixarlog.c,v 1.1 2023/09/09 09:49:56 nros Exp $
+
+use pkgsrc zlib
+
+--- pdfium/third_party/libtiff/tif_pixarlog.c.orig     2023-09-08 21:11:51.774327127 +0000
++++ pdfium/third_party/libtiff/tif_pixarlog.c
+@@ -90,7 +90,7 @@
+  */
+ 
+ #include "tif_predict.h"
+-#include "../zlib_v128/zlib.h"
++#include <zlib.h>
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
Index: pkgsrc/editors/texmaker/patches/patch-pdfium_third__party_libtiff_tif__zip.c
diff -u /dev/null pkgsrc/editors/texmaker/patches/patch-pdfium_third__party_libtiff_tif__zip.c:1.1
--- /dev/null   Sat Sep  9 09:49:56 2023
+++ pkgsrc/editors/texmaker/patches/patch-pdfium_third__party_libtiff_tif__zip.c        Sat Sep  9 09:49:56 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-pdfium_third__party_libtiff_tif__zip.c,v 1.1 2023/09/09 09:49:56 nros Exp $
+
+use pkgsrc zlib
+
+--- pdfium/third_party/libtiff/tif_zip.c.orig  2023-09-08 21:12:11.638227521 +0000
++++ pdfium/third_party/libtiff/tif_zip.c
+@@ -47,7 +47,7 @@
+  * last found at ftp://ftp.uu.net/pub/archiving/zip/zlib/zlib-0.99.tar.gz.
+  */
+ #include "tif_predict.h"
+-#include "../zlib_v128/zlib.h"
++#include <zlib.h>
+ 
+ #include <stdio.h>
+
Home | Main Index | Thread Index | Old Index