Compare commits

..

No commits in common. "rawhide" and "f33" have entirely different histories.

7 changed files with 106 additions and 41 deletions

10
.gitignore vendored
View file

@ -18,13 +18,3 @@
/xeus-1.0.1.tar.gz
/xeus-1.0.3.tar.gz
/xeus-1.0.4.tar.gz
/xeus-2.0.0.tar.gz
/xeus-3.0.5.tar.gz
/xeus-3.1.1.tar.gz
/xeus-3.1.3.tar.gz
/xeus-3.1.4.tar.gz
/xeus-3.1.5.tar.gz
/xeus-5.1.1.tar.gz
/xeus-5.2.3.tar.gz
/xeus-5.2.4.tar.gz
/xeus-5.2.6.tar.gz

View file

@ -1,18 +0,0 @@
# See the documentation for more information:
# https://packit.dev/docs/configuration/
---
jobs:
- job: pull_from_upstream
trigger: release
dist_git_branches:
rawhide:
fast_forward_merge_into:
- fedora-branched
- job: koji_build
trigger: commit
dist_git_branches:
- fedora-all
- job: bodhi_update
trigger: commit
dist_git_branches:
- fedora-all

View file

@ -0,0 +1,40 @@
From 116e9272965094260e056437ca494fc726ba300a Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Sun, 11 Jul 2021 19:22:19 -0400
Subject: [PATCH 1/2] Fix build with Sphinx 4.
`add_stylesheet` was deprecated in 1.8 and removed in 4.0 [1]. The
replacement, `add_css_file` was added in 1.0, which is older than any
version required by `breathe`.
[1] https://www.sphinx-doc.org/en/master/extdev/deprecated.html?highlight=add_stylesheet
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
docs/source/conf.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 58386c6..f67e96e 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -15,8 +15,10 @@ html_theme = "sphinx_rtd_theme"
html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+
def setup(app):
- app.add_stylesheet("main_stylesheet.css")
+ app.add_css_file("main_stylesheet.css")
+
extensions = ['breathe']
breathe_projects = { 'xeus': '../xml' }
@@ -35,4 +37,3 @@ highlight_language = 'c++'
pygments_style = 'sphinx'
todo_include_todos = False
htmlhelp_basename = 'xeusdoc'
-
--
2.31.1

View file

@ -0,0 +1,52 @@
From d31cf19e37c2e847bef8917fd9cf8ed2fbb27b38 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Sun, 11 Jul 2021 20:14:15 -0400
Subject: [PATCH 2/2] Remove all RPATH settings.
If you need to set this, it's an environment-specific thing.
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
CMakeLists.txt | 19 -------------------
1 file changed, 19 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 903dcf9..6b3a26d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -195,13 +195,6 @@ include(CheckCXXCompilerFlag)
string(TOUPPER "${CMAKE_BUILD_TYPE}" U_CMAKE_BUILD_TYPE)
-if (NOT APPLE)
- set(CMAKE_SKIP_BUILD_RPATH FALSE)
- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-endif ()
-
-set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib; ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
-
if (XEUS_STATIC_DEPENDENCIES AND NOT MSVC AND NOT APPLE)
# Explicitly finds and links with libsodium.a
# because it is not exported as a dependency by
@@ -223,18 +216,6 @@ macro(xeus_create_target target_name linkage output_name)
add_library(${target_name} ${linkage_upper} ${XEUS_SOURCES} ${XEUS_HEADERS})
- if (APPLE)
- set_target_properties(
- ${target_name} PROPERTIES
- MACOSX_RPATH ON
- )
- else ()
- set_target_properties(
- ${target_name} PROPERTIES
- BUILD_WITH_INSTALL_RPATH 1
- )
- endif ()
-
target_include_directories(
${target_name}
PUBLIC $<BUILD_INTERFACE:${XEUS_INCLUDE_DIR}>
--
2.31.1

View file

@ -1,3 +0,0 @@
This repository is maintained by packit.
https://packit.dev/
The file was generated using packit 1.12.0.post1.dev18+gc39b0e7d4.

View file

@ -1 +1 @@
SHA512 (xeus-5.2.6.tar.gz) = f931ed1ba0122ee3855f4ce6bb3e30506a3fd56011c9594679baad7382372aa39e2088d1e84c6c730334e27c94080fc3b381073e987afd68186d64626abb32f6
SHA512 (xeus-1.0.4.tar.gz) = 3e13dd1d3d26dacd2beae385ac1a76b189fb56f96a33cb2fdd0b373d76e6992a21bafbeaa92e3255352c3b788c6a6b646e44485563bcbd379f53d16a4114e72d

View file

@ -1,23 +1,27 @@
Name: xeus
Version: 5.2.6
Version: 1.0.4
Release: %autorelease
Summary: C++ implementation of the Jupyter kernel protocol
License: BSD-3-Clause
License: BSD
URL: https://github.com/jupyter-xeus/xeus
Source0: https://github.com/jupyter-xeus/xeus/archive/%{version}/%{name}-%{version}.tar.gz
# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
ExcludeArch: %{ix86}
# https://github.com/jupyter-xeus/xeus/pull/280
Patch0001: 0001-Fix-build-with-Sphinx-4.patch
# https://github.com/jupyter-xeus/xeus/pull/281
Patch0002: 0002-Remove-all-RPATH-settings.patch
BuildRequires: cmake >= 3.8
BuildRequires: cmake(nlohmann_json) >= 3.11.0
BuildRequires: doctest-devel
BuildRequires: cmake(cppzmq) >= 4.3.0
BuildRequires: cmake(nlohmann_json) >= 3.2.0
BuildRequires: cmake(xtl) >= 0.7
BuildRequires: doxygen
BuildRequires: gcc-c++
BuildRequires: gtest-devel
BuildRequires: libuuid-devel
BuildRequires: make
BuildRequires: pkgconfig(uuid)
BuildRequires: openssl-devel >= 1.0.1
BuildRequires: pkgconfig(libzmq) >= 4.2.5
BuildRequires: python3dist(breathe)
BuildRequires: python3dist(jupyter-kernel-test)
BuildRequires: python3dist(pytest)
@ -61,7 +65,7 @@ rm docs/build/html/.buildinfo
%files
%doc README.md docs/build/html
%license LICENSE
%{_libdir}/libxeus.so.13{,.*}
%{_libdir}/libxeus.so.1*
%files devel
%{_includedir}/xeus/