Date: Thu, 3 Aug 2006 23:34:35 +0400 (MSD) From: Stanislav Sedov <ssedov@mbsd.msk.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/101326: [MAINTAINER] x11/e17-module-engage: misc fixes Message-ID: <20060803193435.7FE9612C63@fonon.realnet> Resent-Message-ID: <200608031940.k73JeB9n018778@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 101326 >Category: ports >Synopsis: [MAINTAINER] x11/e17-module-engage: misc fixes >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Aug 03 19:40:11 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Stanislav Sedov >Release: FreeBSD 7.0-CURRENT i386 >Organization: MBSD labs, Inc. >Environment: System: FreeBSD fonon.realnet 7.0-CURRENT FreeBSD 7.0-CURRENT #1: Wed Aug 2 21:44:37 MSD >Description: - Fix building of module.eap under some circumstancies (reported by Michael Metzger <MMetzger@marketvisionresearch.com>) - Fix bug with no icon in e17 menu. - Add missing ewl dependency (reported by Rainer Alves <rainer.alves@gmail.com>) The following files was added: - files/patch-src_module_e_mod_config.c - files/patch-src_module_e_mod_main.c - files/patch-src_module_e_mod_main.h - files/patch-src_module_module_icon.edc >How-To-Repeat: >Fix: --- e17-module-engage-20060719_1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/x11/e17-module-engage/Makefile /var/tmp/e17-module-engage/Makefile --- /usr/ports/x11/e17-module-engage/Makefile Mon Jul 24 21:56:08 2006 +++ /var/tmp/e17-module-engage/Makefile Thu Aug 3 23:32:22 2006 @@ -7,6 +7,7 @@ PORTNAME= engage PORTVERSION= 20060719 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://mbsd.msk.ru/dist/ PKGNAMEPREFIX= e17-module- @@ -16,7 +17,8 @@ COMMENT= Alternative e17 application launcher with tray support BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel -LIB_DEPENDS= esmart_trans_x11.0:${PORTSDIR}/graphics/esmart +LIB_DEPENDS= esmart_trans_x11.0:${PORTSDIR}/graphics/esmart \ + ewl.0:${PORTSDIR}/x11-toolkits/ewl RUN_DEPENDS= ${BUILD_DEPENDS} USE_BZIP2= yes diff -ruN --exclude=CVS /usr/ports/x11/e17-module-engage/files/patch-src_module_e_mod_config.c /var/tmp/e17-module-engage/files/patch-src_module_e_mod_config.c --- /usr/ports/x11/e17-module-engage/files/patch-src_module_e_mod_config.c Thu Jan 1 03:00:00 1970 +++ /var/tmp/e17-module-engage/files/patch-src_module_e_mod_config.c Thu Aug 3 23:25:35 2006 @@ -0,0 +1,21 @@ +--- src/module/e_mod_config.c.orig Thu Jul 20 00:20:27 2006 ++++ src/module/e_mod_config.c Thu Aug 3 23:24:37 2006 +@@ -35,6 +35,8 @@ + v = E_NEW(E_Config_Dialog_View, 1); + if (v) + { ++ char buf[4096]; ++ + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; +@@ -42,7 +44,8 @@ + v->advanced.apply_cfdata = _advanced_apply_data; + v->advanced.create_widgets = _advanced_create_widgets; + +- cfd = e_config_dialog_new(con, "Engage Configuration", NULL, 0, v, eb); ++ snprintf(buf, sizeof(buf), "%s/module.eap", e_module_dir_get(eb->engage->module)); ++ cfd = e_config_dialog_new(con, "Engage Configuration", buf, 0, v, eb); + eb->cfd = cfd; + } + } diff -ruN --exclude=CVS /usr/ports/x11/e17-module-engage/files/patch-src_module_e_mod_main.c /var/tmp/e17-module-engage/files/patch-src_module_e_mod_main.c --- /usr/ports/x11/e17-module-engage/files/patch-src_module_e_mod_main.c Thu Jan 1 03:00:00 1970 +++ /var/tmp/e17-module-engage/files/patch-src_module_e_mod_main.c Thu Aug 3 23:25:35 2006 @@ -0,0 +1,10 @@ +--- src/module/e_mod_main.c.orig Thu Jul 20 00:20:27 2006 ++++ src/module/e_mod_main.c Thu Aug 3 23:24:37 2006 +@@ -151,6 +151,7 @@ + /* actually init engage */ + e = _engage_new(); + // m->config_menu = e->config_menu; ++ e->module = m; + return e; + } + diff -ruN --exclude=CVS /usr/ports/x11/e17-module-engage/files/patch-src_module_e_mod_main.h /var/tmp/e17-module-engage/files/patch-src_module_e_mod_main.h --- /usr/ports/x11/e17-module-engage/files/patch-src_module_e_mod_main.h Thu Jan 1 03:00:00 1970 +++ /var/tmp/e17-module-engage/files/patch-src_module_e_mod_main.h Thu Aug 3 23:25:35 2006 @@ -0,0 +1,13 @@ +--- src/module/e_mod_main.h.orig Thu Jul 20 00:20:27 2006 ++++ src/module/e_mod_main.h Thu Aug 3 23:24:37 2006 +@@ -38,8 +38,9 @@ + E_App *apps; + Evas_List *bars; + E_Menu *config_menu; +- ++ + Config *conf; ++ E_Module *module; + }; + + struct _Engage_Tray diff -ruN --exclude=CVS /usr/ports/x11/e17-module-engage/files/patch-src_module_module_icon.edc /var/tmp/e17-module-engage/files/patch-src_module_module_icon.edc --- /usr/ports/x11/e17-module-engage/files/patch-src_module_module_icon.edc Thu Jan 1 03:00:00 1970 +++ /var/tmp/e17-module-engage/files/patch-src_module_module_icon.edc Thu Aug 3 23:25:35 2006 @@ -0,0 +1,11 @@ +--- src/module/module_icon.edc.orig Thu Aug 3 23:23:25 2006 ++++ src/module/module_icon.edc Thu Aug 3 23:23:43 2006 +@@ -4,7 +4,7 @@ + collections { + group { + name: "icon"; +- max: %d %d; ++ max: 24 24; + parts { + part { + name: "image"; --- e17-module-engage-20060719_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060803193435.7FE9612C63>