Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (6ca6fc95df3bc10666c2ae0a90cac55a3d2b1abb)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (6ca6fc95df3bc10666c2ae0a90cac55a3d2b1abb)
  • Date: Sat, 22 Mar 2008 03:00:13 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

audio-libs/id3lib/DEPENDS | 3
audio-libs/id3lib/HISTORY | 7 +
audio-libs/id3lib/PRE_BUILD | 8 +
audio-libs/id3lib/gcc43.patch | 86 ++++++++++++++
net/wpa_supplicant/HISTORY | 5
net/wpa_supplicant/PRE_BUILD | 2
net/wpa_supplicant/gcc43.patch | 38 ++++++
spelling/aspell/HISTORY | 7 +
spelling/aspell/PRE_BUILD | 4
spelling/aspell/gcc43.patch | 157
+++++++++++++++++++++++++++
spelling/aspell/templateinstantiations.patch | 8 +
11 files changed, 322 insertions(+), 3 deletions(-)

New commits:
commit 6ca6fc95df3bc10666c2ae0a90cac55a3d2b1abb
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

wpa_supplicant: Add patch for old, stable, and devel to compile with gcc
4.3.0

commit 73fef20077befbd80a24c0657e244035bd09b21c
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

wpa_supplicant: Add patches to compile with gcc 4.3.0

commit 023c8f3008c50ea294485a292be8b7eb2bab281c
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

id3lib: Add patch to compile with gcc 4.3.0

diff --git a/audio-libs/id3lib/DEPENDS b/audio-libs/id3lib/DEPENDS
index fd0b0eb..ea5d621 100755
--- a/audio-libs/id3lib/DEPENDS
+++ b/audio-libs/id3lib/DEPENDS
@@ -1 +1,2 @@
-depends g++
+depends autoconf &&
+depends g++
diff --git a/audio-libs/id3lib/HISTORY b/audio-libs/id3lib/HISTORY
index c5544a2..950798f 100644
--- a/audio-libs/id3lib/HISTORY
+++ b/audio-libs/id3lib/HISTORY
@@ -1,3 +1,10 @@
+2008-03-22 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on autoconf to regenerate configure after
gcc43.patch
+ * PRE_BUILD: Apply gcc43.patch
+ Run autoconf to regenerate configure
+ * gcc43.patch: Patch to build with gcc 4.3.0
+ From http://bugs.gentoo.org/show_bug.cgi?id=212455
+
2007-03-01 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DEPENDS: added, g++

diff --git a/audio-libs/id3lib/PRE_BUILD b/audio-libs/id3lib/PRE_BUILD
index d5a1ae0..90aa360 100755
--- a/audio-libs/id3lib/PRE_BUILD
+++ b/audio-libs/id3lib/PRE_BUILD
@@ -1,5 +1,9 @@
-default_pre_build &&
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch &&
+autoconf &&
+
if [[ "${ID3LIB_UNICODE}" == "y" ]] ; then
verify_file 2 &&
- patch -p1 -d ${SOURCE_DIRECTORY} < ${SOURCE_CACHE}/${SOURCE2}
+ patch -p1 < ${SOURCE_CACHE}/${SOURCE2}
fi
diff --git a/audio-libs/id3lib/gcc43.patch b/audio-libs/id3lib/gcc43.patch
new file mode 100644
index 0000000..f4c8179
--- /dev/null
+++ b/audio-libs/id3lib/gcc43.patch
@@ -0,0 +1,86 @@
+#
+# From http://bugs.gentoo.org/show_bug.cgi?id=212455
+#
+diff -Naur id3lib-3.8.3-orig/configure.in id3lib-3.8.3/configure.in
+--- id3lib-3.8.3-orig/configure.in 2008-03-05 18:03:25.000000000 -0600
++++ id3lib-3.8.3/configure.in 2008-03-05 18:15:42.000000000 -0600
+@@ -227,7 +227,6 @@
+ )
+ AC_CHECK_HEADERS( \
+ string \
+- iomanip.h \
+ ,,AC_MSG_ERROR([Missing a vital header file for id3lib])
+ )
+
+diff -Naur id3lib-3.8.3-orig/include/id3/id3lib_strings.h
id3lib-3.8.3/include/id3/id3lib_strings.h
+--- id3lib-3.8.3-orig/include/id3/id3lib_strings.h 2008-03-05
18:19:46.000000000 -0600
++++ id3lib-3.8.3/include/id3/id3lib_strings.h 2008-03-05 18:19:38.000000000
-0600
+@@ -30,6 +30,7 @@
+ #define _ID3LIB_STRINGS_H_
+
+ #include <string>
++#include <cstring>
+
+ #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER
> 1000))
+ namespace std
+diff -Naur id3lib-3.8.3-orig/include/id3/writers.h
id3lib-3.8.3/include/id3/writers.h
+--- id3lib-3.8.3-orig/include/id3/writers.h 2003-03-01 18:23:00.000000000
-0600
++++ id3lib-3.8.3/include/id3/writers.h 2008-03-05 18:23:05.000000000 -0600
+@@ -30,7 +30,7 @@
+
+ #include "id3/writer.h"
+ #include "id3/id3lib_streams.h"
+-//#include <string.h>
++#include <string.h>
+
+ class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer
+ {
+diff -Naur id3lib-3.8.3-orig/examples/demo_convert.cpp
id3lib-3.8.3/examples/demo_convert.cpp
+--- id3lib-3.8.3-orig/examples/demo_convert.cpp 2003-03-01
18:23:00.000000000 -0600
++++ id3lib-3.8.3/examples/demo_convert.cpp 2008-03-05 18:26:50.000000000
-0600
+@@ -84,7 +84,7 @@
+ }
+ }
+
+-int main( unsigned int argc, char * const argv[])
++int main( int argc, char * const argv[])
+ {
+ flags_t ulFlag = ID3TT_ALL;
+ gengetopt_args_info args;
+diff -Naur id3lib-3.8.3-orig/examples/demo_info.cpp
id3lib-3.8.3/examples/demo_info.cpp
+--- id3lib-3.8.3-orig/examples/demo_info.cpp 2003-03-01 18:23:00.000000000
-0600
++++ id3lib-3.8.3/examples/demo_info.cpp 2008-03-05 18:27:40.000000000
-0600
+@@ -309,7 +309,7 @@
+
+ #define DEBUG
+
+-int main( unsigned int argc, char * const argv[])
++int main( int argc, char * const argv[])
+ {
+ ID3D_INIT_DOUT();
+
+diff -Naur id3lib-3.8.3-orig/examples/demo_tag.cpp
id3lib-3.8.3/examples/demo_tag.cpp
+--- id3lib-3.8.3-orig/examples/demo_tag.cpp 2003-03-01 18:23:00.000000000
-0600
++++ id3lib-3.8.3/examples/demo_tag.cpp 2008-03-05 18:31:20.000000000 -0600
+@@ -46,7 +46,7 @@
+ os << "v2";
+ }
+
+-int main( unsigned int argc, char * const argv[])
++int main( int argc, char * const argv[])
+ {
+ int ulFlag = ID3TT_ID3;
+ ID3D_INIT_DOUT();
+diff -Naur id3lib-3.8.3-orig/examples/demo_copy.cpp
id3lib-3.8.3/examples/demo_copy.cpp
+--- id3lib-3.8.3-orig/examples/demo_copy.cpp 2003-03-01 18:23:00.000000000
-0600
++++ id3lib-3.8.3/examples/demo_copy.cpp 2008-03-05 18:32:44.000000000
-0600
+@@ -81,7 +81,7 @@
+ }
+ }
+
+-int main( unsigned int argc, char * const argv[])
++int main( int argc, char * const argv[])
+ {
+ int ulFlag = ID3TT_ID3;
+ ID3D_INIT_DOUT();
+
diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY
index ac5ef5e..9ac7fdf 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -1,3 +1,8 @@
+2008-03-22 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gcc43.patch
+ * gcc43.patch: Patch to compile with gcc 4.3.0
+ From http://w1.fi/bugz/show_bug.cgi?id=251
+
2008-03-15 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated stable to 0.5.10
Updated old to 0.4.11
diff --git a/net/wpa_supplicant/PRE_BUILD b/net/wpa_supplicant/PRE_BUILD
index 4a7be62..ed32b48 100755
--- a/net/wpa_supplicant/PRE_BUILD
+++ b/net/wpa_supplicant/PRE_BUILD
@@ -5,6 +5,8 @@ else
cd "$SOURCE_DIRECTORY"
fi &&

+patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch &&
+
sed -i "s|/local||g" Makefile &&

# Dynamic EAP target borks install.
diff --git a/net/wpa_supplicant/gcc43.patch b/net/wpa_supplicant/gcc43.patch
new file mode 100644
index 0000000..0903bea
--- /dev/null
+++ b/net/wpa_supplicant/gcc43.patch
@@ -0,0 +1,38 @@
+#
+# From http://w1.fi/bugz/show_bug.cgi?id=251
+#
+diff -Naur wpa_supplicant-0.5.8-orig/wpa_gui/networkconfig.ui.h
wpa_supplicant-0.5.8/wpa_gui/networkconfig.ui.h
+--- wpa_supplicant-0.5.8-orig/wpa_gui/networkconfig.ui.h 2006-12-09
18:38:48.000000000 -0600
++++ wpa_supplicant-0.5.8/wpa_gui/networkconfig.ui.h 2007-12-31
18:36:06.000000000 -0600
+@@ -10,6 +10,7 @@
+ ** destructor.
+
*****************************************************************************/
+
++#include <stdlib.h>
+
+ enum {
+ AUTH_NONE = 0,
+diff -Naur wpa_supplicant-0.5.8-orig/wpa_gui/userdatarequest.ui.h
wpa_supplicant-0.5.8/wpa_gui/userdatarequest.ui.h
+--- wpa_supplicant-0.5.8-orig/wpa_gui/userdatarequest.ui.h 2005-06-05
10:19:57.000000000 -0600
++++ wpa_supplicant-0.5.8/wpa_gui/userdatarequest.ui.h 2007-12-31
18:34:57.000000000 -0600
+@@ -10,6 +10,8 @@
+ ** destructor.
+
*****************************************************************************/
+
++#include <stdlib.h>
++
+ int UserDataRequest::setParams(WpaGui *_wpagui, const char *reqMsg)
+ {
+ char *tmp, *pos, *pos2;
+diff -Naur wpa_supplicant-0.5.8-orig/wpa_gui/wpagui.ui.h
wpa_supplicant-0.5.8/wpa_gui/wpagui.ui.h
+--- wpa_supplicant-0.5.8-orig/wpa_gui/wpagui.ui.h 2007-03-24
20:09:57.000000000 -0600
++++ wpa_supplicant-0.5.8/wpa_gui/wpagui.ui.h 2007-12-31 18:34:23.000000000
-0600
+@@ -16,6 +16,7 @@
+ #include <unistd.h>
+ #endif
+
++#include <stdlib.h>
+
+ void WpaGui::init()
+ {
+
diff --git a/spelling/aspell/HISTORY b/spelling/aspell/HISTORY
index da85e1b..a6d0540 100644
--- a/spelling/aspell/HISTORY
+++ b/spelling/aspell/HISTORY
@@ -1,3 +1,10 @@
+2008-03-22 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gcc43.patch
+ * gcc43.patch: Patch to compile with gcc 4.3.0
+ From
http://kambing.ui.edu/gentoo-portage/app-text/aspell/files/aspell-0.60.5-gcc-4.3.patch
+ * templateinstantiations.patch: Patch to compile after gcc43.patch
+ is applied. From
http://kambing.ui.edu/gentoo-portage/app-text/aspell/files/aspell-0.60.3-templateinstantiations.patch
+
2007-03-31 David Brown <dmlb2000 AT gmail.com>
* POST_INSTALL: removed not needed anymore

diff --git a/spelling/aspell/PRE_BUILD b/spelling/aspell/PRE_BUILD
new file mode 100755
index 0000000..8335061
--- /dev/null
+++ b/spelling/aspell/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch &&
+patch -p0 < $SCRIPT_DIRECTORY/templateinstantiations.patch
diff --git a/spelling/aspell/gcc43.patch b/spelling/aspell/gcc43.patch
new file mode 100644
index 0000000..c898dea
--- /dev/null
+++ b/spelling/aspell/gcc43.patch
@@ -0,0 +1,157 @@
+#
+# From
http://kambing.ui.edu/gentoo-portage/app-text/aspell/files/aspell-0.60.5-gcc-4.3.patch
+#
+diff -Naur aspell-0.60.5-orig/common/convert.cpp
aspell-0.60.5/common/convert.cpp
+--- aspell-0.60.5-orig/common/convert.cpp 2006-11-18 02:36:01.000000000
-0600
++++ aspell-0.60.5/common/convert.cpp 2007-12-29 11:17:11.000000000 -0600
+@@ -238,7 +238,7 @@
+ }
+
+ template <class T>
+- static void free_norm_table(NormTable<T> * d)
++ void free_norm_table(NormTable<T> * d)
+ {
+ for (T * cur = d->data; cur != d->end; ++cur) {
+ if (cur->sub_table)
+diff -Naur aspell-0.60.5-orig/common/string.hpp
aspell-0.60.5/common/string.hpp
+--- aspell-0.60.5-orig/common/string.hpp 2004-11-29 11:50:05.000000000
-0600
++++ aspell-0.60.5/common/string.hpp 2007-12-29 11:17:11.000000000 -0600
+@@ -129,10 +129,10 @@
+ }
+
+ char & operator[] (size_t pos) {return begin_[pos];}
+- const char operator[] (size_t pos) const {return begin_[pos];}
++ char operator[] (size_t pos) const {return begin_[pos];}
+
+ char & back() {return end_[-1];}
+- const char back() const {return end_[-1];}
++ char back() const {return end_[-1];}
+
+ void clear() {end_ = begin_;}
+
+@@ -492,7 +492,7 @@
+
+ namespace std
+ {
+- template<> static inline void swap(acommon::String & x, acommon::String &
y) {return x.swap(y);}
++ template<> inline void swap(acommon::String & x, acommon::String & y)
{return x.swap(y);}
+ }
+
+ #endif
+diff -Naur aspell-0.60.5-orig/modules/speller/default/affix.cpp
aspell-0.60.5/modules/speller/default/affix.cpp
+--- aspell-0.60.5-orig/modules/speller/default/affix.cpp 2006-01-21
08:27:54.000000000 -0600
++++ aspell-0.60.5/modules/speller/default/affix.cpp 2007-12-29
11:17:11.000000000 -0600
+@@ -193,7 +193,7 @@
+ typedef const Conds * Value;
+ typedef const char * Key;
+ static const bool is_multi = false;
+- hash<const char *> hfun;
++ acommon::hash<const char *> hfun;
+ size_t hash(const char * s) {return hfun(s);}
+ bool equal(const char * x, const char * y) {return strcmp(x,y) == 0;}
+ const char * key(const Conds * c) {return c->str;}
+diff -Naur aspell-0.60.5-orig/modules/speller/default/affix.hpp
aspell-0.60.5/modules/speller/default/affix.hpp
+--- aspell-0.60.5-orig/modules/speller/default/affix.hpp 2004-11-29
11:50:06.000000000 -0600
++++ aspell-0.60.5/modules/speller/default/affix.hpp 2007-12-29
11:17:11.000000000 -0600
+@@ -107,7 +107,7 @@
+ {
+ return expand(word,aff,buf,0);
+ }
+- WordAff * expand_suffix(ParmString word, const unsigned char * new_aff,
++ WordAff * expand_suffix(ParmString word, const unsigned char * aff,
+ ObjStack &, int limit = INT_MAX,
+ unsigned char * new_aff = 0, WordAff * * * l =
0,
+ ParmString orig_word = 0) const;
+diff -Naur aspell-0.60.5-orig/modules/speller/default/readonly_ws.cpp
aspell-0.60.5/modules/speller/default/readonly_ws.cpp
+--- aspell-0.60.5-orig/modules/speller/default/readonly_ws.cpp 2006-11-18
03:17:19.000000000 -0600
++++ aspell-0.60.5/modules/speller/default/readonly_ws.cpp 2007-12-29
11:17:11.000000000 -0600
+@@ -726,7 +726,7 @@
+ struct WordLookupParms {
+ const char * block_begin;
+ WordLookupParms() {}
+- typedef Vector<u32int> Vector;
++ typedef acommon::Vector<u32int> Vector;
+ typedef u32int Value;
+ typedef const char * Key;
+ static const bool is_multi = false;
+diff -Naur aspell-0.60.5-orig/prog/aspell.cpp aspell-0.60.5/prog/aspell.cpp
+--- aspell-0.60.5-orig/prog/aspell.cpp 2006-12-19 04:51:08.000000000 -0600
++++ aspell-0.60.5/prog/aspell.cpp 2007-12-29 11:18:10.000000000 -0600
+@@ -239,6 +239,14 @@
+ return i;
+ }
+
++static void line_buffer() {
++#ifndef WIN32
++ // set up stdin and stdout to be line buffered
++ assert(setvbuf(stdin, 0, _IOLBF, 0) == 0);
++ assert(setvbuf(stdout, 0, _IOLBF, 0) == 0);
++#endif
++}
++
+ Conv dconv;
+ Conv uiconv;
+
+@@ -686,11 +694,7 @@
+
+ void pipe()
+ {
+-#ifndef WIN32
+- // set up stdin and stdout to be line buffered
+- assert(setvbuf(stdin, 0, _IOLBF, 0) == 0);
+- assert(setvbuf(stdout, 0, _IOLBF, 0) == 0);
+-#endif
++ line_buffer();
+
+ bool terse_mode = true;
+ bool do_time = options->retrieve_bool("time");
+@@ -1651,6 +1655,7 @@
+ Conv oconv(setup_conv(lang, options));
+ String word;
+ String sl;
++ line_buffer();
+ while (CIN.getline(word)) {
+ const char * w = iconv(word);
+ lang->LangImpl::to_soundslike(sl, w);
+@@ -1675,6 +1680,7 @@
+ Conv oconv(setup_conv(lang, options));
+ String word;
+ GuessInfo gi;
++ line_buffer();
+ while (CIN.getline(word)) {
+ lang->munch(iconv(word), &gi);
+ COUT << word;
+@@ -1713,6 +1719,7 @@
+ String word, buf;
+ ObjStack exp_buf;
+ WordAff * exp_list;
++ line_buffer();
+ while (CIN.getline(word)) {
+ buf = word;
+ char * w = iconv(buf.mstr(), buf.size());
+@@ -1799,6 +1806,7 @@
+ String word;
+ String base;
+ String affs;
++ line_buffer();
+ while (CIN.getline(word)) {
+ word = iconv(word);
+
+@@ -1882,7 +1890,7 @@
+ typedef SML_WordEntry Value;
+ typedef const char * Key;
+ static const bool is_multi = false;
+- hash<const char *> hash;
++ acommon::hash<const char *> hash;
+ bool equal(Key x, Key y) {return strcmp(x,y) == 0;}
+ Key key(const Value & v) {return v.word;}
+ };
+@@ -2033,7 +2041,7 @@
+ typedef CML_Entry Value;
+ typedef const char * Key;
+ static const bool is_multi = true;
+- hash<const char *> hash;
++ acommon::hash<const char *> hash;
+ bool equal(Key x, Key y) {return strcmp(x,y) == 0;}
+ Key key(const Value & v) {return v.word;}
+ };
diff --git a/spelling/aspell/templateinstantiations.patch
b/spelling/aspell/templateinstantiations.patch
new file mode 100644
index 0000000..a533f9e
--- /dev/null
+++ b/spelling/aspell/templateinstantiations.patch
@@ -0,0 +1,8 @@
+--- common/string_map.cpp~ 2004-07-15 12:58:58.000000000 +0200
++++ common/string_map.cpp 2005-07-19 14:31:42.000000000 +0200
+@@ -82,3 +82,5 @@
+ }
+ }
+
++template class acommon::HashTable<acommon::StringMap::Parms>;
++template class acommon::BlockSList<acommon::StringPair>;



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (6ca6fc95df3bc10666c2ae0a90cac55a3d2b1abb), Eric Sandall, 03/22/2008

Archive powered by MHonArc 2.6.24.

Top of Page