Github messages for voidlinux
 help / color / Atom feed
* [PR PATCH] PrusaSlicer 2.1.1 update
@ 2020-01-12 23:54 voidlinux-github
  2020-05-19 14:15 ` PrusaSlicer: update to 2.1.1 Piraty
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: voidlinux-github @ 2020-01-12 23:54 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 391 bytes --]

There is a new pull request by zlice against master on the void-packages repository

https://github.com/zlice/void-packages PrusaSlicer_2_1_1
https://github.com/void-linux/void-packages/pull/18280

PrusaSlicer 2.1.1 update
depends on cereal PR
https://github.com/void-linux/void-packages/pull/18279

A patch file from https://github.com/void-linux/void-packages/pull/18280.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-PrusaSlicer_2_1_1-18280.patch --]
[-- Type: text/x-diff, Size: 3540 bytes --]

From 31fc16e23ed0145bc924ec4b9e2d1cf2c642aaa8 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 12 Jan 2020 18:52:48 -0500
Subject: [PATCH] PrusaSlicer 2.1.1 update

---
 ...-sys-unistd.h-with-unistd.h-for-musl.patch | 25 -------------------
 srcpkgs/PrusaSlicer/patches/cross.patch       | 11 --------
 srcpkgs/PrusaSlicer/template                  |  8 +++---
 3 files changed, 4 insertions(+), 40 deletions(-)
 delete mode 100644 srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
 delete mode 100644 srcpkgs/PrusaSlicer/patches/cross.patch

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
deleted file mode 100644
index 4abae3ef38a..00000000000
--- a/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7cdeb3dfbe01fc681c35e89e3f509c8e7ac9522e Mon Sep 17 00:00:00 2001
-From: Jasper Chan <jasperchan515@gmail.com>
-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 <sys/ioctl.h>
- 	#include <sys/time.h>
--	#include <sys/unistd.h>
-+	#include <unistd.h>
- 	#include <sys/select.h>
- #endif
- 
--- 
-2.21.0
-
diff --git a/srcpkgs/PrusaSlicer/patches/cross.patch b/srcpkgs/PrusaSlicer/patches/cross.patch
deleted file mode 100644
index 2c82d96dcde..00000000000
--- a/srcpkgs/PrusaSlicer/patches/cross.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/avrdude/CMakeLists.txt	2019-05-20 18:49:36.000000000 +0200
-+++ -	2019-05-31 23:42:15.542838510 +0200
-@@ -82,7 +82,7 @@
- add_custom_command(
-     DEPENDS avrdude-conf-gen ${CMAKE_CURRENT_SOURCE_DIR}/avrdude-slic3r.conf
-     OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/avrdude-slic3r.conf.h
--    COMMAND $<TARGET_FILE:avrdude-conf-gen> avrdude-slic3r.conf avrdude_slic3r_conf > avrdude-slic3r.conf.h
-+    COMMAND avrdude-conf-gen avrdude-slic3r.conf avrdude_slic3r_conf > avrdude-slic3r.conf.h
-     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- )
- 
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index b517d825b4f..e5ea63c7fd6 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,20 +1,20 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
-version=2.0.0
-revision=2
+version=2.1.1
+revision=1
 wrksrc="PrusaSlicer-version_${version}"
 build_style=cmake
 build_helper="qemu"
 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"
+ wxWidgets-devel glu-devel libpng-devel cereal"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 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
+checksum=79d0681fbf3f4158cac25595522dcea330e0fa960934053ac929a15fa13c1072
 
 Slic3rPE_package() {
 	build_style=meta

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: PrusaSlicer: update to 2.1.1
  2020-01-12 23:54 [PR PATCH] PrusaSlicer 2.1.1 update voidlinux-github
@ 2020-05-19 14:15 ` Piraty
  2020-05-19 16:44 ` [PR PATCH] [Closed]: " zlice
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: Piraty @ 2020-05-19 14:15 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 278 bytes --]

New comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/18280#issuecomment-630847860

Comment:
@zlice ping.
please
* rebase that update commit to master (don't merge master)
* format the commit message according to Void's standard

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Closed]: PrusaSlicer: update to 2.1.1
  2020-01-12 23:54 [PR PATCH] PrusaSlicer 2.1.1 update voidlinux-github
  2020-05-19 14:15 ` PrusaSlicer: update to 2.1.1 Piraty
@ 2020-05-19 16:44 ` zlice
  2020-05-19 16:56 ` zlice
  2020-05-20  7:31 ` Piraty
  3 siblings, 0 replies; 5+ messages in thread
From: zlice @ 2020-05-19 16:44 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 238 bytes --]

There's a closed pull request on the void-packages repository

PrusaSlicer: update to 2.1.1
https://github.com/void-linux/void-packages/pull/18280

Description:
depends on cereal PR
https://github.com/void-linux/void-packages/pull/18279

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: PrusaSlicer: update to 2.1.1
  2020-01-12 23:54 [PR PATCH] PrusaSlicer 2.1.1 update voidlinux-github
  2020-05-19 14:15 ` PrusaSlicer: update to 2.1.1 Piraty
  2020-05-19 16:44 ` [PR PATCH] [Closed]: " zlice
@ 2020-05-19 16:56 ` zlice
  2020-05-20  7:31 ` Piraty
  3 siblings, 0 replies; 5+ messages in thread
From: zlice @ 2020-05-19 16:56 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 244 bytes --]

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/18280#issuecomment-630949189

Comment:
i messed something up, donno what but made this

https://github.com/void-linux/void-packages/pull/22138

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: PrusaSlicer: update to 2.1.1
  2020-01-12 23:54 [PR PATCH] PrusaSlicer 2.1.1 update voidlinux-github
                   ` (2 preceding siblings ...)
  2020-05-19 16:56 ` zlice
@ 2020-05-20  7:31 ` Piraty
  3 siblings, 0 replies; 5+ messages in thread
From: Piraty @ 2020-05-20  7:31 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 191 bytes --]

New comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/18280#issuecomment-631292356

Comment:
please fix existing PRs instead of opening new ones

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, back to index

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-12 23:54 [PR PATCH] PrusaSlicer 2.1.1 update voidlinux-github
2020-05-19 14:15 ` PrusaSlicer: update to 2.1.1 Piraty
2020-05-19 16:44 ` [PR PATCH] [Closed]: " zlice
2020-05-19 16:56 ` zlice
2020-05-20  7:31 ` Piraty

Github messages for voidlinux

Archives are clonable: git clone --mirror http://inbox.vuxu.org/voidlinux-github

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git