| Message ID | cucsgwvo4w5.fsf@lprndn.info |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [bug#34189] gnu: Add arcan. | expand |
| Context | Check | Description |
|---|---|---|
| cbaines/applying patch | fail | Apply failed |
Hello, L p R n d n <guix@lprndn.info> skribis: >> I think that “LGPL” means ’lgpl2.0+’ though, not ‘lgpl2.0’. Could you >> check whether source files that have a GPL or LGPL license header carry >> the “or any later version” wording? > > From what I found, there are both lgpl2.0 and lgpl2.0+ in the package so > I put both. I also added public-domain license as it seems quite a few > files use it. OK. >> And the changes that were needed: >> >> diff --git a/gnu/local.mk b/gnu/local.mk >> index 1ea8069308..97962110c4 100644 >> --- a/gnu/local.mk >> +++ b/gnu/local.mk >> @@ -65,6 +65,7 @@ GNU_SYSTEM_MODULES = \ >> %D%/packages/antivirus.scm \ >> %D%/packages/apl.scm \ >> %D%/packages/apr.scm \ >> + %D%/packages/arcan.scm \ >> %D%/packages/aspell.scm \ >> %D%/packages/assembly.scm \ >> %D%/packages/astronomy.scm \ >> diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm >> index 9ff72a429b..e706f11edf 100644 >> --- a/gnu/packages/arcan.scm >> +++ b/gnu/packages/arcan.scm >> @@ -21,8 +21,6 @@ >> #:use-module (guix git-download) >> #:use-module ((guix licenses) #:prefix license:) >> #:use-module (guix packages) >> - #:use-module (guix utils) I re-added these changes. > From d6c6aeb76c97c8f7a3eb68a115bf2cb59715bac2 Mon Sep 17 00:00:00 2001 > From: Lprndn <guix@lprndn.info> > Date: Thu, 24 Jan 2019 13:29:21 +0100 > Subject: [PATCH] gnu: Add arcan. > > * gnu/packages/arcan.scm: New file. Applied (with the changes above). I confirm that it builds for me on x86_64-linux. > From 4517b292cc36382ee0b855e3a5caf6c3ba5f4c2d Mon Sep 17 00:00:00 2001 > From: Lprndn <guix@lprndn.info> > Date: Thu, 24 Jan 2019 13:34:26 +0100 > Subject: [PATCH] gnu: Add arcan-sdl. > > * gnu/packages/arcan.scm (arcan-sdl): New variable. Applied. > From a0a69b664c3ada7522f42b8ea28ad08d8f39a5d4 Mon Sep 17 00:00:00 2001 > From: Lprndn <guix@lprndn.info> > Date: Thu, 24 Jan 2019 13:39:06 +0100 > Subject: [PATCH] gnu: Add xarcan. > > * gnu/packages/arcan.scm (xarcan): New variable. [...] > +(define-public xarcan > + (package > + (name "xarcan") > + (version "0.5.4") > + (source > + (origin > + (method git-fetch) > + (file-name (git-file-name name version)) > + (uri (git-reference > + (url "https://github.com/letoram/xarcan.git") > + (commit "8e6ee029388326cfe5cddeffe482eb3702e9b7f3"))) > + (sha256 > + (base32 "0zng7cs6733mnf0p6g5wv02981f2sf567n56csax6cmzb8fpamym")))) Please use ‘git-version’ for the ‘version’ field, like you did for ‘arcan’. > + (home-page "https://arcan-fe.com") > + (synopsis "Patched Xserver that bridges connections to Arcan") > + (description "Patched Xserver that bridges connections to Arcan.") Please expound the description a bit—see <https://gnu.org/s/guix/manual/en/html_node/Synopses-and-Descriptions.html>. Sorry that this is taking so long, but at least we’re making progress! :-) Ludo’.
Hello, I see the lats bit that appeared unresolved here has been committed, as we have a 'xarcan' package in Guix now. Thanks to both of you for your efforts! Closing. Maxim
From a0a69b664c3ada7522f42b8ea28ad08d8f39a5d4 Mon Sep 17 00:00:00 2001 From: Lprndn <guix@lprndn.info> Date: Thu, 24 Jan 2019 13:39:06 +0100 Subject: [PATCH] gnu: Add xarcan. * gnu/packages/arcan.scm (xarcan): New variable. --- gnu/packages/arcan.scm | 67 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm index aa32acfb9f..ba1526f10b 100644 --- a/gnu/packages/arcan.scm +++ b/gnu/packages/arcan.scm @@ -18,6 +18,7 @@ (define-module (gnu packages arcan) #:use-module (guix build-system cmake) + #:use-module (guix build-system gnu) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) @@ -25,6 +26,7 @@ #:use-module (gnu packages apr) #:use-module (gnu packages audio) + #:use-module (gnu packages autotools) #:use-module (gnu packages compression) #:use-module (gnu packages databases) #:use-module (gnu packages fontutils) @@ -40,8 +42,10 @@ #:use-module (gnu packages ruby) #:use-module (gnu packages sdl) #:use-module (gnu packages sqlite) + #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages xdisorg) + #:use-module (gnu packages xorg) #:use-module (srfi srfi-1)) (define-public arcan @@ -178,3 +182,66 @@ engine programmable using Lua.") "-DENABLE_LWA=on" "-DSTATIC_SQLITE3=off" "-DSTATIC_FREETYPE=off" "-DSHMIF_TUI_ACCEL=on"))))) (synopsis "Combined display server, multimedia framework and game engine (sdl)"))) + +(define-public xarcan + (package + (name "xarcan") + (version "0.5.4") + (source + (origin + (method git-fetch) + (file-name (git-file-name name version)) + (uri (git-reference + (url "https://github.com/letoram/xarcan.git") + (commit "8e6ee029388326cfe5cddeffe482eb3702e9b7f3"))) + (sha256 + (base32 "0zng7cs6733mnf0p6g5wv02981f2sf567n56csax6cmzb8fpamym")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + `("--enable-kdrive" "--enable-xarcan" + "--disable-xorg" "--disable-xwayland" + "--disable-xnest" "--disable-xvfb" + "--enable-glamor" "--enable-glx" + "--disable-int10-module" "--enable-ipv6" + "--enable-record" "--without-systemd-daemon" + "--enable-xcsecurity" "--disable-static" + ,(string-append "--with-xkb-path=" + (assoc-ref %build-inputs "xkeyboard-config") + "/share/X11/xkb") + ,(string-append "--with-xkb-bin-directory=" + (assoc-ref %build-inputs "xkbcomp") + "/bin") + ,(string-append "--with-xkb-output=" + "/tmp")) ; FIXME: Copied from xorg + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'noconfigure + (lambda _ + (setenv "NOCONFIGURE" "true") + #t))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("util-macros" ,util-macros))) + (inputs + `(("arcan" ,arcan) + ("font-util" ,font-util) + ("libdrm" ,libdrm) + ("libepoxy" ,libepoxy) + ("libkbfile" ,libxkbfile) + ("libressl" ,libressl) + ("libx11" ,libx11) + ("libxfont2" ,libxfont2) + ("mesa" ,mesa) + ("pixman" ,pixman) + ("xkeyboard-config" ,xkeyboard-config) + ("xkbcomp" ,xkbcomp) + ("xorgproto" ,xorgproto) + ("xtrans" ,xtrans))) + (home-page "https://arcan-fe.com") + (synopsis "Patched Xserver that bridges connections to Arcan") + (description "Patched Xserver that bridges connections to Arcan.") + (license license:expat))) -- 2.19.2