Attachment 247759 Details for Bug 276441 – Fix build with imlib2 1.12.1

[patch] Fix build with imlib2 1.12.1

eterm-0.9.6_6.diff (text/plain), 2.23 KB, created by Nuno Teixeira on 2024-01-18 20:54:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nuno Teixeira

Created: 2024-01-18 20:54:44 UTC

Size: 2.23 KB

patch

obsolete

>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);

Flags:

eduardo: maintainer-approval? (enlightenment)

Actions: View | Diff

Attachments on bug 276441: 247759