From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- dev-python/soya/files/soya-0.14-freetype-2.5.patch | 16 ++++++++++++++++ dev-python/soya/files/soya-0.14-glu.patch | 13 +++++++++++++ dev-python/soya/files/soya-pillow.patch | 21 +++++++++++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 dev-python/soya/files/soya-0.14-freetype-2.5.patch create mode 100644 dev-python/soya/files/soya-0.14-glu.patch create mode 100644 dev-python/soya/files/soya-pillow.patch (limited to 'dev-python/soya/files') diff --git a/dev-python/soya/files/soya-0.14-freetype-2.5.patch b/dev-python/soya/files/soya-0.14-freetype-2.5.patch new file mode 100644 index 000000000000..a4d568033109 --- /dev/null +++ b/dev-python/soya/files/soya-0.14-freetype-2.5.patch @@ -0,0 +1,16 @@ +diff -ru soya.old/include_freetype.h soya/include_freetype.h +--- soya.old/include_freetype.h 2014-06-01 23:27:17.970830047 +0900 ++++ soya/include_freetype.h 2014-06-01 23:27:35.320864678 +0900 +@@ -21,8 +21,8 @@ + + #include + #include FT_FREETYPE_H // this is not do-able in Pyrex +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include + diff --git a/dev-python/soya/files/soya-0.14-glu.patch b/dev-python/soya/files/soya-0.14-glu.patch new file mode 100644 index 000000000000..606114a22fb7 --- /dev/null +++ b/dev-python/soya/files/soya-0.14-glu.patch @@ -0,0 +1,13 @@ +Index: setup.py +=================================================================== +--- setup.py (revision 550) ++++ setup.py (working copy) +@@ -130,7 +130,7 @@ + if sys.platform[:3] == "win": + LIBS = ["m", "glew32", "SDL", "SDL_mixer", "freetype", "cal3d", "stdc++", "ode"] + else: +- LIBS = ["m", "GLEW", "SDL", "freetype", "cal3d", "stdc++","ode"] ++ LIBS = ["m", "GLEW", "GLU" , "SDL", "freetype", "cal3d", "stdc++","ode"] + FRAMEWORKS=[] + + SOYA_PYREX_SOURCES = ["_soya.pyx", "matrix.c", "chunk.c"] diff --git a/dev-python/soya/files/soya-pillow.patch b/dev-python/soya/files/soya-pillow.patch new file mode 100644 index 000000000000..4f8df982ccf2 --- /dev/null +++ b/dev-python/soya/files/soya-pillow.patch @@ -0,0 +1,21 @@ +https://bugs.gentoo.org/show_bug.cgi?id=471510 +--- a/editor/__init__.py ++++ b/editor/__init__.py +@@ -52,7 +52,7 @@ + + if obj.face.material and obj.face.material.texture: + try: +- import Image, ImageTk ++ from PIL import Image, ImageTk + + self.image = Image.open(os.path.join(soya.path[0], obj.face.material.texture.filename)) + +@@ -71,7 +71,7 @@ + self.cancel = self.master.cancel + + def label_conf(self, event = None): +- import Image, ImageTk ++ from PIL import Image, ImageTk + + if self.image_width != self.label.winfo_width(): + self.image_width = self.label.winfo_width() -- cgit v1.2.3-65-gdbad