[arch-commits] Commit in mypaint/repos (4 files)

[Jelle van der Waa]

    Date: Wednesday, June 6, 2018 @ 07:08:52
  Author: jelle
Revision: 340867

db-move: moved mypaint from [community-staging] to [community-testing] (x86_64)

Added:
  mypaint/repos/community-testing-x86_64/
  mypaint/repos/community-testing-x86_64/PKGBUILD
    (from rev 340866, mypaint/repos/community-staging-x86_64/PKGBUILD)
  mypaint/repos/community-testing-x86_64/fix-wayland.patch
    (from rev 340866, mypaint/repos/community-staging-x86_64/fix-wayland.patch)
Deleted:
  mypaint/repos/community-staging-x86_64/

-------------------+
 PKGBUILD          |   37 +++++++++++++++++++++++++++
 fix-wayland.patch |   70 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 107 insertions(+)

Copied: mypaint/repos/community-testing-x86_64/PKGBUILD (from rev 340866, mypaint/repos/community-staging-x86_64/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD	                        (rev 0)
+++ community-testing-x86_64/PKGBUILD	2018-06-06 07:08:52 UTC (rev 340867)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Jon Nordby <jononor at gmail.com>
+
+pkgname=mypaint
+pkgver=1.2.1
+pkgrel=6
+pkgdesc="Fast and easy painting application for digital painters, with brush dynamics"
+arch=('x86_64')
+url="http://mypaint.org/"
+license=('GPL')
+depends=('gtk3' 'python2-cairo' 'python2-gobject' 'python2-numpy')
+makedepends=('scons' 'swig')
+source=(https://github.com/mypaint/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz{,.asc}
+        fix-wayland.patch)
+validpgpkeys=('C02391F4BBA4F0E2B27C6BFF6E3037E12878B299') # Andrew Chadwick
+sha512sums=('1783765e495b9535669a83a29d27ba684e6201fdfe0875bdd2c167b1dab8af05993b19025767fe0b2770ed9e578e4709f75d8a4820ac945812cba85609f9eb9b'
+            'SKIP'
+            '8aa0b865c577400039eeba5f7b54d8db4e4baa6e395691db080d43ca803a793e549cb7f5396a2f6a58fa60de8614f9d84cd1b0f55dc71699b685daf2beb2ef9c')
+
+prepare() {
+  cd $pkgname-$pkgver
+  # Fix run under wayland
+  # https://github.com/mypaint/mypaint/issues/791
+  patch -Np1 -i ../fix-wayland.patch
+}
+
+build() {
+  cd $pkgname-$pkgver
+  scons
+}
+
+package() {
+  cd $pkgname-$pkgver
+  scons prefix="$pkgdir"/usr install
+}

Copied: mypaint/repos/community-testing-x86_64/fix-wayland.patch (from rev 340866, mypaint/repos/community-staging-x86_64/fix-wayland.patch)
===================================================================
--- community-testing-x86_64/fix-wayland.patch	                        (rev 0)
+++ community-testing-x86_64/fix-wayland.patch	2018-06-06 07:08:52 UTC (rev 340867)
@@ -0,0 +1,70 @@
+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: