From 390a1de9376194ed75cc165e8cd728e690b41c92 Mon Sep 17 00:00:00 2001 From: layman Date: Mon, 21 Mar 2022 12:33:11 +0100 Subject: [PATCH 1/2] Updated gsconnect gnome shell extension --- .../gnome-shell-extension-gsconnect/Manifest | 3 + .../gnome-shell-extension-gsconnect-53.ebuild | 68 +++++++++++++++++++ .../metadata.xml | 11 +++ 3 files changed, 82 insertions(+) create mode 100644 gnome-extra/gnome-shell-extension-gsconnect/Manifest create mode 100644 gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-53.ebuild create mode 100644 gnome-extra/gnome-shell-extension-gsconnect/metadata.xml diff --git a/gnome-extra/gnome-shell-extension-gsconnect/Manifest b/gnome-extra/gnome-shell-extension-gsconnect/Manifest new file mode 100644 index 0000000..8a09a0f --- /dev/null +++ b/gnome-extra/gnome-shell-extension-gsconnect/Manifest @@ -0,0 +1,3 @@ +DIST gnome-shell-extension-gsconnect-53.tar.gz 729500 BLAKE2B 5cb841d67ee9021b3402420104dd8f74d94c2ed50c45182aec24fd2a39a4f30bab2167192c6cd701e211c3fa12b3a92a5dc18e92867eaee5dd233f107ddf6e42 SHA512 fa2ed1755180446b7e5a203f70a8fa098771380296ceb7f72c9c862a71e0baa8c8b9d34294e6608d6dad149bb98ff9fc224fd0b37bf8f532397df6f7587102c0 +EBUILD gnome-shell-extension-gsconnect-53.ebuild 1613 BLAKE2B 256af71a27da58c575b4f32818aa1a956dca48a9aaba40be0f51d6aa38cf0d83cc6dfea30b5f0f4315c5cc1c0802046cb17176e68c266a701a67a5cf948e4db8 SHA512 91d8197acdd565c4c64ab8035c57cbd45698b9e7a4646c4c195b6ad1681526885d0011fca6e9a8f716e94f77293ed2d5d44c6130e3dad280dab78e026c25e6e9 +MISC metadata.xml 346 BLAKE2B d1e2c79cae69a58f7af962316046f4620238b88d42e0f211a28ba271633993bae4df79956ab9dde4f4e94e7e77233288657d5b3c1876c9192118a11ee5ee678f SHA512 00b2e45892280f1a042b3ec03d66c3fcc7a2b95f94534d22fb8df936976384bb78433337b339ae023ae9850f2e4c0cfb8b12fae28ae7863d2ebe93a47784a77a diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-53.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-53.ebuild new file mode 100644 index 0000000..43492c9 --- /dev/null +++ b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-53.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit gnome2-utils meson readme.gentoo-r1 xdg + +DESCRIPTION="KDE Connect implementation for Gnome Shell" +HOMEPAGE="https://github.com/GSConnect/gnome-shell-extension-gsconnect" +SRC_URI="https://github.com/GSConnect/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="nautilus" + +COMMON_DEPEND="dev-libs/glib:2" +RDEPEND="${COMMON_DEPEND} + app-eselect/eselect-gnome-shell-extensions + >=dev-libs/gjs-1.68 + =gnome-base/gnome-shell-42* + gnome-base/gvfs + gnome-extra/evolution-data-server + || ( media-libs/libcanberra media-libs/gsound ) + nautilus? ( + dev-python/nautilus-python + gnome-base/nautilus[introspection] ) +" +DEPEND="${COMMON_DEPEND}" +BDEPEND=" + virtual/pkgconfig +" + +DISABLE_AUTOFORMATTING="yes" +DOC_CONTENTS="For knowing more about how to do the setup, please visit: +https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki/Installation" + +src_configure() { + # nemo support relies on nemo-python from https://github.com/linuxmint/nemo-extensions + # https://bugs.gentoo.org/694388 + meson_src_configure \ + -Dinstalled_tests=false \ + -Dnemo=false \ + $(meson_use nautilus) +} + +src_install() { + meson_src_install + readme.gentoo_create_doc +} + +pkg_preinst() { + gnome2_schemas_savelist + xdg_pkg_preinst +} + +pkg_postinst() { + gnome2_schemas_update + xdg_pkg_postinst + ebegin "Updating list of installed extensions" + eselect gnome-shell-extensions update + eend $? + readme.gentoo_print_elog +} + +pkg_postrm() { + gnome2_schemas_update + xdg_pkg_postrm +} diff --git a/gnome-extra/gnome-shell-extension-gsconnect/metadata.xml b/gnome-extra/gnome-shell-extension-gsconnect/metadata.xml new file mode 100644 index 0000000..750e40c --- /dev/null +++ b/gnome-extra/gnome-shell-extension-gsconnect/metadata.xml @@ -0,0 +1,11 @@ + + + + + pacho@gentoo.org + + + + Install Nautilus extension for sending files via GSConnect + + From 6788c925804cef0fd5f994860004315de9718ddf Mon Sep 17 00:00:00 2001 From: layman Date: Mon, 21 Mar 2022 13:38:20 +0100 Subject: [PATCH 2/2] Added prusaslicer as slic3r replacement --- media-gfx/prusaslicer/Manifest | 3 + ...er-2.4.0-fix-build-with-cereal-1.3.1.patch | 47 ++++++++++ media-gfx/prusaslicer/metadata.xml | 22 +++++ media-gfx/prusaslicer/prusaslicer-9999.ebuild | 87 +++++++++++++++++++ 4 files changed, 159 insertions(+) create mode 100644 media-gfx/prusaslicer/Manifest create mode 100644 media-gfx/prusaslicer/files/prusaslicer-2.4.0-fix-build-with-cereal-1.3.1.patch create mode 100644 media-gfx/prusaslicer/metadata.xml create mode 100644 media-gfx/prusaslicer/prusaslicer-9999.ebuild diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest new file mode 100644 index 0000000..06baa54 --- /dev/null +++ b/media-gfx/prusaslicer/Manifest @@ -0,0 +1,3 @@ +AUX prusaslicer-2.4.0-fix-build-with-cereal-1.3.1.patch 1601 BLAKE2B 0c30817c51c1cf2a914b1faad9923109cbae111e8538d6c7257885ab29b5944bdb97b0927ced972133ffd8fe12d2fe36f0826bb9839e3cbedd716719b0d26881 SHA512 21377080026fa43bf23dc06c4925decd6c6e7827599caebc2ba2e7b3f4f4428fcd6fe4044f3bc3d0f059cf2ede043cafe2928622046bf9443bdd3f21f1ff6c59 +EBUILD prusaslicer-9999.ebuild 1800 BLAKE2B a736b4456a7c6678c73966f39500a636e804f7898bed74aab10e0df57c54d013d37cf5e0ba66ac304cab56ccc11abdb16d48c4e633cb898f54f0ccdb3a7ce2c2 SHA512 5c60460ec8dad88d764ab8500dd3b0c61549c6414b0f49c7ae33751a963cd807a4527d2278d9bbc8846440c830c9e038c18b64e40bf63679da4fe9f96201ea02 +MISC metadata.xml 1028 BLAKE2B a267e6b0ee72a85b895046cc7d5f659cca379fd799a9ebb802dc1fafd7edfa1b989784b10eb93ac24f1ea6153153b892e28e20055b0a7d2021f6db7742e065b4 SHA512 5760ea954f5ccf09e5d69e101b6d68839a4517a9375adc3009b1bf846b98091ee0555e9c92bb0cf316670efec699cd24d04b4ebe7db5b65e363f83051d868512 diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.4.0-fix-build-with-cereal-1.3.1.patch b/media-gfx/prusaslicer/files/prusaslicer-2.4.0-fix-build-with-cereal-1.3.1.patch new file mode 100644 index 0000000..d57eb8a --- /dev/null +++ b/media-gfx/prusaslicer/files/prusaslicer-2.4.0-fix-build-with-cereal-1.3.1.patch @@ -0,0 +1,47 @@ +https://bugs.gentoo.org/834005 +https://github.com/prusa3d/PrusaSlicer/commit/0ffcfd8393457fd035576436752267c9a1e6bbcc +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -506,6 +506,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") +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -126,7 +126,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) +--- a/src/libslic3r/CMakeLists.txt ++++ b/src/libslic3r/CMakeLists.txt +@@ -358,7 +358,7 @@ find_package(JPEG REQUIRED) + target_link_libraries(libslic3r + libnest2d + admesh +- cereal ++ cereal::cereal + libigl + miniz + boost_libs +--- a/src/slic3r/CMakeLists.txt ++++ b/src/slic3r/CMakeLists.txt +@@ -270,7 +270,7 @@ endforeach() + + 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) diff --git a/media-gfx/prusaslicer/metadata.xml b/media-gfx/prusaslicer/metadata.xml new file mode 100644 index 0000000..514718a --- /dev/null +++ b/media-gfx/prusaslicer/metadata.xml @@ -0,0 +1,22 @@ + + + + + 3dprint@gentoo.org + Gentoo 3D Printer Project + + + PrusaSlicer takes 3D models (STL, OBJ, AMF) and converts them into G-code instructions for FFF printers or PNG + layers for mSLA 3D printers. It's compatible with any modern printer based on the RepRap toolchain, including + all those based on the Marlin, Prusa, Sprinter and Repetier firmware. It also works with Mach3, LinuxCNC and + Machinekit controllers. + + PrusaSlicer is based on Slic3r by Alessandro Ranellucci and the RepRap community. + + + https://github.com/prusa3d/PrusaSlicer/issues + https://help.prusa3d.com/en/article/general-info_1910 + cpe:/a:prusa3d:prusaslicer + prusa3d/PrusaSlicer + + diff --git a/media-gfx/prusaslicer/prusaslicer-9999.ebuild b/media-gfx/prusaslicer/prusaslicer-9999.ebuild new file mode 100644 index 0000000..823681f --- /dev/null +++ b/media-gfx/prusaslicer/prusaslicer-9999.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WX_GTK_VER="3.0-gtk3" + +inherit cmake desktop wxwidgets xdg + +MY_PN="PrusaSlicer" + +DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)" +HOMEPAGE="https://www.prusa3d.com/prusaslicer/" + +if [ "${PV}" == "9999" ] ; then + KEYWORDS="" + SRC_URI="" + EGIT_REPO_URI="https://github.com/prusa3d/PrusaSlicer.git" +else + KEYWORDS="~amd64 ~x86" + SRC_URI="https://github.com/prusa3d/${MY_PN}/archive/version_${PV}.tar.gz -> ${P}.tar.gz" + PATCHES=( + "${FILESDIR}"/${PN}-2.4.0-fix-build-with-cereal-1.3.1.patch + ) + S="${WORKDIR}/${MY_PN}-version_${PV}" +fi + +LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT" +SLOT="0" +IUSE="test" + +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-cpp/eigen:3 + >=dev-cpp/tbb-2021.4.0:= + >=dev-libs/boost-1.73.0:=[nls,threads(+)] + dev-libs/cereal + dev-libs/expat + dev-libs/glib:2 + dev-libs/gmp:= + dev-libs/mpfr:= + dev-libs/imath:= + >=media-gfx/openvdb-8.2:= + net-misc/curl + media-libs/glew:0= + media-libs/libpng:0= + media-libs/qhull:= + sci-libs/libigl + sci-libs/nlopt + >=sci-mathematics/cgal-5.0:= + sys-apps/dbus + sys-libs/zlib:= + virtual/glu + virtual/opengl + x11-libs/gtk+:3 + x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] +" +DEPEND="${RDEPEND} + media-libs/qhull[static-libs] +" + +src_prepare() { + sed -i -e 's/PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN/PrusaSlicer-${SLIC3R_VERSION}+Gentoo/g' version.inc || die + cmake_src_prepare +} + +src_configure() { + CMAKE_BUILD_TYPE="Release" + + setup-wxwidgets + + local mycmakeargs=( + -DOPENVDB_FIND_MODULE_PATH="/usr/$(get_libdir)/cmake/OpenVDB" + + -DSLIC3R_BUILD_TESTS=$(usex test) + -DSLIC3R_FHS=ON + -DSLIC3R_GTK=3 + -DSLIC3R_GUI=ON + -DSLIC3R_PCH=OFF + -DSLIC3R_STATIC=OFF + -DSLIC3R_WX_STABLE=ON + -Wno-dev + ) + + cmake_src_configure +}