Date: Tuesday, December 25, 2018 @ 02:29:01 Author: bgyorgy Revision: 417889
archrelease: copy trunk to community-x86_64 Added: mypaint/repos/community-x86_64/0001-Fix-AppStream-metadata-validation.patch (from rev 417887, mypaint/trunk/0001-Fix-AppStream-metadata-validation.patch) mypaint/repos/community-x86_64/PKGBUILD (from rev 417887, mypaint/trunk/PKGBUILD) mypaint/repos/community-x86_64/fix-wayland.patch (from rev 417887, mypaint/trunk/fix-wayland.patch) Deleted: mypaint/repos/community-x86_64/PKGBUILD mypaint/repos/community-x86_64/fix-wayland.patch ----------------------------------------------+ 0001-Fix-AppStream-metadata-validation.patch | 47 ++++++++ PKGBUILD | 82 ++++++++------ fix-wayland.patch | 140 ++++++++++++------------- 3 files changed, 162 insertions(+), 107 deletions(-) Copied: mypaint/repos/community-x86_64/0001-Fix-AppStream-metadata-validation.patch (from rev 417887, mypaint/trunk/0001-Fix-AppStream-metadata-validation.patch) =================================================================== --- 0001-Fix-AppStream-metadata-validation.patch (rev 0) +++ 0001-Fix-AppStream-metadata-validation.patch 2018-12-25 02:29:01 UTC (rev 417889) @@ -0,0 +1,47 @@ +From 24d6f2bcee83c2e9f8d68c7c6a29f91ca26243ce Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@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.chadw...@gmail.com> --> + <!-- Copyright 2014 Richard Hughes <rich...@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.chadw...@gmail.com</update_contact> +-</application> ++</component> +-- +2.20.1 + Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-12-25 02:29:00 UTC (rev 417888) +++ PKGBUILD 2018-12-25 02:29:01 UTC (rev 417889) @@ -1,37 +0,0 @@ -# $Id$ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> -# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Contributor: Jon Nordby <jono...@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-x86_64/PKGBUILD (from rev 417887, mypaint/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-12-25 02:29:01 UTC (rev 417889) @@ -0,0 +1,45 @@ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: Jon Nordby <jono...@gmail.com> + +pkgname=mypaint +pkgver=1.2.1 +pkgrel=7 +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 + 0001-Fix-AppStream-metadata-validation.patch) +validpgpkeys=('C02391F4BBA4F0E2B27C6BFF6E3037E12878B299') # Andrew Chadwick +sha256sums=('ed2349382f6a0c583d7defae06427e97ac7d14acb77b9e2c0fc7171ddd96d3c7' + 'SKIP' + '1ffa2e6e0deb236928f33c7f82cc037949e76600b5f7242f85b18380a241928b' + '5a0d1dc67a4377adf6d7e38300fcf07b11765ea7bf8866d0a28765d0522ff99b') + +prepare() { + cd $pkgname-$pkgver + # 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 + + # Don't use legacy path for AppStream metainfo file + sed -i 's|/share/appdata|/share/metainfo|' SConscript +} + +build() { + cd $pkgname-$pkgver + scons +} + +package() { + cd $pkgname-$pkgver + scons prefix="$pkgdir"/usr install +} Deleted: fix-wayland.patch =================================================================== --- fix-wayland.patch 2018-12-25 02:29:00 UTC (rev 417888) +++ fix-wayland.patch 2018-12-25 02:29:01 UTC (rev 417889) @@ -1,70 +0,0 @@ -From 037c2e791cfca4114dc75d3077d1266c2506d71c Mon Sep 17 00:00:00 2001 -From: Simon McVittie <s...@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: Copied: mypaint/repos/community-x86_64/fix-wayland.patch (from rev 417887, mypaint/trunk/fix-wayland.patch) =================================================================== --- fix-wayland.patch (rev 0) +++ fix-wayland.patch 2018-12-25 02:29:01 UTC (rev 417889) @@ -0,0 +1,70 @@ +From 037c2e791cfca4114dc75d3077d1266c2506d71c Mon Sep 17 00:00:00 2001 +From: Simon McVittie <s...@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: