Compare commits

...

2 Commits

Author SHA1 Message Date
andreili
c430b203e3 Sync with last state 2025-08-04 22:55:00 +02:00
andreili
edfe4fec15 Sync with last state 2025-08-04 22:54:25 +02:00
29 changed files with 925 additions and 225 deletions

View File

@ -1,2 +0,0 @@
DIST abseil-cpp-20230802.0.tar.gz 2156669 BLAKE2B 34de2f949db3e7578cae39bdd851785fd5327a80662436e7d77f18e196cc28eb1b463e9f49c8fc66060073c6c88222015af8b41044d56af6811c8914e84fbea3 SHA512 320295fa687ded05b774741eb4c5285291d44cc14402ec5d997057cb4f53fb3ba54cd162c7a7b1003312b677603a1c25e14bfdbd1fc22ccf4b4443e8a6e3ec02
EBUILD abseil-cpp-20230802.0.ebuild 1478 BLAKE2B 5d7c7cb2078e016feb12c325aab39696916a5587068bad7d9844b189d1f376a06e49de7e3dcc2d48bc4949d7f84f58db06f816b99aca973be889600179706857 SHA512 db8085b22c15ed93bc4913d8048e9a5729bb22f7e3a5ea5263a4aa94ca233a4c75e61167e56dcd04d83f926451e0f10af130a1cc59d14b3d51d6a94b20cf655e

View File

@ -1,62 +0,0 @@
# Copyright 2020-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
inherit cmake-multilib python-any-r1
DESCRIPTION="Abseil Common Libraries (C++), LTS Branch"
HOMEPAGE="https://abseil.io/"
SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0/${PV%%.*}"
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
IUSE="test"
DEPEND=""
RDEPEND="${DEPEND}"
BDEPEND="
${PYTHON_DEPS}
test? (
>=dev-cpp/gtest-1.13.0
sys-libs/timezone-data
)
"
RESTRICT="!test? ( test )"
src_prepare() {
cmake_src_prepare
# un-hardcode abseil compiler flags
sed -i \
-e '/"-maes",/d' \
-e '/"-msse4.1",/d' \
-e '/"-mfpu=neon"/d' \
-e '/"-march=armv8-a+crypto"/d' \
absl/copts/copts.py || die
# now generate cmake files
python_fix_shebang absl/copts/generate_copts.py
absl/copts/generate_copts.py || die
}
multilib_src_configure() {
local mycmakeargs=(
# We use -std=c++14 here so that abseil-cpp's string_view is used
# See the discussion in https://github.com/gentoo/gentoo/pull/32281.
-DCMAKE_CXX_STANDARD=17
-DABSL_ENABLE_INSTALL=TRUE
-DABSL_USE_EXTERNAL_GOOGLETEST=ON
-DABSL_PROPAGATE_CXX_STD=TRUE
-DABSL_BUILD_TEST_HELPERS=$(usex test ON OFF)
-DABSL_BUILD_TESTING=$(usex test ON OFF)
$(usex test -DBUILD_TESTING=ON '') # intentional usex, it used both variables for tests.
)
cmake_src_configure
}

View File

@ -1,2 +0,0 @@
DIST protobuf-24.4.tar.gz 5180235 BLAKE2B 1c7e9035d9f3810886baaea7d679414c882463c79828c99dd8895a9549638c1ca17f9ab3b38d461019f3e1412d9cb9584b995b1da99866eb6fdbb8bdeb063e6f SHA512 52b6ab5587d03cbd1f35cf3cdc388e1710fa50f3031559ac53cf754965407ded7602cdead56080444ab695588112cc3391a1d7fdd5e565d90d0af7ad08706315
EBUILD protobuf-24.4.ebuild 2446 BLAKE2B d3416e9fe637be0fce05618a8a9c9ed6c08bf6bd060bfcdab54f55be4c19c755e93bd3c8e70427fb5145e78ace7d5f768266689ed4dc08c828f59b86cb12d48a SHA512 458d2c7059e82f4f54e2bba04da69485a5ac89d0eb6befeaab0c3a76841fa1a63438181dde730d0d9472e0fa6d9e804afba3bf3bc0519d9262da4d4a9912bf4d

View File

@ -1,102 +0,0 @@
# Copyright 2008-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit cmake-multilib elisp-common toolchain-funcs
if [[ "${PV}" == *9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
EGIT_SUBMODULES=()
else
SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
fi
DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
HOMEPAGE="https://protobuf.dev/"
LICENSE="BSD"
SLOT="0/$(ver_cut 1-2).0"
IUSE="emacs examples test zlib"
RESTRICT="!test? ( test )"
BDEPEND="emacs? ( app-editors/emacs:* )"
DEPEND="
>=dev-cpp/abseil-cpp-20230125.3:=[${MULTILIB_USEDEP}]
zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
"
RDEPEND="
>=dev-cpp/abseil-cpp-20230125.3:=[${MULTILIB_USEDEP}]
emacs? ( app-editors/emacs:* )
zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
"
#PATCHES=(
# ${FILESDIR}/protobuf-v24.4.patch
#)
DOCS=( CONTRIBUTORS.txt README.md )
src_configure() {
if tc-ld-is-gold; then
# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
tc-ld-disable-gold
fi
cmake-multilib_src_configure
}
multilib_src_configure() {
local mycmakeargs=(
-Dprotobuf_DISABLE_RTTI=ON
-Dprotobuf_BUILD_EXAMPLES=$(usex examples)
-Dprotobuf_WITH_ZLIB=$(usex zlib)
-Dprotobuf_BUILD_TESTS=$(usex test)
-Dprotobuf_ABSL_PROVIDER=package
)
use test && mycmakeargs+=(-Dprotobuf_USE_EXTERNAL_GTEST=ON)
cmake_src_configure
}
src_compile() {
cmake-multilib_src_compile
if use emacs; then
elisp-compile editors/protobuf-mode.el
fi
}
multilib_src_install_all() {
find "${ED}" -name "*.la" -delete || die
if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf.so.${SLOT#*/}" ]]; then
eerror "No matching library found with SLOT variable, currently set: ${SLOT}\n" \
"Expected value: ${ED}/usr/$(get_libdir)/libprotobuf.so.${SLOT#*/}"
die "Please update SLOT variable"
fi
if use emacs; then
elisp-install ${PN} editors/protobuf-mode.el*
elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
fi
if use examples; then
DOCS+=(examples)
docompress -x /usr/share/doc/${PF}/examples
fi
einstalldocs
}
pkg_postinst() {
use emacs && elisp-site-regen
}
pkg_postrm() {
use emacs && elisp-site-regen
}

View File

@ -1,2 +0,0 @@
DIST re2-2023-08-01.tar.gz 396553 BLAKE2B 4e9eed4d7be9e6ea0467099323293d95d5f0db80a9d8fc996e20aebf87d800b548eb0f526c3966843adac5da5568acc731cb8296101f5030cc36b26c1ef42ca6 SHA512 33703f87dbb359e481c46fd97977d420a9f0f3d4b378b8a0ecdec60d3c7b237d941b37780101f229c5e4785898a208963616a390d6c01d849c455716eae85106
EBUILD re2-0.2023.08.01.ebuild 1360 BLAKE2B c05651d26792e5526440b0add5639cde5097c04e97209a64635a470094811340e70d5bbb776326a06935f8692c3e8f0ea9c6b867f92ccfbf2c6adaa5d2c59aa3 SHA512 100dfdc937b12a46a7270aa1847f2d9df104a58e857c9233784902024430007547da15d7afda2a09cee40d59838361d603c27c7aa0077c717ff99096a5ef70ea

View File

@ -1,52 +0,0 @@
# Copyright 2012-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit multilib-minimal toolchain-funcs
# Different date format used upstream.
RE2_VER=${PV#0.}
RE2_VER=${RE2_VER//./-}
DESCRIPTION="An efficient, principled regular expression library"
HOMEPAGE="https://github.com/google/re2"
SRC_URI="https://github.com/google/re2/archive/${RE2_VER}.tar.gz -> re2-${RE2_VER}.tar.gz"
LICENSE="BSD"
# NOTE: Always run libre2 through abi-compliance-checker!
# https://abi-laboratory.pro/tracker/timeline/re2/
SONAME="11"
SLOT="0/${SONAME}"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
IUSE="icu"
BDEPEND="icu? ( virtual/pkgconfig )"
DEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
RDEPEND="${DEPEND}"
S="${WORKDIR}/re2-${RE2_VER}"
DOCS=( AUTHORS CONTRIBUTORS README doc/syntax.txt )
HTML_DOCS=( doc/syntax.html )
src_prepare() {
default
grep -q "^SONAME=${SONAME}\$" Makefile || die "SONAME mismatch"
if use icu; then
sed -i -e 's:^# \(\(CC\|LD\)ICU=.*\):\1:' Makefile || die
fi
multilib_copy_sources
}
src_configure() {
tc-export AR CXX
}
multilib_src_compile() {
emake SONAME="${SONAME}" shared
}
multilib_src_install() {
emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" shared-install
}

View File

@ -0,0 +1,2 @@
AUX pyside6-6.6.0-no-qtexampleicons.patch 221 BLAKE2B d45b4ebcd780a0151b793b5b21f5d7599ee5c427372ef19f518ac1c94306938178b0bfb603d9755aae9bddc4c31c35bb4648617c793f8e399f0f8dcce0d1f3bb SHA512 1da97be74142402454ef5384c58d2b2a792fea53b4155d7b5ede6d145496b45e4fd56723f8f7716150c2bba448ce816c6740059d7d38ae53d5cdf7c38c4acd7b
EBUILD pyside6-6.7.0.ebuild 10270 BLAKE2B ea396318e03c63acf86633b927089ca59416f67ccc39fa7acbc4b7dd568793dc027300ce0e55d657d50c9e4284b64539dac6cd8add4846cda2989914696ae11a SHA512 318bcfac95f5f0d028444493031ebad6d72bf7cf07ce56d219400f3171f49efb70f6c79318116b145830f8f6080de3dcdf60f01b488b58a3094b2a2d3f6d5c11

View File

@ -0,0 +1,10 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e4c701..6792258 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,5 +41,3 @@ if(BUILD_TESTS)
endif()
add_subdirectory(doc)
-
-add_subdirectory(qtexampleicons)

View File

@ -0,0 +1,249 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
# TODO: Add PyPy once officially supported. See also:
# https://bugreports.qt.io/browse/PYSIDE-535
PYTHON_COMPAT=( python3_{10..12} )
LLVM_COMPAT=( {15..17} )
inherit cmake llvm-r1 python-r1 virtualx git-r3
# TODO: Add conditional support for "QtRemoteObjects" via a new "remoteobjects"
# USE flag after an external "dev-qt/qtremoteobjects" package has been created.
# TODO: Add conditional support for apidoc generation via a new "doc" USE flag.
# Note that doing so requires the Qt source tree, sphinx, and graphviz. Once
# ready, pass the ${QT_SRC_DIR} variable to cmake to enable this support.
# TODO: Disable GLES support if the "gles2-only" USE flag is disabled. Note
# that the "PySide6/QtGui/CMakeLists.txt" and
# "PySide6/QtOpenGLFunctions/CMakeLists.txt" files test for GLES support by
# testing whether the "Qt5::Gui" list property defined by
# "/usr/lib64/cmake/Qt5Gui/Qt5GuiConfig.cmake" at "dev-qt/qtgui" installation
# time contains the substring "opengles2". Since cmake does not permit
# properties to be overridden from the command line, these files must instead
# be conditionally patched to avoid these tests. An issue should be filed with
# upstream requesting a CLI-settable variable to control this.
MY_PN="pyside-setup-everywhere-src"
DESCRIPTION="Python bindings for the Qt framework"
HOMEPAGE="https://wiki.qt.io/PySide6"
#SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_PN}-${PV}.tar.xz"
S="${WORKDIR}/${PN}-${PV}/sources/pyside6"
EGIT_REPO_URI="https://code.qt.io/pyside/pyside-setup"
EGIT_BRANCH="6.7.0"
# See "sources/pyside6/PySide6/licensecomment.txt" for licensing details.
# Shall we allow essential modules to be disabled? They are:
# (core), gui, widgets, printsupport, sql, network, testlib, concurrent,
# x11extras (for X)
LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
SLOT="0"
KEYWORDS="~amd64"
IUSE="
3d bluetooth charts +concurrent +dbus designer gles2-only +gui help location
multimedia +network network-auth nfc positioning +opengl pdfium positioning
+printsupport qml quick quick3d serialport scxml sensors spatialaudio speech
+sql svg test +testlib webchannel webengine websockets +widgets +xml
"
# Manually reextract these requirements on version bumps by running the
# following one-liner from within "${S}":
# $ grep 'set.*_deps' PySide6/Qt*/CMakeLists.txt
# Note that the "designer" USE flag corresponds to the "Qt6UiTools" module.
REQUIRED_USE="${PYTHON_REQUIRED_USE}
3d? ( gui network )
charts? ( gui widgets )
designer? ( widgets )
gles2-only? ( gui )
gui? ( dbus opengl )
help? ( network sql widgets )
location? ( gui network positioning quick )
multimedia? ( gui network )
network-auth? ( network )
opengl? ( gui )
pdfium? ( gui )
printsupport? ( widgets )
qml? ( network )
quick? ( gui network opengl qml )
quick3d? ( gui network opengl qml quick )
spatialaudio? ( multimedia )
speech? ( multimedia )
sql? ( widgets )
svg? ( gui )
testlib? ( widgets )
webchannel? ( qml )
webengine? ( network gui printsupport quick webchannel )
websockets? ( network )
widgets? ( gui )
"
# Tests fail pretty bad and I'm not fixing them right now
RESTRICT="test"
# Minimal supported version of Qt.
QT_PV="$(ver_cut 1-3):6"
RDEPEND="${PYTHON_DEPS}
~dev-python/shiboken6-${PV}[${PYTHON_USEDEP},${LLVM_USEDEP}]
>=dev-qt/qtbase-${QT_PV}[concurrent?,dbus?,gles2-only=,network?,opengl?,sql?,widgets?,xml?]
3d? ( >=dev-qt/qt3d-${QT_PV}[qml?,gles2-only=] )
bluetooth? ( >=dev-qt/qtconnectivity-${QT_PV}[bluetooth] )
charts? ( >=dev-qt/qtcharts-${QT_PV} )
designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
gui? (
>=dev-qt/qtbase-${QT_PV}[gui,jpeg(+)]
x11-libs/libxkbcommon
)
help? ( >=dev-qt/qttools-${QT_PV}[assistant] )
location? ( >=dev-qt/qtlocation-${QT_PV} )
multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
network? ( >=dev-qt/qtbase-${QT_PV}[ssl] )
network-auth? ( >=dev-qt/qtnetworkauth-${QT_PV} )
nfc? ( >=dev-qt/qtconnectivity-${QT_PV}[nfc] )
pdfium? ( >=dev-qt/qtwebengine-${QT_PV}[pdfium(-),widgets?] )
positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
printsupport? ( >=dev-qt/qtbase-${QT_PV}[gui,widgets] )
qml? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
quick3d? ( >=dev-qt/qtquick3d-${QT_PV} )
scxml? ( >=dev-qt/qtscxml-${QT_PV} )
sensors? ( >=dev-qt/qtsensors-${QT_PV}[qml?] )
speech? ( >=dev-qt/qtspeech-${QT_PV} )
serialport? ( >=dev-qt/qtserialport-${QT_PV} )
svg? ( >=dev-qt/qtsvg-${QT_PV} )
testlib? ( >=dev-qt/qtbase-${QT_PV}[gui] )
webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
webengine? ( || (
>=dev-qt/qtwebengine-${QT_PV}[alsa,widgets?]
>=dev-qt/qtwebengine-${QT_PV}[pulseaudio,widgets?]
)
)
websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
"
DEPEND="${RDEPEND}
$(llvm_gen_dep '
sys-devel/clang:${LLVM_SLOT}
sys-devel/llvm:${LLVM_SLOT}
')
test? ( >=dev-qt/qtbase-${QT_PV}[gui] )
"
# testlib is toggled by the gui flag on qtbase
PATCHES=(
# References files not present in our dev-qt/qtbase
"${FILESDIR}/${PN}-6.6.0-no-qtexampleicons.patch"
)
src_configure() {
# See collect_module_if_found macros in PySideHelpers.cmake
local mycmakeargs=(
-DBUILD_TESTS=$(usex test)
-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DAnimation=$(usex !3d)
-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DCore=$(usex !3d)
-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DExtras=$(usex !3d)
-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DInput=$(usex !3d)
-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DLogic=$(usex !3d)
-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DRender=$(usex !3d)
#-DCMAKE_DISABLE_FIND_PACKAGE_Qt6AxContainer=yes
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Bluetooth=$(usex !bluetooth)
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Charts=$(usex !charts)
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Concurrent=$(usex !concurrent)
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6DataVisualization=yes
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6DBus=$(usex !dbus)
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Designer=$(usex !designer)
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Gui=$(usex !gui)
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Help=$(usex !help)
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6HttpServer=yes
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Location=$(usex !location)
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Multimedia=$(usex !multimedia)
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6MultimediaWidgets=$(usex !multimedia yes $(usex !widgets))
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6NetworkAuth=$(usex !network-auth)
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Network=$(usex !network)
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Nfc=$(usex !nfc)
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGL=$(usex !opengl)
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGLWidgets=$(usex !opengl yes $(usex !widgets))
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Pdf=$(usex !pdfium)
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6PdfWidgets=$(usex !pdfium yes $(usex !widgets))
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Positioning=$(usex !positioning)
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6PrintSupport=$(usex !printsupport)
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Qml=$(usex !qml)
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick3D=$(usex !quick3d)
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick=$(usex !quick)
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickControls2=yes
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickWidgets=$(usex !quick yes $(usex !widgets))
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6RemoteObjects=yes
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Scxml=$(usex !scxml)
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sensors=$(usex !sensors)
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6SerialPort=$(usex !serialport)
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6SpatialAudio=$(usex !spatialaudio)
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sql=$(usex !sql)
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6StateMachine=yes
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Svg=$(usex !svg)
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6SvgWidgets=$(usex !svg yes $(usex !widgets))
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Test=$(usex !testlib)
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6TextToSpeech=$(usex !speech)
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6UiTools=$(usex !designer)
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebChannel=$(usex !webchannel)
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineCore=$(usex !webengine)
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineQuick=$(usex !webengine yes $(usex !quick))
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineWidgets=$(usex !webengine yes $(usex !widgets))
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebSockets=$(usex !websockets)
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets=$(usex !widgets)
#-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WinExtras=yes
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Xml=$(usex !xml)
# try to avoid pre-stripping
-DQFP_NO_OVERRIDE_OPTIMIZATION_FLAGS=yes
-DQFP_NO_STRIP=yes
)
pyside6_configure() {
local mycmakeargs=(
"${mycmakeargs[@]}"
-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-DPYTHON_EXECUTABLE="${PYTHON}"
-DPYTHON_SITE_PACKAGES="$(python_get_sitedir)"
-DSHIBOKEN_PYTHON_SHARED_LIBRARY_SUFFIX="-${EPYTHON}"
)
cmake_src_configure
}
python_foreach_impl pyside6_configure
}
src_compile() {
python_foreach_impl cmake_src_compile
}
src_test() {
local -x PYTHONDONTWRITEBYTECODE
python_foreach_impl virtx cmake_src_test
}
src_install() {
pyside6_install() {
cmake_src_install
python_optimize
# Uniquify the shiboken6 pkgconfig dependency in the PySide6 pkgconfig
# file for the current Python target. See also:
# https://github.com/leycec/raiagent/issues/73
sed -i -e 's~^Requires: shiboken6$~&-'${EPYTHON}'~' \
"${ED}/usr/$(get_libdir)"/pkgconfig/${PN}.pc || die
# Uniquify the PySide6 pkgconfig file for the current Python target,
# preserving an unversioned "pyside6.pc" file arbitrarily associated
# with the last Python target. (See the previously linked issue.)
cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
}
python_foreach_impl pyside6_install
# CMakeLists.txt installs a "PySide6Targets-gentoo.cmake" file forcing
# downstream consumers (e.g., pyside6-tools) to target one
# "libpyside6-*.so" library linked to one Python interpreter. See also:
# https://bugreports.qt.io/browse/PYSIDE-1053
# https://github.com/leycec/raiagent/issues/74
sed -i -e 's~pyside6-python[[:digit:]]\+\.[[:digit:]]\+~pyside6${PYTHON_CONFIG_SUFFIX}~g' \
"${ED}/usr/$(get_libdir)/cmake/PySide6/PySide6Targets-${CMAKE_BUILD_TYPE,,}.cmake" || die
}

View File

@ -0,0 +1 @@
EBUILD shiboken6-6.7.0.ebuild 6605 BLAKE2B ccb6865e9364521d7af70a6a0291271059f915ec70c4559518d383c761a2b69c55b5b3768baecb35ae9d0fb70e382d758f8212507a6a4cb168f9ec02180360de SHA512 7d07f120dcb4cbc881f514ee7c4dbf5e56d6967d1ed3190606ef366c5f790376c7e3728a0f85ae15ed9b91b132b9f83dcfc609f5c4e2e7fbaa0400044cb67181

View File

@ -0,0 +1,180 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
# TODO: Split the "/usr/bin/shiboken6" binding generator from the
# "/usr/lib64/libshiboken6-*.so" family of shared libraries. The former
# requires everything (including Clang) at runtime; the latter only requires
# Qt and Python at runtime. Note that "pip" separates these two as well. See:
# https://doc.qt.io/qtforpython/shiboken6/faq.html#is-there-any-runtime-dependency-on-the-generated-binding
# Once split, the PySide6 ebuild should be revised to require
# "/usr/bin/shiboken6" at build time and "libshiboken6-*.so" at runtime.
# TODO: Add PyPy once officially supported. See also:
# https://bugreports.qt.io/browse/PYSIDE-535
PYTHON_COMPAT=( python3_{10..12} )
LLVM_COMPAT=( {15..17} )
inherit cmake flag-o-matic llvm-r1 python-r1 toolchain-funcs git-r3
MY_PN="pyside-setup-everywhere-src"
DESCRIPTION="Python binding generator for C++ libraries"
HOMEPAGE="https://wiki.qt.io/PySide6"
EGIT_REPO_URI="https://code.qt.io/pyside/pyside-setup"
EGIT_BRANCH="6.7.0"
S="${WORKDIR}/${PN}-${PV}/sources/shiboken6"
# The "sources/shiboken6/libshiboken" directory is triple-licensed under the
# GPL v2, v3+, and LGPL v3. All remaining files are licensed under the GPL v3
# with version 1.0 of a Qt-specific exception enabling shiboken6 output to be
# arbitrarily relicensed. (TODO)
LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3"
SLOT="0"
KEYWORDS="~amd64"
IUSE="+docstrings numpy test vulkan"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
# Tests fail pretty bad and I'm not fixing them right now
RESTRICT="test"
# Minimal supported version of Qt.
QT_PV="$(ver_cut 1-3)*:6"
# Since Clang is required at both build- and runtime, BDEPEND is omitted here.
RDEPEND="${PYTHON_DEPS}
=dev-qt/qtbase-${QT_PV}
$(llvm_gen_dep '
sys-devel/clang:${LLVM_SLOT}
sys-devel/llvm:${LLVM_SLOT}
')
docstrings? (
>=dev-libs/libxml2-2.6.32
>=dev-libs/libxslt-1.1.19
)
numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
vulkan? ( dev-util/vulkan-headers )
"
DEPEND="${RDEPEND}
test? ( =dev-qt/qtbase-${QT_PV}[gui] )
"
# testlib is toggled by the gui flag on qtbase
DOCS=( AUTHORS )
PATCHES=(
)
src_prepare() {
# TODO: File upstream issue requesting a sane way to disable NumPy support.
if ! use numpy; then
sed -i -e '/\bprint(os\.path\.realpath(numpy))/d' \
libshiboken/CMakeLists.txt || die
fi
# Shiboken6 assumes Vulkan headers live under either "$VULKAN_SDK/include"
# or "$VK_SDK_PATH/include" rather than "${EPREFIX}/usr/include/vulkan".
if use vulkan; then
sed -i -e "s~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral(\"${EPREFIX}/usr/include/vulkan\"), HeaderType::System});~" \
ApiExtractor/clangparser/compilersupport.cpp || die
fi
local clangver="$(CPP=clang clang-major-version)"
# Clang 15 and older used the full version as a directory name.
if [[ ${clangver} -lt 16 ]]; then
clangver="$(CPP=clang clang-fullversion)"
fi
# Shiboken6 assumes the "/usr/lib/clang/${CLANG_NEWEST_VERSION}/include/"
# subdirectory provides Clang builtin includes (e.g., "stddef.h") for the
# currently installed version of Clang, where ${CLANG_NEWEST_VERSION} is
# the largest version specifier that exists under the "/usr/lib/clang/"
# subdirectory. This assumption is false in edge cases, including when
# users downgrade from newer Clang versions but fail to remove those
# versions with "emerge --depclean". See also:
# https://github.com/leycec/raiagent/issues/85
#
# Sadly, the clang-* family of functions exported by the "toolchain-funcs"
# eclass are defective, returning nonsensical placeholder strings if the
# end user has *NOT* explicitly configured their C++ compiler to be Clang.
# PySide6 does *NOT* care whether the end user has done so or not, as
# PySide6 unconditionally requires Clang in either case. See also:
# https://bugs.gentoo.org/619490
sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'"${EPREFIX}"'/usr/lib/clang/'"${clangver}"'/include"))~' \
ApiExtractor/clangparser/compilersupport.cpp || die
cmake_src_prepare
}
src_configure() {
# -Werror=odr
# https://bugs.gentoo.org/925479
# https://bugreports.qt.io/browse/PYSIDE-2619
filter-lto
# Minimal tests for now, 2 failing with the extended version
# FIXME Subscripted generics cannot be used with class and instance checks
local mycmakeargs=(
-DBUILD_TESTS=$(usex test)
-DDISABLE_DOCSTRINGS=$(usex !docstrings)
)
shiboken6_configure() {
local mycmakeargs=(
"${mycmakeargs[@]}"
-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-DPYTHON_EXECUTABLE="${PYTHON}"
-DUSE_PYTHON_VERSION="${EPYTHON#python}"
-DFORCE_LIMITED_API=OFF
)
# CMakeLists.txt expects LLVM_INSTALL_DIR as an environment variable.
local -x LLVM_INSTALL_DIR="$(get_llvm_prefix)"
cmake_src_configure
}
python_foreach_impl shiboken6_configure
}
src_compile() {
python_foreach_impl cmake_src_compile
}
src_test() {
python_foreach_impl cmake_src_test
}
src_install() {
shiboken6_install() {
cmake_src_install
python_optimize
# Uniquify the "shiboken6" executable for the current Python target,
# preserving an unversioned "shiboken6" file arbitrarily associated
# with the last Python target.
cp "${ED}"/usr/bin/${PN}{,-${EPYTHON}} || die
# Uniquify the Shiboken6 pkgconfig file for the current Python target,
# preserving an unversioned "shiboken6.pc" file arbitrarily associated
# with the last Python target. See also:
# https://github.com/leycec/raiagent/issues/73
cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
}
python_foreach_impl shiboken6_install
# CMakeLists.txt installs a "Shiboken6Targets-gentoo.cmake" file forcing
# downstream consumers (e.g., PySide6) to target one "libshiboken6-*.so"
# library and one "shiboken6" executable linked to one Python interpreter.
# See also:
# https://bugreports.qt.io/browse/PYSIDE-1053
# https://github.com/leycec/raiagent/issues/74
sed -i \
-e 's~shiboken6-python[[:digit:]]\+\.[[:digit:]]\+~shiboken6${PYTHON_CONFIG_SUFFIX}~g' \
-e 's~/bin/shiboken6~/bin/shiboken6${PYTHON_CONFIG_SUFFIX}~g' \
"${ED}/usr/$(get_libdir)"/cmake/Shiboken6/Shiboken6Targets-${CMAKE_BUILD_TYPE,,}.cmake || die
# Remove the broken "shiboken_tool.py" script. By inspection, this script
# reduces to a noop. Moreover, this script raises the following exception:
# FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin/../shiboken_tool.py': '/usr/bin/../shiboken_tool.py'
rm "${ED}"/usr/bin/shiboken_tool.py || die
}

View File

@ -0,0 +1,7 @@
AUX exp.patch 2616 BLAKE2B fb26ce27883d98d758ebfe792e50d657b09b079c7118dbb8877c873c53285874c92c00818d1ea6135cd1de27522bdd6286712b2373a8acfb432dbf9d9a56dbbf SHA512 469fec9bf75be6a632423d334c2138c6878e271bea9489e2fc9ffcb1bc5aed114923c7ffb117e38fe9b1bc5f55013bfb66a095dab39f34eea9073aa0b5efb701
AUX fix_2.2.0.patch 5656 BLAKE2B be5b34d1e4ad4d33bd52037d981831805ddc8f99a0290d30cb299faa862896b874a26ae9aa7d02a151b9de5cc069661bb7de991036451bc982c976d725a22cce SHA512 f2583a7e4cc9a44a7fbc34d1d41ecfcd7982c02d8a8c200b6ffc4432b743297cf91051317286be80fff36752a50e725151c5029c23077d5ac3eec77555c3b900
AUX fix_upstream.patch 4120 BLAKE2B af970d45fd15e57c3e06c5a2fd0bd7f4d3b3bb2c99c00a495813fe7068b763a00988856f2bbc6a5a39601900d74dc6318b41a5d95f31081703fba6e0b8f576e0 SHA512 28822c5ab0223603716d4f90f58681eedd5128291cb76aaeeee8e3c95bbe7861ece45a7cb943c910edee53c7352bf20f40d91cd6495b8dacf3fe0437f9637c88
AUX wxgtk3-wayland-fix.patch 485 BLAKE2B 4bd5634f39ba6132bb4216807fef254a88f07f5eb1162de12589c22b038c2876185a801ed481738d9fbbb04796952d304f17010fd61eb347213b649b13f3064d SHA512 4867192b069829ff0fd3d2bf86e2117979e505f4764223f7d0b874c15fad9cffca58d8e55a518a56cf156fee2187040115866a10e92aa903e87dc6ec909d0339
DIST orcaslicer-2.2.0.tar.gz 129285168 BLAKE2B d8e3f89663a37b42eeeeefacf285abd36091258b756e7d9738334361c2498a489e0ab8505a766a50bf3c231166731df29fc21f3ad943a165199d88827bceac9d SHA512 6795212bccaf5973440bc814f5ed2142114193d065eefc1e55fed24692051cf1c7cc1d9faac7bf567433c98db62627dbb8079470dfaaa78fb120fbe184133b2k4
EBUILD orcaslicer-2.2.0.ebuild 1826 BLAKE2B 8702ee6d8488d8c093bc46daf7c72332a42835cb0ed717ab5dd8c13dbd06d95ab32d6d1ef82e1a3a72a8da29239f3923d342d4d78501fe74bf97b4a231459170 SHA512 806d6a15aa4c1586af16d93d63823b628bf97cd22b45268ca9cf4bc169a610e6e447aadfb11c1eb6020c9b32f3871c332e38add89410b141e332a275b13a2ae3
EBUILD orcaslicer-9999.ebuild 1826 BLAKE2B 8702ee6d8488d8c093bc46daf7c72332a42835cb0ed717ab5dd8c13dbd06d95ab32d6d1ef82e1a3a72a8da29239f3923d342d4d78501fe74bf97b4a231459170 SHA512 806d6a15aa4c1586af16d93d63823b628bf97cd22b45268ca9cf4bc169a610e6e447aadfb11c1eb6020c9b32f3871c332e38add89410b141e332a275b13a2ae3

View File

@ -0,0 +1,62 @@
diff '--color=auto' -Naur OrcaSlicer-2.1.1_or/CMakeLists.txt OrcaSlicer-2.1.1/CMakeLists.txt
--- OrcaSlicer-2.1.1_or/CMakeLists.txt 2024-08-08 00:20:43.181267030 +0200
+++ OrcaSlicer-2.1.1/CMakeLists.txt 2024-08-08 01:05:13.851091014 +0200
@@ -403,6 +403,7 @@
if(NOT SLIC3R_STATIC)
target_compile_definitions(boost_headeronly INTERFACE BOOST_LOG_DYN_LINK)
+ target_compile_definitions(boost_headeronly INTERFACE BOOST_ALL_DYN_LINK)
endif()
function(slic3r_remap_configs targets from_Cfg to_Cfg)
diff '--color=auto' -Naur OrcaSlicer-2.1.1_or/src/libslic3r/CMakeLists.txt OrcaSlicer-2.1.1/src/libslic3r/CMakeLists.txt
--- OrcaSlicer-2.1.1_or/src/libslic3r/CMakeLists.txt 2024-08-08 00:20:43.167933750 +0200
+++ OrcaSlicer-2.1.1/src/libslic3r/CMakeLists.txt 2024-08-08 00:50:26.664223580 +0200
@@ -466,6 +466,8 @@
if (SLIC3R_STATIC)
set(CGAL_Boost_USE_STATIC_LIBS ON CACHE BOOL "" FORCE)
+else()
+ set(CGAL_Boost_USE_STATIC_LIBS OF CACHE BOOL "" FORCE)
endif ()
set(CGAL_DO_NOT_WARN_ABOUT_CMAKE_BUILD_TYPE ON CACHE BOOL "" FORCE)
@@ -475,7 +477,7 @@
find_package(OpenCV REQUIRED core)
cmake_policy(POP)
-add_library(libslic3r_cgal STATIC
+add_library(libslic3r_cgal SHARED
CutSurface.hpp CutSurface.cpp
IntersectionPoints.hpp IntersectionPoints.cpp
MeshBoolean.hpp MeshBoolean.cpp
diff '--color=auto' -Naur OrcaSlicer-2.1.1_or/src/slic3r/CMakeLists.txt OrcaSlicer-2.1.1/src/slic3r/CMakeLists.txt
--- OrcaSlicer-2.1.1_or/src/slic3r/CMakeLists.txt 2024-08-08 00:20:43.177933710 +0200
+++ OrcaSlicer-2.1.1/src/slic3r/CMakeLists.txt 2024-08-08 00:38:04.098392643 +0200
@@ -601,7 +601,7 @@
)
endif ()
-add_library(libslic3r_gui STATIC ${SLIC3R_GUI_SOURCES})
+add_library(libslic3r_gui SHARED ${SLIC3R_GUI_SOURCES})
target_include_directories(libslic3r_gui PRIVATE Utils)
if (WIN32)
@@ -656,14 +656,14 @@
# link these libraries.
if (UNIX AND NOT APPLE)
find_package(GTK${SLIC3R_GTK} REQUIRED)
- if (FLATPAK)
+# if (FLATPAK)
# I don't know why this is needed, but for whatever reason slic3r isn't
# linking to X11 and webkit2gtk. force it.
find_package(X11 REQUIRED)
find_package(PkgConfig REQUIRED)
- pkg_check_modules(webkit2gtk REQUIRED webkit2gtk-4.1)
+ pkg_check_modules(webkit2gtk REQUIRED webkit2gtk-4.0)
target_link_libraries (libslic3r_gui ${X11_LIBRARIES} ${webkit2gtk_LIBRARIES})
- endif()
+# endif()
target_include_directories(libslic3r_gui PRIVATE ${GTK${SLIC3R_GTK}_INCLUDE_DIRS})
target_link_libraries(libslic3r_gui ${GTK${SLIC3R_GTK}_LIBRARIES} fontconfig)

View File

@ -0,0 +1,134 @@
diff '--color=auto' -Naur OrcaSlicer_or/src/libslic3r/AppConfig.cpp OrcaSlicer/src/libslic3r/AppConfig.cpp
--- OrcaSlicer_or/src/libslic3r/AppConfig.cpp 2024-08-07 20:51:23.931605968 +0200
+++ OrcaSlicer/src/libslic3r/AppConfig.cpp 2024-08-07 20:51:41.591397327 +0200
@@ -8,6 +8,7 @@
#include "Thread.hpp"
#include "format.hpp"
#include "nlohmann/json.hpp"
+#include "format.hpp"
#include <utility>
#include <vector>
diff '--color=auto' -Naur OrcaSlicer_or/src/libslic3r/GCode/Thumbnails.cpp OrcaSlicer/src/libslic3r/GCode/Thumbnails.cpp
--- OrcaSlicer_or/src/libslic3r/GCode/Thumbnails.cpp 2024-08-07 20:51:23.931605968 +0200
+++ OrcaSlicer/src/libslic3r/GCode/Thumbnails.cpp 2024-08-07 20:51:41.594730621 +0200
@@ -1,4 +1,6 @@
#include "Thumbnails.hpp"
+#include "format.hpp"
+#include <boost/algorithm/string.hpp>
#include "../miniz_extension.hpp"
#include "format.hpp"
diff '--color=auto' -Naur OrcaSlicer_or/src/libslic3r/PrintConfig.cpp OrcaSlicer/src/libslic3r/PrintConfig.cpp
--- OrcaSlicer_or/src/libslic3r/PrintConfig.cpp 2024-08-07 20:51:23.934939261 +0200
+++ OrcaSlicer/src/libslic3r/PrintConfig.cpp 2024-08-07 20:51:41.594730621 +0200
@@ -5,6 +5,7 @@
#include "format.hpp"
#include "GCode/Thumbnails.hpp"
+#include "format.hpp"
#include <set>
#include <boost/algorithm/string/replace.hpp>
#include <boost/algorithm/string/case_conv.hpp>
diff '--color=auto' -Naur OrcaSlicer_or/src/slic3r/Config/Version.cpp OrcaSlicer/src/slic3r/Config/Version.cpp
--- OrcaSlicer_or/src/slic3r/Config/Version.cpp 2024-08-07 20:51:23.938272555 +0200
+++ OrcaSlicer/src/slic3r/Config/Version.cpp 2024-08-07 20:51:41.598063915 +0200
@@ -3,6 +3,7 @@
#include <cctype>
#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem.hpp>
#include <boost/nowide/fstream.hpp>
#include "libslic3r/libslic3r.h"
diff '--color=auto' -Naur OrcaSlicer-2.1.1_or/src/libslic3r/CMakeLists.txt OrcaSlicer-2.1.1/src/libslic3r/CMakeLists.txt
--- OrcaSlicer-2.1.1_or/src/libslic3r/CMakeLists.txt 2024-08-07 21:02:29.347237569 +0200
+++ OrcaSlicer-2.1.1/src/libslic3r/CMakeLists.txt 2024-08-07 22:16:05.859877170 +0200
@@ -520,11 +520,7 @@
find_package(JPEG REQUIRED)
set(OCCT_LIBS
- TKXDESTEP
- TKSTEP
- TKSTEP209
- TKSTEPAttr
- TKSTEPBase
+ TKDESTEP
TKXCAF
TKXSBase
TKVCAF
@@ -573,7 +573,7 @@
mcut
JPEG::JPEG
qoi
- opencv_world
+ opencv_gapi
)
if(NOT WIN32)
diff '--color=auto' -Naur OrcaSlicer-2.1.1_or/src/libslic3r/CMakeLists.txt OrcaSlicer-2.1.1/src/libslic3r/CMakeLists.txt
--- OrcaSlicer-2.1.1_or/src/libslic3r/CMakeLists.txt 2024-08-08 17:56:36.349505920 +0200
+++ OrcaSlicer-2.1.1/src/libslic3r/CMakeLists.txt 2024-08-08 18:30:15.871738122 +0200
@@ -507,6 +507,7 @@
if (MSVC AND "${CMAKE_SIZEOF_VOID_P}" STREQUAL "4") # 32 bit MSVC workaround
target_compile_definitions(libslic3r_cgal PRIVATE CGAL_DO_NOT_USE_MPZF)
endif ()
+target_compile_definitions(libslic3r_cgal PRIVATE BOOST_ALL_DYN_LINK)
encoding_check(libslic3r)
diff '--color=auto' -Naur OrcaSlicer-2.1.1_or/src/libslic3r/CMakeLists.txt OrcaSlicer-2.1.1/src/libslic3r/CMakeLists.txt
--- OrcaSlicer-2.1.1_or/src/libslic3r/CMakeLists.txt 2024-08-08 17:56:36.349505920 +0200
+++ OrcaSlicer-2.1.1/src/libslic3r/CMakeLists.txt 2024-08-08 18:47:26.687872804 +0200
@@ -602,3 +603,7 @@
if (SLIC3R_PCH AND NOT SLIC3R_SYNTAXONLY)
add_precompiled_header(libslic3r pchheader.hpp FORCEINCLUDE)
endif ()
+
+if (NOT SLIC3R_STATIC)
+ install(TARGETS libslic3r_cgal DESTINATION ${CMAKE_INSTALL_DIR})
+endif()
diff '--color=auto' -Naur OrcaSlicer-2.1.1_or/src/slic3r/CMakeLists.txt OrcaSlicer-2.1.1/src/slic3r/CMakeLists.txt
--- OrcaSlicer-2.1.1_or/src/slic3r/CMakeLists.txt 2024-08-08 17:56:36.356172509 +0200
+++ OrcaSlicer-2.1.1/src/slic3r/CMakeLists.txt 2024-08-08 18:48:15.594033021 +0200
@@ -677,3 +677,7 @@
# Add a definition so that we can tell we are compiling slic3r.
target_compile_definitions(libslic3r_gui PRIVATE SLIC3R_CURRENTLY_COMPILING_GUI_MODULE)
+
+if (NOT SLIC3R_STATIC)
+ install(TARGETS libslic3r_gui DESTINATION ${CMAKE_INSTALL_LIBDIR})
+endif()
diff '--color=auto' -Naur OrcaSlicer-nightly-builds_or/src/libslic3r/Arachne/SkeletalTrapezoidationGraph.cpp OrcaSlicer-nightly-builds/src/libslic3r/Arachne/SkeletalTrapezoidationGraph.cpp
--- OrcaSlicer-nightly-builds_or/src/libslic3r/Arachne/SkeletalTrapezoidationGraph.cpp 2024-08-08 19:41:14.965987153 +0200
+++ OrcaSlicer-nightly-builds/src/libslic3r/Arachne/SkeletalTrapezoidationGraph.cpp 2024-08-08 19:45:58.583011102 +0200
@@ -6,6 +6,7 @@
#include <boost/log/trivial.hpp>
+#include "../Line.hpp"
namespace Slic3r::Arachne
{
diff '--color=auto' -Naur OrcaSlicer-nightly-builds_or/src/libslic3r/utils.cpp OrcaSlicer-nightly-builds/src/libslic3r/utils.cpp
--- OrcaSlicer-nightly-builds_or/src/libslic3r/utils.cpp 2024-08-08 19:41:14.972653748 +0200
+++ OrcaSlicer-nightly-builds/src/libslic3r/utils.cpp 2024-08-08 19:43:07.831462664 +0200
@@ -5,6 +5,7 @@
#include <locale>
#include <cstdarg>
#include <stdio.h>
+#include <boost/nowide/cstdio.hpp>
#include "format.hpp"
#include "libslic3r.h"
diff '--color=auto' -Naur OrcaSlicer-nightly-builds_or/src/slic3r/GUI/Preferences.cpp OrcaSlicer-nightly-builds/src/slic3r/GUI/Preferences.cpp
--- OrcaSlicer-nightly-builds_or/src/slic3r/GUI/Preferences.cpp 2024-08-08 19:41:14.975987047 +0200
+++ OrcaSlicer-nightly-builds/src/slic3r/GUI/Preferences.cpp 2024-08-08 19:58:02.008908684 +0200
@@ -16,6 +16,7 @@
#include "Widgets/RadioBox.hpp"
#include "Widgets/TextInput.hpp"
#include <wx/listimpl.cpp>
+#include <wx/display.h>
#include <map>
#ifdef __WINDOWS__

View File

@ -0,0 +1,94 @@
diff '--color=auto' -Naur OrcaSlicer-2.1.1_or/src/clipper2/Clipper2Lib/include/clipper2/clipper.core.h OrcaSlicer-2.1.1/src/clipper2/Clipper2Lib/include/clipper2/clipper.core.h
--- OrcaSlicer-2.1.1_or/src/clipper2/Clipper2Lib/include/clipper2/clipper.core.h 2024-08-06 21:34:19.517462360 +0200
+++ OrcaSlicer-2.1.1/src/clipper2/Clipper2Lib/include/clipper2/clipper.core.h 2024-08-06 21:35:28.980051026 +0200
@@ -114,7 +114,7 @@
Point(const T2 x_, const T2 y_) { Init(x_, y_); }
template <typename T2>
- explicit Point<T>(const Point<T2>& p) { Init(p.x, p.y); }
+ explicit Point(const Point<T2>& p) { Init(p.x, p.y); }
Point operator * (const double scale) const
{
diff '--color=auto' -Naur OrcaSlicer-nightly-builds_or/src/slic3r/GUI/PhysicalPrinterDialog.cpp OrcaSlicer-nightly-builds/src/slic3r/GUI/PhysicalPrinterDialog.cpp
--- OrcaSlicer-nightly-builds_or/src/slic3r/GUI/PhysicalPrinterDialog.cpp 2025-01-15 08:43:33.503222625 +0100
+++ OrcaSlicer-nightly-builds/src/slic3r/GUI/PhysicalPrinterDialog.cpp 2025-01-15 19:56:33.947842341 +0100
@@ -374,7 +374,7 @@
// Always fill in the "printhost_port" combo box from the config and select it.
{
Choice* choice = dynamic_cast<Choice*>(m_optgroup->get_field("printhost_port"));
- choice->set_values({ m_config->opt_string("printhost_port") });
+ choice->set_values(std::vector<std::string>({ m_config->opt_string("printhost_port") }));
choice->set_selection();
}
diff '--color=auto' -Naur OrcaSlicer-nightly-builds_or/src/libslic3r/CMakeLists.txt OrcaSlicer-nightly-builds/src/libslic3r/CMakeLists.txt
--- OrcaSlicer-nightly-builds_or/src/libslic3r/CMakeLists.txt 2025-01-15 08:43:33.496555798 +0100
+++ OrcaSlicer-nightly-builds/src/libslic3r/CMakeLists.txt 2025-01-16 09:13:06.347245982 +0100
@@ -520,6 +520,8 @@
set(OpenCASCADE_DIR "${CMAKE_PREFIX_PATH}/lib/cmake/occt")
find_package(OpenCASCADE REQUIRED)
target_include_directories(libslic3r PUBLIC ${OpenCASCADE_INCLUDE_DIR})
+find_package(OpenCV REQUIRED)
+include_directories(${OpenCV_INCLUDE_DIRS})
find_package(JPEG REQUIRED)
--- OrcaSlicer-nightly-builds_or/src/slic3r/CMakeLists.txt 2025-01-15 08:43:33.506556037 +0100
+++ OrcaSlicer-nightly-builds/src/slic3r/CMakeLists.txt 2025-01-16 09:13:45.512411923 +0100
@@ -2,6 +2,8 @@
project(libslic3r_gui)
include(PrecompiledHeader)
+find_package(OpenCV REQUIRED)
+include_directories(${OpenCV_INCLUDE_DIRS})
set(SLIC3R_GUI_SOURCES
pchheader.cpp
diff '--color=auto' -Naur OrcaSlicer_or/src/slic3r/Config/Version.cpp OrcaSlicer/src/slic3r/Config/Version.cpp
--- OrcaSlicer_or/src/slic3r/Config/Version.cpp 2024-08-07 20:51:23.938272555 +0200
+++ OrcaSlicer/src/slic3r/Config/Version.cpp 2024-08-07 20:51:41.598063915 +0200
@@ -3,6 +3,7 @@
#include <cctype>
#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem.hpp>
#include <boost/nowide/fstream.hpp>
#include "libslic3r/libslic3r.h"
diff '--color=auto' -Naur OrcaSlicer-2.1.1_or/src/libslic3r/CMakeLists.txt OrcaSlicer-2.1.1/src/libslic3r/CMakeLists.txt
--- OrcaSlicer-2.1.1_or/src/libslic3r/CMakeLists.txt 2024-08-07 21:02:29.347237569 +0200
+++ OrcaSlicer-2.1.1/src/libslic3r/CMakeLists.txt 2024-08-07 22:16:05.859877170 +0200
@@ -520,11 +520,7 @@
find_package(JPEG REQUIRED)
set(OCCT_LIBS
- TKXDESTEP
- TKSTEP
- TKSTEP209
- TKSTEPAttr
- TKSTEPBase
+ TKDESTEP
TKXCAF
TKXSBase
TKVCAF
@@ -573,7 +573,7 @@
mcut
JPEG::JPEG
qoi
- opencv_world
+ opencv_gapi
)
if(NOT WIN32)
diff '--color=auto' -Naur orcaslicer-9999_or/src/CMakeLists.txt orcaslicer-9999/src/CMakeLists.txt
--- orcaslicer-9999_or/src/CMakeLists.txt 2025-01-19 16:04:20.905223434 +0100
+++ orcaslicer-9999/src/CMakeLists.txt 2025-01-19 16:04:22.731933455 +0100
@@ -163,6 +163,7 @@
target_link_libraries(OrcaSlicer "-framework OpenGL")
else ()
target_link_libraries(OrcaSlicer -ldl)
+ target_link_libraries(OrcaSlicer -lX11 -lwebkit2gtk-4.1)
endif ()
#if (WIN32)
# find_library(PSAPI_LIB NAMES Psapi)

View File

@ -0,0 +1,21 @@
diff --git a/src/slic3r/GUI/GUI.cpp b/src/slic3r/GUI/GUI.cpp
index ccd3cc0..be8bbe5 100644
--- a/src/slic3r/GUI/GUI.cpp
+++ b/src/slic3r/GUI/GUI.cpp
@@ -33,6 +33,16 @@ class AppConfig;
namespace GUI {
+// wxgtk3 is broken on wayland: https://trac.wxwidgets.org/ticket/17702
+#ifdef __WXGTK3__
+struct ForceX11 {
+ ForceX11() {
+ setenv("GDK_BACKEND", "x11", 1);
+ }
+};
+static struct ForceX11 forcex11;
+#endif
+
#if __APPLE__
IOPMAssertionID assertionID;
#endif

View File

@ -0,0 +1 @@
orcaslicer-9999.ebuild

View File

@ -0,0 +1,83 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
WX_GTK_VER="3.2-gtk3"
SL_GTK="3"
MY_PN="OrcaSlicer"
MY_PV="$(ver_rs 3 -)"
inherit cmake xdg wxwidgets
DESCRIPTION="Orca Slicer is an open source slicer for FDM printers."
HOMEPAGE="https://github.com/SoftFever/OrcaSlicer"
if [[ ${PV} == 9999 ]] ; then
inherit git-r3
#SRC_URI="https://github.com/SoftFever/OrcaSlicer/archive/refs/tags/nightly-builds.tar.gz -> ${P}.tar.gz"
EGIT_REPO_URI="https://github.com/SoftFever/OrcaSlicer.git"
else
SRC_URI="https://github.com/SoftFever/OrcaSlicer/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${MY_PN}-${MY_PV}"
fi
LICENSE=""
SLOT="0"
KEYWORDS="amd64 ~arm64 ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
RDEPEND="
dev-libs/libmspack
media-libs/gstreamer
app-crypt/libsecret
gui-libs/eglexternalplatform
media-libs/glew
dev-libs/boost:=[nls]
media-libs/glfw
media-gfx/openvdb
dev-cpp/tbb
dev-libs/cereal
sci-libs/nlopt
<sci-mathematics/cgal-6.0
sci-libs/opencascade
media-libs/mesa:=[osmesa]
net-libs/webkit-gtk:4.1
x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,gstreamer,webkit,curl]
"
DEPEND="${RDEPEND}
"
PATCHES=(
# "${FILESDIR}/wxgtk3-wayland-fix.patch"
"${FILESDIR}/fix_upstream.patch"
# "${FILESDIR}/exp.patch"
)
src_prepare() {
sed -i "s/+UNKNOWN/_$(date '+%F')/" version.inc
cmake_src_prepare
}
src_configure() {
CMAKE_BUILD_TYPE="Release"
append-flags -fno-strict-aliasing
setup-wxwidgets
local mycmakeargs=(
-DOPENVDB_FIND_MODULE_PATH="/usr/$(get_libdir)/cmake/OpenVDB"
-DSLIC3R_GTK=${SL_GTK}
-DBBL_RELEASE_TO_PUBLIC=1 -DBBL_INTERNAL_TESTING=0
-DSLIC3R_STATIC=OFF
-DSLIC3R_WX_STABLE=OFF
-DSLIC3R_GUI=ON
-DSLIC3R_PCH=OFF
-DSLIC3R_FHS=OFF
-DORCA_TOOLS=ON
-Wno-dev
)
cmake_src_configure
}

View File

@ -1,3 +1,4 @@
acct-group
dev-cpp dev-cpp
dev-libs dev-libs
sci-electronics sci-electronics
@ -5,5 +6,7 @@ sci-libs
cross-riscv32-unknown-elf cross-riscv32-unknown-elf
cross-x86_64-w64-mingw32 cross-x86_64-w64-mingw32
cross-i686-w64-mingw32 cross-i686-w64-mingw32
cross-aarch64-unknown-linux-gnu
cross-avr cross-avr
media-gfx
cross-arm-unknown-linux-gnueabi
cross-aarch64-unknown-linux-gnu

View File

@ -2,4 +2,4 @@ AUX cxx13_fix.patch 357 BLAKE2B c76777905f495ebc604f83fff97954223ab80de6176d068d
AUX openroad_build.patch 21914 BLAKE2B 8788cb36b6bb10b0980a8635ff376cf04aceeff00946bf00d5d1fbe4589c9e27c171eeb8d6940e56b658b2e91baca0cadaa073e57d9a288a4dc4618bb6b8237a SHA512 574602d115497b216d7866d281249a1c7f7e738b0b87f2e13f4add463cf93a424edc022f6e634a56bc897fec03e25315afde10633b772b982daa6bec4b7d2344 AUX openroad_build.patch 21914 BLAKE2B 8788cb36b6bb10b0980a8635ff376cf04aceeff00946bf00d5d1fbe4589c9e27c171eeb8d6940e56b658b2e91baca0cadaa073e57d9a288a4dc4618bb6b8237a SHA512 574602d115497b216d7866d281249a1c7f7e738b0b87f2e13f4add463cf93a424edc022f6e634a56bc897fec03e25315afde10633b772b982daa6bec4b7d2344
AUX openroad_build1.patch 8442 BLAKE2B 4dd9e5d99b55937289a59b0510697f6a600b0eb3917cfe02bc8b271fa818198081940999152a9d782753ea78cec8c42ed4ea92d7541a04b7533c5acb3294e0d3 SHA512 0ff3e8b01c40386e916053592f41d1a8e746a00aeae763accce5af92efd835e1fd6815efa70ff7b3a23692b5ad1965e8839aa23e72be0d28f26859dfd47d0ac4 AUX openroad_build1.patch 8442 BLAKE2B 4dd9e5d99b55937289a59b0510697f6a600b0eb3917cfe02bc8b271fa818198081940999152a9d782753ea78cec8c42ed4ea92d7541a04b7533c5acb3294e0d3 SHA512 0ff3e8b01c40386e916053592f41d1a8e746a00aeae763accce5af92efd835e1fd6815efa70ff7b3a23692b5ad1965e8839aa23e72be0d28f26859dfd47d0ac4
AUX openroad_build_fix.patch 21139 BLAKE2B 20092858234d951ab70a4377a58c6724042988bb2172af06d3649b03907884150a9a4d3e3f194b644fd41c9ec82178c351963dd47dc0705ee5e828eaf921eade SHA512 3c44242fc22bb264957311cc43c25aed00c4fc38fc1015e9aef0ec6f57dc4bd01dd221dd74ff57d829ac87e30c16afb2d278a8bf6812efe0c6446310d183f375 AUX openroad_build_fix.patch 21139 BLAKE2B 20092858234d951ab70a4377a58c6724042988bb2172af06d3649b03907884150a9a4d3e3f194b644fd41c9ec82178c351963dd47dc0705ee5e828eaf921eade SHA512 3c44242fc22bb264957311cc43c25aed00c4fc38fc1015e9aef0ec6f57dc4bd01dd221dd74ff57d829ac87e30c16afb2d278a8bf6812efe0c6446310d183f375
EBUILD openroad-9999.ebuild 1118 BLAKE2B 7182f1c19ff9b38e14d0f40bc55d3783b188943a646ffb4a8e78be88c4649fa36c087f25461223be80b8f91b29d880e8ad569dc2b7788ed51263f80189122369 SHA512 af473290fc8d5b017dc3860342b125826e808c490a396663d5f239be6086f7441cb0f10ef6ca9cdfa349f5dac9770a4522df716c1dee5589a854151f91b23d6b EBUILD openroad-9999.ebuild 1119 BLAKE2B b31089d42f561a3d5c34c47d47ed27cfae9dbb44c670ea85e4fd7450dca7a3be25eff02f3fb3617d421fe327e102e7c255f282acf2c47e32a1cefdbe25a98425 SHA512 adf8145dc573cbabd766a1b97da883a0df1214bf1f933dadb5ca23f9c67cddae332fa37ebb71d1123e9a2e011637936c3d86cd766a1f343db8e911a1de245f3a

View File

@ -34,7 +34,7 @@ RDEPEND="
${DEPEND} ${DEPEND}
" "
BDEPEND=" BDEPEND="
dev-util/cmake dev-build/cmake
" "
src_configure() { src_configure() {

1
virtual/cloud/Manifest Normal file
View File

@ -0,0 +1 @@
EBUILD cloud-1.ebuild 555 BLAKE2B 2d3a4d338bacb983ebdebb91484f43b21fa9ce78341cbf93370d35e0acb926e2faca8f1a63ffd35c1dd4e3934796c314c948af805e13be584d6ba41bf082afce SHA512 145714e9ebdb287cce91d1087a49fdacab1f2372b7fd3eff48c6e81e7ad8ad6ea62ca95d0003fa34ae9f29c31fc2b56aa5a8dc8c64fd5ac2ea6088195f4dbdae

View File

@ -0,0 +1,19 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DESCRIPTION=""
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="+curl +imagemagick mysql postgres +sqlite"
REQUIRED_USE="|| ( mysql postgres sqlite )"
RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
imagemagick? ( dev-php/pecl-imagick )
virtual/httpd-php
media-libs/vips
media-libs/exiftool
dev-php/pdlib
app-admin/sudo"

1
virtual/embedd/Manifest Normal file
View File

@ -0,0 +1 @@
EBUILD embedd-1.ebuild 360 BLAKE2B c588326dbc6cbd6ce069f1092010381e90a502cd002094a3254836bf692eea972cd1d69d2d9b0cff3974b2d3a20cd8abf4594b147d573b1c186480879c3ee98f SHA512 12846f1d8a6d7476aa1c491201d917fcba63867f2e95dd18c2186df7d85c5bf3b48d5dc85f9dbad502ddf81280663b84453672520edba880b8716935b54f71a3

View File

@ -0,0 +1,17 @@
EAPI=8
DESCRIPTION=""
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE=""
RDEPEND="
dev-vcs/git
dev-embedded/u-boot-tools
sys-apps/dtc
cross-aarch64-unknown-linux-gnu/binutils
cross-aarch64-unknown-linux-gnu/gcc
cross-aarch64-unknown-linux-gnu/glibc
sys-fs/squashfs-tools
dev-debug/gdb
"

View File

@ -0,0 +1 @@
EBUILD fdm_meta-1.ebuild 188 BLAKE2B 45c88d52e19c88453e5ef802971513ea090449e7c5bc6fb5d34a9cb73fadb1d3db612b63fa59d1de758ac9438a07e84417afa0812bf147d0494e7b76b26fb59d SHA512 d412f2a76c70c4e4abc1fd3d2419dda23c0b90f801edceca07feb6a1df0ae2c9b28c82a6002b883a80abe3c026e78b1b1f3daeed56f6e4c3bdb0c8da97529c84

View File

@ -0,0 +1,11 @@
EAPI=8
DESCRIPTION=""
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE=""
RDEPEND="
net-libs/webkit-gtk:4
sys-fs/fuse:0
"

1
virtual/klipper/Manifest Normal file
View File

@ -0,0 +1 @@
EBUILD klipper-11.ebuild 485 BLAKE2B 4fd63608d12d0eb8a89627344a702ad7fd451bba076d59d288dc776956de531334a243a6e4dd8a8ddd1efe659f88873d11fb765288d7e3ab236255482ce85651 SHA512 0719f82ca33c39b8215f90640b053915c23a8de4192d5c0499602004d94cb9ccf6e648d869ab887a087a11d988495315998c312dba61482cd933f3d8ac5a7c27

View File

@ -0,0 +1,24 @@
EAPI=8
DESCRIPTION=""
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="mainsail"
RDEPEND="
dev-vcs/git
dev-python/pip
media-libs/openjpeg
dev-db/lmdb
dev-libs/libsodium
net-wireless/wireless-tools
x11-libs/wxGTK
x11-base/xorg-server
media-libs/libjpeg-turbo
sys-apps/systemd[policykit(+)]
app-admin/sudo
net-misc/networkmanager
sys-apps/usbutils
app-mobilephone/dfu-util
mainsail? ( www-servers/nginx )
"