summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-text/sdcv/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-text/sdcv/files')
-rw-r--r--app-text/sdcv/files/sdcv-0.4.2-crash.patch27
-rw-r--r--app-text/sdcv/files/sdcv-0.4.2-dash.patch21
-rw-r--r--app-text/sdcv/files/sdcv-0.4.2-g-handling.patch21
-rw-r--r--app-text/sdcv/files/sdcv-0.4.2-missing-headers.patch47
-rw-r--r--app-text/sdcv/files/sdcv-0.4.2-respect-HOME.patch17
5 files changed, 133 insertions, 0 deletions
diff --git a/app-text/sdcv/files/sdcv-0.4.2-crash.patch b/app-text/sdcv/files/sdcv-0.4.2-crash.patch
new file mode 100644
index 000000000000..264cffcf1fca
--- /dev/null
+++ b/app-text/sdcv/files/sdcv-0.4.2-crash.patch
@@ -0,0 +1,27 @@
+Fix unalligned access to buffer.
+
+On several architectures (arm, armel, sparc and ia64), unalligned access to
+integers is not allowed. Buffer in this function is not alligned at all and
+attempt to read integer from it causes crash of application on such
+architectures.
+
+Reported upstream at:
+https://sourceforge.net/tracker/index.php?func=detail&aid=2149388&group_id=122858&atid=694730
+--- a/src/lib/lib.cpp
++++ b/src/lib/lib.cpp
+@@ -496,9 +496,13 @@
+ entries[i].keystr=p;
+ len=strlen(p);
+ p+=len+1;
+- entries[i].off=g_ntohl(*reinterpret_cast<guint32 *>(p));
++ /*
++ * Can not use typecasting here, because *data does not have
++ * to be alligned and unalligned access fails on some architectures.
++ */
++ entries[i].off=((unsigned char)p[0] << 24) | ((unsigned char)p[1] << 16) | ((unsigned char)p[2] << 8) | (unsigned char)p[3];
+ p+=sizeof(guint32);
+- entries[i].size=g_ntohl(*reinterpret_cast<guint32 *>(p));
++ entries[i].size=((unsigned char)p[0] << 24) | ((unsigned char)p[1] << 16) | ((unsigned char)p[2] << 8) | (unsigned char)p[3];
+ p+=sizeof(guint32);
+ }
+ }
diff --git a/app-text/sdcv/files/sdcv-0.4.2-dash.patch b/app-text/sdcv/files/sdcv-0.4.2-dash.patch
new file mode 100644
index 000000000000..35d15ae014c7
--- /dev/null
+++ b/app-text/sdcv/files/sdcv-0.4.2-dash.patch
@@ -0,0 +1,21 @@
+diff --git a/tests/t_datadir b/tests/t_datadir
+index 116ae7e..327e5b5 100755
+--- a/tests/t_datadir
++++ b/tests/t_datadir
+@@ -1 +1 @@
+-#!/bin/sh
++#!/bin/bash
+diff --git a/tests/t_list b/tests/t_list
+index 42ae137..62e52fd 100755
+--- a/tests/t_list
++++ b/tests/t_list
+@@ -1 +1 @@
+-#!/bin/sh
++#!/bin/bash
+diff --git a/tests/t_utf8input b/tests/t_utf8input
+index 7ae88c4..e692ab0 100755
+--- a/tests/t_utf8input
++++ b/tests/t_utf8input
+@@ -1 +1 @@
+-#!/bin/sh
++#!/bin/bash
diff --git a/app-text/sdcv/files/sdcv-0.4.2-g-handling.patch b/app-text/sdcv/files/sdcv-0.4.2-g-handling.patch
new file mode 100644
index 000000000000..72fb690358ed
--- /dev/null
+++ b/app-text/sdcv/files/sdcv-0.4.2-g-handling.patch
@@ -0,0 +1,21 @@
+https://sourceforge.net/tracker/index.php?func=detail&aid=2125962&group_id=122858&atid=694730
+
+Fixes displaying of 'g' (gtk markup) entries.
+--- a/src/libwrapper.cpp
++++ b/src/libwrapper.cpp
+@@ -118,7 +118,6 @@
+ switch (*p++) {
+ case 'm':
+ case 'l': //need more work...
+- case 'g':
+ sec_size = strlen(p);
+ if (sec_size) {
+ res+="\n";
+@@ -128,6 +127,7 @@
+ }
+ sec_size++;
+ break;
++ case 'g':
+ case 'x':
+ sec_size = strlen(p);
+ if (sec_size) {
diff --git a/app-text/sdcv/files/sdcv-0.4.2-missing-headers.patch b/app-text/sdcv/files/sdcv-0.4.2-missing-headers.patch
new file mode 100644
index 000000000000..8c96c65fa93b
--- /dev/null
+++ b/app-text/sdcv/files/sdcv-0.4.2-missing-headers.patch
@@ -0,0 +1,47 @@
+diff -ur sdcv-0.4.2-orig/src/lib/lib.cpp sdcv-0.4.2/src/lib/lib.cpp
+--- sdcv-0.4.2-orig/src/lib/lib.cpp 2009-07-25 17:44:48.000000000 -0400
++++ sdcv-0.4.2/src/lib/lib.cpp 2009-07-25 17:39:11.000000000 -0400
+@@ -517,7 +517,7 @@
+ {
+ fseek(idxfile, wordoffset[page_idx], SEEK_SET);
+ guint32 page_size=wordoffset[page_idx+1]-wordoffset[page_idx];
+- fread(wordentry_buf, std::min(sizeof(wordentry_buf), page_size), 1, idxfile); //TODO: check returned values, deal with word entry that strlen>255.
++ fread(wordentry_buf, std::min(sizeof(wordentry_buf), (size_t)page_size), 1, idxfile); //TODO: check returned values, deal with word entry that strlen>255.
+ return wordentry_buf;
+ }
+
+diff -ur sdcv-0.4.2-orig/src/libwrapper.cpp sdcv-0.4.2/src/libwrapper.cpp
+--- sdcv-0.4.2-orig/src/libwrapper.cpp 2009-07-25 17:44:48.000000000 -0400
++++ sdcv-0.4.2/src/libwrapper.cpp 2009-07-25 17:39:11.000000000 -0400
+@@ -24,6 +24,7 @@
+
+ #include <glib/gi18n.h>
+ #include <map>
++#include <cstring>
+
+ #include "utils.hpp"
+
+diff -ur sdcv-0.4.2-orig/src/readline.cpp sdcv-0.4.2/src/readline.cpp
+--- sdcv-0.4.2-orig/src/readline.cpp 2009-07-25 17:44:48.000000000 -0400
++++ sdcv-0.4.2/src/readline.cpp 2009-07-25 17:39:11.000000000 -0400
+@@ -23,6 +23,7 @@
+ #endif
+
+ #include <cstdio>
++#include <cstdlib>
+ #ifdef WITH_READLINE
+ # include <readline/readline.h>
+ # include <readline/history.h>
+diff -ur sdcv-0.4.2-orig/src/utils.cpp sdcv-0.4.2/src/utils.cpp
+--- sdcv-0.4.2-orig/src/utils.cpp 2009-07-25 17:44:48.000000000 -0400
++++ sdcv-0.4.2/src/utils.cpp 2009-07-25 17:44:17.000000000 -0400
+@@ -22,6 +22,8 @@
+ # include "config.h"
+ #endif
+
++#include <cstdio>
++#include <cstdlib>
+ #include <glib.h>
+ #include <glib/gi18n.h>
+
+Only in sdcv-0.4.2/src: utils.o
diff --git a/app-text/sdcv/files/sdcv-0.4.2-respect-HOME.patch b/app-text/sdcv/files/sdcv-0.4.2-respect-HOME.patch
new file mode 100644
index 000000000000..5b616500c6ce
--- /dev/null
+++ b/app-text/sdcv/files/sdcv-0.4.2-respect-HOME.patch
@@ -0,0 +1,17 @@
+=== modified file 'src/sdcv.cpp'
+--- src/sdcv.cpp 2008-11-18 12:43:28 +0000
++++ src/sdcv.cpp 2008-11-18 12:43:41 +0000
+@@ -161,7 +161,11 @@
+
+ strlist_t dicts_dir_list;
+
+- dicts_dir_list.push_back(std::string(g_get_home_dir())+G_DIR_SEPARATOR+
++ const char *homedir = g_getenv ("HOME");
++ if (!homedir)
++ homedir = g_get_home_dir ();
++
++ dicts_dir_list.push_back(std::string(homedir)+G_DIR_SEPARATOR+
+ ".stardict"+G_DIR_SEPARATOR+"dic");
+ dicts_dir_list.push_back(data_dir);
+
+