diff options
author | Alin Năstac <mrness@gentoo.org> | 2008-06-07 09:42:54 +0000 |
---|---|---|
committer | Alin Năstac <mrness@gentoo.org> | 2008-06-07 09:42:54 +0000 |
commit | ef2ba27f67e4eadff15fc6af173ac994a7aef7e8 (patch) | |
tree | 4c1c6bf542721617137197a1b93f64c8483c8a35 /app-mobilephone/gammu/files | |
parent | Add a patch to compile with uclibc, by Natanael Copa, bug #219692 (diff) | |
download | gentoo-2-ef2ba27f67e4eadff15fc6af173ac994a7aef7e8.tar.gz gentoo-2-ef2ba27f67e4eadff15fc6af173ac994a7aef7e8.tar.bz2 gentoo-2-ef2ba27f67e4eadff15fc6af173ac994a7aef7e8.zip |
Remove obsolete versions. Version bump (#222503).
(Portage version: 2.1.4.4)
Diffstat (limited to 'app-mobilephone/gammu/files')
-rw-r--r-- | app-mobilephone/gammu/files/gammu-1.11.0-fixups.patch | 29 | ||||
-rw-r--r-- | app-mobilephone/gammu/files/gammu-1.12.0-fixups.patch | 81 | ||||
-rw-r--r-- | app-mobilephone/gammu/files/gammu-1.13.0-fixups.patch | 113 |
3 files changed, 0 insertions, 223 deletions
diff --git a/app-mobilephone/gammu/files/gammu-1.11.0-fixups.patch b/app-mobilephone/gammu/files/gammu-1.11.0-fixups.patch deleted file mode 100644 index 93575a47a50b..000000000000 --- a/app-mobilephone/gammu/files/gammu-1.11.0-fixups.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -Nru gammu-1.11.0.orig/common/phone/at/atgen.c gammu-1.11.0/common/phone/at/atgen.c ---- gammu-1.11.0.orig/common/phone/at/atgen.c 2007-05-11 11:14:47.000000000 +0300 -+++ gammu-1.11.0/common/phone/at/atgen.c 2007-05-15 19:37:00.000000000 +0300 -@@ -642,7 +642,7 @@ - if (GetLineLength(msg.Buffer, Priv->Lines, 2) <= MAX_MANUFACTURER_LENGTH) { - CopyLineString(s->Phone.Data.Manufacturer, msg.Buffer, Priv->Lines, 2); - } else { -- smprintf(s, "WARNING: Manufacturer name too long, increase MAX_MANUFACTURER_LENGTH to at least %zd\n", GetLineLength(msg.Buffer, Priv->Lines, 2)); -+ smprintf(s, "WARNING: Manufacturer name too long, increase MAX_MANUFACTURER_LENGTH to at least %d\n", GetLineLength(msg.Buffer, Priv->Lines, 2)); - s->Phone.Data.Manufacturer[0] = 0; - } - /* Sometimes phone adds this before manufacturer (Sagem) */ -diff -Nru gammu-1.11.0.orig/common/service/gsmcal.c gammu-1.11.0/common/service/gsmcal.c ---- gammu-1.11.0.orig/common/service/gsmcal.c 2007-05-03 12:55:44.000000000 +0300 -+++ gammu-1.11.0/common/service/gsmcal.c 2007-05-15 19:39:36.000000000 +0300 -@@ -677,11 +677,11 @@ - if (Version == Mozilla_iCalendar) { - if (!header) { - *Length += sprintf(Buffer + (*Length), ";BYDAY=%s", -- DaysOfWeek[note->Entries[j].Number]); -+ DaysOfWeek[note->Entries[i].Number]); - header = true; - } else { - *Length += sprintf(Buffer + (*Length), ",%s", -- DaysOfWeek[note->Entries[j].Number]); -+ DaysOfWeek[note->Entries[i].Number]); - } - } else { - *Length += sprintf(Buffer + (*Length), " %s", diff --git a/app-mobilephone/gammu/files/gammu-1.12.0-fixups.patch b/app-mobilephone/gammu/files/gammu-1.12.0-fixups.patch deleted file mode 100644 index 8d50feb92eac..000000000000 --- a/app-mobilephone/gammu/files/gammu-1.12.0-fixups.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff -Nru gammu-1.12.0.orig/CMakeLists.txt gammu-1.12.0/CMakeLists.txt ---- gammu-1.12.0.orig/CMakeLists.txt 2007-06-12 13:30:30.000000000 +0300 -+++ gammu-1.12.0/CMakeLists.txt 2007-07-01 12:12:07.000000000 +0300 -@@ -688,7 +688,7 @@ - - install ( - FILES "${Gammu_BINARY_DIR}/cfg/gammu.pc" -- DESTINATION "lib/pkgconfig" -+ DESTINATION "${INSTALL_LIB_DIR}/pkgconfig" - COMPONENT "development" - ) - -diff -Nru gammu-1.12.0.orig/common/phone/nokia/dct4s40/6510/6510file.c gammu-1.12.0/common/phone/nokia/dct4s40/6510/6510file.c ---- gammu-1.12.0.orig/common/phone/nokia/dct4s40/6510/6510file.c 2007-07-01 12:12:34.000000000 +0300 -+++ gammu-1.12.0/common/phone/nokia/dct4s40/6510/6510file.c 2007-07-01 12:01:19.000000000 +0300 -@@ -934,7 +934,7 @@ - msg.Buffer[11]*256*256+ - msg.Buffer[12]*256+ - msg.Buffer[13]; -- smprintf(s,"Size %i bytes\n",File->Used); -+ smprintf(s,"Size %zi bytes\n",File->Used); - } - File->ReadOnly = false; - if ((msg.Buffer[29] & 1) == 1) { -diff -Nru gammu-1.12.0.orig/gammu/gammu.c gammu-1.12.0/gammu/gammu.c ---- gammu-1.12.0.orig/gammu/gammu.c 2007-07-01 12:12:34.000000000 +0300 -+++ gammu-1.12.0/gammu/gammu.c 2007-07-01 12:01:19.000000000 +0300 -@@ -2697,7 +2697,7 @@ - error = GSM_GetFilePart(s,&File,&Handle,&Size); - if (error == ERR_EMPTY) break; - Print_Error(error); -- fprintf(stderr, _("%c Reading: %i percent"),13,File.Used*100/Size); -+ fprintf(stderr, _("%c Reading: %i percent"),13, (int)(File.Used*100/Size)); - } - fprintf(stderr, "%c",13); - -@@ -8289,7 +8289,7 @@ - if (!Files.ModifiedEmpty) { - printf(" %30s",OSDateTime(Files.Modified,false)); - } else printf(" %30c",0x20); -- printf(" %9i",Files.Used); -+ printf(" %9zi",Files.Used); - printf(" "); - } else printf("|-- "); - } else { -@@ -8325,7 +8325,7 @@ - if (!Files.ModifiedEmpty) { - printf("\"%s\";",OSDateTime(Files.Modified,false)); - } else printf("\"%c\";",0x20); -- printf("%i;",Files.Used); -+ printf("%zi;",Files.Used); - } else { - if (error == ERR_FOLDERPART) { - printf(_("Part of folder;")); -@@ -8440,7 +8440,7 @@ - if (!Files.ModifiedEmpty) { - printf("\"%s\";",OSDateTime(Files.Modified,false)); - } else printf("\"%c\";",0x20); -- printf("%i;",Files.Used); -+ printf("%zi;",Files.Used); - } else { - printf(_("Folder")); - printf(";\"%s\";",DecodeUnicodeConsole(Files.Name)); -@@ -8495,7 +8495,7 @@ - if (Size==0) { - printf("*"); - } else { -- fprintf(stderr, _("%c %i percent"), 13, File->Used*100/Size); -+ fprintf(stderr, _("%c %i percent"), 13, (int)(File->Used*100/Size)); - if (File->Used*100/Size >= 2) { - t_time2 = time(NULL); - diff = t_time2-t_time1; -@@ -8676,7 +8676,7 @@ - if (File->Used != 0) { - fprintf(stderr, "\r"); - fprintf(stderr, "%s", text); -- fprintf(stderr, _("%3i percent"), Pos * 100 / File->Used); -+ fprintf(stderr, _("%3i percent"), (int)(Pos * 100 / File->Used)); - if (Pos*100/File->Used >= 2) { - GSM_GetCurrentDateTime(&dt); - t_time2 = Fill_Time_T(dt); diff --git a/app-mobilephone/gammu/files/gammu-1.13.0-fixups.patch b/app-mobilephone/gammu/files/gammu-1.13.0-fixups.patch deleted file mode 100644 index 68f2818a088e..000000000000 --- a/app-mobilephone/gammu/files/gammu-1.13.0-fixups.patch +++ /dev/null @@ -1,113 +0,0 @@ -diff -Nru gammu-1.13.0.orig/common/misc/misc.h gammu-1.13.0/common/misc/misc.h ---- gammu-1.13.0.orig/common/misc/misc.h 2007-08-03 12:19:04.000000000 +0300 -+++ gammu-1.13.0/common/misc/misc.h 2007-09-06 12:55:36.000000000 +0300 -@@ -22,7 +22,7 @@ - - /* ------------------------------------------------------------------------- */ - --#define MAX_LINES 50 -+#define MAX_LINES 512 - - typedef struct { - int numbers[MAX_LINES*2]; -diff -Nru gammu-1.13.0.orig/common/service/backup/backtext.c gammu-1.13.0/common/service/backup/backtext.c ---- gammu-1.13.0.orig/common/service/backup/backtext.c 2007-08-03 16:20:04.000000000 +0300 -+++ gammu-1.13.0/common/service/backup/backtext.c 2007-09-06 12:55:36.000000000 +0300 -@@ -903,7 +903,12 @@ - - static void SaveRingtoneEntry(FILE *file, GSM_Ringtone *ringtone, bool UseUnicode) - { -- unsigned char buffer[45000]; -+ unsigned char *buffer; -+ -+ buffer = (unsigned char *)malloc(32 > 2 * ringtone->NokiaBinary.Length ? -+ 32 : 2 * ringtone->NokiaBinary.Length); -+ if (buffer == NULL) -+ return; - - sprintf(buffer,"Location = %i%c%c",ringtone->Location,13,10); - SaveBackupText(file, "", buffer, UseUnicode); -@@ -926,6 +931,8 @@ - } - sprintf(buffer,"%c%c",13,10); - SaveBackupText(file, "", buffer, UseUnicode); -+ -+ free(buffer); - } - - static void SaveOperatorEntry(FILE *file, GSM_Bitmap *bitmap, bool UseUnicode) -diff -Nru gammu-1.13.0.orig/gammu/backup.c gammu-1.13.0/gammu/backup.c ---- gammu-1.13.0.orig/gammu/backup.c 2007-08-01 17:36:52.000000000 +0300 -+++ gammu-1.13.0/gammu/backup.c 2007-09-06 12:55:36.000000000 +0300 -@@ -165,7 +165,7 @@ - GSM_FMStation FMStation; - GSM_GPRSAccessPoint GPRSPoint; - bool DoBackup; -- char buffer[100]; -+ char buffer[GSM_MAX_INFO_LENGTH]; - - if (argc == 4 && strcasecmp(argv[3],"-yes") == 0) always_answer_yes = true; - -diff -Nru gammu-1.13.0.orig/gammu/common.c gammu-1.13.0/gammu/common.c ---- gammu-1.13.0.orig/gammu/common.c 2007-08-01 17:36:52.000000000 +0300 -+++ gammu-1.13.0/gammu/common.c 2007-09-06 12:55:36.000000000 +0300 -@@ -224,9 +224,10 @@ - void GSM_Init(bool checkerror) - { - GSM_File PhoneDB; -- char model[100]; -- char version[100]; -- unsigned char buff[200], ver[200]; -+ char model[GSM_MAX_MODEL_LENGTH]; -+ char version[GSM_MAX_VERSION_LENGTH]; -+ unsigned char buff[50 + GSM_MAX_MODEL_LENGTH]; -+ unsigned char ver[GSM_MAX_VERSION_LENGTH]; - size_t pos = 0, oldpos = 0, i; - GSM_Error error; - -diff -Nru gammu-1.13.0.orig/gammu/misc.c gammu-1.13.0/gammu/misc.c ---- gammu-1.13.0.orig/gammu/misc.c 2007-08-06 12:48:08.000000000 +0300 -+++ gammu-1.13.0/gammu/misc.c 2007-09-06 12:55:36.000000000 +0300 -@@ -97,8 +97,8 @@ - - void Identify(int argc, char *argv[]) - { -- char buffer[100]; -- char date[100]; -+ char buffer[GSM_MAX_INFO_LENGTH]; -+ char date[GSM_MAX_VERSION_DATE_LENGTH]; - double num; - GSM_Error error; - -diff -Nru gammu-1.13.0.orig/gammu/search.c gammu-1.13.0/gammu/search.c ---- gammu-1.13.0.orig/gammu/search.c 2007-07-31 19:16:08.000000000 +0300 -+++ gammu-1.13.0/gammu/search.c 2007-09-06 12:55:36.000000000 +0300 -@@ -60,7 +60,7 @@ - void SearchPrintPhoneInfo(OneDeviceInfo * Info, int index, GSM_StateMachine *sm) - { - GSM_Error error; -- char buffer[100]; -+ char buffer[GSM_MAX_INFO_LENGTH]; - - error = GSM_GetManufacturer(sm, buffer); - -diff -Nru gammu-1.13.0.orig/include/gammu-limits.h gammu-1.13.0/include/gammu-limits.h ---- gammu-1.13.0.orig/include/gammu-limits.h 2007-07-23 18:31:42.000000000 +0300 -+++ gammu-1.13.0/include/gammu-limits.h 2007-09-06 12:55:36.000000000 +0300 -@@ -49,6 +49,16 @@ - #define GSM_MAX_IMEI_LENGTH 20 - - /** -+ * Maximal length of various phone information. Just a shorcut for -+ * functions doing whole identification and use one buffer. -+ * -+ * \ingroup Limits -+ */ -+#define GSM_MAX_INFO_LENGTH MAX(MAX(MAX(GSM_MAX_VERSION_LENGTH, \ -+ GSM_MAX_IMEI_LENGTH), GSM_MAX_MODEL_LENGTH), \ -+ GSM_MAX_MANUFACTURER_LENGTH) -+ -+/** - * Maximal count of SMS messages in folder. - * - * \ingroup Limits |