From: Ricardo Wurmus <rekado@elephly.net>
To: 26966@debbugs.gnu.org
Cc: Ricardo Wurmus <rekado@elephly.net>
Subject: bug#26966: [PATCH 16/22] gnu: java-swt: Move below the bootstrap packages.
Date: Wed, 17 May 2017 19:18:59 +0200 [thread overview]
Message-ID: <20170517171905.7840-16-rekado@elephly.net> (raw)
In-Reply-To: <20170517171905.7840-1-rekado@elephly.net>
* gnu/packages/java.scm (java-swt): Move the package.
---
gnu/packages/java.scm | 173 +++++++++++++++++++++++++-------------------------
1 file changed, 87 insertions(+), 86 deletions(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index edab7fd56..5d1db6218 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -707,92 +707,6 @@ the standard javac executable. The tool runs on JamVM instead of SableVM.")))
("jamvm" ,jamvm)
("classpath" ,classpath-devel)))))
-(define-public java-swt
- (package
- (name "java-swt")
- (version "4.6")
- (source
- ;; The types of many variables and procedures differ in the sources
- ;; dependent on whether the target architecture is a 32-bit system or a
- ;; 64-bit system. Instead of patching the sources on demand in a build
- ;; phase we download either the 32-bit archive (which mostly uses "int"
- ;; types) or the 64-bit archive (which mostly uses "long" types).
- (let ((hash32 "0jmx1h65wqxsyjzs64i2z6ryiynllxzm13cq90fky2qrzagcw1ir")
- (hash64 "0wnd01xssdq9pgx5xqh5lfiy3dmk60dzzqdxzdzf883h13692lgy")
- (file32 "x86")
- (file64 "x86_64"))
- (let-values (((hash file)
- (match (or (%current-target-system) (%current-system))
- ("x86_64-linux" (values hash64 file64))
- (_ (values hash32 file32)))))
- (origin
- (method url-fetch)
- (uri (string-append
- "http://ftp-stud.fht-esslingen.de/pub/Mirrors/"
- "eclipse/eclipse/downloads/drops4/R-" version
- "-201606061100/swt-" version "-gtk-linux-" file ".zip"))
- (sha256 (base32 hash))))))
- (build-system ant-build-system)
- (arguments
- `(#:jar-name "swt.jar"
- #:tests? #f ; no "check" target
- #:phases
- (modify-phases %standard-phases
- (replace 'unpack
- (lambda* (#:key source #:allow-other-keys)
- (and (mkdir "swt")
- (zero? (system* "unzip" source "-d" "swt"))
- (chdir "swt")
- (mkdir "src")
- (zero? (system* "unzip" "src.zip" "-d" "src")))))
- ;; The classpath contains invalid icecat jars. Since we don't need
- ;; anything other than the JDK on the classpath, we can simply unset
- ;; it.
- (add-after 'configure 'unset-classpath
- (lambda _ (unsetenv "CLASSPATH") #t))
- (add-before 'build 'build-native
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((lib (string-append (assoc-ref outputs "out") "/lib")))
- ;; Build shared libraries. Users of SWT have to set the system
- ;; property swt.library.path to the "lib" directory of this
- ;; package output.
- (mkdir-p lib)
- (setenv "OUTPUT_DIR" lib)
- (with-directory-excursion "src"
- (zero? (system* "bash" "build.sh"))))))
- (add-after 'install 'install-native
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((lib (string-append (assoc-ref outputs "out") "/lib")))
- (for-each (lambda (file)
- (install-file file lib))
- (find-files "." "\\.so$"))
- #t))))))
- (inputs
- `(("xulrunner" ,icecat)
- ("gtk" ,gtk+-2)
- ("libxtst" ,libxtst)
- ("libxt" ,libxt)
- ("mesa" ,mesa)
- ("glu" ,glu)))
- (native-inputs
- `(("pkg-config" ,pkg-config)
- ("unzip" ,unzip)))
- (home-page "https://www.eclipse.org/swt/")
- (synopsis "Widget toolkit for Java")
- (description
- "SWT is a widget toolkit for Java designed to provide efficient, portable
-access to the user-interface facilities of the operating systems on which it
-is implemented.")
- ;; SWT code is licensed under EPL1.0
- ;; Gnome and Gtk+ bindings contain code licensed under LGPLv2.1
- ;; Cairo bindings contain code under MPL1.1
- ;; XULRunner 1.9 bindings contain code under MPL2.0
- (license (list
- license:epl1.0
- license:mpl1.1
- license:mpl2.0
- license:lgpl2.1+))))
-
(define-public clojure
(let* ((remove-archives '(begin
(for-each delete-file
@@ -1929,6 +1843,93 @@ IcedTea build harness.")
(define-public icedtea icedtea-7)
+\f
+(define-public java-swt
+ (package
+ (name "java-swt")
+ (version "4.6")
+ (source
+ ;; The types of many variables and procedures differ in the sources
+ ;; dependent on whether the target architecture is a 32-bit system or a
+ ;; 64-bit system. Instead of patching the sources on demand in a build
+ ;; phase we download either the 32-bit archive (which mostly uses "int"
+ ;; types) or the 64-bit archive (which mostly uses "long" types).
+ (let ((hash32 "0jmx1h65wqxsyjzs64i2z6ryiynllxzm13cq90fky2qrzagcw1ir")
+ (hash64 "0wnd01xssdq9pgx5xqh5lfiy3dmk60dzzqdxzdzf883h13692lgy")
+ (file32 "x86")
+ (file64 "x86_64"))
+ (let-values (((hash file)
+ (match (or (%current-target-system) (%current-system))
+ ("x86_64-linux" (values hash64 file64))
+ (_ (values hash32 file32)))))
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://ftp-stud.fht-esslingen.de/pub/Mirrors/"
+ "eclipse/eclipse/downloads/drops4/R-" version
+ "-201606061100/swt-" version "-gtk-linux-" file ".zip"))
+ (sha256 (base32 hash))))))
+ (build-system ant-build-system)
+ (arguments
+ `(#:jar-name "swt.jar"
+ #:tests? #f ; no "check" target
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'unpack
+ (lambda* (#:key source #:allow-other-keys)
+ (and (mkdir "swt")
+ (zero? (system* "unzip" source "-d" "swt"))
+ (chdir "swt")
+ (mkdir "src")
+ (zero? (system* "unzip" "src.zip" "-d" "src")))))
+ ;; The classpath contains invalid icecat jars. Since we don't need
+ ;; anything other than the JDK on the classpath, we can simply unset
+ ;; it.
+ (add-after 'configure 'unset-classpath
+ (lambda _ (unsetenv "CLASSPATH") #t))
+ (add-before 'build 'build-native
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((lib (string-append (assoc-ref outputs "out") "/lib")))
+ ;; Build shared libraries. Users of SWT have to set the system
+ ;; property swt.library.path to the "lib" directory of this
+ ;; package output.
+ (mkdir-p lib)
+ (setenv "OUTPUT_DIR" lib)
+ (with-directory-excursion "src"
+ (zero? (system* "bash" "build.sh"))))))
+ (add-after 'install 'install-native
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((lib (string-append (assoc-ref outputs "out") "/lib")))
+ (for-each (lambda (file)
+ (install-file file lib))
+ (find-files "." "\\.so$"))
+ #t))))))
+ (inputs
+ `(("xulrunner" ,icecat)
+ ("gtk" ,gtk+-2)
+ ("libxtst" ,libxtst)
+ ("libxt" ,libxt)
+ ("mesa" ,mesa)
+ ("glu" ,glu)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+ ("unzip" ,unzip)))
+ (home-page "https://www.eclipse.org/swt/")
+ (synopsis "Widget toolkit for Java")
+ (description
+ "SWT is a widget toolkit for Java designed to provide efficient, portable
+access to the user-interface facilities of the operating systems on which it
+is implemented.")
+ ;; SWT code is licensed under EPL1.0
+ ;; Gnome and Gtk+ bindings contain code licensed under LGPLv2.1
+ ;; Cairo bindings contain code under MPL1.1
+ ;; XULRunner 1.9 bindings contain code under MPL2.0
+ (license (list
+ license:epl1.0
+ license:mpl1.1
+ license:mpl2.0
+ license:lgpl2.1+))))
+
(define-public java-xz
(package
(name "java-xz")
--
2.12.2
next prev parent reply other threads:[~2017-05-17 17:20 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-17 17:06 bug#26966: New Java bootstrap Ricardo Wurmus
2017-05-17 17:18 ` bug#26966: [PATCH 01/22] gnu: Add jikes Ricardo Wurmus
2017-05-17 17:18 ` bug#26966: [PATCH 02/22] gnu: Add sablevm-classpath Ricardo Wurmus
2017-05-18 10:35 ` Roel Janssen
2017-05-17 17:18 ` bug#26966: [PATCH 03/22] gnu: Add sablevm Ricardo Wurmus
2017-05-18 10:34 ` Roel Janssen
2017-05-17 17:18 ` bug#26966: [PATCH 04/22] gnu: Add ant-bootstrap Ricardo Wurmus
2017-05-18 10:38 ` Roel Janssen
2017-05-17 17:18 ` bug#26966: [PATCH 05/22] gnu: Add ecj-bootstrap Ricardo Wurmus
2017-05-22 7:36 ` Roel Janssen
2017-05-17 17:18 ` bug#26966: [PATCH 06/22] gnu: Add ecj-javac-wrapper Ricardo Wurmus
2017-05-22 7:38 ` Roel Janssen
2017-05-22 8:55 ` Ludovic Courtès
2017-05-22 16:28 ` Ricardo Wurmus
2017-05-17 17:18 ` bug#26966: [PATCH 07/22] gnu: Add classpath Ricardo Wurmus
2017-05-22 7:58 ` Roel Janssen
2017-05-22 17:00 ` Ricardo Wurmus
2017-05-17 17:18 ` bug#26966: [PATCH 08/22] gnu: Add jamvm-bootstrap Ricardo Wurmus
2017-05-22 7:59 ` Roel Janssen
2017-05-17 17:18 ` bug#26966: [PATCH 09/22] gnu: Add classpath-jamvm-wrappers Ricardo Wurmus
2017-05-22 8:05 ` Roel Janssen
2017-05-17 17:18 ` bug#26966: [PATCH 10/22] gnu: Add ecj-javac-on-jamvm-wrapper Ricardo Wurmus
2017-05-22 9:38 ` Roel Janssen
2017-05-22 17:01 ` Ricardo Wurmus
2017-05-17 17:18 ` bug#26966: [PATCH 11/22] gnu: Add classpath-devel Ricardo Wurmus
2017-05-22 9:38 ` Roel Janssen
2017-05-17 17:18 ` bug#26966: [PATCH 12/22] gnu: Add jamvm Ricardo Wurmus
2017-05-22 9:39 ` Roel Janssen
2017-05-17 17:18 ` bug#26966: [PATCH 13/22] gnu: Add ecj-javac-on-jamvm-wrapper-final Ricardo Wurmus
2017-05-22 9:39 ` Roel Janssen
2017-05-17 17:18 ` bug#26966: [PATCH 14/22] gnu: Add icedtea-6 Ricardo Wurmus
2017-05-22 9:43 ` Roel Janssen
2017-05-22 14:33 ` Ricardo Wurmus
2017-05-17 17:18 ` bug#26966: [PATCH 15/22] gnu: icedtea-7: Use icedtea-6 for bootstrapping Ricardo Wurmus
2017-05-18 10:09 ` Ricardo Wurmus
2017-05-17 17:18 ` Ricardo Wurmus [this message]
2017-05-22 10:00 ` bug#26966: [PATCH 16/22] gnu: java-swt: Move below the bootstrap packages Roel Janssen
2017-05-17 17:19 ` bug#26966: [PATCH 17/22] gnu: clojure: Move below " Ricardo Wurmus
2017-05-22 10:01 ` Roel Janssen
2017-05-17 17:19 ` bug#26966: [PATCH 18/22] gnu: ant-bootstrap: Do not delete scripts Ricardo Wurmus
2017-05-18 10:54 ` Roel Janssen
2017-05-18 19:57 ` Ricardo Wurmus
2017-05-17 17:19 ` bug#26966: [PATCH 19/22] gnu: ant: Inherit from ant-bootstrap Ricardo Wurmus
2017-05-22 10:02 ` Roel Janssen
2017-05-17 17:19 ` bug#26966: [PATCH 20/22] gnu: ant: Delete bundled jars Ricardo Wurmus
2017-05-18 10:31 ` Roel Janssen
2017-05-17 17:19 ` bug#26966: [PATCH 21/22] gnu: ant: Update to 1.10.1 Ricardo Wurmus
2017-05-18 9:31 ` Roel Janssen
2017-05-18 20:00 ` Ricardo Wurmus
2017-05-18 21:23 ` Ricardo Wurmus
2017-05-17 17:19 ` bug#26966: [PATCH 22/22] gnu: Remove GCJ Ricardo Wurmus
2017-05-18 9:29 ` Roel Janssen
2017-05-18 10:03 ` Ricardo Wurmus
2017-05-18 10:28 ` Roel Janssen
2017-05-18 11:49 ` Ludovic Courtès
2017-05-18 9:25 ` bug#26966: [PATCH 01/22] gnu: Add jikes Roel Janssen
2017-05-18 11:54 ` Ludovic Courtès
2017-05-18 9:24 ` bug#26966: New Java bootstrap Roel Janssen
2017-05-18 11:47 ` Ludovic Courtès
2017-05-22 10:22 ` Roel Janssen
2017-05-22 17:03 ` Ricardo Wurmus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170517171905.7840-16-rekado@elephly.net \
--to=rekado@elephly.net \
--cc=26966@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.