Remove patch for libcereal that was fixed upstream

3 files changed, 2 insertions, 76 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 94cc29d6bea0..d824aa9f7b32 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = prusa-slicer-git
 	pkgdesc = G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)
-	pkgver = 2.5.0.alpha0.r43.g3a821d675
+	pkgver = 2.5.0.alpha0.r107.g1e9951dec
 	pkgrel = 1
 	url = https://github.com/prusa3d/PrusaSlicer
 	arch = i686
@@ -30,9 +30,7 @@ pkgbase = prusa-slicer-git
 	conflicts = prusa-slicer
 	source = git+https://github.com/prusa3d/PrusaSlicer
 	source = prusa-slicer-boost-placeholders.patch
-	source = 0001-Use-namespaces-to-link-against-libcereal-1.3.1.patch
 	sha256sums = SKIP
 	sha256sums = 58cae07a418a797222f4cb10950fa2fd7afb7570519785b082cc7d7e7f407c02
-	sha256sums = 74d38c96ff7534aff64f3817579e86e9c63de08d1641118681a53dd4bbb2a6d6
 
 pkgname = prusa-slicer-git
diff --git a/0001-Use-namespaces-to-link-against-libcereal-1.3.1.patch b/0001-Use-namespaces-to-link-against-libcereal-1.3.1.patch
deleted file mode 100644
index 834c657ed8b9..000000000000
--- a/0001-Use-namespaces-to-link-against-libcereal-1.3.1.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From ac486108bdc7ca0548b5d8bb696fa382d68d1801 Mon Sep 17 00:00:00 2001
-From: Yuri D'Elia <wavexx@thregr.org>
-Date: Mon, 24 Jan 2022 20:21:24 +0100
-Subject: [PATCH] Use namespaces to link against libcereal >= 1.3.1
-
-Create an alias for previous versions.
----
- CMakeLists.txt               | 3 +++
- src/CMakeLists.txt           | 2 +-
- src/libslic3r/CMakeLists.txt | 2 +-
- src/slic3r/CMakeLists.txt    | 2 +-
- 4 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a37e7a1b9..42d0693bc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -474,6 +474,9 @@ endif ()
- 
- # Find the Cereal serialization library
- find_package(cereal REQUIRED)
-+if (NOT TARGET cereal::cereal)
-+    add_library(cereal::cereal ALIAS cereal)
-+endif ()
- 
- # l10n
- set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization")
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 9e89e82f6..9adeb94ee 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -125,7 +125,7 @@ if (NOT WIN32 AND NOT APPLE)
-     set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer")
- endif ()
- 
--target_link_libraries(PrusaSlicer libslic3r cereal)
-+target_link_libraries(PrusaSlicer libslic3r cereal::cereal)
- if (APPLE)
- #    add_compile_options(-stdlib=libc++)
- #    add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
-diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
-index 99d010d9c..2abb3ae5b 100644
---- a/src/libslic3r/CMakeLists.txt
-+++ b/src/libslic3r/CMakeLists.txt
-@@ -337,7 +337,7 @@ target_include_directories(libslic3r PUBLIC ${EXPAT_INCLUDE_DIRS})
- target_link_libraries(libslic3r
-     libnest2d
-     admesh
--    cereal
-+    cereal::cereal
-     libigl
-     miniz
-     boost_libs
-diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt
-index 34cc98051..50c5fcabc 100644
---- a/src/slic3r/CMakeLists.txt
-+++ b/src/slic3r/CMakeLists.txt
-@@ -260,7 +260,7 @@ add_library(libslic3r_gui STATIC ${SLIC3R_GUI_SOURCES})
- 
- encoding_check(libslic3r_gui)
- 
--target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
-+target_link_libraries(libslic3r_gui libslic3r avrdude cereal::cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
- 
- if (MSVC)
-     target_link_libraries(libslic3r_gui Setupapi.lib)
--- 
-2.35.1
-
diff --git a/PKGBUILD b/PKGBUILD
index baa1cb95a640..908a72391474 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Salamandar <felix@piedallu.me>
 
 pkgname=prusa-slicer-git
-pkgver=2.5.0.alpha0.r43.g3a821d675
+pkgver=2.5.0.alpha0.r107.g1e9951dec
 pkgrel=1
 pkgdesc='G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)'
 arch=('i686' 'x86_64' 'armv6' 'armv6h' 'armv7h')
@@ -33,12 +33,10 @@ depends=(
 source=(
     "git+${url}"
     'prusa-slicer-boost-placeholders.patch'
-    '0001-Use-namespaces-to-link-against-libcereal-1.3.1.patch'
 )
 sha256sums=(
     'SKIP'
     '58cae07a418a797222f4cb10950fa2fd7afb7570519785b082cc7d7e7f407c02'
-    '74d38c96ff7534aff64f3817579e86e9c63de08d1641118681a53dd4bbb2a6d6'
 )
 conflicts=('prusa-slicer')
 
@@ -50,7 +48,6 @@ prepare() {
     cd "PrusaSlicer"
     # Fix build with Boost 1.76.0
     patch -p1 < "$srcdir/prusa-slicer-boost-placeholders.patch"
-    patch -p1 < "$srcdir/0001-Use-namespaces-to-link-against-libcereal-1.3.1.patch"
 }
 
 build() {