From bbe9b826d2f89728d207b5166aa0938422940fe2 Mon Sep 17 00:00:00 2001 From: Jasper Chan Date: Sun, 26 May 2019 03:10:04 -0700 Subject: [PATCH] Rename package: Slic3rPE-1.42.0 to PrusaSlicer-2.0.0 --- srcpkgs/PrusaSlicer/INSTALL.msg | 4 +++ srcpkgs/PrusaSlicer/Slic3rPE.INSTALL.msg | 4 +++ ...-sys-unistd.h-with-unistd.h-for-musl.patch | 25 +++++++++++++++++ srcpkgs/PrusaSlicer/template | 22 +++++++++++++++ srcpkgs/Slic3rPE | 1 + .../patches/fix-strerror_r-check.patch | 27 ------------------- srcpkgs/Slic3rPE/template | 22 --------------- 7 files changed, 56 insertions(+), 49 deletions(-) create mode 100644 srcpkgs/PrusaSlicer/INSTALL.msg create mode 100644 srcpkgs/PrusaSlicer/Slic3rPE.INSTALL.msg create mode 100644 srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch create mode 100644 srcpkgs/PrusaSlicer/template create mode 120000 srcpkgs/Slic3rPE delete mode 100644 srcpkgs/Slic3rPE/patches/fix-strerror_r-check.patch delete mode 100644 srcpkgs/Slic3rPE/template diff --git a/srcpkgs/PrusaSlicer/INSTALL.msg b/srcpkgs/PrusaSlicer/INSTALL.msg new file mode 100644 index 00000000000..190965371f6 --- /dev/null +++ b/srcpkgs/PrusaSlicer/INSTALL.msg @@ -0,0 +1,4 @@ +Slic3rPE has been renamed to PrusaSlicer + +The binary executable has been renamed from +/usr/bin/slic3r-pe to /usr/bin/prusa-slicer diff --git a/srcpkgs/PrusaSlicer/Slic3rPE.INSTALL.msg b/srcpkgs/PrusaSlicer/Slic3rPE.INSTALL.msg new file mode 100644 index 00000000000..190965371f6 --- /dev/null +++ b/srcpkgs/PrusaSlicer/Slic3rPE.INSTALL.msg @@ -0,0 +1,4 @@ +Slic3rPE has been renamed to PrusaSlicer + +The binary executable has been renamed from +/usr/bin/slic3r-pe to /usr/bin/prusa-slicer diff --git a/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch b/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch new file mode 100644 index 00000000000..4abae3ef38a --- /dev/null +++ b/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch @@ -0,0 +1,25 @@ +From 7cdeb3dfbe01fc681c35e89e3f509c8e7ac9522e Mon Sep 17 00:00:00 2001 +From: Jasper Chan +Date: Mon, 27 May 2019 18:54:59 -0700 +Subject: [PATCH] Replace sys/unistd.h with unistd.h for musl + +--- + src/slic3r/Utils/Serial.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git src/slic3r/Utils/Serial.cpp src/slic3r/Utils/Serial.cpp +index 601719b50..43dab2390 100644 +--- src/slic3r/Utils/Serial.cpp ++++ src/slic3r/Utils/Serial.cpp +@@ -42,7 +42,7 @@ + #ifndef _WIN32 + #include + #include +- #include ++ #include + #include + #endif + +-- +2.21.0 + diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template new file mode 100644 index 00000000000..3cf78afd647 --- /dev/null +++ b/srcpkgs/PrusaSlicer/template @@ -0,0 +1,22 @@ +# Template file for 'PrusaSlicer' +pkgname=PrusaSlicer +version=2.0.0 +revision=1 +wrksrc="PrusaSlicer-version_${version}${_status}" +build_style=cmake +configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1" +hostmakedepends="pkg-config" +makedepends="boost-devel tbb-devel libcurl-devel nlopt-devel gtest-devel + wxWidgets-devel glu-devel libpng-devel" +short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)" +maintainer="Jasper Chan " +license="GPL-3.0-or-later" +homepage="https://www.prusa3d.com/prusaslicer/" +distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz" +checksum=5d3c7fd745f2875be55f316cd779805ce1b6ce38634f0f4b0ccd01884da731b3 +nocross="tries to run avrdude-conf-gen which is compiled for target" + +Slic3rPE_package() { + build_style=meta + depends=${pkgname} +} diff --git a/srcpkgs/Slic3rPE b/srcpkgs/Slic3rPE new file mode 120000 index 00000000000..f9b60034c37 --- /dev/null +++ b/srcpkgs/Slic3rPE @@ -0,0 +1 @@ +PrusaSlicer \ No newline at end of file diff --git a/srcpkgs/Slic3rPE/patches/fix-strerror_r-check.patch b/srcpkgs/Slic3rPE/patches/fix-strerror_r-check.patch deleted file mode 100644 index 0380f333e85..00000000000 --- a/srcpkgs/Slic3rPE/patches/fix-strerror_r-check.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git src/png/error.hpp src/png/error.hpp -index c67f976..8ee2c87 100644 ---- src/png/error.hpp -+++ src/png/error.hpp -@@ -100,7 +100,7 @@ namespace png - strerror_s(buf, ERRBUF_SIZE, errnum); - return std::string(buf); - #else --#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE -+#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE || !defined(__GLIBC__) - char buf[ERRBUF_SIZE] = { 0 }; - strerror_r(errnum, buf, ERRBUF_SIZE); - return std::string(buf); -diff --git src/slic3r/Utils/Serial.cpp src/slic3r/Utils/Serial.cpp -index 601719b..43dab23 100644 ---- src/slic3r/Utils/Serial.cpp -+++ src/slic3r/Utils/Serial.cpp -@@ -42,7 +42,7 @@ - #ifndef _WIN32 - #include - #include -- #include -+ #include - #include - #endif - - diff --git a/srcpkgs/Slic3rPE/template b/srcpkgs/Slic3rPE/template deleted file mode 100644 index c2f5065e5c9..00000000000 --- a/srcpkgs/Slic3rPE/template +++ /dev/null @@ -1,22 +0,0 @@ -# Template file for 'Slic3rPE' -pkgname=Slic3rPE -version=1.42.0 -revision=2 -_status="-beta" -wrksrc="Slic3r-version_${version}${_status}" -build_style=cmake -configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1" -hostmakedepends="pkg-config" -makedepends="boost-devel tbb-devel libcurl-devel nlopt-devel gtest-devel - wxWidgets-devel glu-devel libpng-devel" -short_desc="G-code generator for 3D printers, Prusa Edition" -maintainer="Jasper Chan " -license="GPL-3.0-or-later" -homepage="https://www.prusa3d.com/slic3r-prusa-edition/" -distfiles="https://github.com/prusa3d/Slic3r/archive/version_${version}${_status}.tar.gz" -checksum=d33f20b51dcf58eb048780df050e859969fbd8bcb8534f93a588035179804fcd -nocross="tries to run avrdude-conf-gen which is compiled for target" - -post_install() { - mv ${DESTDIR}/usr/bin/slic3r-{gui,pe} -}