From 0f8fccea370bc6e2e7286487661d91b55de948c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 1 Apr 2017 17:48:09 +0200 Subject: [PATCH 01/86] Initial import (#1401302) --- .gitignore | 1 + libarcus.spec | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 88 insertions(+) create mode 100644 libarcus.spec diff --git a/.gitignore b/.gitignore index e69de29..010188c 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/libarcus-2.4.0.tar.gz diff --git a/libarcus.spec b/libarcus.spec new file mode 100644 index 0000000..1a7b622 --- /dev/null +++ b/libarcus.spec @@ -0,0 +1,86 @@ +Name: libarcus +Version: 2.4.0 +Release: 1%{?dist} +Summary: Communication library between internal components for Ultimaker software +License: AGPLv3+ +URL: https://github.com/Ultimaker/libArcus +Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz + +BuildRequires: protobuf-devel +BuildRequires: python3-devel +BuildRequires: python3-protobuf +BuildRequires: python3-sip-devel +BuildRequires: /usr/bin/sip +BuildRequires: cmake +BuildRequires: gcc-c++ +BuildRequires: git + +%description +Arcus library contains C++ code and Python 3 bindings for creating a socket in +a thread and using this socket to send and receive messages based on the +Protocol Buffers library. It is designed to facilitate the communication +between Cura and its backend and similar code. + +%package devel +Summary: Development files for libarcus +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +Arcus library contains C++ code and Python 3 bindings for creating a socket in +a thread and using this socket to send and receive messages based on the +Protocol Buffers library. It is designed to facilitate the communication +between Cura and its backend and similar code. + +Development files. + +%package -n python3-arcus +Summary: Python 3 libArcus bindings +%{?python_provide:%python_provide python3-arcus} + +%description -n python3-arcus +Arcus Python 3 bindings for creating a socket in a thread and using this +socket to send and receive messages based on the +Protocol Buffers library. It is designed to facilitate the communication +between Cura and its backend and similar code. + +%prep +%autosetup -n libArcus-%{version} -p1 -S git + +# Move stuff to lib64 on 64 arches +# TODO propose a change to honor -DLIB_SUFFIX=64 +sed -i 's|DESTINATION lib|DESTINATION %{_lib}|g' CMakeLists.txt +sed -i 's|PYTHON_SITE_PACKAGES_DIR lib|PYTHON_SITE_PACKAGES_DIR %{_lib}|g' CMakeLists.txt + + +%build +%{cmake} -DBUILD_EXAMPLES:BOOL=OFF -DCMAKE_SKIP_RPATH:BOOL=ON . +make %{?_smp_mflags} + +%install +make install DESTDIR=%{buildroot} + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%license LICENSE +%doc README.md TODO.md +%{_libdir}/libArcus.so.* + +%files devel +%doc examples/example.cpp examples/example.proto +%{_libdir}/libArcus.so +%{_includedir}/Arcus +# Own the dir not to depend on cmake: +%{_libdir}/cmake + +%files -n python3-arcus +%license LICENSE +%doc README.md TODO.md +%doc examples/example.py +%{python3_sitearch}/Arcus.so + +%changelog +* Sat Mar 25 2017 Miro Hrončok - 2.4.0-1 +- Initial package diff --git a/sources b/sources index e69de29..c0f9179 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +SHA512 (libarcus-2.4.0.tar.gz) = fada5ab2a7a467ad999015b34f893cb807e4355cdb08785e538a93dc3ac18229f810de3dfaa15824d2a2393317540b46864743859cddd640af3483e8bd856ed4 From 5c6d763d738a798c943054afc962ef21a675c682 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 1 Apr 2017 18:00:16 +0200 Subject: [PATCH 02/86] Branch requested by accident, no python3-protobuf in f25 --- .gitignore | 0 dead.package | 1 + sources | 0 3 files changed, 1 insertion(+) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index e69de29..0000000 diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..9cf5176 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Branch requested by accident, no python3-protobuf in f25 diff --git a/sources b/sources deleted file mode 100644 index e69de29..0000000 From cf7ea0981f8f9da76888cd0fd6b176e245cfb2ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 26 Apr 2017 12:43:36 +0200 Subject: [PATCH 03/86] Update to 2.5.0 --- .gitignore | 1 + libarcus.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 010188c..e0783b1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /libarcus-2.4.0.tar.gz +/libarcus-2.5.0.tar.gz diff --git a/libarcus.spec b/libarcus.spec index 1a7b622..bbef041 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,5 +1,5 @@ Name: libarcus -Version: 2.4.0 +Version: 2.5.0 Release: 1%{?dist} Summary: Communication library between internal components for Ultimaker software License: AGPLv3+ @@ -82,5 +82,8 @@ make install DESTDIR=%{buildroot} %{python3_sitearch}/Arcus.so %changelog +* Wed Apr 26 2017 Miro Hrončok - 2.5.0-1 +- Update to 2.5.0 + * Sat Mar 25 2017 Miro Hrončok - 2.4.0-1 - Initial package diff --git a/sources b/sources index c0f9179..348300b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libarcus-2.4.0.tar.gz) = fada5ab2a7a467ad999015b34f893cb807e4355cdb08785e538a93dc3ac18229f810de3dfaa15824d2a2393317540b46864743859cddd640af3483e8bd856ed4 +SHA512 (libarcus-2.5.0.tar.gz) = 8e103d236cd78a1eb07765c580d39c71796f97a6b9056d1d3a07dfefefbeb474055b7521a81a602b6593e1d738c242587a84a38d5890bdcb248bedfa59c436fb From c4acf9f68cd55e9f9fcaa1f3188453b6b0431a78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 10 May 2017 16:09:53 +0200 Subject: [PATCH 04/86] Clarify licensing information on cmake files --- libarcus.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/libarcus.spec b/libarcus.spec index bbef041..2bfe049 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus Version: 2.5.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Communication library between internal components for Ultimaker software License: AGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -22,6 +22,10 @@ Protocol Buffers library. It is designed to facilitate the communication between Cura and its backend and similar code. %package devel + +# The cmake scripts are BSD +License: AGPLv3+ and BSD + Summary: Development files for libarcus Requires: %{name}%{?_isa} = %{version}-%{release} @@ -69,6 +73,7 @@ make install DESTDIR=%{buildroot} %{_libdir}/libArcus.so.* %files devel +%license LICENSE cmake/COPYING-CMAKE-SCRIPTS %doc examples/example.cpp examples/example.proto %{_libdir}/libArcus.so %{_includedir}/Arcus @@ -82,6 +87,9 @@ make install DESTDIR=%{buildroot} %{python3_sitearch}/Arcus.so %changelog +* Wed May 03 2017 Miro Hrončok - 2.5.0-2 +- Clarify licensing information on cmake files + * Wed Apr 26 2017 Miro Hrončok - 2.5.0-1 - Update to 2.5.0 From 8645ba318d10ed32694400aeb0a4bbcc8d416ad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 13 Jun 2017 17:06:34 +0200 Subject: [PATCH 05/86] Rebuilt for new protobuf 3.3.1 --- libarcus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libarcus.spec b/libarcus.spec index 2bfe049..b8ca114 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus Version: 2.5.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Communication library between internal components for Ultimaker software License: AGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -87,6 +87,9 @@ make install DESTDIR=%{buildroot} %{python3_sitearch}/Arcus.so %changelog +* Tue Jun 13 2017 Miro Hrončok - 2.5.0-3 +- Rebuilt for new protobuf 3.3.1 + * Wed May 03 2017 Miro Hrončok - 2.5.0-2 - Clarify licensing information on cmake files From 9f185a6860ac2d5ce1b37c8dfb665a7705afe588 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 27 Jun 2017 15:15:46 +0200 Subject: [PATCH 06/86] Update to 2.6.0 --- .gitignore | 1 + libarcus.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e0783b1..f5be9c8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /libarcus-2.4.0.tar.gz /libarcus-2.5.0.tar.gz +/libarcus-2.6.0.tar.gz diff --git a/libarcus.spec b/libarcus.spec index b8ca114..54e9e8a 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus -Version: 2.5.0 -Release: 3%{?dist} +Version: 2.6.0 +Release: 1%{?dist} Summary: Communication library between internal components for Ultimaker software License: AGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -87,6 +87,9 @@ make install DESTDIR=%{buildroot} %{python3_sitearch}/Arcus.so %changelog +* Tue Jun 27 2017 Miro Hrončok - 2.6.0-1 +- Update to 2.6.0 + * Tue Jun 13 2017 Miro Hrončok - 2.5.0-3 - Rebuilt for new protobuf 3.3.1 diff --git a/sources b/sources index 348300b..304996d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libarcus-2.5.0.tar.gz) = 8e103d236cd78a1eb07765c580d39c71796f97a6b9056d1d3a07dfefefbeb474055b7521a81a602b6593e1d738c242587a84a38d5890bdcb248bedfa59c436fb +SHA512 (libarcus-2.6.0.tar.gz) = 1a2c7ec83999f7874b9e82874e83550c7595fcbb0d4fcee2d84c2a06f4ec1147df30ac2e06e55552c718889fbd21146c43a9f8cf08ff282908b866bf87729ca8 From 312ee67fc28890b5978f438a18f259c087c121ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 28 Jun 2017 15:31:46 +0200 Subject: [PATCH 07/86] Update to 2.6.1 --- .gitignore | 1 + libarcus.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f5be9c8..b272b24 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /libarcus-2.4.0.tar.gz /libarcus-2.5.0.tar.gz /libarcus-2.6.0.tar.gz +/libarcus-2.6.1.tar.gz diff --git a/libarcus.spec b/libarcus.spec index 54e9e8a..0464041 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,5 +1,5 @@ Name: libarcus -Version: 2.6.0 +Version: 2.6.1 Release: 1%{?dist} Summary: Communication library between internal components for Ultimaker software License: AGPLv3+ @@ -87,6 +87,9 @@ make install DESTDIR=%{buildroot} %{python3_sitearch}/Arcus.so %changelog +* Wed Jun 28 2017 Miro Hrončok - 2.6.1-1 +- Update to 2.6.1 + * Tue Jun 27 2017 Miro Hrončok - 2.6.0-1 - Update to 2.6.0 diff --git a/sources b/sources index 304996d..e806ad9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libarcus-2.6.0.tar.gz) = 1a2c7ec83999f7874b9e82874e83550c7595fcbb0d4fcee2d84c2a06f4ec1147df30ac2e06e55552c718889fbd21146c43a9f8cf08ff282908b866bf87729ca8 +SHA512 (libarcus-2.6.1.tar.gz) = 670c2a140d89f2fb783cedabf62f108b8724d01428fd0d9b701e21edba83f5f989236d823a2356cf4e507c50a422aa1e3ba23a4a3b67a5578712d78ce1c1bdf0 From 638be5d38ad766e2359d22d01b688a5968b05d5a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 18:32:26 +0000 Subject: [PATCH 08/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- libarcus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libarcus.spec b/libarcus.spec index 0464041..6629fe5 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus Version: 2.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Communication library between internal components for Ultimaker software License: AGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -87,6 +87,9 @@ make install DESTDIR=%{buildroot} %{python3_sitearch}/Arcus.so %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 2.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Wed Jun 28 2017 Miro Hrončok - 2.6.1-1 - Update to 2.6.1 From 075a65abc5276538b7c3dff8a8b86a771ff237d7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 01:11:44 +0000 Subject: [PATCH 09/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- libarcus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libarcus.spec b/libarcus.spec index 6629fe5..143e49d 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus Version: 2.6.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Communication library between internal components for Ultimaker software License: AGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -87,6 +87,9 @@ make install DESTDIR=%{buildroot} %{python3_sitearch}/Arcus.so %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 2.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 2.6.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 9cfb397266732d34e98c408b95be69faead99ce0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 30 Aug 2017 14:53:09 +0200 Subject: [PATCH 10/86] Update to 2.7.0 --- .gitignore | 1 + libarcus.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b272b24..2cd0201 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /libarcus-2.5.0.tar.gz /libarcus-2.6.0.tar.gz /libarcus-2.6.1.tar.gz +/libarcus-2.7.0.tar.gz diff --git a/libarcus.spec b/libarcus.spec index 143e49d..5e806fa 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus -Version: 2.6.1 -Release: 3%{?dist} +Version: 2.7.0 +Release: 1%{?dist} Summary: Communication library between internal components for Ultimaker software License: AGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -87,6 +87,9 @@ make install DESTDIR=%{buildroot} %{python3_sitearch}/Arcus.so %changelog +* Wed Aug 30 2017 Miro Hrončok - 2.7.0-1 +- Update to 2.7.0 + * Thu Aug 03 2017 Fedora Release Engineering - 2.6.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index e806ad9..d67535a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libarcus-2.6.1.tar.gz) = 670c2a140d89f2fb783cedabf62f108b8724d01428fd0d9b701e21edba83f5f989236d823a2356cf4e507c50a422aa1e3ba23a4a3b67a5578712d78ce1c1bdf0 +SHA512 (libarcus-2.7.0.tar.gz) = 86629cb3101ba3c455aafc7e27fbafd352fc239ec63120a0f5b3b81c28a91221debac0abce794fd7cf69c1a9576b6e92744fb066557ee11591355fdf8a06df08 From fe0bdfc025054f3cc84b9075fd54eb58a1deaedc Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Fri, 20 Oct 2017 14:35:43 +0200 Subject: [PATCH 11/86] Update to 3.0.3 --- .gitignore | 1 + libarcus.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2cd0201..a3065a9 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /libarcus-2.6.0.tar.gz /libarcus-2.6.1.tar.gz /libarcus-2.7.0.tar.gz +/libarcus-3.0.3.tar.gz diff --git a/libarcus.spec b/libarcus.spec index 5e806fa..ddcfe06 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,8 +1,8 @@ Name: libarcus -Version: 2.7.0 +Version: 3.0.3 Release: 1%{?dist} Summary: Communication library between internal components for Ultimaker software -License: AGPLv3+ +License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -87,6 +87,9 @@ make install DESTDIR=%{buildroot} %{python3_sitearch}/Arcus.so %changelog +* Fri Oct 20 2017 Charalampos Statakis - 3.0.3-1 +- Update to 3.0.3 + * Wed Aug 30 2017 Miro Hrončok - 2.7.0-1 - Update to 2.7.0 diff --git a/sources b/sources index d67535a..4fba019 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libarcus-2.7.0.tar.gz) = 86629cb3101ba3c455aafc7e27fbafd352fc239ec63120a0f5b3b81c28a91221debac0abce794fd7cf69c1a9576b6e92744fb066557ee11591355fdf8a06df08 +SHA512 (libarcus-3.0.3.tar.gz) = 365102a9bc64fd57222fcc1b3eb92caa0dcc013a8a9a593f9ed625c5d86f64d773aa4e788e9ea64bbc334f9c274f5a748f704a969e2a5fb6894ba9b3d6106454 From cd6490d88d52fbb15f9e68636a24144ca4360c82 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 13 Nov 2017 23:27:42 +0100 Subject: [PATCH 12/86] Rebuild for protobuf 3.4 Signed-off-by: Igor Gnatenko --- libarcus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libarcus.spec b/libarcus.spec index ddcfe06..4c9eb2d 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus Version: 3.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -87,6 +87,9 @@ make install DESTDIR=%{buildroot} %{python3_sitearch}/Arcus.so %changelog +* Mon Nov 13 2017 Igor Gnatenko - 3.0.3-2 +- Rebuild for protobuf 3.4 + * Fri Oct 20 2017 Charalampos Statakis - 3.0.3-1 - Update to 3.0.3 From f54f64d9f6b07277402c75cb62d80abee2b57108 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 29 Nov 2017 12:12:17 +0100 Subject: [PATCH 13/86] Rebuild for protobuf 3.5 Signed-off-by: Igor Gnatenko --- libarcus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libarcus.spec b/libarcus.spec index 4c9eb2d..35a6a2d 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus Version: 3.0.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -87,6 +87,9 @@ make install DESTDIR=%{buildroot} %{python3_sitearch}/Arcus.so %changelog +* Wed Nov 29 2017 Igor Gnatenko - 3.0.3-3 +- Rebuild for protobuf 3.5 + * Mon Nov 13 2017 Igor Gnatenko - 3.0.3-2 - Rebuild for protobuf 3.4 From f7641e19e2384c717c023b94087063d2b0a28f30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 9 Dec 2017 01:31:17 +0100 Subject: [PATCH 14/86] Update to 3.1.0 (#1523891) --- .gitignore | 1 + libarcus.spec | 14 ++++++-------- sources | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index a3065a9..226904c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /libarcus-2.6.1.tar.gz /libarcus-2.7.0.tar.gz /libarcus-3.0.3.tar.gz +/libarcus-3.1.0.tar.gz diff --git a/libarcus.spec b/libarcus.spec index 35a6a2d..c0df751 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus -Version: 3.0.3 -Release: 3%{?dist} +Version: 3.1.0 +Release: 1%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -50,12 +50,6 @@ between Cura and its backend and similar code. %prep %autosetup -n libArcus-%{version} -p1 -S git -# Move stuff to lib64 on 64 arches -# TODO propose a change to honor -DLIB_SUFFIX=64 -sed -i 's|DESTINATION lib|DESTINATION %{_lib}|g' CMakeLists.txt -sed -i 's|PYTHON_SITE_PACKAGES_DIR lib|PYTHON_SITE_PACKAGES_DIR %{_lib}|g' CMakeLists.txt - - %build %{cmake} -DBUILD_EXAMPLES:BOOL=OFF -DCMAKE_SKIP_RPATH:BOOL=ON . make %{?_smp_mflags} @@ -87,6 +81,10 @@ make install DESTDIR=%{buildroot} %{python3_sitearch}/Arcus.so %changelog +* Sat Dec 09 2017 Miro Hrončok - 3.1.0-1 +- Update to 3.1.0 (#1523891) +- Don't sed lib -> lib64 (not needed now) + * Wed Nov 29 2017 Igor Gnatenko - 3.0.3-3 - Rebuild for protobuf 3.5 diff --git a/sources b/sources index 4fba019..bacf85d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libarcus-3.0.3.tar.gz) = 365102a9bc64fd57222fcc1b3eb92caa0dcc013a8a9a593f9ed625c5d86f64d773aa4e788e9ea64bbc334f9c274f5a748f704a969e2a5fb6894ba9b3d6106454 +SHA512 (libarcus-3.1.0.tar.gz) = 338a316e6b0012fcd48d828a0870e64123709c2a2c5097ec70ef7215c3db4d61a5634d040e96d9f7e548c9276091ae2899ee45c438500ee3fa9112bd1ee5a7b5 From a0874d1abd02b08dc7e9b963f4da066d2c919d87 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 21:12:38 +0000 Subject: [PATCH 15/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libarcus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libarcus.spec b/libarcus.spec index c0df751..80ec5be 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus Version: 3.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -81,6 +81,9 @@ make install DESTDIR=%{buildroot} %{python3_sitearch}/Arcus.so %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 3.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sat Dec 09 2017 Miro Hrončok - 3.1.0-1 - Update to 3.1.0 (#1523891) - Don't sed lib -> lib64 (not needed now) From a6ada6a3e66c619baba610348fabd96998ee01c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Mar 2018 23:02:32 +0100 Subject: [PATCH 16/86] Update to 3.2.1 (#1523891) --- .gitignore | 1 + libarcus.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 226904c..2d1e4c5 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /libarcus-2.7.0.tar.gz /libarcus-3.0.3.tar.gz /libarcus-3.1.0.tar.gz +/libarcus-3.2.1.tar.gz diff --git a/libarcus.spec b/libarcus.spec index 80ec5be..9111efe 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus -Version: 3.1.0 -Release: 2%{?dist} +Version: 3.2.1 +Release: 1%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -81,6 +81,9 @@ make install DESTDIR=%{buildroot} %{python3_sitearch}/Arcus.so %changelog +* Mon Mar 19 2018 Miro Hrončok - 3.2.1-1 +- Update to 3.2.1 (#1523891) + * Wed Feb 07 2018 Fedora Release Engineering - 3.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index bacf85d..393a281 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libarcus-3.1.0.tar.gz) = 338a316e6b0012fcd48d828a0870e64123709c2a2c5097ec70ef7215c3db4d61a5634d040e96d9f7e548c9276091ae2899ee45c438500ee3fa9112bd1ee5a7b5 +SHA512 (libarcus-3.2.1.tar.gz) = fc211aa3b917fd2dfaff86642c4a5e28a46cc9a977ad385dcba02795c536e055f50bacd3dced64dbe89dc507aca7894ea79169cc5e0b8e923528a4d4babce15e From a600a68cc6c54a2c0f40a325d275d1d83ff2bf86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 2 May 2018 14:27:27 +0200 Subject: [PATCH 17/86] Update to 3.3.0 (#1571482) --- .gitignore | 1 + libarcus.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2d1e4c5..9c2fef6 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /libarcus-3.0.3.tar.gz /libarcus-3.1.0.tar.gz /libarcus-3.2.1.tar.gz +/libarcus-3.3.0.tar.gz diff --git a/libarcus.spec b/libarcus.spec index 9111efe..cd10d9a 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,5 +1,5 @@ Name: libarcus -Version: 3.2.1 +Version: 3.3.0 Release: 1%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ @@ -81,6 +81,9 @@ make install DESTDIR=%{buildroot} %{python3_sitearch}/Arcus.so %changelog +* Wed May 02 2018 Miro Hrončok - 3.3.0-1 +- Update to 3.3.0 (#1571482) + * Mon Mar 19 2018 Miro Hrončok - 3.2.1-1 - Update to 3.2.1 (#1523891) diff --git a/sources b/sources index 393a281..611bb34 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libarcus-3.2.1.tar.gz) = fc211aa3b917fd2dfaff86642c4a5e28a46cc9a977ad385dcba02795c536e055f50bacd3dced64dbe89dc507aca7894ea79169cc5e0b8e923528a4d4babce15e +SHA512 (libarcus-3.3.0.tar.gz) = a911fb5784ceb835ba2c175ce42cc10544bdd0834e987d8ac1be2517293f00e596f94910d8bf5f37f61e63246ba6e78d28a23bc061809e70b1bb6ad1a21107c9 From e56e01d21fc8d450ee62b56e3e8a5dc09780585a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 19 Jun 2018 10:45:51 +0200 Subject: [PATCH 18/86] Rebuilt for Python 3.7 --- libarcus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libarcus.spec b/libarcus.spec index cd10d9a..469123d 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus Version: 3.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -81,6 +81,9 @@ make install DESTDIR=%{buildroot} %{python3_sitearch}/Arcus.so %changelog +* Tue Jun 19 2018 Miro Hrončok - 3.3.0-2 +- Rebuilt for Python 3.7 + * Wed May 02 2018 Miro Hrončok - 3.3.0-1 - Update to 3.3.0 (#1571482) From c8f01159bc559dcf83077713ba3a1405205b1a9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 29 Jun 2018 12:24:41 +0200 Subject: [PATCH 19/86] Remove ldconfig scriptlets --- libarcus.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libarcus.spec b/libarcus.spec index 469123d..3b01387 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -57,10 +57,6 @@ make %{?_smp_mflags} %install make install DESTDIR=%{buildroot} -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - %files %license LICENSE %doc README.md TODO.md From dafec0599fb16fbd771903cfca3cb8a4cf86415e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 07:49:23 +0000 Subject: [PATCH 20/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libarcus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libarcus.spec b/libarcus.spec index 3b01387..cf1b17d 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus Version: 3.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -77,6 +77,9 @@ make install DESTDIR=%{buildroot} %{python3_sitearch}/Arcus.so %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 3.3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Jun 19 2018 Miro Hrončok - 3.3.0-2 - Rebuilt for Python 3.7 From f7aa86f8561b1fc452ca1061d57d044c7bb3d554 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 23 Aug 2018 09:41:28 -0500 Subject: [PATCH 21/86] Use PyQt5.sip (#1601917) --- libArcus-3.3.0-PyQt5.sip.patch | 12 ++++++++++++ libarcus.spec | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 libArcus-3.3.0-PyQt5.sip.patch diff --git a/libArcus-3.3.0-PyQt5.sip.patch b/libArcus-3.3.0-PyQt5.sip.patch new file mode 100644 index 0000000..ec9fd5d --- /dev/null +++ b/libArcus-3.3.0-PyQt5.sip.patch @@ -0,0 +1,12 @@ +diff -up libArcus-3.3.0/CMakeLists.txt.sip libArcus-3.3.0/CMakeLists.txt +--- libArcus-3.3.0/CMakeLists.txt.sip 2017-10-28 17:28:39.000000000 -0500 ++++ libArcus-3.3.0/CMakeLists.txt 2018-08-23 09:19:22.608553543 -0500 +@@ -88,7 +88,7 @@ endif() + if(BUILD_PYTHON) + set(SIP_EXTRA_FILES_DEPEND python/SocketListener.sip python/Types.sip python/PythonMessage.sip python/Error.sip) + set(SIP_EXTRA_SOURCE_FILES python/PythonMessage.cpp) +- set(SIP_EXTRA_OPTIONS -g) # -g means always release the GIL before calling C++ methods. ++ set(SIP_EXTRA_OPTIONS -g -n PyQt5.sip) # -g means always release the GIL before calling C++ methods. + add_sip_python_module(Arcus python/Socket.sip Arcus) + endif() + diff --git a/libarcus.spec b/libarcus.spec index cf1b17d..1f1219c 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,11 +1,15 @@ Name: libarcus Version: 3.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +# https://bugzilla.redhat.com/show_bug.cgi?id=1601917 +Patch1: libArcus-3.3.0-PyQt5.sip.patch + + BuildRequires: protobuf-devel BuildRequires: python3-devel BuildRequires: python3-protobuf @@ -77,6 +81,9 @@ make install DESTDIR=%{buildroot} %{python3_sitearch}/Arcus.so %changelog +* Thu Aug 23 2018 Rex Dieter - 3.3.0-4 +- Use PyQt5.sip (#1601917) + * Fri Jul 13 2018 Fedora Release Engineering - 3.3.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 27a956a4f11e9bc5658fe9dc45ca6afa025ae653 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 28 Aug 2018 16:02:44 +0200 Subject: [PATCH 22/86] Update to 3.4.1 (#1599716) --- .gitignore | 1 + libarcus.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9c2fef6..b49081e 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /libarcus-3.1.0.tar.gz /libarcus-3.2.1.tar.gz /libarcus-3.3.0.tar.gz +/libarcus-3.4.1.tar.gz diff --git a/libarcus.spec b/libarcus.spec index 1f1219c..021db32 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus -Version: 3.3.0 -Release: 4%{?dist} +Version: 3.4.1 +Release: 1%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -81,6 +81,9 @@ make install DESTDIR=%{buildroot} %{python3_sitearch}/Arcus.so %changelog +* Tue Aug 28 2018 Miro Hrončok - 3.4.1-1 +- Update to 3.4.1 (#1599716) + * Thu Aug 23 2018 Rex Dieter - 3.3.0-4 - Use PyQt5.sip (#1601917) diff --git a/sources b/sources index 611bb34..99e7a47 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libarcus-3.3.0.tar.gz) = a911fb5784ceb835ba2c175ce42cc10544bdd0834e987d8ac1be2517293f00e596f94910d8bf5f37f61e63246ba6e78d28a23bc061809e70b1bb6ad1a21107c9 +SHA512 (libarcus-3.4.1.tar.gz) = 63ed8d8da389641b91ed955624c04ca5488f98d3ef409c4a94ad1962155d6aedd8d61ca0231543cfe4e92ae10beb00001f957eb48f74b0c21447a1bd9b66d85d From 389686ab44edf78c8f1afa098c92f226d8b089b1 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 28 Aug 2018 14:04:58 -0500 Subject: [PATCH 23/86] use more robust upstreamable sip_flags.patch (#1601917) --- libArcus-3.3.0-PyQt5.sip.patch | 12 ------- libArcus-3.4.1-sip_flags.patch | 66 ++++++++++++++++++++++++++++++++++ libarcus.spec | 7 ++-- 3 files changed, 71 insertions(+), 14 deletions(-) delete mode 100644 libArcus-3.3.0-PyQt5.sip.patch create mode 100644 libArcus-3.4.1-sip_flags.patch diff --git a/libArcus-3.3.0-PyQt5.sip.patch b/libArcus-3.3.0-PyQt5.sip.patch deleted file mode 100644 index ec9fd5d..0000000 --- a/libArcus-3.3.0-PyQt5.sip.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up libArcus-3.3.0/CMakeLists.txt.sip libArcus-3.3.0/CMakeLists.txt ---- libArcus-3.3.0/CMakeLists.txt.sip 2017-10-28 17:28:39.000000000 -0500 -+++ libArcus-3.3.0/CMakeLists.txt 2018-08-23 09:19:22.608553543 -0500 -@@ -88,7 +88,7 @@ endif() - if(BUILD_PYTHON) - set(SIP_EXTRA_FILES_DEPEND python/SocketListener.sip python/Types.sip python/PythonMessage.sip python/Error.sip) - set(SIP_EXTRA_SOURCE_FILES python/PythonMessage.cpp) -- set(SIP_EXTRA_OPTIONS -g) # -g means always release the GIL before calling C++ methods. -+ set(SIP_EXTRA_OPTIONS -g -n PyQt5.sip) # -g means always release the GIL before calling C++ methods. - add_sip_python_module(Arcus python/Socket.sip Arcus) - endif() - diff --git a/libArcus-3.4.1-sip_flags.patch b/libArcus-3.4.1-sip_flags.patch new file mode 100644 index 0000000..9c39e54 --- /dev/null +++ b/libArcus-3.4.1-sip_flags.patch @@ -0,0 +1,66 @@ +diff -up libArcus-3.4.1/cmake/FindSIP.cmake.sip_flags libArcus-3.4.1/cmake/FindSIP.cmake +--- libArcus-3.4.1/cmake/FindSIP.cmake.sip_flags 2017-10-28 17:28:39.000000000 -0500 ++++ libArcus-3.4.1/cmake/FindSIP.cmake 2018-08-28 11:04:13.654862074 -0500 +@@ -17,6 +17,8 @@ + # + # SIP_INCLUDE_DIR - Directory holding the SIP C++ header file. + # ++# SIP_FLAGS - PYQT_CONFIGURATION["sip_flags"] content ++# + # SIP_DEFAULT_SIP_DIR - Default directory where .sip files should be installed + # into. + +@@ -50,6 +52,7 @@ ELSE(SIP_VERSION) + STRING(REGEX REPLACE ".*\nsip_bin:([^\n]+).*$" "\\1" SIP_BINARY_PATH ${sip_config}) + STRING(REGEX REPLACE ".*\ndefault_sip_dir:([^\n]+).*$" "\\1" SIP_DEFAULT_SIP_DIR ${sip_config}) + STRING(REGEX REPLACE ".*\nsip_inc_dir:([^\n]+).*$" "\\1" SIP_INCLUDE_DIR ${sip_config}) ++ STRING(REGEX REPLACE ".*\nsip_flags:([^\n]+).*$" "\\1" SIP_FLAGS ${sip_config}) + SET(SIP_FOUND TRUE) + ENDIF(sip_config_returncode EQUAL 0) + +diff -up libArcus-3.4.1/cmake/FindSIP.py.sip_flags libArcus-3.4.1/cmake/FindSIP.py +--- libArcus-3.4.1/cmake/FindSIP.py.sip_flags 2017-10-28 17:28:39.000000000 -0500 ++++ libArcus-3.4.1/cmake/FindSIP.py 2018-08-28 11:01:26.165708149 -0500 +@@ -54,9 +54,13 @@ except ImportError: + except ImportError: + fail("Unable to import sipconfig and determine your sip configuration.") + ++from PyQt5.Qt import PYQT_CONFIGURATION ++sip_flags = PYQT_CONFIGURATION["sip_flags"] ++ + print("sip_version:%06.0x" % sip_version) + print("sip_version_num:%d" % sip_version) + print("sip_version_str:%s" % sip_version_str) + print("sip_bin:%s" % sip_bin) + print("default_sip_dir:%s" % default_sip_dir) + print("sip_inc_dir:%s" % sip_inc_dir) ++print("sip_flags:%s" % sip_flags) +diff -up libArcus-3.4.1/cmake/SIPMacros.cmake.sip_flags libArcus-3.4.1/cmake/SIPMacros.cmake +--- libArcus-3.4.1/cmake/SIPMacros.cmake.sip_flags 2017-10-28 17:28:39.000000000 -0500 ++++ libArcus-3.4.1/cmake/SIPMacros.cmake 2018-08-28 11:06:51.802890122 -0500 +@@ -34,12 +34,16 @@ + # + # SIP_EXTRA_OPTIONS - Extra command line options which should be passed on to + # SIP. ++# ++# SIP_FLAGS - PYQT_CONFIGURATION["sip_flags"] content ++# + + SET(SIP_INCLUDES) + SET(SIP_TAGS) + SET(SIP_CONCAT_PARTS 8) + SET(SIP_DISABLE_FEATURES) + SET(SIP_EXTRA_OPTIONS) ++# + + MACRO(ADD_SIP_PYTHON_MODULE MODULE_NAME MODULE_SIP) + +@@ -102,7 +106,7 @@ MACRO(ADD_SIP_PYTHON_MODULE MODULE_NAME + OUTPUT ${_sip_output_files} + COMMAND ${CMAKE_COMMAND} -E echo ${message} + COMMAND ${CMAKE_COMMAND} -E touch ${_sip_output_files} +- COMMAND ${SIP_BINARY_PATH} ${_sip_tags} ${_sip_x} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} ${_sip_includes} ${_abs_module_sip} ++ COMMAND ${SIP_BINARY_PATH} ${_sip_tags} ${_sip_x} ${SIP_FLAGS} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} ${_sip_includes} ${_abs_module_sip} + DEPENDS ${_abs_module_sip} ${SIP_EXTRA_FILES_DEPEND} + ) + # not sure if type MODULE could be uses anywhere, limit to cygwin for now diff --git a/libarcus.spec b/libarcus.spec index 021db32..572f5c9 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,13 +1,13 @@ Name: libarcus Version: 3.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz # https://bugzilla.redhat.com/show_bug.cgi?id=1601917 -Patch1: libArcus-3.3.0-PyQt5.sip.patch +Patch1: libArcus-3.4.1-sip_flags.patch BuildRequires: protobuf-devel @@ -81,6 +81,9 @@ make install DESTDIR=%{buildroot} %{python3_sitearch}/Arcus.so %changelog +* Tue Aug 28 2018 Rex Dieter - 3.4.1-2 +- use more robust upstreamable sip_flags.patch (#1601917) + * Tue Aug 28 2018 Miro Hrončok - 3.4.1-1 - Update to 3.4.1 (#1599716) From 1e4533995f1db437bfd3d053b98e73102c875cf7 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 28 Aug 2018 16:24:17 -0500 Subject: [PATCH 24/86] patch1 introduced additional dependency --- libarcus.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libarcus.spec b/libarcus.spec index 572f5c9..8961207 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -14,6 +14,8 @@ BuildRequires: protobuf-devel BuildRequires: python3-devel BuildRequires: python3-protobuf BuildRequires: python3-sip-devel +# patch1 introduces additional dependency +BuildRequires: python3-qt5-base BuildRequires: /usr/bin/sip BuildRequires: cmake BuildRequires: gcc-c++ From ef2514a5db119d958228d2eb27fd9c799dfb1e84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 12 Nov 2018 10:27:01 +0100 Subject: [PATCH 25/86] Update to 3.5.1 (#1644323) --- .gitignore | 1 + libArcus-3.4.1-sip_flags.patch | 66 ---------------------------------- libarcus.spec | 16 ++++----- sources | 2 +- 4 files changed, 9 insertions(+), 76 deletions(-) delete mode 100644 libArcus-3.4.1-sip_flags.patch diff --git a/.gitignore b/.gitignore index b49081e..5e5dc43 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /libarcus-3.2.1.tar.gz /libarcus-3.3.0.tar.gz /libarcus-3.4.1.tar.gz +/libarcus-3.5.1.tar.gz diff --git a/libArcus-3.4.1-sip_flags.patch b/libArcus-3.4.1-sip_flags.patch deleted file mode 100644 index 9c39e54..0000000 --- a/libArcus-3.4.1-sip_flags.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -up libArcus-3.4.1/cmake/FindSIP.cmake.sip_flags libArcus-3.4.1/cmake/FindSIP.cmake ---- libArcus-3.4.1/cmake/FindSIP.cmake.sip_flags 2017-10-28 17:28:39.000000000 -0500 -+++ libArcus-3.4.1/cmake/FindSIP.cmake 2018-08-28 11:04:13.654862074 -0500 -@@ -17,6 +17,8 @@ - # - # SIP_INCLUDE_DIR - Directory holding the SIP C++ header file. - # -+# SIP_FLAGS - PYQT_CONFIGURATION["sip_flags"] content -+# - # SIP_DEFAULT_SIP_DIR - Default directory where .sip files should be installed - # into. - -@@ -50,6 +52,7 @@ ELSE(SIP_VERSION) - STRING(REGEX REPLACE ".*\nsip_bin:([^\n]+).*$" "\\1" SIP_BINARY_PATH ${sip_config}) - STRING(REGEX REPLACE ".*\ndefault_sip_dir:([^\n]+).*$" "\\1" SIP_DEFAULT_SIP_DIR ${sip_config}) - STRING(REGEX REPLACE ".*\nsip_inc_dir:([^\n]+).*$" "\\1" SIP_INCLUDE_DIR ${sip_config}) -+ STRING(REGEX REPLACE ".*\nsip_flags:([^\n]+).*$" "\\1" SIP_FLAGS ${sip_config}) - SET(SIP_FOUND TRUE) - ENDIF(sip_config_returncode EQUAL 0) - -diff -up libArcus-3.4.1/cmake/FindSIP.py.sip_flags libArcus-3.4.1/cmake/FindSIP.py ---- libArcus-3.4.1/cmake/FindSIP.py.sip_flags 2017-10-28 17:28:39.000000000 -0500 -+++ libArcus-3.4.1/cmake/FindSIP.py 2018-08-28 11:01:26.165708149 -0500 -@@ -54,9 +54,13 @@ except ImportError: - except ImportError: - fail("Unable to import sipconfig and determine your sip configuration.") - -+from PyQt5.Qt import PYQT_CONFIGURATION -+sip_flags = PYQT_CONFIGURATION["sip_flags"] -+ - print("sip_version:%06.0x" % sip_version) - print("sip_version_num:%d" % sip_version) - print("sip_version_str:%s" % sip_version_str) - print("sip_bin:%s" % sip_bin) - print("default_sip_dir:%s" % default_sip_dir) - print("sip_inc_dir:%s" % sip_inc_dir) -+print("sip_flags:%s" % sip_flags) -diff -up libArcus-3.4.1/cmake/SIPMacros.cmake.sip_flags libArcus-3.4.1/cmake/SIPMacros.cmake ---- libArcus-3.4.1/cmake/SIPMacros.cmake.sip_flags 2017-10-28 17:28:39.000000000 -0500 -+++ libArcus-3.4.1/cmake/SIPMacros.cmake 2018-08-28 11:06:51.802890122 -0500 -@@ -34,12 +34,16 @@ - # - # SIP_EXTRA_OPTIONS - Extra command line options which should be passed on to - # SIP. -+# -+# SIP_FLAGS - PYQT_CONFIGURATION["sip_flags"] content -+# - - SET(SIP_INCLUDES) - SET(SIP_TAGS) - SET(SIP_CONCAT_PARTS 8) - SET(SIP_DISABLE_FEATURES) - SET(SIP_EXTRA_OPTIONS) -+# - - MACRO(ADD_SIP_PYTHON_MODULE MODULE_NAME MODULE_SIP) - -@@ -102,7 +106,7 @@ MACRO(ADD_SIP_PYTHON_MODULE MODULE_NAME - OUTPUT ${_sip_output_files} - COMMAND ${CMAKE_COMMAND} -E echo ${message} - COMMAND ${CMAKE_COMMAND} -E touch ${_sip_output_files} -- COMMAND ${SIP_BINARY_PATH} ${_sip_tags} ${_sip_x} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} ${_sip_includes} ${_abs_module_sip} -+ COMMAND ${SIP_BINARY_PATH} ${_sip_tags} ${_sip_x} ${SIP_FLAGS} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} ${_sip_includes} ${_abs_module_sip} - DEPENDS ${_abs_module_sip} ${SIP_EXTRA_FILES_DEPEND} - ) - # not sure if type MODULE could be uses anywhere, limit to cygwin for now diff --git a/libarcus.spec b/libarcus.spec index 8961207..a7a19fa 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,25 +1,19 @@ Name: libarcus -Version: 3.4.1 -Release: 2%{?dist} +Version: 3.5.1 +Release: 1%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -# https://bugzilla.redhat.com/show_bug.cgi?id=1601917 -Patch1: libArcus-3.4.1-sip_flags.patch - - BuildRequires: protobuf-devel BuildRequires: python3-devel BuildRequires: python3-protobuf BuildRequires: python3-sip-devel -# patch1 introduces additional dependency -BuildRequires: python3-qt5-base BuildRequires: /usr/bin/sip BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: git +BuildRequires: git-core %description Arcus library contains C++ code and Python 3 bindings for creating a socket in @@ -45,6 +39,7 @@ Development files. %package -n python3-arcus Summary: Python 3 libArcus bindings +Requires: python3-sip %{?python_provide:%python_provide python3-arcus} %description -n python3-arcus @@ -83,6 +78,9 @@ make install DESTDIR=%{buildroot} %{python3_sitearch}/Arcus.so %changelog +* Mon Nov 12 2018 Miro Hrončok - 3.5.1-1 +- Update to 3.5.1 (#1644323) + * Tue Aug 28 2018 Rex Dieter - 3.4.1-2 - use more robust upstreamable sip_flags.patch (#1601917) diff --git a/sources b/sources index 99e7a47..762448b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libarcus-3.4.1.tar.gz) = 63ed8d8da389641b91ed955624c04ca5488f98d3ef409c4a94ad1962155d6aedd8d61ca0231543cfe4e92ae10beb00001f957eb48f74b0c21447a1bd9b66d85d +SHA512 (libarcus-3.5.1.tar.gz) = a3cf8599aee83aa080d23849c2c9760e1342fd738db58f4e4bb974a9c3f3dfa34dab1fead6292aa6e27ad9a659fda7b92f031c141039bc3118df8f97cc4b8712 From 937e1636b6fa7f50c1c4a8f55465a078bf1efd8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 12 Nov 2018 10:56:48 +0100 Subject: [PATCH 26/86] Use PyQt5.sip (#1601917) --- libArcus-3.5.1-PyQt5.sip.patch | 12 ++++++++++++ libarcus.spec | 8 +++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 libArcus-3.5.1-PyQt5.sip.patch diff --git a/libArcus-3.5.1-PyQt5.sip.patch b/libArcus-3.5.1-PyQt5.sip.patch new file mode 100644 index 0000000..ec9fd5d --- /dev/null +++ b/libArcus-3.5.1-PyQt5.sip.patch @@ -0,0 +1,12 @@ +diff -up libArcus-3.3.0/CMakeLists.txt.sip libArcus-3.3.0/CMakeLists.txt +--- libArcus-3.3.0/CMakeLists.txt.sip 2017-10-28 17:28:39.000000000 -0500 ++++ libArcus-3.3.0/CMakeLists.txt 2018-08-23 09:19:22.608553543 -0500 +@@ -88,7 +88,7 @@ endif() + if(BUILD_PYTHON) + set(SIP_EXTRA_FILES_DEPEND python/SocketListener.sip python/Types.sip python/PythonMessage.sip python/Error.sip) + set(SIP_EXTRA_SOURCE_FILES python/PythonMessage.cpp) +- set(SIP_EXTRA_OPTIONS -g) # -g means always release the GIL before calling C++ methods. ++ set(SIP_EXTRA_OPTIONS -g -n PyQt5.sip) # -g means always release the GIL before calling C++ methods. + add_sip_python_module(Arcus python/Socket.sip Arcus) + endif() + diff --git a/libarcus.spec b/libarcus.spec index a7a19fa..3020bfe 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,11 +1,14 @@ Name: libarcus Version: 3.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +# https://bugzilla.redhat.com/show_bug.cgi?id=1601917 +Patch1: libArcus-3.5.1-PyQt5.sip.patch + BuildRequires: protobuf-devel BuildRequires: python3-devel BuildRequires: python3-protobuf @@ -78,6 +81,9 @@ make install DESTDIR=%{buildroot} %{python3_sitearch}/Arcus.so %changelog +* Mon Nov 12 2018 Miro Hrončok +- Use PyQt5.sip (#1601917) + * Mon Nov 12 2018 Miro Hrončok - 3.5.1-1 - Update to 3.5.1 (#1644323) From 1ada66d6e4412b572b458f22b33a7a0d8eb34354 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 21 Nov 2018 17:16:17 +0100 Subject: [PATCH 27/86] Rebuild for protobuf 3.6 Signed-off-by: Igor Gnatenko --- libarcus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libarcus.spec b/libarcus.spec index 3020bfe..6755abf 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus Version: 3.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -81,6 +81,9 @@ make install DESTDIR=%{buildroot} %{python3_sitearch}/Arcus.so %changelog +* Wed Nov 21 2018 Igor Gnatenko - 3.5.1-3 +- Rebuild for protobuf 3.6 + * Mon Nov 12 2018 Miro Hrončok - Use PyQt5.sip (#1601917) From d9ac655b8090d8e69331a32c631896724213f360 Mon Sep 17 00:00:00 2001 From: Gabriel Feron Date: Sat, 26 Jan 2019 12:45:39 +0100 Subject: [PATCH 28/86] Update to 3.6.0 Signed-off-by: Gabriel Feron --- .gitignore | 1 + libarcus.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5e5dc43..2123477 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /libarcus-3.3.0.tar.gz /libarcus-3.4.1.tar.gz /libarcus-3.5.1.tar.gz +/libarcus-3.6.0.tar.gz diff --git a/libarcus.spec b/libarcus.spec index 6755abf..5ec06e1 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus -Version: 3.5.1 -Release: 3%{?dist} +Version: 3.6.0 +Release: 1%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -81,6 +81,9 @@ make install DESTDIR=%{buildroot} %{python3_sitearch}/Arcus.so %changelog +* Sat Jan 26 2019 Gabriel Féron - 3.6.0-1 +- Update to 3.6.0 + * Wed Nov 21 2018 Igor Gnatenko - 3.5.1-3 - Rebuild for protobuf 3.6 diff --git a/sources b/sources index 762448b..5aeb8fb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libarcus-3.5.1.tar.gz) = a3cf8599aee83aa080d23849c2c9760e1342fd738db58f4e4bb974a9c3f3dfa34dab1fead6292aa6e27ad9a659fda7b92f031c141039bc3118df8f97cc4b8712 +SHA512 (libarcus-3.6.0.tar.gz) = 1bc50a08cbec61edefd78f3c347cca08f6bc40a308472bf6788c2c8962b03ea81b32357be18a3c34847c121eb52ee6836da22cea65b1a8f64b7c924bda290430 From 820fd6f59a644cdbfa57c59dddffda2ec4042c7e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 06:41:32 +0000 Subject: [PATCH 29/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libarcus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libarcus.spec b/libarcus.spec index 5ec06e1..b01e585 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus Version: 3.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -81,6 +81,9 @@ make install DESTDIR=%{buildroot} %{python3_sitearch}/Arcus.so %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 3.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jan 26 2019 Gabriel Féron - 3.6.0-1 - Update to 3.6.0 From 804dc0f3106b8471cc5ad7d2f6ab0e99b30773a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= Date: Wed, 3 Apr 2019 23:33:48 +0200 Subject: [PATCH 30/86] Update to 4.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Gabriel Féron --- .gitignore | 1 + libarcus.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2123477..54e291e 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /libarcus-3.4.1.tar.gz /libarcus-3.5.1.tar.gz /libarcus-3.6.0.tar.gz +/libarcus-4.0.0.tar.gz diff --git a/libarcus.spec b/libarcus.spec index b01e585..e62e579 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus -Version: 3.6.0 -Release: 2%{?dist} +Version: 4.0.0 +Release: 1%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -81,6 +81,9 @@ make install DESTDIR=%{buildroot} %{python3_sitearch}/Arcus.so %changelog +* Wed Apr 03 2019 Gabriel Féron - 4.0.0-1 +- Update to 4.0.0 + * Fri Feb 01 2019 Fedora Release Engineering - 3.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 5aeb8fb..0be8b4b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libarcus-3.6.0.tar.gz) = 1bc50a08cbec61edefd78f3c347cca08f6bc40a308472bf6788c2c8962b03ea81b32357be18a3c34847c121eb52ee6836da22cea65b1a8f64b7c924bda290430 +SHA512 (libarcus-4.0.0.tar.gz) = 58df6f1cb74244270005a113641c5a8470dfc10ee222bc6a5e68dc803a7bbf3ad7905f982e70f73dc6f2ac98cec2cb577d65d47242eaef2ffdab2504e57e408c From d9f7d6d08aa8fdfc964a9def2a6cdaf8680a68db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= Date: Tue, 18 Jun 2019 23:08:04 +0200 Subject: [PATCH 31/86] Update to 4.1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Miro Hrončok --- .gitignore | 1 + libarcus.spec | 13 ++++++++++--- sources | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 54e291e..e2b80ea 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /libarcus-3.5.1.tar.gz /libarcus-3.6.0.tar.gz /libarcus-4.0.0.tar.gz +/libarcus-4.1.0.tar.gz diff --git a/libarcus.spec b/libarcus.spec index e62e579..2786656 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,5 +1,5 @@ Name: libarcus -Version: 4.0.0 +Version: 4.1.0 Release: 1%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ @@ -12,6 +12,7 @@ Patch1: libArcus-3.5.1-PyQt5.sip.patch BuildRequires: protobuf-devel BuildRequires: python3-devel BuildRequires: python3-protobuf +BuildRequires: python3-sip BuildRequires: python3-sip-devel BuildRequires: /usr/bin/sip BuildRequires: cmake @@ -54,12 +55,15 @@ between Cura and its backend and similar code. %prep %autosetup -n libArcus-%{version} -p1 -S git +# https://github.com/Ultimaker/libArcus/pull/94#issuecomment-505376760 +sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake + %build %{cmake} -DBUILD_EXAMPLES:BOOL=OFF -DCMAKE_SKIP_RPATH:BOOL=ON . -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=%{buildroot} +%make_install %files %license LICENSE @@ -81,6 +85,9 @@ make install DESTDIR=%{buildroot} %{python3_sitearch}/Arcus.so %changelog +* Tue Jun 18 2019 Gabriel Féron - 4.1.0-1 +- Update to 4.1.0 + * Wed Apr 03 2019 Gabriel Féron - 4.0.0-1 - Update to 4.0.0 diff --git a/sources b/sources index 0be8b4b..ab95bc9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libarcus-4.0.0.tar.gz) = 58df6f1cb74244270005a113641c5a8470dfc10ee222bc6a5e68dc803a7bbf3ad7905f982e70f73dc6f2ac98cec2cb577d65d47242eaef2ffdab2504e57e408c +SHA512 (libarcus-4.1.0.tar.gz) = 3d61016ebb043c9d9df0e3ff6b6be9f67a46901387ce20301bfa1a70b97e452556b2daf7371f7f90f3ba9eaca84c7c6e738d981e6ec87174af998f6de9e049e8 From b431a907a33777d5d3ddb030041e4450d3a3843d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 9 Jul 2019 20:41:56 +0200 Subject: [PATCH 32/86] Fix the License tag of the devel subpackage --- libarcus.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libarcus.spec b/libarcus.spec index 2786656..c3f3468 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -28,7 +28,7 @@ between Cura and its backend and similar code. %package devel # The cmake scripts are BSD -License: AGPLv3+ and BSD +License: LGPLv3+ and BSD Summary: Development files for libarcus Requires: %{name}%{?_isa} = %{version}-%{release} From dd426706e05dbb5acc71fd3335337d98989e3d70 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 12:48:24 +0000 Subject: [PATCH 33/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libarcus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libarcus.spec b/libarcus.spec index c3f3468..45a854c 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus Version: 4.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -85,6 +85,9 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %{python3_sitearch}/Arcus.so %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 4.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue Jun 18 2019 Gabriel Féron - 4.1.0-1 - Update to 4.1.0 From 254e7d15ab1b598c3c9f04457dbe57950fced66e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Aug 2019 10:17:30 +0200 Subject: [PATCH 34/86] Rebuilt for Python 3.8 --- libarcus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libarcus.spec b/libarcus.spec index 45a854c..822fe83 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus Version: 4.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -85,6 +85,9 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %{python3_sitearch}/Arcus.so %changelog +* Mon Aug 19 2019 Miro Hrončok - 4.1.0-3 +- Rebuilt for Python 3.8 + * Thu Jul 25 2019 Fedora Release Engineering - 4.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 921f0316aa8b9710f2fe0088409172ac74fdae80 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 16 Sep 2019 10:59:34 -0500 Subject: [PATCH 35/86] use python3-pyqt5-sip (#1748527#c12) --- libArcus-3.5.1-PyQt5.sip.patch | 20 ++++++++++++++++---- libarcus.spec | 9 ++++++--- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/libArcus-3.5.1-PyQt5.sip.patch b/libArcus-3.5.1-PyQt5.sip.patch index ec9fd5d..6f2cb24 100644 --- a/libArcus-3.5.1-PyQt5.sip.patch +++ b/libArcus-3.5.1-PyQt5.sip.patch @@ -1,7 +1,19 @@ -diff -up libArcus-3.3.0/CMakeLists.txt.sip libArcus-3.3.0/CMakeLists.txt ---- libArcus-3.3.0/CMakeLists.txt.sip 2017-10-28 17:28:39.000000000 -0500 -+++ libArcus-3.3.0/CMakeLists.txt 2018-08-23 09:19:22.608553543 -0500 -@@ -88,7 +88,7 @@ endif() +diff -up libArcus-4.1.0/cmake/FindSIP.cmake.sip libArcus-4.1.0/cmake/FindSIP.cmake +--- libArcus-4.1.0/cmake/FindSIP.cmake.sip 2019-04-10 02:00:57.000000000 -0500 ++++ libArcus-4.1.0/cmake/FindSIP.cmake 2019-09-16 10:55:35.906667181 -0500 +@@ -64,7 +64,7 @@ find_path(SIP_INCLUDE_DIRS sip.h + ) + + execute_process( +- COMMAND ${Python3_EXECUTABLE} -c "import sip; print(sip.SIP_VERSION_STR)" ++ COMMAND ${Python3_EXECUTABLE} -c "import PyQt5.sip; print(PyQt5.sip.SIP_VERSION_STR)" + RESULT_VARIABLE _process_status + OUTPUT_VARIABLE _process_output + OUTPUT_STRIP_TRAILING_WHITESPACE +diff -up libArcus-4.1.0/CMakeLists.txt.sip libArcus-4.1.0/CMakeLists.txt +--- libArcus-4.1.0/CMakeLists.txt.sip 2019-04-10 02:00:57.000000000 -0500 ++++ libArcus-4.1.0/CMakeLists.txt 2019-09-16 10:53:36.334104707 -0500 +@@ -93,7 +93,7 @@ endif() if(BUILD_PYTHON) set(SIP_EXTRA_FILES_DEPEND python/SocketListener.sip python/Types.sip python/PythonMessage.sip python/Error.sip) set(SIP_EXTRA_SOURCE_FILES python/PythonMessage.cpp) diff --git a/libarcus.spec b/libarcus.spec index 822fe83..eeb3a75 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus Version: 4.1.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -12,7 +12,7 @@ Patch1: libArcus-3.5.1-PyQt5.sip.patch BuildRequires: protobuf-devel BuildRequires: python3-devel BuildRequires: python3-protobuf -BuildRequires: python3-sip +BuildRequires: python3-pyqt5-sip BuildRequires: python3-sip-devel BuildRequires: /usr/bin/sip BuildRequires: cmake @@ -43,7 +43,7 @@ Development files. %package -n python3-arcus Summary: Python 3 libArcus bindings -Requires: python3-sip +%{?_sip_api:Requires: python3-pyqt5-sip-api(%{_sip_api_major}) >= %{_sip_api}} %{?python_provide:%python_provide python3-arcus} %description -n python3-arcus @@ -85,6 +85,9 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %{python3_sitearch}/Arcus.so %changelog +* Mon Sep 16 2019 Rex Dieter - 4.1.0-4 +- use python3-pyqt5-sip (#1748527#c12) + * Mon Aug 19 2019 Miro Hrončok - 4.1.0-3 - Rebuilt for Python 3.8 From a43df8c92f3115c48c4d4b33973d21a7cd4372a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 1 Nov 2019 17:32:03 +0100 Subject: [PATCH 36/86] Make the dependency of python3-arcus on libarcus strict Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1767762 --- libarcus.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libarcus.spec b/libarcus.spec index eeb3a75..a410ee8 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus Version: 4.1.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -43,6 +43,7 @@ Development files. %package -n python3-arcus Summary: Python 3 libArcus bindings +Requires: %{name}%{?_isa} = %{version}-%{release} %{?_sip_api:Requires: python3-pyqt5-sip-api(%{_sip_api_major}) >= %{_sip_api}} %{?python_provide:%python_provide python3-arcus} @@ -85,6 +86,9 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %{python3_sitearch}/Arcus.so %changelog +* Fri Nov 01 2019 Miro Hrončok - 4.1.0-5 +- Make the dependency of python3-arcus on libarcus strict (#1767762) + * Mon Sep 16 2019 Rex Dieter - 4.1.0-4 - use python3-pyqt5-sip (#1748527#c12) From 1ffe11be4b50fe4eff64d64e92bb888f9444f6e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= Date: Mon, 4 Nov 2019 20:33:39 +0100 Subject: [PATCH 37/86] Update to 4.4.0 --- .gitignore | 15 +-------------- libarcus.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index e2b80ea..df216ea 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1 @@ -/libarcus-2.4.0.tar.gz -/libarcus-2.5.0.tar.gz -/libarcus-2.6.0.tar.gz -/libarcus-2.6.1.tar.gz -/libarcus-2.7.0.tar.gz -/libarcus-3.0.3.tar.gz -/libarcus-3.1.0.tar.gz -/libarcus-3.2.1.tar.gz -/libarcus-3.3.0.tar.gz -/libarcus-3.4.1.tar.gz -/libarcus-3.5.1.tar.gz -/libarcus-3.6.0.tar.gz -/libarcus-4.0.0.tar.gz -/libarcus-4.1.0.tar.gz +/libarcus-*.tar.gz diff --git a/libarcus.spec b/libarcus.spec index a410ee8..da68f46 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus -Version: 4.1.0 -Release: 5%{?dist} +Version: 4.4.0 +Release: 1%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -86,6 +86,9 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %{python3_sitearch}/Arcus.so %changelog +* Thu Nov 21 2019 Gabriel Féron - 4.4.0-1 +- Update to 4.4.0 + * Fri Nov 01 2019 Miro Hrončok - 4.1.0-5 - Make the dependency of python3-arcus on libarcus strict (#1767762) diff --git a/sources b/sources index ab95bc9..ca6c984 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libarcus-4.1.0.tar.gz) = 3d61016ebb043c9d9df0e3ff6b6be9f67a46901387ce20301bfa1a70b97e452556b2daf7371f7f90f3ba9eaca84c7c6e738d981e6ec87174af998f6de9e049e8 +SHA512 (libarcus-4.4.0.tar.gz) = c469780b751ad8c0386732b715dfebba3abdd1c694c1375d74b09445c3bf5dc6f67784056a1089cbf7b95addc161d7abfed2907242082b08f4e36f7db0da9943 From 509aeab54ce30b8c8d3742019a6832ae4585c373 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 18 Dec 2019 20:32:25 -0700 Subject: [PATCH 38/86] Rebuild for protobuf 3.11 --- libarcus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libarcus.spec b/libarcus.spec index da68f46..6911ce0 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus Version: 4.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -86,6 +86,9 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %{python3_sitearch}/Arcus.so %changelog +* Thu Dec 19 2019 Orion Poplawski - 4.4.0-2 +- Rebuild for protobuf 3.11 + * Thu Nov 21 2019 Gabriel Féron - 4.4.0-1 - Update to 4.4.0 From 48a8f2e017b1869c987a1479da175a82b38c79fa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 08:35:22 +0000 Subject: [PATCH 39/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libarcus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libarcus.spec b/libarcus.spec index 6911ce0..54af09c 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus Version: 4.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -86,6 +86,9 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %{python3_sitearch}/Arcus.so %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 4.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Dec 19 2019 Orion Poplawski - 4.4.0-2 - Rebuild for protobuf 3.11 From 2a456ef8c49f1652e392b849c5161b15e3505a4b Mon Sep 17 00:00:00 2001 From: Gabriel Date: Tue, 21 Apr 2020 23:28:48 +0200 Subject: [PATCH 40/86] Update to 4.6.0 --- libarcus.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libarcus.spec b/libarcus.spec index 54af09c..0cb681e 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus -Version: 4.4.0 -Release: 3%{?dist} +Version: 4.6.0 +Release: 1%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -86,6 +86,9 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %{python3_sitearch}/Arcus.so %changelog +* Tue Apr 21 2020 Gabriel Féron - 4.6.0-1 +- Update to 4.6.0 + * Wed Jan 29 2020 Fedora Release Engineering - 4.4.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index ca6c984..e27a65c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libarcus-4.4.0.tar.gz) = c469780b751ad8c0386732b715dfebba3abdd1c694c1375d74b09445c3bf5dc6f67784056a1089cbf7b95addc161d7abfed2907242082b08f4e36f7db0da9943 +SHA512 (libarcus-4.6.0.tar.gz) = 9195040b1481dee4f902c49d327b21cb0de5da4f6d9fb8fda012c93d33189808b117943172173984aacb3a29499e4b55ea1030402223ef37e160e28f4840e8b5 From 74796e741b9e0ace408e96500859c41c1b62bfd1 Mon Sep 17 00:00:00 2001 From: Gabriel Date: Tue, 5 May 2020 18:47:32 +0200 Subject: [PATCH 41/86] Update to 4.6.1 --- libarcus.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libarcus.spec b/libarcus.spec index 0cb681e..dc2816a 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,5 +1,5 @@ Name: libarcus -Version: 4.6.0 +Version: 4.6.1 Release: 1%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ @@ -86,6 +86,9 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %{python3_sitearch}/Arcus.so %changelog +* Tue May 5 2020 Gabriel Féron - 4.6.0-1 +- Update to 4.6.1 + * Tue Apr 21 2020 Gabriel Féron - 4.6.0-1 - Update to 4.6.0 diff --git a/sources b/sources index e27a65c..697a778 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libarcus-4.6.0.tar.gz) = 9195040b1481dee4f902c49d327b21cb0de5da4f6d9fb8fda012c93d33189808b117943172173984aacb3a29499e4b55ea1030402223ef37e160e28f4840e8b5 +SHA512 (libarcus-4.6.1.tar.gz) = 3c56133fee2eb152f0557a1860d1d298b44a021a53247687ce938949c49e1999c3e2287552e67ff65a58bf6aecbd82c8412da394f83a9981bfa68d29e9501250 From 548bf915025d3fc4978f83c0385933fb8bd92ae5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 02:50:07 +0200 Subject: [PATCH 42/86] Rebuilt for Python 3.9 --- libarcus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libarcus.spec b/libarcus.spec index dc2816a..5c021ef 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus Version: 4.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -86,6 +86,9 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %{python3_sitearch}/Arcus.so %changelog +* Tue May 26 2020 Miro Hrončok - 4.6.1-2 +- Rebuilt for Python 3.9 + * Tue May 5 2020 Gabriel Féron - 4.6.0-1 - Update to 4.6.1 From f46cf977a9cf27b70a4a659160b55e995b8848b6 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Sat, 20 Jun 2020 18:49:15 +0200 Subject: [PATCH 43/86] Rebuilt for protobuf 3.12 --- libarcus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libarcus.spec b/libarcus.spec index 5c021ef..cdf6038 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus Version: 4.6.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -86,6 +86,9 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %{python3_sitearch}/Arcus.so %changelog +* Sun Jun 14 2020 Adrian Reber - 4.6.1-3 +- Rebuilt for protobuf 3.12 + * Tue May 26 2020 Miro Hrončok - 4.6.1-2 - Rebuilt for Python 3.9 From 0b08ba97df8f9f6a67ef9857636af77c8aba5617 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sun, 26 Jul 2020 15:08:37 +0200 Subject: [PATCH 44/86] https://fedoraproject.org/wiki/Changes/CMake_to_do_out-of-source_builds --- libarcus.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libarcus.spec b/libarcus.spec index cdf6038..1f56c18 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -19,6 +19,9 @@ BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: git-core +# Get Fedora 33++ behavior on anything older +%undefine __cmake_in_source_build + %description Arcus library contains C++ code and Python 3 bindings for creating a socket in a thread and using this socket to send and receive messages based on the @@ -60,11 +63,11 @@ between Cura and its backend and similar code. sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %build -%{cmake} -DBUILD_EXAMPLES:BOOL=OFF -DCMAKE_SKIP_RPATH:BOOL=ON . -%make_build +%cmake -DBUILD_EXAMPLES:BOOL=OFF -DCMAKE_SKIP_RPATH:BOOL=ON . +%cmake_build %install -%make_install +%cmake_install %files %license LICENSE From 034534cefbec87e77072f4594fe533ddb8fb691d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 04:14:48 +0000 Subject: [PATCH 45/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libarcus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libarcus.spec b/libarcus.spec index 1f56c18..8288373 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus Version: 4.6.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -89,6 +89,9 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %{python3_sitearch}/Arcus.so %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 4.6.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sun Jun 14 2020 Adrian Reber - 4.6.1-3 - Rebuilt for protobuf 3.12 From 72d36118693a43291ba5ade79627d2d3b340a725 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= Date: Mon, 31 Aug 2020 20:56:18 +0200 Subject: [PATCH 46/86] Update to 4.7.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Gabriel Féron --- libarcus.spec | 4 ++-- sources | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libarcus.spec b/libarcus.spec index 8288373..5419a46 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus -Version: 4.6.1 -Release: 4%{?dist} +Version: 4.7.0 +Release: 1%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus diff --git a/sources b/sources index 697a778..7ce5106 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libarcus-4.6.1.tar.gz) = 3c56133fee2eb152f0557a1860d1d298b44a021a53247687ce938949c49e1999c3e2287552e67ff65a58bf6aecbd82c8412da394f83a9981bfa68d29e9501250 +SHA512 (libarcus-4.7.0.tar.gz) = 5eb8e84ff8e87966fc3ff1d71ec69f8fece493e25e022f7f1ba7ef218e75b5be86cededc28faf57634b09617990f62247e6cd6f373f940cf145ee6d8e8635374 From c524b715dca3935086306c00a7e353b3e52e7e63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 3 Sep 2020 18:31:08 +0200 Subject: [PATCH 47/86] Update to 4.7.1 --- libarcus.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libarcus.spec b/libarcus.spec index 5419a46..bd76b10 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,5 +1,5 @@ Name: libarcus -Version: 4.7.0 +Version: 4.7.1 Release: 1%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ @@ -89,6 +89,9 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %{python3_sitearch}/Arcus.so %changelog +* Thu Sep 03 2020 Miro Hrončok - 4.7.1-1 +- Update to 4.7.1 + * Tue Jul 28 2020 Fedora Release Engineering - 4.6.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 7ce5106..e4a6359 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libarcus-4.7.0.tar.gz) = 5eb8e84ff8e87966fc3ff1d71ec69f8fece493e25e022f7f1ba7ef218e75b5be86cededc28faf57634b09617990f62247e6cd6f373f940cf145ee6d8e8635374 +SHA512 (libarcus-4.7.1.tar.gz) = be99b9381e61c50e6b08652485657c2b59a4a62caeaddf9265667a3d771e6ed04c2083e357bf8c2f87e2a41d9bd378feafaf825e8ba4678cf6ce7b1ec50d2c7c From 5566a1ce56fcfd1af06fbd8904543febe9e802d6 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Wed, 23 Sep 2020 17:15:57 +0200 Subject: [PATCH 48/86] Rebuilt for protobuf 3.13 --- libarcus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libarcus.spec b/libarcus.spec index bd76b10..361d3f3 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus Version: 4.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -89,6 +89,9 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %{python3_sitearch}/Arcus.so %changelog +* Wed Sep 23 2020 Adrian Reber - 4.7.1-2 +- Rebuilt for protobuf 3.13 + * Thu Sep 03 2020 Miro Hrončok - 4.7.1-1 - Update to 4.7.1 From 6f275ccfc1afe65070c53a2b748fc30a54d703bd Mon Sep 17 00:00:00 2001 From: Jan Pazdziora Date: Tue, 22 Dec 2020 23:31:00 +0100 Subject: [PATCH 49/86] Update to 4.8.0 --- libarcus.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libarcus.spec b/libarcus.spec index 361d3f3..e2044f7 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus -Version: 4.7.1 -Release: 2%{?dist} +Version: 4.8.0 +Release: 1%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -89,6 +89,9 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %{python3_sitearch}/Arcus.so %changelog +* Tue Dec 22 2020 Jan Pazdziora - 4.8.0-1 +- Update to 4.8.0 + * Wed Sep 23 2020 Adrian Reber - 4.7.1-2 - Rebuilt for protobuf 3.13 diff --git a/sources b/sources index e4a6359..9582a5f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libarcus-4.7.1.tar.gz) = be99b9381e61c50e6b08652485657c2b59a4a62caeaddf9265667a3d771e6ed04c2083e357bf8c2f87e2a41d9bd378feafaf825e8ba4678cf6ce7b1ec50d2c7c +SHA512 (libarcus-4.8.0.tar.gz) = 44db9b48ab6be08c30f2121d68197a7347eaf3ee255649969a773afbe45ec2433e2cc082aa72f6d40dad7ea28345da858471fff9a129365a4e848df8c8c07689 From 5e8ea90ef32127a478e29b35469dd39683589013 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Wed, 13 Jan 2021 09:45:38 +0100 Subject: [PATCH 50/86] Rebuilt for protobuf 3.14 --- libarcus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libarcus.spec b/libarcus.spec index e2044f7..3ae9752 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus Version: 4.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -89,6 +89,9 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %{python3_sitearch}/Arcus.so %changelog +* Wed Jan 13 09:45:36 CET 2021 Adrian Reber - 4.8.0-2 +- Rebuilt for protobuf 3.14 + * Tue Dec 22 2020 Jan Pazdziora - 4.8.0-1 - Update to 4.8.0 From 2da0fe20c06f909d8a9dc0373eccf12afb9bbbbd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 16:39:50 +0000 Subject: [PATCH 51/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libarcus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libarcus.spec b/libarcus.spec index 3ae9752..6fd45bf 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus Version: 4.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -89,6 +89,9 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %{python3_sitearch}/Arcus.so %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 4.8.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jan 13 09:45:36 CET 2021 Adrian Reber - 4.8.0-2 - Rebuilt for protobuf 3.14 From 072c9be08f11c7c72d035c445001170b6b915f6f Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 30 Mar 2021 19:37:00 +0100 Subject: [PATCH 52/86] Rebuilt for removed libstdc++ symbol (#1937698) --- libarcus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libarcus.spec b/libarcus.spec index 6fd45bf..a2fb7fa 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus Version: 4.8.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -89,6 +89,9 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %{python3_sitearch}/Arcus.so %changelog +* Tue Mar 30 2021 Jonathan Wakely - 4.8.0-4 +- Rebuilt for removed libstdc++ symbol (#1937698) + * Tue Jan 26 2021 Fedora Release Engineering - 4.8.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From fb24da97b015c4bc90bb2e2f46edc68415497a9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= Date: Mon, 26 Apr 2021 11:38:07 +0200 Subject: [PATCH 53/86] Update to 4.9.0 --- libarcus.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libarcus.spec b/libarcus.spec index a2fb7fa..4105772 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus -Version: 4.8.0 -Release: 4%{?dist} +Version: 4.9.0 +Release: 1%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -89,6 +89,9 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %{python3_sitearch}/Arcus.so %changelog +* Mon Apr 26 2021 Gabriel Féron - 4.9.0-1 +- Update to 4.9.0 + * Tue Mar 30 2021 Jonathan Wakely - 4.8.0-4 - Rebuilt for removed libstdc++ symbol (#1937698) diff --git a/sources b/sources index 9582a5f..e02342e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libarcus-4.8.0.tar.gz) = 44db9b48ab6be08c30f2121d68197a7347eaf3ee255649969a773afbe45ec2433e2cc082aa72f6d40dad7ea28345da858471fff9a129365a4e848df8c8c07689 +SHA512 (libarcus-4.9.0.tar.gz) = b2427cb4ca425dea7badc6b2cdd13c97eb56e6dc26122ff69a7287dc6f898df5bfe4bd7d69562b6016933e8623786b5380391fc277d9b0cedca368d34ad1504c From 68d508e65a6e1adca3c5ebfc6b06a01c536705ea Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 20:08:53 +0200 Subject: [PATCH 54/86] Rebuilt for Python 3.10 --- libarcus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libarcus.spec b/libarcus.spec index 4105772..87981ed 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus Version: 4.9.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -89,6 +89,9 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %{python3_sitearch}/Arcus.so %changelog +* Fri Jun 04 2021 Python Maint - 4.9.0-2 +- Rebuilt for Python 3.10 + * Mon Apr 26 2021 Gabriel Féron - 4.9.0-1 - Update to 4.9.0 From 42e486e7c23c67e49891f7efab6de089b513c3cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= Date: Thu, 10 Jun 2021 15:42:16 +0200 Subject: [PATCH 55/86] Update to 4.9.1 --- libarcus.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libarcus.spec b/libarcus.spec index 87981ed..e76394a 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus -Version: 4.9.0 -Release: 2%{?dist} +Version: 4.9.1 +Release: 1%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -89,6 +89,9 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %{python3_sitearch}/Arcus.so %changelog +* Thu Jun 10 2021 Gabriel Féron - 4.9.1-1 +- Update to 4.9.1 + * Fri Jun 04 2021 Python Maint - 4.9.0-2 - Rebuilt for Python 3.10 diff --git a/sources b/sources index e02342e..0a5e956 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libarcus-4.9.0.tar.gz) = b2427cb4ca425dea7badc6b2cdd13c97eb56e6dc26122ff69a7287dc6f898df5bfe4bd7d69562b6016933e8623786b5380391fc277d9b0cedca368d34ad1504c +SHA512 (libarcus-4.9.1.tar.gz) = 5124b80647cb0715ad94c5eaaeac797a867319de9a8064b689783fdb28598903a69e3a61393db90f5e0b3d10ee30aed844170cab63dc4b7c70509d5129a17cdd From 39489e34318d5329d69ff3d5d03dbeecebd86c1d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 10:57:47 +0000 Subject: [PATCH 56/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libarcus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libarcus.spec b/libarcus.spec index e76394a..5a7dd60 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus Version: 4.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -89,6 +89,9 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %{python3_sitearch}/Arcus.so %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 4.9.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jun 10 2021 Gabriel Féron - 4.9.1-1 - Update to 4.9.1 From 1e925633b686b7a2be039170b9cacea39ef69298 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= Date: Mon, 16 Aug 2021 11:34:49 +0200 Subject: [PATCH 57/86] Update to 4.10.0 --- libArcus-3.10.0-PyQt5.sip.patch | 12 ++++++++++++ libArcus-3.5.1-PyQt5.sip.patch | 24 ------------------------ libarcus.spec | 9 ++++++--- sources | 2 +- 4 files changed, 19 insertions(+), 28 deletions(-) create mode 100644 libArcus-3.10.0-PyQt5.sip.patch delete mode 100644 libArcus-3.5.1-PyQt5.sip.patch diff --git a/libArcus-3.10.0-PyQt5.sip.patch b/libArcus-3.10.0-PyQt5.sip.patch new file mode 100644 index 0000000..3474500 --- /dev/null +++ b/libArcus-3.10.0-PyQt5.sip.patch @@ -0,0 +1,12 @@ +diff -up libArcus-4.10.0/cmake/FindSIP.cmake.sip libArcus-4.10.0/cmake/FindSIP.cmake +--- libArcus-4.10.0/cmake/FindSIP.cmake.sip ++++ libArcus-4.10.0/cmake/FindSIP.cmake +@@ -70,7 +70,7 @@ find_path(SIP_INCLUDE_DIRS sip.h + ) + + execute_process( +- COMMAND ${Python3_EXECUTABLE} -c "import sip; print(sip.SIP_VERSION_STR)" ++ COMMAND ${Python3_EXECUTABLE} -c "import PyQt5.sip; print(PyQt5.sip.SIP_VERSION_STR)" + RESULT_VARIABLE _process_status + OUTPUT_VARIABLE _process_output + OUTPUT_STRIP_TRAILING_WHITESPACE diff --git a/libArcus-3.5.1-PyQt5.sip.patch b/libArcus-3.5.1-PyQt5.sip.patch deleted file mode 100644 index 6f2cb24..0000000 --- a/libArcus-3.5.1-PyQt5.sip.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up libArcus-4.1.0/cmake/FindSIP.cmake.sip libArcus-4.1.0/cmake/FindSIP.cmake ---- libArcus-4.1.0/cmake/FindSIP.cmake.sip 2019-04-10 02:00:57.000000000 -0500 -+++ libArcus-4.1.0/cmake/FindSIP.cmake 2019-09-16 10:55:35.906667181 -0500 -@@ -64,7 +64,7 @@ find_path(SIP_INCLUDE_DIRS sip.h - ) - - execute_process( -- COMMAND ${Python3_EXECUTABLE} -c "import sip; print(sip.SIP_VERSION_STR)" -+ COMMAND ${Python3_EXECUTABLE} -c "import PyQt5.sip; print(PyQt5.sip.SIP_VERSION_STR)" - RESULT_VARIABLE _process_status - OUTPUT_VARIABLE _process_output - OUTPUT_STRIP_TRAILING_WHITESPACE -diff -up libArcus-4.1.0/CMakeLists.txt.sip libArcus-4.1.0/CMakeLists.txt ---- libArcus-4.1.0/CMakeLists.txt.sip 2019-04-10 02:00:57.000000000 -0500 -+++ libArcus-4.1.0/CMakeLists.txt 2019-09-16 10:53:36.334104707 -0500 -@@ -93,7 +93,7 @@ endif() - if(BUILD_PYTHON) - set(SIP_EXTRA_FILES_DEPEND python/SocketListener.sip python/Types.sip python/PythonMessage.sip python/Error.sip) - set(SIP_EXTRA_SOURCE_FILES python/PythonMessage.cpp) -- set(SIP_EXTRA_OPTIONS -g) # -g means always release the GIL before calling C++ methods. -+ set(SIP_EXTRA_OPTIONS -g -n PyQt5.sip) # -g means always release the GIL before calling C++ methods. - add_sip_python_module(Arcus python/Socket.sip Arcus) - endif() - diff --git a/libarcus.spec b/libarcus.spec index 5a7dd60..d309ddb 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,13 +1,13 @@ Name: libarcus -Version: 4.9.1 -Release: 2%{?dist} +Version: 4.10.0 +Release: 1%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz # https://bugzilla.redhat.com/show_bug.cgi?id=1601917 -Patch1: libArcus-3.5.1-PyQt5.sip.patch +Patch1: libArcus-3.10.0-PyQt5.sip.patch BuildRequires: protobuf-devel BuildRequires: python3-devel @@ -89,6 +89,9 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %{python3_sitearch}/Arcus.so %changelog +* Mon Aug 16 2021 Gabriel Féron - 4.10.0-1 +- Update to 4.10.0 + * Thu Jul 22 2021 Fedora Release Engineering - 4.9.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 0a5e956..d8675a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libarcus-4.9.1.tar.gz) = 5124b80647cb0715ad94c5eaaeac797a867319de9a8064b689783fdb28598903a69e3a61393db90f5e0b3d10ee30aed844170cab63dc4b7c70509d5129a17cdd +SHA512 (libarcus-4.10.0.tar.gz) = 452c541360d74a8f58ab1b20df59efd36756812a9ecd09804ba16877956fb240d367bd968271a9c010496598ef0b459f62aa287553d4ba3fdb4cd2742c25553f From be87862687b14336495930c1dfd35f702207196a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= Date: Wed, 15 Sep 2021 23:55:39 +0200 Subject: [PATCH 58/86] Update to 4.11.0 --- libarcus.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libarcus.spec b/libarcus.spec index d309ddb..7de936f 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,5 +1,5 @@ Name: libarcus -Version: 4.10.0 +Version: 4.11.0 Release: 1%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ @@ -89,6 +89,9 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %{python3_sitearch}/Arcus.so %changelog +* Wed Sep 15 2021 Gabriel Féron - 4.11.0-1 +- Update to 4.11.0 + * Mon Aug 16 2021 Gabriel Féron - 4.10.0-1 - Update to 4.10.0 diff --git a/sources b/sources index d8675a7..aa18939 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libarcus-4.10.0.tar.gz) = 452c541360d74a8f58ab1b20df59efd36756812a9ecd09804ba16877956fb240d367bd968271a9c010496598ef0b459f62aa287553d4ba3fdb4cd2742c25553f +SHA512 (libarcus-4.11.0.tar.gz) = 3a23b63787121b510f35c77f8d184a1773a8e53e7e15a238a7454022c30674a687d9b74414516c24f3330e8689243fad93e82eb50f3d8a64b748020bd2c7b135 From 856110586fb67bdd9ee182c55f0e6381e8b10897 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Mon, 25 Oct 2021 09:41:35 +0200 Subject: [PATCH 59/86] Rebuilt for protobuf 3.18.1 --- libarcus.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libarcus.spec b/libarcus.spec index 7de936f..3ba0bb9 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus Version: 4.11.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -8,6 +8,7 @@ Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz # https://bugzilla.redhat.com/show_bug.cgi?id=1601917 Patch1: libArcus-3.10.0-PyQt5.sip.patch +Patch2: https://raw.githubusercontent.com/coryan/vcpkg/f69b85aa403b04e7d442c90db3418d484e44024f/ports/arcus/0001-fix-protobuf-deprecated.patch BuildRequires: protobuf-devel BuildRequires: python3-devel @@ -89,6 +90,9 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %{python3_sitearch}/Arcus.so %changelog +* Mon Oct 25 2021 Adrian Reber - 4.11.0-2 +- Rebuilt for protobuf 3.18.1 + * Wed Sep 15 2021 Gabriel Féron - 4.11.0-1 - Update to 4.11.0 From 058de97213080cd5e16df57598eb6b5e9a41203c Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Mon, 25 Oct 2021 10:05:00 +0200 Subject: [PATCH 60/86] Added forgotten protobuf build fix patch --- 0001-fix-protobuf-deprecated.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 0001-fix-protobuf-deprecated.patch diff --git a/0001-fix-protobuf-deprecated.patch b/0001-fix-protobuf-deprecated.patch new file mode 100644 index 0000000..a40da84 --- /dev/null +++ b/0001-fix-protobuf-deprecated.patch @@ -0,0 +1,13 @@ +diff --git a/src/Socket_p.h b/src/Socket_p.h +index 9c3c084..9ccabda 100644 +--- a/src/Socket_p.h ++++ b/src/Socket_p.h +@@ -548,7 +548,7 @@ namespace Arcus + + google::protobuf::io::ArrayInputStream array(wire_message->data, wire_message->size); + google::protobuf::io::CodedInputStream stream(&array); +- stream.SetTotalBytesLimit(message_size_maximum, message_size_warning); ++ stream.SetTotalBytesLimit(message_size_maximum); + if(!message->ParseFromCodedStream(&stream)) + { + error(ErrorCode::ParseFailedError, "Failed to parse message:" + std::string(wire_message->data)); From c7ec5f51250a19732c816374e7cf53952a24caa6 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Sat, 6 Nov 2021 10:24:41 +0100 Subject: [PATCH 61/86] Rebuilt for protobuf 3.19.0 --- libarcus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libarcus.spec b/libarcus.spec index 3ba0bb9..f793903 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus Version: 4.11.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -90,6 +90,9 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %{python3_sitearch}/Arcus.so %changelog +* Sat Nov 06 2021 Adrian Reber - 4.11.0-3 +- Rebuilt for protobuf 3.19.0 + * Mon Oct 25 2021 Adrian Reber - 4.11.0-2 - Rebuilt for protobuf 3.18.1 From 1a7e8863a498a6bee583b8e2efff7c78d80d9c9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= Date: Mon, 13 Dec 2021 09:51:43 +0100 Subject: [PATCH 62/86] Update to 4.12.1 --- libarcus.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libarcus.spec b/libarcus.spec index f793903..a41d48a 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus -Version: 4.11.0 -Release: 3%{?dist} +Version: 4.12.1 +Release: 1%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -90,6 +90,9 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %{python3_sitearch}/Arcus.so %changelog +* Mon Dec 13 2021 Gabriel Féron - 4.12.1-1 +- Update to 4.12.1 + * Sat Nov 06 2021 Adrian Reber - 4.11.0-3 - Rebuilt for protobuf 3.19.0 diff --git a/sources b/sources index aa18939..3c590a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libarcus-4.11.0.tar.gz) = 3a23b63787121b510f35c77f8d184a1773a8e53e7e15a238a7454022c30674a687d9b74414516c24f3330e8689243fad93e82eb50f3d8a64b748020bd2c7b135 +SHA512 (libarcus-4.12.1.tar.gz) = 0b2f2a0b4c3492725b83f2c8b0bb38a2cba10c27317cedd722b27447f0e36c571f1ae7a796de29cfb30e9827f35449327cc20c21780212fdeb35d05c90c3e2e6 From 13def313edd9ae3215f4898d22e1122551e4f829 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 15:46:02 +0000 Subject: [PATCH 63/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libarcus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libarcus.spec b/libarcus.spec index a41d48a..df86533 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus Version: 4.12.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -90,6 +90,9 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %{python3_sitearch}/Arcus.so %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 4.12.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Mon Dec 13 2021 Gabriel Féron - 4.12.1-1 - Update to 4.12.1 From 04890e5d35b1a3e69eccbb19a9977da7c7da1404 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= Date: Tue, 11 Jan 2022 20:07:21 +0100 Subject: [PATCH 64/86] Update to 4.13.0 --- libarcus.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libarcus.spec b/libarcus.spec index df86533..fd258d0 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus -Version: 4.12.1 -Release: 2%{?dist} +Version: 4.13.0 +Release: 1%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -90,6 +90,9 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %{python3_sitearch}/Arcus.so %changelog +* Thu Jan 20 2022 Gabriel Féron - 4.13.0-1 +- Update to 4.13.0 + * Thu Jan 20 2022 Fedora Release Engineering - 4.12.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 3c590a5..7b7b6c1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libarcus-4.12.1.tar.gz) = 0b2f2a0b4c3492725b83f2c8b0bb38a2cba10c27317cedd722b27447f0e36c571f1ae7a796de29cfb30e9827f35449327cc20c21780212fdeb35d05c90c3e2e6 +SHA512 (libarcus-4.13.0.tar.gz) = a48ab1cb286c13b817363e113707499f2619724c8d2f7672309f9aad78123a89f60e60e92932d8761af87ec5f868f8c319717457532d45e3f2d8e5c3cc010db5 From 5c4c9783f2d2715fd06b1c6cf3f529a63f1a799b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= Date: Tue, 1 Feb 2022 11:11:15 +0100 Subject: [PATCH 65/86] Update to 4.13.1 --- libarcus.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libarcus.spec b/libarcus.spec index fd258d0..feefc76 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,5 +1,5 @@ Name: libarcus -Version: 4.13.0 +Version: 4.13.1 Release: 1%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ @@ -90,6 +90,9 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %{python3_sitearch}/Arcus.so %changelog +* Tue Feb 01 2022 Gabriel Féron - 4.13.1-1 +- Update to 4.13.1 + * Thu Jan 20 2022 Gabriel Féron - 4.13.0-1 - Update to 4.13.0 diff --git a/sources b/sources index 7b7b6c1..7b2321a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libarcus-4.13.0.tar.gz) = a48ab1cb286c13b817363e113707499f2619724c8d2f7672309f9aad78123a89f60e60e92932d8761af87ec5f868f8c319717457532d45e3f2d8e5c3cc010db5 +SHA512 (libarcus-4.13.1.tar.gz) = ffb14595f23c47f71082b994eae01471f45e2e9e1ae9a8ad01df577b9445594c30173388beab016a92be9723638ca6e46b5cecddddc6adc97e9d212fc0fa23fa From 5b4abb1317e4020b5f903679611dc4b2cca498aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= Date: Mon, 11 Apr 2022 09:15:06 +0200 Subject: [PATCH 66/86] Fix build failure with cmake 3.23+ --- libarcus.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libarcus.spec b/libarcus.spec index feefc76..c339b1b 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus Version: 4.13.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -64,7 +64,7 @@ between Cura and its backend and similar code. sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %build -%cmake -DBUILD_EXAMPLES:BOOL=OFF -DCMAKE_SKIP_RPATH:BOOL=ON . +%cmake -DBUILD_EXAMPLES:BOOL=OFF -DCMAKE_SKIP_RPATH:BOOL=ON %cmake_build %install @@ -90,6 +90,9 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %{python3_sitearch}/Arcus.so %changelog +* Mon Apr 11 2022 Tomáš Hrnčiar - 4.13.1-2 +- Fix build failure with cmake 3.23+ + * Tue Feb 01 2022 Gabriel Féron - 4.13.1-1 - Update to 4.13.1 From 02c9848fde75323bd6077a8a7341a546325d329e Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 17 Jun 2022 13:13:09 +0200 Subject: [PATCH 67/86] Rebuilt for Python 3.11 --- libarcus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libarcus.spec b/libarcus.spec index c339b1b..b4c1199 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus Version: 4.13.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -90,6 +90,9 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %{python3_sitearch}/Arcus.so %changelog +* Fri Jun 17 2022 Python Maint - 4.13.1-3 +- Rebuilt for Python 3.11 + * Mon Apr 11 2022 Tomáš Hrnčiar - 4.13.1-2 - Fix build failure with cmake 3.23+ From 41fc3892cb4aeaf64f46613d41df5a3b9f31993e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 18 Jul 2022 14:44:44 +0200 Subject: [PATCH 68/86] https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval --- libarcus.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libarcus.spec b/libarcus.spec index b4c1199..b9b59fd 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -20,6 +20,11 @@ BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: git-core +# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +%if 0%{?fedora} >= 37 || 0%{?rhel} >= 10 +ExcludeArch: %{ix86} +%endif + # Get Fedora 33++ behavior on anything older %undefine __cmake_in_source_build From 80dd256d142d7cfc18dcc434e34633bbdcb4af36 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 17:19:03 +0000 Subject: [PATCH 69/86] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libarcus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libarcus.spec b/libarcus.spec index b9b59fd..ae38462 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus Version: 4.13.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -95,6 +95,9 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %{python3_sitearch}/Arcus.so %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 4.13.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jun 17 2022 Python Maint - 4.13.1-3 - Rebuilt for Python 3.11 From f2dc678caec43081048c973a00936bd75c28c922 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 18 Oct 2022 12:18:42 +0200 Subject: [PATCH 70/86] BR setuptools on Python 3.12+ --- libarcus.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libarcus.spec b/libarcus.spec index ae38462..a86de3d 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -20,6 +20,10 @@ BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: git-core +# we add a dependency on setuptools to provide the distutils module +# upstream already removed the distutils usage in version 5+ +BuildRequires: (python3-setuptools if python3-devel >= 3.12) + # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval %if 0%{?fedora} >= 37 || 0%{?rhel} >= 10 ExcludeArch: %{ix86} From a0dc5571c4fe1c3354811bc2497a7615f28b43f3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 15:50:28 +0000 Subject: [PATCH 71/86] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libarcus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libarcus.spec b/libarcus.spec index a86de3d..411c822 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus Version: 4.13.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -99,6 +99,9 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %{python3_sitearch}/Arcus.so %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 4.13.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 4.13.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From cb5a355f7e21a5278815c5dbd5d4b0af3af24df9 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 9 Mar 2023 09:49:47 -0500 Subject: [PATCH 72/86] update to 5.2.2 --- .gitignore | 1 + ArcusConfig.cmake.in | 10 ++ CMakeLists.txt | 163 +++++++++++++++++++ COPYING-CMAKE-SCRIPTS | 22 +++ CPackConfig.cmake | 24 +++ FindSIP.cmake | 92 +++++++++++ SIPMacros.cmake | 128 +++++++++++++++ libArcus-3.10.0-PyQt6.sip.patch | 12 ++ libArcus-5.2.2-actually-export-symbols.patch | 90 ++++++++++ libarcus.spec | 46 ++++-- sources | 3 +- 11 files changed, 579 insertions(+), 12 deletions(-) create mode 100644 ArcusConfig.cmake.in create mode 100644 CMakeLists.txt create mode 100644 COPYING-CMAKE-SCRIPTS create mode 100644 CPackConfig.cmake create mode 100644 FindSIP.cmake create mode 100644 SIPMacros.cmake create mode 100644 libArcus-3.10.0-PyQt6.sip.patch create mode 100644 libArcus-5.2.2-actually-export-symbols.patch diff --git a/.gitignore b/.gitignore index df216ea..57a3d47 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /libarcus-*.tar.gz +/pyArcus-5.2.2.tar.gz diff --git a/ArcusConfig.cmake.in b/ArcusConfig.cmake.in new file mode 100644 index 0000000..3208a69 --- /dev/null +++ b/ArcusConfig.cmake.in @@ -0,0 +1,10 @@ +@PACKAGE_INIT@ + +# We want to have access to protobuf_generate_cpp and other FindProtobuf features. +# However, if ProtobufConfig is used instead, there is a CMake option that controls +# this, which defaults to OFF. We need to force this option to ON instead. +set(protobuf_MODULE_COMPATIBLE ON CACHE "" INTERNAL FORCE) +find_package(Protobuf 3.0.0 REQUIRED) + +get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) +include(${SELF_DIR}/Arcus-targets.cmake) diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..a768927 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,163 @@ +project(arcus) +cmake_minimum_required(VERSION 3.8) + +include(GNUInstallDirs) +include(CMakePackageConfigHelpers) +include(GenerateExportHeader) + +option(BUILD_PYTHON "Build " ON) +option(BUILD_EXAMPLES "Build the example programs" ON) +option(BUILD_STATIC "Build as a static library" OFF) + +if(WIN32) + option(MSVC_STATIC_RUNTIME "Link the MSVC runtime statically" OFF) +endif() + +# We want to have access to protobuf_generate_cpp and other FindProtobuf features. +# However, if ProtobufConfig is used instead, there is a CMake option that controls +# this, which defaults to OFF. We need to force this option to ON instead. +set(protobuf_MODULE_COMPATIBLE ON CACHE INTERNAL "" FORCE) +find_package(Protobuf 3.0.0 REQUIRED) + +set(CMAKE_POSITION_INDEPENDENT_CODE ON) #Required if a patch to libArcus needs to be made via templates. + +if(BUILD_PYTHON) + list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) + + # FIXME: Remove the code for CMake <3.12 once we have switched over completely. + # FindPython3 is a new module since CMake 3.12. It deprecates FindPythonInterp and FindPythonLibs. + if(${CMAKE_VERSION} VERSION_LESS 3.12) + # FIXME: Use FindPython3 to find Python, new in CMake 3.12. + # However currently on our CI server it finds the wrong Python version and then doesn't find the headers. + find_package(PythonInterp 3.4 REQUIRED) + find_package(PythonLibs 3.4 REQUIRED) + + else() + # Use FindPython3 for CMake >=3.12 + find_package(Python3 3.4 REQUIRED COMPONENTS Interpreter Development) + endif() + + find_package(SIP REQUIRED) + if(NOT DEFINED LIB_SUFFIX) + set(LIB_SUFFIX "") + endif() + + include_directories(python/ include/pyArcus/ src/ ${SIP_INCLUDE_DIRS} ${Python3_INCLUDE_DIRS}) +endif() + +set(CMAKE_CXX_STANDARD 17) + +if(APPLE AND CMAKE_CXX_COMPILER_ID MATCHES "Clang") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") +endif() + +set(arcus_SRCS + src/Socket.cpp + src/SocketListener.cpp + src/MessageTypeStore.cpp + src/PlatformSocket.cpp + src/Error.cpp +) + +set(arcus_HDRS + include/Arcus/Socket.h + include/Arcus/SocketListener.h + include/Arcus/Types.h + include/Arcus/MessageTypeStore.h + include/Arcus/Error.h + ${CMAKE_CURRENT_BINARY_DIR}/src/ArcusExport.h +) + +set(ARCUS_VERSION 1.1.0) +set(ARCUS_SOVERSION 3) + +set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}") + +if(BUILD_STATIC) + add_library(Arcus STATIC ${arcus_SRCS}) + if(NOT WIN32 OR CMAKE_COMPILER_IS_GNUCXX) + target_link_libraries(Arcus PRIVATE pthread) + set_target_properties(Arcus PROPERTIES COMPILE_FLAGS -fPIC) + endif() +else() + add_library(Arcus SHARED ${arcus_SRCS}) +endif() + +if(MSVC_STATIC_RUNTIME) + foreach(flag_var + CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE + CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO) + if(${flag_var} MATCHES "/MD") + string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}") + endif(${flag_var} MATCHES "/MD") + endforeach(flag_var) +endif() + +if(BUILD_PYTHON) + set(SIP_EXTRA_FILES_DEPEND python/SocketListener.sip python/Types.sip python/PythonMessage.sip python/Error.sip) + set(SIP_EXTRA_SOURCE_FILES python/PythonMessage.cpp) + set(SIP_EXTRA_OPTIONS -g -n PyQt5.sip) # -g means always release the GIL before calling C++ methods. -n PyQt5.sip is required to not get the PyCapsule error + add_sip_python_module(pyArcus python/pyArcus.sip Arcus) +endif() + +target_include_directories(Arcus PUBLIC + $ + $ + ${PROTOBUF_INCLUDE_DIR} +) +target_link_libraries(Arcus PUBLIC ${PROTOBUF_LIBRARIES}) + +if(WIN32) + add_definitions(-D_WIN32_WINNT=0x0600) # Declare we require Vista or higher, this allows us to use IPv6 functions. + target_link_libraries(Arcus PUBLIC Ws2_32) +endif() + +if(${CMAKE_BUILD_TYPE}) + if(${CMAKE_BUILD_TYPE} STREQUAL "Debug" OR ${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo") + add_definitions(-DARCUS_DEBUG) + endif() +endif() + +set_target_properties(Arcus PROPERTIES + FRAMEWORK FALSE + VERSION ${ARCUS_VERSION} + SOVERSION ${ARCUS_SOVERSION} + PUBLIC_HEADER "${arcus_HDRS}" + DEFINE_SYMBOL MAKE_ARCUS_LIB + CXX_VISIBILITY_PRESET hidden + VISIBILITY_INLINES_HIDDEN 1 +) + +generate_export_header(Arcus + EXPORT_FILE_NAME src/ArcusExport.h +) +# This is required when building out-of-tree. +# The compiler won't find the generated header otherwise. +include_directories(${CMAKE_BINARY_DIR}/src include/) + +if(BUILD_EXAMPLES) + add_subdirectory(examples) +endif() + +install(TARGETS Arcus + EXPORT Arcus-targets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Arcus +) + +install(EXPORT Arcus-targets + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Arcus +) + +configure_package_config_file(ArcusConfig.cmake.in ${CMAKE_BINARY_DIR}/ArcusConfig.cmake INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Arcus) +write_basic_package_version_file(${CMAKE_BINARY_DIR}/ArcusConfigVersion.cmake VERSION ${ARCUS_VERSION} COMPATIBILITY SameMajorVersion) + +install(FILES + ${CMAKE_BINARY_DIR}/ArcusConfig.cmake + ${CMAKE_BINARY_DIR}/ArcusConfigVersion.cmake + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Arcus +) + +include(CPackConfig.cmake) diff --git a/COPYING-CMAKE-SCRIPTS b/COPYING-CMAKE-SCRIPTS new file mode 100644 index 0000000..4b41776 --- /dev/null +++ b/COPYING-CMAKE-SCRIPTS @@ -0,0 +1,22 @@ +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/CPackConfig.cmake b/CPackConfig.cmake new file mode 100644 index 0000000..bd1680e --- /dev/null +++ b/CPackConfig.cmake @@ -0,0 +1,24 @@ +set(CPACK_PACKAGE_VENDOR "Ultimaker") +set(CPACK_PACKAGE_CONTACT "Ruben Dulek ") +set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "libArcus Communication library") +if(NOT DEFINED CPACK_PACKAGE_VERSION) + set(CPACK_PACKAGE_VERSION "15.05.91") +endif() +set(CPACK_GENERATOR "DEB") +if(NOT DEFINED CPACK_DEBIAN_PACKAGE_ARCHITECTURE) + execute_process(COMMAND dpkg --print-architecture OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE) +endif() +set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}") + +set(DEB_DEPENDS + "python3 (>= 3.4.0)" + "libgcc1 (>= 4.9.0)" + "libstdc++6 (>= 4.9.0)" + "libc6 (>= 2.19)" + "zlib1g (>= 1.2.0)" + "protobuf (>= 3.0.0)" +) +string(REPLACE ";" ", " DEB_DEPENDS "${DEB_DEPENDS}") +set(CPACK_DEBIAN_PACKAGE_DEPENDS ${DEB_DEPENDS}) + +include(CPack) diff --git a/FindSIP.cmake b/FindSIP.cmake new file mode 100644 index 0000000..e15e2b4 --- /dev/null +++ b/FindSIP.cmake @@ -0,0 +1,92 @@ +# Find SIP +# ~~~~~~~~ +# +# SIP website: http://www.riverbankcomputing.co.uk/sip/index.php +# +# Find the installed version of SIP. FindSIP should be called after Python +# has been found. +# +# This file defines the following variables: +# +# SIP_VERSION - SIP version. +# +# SIP_EXECUTABLE - Path to the SIP executable. +# +# SIP_INCLUDE_DIRS - The SIP include directories. +# + +# Copyright (c) 2007, Simon Edwards +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +if(APPLE) + # Workaround for broken FindPythonLibs. It will always find Python 2.7 libs on OSX + set(CMAKE_FIND_FRAMEWORK LAST) +endif() + +# FIXME: Use FindPython3 to find Python, new in CMake 3.12. +# However currently on our CI server it finds the wrong Python version and then doesn't find the headers. +find_package(PythonInterp 3.5 REQUIRED) +find_package(PythonLibs 3.5 REQUIRED) + +# Define variables that are available in FindPython3, so there's no need to branch off in the later part. +set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE}) +set(Python3_INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS}) +set(Python3_LIBRARIES ${PYTHON_LIBRARIES}) +set(Python3_VERSION_MINOR "${PYTHON_VERSION_MINOR}") + +execute_process( + COMMAND ${Python3_EXECUTABLE} -c + "import distutils.sysconfig; print(distutils.sysconfig.get_python_lib(plat_specific=False,standard_lib=False))" + RESULT_VARIABLE _process_status + OUTPUT_VARIABLE _process_output + OUTPUT_STRIP_TRAILING_WHITESPACE +) +if(${_process_status} EQUAL 0) + string(STRIP ${_process_output} Python3_SITELIB) +else() + message(FATAL_ERROR "Failed to get Python3_SITELIB. Error: ${_process_output}") +endif() + +execute_process( + COMMAND ${Python3_EXECUTABLE} -c + "import distutils.sysconfig; print(distutils.sysconfig.get_python_lib(plat_specific=True,standard_lib=False))" + RESULT_VARIABLE _process_status + OUTPUT_VARIABLE _process_output + OUTPUT_STRIP_TRAILING_WHITESPACE +) +if(${_process_status} EQUAL 0) + string(STRIP ${_process_output} Python3_SITEARCH) +else() + message(FATAL_ERROR "Failed to get Python3_SITEARCH. Error: ${_process_output}") +endif() + +get_filename_component(_python_binary_path ${Python3_EXECUTABLE} DIRECTORY) + +find_program(SIP_EXECUTABLE sip + HINTS ${CMAKE_PREFIX_PATH}/bin ${CMAKE_INSTALL_PATH}/bin ${_python_binary_path} ${Python3_SITELIB}/PyQt5 +) + +find_path(SIP_INCLUDE_DIRS sip.h + HINTS ${CMAKE_PREFIX_PATH}/include ${CMAKE_INSTALL_PATH}/include ${Python3_INCLUDE_DIRS} ${Python3_SITELIB}/PyQt5 +) + +execute_process( + COMMAND ${Python3_EXECUTABLE} -c "import sip; print(sip.SIP_VERSION_STR)" + RESULT_VARIABLE _process_status + OUTPUT_VARIABLE _process_output + OUTPUT_STRIP_TRAILING_WHITESPACE +) + +if(${_process_status} EQUAL 0) + string(STRIP ${_process_output} SIP_VERSION) +endif() + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(SIP REQUIRED_VARS SIP_EXECUTABLE SIP_INCLUDE_DIRS VERSION_VAR SIP_VERSION) + +if(SIP_FOUND) + include(${CMAKE_CURRENT_LIST_DIR}/SIPMacros.cmake) +endif() + +mark_as_advanced(SIP_EXECUTABLE SIP_INCLUDE_DIRS SIP_VERSION) diff --git a/SIPMacros.cmake b/SIPMacros.cmake new file mode 100644 index 0000000..50553e0 --- /dev/null +++ b/SIPMacros.cmake @@ -0,0 +1,128 @@ +# Macros for SIP +# ~~~~~~~~~~~~~~ +# Copyright (c) 2007, Simon Edwards +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. +# +# SIP website: http://www.riverbankcomputing.co.uk/sip/index.php +# +# This file defines the following macros: +# +# ADD_SIP_PYTHON_MODULE (MODULE_NAME MODULE_SIP [library1, libaray2, ...]) +# Specifies a SIP file to be built into a Python module and installed. +# MODULE_NAME is the name of Python module including any path name. (e.g. +# os.sys, Foo.bar etc). MODULE_SIP the path and filename of the .sip file +# to process and compile. libraryN are libraries that the Python module, +# which is typically a shared library, should be linked to. The built +# module will also be install into Python's site-packages directory. +# +# The behaviour of the ADD_SIP_PYTHON_MODULE macro can be controlled by a +# number of variables: +# +# SIP_INCLUDE_DIRS - List of directories which SIP will scan through when looking +# for included .sip files. (Corresponds to the -I option for SIP.) +# +# SIP_TAGS - List of tags to define when running SIP. (Corresponds to the -t +# option for SIP.) +# +# SIP_CONCAT_PARTS - An integer which defines the number of parts the C++ code +# of each module should be split into. Defaults to 8. (Corresponds to the +# -j option for SIP.) +# +# SIP_DISABLE_FEATURES - List of feature names which should be disabled +# running SIP. (Corresponds to the -x option for SIP.) +# +# SIP_EXTRA_OPTIONS - Extra command line options which should be passed on to +# SIP. + +SET(SIP_INCLUDE_DIRS) +SET(SIP_TAGS) +SET(SIP_CONCAT_PARTS 8) +SET(SIP_DISABLE_FEATURES) +SET(SIP_EXTRA_OPTIONS) + +MACRO(ADD_SIP_PYTHON_MODULE MODULE_NAME MODULE_SIP) + + SET(EXTRA_LINK_LIBRARIES ${ARGN}) + + STRING(REPLACE "." "/" _x ${MODULE_NAME}) + GET_FILENAME_COMPONENT(_parent_module_path ${_x} PATH) + GET_FILENAME_COMPONENT(_child_module_name ${_x} NAME) + + GET_FILENAME_COMPONENT(_module_path ${MODULE_SIP} PATH) + GET_FILENAME_COMPONENT(_abs_module_sip ${MODULE_SIP} ABSOLUTE) + + # We give this target a long logical target name. + # (This is to avoid having the library name clash with any already + # install library names. If that happens then cmake dependency + # tracking get confused.) + STRING(REPLACE "." "_" _logical_name ${MODULE_NAME}) + SET(_logical_name "python_module_${_logical_name}") + + FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_module_path}) # Output goes in this dir. + + SET(_sip_includes) + FOREACH (_inc ${SIP_INCLUDES}) + GET_FILENAME_COMPONENT(_abs_inc ${_inc} ABSOLUTE) + LIST(APPEND _sip_includes -I ${_abs_inc}) + ENDFOREACH (_inc ) + + SET(_sip_tags) + FOREACH (_tag ${SIP_TAGS}) + LIST(APPEND _sip_tags -t ${_tag}) + ENDFOREACH (_tag) + + SET(_sip_x) + FOREACH (_x ${SIP_DISABLE_FEATURES}) + LIST(APPEND _sip_x -x ${_x}) + ENDFOREACH (_x ${SIP_DISABLE_FEATURES}) + + SET(_message "-DMESSAGE=Generating CPP code for module ${MODULE_NAME}") + SET(_sip_output_files) + FOREACH(CONCAT_NUM RANGE 0 ${SIP_CONCAT_PARTS} ) + IF( ${CONCAT_NUM} LESS ${SIP_CONCAT_PARTS} ) + SET(_sip_output_files ${_sip_output_files} ${CMAKE_CURRENT_BINARY_DIR}/${_module_path}/sip${_child_module_name}part${CONCAT_NUM}.cpp ) + ENDIF( ${CONCAT_NUM} LESS ${SIP_CONCAT_PARTS} ) + ENDFOREACH(CONCAT_NUM RANGE 0 ${SIP_CONCAT_PARTS} ) + + # Suppress warnings + IF(PEDANTIC) + IF(MSVC) + # 4996 deprecation warnings (bindings re-export deprecated methods) + # 4701 potentially uninitialized variable used (sip generated code) + # 4702 unreachable code (sip generated code) + ADD_DEFINITIONS( /wd4996 /wd4701 /wd4702 ) + ELSE(MSVC) + # disable all warnings + ADD_DEFINITIONS( -w ) + ENDIF(MSVC) + ENDIF(PEDANTIC) + + ADD_CUSTOM_COMMAND( + OUTPUT ${_sip_output_files} + COMMAND ${CMAKE_COMMAND} -E echo ${message} + COMMAND ${CMAKE_COMMAND} -E touch ${_sip_output_files} + COMMAND ${SIP_EXECUTABLE} ${_sip_tags} ${_sip_x} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} ${_sip_includes} ${_abs_module_sip} + DEPENDS ${_abs_module_sip} ${SIP_EXTRA_FILES_DEPEND} + ) + ADD_LIBRARY(${_logical_name} MODULE ${_sip_output_files} ${SIP_EXTRA_SOURCE_FILES}) + IF (NOT APPLE) + IF ("${Python3_VERSION_MINOR}" GREATER 7) + MESSAGE(STATUS "Python > 3.7 - not linking to libpython") + ELSE () + TARGET_LINK_LIBRARIES(${_logical_name} ${Python3_LIBRARIES}) + ENDIF () + ENDIF (NOT APPLE) + TARGET_LINK_LIBRARIES(${_logical_name} ${EXTRA_LINK_LIBRARIES}) + IF (APPLE) + SET_TARGET_PROPERTIES(${_logical_name} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup") + ENDIF (APPLE) + SET_TARGET_PROPERTIES(${_logical_name} PROPERTIES PREFIX "" OUTPUT_NAME ${_child_module_name}) + + IF (WIN32) + SET_TARGET_PROPERTIES(${_logical_name} PROPERTIES SUFFIX ".pyd" IMPORT_PREFIX "_") + ENDIF (WIN32) + + INSTALL(TARGETS ${_logical_name} DESTINATION "${Python3_SITEARCH}/${_parent_module_path}") + +ENDMACRO(ADD_SIP_PYTHON_MODULE) diff --git a/libArcus-3.10.0-PyQt6.sip.patch b/libArcus-3.10.0-PyQt6.sip.patch new file mode 100644 index 0000000..ef4ad09 --- /dev/null +++ b/libArcus-3.10.0-PyQt6.sip.patch @@ -0,0 +1,12 @@ +diff -up libArcus-4.10.0/cmake/FindSIP.cmake.sip libArcus-4.10.0/cmake/FindSIP.cmake +--- libArcus-4.10.0/cmake/FindSIP.cmake.sip ++++ libArcus-4.10.0/cmake/FindSIP.cmake +@@ -70,7 +70,7 @@ find_path(SIP_INCLUDE_DIRS sip.h + ) + + execute_process( +- COMMAND ${Python3_EXECUTABLE} -c "import sip; print(sip.SIP_VERSION_STR)" ++ COMMAND ${Python3_EXECUTABLE} -c "import PyQt6.sip; print(PyQt6.sip.SIP_VERSION_STR)" + RESULT_VARIABLE _process_status + OUTPUT_VARIABLE _process_output + OUTPUT_STRIP_TRAILING_WHITESPACE diff --git a/libArcus-5.2.2-actually-export-symbols.patch b/libArcus-5.2.2-actually-export-symbols.patch new file mode 100644 index 0000000..30ba0b0 --- /dev/null +++ b/libArcus-5.2.2-actually-export-symbols.patch @@ -0,0 +1,90 @@ +diff -up libArcus-5.2.2/include/Arcus/Error.h.export libArcus-5.2.2/include/Arcus/Error.h +--- libArcus-5.2.2/include/Arcus/Error.h.export 2022-11-30 09:32:40.000000000 -0500 ++++ libArcus-5.2.2/include/Arcus/Error.h 2023-03-08 12:26:40.095859666 -0500 +@@ -5,6 +5,7 @@ + #define ARCUS_ERROR_H + + #include "Arcus/Types.h" ++#include "ArcusExport.h" + + namespace Arcus + { +@@ -32,7 +33,7 @@ enum class ErrorCode + /** + * A class representing an error with an error code and an error message. + */ +-class Error ++class ARCUS_EXPORT Error + { + public: + /** +diff -up libArcus-5.2.2/include/Arcus/MessageTypeStore.h.export libArcus-5.2.2/include/Arcus/MessageTypeStore.h +--- libArcus-5.2.2/include/Arcus/MessageTypeStore.h.export 2022-11-30 09:32:40.000000000 -0500 ++++ libArcus-5.2.2/include/Arcus/MessageTypeStore.h 2023-03-08 12:26:40.095859666 -0500 +@@ -8,12 +8,14 @@ + + #include "Arcus/Types.h" + ++#include "ArcusExport.h" ++ + namespace Arcus + { + /** + * A class to manage the different types of messages that are available. + */ +-class MessageTypeStore ++class ARCUS_EXPORT MessageTypeStore + { + public: + MessageTypeStore(); +@@ -87,7 +89,7 @@ public: + void dumpMessageTypes(); + + private: +- class Private; ++ class ARCUS_NO_EXPORT Private; + const std::unique_ptr d; + }; + } // namespace Arcus +diff -up libArcus-5.2.2/include/Arcus/Socket.h.export libArcus-5.2.2/include/Arcus/Socket.h +--- libArcus-5.2.2/include/Arcus/Socket.h.export 2022-11-30 09:32:40.000000000 -0500 ++++ libArcus-5.2.2/include/Arcus/Socket.h 2023-03-08 12:26:40.096859680 -0500 +@@ -9,6 +9,8 @@ + #include "Arcus/Error.h" + #include "Arcus/Types.h" + ++#include "ArcusExport.h" ++ + namespace Arcus + { + class SocketListener; +@@ -21,7 +23,7 @@ class SocketListener; + * + * Please see the README in libArcus for more details. + */ +-class Socket ++class ARCUS_EXPORT Socket + { + public: + Socket(); +diff -up libArcus-5.2.2/include/Arcus/SocketListener.h.export libArcus-5.2.2/include/Arcus/SocketListener.h +--- libArcus-5.2.2/include/Arcus/SocketListener.h.export 2023-03-08 12:27:19.364375316 -0500 ++++ libArcus-5.2.2/include/Arcus/SocketListener.h 2023-03-08 12:27:41.511666142 -0500 +@@ -6,6 +6,8 @@ + + #include "Arcus/Types.h" + ++#include "ArcusExport.h" ++ + namespace Arcus + { + class Socket; +@@ -24,7 +26,7 @@ class Error; + * signal from a subclass of this class, to make sure the actual event + * is handled on the main thread. + */ +-class SocketListener ++class ARCUS_EXPORT SocketListener + { + public: + SocketListener() : _socket(nullptr) diff --git a/libarcus.spec b/libarcus.spec index 411c822..687d596 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,19 +1,31 @@ Name: libarcus -Version: 4.13.1 -Release: 5%{?dist} +Version: 5.2.2 +Release: 1%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +# Python bits +Source1: https://github.com/Ultimaker/pyArcus/archive/%{version}.tar.gz#/pyArcus-%{version}.tar.gz + +# Cmake bits taken from 4.13.1, before upstream went nuts with conan +Source2: FindSIP.cmake +Source3: SIPMacros.cmake +Source4: CMakeLists.txt +Source5: CPackConfig.cmake +Source6: ArcusConfig.cmake.in +Source7: COPYING-CMAKE-SCRIPTS # https://bugzilla.redhat.com/show_bug.cgi?id=1601917 -Patch1: libArcus-3.10.0-PyQt5.sip.patch -Patch2: https://raw.githubusercontent.com/coryan/vcpkg/f69b85aa403b04e7d442c90db3418d484e44024f/ports/arcus/0001-fix-protobuf-deprecated.patch +Patch1: libArcus-3.10.0-PyQt6.sip.patch + +# Actually export symbols +Patch2: libArcus-5.2.2-actually-export-symbols.patch BuildRequires: protobuf-devel BuildRequires: python3-devel BuildRequires: python3-protobuf -BuildRequires: python3-pyqt5-sip +BuildRequires: python3-pyqt6-sip BuildRequires: python3-sip-devel BuildRequires: /usr/bin/sip BuildRequires: cmake @@ -67,7 +79,18 @@ Protocol Buffers library. It is designed to facilitate the communication between Cura and its backend and similar code. %prep -%autosetup -n libArcus-%{version} -p1 -S git +%setup -q -n libArcus-%{version} -a 1 + +cp -a pyArcus-%{version}/python . +cp -a pyArcus-%{version}/include/pyArcus include +mkdir cmake +cp -a %{SOURCE2} %{SOURCE3} %{SOURCE7} cmake/ +rm -rf CMakeLists.txt +cp -a %{SOURCE4} %{SOURCE5} %{SOURCE6} . +cp -a pyArcus-%{version}/src/PythonMessage.cpp python/ + +%patch1 -p1 +%patch2 -p1 -b .export # https://github.com/Ultimaker/libArcus/pull/94#issuecomment-505376760 sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake @@ -81,12 +104,11 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %files %license LICENSE -%doc README.md TODO.md +%doc README.md %{_libdir}/libArcus.so.* %files devel %license LICENSE cmake/COPYING-CMAKE-SCRIPTS -%doc examples/example.cpp examples/example.proto %{_libdir}/libArcus.so %{_includedir}/Arcus # Own the dir not to depend on cmake: @@ -94,11 +116,13 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %files -n python3-arcus %license LICENSE -%doc README.md TODO.md -%doc examples/example.py -%{python3_sitearch}/Arcus.so +%doc README.md +%{python3_sitearch}/pyArcus.so %changelog +* Tue Mar 7 2023 Tom Callaway - 5.2.2-1 +- update to 5.2.2 with the help of forward ported CMake bits + * Thu Jan 19 2023 Fedora Release Engineering - 4.13.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 7b2321a..20c5078 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (libarcus-4.13.1.tar.gz) = ffb14595f23c47f71082b994eae01471f45e2e9e1ae9a8ad01df577b9445594c30173388beab016a92be9723638ca6e46b5cecddddc6adc97e9d212fc0fa23fa +SHA512 (pyArcus-5.2.2.tar.gz) = b24cbb9a5d7aa917b1b21e46f935b1293645e731d4e475a5abe364237f35708e8e96a1c6f06fe78e2e0e381737f4a27a6db87e42a5f4de9d48091d9de096f9b0 +SHA512 (libarcus-5.2.2.tar.gz) = d33fb7dae1fef4d99bad7a165b02767b9e8d1f48dc3e2d4fe635a56019f294c9703762421efcf3bc4e20fab8c6c9e9816bba9ddb4ecc85c0303cd027e39dede1 From 474c580ee183494774ff677087f16a4b3e9da66e Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 15 Jun 2023 16:25:07 +0200 Subject: [PATCH 73/86] Rebuilt for Python 3.12 --- libarcus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libarcus.spec b/libarcus.spec index 687d596..051ef55 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus Version: 5.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -120,6 +120,9 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %{python3_sitearch}/pyArcus.so %changelog +* Thu Jun 15 2023 Python Maint - 5.2.2-2 +- Rebuilt for Python 3.12 + * Tue Mar 7 2023 Tom Callaway - 5.2.2-1 - update to 5.2.2 with the help of forward ported CMake bits From 89f65a45be2455fd27d86448667c7fc1b123e28f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 10:19:24 +0000 Subject: [PATCH 74/86] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libarcus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libarcus.spec b/libarcus.spec index 051ef55..1dd06d4 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus Version: 5.2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -120,6 +120,9 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %{python3_sitearch}/pyArcus.so %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 5.2.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jun 15 2023 Python Maint - 5.2.2-2 - Rebuilt for Python 3.12 From 15cc7fc8bdb67832201f16d6fa8b56273513d744 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 5 Dec 2023 15:37:10 +0100 Subject: [PATCH 75/86] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 195 +++++++++++++++++++++++++++++++++++++++++++++++++ libarcus.spec | 198 +------------------------------------------------- 2 files changed, 197 insertions(+), 196 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..673b8ed --- /dev/null +++ b/changelog @@ -0,0 +1,195 @@ +* Thu Jul 20 2023 Fedora Release Engineering - 5.2.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jun 15 2023 Python Maint - 5.2.2-2 +- Rebuilt for Python 3.12 + +* Tue Mar 7 2023 Tom Callaway - 5.2.2-1 +- update to 5.2.2 with the help of forward ported CMake bits + +* Thu Jan 19 2023 Fedora Release Engineering - 4.13.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 4.13.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jun 17 2022 Python Maint - 4.13.1-3 +- Rebuilt for Python 3.11 + +* Mon Apr 11 2022 Tomáš Hrnčiar - 4.13.1-2 +- Fix build failure with cmake 3.23+ + +* Tue Feb 01 2022 Gabriel Féron - 4.13.1-1 +- Update to 4.13.1 + +* Thu Jan 20 2022 Gabriel Féron - 4.13.0-1 +- Update to 4.13.0 + +* Thu Jan 20 2022 Fedora Release Engineering - 4.12.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Dec 13 2021 Gabriel Féron - 4.12.1-1 +- Update to 4.12.1 + +* Sat Nov 06 2021 Adrian Reber - 4.11.0-3 +- Rebuilt for protobuf 3.19.0 + +* Mon Oct 25 2021 Adrian Reber - 4.11.0-2 +- Rebuilt for protobuf 3.18.1 + +* Wed Sep 15 2021 Gabriel Féron - 4.11.0-1 +- Update to 4.11.0 + +* Mon Aug 16 2021 Gabriel Féron - 4.10.0-1 +- Update to 4.10.0 + +* Thu Jul 22 2021 Fedora Release Engineering - 4.9.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Jun 10 2021 Gabriel Féron - 4.9.1-1 +- Update to 4.9.1 + +* Fri Jun 04 2021 Python Maint - 4.9.0-2 +- Rebuilt for Python 3.10 + +* Mon Apr 26 2021 Gabriel Féron - 4.9.0-1 +- Update to 4.9.0 + +* Tue Mar 30 2021 Jonathan Wakely - 4.8.0-4 +- Rebuilt for removed libstdc++ symbol (#1937698) + +* Tue Jan 26 2021 Fedora Release Engineering - 4.8.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jan 13 09:45:36 CET 2021 Adrian Reber - 4.8.0-2 +- Rebuilt for protobuf 3.14 + +* Tue Dec 22 2020 Jan Pazdziora - 4.8.0-1 +- Update to 4.8.0 + +* Wed Sep 23 2020 Adrian Reber - 4.7.1-2 +- Rebuilt for protobuf 3.13 + +* Thu Sep 03 2020 Miro Hrončok - 4.7.1-1 +- Update to 4.7.1 + +* Tue Jul 28 2020 Fedora Release Engineering - 4.6.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sun Jun 14 2020 Adrian Reber - 4.6.1-3 +- Rebuilt for protobuf 3.12 + +* Tue May 26 2020 Miro Hrončok - 4.6.1-2 +- Rebuilt for Python 3.9 + +* Tue May 5 2020 Gabriel Féron - 4.6.0-1 +- Update to 4.6.1 + +* Tue Apr 21 2020 Gabriel Féron - 4.6.0-1 +- Update to 4.6.0 + +* Wed Jan 29 2020 Fedora Release Engineering - 4.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Dec 19 2019 Orion Poplawski - 4.4.0-2 +- Rebuild for protobuf 3.11 + +* Thu Nov 21 2019 Gabriel Féron - 4.4.0-1 +- Update to 4.4.0 + +* Fri Nov 01 2019 Miro Hrončok - 4.1.0-5 +- Make the dependency of python3-arcus on libarcus strict (#1767762) + +* Mon Sep 16 2019 Rex Dieter - 4.1.0-4 +- use python3-pyqt5-sip (#1748527#c12) + +* Mon Aug 19 2019 Miro Hrončok - 4.1.0-3 +- Rebuilt for Python 3.8 + +* Thu Jul 25 2019 Fedora Release Engineering - 4.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Jun 18 2019 Gabriel Féron - 4.1.0-1 +- Update to 4.1.0 + +* Wed Apr 03 2019 Gabriel Féron - 4.0.0-1 +- Update to 4.0.0 + +* Fri Feb 01 2019 Fedora Release Engineering - 3.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jan 26 2019 Gabriel Féron - 3.6.0-1 +- Update to 3.6.0 + +* Wed Nov 21 2018 Igor Gnatenko - 3.5.1-3 +- Rebuild for protobuf 3.6 + +* Mon Nov 12 2018 Miro Hrončok +- Use PyQt5.sip (#1601917) + +* Mon Nov 12 2018 Miro Hrončok - 3.5.1-1 +- Update to 3.5.1 (#1644323) + +* Tue Aug 28 2018 Rex Dieter - 3.4.1-2 +- use more robust upstreamable sip_flags.patch (#1601917) + +* Tue Aug 28 2018 Miro Hrončok - 3.4.1-1 +- Update to 3.4.1 (#1599716) + +* Thu Aug 23 2018 Rex Dieter - 3.3.0-4 +- Use PyQt5.sip (#1601917) + +* Fri Jul 13 2018 Fedora Release Engineering - 3.3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 19 2018 Miro Hrončok - 3.3.0-2 +- Rebuilt for Python 3.7 + +* Wed May 02 2018 Miro Hrončok - 3.3.0-1 +- Update to 3.3.0 (#1571482) + +* Mon Mar 19 2018 Miro Hrončok - 3.2.1-1 +- Update to 3.2.1 (#1523891) + +* Wed Feb 07 2018 Fedora Release Engineering - 3.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sat Dec 09 2017 Miro Hrončok - 3.1.0-1 +- Update to 3.1.0 (#1523891) +- Don't sed lib -> lib64 (not needed now) + +* Wed Nov 29 2017 Igor Gnatenko - 3.0.3-3 +- Rebuild for protobuf 3.5 + +* Mon Nov 13 2017 Igor Gnatenko - 3.0.3-2 +- Rebuild for protobuf 3.4 + +* Fri Oct 20 2017 Charalampos Statakis - 3.0.3-1 +- Update to 3.0.3 + +* Wed Aug 30 2017 Miro Hrončok - 2.7.0-1 +- Update to 2.7.0 + +* Thu Aug 03 2017 Fedora Release Engineering - 2.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 2.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Jun 28 2017 Miro Hrončok - 2.6.1-1 +- Update to 2.6.1 + +* Tue Jun 27 2017 Miro Hrončok - 2.6.0-1 +- Update to 2.6.0 + +* Tue Jun 13 2017 Miro Hrončok - 2.5.0-3 +- Rebuilt for new protobuf 3.3.1 + +* Wed May 03 2017 Miro Hrončok - 2.5.0-2 +- Clarify licensing information on cmake files + +* Wed Apr 26 2017 Miro Hrončok - 2.5.0-1 +- Update to 2.5.0 + +* Sat Mar 25 2017 Miro Hrončok - 2.4.0-1 +- Initial package diff --git a/libarcus.spec b/libarcus.spec index 1dd06d4..44ee0ce 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,6 +1,6 @@ Name: libarcus Version: 5.2.2 -Release: 3%{?dist} +Release: %autorelease Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus @@ -120,198 +120,4 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %{python3_sitearch}/pyArcus.so %changelog -* Thu Jul 20 2023 Fedora Release Engineering - 5.2.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jun 15 2023 Python Maint - 5.2.2-2 -- Rebuilt for Python 3.12 - -* Tue Mar 7 2023 Tom Callaway - 5.2.2-1 -- update to 5.2.2 with the help of forward ported CMake bits - -* Thu Jan 19 2023 Fedora Release Engineering - 4.13.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 4.13.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jun 17 2022 Python Maint - 4.13.1-3 -- Rebuilt for Python 3.11 - -* Mon Apr 11 2022 Tomáš Hrnčiar - 4.13.1-2 -- Fix build failure with cmake 3.23+ - -* Tue Feb 01 2022 Gabriel Féron - 4.13.1-1 -- Update to 4.13.1 - -* Thu Jan 20 2022 Gabriel Féron - 4.13.0-1 -- Update to 4.13.0 - -* Thu Jan 20 2022 Fedora Release Engineering - 4.12.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Mon Dec 13 2021 Gabriel Féron - 4.12.1-1 -- Update to 4.12.1 - -* Sat Nov 06 2021 Adrian Reber - 4.11.0-3 -- Rebuilt for protobuf 3.19.0 - -* Mon Oct 25 2021 Adrian Reber - 4.11.0-2 -- Rebuilt for protobuf 3.18.1 - -* Wed Sep 15 2021 Gabriel Féron - 4.11.0-1 -- Update to 4.11.0 - -* Mon Aug 16 2021 Gabriel Féron - 4.10.0-1 -- Update to 4.10.0 - -* Thu Jul 22 2021 Fedora Release Engineering - 4.9.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Jun 10 2021 Gabriel Féron - 4.9.1-1 -- Update to 4.9.1 - -* Fri Jun 04 2021 Python Maint - 4.9.0-2 -- Rebuilt for Python 3.10 - -* Mon Apr 26 2021 Gabriel Féron - 4.9.0-1 -- Update to 4.9.0 - -* Tue Mar 30 2021 Jonathan Wakely - 4.8.0-4 -- Rebuilt for removed libstdc++ symbol (#1937698) - -* Tue Jan 26 2021 Fedora Release Engineering - 4.8.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jan 13 09:45:36 CET 2021 Adrian Reber - 4.8.0-2 -- Rebuilt for protobuf 3.14 - -* Tue Dec 22 2020 Jan Pazdziora - 4.8.0-1 -- Update to 4.8.0 - -* Wed Sep 23 2020 Adrian Reber - 4.7.1-2 -- Rebuilt for protobuf 3.13 - -* Thu Sep 03 2020 Miro Hrončok - 4.7.1-1 -- Update to 4.7.1 - -* Tue Jul 28 2020 Fedora Release Engineering - 4.6.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sun Jun 14 2020 Adrian Reber - 4.6.1-3 -- Rebuilt for protobuf 3.12 - -* Tue May 26 2020 Miro Hrončok - 4.6.1-2 -- Rebuilt for Python 3.9 - -* Tue May 5 2020 Gabriel Féron - 4.6.0-1 -- Update to 4.6.1 - -* Tue Apr 21 2020 Gabriel Féron - 4.6.0-1 -- Update to 4.6.0 - -* Wed Jan 29 2020 Fedora Release Engineering - 4.4.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Dec 19 2019 Orion Poplawski - 4.4.0-2 -- Rebuild for protobuf 3.11 - -* Thu Nov 21 2019 Gabriel Féron - 4.4.0-1 -- Update to 4.4.0 - -* Fri Nov 01 2019 Miro Hrončok - 4.1.0-5 -- Make the dependency of python3-arcus on libarcus strict (#1767762) - -* Mon Sep 16 2019 Rex Dieter - 4.1.0-4 -- use python3-pyqt5-sip (#1748527#c12) - -* Mon Aug 19 2019 Miro Hrončok - 4.1.0-3 -- Rebuilt for Python 3.8 - -* Thu Jul 25 2019 Fedora Release Engineering - 4.1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Tue Jun 18 2019 Gabriel Féron - 4.1.0-1 -- Update to 4.1.0 - -* Wed Apr 03 2019 Gabriel Féron - 4.0.0-1 -- Update to 4.0.0 - -* Fri Feb 01 2019 Fedora Release Engineering - 3.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jan 26 2019 Gabriel Féron - 3.6.0-1 -- Update to 3.6.0 - -* Wed Nov 21 2018 Igor Gnatenko - 3.5.1-3 -- Rebuild for protobuf 3.6 - -* Mon Nov 12 2018 Miro Hrončok -- Use PyQt5.sip (#1601917) - -* Mon Nov 12 2018 Miro Hrončok - 3.5.1-1 -- Update to 3.5.1 (#1644323) - -* Tue Aug 28 2018 Rex Dieter - 3.4.1-2 -- use more robust upstreamable sip_flags.patch (#1601917) - -* Tue Aug 28 2018 Miro Hrončok - 3.4.1-1 -- Update to 3.4.1 (#1599716) - -* Thu Aug 23 2018 Rex Dieter - 3.3.0-4 -- Use PyQt5.sip (#1601917) - -* Fri Jul 13 2018 Fedora Release Engineering - 3.3.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jun 19 2018 Miro Hrončok - 3.3.0-2 -- Rebuilt for Python 3.7 - -* Wed May 02 2018 Miro Hrončok - 3.3.0-1 -- Update to 3.3.0 (#1571482) - -* Mon Mar 19 2018 Miro Hrončok - 3.2.1-1 -- Update to 3.2.1 (#1523891) - -* Wed Feb 07 2018 Fedora Release Engineering - 3.1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sat Dec 09 2017 Miro Hrončok - 3.1.0-1 -- Update to 3.1.0 (#1523891) -- Don't sed lib -> lib64 (not needed now) - -* Wed Nov 29 2017 Igor Gnatenko - 3.0.3-3 -- Rebuild for protobuf 3.5 - -* Mon Nov 13 2017 Igor Gnatenko - 3.0.3-2 -- Rebuild for protobuf 3.4 - -* Fri Oct 20 2017 Charalampos Statakis - 3.0.3-1 -- Update to 3.0.3 - -* Wed Aug 30 2017 Miro Hrončok - 2.7.0-1 -- Update to 2.7.0 - -* Thu Aug 03 2017 Fedora Release Engineering - 2.6.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 2.6.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Wed Jun 28 2017 Miro Hrončok - 2.6.1-1 -- Update to 2.6.1 - -* Tue Jun 27 2017 Miro Hrončok - 2.6.0-1 -- Update to 2.6.0 - -* Tue Jun 13 2017 Miro Hrončok - 2.5.0-3 -- Rebuilt for new protobuf 3.3.1 - -* Wed May 03 2017 Miro Hrončok - 2.5.0-2 -- Clarify licensing information on cmake files - -* Wed Apr 26 2017 Miro Hrončok - 2.5.0-1 -- Update to 2.5.0 - -* Sat Mar 25 2017 Miro Hrončok - 2.4.0-1 -- Initial package +%autochangelog From 2a8e1af0f7f1ca644837ff1f8ce967c19569fccc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 5 Dec 2023 15:38:56 +0100 Subject: [PATCH 76/86] Remove old cruft --- libarcus.spec | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/libarcus.spec b/libarcus.spec index 44ee0ce..35e83a2 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -37,12 +37,7 @@ BuildRequires: git-core BuildRequires: (python3-setuptools if python3-devel >= 3.12) # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval -%if 0%{?fedora} >= 37 || 0%{?rhel} >= 10 ExcludeArch: %{ix86} -%endif - -# Get Fedora 33++ behavior on anything older -%undefine __cmake_in_source_build %description Arcus library contains C++ code and Python 3 bindings for creating a socket in @@ -70,7 +65,6 @@ Development files. Summary: Python 3 libArcus bindings Requires: %{name}%{?_isa} = %{version}-%{release} %{?_sip_api:Requires: python3-pyqt5-sip-api(%{_sip_api_major}) >= %{_sip_api}} -%{?python_provide:%python_provide python3-arcus} %description -n python3-arcus Arcus Python 3 bindings for creating a socket in a thread and using this @@ -89,11 +83,8 @@ rm -rf CMakeLists.txt cp -a %{SOURCE4} %{SOURCE5} %{SOURCE6} . cp -a pyArcus-%{version}/src/PythonMessage.cpp python/ -%patch1 -p1 -%patch2 -p1 -b .export - -# https://github.com/Ultimaker/libArcus/pull/94#issuecomment-505376760 -sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake +%patch -P1 -p1 +%patch -P2 -p1 -b .export %build %cmake -DBUILD_EXAMPLES:BOOL=OFF -DCMAKE_SKIP_RPATH:BOOL=ON From e4a514a7eb638e75920821165ae91279bf262aac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 5 Dec 2023 15:39:23 +0100 Subject: [PATCH 77/86] Update the License tag to SPDX --- libarcus.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libarcus.spec b/libarcus.spec index 35e83a2..0ae65f9 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -2,7 +2,7 @@ Name: libarcus Version: 5.2.2 Release: %autorelease Summary: Communication library between internal components for Ultimaker software -License: LGPLv3+ +License: LGPL-3.0-or-later URL: https://github.com/Ultimaker/libArcus Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz # Python bits From 41718c61b27eb747c4bf286e4daad147d4200343 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 5 Dec 2023 15:40:18 +0100 Subject: [PATCH 78/86] Update to 5.3.0 --- .gitignore | 1 + libarcus.spec | 2 +- sources | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 57a3d47..1620c1e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /libarcus-*.tar.gz /pyArcus-5.2.2.tar.gz +/pyArcus-5.3.0.tar.gz diff --git a/libarcus.spec b/libarcus.spec index 0ae65f9..12eda09 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,5 +1,5 @@ Name: libarcus -Version: 5.2.2 +Version: 5.3.0 Release: %autorelease Summary: Communication library between internal components for Ultimaker software License: LGPL-3.0-or-later diff --git a/sources b/sources index 20c5078..889b3c4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (pyArcus-5.2.2.tar.gz) = b24cbb9a5d7aa917b1b21e46f935b1293645e731d4e475a5abe364237f35708e8e96a1c6f06fe78e2e0e381737f4a27a6db87e42a5f4de9d48091d9de096f9b0 -SHA512 (libarcus-5.2.2.tar.gz) = d33fb7dae1fef4d99bad7a165b02767b9e8d1f48dc3e2d4fe635a56019f294c9703762421efcf3bc4e20fab8c6c9e9816bba9ddb4ecc85c0303cd027e39dede1 +SHA512 (libarcus-5.3.0.tar.gz) = 8106bbcd595921d56e39bf694fbee43c6146a9c661edf9fb1fe271bbcf199a202e399cfbda5b83711c9daad1c55d8242ba23ce4fb52c416ddd862fb6de2bcab3 +SHA512 (pyArcus-5.3.0.tar.gz) = d4a114994fa3e3156eae95dde58df13237b8bb0571a1219d6dee6b6338fd65f911f27887d6ab32b7a3cb32bc45ca6c25147e7c2d246cb0707326b88246abfbcd From d50038b8fbeefa088fd46987f8174bc17786507d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 03:35:55 +0000 Subject: [PATCH 79/86] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 37869ab82e2abbfce20b7109593beb69ad4b01a8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 01:33:23 +0000 Subject: [PATCH 80/86] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 53b1cd79b5240eef9eff09c60b61f0ba5159beca Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sat, 8 Jun 2024 10:28:42 +0200 Subject: [PATCH 81/86] Rebuilt for Python 3.13 From bc6028b7f677ee942ee365d805e34c4ee91d0b80 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 13:20:39 +0000 Subject: [PATCH 82/86] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 62babe4fd65bc30b485c275398ad3141db6af3a2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 10:37:06 +0000 Subject: [PATCH 83/86] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From a86814f950fbdf7df98df2950e45a5d1706d0c93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 28 Apr 2025 15:13:15 +0200 Subject: [PATCH 84/86] Fix build with GCC 15 - Fixes: rhzb#2340716 --- 160.patch | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++ libarcus.spec | 10 +++-- 2 files changed, 120 insertions(+), 4 deletions(-) create mode 100644 160.patch diff --git a/160.patch b/160.patch new file mode 100644 index 0000000..26d18e2 --- /dev/null +++ b/160.patch @@ -0,0 +1,114 @@ +From 4826f0d567a6dc373ee8d378f2e40977d94f586b Mon Sep 17 00:00:00 2001 +From: Gregor Riepl +Date: Thu, 20 Feb 2025 20:27:10 +0100 +Subject: [PATCH] Add cstdint includes where needed + +--- + include/Arcus/MessageTypeStore.h | 1 + + include/Arcus/Types.h | 1 + + src/MessageTypeStore.cpp | 1 + + src/PlatformSocket.cpp | 2 ++ + src/PlatformSocket_p.h | 1 + + src/Socket_p.h | 1 + + src/WireMessage_p.h | 2 ++ + test_package/src/test.cpp | 1 + + 8 files changed, 10 insertions(+) + +diff --git a/include/Arcus/MessageTypeStore.h b/include/Arcus/MessageTypeStore.h +index 6cc7b5ee..416c6686 100644 +--- a/include/Arcus/MessageTypeStore.h ++++ b/include/Arcus/MessageTypeStore.h +@@ -5,6 +5,7 @@ + #define ARCUS_MESSAGE_TYPE_STORE_H + + #include ++#include + + #include "Arcus/Types.h" + +diff --git a/include/Arcus/Types.h b/include/Arcus/Types.h +index 9fdcc60a..58103de6 100644 +--- a/include/Arcus/Types.h ++++ b/include/Arcus/Types.h +@@ -6,6 +6,7 @@ + + #include + #include ++#include + + namespace google + { +diff --git a/src/MessageTypeStore.cpp b/src/MessageTypeStore.cpp +index 44c94ec7..5db03cdd 100644 +--- a/src/MessageTypeStore.cpp ++++ b/src/MessageTypeStore.cpp +@@ -6,6 +6,7 @@ + #include + #include + #include ++#include + + #include + #include +diff --git a/src/PlatformSocket.cpp b/src/PlatformSocket.cpp +index ab113e32..90c590da 100644 +--- a/src/PlatformSocket.cpp ++++ b/src/PlatformSocket.cpp +@@ -1,6 +1,8 @@ + // Copyright (c) 2022 Ultimaker B.V. + // libArcus is released under the terms of the LGPLv3 or higher. + ++#include ++ + #include "PlatformSocket_p.h" + + #ifdef _WIN32 +diff --git a/src/PlatformSocket_p.h b/src/PlatformSocket_p.h +index b1e9aa59..3f7e4249 100644 +--- a/src/PlatformSocket_p.h ++++ b/src/PlatformSocket_p.h +@@ -6,6 +6,7 @@ + + #include + #include ++#include + + namespace Arcus + { +diff --git a/src/Socket_p.h b/src/Socket_p.h +index 33f5873f..7711389c 100644 +--- a/src/Socket_p.h ++++ b/src/Socket_p.h +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + + #ifdef _WIN32 + #include +diff --git a/src/WireMessage_p.h b/src/WireMessage_p.h +index 07f8dd13..757aa32e 100644 +--- a/src/WireMessage_p.h ++++ b/src/WireMessage_p.h +@@ -4,6 +4,8 @@ + #ifndef ARCUS_WIRE_MESSAGE_P_H + #define ARCUS_WIRE_MESSAGE_P_H + ++#include ++ + #include "Arcus/Types.h" + + namespace Arcus +diff --git a/test_package/src/test.cpp b/test_package/src/test.cpp +index 52ca8438..09f13a59 100644 +--- a/test_package/src/test.cpp ++++ b/test_package/src/test.cpp +@@ -4,6 +4,7 @@ + #include + #include + #include ++#include + + #include "test.h" + diff --git a/libarcus.spec b/libarcus.spec index 12eda09..05368db 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -17,10 +17,13 @@ Source6: ArcusConfig.cmake.in Source7: COPYING-CMAKE-SCRIPTS # https://bugzilla.redhat.com/show_bug.cgi?id=1601917 -Patch1: libArcus-3.10.0-PyQt6.sip.patch +Patch: libArcus-3.10.0-PyQt6.sip.patch # Actually export symbols -Patch2: libArcus-5.2.2-actually-export-symbols.patch +Patch: libArcus-5.2.2-actually-export-symbols.patch + +# Add missing stdint includes +Patch: https://github.com/Ultimaker/libArcus/pull/160.patch BuildRequires: protobuf-devel BuildRequires: python3-devel @@ -83,8 +86,7 @@ rm -rf CMakeLists.txt cp -a %{SOURCE4} %{SOURCE5} %{SOURCE6} . cp -a pyArcus-%{version}/src/PythonMessage.cpp python/ -%patch -P1 -p1 -%patch -P2 -p1 -b .export +%autopatch -p1 %build %cmake -DBUILD_EXAMPLES:BOOL=OFF -DCMAKE_SKIP_RPATH:BOOL=ON From 889eb7ca04665493da739e886dee82a921cb6e54 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 17 Jun 2025 21:09:14 +0200 Subject: [PATCH 85/86] Rebuilt for Python 3.14 From 78316db09cbb062c09ade4ba97e773127fa4b327 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 19:21:40 +0000 Subject: [PATCH 86/86] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild