freewrl-mozilla.patch

   1 --- FreeWRL-1.00/Plugin/mozilla/Makefile.orig   2003-08-10 14:41:33.000000000 +0200
   2 +++ FreeWRL-1.00/Plugin/mozilla/Makefile        2003-08-11 20:36:01.638817672 +0200
   3 @@ -18,13 +18,13 @@
   4
   5  ifndef ${MOZILLA_INST}
   6
   7 -MOZILLA_INST:=/usr/lib/mozilla-1.0.0
   8 +MOZILLA_INST:=/usr/lib/mozilla
   9
  10  endif
  11
  12  ifndef ${MOZILLA_INC}
  13
  14 -MOZILLA_INC:=/usr/include/mozilla-1.0.0
  15 +MOZILLA_INC:=/usr/include/mozilla
  16
  17  endif
  18
  19 @@ -118,6 +118,7 @@
  20
  21  INC:=\
  22       -Iinclude\
  23 +     -I/usr/include/nspr\
  24       -I${PLUGIN_GLUE_DIR}/CFuncs\
  25       -I${MOZILLA_INC}/plugin\
  26       -I${MOZILLA_INC}/xpcom\
  27 @@ -132,11 +131,8 @@
  28
  29  INC+=\
  30       -I/usr/X11R6/include\
  31 -     -I/usr/include\
  32 -     -I/usr/include/gtk-1.2\
  33 -     -I/usr/include/glib-1.2\
  34 -     -I/usr/lib/glib/include\
  35 -     -include include/config-rhlinux72-i686.h ## for platform defines
  36 +     `$(GTK_CONFIG) --cflags` \
  37 +     -include /usr/include/mozilla/mozilla-config.h ## for platform defines
  38
  39  endif
  40
  41 @@ -151,7 +152,6 @@
  42          ${OPTIMIZER}\
  43          ${INC}\
  44          -pedantic\
  45 -        -fshort-wchar\
  46          -fno-exceptions\
  47          -pthread\
  48          -pipe\
  49 @@ -214,13 +210,10 @@
  50        -L/usr/X11R6/lib\
  51        -lgtkxtbin\
  52        -lXt\
  53 -      -lgtk\
  54 -      -lgdk\
  55        -lXi\
  56        -lXext\
  57        -lX11\
  58 -      -lglib
  59 -
  60 +       `$(GTK_CONFIG) --libs`
  61  endif
  62
  63  ## -lgtkembedmoz\
  64 --- FreeWRL-1.00/Plugin/mozilla/source/npFreeWRLInstance.cpp.orig       2003-08-10 14:41:33.000000000 +0200
  65 +++ FreeWRL-1.00/Plugin/mozilla/source/npFreeWRLInstance.cpp    2003-08-11 20:33:17.972698704 +0200
  66 @@ -195,29 +195,29 @@
  67      // add MacOS code later
  68
  69      // handle signals...
  70 -    if (signal(SIGIO, (__sighandler_t) &npFreeWRLInstance::signalHandler) == SIG_ERR) {
  71 +    if (signal(SIGIO, (__sighandler_t) &npFreeWRLInstance_signalHandler) == SIG_ERR) {
  72          std::cerr << "signal with SIGIO failed." << endl;
  73          return FALSE;
  74      }
  75
  76 -    if (signal(SIGPIPE, (__sighandler_t) &npFreeWRLInstance::signalHandler) == SIG_ERR) {
  77 +    if (signal(SIGPIPE, (__sighandler_t) &npFreeWRLInstance_signalHandler) == SIG_ERR) {
  78          std::cerr << "signal with SIGPIPE failed." << endl;
  79          return FALSE;
  80      }
  81
  82  #if _DEBUG
  83 -    if (signal(SIGBUS, (__sighandler_t) &npFreeWRLInstance::signalHandler) == SIG_ERR) {
  84 +    if (signal(SIGBUS, (__sighandler_t) &npFreeWRLInstance_signalHandler) == SIG_ERR) {
  85          std::cerr << "signal with SIGPIPE failed." << endl;
  86          return FALSE;
  87      }
  88  #endif // _DEBUG
  89
  90 -    if (signal(SIGHUP, (__sighandler_t) &npFreeWRLInstance::signalHandler) == SIG_ERR) {
  91 +    if (signal(SIGHUP, (__sighandler_t) &npFreeWRLInstance_signalHandler) == SIG_ERR) {
  92          std::cerr << "signal with SIGHUP failed." << endl;
  93          return FALSE;
  94      }
  95
  96 -    if (signal(SIGUSR2, (__sighandler_t) &npFreeWRLInstance::signalHandler) == SIG_ERR) {
  97 +    if (signal(SIGUSR2, (__sighandler_t) &npFreeWRLInstance_signalHandler) == SIG_ERR) {
  98          std::cerr << "signal with SIGUSR2 failed." << endl;
  99          return FALSE;
 100      }
 101 @@ -839,7 +839,7 @@
 102  }
 103
 104  void
 105 -npFreeWRLInstance::signalHandler(int signo)
 106 +npFreeWRLInstance_signalHandler(int signo)
 107  {
 108  #if _DEBUG
 109      std::cerr << "npFreeWRLInstance signalHandler signal number = "
 110 @@ -851,7 +851,7 @@
 111  #if _DEBUG
 112              std::cerr << "\tplugin caught SIGIO!" << endl;
 113  #endif // _DEBUG
 114 -            if (receiveUrl(socketDesc, &lastRequest) != NPERR_NO_ERROR) {
 115 +/*          if (receiveUrl(socketDesc, &lastRequest) != NPERR_NO_ERROR) {
 116                  std::cerr << "receiveUrl returned with error!" << endl;
 117              } else {
 118                  if (NPN_GetURL((NPP) lastRequest.instance,
 119 @@ -859,7 +859,7 @@
 120                                 NULL) != NO_ERROR) {
 121                      fprintf(stderr, "NPN_GetURL failed.\n");
 122                  }
 123 -            }
 124 +            }  -- socketDesc and lastRequest inaccessible here */
 125              break;
 126  #if _DEBUG
 127          case SIGBUS:
 128 --- FreeWRL-1.00/Plugin/mozilla/include/npFreeWRLInstance.h.orig        2003-07-24 15:59:15.000000000 +0200
 129 +++ FreeWRL-1.00/Plugin/mozilla/include/npFreeWRLInstance.h     2003-08-10 16:12:44.000000000 +0200
 130 @@ -66,6 +66,7 @@
 131
 132  // from mozilla plugin sdk and samples - plugin.h
 133
 134 +void npFreeWRLInstance_signalHandler(int signo);
 135  class npFreeWRLInstance : public npInstanceBase
 136  {
 137  public:
 138 @@ -130,7 +131,6 @@
 139         void getVersion(char **aVersion);
 140         void showVersion();
 141         void clear();
 142 -    void signalHandler(int signo);
 143      PlatformInfo * getPlatformInfo();
 144
 145  private: