Maj edelib#2.0-beta-2-1

4 files changed, 69 insertions, 88 deletions

diff --git a/extra/edelib/.footprint b/extra/edelib/.footprint
index 2021d7c44..9fdedf943 100644
--- a/extra/edelib/.footprint
+++ b/extra/edelib/.footprint
@@ -20,6 +20,7 @@ drwxr-xr-x	root/root	usr/include/edelib/
 -rw-r--r--	root/root	usr/include/edelib/File.h
 -rw-r--r--	root/root	usr/include/edelib/FileTest.h
 -rw-r--r--	root/root	usr/include/edelib/FontChooser.h
+-rw-r--r--	root/root	usr/include/edelib/ForeignCallback.h
 -rw-r--r--	root/root	usr/include/edelib/IconChooser.h
 -rw-r--r--	root/root	usr/include/edelib/IconLoader.h
 -rw-r--r--	root/root	usr/include/edelib/IconTheme.h
@@ -33,6 +34,7 @@ drwxr-xr-x	root/root	usr/include/edelib/
 -rw-r--r--	root/root	usr/include/edelib/MimeType.h
 -rw-r--r--	root/root	usr/include/edelib/Missing.h
 -rw-r--r--	root/root	usr/include/edelib/Namespace.h
+-rw-r--r--	root/root	usr/include/edelib/Netwm.h
 -rw-r--r--	root/root	usr/include/edelib/Nls.h
 -rw-r--r--	root/root	usr/include/edelib/Pty.h
 -rw-r--r--	root/root	usr/include/edelib/PtyProcess.h
@@ -46,6 +48,7 @@ drwxr-xr-x	root/root	usr/include/edelib/
 -rw-r--r--	root/root	usr/include/edelib/TableBase.h
 -rw-r--r--	root/root	usr/include/edelib/TempFile.h
 -rw-r--r--	root/root	usr/include/edelib/Theme.h
+-rw-r--r--	root/root	usr/include/edelib/ThemeLoader.h
 -rw-r--r--	root/root	usr/include/edelib/TiXml.h
 -rw-r--r--	root/root	usr/include/edelib/Util.h
 -rw-r--r--	root/root	usr/include/edelib/Version.h
@@ -57,7 +60,6 @@ drwxr-xr-x	root/root	usr/include/edelib/
 -rw-r--r--	root/root	usr/include/edelib/XSettingsManager.h
 -rw-r--r--	root/root	usr/include/edelib/_conf.h
 -rw-r--r--	root/root	usr/include/edelib/_conf.h.in
--rw-r--r--	root/root	usr/include/edelib/_conf.h.in~
 -rw-r--r--	root/root	usr/include/edelib/edelib-global.h
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libedelib.a
@@ -74,60 +76,63 @@ drwxr-xr-x	root/root	usr/share/doc/edelib-2.0.0/
 -rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/INSTALL
 -rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/README
 drwxr-xr-x	root/root	usr/share/doc/edelib-2.0.0/html/
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/Color_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/Config_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/DateTime_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/Debug_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/DesktopFile_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/DirWatch_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/Directory_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/EdbusConnection_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/EdbusContainer_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/EdbusData_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/EdbusDict_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/EdbusError_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/EdbusList_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/EdbusMessage_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/EdbusObjectPath_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/ExpandableGroup_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/FileTest_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/File_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/FontChooser_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/IconChooser_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/IconLoader_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/IconTheme_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/List_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/Listener_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/MenuBar_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/MenuBase_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/MenuButton_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/MenuItem_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/MessageBox_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/MimeType_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/Missing_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/Namespace_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/Nls_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/PtyProcess_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/Pty_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/Regex_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/Resource_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/Run_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/SevenSeg_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/Sipc_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/StrUtil_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/String_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/TableBase_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/TempFile_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/Theme_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/TiXml_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/Util_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/Version_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/WindowXid_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/Window_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/XSettingsClient_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/XSettingsCommon_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/XSettingsManager_8h-source.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/__conf_8h-source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/Color_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/Config_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/DateTime_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/Debug_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/DesktopFile_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/DirWatch_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/Directory_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/EdbusConnection_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/EdbusContainer_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/EdbusData_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/EdbusDict_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/EdbusError_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/EdbusList_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/EdbusMessage_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/EdbusObjectPath_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/ExpandableGroup_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/FileTest_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/File_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/FontChooser_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/ForeignCallback_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/IconChooser_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/IconLoader_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/IconTheme_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/List_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/Listener_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/MenuBar_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/MenuBase_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/MenuButton_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/MenuItem_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/MessageBox_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/MimeType_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/Missing_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/Namespace_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/Netwm_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/Nls_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/PtyProcess_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/Pty_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/Regex_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/Resource_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/Run_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/SevenSeg_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/Sipc_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/StrUtil_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/String_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/TableBase_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/TempFile_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/ThemeLoader_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/Theme_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/TiXml_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/Util_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/Version_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/WindowXid_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/Window_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/XSettingsClient_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/XSettingsCommon_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/XSettingsManager_8h_source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/__conf_8h_source.html
 -rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/annotated.html
 -rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/classTiXmlAttribute-members.html
 -rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/classTiXmlAttribute.html
@@ -174,7 +179,6 @@ drwxr-xr-x	root/root	usr/share/doc/edelib-2.0.0/html/
 -rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/classedelib_1_1DesktopFile.png
 -rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/classedelib_1_1DirWatch-members.html
 -rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/classedelib_1_1DirWatch.html
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/classedelib_1_1EdbusCallbackItem-members.html
 -rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/classedelib_1_1EdbusConnection-members.html
 -rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/classedelib_1_1EdbusConnection.html
 -rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/classedelib_1_1EdbusContainer-members.html
@@ -237,6 +241,8 @@ drwxr-xr-x	root/root	usr/share/doc/edelib-2.0.0/html/
 -rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/classedelib_1_1TempFile.html
 -rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/classedelib_1_1Theme-members.html
 -rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/classedelib_1_1Theme.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/classedelib_1_1ThemeLoader-members.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/classedelib_1_1ThemeLoader.html
 -rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/classedelib_1_1Time-members.html
 -rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/classedelib_1_1Time.html
 -rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/classedelib_1_1TimeZone-members.html
@@ -258,7 +264,7 @@ drwxr-xr-x	root/root	usr/share/doc/edelib-2.0.0/html/
 -rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/deprecated.html
 -rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/doxygen.css
 -rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/doxygen.png
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/edelib-global_8h-source.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/edelib-global_8h_source.html
 -rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/files.html
 -rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/functions.html
 -rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/functions_0x62.html
@@ -318,8 +324,11 @@ drwxr-xr-x	root/root	usr/share/doc/edelib-2.0.0/html/
 -rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/functions_type.html
 -rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/functions_vars.html
 -rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/group__dbus.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/group__foreigncallback.html
 -rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/group__macros.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/group__missing.html
 -rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/group__widgets.html
+-rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/group__wm.html
 -rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/hierarchy.html
 -rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/icon_chooser.jpg
 -rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/index.html
@@ -347,7 +356,6 @@ drwxr-xr-x	root/root	usr/share/doc/edelib-2.0.0/html/
 -rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/namespaces.html
 -rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/pages.html
 -rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/sevenseg.jpg
--rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/structedelib_1_1EdbusCallbackItem.html
 -rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/structedelib_1_1EdbusDict.html
 -rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/structedelib_1_1EdbusDict.png
 -rw-r--r--	root/root	usr/share/doc/edelib-2.0.0/html/structedelib_1_1EdbusDictEntry.html
diff --git a/extra/edelib/.md5sum b/extra/edelib/.md5sum
index 1a2886b1a..aee6a5ede 100644
--- a/extra/edelib/.md5sum
+++ b/extra/edelib/.md5sum
@@ -1,2 +1 @@
-64e311d36c14cde71018cedb5b4b6c77  edelib-2.0-beta.c++.patch
-665679d8abada4144549b6f89da13a61  edelib-2.0-beta.tar.gz
+bfff082177e2aa9c773a760bcf80ba48  edelib-2.0-beta-2.tar.gz
diff --git a/extra/edelib/Pkgfile b/extra/edelib/Pkgfile
index a46b099ef..cb4c72395 100644
--- a/extra/edelib/Pkgfile
+++ b/extra/edelib/Pkgfile
@@ -5,13 +5,11 @@
 # Depends on: xorg, jam, fltk1, efltk,doxygen
 
 name=edelib
-version=2.0-beta
+version=2.0-beta-2
 release=1
-source=(http://downloads.sourceforge.net/project/ede/$name/2.0-beta/$name-$version.tar.gz\
-  edelib-2.0-beta.c++.patch)
+source=(http://kiao.no-ip.info/NuTyX/files/$name-$version.tar.gz)
 build() {
 cd $name-*
-patch -Np1 -i ../edelib-2.0-beta.c++.patch
 ./autogen.sh
 ./configure --prefix=/usr
 jam
diff --git a/extra/edelib/edelib-2.0-beta.c++.patch b/extra/edelib/edelib-2.0-beta.c++.patch
deleted file mode 100755
index ea1b7740b..000000000
--- a/extra/edelib/edelib-2.0-beta.c++.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -u edelib-2.0-beta.orig/src/IconChooser.cpp edelib-2.0-beta/src/IconChooser.cpp
---- edelib-2.0-beta.orig/src/IconChooser.cpp	2009-10-08 10:43:55.000000000 -0300
-+++ edelib-2.0-beta/src/IconChooser.cpp	2009-10-10 10:58:52.000000000 -0300
-@@ -82,7 +82,7 @@
- 	iconpth.assign(s);
- 
- 	/* get basename without extension */
--	ptr = strrchr(s.c_str(), E_DIR_SEPARATOR);
-+	ptr = const_cast<char*>(strrchr(s.c_str(), E_DIR_SEPARATOR));
- 	if(ptr) {
- 		ptr += 1;
- 		char* ptr2 = strrchr(ptr, '.');
-diff -u edelib-2.0-beta.orig/src/String.cpp edelib-2.0-beta/src/String.cpp
---- edelib-2.0-beta.orig/src/String.cpp	2009-10-08 10:43:55.000000000 -0300
-+++ edelib-2.0-beta/src/String.cpp	2009-10-10 10:31:05.000000000 -0300
-@@ -262,7 +262,7 @@
- 	if(offset >= length())
- 		return npos;
- 
--	char* p = strstr(data() + offset, str);
-+	const char* p = strstr(data() + offset, str);
- 	if(!p)
- 		return npos;
- 	else