Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 26286 Details for
Bug 41713
Xfreecell game ebuild
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
files/xfreecell-1.0.5b-gentoo.diff
xfreecell-1.0.5b-gentoo.diff (text/plain), 10.59 KB, created by
bartron
on 2004-02-24 16:00:08 UTC
(
hide
)
Description:
files/xfreecell-1.0.5b-gentoo.diff
Filename:
MIME Type:
Creator:
bartron
Created:
2004-02-24 16:00:08 UTC
Size:
10.59 KB
patch
obsolete
>diff -urN xfreecell.orig/card.cpp xfreecell/card.cpp >--- xfreecell.orig/card.cpp 1999-03-27 13:36:28.000000000 +0000 >+++ xfreecell/card.cpp 2004-02-17 05:44:12.000000000 +0000 >@@ -119,7 +119,7 @@ > int oldy = y(); > int newx = dest_x; > int newy = dest_y; >- int steps = max(abs(oldx - newx), abs(oldy - newy)) / Option::speedup(); >+ int steps = std::max(abs(oldx - newx), abs(oldy - newy)) / Option::speedup(); > float curx = (float) oldx; > float cury = (float) oldy; > >diff -urN xfreecell.orig/freecell.cpp xfreecell/freecell.cpp >--- xfreecell.orig/freecell.cpp 1999-07-27 14:15:27.000000000 +0000 >+++ xfreecell/freecell.cpp 2004-02-17 06:15:20.000000000 +0000 >@@ -64,7 +64,7 @@ > static GameNumberManager* gnManager; > static const int PathLength = 256; > static char msNumbersPath[PathLength] = "\0";; >-static const char defaultMSNumbersPath[] = "/usr/local/lib/xfreecell/MSNumbers"; >+static const char defaultMSNumbersPath[] = "/usr/share/xfreecell/MSNumbers"; > > // ##### Functions declarations ##### > static void adjustSubwindow(NSWindow*); >@@ -603,7 +603,7 @@ > void readMSNumbersPath() > { > char* home = getenv("HOME"); >- string saveFile; >+ std::string saveFile; > > if (home == NULL) { > fprintf(stderr, "Cannot get $HOME. Assuming I am at home directory now.\n"); >diff -urN xfreecell.orig/gnmanager.cpp xfreecell/gnmanager.cpp >--- xfreecell.orig/gnmanager.cpp 1999-07-27 14:18:05.000000000 +0000 >+++ xfreecell/gnmanager.cpp 2004-02-17 05:49:35.000000000 +0000 >@@ -16,7 +16,7 @@ > GameNumberManager::GameNumberManager() > { > char* home = getenv("HOME"); >- string directory; >+ std::string directory; > > if (home == NULL) { > fprintf(stderr, "Cannot get $HOME. Assuming I am at home directory now.\n"); >@@ -143,7 +143,7 @@ > readFile(msLostGameFile, &msLostGames); > } > >-void GameNumberManager::readFile(const string& file, hash_set<int>* hs) >+void GameNumberManager::readFile(const std::string& file, hash_set<int>* hs) > { > FILE* fp = fopen(file.c_str(), "r"); > char line[lineLength]; >@@ -169,7 +169,7 @@ > writeFile(msLostGameFile, &msLostGames); > } > >-void GameNumberManager::writeFile(const string& file, hash_set<int>* hs) >+void GameNumberManager::writeFile(const std::string& file, hash_set<int>* hs) > { > FILE* fp = fopen(file.c_str(), "w+"); > >diff -urN xfreecell.orig/gnmanager.h xfreecell/gnmanager.h >--- xfreecell.orig/gnmanager.h 1999-03-29 13:07:19.000000000 +0000 >+++ xfreecell/gnmanager.h 2004-02-17 05:39:58.000000000 +0000 >@@ -2,7 +2,13 @@ > #define GNManager_H > > #include <string> >+ >+#if __GNUG__ < 3 > #include <hash_set> >+#else >+#include <ext/hash_set> >+using __gnu_cxx::hash_set; >+#endif > > class GameNumberManager { > public: >@@ -20,15 +26,15 @@ > bool alreadyLost(int); > > void readFiles(); >- void readFile(const string&, hash_set<int>*); >- void writeFile(const string&, hash_set<int>*); >+ void readFile(const std::string&, hash_set<int>*); >+ void writeFile(const std::string&, hash_set<int>*); > >- string lostGameFile, wonGameFile; >+ std::string lostGameFile, wonGameFile; > > hash_set<int> wonGames; > hash_set<int> lostGames; > >- string msLostGameFile, msWonGameFile; >+ std::string msLostGameFile, msWonGameFile; > > hash_set<int> msWonGames; > hash_set<int> msLostGames; >diff -urN xfreecell.orig/makefile xfreecell/makefile >--- xfreecell.orig/makefile 1999-04-03 13:42:49.000000000 +0000 >+++ xfreecell/makefile 2004-02-17 05:33:50.000000000 +0000 >@@ -1,13 +1,14 @@ > OBJECTS=card.o freecell.o option.o stack.o subwindows.o undo.o util.o gnmanager.o random.o >-CC=g++ >-CFLAGS=-g -Wall -DSHAPE -DBOGUSRANDOM >+CC=$(cxx) >+CFLAGS=$(cxxflags) -Wall -DSHAPE -DBOGUSRANDOM >+LDFLAGS=$(ldflags) > LIBS=-lm -L. -lns -L/usr/X11R6/lib -lXext -lX11 > STATICDIR=xfreecell-static > DOCS=README CHANGES mshuffle.txt xfreecell.6 > LIBDIR=/usr/local/lib/xfreecell > > all: $(OBJECTS) lib >- $(CC) -o xfreecell $(CFLAGS) $(OBJECTS) $(LIBS) >+ $(CC) -o xfreecell $(LDFLAGS) $(OBJECTS) $(LIBS) > > static: $(OBJECTS) lib > $(CC) -o xfreecell -static $(CFLAGS) $(OBJECTS) $(LIBS) >@@ -25,13 +26,13 @@ > > clean: > rm -f *~ *.o a.out xfreecell libns.a >- make -C widget clean >+ $(MAKE) -C widget clean > > lib: >- make -C widget lib >+ $(MAKE) -C widget lib > > install: all >- install xfreecell $(DESTDIR)/usr/local/bin >- install xfreecell.6 $(DESTDIR)/usr/local/man/man6 >+ install xfreecell $(DESTDIR)/usr/bin >+ install xfreecell.6 $(DESTDIR)/usr/share/man/man6 > # install -d $(LIBDIR) >-# install ms-compatible/MSNumbers $(DESTDIR)/usr/local/lib/xfreecell >\ No newline at end of file >+# install ms-compatible/MSNumbers $(DESTDIR)/usr/share/xfreecell >\ No newline at end of file >diff -urN xfreecell.orig/option.h xfreecell/option.h >--- xfreecell.orig/option.h 1999-03-27 19:39:17.000000000 +0000 >+++ xfreecell/option.h 2004-02-17 05:43:46.000000000 +0000 >@@ -22,7 +22,7 @@ > void readPrefs(); > void writePrefs(); > >- string saveFile; >+ std::string saveFile; > > static int _speedup; > static bool _queryWindow; >diff -urN xfreecell.orig/stack.h xfreecell/stack.h >--- xfreecell.orig/stack.h 1999-03-02 18:20:02.000000000 +0000 >+++ xfreecell/stack.h 2004-02-17 05:43:08.000000000 +0000 >@@ -28,7 +28,7 @@ > int _next_x, _next_y; > > private: >- vector<Card*> _cards; >+ std::vector<Card*> _cards; > }; > > class PlayStack : public Stack { >diff -urN xfreecell.orig/subwindows.h xfreecell/subwindows.h >--- xfreecell.orig/subwindows.h 1999-03-15 23:09:49.000000000 +0000 >+++ xfreecell/subwindows.h 2004-02-17 05:46:43.000000000 +0000 >@@ -76,7 +76,7 @@ > int _undos; > int _totalScore; > >- string saveFile; >+ std::string saveFile; > > bool exitPressed; > >diff -urN xfreecell.orig/undo.cpp xfreecell/undo.cpp >--- xfreecell.orig/undo.cpp 1999-03-25 15:48:40.000000000 +0000 >+++ xfreecell/undo.cpp 2004-02-17 05:48:24.000000000 +0000 >@@ -22,7 +22,7 @@ > c->moveToStack(from, false, false); > } > >-stack<Move> moves; >+std::stack<Move> moves; > > void undoClearMoves() > { >diff -urN xfreecell.orig/widget/container.cpp xfreecell/widget/container.cpp >--- xfreecell.orig/widget/container.cpp 1999-03-03 17:34:52.000000000 +0000 >+++ xfreecell/widget/container.cpp 2004-02-17 05:56:55.000000000 +0000 >@@ -61,18 +61,18 @@ > > void NSContainer::remove(NSComponent* nsc) > { >- vector<NSComponent*>::iterator iter; >+ std::vector<NSComponent*>::iterator iter; > for (iter = nscVec.begin(); iter != nscVec.end(); iter++) > if (*iter == nsc) nscVec.erase(iter); > } > > void NSContainer::hremove(NSComponent* nsc) > { >- vector<NSComponent*>::iterator iter; >+ std::vector<NSComponent*>::iterator iter; > for (iter = nscVec.begin(); iter != nscVec.end(); iter++) { > if (*iter == nsc) { > int w = (*iter)->width() + _neighborGap; >- vector<NSComponent*>::iterator iter2 = iter + 1; >+ std::vector<NSComponent*>::iterator iter2 = iter + 1; > if (nscVec.size() == 0) { > _width = 0; _height = 0; > } else { >@@ -87,11 +87,11 @@ > > void NSContainer::vremove(NSComponent* nsc) > { >- vector<NSComponent*>::iterator iter; >+ std::vector<NSComponent*>::iterator iter; > for (iter = nscVec.begin(); iter != nscVec.end(); iter++) { > if (*iter == nsc) { > int h = (*iter)->height() + _neighborGap; >- vector<NSComponent*>::iterator iter2 = iter + 1; >+ std::vector<NSComponent*>::iterator iter2 = iter + 1; > if (nscVec.size() == 0) { > _width = 0; _height = 0; > } else { >diff -urN xfreecell.orig/widget/makefile xfreecell/widget/makefile >--- xfreecell.orig/widget/makefile 1999-03-18 05:54:57.000000000 +0000 >+++ xfreecell/widget/makefile 2004-02-17 05:01:33.000000000 +0000 >@@ -1,7 +1,7 @@ > OBJECTS=window.o plate.o string.o button.o label.o textfield.o container.o frame.o util.o scrollbar.o font.o main.o > #C=/usr/local/gcc-2.8.1/bin/g++ >-CC=g++ >-CFLAGS=-g -Wall >+CC=$(cxx) >+CFLAGS=$(cxxflags) -Wall > LIBS=-L/usr/X11R6/lib -lX11 > LIBNAME=libns.a > >diff -urN xfreecell.orig/widget/textfield.cpp xfreecell/widget/textfield.cpp >--- xfreecell.orig/widget/textfield.cpp 1999-03-03 17:34:52.000000000 +0000 >+++ xfreecell/widget/textfield.cpp 2004-02-17 05:55:25.000000000 +0000 >@@ -1,3 +1,4 @@ >+#include <cctype> > #include "widget.h" > > GC NSTextField::gc; >diff -urN xfreecell.orig/widget/widget.h xfreecell/widget/widget.h >--- xfreecell.orig/widget/widget.h 1999-03-15 16:29:32.000000000 +0000 >+++ xfreecell/widget/widget.h 2004-02-17 05:42:29.000000000 +0000 >@@ -114,7 +114,7 @@ > Elt(NSWindow* nw, Window w) { nswindow = nw; window = w; } > }; > >- static vector<Elt> eltVector; >+ static std::vector<Elt> eltVector; > static void eraseWindow(Window); > static void registerWindow(NSWindow*, Window); > }; >@@ -171,7 +171,7 @@ > void fontWindowHeight(unsigned int); > void resizable(bool arg) { _resizable = arg; } > >- string _label; >+ std::string _label; > private: > static const int fontGap = 4; > static XFontStruct* fontStruct; >@@ -272,7 +272,7 @@ > static unsigned int charWidth, charHeight; > > unsigned int maxCharNum; >- string _str; >+ std::string _str; > unsigned int cursorPos; > unsigned int strStart; > bool cursorOnTF; >@@ -327,7 +327,7 @@ > unsigned int _vGap, _hGap, _neighborGap; > Window _parentWindow; > >- vector<NSComponent*> nscVec; >+ std::vector<NSComponent*> nscVec; > }; > > // ##### NSHContainer ##### >diff -urN xfreecell.orig/widget/window.cpp xfreecell/widget/window.cpp >--- xfreecell.orig/widget/window.cpp 1999-03-03 17:34:52.000000000 +0000 >+++ xfreecell/widget/window.cpp 2004-02-17 05:52:54.000000000 +0000 >@@ -2,7 +2,7 @@ > > bool NSWindow::windowInitialized = false; > Window NSWindow::_root; >-vector<NSWindow::Elt> NSWindow::eltVector; >+std::vector<NSWindow::Elt> NSWindow::eltVector; > > NSWindow::NSWindow(bool create, Window w, int x, int y, unsigned int width, unsigned int height, > unsigned int borderWidth, unsigned long border, unsigned long bg) >@@ -86,8 +86,8 @@ > > void NSWindow::registerWindow(NSWindow* nsw, Window w) > { >- vector<Elt>::iterator begin = eltVector.begin(); >- vector<Elt>::iterator end = eltVector.end(); >+ std::vector<Elt>::iterator begin = eltVector.begin(); >+ std::vector<Elt>::iterator end = eltVector.end(); > Elt elt(nsw, w); > > if (eltVector.size() == 0 || w > eltVector.back().window) { >@@ -95,7 +95,7 @@ > return; > } > >- for (vector<Elt>::iterator iter = begin; iter != end; iter++) >+ for (std::vector<Elt>::iterator iter = begin; iter != end; iter++) > if ((*iter).window > w) > eltVector.insert(iter, elt); > >@@ -104,9 +104,9 @@ > > void NSWindow::eraseWindow(Window w) > { >- vector<Elt>::iterator begin = eltVector.begin(); >- vector<Elt>::iterator end = eltVector.end(); >- vector<Elt>::iterator iter; >+ std::vector<Elt>::iterator begin = eltVector.begin(); >+ std::vector<Elt>::iterator end = eltVector.end(); >+ std::vector<Elt>::iterator iter; > > for (iter = begin; iter != end; iter++) { > if ((*iter).window == w) eltVector.erase(iter);
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=26286">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 41713
:
25966
|
26285
| 26286
