diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /games-board/pysolfc/files | |
download | gentoo-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 'games-board/pysolfc/files')
-rw-r--r-- | games-board/pysolfc/files/pysolfc-2.0-gentoo.patch | 10 | ||||
-rw-r--r-- | games-board/pysolfc/files/pysolfc-PIL-imports.patch | 49 |
2 files changed, 59 insertions, 0 deletions
diff --git a/games-board/pysolfc/files/pysolfc-2.0-gentoo.patch b/games-board/pysolfc/files/pysolfc-2.0-gentoo.patch new file mode 100644 index 000000000000..3af96d9c0c2f --- /dev/null +++ b/games-board/pysolfc/files/pysolfc-2.0-gentoo.patch @@ -0,0 +1,10 @@ +--- pysollib/settings.py.old 2014-04-07 20:05:02.335276008 +0200 ++++ pysollib/settings.py 2014-04-07 20:05:33.099062670 +0200 +@@ -63,6 +63,7 @@ + '/usr/local/share/PySolFC', + '/usr/games/PySolFC', + '/usr/local/games/PySolFC', ++ '@GAMES_DATADIR@', + ] + if os.name == 'nt': + pass diff --git a/games-board/pysolfc/files/pysolfc-PIL-imports.patch b/games-board/pysolfc/files/pysolfc-PIL-imports.patch new file mode 100644 index 000000000000..ed174d8aefe7 --- /dev/null +++ b/games-board/pysolfc/files/pysolfc-PIL-imports.patch @@ -0,0 +1,49 @@ +https://sourceforge.net/p/pysolfc/patches/10/ +https://bugs.gentoo.org/show_bug.cgi?id=471514 + +Index: pysollib/mfxutil.py +=================================================================== +diff --git a/PySolFC/trunk/pysollib/mfxutil.py b/PySolFC/trunk/pysollib/mfxutil.py +--- a/PySolFC/trunk/pysollib/mfxutil.py (revision 279) ++++ b/PySolFC/trunk/pysollib/mfxutil.py (working copy) +@@ -41,18 +41,18 @@ + Image = ImageTk = ImageOps = None + if TOOLKIT == 'tk': + try: # PIL +- import Image +- import ImageTk +- import ImageOps ++ from PIL import Image ++ from PIL import ImageTk ++ from PIL import ImageOps + except ImportError: + Image = None + else: + # for py2exe +- import GifImagePlugin +- import PngImagePlugin +- import JpegImagePlugin +- import BmpImagePlugin +- import PpmImagePlugin ++ from PIL import GifImagePlugin ++ from PIL import PngImagePlugin ++ from PIL import JpegImagePlugin ++ from PIL import BmpImagePlugin ++ from PIL import PpmImagePlugin + Image._initialized = 2 + USE_PIL = False + if TOOLKIT == 'tk' and Image and Image.VERSION >= '1.1.7': +Index: scripts/cardset_viewer.py +=================================================================== +diff --git a/PySolFC/trunk/scripts/cardset_viewer.py b/PySolFC/trunk/scripts/cardset_viewer.py +--- a/PySolFC/trunk/scripts/cardset_viewer.py (revision 279) ++++ b/PySolFC/trunk/scripts/cardset_viewer.py (working copy) +@@ -7,7 +7,7 @@ + from math import sqrt, sin, cos, pi + from Tkinter import * + try: +- import Image, ImageTk ++ from PIL import Image, ImageTk + except ImportError: + Image = None + |