public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Christoph Junghans <junghans@votca.org>
To: git-commits@fedoraproject.org
Subject: [rpms/lfortran] rawhide: Bring back jupyter package
Date: Thu, 03 Sep 2026 13:09:10 GMT	[thread overview]
Message-ID: <178844095032.1.6866666250200125205.rpms-lfortran-85ba360c72fb@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/lfortran
Branch : rawhide
Commit : 85ba360c72fbcb1f9bb85a0307a1620c07344201
Author : Christoph Junghans <junghans@votca.org>
Date   : 2026-09-03T07:08:52-06:00
Stats  : +82/-3 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/lfortran/c/85ba360c72fbcb1f9bb85a0307a1620c07344201?branch=rawhide

Log:
Bring back jupyter package

---
diff --git a/12688.patch b/12688.patch
new file mode 100644
index 0000000..df9d30e
--- /dev/null
+++ b/12688.patch
@@ -0,0 +1,74 @@
+From dcf373eae365bee96bcdd597b2efd86104b17b19 Mon Sep 17 00:00:00 2001
+From: Christoph Junghans <junghans@votca.org>
+Date: Thu, 3 Sep 2026 06:45:12 -0600
+Subject: [PATCH] Bring back support for xeus-5
+
+---
+ CMakeLists.txt                  |  4 ++--
+ src/lfortran/config.h.cmakein   |  2 ++
+ src/lfortran/fortran_kernel.cpp | 11 ++++++++++-
+ 3 files changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7660ef7fe5c..11375ccb24e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -352,8 +352,8 @@ endfunction()
+ # XEUS (Fortran kernel)
+ set(WITH_XEUS no CACHE BOOL "Build with XEUS support")
+ if (WITH_XEUS)
+-    find_package(xeus 6.0.0 REQUIRED)
+-    find_package(xeus-zmq 4.0.0 REQUIRED)
++    find_package(xeus 5.0.0 REQUIRED)
++    find_package(xeus-zmq 3.0.0 REQUIRED)
+     set(HAVE_LFORTRAN_XEUS yes)
+ 
+     configure_lfortran_kernel()
+diff --git a/src/lfortran/config.h.cmakein b/src/lfortran/config.h.cmakein
+index da3a0e976e5..b4182aa5174 100644
+--- a/src/lfortran/config.h.cmakein
++++ b/src/lfortran/config.h.cmakein
+@@ -3,3 +3,5 @@
+ 
+ #cmakedefine KOKKOS_LIBDIR "@KOKKOS_LIBDIR@"
+ #cmakedefine KOKKOS_INCLUDEDIR "@KOKKOS_INCLUDEDIR@"
++
++#cmakedefine XEUS_VERSION_MAJOR "@xeus_VERSION_MAJOR"
+diff --git a/src/lfortran/fortran_kernel.cpp b/src/lfortran/fortran_kernel.cpp
+index 73471c71463..eebc85e3410 100644
+--- a/src/lfortran/fortran_kernel.cpp
++++ b/src/lfortran/fortran_kernel.cpp
+@@ -146,9 +146,12 @@ namespace LCompilers::LFortran {
+         nl::json is_complete_request_impl(const std::string& code) override;
+ 
+         nl::json kernel_info_request_impl() override;
+-
++#if XEUS_VERSION_MAJOR > 5
+         nl::json shutdown_request_impl(bool restart) override;
+         nl::json interrupt_request_impl() override;
++#else
++	void shutdown_request_impl() override;
++#endif
+     };
+ 
+     
+@@ -496,6 +499,7 @@ namespace LCompilers::LFortran {
+         );
+     }
+ 
++#if XEUS_VERSION_MAJOR > 5
+     nl::json custom_interpreter::shutdown_request_impl(bool restart) {
+         std::cout << "Bye!!" << std::endl;
+         return xeus::create_shutdown_reply(restart);
+@@ -504,6 +508,11 @@ namespace LCompilers::LFortran {
+     nl::json custom_interpreter::interrupt_request_impl() {
+         return xeus::create_interrupt_reply();
+     }
++#else
++    void custom_interpreter::shutdown_request_impl() {
++        std::cout << "Bye!!" << std::endl;
++    }
++#endif
+ 
+     int run_kernel(const std::string &connection_filename)
+     {

diff --git a/lfortran.spec b/lfortran.spec
index 49ec03d..cb9f895 100644
--- a/lfortran.spec
+++ b/lfortran.spec
@@ -1,6 +1,6 @@
 Version:        0.65.0
 Name:           lfortran
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A modern Fortran compiler
 
 # Main code is BSD-3-Clause
@@ -9,13 +9,15 @@ Summary:        A modern Fortran compiler
 License:        BSD-3-Clause AND Apache-2.0 WITH LLVM-exception
 URL:            https://lfortran.org/
 Source0:        https://github.com/lfortran/lfortran/releases/download/v%{version}/lfortran-%{version}.tar.gz
+# toml -> tomli
 Patch0:         https://github.com/lfortran/lfortran/pull/12679.patch
+# support for xeus-5
+Patch1:         https://github.com/lfortran/lfortran/pull/12688.patch
 
 # https://github.com/lfortran/lfortran/issues/2981
 ExclusiveArch: x86_64
 
-# needs xeus-6
-%global with_jupyter 0
+%global with_jupyter 1
 
 BuildRequires: binutils-devel
 BuildRequires: bison
@@ -161,6 +163,9 @@ This package contains the jupyter kernel for %{name}.
 %endif
 
 %changelog
+* Thu Sep 03 2026 Christoph Junghans <junghans@votca.org> - 0.65.0-2
+- Bring back jupyter package
+
 * Wed Sep 02 2026 Christoph Junghans <junghans@votca.org> - 0.65.0-1
 - Update to version 0.65.0
 - Resolves: rhbz#2501985

                 reply	other threads:[~2026-09-03 13:09 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=178844095032.1.6866666250200125205.rpms-lfortran-85ba360c72fb@fedoraproject.org \
    --to=junghans@votca.org \
    --cc=git-commits@fedoraproject.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox