org.handhelds.familiar/packages/libsigcx/libsigcx0/libsigcx-0.6.4-build-swb.patch

   1 Backport of libsigcx-200504101-build-swb.patch for use with the 0.6.4 release.
   2
   3 - Steven Brown <swbrown@ucsd.edu>
   4
   5
   6 diff -ru libsigcx-0.6.4-old/configure.ac libsigcx-0.6.4/configure.ac
   7 --- libsigcx-0.6.4-old/configure.ac     Tue Jun  3 09:58:34 2003
   8 +++ libsigcx-0.6.4/configure.ac Fri May  6 20:04:21 2005
   9 @@ -69,6 +69,16 @@
  10  AC_SUBST(SIGC_LIBS)
  11  AC_SUBST(SIGC_CFLAGS)
  12
  13 +dnl SigC++ macros
  14 +AC_MSG_CHECKING([for SigC++ macros])
  15 +SIGC_MACROS="`pkg-config --variable=prefix sigc++-1.2`/include/sigc++-1.2/sigc++/macros"
  16 +if test "$?" != "0"; then
  17 +  AC_MSG_ERROR([failed to locate the SigC++ macros])
  18 +else
  19 +  AC_MSG_RESULT([$SIGC_MACROS])
  20 +fi
  21 +AC_SUBST(SIGC_MACROS)
  22 +
  23  dnl Check for thread support
  24  AC_ARG_WITH(threads,
  25              AC_HELP_STRING([--with-threads],
  26 diff -ru libsigcx-0.6.4-old/sigcx/Makefile.am libsigcx-0.6.4/sigcx/Makefile.am
  27 --- libsigcx-0.6.4-old/sigcx/Makefile.am        Thu Apr 24 06:47:32 2003
  28 +++ libsigcx-0.6.4/sigcx/Makefile.am    Fri May  6 20:04:39 2005
  29 @@ -20,7 +20,7 @@
  30                           dispatch.cc thread_tunnel.cc convert.cc
  31
  32  libsigcx_0_6_la_LIBADD = $(THREAD_LIBS) $(SIGC_LIBS)
  33 -libsigcx_0_6_la_LDFLAGS = -version-info "2:0:0"
  34 +libsigcx_0_6_la_LDFLAGS = -version-info "2:0:0" -no-undefined
  35
  36  libsigcdir = $(prefix)/include/sigcx
  37
  38 @@ -34,7 +34,7 @@
  39  libsigcx_gtk_0_6_la_SOURCES = gtk_dispatch.cc
  40  libsigcx_gtk_0_6_la_LIBADD = libsigcx-@SIGCX_DEVBRANCH@.la \
  41                              $(THREAD_LIBS) $(SIGC_LIBS) $(GTK_LIBS)
  42 -libsigcx_gtk_0_6_la_LDFLAGS = -version-info "1:0:0" -rpath $(libdir)
  43 +libsigcx_gtk_0_6_la_LDFLAGS = -version-info "1:0:0" -rpath $(libdir) -no-undefined
  44
  45  EXTRA_DIST = sigcx-@SIGCX_BRANCH@.pc.in sigcx-@SIGCX_BRANCH@-gtk+.pc.in \
  46              $(BUILT_SOURCES) \
  47 @@ -48,10 +48,5 @@
  48         $(M4) $(M4_INCLUDES) $(DEFINES) $<  > $@
  49
  50  bind3.h: $(M4_DIR)/bind3.h.m4 $(M4_DIR)/template.macros.m4
  51 -       $(M4) $(M4_INCLUDES) -I`pkg-config --variable=prefix sigc++-1.2`/include/sigc++-1.2/sigc++/macros \
  52 +       $(M4) $(M4_INCLUDES) -I$(SIGC_MACROS) \
  53           $(DEFINES) $<  > $@
  54 -
  55 -# We use libtool 1.5, which does proper linking against libstdc++ for libs,
  56 -# if called with --tag=CXX, but AM doesn't understand that yet
  57 -CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) \
  58 -         $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
  59 diff -ru libsigcx-0.6.4-old/sigcx/dispatch.cc libsigcx-0.6.4/sigcx/dispatch.cc
  60 --- libsigcx-0.6.4-old/sigcx/dispatch.cc        Sun Apr 27 09:48:30 2003
  61 +++ libsigcx-0.6.4/sigcx/dispatch.cc    Fri May  6 20:04:21 2005
  62 @@ -19,6 +19,9 @@
  63  #include <iostream>
  64
  65  #include <signal.h>
  66 +#include <sys/time.h>
  67 +#include <sys/types.h>
  68 +#include <unistd.h>
  69
  70  #include "sigcx/dispatch.h"
  71