diff options
author | gahr <gahr@FreeBSD.org> | 2009-06-28 21:47:42 +0800 |
---|---|---|
committer | gahr <gahr@FreeBSD.org> | 2009-06-28 21:47:42 +0800 |
commit | 021a8d0e174be13028e739f468fb99dc5e5aa289 (patch) | |
tree | ab3f354831e0cd87fd631d1e72328e3981340167 /x11-wm/e16 | |
parent | d634d6d9ae68106b4cca4e80444f7c315b62d19e (diff) | |
download | freebsd-ports-gnome-021a8d0e174be13028e739f468fb99dc5e5aa289.tar.gz freebsd-ports-gnome-021a8d0e174be13028e739f468fb99dc5e5aa289.tar.zst freebsd-ports-gnome-021a8d0e174be13028e739f468fb99dc5e5aa289.zip |
- Update to 1.0.0.001
http://trac.enlightenment.org/e/changeset/41210/trunk/E16/e/ChangeLog
Diffstat (limited to 'x11-wm/e16')
-rw-r--r-- | x11-wm/e16/Makefile | 2 | ||||
-rw-r--r-- | x11-wm/e16/distinfo | 6 | ||||
-rw-r--r-- | x11-wm/e16/files/patch-src_aclass.c | 15 | ||||
-rw-r--r-- | x11-wm/e16/files/patch-src_magwin.c | 11 | ||||
-rw-r--r-- | x11-wm/e16/files/patch-src_menus-misc.c | 34 |
5 files changed, 4 insertions, 64 deletions
diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile index d07d21eb0fff..ab330c84e1e5 100644 --- a/x11-wm/e16/Makefile +++ b/x11-wm/e16/Makefile @@ -6,7 +6,7 @@ # PORTNAME= e16 -DISTVERSION= 1.0.0 +DISTVERSION= 1.0.0.001 CATEGORIES= x11-wm MASTER_SITES= SF/enlightenment diff --git a/x11-wm/e16/distinfo b/x11-wm/e16/distinfo index 9b6ebac76f93..469568286e7c 100644 --- a/x11-wm/e16/distinfo +++ b/x11-wm/e16/distinfo @@ -1,3 +1,3 @@ -MD5 (e16-1.0.0.tar.gz) = c825ed643c7c30e12e1646dcfa2638d9 -SHA256 (e16-1.0.0.tar.gz) = 0e05aac4f0e14e437372740edd7b9b181fe83020861db83056cc16f9548e65e8 -SIZE (e16-1.0.0.tar.gz) = 2004784 +MD5 (e16-1.0.0.001.tar.gz) = 3517860697d8b504c75ccaf64af10a2b +SHA256 (e16-1.0.0.001.tar.gz) = 36eca85807fe95ef030b862b7cfe086fb7b43c004f80cdd112701b6b82577c50 +SIZE (e16-1.0.0.001.tar.gz) = 2013158 diff --git a/x11-wm/e16/files/patch-src_aclass.c b/x11-wm/e16/files/patch-src_aclass.c deleted file mode 100644 index 9520e0387d8b..000000000000 --- a/x11-wm/e16/files/patch-src_aclass.c +++ /dev/null @@ -1,15 +0,0 @@ ---- src/aclass.c.orig 2009-06-08 00:26:06.000000000 +0200 -+++ src/aclass.c 2009-06-08 00:28:04.000000000 +0200 -@@ -937,7 +937,11 @@ - ewin->state.in_action = 1; - EFunc(ewin, action->params); - if (ewin) -- ewin->state.in_action = 0; -+ { -+ if (!EwinFindByPtr(ewin)) -+ return; /* ewin has been destroyed */ -+ ewin->state.in_action = 0; -+ } - - /* Did we just hose ourselves? if so, we'd best not stick around here */ - if (mode_action_destroy) diff --git a/x11-wm/e16/files/patch-src_magwin.c b/x11-wm/e16/files/patch-src_magwin.c deleted file mode 100644 index 3c39727cc81c..000000000000 --- a/x11-wm/e16/files/patch-src_magwin.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/magwin.c.orig 2009-06-08 00:24:00.000000000 +0200 -+++ src/magwin.c 2009-06-08 00:24:18.000000000 +0200 -@@ -448,8 +448,6 @@ - #if USE_TIMER - TIMER_DEL(mw->timer); - #endif -- EventCallbackUnregister(EwinGetClientWin(mw->ewin), 0, MagwinEvent, mw); -- EDestroyWindow(EwinGetClientWin(mw->ewin)); - Efree(mw); - } - diff --git a/x11-wm/e16/files/patch-src_menus-misc.c b/x11-wm/e16/files/patch-src_menus-misc.c deleted file mode 100644 index 9f72ac562371..000000000000 --- a/x11-wm/e16/files/patch-src_menus-misc.c +++ /dev/null @@ -1,34 +0,0 @@ ---- src/menus-misc.c.orig 2009-06-08 00:30:15.000000000 +0200 -+++ src/menus-misc.c 2009-06-08 00:32:24.000000000 +0200 -@@ -255,6 +255,16 @@ - menu_scan_recursive = 0; - } - -+static char * -+find_icon(const char *file) -+{ -+ char s[FILEPATH_LEN_MAX]; -+ -+ Esnprintf(s, sizeof(s), "%s/icons", EDirUser()); -+ -+ return FindFile(file, s); -+} -+ - static void - FillFlatFileMenu(Menu * m, const char *file) - { -@@ -311,12 +321,13 @@ - txt = icon = act = params = NULL; - parse(s, "%S%T%S%S", &txt, &icon, &act, ¶ms); - -- if (icon && exists(icon)) -+ if (icon && (icon = find_icon(icon))) - { - Esnprintf(wd, sizeof(wd), "__FM.%s", icon); - icc = ImageclassFind(wd, 0); - if (!icc) - icc = ImageclassCreateSimple(wd, icon); -+ Efree(icon); - } - if ((act) && (!strcmp(act, "exec")) && (params)) - { |