GNU bug report logs - #61332
[PATCH] gnu: Remove opencascade-oce.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 61332 in the body.
You can then email your comments to 61332 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Vinicius Monego <monego <at> posteo.net>
To: guix-patches <at> gnu.org
Cc: Vinicius Monego <monego <at> posteo.net>
Subject: [PATCH] gnu: Remove opencascade-oce.
Date: Mon,  6 Feb 2023 23:47:08 +0000

This package is unmaintained by upstream, has no dependents and was
replaced by opencascade-occt.

* gnu/packages/maths.scm (opencascade-oce): Remove variable.
* gnu/packages/patches/opencascade-oce-glibc-2.26.patch: Remove file.
* gnu/local.mk: Unregister it.
---
 gnu/local.mk                                  |  3 +-
 gnu/packages/maths.scm                        | 55 ----------------
 .../patches/opencascade-oce-glibc-2.26.patch  | 62 -------------------
 3 files changed, 1 insertion(+), 119 deletions(-)
 delete mode 100644 gnu/packages/patches/opencascade-oce-glibc-2.26.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index fdbb8ce461..cd92d98068 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -38,7 +38,7 @@
 # Copyright © 2020 Tanguy Le Carrour <tanguy <at> bioneland.org>
 # Copyright © 2020 Martin Becze <mjbecze <at> riseup.net>
 # Copyright © 2020 Malte Frank Gerdes <mate.f.gerdes <at> gmail.com>
-# Copyright © 2020 Vinicius Monego <monego <at> posteo.net>
+# Copyright © 2020, 2023 Vinicius Monego <monego <at> posteo.net>
 # Copyright © 2021 Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
 # Copyright © 2021 Greg Hogan <code <at> greghogan.com>
 # Copyright © 2021, 2022 Philip McGrath <philip <at> philipmcgrath.com>
@@ -1599,7 +1599,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/openboardview-use-system-imgui.patch	\
   %D%/packages/patches/openboardview-use-system-utf8.patch	\
   %D%/packages/patches/openbox-python3.patch			\
-  %D%/packages/patches/opencascade-oce-glibc-2.26.patch		\
   %D%/packages/patches/openfoam-4.1-cleanup.patch			\
   %D%/packages/patches/openjdk-10-idlj-reproducibility.patch	\
   %D%/packages/patches/openjdk-15-xcursor-no-dynamic.patch	\
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 4640237968..b82caf35ce 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -2968,61 +2968,6 @@ (define-public octave
                #t))))))
     (synopsis "High-level language for numerical computation (with GUI)")))
 
-(define-public opencascade-oce
-  (package
-    (name "opencascade-oce")
-    (version "0.17.2")
-    (source
-      (origin
-        (method git-fetch)
-        (uri (git-reference
-              (url "https://github.com/tpaviot/oce")
-              (commit (string-append "OCE-" version))))
-        (file-name (git-file-name name version))
-        (patches (search-patches "opencascade-oce-glibc-2.26.patch"))
-        (sha256
-          (base32 "0rg5wzkvfmzfl6v2amyryb8dnjad0nn9kyr607wy2gch6rciah69"))))
-    (build-system cmake-build-system)
-    (arguments
-     '(#:configure-flags
-        (list "-DOCE_TESTING:BOOL=ON"
-              "-DOCE_USE_TCL_TEST_FRAMEWORK:BOOL=ON"
-              "-DOCE_DRAW:BOOL=ON"
-              (string-append "-DOCE_INSTALL_PREFIX:PATH="
-                        (assoc-ref %outputs "out"))
-              "-UCMAKE_INSTALL_RPATH")))
-    (inputs
-      (list freetype
-            glu
-            libxmu
-            mesa
-            tcl
-            tk))
-    (native-inputs
-      `(("python" ,python-wrapper)))
-    (home-page "https://github.com/tpaviot/oce")
-    (synopsis "Libraries for 3D modeling and numerical simulation")
-    (description
-     "Open CASCADE is a set of libraries for the development of applications
-dealing with 3D CAD data or requiring industrial 3D capabilities.  It includes
-C++ class libraries providing services for 3D surface and solid modeling, CAD
-data exchange, and visualization.  It is used for development of specialized
-software dealing with 3D models in design (CAD), manufacturing (CAM),
-numerical simulation (CAE), measurement equipment (CMM), and quality
-control (CAQ) domains.
-
-This is the ``Community Edition'' (OCE) of Open CASCADE, which gathers
-patches, improvements, and experiments contributed by users over the official
-Open CASCADE library.")
-    (license (list license:lgpl2.1; OCE libraries, with an exception for the
-                                  ; use of header files; see
-                                  ; OCCT_LGPL_EXCEPTION.txt
-                   license:public-domain; files
-                                  ; src/Standard/Standard_StdAllocator.hxx and
-                                  ; src/NCollection/NCollection_StdAllocator.hxx
-                   license:expat; file src/OpenGl/OpenGl_glext.h
-                   license:bsd-3)))); test framework gtest
-
 (define-public opencascade-occt
   (package
     (name "opencascade-occt")
diff --git a/gnu/packages/patches/opencascade-oce-glibc-2.26.patch b/gnu/packages/patches/opencascade-oce-glibc-2.26.patch
deleted file mode 100644
index ee5ed572c8..0000000000
--- a/gnu/packages/patches/opencascade-oce-glibc-2.26.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Fix build with glibc 2.26:
-
-https://github.com/tpaviot/oce/issues/675
-
-Patch copied from upstream source repository:
-
-https://github.com/tpaviot/oce/commit/aa1321e68cc004e3debe38d79ae74581a617c767
-
-From aa1321e68cc004e3debe38d79ae74581a617c767 Mon Sep 17 00:00:00 2001
-From: Janus Weil <janus <at> gcc.gnu.org>
-Date: Mon, 18 Dec 2017 11:27:55 +0100
-Subject: [PATCH] fix build errors with glibc 2.26+ due to missing xlocale.h
- (issue #675)
-
-* check for the presence of xlocale.h via cmake
-* remove related logic from Standard_CLocaleSentry.hxx
----
- CMakeLists.txt                          |  1 +
- src/Standard/Standard_CLocaleSentry.hxx | 15 ---------------
- 2 files changed, 1 insertion(+), 15 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b782b4101..50e9500b2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -616,6 +616,7 @@ if (NOT WIN32)
- 	# compilation anywhere in OCE
- 	include(CheckIncludeFile)
- 	check_include_file(strings.h HAVE_STRINGS_H)
-+	check_include_file(xlocale.h HAVE_XLOCALE_H)
- 	include(CheckIncludeFileCXX)
- 	check_include_file_cxx(mm_malloc.h HAVE_MM_MALLOC_H)
- 	check_include_file_cxx(atomic.h OCE_HAVE_ATOMIC_H)
-diff --git a/src/Standard/Standard_CLocaleSentry.hxx b/src/Standard/Standard_CLocaleSentry.hxx
-index 2b226e7f3..1a4c1dadc 100644
---- a/src/Standard/Standard_CLocaleSentry.hxx
-+++ b/src/Standard/Standard_CLocaleSentry.hxx
-@@ -20,21 +20,6 @@
- 
- #include <locale.h>
- 
--#ifndef HAVE_XLOCALE_H
--  //! "xlocale.h" available in Mac OS X and glibc (Linux) for a long time as an extension
--  //! and become part of POSIX since '2008.
--  //! Notice that this is impossible to test (_POSIX_C_SOURCE >= 200809L)
--  //! since POSIX didn't declared such identifier.
--  #if defined(__APPLE__)
--    #define HAVE_XLOCALE_H
--  #endif
--
--  //! We check _GNU_SOURCE for glibc extensions here and it is always defined by g++ compiler.
--  #if defined(_GNU_SOURCE) && !defined(__ANDROID__)
--    #define HAVE_XLOCALE_H
--  #endif
--#endif // ifndef HAVE_LOCALE_H
--
- #ifdef HAVE_XLOCALE_H
-   #include <xlocale.h>
- #endif
--- 
-2.15.1
-

base-commit: 1f684d00d25f0f205c4cc4b762d8f56911062581
-- 
2.34.1

Message #8 received at 61332 <at> debbugs.gnu.org (full text, mbox):

From: Simon Tournier <zimon.toutoune <at> gmail.com>
To: Vinicius Monego <monego <at> posteo.net>, 61332 <at> debbugs.gnu.org
Cc: Vinicius Monego <monego <at> posteo.net>
Subject: Re: [bug#61332] [PATCH] gnu: Remove opencascade-oce.
Date: Wed, 08 Feb 2023 15:21:42 +0100

Hi,

On lun., 06 févr. 2023 at 23:47, Vinicius Monego <monego <at> posteo.net> wrote:

>  gnu/local.mk                                  |  3 +-
>  gnu/packages/maths.scm                        | 55 ----------------
>  .../patches/opencascade-oce-glibc-2.26.patch  | 62 -------------------
>  3 files changed, 1 insertion(+), 119 deletions(-)
>  delete mode 100644 gnu/packages/patches/opencascade-oce-glibc-2.26.patch

[...]

> -# Copyright © 2020 Vinicius Monego <monego <at> posteo.net>
> +# Copyright © 2020, 2023 Vinicius Monego <monego <at> posteo.net>

For what it is worth, removing is not copyrightable.


Cheers,
simon

Message #13 received at 61332-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Vinicius Monego <monego <at> posteo.net>
Cc: 61332-done <at> debbugs.gnu.org
Subject: Re: bug#61332: [PATCH] gnu: Remove opencascade-oce.
Date: Fri, 10 Feb 2023 23:29:41 +0100

Hi,

Vinicius Monego <monego <at> posteo.net> skribis:

> This package is unmaintained by upstream, has no dependents and was
> replaced by opencascade-occt.
>
> * gnu/packages/maths.scm (opencascade-oce): Remove variable.
> * gnu/packages/patches/opencascade-oce-glibc-2.26.patch: Remove file.
> * gnu/local.mk: Unregister it.

Applied, thanks!

Ludo’.

Message #16 received at 61332-done <at> debbugs.gnu.org (full text, mbox):

From: zimoun <zimon.toutoune <at> gmail.com>
To: Ludovic Courtès <ludo <at> gnu.org>, Vinicius Monego
 <monego <at> posteo.net>
Cc: 61332-done <at> debbugs.gnu.org
Subject: Re: bug#61332: [PATCH] gnu: Remove opencascade-oce.
Date: Sat, 11 Feb 2023 10:51:06 +0100

Hi,

On Fri, 10 Feb 2023 at 23:29, Ludovic Courtès <ludo <at> gnu.org> wrote:

> Applied, thanks!

As I pointed:

 1. Removal it is not copyrightable.
 2. One line change is not copyrightable.

Therefore, this change in gnu/local.mk change is doubly incorrect. :-)

Vinicius, now you have the pressure. ;-) Sometime this year 2023, you
should send a Copyrightable change to gnu/local.mk. ;-) Double smileys
because I am kidding twice.

Moreover, the header of this file should only contain few Copyright
lines since most of the additions had been one line.  I also plead
culprit for having added one myself. :-)

Cheers,
simon

--8<---------------cut here---------------start------------->8---
diff --git a/gnu/local.mk b/gnu/local.mk
index fdbb8ce461..cd92d98068 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -38,7 +38,7 @@
 # Copyright © 2020 Tanguy Le Carrour <tanguy <at> bioneland.org>
 # Copyright © 2020 Martin Becze <mjbecze <at> riseup.net>
 # Copyright © 2020 Malte Frank Gerdes <mate.f.gerdes <at> gmail.com>
-# Copyright © 2020 Vinicius Monego <monego <at> posteo.net>
+# Copyright © 2020, 2023 Vinicius Monego <monego <at> posteo.net>
 # Copyright © 2021 Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
 # Copyright © 2021 Greg Hogan <code <at> greghogan.com>
 # Copyright © 2021, 2022 Philip McGrath <philip <at> philipmcgrath.com>
@@ -1599,7 +1599,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/openboardview-use-system-imgui.patch	\
   %D%/packages/patches/openboardview-use-system-utf8.patch	\
   %D%/packages/patches/openbox-python3.patch			\
-  %D%/packages/patches/opencascade-oce-glibc-2.26.patch		\
   %D%/packages/patches/openfoam-4.1-cleanup.patch			\
   %D%/packages/patches/openjdk-10-idlj-reproducibility.patch	\
   %D%/packages/patches/openjdk-15-xcursor-no-dynamic.patch	\
--8<---------------cut here---------------end--------------->8---

Message #19 received at 61332-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: zimoun <zimon.toutoune <at> gmail.com>
Cc: 61332-done <at> debbugs.gnu.org, Vinicius Monego <monego <at> posteo.net>
Subject: Re: bug#61332: [PATCH] gnu: Remove opencascade-oce.
Date: Mon, 20 Feb 2023 11:47:04 +0100

Hi,

zimoun <zimon.toutoune <at> gmail.com> skribis:

> As I pointed:
>
>  1. Removal it is not copyrightable.
>  2. One line change is not copyrightable.

This is true, but hopefully Vinicius will contribute more this year,
which is why I did not worry!

Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.