summaryrefslogtreecommitdiffstats
path: root/app-mobilephone/gsmlib/files
diff options
context:
space:
mode:
Diffstat (limited to 'app-mobilephone/gsmlib/files')
-rw-r--r--app-mobilephone/gsmlib/files/gsmlib-1.11-gcc41.patch52
-rw-r--r--app-mobilephone/gsmlib/files/gsmlib-1.11-gcc43.patch67
-rw-r--r--app-mobilephone/gsmlib/files/gsmlib-1.11-include-gcc34-fix.patch52
3 files changed, 171 insertions, 0 deletions
diff --git a/app-mobilephone/gsmlib/files/gsmlib-1.11-gcc41.patch b/app-mobilephone/gsmlib/files/gsmlib-1.11-gcc41.patch
new file mode 100644
index 00000000..a7414e36
--- /dev/null
+++ b/app-mobilephone/gsmlib/files/gsmlib-1.11-gcc41.patch
@@ -0,0 +1,52 @@
+diff -ur gsmlib-1.11-orig/gsmlib/gsm_map_key.h gsmlib-1.11/gsmlib/gsm_map_key.h
+--- gsmlib-1.11-orig/gsmlib/gsm_map_key.h 2006-02-25 19:20:52.000000000 -0500
++++ gsmlib-1.11/gsmlib/gsm_map_key.h 2006-02-25 19:23:01.000000000 -0500
+@@ -78,7 +78,7 @@
+ // MapKey members
+
+ template <class SortedStore>
+- bool gsmlib::operator<(const MapKey<SortedStore> &x,
++ bool operator<(const MapKey<SortedStore> &x,
+ const MapKey<SortedStore> &y)
+ {
+ assert(&x._myStore == &y._myStore);
+@@ -103,7 +103,7 @@
+ }
+
+ template <class SortedStore>
+- bool gsmlib::operator==(const MapKey<SortedStore> &x,
++ bool operator==(const MapKey<SortedStore> &x,
+ const MapKey<SortedStore> &y)
+ {
+ assert(&x._myStore == &y._myStore);
+diff -ur gsmlib-1.11-orig/gsmlib/gsm_me_ta.h gsmlib-1.11/gsmlib/gsm_me_ta.h
+--- gsmlib-1.11-orig/gsmlib/gsm_me_ta.h 2006-02-25 19:20:52.000000000 -0500
++++ gsmlib-1.11/gsmlib/gsm_me_ta.h 2006-02-25 19:21:48.000000000 -0500
+@@ -294,8 +294,8 @@
+ // 3 disable phone receive RF circuits only
+ // 4 disable phone both transmit and receive RF circuits
+ // 5...127 implementation-defined
+- int MeTa::getFunctionalityLevel() throw(GsmException);
+- void MeTa::setFunctionalityLevel(int level) throw(GsmException);
++ int getFunctionalityLevel() throw(GsmException);
++ void setFunctionalityLevel(int level) throw(GsmException);
+
+ // return battery charge status (+CBC):
+ // 0 ME is powered by the battery
+@@ -389,13 +389,13 @@
+ void setCallWaitingLockStatus(FacilityClass cl,
+ bool lock)throw(GsmException);
+
+- void MeTa::setCLIRPresentation(bool enable) throw(GsmException);
++ void setCLIRPresentation(bool enable) throw(GsmException);
+ //(+CLIR)
+
+ // 0:according to the subscription of the CLIR service
+ // 1:CLIR invocation
+ // 2:CLIR suppression
+- int MeTa::getCLIRPresentation() throw(GsmException);
++ int getCLIRPresentation() throw(GsmException);
+
+ friend class Phonebook;
+ friend class SMSStore;
+
diff --git a/app-mobilephone/gsmlib/files/gsmlib-1.11-gcc43.patch b/app-mobilephone/gsmlib/files/gsmlib-1.11-gcc43.patch
new file mode 100644
index 00000000..ddd78c6d
--- /dev/null
+++ b/app-mobilephone/gsmlib/files/gsmlib-1.11-gcc43.patch
@@ -0,0 +1,67 @@
+diff -Naurp gsmlib-1.11-orig/gsmlib/gsm_me_ta.cc gsmlib-1.11/gsmlib/gsm_me_ta.cc
+--- gsmlib-1.11-orig/gsmlib/gsm_me_ta.cc 2003-08-26 02:01:36.000000000 -0600
++++ gsmlib-1.11/gsmlib/gsm_me_ta.cc 2008-02-24 15:09:58.000000000 -0600
+@@ -19,6 +19,8 @@
+ #include <gsmlib/gsm_parser.h>
+ #include <gsmlib/gsm_sysdep.h>
+
++#include <cstdlib>
++
+ using namespace std;
+ using namespace gsmlib;
+
+diff -Naurp gsmlib-1.11-orig/gsmlib/gsm_sms_codec.cc gsmlib-1.11/gsmlib/gsm_sms_codec.cc
+--- gsmlib-1.11-orig/gsmlib/gsm_sms_codec.cc 2004-10-27 17:06:06.000000000 -0600
++++ gsmlib-1.11/gsmlib/gsm_sms_codec.cc 2008-02-24 15:10:44.000000000 -0600
+@@ -23,6 +23,7 @@
+ #ifdef HAVE_STRING_H
+ #include <string.h>
+ #endif
++#include <climits>
+ #include <string>
+ using namespace std;
+ using namespace gsmlib;
+diff -Naurp gsmlib-1.11-orig/gsmlib/gsm_util.cc gsmlib-1.11/gsmlib/gsm_util.cc
+--- gsmlib-1.11-orig/gsmlib/gsm_util.cc 2004-10-27 17:05:53.000000000 -0600
++++ gsmlib-1.11/gsmlib/gsm_util.cc 2008-02-24 15:09:36.000000000 -0600
+@@ -35,6 +35,7 @@
+ #define __USE_GNU
+ #define _GNU_SOURCE
+ #endif
++#include <cstdlib>
+ #include <stdio.h>
+ #include <sys/stat.h>
+
+diff -Naurp gsmlib-1.11-orig/gsmlib/gsm_unix_serial.cc gsmlib-1.11/gsmlib/gsm_unix_serial.cc
+--- gsmlib-1.11-orig/gsmlib/gsm_unix_serial.cc 2004-10-27 16:57:35.000000000 -0600
++++ gsmlib-1.11/gsmlib/gsm_unix_serial.cc 2008-02-24 15:19:03.000000000 -0600
+@@ -28,6 +28,7 @@
+ #include <pthread.h>
+ #include <cassert>
+ #include <assert.h>
++#include <cstring>
+
+ using namespace std;
+ using namespace gsmlib;
+diff -Naurp gsmlib-1.11-orig/gsmlib/gsm_sorted_phonebook.cc gsmlib-1.11/gsmlib/gsm_sorted_phonebook.cc
+--- gsmlib-1.11-orig/gsmlib/gsm_sorted_phonebook.cc 2002-05-14 13:38:12.000000000 -0600
++++ gsmlib-1.11/gsmlib/gsm_sorted_phonebook.cc 2008-02-24 15:22:52.000000000 -0600
+@@ -20,6 +20,7 @@
+ #include <iostream>
+ #include <fstream>
+ #include <limits.h>
++#include <cstring>
+
+ const int MAX_LINE_SIZE = 1000;
+
+diff -Naurp gsmlib-1.11-orig/apps/gsmsmsd.cc gsmlib-1.11/apps/gsmsmsd.cc
+--- gsmlib-1.11-orig/apps/gsmsmsd.cc 2003-08-26 00:47:47.000000000 -0600
++++ gsmlib-1.11/apps/gsmsmsd.cc 2008-02-24 15:25:54.000000000 -0600
+@@ -40,6 +40,7 @@
+ #include <iostream>
+ #include <gsmlib/gsm_me_ta.h>
+ #include <gsmlib/gsm_event.h>
++#include <cstring>
+
+ using namespace std;
+ using namespace gsmlib;
diff --git a/app-mobilephone/gsmlib/files/gsmlib-1.11-include-gcc34-fix.patch b/app-mobilephone/gsmlib/files/gsmlib-1.11-include-gcc34-fix.patch
new file mode 100644
index 00000000..dda54512
--- /dev/null
+++ b/app-mobilephone/gsmlib/files/gsmlib-1.11-include-gcc34-fix.patch
@@ -0,0 +1,52 @@
+--- gsmlib-1.11/gsmlib/gsm_map_key.h 2002-05-14 23:38:12.000000000 +0400
++++ gsmlib-1.11-fixed/gsmlib/gsm_map_key.h 2004-08-02 00:56:40.997784696 +0400
+@@ -25,6 +25,16 @@
+
+ // wrapper for map key, can access Sortedtore to get sortOrder()
+
++ // compare two keys
++ template <class SortedStore> class MapKey;
++
++ template <class SortedStore>
++ bool operator<(const MapKey<SortedStore> &x,
++ const MapKey<SortedStore> &y);
++ template <class SortedStore>
++ bool operator==(const MapKey<SortedStore> &x,
++ const MapKey<SortedStore> &y);
++
+ template <class SortedStore> class MapKey
+ {
+ SortedStore &_myStore; // my store
+@@ -47,20 +57,16 @@
+
+ friend
+ bool operator<
+-#ifndef WIN32
+- <>
+-#endif
++ <SortedStore>
+ (const MapKey<SortedStore> &x,
+ const MapKey<SortedStore> &y);
+ friend
+ bool operator==
+-#ifndef WIN32
+- <>
+-#endif
++ <SortedStore>
+ (const MapKey<SortedStore> &x,
+ const MapKey<SortedStore> &y);
+ };
+-
++/*
+ // compare two keys
+ template <class SortedStore>
+ extern bool operator<(const MapKey<SortedStore> &x,
+@@ -68,7 +74,7 @@
+ template <class SortedStore>
+ extern bool operator==(const MapKey<SortedStore> &x,
+ const MapKey<SortedStore> &y);
+-
++ */
+ // MapKey members
+
+ template <class SortedStore>