Date: Thu, 6 Jul 2006 23:44:41 +0400 (MSD) From: Stanislav Sedov <ssedov@mbsd.msk.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/99857: [MAINTAINER UPDATE] sysutils/e17-module-devian doesn't compile Message-ID: <200607061944.k66Jifeg041285@fonon.realnet> Resent-Message-ID: <200607062000.k66K0eXk017824@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 99857 >Category: ports >Synopsis: [MAINTAINER UPDATE] sysutils/e17-module-devian doesn't compile >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 Jul 06 20:00:40 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 #7: Sun Jun 18 20:51:36 MSD 2006 root@fonon.realnet:/work/src/fbsd-cur/src/sys/i386/compile/FONON i386 >Description: Make it work with current version of enlightenment. Note: a lot of new patchfiles has been added. >How-To-Repeat: >Fix: --- devian.diff begins here --- diff -ruN e17-module-devian.orig/Makefile e17-module-devian/Makefile --- e17-module-devian.orig/Makefile Thu Jul 6 23:21:06 2006 +++ e17-module-devian/Makefile Thu Jul 6 23:21:41 2006 @@ -7,6 +7,7 @@ PORTNAME= devian PORTVERSION= 23062006 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://mbsd.msk.ru/dist/ PKGNAMEPREFIX= e17-module- diff -ruN e17-module-devian.orig/files/patch-src::module::e_mod_config.c e17-module-devian/files/patch-src::module::e_mod_config.c --- e17-module-devian.orig/files/patch-src::module::e_mod_config.c Thu Jan 1 03:00:00 1970 +++ e17-module-devian/files/patch-src::module::e_mod_config.c Thu Jul 6 23:39:21 2006 @@ -0,0 +1,20 @@ +--- src/module/e_mod_config.c.orig Thu Jul 6 23:32:07 2006 ++++ src/module/e_mod_config.c Thu Jul 6 23:32:25 2006 +@@ -100,7 +100,7 @@ + "has been upgraded<br>" + "Your settings were removed<br>" + "Sorry for the inconvenience<br><br>" "(%d -> %d)"), cfg_main->conf_version, CONFIG_VERSION); +- e_module_dialog_show(_(MODULE_NAME " Module version " MODULE_VERSION), buf); ++ e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module version " MODULE_VERSION), buf); + + cfg_main = NULL; + } +@@ -116,7 +116,7 @@ + "has been downgraded<br>" + "Your settings were removed<br>" + "Sorry for the inconvenience<br><br>" "(%d ->%d)"), cfg_main->conf_version, CONFIG_VERSION); +- e_module_dialog_show(_(MODULE_NAME " Module version " MODULE_VERSION), buf); ++ e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module version " MODULE_VERSION), buf); + cfg_main = NULL; + } + } diff -ruN e17-module-devian.orig/files/patch-src::module::e_mod_config_dialog_devian.c e17-module-devian/files/patch-src::module::e_mod_config_dialog_devian.c --- e17-module-devian.orig/files/patch-src::module::e_mod_config_dialog_devian.c Thu Jan 1 03:00:00 1970 +++ e17-module-devian/files/patch-src::module::e_mod_config_dialog_devian.c Thu Jul 6 23:39:21 2006 @@ -0,0 +1,11 @@ +--- src/module/e_mod_config_dialog_devian.c.orig Thu Jul 6 23:32:48 2006 ++++ src/module/e_mod_config_dialog_devian.c Thu Jul 6 23:33:02 2006 +@@ -789,7 +789,7 @@ + snprintf(buf, sizeof(buf), + _("<hilight>Rss '%s' is in use !</hilight><br><br>" + "You can't delete it while its in use.<br><br>" "Owner is %s"), doc->name, doc->user->source->devian->id); +- e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); ++ e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); + } + } + #endif diff -ruN e17-module-devian.orig/files/patch-src::module::e_mod_config_dialog_theme.c e17-module-devian/files/patch-src::module::e_mod_config_dialog_theme.c --- e17-module-devian.orig/files/patch-src::module::e_mod_config_dialog_theme.c Thu Jan 1 03:00:00 1970 +++ e17-module-devian/files/patch-src::module::e_mod_config_dialog_theme.c Thu Jul 6 23:39:21 2006 @@ -0,0 +1,27 @@ +--- src/module/e_mod_config_dialog_theme.c.orig Thu Jul 6 23:33:17 2006 ++++ src/module/e_mod_config_dialog_theme.c Thu Jul 6 23:33:33 2006 +@@ -636,7 +636,7 @@ + if (!ecore_file_is_dir(themes_path)) + { + snprintf(buf, sizeof(buf), _("<hilight>Directory %s doesnt exists.</hilight><br><br>" "No themes found !!!"), themes_path); +- e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); ++ e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); + return NULL; + } + +@@ -644,7 +644,7 @@ + if (ecore_list_is_empty(list) || !list) + { + snprintf(buf, sizeof(buf), _("<hilight>Directory %s is empty !</hilight><br><br>" "No themes found !!!"), themes_path); +- e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); ++ e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); + return NULL; + } + +@@ -701,5 +701,5 @@ + snprintf(buf, sizeof(buf), + _("<hilight>Invalid theme</hilight><br><br>" + "You have selected an invalid theme.<br>" "A valid theme has a dEvian icon in front of it.")); +- e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); ++ e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); + } diff -ruN e17-module-devian.orig/files/patch-src::module::e_mod_container.c e17-module-devian/files/patch-src::module::e_mod_container.c --- e17-module-devian.orig/files/patch-src::module::e_mod_container.c Thu Jan 1 03:00:00 1970 +++ e17-module-devian/files/patch-src::module::e_mod_container.c Thu Jul 6 23:39:21 2006 @@ -0,0 +1,20 @@ +--- src/module/e_mod_container.c.orig Thu Jul 6 23:33:42 2006 ++++ src/module/e_mod_container.c Thu Jul 6 23:33:53 2006 +@@ -248,7 +248,7 @@ + char buf[4096]; + + snprintf(buf, sizeof(buf), _("<hilight>Invalid theme !</hilight><br><br>" "Failed to switch to %s theme"), *theme); +- e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); ++ e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); + evas_stringshare_del(*theme); + *theme = evas_stringshare_add(DEVIAN_THEME_DEFAULT); + DEVIANF(container_change) (devian, devian->conf->container_type); +@@ -272,7 +272,7 @@ + + snprintf(buf, sizeof(buf), + _("<hilight>Invalid theme !</hilight><br><br>" "Failed to switch to %s theme"), *theme); +- e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); ++ e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); + evas_stringshare_del(*theme); + *theme = evas_stringshare_add(DEVIAN_THEME_DEFAULT); + DEVIANF(container_change) (devian, devian->conf->container_type); diff -ruN e17-module-devian.orig/files/patch-src::module::e_mod_data_file.c e17-module-devian/files/patch-src::module::e_mod_data_file.c --- e17-module-devian.orig/files/patch-src::module::e_mod_data_file.c Thu Jan 1 03:00:00 1970 +++ e17-module-devian/files/patch-src::module::e_mod_data_file.c Thu Jul 6 23:39:21 2006 @@ -0,0 +1,11 @@ +--- src/module/e_mod_data_file.c.orig Thu Jul 6 23:30:59 2006 ++++ src/module/e_mod_data_file.c Thu Jul 6 23:31:07 2006 +@@ -33,7 +33,7 @@ + snprintf(buf, sizeof(buf), + _("<hilight>Can't open file %s</hilight><br><br>" + "You can change the file in the dEvian's config panel"), source->devian->conf->file_path); +- e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); ++ e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); + } + + /* create the textblock */ diff -ruN e17-module-devian.orig/files/patch-src::module::e_mod_data_picture.c e17-module-devian/files/patch-src::module::e_mod_data_picture.c --- e17-module-devian.orig/files/patch-src::module::e_mod_data_picture.c Thu Jan 1 03:00:00 1970 +++ e17-module-devian/files/patch-src::module::e_mod_data_picture.c Thu Jul 6 23:39:21 2006 @@ -0,0 +1,20 @@ +--- src/module/e_mod_data_picture.c.orig Thu Jul 6 23:30:33 2006 ++++ src/module/e_mod_data_picture.c Thu Jul 6 23:30:56 2006 +@@ -402,7 +402,7 @@ + "They can be jpeg or png<br><br>" + "After import, if you can remove these files and the pictures still can<br>" + "be viewed, but you wont be able to set them as wallpaper anymore<br><br>"), dir); +- e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); ++ e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); + return 0; + } + +@@ -1199,7 +1199,7 @@ + DEVIANM->conf->sources_picture_data_import_thumbs_warn) + { + DEVIANM->conf->sources_picture_data_import_thumbs_warn = 0; +- e_module_dialog_show(_(MODULE_NAME " Module Information"), ++ e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Information"), + _("<hilight>Creating thumbs</hilight><br><br>" + "Some pictures are being thumbed in a <hilight>background task</hilight>.<br>" + "It can take a while, but after, loading will be faster :)<br><br>" diff -ruN e17-module-devian.orig/files/patch-src::module::e_mod_data_rss.c e17-module-devian/files/patch-src::module::e_mod_data_rss.c --- e17-module-devian.orig/files/patch-src::module::e_mod_data_rss.c Thu Jan 1 03:00:00 1970 +++ e17-module-devian/files/patch-src::module::e_mod_data_rss.c Thu Jul 6 23:39:21 2006 @@ -0,0 +1,47 @@ +--- src/module/e_mod_data_rss.c.orig Thu Jul 6 23:30:02 2006 ++++ src/module/e_mod_data_rss.c Thu Jul 6 23:30:29 2006 +@@ -280,7 +280,7 @@ + snprintf(buf, sizeof(buf), + _("<hilight>Rss '%s' is aready in use !</hilight><br><br>" + "You can't set a rss document to more than one dEvian<br><br>" "Url: %s"), doc->name, doc->url); +- e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); ++ e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); + return -1; + } + +@@ -561,7 +561,7 @@ + "<underline=on underline_color=#000>Url :</> %s<br>" + "<underline=on underline_color=#000>Begining of the document dEvian get :</><br>%100.100s"), + doc->name, doc->url, feed->buffer); +- e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); ++ e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); + } + else + { +@@ -572,7 +572,7 @@ + "<underline=on underline_color=#000>Url :</> %s<br>" + "<underline=on underline_color=#000>Begining of the document dEvian get :</><br>%100.100s<br>" + "%100.100s"), doc->name, doc->url, feed->buffer, p); +- e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); ++ e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); + } + } + DEVIANF(container_loading_state_change) (feed->source->devian, 0); +@@ -1009,7 +1009,7 @@ + { + snprintf(buf, sizeof(buf), + _("<hilight>Unable to open link</hilight><br><br>" "Article '%s' has no link associated !"), article->title); +- e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); ++ e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); + return; + } + +@@ -1029,7 +1029,7 @@ + _("<hilight>Viewer %s not found !</hilight><br><br>" + "You can change the viewer for http in dEvian configuration panel\ + (Advanced view)"), DEVIANM->conf->viewer_http); +- e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); ++ e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); + return; + } + diff -ruN e17-module-devian.orig/files/patch-src::module::e_mod_devian.c e17-module-devian/files/patch-src::module::e_mod_devian.c --- e17-module-devian.orig/files/patch-src::module::e_mod_devian.c Thu Jan 1 03:00:00 1970 +++ e17-module-devian/files/patch-src::module::e_mod_devian.c Thu Jul 6 23:39:21 2006 @@ -0,0 +1,11 @@ +--- src/module/e_mod_devian.c.orig Thu Jul 6 23:34:34 2006 ++++ src/module/e_mod_devian.c Thu Jul 6 23:34:41 2006 +@@ -443,7 +443,7 @@ + + snprintf(buf, sizeof(buf), + _("<hilight>Error !</hilight><br>" "Did not find <hilight>theme</hilight> %s group %s"), path, part); +- e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); ++ e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); + return NULL; + } + DMAIN(("Edje loaded %s group %s", path, part)); diff -ruN e17-module-devian.orig/files/patch-src::module::e_mod_main.c e17-module-devian/files/patch-src::module::e_mod_main.c --- e17-module-devian.orig/files/patch-src::module::e_mod_main.c Thu Jan 1 03:00:00 1970 +++ e17-module-devian/files/patch-src::module::e_mod_main.c Thu Jul 6 23:39:21 2006 @@ -0,0 +1,11 @@ +--- src/module/e_mod_main.c.orig Thu Jul 6 23:28:34 2006 ++++ src/module/e_mod_main.c Thu Jul 6 23:28:50 2006 +@@ -48,7 +48,7 @@ + char buf[4096]; + + snprintf(buf, sizeof(buf), _("Enlightenment %s Module - version " MODULE_VERSION), MODULE_NAME); +- e_module_dialog_show(buf, _( ++ e_module_dialog_show(m, buf, _( + #ifndef HAVE_ALL + "This module is part of dEvian module<br><br>" + #ifdef HAVE_PICTURE diff -ruN e17-module-devian.orig/files/patch-src::module::e_mod_source_file.c e17-module-devian/files/patch-src::module::e_mod_source_file.c --- e17-module-devian.orig/files/patch-src::module::e_mod_source_file.c Thu Jan 1 03:00:00 1970 +++ e17-module-devian/files/patch-src::module::e_mod_source_file.c Thu Jul 6 23:39:21 2006 @@ -0,0 +1,11 @@ +--- src/module/e_mod_source_file.c.orig Thu Jul 6 23:29:46 2006 ++++ src/module/e_mod_source_file.c Thu Jul 6 23:29:54 2006 +@@ -24,7 +24,7 @@ + snprintf(buf, sizeof(buf), + _("<hilight>dEvian's Log feature isn't stable yet !</hilight><br><br>" + "It's disabled for now")); +- e_module_dialog_show(_(MODULE_NAME " Module error"), buf); ++ e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module error"), buf); + return 0; + } + #endif diff -ruN e17-module-devian.orig/files/patch-src::module::e_mod_source_picture.c e17-module-devian/files/patch-src::module::e_mod_source_picture.c --- e17-module-devian.orig/files/patch-src::module::e_mod_source_picture.c Thu Jan 1 03:00:00 1970 +++ e17-module-devian/files/patch-src::module::e_mod_source_picture.c Thu Jul 6 23:39:21 2006 @@ -0,0 +1,38 @@ +--- src/module/e_mod_source_picture.c.orig Thu Jul 6 23:29:20 2006 ++++ src/module/e_mod_source_picture.c Thu Jul 6 23:29:41 2006 +@@ -174,7 +174,7 @@ + _("<hilight>File %s doesnt exists.</hilight><br><br>" + "This file is in dEvian's picture list, but it seems you removed it from the disk<br>" + "It cant be set as background, sorry."), file); +- e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); ++ e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); + return 0; + } + +@@ -201,7 +201,7 @@ + "%s is not an edje file !<br>" + "dEvian need e17setroot util from e_utils package to set you're picture as background" + "Please install it and try again"), file); +- e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); ++ e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); + return 0; + } + } +@@ -261,7 +261,7 @@ + _("<hilight>File %s doesnt exists !</hilight><br><br>" + "This file is in dEvian's picture list, but it seems you removed it from the disk.<br>" + "It cant be set opened in a viewer, sorry."), file); +- e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); ++ e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); + return 0; + } + +@@ -281,7 +281,7 @@ + _("<hilight>Viewer %s not found !</hilight><br><br>" + "You can change the viewer for images in dEvian configuration panel (Advanced view)"), + DEVIANM->conf->viewer_image); +- e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); ++ e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); + return 0; + } + diff -ruN e17-module-devian.orig/files/patch-src::module::e_mod_source_rss.c e17-module-devian/files/patch-src::module::e_mod_source_rss.c --- e17-module-devian.orig/files/patch-src::module::e_mod_source_rss.c Thu Jan 1 03:00:00 1970 +++ e17-module-devian/files/patch-src::module::e_mod_source_rss.c Thu Jul 6 23:39:21 2006 @@ -0,0 +1,20 @@ +--- src/module/e_mod_source_rss.c.orig Thu Jul 6 23:28:58 2006 ++++ src/module/e_mod_source_rss.c Thu Jul 6 23:29:14 2006 +@@ -108,7 +108,7 @@ + snprintf(buf, sizeof(buf), + _("<hilight>Unable to open link</hilight><br><br>" + "Feed '%s' has no link associated !"), source->devian->conf->rss_doc->name); +- e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); ++ e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); + return 0; + } + +@@ -128,7 +128,7 @@ + _("<hilight>Viewer %s not found !</hilight><br><br>" + "You can change the viewer for http in DEVIANN configuration panel (Advanced view)"), + DEVIANM->conf->viewer_http); +- e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); ++ e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); + return 0; + } + --- devian.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607061944.k66Jifeg041285>