Architecture specific change in rpms/rust-wiggle.git
by githook-noreply@fedoraproject.org
The package rpms/rust-wiggle.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-wiggle.git/commit/?id=4f7dcf....
Change:
-ExclusiveArch: x86_64 aarch64 s390x
Thanks.
Full change:
============
commit 4f7dcf493daefc6a5e9cca3550b3785d70c95307
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Tue Aug 9 18:05:27 2022 +0200
unused as effort to package wasmtime is abandoned
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 3a5024c..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/results_*/
-/*.src.rpm
-
-/wiggle-0.33.0.crate
-/wiggle-0.35.3.crate
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..0d143d3
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+unused as effort to package wasmtime is abandoned
diff --git a/rust-wiggle.spec b/rust-wiggle.spec
deleted file mode 100644
index d1db754..0000000
--- a/rust-wiggle.spec
+++ /dev/null
@@ -1,147 +0,0 @@
-# Generated by rust2rpm 21
-%bcond_without check
-%global debug_package %{nil}
-
-%global crate wiggle
-
-Name: rust-%{crate}
-Version: 0.35.3
-Release: %autorelease
-Summary: Runtime components of wiggle code generator
-
-# Upstream license specification: Apache-2.0 WITH LLVM-exception
-License: ASL 2.0
-URL: https://crates.io/crates/wiggle
-Source: %{crates_source}
-
-# cranelift only supports x86_64, aarch64, and s390x
-# * i686: https://bugzilla.redhat.com/show_bug.cgi?id=1966344
-# * armv7hl: https://bugzilla.redhat.com/show_bug.cgi?id=1966346
-# * ppc64le: https://bugzilla.redhat.com/show_bug.cgi?id=1966347
-ExclusiveArch: x86_64 aarch64 s390x
-
-BuildRequires: rust-packaging >= 21
-
-%global _description %{expand:
-Runtime components of wiggle code generator.}
-
-%description %{_description}
-
-%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "%{crate}" crate.
-
-%files devel
-%license %{crate_instdir}/LICENSE
-%doc %{crate_instdir}/README.md
-%{crate_instdir}/
-
-%package -n %{name}+default-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+default-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "default" feature of the "%{crate}" crate.
-
-%files -n %{name}+default-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package -n %{name}+tracing_log-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+tracing_log-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "tracing_log" feature of the "%{crate}" crate.
-
-%files -n %{name}+tracing_log-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package -n %{name}+wasmtime-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+wasmtime-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "wasmtime" feature of the "%{crate}" crate.
-
-%files -n %{name}+wasmtime-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package -n %{name}+wasmtime_async-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+wasmtime_async-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "wasmtime_async" feature of the "%{crate}" crate.
-
-%files -n %{name}+wasmtime_async-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package -n %{name}+wasmtime_integration-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+wasmtime_integration-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "wasmtime_integration" feature of the "%{crate}" crate.
-
-%files -n %{name}+wasmtime_integration-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package -n %{name}+wiggle_metadata-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+wiggle_metadata-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "wiggle_metadata" feature of the "%{crate}" crate.
-
-%files -n %{name}+wiggle_metadata-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package -n %{name}+witx-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+witx-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "witx" feature of the "%{crate}" crate.
-
-%files -n %{name}+witx-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
-%cargo_prep
-
-%generate_buildrequires
-%cargo_generate_buildrequires
-
-%build
-%cargo_build
-
-%install
-%cargo_install
-
-%if %{with check}
-%check
-%cargo_test
-%endif
-
-%changelog
-%autochangelog
diff --git a/sources b/sources
deleted file mode 100644
index 4298e18..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (wiggle-0.35.3.crate) = 46da52042785a5b616a8bab939d7ca68418353f78f6674a822ba4fa11e8aa59319f68942e52a4848a9d0d4b18f11b9eae1b328cedbc38f28fce0d2a22ed5f8a4
1 year, 10 months
Architecture specific change in rpms/rust-arf-strings.git
by githook-noreply@fedoraproject.org
The package rpms/rust-arf-strings.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-arf-strings.git/commit/?id=9....
Change:
-ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit 9e6ff666aa9e161920dcf0432a8a31224cfa1ea7
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Tue Aug 9 17:46:50 2022 +0200
unused as effort to package wasmtime is abandoned
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index b289b9c..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/results_*/
-/*.src.rpm
-
-/arf-strings-0.6.3.crate
-/arf-strings-0.6.5.crate
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..0d143d3
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+unused as effort to package wasmtime is abandoned
diff --git a/rust-arf-strings.spec b/rust-arf-strings.spec
deleted file mode 100644
index d8d76c4..0000000
--- a/rust-arf-strings.spec
+++ /dev/null
@@ -1,76 +0,0 @@
-# Generated by rust2rpm 21
-%bcond_without check
-%global debug_package %{nil}
-
-%global crate arf-strings
-
-Name: rust-%{crate}
-Version: 0.6.5
-Release: %autorelease
-Summary: Encoding and decoding for ARF strings
-
-# Upstream license specification: Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
-License: ASL 2.0 or MIT
-URL: https://crates.io/crates/arf-strings
-Source: %{crates_source}
-
-ExclusiveArch: %{rust_arches}
-
-BuildRequires: rust-packaging >= 21
-
-%global _description %{expand:
-Encoding and decoding for ARF strings.}
-
-%description %{_description}
-
-%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "%{crate}" crate.
-
-%files devel
-%license %{crate_instdir}/COPYRIGHT
-%license %{crate_instdir}/LICENSE-APACHE
-%license %{crate_instdir}/LICENSE-Apache-2.0_WITH_LLVM-exception
-%license %{crate_instdir}/LICENSE-MIT
-%doc %{crate_instdir}/ORG_CODE_OF_CONDUCT.md
-%doc %{crate_instdir}/README.md
-%doc %{crate_instdir}/arf-proposal.md
-%{crate_instdir}/
-
-%package -n %{name}+default-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+default-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "default" feature of the "%{crate}" crate.
-
-%files -n %{name}+default-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
-%cargo_prep
-
-%generate_buildrequires
-%cargo_generate_buildrequires
-
-%build
-%cargo_build
-
-%install
-%cargo_install
-
-%if %{with check}
-%check
-%cargo_test
-%endif
-
-%changelog
-%autochangelog
diff --git a/sources b/sources
deleted file mode 100644
index c9eb69b..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (arf-strings-0.6.5.crate) = 54e018d4f60cbef8f9cb8aa0ad5fa2b57258dadf7f6de184a72eb56ec1d21a0a707308770c274638219fab976e8ba979df781db907ab30564f5f392f26e72ffb
1 year, 10 months
Architecture specific change in rpms/rust-cap-primitives.git
by githook-noreply@fedoraproject.org
The package rpms/rust-cap-primitives.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-cap-primitives.git/commit/?i....
Change:
-ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit a7d6ac1b4507a3ff41fec648a34d4d4dc95af418
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Tue Aug 9 17:45:54 2022 +0200
unused as effort to package wasmtime is abandoned
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 8b32771..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/cap-primitives-0.13.10.crate
-/cap-primitives-0.21.1.crate
-/cap-primitives-0.22.1.crate
-/cap-primitives-0.24.2.crate
diff --git a/README.md b/README.md
deleted file mode 100644
index ed83e0f..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-cap-primitives
-
-The rust-cap-primitives package
diff --git a/cap-primitives-fix-metadata.diff b/cap-primitives-fix-metadata.diff
deleted file mode 100644
index ad9ca7b..0000000
--- a/cap-primitives-fix-metadata.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- cap-primitives-0.24.2/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ cap-primitives-0.24.2/Cargo.toml 2022-04-13T22:28:15.357300+00:00
-@@ -45,17 +45,3 @@
- [target."cfg(not(windows))".dependencies.rustix]
- version = "0.33.0"
- features = ["procfs"]
--[target."cfg(target_os = \"ios\")".dependencies.errno]
--version = "0.2.8"
--default-features = false
--[target."cfg(target_os = \"macos\")".dependencies.errno]
--version = "0.2.8"
--default-features = false
--[target."cfg(windows)".dependencies.winapi]
--version = "0.3.9"
--
--[target."cfg(windows)".dependencies.winapi-util]
--version = "0.1.5"
--
--[target."cfg(windows)".dependencies.winx]
--version = "0.31.0"
diff --git a/changelog b/changelog
deleted file mode 100644
index 98f0c1f..0000000
--- a/changelog
+++ /dev/null
@@ -1,11 +0,0 @@
-* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.21.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Sat Dec 04 2021 Olivier Lemasle <o.lemasle(a)gmail.com> - 0.21.1-1
-- Update to upstream 0.21.1 (fixes rhbz#1976474)
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.13.10-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jun 08 10:53:32 CEST 2021 Olivier Lemasle <o.lemasle(a)gmail.com> - 0.13.10-1
-- Initial package
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..0d143d3
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+unused as effort to package wasmtime is abandoned
diff --git a/rust-cap-primitives.spec b/rust-cap-primitives.spec
deleted file mode 100644
index 5c3ae2c..0000000
--- a/rust-cap-primitives.spec
+++ /dev/null
@@ -1,89 +0,0 @@
-# Generated by rust2rpm 21
-%bcond_without check
-%global debug_package %{nil}
-
-%global crate cap-primitives
-
-Name: rust-%{crate}
-Version: 0.24.2
-Release: %autorelease
-Summary: Capability-based primitives
-
-# Upstream license specification: Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
-License: ASL 2.0 or MIT
-URL: https://crates.io/crates/cap-primitives
-Source: %{crates_source}
-# Initial patched metadata
-# * drop non-linux dependencies
-Patch0: cap-primitives-fix-metadata.diff
-
-ExclusiveArch: %{rust_arches}
-
-BuildRequires: rust-packaging >= 21
-
-%global _description %{expand:
-Capability-based primitives.}
-
-%description %{_description}
-
-%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "%{crate}" crate.
-
-%files devel
-%license %{crate_instdir}/COPYRIGHT
-%license %{crate_instdir}/LICENSE-APACHE
-%license %{crate_instdir}/LICENSE-Apache-2.0_WITH_LLVM-exception
-%license %{crate_instdir}/LICENSE-MIT
-%doc %{crate_instdir}/README.md
-%{crate_instdir}/
-
-%package -n %{name}+default-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+default-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "default" feature of the "%{crate}" crate.
-
-%files -n %{name}+default-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package -n %{name}+arbitrary-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+arbitrary-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "arbitrary" feature of the "%{crate}" crate.
-
-%files -n %{name}+arbitrary-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
-%cargo_prep
-
-%generate_buildrequires
-%cargo_generate_buildrequires
-
-%build
-%cargo_build
-
-%install
-%cargo_install
-
-%if %{with check}
-%check
-%cargo_test
-%endif
-
-%changelog
-%autochangelog
diff --git a/sources b/sources
deleted file mode 100644
index 463de8b..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (cap-primitives-0.24.2.crate) = 36f3b0f87406aa44446fdd332c015858ccd4a11b321bfad34d4569c4e7ea54303a73a3f0285ea47b97e02926b4a2c72255b0e8ac49d60b531ce814e1114274f4
1 year, 10 months
Architecture specific change in rpms/rust-cap-std.git
by githook-noreply@fedoraproject.org
The package rpms/rust-cap-std.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-cap-std.git/commit/?id=beb24....
Change:
-ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit beb242e74fedae9e8d6a569e6bfdec37c037ac8d
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Tue Aug 9 17:43:51 2022 +0200
unused as effort to package wasmtime is abandoned
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index f7b7fba..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/cap-std-0.13.10.crate
-/cap-std-0.21.1.crate
-/cap-std-0.22.1.crate
-/cap-std-0.24.2.crate
diff --git a/README.md b/README.md
deleted file mode 100644
index d8f792a..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-cap-std
-
-The rust-cap-std package
diff --git a/changelog b/changelog
deleted file mode 100644
index 3a36585..0000000
--- a/changelog
+++ /dev/null
@@ -1,12 +0,0 @@
-* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.21.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Sat Dec 04 2021 Olivier Lemasle <o.lemasle(a)gmail.com> - 0.21.1-1
-- Bump to upstream 0.21.1 (fixes rhbz#1983296)
-- Add fs_utf8 feature
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.13.10-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Sun Jun 13 17:20:40 CEST 2021 Olivier Lemasle <o.lemasle(a)gmail.com> - 0.13.10-1
-- Initial package
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..0d143d3
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+unused as effort to package wasmtime is abandoned
diff --git a/rust-cap-std.spec b/rust-cap-std.spec
deleted file mode 100644
index c341a2b..0000000
--- a/rust-cap-std.spec
+++ /dev/null
@@ -1,122 +0,0 @@
-# Generated by rust2rpm 21
-%bcond_without check
-%global debug_package %{nil}
-
-%global crate cap-std
-
-Name: rust-%{crate}
-Version: 0.24.2
-Release: %autorelease
-Summary: Capability-based version of the Rust standard library
-
-# Upstream license specification: Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
-License: ASL 2.0 or MIT
-URL: https://crates.io/crates/cap-std
-Source: %{crates_source}
-
-ExclusiveArch: %{rust_arches}
-
-BuildRequires: rust-packaging >= 21
-
-%global _description %{expand:
-Capability-based version of the Rust standard library.}
-
-%description %{_description}
-
-%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "%{crate}" crate.
-
-%files devel
-%license %{crate_instdir}/COPYRIGHT
-%license %{crate_instdir}/LICENSE-APACHE
-%license %{crate_instdir}/LICENSE-Apache-2.0_WITH_LLVM-exception
-%license %{crate_instdir}/LICENSE-MIT
-%doc %{crate_instdir}/README.md
-%{crate_instdir}/
-
-%package -n %{name}+default-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+default-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "default" feature of the "%{crate}" crate.
-
-%files -n %{name}+default-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package -n %{name}+arf-strings-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+arf-strings-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "arf-strings" feature of the "%{crate}" crate.
-
-%files -n %{name}+arf-strings-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package -n %{name}+arf_strings-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+arf_strings-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "arf_strings" feature of the "%{crate}" crate.
-
-%files -n %{name}+arf_strings-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package -n %{name}+camino-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+camino-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "camino" feature of the "%{crate}" crate.
-
-%files -n %{name}+camino-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package -n %{name}+fs_utf8-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+fs_utf8-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "fs_utf8" feature of the "%{crate}" crate.
-
-%files -n %{name}+fs_utf8-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
-%cargo_prep
-
-%generate_buildrequires
-%cargo_generate_buildrequires
-
-%build
-%cargo_build
-
-%install
-%cargo_install
-
-%if %{with check}
-%check
-%cargo_test
-%endif
-
-%changelog
-%autochangelog
diff --git a/sources b/sources
deleted file mode 100644
index b9742b4..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (cap-std-0.24.2.crate) = 6e0a84ad3721b7c936022ec21f1ce7e2dd0e9b89a71eddf7c1d96afccfaacfba76eee619ae2f5db0ea94578d895d944323dc6ef99edfa229a9a56d3576fa9346
1 year, 10 months
Architecture specific change in rpms/rust-cap-tempfile.git
by githook-noreply@fedoraproject.org
The package rpms/rust-cap-tempfile.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-cap-tempfile.git/commit/?id=....
Change:
-ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit f4ba628da0ebd822526319a6639a1beb00cb79c8
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Tue Aug 9 17:42:08 2022 +0200
unused as effort to package wasmtime is abandoned
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index b0bc1a5..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/results_*/
-/*.src.rpm
-
-/cap-tempfile-0.22.1.crate
-/cap-tempfile-0.24.2.crate
diff --git a/cap-tempfile-fix-metadata.diff b/cap-tempfile-fix-metadata.diff
deleted file mode 100644
index 21ced61..0000000
--- a/cap-tempfile-fix-metadata.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- cap-tempfile-0.24.2/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ cap-tempfile-0.24.2/Cargo.toml 2022-04-13T23:22:56.962596+00:00
-@@ -34,7 +34,3 @@
- arf_strings = ["cap-std/arf_strings"]
- default = []
- fs_utf8 = ["cap-std/fs_utf8", "camino"]
--[target."cfg(target_os = \"emscripten\")".dependencies.rand]
--version = "0.8.1"
--[target."cfg(windows)".dev-dependencies.winapi]
--version = "0.3.9"
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..0d143d3
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+unused as effort to package wasmtime is abandoned
diff --git a/rust-cap-tempfile.spec b/rust-cap-tempfile.spec
deleted file mode 100644
index 14c501e..0000000
--- a/rust-cap-tempfile.spec
+++ /dev/null
@@ -1,113 +0,0 @@
-# Generated by rust2rpm 21
-%bcond_without check
-%global debug_package %{nil}
-
-%global crate cap-tempfile
-
-Name: rust-%{crate}
-Version: 0.24.2
-Release: %autorelease
-Summary: Capability-based temporary directories
-
-# Upstream license specification: Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
-License: ASL 2.0 or MIT
-URL: https://crates.io/crates/cap-tempfile
-Source: %{crates_source}
-# Initial patched metadata
-# * drop non-linux dependencies
-Patch0: cap-tempfile-fix-metadata.diff
-
-ExclusiveArch: %{rust_arches}
-
-BuildRequires: rust-packaging >= 21
-
-%global _description %{expand:
-Capability-based temporary directories.}
-
-%description %{_description}
-
-%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "%{crate}" crate.
-
-%files devel
-%license %{crate_instdir}/COPYRIGHT
-%license %{crate_instdir}/LICENSE-APACHE
-%license %{crate_instdir}/LICENSE-Apache-2.0_WITH_LLVM-exception
-%license %{crate_instdir}/LICENSE-MIT
-%doc %{crate_instdir}/README.md
-%{crate_instdir}/
-
-%package -n %{name}+default-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+default-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "default" feature of the "%{crate}" crate.
-
-%files -n %{name}+default-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package -n %{name}+arf_strings-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+arf_strings-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "arf_strings" feature of the "%{crate}" crate.
-
-%files -n %{name}+arf_strings-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package -n %{name}+camino-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+camino-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "camino" feature of the "%{crate}" crate.
-
-%files -n %{name}+camino-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package -n %{name}+fs_utf8-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+fs_utf8-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "fs_utf8" feature of the "%{crate}" crate.
-
-%files -n %{name}+fs_utf8-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
-%cargo_prep
-
-%generate_buildrequires
-%cargo_generate_buildrequires
-
-%build
-%cargo_build
-
-%install
-%cargo_install
-
-%if %{with check}
-%check
-%cargo_test
-%endif
-
-%changelog
-%autochangelog
diff --git a/sources b/sources
deleted file mode 100644
index b2ed8ce..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (cap-tempfile-0.24.2.crate) = cb10c119d1ab2d22460ac171ed284d068447fcf5b7bfdbdeddba4e36a658e3afc12a8cdd50cc3d11f543a9b15819d5f341d48a347550605da820b748e50f2a69
1 year, 10 months
Architecture specific change in rpms/rust-wasmtime-wast.git
by githook-noreply@fedoraproject.org
The package rpms/rust-wasmtime-wast.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-wasmtime-wast.git/commit/?id....
Change:
-ExclusiveArch: x86_64 aarch64 s390x
Thanks.
Full change:
============
commit c820b98ec00f2660914eb443e91c3afd7e888437
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Tue Aug 9 17:54:18 2022 +0200
unused as effort to package wasmtime is abandoned
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 9ba10e6..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/results_*/
-/*.src.rpm
-
-/wasmtime-wast-0.33.0.crate
-/wasmtime-wast-0.35.3.crate
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..0d143d3
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+unused as effort to package wasmtime is abandoned
diff --git a/rust-wasmtime-wast.spec b/rust-wasmtime-wast.spec
deleted file mode 100644
index 6ee02a7..0000000
--- a/rust-wasmtime-wast.spec
+++ /dev/null
@@ -1,74 +0,0 @@
-# Generated by rust2rpm 21
-%bcond_without check
-%global debug_package %{nil}
-
-%global crate wasmtime-wast
-
-Name: rust-%{crate}
-Version: 0.35.3
-Release: %autorelease
-Summary: Wast testing support for wasmtime
-
-# Upstream license specification: Apache-2.0 WITH LLVM-exception
-License: ASL 2.0
-URL: https://crates.io/crates/wasmtime-wast
-Source: %{crates_source}
-
-# cranelift only supports x86_64, aarch64, and s390x
-# * i686: https://bugzilla.redhat.com/show_bug.cgi?id=1966344
-# * armv7hl: https://bugzilla.redhat.com/show_bug.cgi?id=1966346
-# * ppc64le: https://bugzilla.redhat.com/show_bug.cgi?id=1966347
-ExclusiveArch: x86_64 aarch64 s390x
-
-BuildRequires: rust-packaging >= 21
-
-%global _description %{expand:
-Wast testing support for wasmtime.}
-
-%description %{_description}
-
-%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "%{crate}" crate.
-
-%files devel
-%license %{crate_instdir}/LICENSE
-%{crate_instdir}/
-
-%package -n %{name}+default-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+default-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "default" feature of the "%{crate}" crate.
-
-%files -n %{name}+default-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
-%cargo_prep
-
-%generate_buildrequires
-%cargo_generate_buildrequires
-
-%build
-%cargo_build
-
-%install
-%cargo_install
-
-%if %{with check}
-%check
-%cargo_test
-%endif
-
-%changelog
-%autochangelog
diff --git a/sources b/sources
deleted file mode 100644
index 3f6e5ec..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (wasmtime-wast-0.35.3.crate) = c73c18c9f0b68333d16716adec56c659c0db9815a315d8f260175ffdccfc4856265183e79598f5f03306a986d29ce1890d0d0adb9c766259baf020cf6a62d7d8
1 year, 10 months
Architecture specific change in rpms/rust-temp_testdir.git
by githook-noreply@fedoraproject.org
The package rpms/rust-temp_testdir.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-temp_testdir.git/commit/?id=....
Change:
+ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit ec192c45170ea46b076b62988d8f05884adcb1a0
Author: Davide Cavalca <dcavalca(a)fedoraproject.org>
Date: Sun Aug 7 22:54:46 2022 -0500
Initial import; Fixes: RHBZ#1982500
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..77e4d22
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/temp_testdir-0.2.3.crate
diff --git a/LICENSE-APACHE b/LICENSE-APACHE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/LICENSE-APACHE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/LICENSE-MIT b/LICENSE-MIT
new file mode 100644
index 0000000..1f95d26
--- /dev/null
+++ b/LICENSE-MIT
@@ -0,0 +1,5 @@
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/rust-temp_testdir.spec b/rust-temp_testdir.spec
new file mode 100644
index 0000000..2401991
--- /dev/null
+++ b/rust-temp_testdir.spec
@@ -0,0 +1,78 @@
+# Generated by rust2rpm 21
+%bcond_without check
+%global debug_package %{nil}
+
+%global crate temp_testdir
+
+Name: rust-%{crate}
+Version: 0.2.3
+Release: %autorelease
+Summary: Little crate to use temp directory in crate
+
+# Upstream license specification: MIT/Apache-2.0
+License: MIT or ASL 2.0
+URL: https://crates.io/crates/temp_testdir
+Source: %{crates_source}
+# Add missing license files: https://github.com/la10736/temp_testdir/pull/5
+Source: https://github.com/la10736/temp_testdir/raw/b2ad5cf9a8c38438f7cc9909ec3fe...
+Source: https://github.com/la10736/temp_testdir/raw/b2ad5cf9a8c38438f7cc9909ec3fe...
+
+ExclusiveArch: %{rust_arches}
+
+BuildRequires: rust-packaging >= 21
+
+%global _description %{expand:
+Little crate to use temp directory in crate. You can chose if delete it after
+use or not to debugging purpose.}
+
+%description %{_description}
+
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "%{crate}" crate.
+
+%files devel
+%license %{crate_instdir}/LICENSE-APACHE
+%license %{crate_instdir}/LICENSE-MIT
+%doc %{crate_instdir}/CHANGELOG.md
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/
+
+%package -n %{name}+default-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+default-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "default" feature of the "%{crate}" crate.
+
+%files -n %{name}+default-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%prep
+%autosetup -n %{crate}-%{version_no_tilde} -p1
+%cargo_prep
+cp -p %SOURCE1 %SOURCE2 .
+
+%generate_buildrequires
+%cargo_generate_buildrequires
+
+%build
+%cargo_build
+
+%install
+%cargo_install
+
+%if %{with check}
+%check
+%cargo_test
+%endif
+
+%changelog
+%autochangelog
diff --git a/sources b/sources
new file mode 100644
index 0000000..57f58e2
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (temp_testdir-0.2.3.crate) = d28d95be2cebd7d37c1a318c9dbfa596a4a32167446673c0708e245e3a88de5ce2750183cfeed83d8b4341a1d7455d28711bb70acf28a1d4e0d1924f9999bfd6
1 year, 10 months
Architecture specific change in rpms/rust-temp_testdir.git
by githook-noreply@fedoraproject.org
The package rpms/rust-temp_testdir.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-temp_testdir.git/commit/?id=....
Change:
+ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit ec192c45170ea46b076b62988d8f05884adcb1a0
Author: Davide Cavalca <dcavalca(a)fedoraproject.org>
Date: Sun Aug 7 22:54:46 2022 -0500
Initial import; Fixes: RHBZ#1982500
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..77e4d22
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/temp_testdir-0.2.3.crate
diff --git a/LICENSE-APACHE b/LICENSE-APACHE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/LICENSE-APACHE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/LICENSE-MIT b/LICENSE-MIT
new file mode 100644
index 0000000..1f95d26
--- /dev/null
+++ b/LICENSE-MIT
@@ -0,0 +1,5 @@
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/rust-temp_testdir.spec b/rust-temp_testdir.spec
new file mode 100644
index 0000000..2401991
--- /dev/null
+++ b/rust-temp_testdir.spec
@@ -0,0 +1,78 @@
+# Generated by rust2rpm 21
+%bcond_without check
+%global debug_package %{nil}
+
+%global crate temp_testdir
+
+Name: rust-%{crate}
+Version: 0.2.3
+Release: %autorelease
+Summary: Little crate to use temp directory in crate
+
+# Upstream license specification: MIT/Apache-2.0
+License: MIT or ASL 2.0
+URL: https://crates.io/crates/temp_testdir
+Source: %{crates_source}
+# Add missing license files: https://github.com/la10736/temp_testdir/pull/5
+Source: https://github.com/la10736/temp_testdir/raw/b2ad5cf9a8c38438f7cc9909ec3fe...
+Source: https://github.com/la10736/temp_testdir/raw/b2ad5cf9a8c38438f7cc9909ec3fe...
+
+ExclusiveArch: %{rust_arches}
+
+BuildRequires: rust-packaging >= 21
+
+%global _description %{expand:
+Little crate to use temp directory in crate. You can chose if delete it after
+use or not to debugging purpose.}
+
+%description %{_description}
+
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "%{crate}" crate.
+
+%files devel
+%license %{crate_instdir}/LICENSE-APACHE
+%license %{crate_instdir}/LICENSE-MIT
+%doc %{crate_instdir}/CHANGELOG.md
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/
+
+%package -n %{name}+default-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+default-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "default" feature of the "%{crate}" crate.
+
+%files -n %{name}+default-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%prep
+%autosetup -n %{crate}-%{version_no_tilde} -p1
+%cargo_prep
+cp -p %SOURCE1 %SOURCE2 .
+
+%generate_buildrequires
+%cargo_generate_buildrequires
+
+%build
+%cargo_build
+
+%install
+%cargo_install
+
+%if %{with check}
+%check
+%cargo_test
+%endif
+
+%changelog
+%autochangelog
diff --git a/sources b/sources
new file mode 100644
index 0000000..57f58e2
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (temp_testdir-0.2.3.crate) = d28d95be2cebd7d37c1a318c9dbfa596a4a32167446673c0708e245e3a88de5ce2750183cfeed83d8b4341a1d7455d28711bb70acf28a1d4e0d1924f9999bfd6
1 year, 10 months
Architecture specific change in rpms/freecad.git
by githook-noreply@fedoraproject.org
The package rpms/freecad.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/freecad.git/commit/?id=13906588ec....
Change:
+ExcludeArch: i686
Thanks.
Full change:
============
commit 13906588ec4783d7383d8003990f3cefb260cbce
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Tue Aug 9 10:08:12 2022 -0500
Exclude i686 arch on Fedora 37 and higher.
diff --git a/freecad.spec b/freecad.spec
index e2c5e1c..ae860e9 100644
--- a/freecad.spec
+++ b/freecad.spec
@@ -32,6 +32,11 @@ Source102: freecad.1
Patch0: freecad-unbundled-pycxx.patch
+# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
+%if 0%{?fedora} > 36
+ExcludeArch: i686
+%endif
+
# Utilities
BuildRequires: cmake gcc-c++ gettext dos2unix
BuildRequires: doxygen swig graphviz
commit 4966647c2516d333df862d36f1a43e402de63e04
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Tue Aug 9 07:45:26 2022 -0500
Update to 0.20.1.
diff --git a/.gitignore b/.gitignore
index 9a944bf..21aaced 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
/FreeCAD-0.19.3.tar.gz
/FreeCAD-0.19.4.tar.gz
/FreeCAD-0.20.tar.gz
+/FreeCAD-0.20.1.tar.gz
diff --git a/1ae55905ba.patch b/1ae55905ba.patch
deleted file mode 100644
index d543806..0000000
--- a/1ae55905ba.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-From 1ae55905ba7e89278bf656ebcc57ea1088e8fa44 Mon Sep 17 00:00:00 2001
-From: wmayer <wmayer(a)users.sourceforge.net>
-Date: Fri, 1 Jul 2022 17:54:50 +0200
-Subject: [PATCH] Py: make FreeCAD to compile with Py3.11
-
----
- src/Base/ConsoleObserver.cpp | 6 ++++
- src/Base/Interpreter.cpp | 56 ++++++++++++++++++++++++++++++++++++
- src/Base/PyObjectBase.cpp | 4 +++
- src/Base/PyTools.c | 10 ++++++-
- src/Gui/Command.cpp | 7 +++++
- src/Gui/PythonDebugger.cpp | 17 +++++++++--
- 6 files changed, 97 insertions(+), 3 deletions(-)
-
-diff --git a/src/Base/ConsoleObserver.cpp b/src/Base/ConsoleObserver.cpp
-index c6428a7f18be..ab3b3e9157b1 100644
---- a/src/Base/ConsoleObserver.cpp
-+++ b/src/Base/ConsoleObserver.cpp
-@@ -266,7 +266,13 @@ std::stringstream &LogLevel::prefix(std::stringstream &str, const char *src, int
- PyFrameObject* frame = PyEval_GetFrame();
- if (frame) {
- line = PyFrame_GetLineNumber(frame);
-+#if PY_VERSION_HEX < 0x030b0000
- src = PyUnicode_AsUTF8(frame->f_code->co_filename);
-+#else
-+ PyCodeObject* code = PyFrame_GetCode(frame);
-+ src = PyUnicode_AsUTF8(code->co_filename);
-+ Py_DECREF(code);
-+#endif
- }
- }
- if (print_src && src && src[0]) {
-diff --git a/src/Base/Interpreter.cpp b/src/Base/Interpreter.cpp
-index 2bacea30cbb7..5a476094b749 100644
---- a/src/Base/Interpreter.cpp
-+++ b/src/Base/Interpreter.cpp
-@@ -523,6 +523,7 @@ void InterpreterSingleton::addPythonPath(const char* Path)
- list.append(Py::String(Path));
- }
-
-+#if PY_VERSION_HEX < 0x030b0000
- const char* InterpreterSingleton::init(int argc,char *argv[])
- {
- if (!Py_IsInitialized()) {
-@@ -565,6 +566,61 @@ const char* InterpreterSingleton::init(int argc,char *argv[])
- PyGILStateLocker lock;
- return Py_EncodeLocale(Py_GetPath(),nullptr);
- }
-+#else
-+namespace {
-+void initInterpreter(int argc,char *argv[])
-+{
-+ PyStatus status;
-+ PyConfig config;
-+ PyConfig_InitPythonConfig(&config);
-+
-+ status = PyConfig_SetBytesArgv(&config, argc, argv);
-+ if (PyStatus_Exception(status)) {
-+ throw Base::RuntimeError("Failed to set config");
-+ }
-+
-+ status = Py_InitializeFromConfig(&config);
-+ if (PyStatus_Exception(status)) {
-+ throw Base::RuntimeError("Failed to init from config");
-+ }
-+
-+ PyConfig_Clear(&config);
-+
-+ Py_Initialize();
-+ const char* virtualenv = getenv("VIRTUAL_ENV");
-+ if (virtualenv) {
-+ PyRun_SimpleString(
-+ "# Check for virtualenv, and activate if present.\n"
-+ "# See https://virtualenv.pypa.io/en/latest/userguide/#using-virtualenv-without-..."
-+ "import os\n"
-+ "import sys\n"
-+ "base_path = os.getenv(\"VIRTUAL_ENV\")\n"
-+ "if not base_path is None:\n"
-+ " activate_this = os.path.join(base_path, \"bin\", \"activate_this.py\")\n"
-+ " exec(open(activate_this).read(), {'__file__':activate_this})\n"
-+ );
-+ }
-+}
-+}
-+const char* InterpreterSingleton::init(int argc,char *argv[])
-+{
-+ try {
-+ if (!Py_IsInitialized()) {
-+ initInterpreter(argc, argv);
-+
-+ PythonStdOutput::init_type();
-+ this->_global = PyEval_SaveThread();
-+ }
-+
-+ PyGILStateLocker lock;
-+ return Py_EncodeLocale(Py_GetPath(),nullptr);
-+ }
-+ catch (const Base::Exception& e) {
-+ e.ReportException();
-+ throw;
-+ }
-+}
-+#endif
-
- void InterpreterSingleton::replaceStdOutput()
- {
-diff --git a/src/Base/PyObjectBase.cpp b/src/Base/PyObjectBase.cpp
-index 773a61b259b3..343ab26999f6 100644
---- a/src/Base/PyObjectBase.cpp
-+++ b/src/Base/PyObjectBase.cpp
-@@ -60,7 +60,11 @@ PyObjectBase::PyObjectBase(void* p,PyTypeObject *T)
- , baseProxy(nullptr)
- , attrDict(nullptr)
- {
-+#if PY_VERSION_HEX < 0x030b0000
- Py_TYPE(this) = T;
-+#else
-+ Py_SET_TYPE(this, T);
-+#endif
- _Py_NewReference(this);
- #ifdef FC_LOGPYOBJECTS
- Base::Console().Log("PyO+: %s (%p)\n",T->tp_name, this);
-diff --git a/src/Base/PyTools.c b/src/Base/PyTools.c
-index 71569e26a200..492d0c8563a4 100644
---- a/src/Base/PyTools.c
-+++ b/src/Base/PyTools.c
-@@ -15,8 +15,10 @@ is provided on an as is basis, without warranties of any kind.
- #include <string.h>
- #include <assert.h>
- #include <compile.h>
--#include <eval.h>
- #include <frameobject.h>
-+#if PY_VERSION_HEX < 0x030b0000
-+#include <eval.h>
-+#endif
-
-
- /*****************************************************************************
-@@ -310,7 +312,13 @@ void PP_Fetch_Error_Text()
- if(!frame)
- return;
- int line = PyFrame_GetLineNumber(frame);
-+#if PY_VERSION_HEX < 0x030b0000
- const char *file = PyUnicode_AsUTF8(frame->f_code->co_filename);
-+#else
-+ PyCodeObject* code = PyFrame_GetCode(frame);
-+ const char *file = PyUnicode_AsUTF8(code->co_filename);
-+ Py_DECREF(code);
-+#endif
- #ifdef FC_OS_WIN32
- const char *_f = strstr(file, "\\src\\");
- #else
-diff --git a/src/Gui/Command.cpp b/src/Gui/Command.cpp
-index c9568e8f0e69..cf555439fcd2 100644
---- a/src/Gui/Command.cpp
-+++ b/src/Gui/Command.cpp
-@@ -657,8 +657,15 @@ void Command::printPyCaller() {
- if(!frame)
- return;
- int line = PyFrame_GetLineNumber(frame);
-+#if PY_VERSION_HEX < 0x030b0000
- const char *file = PyUnicode_AsUTF8(frame->f_code->co_filename);
- printCaller(file?file:"<no file>",line);
-+#else
-+ PyCodeObject* code = PyFrame_GetCode(frame);
-+ const char* file = PyUnicode_AsUTF8(code->co_filename);
-+ printCaller(file?file:"<no file>",line);
-+ Py_DECREF(code);
-+#endif
- }
-
- void Command::printCaller(const char *file, int line) {
-diff --git a/src/Gui/PythonDebugger.cpp b/src/Gui/PythonDebugger.cpp
-index 7e731a9dd6af..cd44e9b1c233 100644
---- a/src/Gui/PythonDebugger.cpp
-+++ b/src/Gui/PythonDebugger.cpp
-@@ -563,6 +563,14 @@ void PythonDebugger::hideDebugMarker(const QString& fn)
- }
- }
-
-+#if PY_VERSION_HEX < 0x030900B1
-+static PyCodeObject* PyFrame_GetCode(PyFrameObject *frame)
-+{
-+ Py_INCREF(frame->f_code);
-+ return frame->f_code;
-+}
-+#endif
-+
- // http://www.koders.com/cpp/fidBA6CD8A0FE5F41F1464D74733D9A711DA257D20B.asp...
- // http://code.google.com/p/idapython/source/browse/trunk/python.cpp
- // http://www.koders.com/cpp/fid191F7B13CF73133935A7A2E18B7BF43ACC6D1784.asp...
-@@ -578,7 +586,9 @@ int PythonDebugger::tracer_callback(PyObject *obj, PyFrameObject *frame, int wha
-
- //no = frame->f_tstate->recursion_depth;
- //std::string funcname = PyString_AsString(frame->f_code->co_name);
-- QString file = QString::fromUtf8(PyUnicode_AsUTF8(frame->f_code->co_filename));
-+ PyCodeObject* code = PyFrame_GetCode(frame);
-+ QString file = QString::fromUtf8(PyUnicode_AsUTF8(code->co_filename));
-+ Py_DECREF(code);
- switch (what) {
- case PyTrace_CALL:
- self->depth++;
-@@ -592,7 +602,10 @@ int PythonDebugger::tracer_callback(PyObject *obj, PyFrameObject *frame, int wha
- //PyObject *str;
- //str = PyObject_Str(frame->f_code->co_filename);
- //no = frame->f_lineno;
-- int line = PyCode_Addr2Line(frame->f_code, frame->f_lasti);
-+ PyCodeObject* f_code = PyFrame_GetCode(frame);
-+ int f_lasti = PyFrame_GetLineNumber(frame);
-+ int line = PyCode_Addr2Line(f_code, f_lasti);
-+ Py_DECREF(f_code);
- //if (str) {
- // Base::Console().Message("PROFILING: %s:%d\n", PyString_AsString(str), frame->f_lineno);
- // Py_DECREF(str);
diff --git a/4916.patch b/4916.patch
deleted file mode 100644
index 2fc56d7..0000000
--- a/4916.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 196813abe2a349fb2b87133aa5c71febb971810e Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo(a)posteo.net>
-Date: Sun, 11 Jul 2021 15:29:03 +0200
-Subject: [PATCH] improve search for VTK-9
-
-Improve the find_package calls with vtk-9 cmake config files.
-In this version, the variable VTK_MODULES_ENABLED has been
-replaced by VTK_AVAILABLE_COMPONENTS.
-
-The additional change of the components names, which have their
-'vtk' prefix removed in vtk-9 is not covered by this patch for
-compatibility reasons.
-
-See the forum thread noted below for a description of this:
-https://forum.freecadweb.org/viewtopic.php?f=4&t=60068
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo(a)posteo.net>
----
- cMake/FreeCAD_Helpers/SetupSalomeSMESH.cmake | 25 ++++++++++++++------
- 1 file changed, 18 insertions(+), 7 deletions(-)
-
-diff --git a/cMake/FreeCAD_Helpers/SetupSalomeSMESH.cmake b/cMake/FreeCAD_Helpers/SetupSalomeSMESH.cmake
-index c83f83265400..5cf36329dfa3 100644
---- a/cMake/FreeCAD_Helpers/SetupSalomeSMESH.cmake
-+++ b/cMake/FreeCAD_Helpers/SetupSalomeSMESH.cmake
-@@ -27,13 +27,24 @@ macro(SetupSalomeSMESH)
- # check which modules are available
- if(UNIX OR WIN32)
- find_package(VTK COMPONENTS vtkCommonCore REQUIRED NO_MODULE)
-- list(APPEND VTK_COMPONENTS vtkIOMPIParallel vtkParallelMPI vtkhdf5 vtkFiltersParallelDIY2 vtkRenderingCore vtkInteractionStyle vtkRenderingFreeType vtkRenderingOpenGL2)
-- foreach(_module ${VTK_COMPONENTS})
-- list (FIND VTK_MODULES_ENABLED ${_module} _index)
-- if (${_index} GREATER -1)
-- list(APPEND AVAILABLE_VTK_COMPONENTS ${_module})
-- endif()
-- endforeach()
-+ if(${VTK_MAJOR_VERSION} LESS 9)
-+ list(APPEND VTK_COMPONENTS vtkIOMPIParallel vtkParallelMPI vtkhdf5 vtkFiltersParallelDIY2 vtkRenderingCore vtkInteractionStyle vtkRenderingFreeType vtkRenderingOpenGL2)
-+ foreach(_module ${VTK_COMPONENTS})
-+ list (FIND VTK_MODULES_ENABLED ${_module} _index)
-+ if(${_index} GREATER -1)
-+ list(APPEND AVAILABLE_VTK_COMPONENTS ${_module})
-+ endif()
-+ endforeach()
-+ else()
-+ set(VTK_COMPONENTS "CommonCore;CommonDataModel;FiltersVerdict;IOXML;FiltersCore;FiltersGeneral;IOLegacy;FiltersExtraction;FiltersSources;FiltersGeometry")
-+ list(APPEND VTK_COMPONENTS "IOMPIParallel;ParallelMPI;hdf5;FiltersParallelDIY2;RenderingCore;InteractionStyle;RenderingFreeType;RenderingOpenGL2")
-+ foreach(_module ${VTK_COMPONENTS})
-+ list (FIND VTK_AVAILABLE_COMPONENTS ${_module} _index)
-+ if(${_index} GREATER -1)
-+ list(APPEND AVAILABLE_VTK_COMPONENTS ${_module})
-+ endif()
-+ endforeach()
-+ endif()
- endif()
-
- # don't check VERSION 6 as this would exclude VERSION 7
diff --git a/6820e0a9ec.patch b/6820e0a9ec.patch
deleted file mode 100644
index 3f7db40..0000000
--- a/6820e0a9ec.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 6820e0a9ec85203a6f342ca72a2ff8fd417beaf1 Mon Sep 17 00:00:00 2001
-From: wmayer <wmayer(a)users.sourceforge.net>
-Date: Sat, 2 Jul 2022 19:36:27 +0200
-Subject: [PATCH] Py3: properly port to Py3.11
-
----
- src/Base/PyObjectBase.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Base/PyObjectBase.cpp b/src/Base/PyObjectBase.cpp
-index 343ab26999f..a8e1b327809 100644
---- a/src/Base/PyObjectBase.cpp
-+++ b/src/Base/PyObjectBase.cpp
-@@ -63,7 +63,7 @@ PyObjectBase::PyObjectBase(void* p,PyTypeObject *T)
- #if PY_VERSION_HEX < 0x030b0000
- Py_TYPE(this) = T;
- #else
-- Py_SET_TYPE(this, T);
-+ this->ob_type = T;
- #endif
- _Py_NewReference(this);
- #ifdef FC_LOGPYOBJECTS
diff --git a/freecad-0.14-Version_h.patch b/freecad-0.14-Version_h.patch
deleted file mode 100644
index 74e978d..0000000
--- a/freecad-0.14-Version_h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory(Build)
-+if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Build/Version.h)
-+ add_subdirectory(Build)
-+endif()
- add_subdirectory(3rdParty)
- add_subdirectory(Base)
- add_subdirectory(App)
diff --git a/freecad-0.15-zipios.patch b/freecad-0.15-zipios.patch
deleted file mode 100644
index c9e9f32..0000000
--- a/freecad-0.15-zipios.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: FreeCAD-a50ae33557e1992a938542b319cacb8b09d7fb08/src/Base/CMakeLists.txt
-===================================================================
---- FreeCAD-a50ae33557e1992a938542b319cacb8b09d7fb08.orig/src/Base/CMakeLists.txt
-+++ FreeCAD-a50ae33557e1992a938542b319cacb8b09d7fb08/src/Base/CMakeLists.txt
-@@ -377,9 +377,11 @@ ENDIF(MSVC)
- # Use external zipios++ if specified.
- if(FREECAD_USE_EXTERNAL_ZIPIOS)
- find_library(ZIPIOS_LIBRARY zipios)
-- find_path(ZIPIOS_INCLUDES zipios++/zipios-config.h)
-+ find_path(ZIPIOS_INCLUDES NAMES
-+ zipios++/zipios-config.h
-+ zipios++/zipios-config.hpp)
- if(ZIPIOS_LIBRARY)
-- message(STATUS "Found zipios++: ${ZIPIOS}")
-+ message(STATUS "Found zipios++: ${ZIPIOS_LIBRARY}")
- endif()
- if(ZIPIOS_INCLUDES)
- message(STATUS "Found zipios++ headers.")
diff --git a/freecad-boost.patch b/freecad-boost.patch
deleted file mode 100644
index 5b51837..0000000
--- a/freecad-boost.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: FreeCAD-0.19.2/CMakeLists.txt
-===================================================================
---- FreeCAD-0.19.2.orig/CMakeLists.txt
-+++ FreeCAD-0.19.2/CMakeLists.txt
-@@ -46,6 +46,7 @@ if(NOT FREECAD_LIBPACK_USE OR FREECAD_LI
- SetupPCL()
- SetupPybind11()
- SetupBoost()
-+ set(Boost_LIBRARIES_App ${Boost_LIBRARIES})
- SetupXercesC()
- find_package(ZLIB REQUIRED)
- find_package(PyCXX REQUIRED)
-Index: FreeCAD-0.19.2/src/App/CMakeLists.txt
-===================================================================
---- FreeCAD-0.19.2.orig/src/App/CMakeLists.txt
-+++ FreeCAD-0.19.2/src/App/CMakeLists.txt
-@@ -59,7 +59,7 @@ include_directories(
-
- set(FreeCADApp_LIBS
- FreeCADBase
-- ${Boost_LIBRARIES}
-+ ${Boost_LIBRARIES_App}
- )
-
- if (BUILD_QT5)
diff --git a/freecad-memory_h.patch b/freecad-memory_h.patch
deleted file mode 100644
index ed25b90..0000000
--- a/freecad-memory_h.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: FreeCAD-0.19.4/src/Mod/Part/App/BRepOffsetAPI_MakeFillingPyImp.cpp
-===================================================================
---- FreeCAD-0.19.4.orig/src/Mod/Part/App/BRepOffsetAPI_MakeFillingPyImp.cpp
-+++ FreeCAD-0.19.4/src/Mod/Part/App/BRepOffsetAPI_MakeFillingPyImp.cpp
-@@ -30,6 +30,9 @@
- # include <TopoDS_Face.hxx>
- #endif
-
-+// For std::unique_ptr
-+#include <memory>
-+
- #include "BRepOffsetAPI_MakeFillingPy.h"
- #include "BRepOffsetAPI_MakeFillingPy.cpp"
- #include "TopoShapeEdgePy.h"
-Index: FreeCAD-0.19.4/src/Mod/Part/App/ShapeUpgrade/UnifySameDomainPyImp.cpp
-===================================================================
---- FreeCAD-0.19.4.orig/src/Mod/Part/App/ShapeUpgrade/UnifySameDomainPyImp.cpp
-+++ FreeCAD-0.19.4/src/Mod/Part/App/ShapeUpgrade/UnifySameDomainPyImp.cpp
-@@ -29,6 +29,8 @@
-
- // Needed for OCCT 7.5.2
- #include <TopoDS_Edge.hxx>
-+// Needed for std::unique_ptr
-+#include <memory>
-
- #include "ShapeUpgrade/UnifySameDomainPy.h"
- #include "ShapeUpgrade/UnifySameDomainPy.cpp"
diff --git a/freecad-vtk9.patch b/freecad-vtk9.patch
deleted file mode 100644
index 74568f4..0000000
--- a/freecad-vtk9.patch
+++ /dev/null
@@ -1,827 +0,0 @@
-From bb9bcbd51df7c3cb76c5823038e4ea0f7e25a9ff Mon Sep 17 00:00:00 2001
-From: wmayer <wmayer(a)users.sourceforge.net>
-Date: Mon, 12 Oct 2020 17:56:03 +0200
-Subject: [PATCH] Make smesh compile with vtk9
-
----
- .../salomesmesh/inc/SMDS_MeshElement.hxx | 9 +++-
- .../salomesmesh/inc/SMDS_UnstructuredGrid.hxx | 4 ++
- .../salomesmesh/src/SMDS/SMDS_BallElement.cpp | 9 +++-
- .../salomesmesh/src/SMDS/SMDS_Downward.cpp | 44 +++++++++----------
- .../salomesmesh/src/SMDS/SMDS_Mesh.cpp | 6 ++-
- .../src/SMDS/SMDS_Mesh0DElement.cpp | 12 +++++
- .../salomesmesh/src/SMDS/SMDS_MeshNode.cpp | 10 ++---
- .../src/SMDS/SMDS_UnstructuredGrid.cpp | 35 +++++++++++++--
- .../src/SMDS/SMDS_VtkCellIterator.cpp | 7 +--
- .../salomesmesh/src/SMDS/SMDS_VtkEdge.cpp | 19 +++++++-
- .../salomesmesh/src/SMDS/SMDS_VtkFace.cpp | 29 ++++++++++--
- .../salomesmesh/src/SMDS/SMDS_VtkVolume.cpp | 38 +++++++++++-----
- .../src/SMESH/SMESH_MeshEditor.cpp | 8 ++--
- src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp | 7 ++-
- 14 files changed, 179 insertions(+), 58 deletions(-)
-
-Index: FreeCAD-0.19.2/src/3rdParty/salomesmesh/inc/SMDS_MeshElement.hxx
-===================================================================
---- FreeCAD-0.19.2.orig/src/3rdParty/salomesmesh/inc/SMDS_MeshElement.hxx
-+++ FreeCAD-0.19.2/src/3rdParty/salomesmesh/inc/SMDS_MeshElement.hxx
-@@ -40,11 +40,16 @@
-
- #include <vtkType.h>
- #include <vtkCellType.h>
-+#include <vtkCellArray.h>
-
- //typedef unsigned short UShortType;
- typedef short ShortType;
- typedef int LongType;
--
-+#ifdef VTK_CELL_ARRAY_V2
-+typedef const vtkIdType* vtkIdTypePtr;
-+#else
-+typedef vtkIdType* vtkIdTypePtr;
-+#endif
- class SMDS_MeshNode;
- class SMDS_MeshEdge;
- class SMDS_MeshFace;
-@@ -192,7 +197,7 @@ protected:
- //! Element index in vector SMDS_Mesh::myNodes or SMDS_Mesh::myCells
- int myID;
- //! index in vtkUnstructuredGrid
-- int myVtkID;
-+ vtkIdType myVtkID;
- //! SMDS_Mesh identification in SMESH
- ShortType myMeshId;
- //! SubShape and SubMesh identification in SMESHDS
-Index: FreeCAD-0.19.2/src/3rdParty/salomesmesh/inc/SMDS_UnstructuredGrid.hxx
-===================================================================
---- FreeCAD-0.19.2.orig/src/3rdParty/salomesmesh/inc/SMDS_UnstructuredGrid.hxx
-+++ FreeCAD-0.19.2/src/3rdParty/salomesmesh/inc/SMDS_UnstructuredGrid.hxx
-@@ -95,7 +95,11 @@ public:
- std::map<int, std::map<long,int> >& nodeQuadDomains);
- vtkCellLinks* GetLinks()
- {
-+#ifdef VTK_CELL_ARRAY_V2
-+ return static_cast<vtkCellLinks*>(GetCellLinks());
-+#else
- return Links;
-+#endif
- }
- SMDS_Downward* getDownArray(unsigned char vtkType)
- {
-Index: FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_BallElement.cpp
-===================================================================
---- FreeCAD-0.19.2.orig/src/3rdParty/salomesmesh/src/SMDS/SMDS_BallElement.cpp
-+++ FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_BallElement.cpp
-@@ -67,10 +67,16 @@ void SMDS_BallElement::SetDiameter(doubl
- bool SMDS_BallElement::ChangeNode (const SMDS_MeshNode * node)
- {
- vtkUnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid();
-+#ifdef VTK_CELL_ARRAY_V2
-+ vtkNew<vtkIdList> cellPoints;
-+ grid->GetCellPoints(myVtkID, cellPoints.GetPointer());
-+ cellPoints->SetId(0, node->getVtkId());
-+#else
- vtkIdType npts = 0;
- vtkIdType* pts = 0;
- grid->GetCellPoints(myVtkID, npts, pts);
- pts[0] = node->getVtkId();
-+#endif
- SMDS_Mesh::_meshList[myMeshId]->setMyModified();
- return true;
- }
-@@ -83,7 +89,8 @@ void SMDS_BallElement::Print (std::ostre
- const SMDS_MeshNode* SMDS_BallElement::GetNode (const int ind) const
- {
- vtkUnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid();
-- vtkIdType npts, *pts;
-+ vtkIdType npts;
-+ vtkIdTypePtr pts;
- grid->GetCellPoints( myVtkID, npts, pts );
- return SMDS_Mesh::_meshList[myMeshId]->FindNodeVtk( pts[ 0 ]);
- }
-Index: FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_Downward.cpp
-===================================================================
---- FreeCAD-0.19.2.orig/src/3rdParty/salomesmesh/src/SMDS/SMDS_Downward.cpp
-+++ FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_Downward.cpp
-@@ -303,7 +303,7 @@ int SMDS_Down1D::getNodeSet(int cellId,
- void SMDS_Down1D::setNodes(int cellId, int vtkId)
- {
- vtkIdType npts = 0;
-- vtkIdType *pts; // will refer to the point id's of the face
-+ vtkIdTypePtr pts; // will refer to the point id's of the face
- _grid->GetCellPoints(vtkId, npts, pts);
- // MESSAGE(vtkId << " " << npts << " " << _nbDownCells);
- //ASSERT(npts == _nbDownCells);
-@@ -357,7 +357,7 @@ int SMDS_Down1D::computeVtkCells(int *pt
- {
- vtkIdType point = pts[i];
- int numCells = _grid->GetLinks()->GetNcells(point);
-- vtkIdType *cells = _grid->GetLinks()->GetCells(point);
-+ vtkIdTypePtr cells = _grid->GetLinks()->GetCells(point);
- for (int j = 0; j < numCells; j++)
- {
- int vtkCellId = cells[j];
-@@ -532,7 +532,7 @@ int SMDS_Down2D::computeVolumeIds(int ce
- // --- find point id's of the face
-
- vtkIdType npts = 0;
-- vtkIdType *pts; // will refer to the point id's of the face
-+ vtkIdTypePtr pts; // will refer to the point id's of the face
- _grid->GetCellPoints(cellId, npts, pts);
- vector<int> nodes;
- for (int i = 0; i < npts; i++)
-@@ -577,7 +577,7 @@ int SMDS_Down2D::computeVolumeIdsFromNod
- vtkIdType point = pts[i];
- int numCells = _grid->GetLinks()->GetNcells(point);
- //MESSAGE("cells pour " << i << " " << numCells);
-- vtkIdType *cells = _grid->GetLinks()->GetCells(point);
-+ vtkIdTypePtr cells = _grid->GetLinks()->GetCells(point);
- for (int j = 0; j < numCells; j++)
- {
- int vtkCellId = cells[j];
-@@ -627,7 +627,7 @@ int SMDS_Down2D::computeVolumeIdsFromNod
- void SMDS_Down2D::setTempNodes(int cellId, int vtkId)
- {
- vtkIdType npts = 0;
-- vtkIdType *pts; // will refer to the point id's of the face
-+ vtkIdTypePtr pts; // will refer to the point id's of the face
- _grid->GetCellPoints(vtkId, npts, pts);
- // MESSAGE(vtkId << " " << npts << " " << _nbNodes);
- //ASSERT(npts == _nbNodes);
-@@ -795,7 +795,7 @@ void SMDS_Down3D::getNodeIds(int cellId,
- {
- int vtkId = this->_vtkCellIds[cellId];
- vtkIdType npts = 0;
-- vtkIdType *nodes; // will refer to the point id's of the volume
-+ vtkIdTypePtr nodes; // will refer to the point id's of the volume
- _grid->GetCellPoints(vtkId, npts, nodes);
- for (int i = 0; i < npts; i++)
- nodeSet.insert(nodes[i]);
-@@ -1126,7 +1126,7 @@ void SMDS_DownTetra::getOrderedNodesOfFa
- //MESSAGE("cellId = " << cellId);
-
- vtkIdType npts = 0;
-- vtkIdType *nodes; // will refer to the point id's of the volume
-+ vtkIdTypePtr nodes; // will refer to the point id's of the volume
- _grid->GetCellPoints(this->_vtkCellIds[cellId], npts, nodes);
-
- set<int> tofind;
-@@ -1178,7 +1178,7 @@ void SMDS_DownTetra::computeFacesWithNod
- // --- find point id's of the volume
-
- vtkIdType npts = 0;
-- vtkIdType *nodes; // will refer to the point id's of the volume
-+ vtkIdTypePtr nodes; // will refer to the point id's of the volume
- _grid->GetCellPoints(cellId, npts, nodes);
-
- // --- create all the ordered list of node id's for each face
-@@ -1234,7 +1234,7 @@ void SMDS_DownQuadTetra::getOrderedNodes
- //MESSAGE("cellId = " << cellId);
-
- vtkIdType npts = 0;
-- vtkIdType *nodes; // will refer to the point id's of the volume
-+ vtkIdTypePtr nodes; // will refer to the point id's of the volume
- _grid->GetCellPoints(this->_vtkCellIds[cellId], npts, nodes);
-
- set<int> tofind;
-@@ -1288,7 +1288,7 @@ void SMDS_DownQuadTetra::computeFacesWit
- // --- find point id's of the volume
-
- vtkIdType npts = 0;
-- vtkIdType *nodes; // will refer to the point id's of the volume
-+ vtkIdTypePtr nodes; // will refer to the point id's of the volume
- _grid->GetCellPoints(cellId, npts, nodes);
-
- // --- create all the ordered list of node id's for each face
-@@ -1357,7 +1357,7 @@ void SMDS_DownPyramid::getOrderedNodesOf
- //MESSAGE("cellId = " << cellId);
-
- vtkIdType npts = 0;
-- vtkIdType *nodes; // will refer to the point id's of the volume
-+ vtkIdTypePtr nodes; // will refer to the point id's of the volume
- _grid->GetCellPoints(this->_vtkCellIds[cellId], npts, nodes);
-
- set<int> tofind;
-@@ -1435,7 +1435,7 @@ void SMDS_DownPyramid::computeFacesWithN
- // --- find point id's of the volume
-
- vtkIdType npts = 0;
-- vtkIdType *nodes; // will refer to the point id's of the volume
-+ vtkIdTypePtr nodes; // will refer to the point id's of the volume
- _grid->GetCellPoints(cellId, npts, nodes);
-
- // --- create all the ordered list of node id's for each face
-@@ -1500,7 +1500,7 @@ void SMDS_DownQuadPyramid::getOrderedNod
- //MESSAGE("cellId = " << cellId);
-
- vtkIdType npts = 0;
-- vtkIdType *nodes; // will refer to the point id's of the volume
-+ vtkIdTypePtr nodes; // will refer to the point id's of the volume
- _grid->GetCellPoints(this->_vtkCellIds[cellId], npts, nodes);
-
- set<int> tofind;
-@@ -1580,7 +1580,7 @@ void SMDS_DownQuadPyramid::computeFacesW
- // --- find point id's of the volume
-
- vtkIdType npts = 0;
-- vtkIdType *nodes; // will refer to the point id's of the volume
-+ vtkIdTypePtr nodes; // will refer to the point id's of the volume
- _grid->GetCellPoints(cellId, npts, nodes);
-
- // --- create all the ordered list of node id's for each face
-@@ -1660,7 +1660,7 @@ void SMDS_DownPenta::getOrderedNodesOfFa
- //MESSAGE("cellId = " << cellId);
-
- vtkIdType npts = 0;
-- vtkIdType *nodes; // will refer to the point id's of the volume
-+ vtkIdTypePtr nodes; // will refer to the point id's of the volume
- _grid->GetCellPoints(this->_vtkCellIds[cellId], npts, nodes);
-
- set<int> tofind;
-@@ -1744,7 +1744,7 @@ void SMDS_DownPenta::computeFacesWithNod
- // --- find point id's of the volume
-
- vtkIdType npts = 0;
-- vtkIdType *nodes; // will refer to the point id's of the volume
-+ vtkIdTypePtr nodes; // will refer to the point id's of the volume
- _grid->GetCellPoints(cellId, npts, nodes);
-
- // --- create all the ordered list of node id's for each face
-@@ -1810,7 +1810,7 @@ void SMDS_DownQuadPenta::getOrderedNodes
- //MESSAGE("cellId = " << cellId);
-
- vtkIdType npts = 0;
-- vtkIdType *nodes; // will refer to the point id's of the volume
-+ vtkIdTypePtr nodes; // will refer to the point id's of the volume
- _grid->GetCellPoints(this->_vtkCellIds[cellId], npts, nodes);
-
- set<int> tofind;
-@@ -1896,7 +1896,7 @@ void SMDS_DownQuadPenta::computeFacesWit
- // --- find point id's of the volume
-
- vtkIdType npts = 0;
-- vtkIdType *nodes; // will refer to the point id's of the volume
-+ vtkIdTypePtr nodes; // will refer to the point id's of the volume
- _grid->GetCellPoints(cellId, npts, nodes);
-
- // --- create all the ordered list of node id's for each face
-@@ -1981,7 +1981,7 @@ void SMDS_DownHexa::getOrderedNodesOfFac
- //MESSAGE("cellId = " << cellId);
-
- vtkIdType npts = 0;
-- vtkIdType *nodes; // will refer to the point id's of the volume
-+ vtkIdTypePtr nodes; // will refer to the point id's of the volume
- _grid->GetCellPoints(this->_vtkCellIds[cellId], npts, nodes);
-
- set<int> tofind;
-@@ -2036,7 +2036,7 @@ void SMDS_DownHexa::computeFacesWithNode
- // --- find point id's of the volume
-
- vtkIdType npts = 0;
-- vtkIdType *nodes; // will refer to the point id's of the volume
-+ vtkIdTypePtr nodes; // will refer to the point id's of the volume
- _grid->GetCellPoints(cellId, npts, nodes);
-
- // --- create all the ordered list of node id's for each face
-@@ -2112,7 +2112,7 @@ void SMDS_DownQuadHexa::getOrderedNodesO
- //MESSAGE("cellId = " << cellId);
-
- vtkIdType npts = 0;
-- vtkIdType *nodes; // will refer to the point id's of the volume
-+ vtkIdTypePtr nodes; // will refer to the point id's of the volume
- _grid->GetCellPoints(this->_vtkCellIds[cellId], npts, nodes);
-
- set<int> tofind;
-@@ -2167,7 +2167,7 @@ void SMDS_DownQuadHexa::computeFacesWith
- // --- find point id's of the volume
-
- vtkIdType npts = 0;
-- vtkIdType *nodes; // will refer to the point id's of the volume
-+ vtkIdTypePtr nodes; // will refer to the point id's of the volume
- _grid->GetCellPoints(cellId, npts, nodes);
-
- // --- create all the ordered list of node id's for each face
-Index: FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
-===================================================================
---- FreeCAD-0.19.2.orig/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
-+++ FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
-@@ -4768,7 +4768,11 @@ void SMDS_Mesh::dumpGrid(string ficdump)
- ficcon << endl;
- }
- ficcon << "-------------------------------- connectivity " << nbPoints << endl;
-- vtkCellLinks *links = myGrid->GetCellLinks();
-+#ifdef VTK_CELL_ARRAY_V2
-+ vtkCellLinks *links = static_cast<vtkCellLinks*>(myGrid->GetCellLinks());
-+#else
-+ vtkCellLinks *links = myGrid->GetCellLinks();
-+#endif
- for (int i=0; i<nbPoints; i++)
- {
- int ncells = links->GetNcells(i);
-Index: FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh0DElement.cpp
-===================================================================
---- FreeCAD-0.19.2.orig/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh0DElement.cpp
-+++ FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh0DElement.cpp
-@@ -146,6 +146,17 @@ bool SMDS_Mesh0DElement::ChangeNodes(con
- if ( nbNodes == 1 )
- {
- vtkUnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid();
-+#ifdef VTK_CELL_ARRAY_V2
-+ vtkNew<vtkIdList> cellPoints;
-+ grid->GetCellPoints(myVtkID, cellPoints.GetPointer());
-+ if (nbNodes != cellPoints->GetNumberOfIds())
-+ {
-+ MESSAGE("ChangeNodes problem: not the same number of nodes " << cellPoints->GetNumberOfIds() << " -> " << nbNodes);
-+ return false;
-+ }
-+ myNode = nodes[0];
-+ cellPoints->SetId(0, myNode->getVtkId());
-+#else
- vtkIdType npts = 0;
- vtkIdType* pts = 0;
- grid->GetCellPoints(myVtkID, npts, pts);
-@@ -156,6 +167,7 @@ bool SMDS_Mesh0DElement::ChangeNodes(con
- }
- myNode = nodes[0];
- pts[0] = myNode->getVtkId();
-+#endif
-
- SMDS_Mesh::_meshList[myMeshId]->setMyModified();
- return true;
-Index: FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_MeshNode.cpp
-===================================================================
---- FreeCAD-0.19.2.orig/src/3rdParty/salomesmesh/src/SMDS/SMDS_MeshNode.cpp
-+++ FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_MeshNode.cpp
-@@ -191,7 +191,7 @@ public:
- SMDS_ElemIteratorPtr SMDS_MeshNode::
- GetInverseElementIterator(SMDSAbs_ElementType type) const
- {
-- vtkCellLinks::Link l = SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks()->GetLink(myVtkID);
-+ vtkCellLinks::Link l = static_cast<vtkCellLinks*>(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks())->GetLink(myVtkID);
- //MESSAGE("myID " << myID << " ncells " << l.ncells);
- return SMDS_ElemIteratorPtr(new SMDS_MeshNode_MyInvIterator(SMDS_Mesh::_meshList[myMeshId], l.cells, l.ncells, type));
- }
-@@ -251,7 +251,7 @@ elementsIterator(SMDSAbs_ElementType typ
- return SMDS_MeshElement::elementsIterator(SMDSAbs_Node);
- else
- {
-- vtkCellLinks::Link l = SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks()->GetLink(myVtkID);
-+ vtkCellLinks::Link l = static_cast<vtkCellLinks*>(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks())->GetLink(myVtkID);
- return SMDS_ElemIteratorPtr(new SMDS_MeshNode_MyIterator(SMDS_Mesh::_meshList[myMeshId], l.cells, l.ncells, type));
- }
- }
-@@ -350,7 +350,7 @@ void SMDS_MeshNode::AddInverseElement(co
- const SMDS_MeshCell *cell = dynamic_cast<const SMDS_MeshCell*> (ME);
- assert(cell);
- SMDS_UnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid();
-- vtkCellLinks *Links = grid->GetCellLinks();
-+ vtkCellLinks *Links = static_cast<vtkCellLinks*>(grid->GetCellLinks());
- Links->ResizeCellList(myVtkID, 1);
- Links->AddCellReference(cell->getVtkId(), myVtkID);
- }
-@@ -366,7 +366,7 @@ void SMDS_MeshNode::ClearInverseElements
-
- bool SMDS_MeshNode::emptyInverseElements()
- {
-- vtkCellLinks::Link l = SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks()->GetLink(myVtkID);
-+ vtkCellLinks::Link l = static_cast<vtkCellLinks*>(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks())->GetLink(myVtkID);
- return (l.ncells == 0);
- }
-
-@@ -378,7 +378,7 @@ bool SMDS_MeshNode::emptyInverseElements
-
- int SMDS_MeshNode::NbInverseElements(SMDSAbs_ElementType type) const
- {
-- vtkCellLinks::Link l = SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks()->GetLink(myVtkID);
-+ vtkCellLinks::Link l = static_cast<vtkCellLinks*>(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks())->GetLink(myVtkID);
-
- if ( type == SMDSAbs_All )
- return l.ncells;
-Index: FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
-===================================================================
---- FreeCAD-0.19.2.orig/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
-+++ FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
-@@ -139,8 +139,8 @@ int SMDS_UnstructuredGrid::InsertNextLin
- for (; it != setOfNodes.end(); ++it)
- {
- //MESSAGE("reverse link for node " << *it << " cell " << cellid);
-- this->Links->ResizeCellList(*it, 1);
-- this->Links->AddCellReference(cellid, *it);
-+ this->GetLinks()->ResizeCellList(*it, 1);
-+ this->GetLinks()->AddCellReference(cellid, *it);
- }
-
- return cellid;
-@@ -332,9 +332,13 @@ void SMDS_UnstructuredGrid::copyBloc(vtk
- {
- newTypes->SetValue(alreadyCopied, this->Types->GetValue(j));
- idCellsOldToNew[j] = alreadyCopied; // old vtkId --> new vtkId
-+#ifdef VTK_CELL_ARRAY_V2
-+ vtkIdType oldLoc = this->GetCellLocationsArray()->GetValue(j);
-+#else
- vtkIdType oldLoc = this->Locations->GetValue(j);
-+#endif
- vtkIdType nbpts;
-- vtkIdType *oldPtsCell = 0;
-+ vtkIdTypePtr oldPtsCell = 0;
- this->Connectivity->GetCell(oldLoc, nbpts, oldPtsCell);
- assert(nbpts < NBMAXNODESINCELL);
- //MESSAGE(j << " " << alreadyCopied << " " << (int)this->Types->GetValue(j) << " " << oldLoc << " " << nbpts );
-@@ -952,6 +956,21 @@ void SMDS_UnstructuredGrid::GetNodeIds(s
- */
- void SMDS_UnstructuredGrid::ModifyCellNodes(int vtkVolId, std::map<int, int> localClonedNodeIds)
- {
-+#ifdef VTK_CELL_ARRAY_V2
-+ vtkNew<vtkIdList> cellPoints;
-+ this->GetCellPoints(vtkVolId, cellPoints.GetPointer());
-+ for (vtkIdType i = 0; i < cellPoints->GetNumberOfIds(); i++)
-+ {
-+ if (localClonedNodeIds.count(cellPoints->GetId(i)))
-+ {
-+ vtkIdType oldpt = cellPoints->GetId(i);
-+ cellPoints->SetId(i, localClonedNodeIds[oldpt]);
-+ //MESSAGE(oldpt << " --> " << pts[i]);
-+ //this->RemoveReferenceToCell(oldpt, vtkVolId);
-+ //this->AddReferenceToCell(pts[i], vtkVolId);
-+ }
-+ }
-+#else
- vtkIdType npts = 0;
- vtkIdType *pts; // will refer to the point id's of the face
- this->GetCellPoints(vtkVolId, npts, pts);
-@@ -966,6 +985,7 @@ void SMDS_UnstructuredGrid::ModifyCellNo
- //this->AddReferenceToCell(pts[i], vtkVolId);
- }
- }
-+#endif
- }
-
- /*! reorder the nodes of a face
-@@ -995,11 +1015,20 @@ void SMDS_UnstructuredGrid::BuildLinks()
- this->Links->UnRegister(this);
- }
-
-+#ifdef VTK_CELL_ARRAY_V2
-+ this->Links = SMDS_CellLinks::New();
-+ GetLinks()->Allocate(this->GetNumberOfPoints());
-+ GetLinks()->Register(this);
-+//FIXME: vtk9
-+ GetLinks()->BuildLinks(this);
-+ GetLinks()->Delete();
-+#else
- this->Links = SMDS_CellLinks::New();
- this->Links->Allocate(this->GetNumberOfPoints());
- this->Links->Register(this);
- this->Links->BuildLinks(this, this->Connectivity);
- this->Links->Delete();
-+#endif
- }
-
- /*! Create a volume (prism or hexahedron) by duplication of a face.
-Index: FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkCellIterator.cpp
-===================================================================
---- FreeCAD-0.19.2.orig/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkCellIterator.cpp
-+++ FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkCellIterator.cpp
-@@ -33,7 +33,8 @@ SMDS_VtkCellIterator::SMDS_VtkCellIterat
- }
- else
- {
-- vtkIdType npts, *pts;
-+ vtkIdType npts;
-+ vtkIdTypePtr pts;
- grid->GetCellPoints( _cellId, npts, pts );
- _vtkIdList->SetNumberOfIds( _nbNodes = npts );
- for (int i = 0; i < _nbNodes; i++)
-@@ -67,7 +68,7 @@ SMDS_VtkCellIteratorToUNV::SMDS_VtkCellI
- //MESSAGE("SMDS_VtkCellInterlacedIterator (UNV)" << _type);
-
- _vtkIdList = vtkIdList::New();
-- vtkIdType* pts;
-+ vtkIdTypePtr pts;
- vtkIdType npts;
- vtkUnstructuredGrid* grid = _mesh->getGrid();
- grid->GetCellPoints((vtkIdType)_cellId, npts, pts);
-@@ -182,7 +183,7 @@ SMDS_VtkCellIteratorPolyH::SMDS_VtkCellI
- {
- //MESSAGE("SMDS_VtkCellIterator Polyhedra");
- vtkIdType nFaces = 0;
-- vtkIdType* ptIds = 0;
-+ vtkIdTypePtr ptIds = 0;
- grid->GetFaceStream(_cellId, nFaces, ptIds);
- int id = 0;
- _nbNodesInFaces = 0;
-Index: FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkEdge.cpp
-===================================================================
---- FreeCAD-0.19.2.orig/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkEdge.cpp
-+++ FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkEdge.cpp
-@@ -67,6 +67,19 @@ bool SMDS_VtkEdge::ChangeNodes(const SMD
- bool SMDS_VtkEdge::ChangeNodes(const SMDS_MeshNode* nodes[], const int nbNodes)
- {
- vtkUnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid();
-+#ifdef VTK_CELL_ARRAY_V2
-+ vtkNew<vtkIdList> cellPoints;
-+ grid->GetCellPoints(myVtkID, cellPoints.GetPointer());
-+ if (nbNodes != cellPoints->GetNumberOfIds())
-+ {
-+ MESSAGE("ChangeNodes problem: not the same number of nodes " << cellPoints->GetNumberOfIds() << " -> " << nbNodes);
-+ return false;
-+ }
-+ for (int i = 0; i < nbNodes; i++)
-+ {
-+ cellPoints->SetId(i, nodes[i]->getVtkId());
-+ }
-+#else
- vtkIdType npts = 0;
- vtkIdType* pts = 0;
- grid->GetCellPoints(myVtkID, npts, pts);
-@@ -79,6 +92,7 @@ bool SMDS_VtkEdge::ChangeNodes(const SMD
- {
- pts[i] = nodes[i]->getVtkId();
- }
-+#endif
- SMDS_Mesh::_meshList[myMeshId]->setMyModified();
- return true;
- }
-@@ -87,7 +101,7 @@ bool SMDS_VtkEdge::IsMediumNode(const SM
- {
- vtkUnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid();
- vtkIdType npts = 0;
-- vtkIdType* pts = 0;
-+ vtkIdTypePtr pts = 0;
- grid->GetCellPoints(myVtkID, npts, pts);
- //MESSAGE("IsMediumNode " << npts << " " << (node->getVtkId() == pts[npts-1]));
- return ((npts == 3) && (node->getVtkId() == pts[2]));
-@@ -137,7 +151,8 @@ const SMDS_MeshNode*
- SMDS_VtkEdge::GetNode(const int ind) const
- {
- vtkUnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid();
-- vtkIdType npts, *pts;
-+ vtkIdType npts;
-+ vtkIdTypePtr pts;
- grid->GetCellPoints( this->myVtkID, npts, pts );
- return SMDS_Mesh::_meshList[myMeshId]->FindNodeVtk( pts[ ind ]);
- }
-Index: FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkFace.cpp
-===================================================================
---- FreeCAD-0.19.2.orig/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkFace.cpp
-+++ FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkFace.cpp
-@@ -101,6 +101,19 @@ void SMDS_VtkFace::initQuadPoly(const st
- bool SMDS_VtkFace::ChangeNodes(const SMDS_MeshNode* nodes[], const int nbNodes)
- {
- vtkUnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid();
-+#ifdef VTK_CELL_ARRAY_V2
-+ vtkNew<vtkIdList> cellPoints;
-+ grid->GetCellPoints(myVtkID, cellPoints.GetPointer());
-+ if (nbNodes != cellPoints->GetNumberOfIds())
-+ {
-+ MESSAGE("ChangeNodes problem: not the same number of nodes " << cellPoints->GetNumberOfIds() << " -> " << nbNodes);
-+ return false;
-+ }
-+ for (int i = 0; i < nbNodes; i++)
-+ {
-+ cellPoints->SetId(i, nodes[i]->getVtkId());
-+ }
-+#else
- vtkIdType npts = 0;
- vtkIdType* pts = 0;
- grid->GetCellPoints(myVtkID, npts, pts);
-@@ -113,6 +126,7 @@ bool SMDS_VtkFace::ChangeNodes(const SMD
- {
- pts[i] = nodes[i]->getVtkId();
- }
-+#endif
- SMDS_Mesh::_meshList[myMeshId]->setMyModified();
- return true;
- }
-@@ -173,7 +187,8 @@ const SMDS_MeshNode*
- SMDS_VtkFace::GetNode(const int ind) const
- {
- vtkUnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid();
-- vtkIdType npts, *pts;
-+ vtkIdType npts;
-+ vtkIdTypePtr pts;
- grid->GetCellPoints( this->myVtkID, npts, pts );
- return SMDS_Mesh::_meshList[myMeshId]->FindNodeVtk( pts[ ind ]);
- }
-@@ -186,7 +201,8 @@ SMDS_VtkFace::GetNode(const int ind) con
- int SMDS_VtkFace::GetNodeIndex( const SMDS_MeshNode* node ) const
- {
- vtkUnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid();
-- vtkIdType npts, *pts;
-+ vtkIdType npts;
-+ vtkIdTypePtr pts;
- grid->GetCellPoints( this->myVtkID, npts, pts );
- for ( vtkIdType i = 0; i < npts; ++i )
- if ( pts[i] == node->getVtkId() )
-@@ -251,7 +267,7 @@ bool SMDS_VtkFace::IsMediumNode(const SM
- return false;
- }
- vtkIdType npts = 0;
-- vtkIdType* pts = 0;
-+ vtkIdTypePtr pts = 0;
- grid->GetCellPoints(myVtkID, npts, pts);
- vtkIdType nodeId = node->getVtkId();
- for (int rank = 0; rank < npts; rank++)
-@@ -356,11 +372,18 @@ SMDS_NodeIteratorPtr SMDS_VtkFace::inter
- void SMDS_VtkFace::ChangeApex(SMDS_MeshNode* node)
- {
- vtkUnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid();
-+#ifdef VTK_CELL_ARRAY_V2
-+ vtkNew<vtkIdList> cellPoints;
-+ grid->GetCellPoints(myVtkID, cellPoints.GetPointer());
-+ grid->RemoveReferenceToCell(cellPoints->GetId(0), myVtkID);
-+ cellPoints->SetId(0, node->getVtkId());
-+#else
- vtkIdType npts = 0;
- vtkIdType* pts = 0;
- grid->GetCellPoints(myVtkID, npts, pts);
- grid->RemoveReferenceToCell(pts[0], myVtkID);
- pts[0] = node->getVtkId();
-+#endif
- node->AddInverseElement(this),
- SMDS_Mesh::_meshList[myMeshId]->setMyModified();
- }
-Index: FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkVolume.cpp
-===================================================================
---- FreeCAD-0.19.2.orig/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkVolume.cpp
-+++ FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkVolume.cpp
-@@ -133,6 +133,19 @@ void SMDS_VtkVolume::initPoly(const std:
- bool SMDS_VtkVolume::ChangeNodes(const SMDS_MeshNode* nodes[], const int nbNodes)
- {
- vtkUnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid();
-+#ifdef VTK_CELL_ARRAY_V2
-+ vtkNew<vtkIdList> cellPoints;
-+ grid->GetCellPoints(myVtkID, cellPoints.GetPointer());
-+ if (nbNodes != cellPoints->GetNumberOfIds())
-+ {
-+ MESSAGE("ChangeNodes problem: not the same number of nodes " << cellPoints->GetNumberOfIds() << " -> " << nbNodes);
-+ return false;
-+ }
-+ for (int i = 0; i < nbNodes; i++)
-+ {
-+ cellPoints->SetId(i, nodes[i]->getVtkId());
-+ }
-+#else
- vtkIdType npts = 0;
- vtkIdType* pts = 0;
- grid->GetCellPoints(myVtkID, npts, pts);
-@@ -145,6 +158,7 @@ bool SMDS_VtkVolume::ChangeNodes(const S
- {
- pts[i] = nodes[i]->getVtkId();
- }
-+#endif
- SMDS_Mesh::_meshList[myMeshId]->setMyModified();
- return true;
- }
-@@ -207,7 +221,7 @@ int SMDS_VtkVolume::NbFaces() const
- case VTK_POLYHEDRON:
- {
- vtkIdType nFaces = 0;
-- vtkIdType* ptIds = 0;
-+ vtkIdTypePtr ptIds = 0;
- grid->GetFaceStream(this->myVtkID, nFaces, ptIds);
- nbFaces = nFaces;
- break;
-@@ -236,7 +250,7 @@ int SMDS_VtkVolume::NbNodes() const
- else
- {
- vtkIdType nFaces = 0;
-- vtkIdType* ptIds = 0;
-+ vtkIdTypePtr ptIds = 0;
- grid->GetFaceStream(this->myVtkID, nFaces, ptIds);
- int id = 0;
- for (int i = 0; i < nFaces; i++)
-@@ -276,7 +290,7 @@ int SMDS_VtkVolume::NbEdges() const
- case VTK_POLYHEDRON:
- {
- vtkIdType nFaces = 0;
-- vtkIdType* ptIds = 0;
-+ vtkIdTypePtr ptIds = 0;
- grid->GetFaceStream(this->myVtkID, nFaces, ptIds);
- nbEdges = 0;
- int id = 0;
-@@ -312,7 +326,7 @@ int SMDS_VtkVolume::NbFaceNodes(const in
- if (aVtkType == VTK_POLYHEDRON)
- {
- vtkIdType nFaces = 0;
-- vtkIdType* ptIds = 0;
-+ vtkIdTypePtr ptIds = 0;
- grid->GetFaceStream(this->myVtkID, nFaces, ptIds);
- int id = 0;
- for (int i = 0; i < nFaces; i++)
-@@ -342,7 +356,7 @@ const SMDS_MeshNode* SMDS_VtkVolume::Get
- if (aVtkType == VTK_POLYHEDRON)
- {
- vtkIdType nFaces = 0;
-- vtkIdType* ptIds = 0;
-+ vtkIdTypePtr ptIds = 0;
- grid->GetFaceStream(this->myVtkID, nFaces, ptIds);
- int id = 0;
- for (int i = 0; i < nFaces; i++)
-@@ -372,7 +386,7 @@ std::vector<int> SMDS_VtkVolume::GetQuan
- if (aVtkType == VTK_POLYHEDRON)
- {
- vtkIdType nFaces = 0;
-- vtkIdType* ptIds = 0;
-+ vtkIdTypePtr ptIds = 0;
- grid->GetFaceStream(this->myVtkID, nFaces, ptIds);
- int id = 0;
- for (int i = 0; i < nFaces; i++)
-@@ -430,7 +444,7 @@ const SMDS_MeshNode* SMDS_VtkVolume::Get
- if ( aVtkType == VTK_POLYHEDRON)
- {
- vtkIdType nFaces = 0;
-- vtkIdType* ptIds = 0;
-+ vtkIdTypePtr ptIds = 0;
- grid->GetFaceStream(this->myVtkID, nFaces, ptIds);
- int id = 0, nbPoints = 0;
- for (int i = 0; i < nFaces; i++)
-@@ -443,7 +457,8 @@ const SMDS_MeshNode* SMDS_VtkVolume::Get
- }
- return 0;
- }
-- vtkIdType npts, *pts;
-+ vtkIdType npts;
-+ vtkIdTypePtr pts;
- grid->GetCellPoints( this->myVtkID, npts, pts );
- const std::vector<int>& interlace = SMDS_MeshCell::fromVtkOrder( VTKCellType( aVtkType ));
- return SMDS_Mesh::_meshList[myMeshId]->FindNodeVtk( pts[ interlace.empty() ? ind : interlace[ind]] );
-@@ -460,7 +475,7 @@ int SMDS_VtkVolume::GetNodeIndex( const
- if ( aVtkType == VTK_POLYHEDRON)
- {
- vtkIdType nFaces = 0;
-- vtkIdType* ptIds = 0;
-+ vtkIdTypePtr ptIds = 0;
- grid->GetFaceStream(this->myVtkID, nFaces, ptIds);
- int id = 0;
- for (int iF = 0; iF < nFaces; iF++)
-@@ -473,7 +488,8 @@ int SMDS_VtkVolume::GetNodeIndex( const
- }
- return -1;
- }
-- vtkIdType npts, *pts;
-+ vtkIdType npts;
-+ vtkIdTypePtr pts;
- grid->GetCellPoints( this->myVtkID, npts, pts );
- for ( vtkIdType i = 0; i < npts; ++i )
- if ( pts[i] == node->getVtkId() )
-@@ -534,7 +550,7 @@ bool SMDS_VtkVolume::IsMediumNode(const
- return false;
- }
- vtkIdType npts = 0;
-- vtkIdType* pts = 0;
-+ vtkIdTypePtr pts = 0;
- grid->GetCellPoints(myVtkID, npts, pts);
- vtkIdType nodeId = node->getVtkId();
- for (int rank = 0; rank < npts; rank++)
-Index: FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp
-===================================================================
---- FreeCAD-0.19.2.orig/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp
-+++ FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp
-@@ -11348,7 +11348,7 @@ bool SMESH_MeshEditor::DoubleNodesOnGrou
- {
- int oldId = *itn;
- //MESSAGE(" node " << oldId);
-- vtkCellLinks::Link l = grid->GetCellLinks()->GetLink(oldId);
-+ vtkCellLinks::Link l = static_cast<vtkCellLinks*>(grid->GetCellLinks())->GetLink(oldId);
- for (int i=0; i<l.ncells; i++)
- {
- int vtkId = l.cells[i];
-@@ -11527,7 +11527,7 @@ bool SMESH_MeshEditor::DoubleNodesOnGrou
- //MESSAGE(" domain " << idom << " volume " << elem->GetID());
- double values[3];
- vtkIdType npts = 0;
-- vtkIdType* pts = 0;
-+ vtkIdTypePtr pts = 0;
- grid->GetCellPoints(vtkVolIds[ivol], npts, pts);
- SMDS_VtkVolume::gravityCenter(grid, pts, npts, values);
- if (id ==0)
-@@ -11708,7 +11708,7 @@ bool SMESH_MeshEditor::DoubleNodesOnGrou
- {
- int oldId = itnod->first;
- //MESSAGE(" node " << oldId);
-- vtkCellLinks::Link l = grid->GetCellLinks()->GetLink(oldId);
-+ vtkCellLinks::Link l = static_cast<vtkCellLinks*>(grid->GetCellLinks())->GetLink(oldId);
- for (int i = 0; i < l.ncells; i++)
- {
- int vtkId = l.cells[i];
-@@ -12165,7 +12165,7 @@ void SMESH_MeshEditor::CreateHoleSkin(do
- MESSAGE("volume to check, vtkId " << vtkId << " smdsId " << meshDS->fromVtkToSmds(vtkId));
- bool volInside = false;
- vtkIdType npts = 0;
-- vtkIdType* pts = 0;
-+ vtkIdTypePtr pts = 0;
- grid->GetCellPoints(vtkId, npts, pts);
- for (int i=0; i<npts; i++)
- {
-Index: FreeCAD-0.19.2/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp
-===================================================================
---- FreeCAD-0.19.2.orig/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp
-+++ FreeCAD-0.19.2/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp
-@@ -20,7 +20,6 @@
- * *
- ***************************************************************************/
-
--
- #include "PreCompiled.h"
-
- #ifndef _PreComp_
diff --git a/freecad.spec b/freecad.spec
index c26094d..e2c5e1c 100644
--- a/freecad.spec
+++ b/freecad.spec
@@ -20,8 +20,8 @@
Name: freecad
Epoch: 1
-Version: 0.20
-Release: 2%{?dist}
+Version: 0.20.1
+Release: 1%{?dist}
Summary: A general purpose 3D CAD modeler
License: GPLv2+
@@ -30,16 +30,7 @@ Source0: https://github.com/FreeCAD/FreeCAD/archive/%{version}%{?pre:_pre
#Source0: https://github.com/FreeCAD/FreeCAD/archive/%{commit}/FreeCAD-%{version}.%...
Source102: freecad.1
-#Patch0: freecad-0.15-zipios.patch
-#Patch1: freecad-0.14-Version_h.patch
-Patch2: freecad-unbundled-pycxx.patch
-#Patch3: freecad-vtk9.patch
-#Patch4: freecad-boost.patch
-#Patch5: 4916.patch
-Patch6: freecad-memory_h.patch
-# Python 3.11 compatibility patches
-Patch7: https://github.com/FreeCAD/FreeCAD/commit/1ae55905ba.patch
-Patch8: https://github.com/FreeCAD/FreeCAD/commit/6820e0a9ec.patch
+Patch0: freecad-unbundled-pycxx.patch
# Utilities
BuildRequires: cmake gcc-c++ gettext dos2unix
@@ -245,6 +236,9 @@ desktop-file-validate \
%changelog
+* Tue Aug 09 2022 Richard Shaw <hobbes1069(a)gmail.com> - 1:0.20.1-1
+- Update to 0.20.1.
+
* Thu Jul 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:0.20-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
diff --git a/sources b/sources
index d1359b4..ee8b846 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (FreeCAD-0.20.tar.gz) = b1d91efa873f180bf635f6006d6c4b7a33b64b630955c639fe923bb340ce8104474688e05eea151d1ac1557388947ae81618cfc8a578f14706aa07b5cdc45cda
+SHA512 (FreeCAD-0.20.1.tar.gz) = 4e4422cfb4f887f5d501b24b8af8efa1428b91e20ff87257f361e86a7328f3fc53b4a8b00f93b911b73cb2a31d6951e12f53561ef9e83a9b0c5987eb4b0dbb02
commit 6f32db7766a58ca463294209befcaeaed6a79e28
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jul 21 03:33:49 2022 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/freecad.spec b/freecad.spec
index abdbad6..c26094d 100644
--- a/freecad.spec
+++ b/freecad.spec
@@ -21,7 +21,7 @@
Name: freecad
Epoch: 1
Version: 0.20
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A general purpose 3D CAD modeler
License: GPLv2+
@@ -245,6 +245,9 @@ desktop-file-validate \
%changelog
+* Thu Jul 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:0.20-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
* Wed Jun 29 2022 Richard Shaw <hobbes1069(a)gmail.com> - 1:0.20-1
- Update to 0.20.
1 year, 10 months
Architecture specific change in rpms/rust-backtrace.git
by githook-noreply@fedoraproject.org
The package rpms/rust-backtrace.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-backtrace.git/commit/?id=689....
Change:
-%ifarch %{ix86} ppc64le aarch64 s390x
Thanks.
Full change:
============
commit 68934b7e90d35c117420eca14563ee34d3aaeee6
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Tue Aug 9 14:34:59 2022 +0200
Update to version 0.3.66; Fixes RHBZ#2076300
diff --git a/.gitignore b/.gitignore
index d49e300..a9e1a78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@
/backtrace-0.3.59.crate
/backtrace-0.3.61.crate
/backtrace-0.3.64.crate
+/backtrace-0.3.66.crate
diff --git a/backtrace-fix-metadata-auto.diff b/backtrace-fix-metadata-auto.diff
new file mode 100644
index 0000000..8341996
--- /dev/null
+++ b/backtrace-fix-metadata-auto.diff
@@ -0,0 +1,21 @@
+--- backtrace-0.3.66/Cargo.toml 1970-01-01T00:00:01+00:00
++++ backtrace-0.3.66/Cargo.toml 1970-01-01T00:00:01+00:00
+@@ -121,18 +121,5 @@
+ std = []
+ unix-backtrace = []
+ verify-winapi = [
+- "winapi/dbghelp",
+- "winapi/handleapi",
+- "winapi/libloaderapi",
+- "winapi/memoryapi",
+- "winapi/minwindef",
+- "winapi/processthreadsapi",
+- "winapi/synchapi",
+- "winapi/tlhelp32",
+- "winapi/winbase",
+- "winapi/winnt",
+ ]
+
+-[target."cfg(windows)".dependencies.winapi]
+-version = "0.3.9"
+-optional = true
diff --git a/backtrace-fix-metadata.diff b/backtrace-fix-metadata.diff
index 504279f..4981696 100644
--- a/backtrace-fix-metadata.diff
+++ b/backtrace-fix-metadata.diff
@@ -1,6 +1,14 @@
---- backtrace-0.3.64/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ backtrace-0.3.64/Cargo.toml 2022-02-03T14:55:24.935091+00:00
-@@ -42,11 +42,6 @@
+--- backtrace-0.3.66/Cargo.toml 1970-01-01T00:00:01+00:00
++++ backtrace-0.3.66/Cargo.toml 2022-08-09T09:33:39.983784+00:00
+@@ -25,6 +25,7 @@
+ readme = "README.md"
+ license = "MIT/Apache-2.0"
+ repository = "https://github.com/rust-lang/backtrace-rs"
++exclude = ["/ci/"]
+
+ [[example]]
+ name = "backtrace"
+@@ -44,11 +45,6 @@
[[test]]
name = "smoke"
@@ -12,23 +20,3 @@
required-features = ["std"]
edition = "2018"
-@@ -96,19 +91,9 @@
- version = "1.0.67"
-
- [features]
--coresymbolication = []
--dbghelp = []
- default = ["std"]
--dladdr = []
- gimli-symbolize = []
--kernel32 = []
- libbacktrace = []
--libunwind = []
- serialize-rustc = ["rustc-serialize"]
- serialize-serde = ["serde"]
- std = []
--unix-backtrace = []
--verify-winapi = ["winapi/dbghelp", "winapi/handleapi", "winapi/libloaderapi", "winapi/memoryapi", "winapi/minwindef", "winapi/processthreadsapi", "winapi/synchapi", "winapi/tlhelp32", "winapi/winbase", "winapi/winnt"]
--[target."cfg(windows)".dependencies.winapi]
--version = "0.3.9"
--optional = true
diff --git a/rust-backtrace.spec b/rust-backtrace.spec
index e92677d..8a4c24a 100644
--- a/rust-backtrace.spec
+++ b/rust-backtrace.spec
@@ -1,26 +1,28 @@
-# Generated by rust2rpm 20
+# Generated by rust2rpm 22
%bcond_without check
%global debug_package %{nil}
%global crate backtrace
-Name: rust-%{crate}
-Version: 0.3.64
+Name: rust-backtrace
+Version: 0.3.66
Release: %autorelease
Summary: Library to acquire a stack trace (backtrace) at runtime in a Rust program
# Upstream license specification: MIT/Apache-2.0
-License: MIT or ASL 2.0
+License: MIT OR Apache-2.0
URL: https://crates.io/crates/backtrace
Source: %{crates_source}
-# Initial patched metadata
-# * Drop windows-specific dependencies and features
-# * Drop deprecated/internal features
-Patch0: backtrace-fix-metadata.diff
+# Automatically generated patch to strip foreign dependencies
+Patch: backtrace-fix-metadata-auto.diff
+# Manually created patch for downstream crate metadata changes
+# * drop accuracy test (requires crates to be built in dylib mode)
+# * exclude files for upstream CI
+Patch: backtrace-fix-metadata.diff
ExclusiveArch: %{rust_arches}
-BuildRequires: rust-packaging
+BuildRequires: rust-packaging >= 21
%global _description %{expand:
Library to acquire a stack trace (backtrace) at runtime in a Rust program.}
@@ -37,10 +39,10 @@ This package contains library source intended for building other packages which
use the "%{crate}" crate.
%files devel
-%license LICENSE-APACHE LICENSE-MIT
-%doc README.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
-%exclude %{cargo_registry}/%{crate}-%{version_no_tilde}/ci/
+%license %{crate_instdir}/LICENSE-APACHE
+%license %{crate_instdir}/LICENSE-MIT
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/
%package -n %{name}+default-devel
Summary: %{summary}
@@ -52,7 +54,7 @@ This package contains library source intended for building other packages which
use the "default" feature of the "%{crate}" crate.
%files -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+cpp_demangle-devel
Summary: %{summary}
@@ -64,7 +66,7 @@ This package contains library source intended for building other packages which
use the "cpp_demangle" feature of the "%{crate}" crate.
%files -n %{name}+cpp_demangle-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+gimli-symbolize-devel
Summary: %{summary}
@@ -76,7 +78,7 @@ This package contains library source intended for building other packages which
use the "gimli-symbolize" feature of the "%{crate}" crate.
%files -n %{name}+gimli-symbolize-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+libbacktrace-devel
Summary: %{summary}
@@ -88,7 +90,7 @@ This package contains library source intended for building other packages which
use the "libbacktrace" feature of the "%{crate}" crate.
%files -n %{name}+libbacktrace-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+rustc-serialize-devel
Summary: %{summary}
@@ -100,7 +102,7 @@ This package contains library source intended for building other packages which
use the "rustc-serialize" feature of the "%{crate}" crate.
%files -n %{name}+rustc-serialize-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+serde-devel
Summary: %{summary}
@@ -112,7 +114,7 @@ This package contains library source intended for building other packages which
use the "serde" feature of the "%{crate}" crate.
%files -n %{name}+serde-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+serialize-rustc-devel
Summary: %{summary}
@@ -124,7 +126,7 @@ This package contains library source intended for building other packages which
use the "serialize-rustc" feature of the "%{crate}" crate.
%files -n %{name}+serialize-rustc-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+serialize-serde-devel
Summary: %{summary}
@@ -136,7 +138,7 @@ This package contains library source intended for building other packages which
use the "serialize-serde" feature of the "%{crate}" crate.
%files -n %{name}+serialize-serde-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+std-devel
Summary: %{summary}
@@ -148,7 +150,7 @@ This package contains library source intended for building other packages which
use the "std" feature of the "%{crate}" crate.
%files -n %{name}+std-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
@@ -168,12 +170,9 @@ rm -r tests/accuracy/
%if %{with check}
%check
# https://github.com/rust-lang/backtrace-rs/issues/204
-%ifarch %{ix86} ppc64le aarch64 s390x
- %cargo_test || :
-%else
- # some tests can't find symbols in release mode
- %cargo_test -- -- --skip smoke_test_frames
-%endif
+# * smoke_test_frames: fails on all architectures
+# * backtrace_new_unresolved_should_start_with_call_site_trace: fails on aarch64, ppc64le, s390x
+%cargo_test -- -- --skip smoke_test_frames --skip backtrace_new_unresolved_should_start_with_call_site_trace
%endif
%changelog
diff --git a/rust2rpm.conf b/rust2rpm.conf
new file mode 100644
index 0000000..aede82b
--- /dev/null
+++ b/rust2rpm.conf
@@ -0,0 +1,9 @@
+[DEFAULT]
+unwanted-features =
+ coresymbolication
+ dbghelp
+ dladdr
+ kernel32
+ libunwind
+ unix-backtrace
+ verify-winapi
diff --git a/sources b/sources
index e981e91..5205a85 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (backtrace-0.3.64.crate) = 37435cca0587c1c7b511536478ff448914d423c9cf6152ec8bb884c19d1c2466c377b270ebce2028960b4a380f3152fbfeb940de943ef4071ed271c7cd576f2e
+SHA512 (backtrace-0.3.66.crate) = 7370ce52d0b949a6faa05f91225f60928e42e52c00ed2ba4054ef7efd41cd65c77b0e67c8afb9d5bf834eb4b1451b642720521e17d1954be810e3c5fc70bf646
commit bce065ef876ae38a23f62087bd164e56d7e88f53
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Jul 23 02:52:42 2022 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
1 year, 10 months