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 /media-plugins/vdr-freecell/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 'media-plugins/vdr-freecell/files')
-rw-r--r--media-plugins/vdr-freecell/files/gcc-3.4.patch139
-rw-r--r--media-plugins/vdr-freecell/files/vdr-freecell-0.0.2-gentoo.diff24
-rw-r--r--media-plugins/vdr-freecell/files/vdr-freecell-0.0.2_vdr-1.5.4-compile.diff20
-rw-r--r--media-plugins/vdr-freecell/files/vdr-freecell-time_ms.diff12
4 files changed, 195 insertions, 0 deletions
diff --git a/media-plugins/vdr-freecell/files/gcc-3.4.patch b/media-plugins/vdr-freecell/files/gcc-3.4.patch
new file mode 100644
index 000000000000..a6eb78fe8c9e
--- /dev/null
+++ b/media-plugins/vdr-freecell/files/gcc-3.4.patch
@@ -0,0 +1,139 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+## 02_gcc3.4-fix.dpatch by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix from Andreas Jochens <aj@andaco.de>, to compile the plugin
+## DP: with gcc-3.4
+
+@DPATCH@
+diff -urNad /home/chelli/vdr/cvs/vdr/vdr-plugin-freecell/tools/list.h vdr-plugin-freecell/tools/list.h
+--- a/vdr-plugin-freecell/tools/list.h 2004-02-11 13:33:26.000000000 +0100
++++ b/vdr-plugin-freecell/tools/list.h 2004-09-11 16:00:20.000000000 +0200
+@@ -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;
+
diff --git a/media-plugins/vdr-freecell/files/vdr-freecell-0.0.2-gentoo.diff b/media-plugins/vdr-freecell/files/vdr-freecell-0.0.2-gentoo.diff
new file mode 100644
index 000000000000..96badefcd3ab
--- /dev/null
+++ b/media-plugins/vdr-freecell/files/vdr-freecell-0.0.2-gentoo.diff
@@ -0,0 +1,24 @@
+diff -Naur freecell-0.0.2.orig/cards.c freecell-0.0.2/cards.c
+--- freecell-0.0.2.orig/cards.c 2007-01-08 22:50:05.921165375 +0100
++++ freecell-0.0.2/cards.c 2007-01-08 22:53:55.358240251 +0100
+@@ -34,7 +34,7 @@
+ mShape = Shape;
+ mValue = Value;
+
+- asprintf(&filename, "%s/%s_%s.xpm", cPlugin::ConfigDirectory("freecell"),
++ asprintf(&filename, "%s/%s_%s.xpm", cPlugin::ConfigDirectory("../../../usr/share/vdr/freecell"),
+ ShapeNames[mShape], ValueNames[mValue]);
+ ::LoadXpm(this, filename);
+ free(filename);
+diff -Naur freecell-0.0.2.orig/cursor.c freecell-0.0.2/cursor.c
+--- freecell-0.0.2.orig/cursor.c 2007-01-08 22:50:05.921165375 +0100
++++ freecell-0.0.2/cursor.c 2007-01-08 22:52:58.234984984 +0100
+@@ -8,7 +8,7 @@
+
+ mX = mY = -1;
+
+- asprintf(&filename, "%s/cursor.xpm", cPlugin::ConfigDirectory("freecell"));
++ asprintf(&filename, "%s/cursor.xpm", cPlugin::ConfigDirectory("../../../usr/share/vdr/freecell"));
+ ::LoadXpm(this, filename, clrTransparent);
+ free(filename);
+ }
diff --git a/media-plugins/vdr-freecell/files/vdr-freecell-0.0.2_vdr-1.5.4-compile.diff b/media-plugins/vdr-freecell/files/vdr-freecell-0.0.2_vdr-1.5.4-compile.diff
new file mode 100644
index 000000000000..bb9153c5cda0
--- /dev/null
+++ b/media-plugins/vdr-freecell/files/vdr-freecell-0.0.2_vdr-1.5.4-compile.diff
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 93_freecell-0.0.2-1.5.4.dpatch by Thomas Günther <tom@toms-cafe.de>
+## http://toms-cafe.de/vdr/download/freecell-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@
+--- freecell-0.0.2/tools/list.h
++++ freecell-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/media-plugins/vdr-freecell/files/vdr-freecell-time_ms.diff b/media-plugins/vdr-freecell/files/vdr-freecell-time_ms.diff
new file mode 100644
index 000000000000..276422e225b4
--- /dev/null
+++ b/media-plugins/vdr-freecell/files/vdr-freecell-time_ms.diff
@@ -0,0 +1,12 @@
+diff -ru freecell-0.0.2-orig/cards.c freecell-0.0.2/cards.c
+--- freecell-0.0.2-orig/cards.c 2005-11-20 21:19:31.000000000 +0100
++++ freecell-0.0.2/cards.c 2005-11-20 21:19:15.000000000 +0100
+@@ -52,7 +52,7 @@
+ mX = X;
+ mY = Y;
+ mStacked = Stacked;
+- mSeed = time_ms();
++ mSeed = cTimeMs::Now();
+ }
+
+ cCardStack::~cCardStack() {