View | Details | Raw Unified | Return to bug 276441
Collapse All | Expand All

(-)b/x11/eterm/Makefile (-1 / +1 lines)
Lines 1-6 Link Here
1
PORTNAME=	eterm
1
PORTNAME=	eterm
2
PORTVERSION=	0.9.6
2
PORTVERSION=	0.9.6
3
PORTREVISION=	5
3
PORTREVISION=	6
4
CATEGORIES+=	x11
4
CATEGORIES+=	x11
5
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Eterm-${PORTVERSION}
5
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Eterm-${PORTVERSION}
6
DISTNAME=	Eterm-${PORTVERSION}
6
DISTNAME=	Eterm-${PORTVERSION}
(-)b/x11/eterm/files/patch-src_pixmap.c (+30 lines)
Added Link Here
1
imlib_strerror is provided by Imlib2
2
3
--- src/pixmap.c.orig	2011-03-16 06:09:23 UTC
4
+++ src/pixmap.c
5
@@ -171,6 +171,7 @@ image_mode_any(unsigned char mode)
6
 }
7
 
8
 #ifdef PIXMAP_SUPPORT
9
+#if 0
10
 const char *
11
 imlib_strerror(Imlib_Load_Error err)
12
 {
13
@@ -224,6 +225,7 @@ imlib_strerror(Imlib_Load_Error err)
14
     }
15
     ASSERT_NOTREACHED_RVAL("");
16
 }
17
+#endif
18
 
19
 unsigned short
20
 parse_pixmap_ops(char *str)
21
@@ -1916,7 +1918,8 @@ update_desktop_info(int *w, int *h)
22
     }
23
     if (desktop_window == None) {
24
         libast_print_error("Unable to locate desktop window.  If you are running Enlightenment, please\n"
25
-                    "restart.  If not, please set your background image with Esetroot, then try again.");
26
+                    "restart.  If not, please set your background image with Esetroot, then try again.\n"
27
+		    "Or, if you are running Enlightenment DR17, use e17setroot.");
28
         return 0;
29
     }
30
     if (desktop_pixmap == None) {
(-)b/x11/eterm/files/patch-src_pixmap.h (+12 lines)
Added Link Here
1
imlib_strerror is provided by Imlib2
2
3
--- src/pixmap.h.orig	2009-01-06 09:05:36 UTC
4
+++ src/pixmap.h
5
@@ -221,7 +221,6 @@ extern unsigned char image_mode_any(unsigned char);
6
 extern const char *get_image_type(unsigned char);
7
 extern unsigned char image_mode_any(unsigned char);
8
 #ifdef PIXMAP_SUPPORT
9
-extern const char *imlib_strerror(Imlib_Load_Error);
10
 extern unsigned short parse_pixmap_ops(char *);
11
 extern unsigned short set_pixmap_scale(const char *, pixmap_t *);
12
 extern unsigned char check_image_ipc(unsigned char);

Return to bug 276441