From a1392efe64137262023d92492396ca9156d22396 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 13 Sep 2019 17:45:37 +0100 Subject: gentoo resync : 13.09.2019 --- media-video/photofilmstrip/Manifest | 4 - ...tofilmstrip-2.1.0-PIL_modules_imports_fix.patch | 91 ---------------------- .../photofilmstrip-2.1.0-PIL_tostring_fix.patch | 35 --------- .../photofilmstrip/photofilmstrip-2.1.0-r2.ebuild | 63 --------------- 4 files changed, 193 deletions(-) delete mode 100644 media-video/photofilmstrip/files/photofilmstrip-2.1.0-PIL_modules_imports_fix.patch delete mode 100644 media-video/photofilmstrip/files/photofilmstrip-2.1.0-PIL_tostring_fix.patch delete mode 100644 media-video/photofilmstrip/photofilmstrip-2.1.0-r2.ebuild (limited to 'media-video/photofilmstrip') diff --git a/media-video/photofilmstrip/Manifest b/media-video/photofilmstrip/Manifest index 37fb4adc3b5a..54709b0e6e41 100644 --- a/media-video/photofilmstrip/Manifest +++ b/media-video/photofilmstrip/Manifest @@ -1,8 +1,4 @@ -AUX photofilmstrip-2.1.0-PIL_modules_imports_fix.patch 3432 BLAKE2B 05626efec54a20a1e5be19a3128a50a2e32164f36ebc3f86b74bf0dbab9d5d296a435dfc25ff5b35f5aa0817dcfd16b8a8868768073156db3cc8d267d4630e94 SHA512 d37c31f89d421014023a1b9bb7be1a78731a056a6332e2d1040e1bdc90c7e5652e53b8708e23f68e5ae289063c27e7a05d7c8369845a36d8665297babd23f68a -AUX photofilmstrip-2.1.0-PIL_tostring_fix.patch 1479 BLAKE2B ce193bc77c20f755bfe3f8777a9371a152ff15bb8b3d0ce2f0003eb449f22bce943d4bd737d251d7e5212fd0776611620b1151ff9a7f7b07201db851273f57af SHA512 d08bfc7b77dd6a7e6ef38b74cb40bb9817fd272d22f598318a1313b08901fd042808cbfba25d3a748f8f9fba1c900b9c920db28cc95ac9d2424d5e3cb971ffaf AUX photofilmstrip-3.7.1-disable-docs-by-default.patch 379 BLAKE2B 8af4a4e5ab1f407ba72dad0975a5f17e2eb245a42484dcfcb996a785dc2a49c4e5c22a5136e4dc0c375dc0dc16baeb4cc4ef60b7ec21b48b6f11fadc91383e3f SHA512 92f24eac04653e2be160872a553d96d1d0c763c50879fc124ae3dd9a3f84d7988274965f122eb4ba7709ee9f65409e7d24fda36693129cf55a8d2cd26a4bc539 -DIST photofilmstrip-2.1.0.tar.gz 243163 BLAKE2B 30bc0de885a00b715377b262039b3c22425315e77c7e5ac7db377535f0dc3a7614bd83b894bcfbaf53601be140fef0e9754a3911958b9f71aec1e5d0214fe972 SHA512 e3cbf19d73d6cc16dcef23c11d84e5bfd1d0721cb72bb4d775390152be2fb20cab14912a9e0e73ef2d9dba9c041883591df2708cdeb7e7447cbcb18e750ea142 DIST photofilmstrip-3.7.1.tar.gz 354585 BLAKE2B df1e8756677814f35a59d7f4d3585647393e37262eb80c3299805cb0811cdfb4a16c96f90aaa192469266805145db68a582671a34f2b2780b75f1e0318460bd7 SHA512 fc2284c6c52eea5d9a6415149681e26505d6e084ad31897c44cde8e2b4845584b8521b375da06fd0a59179bfa73f6aabe769caad7a8186d5f87ecacebaff24fb -EBUILD photofilmstrip-2.1.0-r2.ebuild 1485 BLAKE2B a059225726d6d4d960411d9050a28695a4352f83121f0e504f5370fc0e1246ef58e5eac21a128d30caed0c0afe2bab9fe92ddd2d5a8c69b3ec0ecabd4d58c027 SHA512 d33f7b219a450b1f6517075420675c23b4176763171bbdf4b7baa37f350c9b4a3e80f4c04fc667b80f3aee69d797a97261f8ecf3776418b2b10868becab7c762 EBUILD photofilmstrip-3.7.1.ebuild 2055 BLAKE2B bd3f762857a28ab28be20d1070539f6cc3fe6e63f111e4d4992a82d9b733a1df08bbd327387b6a5bc3381695d881394ab462644fe3510c0c5fa80f3bfe43941e SHA512 39cc395df0c5dc2de391e1d54d4e77656839502c4e9109e63f2d582b11b80cea54d3e0d6b2b74e1b3be6117d6f7f55627f7dfa13ffbb49938e5b5de72488b247 MISC metadata.xml 683 BLAKE2B 517c2479c9ce8b3d78afd530cd6f97fcd6fefc73aaffc889584729035151d40fdd5cfe8efcf285aa5e6f3522af8825dab0e214cd5f252bb69da3f5c2b6f17c44 SHA512 58801972ef5326f757ce11964e47267df3b199f36290d0d81d3fecc97f59f678a110c107082d8d8bdebd54fc7268dd75a463a089aa22361157f4770f0d6b7251 diff --git a/media-video/photofilmstrip/files/photofilmstrip-2.1.0-PIL_modules_imports_fix.patch b/media-video/photofilmstrip/files/photofilmstrip-2.1.0-PIL_modules_imports_fix.patch deleted file mode 100644 index 989459775413..000000000000 --- a/media-video/photofilmstrip/files/photofilmstrip-2.1.0-PIL_modules_imports_fix.patch +++ /dev/null @@ -1,91 +0,0 @@ ---- photofilmstrip-2.1.0-orig/photofilmstrip/core/__init__.py -+++ photofilmstrip-2.1.0/photofilmstrip/core/__init__.py -@@ -22,47 +22,47 @@ - # WA: py2exe and PIL - import os - if os.name == "nt": -- import Image -+ import PIL.Image as Image - -- import ArgImagePlugin -- import BmpImagePlugin -- import BufrStubImagePlugin -- import CurImagePlugin -- import DcxImagePlugin -- import EpsImagePlugin -- import FitsStubImagePlugin -- import FliImagePlugin -- import FpxImagePlugin -- import GbrImagePlugin -- import GifImagePlugin -- import GribStubImagePlugin -- import Hdf5StubImagePlugin -- import IcnsImagePlugin -- import IcoImagePlugin -- import ImImagePlugin -- import ImtImagePlugin -- import IptcImagePlugin -- import JpegImagePlugin -- import McIdasImagePlugin -- import MicImagePlugin -- import MpegImagePlugin -- import MspImagePlugin -- import PalmImagePlugin -- import PcdImagePlugin -- import PcxImagePlugin -- import PdfImagePlugin -- import PixarImagePlugin -- import PngImagePlugin -- import PpmImagePlugin -- import PsdImagePlugin -- import SgiImagePlugin -- import SpiderImagePlugin -- import SunImagePlugin -- import TgaImagePlugin -- import TiffImagePlugin -- import WmfImagePlugin -- import XbmImagePlugin -- import XpmImagePlugin -- import XVThumbImagePlugin -+ import PIL.ArgImagePlugin as ArgImagePlugin -+ import PIL.BmpImagePlugin as BmpImagePlugin -+ import PIL.BufrStubImagePlugin as BufrStubImagePlugin -+ import PIL.CurImagePlugin as CurImagePlugin -+ import PIL.DcxImagePlugin as DcxImagePlugin -+ import PIL.EpsImagePlugin as EpsImagePlugin -+ import PIL.FitsStubImagePlugin as FitsStubImagePlugin -+ import PIL.FliImagePlugin as FliImagePlugin -+ import PIL.FpxImagePlugin as FpxImagePlugin -+ import PIL.GbrImagePlugin as GbrImagePlugin -+ import PIL.GifImagePlugin as GifImagePlugin -+ import PIL.GribStubImagePlugin as GribStubImagePlugin -+ import PIL.Hdf5StubImagePlugin as Hdf5StubImagePlugin -+ import PIL.IcnsImagePlugin as IcnsImagePlugin -+ import PIL.IcoImagePlugin as IcoImagePlugin -+ import PIL.ImImagePlugin as ImImagePlugin -+ import PIL.ImtImagePlugin as ImtImagePlugin -+ import PIL.IptcImagePlugin as IptcImagePlugin -+ import PIL.JpegImagePlugin as JpegImagePlugin -+ import PIL.McIdasImagePlugin as McIdasImagePlugin -+ import PIL.MicImagePlugin as MicImagePlugin -+ import PIL.MpegImagePlugin as MpegImagePlugin -+ import PIL.MspImagePlugin as MspImagePlugin -+ import PIL.PalmImagePlugin as PalmImagePlugin -+ import PIL.PcdImagePlugin as PcdImagePlugin -+ import PIL.PcxImagePlugin as PcxImagePlugin -+ import PIL.PdfImagePlugin as PdfImagePlugin -+ import PIL.PixarImagePlugin as PixarImagePlugin -+ import PIL.PngImagePlugin as PngImagePlugin -+ import PIL.PpmImagePlugin as PpmImagePlugin -+ import PIL.PsdImagePlugin as PsdImagePlugin -+ import PIL.SgiImagePlugin as SgiImagePlugin -+ import PIL.SpiderImagePlugin as SpiderImagePlugin -+ import PIL.SunImagePlugin as SunImagePlugin -+ import PIL.TgaImagePlugin as TgaImagePlugin -+ import PIL.TiffImagePlugin as TiffImagePlugin -+ import PIL.WmfImagePlugin as WmfImagePlugin -+ import PIL.XbmImagePlugin as XbmImagePlugin -+ import PIL.XpmImagePlugin as XpmImagePlugin -+ import PIL.XVThumbImagePlugin as XVThumbImagePlugin - Image._initialized=2 - # WA: end diff --git a/media-video/photofilmstrip/files/photofilmstrip-2.1.0-PIL_tostring_fix.patch b/media-video/photofilmstrip/files/photofilmstrip-2.1.0-PIL_tostring_fix.patch deleted file mode 100644 index dc29c9c8e14f..000000000000 --- a/media-video/photofilmstrip/files/photofilmstrip-2.1.0-PIL_tostring_fix.patch +++ /dev/null @@ -1,35 +0,0 @@ -Gentoo-Bug: https://bugs.gentoo.org/584128 - ---- a/photofilmstrip/core/ProjectFile.py -+++ b/photofilmstrip/core/ProjectFile.py -@@ -196,7 +196,7 @@ - def __ThumbToQuery(self, picId, pic): - pilThumb = PILBackend.GetThumbnail(pic, height=120) - thumbWidth, thumbHeight = pilThumb.size -- thumbData = buffer(pilThumb.tostring()) -+ thumbData = buffer(pilThumb.tobytes()) - - query = "INSERT INTO `thumbnail` (" \ - "picture_id, width, height, data" \ ---- a/photofilmstrip/core/renderer/CairoRenderer.py -+++ b/photofilmstrip/core/renderer/CairoRenderer.py -@@ -121,7 +121,7 @@ - def _PilToCairo(self, pilImg): - pilImg = pilImg.copy() - w, h = pilImg.size -- data = pilImg.convert('RGBA').tostring() -+ data = pilImg.convert('RGBA').tobytes() - buff = array.array('B', data) - cairoImage = cairo.ImageSurface.create_for_data(buff, cairo.FORMAT_ARGB32, w, h) - # cairoImage = cairo.ImageSurface.create_for_data(buff, cairo.FORMAT_RGB24, w, h) ---- a/photofilmstrip/core/renderer/PyGameRenderer.py -+++ b/photofilmstrip/core/renderer/PyGameRenderer.py -@@ -100,7 +100,7 @@ - def _PilToPyGame(self, pilImg): - mode = pilImg.mode - assert mode in "RGB", "RGBA" -- return pygame.image.fromstring(pilImg.tostring(), pilImg.size, mode) -+ return pygame.image.frombytes(pilImg.tobytes(), pilImg.size, mode) - - - # def CropAndResize(self, ctx, rect): diff --git a/media-video/photofilmstrip/photofilmstrip-2.1.0-r2.ebuild b/media-video/photofilmstrip/photofilmstrip-2.1.0-r2.ebuild deleted file mode 100644 index d20fa98d7060..000000000000 --- a/media-video/photofilmstrip/photofilmstrip-2.1.0-r2.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite" -DISTUTILS_SINGLE_IMPL=1 - -inherit distutils-r1 - -DESCRIPTION="Movie slideshow creator using Ken Burns effect" -HOMEPAGE="http://www.photofilmstrip.org" -SRC_URI="mirror://sourceforge/photostoryx/${PN}/${PV}/${P}.tar.gz" -LICENSE="GPL-2+" -SLOT="0" - -KEYWORDS="~amd64 ~x86" -IUSE="cairo sdl" - -RDEPEND=" - dev-python/wxpython:3.0[cairo?,${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP}] - media-video/mplayer[encode] - sdl? ( dev-python/pygame[${PYTHON_USEDEP}] ) -" -DEPEND="${RDEPEND}" - -# Fix bug #472774 (https://bugs.gentoo.org/show_bug.cgi?id=472774) -PATCHES=( - "${FILESDIR}/${P}-PIL_modules_imports_fix.patch" - "${FILESDIR}/${P}-PIL_tostring_fix.patch" -) - -DOCS=( CHANGES COPYING README ) - -src_prepare() { - # Remove unneeded icon resources update needing running X - # Fix app doc/help files paths - sed -i \ - -e '/self\._make_resources\(\)/d' \ - -e "s:\(os\.path\.join(\"share\", \"doc\", \"\)photofilmstrip:\1${PF}:" \ - setup.py || die - - sed -i \ - -e "s:\"photofilmstrip\":\"${PF}\":" \ - photofilmstrip/gui/HelpViewer.py || die - - # Fix desktop file entry - sed -i \ - -e '/^Version.*/d' \ - data/photofilmstrip.desktop || die - - distutils-r1_src_prepare -} - -src_install() { - doman docs/manpage/* - - # Do not compress the apps help files - docompress -x /usr/share/doc/${PF}/${PN}.hh{c,k,p} - - distutils-r1_src_install -} -- cgit v1.2.3