summaryrefslogtreecommitdiff
path: root/development
diff options
context:
space:
mode:
authorslakmagik <jsun@freeshell.org>2010-05-11 22:22:33 +0200
committerDavid Somero <xgizzmo@slackbuilds.org>2010-05-11 22:22:33 +0200
commitebe06dfc073dff259a0acb304db14ead7b3ce803 (patch)
tree53fab10e04dfc5c2539fe3f0c7d58223c9d1ae7f /development
parent8d9e7eff310ad62124e8ff88fb881dde4db37101 (diff)
downloadslackbuilds-ebe06dfc073dff259a0acb304db14ead7b3ce803.tar.gz
development/gtkdialog: Updated for version 0.7.20
Diffstat (limited to 'development')
-rw-r--r--development/gtkdialog/gtkdialog-0.7.20-variables-export-fix.patch22
-rw-r--r--development/gtkdialog/gtkdialog.SlackBuild8
-rw-r--r--development/gtkdialog/gtkdialog.info2
3 files changed, 30 insertions, 2 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
new file mode 100644
index 0000000000..389dc1504f
--- /dev/null
+++ b/development/gtkdialog/gtkdialog-0.7.20-variables-export-fix.patch
@@ -0,0 +1,22 @@
+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 fc4ddf0f4a..98a2ec5cfd 100644
--- a/development/gtkdialog/gtkdialog.SlackBuild
+++ b/development/gtkdialog/gtkdialog.SlackBuild
@@ -7,7 +7,7 @@
PRGNAM=gtkdialog
VERSION=0.7.20
ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
CWD=$(pwd)
@@ -19,6 +19,8 @@ if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
fi
set -e
@@ -36,6 +38,10 @@ 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
+
CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" ./configure --prefix=/usr
make
make DESTDIR=$PKG install-strip
diff --git a/development/gtkdialog/gtkdialog.info b/development/gtkdialog/gtkdialog.info
index 6d4a8797ee..8a6feceb17 100644
--- a/development/gtkdialog/gtkdialog.info
+++ b/development/gtkdialog/gtkdialog.info
@@ -5,4 +5,4 @@ DOWNLOAD="ftp://linux.pte.hu/pub/gtkdialog/gtkdialog-0.7.20.tar.gz"
MD5SUM="597103b3ec575dd7af9e84931a62c532"
MAINTAINER="slakmagik"
EMAIL="jsun@freeshell.org"
-APPROVED="rworkman"
+APPROVED="David Somero" \ No newline at end of file