[arch-commits] Commit in mypaint/trunk (5 files)
Balló György
bgyorgy at archlinux.org
Wed May 27 20:32:47 UTC 2020
Date: Wednesday, May 27, 2020 @ 20:32:46
Author: bgyorgy
Revision: 636037
upgpkg: mypaint 2.0.0-1: Update to new version
Modified:
mypaint/trunk/PKGBUILD
Deleted:
mypaint/trunk/0001-Fix-AppStream-metadata-validation.patch
mypaint/trunk/fix-wayland.patch
mypaint/trunk/json-c.patch
mypaint/trunk/scons-python3.patch
----------------------------------------------+
0001-Fix-AppStream-metadata-validation.patch | 47 ------
PKGBUILD | 66 +--------
fix-wayland.patch | 70 ----------
json-c.patch | 13 -
scons-python3.patch | 171 -------------------------
5 files changed, 13 insertions(+), 354 deletions(-)
Deleted: 0001-Fix-AppStream-metadata-validation.patch
===================================================================
--- 0001-Fix-AppStream-metadata-validation.patch 2020-05-27 20:31:47 UTC (rev 636036)
+++ 0001-Fix-AppStream-metadata-validation.patch 2020-05-27 20:32:46 UTC (rev 636037)
@@ -1,47 +0,0 @@
-From 24d6f2bcee83c2e9f8d68c7c6a29f91ca26243ce Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
-Date: Tue, 25 Dec 2018 03:15:55 +0100
-Subject: [PATCH] Fix AppStream metadata validation
-
----
- desktop/mypaint.appdata.xml | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/desktop/mypaint.appdata.xml b/desktop/mypaint.appdata.xml
-index 77a60b2c..209d85e4 100644
---- a/desktop/mypaint.appdata.xml
-+++ b/desktop/mypaint.appdata.xml
-@@ -1,12 +1,10 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <!-- Copyright 2016 Andrew Chadwick <a.t.chadwick at gmail.com> -->
- <!-- Copyright 2014 Richard Hughes <richard at hughsie.com> -->
--<application>
-- <id type="desktop">mypaint.desktop</id>
-+<component type="desktop-application">
-+ <id>org.mypaint.mypaint</id>
- <name>MyPaint</name>
-- <summary>
-- Painting program for digital artists
-- </summary>
-+ <summary>Painting program for digital artists</summary>
- <project_license>GPL-2.0+</project_license>
- <metadata_license>CC0-1.0</metadata_license>
- <description>
-@@ -24,9 +22,12 @@
- so you don’t have to configure your own if you don’t want to.
- </p>
- </description>
-+ <launchable type="desktop-id">mypaint.desktop</launchable>
- <url type="homepage">http://mypaint.org/</url>
- <screenshots>
-- <screenshot type="default">https://cloud.githubusercontent.com/assets/1840562/8720135/b28edc2e-2b65-11e5-91ce-9d557bcd2c9e.png</screenshot>
-+ <screenshot type="default">
-+ <image>https://cloud.githubusercontent.com/assets/1840562/8720135/b28edc2e-2b65-11e5-91ce-9d557bcd2c9e.png</image>
-+ </screenshot>
- </screenshots>
- <update_contact>a.t.chadwick at gmail.com</update_contact>
--</application>
-+</component>
---
-2.20.1
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-05-27 20:31:47 UTC (rev 636036)
+++ PKGBUILD 2020-05-27 20:32:46 UTC (rev 636037)
@@ -3,73 +3,33 @@
# Contributor: Jon Nordby <jononor at gmail.com>
pkgname=mypaint
-pkgver=1.2.1
-pkgrel=12
+pkgver=2.0.0
+pkgrel=1
pkgdesc="Fast and easy painting application for digital painters, with brush dynamics"
arch=('x86_64')
url="http://mypaint.org/"
license=('GPL')
-depends=('gtk3' 'libmypaint' 'python2-cairo' 'python2-gobject' 'python2-numpy')
-makedepends=('scons' 'swig')
-# requires mypaint 2.0 with libmypaint 2.0 to work dynamically
+depends=('gtk3' 'libmypaint' 'mypaint-brushes' 'python-cairo' 'python-gobject' 'python-numpy')
+makedepends=('python-setuptools' 'swig')
options=('!emptydirs')
-source=(https://github.com/mypaint/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz{,.asc}
- json-c.patch
- fix-wayland.patch
- 0001-Fix-AppStream-metadata-validation.patch
- scons-python3.patch
- https://github.com/mypaint/mypaint/commit/e05fc17118b6dc20adfe0652756df023528a7fc0.patch)
-validpgpkeys=('C02391F4BBA4F0E2B27C6BFF6E3037E12878B299') # Andrew Chadwick
-sha256sums=('ed2349382f6a0c583d7defae06427e97ac7d14acb77b9e2c0fc7171ddd96d3c7'
- 'SKIP'
- 'cdb78e8f592bdb1862c57edbb0e287b23512203e33e398f1471d6dea3f47f772'
- '1ffa2e6e0deb236928f33c7f82cc037949e76600b5f7242f85b18380a241928b'
- '5a0d1dc67a4377adf6d7e38300fcf07b11765ea7bf8866d0a28765d0522ff99b'
- 'f2f99e7d0db538eb2c9c084077e7c8ceb480911318b3c0fbf23cf9cc37bfc893'
- 'b2743d0d3c6d894385bb154ac1594d370adb83ba3ac9beb135c2a196934dfc3b')
+source=(https://github.com/mypaint/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz
+ mypaint-fix-build.patch::https://github.com/mypaint/mypaint/commit/16d346dbe0e8cf73dda78d5165bfc3491695e3b1.patch)
+#validpgpkeys=('C02391F4BBA4F0E2B27C6BFF6E3037E12878B299') # Andrew Chadwick
+sha256sums=('d1d67866e342938c1e84b42da10bbed5f613f7e216f800fcc7c0e20200074a5e'
+ 'a4d3efdba24d9f357fc2dd8abc0d16b7cb071eae6bc34d33fcad877801a70bbd')
prepare() {
cd $pkgname-$pkgver
-
- # Fix building with json-c 0.14
- patch -Np1 -i ../json-c.patch
-
- # Fix run under wayland
- # https://github.com/mypaint/mypaint/issues/791
- patch -Np1 -i ../fix-wayland.patch
-
- # Fix AppStream metadata validation
- # https://github.com/mypaint/mypaint/pull/955
- patch -Np1 -i ../0001-Fix-AppStream-metadata-validation.patch
-
- # FS#63288 -> https://github.com/mypaint/mypaint/issues/1030
- patch -p1 -i ../e05fc17118b6dc20adfe0652756df023528a7fc0.patch
- sed -i 's|ui_dir = os.path.dirname(os.path.abspath(__file__))|ui_dir = "/usr/share/mypaint/gui"|' gui/brusheditor.py
-
- # Don't use legacy path for AppStream metainfo file
- sed -i 's|/share/appdata|/share/metainfo|' SConscript
-
- patch -p1 -i ../scons-python3.patch
+ # Fix build
+ patch -Np1 -i ../mypaint-fix-build.patch
}
build() {
cd $pkgname-$pkgver
- scons python_binary=python2 python_config=python2-config
+ python3 setup.py build
}
package() {
cd $pkgname-$pkgver
- scons prefix="$pkgdir"/usr install python_binary=python2 python_config=python2-config
-
- # This is kind of ugly but removes traces of the build root.
- while read -rd '' _file; do
- _destdir="$(dirname "${_file#${pkgdir}}")"
- python2 -m compileall -d "${_destdir}" "${_file}"
- python2 -O -m compileall -d "${_destdir}" "${_file}"
- done < <(find "${pkgdir}"/usr/lib/ -name '*.py' -print0)
-
- # Remove conflicting files with the libmypaint package
- rm -r "$pkgdir"/usr/include/ "$pkgdir"/usr/lib/pkgconfig/
- rm "$pkgdir"/usr/lib/libmypaint.a
- rm -r "$pkgdir"/usr/share/locale/*/LC_MESSAGES/libmypaint.mo
+ python3 setup.py install --root="$pkgdir" --optimize=1
}
Deleted: fix-wayland.patch
===================================================================
--- fix-wayland.patch 2020-05-27 20:31:47 UTC (rev 636036)
+++ fix-wayland.patch 2020-05-27 20:32:46 UTC (rev 636037)
@@ -1,70 +0,0 @@
-From 037c2e791cfca4114dc75d3077d1266c2506d71c Mon Sep 17 00:00:00 2001
-From: Simon McVittie <smcv at debian.org>
-Date: Sun, 2 Apr 2017 18:24:33 +0100
-Subject: [PATCH] hcywheel: Avoid deprecated gdk.Cursor constructor
-
-Use Gdk.Cursor.new_for_display on realize instead.
-
-Backported from a larger patch by Daniel Plachotich.
-
-Fixes #791
-
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=859064
----
- gui/colors/hcywheel.py | 23 +++++++++++++++++++----
- 1 file changed, 19 insertions(+), 4 deletions(-)
-
-diff --git a/gui/colors/hcywheel.py b/gui/colors/hcywheel.py
-index ed2d1130f..7d5235882 100644
---- a/gui/colors/hcywheel.py
-+++ b/gui/colors/hcywheel.py
-@@ -20,6 +20,7 @@
- import gui.gtk2compat as gtk2compat
- import gtk
- from gtk import gdk
-+from gi.repository import Gdk
- import cairo
-
- from bases import CachedBgDrawingArea
-@@ -391,10 +392,10 @@ class HCYMaskEditorWheel (HCYHueChromaWheel):
-
- ## Class-level constants and variables
- # Specialized cursors for different actions
-- __add_cursor = gdk.Cursor(gdk.PLUS)
-- __move_cursor = gdk.Cursor(gdk.FLEUR)
-- __move_point_cursor = gdk.Cursor(gdk.CROSSHAIR)
-- __rotate_cursor = gdk.Cursor(gdk.EXCHANGE)
-+ __add_cursor = None
-+ __move_cursor = None
-+ __move_point_cursor = None
-+ __rotate_cursor = None
- # Constrain the range of allowable lumas
- __MAX_LUMA = 0.75
- __MIN_LUMA = 0.25
-@@ -417,12 +418,26 @@ def __init__(self):
- """Instantiate, and connect the editor events.
- """
- HCYHueChromaWheel.__init__(self)
-+
-+ self.connect("realize", self._realize_cb)
- self.connect("button-press-event", self.__button_press_cb)
- self.connect("button-release-event", self.__button_release_cb)
- self.connect("motion-notify-event", self.__motion_cb)
- self.connect("leave-notify-event", self.__leave_cb)
- self.add_events(gdk.POINTER_MOTION_MASK | gdk.LEAVE_NOTIFY_MASK)
-
-+ def _realize_cb(self, widget):
-+ display = self.get_window().get_display()
-+
-+ self.__add_cursor = Gdk.Cursor.new_for_display(
-+ display, Gdk.CursorType.PLUS)
-+ self.__move_cursor = Gdk.Cursor.new_for_display(
-+ display, Gdk.CursorType.FLEUR)
-+ self.__move_point_cursor = Gdk.Cursor.new_for_display(
-+ display, Gdk.CursorType.CROSSHAIR)
-+ self.__rotate_cursor = Gdk.Cursor.new_for_display(
-+ display, Gdk.CursorType.EXCHANGE)
-+
- def __leave_cb(self, widget, event):
- # Reset the active objects when the pointer leaves.
- if self.__drag_func is not None:
Deleted: json-c.patch
===================================================================
--- json-c.patch 2020-05-27 20:31:47 UTC (rev 636036)
+++ json-c.patch 2020-05-27 20:32:46 UTC (rev 636037)
@@ -1,13 +0,0 @@
-diff -u -r mypaint-1.2.1/brushlib/mypaint-brush.c mypaint-1.2.1-json-c/brushlib/mypaint-brush.c
---- mypaint-1.2.1/brushlib/mypaint-brush.c 2017-01-21 17:51:52.000000000 +0000
-+++ mypaint-1.2.1-json-c/brushlib/mypaint-brush.c 2020-04-26 00:23:04.098737838 +0000
-@@ -28,9 +28,6 @@
- #include "rng-double.h"
-
- #ifdef HAVE_JSON_C
--// Allow the C99 define from json.h
--#undef TRUE
--#undef FALSE
- #include <json.h>
- #endif // HAVE_JSON_C
-
Deleted: scons-python3.patch
===================================================================
--- scons-python3.patch 2020-05-27 20:31:47 UTC (rev 636036)
+++ scons-python3.patch 2020-05-27 20:32:46 UTC (rev 636037)
@@ -1,171 +0,0 @@
---- mypaint-1.2.1/SConstruct.orig 2019-07-27 06:58:18.369247493 +0000
-+++ mypaint-1.2.1/SConstruct 2019-07-27 06:59:01.299843987 +0000
-@@ -17,7 +17,7 @@
- # Defaults above will work fine.
- pass
- elif os.path.exists('/etc/gentoo-release'):
-- print 'Gentoo: /etc/gentoo-release exists. Must be on a Gentoo based system.'
-+ print ('Gentoo: /etc/gentoo-release exists. Must be on a Gentoo based system.')
- default_python_config = 'python-config-%d.%d' % (sys.version_info[0],sys.version_info[1])
-
- SConsignFile() # no .scsonsign into $PREFIX please
-@@ -76,18 +76,18 @@
- # Respect some standard build environment stuff
- # See http://cgit.freedesktop.org/mesa/mesa/tree/scons/gallium.py
- # See https://wiki.gentoo.org/wiki/SCons#Missing_CC.2C_CFLAGS.2C_LDFLAGS
--if os.environ.has_key('CC'):
-+if os.environ.get('CC'):
- env['CC'] = os.environ['CC']
--if os.environ.has_key('CFLAGS'):
-+if os.environ.get('CFLAGS'):
- env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
--if os.environ.has_key('CXX'):
-+if os.environ.get('CXX'):
- env['CXX'] = os.environ['CXX']
--if os.environ.has_key('CXXFLAGS'):
-+if os.environ.get('CXXFLAGS'):
- env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
--if os.environ.has_key('CPPFLAGS'):
-+if os.environ.get('CPPFLAGS'):
- env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CPPFLAGS'])
- env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CPPFLAGS'])
--if os.environ.has_key('LDFLAGS'):
-+if os.environ.get('LDFLAGS'):
- # LDFLAGS is omitted in SHLINKFLAGS, which is derived from LINKFLAGS
- env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
- if "$CCFLAGS" in env['CXXCOM']:
-@@ -146,7 +146,7 @@
-
-
- set_dir_postaction = {}
--def install_perms(env, target, sources, perms=0644, dirperms=0755):
-+def install_perms(env, target, sources, perms=0o644, dirperms=0o755):
- """As a normal env.Install, but with Chmod postactions.
-
- The `target` parameter must be a string starting with ``$prefix``.
-@@ -178,7 +178,7 @@
- return install_targs
-
-
--def install_tree(env, dest, path, perms=0644, dirperms=0755):
-+def install_tree(env, dest, path, perms=0o644, dirperms=0o755):
- assert os.path.isdir(path)
- target_root = join(dest, os.path.basename(path))
- for dirpath, dirnames, filenames in os.walk(path):
-@@ -228,7 +228,7 @@
- Export('env', 'install_tree', 'install_perms')
-
- if not env.GetOption("help"):
-- print "Enabling i18n for brushlib in full application build"
-+ print ("Enabling i18n for brushlib in full application build")
- env['enable_i18n'] = True
-
- # Brushlib
---- mypaint-1.2.1/brushlib/SConscript.orig 2019-07-27 07:11:56.630862385 +0000
-+++ mypaint-1.2.1/brushlib/SConscript 2019-07-27 07:12:35.081442001 +0000
-@@ -81,8 +81,8 @@
- if env['enable_introspection']:
- env['use_glib'] = True
- env['use_sharedlib'] = True
-- print "Enabling glib because of enable_introspection=true"
-- print "Building a shared lib instead of a static lib because of enable_introspection=true"
-+ print ("Enabling glib because of enable_introspection=true")
-+ print ("Building a shared lib instead of a static lib because of enable_introspection=true")
-
- Export('env')
-
-@@ -95,7 +95,7 @@
- json_pkgconfig = 'json-c'
-
- if subprocess.call(["pkg-config", json_pkgconfig]):
-- print "Could not find 'json-c' pkg-config, trying legacy 'json' instead"
-+ print ("Could not find 'json-c' pkg-config, trying legacy 'json' instead")
- json_pkgconfig = 'json'
-
- pkg_deps = [json_pkgconfig]
---- mypaint-1.2.1/SConscript.orig 2019-07-27 07:13:59.329369214 +0000
-+++ mypaint-1.2.1/SConscript 2019-07-27 07:14:16.359622596 +0000
-@@ -27,9 +27,9 @@
- languages = SConscript('po/SConscript')
-
- try:
-- new_umask = 022
-+ new_umask = 0o22
- old_umask = os.umask(new_umask)
-- print "set umask to 0%03o (was 0%03o)" % (new_umask, old_umask)
-+ print ("set umask to 0%03o (was 0%03o)" % (new_umask, old_umask))
- except OSError:
- # Systems like Win32...
- pass
-@@ -56,13 +56,13 @@
- relinfo_script = relinfo_script,
- source = source[0],
- )
-- with open(unicode(target[0]), 'w') as output:
-+ with open(str(target[0]), 'w') as output:
- output.write(header)
-- with open(unicode(source[0])) as input:
-+ with open(str(source[0])) as input:
- output.write(input.read())
- c = env.Command(target, source, [
- _burn_versions,
-- Chmod(target, 0755),
-+ Chmod(target, 0o755),
- ])
- d = env.Depends(target, env.Value(env["python_binary"]))
- # But don't depend on the git output:
-@@ -92,7 +92,7 @@
- install_perms(env,
- '$prefix/bin',
- 'desktop/mypaint-ora-thumbnailer',
-- perms=0755,
-+ perms=0o755,
- )
- install_perms(env,
- '$prefix/share/thumbnailers',
-@@ -125,7 +125,7 @@
- install_perms(env, '$prefix/lib/mypaint', mypaintlib)
-
- # Program and supporting UI XML
--install_perms(env, '$prefix/bin', 'mypaint', perms=0755)
-+install_perms(env, '$prefix/bin', 'mypaint', perms=0o755)
- install_perms(env, '$prefix/share/mypaint/gui', Glob('gui/*.xml'))
- install_perms(env, '$prefix/share/mypaint/gui', Glob('gui/*.glade'))
- install_perms(env, "$prefix/share/mypaint/lib", Glob("lib/*.py"))
---- mypaint-1.2.1/lib/SConscript.orig 2019-07-27 07:26:49.270531250 +0000
-+++ mypaint-1.2.1/lib/SConscript 2019-07-27 07:27:52.654767547 +0000
-@@ -109,7 +109,7 @@
- # syntax too much, causing os.path.join() to fail.
-
- if not numpy_path:
-- numpy_cfg_py = "import numpy; print numpy.get_include()"
-+ numpy_cfg_py = "import numpy; print (numpy.get_include())"
- try:
- numpy_path = subprocess.check_output([
- env["python_binary"],
-@@ -119,7 +119,7 @@
- except:
- numpy_path = None
- else:
-- numpy_path = numpy_path.rstrip("\r\n")
-+ numpy_path = numpy_path.decode('utf-8').rstrip("\r\n")
-
- # There may be strange builds out there that don't have a target Python
- # binary yet at the time of compilation, but for which using the local
---- mypaint-1.2.1/lib/meta.py.orig 2019-07-27 07:52:16.131752304 +0000
-+++ mypaint-1.2.1/lib/meta.py 2019-07-27 07:53:08.652470988 +0000
-@@ -144,7 +144,7 @@
- # If release information from release.sh exists, use that
- relinfo = {}
- with open("release_info", "rb") as relinfo_fp:
-- exec relinfo_fp in relinfo
-+ exec (relinfo_fp.read(), relinfo)
- base_version = relinfo.get(
- "MYPAINT_VERSION_BASE",
- base_version,
-@@ -310,4 +310,4 @@
- # makes.
-
- if __name__ == '__main__':
-- print _get_release_info_script(),
-+ print (_get_release_info_script()),
More information about the arch-commits
mailing list