* [bug#34283] [PATCH]Add: mypaint
2019-02-02 4:44 [bug#34283] [PATCH]Add: mypaint Yoshinori Arai
@ 2019-02-05 5:43 ` swedebugia
2019-02-05 5:52 ` [bug#34283] [PATCH] Add: mypaint Maxim Cournoyer
` (6 subsequent siblings)
7 siblings, 0 replies; 20+ messages in thread
From: swedebugia @ 2019-02-05 5:43 UTC (permalink / raw)
To: 34283, kumagusu08
Yoshinori Arai <kumagusu08@gmail.com> skrev: (2 februari 2019 05:44:21 CET)
>Hello,
>
>I made mypaint package from git version.
>libmypaint-git,
Why the git version, is there no stable release?
> mypaint-brushes-git may be conflict with gimp package.
Could you elaborate? What do you mean by conflict?
>
>From c9d5b440a6affccd0852e8686482b64aaef06bea Mon Sep 17 00:00:00 2001
>From: Yoshinori Arai <kumagusu08@gmail.com>
>Date: Sat, 2 Feb 2019 13:23:33 +0900
>Subject: [PATCH] Add: mypaint
>
>---
> gnu/packages/mypaint.scm | 132
Why did you create a new file? I suggest putting it in graphics.scm
Hi 😃
--
Sent from my k-9 mail for Android.
^ permalink raw reply [flat|nested] 20+ messages in thread* [bug#34283] [PATCH] Add: mypaint
2019-02-02 4:44 [bug#34283] [PATCH]Add: mypaint Yoshinori Arai
2019-02-05 5:43 ` swedebugia
@ 2019-02-05 5:52 ` Maxim Cournoyer
2019-02-05 9:23 ` Yoshinori Arai
2019-02-05 11:42 ` [bug#34283] [PATCH]Add: mypaint Björn Höfling
` (5 subsequent siblings)
7 siblings, 1 reply; 20+ messages in thread
From: Maxim Cournoyer @ 2019-02-05 5:52 UTC (permalink / raw)
To: Yoshinori Arai; +Cc: 34283
Hello Yoshinori!
Yoshinori Arai <kumagusu08@gmail.com> writes:
> Hello,
>
> I made mypaint package from git version.
> libmypaint-git, mypaint-brushes-git may be conflict with gimp package.
In Guix, we can have multiple versions of the software without changing
its name (it's one of the advantages of a functional package manager
:-). In general, we package the latest release available from
upstream, unless there is a good justification to do otherwise.
Was there a reason to prefer the git snapshots over normal releases of
mypaint, libmypaint and mypaint-brushes in Guix? I see that the latest
release for mypaint-brushes was released only a couple days ago (2.0.1);
unless there is a reason, it would be preferable to use this tagged
released rather than some random commit.
In this case, since it seems the only dependent of mypaint is Gimp and
since Gimp requires a specific version, (its configure.ac [0] mentions
mypaint-brusesh 1.3.0, although Arch seems to work around it [1]), I'd
go with a public variable named mypaint-brushes-2 for the new
definition, leaving the current one in (gnu packages gimp) alone, thus
not impacting Gimp. The name field of both packages should be the same,
though, so that a user of mypaint-brushes can select the version as in:
guix package -i mypaint-brushes@2
I'd also put the new package definitions at the current location (gnu
packages gimp) so that their different versions live in the same Guile
module.
[0] https://gitlab.gnome.org/garyskeete/gimp/blob/GIMP_2_10_4/configure.ac#L73
[1] https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=mypaint-brushes-git
> From c9d5b440a6affccd0852e8686482b64aaef06bea Mon Sep 17 00:00:00 2001
> From: Yoshinori Arai <kumagusu08@gmail.com>
> Date: Sat, 2 Feb 2019 13:23:33 +0900
> Subject: [PATCH] Add: mypaint
>
> ---
> gnu/packages/mypaint.scm | 132 +++++++++++++++++++++++++++++++++++++++
> 1 file changed, 132 insertions(+)
> create mode 100644 gnu/packages/mypaint.scm
>
> diff --git a/gnu/packages/mypaint.scm b/gnu/packages/mypaint.scm
> new file mode 100644
> index 000000000..8c6edeffb
> --- /dev/null
> +++ b/gnu/packages/mypaint.scm
> @@ -0,0 +1,132 @@
> +(define-module (gnu packages mypaint)
> + #:use-module ((guix licenses) #:prefix license:)
> + #:use-module (guix utils)
> + #:use-module (guix packages)
> + #:use-module (guix git-download)
> + #:use-module (guix build-system gnu)
> + #:use-module (guix build-system python)
> + #:use-module (gnu packages pkg-config)
> + #:use-module (gnu packages autotools)
> + #:use-module (gnu packages gettext)
> + #:use-module (gnu packages glib)
> + #:use-module (gnu packages swig)
> + #:use-module (gnu packages gtk)
> + #:use-module (gnu packages python)
> + #:use-module (gnu packages python-xyz)
> + #:use-module (gnu packages ghostscript)
> + #:use-module (gnu packages gimp)
> + #:use-module (gnu packages gnome)
> + #:use-module (gnu packages web)
> + #:use-module (gnu packages python))
> +
> +(define-public libmypaint-git
> + (let ((commit "0c07191409bd257084d4ea7576deb832aac8868b")
> + (revision "1"))
> + (package
> + (name "libmypaint-git")
> + (version (git-version "2.0.0" revision commit))
> + (source (origin
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://github.com/mypaint/libmypaint.git")
> + (commit commit)))
> + (file-name (git-file-name name version))
> + (sha256
> + (base32
> + "0x5yacdj4bfm298ijv64igv06yjr401g6giln5wrdpv0pixg8ig3"))))
> + ;;Using glib-or-gtk-build-system, I got error as follows.
> + ;;configure.ac:243: error: possibly undefined macro: AM_GLIB_GNU_GETTEXT
> + ;;If this token and others are legitimate, please use m4_pattern_allow.
> + ;;See the Autoconf documentation.
This error disappears when we leave "glib" as an input. Apparently glib
defines autoconf M4 macros; to be found by the ACLOCAL_PATH path
specification, it must be made an explicit input.
> + (build-system gnu-build-system)
> + (native-inputs
> + `(("intltool" ,intltool)
> + ("libtool" ,libtool)
> + ("automake" ,automake)
> + ("autoconf" ,autoconf)
> + ("python-2" ,python-2) ;need to generate headers in autogen.sh
> + ("pkg-config" ,pkg-config)))
> + ;; As needed by 'libmypaint.pc'.
> + (propagated-inputs
> + `(("json-c" ,json-c)
> + ("gobject-introspection" ,gobject-introspection)))
> + (inputs
> + `(("glib" ,glib)))
> + (home-page "http://mypaint.org/")
> + (synopsis "Brush library")
> + (description "This library used by MyPaint and other painting programs use it too")
> + (license license:isc))))
This should reuse the original libmypaint package definition through
inheritance. You'll find examples in the sources of Guix. This way, you
wouldn't need to duplicate the common fields (home page, description,
synopsis, etc.).
> +(define-public mypaint-brushes-git
> + (let ((commit "769ec941054725a195e77d8c55080344e2ab77e4")
> + (revision "1"))
> + (package
> + (name "mypaint-brushes-git")
> + (version (git-version "2.0.0" revision commit))
> + (source (origin
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://github.com/mypaint/mypaint-brushes.git")
> + (commit commit)))
> + (file-name (git-file-name name version))
> + (sha256
> + (base32
> + "0viilmad809qg12xw11p1yv0lwbgjfkcv82g2avwzdaa6wy783pf"))))
> + (build-system gnu-build-system)
> + (native-inputs
> + `(("autoconf" ,autoconf)
> + ("automake" ,automake)))
> + (home-page "http://mypaint.org/")
> + (synopsis "Brushes for MyPaint")
> + (description "Brushes used by MyPaint and other software using libmypaint")
> + (license license:cc0))))
Same for inheritance. If something is wrong with the original synopsis
or description, it should be fixed in the original package
definitions. This package could use the recently released (9 days ago)
2.0.1 tagged version instead of this commit.
> +(define-public mypaint-git
> + (let ((commit "57685af8dbd65719d7874bc501094bade85d94e7")
> + (revision "1"))
> + (package
> + (name "mypaint-git")
> + (version (git-version "2.0.0" revision commit))
> + (source (origin
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://github.com/mypaint/mypaint.git")
> + (commit commit)))
> + (file-name (git-file-name name version))
> + (sha256
> + (base32
> + "14dmnwma8gsfd5hv3cvwkzyd3v392h4g1zp7i38295cf39yf61y6"))))
> + (build-system python-build-system)
> + (arguments
> + `(#:python ,python-2
Why is this needed? It otherwise seem to support Python 3. Is there an
upstream issue on their tracker which we could link to in a comment?
> + #:phases
> + (modify-phases %standard-phases
> + (add-after 'unpack 'fix-for-buildconfig-and-test
> + (lambda _
> + (for-each make-file-writable (find-files "." ".*"))
> + ;; FATAL: Cannot create cache dir '/homeless-shelter
> + (setenv "HOME" "/tmp")))
> + (replace 'install
> + (lambda _
> + (invoke "python" "setup.py" "managed_install"
> + (string-append "--prefix=" (assoc-ref %outputs "out"))))))))
> + (native-inputs
> + `(("pkg-config" ,pkg-config)
> + ("lcms" ,lcms)
> + ("libmypaint" ,libmypaint-git)
> + ("mypaint-brushes" ,mypaint-brushes-git)))
mypaint-brushes should be an input (otherwise it could be lost after
garbage collection, and is referred to by config.py).
> + (inputs
> + `(("python2-pygobject" ,python2-pygobject)
This should go in the propagated-inputs (any run-time Python dependencies usually
must go there).
> + ("swig" ,swig)
This can go to the native-inputs, as it is only used at build time.
> + ("gettext" ,gettext-minimal)
> + ("python2-numpy" ,python2-numpy)
> + ("python2-pycairo" ,python2-pycairo)))
The Python dependencies should become propagated-inputs.
> + (propagated-inputs
> + `(("gtk+" ,gtk+)
> + ("librsvg" ,librsvg)
> + ("gdk-pixbuf" ,gdk-pixbuf+svg)))
It'd be nicer to apply the extra 2 phases from the
glib-or-gtk-build-system. There are examples of hybrid build systems,
such as emacs-pdf-tools.
> + (home-page "http://mypaint.org/")
> + (synopsis "Simple drawing an id painting program")
> + (description "MyPaint is a fast, free, and easy graphics app
> +for digital painters. MyPaint works best with a graphics tablet.")
There's no need to say "free" here, since everything is and must be in
Guix. Maybe, [...] with a tablet or similar input device.
> + (license license:gpl2+))))
I managed to make it run a couple of times, but then it started
complaining about icons (even though I was adding the hicolor-icon-theme
to my test environment). I also tried running fc-cache -vf, but in
vain. Any ideas?
Thank you!
Maxim
^ permalink raw reply [flat|nested] 20+ messages in thread* [bug#34283] [PATCH] Add: mypaint
2019-02-05 5:52 ` [bug#34283] [PATCH] Add: mypaint Maxim Cournoyer
@ 2019-02-05 9:23 ` Yoshinori Arai
0 siblings, 0 replies; 20+ messages in thread
From: Yoshinori Arai @ 2019-02-05 9:23 UTC (permalink / raw)
To: Maxim Cournoyer; +Cc: 34283
On Tue, Feb 05, 2019 at 12:52:52AM -0500, Maxim Cournoyer wrote:
> Hello Yoshinori!
>
> Yoshinori Arai <kumagusu08@gmail.com> writes:
>
> > Hello,
> >
> > I made mypaint package from git version.
> > libmypaint-git, mypaint-brushes-git may be conflict with gimp package.
>
> In Guix, we can have multiple versions of the software without changing
> its name (it's one of the advantages of a functional package manager
> :-). In general, we package the latest release available from
> upstream, unless there is a good justification to do otherwise.
>
> Was there a reason to prefer the git snapshots over normal releases of
> mypaint, libmypaint and mypaint-brushes in Guix? I see that the latest
> release for mypaint-brushes was released only a couple days ago (2.0.1);
> unless there is a reason, it would be preferable to use this tagged
> released rather than some random commit.
>
> In this case, since it seems the only dependent of mypaint is Gimp and
> since Gimp requires a specific version, (its configure.ac [0] mentions
> mypaint-brusesh 1.3.0, although Arch seems to work around it [1]), I'd
> go with a public variable named mypaint-brushes-2 for the new
> definition, leaving the current one in (gnu packages gimp) alone, thus
> not impacting Gimp. The name field of both packages should be the same,
> though, so that a user of mypaint-brushes can select the version as in:
>
> guix package -i mypaint-brushes@2
>
> I'd also put the new package definitions at the current location (gnu
> packages gimp) so that their different versions live in the same Guile
> module.
>
> [0] https://gitlab.gnome.org/garyskeete/gimp/blob/GIMP_2_10_4/configure.ac#L73
> [1] https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=mypaint-brushes-git
> I managed to make it run a couple of times, but then it started
> complaining about icons (even though I was adding the hicolor-icon-theme
> to my test environment). I also tried running fc-cache -vf, but in
> vain. Any ideas?
>
> Thank you!
>
> Maxim
Hello,
I will try to make patch of mypaint@1.3.0 in gimp package at first.
^ permalink raw reply [flat|nested] 20+ messages in thread
* [bug#34283] [PATCH]Add: mypaint
2019-02-02 4:44 [bug#34283] [PATCH]Add: mypaint Yoshinori Arai
2019-02-05 5:43 ` swedebugia
2019-02-05 5:52 ` [bug#34283] [PATCH] Add: mypaint Maxim Cournoyer
@ 2019-02-05 11:42 ` Björn Höfling
2019-02-06 11:03 ` Yoshinori Arai
` (2 more replies)
2019-02-08 7:22 ` [bug#34283] [PATCH-1/4]Add: mypaint@1.2.1 Yoshinori Arai
` (4 subsequent siblings)
7 siblings, 3 replies; 20+ messages in thread
From: Björn Höfling @ 2019-02-05 11:42 UTC (permalink / raw)
To: Yoshinori Arai; +Cc: 34283
[-- Attachment #1: Type: text/plain, Size: 1079 bytes --]
Hi,
On Sat, 2 Feb 2019 13:44:21 +0900
Yoshinori Arai <kumagusu08@gmail.com> wrote:
> Hello,
>
> I made mypaint package from git version.
> libmypaint-git, mypaint-brushes-git may be conflict with gimp package.
>
> >From c9d5b440a6affccd0852e8686482b64aaef06bea Mon Sep 17 00:00:00
> >2001
> From: Yoshinori Arai <kumagusu08@gmail.com>
> Date: Sat, 2 Feb 2019 13:23:33 +0900
> Subject: [PATCH] Add: mypaint
>
> ---
> gnu/packages/mypaint.scm | 132
I have two more notes (hope I'm not redundant):
We usually just add/modify one package per commit, unless really
necessary. Could you split your contribution into several patches?
The commit message should conform to the GNU Changelog Guides, a link
can be found here:
https://www.gnu.org/software/guix/manual/en/html_node/Submitting-Patches.html#Submitting-Patches
For examples see other commits from the git repository. Could you adapt
your commit's log messages?
Packaging can sometimes be tricky, so please ask the questions you have.
Thank you for your contribution,
Björn
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
^ permalink raw reply [flat|nested] 20+ messages in thread* [bug#34283] [PATCH]Add: mypaint
2019-02-05 11:42 ` [bug#34283] [PATCH]Add: mypaint Björn Höfling
@ 2019-02-06 11:03 ` Yoshinori Arai
2019-02-07 11:13 ` Yoshinori Arai
2019-02-08 4:26 ` Yoshinori Arai
2 siblings, 0 replies; 20+ messages in thread
From: Yoshinori Arai @ 2019-02-06 11:03 UTC (permalink / raw)
To: Björn Höfling; +Cc: 34283
On Tue, Feb 05, 2019 at 12:42:55PM +0100, Björn Höfling wrote:
> Hi,
>
> On Sat, 2 Feb 2019 13:44:21 +0900
> Yoshinori Arai <kumagusu08@gmail.com> wrote:
>
> > Hello,
> >
> > I made mypaint package from git version.
> > libmypaint-git, mypaint-brushes-git may be conflict with gimp package.
> >
> > >From c9d5b440a6affccd0852e8686482b64aaef06bea Mon Sep 17 00:00:00
> > >2001
> > From: Yoshinori Arai <kumagusu08@gmail.com>
> > Date: Sat, 2 Feb 2019 13:23:33 +0900
> > Subject: [PATCH] Add: mypaint
> >
> > ---
> > gnu/packages/mypaint.scm | 132
>
> I have two more notes (hope I'm not redundant):
>
> We usually just add/modify one package per commit, unless really
> necessary. Could you split your contribution into several patches?
>
> The commit message should conform to the GNU Changelog Guides, a link
> can be found here:
>
> https://www.gnu.org/software/guix/manual/en/html_node/Submitting-Patches.html#Submitting-Patches
>
> For examples see other commits from the git repository. Could you adapt
> your commit's log messages?
>
> Packaging can sometimes be tricky, so please ask the questions you have.
>
> Thank you for your contribution,
>
> Björn
hello,
OK, I will split previous mypaint patch. Thank you.
^ permalink raw reply [flat|nested] 20+ messages in thread
* [bug#34283] [PATCH]Add: mypaint
2019-02-05 11:42 ` [bug#34283] [PATCH]Add: mypaint Björn Höfling
2019-02-06 11:03 ` Yoshinori Arai
@ 2019-02-07 11:13 ` Yoshinori Arai
2019-02-10 19:57 ` Danny Milosavljevic
2019-02-08 4:26 ` Yoshinori Arai
2 siblings, 1 reply; 20+ messages in thread
From: Yoshinori Arai @ 2019-02-07 11:13 UTC (permalink / raw)
To: Björn Höfling; +Cc: 34283
On Tue, Feb 05, 2019 at 12:42:55PM +0100, Björn Höfling wrote:
> Hi,
>
> On Sat, 2 Feb 2019 13:44:21 +0900
> Yoshinori Arai <kumagusu08@gmail.com> wrote:
>
> > Hello,
> >
> > I made mypaint package from git version.
> > libmypaint-git, mypaint-brushes-git may be conflict with gimp package.
> >
> > >From c9d5b440a6affccd0852e8686482b64aaef06bea Mon Sep 17 00:00:00
> > >2001
> > From: Yoshinori Arai <kumagusu08@gmail.com>
> > Date: Sat, 2 Feb 2019 13:23:33 +0900
> > Subject: [PATCH] Add: mypaint
> >
> > ---
> > gnu/packages/mypaint.scm | 132
>
> I have two more notes (hope I'm not redundant):
>
> We usually just add/modify one package per commit, unless really
> necessary. Could you split your contribution into several patches?
>
> The commit message should conform to the GNU Changelog Guides, a link
> can be found here:
>
> https://www.gnu.org/software/guix/manual/en/html_node/Submitting-Patches.html#Submitting-Patches
>
> For examples see other commits from the git repository. Could you adapt
> your commit's log messages?
>
> Packaging can sometimes be tricky, so please ask the questions you have.
>
> Thank you for your contribution,
>
> Björn
Hello,
I made patch of mypaint, libmypaint, mypaint-brushes again but I am not
accustomed to git operation. I don't know how to split patch one by one.
Also, I don't know which is better my patch is in gimp or graphics.
Please tell me how to make better separate patch or how to handle git/magit to
make patch.
Now, it's my patch as follows.
From f1cb8c414916b777d68ed509d183bb10fb6a29f2 Mon Sep 17 00:00:00 2001
From: Yoshinori Arai <kumagusu08@gmail.com>
Date: Thu, 7 Feb 2019 16:30:47 +0900
Subject: [PATCH] Add: mypaint@1.2.1
---
gnu/packages/gimp.scm | 56 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 56 insertions(+)
diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index cd0deac15..7836b8e66 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -29,6 +29,7 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system gnu)
#:use-module (guix build-system glib-or-gtk)
+ #:use-module (guix build-system scons)
#:use-module (gnu packages)
#:use-module (gnu packages algebra)
#:use-module (gnu packages autotools)
@@ -37,12 +38,15 @@
#:use-module (gnu packages gtk)
#:use-module (gnu packages gnome)
#:use-module (gnu packages image)
+ #:use-module (gnu packages gettext)
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages compression)
#:use-module (gnu packages xml)
#:use-module (gnu packages pdf)
#:use-module (gnu packages photo)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-xyz)
+ #:use-module (gnu packages swig)
#:use-module (gnu packages web)
#:use-module (gnu packages xorg))
@@ -307,6 +311,58 @@ MyPaint.")
(home-page "https://github.com/Jehan/mypaint-brushes")
(license license:cc0)))
+(define-public mypaint
+ (package
+ (name "mypaint")
+ (version "1.2.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/" name "/" name
+ "/releases/download/v" version
+ "/" name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1iykjvfis5y71wn9wyxpmha7vb4pgr10dbpgglymh33a5ww4j8zd"))))
+ (build-system scons-build-system)
+ (arguments
+ `(#:tests? #f ;; need graphical environment
+ #:scons ,scons-python2
+ #:scons-flags
+ (list (string-append "numpy_include="
+ (assoc-ref %build-inputs "python2-numpy")
+ "/lib/python2.7/site-packages/numpy/core/include")
+ (string-append "prefix=" (assoc-ref %outputs "out")))))
+ ;; README_LINUX.md
+ ;;-If testing outside a graphical environment (anywhere Gdk refuses
+ ;; to initialize), limit the doctests to just `lib/` and `brushlib/`.
+ ;;-There are several interactive GUI tests in the `tests/` folder
+ ;; which `nosetests` does not run - quite intentionally -
+ ;; because their executable bit is set.
+ ;;#:phases
+ ;;(modify-phases %standard-phases
+ ;; (replace 'check
+ ;; (lambda _
+ ;; (invoke "nosetests" "--with-doctest"))))))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+ ("python" ,python-2)
+ ("lcms" ,lcms)
+ ("swig" ,swig)))
+ ;;("python-nose" ,python2-nose))) ;; for test
+ (inputs
+ `(("gettext" ,gettext-minimal)
+ ("libmypaint" ,libmypaint)
+ ("mypaint-brushes" ,mypaint-brushes)))
+ (propagated-inputs
+ `(("gtk+" ,gtk+)
+ ("python2-pygobject" ,python2-pygobject)
+ ("python2-numpy" ,python2-numpy)
+ ("python2-pycairo" ,python2-pycairo)))
+ (home-page "http://mypaint.org/")
+ (synopsis "Simple drawing and painting program")
+ (description "MyPaint is a fast and easy graphics app for digital painters.")
+ (license license:gpl2+)))
+
(define-public gimp-resynthesizer
;; GIMP does not respect any plugin search path environment variable, so after
;; installation users have to edit their GIMP settings to include
--
2.20.1
From 9dfc630a8519fe06a8157cc9e57451648e5065a8 Mon Sep 17 00:00:00 2001
From: Yoshinori Arai <kumagusu08@gmail.com>
Date: Thu, 7 Feb 2019 19:34:53 +0900
Subject: [PATCH] Add: libmypaint-2, mypaint-brushes-2, mypaint-2
---
gnu/packages/gimp.scm | 122 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 122 insertions(+)
diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index cd0deac15..be9b3fdca 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -29,6 +29,8 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system gnu)
#:use-module (guix build-system glib-or-gtk)
+ #:use-module (guix build-system scons)
+ #:use-module (guix build-system python)
#:use-module (gnu packages)
#:use-module (gnu packages algebra)
#:use-module (gnu packages autotools)
@@ -37,12 +39,15 @@
#:use-module (gnu packages gtk)
#:use-module (gnu packages gnome)
#:use-module (gnu packages image)
+ #:use-module (gnu packages gettext)
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages compression)
#:use-module (gnu packages xml)
#:use-module (gnu packages pdf)
#:use-module (gnu packages photo)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-xyz)
+ #:use-module (gnu packages swig)
#:use-module (gnu packages web)
#:use-module (gnu packages xorg))
@@ -275,6 +280,28 @@ brushstrokes which is used by MyPaint and GIMP.")
(home-page "http://mypaint.org")
(license license:isc)))
+(define-public libmypaint-2
+ (package (inherit libmypaint)
+ (version "2.0.0-alpha")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/mypaint/libmypaint/"
+ "archive/v" version ".0.tar.gz"))
+ (sha256
+ (base32
+ "1qbmjj7rammw4rma0jawff7q32d4gsy63f11af8dhk07bk4rkxph"))))
+ ;;MyPaint and libmypaint benefit dramatically from autovectorization
+ ;;and other compiler optimizations. from README.md
+ (arguments
+ `(#:make-flags (list "CFLAGS=-Ofast -ftree-vectorize -fopt-info-vec-optimized -march=native -mtune=native -funsafe-math-optimizations -funsafe-loop-optimizations")))
+ (native-inputs
+ `(("intltool" ,intltool)
+ ("libtool" ,libtool)
+ ("automake" ,automake)
+ ("autoconf" ,autoconf)
+ ("python-2" ,python-2) ;need to generate headers in autogen.sh
+ ("pkg-config" ,pkg-config)))))
+
(define-public mypaint-brushes
(package
(name "mypaint-brushes")
@@ -307,6 +334,101 @@ MyPaint.")
(home-page "https://github.com/Jehan/mypaint-brushes")
(license license:cc0)))
+(define-public mypaint-brushes-2
+ (package (inherit mypaint-brushes)
+ (version "2.0.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/mypaint/mypaint-brushes/"
+ "archive/v" version ".tar.gz"))
+ (sha256
+ (base32
+ "0ap2b6n20lnvdm06x91qawk1k8jmxnf7zffxrqxw60fgqd4whwjm"))))))
+
+(define-public mypaint
+ (package
+ (name "mypaint")
+ (version "1.2.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/" name "/" name
+ "/releases/download/v" version
+ "/" name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1iykjvfis5y71wn9wyxpmha7vb4pgr10dbpgglymh33a5ww4j8zd"))))
+ (build-system scons-build-system)
+ (arguments
+ `(#:tests? #f ;; need graphical environment
+ #:scons ,scons-python2
+ #:scons-flags
+ (list (string-append "numpy_include="
+ (assoc-ref %build-inputs "python2-numpy")
+ "/lib/python2.7/site-packages/numpy/core/include")
+ (string-append "prefix=" (assoc-ref %outputs "out")))))
+ ;; README_LINUX.md
+ ;;-If testing outside a graphical environment (anywhere Gdk refuses
+ ;; to initialize), limit the doctests to just `lib/` and `brushlib/`.
+ ;;-There are several interactive GUI tests in the `tests/` folder
+ ;; which `nosetests` does not run - quite intentionally -
+ ;; because their executable bit is set.
+ ;;#:phases
+ ;;(modify-phases %standard-phases
+ ;; (replace 'check
+ ;; (lambda _
+ ;; (invoke "nosetests" "--with-doctest"))))))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+ ("python" ,python-2)
+ ("lcms" ,lcms)
+ ("swig" ,swig)))
+ ;;("python-nose" ,python2-nose))) ;; for test
+ (inputs
+ `(("gettext" ,gettext-minimal)
+ ("libmypaint" ,libmypaint)
+ ("mypaint-brushes" ,mypaint-brushes)))
+ (propagated-inputs
+ `(("gtk+" ,gtk+)
+ ("python2-pygobject" ,python2-pygobject)
+ ("python2-numpy" ,python2-numpy)
+ ("python2-pycairo" ,python2-pycairo)))
+ (home-page "http://mypaint.org/")
+ (synopsis "Simple drawing and painting program")
+ (description "MyPaint is a fast and easy graphics app for digital painters.")
+ (license license:gpl2+)))
+
+(define-public mypaint-2
+ (package (inherit mypaint)
+ (version "2.0.0-alpha.2")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/mypaint/mypaint/"
+ "archive/v" version ".tar.gz"))
+ (sha256
+ (base32
+ "0nmcvma2vg2iqlvg8v96d3mppc5cn46591hh8jhppgibcvifc81m"))))
+ (build-system python-build-system)
+ (arguments
+ `(#:python ,python-2
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-for-buildconfig-and-test
+ (lambda _
+ (for-each make-file-writable (find-files "." ".*"))
+ ;; FATAL: Cannot create cache dir '/homeless-shelter
+ (setenv "HOME" "/tmp")))
+ (add-before 'build 'set-cflags
+ (lambda _
+ (setenv "CFLAGS" "-Ofast -ftree-vectorize -fopt-info-vec-optimized -march=native -mtune=native -funsafe-math-optimizations -funsafe-loop-optimizations")))
+ (replace 'install
+ (lambda _
+ (invoke "python" "setup.py" "managed_install"
+ (string-append "--prefix=" (assoc-ref %outputs "out"))))))))
+ (inputs
+ `(("gettext" ,gettext-minimal)
+ ("libmypaint" ,libmypaint-2)
+ ("mypaint-brushes" ,mypaint-brushes-2)))))
+
(define-public gimp-resynthesizer
;; GIMP does not respect any plugin search path environment variable, so after
;; installation users have to edit their GIMP settings to include
--
2.20.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [bug#34283] [PATCH]Add: mypaint
2019-02-07 11:13 ` Yoshinori Arai
@ 2019-02-10 19:57 ` Danny Milosavljevic
2019-02-10 22:15 ` Yoshinori Arai
0 siblings, 1 reply; 20+ messages in thread
From: Danny Milosavljevic @ 2019-02-10 19:57 UTC (permalink / raw)
To: Yoshinori Arai; +Cc: 34283
[-- Attachment #1: Type: text/plain, Size: 589 bytes --]
Hi,
On Thu, 7 Feb 2019 20:13:52 +0900
Yoshinori Arai <kumagusu08@gmail.com> wrote:
> gimp or graphics
I think "graphics".
> I made patch of mypaint, libmypaint, mypaint-brushes again but I am not
> accustomed to git operation. I don't know how to split patch one by one.
git format-patch -3 -o ../outgoing-mypaint will create a directory
"../outgoing-mypaint" containing multiple files.
Edit them to specify the patch version in the subject (if you change things
please add something like "v2", to make the subject: "[PATCH v2] ...".
After that, git send-email *
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 20+ messages in thread
* [bug#34283] [PATCH]Add: mypaint
2019-02-10 19:57 ` Danny Milosavljevic
@ 2019-02-10 22:15 ` Yoshinori Arai
0 siblings, 0 replies; 20+ messages in thread
From: Yoshinori Arai @ 2019-02-10 22:15 UTC (permalink / raw)
To: Danny Milosavljevic; +Cc: 34283
On Sun, Feb 10, 2019 at 08:57:02PM +0100, Danny Milosavljevic wrote:
> Hi,
>
> On Thu, 7 Feb 2019 20:13:52 +0900
> Yoshinori Arai <kumagusu08@gmail.com> wrote:
>
> > gimp or graphics
>
> I think "graphics".
>
> > I made patch of mypaint, libmypaint, mypaint-brushes again but I am not
> > accustomed to git operation. I don't know how to split patch one by one.
>
> git format-patch -3 -o ../outgoing-mypaint will create a directory
> "../outgoing-mypaint" containing multiple files.
>
> Edit them to specify the patch version in the subject (if you change things
> please add something like "v2", to make the subject: "[PATCH v2] ...".
>
> After that, git send-email *
Hello,
Thank you for your advise. I got how to make patch series.
I made patches in guix checkout directory.
I commited patches one by one and did git format-patch ~~~~.
~ number is how many commit.
Then I did git reset --soft master/origin.
Git made patches 0001,0002,0003,0004-<commit-message>.
I don't installed git-sendmail yet.
^ permalink raw reply [flat|nested] 20+ messages in thread
* [bug#34283] [PATCH]Add: mypaint
2019-02-05 11:42 ` [bug#34283] [PATCH]Add: mypaint Björn Höfling
2019-02-06 11:03 ` Yoshinori Arai
2019-02-07 11:13 ` Yoshinori Arai
@ 2019-02-08 4:26 ` Yoshinori Arai
2019-02-08 4:30 ` Brett Gilio
2 siblings, 1 reply; 20+ messages in thread
From: Yoshinori Arai @ 2019-02-08 4:26 UTC (permalink / raw)
To: Björn Höfling; +Cc: 34283
On Tue, Feb 05, 2019 at 12:42:55PM +0100, Björn Höfling wrote:
> Hi,
>
> On Sat, 2 Feb 2019 13:44:21 +0900
> Yoshinori Arai <kumagusu08@gmail.com> wrote:
>
> > Hello,
> >
> > I made mypaint package from git version.
> > libmypaint-git, mypaint-brushes-git may be conflict with gimp package.
> >
> > >From c9d5b440a6affccd0852e8686482b64aaef06bea Mon Sep 17 00:00:00
> > >2001
> > From: Yoshinori Arai <kumagusu08@gmail.com>
> > Date: Sat, 2 Feb 2019 13:23:33 +0900
> > Subject: [PATCH] Add: mypaint
> >
> > ---
> > gnu/packages/mypaint.scm | 132
>
> I have two more notes (hope I'm not redundant):
>
> We usually just add/modify one package per commit, unless really
> necessary. Could you split your contribution into several patches?
>
> The commit message should conform to the GNU Changelog Guides, a link
> can be found here:
>
> https://www.gnu.org/software/guix/manual/en/html_node/Submitting-Patches.html#Submitting-Patches
>
> For examples see other commits from the git repository. Could you adapt
> your commit's log messages?
>
> Packaging can sometimes be tricky, so please ask the questions you have.
>
> Thank you for your contribution,
>
> Björn
Hello,
I have prepared patch series of mypaint.
Please tell me which is better to send patch series patches-guix again or another.
^ permalink raw reply [flat|nested] 20+ messages in thread
* [bug#34283] [PATCH]Add: mypaint
2019-02-08 4:26 ` Yoshinori Arai
@ 2019-02-08 4:30 ` Brett Gilio
2019-02-09 22:54 ` Yoshinori Arai
0 siblings, 1 reply; 20+ messages in thread
From: Brett Gilio @ 2019-02-08 4:30 UTC (permalink / raw)
To: Yoshinori Arai; +Cc: 34283
Yoshinori Arai writes:
> On Tue, Feb 05, 2019 at 12:42:55PM +0100, Björn Höfling wrote:
>> Hi,
>>
>> On Sat, 2 Feb 2019 13:44:21 +0900
>> Yoshinori Arai <kumagusu08@gmail.com> wrote:
>>
>> > Hello,
>> >
>> > I made mypaint package from git version.
>> > libmypaint-git, mypaint-brushes-git may be conflict with gimp package.
>> >
>> > >From c9d5b440a6affccd0852e8686482b64aaef06bea Mon Sep 17 00:00:00
>> > >2001
>> > From: Yoshinori Arai <kumagusu08@gmail.com>
>> > Date: Sat, 2 Feb 2019 13:23:33 +0900
>> > Subject: [PATCH] Add: mypaint
>> >
>> > ---
>> > gnu/packages/mypaint.scm | 132
>>
>> I have two more notes (hope I'm not redundant):
>>
>> We usually just add/modify one package per commit, unless really
>> necessary. Could you split your contribution into several patches?
>>
>> The commit message should conform to the GNU Changelog Guides, a link
>> can be found here:
>>
>> https://www.gnu.org/software/guix/manual/en/html_node/Submitting-Patches.html#Submitting-Patches
>>
>> For examples see other commits from the git repository. Could you adapt
>> your commit's log messages?
>>
>> Packaging can sometimes be tricky, so please ask the questions you have.
>>
>> Thank you for your contribution,
>>
>> Björn
>
>
> Hello,
>
> I have prepared patch series of mypaint.
> Please tell me which is better to send patch series patches-guix again or another.
Use the mailing address for the original patch you opened.
^ permalink raw reply [flat|nested] 20+ messages in thread
* [bug#34283] [PATCH]Add: mypaint
2019-02-08 4:30 ` Brett Gilio
@ 2019-02-09 22:54 ` Yoshinori Arai
2019-02-10 1:24 ` Brett Gilio
0 siblings, 1 reply; 20+ messages in thread
From: Yoshinori Arai @ 2019-02-09 22:54 UTC (permalink / raw)
To: Brett Gilio; +Cc: 34283
On Thu, Feb 07, 2019 at 10:30:34PM -0600, Brett Gilio wrote:
>
> Yoshinori Arai writes:
>
> > On Tue, Feb 05, 2019 at 12:42:55PM +0100, Björn Höfling wrote:
> >> Hi,
> >>
> >> On Sat, 2 Feb 2019 13:44:21 +0900
> >> Yoshinori Arai <kumagusu08@gmail.com> wrote:
> >>
> >> > Hello,
> >> >
> >> > I made mypaint package from git version.
> >> > libmypaint-git, mypaint-brushes-git may be conflict with gimp package.
> >> >
> >> > >From c9d5b440a6affccd0852e8686482b64aaef06bea Mon Sep 17 00:00:00
> >> > >2001
> >> > From: Yoshinori Arai <kumagusu08@gmail.com>
> >> > Date: Sat, 2 Feb 2019 13:23:33 +0900
> >> > Subject: [PATCH] Add: mypaint
> >> >
> >> > ---
> >> > gnu/packages/mypaint.scm | 132
> >>
> >> I have two more notes (hope I'm not redundant):
> >>
> >> We usually just add/modify one package per commit, unless really
> >> necessary. Could you split your contribution into several patches?
> >>
> >> The commit message should conform to the GNU Changelog Guides, a link
> >> can be found here:
> >>
> >> https://www.gnu.org/software/guix/manual/en/html_node/Submitting-Patches.html#Submitting-Patches
> >>
> >> For examples see other commits from the git repository. Could you adapt
> >> your commit's log messages?
> >>
> >> Packaging can sometimes be tricky, so please ask the questions you have.
> >>
> >> Thank you for your contribution,
> >>
> >> Björn
> >
> >
> > Hello,
> >
> > I have prepared patch series of mypaint.
> > Please tell me which is better to send patch series patches-guix again or another.
>
> Use the mailing address for the original patch you opened.
I sent patch series to [bug#34283] but anything happen. Is it foolish I did?
My first patch is for gimp.scm but last patch for graphics.scm.
Do I sent patch of mypaint to patches@gnu.org again as new patch?
^ permalink raw reply [flat|nested] 20+ messages in thread
* [bug#34283] [PATCH]Add: mypaint
2019-02-09 22:54 ` Yoshinori Arai
@ 2019-02-10 1:24 ` Brett Gilio
2019-02-10 2:36 ` Yoshinori Arai
0 siblings, 1 reply; 20+ messages in thread
From: Brett Gilio @ 2019-02-10 1:24 UTC (permalink / raw)
To: Yoshinori Arai; +Cc: 34283
Yoshinori Arai writes:
> On Thu, Feb 07, 2019 at 10:30:34PM -0600, Brett Gilio wrote:
>>
>> Yoshinori Arai writes:
>>
>> > On Tue, Feb 05, 2019 at 12:42:55PM +0100, Björn Höfling wrote:
>> >> Hi,
>> >>
>> >> On Sat, 2 Feb 2019 13:44:21 +0900
>> >> Yoshinori Arai <kumagusu08@gmail.com> wrote:
>> >>
>> >> > Hello,
>> >> >
>> >> > I made mypaint package from git version.
>> >> > libmypaint-git, mypaint-brushes-git may be conflict with gimp package.
>> >> >
>> >> > >From c9d5b440a6affccd0852e8686482b64aaef06bea Mon Sep 17 00:00:00
>> >> > >2001
>> >> > From: Yoshinori Arai <kumagusu08@gmail.com>
>> >> > Date: Sat, 2 Feb 2019 13:23:33 +0900
>> >> > Subject: [PATCH] Add: mypaint
>> >> >
>> >> > ---
>> >> > gnu/packages/mypaint.scm | 132
>> >>
>> >> I have two more notes (hope I'm not redundant):
>> >>
>> >> We usually just add/modify one package per commit, unless really
>> >> necessary. Could you split your contribution into several patches?
>> >>
>> >> The commit message should conform to the GNU Changelog Guides, a link
>> >> can be found here:
>> >>
>> >> https://www.gnu.org/software/guix/manual/en/html_node/Submitting-Patches.html#Submitting-Patches
>> >>
>> >> For examples see other commits from the git repository. Could you adapt
>> >> your commit's log messages?
>> >>
>> >> Packaging can sometimes be tricky, so please ask the questions you have.
>> >>
>> >> Thank you for your contribution,
>> >>
>> >> Björn
>> >
>> >
>> > Hello,
>> >
>> > I have prepared patch series of mypaint.
>> > Please tell me which is better to send patch series patches-guix again or another.
>>
>> Use the mailing address for the original patch you opened.
>
> I sent patch series to [bug#34283] but anything happen. Is it foolish I did?
> My first patch is for gimp.scm but last patch for graphics.scm.
>
> Do I sent patch of mypaint to patches@gnu.org again as new patch?
No, just be patient. It will be reviewed for integration upstream and
will be provided feedback by one of the maintainers when they have time
to review it.
Some things get a priority in the debbugs triage.
Best,
Brett Gilio
^ permalink raw reply [flat|nested] 20+ messages in thread
* [bug#34283] [PATCH]Add: mypaint
2019-02-10 1:24 ` Brett Gilio
@ 2019-02-10 2:36 ` Yoshinori Arai
0 siblings, 0 replies; 20+ messages in thread
From: Yoshinori Arai @ 2019-02-10 2:36 UTC (permalink / raw)
To: Brett Gilio; +Cc: 34283
On Sat, Feb 09, 2019 at 07:24:58PM -0600, Brett Gilio wrote:
> >> Use the mailing address for the original patch you opened.
> >
> > I sent patch series to [bug#34283] but anything happen. Is it foolish I did?
> > My first patch is for gimp.scm but last patch for graphics.scm.
> >
> > Do I sent patch of mypaint to patches@gnu.org again as new patch?
>
> No, just be patient. It will be reviewed for integration upstream and
> will be provided feedback by one of the maintainers when they have time
> to review it.
>
> Some things get a priority in the debbugs triage.
>
> Best,
> Brett Gilio
Thank you, I got.
^ permalink raw reply [flat|nested] 20+ messages in thread
* [bug#34283] [PATCH-1/4]Add: mypaint@1.2.1
2019-02-02 4:44 [bug#34283] [PATCH]Add: mypaint Yoshinori Arai
` (2 preceding siblings ...)
2019-02-05 11:42 ` [bug#34283] [PATCH]Add: mypaint Björn Höfling
@ 2019-02-08 7:22 ` Yoshinori Arai
2019-06-28 5:34 ` swedebugia
2019-02-08 7:24 ` [bug#34283] [PATCH-2/4]Add: libmypaint@2.0.0-alpha Yoshinori Arai
` (3 subsequent siblings)
7 siblings, 1 reply; 20+ messages in thread
From: Yoshinori Arai @ 2019-02-08 7:22 UTC (permalink / raw)
To: 34283
From 9fe8e0b3cb260da2bae0de7c2c5d0963c4f543a6 Mon Sep 17 00:00:00 2001
From: Yoshinori Arai <kumagusu08@gmail.com>
Date: Fri, 8 Feb 2019 12:41:11 +0900
Subject: [PATCH 1/4] Add: mypaint@1.2.1
---
gnu/packages/graphics.scm | 55 +++++++++++++++++++++++++++++++++++++++
1 file changed, 55 insertions(+)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index bf4cc89b0..6663ff7dc 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -41,7 +41,9 @@
#:use-module (gnu packages flex)
#:use-module (gnu packages fonts)
#:use-module (gnu packages fontutils)
+ #:use-module (gnu packages gettext)
#:use-module (gnu packages ghostscript)
+ #:use-module (gnu packages gimp)
#:use-module (gnu packages gl)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
@@ -70,6 +72,7 @@
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix build-system python)
+ #:use-module (guix build-system scons)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
@@ -856,3 +859,55 @@ your terminal. It comes bundled with predefined styles:
look. The result can be uploaded on any web server without additional
requirements.")
(license license:gpl2+)))
+
+(define-public mypaint
+ (package
+ (name "mypaint")
+ (version "1.2.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/" name "/" name
+ "/releases/download/v" version
+ "/" name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1iykjvfis5y71wn9wyxpmha7vb4pgr10dbpgglymh33a5ww4j8zd"))))
+ (build-system scons-build-system)
+ (arguments
+ `(#:tests? #f ;; need graphical environment
+ #:scons ,scons-python2
+ #:scons-flags
+ (list (string-append "numpy_include="
+ (assoc-ref %build-inputs "python2-numpy")
+ "/lib/python2.7/site-packages/numpy/core/include")
+ (string-append "prefix=" (assoc-ref %outputs "out")))))
+ ;; README_LINUX.md
+ ;;-If testing outside a graphical environment (anywhere Gdk refuses
+ ;; to initialize), limit the doctests to just `lib/` and `brushlib/`.
+ ;;-There are several interactive GUI tests in the `tests/` folder
+ ;; which `nosetests` does not run - quite intentionally -
+ ;; because their executable bit is set.
+ ;;#:phases
+ ;;(modify-phases %standard-phases
+ ;; (replace 'check
+ ;; (lambda _
+ ;; (invoke "nosetests" "--with-doctest"))))))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+ ("python" ,python-2)
+ ("lcms" ,lcms)
+ ("swig" ,swig)))
+ ;;("python-nose" ,python2-nose))) ;; for test
+ (inputs
+ `(("gettext" ,gettext-minimal)
+ ("libmypaint" ,libmypaint)
+ ("mypaint-brushes" ,mypaint-brushes)))
+ (propagated-inputs
+ `(("gtk+" ,gtk+)
+ ("python2-pygobject" ,python2-pygobject)
+ ("python2-numpy" ,python2-numpy)
+ ("python2-pycairo" ,python2-pycairo)))
+ (home-page "http://mypaint.org/")
+ (synopsis "Simple drawing and painting program")
+ (description "MyPaint is a fast and easy graphics app for digital painters.")
+ (license license:gpl2+)))
--
2.20.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [bug#34283] [PATCH-1/4]Add: mypaint@1.2.1
2019-02-08 7:22 ` [bug#34283] [PATCH-1/4]Add: mypaint@1.2.1 Yoshinori Arai
@ 2019-06-28 5:34 ` swedebugia
0 siblings, 0 replies; 20+ messages in thread
From: swedebugia @ 2019-06-28 5:34 UTC (permalink / raw)
To: 34283
On 2019-02-08 08:22, Yoshinori Arai wrote:
> From 9fe8e0b3cb260da2bae0de7c2c5d0963c4f543a6 Mon Sep 17 00:00:00 2001
> From: Yoshinori Arai <kumagusu08@gmail.com>
> Date: Fri, 8 Feb 2019 12:41:11 +0900
> Subject: [PATCH 1/4] Add: mypaint@1.2.1
>
> ---
> gnu/packages/graphics.scm | 55 +++++++++++++++++++++++++++++++++++++++
> 1 file changed, 55 insertions(+)
>
> diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
> index bf4cc89b0..6663ff7dc 100644
> --- a/gnu/packages/graphics.scm
> +++ b/gnu/packages/graphics.scm
> @@ -41,7 +41,9 @@
> #:use-module (gnu packages flex)
> #:use-module (gnu packages fonts)
> #:use-module (gnu packages fontutils)
> + #:use-module (gnu packages gettext)
> #:use-module (gnu packages ghostscript)
> + #:use-module (gnu packages gimp)
> #:use-module (gnu packages gl)
> #:use-module (gnu packages glib)
> #:use-module (gnu packages gnome)
> @@ -70,6 +72,7 @@
> #:use-module (guix build-system cmake)
> #:use-module (guix build-system gnu)
> #:use-module (guix build-system python)
> + #:use-module (guix build-system scons)
> #:use-module (guix download)
> #:use-module (guix git-download)
> #:use-module ((guix licenses) #:prefix license:)
> @@ -856,3 +859,55 @@ your terminal. It comes bundled with predefined styles:
> look. The result can be uploaded on any web server without additional
> requirements.")
> (license license:gpl2+)))
> +
> +(define-public mypaint
> + (package
> + (name "mypaint")
> + (version "1.2.1")
> + (source (origin
> + (method url-fetch)
> + (uri (string-append "https://github.com/" name "/" name
> + "/releases/download/v" version
> + "/" name "-" version ".tar.xz"))
> + (sha256
> + (base32
> + "1iykjvfis5y71wn9wyxpmha7vb4pgr10dbpgglymh33a5ww4j8zd"))))
> + (build-system scons-build-system)
> + (arguments
> + `(#:tests? #f ;; need graphical environment
> + #:scons ,scons-python2
> + #:scons-flags
> + (list (string-append "numpy_include="
> + (assoc-ref %build-inputs "python2-numpy")
> + "/lib/python2.7/site-packages/numpy/core/include")
> + (string-append "prefix=" (assoc-ref %outputs "out")))))
> + ;; README_LINUX.md
> + ;;-If testing outside a graphical environment (anywhere Gdk refuses
> + ;; to initialize), limit the doctests to just `lib/` and `brushlib/`.
> + ;;-There are several interactive GUI tests in the `tests/` folder
> + ;; which `nosetests` does not run - quite intentionally -
> + ;; because their executable bit is set.
> + ;;#:phases
> + ;;(modify-phases %standard-phases
> + ;; (replace 'check
> + ;; (lambda _
> + ;; (invoke "nosetests" "--with-doctest"))))))
> + (native-inputs
> + `(("pkg-config" ,pkg-config)
> + ("python" ,python-2)
> + ("lcms" ,lcms)
> + ("swig" ,swig)))
> + ;;("python-nose" ,python2-nose))) ;; for test
> + (inputs
> + `(("gettext" ,gettext-minimal)
> + ("libmypaint" ,libmypaint)
> + ("mypaint-brushes" ,mypaint-brushes)))
> + (propagated-inputs
> + `(("gtk+" ,gtk+)
> + ("python2-pygobject" ,python2-pygobject)
> + ("python2-numpy" ,python2-numpy)
> + ("python2-pycairo" ,python2-pycairo)))
> + (home-page "http://mypaint.org/")
> + (synopsis "Simple drawing and painting program")
> + (description "MyPaint is a fast and easy graphics app for digital painters.")
> + (license license:gpl2+)))
>
This has slipped through the cracks. Can someone with gtk-knowledge
please review?
--
Cheers Swedebugia
^ permalink raw reply [flat|nested] 20+ messages in thread
* [bug#34283] [PATCH-2/4]Add: libmypaint@2.0.0-alpha
2019-02-02 4:44 [bug#34283] [PATCH]Add: mypaint Yoshinori Arai
` (3 preceding siblings ...)
2019-02-08 7:22 ` [bug#34283] [PATCH-1/4]Add: mypaint@1.2.1 Yoshinori Arai
@ 2019-02-08 7:24 ` Yoshinori Arai
2019-02-08 7:25 ` [bug#34283] [PATCH-3/4]Add: mypaint-blushes@2.0.1 Yoshinori Arai
` (2 subsequent siblings)
7 siblings, 0 replies; 20+ messages in thread
From: Yoshinori Arai @ 2019-02-08 7:24 UTC (permalink / raw)
To: 34283
From 9eb0cea3a515c4bf927758578e105e1125d54c8f Mon Sep 17 00:00:00 2001
From: Yoshinori Arai <kumagusu08@gmail.com>
Date: Fri, 8 Feb 2019 12:53:49 +0900
Subject: [PATCH 2/4] Add: libmypaint@2.0.0-alpha
---
gnu/packages/graphics.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 6663ff7dc..cdccc9372 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -911,3 +911,25 @@ requirements.")
(synopsis "Simple drawing and painting program")
(description "MyPaint is a fast and easy graphics app for digital painters.")
(license license:gpl2+)))
+
+(define-public libmypaint-2
+ (package (inherit libmypaint)
+ (version "2.0.0-alpha")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/mypaint/libmypaint/"
+ "archive/v" version ".0.tar.gz"))
+ (sha256
+ (base32
+ "1qbmjj7rammw4rma0jawff7q32d4gsy63f11af8dhk07bk4rkxph"))))
+ ;;MyPaint and libmypaint benefit dramatically from autovectorization
+ ;;and other compiler optimizations. from README.md
+ (arguments
+ `(#:make-flags (list "CFLAGS=-Ofast -ftree-vectorize -fopt-info-vec-optimized -march=native -mtune=native -funsafe-math-optimizations -funsafe-loop-optimizations")))
+ (native-inputs
+ `(("intltool" ,intltool)
+ ("libtool" ,libtool)
+ ("automake" ,automake)
+ ("autoconf" ,autoconf)
+ ("python-2" ,python-2) ;need to generate headers in autogen.sh
+ ("pkg-config" ,pkg-config)))))
--
2.20.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [bug#34283] [PATCH-3/4]Add: mypaint-blushes@2.0.1
2019-02-02 4:44 [bug#34283] [PATCH]Add: mypaint Yoshinori Arai
` (4 preceding siblings ...)
2019-02-08 7:24 ` [bug#34283] [PATCH-2/4]Add: libmypaint@2.0.0-alpha Yoshinori Arai
@ 2019-02-08 7:25 ` Yoshinori Arai
2019-02-08 7:27 ` [bug#34283] [PATCH-4/4]Add: mypaint@2.0.0-alpha.2 Yoshinori Arai
2021-01-15 19:50 ` bug#34283: [PATCH]Add: mypaint Julien Lepiller
7 siblings, 0 replies; 20+ messages in thread
From: Yoshinori Arai @ 2019-02-08 7:25 UTC (permalink / raw)
To: 34283
From 1b88c91f1fdec26ff604158c78861bd99bb8e40e Mon Sep 17 00:00:00 2001
From: Yoshinori Arai <kumagusu08@gmail.com>
Date: Fri, 8 Feb 2019 12:57:03 +0900
Subject: [PATCH 3/4] Add: mypaint-brushes@2.0.1
---
gnu/packages/graphics.scm | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index cdccc9372..03b411a50 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -933,3 +933,14 @@ requirements.")
("autoconf" ,autoconf)
("python-2" ,python-2) ;need to generate headers in autogen.sh
("pkg-config" ,pkg-config)))))
+
+(define-public mypaint-brushes-2
+ (package (inherit mypaint-brushes)
+ (version "2.0.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/mypaint/mypaint-brushes/"
+ "archive/v" version ".tar.gz"))
+ (sha256
+ (base32
+ "0ap2b6n20lnvdm06x91qawk1k8jmxnf7zffxrqxw60fgqd4whwjm"))))))
--
2.20.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [bug#34283] [PATCH-4/4]Add: mypaint@2.0.0-alpha.2
2019-02-02 4:44 [bug#34283] [PATCH]Add: mypaint Yoshinori Arai
` (5 preceding siblings ...)
2019-02-08 7:25 ` [bug#34283] [PATCH-3/4]Add: mypaint-blushes@2.0.1 Yoshinori Arai
@ 2019-02-08 7:27 ` Yoshinori Arai
2021-01-15 19:50 ` bug#34283: [PATCH]Add: mypaint Julien Lepiller
7 siblings, 0 replies; 20+ messages in thread
From: Yoshinori Arai @ 2019-02-08 7:27 UTC (permalink / raw)
To: 34283
From 624bcd336536880cf802e87bb25aeac8aac97c0a Mon Sep 17 00:00:00 2001
From: Yoshinori Arai <kumagusu08@gmail.com>
Date: Fri, 8 Feb 2019 13:07:44 +0900
Subject: [PATCH 4/4] Add: mypaint@2.0.0-alpha.2
---
gnu/packages/graphics.scm | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 03b411a50..325a9dd51 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -944,3 +944,35 @@ requirements.")
(sha256
(base32
"0ap2b6n20lnvdm06x91qawk1k8jmxnf7zffxrqxw60fgqd4whwjm"))))))
+
+(define-public mypaint-2
+ (package (inherit mypaint)
+ (version "2.0.0-alpha.2")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/mypaint/mypaint/"
+ "archive/v" version ".tar.gz"))
+ (sha256
+ (base32
+ "0nmcvma2vg2iqlvg8v96d3mppc5cn46591hh8jhppgibcvifc81m"))))
+ (build-system python-build-system)
+ (arguments
+ `(#:python ,python-2
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-for-buildconfig-and-test
+ (lambda _
+ (for-each make-file-writable (find-files "." ".*"))
+ ;; FATAL: Cannot create cache dir '/homeless-shelter
+ (setenv "HOME" "/tmp")))
+ (add-before 'build 'set-cflags
+ (lambda _
+ (setenv "CFLAGS" "-Ofast -ftree-vectorize -fopt-info-vec-optimized -march=native -mtune=native -funsafe-math-optimizations -funsafe-loop-optimizations")))
+ (replace 'install
+ (lambda _
+ (invoke "python" "setup.py" "managed_install"
+ (string-append "--prefix=" (assoc-ref %outputs "out"))))))))
+ (inputs
+ `(("gettext" ,gettext-minimal)
+ ("libmypaint" ,libmypaint-2)
+ ("mypaint-brushes" ,mypaint-brushes-2)))))
--
2.20.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* bug#34283: [PATCH]Add: mypaint
2019-02-02 4:44 [bug#34283] [PATCH]Add: mypaint Yoshinori Arai
` (6 preceding siblings ...)
2019-02-08 7:27 ` [bug#34283] [PATCH-4/4]Add: mypaint@2.0.0-alpha.2 Yoshinori Arai
@ 2021-01-15 19:50 ` Julien Lepiller
7 siblings, 0 replies; 20+ messages in thread
From: Julien Lepiller @ 2021-01-15 19:50 UTC (permalink / raw)
To: Yoshinori Arai; +Cc: 34283-close
Le Sat, 2 Feb 2019 13:44:21 +0900,
Yoshinori Arai <kumagusu08@gmail.com> a écrit :
> Hello,
>
> I made mypaint package from git version.
> libmypaint-git, mypaint-brushes-git may be conflict with gimp package.
>
Hello Yoshinori,
Sorry for the late reply, it seems this patch has indeed fell into the
cracks :/. In the meantime, someone pushed mypaint 2.0.1 last December.
This situation is really not great for you and I apologize.
Since we now have mypaint in Guix, I think this patch series is
obsolete, so I'm going ahead and closing. Of course, feel free to
re-open if you think that's a mistake.
^ permalink raw reply [flat|nested] 20+ messages in thread