GNU bug report logs -
#65711
[PATCH 0/2] Add wl-mirror.
Previous Next
Reported by: kiasoc5 <kiasoc5 <at> disroot.org>
Date: Sat, 2 Sep 2023 23:22:02 UTC
Severity: normal
Tags: patch
Done: Hilton Chain <hako <at> ultrarare.space>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 65711 in the body.
You can then email your comments to 65711 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
Report forwarded
to
guix-patches <at> gnu.org
:
bug#65711
; Package
guix-patches
.
(Sat, 02 Sep 2023 23:22:02 GMT)
Full text and
rfc822 format available.
Acknowledgement sent
to
kiasoc5 <kiasoc5 <at> disroot.org>
:
New bug report received and forwarded. Copy sent to
guix-patches <at> gnu.org
.
(Sat, 02 Sep 2023 23:22:02 GMT)
Full text and
rfc822 format available.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
Requires wlr-protocols, which doesn't have a release, so use the latest tag.
Helps wlroots compositors (eg Sway) work around sharing windows of applications.
kiasoc5 (2):
gnu: Add wlr-protocols.
gnu: Add wl-mirror.
gnu/packages/freedesktop.scm | 28 ++++++++++++++++++++
gnu/packages/wm.scm | 51 ++++++++++++++++++++++++++++++++++++
2 files changed, 79 insertions(+)
base-commit: 4818ad5ba204e094fd8995c90c16ee1940e76210
--
2.39.2
Information forwarded
to
guix-patches <at> gnu.org
:
bug#65711
; Package
guix-patches
.
(Mon, 18 Sep 2023 02:09:01 GMT)
Full text and
rfc822 format available.
Message #8 received at 65711 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
For some reason git send-email didn't work with this address so I send
the patches as attachments.
[0001-gnu-Add-wlr-protocols.patch (text/x-diff, attachment)]
[0002-gnu-Add-wl-mirror.patch (text/x-diff, attachment)]
Information forwarded
to
guix-patches <at> gnu.org
:
bug#65711
; Package
guix-patches
.
(Tue, 05 Mar 2024 15:02:02 GMT)
Full text and
rfc822 format available.
Message #11 received at 65711 <at> debbugs.gnu.org (full text, mbox):
Dear Guix,
I also needed wl-mirror and unfortunately didn't check
issues.guix.gnu.org before. However, I ended with quite the same
patch (one difference is, that I used e newer version of
wl-mirror), independently.
What can we do to get one of the patches merged into guix's
master?
Best Regards,
Julian Flake
--
Dipl.-Inf. Julian Flake
Universität Koblenz
Fachbereich Informatik
Institut für Softwaretechnik
Postfach 20 16 02 | D-56016 Koblenz
Tel.: +49 261 287 2787
E-Mail: flake <at> uni-koblenz.de
Website: https://www.uni-koblenz.de/~flake
Information forwarded
to
guix-patches <at> gnu.org
:
bug#65711
; Package
guix-patches
.
(Tue, 05 Mar 2024 15:02:02 GMT)
Full text and
rfc822 format available.
Message #14 received at 65711 <at> debbugs.gnu.org (full text, mbox):
---
gnu/packages/freedesktop.scm | 31 +++++++++++++++++
gnu/packages/wm.scm | 67 ++++++++++++++++++++++++++----------
2 files changed, 80 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 7b5d2dbbf2..627a837801 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1270,6 +1270,37 @@ (define-public wayland-protocols
. "https://wayland.freedesktop.org/releases.html")))
(license license:expat)))
+(define-public wlr-protocols
+ (let ((revision "0")
+ (commit "4264185db3b7e961e7f157e1cc4fd0ab75137568"))
+ (package
+ (name "wlr-protocols")
+ (version (git-version "0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.freedesktop.org/wlroots/wlr-protocols.git")
+ (commit commit)))
+ (sha256
+ (base32
+ "045jj3mbhi7p2qn59krz0vap0wd3i6zgwkvpl97idy702bnk9mv6"))))
+ (build-system gnu-build-system)
+ (arguments
+ '(#:phases (modify-phases %standard-phases
+ (delete 'configure)
+ (add-before 'build 'set-prefix-in-makefile
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (substitute* "Makefile"
+ (("PREFIX=.*") (string-append "PREFIX="out "\n")))))))))
+ (inputs
+ (list wayland))
+ (home-page "https://gitlab.freedesktop.org/wlroots/wlr-protocols")
+ (synopsis "Wayland protocols designed for use in wlroots (and other compositors).")
+ (description
+ "Wayland protocols designed for use in wlroots (and other compositors).")
+ (license expat))))
+
(define-public wayland-utils
(package
(name "wayland-utils")
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 8ed3ed1107..f661140d28 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1759,6 +1759,37 @@ (define-public wlroots-0.16
(propagated-inputs (modify-inputs (package-propagated-inputs wlroots)
(delete libdisplay-info)))))
+(define-public wl-mirror
+ (package
+ (name "wl-mirror")
+ (version "0.16.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Ferdi265/wl-mirror")
+ (commit "v0.16.1")))
+ (sha256
+ (base32
+ "0464m60xsbpfwvsszrdkjsxfvrbkr71hp7phsz05cqyvjwf6cism"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ #:tests? #f
+ #:configure-flags
+ #~(list "-DFORCE_SYSTEM_WL_PROTOCOLS=ON"
+ (string-append "-DWL_PROTOCOL_DIR="
+ #$(this-package-input "wayland-protocols") "/share/wayland-protocols")
+ "-DFORCE_SYSTEM_WLR_PROTOCOLS=ON"
+ (string-append "-DWLR_PROTOCOL_DIR="
+ #$(this-package-input "wlr-protocols") "/share/wlr-protocols"))))
+ (inputs
+ (list pkg-config egl-wayland mesa wayland wayland-protocols wlr-protocols))
+ (home-page "https://github.com/Ferdi265/wl-mirror")
+ (synopsis "A simple Wayland output mirror client")
+ (description
+ "wl-mirror attempts to provide a solution to sway's lack of output mirroring by mirroring an output onto a client surface.")
+ (license gpl3)))
+
(define-public sway
(package
(name "sway")
@@ -1777,21 +1808,21 @@ (define-public sway
`(;; elogind is propagated by wlroots -> libseat
;; and would otherwise shadow basu.
#:configure-flags '("-Dsd-bus-provider=basu")
- #:phases
- (modify-phases %standard-phases
- (add-before 'configure 'hardcode-paths
- (lambda* (#:key inputs #:allow-other-keys)
- ;; Hardcode path to swaybg.
- (substitute* "sway/config.c"
- (("strdup..swaybg..")
- (string-append "strdup(\"" (assoc-ref inputs "swaybg")
- "/bin/swaybg\")")))
- ;; Hardcode path to scdoc.
- (substitute* "meson.build"
- (("scdoc.get_pkgconfig_variable..scdoc..")
- (string-append "'" (assoc-ref inputs "scdoc")
- "/bin/scdoc'")))
- #t)))))
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'hardcode-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Hardcode path to swaybg.
+ (substitute* "sway/config.c"
+ (("strdup..swaybg..")
+ (string-append "strdup(\"" (assoc-ref inputs "swaybg")
+ "/bin/swaybg\")")))
+ ;; Hardcode path to scdoc.
+ (substitute* "meson.build"
+ (("scdoc.get_pkgconfig_variable..scdoc..")
+ (string-append "'" (assoc-ref inputs "scdoc")
+ "/bin/scdoc'")))
+ #t)))))
(inputs (list basu
cairo
gdk-pixbuf
@@ -1807,9 +1838,9 @@ (define-public sway
(native-inputs
(cons* linux-pam mesa pkg-config scdoc wayland-protocols
(if (%current-target-system)
- (list pkg-config-for-build
- wayland)
- '())))
+ (list pkg-config-for-build
+ wayland)
+ '())))
(home-page "https://github.com/swaywm/sway")
(synopsis "Wayland compositor compatible with i3")
(description "Sway is a i3-compatible Wayland compositor.")
base-commit: b6dec0108f99d75066bad15aaa124b84bb0261f3
--
2.41.0
Information forwarded
to
guix-patches <at> gnu.org
:
bug#65711
; Package
guix-patches
.
(Wed, 06 Mar 2024 08:48:01 GMT)
Full text and
rfc822 format available.
Message #17 received at 65711 <at> debbugs.gnu.org (full text, mbox):
Sending patch again, since the previous [PATCH v1] contained
additional/unnecessary indentation related diff
--
Dipl.-Inf. Julian Flake
Universität Koblenz
Fachbereich Informatik
Institut für Softwaretechnik
Postfach 20 16 02 | D-56016 Koblenz
Tel.: +49 261 287 2787
E-Mail: flake <at> uni-koblenz.de
Website: https://www.uni-koblenz.de/~flake
Information forwarded
to
guix-patches <at> gnu.org
:
bug#65711
; Package
guix-patches
.
(Wed, 06 Mar 2024 08:49:02 GMT)
Full text and
rfc822 format available.
Message #20 received at 65711 <at> debbugs.gnu.org (full text, mbox):
---
gnu/packages/freedesktop.scm | 31 +++++++++++++++++++++++++++++++
gnu/packages/wm.scm | 31 +++++++++++++++++++++++++++++++
2 files changed, 62 insertions(+)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 7b5d2dbbf2..627a837801 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1270,6 +1270,37 @@ (define-public wayland-protocols
. "https://wayland.freedesktop.org/releases.html")))
(license license:expat)))
+(define-public wlr-protocols
+ (let ((revision "0")
+ (commit "4264185db3b7e961e7f157e1cc4fd0ab75137568"))
+ (package
+ (name "wlr-protocols")
+ (version (git-version "0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.freedesktop.org/wlroots/wlr-protocols.git")
+ (commit commit)))
+ (sha256
+ (base32
+ "045jj3mbhi7p2qn59krz0vap0wd3i6zgwkvpl97idy702bnk9mv6"))))
+ (build-system gnu-build-system)
+ (arguments
+ '(#:phases (modify-phases %standard-phases
+ (delete 'configure)
+ (add-before 'build 'set-prefix-in-makefile
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (substitute* "Makefile"
+ (("PREFIX=.*") (string-append "PREFIX="out "\n")))))))))
+ (inputs
+ (list wayland))
+ (home-page "https://gitlab.freedesktop.org/wlroots/wlr-protocols")
+ (synopsis "Wayland protocols designed for use in wlroots (and other compositors).")
+ (description
+ "Wayland protocols designed for use in wlroots (and other compositors).")
+ (license expat))))
+
(define-public wayland-utils
(package
(name "wayland-utils")
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 8ed3ed1107..fe07747a81 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1759,6 +1759,37 @@ (define-public wlroots-0.16
(propagated-inputs (modify-inputs (package-propagated-inputs wlroots)
(delete libdisplay-info)))))
+(define-public wl-mirror
+ (package
+ (name "wl-mirror")
+ (version "0.16.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Ferdi265/wl-mirror")
+ (commit "v0.16.1")))
+ (sha256
+ (base32
+ "0464m60xsbpfwvsszrdkjsxfvrbkr71hp7phsz05cqyvjwf6cism"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ #:tests? #f
+ #:configure-flags
+ #~(list "-DFORCE_SYSTEM_WL_PROTOCOLS=ON"
+ (string-append "-DWL_PROTOCOL_DIR="
+ #$(this-package-input "wayland-protocols") "/share/wayland-protocols")
+ "-DFORCE_SYSTEM_WLR_PROTOCOLS=ON"
+ (string-append "-DWLR_PROTOCOL_DIR="
+ #$(this-package-input "wlr-protocols") "/share/wlr-protocols"))))
+ (inputs
+ (list pkg-config egl-wayland mesa wayland wayland-protocols wlr-protocols))
+ (home-page "https://github.com/Ferdi265/wl-mirror")
+ (synopsis "A simple Wayland output mirror client")
+ (description
+ "wl-mirror attempts to provide a solution to sway's lack of output mirroring by mirroring an output onto a client surface.")
+ (license gpl3)))
+
(define-public sway
(package
(name "sway")
base-commit: b6dec0108f99d75066bad15aaa124b84bb0261f3
--
2.41.0
Information forwarded
to
guix-patches <at> gnu.org
:
bug#65711
; Package
guix-patches
.
(Wed, 06 Mar 2024 11:24:02 GMT)
Full text and
rfc822 format available.
Message #23 received at 65711 <at> debbugs.gnu.org (full text, mbox):
Split the two packages into two separate patches
---
gnu/packages/freedesktop.scm | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 7b5d2dbbf2..dbb55506b6 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1270,6 +1270,34 @@ (define-public wayland-protocols
. "https://wayland.freedesktop.org/releases.html")))
(license license:expat)))
+(define-public wlr-protocols
+ (let ((revision "0")
+ (commit "4264185db3b7e961e7f157e1cc4fd0ab75137568"))
+ (package
+ (name "wlr-protocols")
+ (version (git-version "0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.freedesktop.org/wlroots/wlr-protocols.git")
+ (commit commit)))
+ (sha256
+ (base32
+ "045jj3mbhi7p2qn59krz0vap0wd3i6zgwkvpl97idy702bnk9mv6"))))
+ (build-system gnu-build-system)
+ (arguments
+ '(#:make-flags (list
+ (string-append "PREFIX=" (assoc-ref %outputs "out")))
+ #:phases (modify-phases %standard-phases
+ (delete 'configure))))
+ (inputs
+ (list wayland))
+ (home-page "https://gitlab.freedesktop.org/wlroots/wlr-protocols")
+ (synopsis "Wayland protocols designed for use in wlroots (and other compositors).")
+ (description
+ "Wayland protocols designed for use in wlroots (and other compositors).")
+ (license license:expat))))
+
(define-public wayland-utils
(package
(name "wayland-utils")
base-commit: b6dec0108f99d75066bad15aaa124b84bb0261f3
--
2.41.0
Information forwarded
to
guix-patches <at> gnu.org
:
bug#65711
; Package
guix-patches
.
(Wed, 06 Mar 2024 11:24:02 GMT)
Full text and
rfc822 format available.
Message #26 received at 65711 <at> debbugs.gnu.org (full text, mbox):
---
gnu/packages/wm.scm | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 8ed3ed1107..d4e5af44d5 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1759,6 +1759,37 @@ (define-public wlroots-0.16
(propagated-inputs (modify-inputs (package-propagated-inputs wlroots)
(delete libdisplay-info)))))
+(define-public wl-mirror
+ (package
+ (name "wl-mirror")
+ (version "0.16.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Ferdi265/wl-mirror")
+ (commit "v0.16.1")))
+ (sha256
+ (base32
+ "0464m60xsbpfwvsszrdkjsxfvrbkr71hp7phsz05cqyvjwf6cism"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ #:tests? #f
+ #:configure-flags
+ #~(list "-DFORCE_SYSTEM_WL_PROTOCOLS=ON"
+ (string-append "-DWL_PROTOCOL_DIR="
+ #$(this-package-input "wayland-protocols") "/share/wayland-protocols")
+ "-DFORCE_SYSTEM_WLR_PROTOCOLS=ON"
+ (string-append "-DWLR_PROTOCOL_DIR="
+ #$(this-package-input "wlr-protocols") "/share/wlr-protocols"))))
+ (inputs
+ (list pkg-config egl-wayland mesa wayland wayland-protocols wlr-protocols))
+ (home-page "https://github.com/Ferdi265/wl-mirror")
+ (synopsis "A simple Wayland output mirror client")
+ (description
+ "wl-mirror attempts to provide a solution to sway's lack of output mirroring by mirroring an output onto a client surface.")
+ (license license:gpl3)))
+
(define-public sway
(package
(name "sway")
--
2.41.0
Information forwarded
to
guix-patches <at> gnu.org
:
bug#65711
; Package
guix-patches
.
(Thu, 14 Mar 2024 11:29:01 GMT)
Full text and
rfc822 format available.
Message #29 received at 65711 <at> debbugs.gnu.org (full text, mbox):
Revision 4: use latest commit of wlr-protocols
Change-Id: Ia8daffd7219b7bd573ae54e7cfc5ec6b6a5f4052
---
gnu/packages/freedesktop.scm | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 7b5d2dbbf2..88d0d1d080 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1270,6 +1270,34 @@ (define-public wayland-protocols
. "https://wayland.freedesktop.org/releases.html")))
(license license:expat)))
+(define-public wlr-protocols
+ (let ((revision "3")
+ (commit "2b8d43325b7012cc3f9b55c08d26e50e42beac7d"))
+ (package
+ (name "wlr-protocols")
+ (version (git-version "0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.freedesktop.org/wlroots/wlr-protocols.git")
+ (commit commit)))
+ (sha256
+ (base32
+ "02ydbbbz9y0hxnpkypw9vwz7q8dzswrl1500liqq1ddgxg89zzd0"))))
+ (build-system gnu-build-system)
+ (arguments
+ '(#:make-flags (list
+ (string-append "PREFIX=" (assoc-ref %outputs "out")))
+ #:phases (modify-phases %standard-phases
+ (delete 'configure))))
+ (inputs
+ (list wayland))
+ (home-page "https://gitlab.freedesktop.org/wlroots/wlr-protocols")
+ (synopsis "Wayland protocols designed for use in wlroots (and other compositors).")
+ (description
+ "Wayland protocols designed for use in wlroots (and other compositors).")
+ (license license:expat))))
+
(define-public wayland-utils
(package
(name "wayland-utils")
base-commit: b6dec0108f99d75066bad15aaa124b84bb0261f3
--
2.41.0
Information forwarded
to
guix-patches <at> gnu.org
:
bug#65711
; Package
guix-patches
.
(Thu, 14 Mar 2024 11:29:02 GMT)
Full text and
rfc822 format available.
Message #32 received at 65711 <at> debbugs.gnu.org (full text, mbox):
use latest version of wl-mirror
Change-Id: Ib87959a40800a2a8219877611b8cfd301960c608
---
gnu/packages/wm.scm | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 8ed3ed1107..24c6fdf9e5 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1759,6 +1759,37 @@ (define-public wlroots-0.16
(propagated-inputs (modify-inputs (package-propagated-inputs wlroots)
(delete libdisplay-info)))))
+(define-public wl-mirror
+ (package
+ (name "wl-mirror")
+ (version "0.16.2")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Ferdi265/wl-mirror")
+ (commit (string-append "v" version))))
+ (sha256
+ (base32
+ "1jdycr9vf5skbf55kbm2hc3zl3qg58x3bb6xqkf9qx14m4ramcdj"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ #:tests? #f
+ #:configure-flags
+ #~(list "-DFORCE_SYSTEM_WL_PROTOCOLS=ON"
+ (string-append "-DWL_PROTOCOL_DIR="
+ #$(this-package-input "wayland-protocols") "/share/wayland-protocols")
+ "-DFORCE_SYSTEM_WLR_PROTOCOLS=ON"
+ (string-append "-DWLR_PROTOCOL_DIR="
+ #$(this-package-input "wlr-protocols") "/share/wlr-protocols"))))
+ (inputs
+ (list pkg-config egl-wayland mesa wayland wayland-protocols wlr-protocols))
+ (home-page "https://github.com/Ferdi265/wl-mirror")
+ (synopsis "A simple Wayland output mirror client")
+ (description
+ "wl-mirror attempts to provide a solution to sway's lack of output mirroring by mirroring an output onto a client surface.")
+ (license license:gpl3)))
+
(define-public sway
(package
(name "sway")
--
2.41.0
Reply sent
to
Hilton Chain <hako <at> ultrarare.space>
:
You have taken responsibility.
(Sat, 20 Apr 2024 01:30:02 GMT)
Full text and
rfc822 format available.
Notification sent
to
kiasoc5 <kiasoc5 <at> disroot.org>
:
bug acknowledged by developer.
(Sat, 20 Apr 2024 01:30:03 GMT)
Full text and
rfc822 format available.
Message #37 received at 65711-done <at> debbugs.gnu.org (full text, mbox):
Hi Julian,
On Thu, 14 Mar 2024 19:26:46 +0800,
Julian Flake wrote:
>
> Revision 4: use latest commit of wlr-protocols
I have adjusted the series and applied them as 6c4f3043933d and d66bfbeeb2a9.
Thanks!
Information forwarded
to
guix-patches <at> gnu.org
:
bug#65711
; Package
guix-patches
.
(Sat, 20 Apr 2024 07:27:01 GMT)
Full text and
rfc822 format available.
Message #40 received at 65711-done <at> debbugs.gnu.org (full text, mbox):
Hi Hilton,
>> Revision 4: use latest commit of wlr-protocols
>
> I have adjusted the series and applied them as 6c4f3043933d and
> d66bfbeeb2a9.
Thank you!
Best Regards,
Julian
bug archived.
Request was from
Debbugs Internal Request <help-debbugs <at> gnu.org>
to
internal_control <at> debbugs.gnu.org
.
(Sat, 18 May 2024 11:24:05 GMT)
Full text and
rfc822 format available.
This bug report was last modified 355 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.