Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_165907475030910"
MIME-Version: 1.0
Date: Fri, 29 Jul 2022 06:05:50 +0000
From: "Rin Okuyama" <rin@netbsd.org>
Subject: CVS commit: pkgsrc/x11/eterm
To: pkgsrc-changes@NetBSD.org
Reply-To: rin@netbsd.org
Message-Id: <20220729060550.0B5EFFB1A@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_165907475030910
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	rin
Date:		Fri Jul 29 06:05:49 UTC 2022

Modified Files:
	pkgsrc/x11/eterm: Makefile distinfo
Added Files:
	pkgsrc/x11/eterm/patches: patch-src_pixmap.c patch-src_pixmap.h

Log Message:
x11/eterm: Fix for graphics/imlib2 update

imlib_strerror() has been introduced to imlib2; mangle local version.

Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 pkgsrc/x11/eterm/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/x11/eterm/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/eterm/patches/patch-src_pixmap.c \
    pkgsrc/x11/eterm/patches/patch-src_pixmap.h

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


--_----------=_165907475030910
Content-Disposition: inline
Content-Length: 4629
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/x11/eterm/Makefile
diff -u pkgsrc/x11/eterm/Makefile:1.88 pkgsrc/x11/eterm/Makefile:1.89
--- pkgsrc/x11/eterm/Makefile:1.88	Tue Jun 28 11:37:52 2022
+++ pkgsrc/x11/eterm/Makefile	Fri Jul 29 06:05:49 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.88 2022/06/28 11:37:52 wiz Exp $
+# $NetBSD: Makefile,v 1.89 2022/07/29 06:05:49 rin Exp $
 
 DISTNAME=	Eterm-0.9.6
 PKGNAME=	${DISTNAME:S/^E/e/}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=eterm/}
 DISTFILES=	${DEFAULT_DISTFILES} ${PIXMAP_FILES}

Index: pkgsrc/x11/eterm/distinfo
diff -u pkgsrc/x11/eterm/distinfo:1.26 pkgsrc/x11/eterm/distinfo:1.27
--- pkgsrc/x11/eterm/distinfo:1.26	Tue Oct 26 11:33:48 2021
+++ pkgsrc/x11/eterm/distinfo	Fri Jul 29 06:05:49 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2021/10/26 11:33:48 nia Exp $
+$NetBSD: distinfo,v 1.27 2022/07/29 06:05:49 rin Exp $
 
 BLAKE2s (Eterm-0.9.6.tar.gz) = 6f7b2d8dc741929ad4b8f93fa257cd6ae22ac7d68012b2d04da9d27316b70715
 SHA512 (Eterm-0.9.6.tar.gz) = 07ef5587b7c8444d49ffd6f20f09c98bd248ccee9b3de311f5705961579f707c4a8e2b69a2193500b75cc1e4bdeabb711a1dd23637d6b94433508d8a93d377fe
@@ -11,5 +11,7 @@ SHA1 (patch-ab) = d019a18bb32f890d6de7c5
 SHA1 (patch-ai) = 1f1a050c27b042c5cccff91aae4ced7b887b68b1
 SHA1 (patch-src_Makefile.in) = 3000a407bed7d7c23bfc127fd09b0723d9c0b395
 SHA1 (patch-src_command.c) = 0b5b3dbde8eba16b1690155a28764ec7ea0f6bff
+SHA1 (patch-src_pixmap.c) = 4894169d1f23c6e8de09fc53a9fc2b242b0e8f36
+SHA1 (patch-src_pixmap.h) = 5ade255a6a6d8d8c423eacc3057b9e1ee89c9bf4
 SHA1 (patch-src_screen.c) = f820501e3a67cfc59dedd1dd5e3eb6f06ae2be23
 SHA1 (patch-src_term.c) = 45b1fecdb9b0f726f4ce5c001c27cc20340cd687

Added files:

Index: pkgsrc/x11/eterm/patches/patch-src_pixmap.c
diff -u /dev/null pkgsrc/x11/eterm/patches/patch-src_pixmap.c:1.1
--- /dev/null	Fri Jul 29 06:05:49 2022
+++ pkgsrc/x11/eterm/patches/patch-src_pixmap.c	Fri Jul 29 06:05:49 2022
@@ -0,0 +1,33 @@
+$NetBSD: patch-src_pixmap.c,v 1.1 2022/07/29 06:05:49 rin Exp $
+
+imlib_strerror() has been introduced to imlib2; mangle local version.
+
+--- src/pixmap.c.orig	2022-07-29 02:12:11.471134723 +0900
++++ src/pixmap.c	2022-07-29 02:12:47.891883811 +0900
+@@ -172,7 +172,7 @@ image_mode_any(unsigned char mode)
+ 
+ #ifdef PIXMAP_SUPPORT
+ const char *
+-imlib_strerror(Imlib_Load_Error err)
++eterm_imlib_strerror(Imlib_Load_Error err)
+ {
+     switch (err) {
+         case IMLIB_LOAD_ERROR_NONE:
+@@ -1447,7 +1447,7 @@ load_image(const char *file, simage_t *s
+         if (f) {
+             im = imlib_load_image_with_error_return(f, &im_err);
+             if (!im) {
+-                libast_print_error("Unable to load image file \"%s\" -- %s\n", file, imlib_strerror(im_err));
++                libast_print_error("Unable to load image file \"%s\" -- %s\n", file, eterm_imlib_strerror(im_err));
+                 return 0;
+             } else {
+                 reset_simage(simg, (RESET_IMLIB_IM | RESET_PMAP_PIXMAP | RESET_PMAP_MASK));
+@@ -2178,7 +2178,7 @@ set_icon_pixmap(char *filename, XWMHints
+ 
+             temp_im = imlib_load_image_with_error_return(icon_path, &im_err);
+             if (!temp_im) {
+-                libast_print_error("Unable to load icon file \"%s\" -- %s\n", icon_path, imlib_strerror(im_err));
++                libast_print_error("Unable to load icon file \"%s\" -- %s\n", icon_path, eterm_imlib_strerror(im_err));
+             } else {
+                 /* If we're going to render the image anyway, might as well be nice and give it to the WM in a size it likes. */
+                 if (XGetIconSizes(Xdisplay, Xroot, &icon_sizes, &count)) {
Index: pkgsrc/x11/eterm/patches/patch-src_pixmap.h
diff -u /dev/null pkgsrc/x11/eterm/patches/patch-src_pixmap.h:1.1
--- /dev/null	Fri Jul 29 06:05:49 2022
+++ pkgsrc/x11/eterm/patches/patch-src_pixmap.h	Fri Jul 29 06:05:49 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_pixmap.h,v 1.1 2022/07/29 06:05:49 rin Exp $
+
+imlib_strerror() has been introduced to imlib2; mangle local version.
+
+--- src/pixmap.h.orig	2022-07-29 04:41:21.385340371 +0900
++++ src/pixmap.h	2022-07-29 04:41:31.374499903 +0900
+@@ -221,7 +221,7 @@ _XFUNCPROTOBEGIN
+ extern const char *get_image_type(unsigned char);
+ extern unsigned char image_mode_any(unsigned char);
+ #ifdef PIXMAP_SUPPORT
+-extern const char *imlib_strerror(Imlib_Load_Error);
++extern const char *eterm_imlib_strerror(Imlib_Load_Error);
+ extern unsigned short parse_pixmap_ops(char *);
+ extern unsigned short set_pixmap_scale(const char *, pixmap_t *);
+ extern unsigned char check_image_ipc(unsigned char);


--_----------=_165907475030910--