development/gtkdialog: Updated for version 0.8.0.

Signed-off-by: Erik Hanson <erik@slackbuilds.org>

5 files changed, 13 insertions, 85 deletions

diff --git a/development/gtkdialog/gtkdialog-0.7.20-variables-export-fix.patch b/development/gtkdialog/gtkdialog-0.7.20-variables-export-fix.patch
deleted file mode 100644
index 389dc1504f..0000000000
--- a/development/gtkdialog/gtkdialog-0.7.20-variables-export-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Submitted By: David B. Cortarello (Nomius) <nomius at users dot berlios dot de>
-Date: 13-08-2008
-Initial Package Version: 0.7.20
-Description: The patch was created from the original mpd package
-This patch provides the following features:
-    * Fix infinite loop caused by continue sentence out of frame.
-
-diff -Naur gtkdialog-0.7.20.orig/src/variables.c gtkdialog-0.7.20/src/variables.c
---- gtkdialog-0.7.20.orig/src/variables.c	2007-03-16 11:25:48.000000000 -0300
-+++ gtkdialog-0.7.20/src/variables.c	2008-08-13 23:13:32.000000000 -0300
-@@ -627,9 +627,10 @@
- 			itemlist = GTK_LIST(actual->Widget)->children;
- 			n = 0;
- 			while (itemlist != NULL) {
--				if (itemlist->data == NULL) 
-+				if (itemlist->data == NULL) {
- 					itemlist = itemlist->next;
- 					continue;
-+				}
- 				text = gtk_object_get_user_data(itemlist->data);
- 				if (n == 0)
- 					tmp = g_strconcat(line, "'", text, "'", NULL);
diff --git a/development/gtkdialog/gtkdialog.SlackBuild b/development/gtkdialog/gtkdialog.SlackBuild
index 592b822e05..70745951e5 100644
--- a/development/gtkdialog/gtkdialog.SlackBuild
+++ b/development/gtkdialog/gtkdialog.SlackBuild
@@ -5,8 +5,8 @@
 # Released under the WTFPL
 
 PRGNAM=gtkdialog
-VERSION=${VERSION:-0.7.20}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-0.8.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -51,14 +51,8 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \
   -o -perm 400 \) -exec chmod 644 {} \;
 
-# Fix an infinite loop caused by a pair of statements not being contained in
-# braces. Thanks to David B. Cortarello
-patch -p1 < $CWD/gtkdialog-0.7.20-variables-export-fix.patch
-# Fix a redeclaration error/namespace issue
-patch -p1 < $CWD/redeclaration.patch
-
-CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" ./configure --prefix=/usr
-
+CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" \
+  ./configure --prefix=/usr --infodir=/usr/info
 make
 make DESTDIR=$PKG install-strip
 
@@ -66,10 +60,9 @@ rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/$PRGNAM.info
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-# the NEWS and README files are empty, so this doesn't include them
-cp -a [ACIT]* examples $PKG/usr/doc/$PRGNAM-$VERSION
-# clean up some stuff in examples/
-(cd $PKG/usr/doc/$PRGNAM-$VERSION/examples; rm -f Makefile*; chmod 0644 *)
+cp -a [ACINRT]* examples doc/reference $PKG/usr/doc/$PRGNAM-$VERSION
+# make example docs non-executable
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -print0 | xargs -0 chmod 0644
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/gtkdialog/gtkdialog.info b/development/gtkdialog/gtkdialog.info
index 3f6b0f2471..9381fc5a6f 100644
--- a/development/gtkdialog/gtkdialog.info
+++ b/development/gtkdialog/gtkdialog.info
@@ -1,10 +1,10 @@
 PRGNAM="gtkdialog"
-VERSION="0.7.20"
-HOMEPAGE="http://linux.pte.hu/~pipas/gtkdialog/"
-DOWNLOAD="ftp://linux.pte.hu/pub/gtkdialog/gtkdialog-0.7.20.tar.gz"
-MD5SUM="597103b3ec575dd7af9e84931a62c532"
+VERSION="0.8.0"
+HOMEPAGE="http://code.google.com/p/gtkdialog/"
+DOWNLOAD="http://gtkdialog.googlecode.com/files/gtkdialog-0.8.0.tar.gz"
+MD5SUM="a1f0c459a610ac3892342efbec27d93d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="slakmagik"
 EMAIL="slakmagik@gmail.com"
-APPROVED="David Somero"
+APPROVED="David Somero,Erik Hanson"
diff --git a/development/gtkdialog/redeclaration.patch b/development/gtkdialog/redeclaration.patch
deleted file mode 100644
index 9d6d5c1322..0000000000
--- a/development/gtkdialog/redeclaration.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -Naurp gtkdialog-0.7.20-orig/src/glade_support.c gtkdialog-0.7.20/src/glade_support.c
---- gtkdialog-0.7.20-orig/src/glade_support.c	2007-03-16 10:25:49.000000000 -0400
-+++ gtkdialog-0.7.20/src/glade_support.c	2009-09-06 00:10:21.405853809 -0400
-@@ -37,10 +37,10 @@
-  *                                                                       *
-  *                                                                       *
-  *************************************************************************/
--typedef struct signal {
-+typedef struct gtkd_signal {
- 	gchar     *name;
- 	GCallback callback;
--} signal;
-+} gtkd_signal;
- 
- /*
- ** Signal handler callbascks.
-@@ -206,7 +206,7 @@ on_any_widget_almost_any_gdk_event(
- static gboolean
- find_and_connect_handler(
- 		GtkWidget *widget,
--		signal *signals,
-+		gtkd_signal *signals,
- 		const gchar *signal_name,
- 		const gchar *handler_name)
- {
-@@ -288,7 +288,7 @@ gtk_entry_signal_handler_connector(
- 		gpointer user_data)
- {
- 	gint n;
--	signal entry_signals[] = {
-+	gtkd_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 @@ gtk_widget_signal_handler_connector(
- 		gpointer user_data)
- {
- 	variable *var;
--	signal widget_signals[] = {
-+	gtkd_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 },
diff --git a/development/gtkdialog/slack-desc b/development/gtkdialog/slack-desc
index 2d85088101..c9081cb86a 100644
--- a/development/gtkdialog/slack-desc
+++ b/development/gtkdialog/slack-desc
@@ -14,6 +14,6 @@ gtkdialog: compiled programs which is a very attractive feature since the
 gtkdialog: developer does not have to learn various GUI languages for the
 gtkdialog: miscellaneous programming languages.
 gtkdialog:
-gtkdialog: Homepage: http://linux.pte.hu/~pipas/gtkdialog/
+gtkdialog: Homepage: http://code.google.com/p/gtkdialog/
 gtkdialog:
 gtkdialog: