Updated Version and Dependencies

4 files changed, 106 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 13436f52505b..a680ad84e345 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = mypaint-git
 	pkgdesc = Simple drawing & painting program that works well with graphics tablets (git).
-	pkgver = 2.0.0.master.r6054.90b36dbc
+	pkgver = 2.0.0.main.r6208.8187b1e2
 	pkgrel = 1
 	url = http://mypaint.org/
-	install = mypaint-git.install
 	arch = i686
 	arch = x86_64
 	license = GPL2
@@ -12,7 +11,6 @@ pkgbase = mypaint-git
 	makedepends = pygobject-devel
 	makedepends = python
 	makedepends = python-setuptools
-	depends = desktop-file-utils
 	depends = gtk3
 	depends = json-c
 	depends = lcms2
@@ -21,11 +19,11 @@ pkgbase = mypaint-git
 	depends = python-gobject
 	depends = python-numpy
 	depends = mypaint-brushes-git
-	provides = mypaint=2.0.0.master
+	provides = mypaint=2.0.0.main
 	conflicts = mypaint
 	source = git+https://github.com/mypaint/mypaint.git
-	source = mypaint-git.install
+	source = radius_lock.patch
 	sha256sums = SKIP
-	sha256sums = 34dec9df2e005de9fae6c6352f49835a1d41e515c6131ed1df8c9e27ee3c9d1d
+	sha256sums = 922cd92ba2a96691d45694c78c4ca26a104f011d2477b8a4581c1e45d45c4f58
 
 pkgname = mypaint-git
diff --git a/PKGBUILD b/PKGBUILD
index e9144b0963c5..262c2302ba3e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,21 +3,20 @@
 # Contributor: Jon Nordby <jononor@gmail.com>
 # Contributor: mosra <mosra@centrum.cz>
 
-_basever=2.0.0.master
+_basever=2.0.0.main
 pkgname=mypaint-git
-pkgver=2.0.0.master.r6054.90b36dbc
+pkgver=2.0.0.main.r6208.8187b1e2
 pkgrel=1
 pkgdesc="Simple drawing & painting program that works well with graphics tablets (git)."
 arch=('i686' 'x86_64')
 url="http://mypaint.org/"
-license=('GPL2')
-depends=('desktop-file-utils' 'gtk3' 'json-c' 'lcms2' 'librsvg' 'python-cairo' 'python-gobject' 'python-numpy' 'mypaint-brushes-git')
+license=('GPL-2.0-only')
+depends=('gtk3' 'json-c' 'lcms2' 'librsvg' 'python-cairo' 'python-gobject' 'python-numpy' 'mypaint-brushes-git')
 makedepends=('git' 'swig' 'pygobject-devel' 'python' 'python-setuptools')
 provides=("mypaint=${_basever}")
 conflicts=('mypaint')
-install=mypaint-git.install
 source=('git+https://github.com/mypaint/mypaint.git'
-        'mypaint-git.install')
+        'radius_lock.patch')
 
 pkgver() {
     cd "${srcdir}/mypaint"
@@ -26,6 +25,7 @@ pkgver() {
 
 prepare() {
     cd "${srcdir}/mypaint"
+    patch --forward --strip=1 --input="${srcdir}/radius_lock.patch"
     export CFLAGS='-Ofast -ftree-vectorize -fopt-info-vec-optimized -march=native -mtune=native -funsafe-math-optimizations -funsafe-loop-optimizations'
 }
 
@@ -46,4 +46,4 @@ package() {
 }
 
 sha256sums=('SKIP'
-            '34dec9df2e005de9fae6c6352f49835a1d41e515c6131ed1df8c9e27ee3c9d1d')
+            '922cd92ba2a96691d45694c78c4ca26a104f011d2477b8a4581c1e45d45c4f58')
diff --git a/mypaint-git.install b/mypaint-git.install
deleted file mode 100644
index a83c8e8f7aad..000000000000
--- a/mypaint-git.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	update-mime-database usr/share/mime
-	update-desktop-database -q
-	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-	post_install $1
-}
-
-post_remove() {
-	post_install $1
-}
diff --git a/radius_lock.patch b/radius_lock.patch
new file mode 100644
index 000000000000..b1e405916988
--- /dev/null
+++ b/radius_lock.patch
@@ -0,0 +1,95 @@
+diff --git a/gui/brushmodifier.py b/gui/brushmodifier.py
+index f2b46e95..6a5a609f 100644
+--- a/gui/brushmodifier.py
++++ b/gui/brushmodifier.py
+@@ -96,12 +96,20 @@ class BrushModifier (object):
+         b = self.app.brush
+         prev_lock_alpha = b.is_alpha_locked()
+ 
++        lock_radius = self.app.preferences['misc.context_lock_radius']
++        if lock_radius:
++            prev_radius = b.get_base_value('radius_logarithmic')
++
+         # Changing the effective brush
+         b.begin_atomic()
+         color = b.get_color_hsv()
+ 
+         mix_old = b.get_base_value('restore_color')
+         b.load_from_brushinfo(brushinfo)
++
++        if lock_radius:
++            b.set_base_value('radius_logarithmic', prev_radius)
++
+         self.unmodified_brushinfo = b.clone()
+ 
+         # Preserve color
+diff --git a/gui/document.py b/gui/document.py
+index 047fca9e..ff911ba4 100644
+--- a/gui/document.py
++++ b/gui/document.py
+@@ -354,6 +354,11 @@ class Document (CanvasController):  # TODO: rename to "DocumentController"
+             toggle_action.set_active(
+                 self.app.preferences['misc.context_restores_color']
+             )
++            
++            toggle_action = self.app.builder.get_object('ContextLockRadius')
++            toggle_action.set_active(
++                self.app.preferences['misc.context_lock_radius']
++            )
+ 
+         #: Saved transformation to allow FitView to be toggled.
+         self.saved_view = None
+@@ -1686,6 +1691,11 @@ class Document (CanvasController):  # TODO: rename to "DocumentController"
+         value = bool(action.get_active())
+         self.app.preferences['misc.context_restores_color'] = value
+ 
++    def context_toggle_lock_radius_cb(self, action):
++        """GtkToggleAction callback for whether the radius is locked between brush changes"""
++        value = bool(action.get_active())
++        self.app.preferences['misc.context_lock_radius'] = value
++
+     ## UI feedback for current layer/stroke
+ 
+     def strokeblink_state_enter(self, strokeshape, bbox, center):
+diff --git a/gui/menu.xml b/gui/menu.xml
+index eab7a7d1..c20d6759 100644
+--- a/gui/menu.xml
++++ b/gui/menu.xml
+@@ -142,6 +142,7 @@
+         <menuitem action='Context09s'/>
+       </menu>
+       <menuitem action='PickContext'/>
++      <menuitem action='ContextLockRadius'/>
+       <!-- Brush pack import -->
+       <separator/>
+       <menuitem action='ImportBrushPack'/>
+diff --git a/gui/resources.xml b/gui/resources.xml
+index a0641e5e..1812dc35 100644
+--- a/gui/resources.xml
++++ b/gui/resources.xml
+@@ -385,6 +385,13 @@ Vocabulary
+         </object>
+         <accelerator key="grave"/>
+       </child>
++      <child>
++        <object class="GtkToggleAction" id="ContextLockRadius">
++          <property name="label" translatable="yes" context="Menu→Brush">Lock Radius</property>
++          <property name="tooltip" translatable="yes" context="Accel Editor (descriptions)">Toggle whether changing the brush should keep current radius.</property>
++          <signal name="activate" handler="context_toggle_lock_radius_cb"/>
++        </object>
++      </child>
+       <child>
+         <object class="GtkAction" id="ContextStore">
+           <property name="label" translatable="yes" context="Menu→Brush→Shortcut Keys (labels), Accel Editor (labels)">Save Brush to Most Recent Shortcut Key</property>
+diff --git a/gui/userconfig.py b/gui/userconfig.py
+index 582d7f13..9de0c696 100644
+--- a/gui/userconfig.py
++++ b/gui/userconfig.py
+@@ -91,6 +91,7 @@ def default_configuration():
+         'brushmanager.selected_groups': [],
+         'frame.color_rgba': (0.12, 0.12, 0.12, 0.92),
+         'misc.context_restores_color': True,
++        'misc.context_lock_radius': False,
+ 
+         'document.autosave_backups': True,
+         'document.autosave_interval': 10,