Merge branch 'master' of ssh://kiao.no-ip.info:443/~/attapu

6 files changed, 71 insertions, 3 deletions

diff --git a/base/initrd/.md5sum b/base/initrd/.md5sum
index 1e44374ae..7b0692d02 100644
--- a/base/initrd/.md5sum
+++ b/base/initrd/.md5sum
@@ -1,3 +1,3 @@
 ac228e1c3ad67772e76611e7abaff3a1  install-attapu.ash
-0850afc682460d93d124c32099d3a680  installtools-23072010.tar.gz
+9481ac5c8a5e2ca11074ab950f3c0d4f  installtools-26072010.tar.gz
 f922f5b5887aceae754673976d492efc  kernel%232.6.34.1-2.pkg.tar.gz
diff --git a/base/initrd/Pkgfile b/base/initrd/Pkgfile
index 105d36fcb..c50d7366e 100644
--- a/base/initrd/Pkgfile
+++ b/base/initrd/Pkgfile
@@ -5,8 +5,8 @@
 
 name=initrd
 version=2.6.34.1
-release=5
-_tools=23072010
+release=6
+_tools=26072010
 _baseversion=2.6.34
 SCRIPT_VERSION="attapu"
 source=(http://kiao.no-ip.info/NuTyX/tools/install-${SCRIPT_VERSION}.ash\
diff --git a/extra/gtkdialog/.footprint b/extra/gtkdialog/.footprint
new file mode 100644
index 000000000..763a92406
--- /dev/null
+++ b/extra/gtkdialog/.footprint
@@ -0,0 +1,3 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/gtkdialog
diff --git a/extra/gtkdialog/.md5sum b/extra/gtkdialog/.md5sum
new file mode 100644
index 000000000..d1e1bcb07
--- /dev/null
+++ b/extra/gtkdialog/.md5sum
@@ -0,0 +1,2 @@
+597103b3ec575dd7af9e84931a62c532  gtkdialog-0.7.20.tar.gz
+9b520274e22e4e6f18fbaafe339d24de  gtkdialog_0.7.20_glade.patch
diff --git a/extra/gtkdialog/Pkgfile b/extra/gtkdialog/Pkgfile
new file mode 100644
index 000000000..75d481da2
--- /dev/null
+++ b/extra/gtkdialog/Pkgfile
@@ -0,0 +1,21 @@
+# Description: outils pour GUI  
+# URL: http://linux.pte.hu/~pipas/gtkdialog/ 
+# Maintainer: NuTyX core team
+# Packager: geantbrun at gmail dot com
+# Depends on: gtk
+
+name=gtkdialog
+version=0.7.20
+release=3
+source=(ftp://linux.pte.hu/pub/gtkdialog/$name-$version.tar.gz \
+        gtkdialog_0.7.20_glade.patch)
+
+build() {
+  cd $name-$version
+  patch -p1 < $SRC/gtkdialog_0.7.20_glade.patch
+  ./configure --prefix=/usr 
+              
+  make
+  make prefix=$PKG/usr install
+  rm -r $PKG/usr/info
+}
diff --git a/extra/gtkdialog/gtkdialog_0.7.20_glade.patch b/extra/gtkdialog/gtkdialog_0.7.20_glade.patch
new file mode 100644
index 000000000..8a2b585a5
--- /dev/null
+++ b/extra/gtkdialog/gtkdialog_0.7.20_glade.patch
@@ -0,0 +1,42 @@
+--- gtkdialog-0.7.20/src/glade_support.c	2007-03-16 14:25:49.000000000 +0000
++++ gtkdialog-0.7.20/src/glade_support.c.new	2009-05-17 19:11:59.993997605 +0100
+@@ -37,10 +37,10 @@
+  *                                                                       *
+  *                                                                       *
+  *************************************************************************/
+-typedef struct signal {
++typedef struct _signal {
+ 	gchar     *name;
+ 	GCallback callback;
+-} signal;
++} _signal;
+ 
+ /*
+ ** Signal handler callbascks.
+@@ -206,7 +206,7 @@
+ static gboolean
+ find_and_connect_handler(
+ 		GtkWidget *widget,
+-		signal *signals,
++		_signal *signals,
+ 		const gchar *signal_name,
+ 		const gchar *handler_name)
+ {
+@@ -288,7 +288,7 @@
+ 		gpointer user_data)
+ {
+ 	gint n;
+-	signal entry_signals[] = {
++	_signal entry_signals[] = {
+ 		{ "activate",           (GCallback)on_any_entry_almost_any },
+ 		{ "backspace",          (GCallback)on_any_entry_almost_any },
+ 		{ "copy-clipboard",     (GCallback)on_any_entry_almost_any },
+@@ -319,7 +319,7 @@
+ 		gpointer user_data)
+ {
+ 	variable *var;
+-	signal widget_signals[] = {
++	_signal widget_signals[] = {
+ 		{ "accel-closures-changed",    (GCallback)on_any_widget_almost_any },
+ 		{ "composited-changed",        (GCallback)on_any_widget_almost_any },
+ 		{ "grab-focus",                (GCallback)on_any_widget_almost_any },