From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:56634) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOQ1Y-0008Q1-Lw for guix-patches@gnu.org; Tue, 14 Apr 2020 14:11:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOQ1W-0003eQ-VD for guix-patches@gnu.org; Tue, 14 Apr 2020 14:11:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51448) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jOQ1W-0003cG-CF for guix-patches@gnu.org; Tue, 14 Apr 2020 14:11:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jOQ1W-0007oh-7p for guix-patches@gnu.org; Tue, 14 Apr 2020 14:11:02 -0400 Subject: [bug#40426] [PATCH] Add g-golf Resent-Message-ID: References: <6xX3P5wtqPLaHAJcG08vvndO5ruSKavzCs0khwcdJmF2CYVGjPLz_J-2HZXM7vCKOcAiSqWHMFPG1-rQA04EWZ9YPqh6KA090K1BOwlAhpY=@protonmail.com> From: Christopher Baines In-reply-to: <6xX3P5wtqPLaHAJcG08vvndO5ruSKavzCs0khwcdJmF2CYVGjPLz_J-2HZXM7vCKOcAiSqWHMFPG1-rQA04EWZ9YPqh6KA090K1BOwlAhpY=@protonmail.com> Date: Tue, 14 Apr 2020 19:10:37 +0100 Message-ID: <87eesq6iqq.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Vitaliy Shatrov Cc: 40426@debbugs.gnu.org --=-=-= Content-Type: text/plain Vitaliy Shatrov via Guix-patches via writes: > str1ngs and nly want it to be submitted to guix, and i was proudly > take this task. Package was copied "as-is", and tested as per Guix > manual. There is desire to package be named "g-golf", and not as > "guile-g-golf", as the package name stands for "Gnome: Guile Object > Library For". Thanks for the patch, > +(define-public g-golf > + (let ((commit "4a4edf25e4877df9182c77843bdd98ab59e13ef7")) > + (package > + (name "g-golf") > + (version (git-version "1" "683" commit)) > + (source (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://git.savannah.gnu.org/git/g-golf.git") > + (commit commit))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 > + "09p0gf71wbmlm9kri693a8fvr9hl3hhlmlidyadwjdh7853xg0h8")))) > + (build-system gnu-build-system) > + (native-inputs > + `(("autoconf" ,autoconf) > + ("automake" ,automake) > + ("texinfo" ,texinfo) > + ("gettext" ,gettext-minimal) > + ("libtool" ,libtool) > + ("pkg-config" ,pkg-config))) > + (inputs > + `(("guile" ,guile-2.2) Does g-golf work with Guile 3 yet? If not, that's OK. > + ("guile-lib" ,guile-lib) > + ("clutter" ,clutter) > + ("gtk" ,gtk+) > + ("glib" ,glib))) > + (propagated-inputs > + `(("gobject-introspection" ,gobject-introspection))) > + (arguments > + `(#:tests? #t I'd remove the #:tests? argument given the default value of #t is fine. > + #:phases > + (modify-phases %standard-phases > + (add-before 'configure 'tests-work-arounds > + (lambda* (#:key inputs #:allow-other-keys) > + ;; In build environment, There is no /dev/tty > + (substitute* > + "test-suite/tests/gobject.scm" > + (("/dev/tty") "/dev/null")))) > + (add-before 'configure 'substitute-libs > + (lambda* (#:key inputs outputs #:allow-other-keys) > + (let* ((get (lambda (key lib) > + (string-append (assoc-ref inputs key) "/lib/" lib))) > + (libgi (get "gobject-introspection" "libgirepository-1.0")) > + (libglib (get "glib" "libglib-2.0")) > + (libgobject (get "glib" "libgobject-2.0")) > + (libgdk (get "gtk" "libgdk-3"))) > + (substitute* "configure" > + (("SITEDIR=\"\\$datadir/g-golf\"") > + "SITEDIR=\"$datadir/guile/site/$GUILE_EFFECTIVE_VERSION\"") > + (("SITECCACHEDIR=\"\\$libdir/g-golf/") > + "SITECCACHEDIR=\"$libdir/")) > + (substitute* "g-golf/init.scm" > + (("libgirepository-1.0") libgi) > + (("libglib-2.0") libglib) > + (("libgdk-3") libgdk) > + (("libgobject-2.0") libgobject) > + (("\\(dynamic-link \"libg-golf\"\\)") > + (format #f "~s" > + `(dynamic-link > + (format #f "~alibg-golf" > + (if (getenv "GUILE_GGOLF_UNINSTALLED") > + "" > + ,(format #f "~a/lib/" > + (assoc-ref outputs "out")))))))) > + (setenv "GUILE_AUTO_COMPILE" "0") > + (setenv "GUILE_GGOLF_UNINSTALLED" "1") I don't quite follow this GUILE_GGOLF_UNINSTALLED environment variable. Why not just use the absolute filename for the so file (without the extension I think)? Also, maybe delete the strip phase, as I don't think that does anything apart from producing a load of warnings. > + #t)))))) > + (home-page "https://www.gnu.org/software/g-golf/") > + (synopsis "Guile bindings for GObject Introspection") > + (description > + "G-Golf (Gnome: (Guile Object Library for)) is a library for developing > +applications in Guile Scheme. It comprises a direct binding to the low level > +GObject Introspection API and higher-level functionality for importing Gnome > +libraries and making GObject classes (and methods) available in Guile's This looks pretty good to me, just a few things to clear up :) Thanks, Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl6V/J1fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9Xeg4w//X3hH9gOpGf322YS4YFDsbtkwBNsjfU2bhyX1XY1XI09/i8k/u1YB5WBy DjYOPTXaW6MR3gBznB2aFhva/6U7LlFn1pmvI1cfbHSX+gLndxJ7iwNjOGiAwajG 2aCD2ceVgv/y80LRbosUwaLi+VPlwMcY+/M3PIOyQ52BShVKhREnSVQeShNgxEIY zMV6+3K2a7E24/8bxnz/HQkDizEMfuwQNK1M4lrpu+m8k/i8M7UBe51WJcFueHuL IQ0qRr4vrcEFcbrShFTO3C9eU8VqA7t6ERdyjAIa1p751oa0cr+xqx4S2/wKKzSh F0yG5vhKolldKdWtxPbs4ryCzlvtLFO0NQKsodIhBrKbO2kviBgRRTosuLPLBOGr WwSEIttIGUkLC4muivjX3YjXxH9c86Vw9hMZzWgg8TMyK/kFuibnvjR5xj85Px0v uV+MX36Qt10MXNa4EDaO92UnY0SjWSsgpsR/BsG2XL7bZxUzI7uqv2tvfcjpkf6I bTq9Pj1sJqm9982xLm68yfSlyIixb+txRw0cCL3n0gozgJfTsnMHsyIB3u1xBL8K s3eqF3S5V8tYI//eQRVt+EG1X9f836wEMLStC2li0iqNguXY4CphMwgNy9c5xLa4 FGc6Z/xpNGvomtUW1z7sX8JRwY0azwau7WHU2KS7Y7jAeIyHG1c= =iVvA -----END PGP SIGNATURE----- --=-=-=--