development/gtkdialog: Updated for version 0.7.20

This commit is contained in:
slakmagik 2010-05-13 00:24:44 +02:00 committed by David Somero
parent fec388f0d1
commit f4b4caabaf
3 changed files with 55 additions and 4 deletions

View file

@ -5,9 +5,9 @@
# Released under the WTFPL
PRGNAM=gtkdialog
VERSION=0.7.20
VERSION=${VERSION:-0.7.20}
ARCH=${ARCH:-i486}
BUILD=${BUILD:-2}
BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
CWD=$(pwd)
@ -17,10 +17,13 @@ OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
fi
set -e
@ -41,6 +44,8 @@ find . \
# 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
make
@ -53,10 +58,11 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
find $PKG/usr/doc -name "Makefile*" -exec rm -f {} \;
find $PKG/usr/doc -type f -exec chmod 0644 {} \;
rm -f $PKG/usr/info/dir
gzip -9 $PKG/usr/info/$PRGNAM.info
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}

View file

@ -3,6 +3,8 @@ 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"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="slakmagik"
EMAIL="jsun@freeshell.org"
APPROVED="David Somero"
APPROVED="David Somero"

View file

@ -0,0 +1,43 @@
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 },