mingw32-paragui/patch.diff

   1 diff -rc paragui-1.1.8/configure.in paragui/configure.in
   2 *** paragui-1.1.8/configure.in  2004-10-18 22:58:09.000000000 +0400
   3 --- paragui/configure.in        2010-03-28 20:01:34.114403379 +0400
   4 ***************
   5 *** 39,44 ****
   6 --- 39,46 ----
   7   AC_SUBST(PARAGUI_VERSION)
   8
   9   # libtool versioning
  10 + AC_LIBTOOL_WIN32_DLL
  11 + AC_PROG_LIBTOOL
  12   LT_RELEASE=$PARAGUI_MAJOR_VERSION.$PARAGUI_MINOR_VERSION
  13   LT_CURRENT=`expr $PARAGUI_MICRO_VERSION - $PARAGUI_INTERFACE_AGE`
  14   LT_REVISION=$PARAGUI_INTERFACE_AGE
  15 ***************
  16 *** 58,65 ****
  17
  18   dnl Check for tools
  19
  20 - AC_LIBTOOL_WIN32_DLL
  21 - AM_PROG_LIBTOOL
  22   AC_PROG_MAKE_SET
  23   AC_PROG_CXX
  24   AC_PROG_CPP
  25 --- 60,65 ----
  26 ***************
  27 *** 296,301 ****
  28 --- 296,302 ----
  29   AC_DEFINE_UNQUOTED([SDLIMAGE_LIB], "$SDLimage_lib", [SDL_image shared library])
  30
  31   CFLAGS="$CFLAGS $FREETYPE_CFLAGS"
  32 + LDFLAGS="-no-undefined"
  33
  34   dnl Check for expat
  35
  36 ***************
  37 *** 554,560 ****
  38   AC_SUBST(SYSTEM_LIBS)
  39
  40   OLDLIBS="$LIBS"
  41 ! LIBS=""
  42   # Grab all extra libs from SDL_CONFIG to build the static lib list.
  43   # Unfortunately libs like jpeg and png will be missing still so we check
  44   # for those manually.
  45 --- 555,561 ----
  46   AC_SUBST(SYSTEM_LIBS)
  47
  48   OLDLIBS="$LIBS"
  49 ! LIBS="-lfreetype"
  50   # Grab all extra libs from SDL_CONFIG to build the static lib list.
  51   # Unfortunately libs like jpeg and png will be missing still so we check
  52   # for those manually.
  53 diff -rc paragui-1.1.8/include/paragui.h paragui/include/paragui.h
  54 *** paragui-1.1.8/include/paragui.h     2004-04-18 00:39:07.000000000 +0400
  55 --- paragui/include/paragui.h   2010-03-28 20:01:02.788791242 +0400
  56 ***************
  57 *** 71,77 ****
  58   #if defined(HAVE_HASH_MAP)
  59   #define HASH_MAP_INC <hash_map>
  60   #define MAP_INC <hash_map>
  61 ! #define STL_MAP std::hash_map
  62   #elif defined(HAVE_EXT_HASH_MAP)
  63   #define HASH_MAP_INC <ext/hash_map>
  64   #define MAP_INC <ext/hash_map>
  65 --- 71,77 ----
  66   #if defined(HAVE_HASH_MAP)
  67   #define HASH_MAP_INC <hash_map>
  68   #define MAP_INC <hash_map>
  69 ! #define STL_MAP __gnu_cxx::hash_map
  70   #elif defined(HAVE_EXT_HASH_MAP)
  71   #define HASH_MAP_INC <ext/hash_map>
  72   #define MAP_INC <ext/hash_map>
  73 diff -rc paragui-1.1.8/src/core/pgfilearchive.cpp paragui/src/core/pgfilearchive.cpp
  74 *** paragui-1.1.8/src/core/pgfilearchive.cpp    2004-03-13 16:45:44.000000000 +0300
  75 --- paragui/src/core/pgfilearchive.cpp  2010-03-28 20:01:02.788791242 +0400
  76 ***************
  77 *** 100,106 ****
  78         const char* sep = GetDirSeparator();
  79         std::string::size_type pos = 0, incr;
  80         newpath = new std::string(path);
  81 !       incr = std::strlen(sep);
  82         if(incr == 1 && sep[0] == '/')
  83                 return newpath;
  84
  85 --- 100,106 ----
  86         const char* sep = GetDirSeparator();
  87         std::string::size_type pos = 0, incr;
  88         newpath = new std::string(path);
  89 !       incr = strlen(sep);
  90         if(incr == 1 && sep[0] == '/')
  91                 return newpath;
  92
  93 diff -rc paragui-1.1.8/test/navtest.cpp paragui/test/navtest.cpp
  94 *** paragui-1.1.8/test/navtest.cpp      2004-02-28 21:49:06.000000000 +0300
  95 --- paragui/test/navtest.cpp    2010-03-28 20:01:45.318805660 +0400
  96 ***************
  97 *** 13,37 ****
  98
  99         switch(key->keysym.sym) {
 100                 case SDLK_UP:
 101 !                       dest = FindUp();
 102                         break;
 103                 case SDLK_DOWN:
 104 !                       dest = FindDown();
 105                         break;
 106                 case SDLK_LEFT:
 107 !                       dest = FindLeft();
 108                         break;
 109                 case SDLK_RIGHT:
 110 !                       dest = FindRight();
 111                         break;
 112                 case SDLK_TAB:
 113 !                       dest = GotoNext();
 114                         if(dest == NULL) {
 115 !                               GotoFirst();
 116                         }
 117                         return true;
 118                 case SDLK_SPACE:
 119 !                       Action(PG_Widget::ACT_OK);
 120                         return true;
 121                 default:
 122                         dest = NULL;
 123 --- 13,37 ----
 124
 125         switch(key->keysym.sym) {
 126                 case SDLK_UP:
 127 ! //                    dest = FindUp();
 128                         break;
 129                 case SDLK_DOWN:
 130 ! //                    dest = FindDown();
 131                         break;
 132                 case SDLK_LEFT:
 133 ! //                    dest = FindLeft();
 134                         break;
 135                 case SDLK_RIGHT:
 136 ! //                    dest = FindRight();
 137                         break;
 138                 case SDLK_TAB:
 139 ! //                    dest = GotoNext();
 140                         if(dest == NULL) {
 141 ! //                            GotoFirst();
 142                         }
 143                         return true;
 144                 case SDLK_SPACE:
 145 ! //                    Action(PG_Widget::ACT_OK);
 146                         return true;
 147                 default:
 148                         dest = NULL;
 149 ***************
 150 *** 99,112 ****
 151         edit1.Show();
 152
 153         // add the widgets
 154 !       app.Add(&btn1);
 155 !       app.Add(&btn2);
 156 !       app.Add(&btn3);
 157 !       app.Add(&btn4);
 158 !       app.Add(&btn5);
 159 !       app.Add(&edit1);
 160
 161 !       app.GotoFirst();
 162
 163         app.Run();
 164
 165 --- 99,112 ----
 166         edit1.Show();
 167
 168         // add the widgets
 169 ! //    app.Add(&btn1);
 170 ! //    app.Add(&btn2);
 171 ! //    app.Add(&btn3);
 172 ! //    app.Add(&btn4);
 173 ! //    app.Add(&btn5);
 174 ! //    app.Add(&edit1);
 175
 176 ! //    app.GotoFirst();
 177
 178         app.Run();
 179