Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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)
- Loading branch information
1 parent
eeb84c2
commit 1890e08
Showing
3 changed files
with
43 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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) { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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); |