From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Morgan Smith Newsgroups: gmane.lisp.guile.user Subject: [PATCH] Emacsy - build fixes Date: Wed, 29 Nov 2023 17:59:31 -0500 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="22400"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: janneke@gnu.org To: guile-user@gnu.org Original-X-From: guile-user-bounces+guile-user=m.gmane-mx.org@gnu.org Thu Nov 30 03:00:03 2023 Return-path: Envelope-to: guile-user@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1r8WLS-0005cx-Dc for guile-user@m.gmane-mx.org; Thu, 30 Nov 2023 03:00:02 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8WL6-0004fn-BA; Wed, 29 Nov 2023 20:59:41 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r8TWE-0006MY-3k for guile-user@gnu.org; Wed, 29 Nov 2023 17:58:58 -0500 Original-Received: from mail-dm6nam11olkn2067.outbound.protection.outlook.com ([40.92.19.67] helo=NAM11-DM6-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r8TW9-0007jS-Hh; Wed, 29 Nov 2023 17:58:57 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KmtgLWzUNIiexK+AzBZNfuYSst2ExfKKqZ3fzuDYpUl6SMdckhwlSd/RREPEauiUhC6GmJK0/n/njb6hF9ZkkZ+YRbYP7F/iu6w/8vZHOzKACsHJvzHYXvUsN2jq8sa6NQTOWRX130KXl6gYNW9LviomSiOtHbBNOLQ978TYzi3FG5nWrG0RtzcphvL7mmZJlNi0SV8m88Pp6tTvUruUl9RRArgB4jfl1mwgH73HUJrwQOVud5qEI/LsAUZG2JrHGf1Nrwmzah30lBUaGPyB55Nw+nYkrUWPz6FMElSsSJa9U/Dj8EtrXrBZuh4L6vR2kRE25jreHFbWbIXnRtdTdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Ip2AuJuqmqSRbL7/jF/A6v1sDQeSBEuECtGdQJEVbKk=; b=iM/s5+uhaDj/YlnClJq74GPfnj+bpwq0XI8D3RHFLkaXGPswD/Nxh5ErdJCGqdF/ZUTeq7vckGke/ENHeS7eKau236FTJrfrrI6qdGYjD0RKvhw+ZM+5YolFs5NQfTipjpIOJJNKOiuNCB5G34IiTznopb/7a+PMzAyutahbeTL9at6HCG4/Lmjm8fYgtSV8jygn17LAkPqEQidjEjOYAdIbBiezrWxGY/CBiFom4uWdTroqwpkds+b/NjvtkFmRTDacdHQDyQPivlXLhP/hg4TAr2TGYXuNFwZCiICsfOV7aYoNddouR1CtUYdIdjngv1CGK6nSq+UQ+w2Jz6pv2A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Ip2AuJuqmqSRbL7/jF/A6v1sDQeSBEuECtGdQJEVbKk=; b=sBO8AeC8bw4NlWQXxwpDtCHZkTsCblBbPqSGbe7+xEv0eGcMXsjDeYZALPKMZ1OIayhSaIRjncnt85miLLxDKVbBQRzo2d28wFXo5k7uxoNQkBDrsTcmf7Zh2SrXQhjLjzFLCG76P7iBqViKbqNaVn3OCDmvf8QWYG+0/DWpEXgTkkOsXpx3WBh/PkwB9M44w5yasUT2u6uzW5hc5BihATw/GJ1GFuWDBp11wNy+4XtOsZonzFrsrw+x4gZmaPy/2yodRnHQg9UEVKtu3+7rfu0IdbdyJ432kgDQZVgCi6TXr9LNsmAGK1OJEmZXIT9vpmTqJKTHzAusyyT7TUeuog== Original-Received: from DM5PR03MB3163.namprd03.prod.outlook.com (2603:10b6:4:40::24) by BN8PR03MB4994.namprd03.prod.outlook.com (2603:10b6:408:da::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.8; Wed, 29 Nov 2023 22:58:47 +0000 Original-Received: from DM5PR03MB3163.namprd03.prod.outlook.com ([fe80::a96e:87f:1f4d:27fa]) by DM5PR03MB3163.namprd03.prod.outlook.com ([fe80::a96e:87f:1f4d:27fa%6]) with mapi id 15.20.7046.015; Wed, 29 Nov 2023 22:58:47 +0000 X-Hashcash: 1:20:231129:guile-user@gnu.org::eIGufoYYT82EamZH:2S0 X-Hashcash: 1:20:231129:janneke@gnu.org::AcyzAAP2r/7RDP4Y:0piX X-TMN: [yRLiBBqJfQAVvo1T6yGOblTYpoHsXcRz] X-ClientProxiedBy: YT4P288CA0035.CANP288.PROD.OUTLOOK.COM (2603:10b6:b01:d3::17) To DM5PR03MB3163.namprd03.prod.outlook.com (2603:10b6:4:40::24) X-Microsoft-Original-Message-ID: <87v89k6u98.fsf@outlook.com> X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR03MB3163:EE_|BN8PR03MB4994:EE_ X-MS-Office365-Filtering-Correlation-Id: e4b46a44-201c-44b9-217f-08dbf12ebe94 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YEfjT2Zor/TiqBhUPFFhz6SIa8zCCdy6ncbYLKs28LWYlEIlc5Gd0AHJwxTEtnnzqqPsRQQoARyNkQKz1JxnF+GpwyG7M69B8NOBesUU53ws8CCG3v72nbFX8EprItPKtm7qnbcLl0Kkeqwc6pIjBjRLYNOjb8S0GknNAsU/K+GL9HKgN8RRpDFvUhLPLePeC+TMcz7MVgc7PHi3MWd8wmUK3XrWMltLMk5X7NrD1OVQ5Yg2d/uYfhNluRAE5mAQdlU3rJKl2c0jzA5dp7NAnmyysbPJ6QCJ4Ax4t6GCepC5nNtIGvl0IAqGwsVUwgQ0mipwJRmBb+F/YisElE21dwLrkvmh+xjl7MS4Ie6DFgiFrFLAza2IfdKWjF4zV4RgenMTJkXeqjfUS9NkCsQDgT0x4PjHtaoT0WCSXOC8K+5gF2o0MOt82DwZ6T3+2Jzz7ovTrR24TnaAD9hCsEAlgTnadEDms3Xx8EOUiKBerg/FKhJQPriL4AL623IG59qLTEtzBr9ALIWFh1UWXHCju90v5gx+D8VQ6qigDbUb5HxvsCMTsCfCqgMTOZ66hqzK X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?eKU/I4YYmPa4bMdemCvHt/ZHPGrwGVobb9S5Wr3X2yY3QsdUiqRrFO+ADrhg?= =?us-ascii?Q?OHQ1USrvgpk/s8mg6sq0zgWXI9f7ncGv7Dcu0Z+kUgFBB3NT8ljmkq0IZcPs?= =?us-ascii?Q?ad4bagFtFA6oNQKMBTaFpb4SFbj7Jvwk6UCNXnWqtOb2VyiSiVOL/jD0QeW4?= =?us-ascii?Q?W3lvRv5T5MDZ9h/9oXSIorZ8ssROZm9fcsCvpXbl3mhAQAYxRaxKP1qoBAnk?= =?us-ascii?Q?q/z7GISPgq8B58JJMSfFeHQsKLOOaFlyZRPHsHu5574oVkzmcT76ZsF0fiYv?= =?us-ascii?Q?hoKWeHISQCRTDdTwq4PQv/dLI8eJ3m3CsbP3wtLEjb9V7WukWL6DlFC/9+Id?= =?us-ascii?Q?jqpJz4ALUi7nIigBwJ0AGW7uyAB+DixjJ+nuhlHZCBGYY+5IXqks02QHdV51?= =?us-ascii?Q?tgtok5M40vdcD9NZDq9kXxWgbauxCKcuhwq6ERdRw/GHQYhWUgIYC0Y5N9nY?= =?us-ascii?Q?IJjyuqSpWVMUKggRMsPz+EflvsxgxxBxdHNIivi2fuIPfhT3Utb4vc5Ek33B?= =?us-ascii?Q?Qbrcm3qWoKOv1gWCbi88+Gtyu+8dZhEBsYepBMltaDYgPCAsjxi3kkdqTy2N?= =?us-ascii?Q?zLjBu6JTZgwnqsFEbJbcmVPir6lYanbWC0Xyhkr3WSfp+NCyNvgwopGpjlY3?= =?us-ascii?Q?Bl X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e4b46a44-201c-44b9-217f-08dbf12ebe94 X-MS-Exchange-CrossTenant-AuthSource: DM5PR03MB3163.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Nov 2023 22:58:47.6143 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR03MB4994 Received-SPF: pass client-ip=40.92.19.67; envelope-from=Morgan.J.Smith@outlook.com; helo=NAM11-DM6-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Wed, 29 Nov 2023 20:59:34 -0500 X-BeenThere: guile-user@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: General Guile related discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guile-user-bounces+guile-user=m.gmane-mx.org@gnu.org Original-Sender: guile-user-bounces+guile-user=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.lisp.guile.user:19332 Archived-At: --=-=-= Content-Type: text/plain Hello! I'm starting to play with emacsy and the readme said this was the mailing list to send bug reports too. These patches allow me to build emacsy and run the example programs. They also add a build with guile 3.0 but that doesn't seem to work too good so I'll have to try and debug that. Thanks, Morgan --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-configure-Update-dependencies.patch >From e74bc4e6712db9b57782c76b985c935c82fcda90 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Wed, 29 Nov 2023 17:52:10 -0500 Subject: [PATCH 1/3] configure: Update dependencies --- configure.ac | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index c18374f..231fd41 100644 --- a/configure.ac +++ b/configure.ac @@ -69,12 +69,13 @@ AS_IF([test x$with_examples != xno], [BUILD_EXAMPLES=yes], [BUILD_EXAMPLES=no]) -PKG_CHECK_MODULES([FREEGLUT], [freeglut >= 3.0], [HAVE_FREEGLUT=yes], [HAVE_FREEGLUT=no]) +dnl Freeglut 3.2 provides 'glut.pc', not 'freeglut.pc'. +PKG_CHECK_MODULES([FREEGLUT], [glut >= 3.0], [HAVE_FREEGLUT=yes], [HAVE_FREEGLUT=no]) PKG_CHECK_MODULES([GL], [gl >= 18.0.0], [HAVE_GL=yes], [HAVE_GL=no]) PKG_CHECK_MODULES([GLU], [glu >= 9.0.0], [HAVE_GLU=yes], [HAVE_GLU=no]) AM_CONDITIONAL([HELLO_EMACSY], [test x$BUILD_EXAMPLES$HAVE_FREEGLUT$HAVE_GL$HAVE_GLU = xyesyesyesyes]) -PKG_CHECK_MODULES([WEBKIT], [webkit2gtk-4.0], [HAVE_WEBKIT=yes], [HAVE_WEBKIT=no]) +PKG_CHECK_MODULES([WEBKIT], [webkit2gtk-4.1], [HAVE_WEBKIT=yes], [HAVE_WEBKIT=no]) AM_CONDITIONAL([EMACSY_WEBKIT_GTK], [test x$BUILD_EXAMPLES$HAVE_WEBKIT = xyesyes]) AC_CONFIG_FILES([Makefile]) -- 2.41.0 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-guix-Fix-build-and-modernize.patch >From dc7db5ebc864a28363bd7090755a8db4a91358c6 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Wed, 29 Nov 2023 17:52:44 -0500 Subject: [PATCH 2/3] guix: Fix build and modernize --- guix.scm | 97 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 48 insertions(+), 49 deletions(-) diff --git a/guix.scm b/guix.scm index da127a9..3180e30 100644 --- a/guix.scm +++ b/guix.scm @@ -70,60 +70,59 @@ #:select? (git-predicate %source-dir))) (build-system glib-or-gtk-build-system) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("bzip2" ,bzip2) - ("guile" ,guile-2.2) - ("gettext" ,gnu-gettext) - ("libtool" ,libtool) - ("perl" ,perl) - ("pkg-config" ,pkg-config) - ("texinfo" ,texinfo) - ("texlive" ,(texlive-union (list texlive-generic-epsf))))) + (list autoconf + automake + bzip2 + gnu-gettext + libtool + perl + pkg-config + texinfo + (texlive-updmap.cfg (list texlive-epsf)))) (inputs - `(("dbus-glib" ,dbus-glib) - ("guile" ,guile-2.2) - ("guile-lib" ,guile-lib) - ("guile-readline" ,guile-readline) - ("freeglut" ,freeglut) - ("glib-networking" ,glib-networking) - ("gssettings-desktop-schemas" - ,gsettings-desktop-schemas) - ("webkitgtk" ,webkitgtk))) + (list dbus-glib + guile-2.2 + guile2.2-lib + guile2.2-readline + freeglut + glib-networking + gsettings-desktop-schemas + webkitgtk)) (arguments - `(#:tests? #t - #:modules ((guix build gnu-build-system) + (list + #:configure-flags #~'("BUILD_EXAMPLES=true") + #:tests? #t + #:imported-modules `((guix build guile-build-system) + (guix build gnu-build-system) + ,@%glib-or-gtk-build-system-modules) + #:modules '((guix build guile-build-system) + (guix build gnu-build-system) (guix build glib-or-gtk-build-system) (guix build utils) - (ice-9 popen) - (ice-9 rdelim) - (ice-9 regex) - (ice-9 ftw) (srfi srfi-26)) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'setenv - (lambda _ - (setenv "GUILE_AUTO_COMPILE" "0") - #t)) - (add-after 'install 'wrap-binaries - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (effective (read-line - (open-pipe* OPEN_READ - "guile" "-c" - "(display (effective-version))"))) - (deps (map (cut assoc-ref inputs <>) '("guile-lib" "guile-readline"))) - (scm-path (map (cut string-append <> "/share/guile/site/" effective) `(,out ,@deps))) - (go-path (map (cut string-append <> "/lib/guile/" effective "/site-ccache/") `(,out ,@deps))) - (examples (filter (cut string-match "emacsy" <>) - (scandir (string-append out "/bin/")))) - (progs (map (cut string-append out "/bin/" <>) - examples))) - (map (cut wrap-program <> - `("GUILE_LOAD_PATH" ":" prefix ,scm-path) - `("GUILE_LOAD_COMPILED_PATH" ":" prefix ,go-path)) progs) - #t)))))) + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'setenv + (lambda _ + (setenv "GUILE_AUTO_COMPILE" "0"))) + (add-after 'install 'wrap-binaries + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (deps (cons + (call-with-values (lambda () (target-guile-scm+go out)) cons) + (map (lambda (dep) (call-with-values + (lambda () (target-guile-scm+go dep)) + cons)) + (list (or #$(this-package-input "guile2.2-lib") + #$(this-package-input "guile-lib")) + (or #$(this-package-input "guile2.2-readline") + #$(this-package-input "guile-readline")))))) + (scm-path (map car deps)) + (go-path (map cdr deps)) + (progs (find-files (string-append out "/bin/")))) + (map (cut wrap-program <> + `("GUILE_LOAD_PATH" ":" prefix ,scm-path) + `("GUILE_LOAD_COMPILED_PATH" ":" prefix ,go-path)) progs))))))) (home-page "https://savannah.nongnu.org/projects/emacsy") (synopsis "Embeddable GNU Emacs-like library using Guile") (description -- 2.41.0 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0003-guix-Add-guile3.0-emacsy-does-not-work-yet.patch >From 26cb52b0c75f23e664acaad2d88a51666e42ddf8 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Wed, 29 Nov 2023 17:53:19 -0500 Subject: [PATCH 3/3] guix: Add guile3.0-emacsy (does not work yet) --- guix.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/guix.scm b/guix.scm index 3180e30..ef1b932 100644 --- a/guix.scm +++ b/guix.scm @@ -134,4 +134,13 @@ comes with a simple counter example using FreeGLUT and browser examples in C using Gtk+-3 and WebKitGtk.") (license license:gpl3+))) +;; TODO: tests don't pass +(define-public guile3.0-emacsy + (package + (inherit emacsy) + (inputs (modify-inputs (package-inputs emacsy) + (replace "guile" guile-3.0) + (replace "guile2.2-lib" guile-lib) + (replace "guile2.2-readline" guile-readline))))) + emacsy -- 2.41.0 --=-=-=--