diff options
Diffstat (limited to 'libraries/meanwhile')
| -rw-r--r-- | libraries/meanwhile/fix_glib_includes.patch | 235 | ||||
| -rw-r--r-- | libraries/meanwhile/meanwhile.SlackBuild | 9 |
2 files changed, 240 insertions, 4 deletions
diff --git a/libraries/meanwhile/fix_glib_includes.patch b/libraries/meanwhile/fix_glib_includes.patch new file mode 100644 index 0000000000..047eda0ef2 --- /dev/null +++ b/libraries/meanwhile/fix_glib_includes.patch @@ -0,0 +1,235 @@ +diff --git a/src/channel.c b/src/channel.c +index d7215a9..932522d 100644 +--- a/src/channel.c ++++ b/src/channel.c +@@ -19,8 +19,6 @@ + */ + + #include <glib.h> +-#include <glib/ghash.h> +-#include <glib/glist.h> + #include <string.h> + + #include "mw_channel.h" +diff --git a/src/mw_debug.c b/src/mw_debug.c +index cf47a38..d22d287 100644 +--- a/src/mw_debug.c ++++ b/src/mw_debug.c +@@ -19,7 +19,7 @@ + */ + + +-#include <glib/gstring.h> ++#include <glib.h> + + #include "mw_debug.h" + +diff --git a/src/mw_message.h b/src/mw_message.h +index 8402b8b..a825ec2 100644 +--- a/src/mw_message.h ++++ b/src/mw_message.h +@@ -22,7 +22,7 @@ + #define _MW_MESSAGE_H + + +-#include <glib/glist.h> ++#include <glib.h> + #include "mw_common.h" + + +diff --git a/src/mw_srvc_conf.h b/src/mw_srvc_conf.h +index 156c639..66d885b 100644 +--- a/src/mw_srvc_conf.h ++++ b/src/mw_srvc_conf.h +@@ -22,7 +22,7 @@ + #define _MW_SRVC_CONF_H + + +-#include <glib/glist.h> ++#include <glib.h> + #include "mw_common.h" + + +diff --git a/src/mw_srvc_dir.h b/src/mw_srvc_dir.h +index b9230bb..8fd1c85 100644 +--- a/src/mw_srvc_dir.h ++++ b/src/mw_srvc_dir.h +@@ -22,7 +22,7 @@ + + + #include <glib.h> +-#include <glib/glist.h> ++#include <glib.h> + + + #ifdef __cplusplus +diff --git a/src/mw_srvc_place.h b/src/mw_srvc_place.h +index e17aa71..bba97b6 100644 +--- a/src/mw_srvc_place.h ++++ b/src/mw_srvc_place.h +@@ -22,7 +22,7 @@ + #define _MW_SRVC_PLACE_H + + +-#include <glib/glist.h> ++#include <glib.h> + #include "mw_common.h" + + +diff --git a/src/mw_srvc_resolve.h b/src/mw_srvc_resolve.h +index 3b06b75..55aefdf 100644 +--- a/src/mw_srvc_resolve.h ++++ b/src/mw_srvc_resolve.h +@@ -23,7 +23,7 @@ + + + #include <glib.h> +-#include <glib/glist.h> ++#include <glib.h> + + + #ifdef __cplusplus +diff --git a/src/mw_st_list.h b/src/mw_st_list.h +index 39e1cbf..c0032d4 100644 +--- a/src/mw_st_list.h ++++ b/src/mw_st_list.h +@@ -30,7 +30,7 @@ + + + #include <glib.h> +-#include <glib/glist.h> ++#include <glib.h> + #include "mw_common.h" + + +diff --git a/src/mw_util.h b/src/mw_util.h +index b8e0b7e..10dcd69 100644 +--- a/src/mw_util.h ++++ b/src/mw_util.h +@@ -23,9 +23,6 @@ + + + #include <glib.h> +-#include <glib/ghash.h> +-#include <glib/glist.h> +- + + #define map_guint_new() \ + g_hash_table_new(g_direct_hash, g_direct_equal) +diff --git a/src/srvc_aware.c b/src/srvc_aware.c +index 869f973..dc2c12f 100644 +--- a/src/srvc_aware.c ++++ b/src/srvc_aware.c +@@ -19,8 +19,6 @@ + */ + + #include <glib.h> +-#include <glib/ghash.h> +-#include <glib/glist.h> + #include <string.h> + + #include "mw_channel.h" +diff --git a/src/srvc_conf.c b/src/srvc_conf.c +index da8e6f3..eee0051 100644 +--- a/src/srvc_conf.c ++++ b/src/srvc_conf.c +@@ -19,8 +19,6 @@ + */ + + #include <glib.h> +-#include <glib/ghash.h> +-#include <glib/glist.h> + + #include <stdio.h> + #include <stdlib.h> +diff --git a/src/srvc_dir.c b/src/srvc_dir.c +index cf49152..ed5997e 100644 +--- a/src/srvc_dir.c ++++ b/src/srvc_dir.c +@@ -18,7 +18,7 @@ + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +-#include <glib/ghash.h> ++#include <glib.h> + + #include "mw_channel.h" + #include "mw_common.h" +diff --git a/src/srvc_ft.c b/src/srvc_ft.c +index 0564732..ff9f010 100644 +--- a/src/srvc_ft.c ++++ b/src/srvc_ft.c +@@ -19,7 +19,7 @@ + */ + + +-#include <glib/glist.h> ++#include <glib.h> + + #include "mw_channel.h" + #include "mw_common.h" +diff --git a/src/srvc_im.c b/src/srvc_im.c +index 5930687..16714c7 100644 +--- a/src/srvc_im.c ++++ b/src/srvc_im.c +@@ -19,7 +19,7 @@ + */ + + #include <glib.h> +-#include <glib/glist.h> ++#include <glib.h> + #include <string.h> + + #include "mw_channel.h" +diff --git a/src/srvc_place.c b/src/srvc_place.c +index fc979ff..58ba574 100644 +--- a/src/srvc_place.c ++++ b/src/srvc_place.c +@@ -19,8 +19,6 @@ + */ + + #include <glib.h> +-#include <glib/ghash.h> +-#include <glib/glist.h> + + #include <stdio.h> + #include <stdlib.h> +diff --git a/src/srvc_resolve.c b/src/srvc_resolve.c +index aac0d49..c71d7b3 100644 +--- a/src/srvc_resolve.c ++++ b/src/srvc_resolve.c +@@ -18,7 +18,7 @@ + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +-#include <glib/ghash.h> ++#include <glib.h> + + #include "mw_channel.h" + #include "mw_common.h" +diff --git a/src/srvc_store.c b/src/srvc_store.c +index 90f2efc..afbd2b6 100644 +--- a/src/srvc_store.c ++++ b/src/srvc_store.c +@@ -18,7 +18,7 @@ + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +-#include <glib/glist.h> ++#include <glib.h> + + #include "mw_channel.h" + #include "mw_debug.h" +diff --git a/src/st_list.c b/src/st_list.c +index 949696a..e47ec35 100644 +--- a/src/st_list.c ++++ b/src/st_list.c +@@ -20,7 +20,7 @@ + + #include <stdio.h> + #include <string.h> +-#include <glib/gstring.h> ++#include <glib.h> + + #include "mw_debug.h" + #include "mw_util.h" diff --git a/libraries/meanwhile/meanwhile.SlackBuild b/libraries/meanwhile/meanwhile.SlackBuild index 38a92b6472..95e1e3fad2 100644 --- a/libraries/meanwhile/meanwhile.SlackBuild +++ b/libraries/meanwhile/meanwhile.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for Meanwhile # -# Copyright 2009 Erik W. Hanson, Minneapolis, MN, USA +# Copyright 2009-2012 Erik W. Hanson, Minneapolis, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,15 +24,13 @@ PRGNAM=meanwhile VERSION=1.0.2 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -65,6 +63,9 @@ cd $PRGNAM-$VERSION chown -R root:root . chmod -R u+w,go+r-w,a-s . +# Patch to only include glib.h +patch -p1 < $CWD/fix_glib_includes.patch + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ |