diff options
| author | root <root@elwms02.(none)> | 2010-04-06 16:13:08 +0200 |
|---|---|---|
| committer | root <root@elwms02.(none)> | 2010-04-06 16:13:08 +0200 |
| commit | 0e7005fcc7483c01aa102fbea358c5ac65a48d62 (patch) | |
| tree | 11517ce0d3d2977c6732b3aa583b0008083e0bd3 /plugins/solitaire/patches | |
| download | x-vdr-0e7005fcc7483c01aa102fbea358c5ac65a48d62.tar.gz x-vdr-0e7005fcc7483c01aa102fbea358c5ac65a48d62.tar.bz2 | |
hello world
Diffstat (limited to 'plugins/solitaire/patches')
| -rw-r--r-- | plugins/solitaire/patches/p1/solitaire-0.0.2-1.5.4.diff | 19 | ||||
| -rw-r--r-- | plugins/solitaire/patches/p1/solitaire-0.0.2.patch | 129 |
2 files changed, 148 insertions, 0 deletions
diff --git a/plugins/solitaire/patches/p1/solitaire-0.0.2-1.5.4.diff b/plugins/solitaire/patches/p1/solitaire-0.0.2-1.5.4.diff new file mode 100644 index 0000000..f86ff6a --- /dev/null +++ b/plugins/solitaire/patches/p1/solitaire-0.0.2-1.5.4.diff @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 91_solitaire-0.0.2-1.5.4.dpatch by Thomas Günther <tom@toms-cafe.de> +## http://toms-cafe.de/vdr/download/solitaire-0.0.2-1.5.4.diff +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Changes for VDR >= 1.5.4. + +@DPATCH@ +--- solitaire-0.0.2/tools/list.h ++++ solitaire-0.0.2/tools/list.h +@@ -523,7 +523,7 @@ + return neu;
+ }
+
+-typedef class cTBList<cTBString> cStringList;
++//typedef class cTBList<cTBString> cStringList;
+ typedef class cTBList<void*> cPtrList;
+
+ // Special Overrides for String lists
diff --git a/plugins/solitaire/patches/p1/solitaire-0.0.2.patch b/plugins/solitaire/patches/p1/solitaire-0.0.2.patch new file mode 100644 index 0000000..83db65b --- /dev/null +++ b/plugins/solitaire/patches/p1/solitaire-0.0.2.patch @@ -0,0 +1,129 @@ +diff -ruN solitaire-0.0.2.org/tools/list.h solitaire-0.0.2/tools/list.h +--- solitaire-0.0.2.org/tools/list.h 2004-08-24 00:49:04.000000000 +0200 ++++ solitaire-0.0.2/tools/list.h 2006-02-03 11:35:36.000000000 +0100 +@@ -90,22 +90,22 @@ + T &SetNextCurrent ();
+ T &SetPrevCurrent ();
+
+- friend cTBList<T> &operator+= <> (cTBList<T> &list1, const cTBList<T> &list2);
+- friend cTBList<T> &operator+= <> (cTBList<T> &list, const T &element);
++// friend cTBList<T> &operator+= <> (cTBList<T> &list1, const cTBList<T> &list2);
++// friend cTBList<T> &operator+= <> (cTBList<T> &list, const T &element);
+
+- friend cTBList<T> operator+ <> (const cTBList<T> &list1, const cTBList<T> &list2);
+- friend cTBList<T> operator+ <> (const T &element, const cTBList<T> &list);
+- friend cTBList<T> operator+ <> (const cTBList<T> &list, const T &element);
++// friend cTBList<T> operator+ <> (const cTBList<T> &list1, const cTBList<T> &list2);
++// friend cTBList<T> operator+ <> (const T &element, const cTBList<T> &list);
++// friend cTBList<T> operator+ <> (const cTBList<T> &list, const T &element);
+
+ /*friend cSource &operator<< <> (cSource &dest, const cTBList<T> &list);
+- friend cSource &operator>> <> (cSource &dest, cTBList<T> &list);*/
++// friend cSource &operator>> <> (cSource &dest, cTBList<T> &list);*/
+ };
+
+ // Template Implementation (inline funcs)
+
+ template<class T>
+ inline int cTBList<T>::Find (const T & i) {
+- cTBList<T>::cItem *item = m_First;
++ typename cTBList<T>::cItem *item = m_First;
+ int index = 0;
+
+ while (item && (item->Data != i)) {
+@@ -203,7 +203,7 @@ +
+ template<class T>
+ typename cTBList<T>::cItem *cTBList<T>::NewItem (cTBList<T>::cItem *pBefore, cTBList<T>::cItem *pAfter) const {
+- cTBList<T>::cItem *item = new cTBList<T>::cItem;
++ typename cTBList<T>::cItem *item = new typename cTBList<T>::cItem;
+
+ item->Next = pAfter;
+ item->Prev = pBefore;
+@@ -235,7 +235,7 @@ + if ((int)idx == m_CurPos)
+ return m_Current;
+
+- cTBList<T>::cItem *item;
++ typename cTBList<T>::cItem *item;
+ int dist = idx - m_CurPos;
+ bool direct;
+
+@@ -271,7 +271,7 @@ +
+ template<class T>
+ T &cTBList<T>::Prepend () {
+- cTBList<T>::cItem *item = NewItem(NULL, m_First);
++ typename cTBList<T>::cItem *item = NewItem(NULL, m_First);
+
+ m_First = m_Current = item;
+ if (!m_Last)
+@@ -285,7 +285,7 @@ +
+ template<class T>
+ T &cTBList<T>::Append () {
+- cTBList<T>::cItem *item = NewItem(m_Last, NULL);
++ typename cTBList<T>::cItem *item = NewItem(m_Last, NULL);
+
+ m_Last = m_Current = item;
+ if (!m_First)
+@@ -317,13 +317,13 @@ + return true;
+ }
+
+- cTBList<T>::cItem *nextItem = Locate(idx);
++ typename cTBList<T>::cItem *nextItem = Locate(idx);
+ if (!nextItem)
+ return false;
+
+- cTBList<T>::cItem *prevItem = nextItem->Prev;
++ typename cTBList<T>::cItem *prevItem = nextItem->Prev;
+
+- cTBList<T>::cItem *item = NewItem(prevItem, nextItem);
++ typename cTBList<T>::cItem *item = NewItem(prevItem, nextItem);
+ item->Data = i;
+
+ m_CurPos = idx;
+@@ -338,7 +338,7 @@ + if (!m_Current)
+ return NULL;
+
+- cTBList<T>::cItem *item = m_Current;
++ typename cTBList<T>::cItem *item = m_Current;
+ if (item == m_First) {
+ if (m_First = item->Next)
+ m_First->Prev = NULL;
+@@ -370,7 +370,7 @@ + if (Find(i) == -1)
+ return false;
+
+- cTBList<T>::cItem *item = Unlink();
++ typename cTBList<T>::cItem *item = Unlink();
+ if (!item)
+ return false;
+
+@@ -383,7 +383,7 @@ + if (!Locate(idx))
+ return false;
+
+- cTBList<T>::cItem *item = Unlink();
++ typename cTBList<T>::cItem *item = Unlink();
+ if (!item)
+ return false;
+
+@@ -412,13 +412,13 @@ +
+ template<class T>
+ void cTBList<T>::Clear () {
+- cTBList<T>::cItem *item = m_First;
++ typename cTBList<T>::cItem *item = m_First;
+
+ m_First = m_Last = m_Current = NULL;
+ m_Count = 0;
+ m_CurPos = -1;
+
+- cTBList<T>::cItem *Prev;
++ typename cTBList<T>::cItem *Prev;
+ while (item) {
+ Prev = item;
+ item = item->Next;
|