unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
blob 6178bfbe4fe97a8937e9a81d15327152c23896b7 10404 bytes (raw)
name: gnu/packages/java-graphics.scm 	 # note: path name is non-authoritative(*)

  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
 
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2023 Frank Pursel <frank.pursel@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

(define-module (gnu packages java-graphics)
  #:use-module ((guix licenses) #:prefix license:)
  #:use-module (gnu packages bash)
  #:use-module (gnu packages batik)
  #:use-module (gnu packages java)
  #:use-module (gnu packages java-xml)
  #:use-module (gnu packages xml)
  #:use-module (gnu packages xorg)
  #:use-module (gnu packages)
  #:use-module (guix build utils)
  #:use-module (guix build-system ant)
  #:use-module (guix download)
  #:use-module (guix git-download)
  #:use-module (guix modules)
  #:use-module (guix packages)
  #:use-module (guix utils)
  #:use-module (ice-9 match))

(define-public ditaa
  (package
    (name "ditaa")
    (version "0.11.0")
    (source (origin
              (method git-fetch)
              (uri (git-reference
                    (url "https://github.com/stathissideris/ditaa")
                    (commit (string-append "v" version))))
              (file-name (git-file-name name version))
              (sha256
               (base32
                "1y3g17wp1wvb05m56pp25avww2njpgh0gk0jsbsf25scj7hyyj26"))
              (modules '((guix build utils)))
              (snippet
               '(begin
                  (format #t "~%~a~%" "Finding and removing embedded jars.")
                  (for-each
                   (lambda (jarf)
                     (delete-file jarf)
                     (format #t "Deleted: ~a~%" jarf))
                   (find-files "." "\\.jar$"))))))
    (build-system ant-build-system)
    (inputs (list bash-minimal))
    (native-inputs (list
                    java-commons-cli
                    java-jericho-html
                    java-junit
                    java-libbatik
                    java-w3c-svg))
    (arguments
     `(#:build-target "release-all"
       #:phases
       (modify-phases %standard-phases
           ;; Ant's buildfile and build tree need to be modified
           ;; to provide access to the guix builds of the
           ;; batik and the java-commons-cli
           ;; jar files.  Also some of the source requires java7.
           (add-before 'build 'build-prep
             (lambda* (#:key inputs outputs #:allow-other-keys)
               (let* ((batik-jar
                       (search-input-file
                        inputs
                        "share/java/batik.jar"))
                      (commons-cli-jar
                       (search-input-file
                        inputs
                        "lib/m2/commons-cli/commons-cli/1.4/commons-cli-1.4.jar")))
                 (mkdir-p "lib")
                 (copy-file batik-jar "./lib/batik.jar")
                 (copy-file commons-cli-jar "./lib/commons-cli.jar"))
               (with-directory-excursion "build"
                 (substitute* "release.xml"
                   (("source=\"1.6\"")
                    "source=\"7\"")
                   (("<file name=\"commons-cli-1.2.jar\"/>")
                    (string-append "<file name=\"commons-cli.jar\"/>"
                                   "\n" "<file name=\"batik.jar\"/>"))))))
           (replace 'build
             (lambda* _
               (setenv "ANT_OPTS"
                       (string-append "-Dversion.string="
                                      ,version))
               (with-directory-excursion "build"
                 (invoke "ant" "-f" "release.xml" "release-jar"))))
           (replace 'check
             (lambda* (#:key tests? #:allow-other-keys)
               (if tests?
                   (begin
                     (setenv "ANT_OPTS"
                             (string-append "-Dversion.string="
                                            ,version))
                     (mkdir-p "tests/testlib")
                     (with-directory-excursion "build"
                       (invoke "ant" "-f" "release.xml"
                               "generate-test-images")
                       (invoke "ant" "test"))) #f)))
           (replace 'install
             (lambda* (#:key inputs outputs #:allow-other-keys)
               (let* ((out (assoc-ref outputs "out"))
                      (lib (string-append out "/lib"))
                      (bin (string-append out "/bin"))
                      (bash (search-input-file inputs "bin/bash"))
                      (java (search-input-file inputs "bin/java"))
                      (jre (search-input-directory inputs "jre"))
                      (ditaa (string-append out "/bin/ditaa"))
                      (jar-name (string-append ,name
                                               ,version ".jar")))
                 (with-directory-excursion "releases"
                   (install-file jar-name lib))
                 (mkdir-p bin)
                 (with-output-to-file ditaa
                   (lambda _
                     (format #t "#!~a~%JAVA_HOME=~a ~a -jar ~a/~a $@~%"
                             bash jre java lib jar-name)))
                 (chmod ditaa #o755))))
           (add-after 'install 'install-docs
             (lambda* (#:key outputs #:allow-other-keys)
               (let ((doc (string-append (assoc-ref outputs "out")
                                         "/share/doc/")))
                 (for-each (lambda (filen)
                             (install-file filen doc))
                           (find-files "." ".*README\\.md"))))))))
    (home-page "https://github.com/stathissideris/ditaa")
    (synopsis "Create graphics from ascii art")
    (description
     "ditaa is a small command-line utility 
that converts diagrams drawn using ascii art 
('drawings' that contain characters that resemble lines like @samp{|} 
@samp{/} @samp{-}), 
into proper bitmap graphics.")
    (license license:lgpl3)))

(define-public java-piccolo2d-core
  (package
    (name "java-piccolo2d-core")
    (version "3.0.1")
    (source (origin
              (method git-fetch)
              (uri (git-reference
                    (url "https://github.com/piccolo2d/piccolo2d.java")
                    (commit (string-append "piccolo2d-complete-" version))))
              (file-name (git-file-name name version))
              (sha256
               (base32
                "1k6gw643k83516lcw04mgac2yi75phdrng44pz9xk6hz066ip21s"))))
    (build-system ant-build-system)
    (arguments
     `(#:jar-name "piccolo2d-core.jar"
       #:phases
       (modify-phases %standard-phases
         (add-after 'unpack 'chdir
           (lambda _ (chdir "core") #t)))))
    (inputs
     (list java-junit))
    (home-page "http://piccolo2d.org")
    (synopsis "Structured 2D graphics framework")
    (description "Piccolo2D is a framework (in the Jazz ZUI tradition) to
create robust, full-featured graphical applications in Java, with features
such as zooming and multiple representation.  This package provides the core
libraries.")
    (license license:bsd-3)))

(define-public java-piccolo2d-extras
  (package (inherit java-piccolo2d-core)
    (name "java-piccolo2d-extras")
    (arguments
     `(#:jar-name "piccolo2d-extras.jar"
       #:phases
       (modify-phases %standard-phases
         (add-after 'unpack 'chdir
           (lambda _ (chdir "extras") #t))
         (add-after 'chdir 'remove-failing-test
           (lambda _
             ;; TODO: These both fail with "Unable to convolve src image"
             (delete-file "src/test/java/org/piccolo2d/extras/nodes/PShadowTest.java")
             (delete-file "src/test/java/org/piccolo2d/extras/util/ShadowUtilsTest.java")
             #t))
         (add-before 'check 'start-xorg-server
           (lambda* (#:key inputs #:allow-other-keys)
             ;; The test suite requires a running X server.
             (system "Xvfb :1 -screen 0 640x480x24 &")
             (setenv "DISPLAY" ":1")
             #t)))))
    (inputs
     (list java-piccolo2d-core java-junit))
    (native-inputs
     (list xorg-server)) ; for tests
    (description "Piccolo2D is a framework (in the Jazz ZUI tradition) to
create robust, full-featured graphical applications in Java, with features
such as zooming and multiple representation.  This package provides additional
features not found in the core libraries.")))

(define-public java-marlin-renderer
  (package
    (name "java-marlin-renderer")
    (version "0.9.4.2")
    (source (origin
              (method git-fetch)
              (uri (git-reference
                    (url "https://github.com/bourgesl/marlin-renderer")
                    (commit (string-append "v" (string-map (match-lambda
                                                             (#\. #\_)
                                                             (c c))
                                                           version)))))
              (file-name (git-file-name name version))
              (sha256
               (base32
                "12vb8fmxf1smnyv6w8i1khahy76v6r29j1qwabbykxff8i9ndxqv"))))
    (build-system ant-build-system)
    (arguments
     `(#:jar-name "marlin.jar"
       #:test-include (list "src/test/java/RunJUnitTest.java")))
    (inputs
     (list java-hamcrest-core java-junit))
    (home-page "https://github.com/bourgesl/marlin-renderer/")
    (synopsis "Rendering engine")
    (description "Marlin is a Java2D @code{RenderingEngine} optimized for
performance (improved memory usage and footprint, better multi-threading) and
better visual quality based on OpenJDK's @code{pisces} implementation.  It
handles shape rendering (@code{Graphics2D} @code{draw(Shape)} /
@code{fill(Shape)} with stroke and dash attributes.")
    ;; With Classpath Exception
    (license license:gpl2)))

debug log:

solving 6178bfbe4f ...
found 6178bfbe4f in https://yhetil.org/guix-patches/d5869ad65ce99348a2c2d2d26ac2e679377ad67d.1677706130.git.frank.pursel@gmail.com/
found 9a71548b9c in https://git.savannah.gnu.org/cgit/guix.git
preparing index
index prepared:
100644 9a71548b9cde2b548d53d5506f6bb585d7216b90	gnu/packages/java-graphics.scm

applying [1/1] https://yhetil.org/guix-patches/d5869ad65ce99348a2c2d2d26ac2e679377ad67d.1677706130.git.frank.pursel@gmail.com/
diff --git a/gnu/packages/java-graphics.scm b/gnu/packages/java-graphics.scm
index 9a71548b9c..6178bfbe4f 100644

1:143: trailing whitespace.
     "ditaa is a small command-line utility 
1:144: trailing whitespace.
that converts diagrams drawn using ascii art 
1:145: trailing whitespace.
('drawings' that contain characters that resemble lines like @samp{|} 
1:146: trailing whitespace.
@samp{/} @samp{-}), 
Checking patch gnu/packages/java-graphics.scm...
Applied patch gnu/packages/java-graphics.scm cleanly.
warning: 4 lines add whitespace errors.

index at:
100644 6178bfbe4fe97a8937e9a81d15327152c23896b7	gnu/packages/java-graphics.scm

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).