[arch-commits] Commit in mypaint/trunk (PKGBUILD)

2020-11-12 Thread Evangelos Foutras via arch-commits
Date: Thursday, November 12, 2020 @ 16:59:36
  Author: foutrelis
Revision: 752152

upgpkg: mypaint 2.0.0-2: Python 3.9 rebuild

Modified:
  mypaint/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-12 16:59:33 UTC (rev 752151)
+++ PKGBUILD2020-11-12 16:59:36 UTC (rev 752152)
@@ -4,7 +4,7 @@
 
 pkgname=mypaint
 pkgver=2.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Fast and easy painting application for digital painters, with brush 
dynamics"
 arch=('x86_64')
 url="http://mypaint.org/;


[arch-commits] Commit in mypaint/trunk (PKGBUILD json-c.patch)

2020-04-25 Thread Jan Steffens via arch-commits
Date: Sunday, April 26, 2020 @ 00:27:13
  Author: heftig
Revision: 621250

1.2.1-12

Added:
  mypaint/trunk/json-c.patch
Modified:
  mypaint/trunk/PKGBUILD

--+
 PKGBUILD |8 +++-
 json-c.patch |   13 +
 2 files changed, 20 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-26 00:26:39 UTC (rev 621249)
+++ PKGBUILD2020-04-26 00:27:13 UTC (rev 621250)
@@ -4,7 +4,7 @@
 
 pkgname=mypaint
 pkgver=1.2.1
-pkgrel=11
+pkgrel=12
 pkgdesc="Fast and easy painting application for digital painters, with brush 
dynamics"
 arch=('x86_64')
 url="http://mypaint.org/;
@@ -14,6 +14,7 @@
 # requires mypaint 2.0 with libmypaint 2.0 to work dynamically
 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
@@ -21,6 +22,7 @@
 validpgpkeys=('C02391F4BBA4F0E2B27C6BFF6E3037E12878B299') # Andrew Chadwick
 sha256sums=('ed2349382f6a0c583d7defae06427e97ac7d14acb77b9e2c0fc7171ddd96d3c7'
 'SKIP'
+'cdb78e8f592bdb1862c57edbb0e287b23512203e33e398f1471d6dea3f47f772'
 '1ffa2e6e0deb236928f33c7f82cc037949e76600b5f7242f85b18380a241928b'
 '5a0d1dc67a4377adf6d7e38300fcf07b11765ea7bf8866d0a28765d0522ff99b'
 'f2f99e7d0db538eb2c9c084077e7c8ceb480911318b3c0fbf23cf9cc37bfc893'
@@ -28,6 +30,10 @@
 
 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

Added: json-c.patch
===
--- json-c.patch(rev 0)
+++ json-c.patch2020-04-26 00:27:13 UTC (rev 621250)
@@ -0,0 +1,13 @@
+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.0 
+
 mypaint-1.2.1-json-c/brushlib/mypaint-brush.c  2020-04-26 
00:23:04.098737838 +
+@@ -28,9 +28,6 @@
+ #include "rng-double.h"
+ 
+ #ifdef HAVE_JSON_C
+-// Allow the C99 define from json.h
+-#undef TRUE
+-#undef FALSE
+ #include 
+ #endif // HAVE_JSON_C
+ 


[arch-commits] Commit in mypaint/trunk (PKGBUILD)

2019-10-04 Thread Balló György via arch-commits
Date: Friday, October 4, 2019 @ 14:29:38
  Author: bgyorgy
Revision: 512736

upgpkg: mypaint 1.2.1-11

Remove conflicting files with libmypaint (FS#63663)

Modified:
  mypaint/trunk/PKGBUILD

--+
 PKGBUILD |   12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-04 14:05:15 UTC (rev 512735)
+++ PKGBUILD2019-10-04 14:29:38 UTC (rev 512736)
@@ -4,15 +4,15 @@
 
 pkgname=mypaint
 pkgver=1.2.1
-pkgrel=10
+pkgrel=11
 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')
+depends=('gtk3' 'libmypaint' 'python2-cairo' 'python2-gobject' 'python2-numpy')
 makedepends=('scons' 'swig')
 # requires mypaint 2.0 with libmypaint 2.0 to work dynamically
-conflicts=('libmypaint')
+options=('!emptydirs')
 
source=(https://github.com/mypaint/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz{,.asc}
 fix-wayland.patch
 0001-Fix-AppStream-metadata-validation.patch
@@ -38,6 +38,7 @@
 
   # 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
@@ -60,4 +61,9 @@
 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
 }


[arch-commits] Commit in mypaint/trunk (PKGBUILD mypaint-swig3.patch)

2019-09-11 Thread Eli Schwartz via arch-commits
Date: Wednesday, September 11, 2019 @ 23:39:25
  Author: eschwartz
Revision: 509329

upgpkg: mypaint 1.2.1-10

backport upstream patch to build with swig 4 -- changes location of installed 
.py files
also, compile bytecode

Modified:
  mypaint/trunk/PKGBUILD
Deleted:
  mypaint/trunk/mypaint-swig3.patch

-+
 PKGBUILD|   20 ++--
 mypaint-swig3.patch |   11 ---
 2 files changed, 14 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-09-11 21:23:31 UTC (rev 509328)
+++ PKGBUILD2019-09-11 23:39:25 UTC (rev 509329)
@@ -4,13 +4,13 @@
 
 pkgname=mypaint
 pkgver=1.2.1
-pkgrel=9
+pkgrel=10
 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' 'swig3')
+makedepends=('scons' 'swig')
 # requires mypaint 2.0 with libmypaint 2.0 to work dynamically
 conflicts=('libmypaint')
 
source=(https://github.com/mypaint/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz{,.asc}
@@ -17,7 +17,7 @@
 fix-wayland.patch
 0001-Fix-AppStream-metadata-validation.patch
 scons-python3.patch
-mypaint-swig3.patch)
+
https://github.com/mypaint/mypaint/commit/e05fc17118b6dc20adfe0652756df023528a7fc0.patch)
 validpgpkeys=('C02391F4BBA4F0E2B27C6BFF6E3037E12878B299') # Andrew Chadwick
 sha256sums=('ed2349382f6a0c583d7defae06427e97ac7d14acb77b9e2c0fc7171ddd96d3c7'
 'SKIP'
@@ -24,7 +24,7 @@
 '1ffa2e6e0deb236928f33c7f82cc037949e76600b5f7242f85b18380a241928b'
 '5a0d1dc67a4377adf6d7e38300fcf07b11765ea7bf8866d0a28765d0522ff99b'
 'f2f99e7d0db538eb2c9c084077e7c8ceb480911318b3c0fbf23cf9cc37bfc893'
-'1d76b18aee23257204d78cc6632d3723d2d882527d36ed0db0844307977edaea')
+'b2743d0d3c6d894385bb154ac1594d370adb83ba3ac9beb135c2a196934dfc3b')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -36,12 +36,13 @@
   # 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
+
   # Don't use legacy path for AppStream metainfo file
   sed -i 's|/share/appdata|/share/metainfo|' SConscript
 
   patch -p1 -i ../scons-python3.patch
-
-  patch -p1 -i ../mypaint-swig3.patch # FS#63288
 }
 
 build() {
@@ -52,4 +53,11 @@
 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)
 }

Deleted: mypaint-swig3.patch
===
--- mypaint-swig3.patch 2019-09-11 21:23:31 UTC (rev 509328)
+++ mypaint-swig3.patch 2019-09-11 23:39:25 UTC (rev 509329)
@@ -1,11 +0,0 @@
 mypaint-1.2.1/SConstruct.orig  2019-09-07 08:59:20.675785294 +
-+++ mypaint-1.2.1/SConstruct   2019-09-07 08:59:33.795961507 +
-@@ -63,7 +63,7 @@
- # patch with a suitable options switch.
- tools.append("mingw")
- 
--env = Environment(ENV=os.environ, options=opts, tools=tools)
-+env = Environment(ENV=os.environ, options=opts, tools=tools, SWIG='swig-3')
- 
- Help(opts.GenerateHelpText(env))
- 


[arch-commits] Commit in mypaint/trunk (PKGBUILD)

2019-09-07 Thread Antonio Rojas via arch-commits
Date: Saturday, September 7, 2019 @ 09:06:46
  Author: arojas
Revision: 508366

Build with swig 3 (FS#63288)

Modified:
  mypaint/trunk/PKGBUILD

--+
 PKGBUILD |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-09-07 08:54:36 UTC (rev 508365)
+++ PKGBUILD2019-09-07 09:06:46 UTC (rev 508366)
@@ -4,25 +4,27 @@
 
 pkgname=mypaint
 pkgver=1.2.1
-pkgrel=8
+pkgrel=9
 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')
+makedepends=('scons' 'swig3')
 # requires mypaint 2.0 with libmypaint 2.0 to work dynamically
 conflicts=('libmypaint')
 
source=(https://github.com/mypaint/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz{,.asc}
 fix-wayland.patch
 0001-Fix-AppStream-metadata-validation.patch
-scons-python3.patch)
+scons-python3.patch
+mypaint-swig3.patch)
 validpgpkeys=('C02391F4BBA4F0E2B27C6BFF6E3037E12878B299') # Andrew Chadwick
 sha256sums=('ed2349382f6a0c583d7defae06427e97ac7d14acb77b9e2c0fc7171ddd96d3c7'
 'SKIP'
 '1ffa2e6e0deb236928f33c7f82cc037949e76600b5f7242f85b18380a241928b'
 '5a0d1dc67a4377adf6d7e38300fcf07b11765ea7bf8866d0a28765d0522ff99b'
-'f2f99e7d0db538eb2c9c084077e7c8ceb480911318b3c0fbf23cf9cc37bfc893')
+'f2f99e7d0db538eb2c9c084077e7c8ceb480911318b3c0fbf23cf9cc37bfc893'
+'1d76b18aee23257204d78cc6632d3723d2d882527d36ed0db0844307977edaea')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -38,6 +40,8 @@
   sed -i 's|/share/appdata|/share/metainfo|' SConscript
 
   patch -p1 -i ../scons-python3.patch
+
+  patch -p1 -i ../mypaint-swig3.patch # FS#63288
 }
 
 build() {


[arch-commits] Commit in mypaint/trunk (PKGBUILD)

2019-09-06 Thread Levente Polyak via arch-commits
Date: Friday, September 6, 2019 @ 14:10:19
  Author: anthraxx
Revision: 508277

upgpkg: mypaint 1.2.1-8 conflict with libmypaint

Since libmypaint is packages like upstream expects, it conflicts with mypaint.
There is no good way to make it co-installable unless we get pymaint 2.0 which
requires libmypaint 2.0. Currently both are alpha.
Revisit once both are released.

Modified:
  mypaint/trunk/PKGBUILD

--+
 PKGBUILD |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-09-06 10:29:42 UTC (rev 508276)
+++ PKGBUILD2019-09-06 14:10:19 UTC (rev 508277)
@@ -4,7 +4,7 @@
 
 pkgname=mypaint
 pkgver=1.2.1
-pkgrel=7
+pkgrel=8
 pkgdesc="Fast and easy painting application for digital painters, with brush 
dynamics"
 arch=('x86_64')
 url="http://mypaint.org/;
@@ -11,6 +11,8 @@
 license=('GPL')
 depends=('gtk3' 'python2-cairo' 'python2-gobject' 'python2-numpy')
 makedepends=('scons' 'swig')
+# requires mypaint 2.0 with libmypaint 2.0 to work dynamically
+conflicts=('libmypaint')
 
source=(https://github.com/mypaint/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz{,.asc}
 fix-wayland.patch
 0001-Fix-AppStream-metadata-validation.patch


[arch-commits] Commit in mypaint/trunk (PKGBUILD scons-python3.patch)

2019-07-27 Thread Antonio Rojas via arch-commits
Date: Saturday, July 27, 2019 @ 08:24:56
  Author: arojas
Revision: 493078

Fix build with python3 scons

Added:
  mypaint/trunk/scons-python3.patch
Modified:
  mypaint/trunk/PKGBUILD

-+
 PKGBUILD|   12 ++-
 scons-python3.patch |  171 ++
 2 files changed, 179 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-07-27 07:14:10 UTC (rev 493077)
+++ PKGBUILD2019-07-27 08:24:56 UTC (rev 493078)
@@ -13,12 +13,14 @@
 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)
+0001-Fix-AppStream-metadata-validation.patch
+scons-python3.patch)
 validpgpkeys=('C02391F4BBA4F0E2B27C6BFF6E3037E12878B299') # Andrew Chadwick
 sha256sums=('ed2349382f6a0c583d7defae06427e97ac7d14acb77b9e2c0fc7171ddd96d3c7'
 'SKIP'
 '1ffa2e6e0deb236928f33c7f82cc037949e76600b5f7242f85b18380a241928b'
-'5a0d1dc67a4377adf6d7e38300fcf07b11765ea7bf8866d0a28765d0522ff99b')
+'5a0d1dc67a4377adf6d7e38300fcf07b11765ea7bf8866d0a28765d0522ff99b'
+'f2f99e7d0db538eb2c9c084077e7c8ceb480911318b3c0fbf23cf9cc37bfc893')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -32,14 +34,16 @@
 
   # Don't use legacy path for AppStream metainfo file
   sed -i 's|/share/appdata|/share/metainfo|' SConscript
+
+  patch -p1 -i ../scons-python3.patch
 }
 
 build() {
   cd $pkgname-$pkgver
-  scons
+  scons python_binary=python2 python_config=python2-config
 }
 
 package() {
   cd $pkgname-$pkgver
-  scons prefix="$pkgdir"/usr install
+  scons prefix="$pkgdir"/usr install python_binary=python2 
python_config=python2-config
 }

Added: scons-python3.patch
===
--- scons-python3.patch (rev 0)
+++ scons-python3.patch 2019-07-27 08:24:56 UTC (rev 493078)
@@ -0,0 +1,171 @@
+--- mypaint-1.2.1/SConstruct.orig  2019-07-27 06:58:18.369247493 +
 mypaint-1.2.1/SConstruct   2019-07-27 06:59:01.299843987 +
+@@ -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 
+
 mypaint-1.2.1/brushlib/SConscript  2019-07-27 07:12:35.081442001 +
+@@ -81,8 +81,8 @@
+ if env['enable_introspection']:
+ env['use_glib'] = True
+ 

[arch-commits] Commit in mypaint/trunk (PKGBUILD)

2018-06-03 Thread Felix Yan via arch-commits
Date: Sunday, June 3, 2018 @ 17:03:43
  Author: felixonmars
Revision: 339409

upgpkg: mypaint 1.2.1-6

json-c 0.13.1 rebuild

Modified:
  mypaint/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-06-03 17:00:30 UTC (rev 339408)
+++ PKGBUILD2018-06-03 17:03:43 UTC (rev 339409)
@@ -5,7 +5,7 @@
 
 pkgname=mypaint
 pkgver=1.2.1
-pkgrel=5
+pkgrel=6
 pkgdesc="Fast and easy painting application for digital painters, with brush 
dynamics"
 arch=('x86_64')
 url="http://mypaint.org/;
@@ -15,9 +15,9 @@
 
source=(https://github.com/mypaint/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz{,.asc}
 fix-wayland.patch)
 validpgpkeys=('C02391F4BBA4F0E2B27C6BFF6E3037E12878B299') # Andrew Chadwick
-sha256sums=('ed2349382f6a0c583d7defae06427e97ac7d14acb77b9e2c0fc7171ddd96d3c7'
+sha512sums=('1783765e495b9535669a83a29d27ba684e6201fdfe0875bdd2c167b1dab8af05993b19025767fe0b2770ed9e578e4709f75d8a4820ac945812cba85609f9eb9b'
 'SKIP'
-'1ffa2e6e0deb236928f33c7f82cc037949e76600b5f7242f85b18380a241928b')
+
'8aa0b865c577400039eeba5f7b54d8db4e4baa6e395691db080d43ca803a793e549cb7f5396a2f6a58fa60de8614f9d84cd1b0f55dc71699b685daf2beb2ef9c')
 
 prepare() {
   cd $pkgname-$pkgver


[arch-commits] Commit in mypaint/trunk (PKGBUILD)

2018-05-03 Thread Balló György via arch-commits
Date: Thursday, May 3, 2018 @ 12:15:57
  Author: bgyorgy
Revision: 318854

Use PGP signature of the released archive

Modified:
  mypaint/trunk/PKGBUILD

--+
 PKGBUILD |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-05-03 11:12:51 UTC (rev 318853)
+++ PKGBUILD2018-05-03 12:15:57 UTC (rev 318854)
@@ -12,9 +12,11 @@
 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
+source=(https://github.com/mypaint/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz{,.asc}
 fix-wayland.patch)
+validpgpkeys=('C02391F4BBA4F0E2B27C6BFF6E3037E12878B299') # Andrew Chadwick
 sha256sums=('ed2349382f6a0c583d7defae06427e97ac7d14acb77b9e2c0fc7171ddd96d3c7'
+'SKIP'
 '1ffa2e6e0deb236928f33c7f82cc037949e76600b5f7242f85b18380a241928b')
 
 prepare() {


[arch-commits] Commit in mypaint/trunk (PKGBUILD)

2018-01-20 Thread Balló György via arch-commits
Date: Sunday, January 21, 2018 @ 01:01:13
  Author: bgyorgy
Revision: 284475

mypaint: minor change

Modified:
  mypaint/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-01-21 00:57:00 UTC (rev 284474)
+++ PKGBUILD2018-01-21 01:01:13 UTC (rev 284475)
@@ -6,7 +6,7 @@
 pkgname=mypaint
 pkgver=1.2.1
 pkgrel=5
-pkgdesc="A fast and easy painting application for digital painters, with brush 
dynamics"
+pkgdesc="Fast and easy painting application for digital painters, with brush 
dynamics"
 arch=('x86_64')
 url="http://mypaint.org/;
 license=('GPL')


[arch-commits] Commit in mypaint/trunk (PKGBUILD fix-wayland.patch)

2018-01-20 Thread Balló György via arch-commits
Date: Sunday, January 21, 2018 @ 00:56:29
  Author: bgyorgy
Revision: 284473

upgpkg: mypaint 1.2.1-5

Adopt the package, fix run under wayland (FS#53876)

Added:
  mypaint/trunk/fix-wayland.patch
Modified:
  mypaint/trunk/PKGBUILD

---+
 PKGBUILD  |   28 ++--
 fix-wayland.patch |   70 
 2 files changed, 89 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-01-21 00:10:14 UTC (rev 284472)
+++ PKGBUILD2018-01-21 00:56:29 UTC (rev 284473)
@@ -1,25 +1,35 @@
 # $Id$
-# Maintainer: Sergej Pupykin 
+# Maintainer: Balló György 
+# Contributor: Sergej Pupykin 
 # Contributor: Jon Nordby 
 
 pkgname=mypaint
 pkgver=1.2.1
-pkgrel=4
+pkgrel=5
 pkgdesc="A fast and easy painting application for digital painters, with brush 
dynamics"
 arch=('x86_64')
 url="http://mypaint.org/;
-license=('GPL' 'LGPL')
-depends=('gtk3' 'json-c' 'lcms2' 'python2-cairo' 'python2-gobject' 
'python2-numpy')
-makedepends=('scons>=0.97' 'swig>=1.3.39')
-source=(https://github.com/mypaint/mypaint/releases/download/v$pkgver/mypaint-$pkgver.tar.xz)
-sha256sums=('ed2349382f6a0c583d7defae06427e97ac7d14acb77b9e2c0fc7171ddd96d3c7')
+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
+fix-wayland.patch)
+sha256sums=('ed2349382f6a0c583d7defae06427e97ac7d14acb77b9e2c0fc7171ddd96d3c7'
+'1ffa2e6e0deb236928f33c7f82cc037949e76600b5f7242f85b18380a241928b')
 
+prepare() {
+  cd $pkgname-$pkgver
+  # Fix run under wayland
+  # https://github.com/mypaint/mypaint/issues/791
+  patch -Np1 -i ../fix-wayland.patch
+}
+
 build() {
-  cd "$srcdir"/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   scons
 }
 
 package() {
-  cd "$srcdir"/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   scons prefix="$pkgdir"/usr install
 }

Added: fix-wayland.patch
===
--- fix-wayland.patch   (rev 0)
+++ fix-wayland.patch   2018-01-21 00:56:29 UTC (rev 284473)
@@ -0,0 +1,70 @@
+From 037c2e791cfca4114dc75d3077d1266c2506d71c Mon Sep 17 00:00:00 2001
+From: Simon McVittie 
+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.
+ 

[arch-commits] Commit in mypaint/trunk (PKGBUILD)

2017-12-24 Thread Jelle van der Waa via arch-commits
Date: Sunday, December 24, 2017 @ 21:16:59
  Author: jelle
Revision: 275859

upgpkg: mypaint 1.2.1-4

json-c 0.13 rebuild

Modified:
  mypaint/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-12-24 20:48:45 UTC (rev 275858)
+++ PKGBUILD2017-12-24 21:16:59 UTC (rev 275859)
@@ -4,7 +4,7 @@
 
 pkgname=mypaint
 pkgver=1.2.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A fast and easy painting application for digital painters, with brush 
dynamics"
 arch=('x86_64')
 url="http://mypaint.org/;


[arch-commits] Commit in mypaint/trunk (PKGBUILD)

2017-07-10 Thread Sergej Pupykin
Date: Monday, July 10, 2017 @ 14:35:56
  Author: spupykin
Revision: 243665

upgpkg: mypaint 1.2.1-3: PIE rebuild

Modified:
  mypaint/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-07-10 14:35:47 UTC (rev 243664)
+++ PKGBUILD2017-07-10 14:35:56 UTC (rev 243665)
@@ -4,7 +4,7 @@
 
 pkgname=mypaint
 pkgver=1.2.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A fast and easy painting application for digital painters, with brush 
dynamics"
 arch=('i686' 'x86_64')
 url="http://mypaint.org/;


[arch-commits] Commit in mypaint/trunk (PKGBUILD)

2017-02-17 Thread Balló György
Date: Saturday, February 18, 2017 @ 00:25:40
  Author: bgyorgy
Revision: 212991

upgpkg: mypaint 1.2.1-2

Remove unused dependencies

Modified:
  mypaint/trunk/PKGBUILD

--+
 PKGBUILD |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-17 22:45:25 UTC (rev 212990)
+++ PKGBUILD2017-02-18 00:25:40 UTC (rev 212991)
@@ -4,13 +4,12 @@
 
 pkgname=mypaint
 pkgver=1.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A fast and easy painting application for digital painters, with brush 
dynamics"
 arch=('i686' 'x86_64')
 url="http://mypaint.org/;
 license=('GPL' 'LGPL')
-depends=('pygtk' 'python2-numpy' 'python2-protobuf' 'python2' 'json-c'
-'lcms2' 'python2-gobject' 'gtk3' 'hicolor-icon-theme')
+depends=('gtk3' 'json-c' 'lcms2' 'python2-cairo' 'python2-gobject' 
'python2-numpy')
 makedepends=('scons>=0.97' 'swig>=1.3.39')
 
source=(https://github.com/mypaint/mypaint/releases/download/v$pkgver/mypaint-$pkgver.tar.xz)
 sha256sums=('ed2349382f6a0c583d7defae06427e97ac7d14acb77b9e2c0fc7171ddd96d3c7')


[arch-commits] Commit in mypaint/trunk (PKGBUILD)

2017-02-06 Thread Sergej Pupykin
Date: Monday, February 6, 2017 @ 12:24:59
  Author: spupykin
Revision: 210395

upgpkg: mypaint 1.2.1-1

upd

Modified:
  mypaint/trunk/PKGBUILD

--+
 PKGBUILD |   15 ---
 1 file changed, 4 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-06 12:24:54 UTC (rev 210394)
+++ PKGBUILD2017-02-06 12:24:59 UTC (rev 210395)
@@ -3,8 +3,8 @@
 # Contributor: Jon Nordby 
 
 pkgname=mypaint
-pkgver=1.2.0
-pkgrel=5
+pkgver=1.2.1
+pkgrel=1
 pkgdesc="A fast and easy painting application for digital painters, with brush 
dynamics"
 arch=('i686' 'x86_64')
 url="http://mypaint.org/;
@@ -12,16 +12,9 @@
 depends=('pygtk' 'python2-numpy' 'python2-protobuf' 'python2' 'json-c'
 'lcms2' 'python2-gobject' 'gtk3' 'hicolor-icon-theme')
 makedepends=('scons>=0.97' 'swig>=1.3.39')
-source=(https://github.com/mypaint/mypaint/releases/download/v$pkgver/mypaint-$pkgver.tar.xz
-   
https://github.com/mypaint/mypaint/commit/c03602f3d5456d59fccfc8ad7d41c8c6f1a6d593.patch)
-md5sums=('c7c2cfac8e1eec5549e58567ec68daac'
- 'e196d8ea9eb9e939118a17c04678a69a')
+source=(https://github.com/mypaint/mypaint/releases/download/v$pkgver/mypaint-$pkgver.tar.xz)
+sha256sums=('ed2349382f6a0c583d7defae06427e97ac7d14acb77b9e2c0fc7171ddd96d3c7')
 
-prepare() {
-  cd "$srcdir"/$pkgname-$pkgver
-  patch -p1 <"$srcdir"/c03602f3d5456d59fccfc8ad7d41c8c6f1a6d593.patch
-}
-
 build() {
   cd "$srcdir"/$pkgname-$pkgver
   scons


[arch-commits] Commit in mypaint/trunk (PKGBUILD)

2016-12-23 Thread Sergej Pupykin
Date: Friday, December 23, 2016 @ 10:41:19
  Author: spupykin
Revision: 201242

upgpkg: mypaint 1.2.0-5

upd

Modified:
  mypaint/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-12-23 09:11:54 UTC (rev 201241)
+++ PKGBUILD2016-12-23 10:41:19 UTC (rev 201242)
@@ -4,13 +4,13 @@
 
 pkgname=mypaint
 pkgver=1.2.0
-pkgrel=4
+pkgrel=5
 pkgdesc="A fast and easy painting application for digital painters, with brush 
dynamics"
 arch=('i686' 'x86_64')
 url="http://mypaint.org/;
 license=('GPL' 'LGPL')
 depends=('pygtk' 'python2-numpy' 'python2-protobuf' 'python2' 'json-c'
-'lcms2' 'python2-gobject' 'gtk3')
+'lcms2' 'python2-gobject' 'gtk3' 'hicolor-icon-theme')
 makedepends=('scons>=0.97' 'swig>=1.3.39')
 
source=(https://github.com/mypaint/mypaint/releases/download/v$pkgver/mypaint-$pkgver.tar.xz

https://github.com/mypaint/mypaint/commit/c03602f3d5456d59fccfc8ad7d41c8c6f1a6d593.patch)


[arch-commits] Commit in mypaint/trunk (PKGBUILD)

2016-11-18 Thread Sergej Pupykin
Date: Friday, November 18, 2016 @ 10:50:26
  Author: spupykin
Revision: 196298

upgpkg: mypaint 1.2.0-4

upd

Modified:
  mypaint/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-18 10:43:24 UTC (rev 196297)
+++ PKGBUILD2016-11-18 10:50:26 UTC (rev 196298)
@@ -4,12 +4,12 @@
 
 pkgname=mypaint
 pkgver=1.2.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A fast and easy painting application for digital painters, with brush 
dynamics"
 arch=('i686' 'x86_64')
 url="http://mypaint.org/;
 license=('GPL' 'LGPL')
-depends=('pygtk' 'python2-numpy' 'protobuf-python' 'python2' 'json-c'
+depends=('pygtk' 'python2-numpy' 'python2-protobuf' 'python2' 'json-c'
 'lcms2' 'python2-gobject' 'gtk3')
 makedepends=('scons>=0.97' 'swig>=1.3.39')
 
source=(https://github.com/mypaint/mypaint/releases/download/v$pkgver/mypaint-$pkgver.tar.xz


[arch-commits] Commit in mypaint/trunk (PKGBUILD)

2016-04-27 Thread Sergej Pupykin
Date: Thursday, April 28, 2016 @ 01:09:32
  Author: spupykin
Revision: 172300

upgpkg: mypaint 1.2.0-3

upd

Modified:
  mypaint/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-27 23:09:28 UTC (rev 172299)
+++ PKGBUILD2016-04-27 23:09:32 UTC (rev 172300)
@@ -4,7 +4,7 @@
 
 pkgname=mypaint
 pkgver=1.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A fast and easy painting application for digital painters, with brush 
dynamics"
 arch=('i686' 'x86_64')
 url="http://mypaint.org/;


[arch-commits] Commit in mypaint/trunk (PKGBUILD)

2016-04-14 Thread Sergej Pupykin
Date: Thursday, April 14, 2016 @ 19:06:33
  Author: spupykin
Revision: 171064

upgpkg: mypaint 1.2.0-2

upd

Modified:
  mypaint/trunk/PKGBUILD

--+
 PKGBUILD |   13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-14 17:06:29 UTC (rev 171063)
+++ PKGBUILD2016-04-14 17:06:33 UTC (rev 171064)
@@ -4,7 +4,7 @@
 
 pkgname=mypaint
 pkgver=1.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A fast and easy painting application for digital painters, with brush 
dynamics"
 arch=('i686' 'x86_64')
 url="http://mypaint.org/;
@@ -13,9 +13,16 @@
 'lcms2' 'python2-gobject' 'gtk3')
 makedepends=('scons>=0.97' 'swig>=1.3.39')
 install=mypaint.install
-source=(https://github.com/mypaint/mypaint/releases/download/v$pkgver/mypaint-$pkgver.tar.xz)
-md5sums=('c7c2cfac8e1eec5549e58567ec68daac')
+source=(https://github.com/mypaint/mypaint/releases/download/v$pkgver/mypaint-$pkgver.tar.xz
+   
https://github.com/mypaint/mypaint/commit/c03602f3d5456d59fccfc8ad7d41c8c6f1a6d593.patch)
+md5sums=('c7c2cfac8e1eec5549e58567ec68daac'
+ 'e196d8ea9eb9e939118a17c04678a69a')
 
+prepare() {
+  cd $srcdir/$pkgname-$pkgver
+  patch -p1 <$srcdir/c03602f3d5456d59fccfc8ad7d41c8c6f1a6d593.patch
+}
+
 build() {
   cd $srcdir/$pkgname-$pkgver
   scons


[arch-commits] Commit in mypaint/trunk (PKGBUILD mypaint.install)

2016-01-16 Thread Sergej Pupykin
Date: Saturday, January 16, 2016 @ 16:31:50
  Author: spupykin
Revision: 156993

upgpkg: mypaint 1.2.0-1

upd

Modified:
  mypaint/trunk/PKGBUILD
  mypaint/trunk/mypaint.install

-+
 PKGBUILD|   24 +++-
 mypaint.install |2 +-
 2 files changed, 8 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-01-16 13:05:41 UTC (rev 156992)
+++ PKGBUILD2016-01-16 15:31:50 UTC (rev 156993)
@@ -3,29 +3,19 @@
 # Contributor: Jon Nordby 
 
 pkgname=mypaint
-pkgver=1.1.0
-pkgrel=5
+pkgver=1.2.0
+pkgrel=1
 pkgdesc="A fast and easy painting application for digital painters, with brush 
dynamics"
 arch=('i686' 'x86_64')
-url="http://mypaint.intilinux.com/;
+url="http://mypaint.org/;
 license=('GPL' 'LGPL')
-depends=('pygtk' 'python2-numpy' 'protobuf-python' 'python2' 'json-c' 'lcms2')
+depends=('pygtk' 'python2-numpy' 'protobuf-python' 'python2' 'json-c'
+'lcms2' 'python2-gobject' 'gtk3')
 makedepends=('scons>=0.97' 'swig>=1.3.39')
 install=mypaint.install
-source=(http://download.gna.org/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('7846a8406259d0fc81c9a2157a2348bf')
+source=(https://github.com/mypaint/mypaint/releases/download/v$pkgver/mypaint-$pkgver.tar.xz)
+md5sums=('c7c2cfac8e1eec5549e58567ec68daac')
 
-prepare() {
-  cd $srcdir/$pkgname-$pkgver
-  # python2 fix
-  sed -i 's_python generate.py_python2 generate.py_' brushlib/SConscript
-  for file in $(find . -name '*.py' -print); do
-sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
-sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
-  done
-  sed -i "s|'json|'json-c|" brushlib/SConscript
-}
-
 build() {
   cd $srcdir/$pkgname-$pkgver
   scons

Modified: mypaint.install
===
--- mypaint.install 2016-01-16 13:05:41 UTC (rev 156992)
+++ mypaint.install 2016-01-16 15:31:50 UTC (rev 156993)
@@ -1,7 +1,7 @@
 post_install() {
[ -x `which update-mime-database` ] &&  update-mime-database 
usr/share/mime
[ -x `which gtk-update-icon-cache` ] && gtk-update-icon-cache -q -t -f 
usr/share/icons/hicolor
-   /bin/true
+   bin/true
 }
 
 post_upgrade() {


[arch-commits] Commit in mypaint/trunk (PKGBUILD)

2015-12-06 Thread Bartłomiej Piotrowski
Date: Monday, December 7, 2015 @ 00:47:04
  Author: bpiotrowski
Revision: 149382

C++11 ABI rebuild

Modified:
  mypaint/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-06 23:46:10 UTC (rev 149381)
+++ PKGBUILD2015-12-06 23:47:04 UTC (rev 149382)
@@ -4,7 +4,7 @@
 
 pkgname=mypaint
 pkgver=1.1.0
-pkgrel=4
+pkgrel=5
 pkgdesc="A fast and easy painting application for digital painters, with brush 
dynamics"
 arch=('i686' 'x86_64')
 url="http://mypaint.intilinux.com/;


[arch-commits] Commit in mypaint/trunk (PKGBUILD)

2014-05-26 Thread Sergej Pupykin
Date: Monday, May 26, 2014 @ 12:18:20
  Author: spupykin
Revision: 111884

json-c 0.12 fix

Modified:
  mypaint/trunk/PKGBUILD

--+
 PKGBUILD |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-05-26 09:30:13 UTC (rev 111883)
+++ PKGBUILD2014-05-26 10:18:20 UTC (rev 111884)
@@ -4,7 +4,7 @@
 
 pkgname=mypaint
 pkgver=1.1.0
-pkgrel=3
+pkgrel=4
 pkgdesc=A fast and easy painting application for digital painters, with brush 
dynamics
 arch=('i686' 'x86_64')
 url=http://mypaint.intilinux.com/;
@@ -15,7 +15,7 @@
 source=(http://download.gna.org/$pkgname/$pkgname-$pkgver.tar.bz2)
 md5sums=('7846a8406259d0fc81c9a2157a2348bf')
 
-build() {
+prepare() {
   cd $srcdir/$pkgname-$pkgver
   # python2 fix
   sed -i 's_python generate.py_python2 generate.py_' brushlib/SConscript
@@ -23,6 +23,11 @@
 sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
 sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
   done
+  sed -i s|'json|'json-c| brushlib/SConscript
+}
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
   scons
 }
 



[arch-commits] Commit in mypaint/trunk (PKGBUILD)

2013-11-02 Thread Sergej Pupykin
Date: Saturday, November 2, 2013 @ 09:42:40
  Author: spupykin
Revision: 100252

upgpkg: mypaint 1.1.0-3

upd

Modified:
  mypaint/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-11-02 08:42:36 UTC (rev 100251)
+++ PKGBUILD2013-11-02 08:42:40 UTC (rev 100252)
@@ -4,7 +4,7 @@
 
 pkgname=mypaint
 pkgver=1.1.0
-pkgrel=2
+pkgrel=3
 pkgdesc=A fast and easy painting application for digital painters, with brush 
dynamics
 arch=('i686' 'x86_64')
 url=http://mypaint.intilinux.com/;



[arch-commits] Commit in mypaint/trunk (PKGBUILD)

2013-04-29 Thread Sergej Pupykin
Date: Monday, April 29, 2013 @ 17:30:14
  Author: spupykin
Revision: 89493

upgpkg: mypaint 1.1.0-2

upd

Modified:
  mypaint/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-29 15:30:05 UTC (rev 89492)
+++ PKGBUILD2013-04-29 15:30:14 UTC (rev 89493)
@@ -4,7 +4,7 @@
 
 pkgname=mypaint
 pkgver=1.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc=A fast and easy painting application for digital painters, with brush 
dynamics
 arch=('i686' 'x86_64')
 url=http://mypaint.intilinux.com/;