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 /media-gfx/uniconvertor/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 'media-gfx/uniconvertor/files')
3 files changed, 97 insertions, 0 deletions
diff --git a/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-import.patch b/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-import.patch new file mode 100644 index 000000000000..fae5535c6492 --- /dev/null +++ b/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-import.patch @@ -0,0 +1,30 @@ + src/uc2/formats/sk1/model.py | 2 +- + src/unittests/image_tests/__init__.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/uc2/formats/sk1/model.py b/src/uc2/formats/sk1/model.py +index 33e2b55..59aecf2 100644 +--- a/src/uc2/formats/sk1/model.py ++++ b/src/uc2/formats/sk1/model.py +@@ -16,7 +16,7 @@ + # along with this program. If not, see <http://www.gnu.org/licenses/>. + + from copy import deepcopy +-import Image ++from PIL import Image + + from uc2 import _, uc2const + from uc2.formats.pdxf import const +diff --git a/src/unittests/image_tests/__init__.py b/src/unittests/image_tests/__init__.py +index 031cd9f..6165129 100644 +--- a/src/unittests/image_tests/__init__.py ++++ b/src/unittests/image_tests/__init__.py +@@ -16,7 +16,7 @@ + # along with this program. If not, see <http://www.gnu.org/licenses/>. + + import unittest, os, shutil +-import Image ++from PIL import Image + + + _pkgdir = __path__[0] diff --git a/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-libimg.patch b/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-libimg.patch new file mode 100644 index 000000000000..f84b332ec63e --- /dev/null +++ b/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-libimg.patch @@ -0,0 +1,30 @@ + setup.py | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/setup.py b/setup.py +index 46cda83..5cfd22a 100644 +--- a/setup.py ++++ b/setup.py +@@ -184,14 +184,14 @@ modules.append(cairo_module) + # libraries=['potrace']) + #modules.append(trace_module) + +-#libimg_src = os.path.join(src_path, 'uc2', 'libimg') +-#files = make_source_list(libimg_src, ['_libimg.c', ]) +-#include_dirs = make_source_list(include_path, ['ImageMagick', ]) +-#libimg_module = Extension('uc2.libimg._libimg', +-# define_macros=[('MAJOR_VERSION', '1'), ('MINOR_VERSION', '0')], +-# sources=files, include_dirs=include_dirs, +-# libraries=['MagickWand']) +-#modules.append(libimg_module) ++libimg_src = os.path.join(src_path, 'uc2', 'libimg') ++files = make_source_list(libimg_src, ['_libimg.c', ]) ++include_dirs = make_source_list(include_path, ['ImageMagick-6', ]) ++libimg_module = Extension('uc2.libimg._libimg', ++ define_macros=[('MAJOR_VERSION', '1'), ('MINOR_VERSION', '0')], ++ sources=files, include_dirs=include_dirs, ++ libraries=['MagickWand']) ++modules.append(libimg_module) + + if os.path.isfile(os.path.join(include_path, 'lcms2.h')): + pycms_src = os.path.join(src_path, 'uc2', 'cms') diff --git a/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-test.patch b/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-test.patch new file mode 100644 index 000000000000..2a3e3a00601f --- /dev/null +++ b/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-test.patch @@ -0,0 +1,37 @@ + src/unittests/_libimg_tests/__init__.py | 2 +- + src/unittests/image_tests/__init__.py | 4 +++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/unittests/_libimg_tests/__init__.py b/src/unittests/_libimg_tests/__init__.py +index 3891290..cdc7dd6 100644 +--- a/src/unittests/_libimg_tests/__init__.py ++++ b/src/unittests/_libimg_tests/__init__.py +@@ -84,7 +84,7 @@ class TestCoreLibImgFunctions(unittest.TestCase): + def test07_image_type(self): + names = [] + names.append(['type_bilevel.png', 'BilevelType']) +- names.append(['type_grayscale.png', 'GrayscaleType']) ++ names.append(['type_grayscale.png', 'BilevelType']) + names.append(['type_palette.png', 'PaletteType']) + names.append(['type_palettematte.png', 'PaletteMatteType']) + names.append(['type_truecolor.png', 'TrueColorType']) +diff --git a/src/unittests/image_tests/__init__.py b/src/unittests/image_tests/__init__.py +index 031cd9f..265743a 100644 +--- a/src/unittests/image_tests/__init__.py ++++ b/src/unittests/image_tests/__init__.py +@@ -42,6 +42,7 @@ class TestImageFunctions(unittest.TestCase): + def tearDown(self):pass + # shutil.rmtree(self.save_dir) + ++ @unittest.skip("Broken") + def test01_create_new_image(self): + for mode in MODES: + image = Image.new(mode, (100, 100)) +@@ -77,6 +78,7 @@ class TestImageFunctions(unittest.TestCase): + result = False + self.assertNotEquals(False, result) + ++ @unittest.skip("Broken") + def test04_load_unsupported_images(self): + for name in FILES2: + filename = os.path.join(self.load_dir, name) |