Skip to content

Commit

Permalink
x11/eterm: Fix build with graphics/imlib2 1.12.1
Browse files Browse the repository at this point in the history
Fix pixmap.{c,h}
imlib_strerror is provided by Imlib2

PR:		276441
Approved by:	portmgr (buildfix blanket)
  • Loading branch information
nunotexbsd committed Jan 19, 2024
1 parent eeb84c2 commit 1890e08
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 1 deletion.
2 changes: 1 addition & 1 deletion 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}
Expand Down
30 changes: 30 additions & 0 deletions 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) {
12 changes: 12 additions & 0 deletions 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);

0 comments on commit 1890e08

Please sign in to comment.