From nobody Fri Jan 19 14:04:59 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TGhFm1YCWz56Ys0; Fri, 19 Jan 2024 14:05:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TGhFm0shXz4ryC; Fri, 19 Jan 2024 14:05:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705673100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y1VBAb8DgUfoJwMrVfNZVbc1up0o9WtAHYd+YK2HlNo=; b=Q8wvF9WClLOGBvOrHFGoD53lR/ka/IVlEScUzD3gA8T0qYRldfIvRhr4TkBcm0PFubauFo r1e0oUX2ySCCAFEDet8n2Sk70aloch0ukqqaPT363WxA05/Hznt2p9gcU17QwxGAA92Kbt liIBO15nOBtJd4+vysASrzwehJReScRh/x0KjHKcawFJIVIxkinb/OJrtLsyk8nG1PF+5p F/xHI5twr1NCSVxcnWH0Dm1N2J5nGtwNFDR+GV3AE44MU6kjeX8vi7RAFv16MUL91PQjKJ qb7usGUha1WC68jbIo+za7aVXnAoojVCADj5IdEArGyccI7W5bcjnPEO6LZV9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705673100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y1VBAb8DgUfoJwMrVfNZVbc1up0o9WtAHYd+YK2HlNo=; b=Ko1RHsTL5E/rN+uUJjvw6WbQBH5S4M9LaAUWpZgvQkSMLMxGqnwGUJZYS6OEz/cRJ/5ssA J3Cpf1ypS+9hJdAw2TcDNxQlBSe07NtQss/B0Xdgm0vaRZs5YKUOvI9gkqjS+N+7ziq+bd g58CObE96dKm7QXCHmS9iAzETOSV5pejlaHbGlAtrZxCsv0b7dRHWR9GzyjNh4KhqHTW77 VNZuNEXOzm68pEojGqmm3j0NMcJX2VzAj4+j5d3DP45w32dYALvQmjuyf2hInAyxX8Qj5g o+alTljyFPO15gb660/jztCqeWUmbkUreYbGqHrdVpnVahGmoW3pemlKKaxJ1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705673100; a=rsa-sha256; cv=none; b=FbLGhrLHixvemIhUGw8sSCL6AQgT1EBTH8pwb1fC1MYeQTsNa0J9CwmJQJNp0uk+ICE0i1 bjJnqopZE1ZW/5ZDcttB02rNcrHcSkrx6QlWws0hR0OwOe09m/8kqITwYh7AinbPsE/bzL H6N4HmvkQkLfSAo//PAyQIHEr6qv/GMqlrPOHQWJqWmxvK6wyIPzPIDZdrJnewVBK9fn0O htLg1iw28mavMLPCLr9zHbG3GIKFBbdsBhMZ+65Zj9cJdWpIskplvcRJnTXixnri79xIh5 zYzNQYbAFZJiqJs/yNc7AORWPVbtfC0KvUk/USnK++IIy1TU1zHAjQNlKYdN5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TGhFl6kcmztr8; Fri, 19 Jan 2024 14:04:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40JE4xaV071732; Fri, 19 Jan 2024 14:04:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40JE4xRF071729; Fri, 19 Jan 2024 14:04:59 GMT (envelope-from git) Date: Fri, 19 Jan 2024 14:04:59 GMT Message-Id: <202401191404.40JE4xRF071729@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 1890e08180ff - main - x11/eterm: Fix build with graphics/imlib2 1.12.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1890e08180ff2b4d942cd5056a349b06ac812521 Auto-Submitted: auto-generated The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=1890e08180ff2b4d942cd5056a349b06ac812521 commit 1890e08180ff2b4d942cd5056a349b06ac812521 Author: Nuno Teixeira AuthorDate: 2024-01-19 14:00:55 +0000 Commit: Nuno Teixeira CommitDate: 2024-01-19 14:04:47 +0000 x11/eterm: Fix build with graphics/imlib2 1.12.1 Fix pixmap.{c,h} imlib_strerror is provided by Imlib2 PR: 276441 Approved by: portmgr (buildfix blanket) --- x11/eterm/Makefile | 2 +- x11/eterm/files/patch-src_pixmap.c | 30 ++++++++++++++++++++++++++++++ x11/eterm/files/patch-src_pixmap.h | 12 ++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile index b3b14ba4b589..cbac8e61d9ef 100644 --- a/x11/eterm/Makefile +++ b/x11/eterm/Makefile @@ -1,6 +1,6 @@ PORTNAME= eterm PORTVERSION= 0.9.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES+= x11 MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Eterm-${PORTVERSION} DISTNAME= Eterm-${PORTVERSION} diff --git a/x11/eterm/files/patch-src_pixmap.c b/x11/eterm/files/patch-src_pixmap.c new file mode 100644 index 000000000000..3b72a16e3937 --- /dev/null +++ b/x11/eterm/files/patch-src_pixmap.c @@ -0,0 +1,30 @@ +imlib_strerror is provided by Imlib2 + +--- src/pixmap.c.orig 2011-03-16 06:09:23 UTC ++++ src/pixmap.c +@@ -171,6 +171,7 @@ image_mode_any(unsigned char mode) + } + + #ifdef PIXMAP_SUPPORT ++#if 0 + const char * + imlib_strerror(Imlib_Load_Error err) + { +@@ -224,6 +225,7 @@ imlib_strerror(Imlib_Load_Error err) + } + ASSERT_NOTREACHED_RVAL(""); + } ++#endif + + unsigned short + parse_pixmap_ops(char *str) +@@ -1916,7 +1918,8 @@ update_desktop_info(int *w, int *h) + } + if (desktop_window == None) { + libast_print_error("Unable to locate desktop window. If you are running Enlightenment, please\n" +- "restart. If not, please set your background image with Esetroot, then try again."); ++ "restart. If not, please set your background image with Esetroot, then try again.\n" ++ "Or, if you are running Enlightenment DR17, use e17setroot."); + return 0; + } + if (desktop_pixmap == None) { diff --git a/x11/eterm/files/patch-src_pixmap.h b/x11/eterm/files/patch-src_pixmap.h new file mode 100644 index 000000000000..5a8770d7a32f --- /dev/null +++ b/x11/eterm/files/patch-src_pixmap.h @@ -0,0 +1,12 @@ +imlib_strerror is provided by Imlib2 + +--- src/pixmap.h.orig 2009-01-06 09:05:36 UTC ++++ src/pixmap.h +@@ -221,7 +221,6 @@ extern unsigned char image_mode_any(unsigned char); + 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 unsigned short parse_pixmap_ops(char *); + extern unsigned short set_pixmap_scale(const char *, pixmap_t *); + extern unsigned char check_image_ipc(unsigned char);