summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter O'Connor <peter@solus-project.com>2017-03-19 18:34:12 +1100
committerPeter O'Connor <peter@solus-project.com>2017-03-19 18:34:12 +1100
commit5ceb51783d1e5d854550e52002878a69667179b1 (patch)
tree15bfc171ff2d63db1d6f7604a85547ccfcb2d3bb
parent2d619336df0d2d787dad122494ecf699aaf37b41 (diff)
downloadmypaint-5ceb51783d1e5d854550e52002878a69667179b1.tar.gz
mypaint-5ceb51783d1e5d854550e52002878a69667179b1.tar.bz2
-rw-r--r--files/0001-filename_to_unicode-tolerate-typelib-variations.patch47
-rw-r--r--package.yml11
-rw-r--r--pspec_x86_64.xml16
3 files changed, 12 insertions, 62 deletions
diff --git a/files/0001-filename_to_unicode-tolerate-typelib-variations.patch b/files/0001-filename_to_unicode-tolerate-typelib-variations.patch
deleted file mode 100644
index 251129c..0000000
--- a/files/0001-filename_to_unicode-tolerate-typelib-variations.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From a0ff39936a824f0677ce1dc075c77f0097edfae5 Mon Sep 17 00:00:00 2001
-From: Andrew Chadwick <a.t.chadwick@gmail.com>
-Date: Sat, 2 Apr 2016 19:11:25 +0100
-Subject: [PATCH 1/1] filename_to_unicode: tolerate typelib variations
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes an exception when g_filename_to_utf8() has a more sensible
-wrapping than our old expectation ☺
-
-Addresses mypaint/mypaint#634.
-
-Also remove pointless import from doctest.
----
- lib/glib.py | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/lib/glib.py b/lib/glib.py
-index 3bc5989..ca4f34b 100644
---- a/lib/glib.py
-+++ b/lib/glib.py
-@@ -36,7 +36,6 @@ def filename_to_unicode(opsysstring):
- :returns: the converted filename
- :rtype: unicode
-
-- >>> from gi.repository import GLib
- >>> filename_to_unicode('/ascii/only/path')
- u'/ascii/only/path'
- >>> filename_to_unicode(None) is None
-@@ -55,7 +54,12 @@ def filename_to_unicode(opsysstring):
- # Other systems are dependent in opaque ways on the environment.
- if not isinstance(opsysstring, str):
- raise TypeError("Argument must be bytes")
-- ustring = GLib.filename_to_utf8(opsysstring, -1, 0, 0)
-+ # This function's annotation seems to vary quite a bit.
-+ # See https://github.com/mypaint/mypaint/issues/634
-+ try:
-+ ustring, _, _ = GLib.filename_to_utf8(opsysstring, -1)
-+ except TypeError:
-+ ustring = GLib.filename_to_utf8(opsysstring, -1, 0, 0)
- if ustring is None:
- raise UnicodeDecodeError(
- "GLib failed to convert %r to a UTF-8 string. "
---
-2.10.1
-
diff --git a/package.yml b/package.yml
index bad155f..89a8468 100644
--- a/package.yml
+++ b/package.yml
@@ -1,13 +1,12 @@
name : mypaint
homepage : http://mypaint.org/
-version : 1.2.0
-release : 4
+version : 1.2.1
+release : 5
source :
- - https://github.com/mypaint/mypaint/releases/download/v1.2.0/mypaint-1.2.0.tar.xz : cdab33dd0c146cf678c97bcdd44e561f97a0aec40421b8c6785a74b33b9728e2
+ - https://github.com/mypaint/mypaint/releases/download/v1.2.1/mypaint-1.2.1.tar.xz : ed2349382f6a0c583d7defae06427e97ac7d14acb77b9e2c0fc7171ddd96d3c7
license : GPL-2.0
component : multimedia.graphics
-summary : MyPaint is a simple drawing and painting program that works well with
- Wacom-style graphics tablets.
+summary : MyPaint is a simple drawing and painting program that works well with Wacom-style graphics tablets.
description: |
MyPaint is a simple drawing and painting program that works well with Wacom-style graphics tablets.
builddeps :
@@ -25,8 +24,6 @@ rundeps :
- python-gobject2
- python-gtk2
- python-protobuf
-setup : |
- %patch -p1 < $pkgfiles/0001-filename_to_unicode-tolerate-typelib-variations.patch
build : |
scons
install : |
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
index 87b2e3f..66b49bc 100644
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -3,8 +3,8 @@
<Name>mypaint</Name>
<Homepage>http://mypaint.org/</Homepage>
<Packager>
- <Name>Joshua Strobl</Name>
- <Email>joshua@stroblindustries.com</Email>
+ <Name>Peter O&apos;Connor</Name>
+ <Email>peter@solus-project.com</Email>
</Packager>
<License>GPL-2.0</License>
<PartOf>multimedia.graphics</PartOf>
@@ -267,7 +267,7 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="4">mypaint</Dependency>
+ <Dependency release="5">mypaint</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/</Path>
@@ -276,12 +276,12 @@
</Files>
</Package>
<History>
- <Update release="4">
- <Date>2016-10-16</Date>
- <Version>1.2.0</Version>
+ <Update release="5">
+ <Date>2017-03-19</Date>
+ <Version>1.2.1</Version>
<Comment>Packaging update</Comment>
- <Name>Joshua Strobl</Name>
- <Email>joshua@stroblindustries.com</Email>
+ <Name>Peter O&apos;Connor</Name>
+ <Email>peter@solus-project.com</Email>
</Update>
</History>
</PISI> \ No newline at end of file
Copyright © 2015-2016 Solus Project. The Solus logo is Copyright © 2016 Solus Project. All rights reserved.