Compare commits
9 commits
edge
...
freecad/up
Author | SHA1 | Date | |
---|---|---|---|
89cf19a889 | |||
42bfe51a65 | |||
b94c645942 | |||
6a4d7776d7 | |||
364345e160 | |||
d26837cfc6 | |||
57f44384da | |||
6240471d87 | |||
cdb9e43039 |
49 changed files with 706 additions and 1662 deletions
|
@ -108,7 +108,7 @@ set_repositories_for() {
|
|||
[ "$repo" = "$target_repo" ] && break
|
||||
done
|
||||
doas sh -c "printf '%s\n' $repos >> /etc/apk/repositories"
|
||||
doas apk update || true
|
||||
doas apk update
|
||||
}
|
||||
|
||||
apply_offset_limit() {
|
||||
|
|
|
@ -22,12 +22,6 @@ for pkg in $owned_by_you; do
|
|||
downstream_version=$(sed -n "/^P:$pkg$/,/^$/p" APKINDEX | awk -F ':' '{if($1=="V"){print $2}}' | sort -V | tail -n 1)
|
||||
downstream_version=${downstream_version/-*}
|
||||
|
||||
# special cases
|
||||
case $pkg in
|
||||
freetube) upstream_version=$(curl --fail -X GET -sS -H 'Content-Type: application/json' "https://release-monitoring.org/api/v2/packages/?name=$pkg&distribution=Alpine" | jq -r '.items.[].version' | sed "s|-beta||");;
|
||||
dotnet9-sdk|dotnet9-stage0) upstream_version=${upstream_version/-*};;
|
||||
esac
|
||||
|
||||
if [ -z "$upstream_version" ]; then
|
||||
echo "$pkg not in anitya"
|
||||
echo "$pkg" >> not_in_anitya
|
||||
|
|
|
@ -5,14 +5,14 @@ Upstream: https://ayakael.net/forge/ayaports
|
|||
|
||||
This repository contains aports that are not yet merged in the official Alpine
|
||||
Linux repository or don’t adhere to Alpine polices. Packages are automatically
|
||||
built using CI. Once built, they are deployed to a Forgejo repository, making
|
||||
built using CI. Once built, they are deployed to a git-lfs repository, making
|
||||
them available to apk.
|
||||
|
||||
Branches are matched to Alpine releases.
|
||||
|
||||
## Repositories
|
||||
|
||||
You can browse all the repositories at https://ayakael.net/forge/ayaports
|
||||
You can browse all the repositories at https://codeberg.org/ayakael/ayaports
|
||||
Affixed to each repository description is the appropriate link for use in
|
||||
`/etc/apk/repositories`.
|
||||
|
||||
|
@ -21,12 +21,11 @@ Affixed to each repository description is the appropriate link for use in
|
|||
https://ayakael.net/api/packages/forge/alpine/v3.21/backports
|
||||
```
|
||||
|
||||
Aports from the official Alpine repositories backported from edge. This is only
|
||||
available and kept up-to-date on latest stable release.
|
||||
Aports from the official Alpine repositories backported from edge.
|
||||
|
||||
#### User
|
||||
```
|
||||
https://ayakael.net/api/packages/forge/alpine/edge/user
|
||||
https://ayakael.net/api/packages/forge/alpine/v3.21/user
|
||||
```
|
||||
|
||||
Aports that have yet to be (or may never be) upstreamed to the official
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
|
||||
# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
|
||||
pkgname=caprine
|
||||
pkgver=2.60.1
|
||||
pkgrel=2
|
||||
pkgver=2.60.3
|
||||
pkgrel=0
|
||||
pkgdesc="Elegant Facebook Messenger desktop app"
|
||||
arch="x86_64 aarch64" # blocked by electron
|
||||
url="https://github.com/sindresorhus/caprine"
|
||||
|
@ -17,12 +17,10 @@ source="
|
|||
"
|
||||
|
||||
build() {
|
||||
npm install --ignore-scripts
|
||||
npx --yes patch-package
|
||||
npm ci --ignore-scripts
|
||||
npx patch-package
|
||||
npx tsc
|
||||
rm -r node_modules
|
||||
npm install --ignore-scripts --production
|
||||
npx --yes patch-package
|
||||
npm prune --ignore-scripts --omit=dev
|
||||
}
|
||||
|
||||
package() {
|
||||
|
@ -59,7 +57,7 @@ package() {
|
|||
-or -name "test" -prune -exec rm -r '{}' \;
|
||||
}
|
||||
sha512sums="
|
||||
0df7f233c91f5a044dcffde94b976c6ad71e6d355518615c48cd825a249c01d63f455de31ece69193a66ca0fd8157506f9b88088da1bd47fc75e9d3800784ed0 caprine-2.60.1.tar.gz
|
||||
edf6452294b3c661befd9811c5836da33311171d587cb9a5939ac11a0c1e2a7ebbc4f2a8d81e02c1db1a2d814ac1aa7bbdadca9e21892cc8d7f7e9c23dc2e221 caprine-2.60.3.tar.gz
|
||||
a469e3bea24926119e51642b777ef794c5fa65421107903f967c36d81bbb1adb3d52469ce3a3301b2c890f1aa53ab989ded22a7c6e811fb8cf0a582dbd835e19 caprine.desktop
|
||||
3ad8994c1a0417e73d622587769e527b4236a32c1a89442ff76413b75b4392d667c9e2908979b453e5926e54db6d94b31625340c5a94e84e91ea77f56feae778 caprine.sh
|
||||
"
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
# Contributor: lauren n. liberda <lauren@selfisekai.rocks>
|
||||
# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
|
||||
pkgname=electron
|
||||
pkgver=33.2.1
|
||||
pkgver=33.3.0
|
||||
_gittag=v"${pkgver/_beta/-beta.}"
|
||||
pkgrel=0
|
||||
_chromium=130.0.6723.127
|
||||
_chromium=130.0.6723.152
|
||||
_copium_tag=129.1
|
||||
_depot_tools=495b23b39aaba2ca3b55dd27cadc523f1cb17ee6
|
||||
pkgdesc="Electron cross-platform desktop toolkit"
|
||||
|
@ -544,7 +544,7 @@ lang() {
|
|||
}
|
||||
|
||||
sha512sums="
|
||||
e2df4454f4178af859c13aadee4ea04a5b6aa202972cad625e54bc68f5b8c25e098e50d428ec9c1886c37ccf49aaaedb4c5f02fc8bdd498314ba216901932185 electron-v33.2.1-130.0.6723.127.tar.zst
|
||||
2aa8d27657fea4a86169929c39a67dc2afcf4baa52f4fbc1227f9bd3113b61ae7966186d363cc1307113182d4e5181ce5187842801dc6699ee965fd3057d94a3 electron-v33.3.0-130.0.6723.152.tar.zst
|
||||
6138b3dbf3903c78f4ca1ed5a6c3c3c485471ded31976010484ce8893d03953df2b8f066a4fe84bbde5ae7ef9bbff664ef917e247b2e95dd471de40f2774d7d0 copium-129.1.tar.gz
|
||||
29bb685e03356a77df5fd347cdf55194cc8b3265c421cc76e54d64edefc329dbcb052deb26b22e8f587ce68456876c071de1b7d258dd0fcc6ee66c875ec4a020 chromium-revert-drop-of-system-java.patch
|
||||
53b7cdee8f7bfb4c9371cb385c473e34ed3d8ac7efaa43c0af061107560be30d8747b07fb0b16c01079b8c770f2c721bb5a8081313b7c126856ea4078a74da2a compiler.patch
|
||||
|
|
80
backports/freecad/APKBUILD
Normal file
80
backports/freecad/APKBUILD
Normal file
|
@ -0,0 +1,80 @@
|
|||
# Contributor: Bryce Vandegrift <bryce@brycevandegrift.xyz>
|
||||
# Maintainer: Bryce Vandegrift <bryce@brycevandegrift.xyz>
|
||||
pkgname=freecad
|
||||
pkgver=1.0.0
|
||||
_ondsel_ver="2e3659c4bce3e6885269e0cb3d640261b2a91108"
|
||||
_gsl_ver="b39e7e4b0987859f5b19ff7686b149c916588658"
|
||||
pkgrel=0
|
||||
pkgdesc="Open-source parametric 3D modeler"
|
||||
url="https://www.freecad.org/"
|
||||
# armv7, armhf, and aarch64: GL_MULTISAMPLE not declared
|
||||
# s390x: blocked by opencascade-dev, vtk-dev, and freeimage-dev
|
||||
# riscv64: blocked by py3-pivy, py3-pyside6, pyside6-dev, and py3-shiboken6
|
||||
arch="all !aarch64 !armhf !armv7 !s390x !riscv64"
|
||||
license="LGPL-2.0-or-later"
|
||||
depends="py3-pivy py3-matplotlib py3-pyside6"
|
||||
makedepends="
|
||||
cmake
|
||||
ninja
|
||||
boost-dev
|
||||
doxygen
|
||||
python3-dev
|
||||
xerces-c-dev
|
||||
opencascade-dev
|
||||
glew-dev
|
||||
gtest-dev
|
||||
vtk-dev
|
||||
libmedc-dev
|
||||
eigen-dev
|
||||
coin-dev
|
||||
libspnav-dev
|
||||
pyside6-dev
|
||||
py3-shiboken6
|
||||
py3-pivy
|
||||
py3-matplotlib
|
||||
swig
|
||||
jsoncpp-dev
|
||||
freeimage-dev
|
||||
qt6-qtbase-dev
|
||||
qt6-qtsvg-dev
|
||||
qt6-qttools-dev
|
||||
yaml-cpp-dev"
|
||||
subpackages="$pkgname-doc $pkgname-dev"
|
||||
options="!check"
|
||||
source="$pkgname-$pkgver.tar.gz::https://github.com/FreeCAD/FreeCAD/archive/$pkgver.tar.gz
|
||||
OndselSolver-$_ondsel_ver.tar.gz::https://github.com/Ondsel-Development/OndselSolver/archive/$_ondsel_ver.tar.gz
|
||||
GSL-$_gsl_ver.tar.gz::https://github.com/microsoft/GSL/archive/$_gsl_ver.tar.gz
|
||||
no-execinfo.patch"
|
||||
builddir="$srcdir/FreeCAD-$pkgver"
|
||||
|
||||
prepare() {
|
||||
default_prepare
|
||||
|
||||
cp -r $srcdir/OndselSolver-$_ondsel_ver/* $builddir/src/3rdParty/OndselSolver
|
||||
cp -r $srcdir/GSL-$_gsl_ver/* $builddir/src/3rdParty/GSL
|
||||
}
|
||||
|
||||
build() {
|
||||
cmake -B build -G Ninja \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DFREECAD_QT_VERSION=6 \
|
||||
-DFREECAD_USE_EXTERNAL_PIVY=ON \
|
||||
-DBUILD_FLAT_MESH=ON \
|
||||
-DENABLE_DEVELOPER_TESTS=OFF \
|
||||
-DBUILD_TEST=OFF \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DCMAKE_INSTALL_DATAROOTDIR=/usr/share \
|
||||
-DCMAKE_INSTALL_DATADIR=/usr/share/$pkgname
|
||||
ninja -C build
|
||||
}
|
||||
|
||||
package() {
|
||||
DESTDIR="$pkgdir" ninja -C build install
|
||||
}
|
||||
|
||||
sha512sums="
|
||||
afc1079ea04fd5bb8135f8ad1012d9e4e05c8839dd0a4e00253eada58fe018f445c1200d1ca7ac9f268644c946cbf55b7b313dc3d6bd010f9da3a3334103b7db freecad-1.0.0.tar.gz
|
||||
8b08a668c63b57a49b8d95308f31496c1bcb27a5fb024d2e6b9744bd2e4819e82c59f68a8b99cc1be3e2bdfcdf435da5e342afaff4f28d97a849f9c01736af89 OndselSolver-2e3659c4bce3e6885269e0cb3d640261b2a91108.tar.gz
|
||||
01ae556b70f7b5b572d15a427a6a5e0e7a4047727958be4c61d7dd84fc3bc97aebeaebf60c48064c565884441605fca180d5fdc8c920d35b2a8874664c024b01 GSL-b39e7e4b0987859f5b19ff7686b149c916588658.tar.gz
|
||||
2f190118bddbf2e070519d0244eafd15ae7919f9759f925f593ce43988a7f9ab023c50bec3768404926e8cc661e829f6a55bec5e9e58c58735c050338fbcec16 no-execinfo.patch
|
||||
"
|
|
@ -1,5 +1,15 @@
|
|||
From 9cd1f5e5b90ef2e17c61719ffdb2f6c43cbae185 Mon Sep 17 00:00:00 2001
|
||||
From: Bryce Vandegrift <bryce@brycevandegrift.xyz>
|
||||
Date: Sun, 24 Nov 2024 18:19:39 -0500
|
||||
Subject: [PATCH] Remove dependency on execinfo.h
|
||||
|
||||
---
|
||||
.../salomesmesh/src/DriverSTL/Basics_Utils.cpp | 11 -----------
|
||||
src/App/Application.cpp | 1 -
|
||||
2 files changed, 12 deletions(-)
|
||||
|
||||
diff --git a/src/3rdParty/salomesmesh/src/DriverSTL/Basics_Utils.cpp b/src/3rdParty/salomesmesh/src/DriverSTL/Basics_Utils.cpp
|
||||
index 23c5083..54c7ecf 100644
|
||||
index 23c5083fdf..5ea06ad3f4 100644
|
||||
--- a/src/3rdParty/salomesmesh/src/DriverSTL/Basics_Utils.cpp
|
||||
+++ b/src/3rdParty/salomesmesh/src/DriverSTL/Basics_Utils.cpp
|
||||
@@ -29,7 +29,6 @@
|
||||
|
@ -10,14 +20,10 @@ index 23c5083..54c7ecf 100644
|
|||
#endif
|
||||
|
||||
|
||||
@@ -109,20 +108,7 @@ namespace Kernel_Utils
|
||||
#ifndef WIN32
|
||||
void print_traceback()
|
||||
{
|
||||
- void *array[50];
|
||||
- size_t size;
|
||||
- char **strings;
|
||||
- size_t i;
|
||||
@@ -113,16 +112,6 @@ namespace Kernel_Utils
|
||||
size_t size;
|
||||
char **strings;
|
||||
size_t i;
|
||||
-
|
||||
- size = backtrace (array, 40);
|
||||
- strings = backtrace_symbols (array, size);
|
||||
|
@ -28,15 +34,14 @@ index 23c5083..54c7ecf 100644
|
|||
- }
|
||||
-
|
||||
- free (strings);
|
||||
+ std::cerr << "there is no backtrace." << std::endl;
|
||||
}
|
||||
#else
|
||||
#if (_MSC_VER >= 1400) // Visual Studio 2005
|
||||
diff --git a/src/App/Application.cpp b/src/App/Application.cpp
|
||||
index 3081623..ba3525f 100644
|
||||
index 9384790627..9155c00d25 100644
|
||||
--- a/src/App/Application.cpp
|
||||
+++ b/src/App/Application.cpp
|
||||
@@ -1732,7 +1732,6 @@ static void freecadNewHandler ()
|
||||
@@ -1798,7 +1798,6 @@ static void freecadNewHandler ()
|
||||
#endif
|
||||
|
||||
#if defined(FC_OS_LINUX)
|
||||
|
@ -44,3 +49,6 @@ index 3081623..ba3525f 100644
|
|||
#include <dlfcn.h>
|
||||
#include <cxxabi.h>
|
||||
|
||||
--
|
||||
2.47.0
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
|
||||
# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
|
||||
pkgname=freetube
|
||||
pkgver=0.21.3
|
||||
pkgrel=2
|
||||
pkgver=0.22.1
|
||||
pkgrel=0
|
||||
pkgdesc="An open source desktop YouTube player built with privacy in mind."
|
||||
arch="x86_64 aarch64" # blocked by electron
|
||||
license="AGPL-3.0-only"
|
||||
|
@ -50,7 +50,7 @@ package() {
|
|||
}
|
||||
|
||||
sha512sums="
|
||||
22e5ab677cd442d50237b2d62534698d8ad73a37e1731003dc23c4ea3da992b3cae936f0bb3a0a86cd4b7fba731c9fa53276cb0a6cd5bab213ff2a6c9006cb05 freetube-0.21.3.tar.gz
|
||||
7ea436ac67d9fe4e99e0a234d04ca88215e066006d3456d1474f2097773ba40f5bca57081155f948c41d429ea74e6185600bdcff56d87f047c6f7978037fd9ba freetube-0.22.1.tar.gz
|
||||
2ce2effc794bb663789cefe968b5899122127983dbfa1b240aa33a2be383720b18204e6d01b4a550df72956f02b6636b79c93a58f470a970b09b770f5b8f2fc4 freetube.sh
|
||||
d27cb896b65a7e8d52ffe86e5f74eed72b6cf976b28e1a13012d34c7eceba5ff6f20298017738dfa93c0336ffa52b8ee4da7e06b02747062898db7e678819526 tasje-dotdash.patch
|
||||
"
|
||||
|
|
43
backports/libmedc/APKBUILD
Normal file
43
backports/libmedc/APKBUILD
Normal file
|
@ -0,0 +1,43 @@
|
|||
# Contributor: Aiden Grossman <agrossman154@yahoo.com>
|
||||
# Maintainer:
|
||||
pkgname=libmedc
|
||||
pkgver=4.1.1
|
||||
pkgrel=4
|
||||
pkgdesc="Open source library for numerical simulation"
|
||||
url="https://www.salome-platform.org/"
|
||||
arch="all"
|
||||
license="GPL-3.0-or-later"
|
||||
makedepends="cmake hdf5-dev swig python3-dev samurai"
|
||||
options="!check" #test suite is nonfunctional with python bindings
|
||||
subpackages="$pkgname-dev $pkgname-doc $pkgname-python-pyc $pkgname-python:_py"
|
||||
source="
|
||||
https://www.code-saturne.org/releases/external/med-$pkgver.tar.gz
|
||||
hdf5.patch
|
||||
cmake-config-dir.patch
|
||||
"
|
||||
builddir="$srcdir"/med-${pkgver}_SRC
|
||||
|
||||
build() {
|
||||
cmake -B build -G Ninja \
|
||||
-DCMAKE_BUILD_TYPE=None \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DMEDFILE_BUILD_TESTS=OFF \
|
||||
-DMEDFILE_BUILD_PYTHON=ON
|
||||
cmake --build build
|
||||
}
|
||||
|
||||
package() {
|
||||
DESTDIR="$pkgdir" cmake --install build
|
||||
}
|
||||
|
||||
_py() {
|
||||
pkgdesc="Python bindings for libmedc"
|
||||
depends="python3"
|
||||
amove usr/lib/python3*
|
||||
}
|
||||
|
||||
sha512sums="
|
||||
8917e7ecfe30e1259b0927c8e1c3d6efd86ed2386813f6d90217bd95589199478e587f0815031ab65cacf7901a30b77a6307414f9073caffe6e7f013e710d768 med-4.1.1.tar.gz
|
||||
68d9291e73a68d674081314028c0fce7bbd4a7b78b93b7e5078117ce62f2d07318bc33ec95091ce677148ec3926c1ce653d0760c34e74b29257a7be59210f040 hdf5.patch
|
||||
8d0f58cd67d205fbacaff0e6da76e2ee5473457b478ede13a551ebe5853c0716c7406b74c3792e1ace33a34d352fccca8dd2940f063a7c060a12529d060a991a cmake-config-dir.patch
|
||||
"
|
11
backports/libmedc/cmake-config-dir.patch
Normal file
11
backports/libmedc/cmake-config-dir.patch
Normal file
|
@ -0,0 +1,11 @@
|
|||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -101,7 +101,7 @@
|
||||
IF(WIN32 AND NOT CYGWIN)
|
||||
SET(INSTALL_CMAKE_CONFIG_DIR cmake)
|
||||
ELSE()
|
||||
- SET(INSTALL_CMAKE_CONFIG_DIR share/cmake/medfile-${MED_STR_VERSION})
|
||||
+ SET(INSTALL_CMAKE_CONFIG_DIR lib${LIB_SUFFIX}/cmake/medfile-${MED_STR_VERSION})
|
||||
ENDIF()
|
||||
SET(INSTALL_INCLUDE_DIR include)
|
||||
|
94
backports/libmedc/hdf5.patch
Normal file
94
backports/libmedc/hdf5.patch
Normal file
|
@ -0,0 +1,94 @@
|
|||
Originally from https://gist.github.com/jedbrown/527ef81ff59a0dccf833da40fdd15a47
|
||||
diff -rupN med-4.1.0/config/cmake_files/medMacros.cmake med-4.1.0-new/config/cmake_files/medMacros.cmake
|
||||
--- med-4.1.0/config/cmake_files/medMacros.cmake 2021-12-03 09:35:30.675827163 +0100
|
||||
+++ med-4.1.0-new/config/cmake_files/medMacros.cmake 2021-12-03 09:32:31.894994147 +0100
|
||||
@@ -447,7 +447,7 @@ MACRO(MED_FIND_HDF5)
|
||||
##
|
||||
## Requires 1.10.x version
|
||||
##
|
||||
- IF (NOT HDF_VERSION_MAJOR_REF EQUAL 1 OR NOT HDF_VERSION_MINOR_REF EQUAL 10 OR NOT HDF_VERSION_RELEASE_REF GREATER 1)
|
||||
+ IF (HDF5_VERSION VERSION_LESS 1.10.2)
|
||||
MESSAGE(FATAL_ERROR "HDF5 version is ${HDF_VERSION_REF}. Only versions >= 1.10.2 are supported.")
|
||||
ENDIF()
|
||||
##
|
||||
diff -rupN med-4.1.0/src/ci/MEDfileCompatibility.c med-4.1.0-new/src/ci/MEDfileCompatibility.c
|
||||
--- med-4.1.0/src/ci/MEDfileCompatibility.c 2021-12-03 09:35:30.676827162 +0100
|
||||
+++ med-4.1.0-new/src/ci/MEDfileCompatibility.c 2021-12-03 09:33:26.292942149 +0100
|
||||
@@ -71,7 +71,7 @@ MEDfileCompatibility(const char* const f
|
||||
_hversionMMR=10000*_hmajeur+100*_hmineur+_hrelease;
|
||||
/* ISCRUTE(_hversionMMR); */
|
||||
/* ISCRUTE(HDF_VERSION_NUM_REF); */
|
||||
- if ( (_hversionMMR >= HDF_VERSION_NUM_REF) && (_hmineur == HDF_VERSION_MINOR_REF) ) *hdfok = MED_TRUE;
|
||||
+ if (_hversionMMR >= HDF_VERSION_NUM_REF) *hdfok = MED_TRUE;
|
||||
|
||||
/* TODO : Vérifier si la version mineure HDF du fichier est supérieure
|
||||
à la version mineure de la bibliothèque HDF utilisée :
|
||||
@@ -113,7 +113,7 @@ MEDfileCompatibility(const char* const f
|
||||
#if MED_NUM_MAJEUR != 4
|
||||
#error "Don't forget to update the test version here when you change the major version of the library !"
|
||||
#endif
|
||||
-#if H5_VERS_MINOR > 10
|
||||
+#if H5_VERS_MINOR > 14
|
||||
#error "Don't forget to check the compatibility version of the library, depending on the internal hdf model choice !"
|
||||
#error "Cf. _MEDfileCreate ..."
|
||||
#endif
|
||||
diff -rupN med-4.1.0/src/hdfi/_MEDfileCreate.c med-4.1.0-new/src/hdfi/_MEDfileCreate.c
|
||||
--- med-4.1.0/src/hdfi/_MEDfileCreate.c 2021-12-03 09:35:30.677827161 +0100
|
||||
+++ med-4.1.0-new/src/hdfi/_MEDfileCreate.c 2021-12-03 09:32:31.894994147 +0100
|
||||
@@ -159,7 +159,7 @@ med_idt _MEDfileCreate(const char * cons
|
||||
* En HDF5-1.10.0p1 cela n'a aucun effet !
|
||||
* Un test autoconf permet de fixer un intervalle de version HDF à MED.
|
||||
*/
|
||||
-#if H5_VERS_MINOR > 10
|
||||
+#if H5_VERS_MINOR > 14
|
||||
#error "Don't forget to change the compatibility version of the library !"
|
||||
#endif
|
||||
|
||||
diff -rupN med-4.1.0/src/hdfi/_MEDfileOpen.c med-4.1.0-new/src/hdfi/_MEDfileOpen.c
|
||||
--- med-4.1.0/src/hdfi/_MEDfileOpen.c 2021-12-03 09:35:30.677827161 +0100
|
||||
+++ med-4.1.0-new/src/hdfi/_MEDfileOpen.c 2021-12-03 09:32:31.894994147 +0100
|
||||
@@ -72,7 +72,7 @@ med_idt _MEDfileOpen(const char * const
|
||||
|
||||
• The creation order tracking property, H5P_CRT_ORDER_TRACKED, has been set in the group creation property list (see H5Pset_link_creation_order).
|
||||
*/
|
||||
-#if H5_VERS_MINOR > 10
|
||||
+#if H5_VERS_MINOR > 14
|
||||
#error "Don't forget to change the compatibility version of the library !"
|
||||
#endif
|
||||
/* L'avantage de bloquer le modèle interne HDF5
|
||||
diff -rupN med-4.1.0/src/hdfi/_MEDmemFileOpen.c med-4.1.0-new/src/hdfi/_MEDmemFileOpen.c
|
||||
--- med-4.1.0/src/hdfi/_MEDmemFileOpen.c 2021-12-03 09:35:30.678827160 +0100
|
||||
+++ med-4.1.0-new/src/hdfi/_MEDmemFileOpen.c 2021-12-03 09:32:31.894994147 +0100
|
||||
@@ -434,7 +434,7 @@ med_idt _MEDmemFileOpen(const char * con
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
-#if H5_VERS_MINOR > 10
|
||||
+#if H5_VERS_MINOR > 14
|
||||
#error "Don't forget to change the compatibility version of the library !"
|
||||
#endif
|
||||
if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18) ) {
|
||||
diff -rupN med-4.1.0/src/hdfi/_MEDparFileCreate.c med-4.1.0-new/src/hdfi/_MEDparFileCreate.c
|
||||
--- med-4.1.0/src/hdfi/_MEDparFileCreate.c 2021-12-03 09:35:30.678827160 +0100
|
||||
+++ med-4.1.0-new/src/hdfi/_MEDparFileCreate.c 2021-12-03 09:32:31.894994147 +0100
|
||||
@@ -64,7 +64,7 @@ med_idt _MEDparFileCreate(const char * c
|
||||
* En HDF5-1.10.0p1 cela n'a aucun effet !
|
||||
* Un test autoconf permet de fixer un intervalle de version HDF à MED.
|
||||
*/
|
||||
-#if H5_VERS_MINOR > 10
|
||||
+#if H5_VERS_MINOR > 14
|
||||
#error "Don't forget to change the compatibility version of the library !"
|
||||
#endif
|
||||
|
||||
diff -rupN med-4.1.0/src/hdfi/_MEDparFileOpen.c med-4.1.0-new/src/hdfi/_MEDparFileOpen.c
|
||||
--- med-4.1.0/src/hdfi/_MEDparFileOpen.c 2021-12-03 09:35:30.679827159 +0100
|
||||
+++ med-4.1.0-new/src/hdfi/_MEDparFileOpen.c 2021-12-03 09:32:31.894994147 +0100
|
||||
@@ -55,7 +55,7 @@ med_idt _MEDparFileOpen(const char * con
|
||||
MED_ERR_(_fid,MED_ERR_INIT,MED_ERR_PROPERTY,MED_ERR_PARALLEL_MSG);
|
||||
goto ERROR;
|
||||
}
|
||||
-#if H5_VERS_MINOR > 10
|
||||
+#if H5_VERS_MINOR > 14
|
||||
#error "Don't forget to change the compatibility version of the library !"
|
||||
#endif
|
||||
if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18 ) ) {
|
|
@ -2,7 +2,7 @@
|
|||
# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
|
||||
# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
|
||||
pkgname=signal-desktop
|
||||
pkgver=7.34.0
|
||||
pkgver=7.35.1
|
||||
pkgrel=0
|
||||
pkgdesc="A messaging app for simple private communication with friends"
|
||||
url="https://github.com/signalapp/Signal-Desktop/"
|
||||
|
@ -66,7 +66,7 @@ makedepends="
|
|||
options="net !check"
|
||||
|
||||
# use _check_depends to validate this
|
||||
_libsignalver=0.60.2
|
||||
_libsignalver=0.62.0
|
||||
_ringrtcver=2.48.7
|
||||
_webrtcver=6723a
|
||||
_stokenizerver=0.2.1
|
||||
|
@ -88,9 +88,9 @@ source="
|
|||
webrtc-compiler.patch
|
||||
webrtc-gcc13.patch
|
||||
|
||||
signal-desktop
|
||||
signal-desktop.sh
|
||||
"
|
||||
builddir="$srcdir/Signal-Desktop-$pkgver"
|
||||
builddir="$srcdir"
|
||||
|
||||
# webrtc broken on clang https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101227
|
||||
export CC=gcc
|
||||
|
@ -112,7 +112,8 @@ export CARGO_PROFILE_RELEASE_STRIP="symbols"
|
|||
|
||||
export YARN_CACHE_FOLDER="$srcdir/.yarn"
|
||||
|
||||
_check_depends() {
|
||||
_update_depends() {
|
||||
msg "Updating extra dependencies version information in $APKBUILD..."
|
||||
# _libsignalver: follow signal-desktop package.json -> @signalapp/libsignal-client
|
||||
# _ringrtcver: follow signal-desktop package.json -> @signalapp/ringrtc
|
||||
# _webrtcver: follow ringrtc (on version above) -> config/version.properties -> webrtc.version
|
||||
|
@ -126,10 +127,12 @@ _check_depends() {
|
|||
local _extensionver=$(curl --silent https://raw.githubusercontent.com/signalapp/better-sqlite3/v$_bsqlitever/deps/download.js | grep "const EXTENSION_VERSION" | awk '{print $4}' | tr -d "'" | tr -d ';' | head -n 1)
|
||||
local _stokenizerver=$(curl --silent https://raw.githubusercontent.com/signalapp/Signal-Sqlcipher-Extension/refs/tags/v$_extensionver/Cargo.lock | sed -n "/^name = \"signal-tokenizer\"$/,/^$/p" | awk -F ' = ' '{if($1=="version"){print $2}}' | tr -d '"')
|
||||
|
||||
echo _libsignalver=$_libsignalver
|
||||
echo _ringrtcver=$_ringrtcver
|
||||
echo _webrtcver=$_webrtcver
|
||||
echo _stokenizerver=$_stokenizerver
|
||||
sed -i \
|
||||
-e "s|^_libsignalver=.*|_libsignalver=$_libsignalver|" \
|
||||
-e "s|^_ringrtcver=.*|_ringrtcver=$_ringrtcver|" \
|
||||
-e "s|^_webrtcver=.*|_webrtcver=$_webrtcver|" \
|
||||
-e "s|^_stokenizerver=.*|_stokenizerver=$_stokenizerver|" \
|
||||
APKBUILD
|
||||
}
|
||||
|
||||
# webrtc only, the other dependencies are fine with tarballs
|
||||
|
@ -183,13 +186,17 @@ target_cpu_only = True
|
|||
|
||||
prepare() {
|
||||
# Moves to builddir to use abuild patch logics
|
||||
for i in libsignal-$_libsignalver ringrtc-$_ringrtcver webrtc-$_webrtcver Signal-FTS5-Extension-$_stokenizerver; do
|
||||
for i in Signal-Desktop-$pkgver libsignal-$_libsignalver ringrtc-$_ringrtcver webrtc-$_webrtcver Signal-FTS5-Extension-$_stokenizerver; do
|
||||
mv "$srcdir"/$i "$builddir"/${i%-*}
|
||||
done
|
||||
|
||||
cd "$builddir"/Signal-Desktop
|
||||
msg "Installing signal-desktop JS dependencies"
|
||||
npm ci --ignore-scripts
|
||||
|
||||
# remove shipped fonts for system-provided (part 1)
|
||||
rm -rf fonts/
|
||||
|
||||
default_prepare
|
||||
|
||||
(
|
||||
|
@ -290,9 +297,6 @@ prepare() {
|
|||
msg "Installing libsignal js dependencies"
|
||||
yarn --ignore-scripts --frozen-lockfile
|
||||
)
|
||||
|
||||
# remove shipped fonts for system-provided (part 1)
|
||||
rm -rf fonts/
|
||||
}
|
||||
|
||||
build() {
|
||||
|
@ -386,6 +390,9 @@ build() {
|
|||
cbindgen --profile release . -o target/release/signal-tokenizer.h
|
||||
)
|
||||
|
||||
msg "Building signal-desktop"
|
||||
cd "$builddir"/Signal-Desktop
|
||||
|
||||
# from package.json postinstall
|
||||
npm run build:acknowledgments
|
||||
npm exec patch-package
|
||||
|
@ -405,15 +412,15 @@ build() {
|
|||
|
||||
# use our libsignal
|
||||
rm -rf node_modules/@signalapp/libsignal-client/
|
||||
mv libsignal/node/ node_modules/@signalapp/libsignal-client
|
||||
mv "$builddir"/libsignal/node/ node_modules/@signalapp/libsignal-client
|
||||
|
||||
# use our libringrtc
|
||||
rm -rf node_modules/@signalapp/ringrtc/
|
||||
mv ringrtc/src/node/ node_modules/@signalapp/ringrtc
|
||||
mv "$builddir"/ringrtc/src/node/ node_modules/@signalapp/ringrtc
|
||||
|
||||
mkdir node_modules/@signalapp/better-sqlite3/tokenizer
|
||||
mv Signal-FTS5-Extension/target/release/libsignal_tokenizer.a node_modules/@signalapp/better-sqlite3/tokenizer/
|
||||
mv Signal-FTS5-Extension/target/release/signal-tokenizer.h node_modules/@signalapp/better-sqlite3/tokenizer/
|
||||
mv "$builddir"/Signal-FTS5-Extension/target/release/libsignal_tokenizer.a node_modules/@signalapp/better-sqlite3/tokenizer/
|
||||
mv "$builddir"/Signal-FTS5-Extension/target/release/signal-tokenizer.h node_modules/@signalapp/better-sqlite3/tokenizer/
|
||||
|
||||
npm rebuild \
|
||||
sharp @signalapp/better-sqlite3 spellchecker websocket \
|
||||
|
@ -425,12 +432,13 @@ build() {
|
|||
}
|
||||
|
||||
check() {
|
||||
cd "$builddir"/Signal-Desktop
|
||||
# tests run against downloaded build of electron for glibc, probably can be patched
|
||||
npm run test
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "$builddir"/tasje_out
|
||||
cd "$builddir"/Signal-Desktop/tasje_out
|
||||
|
||||
install -Dm644 resources/app.asar "$pkgdir"/usr/lib/$pkgname/app.asar
|
||||
cp -r resources/app.asar.unpacked "$pkgdir"/usr/lib/$pkgname/app.asar.unpacked
|
||||
|
@ -439,7 +447,7 @@ package() {
|
|||
# this should be in /usr/lib/signal-desktop. however, it does not simply work and I stopped to care
|
||||
install -Dm755 "$builddir"/ringrtc/out/release/libsignaldeswebrtc.so "$pkgdir"/usr/lib/libsignaldeswebrtc.so
|
||||
|
||||
install -Dm755 "$srcdir"/signal-desktop "$pkgdir"/usr/bin/signal-desktop
|
||||
install -Dm755 "$srcdir"/signal-desktop.sh "$pkgdir"/usr/bin/signal-desktop
|
||||
|
||||
while read -r size; do
|
||||
install -Dm644 icons/$size.png "$pkgdir"/usr/share/icons/hicolor/$size/apps/$pkgname.png
|
||||
|
@ -447,19 +455,19 @@ package() {
|
|||
}
|
||||
|
||||
sha512sums="
|
||||
30e06721b01e580414c5e57b63350fc42edbe837b0a60a9cd100bc6ab1758fa6fd5744dc3a35d991db62f363eab791c45b43e1d9d5c81af9e67685114ae2e630 Signal-Desktop-7.34.0.tar.gz
|
||||
26780a0a6a529cee18f5c3b58f0395c6b5b630dbc8d2bbaa345dd7dd319a0e8548575c915dc16de6ac5d421fffdbe898f2dedb1fa3b4eab5d26debdfc1da515b libsignal-0.60.2.tar.gz
|
||||
9e780149b4734c6d9834606b0e15bedc99739ce9c637e69c9d0cedf9e3f870819bba411b7f192920ab4bc8adc9bd0ddccb0ca6790933f701c06b41175e3f7dce Signal-Desktop-7.35.1.tar.gz
|
||||
2a1d171a6bf9f1dfea9fc1fbc4f200c8b9e2ccb30d9d63f29007f252ff79ae7d149ab5707a8e430010da90ad1e3112475bd0eba8efb5cc011d5e3098aa1e26de libsignal-0.62.0.tar.gz
|
||||
e5e5ab27dc3bd37ef577c248d450e70fa11e72bdfab00fef233aad84d3d8aa3434166c03267f6b95b69d593e9da2f37017b5b7a0913f68499f387354742ba50a ringrtc-2.48.7.tar.gz
|
||||
64eed5c2a6f5a505d014bc4fa80e15b21103df1ea27825eaa1dfecc23c269f198a7e98472f29de7cae4ac7fa4fede6e837c27494b8ec4d03e36b85b029c64831 webrtc-6723a.tar.zst
|
||||
84a1f2fc29262a12842e94698d124a85b823128e72a493b0be8ea92fbb72c5c268499f4a6827cdedaae06ec73cce4039a39fe5c5d536cbef330e59ba0183da28 stokenizer-0.2.1.tar.gz
|
||||
8d2d2d82c8546c2dd1fef161b61df79918f8c22235a56a46adb375a0beb4acef12c5fe53e67242a4be97f77adc522ff79b47949c352956c742a70d50f4179f7f libsignal-auditable.patch
|
||||
cee74edb504ee5ae685e8a449ac35fabf949c33bfee5905778f850c3b18e17f9ae9bd501c89a7fd2c9c81a5bb2b0af0c0b3c72e32128603b3923c32d2a493ce9 signal-use-system-sqlcipher.patch
|
||||
152435231cdcf52a17a9e24aadf95d77511258e818172941ba074a73a90a541f0136feb58868674f2bcb19191a6d12933fe6cd5baf3ee99e508915c72523163b signal-disable-updates.patch
|
||||
d50eb5724502df9ea4d795db8cfc27af767c25168d7db2af512e615be7cc2ca290210a9ae78e1abb153c0198677e858ad3d74926c958099d0319295e7d9e7f1d signal-update-links.patch
|
||||
bfc8acdd13aa48d29c7657311733cc9d33c4899782efbd1ef6d25ad1698be4de7cc67e829324bc0309715d69ae37ea9f782cf54887317e817213e110d73d68e7 signal-show-window-please.patch
|
||||
18d5a0208d75fa910b6c0d531997402bba83290dfc7d7ce903acdcd0ce1d88bd3026ace40ecd32a88c2e429e48530b4e40f207a3d15bd9c0d6ebc8c447fa8ff9 signal-use-system-sqlcipher.patch
|
||||
fc2af28645364cd85c106304a26811b036f6be048c52137fbbcc112870a84132a181f532563e0569b560fde3cf8c02480666a9b01d804b0008f97c728005b1c7 signal-disable-updates.patch
|
||||
853de84d636f730694f17bcec63463fa7bfbdd0a7f7a64618a8fc6bc523ce1a9854b4c651753735af735c18101295d3efbe54f83ae0bccbed83c8c1fee3e7049 signal-update-links.patch
|
||||
882d6889b23a3ebc6449c8b6acec8c3853674a7e94f066d65b57bab674ba8c11d582ba2c760825cb67b9202716e6d8b7123001d1e9f9229e49a0b77e9d978265 signal-show-window-please.patch
|
||||
10284e0d86ab88de161ae689871082194f689ce416f3ebada8991d5db707994ea1cb8b4212756dd93ba5a3469964050988220f18afc37e38f3404a6e17ec8caf ringrtc-webrtc-renamed.patch
|
||||
98a7e4df27c3ed56c5968ebc3ae8e08bfb54362d0c910f9af1d414079a6d5fe0f18aa570ae3c38042f4691af6a130cb3ff689625e26a3987720dd319a5f587b1 webrtc-shared-libs.patch
|
||||
fe78cdc58c18826fc4227cc8e9377980766229390544578f6a1a6f7322bc3243c066963b589323dbfe4f2bfd37f8859ad84f63cb3783317892e5ae3652270a3a webrtc-compiler.patch
|
||||
48ab5c733e643eaff08ccbe839086bebbb68d397984ad7c5c5b68df8071f75d2dfe92c3f52d9fbf9b81754934bdfa8a67c69addd476ce4265b978592fb4ff9bd webrtc-gcc13.patch
|
||||
87534e7b5ad7365509eab75629e6bd1a9ed61ee92f7e358405a0abaf0df57de14623fb3894eb082f8785422e5c087e1c50f9e2e5cafbb2529591fd7bf447f7f5 signal-desktop
|
||||
87534e7b5ad7365509eab75629e6bd1a9ed61ee92f7e358405a0abaf0df57de14623fb3894eb082f8785422e5c087e1c50f9e2e5cafbb2529591fd7bf447f7f5 signal-desktop.sh
|
||||
"
|
||||
|
|
61
backports/signal-desktop/README.md
Normal file
61
backports/signal-desktop/README.md
Normal file
|
@ -0,0 +1,61 @@
|
|||
# signal-desktop
|
||||
|
||||
This is the `signal-desktop` package for Alpine Linux.
|
||||
|
||||
Please report any issues [using Gitlab](https://gitlab.alpinelinux.org/alpine/aports/-/issues/new) and tag @ayakael
|
||||
|
||||
## Building signal-desktop
|
||||
|
||||
Signal-desktop is an electron application that is rather complex to build
|
||||
|
||||
The first layer of complexity is the use of dependencies that are themselves
|
||||
rather complex to build. Some are based on nodejs, others rust. Those
|
||||
dependencies are built before signal-desktop, like ringrtc, webrtc and
|
||||
libsignal. The versions of those dependencies are tracked in different files,
|
||||
which adds complexity when maintaining the package. Executing `abuild
|
||||
_update_depends` automatically fetches the expected versions and updates
|
||||
the relevant variables.
|
||||
|
||||
A second layer of complexity is that webrtc's source code isn't available as a
|
||||
downloadable tarball. It is only fetchable using Google's `gclient` available
|
||||
in `depot_tools` with a reimplemented version in the `teapot` package. By
|
||||
executing, `abuild snapshot`, webrtc tarball can be fetched and packaged, as
|
||||
long as `gclient` is in your path. For ease of maintenance, a workflow on
|
||||
[Ayakael's Forge](https://ayakael.net/mirrors/signal-desktop) automatically
|
||||
fetches and packages the source code and makes it available in a [generic
|
||||
Forgejo repository](https://ayakael.net/mirrors/-/packages/generic/webrtc).
|
||||
|
||||
## Updating signal-desktop
|
||||
|
||||
In a nutshell:
|
||||
|
||||
1. Set `pkgver` to up-to-date version
|
||||
|
||||
2. Update the dependency versions using `abuild _update_depends`
|
||||
|
||||
3. Optional: fetch webrtc using `abuild snapshot`, making sure `client`
|
||||
is in your path
|
||||
|
||||
4. Update source checksum using `abuild checksum`
|
||||
|
||||
## Finding dependency version information
|
||||
|
||||
Here is where the version information is stored. It is different for every
|
||||
extra dependency.
|
||||
|
||||
* _libsignalver: follow signal-desktop package.json ->
|
||||
@signalapp/libsignal-client
|
||||
* _ringrtcver: follow signal-desktop package.json -> @signalapp/ringrtc
|
||||
* _webrtcver: follow ringrtc (on version above) -> config/version.properties ->
|
||||
webrtc.version downloading tarball generated with abuild snapshot (with gclient
|
||||
dependencies fetched)
|
||||
* _stokenizerver: follow @signalapp/better-sqlite3 (on version in package.json)
|
||||
-> deps/download.js -> TOKENIZER_VERSION
|
||||
|
||||
## Why is this package still in testing
|
||||
|
||||
As `electron` is still in testing, this package cannot yet be moved to
|
||||
`community`. Until that changes, this package is also kept-to-date against the
|
||||
latest release of Alpine Linux (along with `electron`) in
|
||||
[Ayakael's Forge](https://ayakael.net/forge/-/packages/alpine/signal-desktop).
|
||||
This is true of all Ayakael's packages still in `testing`.
|
6
backports/signal-desktop/signal-desktop.sh
Executable file
6
backports/signal-desktop/signal-desktop.sh
Executable file
|
@ -0,0 +1,6 @@
|
|||
#!/bin/sh
|
||||
|
||||
# app chooses config (including used endpoints) based on this
|
||||
export NODE_ENV=production
|
||||
|
||||
exec electron /usr/lib/signal-desktop/app.asar
|
|
@ -1,5 +1,5 @@
|
|||
--- a/config/production.json
|
||||
+++ b/config/production.json
|
||||
--- a/Signal-Desktop/config/production.json
|
||||
+++ b/Signal-Desktop/config/production.json
|
||||
@@ -16,5 +16,5 @@
|
||||
"serverTrustRoot": "BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF",
|
||||
"genericServerPublicParams": "AByD873dTilmOSG0TjKrvpeaKEsUmIO8Vx9BeMmftwUs9v7ikPwM8P3OHyT0+X3EUMZrSe9VUp26Wai51Q9I8mdk0hX/yo7CeFGJyzoOqn8e/i4Ygbn5HoAyXJx5eXfIbqpc0bIxzju4H/HOQeOpt6h742qii5u/cbwOhFZCsMIbElZTaeU+BWMBQiZHIGHT5IE0qCordQKZ5iPZom0HeFa8Yq0ShuEyAl0WINBiY6xE3H/9WnvzXBbMuuk//eRxXgzO8ieCeK8FwQNxbfXqZm6Ro1cMhCOF3u7xoX83QhpN",
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
diff --git a/app/main.ts.orig b/app/main.ts
|
||||
diff --git a/Signal-Desktop/app/main.ts.orig b/Signal-Desktop/app/main.ts
|
||||
index aa1bec8..bd7c1d5 100644
|
||||
--- a/app/main.ts.orig
|
||||
+++ b/app/main.ts
|
||||
--- a/Signal-Desktop/app/main.ts.orig
|
||||
+++ b/Signal-Desktop/app/main.ts
|
||||
@@ -690,7 +690,7 @@ async function createWindow() {
|
||||
: DEFAULT_HEIGHT;
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
--- ./ts/components/DialogExpiredBuild.tsx.orig
|
||||
+++ ./ts/components/DialogExpiredBuild.tsx
|
||||
--- ./Signal-Desktop/ts/components/DialogExpiredBuild.tsx.orig
|
||||
+++ ./Signal-Desktop/ts/components/DialogExpiredBuild.tsx
|
||||
@@ -23,9 +23,9 @@
|
||||
containerWidthBreakpoint={containerWidthBreakpoint}
|
||||
type="error"
|
||||
|
@ -12,8 +12,8 @@
|
|||
hasAction
|
||||
>
|
||||
{i18n('icu:expiredWarning')}{' '}
|
||||
--- ./ts/types/support.ts.orig
|
||||
+++ ./ts/types/support.ts
|
||||
--- ./Signal-Desktop/ts/types/support.ts.orig
|
||||
+++ ./Signal-Desktop/ts/types/support.ts
|
||||
@@ -1,7 +1,7 @@
|
||||
// Copyright 2023 Signal Messenger, LLC
|
||||
// SPDX-License-Identifier: AGPL-3.0-only
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
diff --git a/node_modules/@signalapp/better-sqlite3/binding.gyp.orig b/node_modules/@signalapp/better-sqlite3/binding.gyp
|
||||
diff --git a/Signal-Desktop/node_modules/@signalapp/better-sqlite3/binding.gyp.orig b/Signal-Desktop/node_modules/@signalapp/better-sqlite3/binding.gyp
|
||||
index c370c30b309..bf0207e6fec 100644
|
||||
--- a/node_modules/@signalapp/better-sqlite3/binding.gyp.orig
|
||||
+++ b/node_modules/@signalapp/better-sqlite3/binding.gyp
|
||||
--- a/Signal-Desktop/node_modules/@signalapp/better-sqlite3/binding.gyp.orig
|
||||
+++ b/Signal-Desktop/node_modules/@signalapp/better-sqlite3/binding.gyp
|
||||
@@ -7,7 +7,16 @@
|
||||
'targets': [
|
||||
{
|
||||
|
@ -28,10 +28,10 @@ index c370c30b309..bf0207e6fec 100644
|
|||
],
|
||||
}],
|
||||
],
|
||||
diff --git a/node_modules/@signalapp/better-sqlite3/package.json.orig b/node_modules/@signalapp/better-sqlite3/package.json
|
||||
diff --git a/Signal-Desktop/node_modules/@signalapp/better-sqlite3/package.json.orig b/Signal-Desktop/node_modules/@signalapp/better-sqlite3/package.json
|
||||
index fbb9d360352..a9217039c01 100644
|
||||
--- a/node_modules/@signalapp/better-sqlite3/package.json.orig
|
||||
+++ b/node_modules/@signalapp/better-sqlite3/package.json
|
||||
--- a/Signal-Desktop/node_modules/@signalapp/better-sqlite3/package.json.orig
|
||||
+++ b/Signal-Desktop/node_modules/@signalapp/better-sqlite3/package.json
|
||||
@@ -35,7 +35,7 @@
|
||||
},
|
||||
"scripts": {
|
||||
|
|
108
unmaintained/craftbukkit-plugin-essentialsx/APKBUILD
Normal file
108
unmaintained/craftbukkit-plugin-essentialsx/APKBUILD
Normal file
|
@ -0,0 +1,108 @@
|
|||
# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
|
||||
# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
|
||||
|
||||
pkgname=craftbukkit-plugin-essentialx
|
||||
_pkgver=2.19.2
|
||||
_buildver=release
|
||||
_buildcommit=0
|
||||
pkgrel=2
|
||||
pkgdesc="EssentialsX is the essential plugin suite for Minecraft servers, with over 130 commands for servers of all size and scale."
|
||||
options=!check
|
||||
arch='noarch'
|
||||
url="https://essentialsx.net/"
|
||||
license="GPL-3.0"
|
||||
depends="craftbukkit>=1.8.8 craftbukkit<=1.18.1"
|
||||
|
||||
if _buildver=release; then
|
||||
pkgver=$_pkgver
|
||||
_url=https://github.com/EssentialsX/Essentials/releases/download/$pkgver
|
||||
_filename="$pkgver.jar"
|
||||
else
|
||||
pkgver=$_pkgver.$_buildver
|
||||
_url=https://ci.ender.zone/job/EssentialsX/lastSuccessfulBuild/artifact/jars
|
||||
_filename="$_pkgver-dev+$_buildver-$_buildcommit.jar"
|
||||
fi
|
||||
|
||||
source="
|
||||
$_url/EssentialsX-$_filename
|
||||
$_url/EssentialsXChat-$_filename
|
||||
$_url/EssentialsXSpawn-$_filename
|
||||
$_url/EssentialsXAntiBuild-$_filename
|
||||
$_url/EssentialsXDiscord-$_filename
|
||||
$_url/EssentialsXGeoIP-$_filename
|
||||
$_url/EssentialsXProtect-$_filename
|
||||
$_url/EssentialsXXMPP-$_filename
|
||||
"
|
||||
|
||||
subpackages="$pkgname-core $pkgname-chat $pkgname-spawn $pkgname-antibuild $pkgname-discord $pkgname-geo $pkgname-protect $pkgname-xmpp"
|
||||
|
||||
|
||||
package() {
|
||||
mkdir -p "$pkgdir"
|
||||
}
|
||||
|
||||
core() {
|
||||
pkgdesc="Core functionality: teleports, private messages, homes, warps and more"
|
||||
install -Dm644 "$srcdir"/EssentialsX-*.jar "$subpkgdir/var/lib/craftbukkit/plugins/Essentials.jar"
|
||||
chown craftbukkit:craftbukkit "$subpkgdir"/var/lib/craftbukkit/plugins/Essentials.jar
|
||||
}
|
||||
|
||||
chat() {
|
||||
pkgdesc="Chat formatting, local chat"
|
||||
depends="$pkgname-core"
|
||||
install -Dm644 "$srcdir"/EssentialsXChat-*.jar "$subpkgdir/var/lib/craftbukkit/plugins/EssentialsChat.jar"
|
||||
chown craftbukkit:craftbukkit "$subpkgdir"/var/lib/craftbukkit/plugins/EssentialsChat.jar
|
||||
}
|
||||
|
||||
spawn() {
|
||||
pkgdesc="Spawnpoint control, per-player spawns"
|
||||
depends="$pkgname-core"
|
||||
install -Dm644 "$srcdir"/EssentialsXSpawn-*.jar "$subpkgdir/var/lib/craftbukkit/plugins/EssentialsSpawn.jar"
|
||||
chown craftbukkit:craftbukkit "$subpkgdir"/var/lib/craftbukkit/plugins/EssentialsSpawn.jar
|
||||
}
|
||||
|
||||
antibuild() {
|
||||
pkgdesc="Simple permissions-based building control"
|
||||
depends="$pkgname-core"
|
||||
install -Dm644 "$srcdir"/EssentialsXAntiBuild-*.jar "$subpkgdir/var/lib/craftbukkit/plugins/EssentialsAntiBuild.jar"
|
||||
chown craftbukkit:craftbukkit "$subpkgdir"/var/lib/craftbukkit/plugins/EssentialsAntiBuild.jar
|
||||
}
|
||||
|
||||
discord() {
|
||||
pkgdesc="Lightweight chat, messaging and command integration with Discord"
|
||||
depends="$pkgname-core"
|
||||
install -Dm644 "$srcdir"/EssentialsXDiscord-*.jar "$subpkgdir/var/lib/craftbukkit/plugins/EssentialsDiscord.jar"
|
||||
chown craftbukkit:craftbukkit "$subpkgdir"/var/lib/craftbukkit/plugins/EssentialsDiscord.jar
|
||||
}
|
||||
|
||||
geo() {
|
||||
pkgdesc="Geographical player lookup (formerly EssentialsX GeoIP)"
|
||||
depends="$pkgname-core"
|
||||
install -Dm644 "$srcdir"/EssentialsXGeoIP-*.jar "$subpkgdir/var/lib/craftbukkit/plugins/EssentialsGeo.jar"
|
||||
chown craftbukkit:craftbukkit "$subpkgdir"/var/lib/craftbukkit/plugins/EssentialsGeo.jar
|
||||
}
|
||||
|
||||
protect() {
|
||||
pkgdesc="Configurable world protection and control"
|
||||
depends="$pkgname-core"
|
||||
install -Dm644 "$srcdir"/EssentialsXProtect-*.jar "$subpkgdir/var/lib/craftbukkit/plugins/EssentialsProtect.jar"
|
||||
chown craftbukkit:craftbukkit "$subpkgdir"/var/lib/craftbukkit/plugins/EssentialsProtect.jar
|
||||
}
|
||||
|
||||
xmpp() {
|
||||
pkgdesc="Lightweight chat, messaging and server log integration with Jabber/XMPP services"
|
||||
depends="$pkgname-core"
|
||||
install -Dm644 "$srcdir"/EssentialsXXMPP-*.jar "$subpkgdir/var/lib/craftbukkit/plugins/EssentialsXMPP.jar"
|
||||
chown craftbukkit:craftbukkit "$subpkgdir"/var/lib/craftbukkit/plugins/EssentialsXMPP.jar
|
||||
}
|
||||
|
||||
sha512sums="
|
||||
c91c0905c11482d93b1565f8b9dce7b6f939567b4cb2756b112ee408bdcca1fece04742f9b7b0876d5b2e84cebdbc555d35cf783e9e86ab12fafb9dc02bc6008 EssentialsX-2.19.2.jar
|
||||
e2df6f242db38689579501b34763ad7d4b5e8ddd87b7b57956c6b5cc667f1b34af6b1289d668a64761da63f8ae8507eb9687ca490cc715a3eff6338770963240 EssentialsXChat-2.19.2.jar
|
||||
24e41168428f20bd6506282b9920718c43f7e5227bf35e174522e49859e294048a1d979ae42044bdbdba45c8a1109f4db6ffd0e24d5f3e909d0f9a3ac31e21d3 EssentialsXSpawn-2.19.2.jar
|
||||
326ec004241b526965cb67ae0f0245dfa960da2fdb4b59d867eb08e5196fceb468f9314cb838c8a0bc513cc55f43cf58023d11b18ed98e472be7089838538f97 EssentialsXAntiBuild-2.19.2.jar
|
||||
211c575adde17c3f2f901144e5c31beb2918df7e6e15f8ebe16805d3b53214a4756b87ec84466790ebf1dacb41e1aea97b6a9ba8ed39e85092293a821044d579 EssentialsXDiscord-2.19.2.jar
|
||||
7845e7666f983d3e793528a7085ced7c9f1bf881740bcc68b6a54fea74e31c3c0c2a52e26fc20330ba7d4a190dad0a1b27195fed0e1417a48494c5fa2ac60d92 EssentialsXGeoIP-2.19.2.jar
|
||||
e74ed72a15b5e6cd3c5f61d032a26c151865e3197638c9059237dc2d1144b0cb15668545532fc532ac8ec247bdf9b9ee6843b8f4af7506aef86d155dd5672c5f EssentialsXProtect-2.19.2.jar
|
||||
8d35009499557700f49c27ca3132e866f511a200791dbcfd2f595396977058cc2fc9349d0b4eaa0eb67b27331e91e6209df6ed57a766c06fd3b3325718462478 EssentialsXXMPP-2.19.2.jar
|
||||
"
|
23
unmaintained/craftbukkit-plugin-luckperms/APKBUILD
Normal file
23
unmaintained/craftbukkit-plugin-luckperms/APKBUILD
Normal file
|
@ -0,0 +1,23 @@
|
|||
# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
|
||||
# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
|
||||
|
||||
pkgname=craftbukkit-plugin-luckperms
|
||||
_pkgver=5.3.89
|
||||
_buildver=1389
|
||||
pkgver=$_pkgver.$_buildver
|
||||
pkgrel=1
|
||||
pkgdesc="An advanced permissions plugin for Bukkit/Spigot, BungeeCord and Sponge."
|
||||
options=!check
|
||||
arch='noarch'
|
||||
url="https://github.com/lucko/LuckPerms"
|
||||
license="MIT"
|
||||
depends="craftbukkit>=1.8.8 craftbukkit<=1.18.1"
|
||||
source="https://ci.lucko.me/job/LuckPerms/$_buildver/artifact/bukkit/loader/build/libs/LuckPerms-Bukkit-$_pkgver.jar"
|
||||
|
||||
package() {
|
||||
install -Dm644 "$srcdir"/LuckPerms-Bukkit-$_pkgver.jar "$pkgdir/var/lib/craftbukkit/plugins/LuckPerms.jar"
|
||||
chown craftbukkit:craftbukkit "$pkgdir"/var/lib/craftbukkit/plugins/LuckPerms.jar
|
||||
}
|
||||
sha512sums="
|
||||
7e146616cdf7f667c483bbe2112439c85f32427e9aa3714f0b0e869abf0cde6aacc7341d8d9e6a72ddcf8f35af840f4ba678c4690222912113f497cafce11154 LuckPerms-Bukkit-5.3.89.jar
|
||||
"
|
22
unmaintained/craftbukkit-plugin-worldedit/APKBUILD
Normal file
22
unmaintained/craftbukkit-plugin-worldedit/APKBUILD
Normal file
|
@ -0,0 +1,22 @@
|
|||
# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
|
||||
# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
|
||||
|
||||
pkgname=craftbukkit-plugin-worldedit
|
||||
pkgver=7.2.8
|
||||
_pkgver=$pkgver
|
||||
pkgrel=1
|
||||
pkgdesc="WorldEdit is an easy-to-use in-game Minecraft map editor"
|
||||
options=!check
|
||||
arch='noarch'
|
||||
url="https://dev.bukkit.org/projects/worldedit"
|
||||
license="GPL-3.0"
|
||||
depends="craftbukkit>=1.13.2 craftbukkit<=1.18.1"
|
||||
source="https://media.forgecdn.net/files/3559/523/worldedit-bukkit-7.2.8.jar"
|
||||
|
||||
package() {
|
||||
install -Dm644 "$srcdir"/worldedit-bukkit-$_pkgver.jar "$pkgdir/var/lib/craftbukkit/plugins/WorldEdit.jar"
|
||||
chown craftbukkit:craftbukkit $pkgdir/var/lib/craftbukkit/plugins/WorldEdit.jar
|
||||
}
|
||||
sha512sums="
|
||||
b57eacf7a2d90461f996f71cf55aa2e328d7b75c724291f11bcd1ab0f7e64e980db7ae3a2a56fffdf2bc31bfbcf68dda89b7c6f2ffa32ee430b8016020d796e3 worldedit-bukkit-7.2.8.jar
|
||||
"
|
22
unmaintained/craftbukkit-plugin-worldguard/APKBUILD
Normal file
22
unmaintained/craftbukkit-plugin-worldguard/APKBUILD
Normal file
|
@ -0,0 +1,22 @@
|
|||
# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
|
||||
# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
|
||||
|
||||
pkgname=craftbukkit-plugin-worldedit
|
||||
pkgver=7.0.6
|
||||
_pkgver=$pkgver
|
||||
pkgrel=3
|
||||
pkgdesc="WorldGuard lets you and players guard areas of land against griefers and undesirables"
|
||||
options=!check
|
||||
arch='noarch'
|
||||
url="https://dev.bukkit.org/projects/worldguard"
|
||||
license="GPL-3.0"
|
||||
depends="craftbukkit>=1.17.0 craftbukkit<=1.18.1"
|
||||
source="https://media.forgecdn.net/files/3461/546/worldguard-bukkit-7.0.6-dist.jar"
|
||||
|
||||
package() {
|
||||
install -Dm644 "$srcdir"/worldguard-bukkit-$_pkgver-dist.jar "$pkgdir/var/lib/craftbukkit/plugins/WorldGuard.jar"
|
||||
chown craftbukkit:craftbukkit $pkgdir/var/lib/craftbukkit/plugins/WorldGuard.jar
|
||||
}
|
||||
sha512sums="
|
||||
f2f857ffbbe7896b8986d5944564d7ab01e51d86476e05c66067a57d83dcb2ee60019ab9d75b16d551e9cfe102d29a602de41f316da57d7743d2595d6a11d839 worldguard-bukkit-7.0.6-dist.jar
|
||||
"
|
56
unmaintained/papermc/APKBUILD
Normal file
56
unmaintained/papermc/APKBUILD
Normal file
|
@ -0,0 +1,56 @@
|
|||
# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
|
||||
# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
|
||||
|
||||
pkgname=papermc
|
||||
_pkgver=1.18.1
|
||||
_build=99
|
||||
_license_commit=4a7962c
|
||||
pkgver="$_pkgver.$_build"
|
||||
pkgrel=1
|
||||
pkgdesc="Next generation of Minecraft server, compatible with Spigot plugins and offering uncompromising performance"
|
||||
pkgusers="craftbukkit"
|
||||
pkggroups="craftbukkit"
|
||||
arch='noarch'
|
||||
url="https://papermc.io/"
|
||||
license='custom'
|
||||
depends='openjdk17-jre-headless screen sudo bash gawk sed netcat-openbsd tar'
|
||||
options="!check"
|
||||
provides="craftbukkit=$_pkgver"
|
||||
subpackages="$pkgname-openrc"
|
||||
source="papermc.$pkgver.jar::https://papermc.io/api/v2/projects/paper/versions/$_pkgver/builds/$_build/downloads/paper-$_pkgver-$_build.jar
|
||||
papermc.initd
|
||||
papermc.conf
|
||||
papermc.sh
|
||||
LICENSE_$pkgver.md::https://raw.githubusercontent.com/PaperMC/Paper/$_license_commit/LICENSE.md
|
||||
"
|
||||
|
||||
_game="papermc"
|
||||
_server_root="/var/lib/papermc"
|
||||
|
||||
package() {
|
||||
install -Dm644 "$srcdir"/$_game.conf "$pkgdir"/etc/conf.d/$_game
|
||||
install -Dm755 "$srcdir"/$_game.sh "$pkgdir"/usr/bin/$_game
|
||||
install -Dm755 "$srcdir"/$_game.initd "$pkgdir"/etc/init.d/$_game
|
||||
install -Dm644 "$srcdir"/$_game.$pkgver.jar "$pkgdir"/$_server_root/$_game/$pkgver.jar
|
||||
ln -s "$_game"/$pkgver.jar "$pkgdir"/$_server_root/$_game/server.jar
|
||||
|
||||
# Link to craftbukkit plugins var
|
||||
ln -s "/var/lib/craftbukkit/plugins" "$pkgdir"/$_server_root/plugins
|
||||
|
||||
# Link the log files
|
||||
mkdir -p "$pkgdir"/var/log/
|
||||
install -dm2755 "$pkgdir"/$_server_root/logs
|
||||
ln -s "$_server_root"/logs "$pkgdir"/var/log/$_game
|
||||
|
||||
# Give the group write permissions and set user or group ID on execution
|
||||
chmod g+ws "$pkgdir"/$_server_root
|
||||
|
||||
install -D "$srcdir"/LICENSE_$pkgver.md "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
|
||||
}
|
||||
sha512sums="
|
||||
623d6423ee337671d546469e6bf1821005484192a1ae56d7b77f547f79102df50462e1d0144be13a0de9021c9d931bc974143b1e1526114627ba28688589d76a papermc.1.18.1.99.jar
|
||||
c5d1bf85ceb74162aaaf2bcd2d06dc2e3dd2e37c39f0cee2be7c8dbff9970a6aff1e48a43e6d1e83e6a0ac610bd89f62b1279bf27b64afa88d9831a36aebbd3e papermc.initd
|
||||
9b8e267428731ee9255f82a93f1e8674d7e917a0f154bd395cd2280a49aa248a4b8427520b08dbb4b3a74a5471dac0e439eedc8ab94bf2e53bb8d411d2d8a789 papermc.conf
|
||||
943ba0d4c10173246bdc6497dcedd54da0788f966841c8d3381398711d79f8d5eb07a24ce28f519b6f24f59d99fa9e74bc6bb882059f343df4eeda5de3660ac7 papermc.sh
|
||||
d4c645a58e1a17a0a1e42856a3cc43097711a05bf3d9f18c77c3bc9874417f223552859042ff00b7d3dda0003f49a9ee568540c2eb24e9f8fbb3c055f3b6e0a5 LICENSE_1.18.1.99.md
|
||||
"
|
56
unmaintained/papermc/APKBUILD.orig
Normal file
56
unmaintained/papermc/APKBUILD.orig
Normal file
|
@ -0,0 +1,56 @@
|
|||
# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
|
||||
# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
|
||||
|
||||
pkgname=papermc
|
||||
_pkgver=1.18.1
|
||||
_build=99
|
||||
_license_commit=4a7962c
|
||||
pkgver="$_pkgver.$_build"
|
||||
pkgrel=1
|
||||
pkgdesc="Next generation of Minecraft server, compatible with Spigot plugins and offering uncompromising performance"
|
||||
pkgusers="craftbukkit"
|
||||
pkggroups="craftbukkit"
|
||||
arch='noarch'
|
||||
url="https://papermc.io/"
|
||||
license='custom'
|
||||
depends='openjdk17-jre-headless screen sudo bash gawk sed netcat-openbsd tar'
|
||||
options="!check"
|
||||
provides="craftbukkit=$_pkgver"
|
||||
subpackages="$pkgname.openrc"
|
||||
source="papermc.$pkgver.jar::https://papermc.io/api/v2/projects/paper/versions/$_pkgver/builds/$_build/downloads/paper-$_pkgver-$_build.jar
|
||||
papermc.initd
|
||||
papermc.conf
|
||||
papermc.sh
|
||||
LICENSE_$pkgver.md::https://raw.githubusercontent.com/PaperMC/Paper/$_license_commit/LICENSE.md
|
||||
"
|
||||
|
||||
_game="papermc"
|
||||
_server_root="/var/lib/papermc"
|
||||
|
||||
package() {
|
||||
install -Dm644 $srcdir.$_game.conf "$pkgdir.etc/conf.d/$_game"
|
||||
install -Dm755 $srcdir.$_game.sh "$pkgdir.usr/bin/$_game"
|
||||
install -Dm755 $srcdir.$_game.initd "$pkgdir.etc/init.d/$_game"
|
||||
install -Dm644 $srcdir.$_game.$pkgver.jar "$pkgdir.$_server_root.$_game.$pkgver.jar"
|
||||
ln -s "$_game.$pkgver.jar" "$pkgdir._server_root.$_game.server.jar"
|
||||
|
||||
# Link to craftbukkit plugins var
|
||||
ln -s "/var/lib/craftbukkit/plugins" "$pkgdir.$_server_root.plugins"
|
||||
|
||||
# Link the log files
|
||||
mkdir -p "$pkgdir.var/log/"
|
||||
install -dm2755 "$pkgdir.$_server_root.logs"
|
||||
ln -s "$_server_root.logs" "$pkgdir.var/log/$_game"
|
||||
|
||||
# Give the group write permissions and set user or group ID on execution
|
||||
chmod g+ws "$pkgdir._server_root"
|
||||
|
||||
install -D $srcdir../LICENSE_$pkgver.md "$pkgdir.usr/share/licenses/$pkgname.LICENSE"
|
||||
}
|
||||
sha512sums="
|
||||
623d6423ee337671d546469e6bf1821005484192a1ae56d7b77f547f79102df50462e1d0144be13a0de9021c9d931bc974143b1e1526114627ba28688589d76a papermc.1.18.1.99.jar
|
||||
c5d1bf85ceb74162aaaf2bcd2d06dc2e3dd2e37c39f0cee2be7c8dbff9970a6aff1e48a43e6d1e83e6a0ac610bd89f62b1279bf27b64afa88d9831a36aebbd3e papermc.initd
|
||||
9b8e267428731ee9255f82a93f1e8674d7e917a0f154bd395cd2280a49aa248a4b8427520b08dbb4b3a74a5471dac0e439eedc8ab94bf2e53bb8d411d2d8a789 papermc.conf
|
||||
943ba0d4c10173246bdc6497dcedd54da0788f966841c8d3381398711d79f8d5eb07a24ce28f519b6f24f59d99fa9e74bc6bb882059f343df4eeda5de3660ac7 papermc.sh
|
||||
d4c645a58e1a17a0a1e42856a3cc43097711a05bf3d9f18c77c3bc9874417f223552859042ff00b7d3dda0003f49a9ee568540c2eb24e9f8fbb3c055f3b6e0a5 LICENSE_1.18.1.99.md
|
||||
"
|
38
unmaintained/papermc/APKBUILD.rej
Normal file
38
unmaintained/papermc/APKBUILD.rej
Normal file
|
@ -0,0 +1,38 @@
|
|||
--- user/papermc/APKBUILD
|
||||
+++ user/papermc/APKBUILD
|
||||
@@ -28,24 +28,24 @@ _game="papermc"
|
||||
_server_root="/var/lib/papermc"
|
||||
|
||||
package() {
|
||||
- install -Dm644 $srcdir.$_game.conf "$pkgdir.etc/conf.d/$_game"
|
||||
- install -Dm755 $srcdir.$_game.sh "$pkgdir.usr/bin/$_game"
|
||||
- install -Dm755 $srcdir.$_game.initd "$pkgdir.etc/init.d/$_game"
|
||||
- install -Dm644 $srcdir.$_game.$pkgver.jar "$pkgdir.$_server_root.$_game.$pkgver.jar"
|
||||
- ln -s "$_game.$pkgver.jar" "$pkgdir._server_root.$_game.server.jar"
|
||||
+ install -Dm644 "$srcdir"/$_game.conf "$pkgdir"/etc/conf.d/$_game
|
||||
+ install -Dm755 "$srcdir"/$_game.sh "$pkgdir"/usr/bin/$_game
|
||||
+ install -Dm755 "$srcdir"/$_game.initd "$pkgdir"/etc/init.d/$_game
|
||||
+ install -Dm644 "$srcdir"/$_game.$pkgver.jar "$pkgdir"/$_server_root/$_game/$pkgver.jar
|
||||
+ ln -s "$_game"/$pkgver.jar "$pkgdir"/$_server_root/$_game/server.jar
|
||||
|
||||
# Link to craftbukkit plugins var
|
||||
- ln -s "/var/lib/craftbukkit/plugins" "$pkgdir.$_server_root.plugins"
|
||||
+ ln -s "/var/lib/craftbukkit/plugins" "$pkgdir"/$_server_root/plugins
|
||||
|
||||
# Link the log files
|
||||
- mkdir -p "$pkgdir.var/log/"
|
||||
- install -dm2755 "$pkgdir.$_server_root.logs"
|
||||
- ln -s "$_server_root.logs" "$pkgdir.var/log/$_game"
|
||||
+ mkdir -p "$pkgdir"/var/log/
|
||||
+ install -dm2755 "$pkgdir"/$_server_root/logs
|
||||
+ ln -s "$_server_root"/logs "$pkgdir"/var/log/$_game
|
||||
|
||||
# Give the group write permissions and set user or group ID on execution
|
||||
- chmod g+ws "$pkgdir._server_root"
|
||||
+ chmod g+ws "$pkgdir"/$_server_root
|
||||
|
||||
- install -D $srcdir../LICENSE_$pkgver.md "$pkgdir.usr/share/licenses/$pkgname.LICENSE"
|
||||
+ install -D "$srcdir"/LICENSE_$pkgver.md "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
|
||||
}
|
||||
sha512sums="
|
||||
623d6423ee337671d546469e6bf1821005484192a1ae56d7b77f547f79102df50462e1d0144be13a0de9021c9d931bc974143b1e1526114627ba28688589d76a papermc.1.18.1.99.jar
|
|
@ -1,108 +0,0 @@
|
|||
# Contributor: Aiden Grossman <agrossman154@yahoo.com>
|
||||
# Maintainer: Aiden Grossman <agrossman154@yahoo.com>
|
||||
pkgname=freecad
|
||||
pkgver=0.20.2
|
||||
pkgrel=5
|
||||
pkgdesc="Free and open source 3D parametric modeler"
|
||||
url="https://freecadweb.org/"
|
||||
license="LGPL-2.0-or-later"
|
||||
arch="" # removed dependency py3-pyside2
|
||||
#arch="x86_64" # dependency OpenCascade is only x86_64
|
||||
depends="
|
||||
graphviz
|
||||
hdf5
|
||||
opencascade
|
||||
py3-matplotlib
|
||||
py3-numpy
|
||||
py3-pivy
|
||||
py3-ply
|
||||
py3-pyside2
|
||||
py3-six
|
||||
py3-yaml
|
||||
python3
|
||||
"
|
||||
makedepends="
|
||||
boost-dev
|
||||
cmake
|
||||
coin-dev
|
||||
doxygen
|
||||
eigen-dev
|
||||
freeimage-dev
|
||||
glu-dev
|
||||
hdf5-dev
|
||||
libmedc-dev
|
||||
libshiboken2-dev
|
||||
onetbb-dev
|
||||
opencascade-dev
|
||||
py3-pyside2-dev
|
||||
python3-dev
|
||||
shiboken2
|
||||
qt5-qtsvg-dev
|
||||
qt5-qtwebengine-dev
|
||||
qt5-qtxmlpatterns-dev
|
||||
samurai
|
||||
swig
|
||||
vtk-dev
|
||||
xerces-c-dev
|
||||
"
|
||||
checkdepends="xvfb-run mesa mesa-dri-gallium font-opensans"
|
||||
source="https://github.com/FreeCAD/FreeCAD/archive/$pkgver/freecad-$pkgver.tar.gz
|
||||
$pkgname-python3.11-1.patch::https://github.com/FreeCAD/FreeCAD/commit/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch
|
||||
numpy-1.20.patch
|
||||
no-execinfo.patch
|
||||
no-workaround-spnav.patch
|
||||
resourceDirectory.patch
|
||||
tests.patch
|
||||
opencascade-7.8.0.patch
|
||||
missing-include-cstdint.patch
|
||||
"
|
||||
builddir="$srcdir/FreeCAD-$pkgver"
|
||||
|
||||
build() {
|
||||
cmake -B build -G Ninja \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_C_FLAGS="$CFLAGS -fPIC -w" \
|
||||
-DCMAKE_CXX_FLAGS="$CXXFLAGS -fPIC -w" \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr/lib/freecad \
|
||||
-DCMAKE_INSTALL_DATADIR=/usr/share/freecad \
|
||||
-DCMAKE_INSTALL_DATAROOTDIR=/usr/share \
|
||||
-DCMAKE_INSTALL_DOCDIR=/usr/share/freecad/doc \
|
||||
-DBUILD_ENABLE_CXX_STD=C++17 \
|
||||
-DBUILD_QT5=ON \
|
||||
-DFREECAD_USE_EXTERNAL_PIVY=ON \
|
||||
-DFREECAD_USE_OCC_VARIANT="Official Version" \
|
||||
-DFREECAD_USE_QT_FILEDIALOG=ON \
|
||||
-DPYTHON_EXECUTABLE=/usr/bin/python3
|
||||
cmake --build build
|
||||
}
|
||||
|
||||
check() {
|
||||
DESTDIR=test_install cmake --install build
|
||||
mkdir -p test_install/usr/bin
|
||||
ln -s ../lib/freecad/bin/FreeCAD test_install/usr/bin/FreeCAD
|
||||
ln -s ../lib/freecad/bin/FreeCADCmd test_install/usr/bin/FreeCADCmd
|
||||
LD_LIBRARY_PATH="$PWD"/test_install/usr/lib/freecad/lib \
|
||||
xvfb-run "$PWD"/test_install/usr/bin/FreeCAD -t 0
|
||||
}
|
||||
|
||||
package() {
|
||||
DESTDIR="$pkgdir" cmake --install build
|
||||
|
||||
# FreeCAD does not initialize correctly when binaries
|
||||
# are located under /usr/bin; thus, symlinks are necessary.
|
||||
install -d "$pkgdir"/usr/bin
|
||||
ln -s /usr/lib/freecad/bin/FreeCAD "$pkgdir"/usr/bin/FreeCAD
|
||||
ln -s /usr/lib/freecad/bin/FreeCADCmd "$pkgdir"/usr/bin/FreeCADCmd
|
||||
}
|
||||
|
||||
sha512sums="
|
||||
c3acd77dd2bb9a2a23ac354da3b6102effb89c95d675e91421d65486414dfe8cc0188a7212245e0deb63f17b9c5df76133017be09e4cd14b833be8cbec52a08d freecad-0.20.2.tar.gz
|
||||
75a237f7ed7a89a98c0e5bdb3d3f0788749602daf718089aa0814e05f93ced1e15ad5867c7c87f170b48c5984f9ace1bbc95c4f386ce72bfb8d616323b47f1e5 freecad-python3.11-1.patch
|
||||
80b08b031810fce7b6d698c662f64fa4f8a904f283f46b478b1d718529164c0ee61ce190f633abf04e03212720480f3f0603b0c1e160af79d7b6bb82da3bd0e4 numpy-1.20.patch
|
||||
73aaba7015dce7048eb7d2456131b5b5ba4673cc980503331987be54d99daed5f61db015ca33d7d2ef0f02bd3192da8ce122c103c3b93f9959927deb4f0b933e no-execinfo.patch
|
||||
15696bdaaf77482f1b5d3806535a8004c8cec7d598d62092d9f0394b4ca9e2ad6cedd77c4b86a83a06324d16678c1c6bbf3a390b807729717a2f513e858afd50 no-workaround-spnav.patch
|
||||
8ba13b17bad66316757d180c1b9e9e72a24382627eac7c43a2264b3b5101e6e8f701775f2b805ed733f500fbcd8b0e8e422ec58a9ab3d948d613b666157d4c52 resourceDirectory.patch
|
||||
5db19e0aa2ca1fd21f4c56afc9db54390a799262aaa0a741704c2c304b0068fd6ca1dcc086465e12e9c0cfe06aac750aaf9b8f5f4db324539af4dd3394803ff9 tests.patch
|
||||
f933680dea8744e147f38abce389cb7fd0ec3fb3566454fdd5e6ea07b2faaac5fe61aabe1df3bda9f0d7b4fca16055aa2ad700e9cce10d2604ae37b761b68ade opencascade-7.8.0.patch
|
||||
fec515cc63830f0e715527c7890173705b24e7d99d225821ec4300104cf3affdee49243bbd4d0a331a902cf04db756a1b8f18f0a17cc71f5757f8b5c73c78ede missing-include-cstdint.patch
|
||||
"
|
|
@ -1,11 +0,0 @@
|
|||
diff --color -rupN a/src/3rdParty/libE57Format/include/E57Format.h b/src/3rdParty/libE57Format/include/E57Format.h
|
||||
--- a/src/3rdParty/libE57Format/include/E57Format.h 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/3rdParty/libE57Format/include/E57Format.h 2024-02-27 14:06:29.308892531 +0100
|
||||
@@ -32,6 +32,7 @@
|
||||
//! @file E57Format.h header file for the E57 API
|
||||
|
||||
#include <cfloat>
|
||||
+#include <cstdint>
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
|
|
@ -1,69 +0,0 @@
|
|||
Patch-Source: https://github.com/FreeCAD/FreeCAD/commit/7b377a216b9185960e4cee980a6504dc1a755f50
|
||||
fixes stderr reassignment
|
||||
--
|
||||
From 7b377a216b9185960e4cee980a6504dc1a755f50 Mon Sep 17 00:00:00 2001
|
||||
From: wmayer <wmayer@users.sourceforge.net>
|
||||
Date: Wed, 29 Jun 2022 15:19:18 +0200
|
||||
Subject: [PATCH] Gui: remove workaround for spnav 0.23 due to build failure
|
||||
with musl libc
|
||||
|
||||
---
|
||||
src/Gui/3Dconnexion/GuiNativeEventLinux.cpp | 27 ---------------------
|
||||
1 file changed, 27 deletions(-)
|
||||
|
||||
diff --git a/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp b/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp
|
||||
index 7f0ddd75d262..455ece0b36bd 100644
|
||||
--- a/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp
|
||||
+++ b/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp
|
||||
@@ -21,42 +21,17 @@
|
||||
***************************************************************************/
|
||||
|
||||
#include <FCConfig.h>
|
||||
-#include <cstdio>
|
||||
|
||||
#include "GuiNativeEventLinux.h"
|
||||
|
||||
#include "GuiApplicationNativeEventAware.h"
|
||||
#include <Base/Console.h>
|
||||
-#include <Base/FileInfo.h>
|
||||
#include <QMainWindow>
|
||||
|
||||
#include <QSocketNotifier>
|
||||
|
||||
#include <spnav.h>
|
||||
|
||||
-namespace {
|
||||
-class RedirectStdErr
|
||||
-{
|
||||
-public:
|
||||
- RedirectStdErr()
|
||||
- : fi(Base::FileInfo::getTempFileName())
|
||||
- , file(stderr)
|
||||
- {
|
||||
- stderr = fopen(fi.filePath().c_str(), "w");
|
||||
- }
|
||||
- ~RedirectStdErr()
|
||||
- {
|
||||
- fclose(stderr);
|
||||
- fi.deleteFile();
|
||||
- stderr = file;
|
||||
- }
|
||||
-
|
||||
-private:
|
||||
- Base::FileInfo fi;
|
||||
- FILE* file;
|
||||
-};
|
||||
-}
|
||||
-
|
||||
Gui::GuiNativeEvent::GuiNativeEvent(Gui::GUIApplicationNativeEventAware *app)
|
||||
: GuiAbstractNativeEvent(app)
|
||||
{
|
||||
@@ -72,8 +47,6 @@ Gui::GuiNativeEvent::~GuiNativeEvent()
|
||||
|
||||
void Gui::GuiNativeEvent::initSpaceball(QMainWindow *window)
|
||||
{
|
||||
- // tmp. redirect stderr to a file to suppress an error message from spnav_open()
|
||||
- RedirectStdErr err;
|
||||
Q_UNUSED(window)
|
||||
if (spnav_open() == -1) {
|
||||
Base::Console().Log("Couldn't connect to spacenav daemon. Please ignore if you don't have a spacemouse.\n");
|
|
@ -1,25 +0,0 @@
|
|||
Patch-Source: https://github.com/FreeCAD/FreeCAD/commit/8b0df1dc936b544091f6a2d68df1c1a14ae3de5b
|
||||
--
|
||||
From 8b0df1dc936b544091f6a2d68df1c1a14ae3de5b Mon Sep 17 00:00:00 2001
|
||||
From: lorenz <looooo@users.noreply.github.com>
|
||||
Date: Tue, 27 Dec 2022 04:59:35 +0100
|
||||
Subject: [PATCH] FEM: femmesh: fix AttributeError: module 'numpy' has no
|
||||
attribute 'int'
|
||||
|
||||
---
|
||||
src/Mod/Fem/femmesh/meshtools.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/Mod/Fem/femmesh/meshtools.py b/src/Mod/Fem/femmesh/meshtools.py
|
||||
index dd8671b..d2e2b0a 100644
|
||||
--- a/src/Mod/Fem/femmesh/meshtools.py
|
||||
+++ b/src/Mod/Fem/femmesh/meshtools.py
|
||||
@@ -485,7 +485,7 @@ def get_femelement_sets(
|
||||
# fem_objects = FreeCAD FEM document objects
|
||||
# get femelements for reference shapes of each obj.References
|
||||
count_femelements = 0
|
||||
- referenced_femelements = np.zeros((max(femelement_table.keys())+1,),dtype=np.int)
|
||||
+ referenced_femelements = np.zeros((max(femelement_table.keys())+1,),dtype=int)
|
||||
has_remaining_femelements = None
|
||||
for fem_object_i, fem_object in enumerate(fem_objects):
|
||||
obj = fem_object["Object"]
|
|
@ -1,877 +0,0 @@
|
|||
Fix compilation with opencascase 7.8.0
|
||||
|
||||
Base on https://github.com/FreeCAD/FreeCAD/pull/11909
|
||||
|
||||
diff --color -rupN a/cMake/FindOCC.cmake b/cMake/FindOCC.cmake
|
||||
--- a/cMake/FindOCC.cmake 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/cMake/FindOCC.cmake 2024-02-27 15:00:48.248873883 +0100
|
||||
@@ -127,8 +127,6 @@ if(OCC_FOUND)
|
||||
TKG2d
|
||||
TKG3d
|
||||
TKMath
|
||||
- TKIGES
|
||||
- TKSTL
|
||||
TKShHealing
|
||||
TKXSBase
|
||||
TKBool
|
||||
@@ -139,10 +137,6 @@ if(OCC_FOUND)
|
||||
TKGeomBase
|
||||
TKOffset
|
||||
TKPrim
|
||||
- TKSTEPBase
|
||||
- TKSTEPAttr
|
||||
- TKSTEP209
|
||||
- TKSTEP
|
||||
TKHLR
|
||||
TKFeat
|
||||
)
|
||||
@@ -154,17 +148,19 @@ if(OCC_FOUND)
|
||||
TKLCAF
|
||||
TKVCAF
|
||||
TKCDF
|
||||
- TKXDESTEP
|
||||
- TKXDEIGES
|
||||
TKMeshVS
|
||||
TKService
|
||||
TKV3d
|
||||
)
|
||||
- if(OCC_VERSION_STRING VERSION_LESS 6.7.3)
|
||||
- list(APPEND OCC_OCAF_LIBRARIES TKAdvTools)
|
||||
- elseif(NOT OCC_VERSION_STRING VERSION_LESS 7.5.0)
|
||||
+ if(NOT OCC_VERSION_STRING VERSION_LESS 7.5.0)
|
||||
list(APPEND OCC_OCAF_LIBRARIES TKRWMesh)
|
||||
- endif(OCC_VERSION_STRING VERSION_LESS 6.7.3)
|
||||
+ endif(NOT OCC_VERSION_STRING VERSION_LESS 7.5.0)
|
||||
+ if(OCC_VERSION_STRING VERSION_LESS 7.8.0)
|
||||
+ list(APPEND OCC_LIBRARIES TKIGES TKSTL TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP)
|
||||
+ list(APPEND OCC_OCAF_LIBRARIES TKXDESTEP TKXDEIGES)
|
||||
+ else(OCC_VERSION_STRING VERSION_LESS 7.8.0)
|
||||
+ list(APPEND OCC_LIBRARIES TKDESTEP TKDEIGES TKDEGLTF TKDESTL)
|
||||
+ endif(OCC_VERSION_STRING VERSION_LESS 7.8.0)
|
||||
message(STATUS "-- Found OCE/OpenCASCADE version: ${OCC_VERSION_STRING}")
|
||||
message(STATUS "-- OCE/OpenCASCADE include directory: ${OCC_INCLUDE_DIR}")
|
||||
message(STATUS "-- OCE/OpenCASCADE shared libraries directory: ${OCC_LIBRARY_DIR}")
|
||||
diff --color -rupN a/src/3rdParty/salomesmesh/inc/SMESHDS_DataMapOfShape.hxx b/src/3rdParty/salomesmesh/inc/SMESHDS_DataMapOfShape.hxx
|
||||
--- a/src/3rdParty/salomesmesh/inc/SMESHDS_DataMapOfShape.hxx 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/3rdParty/salomesmesh/inc/SMESHDS_DataMapOfShape.hxx 2024-02-27 15:00:48.248873883 +0100
|
||||
@@ -29,22 +29,35 @@
|
||||
|
||||
#include <TopoDS_Shape.hxx>
|
||||
|
||||
+#include <Standard_Version.hxx>
|
||||
+
|
||||
/*
|
||||
* This method needed for instance NCollection_DataMap with TopoDS_Shape as key
|
||||
*/
|
||||
+#if OCC_VERSION_HEX >= 0x070800
|
||||
struct SMESHDS_Hasher
|
||||
{
|
||||
- static inline Standard_Boolean IsEqual(const TopoDS_Shape& S1,
|
||||
- const TopoDS_Shape& S2)
|
||||
- {
|
||||
- return S1.IsSame(S2);
|
||||
+ size_t operator()(const TopoDS_Shape& S) const noexcept {
|
||||
+ return std::hash<TopoDS_Shape>{}(S);
|
||||
}
|
||||
- static inline Standard_Integer HashCode(const TopoDS_Shape& S,
|
||||
- const Standard_Integer Upper)
|
||||
- {
|
||||
- return ::HashCode( S, Upper);
|
||||
+ size_t operator()(const TopoDS_Shape& S1, const TopoDS_Shape& S2) const noexcept {
|
||||
+ return S1.IsSame(S2);
|
||||
}
|
||||
};
|
||||
-
|
||||
+#else
|
||||
+struct SMESHDS_Hasher
|
||||
+{
|
||||
+static inline Standard_Boolean IsEqual(const TopoDS_Shape& S1,
|
||||
+ const TopoDS_Shape& S2)
|
||||
+{
|
||||
+ return S1.IsSame(S2);
|
||||
+}
|
||||
+static inline Standard_Integer HashCode(const TopoDS_Shape& S,
|
||||
+ const Standard_Integer Upper)
|
||||
+{
|
||||
+ return ::HashCode( S, Upper);
|
||||
+}
|
||||
+};
|
||||
+#endif
|
||||
|
||||
#endif
|
||||
diff --color -rupN a/src/3rdParty/salomesmesh/inc/SMESH_MeshVSLink.hxx b/src/3rdParty/salomesmesh/inc/SMESH_MeshVSLink.hxx
|
||||
--- a/src/3rdParty/salomesmesh/inc/SMESH_MeshVSLink.hxx 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/3rdParty/salomesmesh/inc/SMESH_MeshVSLink.hxx 2024-02-27 15:00:48.248873883 +0100
|
||||
@@ -57,9 +57,6 @@
|
||||
#ifndef _MeshVS_EntityType_HeaderFile
|
||||
#include <MeshVS_EntityType.hxx>
|
||||
#endif
|
||||
-#ifndef _Standard_Address_HeaderFile
|
||||
-#include <Standard_Address.hxx>
|
||||
-#endif
|
||||
#ifndef _TColStd_HArray1OfInteger_HeaderFile
|
||||
#include <TColStd_HArray1OfInteger.hxx>
|
||||
#endif
|
||||
diff --color -rupN a/src/3rdParty/salomesmesh/inc/SMESH_SMESH.hxx b/src/3rdParty/salomesmesh/inc/SMESH_SMESH.hxx
|
||||
--- a/src/3rdParty/salomesmesh/inc/SMESH_SMESH.hxx 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/3rdParty/salomesmesh/inc/SMESH_SMESH.hxx 2024-02-27 15:00:48.248873883 +0100
|
||||
@@ -37,4 +37,5 @@
|
||||
#define SMESH_EXPORT
|
||||
#endif
|
||||
|
||||
+#include <Standard_Version.hxx>
|
||||
#endif
|
||||
diff --color -rupN a/src/3rdParty/salomesmesh/inc/SMESH_SequenceOfNode.hxx b/src/3rdParty/salomesmesh/inc/SMESH_SequenceOfNode.hxx
|
||||
--- a/src/3rdParty/salomesmesh/inc/SMESH_SequenceOfNode.hxx 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/3rdParty/salomesmesh/inc/SMESH_SequenceOfNode.hxx 2024-02-27 15:00:48.252207183 +0100
|
||||
@@ -28,10 +28,11 @@
|
||||
|
||||
#include "SMESH_SMESH.hxx"
|
||||
|
||||
-#include <NCollection_DefineSequence.hxx>
|
||||
#if OCC_VERSION_HEX >= 0x060703
|
||||
#include <NCollection_IncAllocator.hxx>
|
||||
#include <NCollection_Sequence.hxx>
|
||||
+#else
|
||||
+#include <NCollection_DefineSequence.hxx>
|
||||
#endif
|
||||
|
||||
typedef const SMDS_MeshNode* SMDS_MeshNodePtr;
|
||||
diff --color -rupN a/src/3rdParty/salomesmesh/inc/SMESH_TypeDefs.hxx b/src/3rdParty/salomesmesh/inc/SMESH_TypeDefs.hxx
|
||||
--- a/src/3rdParty/salomesmesh/inc/SMESH_TypeDefs.hxx 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/3rdParty/salomesmesh/inc/SMESH_TypeDefs.hxx 2024-02-27 15:00:48.252207183 +0100
|
||||
@@ -185,11 +185,18 @@ typedef std::vector< UVPtStruct > UVPtSt
|
||||
|
||||
// --------------------------------------------------------------------------------
|
||||
// class SMESH_SequenceOfElemPtr
|
||||
+#include <Standard_Version.hxx>
|
||||
+#if OCC_VERSION_HEX >= 0x060703
|
||||
+#include <NCollection_Sequence.hxx>
|
||||
+#else
|
||||
#include <NCollection_DefineSequence.hxx>
|
||||
+#endif
|
||||
|
||||
class SMDS_MeshElement;
|
||||
|
||||
typedef const SMDS_MeshElement* SMDS_MeshElementPtr;
|
||||
+#define DEFINE_SEQUENCE(_ClassName_, _BaseCollection_, TheItemType) \
|
||||
+typedef NCollection_Sequence<TheItemType > _ClassName_;
|
||||
|
||||
DEFINE_SEQUENCE (SMESH_SequenceOfElemPtr, SMESH_BaseCollectionElemPtr, SMDS_MeshElementPtr)
|
||||
|
||||
diff --color -rupN a/src/3rdParty/salomesmesh/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cpp b/src/3rdParty/salomesmesh/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cpp
|
||||
--- a/src/3rdParty/salomesmesh/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/3rdParty/salomesmesh/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cpp 2024-02-27 15:00:48.252207183 +0100
|
||||
@@ -33,10 +33,33 @@
|
||||
#include "SMDS_MeshNode.hxx"
|
||||
#include "SMESH_File.hxx"
|
||||
|
||||
+#include <Standard_Version.hxx>
|
||||
+
|
||||
namespace
|
||||
{
|
||||
struct Hasher
|
||||
{
|
||||
+#if OCC_VERSION_HEX >= 0x070800
|
||||
+ size_t operator()(const gp_Pnt& point) const noexcept
|
||||
+ {
|
||||
+ union
|
||||
+ {
|
||||
+ Standard_Real R[3];
|
||||
+ Standard_Integer I[6];
|
||||
+ } U;
|
||||
+
|
||||
+ point.Coord( U.R[0], U.R[1], U.R[2] );
|
||||
+ return std::hash<Standard_Integer>{}(U.I[0]/23+U.I[1]/19+U.I[2]/17+U.I[3]/13+U.I[4]/11+U.I[5]/7);
|
||||
+ }
|
||||
+
|
||||
+ size_t operator()(const gp_Pnt& point1, const gp_Pnt& point2) const noexcept
|
||||
+ {
|
||||
+ static Standard_Real tab1[3], tab2[3];
|
||||
+ point1.Coord(tab1[0],tab1[1],tab1[2]);
|
||||
+ point2.Coord(tab2[0],tab2[1],tab2[2]);
|
||||
+ return (memcmp(tab1,tab2,sizeof(tab1)) == 0);
|
||||
+ }
|
||||
+#else
|
||||
//=======================================================================
|
||||
//function : HashCode
|
||||
//purpose :
|
||||
@@ -51,9 +74,9 @@ namespace
|
||||
} U;
|
||||
|
||||
point.Coord( U.R[0], U.R[1], U.R[2] );
|
||||
-
|
||||
- return ::HashCode(U.I[0]/23+U.I[1]/19+U.I[2]/17+U.I[3]/13+U.I[4]/11+U.I[5]/7,Upper);
|
||||
+ return std::hash<Standard_Integer>{}(U.I[0]/23+U.I[1]/19+U.I[2]/17+U.I[3]/13+U.I[4]/11+U.I[5]/7);
|
||||
}
|
||||
+
|
||||
//=======================================================================
|
||||
//function : IsEqual
|
||||
//purpose :
|
||||
@@ -66,7 +89,9 @@ namespace
|
||||
point2.Coord(tab2[0],tab2[1],tab2[2]);
|
||||
return (memcmp(tab1,tab2,sizeof(tab1)) == 0);
|
||||
}
|
||||
+#endif
|
||||
};
|
||||
+
|
||||
typedef NCollection_DataMap<gp_Pnt,SMDS_MeshNode*,Hasher> TDataMapOfPntNodePtr;
|
||||
|
||||
const int HEADER_SIZE = 84;
|
||||
diff --color -rupN a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Quadrangle_2D.cpp b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Quadrangle_2D.cpp
|
||||
--- a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Quadrangle_2D.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Quadrangle_2D.cpp 2024-02-27 15:00:48.252207183 +0100
|
||||
@@ -48,7 +48,6 @@
|
||||
#include <Bnd_Box.hxx>
|
||||
#include <GeomAPI_ProjectPointOnSurf.hxx>
|
||||
#include <Geom_Surface.hxx>
|
||||
-#include <NCollection_DefineArray2.hxx>
|
||||
#include <Precision.hxx>
|
||||
#include <Standard_Real.hxx>
|
||||
#include <TColStd_SequenceOfInteger.hxx>
|
||||
diff --color -rupN a/src/Mod/Drawing/App/PreCompiled.h b/src/Mod/Drawing/App/PreCompiled.h
|
||||
--- a/src/Mod/Drawing/App/PreCompiled.h 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/Mod/Drawing/App/PreCompiled.h 2024-02-27 15:00:48.252207183 +0100
|
||||
@@ -70,7 +70,6 @@
|
||||
#include <Standard_LicenseError.hxx>
|
||||
#include <Standard_LicenseNotFound.hxx>
|
||||
#include <Standard_Macro.hxx>
|
||||
-#include <Standard_math.hxx>
|
||||
#include <Standard_MultiplyDefined.hxx>
|
||||
#include <Standard_NegativeValue.hxx>
|
||||
#include <Standard_NoMoreObject.hxx>
|
||||
diff --color -rupN a/src/Mod/Drawing/Gui/TaskDialog.cpp b/src/Mod/Drawing/Gui/TaskDialog.cpp
|
||||
--- a/src/Mod/Drawing/Gui/TaskDialog.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/Mod/Drawing/Gui/TaskDialog.cpp 2024-02-27 15:00:48.252207183 +0100
|
||||
@@ -29,7 +29,6 @@
|
||||
#endif
|
||||
|
||||
|
||||
-#include <Standard_math.hxx>
|
||||
#include "TaskDialog.h"
|
||||
#include <Gui/Application.h>
|
||||
#include <Gui/Command.h>
|
||||
diff --color -rupN a/src/Mod/Fem/Gui/PreCompiled.h b/src/Mod/Fem/Gui/PreCompiled.h
|
||||
--- a/src/Mod/Fem/Gui/PreCompiled.h 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/Mod/Fem/Gui/PreCompiled.h 2024-02-27 15:00:48.252207183 +0100
|
||||
@@ -63,7 +63,6 @@
|
||||
#endif
|
||||
|
||||
// OCC
|
||||
-#include <Standard_math.hxx>
|
||||
#include <Precision.hxx>
|
||||
#include <TopoDS.hxx>
|
||||
#include <BRepAdaptor_Surface.hxx>
|
||||
diff --color -rupN a/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp b/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp
|
||||
--- a/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp 2024-02-27 15:00:48.252207183 +0100
|
||||
@@ -28,7 +28,6 @@
|
||||
|
||||
# include <SMESH_Mesh.hxx>
|
||||
# include <SMESHDS_Mesh.hxx>
|
||||
-# include <Standard_math.hxx>
|
||||
#endif
|
||||
|
||||
#include <Base/Console.h>
|
||||
diff --color -rupN a/src/Mod/Import/App/ImportOCAF.cpp b/src/Mod/Import/App/ImportOCAF.cpp
|
||||
--- a/src/Mod/Import/App/ImportOCAF.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/Mod/Import/App/ImportOCAF.cpp 2024-02-27 15:00:48.252207183 +0100
|
||||
@@ -165,7 +165,11 @@ void ImportOCAF::loadShapes(const TDF_La
|
||||
std::vector<App::DocumentObject *> localValue;
|
||||
|
||||
if (aShapeTool->GetShape(label,aShape)) {
|
||||
+#if OCC_VERSION_HEX >= 0x070800
|
||||
+ hash = std::hash<TopoDS_Shape>{}(aShape);
|
||||
+#else
|
||||
hash = aShape.HashCode(HashUpper);
|
||||
+#endif
|
||||
}
|
||||
|
||||
Handle(TDataStd_Name) name;
|
||||
@@ -235,7 +239,11 @@ void ImportOCAF::loadShapes(const TDF_La
|
||||
if (isRef || myRefShapes.find(hash) == myRefShapes.end()) {
|
||||
TopoDS_Shape aShape;
|
||||
if (isRef && aShapeTool->GetShape(label, aShape))
|
||||
+#if OCC_VERSION_HEX >= 0x070800
|
||||
+ myRefShapes.insert(std::hash<TopoDS_Shape>{}(aShape));
|
||||
+#else
|
||||
myRefShapes.insert(aShape.HashCode(HashUpper));
|
||||
+#endif
|
||||
|
||||
if (aShapeTool->IsSimpleShape(label) && (isRef || aShapeTool->IsFree(label))) {
|
||||
if (!asm_name.empty())
|
||||
@@ -565,7 +573,11 @@ void ImportXCAF::createShape(const TopoD
|
||||
part->Label.setValue(default_name);
|
||||
part->Shape.setValue(shape);
|
||||
std::map<Standard_Integer, Quantity_ColorRGBA>::const_iterator jt;
|
||||
+#if OCC_VERSION_HEX >= 0x070800
|
||||
+ jt = myColorMap.find(std::hash<TopoDS_Shape>{}(shape));
|
||||
+#else
|
||||
jt = myColorMap.find(shape.HashCode(INT_MAX));
|
||||
+#endif
|
||||
|
||||
App::Color partColor(0.8f,0.8f,0.8f);
|
||||
#if 0//TODO
|
||||
@@ -586,7 +598,11 @@ void ImportXCAF::createShape(const TopoD
|
||||
// set label name if defined
|
||||
if (setname && !myNameMap.empty()) {
|
||||
std::map<Standard_Integer, std::string>::const_iterator jt;
|
||||
+#if OCC_VERSION_HEX >= 0x070800
|
||||
+ jt = myNameMap.find(std::hash<TopoDS_Shape>{}(shape));
|
||||
+#else
|
||||
jt = myNameMap.find(shape.HashCode(INT_MAX));
|
||||
+#endif
|
||||
if (jt != myNameMap.end()) {
|
||||
part->Label.setValue(jt->second);
|
||||
}
|
||||
@@ -606,7 +622,11 @@ void ImportXCAF::createShape(const TopoD
|
||||
faceColors.resize(faces.Extent(), partColor);
|
||||
xp.Init(shape,TopAbs_FACE);
|
||||
while (xp.More()) {
|
||||
+#if OCC_VERSION_HEX >= 0x070800
|
||||
+ jt = myColorMap.find(std::hash<TopoDS_Shape>{}(xp.Current()));
|
||||
+#else
|
||||
jt = myColorMap.find(xp.Current().HashCode(INT_MAX));
|
||||
+#endif
|
||||
if (jt != myColorMap.end()) {
|
||||
int index = faces.FindIndex(xp.Current());
|
||||
faceColors[index-1] = convertColor(jt->second);
|
||||
@@ -641,23 +661,51 @@ void ImportXCAF::loadShapes(const TDF_La
|
||||
// add the shapes
|
||||
TopExp_Explorer xp;
|
||||
for (xp.Init(aShape, TopAbs_SOLID); xp.More(); xp.Next(), ctSolids++)
|
||||
+#if OCC_VERSION_HEX >= 0x070800
|
||||
+ this->mySolids[std::hash<TopoDS_Shape>{}(xp.Current())] = (xp.Current());
|
||||
+#else
|
||||
this->mySolids[xp.Current().HashCode(INT_MAX)] = (xp.Current());
|
||||
+#endif
|
||||
for (xp.Init(aShape, TopAbs_SHELL, TopAbs_SOLID); xp.More(); xp.Next(), ctShells++)
|
||||
+#if OCC_VERSION_HEX >= 0x070800
|
||||
+ this->myShells[std::hash<TopoDS_Shape>{}(xp.Current())] = (xp.Current());
|
||||
+#else
|
||||
this->myShells[xp.Current().HashCode(INT_MAX)] = (xp.Current());
|
||||
+#endif
|
||||
// if no solids and no shells were found then go for compounds
|
||||
if (ctSolids == 0 && ctShells == 0) {
|
||||
for (xp.Init(aShape, TopAbs_COMPOUND); xp.More(); xp.Next(), ctComps++)
|
||||
+#if OCC_VERSION_HEX >= 0x070800
|
||||
+ this->myCompds[std::hash<TopoDS_Shape>{}(xp.Current())] = (xp.Current());
|
||||
+#else
|
||||
this->myCompds[xp.Current().HashCode(INT_MAX)] = (xp.Current());
|
||||
+#endif
|
||||
}
|
||||
if (ctComps == 0) {
|
||||
for (xp.Init(aShape, TopAbs_FACE, TopAbs_SHELL); xp.More(); xp.Next())
|
||||
+#if OCC_VERSION_HEX >= 0x070800
|
||||
+ this->myShapes[std::hash<TopoDS_Shape>{}(xp.Current())] = (xp.Current());
|
||||
+#else
|
||||
this->myShapes[xp.Current().HashCode(INT_MAX)] = (xp.Current());
|
||||
+#endif
|
||||
for (xp.Init(aShape, TopAbs_WIRE, TopAbs_FACE); xp.More(); xp.Next())
|
||||
+#if OCC_VERSION_HEX >= 0x070800
|
||||
+ this->myShapes[std::hash<TopoDS_Shape>{}(xp.Current())] = (xp.Current());
|
||||
+#else
|
||||
this->myShapes[xp.Current().HashCode(INT_MAX)] = (xp.Current());
|
||||
+#endif
|
||||
for (xp.Init(aShape, TopAbs_EDGE, TopAbs_WIRE); xp.More(); xp.Next())
|
||||
+#if OCC_VERSION_HEX >= 0x070800
|
||||
+ this->myShapes[std::hash<TopoDS_Shape>{}(xp.Current())] = (xp.Current());
|
||||
+#else
|
||||
this->myShapes[xp.Current().HashCode(INT_MAX)] = (xp.Current());
|
||||
+#endif
|
||||
for (xp.Init(aShape, TopAbs_VERTEX, TopAbs_EDGE); xp.More(); xp.Next())
|
||||
+#if OCC_VERSION_HEX >= 0x070800
|
||||
+ this->myShapes[std::hash<TopoDS_Shape>{}(xp.Current())] = (xp.Current());
|
||||
+#else
|
||||
this->myShapes[xp.Current().HashCode(INT_MAX)] = (xp.Current());
|
||||
+#endif
|
||||
}
|
||||
}
|
||||
|
||||
@@ -667,7 +715,11 @@ void ImportXCAF::loadShapes(const TDF_La
|
||||
hColors->GetColor(label, XCAFDoc_ColorSurf, col) ||
|
||||
hColors->GetColor(label, XCAFDoc_ColorCurv, col)) {
|
||||
// add defined color
|
||||
+#if OCC_VERSION_HEX >= 0x070800
|
||||
+ myColorMap[std::hash<TopoDS_Shape>{}(aShape)] = col;
|
||||
+#else
|
||||
myColorMap[aShape.HashCode(INT_MAX)] = col;
|
||||
+#endif
|
||||
}
|
||||
else {
|
||||
// http://www.opencascade.org/org/forum/thread_17107/
|
||||
@@ -677,7 +729,11 @@ void ImportXCAF::loadShapes(const TDF_La
|
||||
hColors->GetColor(it.Value(), XCAFDoc_ColorSurf, col) ||
|
||||
hColors->GetColor(it.Value(), XCAFDoc_ColorCurv, col)) {
|
||||
// add defined color
|
||||
+#if OCC_VERSION_HEX >= 0x070800
|
||||
+ myColorMap[std::hash<TopoDS_Shape>{}(it.Value())] = col;
|
||||
+#else
|
||||
myColorMap[it.Value().HashCode(INT_MAX)] = col;
|
||||
+#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -690,7 +746,11 @@ void ImportXCAF::loadShapes(const TDF_La
|
||||
extstr.ToUTF8CString(str);
|
||||
std::string labelName(str);
|
||||
if (!labelName.empty())
|
||||
+#if OCC_VERSION_HEX >= 0x070800
|
||||
+ myNameMap[std::hash<TopoDS_Shape>{}(aShape)] = labelName;
|
||||
+#else
|
||||
myNameMap[aShape.HashCode(INT_MAX)] = labelName;
|
||||
+#endif
|
||||
delete [] str;
|
||||
}
|
||||
|
||||
diff --color -rupN a/src/Mod/Import/App/ImportOCAF.h b/src/Mod/Import/App/ImportOCAF.h
|
||||
--- a/src/Mod/Import/App/ImportOCAF.h 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/Mod/Import/App/ImportOCAF.h 2024-02-27 15:00:48.252207183 +0100
|
||||
@@ -29,7 +29,6 @@
|
||||
#include <XCAFDoc_ShapeTool.hxx>
|
||||
#include <Quantity_ColorRGBA.hxx>
|
||||
#include <TopoDS_Shape.hxx>
|
||||
-#include <TDF_LabelMapHasher.hxx>
|
||||
#include <climits>
|
||||
#include <string>
|
||||
#include <set>
|
||||
diff --color -rupN a/src/Mod/Import/App/ImportOCAF2.h b/src/Mod/Import/App/ImportOCAF2.h
|
||||
--- a/src/Mod/Import/App/ImportOCAF2.h 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/Mod/Import/App/ImportOCAF2.h 2024-02-27 15:06:12.358890276 +0100
|
||||
@@ -27,7 +27,6 @@
|
||||
#include <XCAFDoc_ColorTool.hxx>
|
||||
#include <XCAFDoc_ShapeTool.hxx>
|
||||
#include <TopoDS_Shape.hxx>
|
||||
-#include <TDF_LabelMapHasher.hxx>
|
||||
#include <climits>
|
||||
#include <string>
|
||||
#include <set>
|
||||
@@ -57,13 +56,21 @@ namespace Import {
|
||||
|
||||
struct ShapeHasher {
|
||||
std::size_t operator()(const TopoDS_Shape &s) const {
|
||||
+#if OCC_VERSION_HEX >= 0x070800
|
||||
+ return std::hash<TopoDS_Shape>{}(s);
|
||||
+#else
|
||||
return s.HashCode(INT_MAX);
|
||||
+#endif
|
||||
}
|
||||
};
|
||||
|
||||
struct LabelHasher {
|
||||
std::size_t operator()(const TDF_Label &l) const {
|
||||
+#if OCC_VERSION_HEX >= 0x070800
|
||||
+ return std::hash<TDF_Label> {}(l);
|
||||
+#else
|
||||
return TDF_LabelMapHasher::HashCode(l,INT_MAX);
|
||||
+#endif
|
||||
}
|
||||
};
|
||||
|
||||
diff --color -rupN a/src/Mod/MeshPart/App/CurveProjector.h b/src/Mod/MeshPart/App/CurveProjector.h
|
||||
--- a/src/Mod/MeshPart/App/CurveProjector.h 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/Mod/MeshPart/App/CurveProjector.h 2024-02-27 15:00:48.252207183 +0100
|
||||
@@ -20,6 +20,7 @@
|
||||
* *
|
||||
***************************************************************************/
|
||||
|
||||
+#include <Standard_Version.hxx>
|
||||
|
||||
#ifndef _CurveProjector_h_
|
||||
#define _CurveProjector_h_
|
||||
@@ -64,8 +65,13 @@ public:
|
||||
|
||||
template<class T>
|
||||
struct TopoDSLess {
|
||||
- bool operator()(const T& x, const T& y) const {
|
||||
- return x.HashCode(INT_MAX-1) < y.HashCode(INT_MAX-1);
|
||||
+ bool operator()(const T& x, const T& y) const {
|
||||
+#if OCC_VERSION_HEX >= 0x070800
|
||||
+ std::hash<T> hasher;
|
||||
+ return hasher(x) < hasher(y);
|
||||
+#else
|
||||
+ return x.HashCode(INT_MAX-1) < y.HashCode(INT_MAX-1);
|
||||
+#endif
|
||||
}
|
||||
};
|
||||
|
||||
diff --color -rupN a/src/Mod/MeshPart/App/PreCompiled.h b/src/Mod/MeshPart/App/PreCompiled.h
|
||||
--- a/src/Mod/MeshPart/App/PreCompiled.h 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/Mod/MeshPart/App/PreCompiled.h 2024-02-27 15:00:48.252207183 +0100
|
||||
@@ -76,7 +76,6 @@
|
||||
#include <Standard_LicenseError.hxx>
|
||||
#include <Standard_LicenseNotFound.hxx>
|
||||
#include <Standard_Macro.hxx>
|
||||
-#include <Standard_math.hxx>
|
||||
#include <Standard_MultiplyDefined.hxx>
|
||||
#include <Standard_NegativeValue.hxx>
|
||||
#include <Standard_NoMoreObject.hxx>
|
||||
diff --color -rupN a/src/Mod/MeshPart/Gui/CrossSections.cpp b/src/Mod/MeshPart/Gui/CrossSections.cpp
|
||||
--- a/src/Mod/MeshPart/Gui/CrossSections.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/Mod/MeshPart/Gui/CrossSections.cpp 2024-02-27 15:00:48.252207183 +0100
|
||||
@@ -24,7 +24,6 @@
|
||||
#include "PreCompiled.h"
|
||||
#ifndef _PreComp_
|
||||
# include <sstream>
|
||||
-# include <Standard_math.hxx>
|
||||
# include <BRep_Builder.hxx>
|
||||
# include <BRepBuilderAPI_MakePolygon.hxx>
|
||||
# include <TopoDS.hxx>
|
||||
diff --color -rupN a/src/Mod/Part/App/ImportStep.cpp b/src/Mod/Part/App/ImportStep.cpp
|
||||
--- a/src/Mod/Part/App/ImportStep.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/Mod/Part/App/ImportStep.cpp 2024-02-27 15:00:48.255540482 +0100
|
||||
@@ -167,7 +167,12 @@ int Part::ImportStepParts(App::Document
|
||||
// This is a trick to access the GUI via Python and set the color property
|
||||
// of the associated view provider. If no GUI is up an exception is thrown
|
||||
// and cleared immediately
|
||||
+#if OCC_VERSION_HEX >= 0x070800
|
||||
+ std::hash<TopoDS_Solid> hasher;
|
||||
+ std::map<int, Quantity_Color>::iterator it = hash_col.find(hasher(aSolid));
|
||||
+#else
|
||||
std::map<int, Quantity_Color>::iterator it = hash_col.find(aSolid.HashCode(INT_MAX));
|
||||
+#endif
|
||||
if (it != hash_col.end()) {
|
||||
try {
|
||||
Py::Object obj(pcFeature->getPyObject(), true);
|
||||
diff --color -rupN a/src/Mod/Part/App/OCCError.h b/src/Mod/Part/App/OCCError.h
|
||||
--- a/src/Mod/Part/App/OCCError.h 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/Mod/Part/App/OCCError.h 2024-02-27 15:00:48.255540482 +0100
|
||||
@@ -50,7 +50,6 @@
|
||||
# include <Standard_Overflow.hxx>
|
||||
# include <Standard_ProgramError.hxx>
|
||||
# include <Standard_RangeError.hxx>
|
||||
-# include <Standard_TooManyUsers.hxx>
|
||||
# include <Standard_TypeMismatch.hxx>
|
||||
# include <Standard_Underflow.hxx>
|
||||
|
||||
diff --color -rupN a/src/Mod/Part/App/OpenCascadeAll.h b/src/Mod/Part/App/OpenCascadeAll.h
|
||||
--- a/src/Mod/Part/App/OpenCascadeAll.h 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/Mod/Part/App/OpenCascadeAll.h 2024-02-27 15:00:48.255540482 +0100
|
||||
@@ -49,7 +49,6 @@
|
||||
#include <Standard_LicenseError.hxx>
|
||||
#include <Standard_LicenseNotFound.hxx>
|
||||
#include <Standard_Macro.hxx>
|
||||
-#include <Standard_math.hxx>
|
||||
#include <Standard_MultiplyDefined.hxx>
|
||||
#include <Standard_NegativeValue.hxx>
|
||||
#include <Standard_NoMoreObject.hxx>
|
||||
diff --color -rupN a/src/Mod/Part/App/TopoShapePyImp.cpp b/src/Mod/Part/App/TopoShapePyImp.cpp
|
||||
--- a/src/Mod/Part/App/TopoShapePyImp.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/Mod/Part/App/TopoShapePyImp.cpp 2024-02-27 15:00:48.255540482 +0100
|
||||
@@ -1321,7 +1321,11 @@ PyObject* TopoShapePy::ancestorsOfType(
|
||||
TopTools_ListIteratorOfListOfShape it(ancestors);
|
||||
for (; it.More(); it.Next()) {
|
||||
// make sure to avoid duplicates
|
||||
+#if OCC_VERSION_HEX >= 0x070800
|
||||
+ const size_t code = std::hash<TopoDS_Shape>{}(static_cast<TopoDS_Shape>(it.Value()));
|
||||
+#else
|
||||
Standard_Integer code = it.Value().HashCode(INT_MAX);
|
||||
+#endif
|
||||
if (hashes.find(code) == hashes.end()) {
|
||||
list.append(shape2pyshape(it.Value()));
|
||||
hashes.insert(code);
|
||||
@@ -1943,7 +1947,11 @@ PyObject* TopoShapePy::hashCode(PyObject
|
||||
if (!PyArg_ParseTuple(args, "|i",&upper))
|
||||
return nullptr;
|
||||
|
||||
+#if OCC_VERSION_HEX >= 0x070800
|
||||
+ int hc = std::hash<TopoDS_Shape>{}(getTopoShapePtr()->getShape());
|
||||
+#else
|
||||
int hc = getTopoShapePtr()->getShape().HashCode(upper);
|
||||
+#endif
|
||||
return Py_BuildValue("i", hc);
|
||||
}
|
||||
|
||||
diff --color -rupN a/src/Mod/Part/Gui/AppPartGui.cpp b/src/Mod/Part/Gui/AppPartGui.cpp
|
||||
--- a/src/Mod/Part/Gui/AppPartGui.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/Mod/Part/Gui/AppPartGui.cpp 2024-02-27 15:00:48.255540482 +0100
|
||||
@@ -11,9 +11,6 @@
|
||||
|
||||
|
||||
#include "PreCompiled.h"
|
||||
-#ifndef _PreComp_
|
||||
-# include <Standard_math.hxx>
|
||||
-#endif
|
||||
|
||||
#include <Base/Console.h>
|
||||
#include <Base/Interpreter.h>
|
||||
diff --color -rupN a/src/Mod/Part/Gui/Command.cpp b/src/Mod/Part/Gui/Command.cpp
|
||||
--- a/src/Mod/Part/Gui/Command.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/Mod/Part/Gui/Command.cpp 2024-02-27 15:00:48.255540482 +0100
|
||||
@@ -26,7 +26,6 @@
|
||||
# include <QFileInfo>
|
||||
# include <QPointer>
|
||||
# include <QString>
|
||||
-# include <Standard_math.hxx>
|
||||
# include <Standard_Version.hxx>
|
||||
# include <TopExp_Explorer.hxx>
|
||||
# include <TopoDS_Shape.hxx>
|
||||
diff --color -rupN a/src/Mod/Part/Gui/CommandSimple.cpp b/src/Mod/Part/Gui/CommandSimple.cpp
|
||||
--- a/src/Mod/Part/Gui/CommandSimple.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/Mod/Part/Gui/CommandSimple.cpp 2024-02-27 15:00:48.255540482 +0100
|
||||
@@ -22,9 +22,6 @@
|
||||
|
||||
|
||||
#include "PreCompiled.h"
|
||||
-#ifndef _PreComp_
|
||||
-# include <Standard_math.hxx>
|
||||
-#endif
|
||||
|
||||
#include <App/Document.h>
|
||||
#include <App/DocumentObject.h>
|
||||
diff --color -rupN a/src/Mod/Part/Gui/CrossSections.cpp b/src/Mod/Part/Gui/CrossSections.cpp
|
||||
--- a/src/Mod/Part/Gui/CrossSections.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/Mod/Part/Gui/CrossSections.cpp 2024-02-27 15:00:48.255540482 +0100
|
||||
@@ -23,7 +23,6 @@
|
||||
|
||||
#include "PreCompiled.h"
|
||||
#ifndef _PreComp_
|
||||
-# include <Standard_math.hxx>
|
||||
# include <BRep_Builder.hxx>
|
||||
# include <BRepAlgoAPI_Section.hxx>
|
||||
# include <BRepBuilderAPI_MakeWire.hxx>
|
||||
diff --color -rupN a/src/Mod/Part/Gui/ViewProvider2DObject.cpp b/src/Mod/Part/Gui/ViewProvider2DObject.cpp
|
||||
--- a/src/Mod/Part/Gui/ViewProvider2DObject.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/Mod/Part/Gui/ViewProvider2DObject.cpp 2024-02-27 15:00:48.255540482 +0100
|
||||
@@ -26,8 +26,6 @@
|
||||
#ifndef _PreComp_
|
||||
# include <cfloat>
|
||||
|
||||
-# include <Standard_math.hxx>
|
||||
-
|
||||
# include <Inventor/nodes/SoAnnotation.h>
|
||||
# include <Inventor/nodes/SoBaseColor.h>
|
||||
# include <Inventor/nodes/SoDepthBuffer.h>
|
||||
diff --color -rupN a/src/Mod/Part/Gui/ViewProviderExt.cpp b/src/Mod/Part/Gui/ViewProviderExt.cpp
|
||||
--- a/src/Mod/Part/Gui/ViewProviderExt.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/Mod/Part/Gui/ViewProviderExt.cpp 2024-02-27 15:00:48.255540482 +0100
|
||||
@@ -978,7 +978,11 @@ void ViewProviderPartExt::updateVisual()
|
||||
|
||||
TopExp_Explorer xp;
|
||||
for (xp.Init(faceMap(i),TopAbs_EDGE);xp.More();xp.Next())
|
||||
+#if OCC_VERSION_HEX >= 0x070800
|
||||
+ faceEdges.insert(std::hash<TopoDS_Shape>{}(xp.Current()));
|
||||
+#else
|
||||
faceEdges.insert(xp.Current().HashCode(INT_MAX));
|
||||
+#endif
|
||||
numFaces++;
|
||||
}
|
||||
|
||||
@@ -1006,7 +1010,11 @@ void ViewProviderPartExt::updateVisual()
|
||||
// So, we have to store the hashes of the edges associated to a face.
|
||||
// If the hash of a given edge is not in this list we know it's really
|
||||
// a free edge.
|
||||
+#if OCC_VERSION_HEX >= 0x070800
|
||||
+ int hash = std::hash<TopoDS_Shape>{}(aEdge);
|
||||
+#else
|
||||
int hash = aEdge.HashCode(INT_MAX);
|
||||
+#endif
|
||||
if (faceEdges.find(hash) == faceEdges.end()) {
|
||||
Handle(Poly_Polygon3D) aPoly = Part::Tools::polygonOfEdge(aEdge, aLoc);
|
||||
if (!aPoly.IsNull()) {
|
||||
@@ -1205,7 +1213,11 @@ void ViewProviderPartExt::updateVisual()
|
||||
TopLoc_Location aLoc;
|
||||
|
||||
// handling of the free edge that are not associated to a face
|
||||
+#if OCC_VERSION_HEX >= 0x070800
|
||||
+ int hash = std::hash<TopoDS_Shape>{}(aEdge);
|
||||
+#else
|
||||
int hash = aEdge.HashCode(INT_MAX);
|
||||
+#endif
|
||||
if (faceEdges.find(hash) == faceEdges.end()) {
|
||||
Handle(Poly_Polygon3D) aPoly = Part::Tools::polygonOfEdge(aEdge, aLoc);
|
||||
if (!aPoly.IsNull()) {
|
||||
diff --color -rupN a/src/Mod/Part/Gui/ViewProviderExt.h b/src/Mod/Part/Gui/ViewProviderExt.h
|
||||
--- a/src/Mod/Part/Gui/ViewProviderExt.h 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/Mod/Part/Gui/ViewProviderExt.h 2024-02-27 15:00:48.255540482 +0100
|
||||
@@ -24,7 +24,6 @@
|
||||
#ifndef PARTGUI_VIEWPROVIDERPARTEXT_H
|
||||
#define PARTGUI_VIEWPROVIDERPARTEXT_H
|
||||
|
||||
-#include <Standard_math.hxx>
|
||||
#include <Standard_Boolean.hxx>
|
||||
#include <TopoDS_Shape.hxx>
|
||||
#include <TopoDS_Face.hxx>
|
||||
diff --color -rupN a/src/Mod/Part/Gui/ViewProviderMirror.cpp b/src/Mod/Part/Gui/ViewProviderMirror.cpp
|
||||
--- a/src/Mod/Part/Gui/ViewProviderMirror.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/Mod/Part/Gui/ViewProviderMirror.cpp 2024-02-27 15:00:48.255540482 +0100
|
||||
@@ -27,7 +27,6 @@
|
||||
# include <QAction>
|
||||
# include <QMenu>
|
||||
# include <QTimer>
|
||||
-# include <Standard_math.hxx>
|
||||
# include <TopExp.hxx>
|
||||
# include <TopTools_IndexedMapOfShape.hxx>
|
||||
# include <TopTools_ListOfShape.hxx>
|
||||
diff --color -rupN a/src/Mod/Part/Gui/ViewProviderPython.cpp b/src/Mod/Part/Gui/ViewProviderPython.cpp
|
||||
--- a/src/Mod/Part/Gui/ViewProviderPython.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/Mod/Part/Gui/ViewProviderPython.cpp 2024-02-27 15:00:48.255540482 +0100
|
||||
@@ -23,7 +23,6 @@
|
||||
|
||||
#include "PreCompiled.h"
|
||||
|
||||
-#include <Standard_math.hxx>
|
||||
#ifndef _PreComp_
|
||||
# include <Inventor/nodes/SoSeparator.h>
|
||||
#endif
|
||||
diff --color -rupN a/src/Mod/Part/Gui/ViewProviderReference.h b/src/Mod/Part/Gui/ViewProviderReference.h
|
||||
--- a/src/Mod/Part/Gui/ViewProviderReference.h 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/Mod/Part/Gui/ViewProviderReference.h 2024-02-27 15:00:48.255540482 +0100
|
||||
@@ -24,7 +24,6 @@
|
||||
#ifndef PARTGUI_ViewProviderPartReference_H
|
||||
#define PARTGUI_ViewProviderPartReference_H
|
||||
|
||||
-#include <Standard_math.hxx>
|
||||
#include <Standard_Boolean.hxx>
|
||||
#include <TopoDS_Shape.hxx>
|
||||
#include <Gui/ViewProviderGeometryObject.h>
|
||||
diff --color -rupN a/src/Mod/PartDesign/Gui/PreCompiled.h b/src/Mod/PartDesign/Gui/PreCompiled.h
|
||||
--- a/src/Mod/PartDesign/Gui/PreCompiled.h 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/Mod/PartDesign/Gui/PreCompiled.h 2024-02-27 15:00:48.255540482 +0100
|
||||
@@ -44,7 +44,6 @@
|
||||
#include <boost/bind/bind.hpp>
|
||||
|
||||
// OCC
|
||||
-#include <Standard_math.hxx>
|
||||
#include <Standard_Version.hxx>
|
||||
#include <Bnd_Box.hxx>
|
||||
#include <BRepBndLib.hxx>
|
||||
diff --color -rupN a/src/Mod/Path/App/Voronoi.cpp b/src/Mod/Path/App/Voronoi.cpp
|
||||
--- a/src/Mod/Path/App/Voronoi.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/Mod/Path/App/Voronoi.cpp 2024-02-27 15:00:48.255540482 +0100
|
||||
@@ -23,10 +23,6 @@
|
||||
|
||||
#include "PreCompiled.h"
|
||||
|
||||
-#ifndef _PreComp_
|
||||
-# include <Standard_math.hxx>
|
||||
-#endif
|
||||
-
|
||||
#include <Base/Vector3D.h>
|
||||
|
||||
#include "Voronoi.h"
|
||||
diff --color -rupN a/src/Mod/Path/Gui/PreCompiled.h b/src/Mod/Path/Gui/PreCompiled.h
|
||||
--- a/src/Mod/Path/Gui/PreCompiled.h 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/Mod/Path/Gui/PreCompiled.h 2024-02-27 15:00:48.258873781 +0100
|
||||
@@ -38,8 +38,6 @@
|
||||
# define PathGuiExport
|
||||
#endif
|
||||
|
||||
-#include <Standard_math.hxx>
|
||||
-
|
||||
#ifdef _MSC_VER
|
||||
# pragma warning( disable : 4273 )
|
||||
#endif
|
||||
diff --color -rupN a/src/Mod/Robot/Gui/PreCompiled.h b/src/Mod/Robot/Gui/PreCompiled.h
|
||||
--- a/src/Mod/Robot/Gui/PreCompiled.h 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/Mod/Robot/Gui/PreCompiled.h 2024-02-27 15:00:48.258873781 +0100
|
||||
@@ -39,8 +39,6 @@
|
||||
# define RobotGuiExport
|
||||
#endif
|
||||
|
||||
-#include <Standard_math.hxx>
|
||||
-
|
||||
#ifdef _MSC_VER
|
||||
# pragma warning(disable : 4005)
|
||||
# pragma warning(disable : 4273)
|
||||
diff --color -rupN a/src/Mod/Sandbox/Gui/AppSandboxGui.cpp b/src/Mod/Sandbox/Gui/AppSandboxGui.cpp
|
||||
--- a/src/Mod/Sandbox/Gui/AppSandboxGui.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/Mod/Sandbox/Gui/AppSandboxGui.cpp 2024-02-27 15:00:48.258873781 +0100
|
||||
@@ -24,7 +24,6 @@
|
||||
#include "PreCompiled.h"
|
||||
#ifndef _PreComp_
|
||||
# include <Python.h>
|
||||
-# include <Standard_math.hxx>
|
||||
# include <Inventor/nodes/SoLineSet.h>
|
||||
# include <Inventor/nodes/SoBaseColor.h>
|
||||
# include <Inventor/nodes/SoSeparator.h>
|
||||
diff --color -rupN a/src/Mod/Sketcher/App/SketchAnalysis.cpp b/src/Mod/Sketcher/App/SketchAnalysis.cpp
|
||||
--- a/src/Mod/Sketcher/App/SketchAnalysis.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/Mod/Sketcher/App/SketchAnalysis.cpp 2024-02-27 15:00:48.258873781 +0100
|
||||
@@ -25,7 +25,6 @@
|
||||
#include "PreCompiled.h"
|
||||
|
||||
#ifndef _PreComp_
|
||||
-# include <Standard_math.hxx>
|
||||
# include <BRep_Tool.hxx>
|
||||
# include <gp_Pnt.hxx>
|
||||
# include <Precision.hxx>
|
||||
diff --color -rupN a/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp b/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp
|
||||
--- a/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp 2024-02-27 15:00:48.258873781 +0100
|
||||
@@ -24,7 +24,6 @@
|
||||
#include "PreCompiled.h"
|
||||
|
||||
#ifndef _PreComp_
|
||||
-# include <Standard_math.hxx>
|
||||
# include <Inventor/nodes/SoTranslation.h>
|
||||
# include <Inventor/nodes/SoText2.h>
|
||||
# include <Inventor/nodes/SoFont.h>
|
||||
diff --color -rupN a/src/Mod/Sketcher/Gui/EditDatumDialog.cpp b/src/Mod/Sketcher/Gui/EditDatumDialog.cpp
|
||||
--- a/src/Mod/Sketcher/Gui/EditDatumDialog.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/Mod/Sketcher/Gui/EditDatumDialog.cpp 2024-02-27 15:00:48.258873781 +0100
|
||||
@@ -23,7 +23,6 @@
|
||||
#include "PreCompiled.h"
|
||||
|
||||
#ifndef _PreComp_
|
||||
-# include <Standard_math.hxx>
|
||||
/// Qt Include Files
|
||||
# include <QApplication>
|
||||
# include <QDialog>
|
||||
diff --color -rupN a/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp b/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp
|
||||
--- a/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp 2024-02-27 15:00:48.258873781 +0100
|
||||
@@ -24,7 +24,6 @@
|
||||
#include "PreCompiled.h"
|
||||
|
||||
#ifndef _PreComp_
|
||||
-# include <Standard_math.hxx>
|
||||
# include <QDoubleValidator>
|
||||
# include <QLocale>
|
||||
# include <QMessageBox>
|
||||
diff --color -rupN a/src/Mod/Sketcher/Gui/ViewProviderPython.cpp b/src/Mod/Sketcher/Gui/ViewProviderPython.cpp
|
||||
--- a/src/Mod/Sketcher/Gui/ViewProviderPython.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/Mod/Sketcher/Gui/ViewProviderPython.cpp 2024-02-27 15:00:48.258873781 +0100
|
||||
@@ -23,7 +23,6 @@
|
||||
|
||||
#include "PreCompiled.h"
|
||||
|
||||
-#include <Standard_math.hxx>
|
||||
#ifndef _PreComp_
|
||||
# include <Inventor/nodes/SoSeparator.h>
|
||||
#endif
|
||||
diff --color -rupN a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
|
||||
--- a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp 2024-02-27 15:00:48.258873781 +0100
|
||||
@@ -24,7 +24,6 @@
|
||||
#include "PreCompiled.h"
|
||||
|
||||
#ifndef _PreComp_
|
||||
-# include <Standard_math.hxx>
|
||||
|
||||
# include <Inventor/actions/SoGetBoundingBoxAction.h>
|
||||
# include <Inventor/SbBox3f.h>
|
||||
diff --color -rupN a/src/Mod/Surface/Gui/Command.cpp b/src/Mod/Surface/Gui/Command.cpp
|
||||
--- a/src/Mod/Surface/Gui/Command.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/Mod/Surface/Gui/Command.cpp 2024-02-27 15:00:48.258873781 +0100
|
||||
@@ -31,7 +31,6 @@
|
||||
#include <QLineEdit>
|
||||
#include <QMessageBox>
|
||||
#include <QPointer>
|
||||
-#include <Standard_math.hxx>
|
||||
#include <TopoDS_Shape.hxx>
|
||||
#include <TopoDS_Edge.hxx>
|
||||
#include <Geom_BezierCurve.hxx>
|
||||
diff --color -rupN a/src/Mod/TechDraw/Gui/TaskProjection.cpp b/src/Mod/TechDraw/Gui/TaskProjection.cpp
|
||||
--- a/src/Mod/TechDraw/Gui/TaskProjection.cpp 2022-12-07 03:35:37.000000000 +0100
|
||||
+++ b/src/Mod/TechDraw/Gui/TaskProjection.cpp 2024-02-27 15:00:48.258873781 +0100
|
||||
@@ -29,9 +29,6 @@
|
||||
# include <QMessageBox>
|
||||
#endif
|
||||
|
||||
-
|
||||
-#include <Standard_math.hxx>
|
||||
-
|
||||
#include <Gui/Application.h>
|
||||
#include <Gui/BitmapFactory.h>
|
||||
#include <Gui/Command.h>
|
|
@ -1,11 +0,0 @@
|
|||
--- ./cMake/FreeCAD_Helpers/ConfigureCMakeVariables.cmake.orig
|
||||
+++ ./cMake/FreeCAD_Helpers/ConfigureCMakeVariables.cmake
|
||||
@@ -23,7 +23,7 @@
|
||||
"Path to the directory containing PyCXX's cxxextensions.c source file")
|
||||
|
||||
# used as compiler defines
|
||||
- set(RESOURCEDIR "${CMAKE_INSTALL_DATADIR}")
|
||||
+ set(RESOURCEDIR "../../share/freecad")
|
||||
set(LIBRARYDIR "${CMAKE_INSTALL_LIBDIR}")
|
||||
set(DOCDIR "${CMAKE_INSTALL_DOCDIR}")
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
--- ./src/Mod/Mesh/App/MeshTestsApp.py.orig
|
||||
+++ ./src/Mod/Mesh/App/MeshTestsApp.py
|
||||
@@ -423,30 +423,6 @@
|
||||
self.planarMesh = []
|
||||
FreeCAD.newDocument("MeshTest")
|
||||
|
||||
- def testRayPick(self):
|
||||
- if not FreeCAD.GuiUp:
|
||||
- return
|
||||
- self.planarMesh.append( [-16.097176,-29.891157,15.987688] )
|
||||
- self.planarMesh.append( [-16.176304,-29.859991,15.947966] )
|
||||
- self.planarMesh.append( [-16.071451,-29.900553,15.912505] )
|
||||
- self.planarMesh.append( [-16.092241,-29.893408,16.020439] )
|
||||
- self.planarMesh.append( [-16.007210,-29.926180,15.967641] )
|
||||
- self.planarMesh.append( [-16.064457,-29.904951,16.090832] )
|
||||
- planarMeshObject = Mesh.Mesh(self.planarMesh)
|
||||
-
|
||||
- from pivy import coin; import FreeCADGui
|
||||
- Mesh.show(planarMeshObject)
|
||||
- view=FreeCADGui.ActiveDocument.ActiveView.getViewer()
|
||||
- rp=coin.SoRayPickAction(view.getSoRenderManager().getViewportRegion())
|
||||
- rp.setRay(coin.SbVec3f(-16.05,16.0,16.0),coin.SbVec3f(0,-1,0))
|
||||
- rp.apply(view.getSoRenderManager().getSceneGraph())
|
||||
- pp=rp.getPickedPoint()
|
||||
- self.assertTrue(pp != None)
|
||||
- det=pp.getDetail()
|
||||
- self.assertTrue(det.getTypeId() == coin.SoFaceDetail.getClassTypeId())
|
||||
- det=coin.cast(det, det.getTypeId().getName().getString())
|
||||
- self.assertTrue(det.getFaceIndex() == 1)
|
||||
-
|
||||
def testPrimitiveCount(self):
|
||||
if not FreeCAD.GuiUp:
|
||||
return
|
|
@ -1,79 +0,0 @@
|
|||
# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
|
||||
# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
|
||||
pkgname=papermc-plugin-essentialsx
|
||||
pkgver=2.21.0_pre151
|
||||
_gittag=f2af9528b0f99f2ff121dda2607e51d391a2a8bf
|
||||
pkgrel=0
|
||||
pkgdesc="EssentialsX is the essential plugin suite for Minecraft servers, with over 130 commands for servers of all size and scale."
|
||||
arch='noarch'
|
||||
url="https://essentialsx.net/"
|
||||
license="GPL-3.0"
|
||||
depends="
|
||||
papermc>=1.8.8
|
||||
papermc-plugin-luckperms
|
||||
papermc-plugin-vault
|
||||
"
|
||||
makedepends="openjdk21-jdk"
|
||||
source="$pkgname-$_gittag.tar.gz::https://github.com/EssentialsX/Essentials/archive/$_gittag.tar.gz"
|
||||
builddir="$srcdir"/Essentials-$_gittag
|
||||
|
||||
subpackages="$pkgname-chat $pkgname-spawn $pkgname-antibuild $pkgname-discord $pkgname-geo $pkgname-protect $pkgname-xmpp"
|
||||
|
||||
build() {
|
||||
./gradlew build
|
||||
}
|
||||
|
||||
check() {
|
||||
./gradlew test
|
||||
}
|
||||
|
||||
package() {
|
||||
install -Dm644 "$builddir"/jars/EssentialsX-*.jar "$pkgdir/var/lib/papermc/plugins/Essentials.jar"
|
||||
}
|
||||
|
||||
chat() {
|
||||
pkgdesc="Chat formatting, local chat"
|
||||
depends="$pkgname"
|
||||
install -Dm644 "$builddir"/jars/EssentialsXChat-*.jar "$subpkgdir/var/lib/papermc/plugins/EssentialsChat.jar"
|
||||
}
|
||||
|
||||
spawn() {
|
||||
pkgdesc="Spawnpoint control, per-player spawns"
|
||||
depends="$pkgname"
|
||||
install -Dm644 "$builddir"/jars/EssentialsXSpawn-*.jar "$subpkgdir/var/lib/papermc/plugins/EssentialsSpawn.jar"
|
||||
}
|
||||
|
||||
antibuild() {
|
||||
pkgdesc="Simple permissions-based building control"
|
||||
depends="$pkgname"
|
||||
install -Dm644 "$builddir"/jars/EssentialsXAntiBuild-*.jar "$subpkgdir/var/lib/papermc/plugins/EssentialsAntiBuild.jar"
|
||||
}
|
||||
|
||||
discord() {
|
||||
pkgdesc="Lightweight chat, messaging and command integration with Discord"
|
||||
depends="$pkgname"
|
||||
install -Dm644 "$builddir"/jars/EssentialsXDiscord-*.jar "$subpkgdir/var/lib/papermc/plugins/EssentialsDiscord.jar"
|
||||
install -Dm644 "$builddir"/jars/EssentialsXDiscordLink-*.jar "$subpkgdir/var/lib/papermc/plugins/EssentialsDiscordLink.jar"
|
||||
}
|
||||
|
||||
geo() {
|
||||
pkgdesc="Geographical player lookup (formerly EssentialsX GeoIP)"
|
||||
depends="$pkgname"
|
||||
install -Dm644 "$builddir"/jars/EssentialsXGeoIP-*.jar "$subpkgdir/var/lib/papermc/plugins/EssentialsGeo.jar"
|
||||
}
|
||||
|
||||
protect() {
|
||||
pkgdesc="Configurable world protection and control"
|
||||
depends="$pkgname"
|
||||
install -Dm644 "$builddir"/jars/EssentialsXProtect-*.jar "$subpkgdir/var/lib/papermc/plugins/EssentialsProtect.jar"
|
||||
}
|
||||
|
||||
xmpp() {
|
||||
pkgdesc="Lightweight chat, messaging and server log integration with Jabber/XMPP services"
|
||||
depends="$pkgname"
|
||||
install -Dm644 "$builddir"/jars/EssentialsXXMPP-*.jar "$subpkgdir/var/lib/papermc/plugins/EssentialsXMPP.jar"
|
||||
}
|
||||
|
||||
sha512sums="
|
||||
5fabf6b2091f7182ff23ca02e2f93ff22527668d55bbf60977ad414881c201bdc4608fe3618ca0d1312beb8fe8768f36cd792099817a0205f791ab2f9b212e04 papermc-plugin-essentialsx-f2af9528b0f99f2ff121dda2607e51d391a2a8bf.tar.gz
|
||||
"
|
|
@ -1,34 +0,0 @@
|
|||
# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
|
||||
# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
|
||||
pkgname=papermc-plugin-luckperms
|
||||
pkgver=5.4.151
|
||||
_gittag=0fef481d480737528491fc0b3b8487eb1612f955
|
||||
pkgrel=0
|
||||
pkgdesc="An advanced permissions plugin for Bukkit/Spigot, BungeeCord and Sponge."
|
||||
arch='noarch'
|
||||
url="https://github.com/lucko/LuckPerms"
|
||||
license="MIT"
|
||||
depends="papermc>=1.8.8"
|
||||
makedepends="openjdk21-jdk"
|
||||
source="$pkgname-$_gittag.tar.gz::https://github.com/LuckPerms/LuckPerms/archive/$_gittag.tar.gz"
|
||||
builddir="$srcdir"/LuckPerms-$_gittag
|
||||
|
||||
prepare() {
|
||||
default_prepare
|
||||
sed -i "s|project.ext.patchVersion = determinePatchVersion()|project.ext.patchVersion = '${pkgver##*.}'|" build.gradle
|
||||
}
|
||||
|
||||
build() {
|
||||
./gradlew build
|
||||
}
|
||||
|
||||
check() {
|
||||
./gradlew test
|
||||
}
|
||||
|
||||
package() {
|
||||
install -Dm644 "$builddir"/bukkit/loader/build/libs/LuckPerms-Bukkit-*.jar "$pkgdir/var/lib/papermc/plugins/LuckPerms.jar"
|
||||
}
|
||||
sha512sums="
|
||||
e016d2a161472974cc75151e1a6cb3495881d4db7e0aa75d81a1c54fd16d191fe721b1f9fadeaac0bef7ec4a7c47329a2cf367cf3a7577b284077ec173db0579 papermc-plugin-luckperms-0fef481d480737528491fc0b3b8487eb1612f955.tar.gz
|
||||
"
|
Binary file not shown.
|
@ -1,33 +0,0 @@
|
|||
From 2022cb08922caa42aa77faca254c9b7d7506bee8 Mon Sep 17 00:00:00 2001
|
||||
From: Geolykt <admin@geolykt.de>
|
||||
Date: Mon, 27 Jun 2022 12:02:49 +0200
|
||||
Subject: [PATCH] Support newer JDKs for building
|
||||
|
||||
Apparently the ancient version of lombok used
|
||||
by a dependency is not compatible with newer
|
||||
versions of java. As Vault proper did not make
|
||||
use of lombok, it can be safely removed without
|
||||
declaring an alternative.
|
||||
|
||||
This commit allows Vault to build under Java 17.
|
||||
---
|
||||
pom.xml | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index 5b8a6dfd..17c189fd 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -324,6 +324,12 @@ Vault currently supports the following: Permissions 3, PEX, GroupManager, bPerms
|
||||
<artifactId>craftconomy3</artifactId>
|
||||
<version>3.2.2-SNAPSHOT</version>
|
||||
<optional>true</optional>
|
||||
+ <exclusions>
|
||||
+ <exclusion>
|
||||
+ <groupId>org.projectlombok</groupId>
|
||||
+ <artifactId>lombok</artifactId>
|
||||
+ </exclusion>
|
||||
+ </exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>net.crystalyx.bukkit.simplyperms</groupId>
|
|
@ -1,37 +0,0 @@
|
|||
From 52df9d3287e8d593d0e4d999c6d5daaebe947ca1 Mon Sep 17 00:00:00 2001
|
||||
From: Ricardo Boss <mail@ricardoboss.de>
|
||||
Date: Tue, 28 Jun 2022 18:50:18 +0200
|
||||
Subject: [PATCH] Add option to silence "no update" logs (#823)
|
||||
|
||||
* Added "silent-no-update" config option
|
||||
|
||||
Added switch to turn off messages if no update is available.
|
||||
|
||||
* Set default value for "silent-no-update"
|
||||
|
||||
* Removed any "no update available" option and message
|
||||
---
|
||||
src/net/milkbowl/vault/Vault.java | 3 ---
|
||||
1 file changed, 3 deletions(-)
|
||||
|
||||
diff --git a/src/net/milkbowl/vault/Vault.java b/src/net/milkbowl/vault/Vault.java
|
||||
index ef8b5578..fd2a9787 100644
|
||||
--- a/src/net/milkbowl/vault/Vault.java
|
||||
+++ b/src/net/milkbowl/vault/Vault.java
|
||||
@@ -171,8 +171,6 @@ public void run() {
|
||||
log.warning("Update at: https://dev.bukkit.org/projects/vault");
|
||||
} else if (currentVersion > newVersion) {
|
||||
log.info("Stable Version: " + newVersionTitle + " | Current Version: " + currentVersionTitle);
|
||||
- } else {
|
||||
- log.info("No new version available");
|
||||
}
|
||||
} catch (Exception e) {
|
||||
// ignore exceptions
|
||||
@@ -182,7 +180,6 @@ public void run() {
|
||||
}, 0, 432000);
|
||||
|
||||
}
|
||||
-
|
||||
});
|
||||
|
||||
// Load up the Plugin metrics
|
|
@ -1,72 +0,0 @@
|
|||
From 3f20655f0b1b9c7a0f69eb241c5bedd8e748b5c9 Mon Sep 17 00:00:00 2001
|
||||
From: Leonardo Di Gianfelice Stornelli
|
||||
<leonardo.digianfelicestornelli@gmail.com>
|
||||
Date: Tue, 28 Jun 2022 00:34:40 +0200
|
||||
Subject: [PATCH] Update bStats (#868)
|
||||
|
||||
---
|
||||
pom.xml | 2 +-
|
||||
src/net/milkbowl/vault/Vault.java | 9 +++++----
|
||||
2 files changed, 6 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index 17c189fd..ccd8cde4 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -85,7 +85,7 @@ Vault currently supports the following: Permissions 3, PEX, GroupManager, bPerms
|
||||
<dependency>
|
||||
<groupId>org.bstats</groupId>
|
||||
<artifactId>bstats-bukkit</artifactId>
|
||||
- <version>1.5</version>
|
||||
+ <version>3.0.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.gmail.bleedobsidian.miconomy</groupId>
|
||||
diff --git a/src/net/milkbowl/vault/Vault.java b/src/net/milkbowl/vault/Vault.java
|
||||
index 30f6f17f..ef8b5578 100644
|
||||
--- a/src/net/milkbowl/vault/Vault.java
|
||||
+++ b/src/net/milkbowl/vault/Vault.java
|
||||
@@ -78,6 +78,7 @@
|
||||
import net.milkbowl.vault.permission.plugins.Permission_KPerms;
|
||||
|
||||
import org.bstats.bukkit.Metrics;
|
||||
+import org.bstats.charts.SimplePie;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.OfflinePlayer;
|
||||
import org.bukkit.command.Command;
|
||||
@@ -185,7 +186,7 @@ public void run() {
|
||||
});
|
||||
|
||||
// Load up the Plugin metrics
|
||||
- Metrics metrics = new Metrics(this);
|
||||
+ Metrics metrics = new Metrics(this, 887);
|
||||
findCustomData(metrics);
|
||||
|
||||
log.info(String.format("Enabled Version %s", getDescription().getVersion()));
|
||||
@@ -581,7 +582,7 @@ private void findCustomData(Metrics metrics) {
|
||||
econ = rspEcon.getProvider();
|
||||
}
|
||||
final String econName = econ != null ? econ.getName() : "No Economy";
|
||||
- metrics.addCustomChart(new Metrics.SimplePie("economy", new Callable<String>() {
|
||||
+ metrics.addCustomChart(new SimplePie("economy", new Callable<String>() {
|
||||
@Override
|
||||
public String call() {
|
||||
return econName;
|
||||
@@ -590,7 +591,7 @@ public String call() {
|
||||
|
||||
// Create our Permission Graph and Add our permission Plotters
|
||||
final String permName = Bukkit.getServer().getServicesManager().getRegistration(Permission.class).getProvider().getName();
|
||||
- metrics.addCustomChart(new Metrics.SimplePie("permission", new Callable<String>() {
|
||||
+ metrics.addCustomChart(new SimplePie("permission", new Callable<String>() {
|
||||
@Override
|
||||
public String call() {
|
||||
return permName;
|
||||
@@ -604,7 +605,7 @@ public String call() {
|
||||
chat = rspChat.getProvider();
|
||||
}
|
||||
final String chatName = chat != null ? chat.getName() : "No Chat";
|
||||
- metrics.addCustomChart(new Metrics.SimplePie("chat", new Callable<String>() {
|
||||
+ metrics.addCustomChart(new SimplePie("chat", new Callable<String>() {
|
||||
@Override
|
||||
public String call() {
|
||||
return chatName;
|
|
@ -1,42 +0,0 @@
|
|||
# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
|
||||
# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
|
||||
pkgname=papermc-plugin-vault
|
||||
pkgver=1.7.3
|
||||
pkgrel=0
|
||||
pkgdesc="Vault of common APIs for Bukkit Plugins"
|
||||
arch='noarch'
|
||||
url="https://github.com/MilkBowl/Vault"
|
||||
license="MIT"
|
||||
depends="papermc>=1.8.8"
|
||||
makedepends="
|
||||
openjdk21-jdk
|
||||
maven
|
||||
"
|
||||
source="
|
||||
vault-$pkgver.tar.gz::https://github.com/MilkBowl/Vault/archive/refs/tags/1.7.3.tar.gz
|
||||
2022cb0_support-newer-jdk-for-building.patch
|
||||
868_update-bstats.patch
|
||||
823_add-option-to-silence-no-update-logs.patch
|
||||
1996cfa_finish-removal-native-support-for-abandonned-economy-plugins.patch
|
||||
"
|
||||
builddir="$srcdir"/Vault-$pkgver
|
||||
|
||||
build() {
|
||||
mvn compile
|
||||
mvn package
|
||||
}
|
||||
|
||||
check() {
|
||||
mvn test
|
||||
}
|
||||
|
||||
package() {
|
||||
install -Dm644 "$builddir"/target/Vault-$pkgver.jar "$pkgdir/var/lib/papermc/plugins/Vault.jar"
|
||||
}
|
||||
sha512sums="
|
||||
3d154945e63b7824f0a0e0900fe6db7dc77c97f1967c29760d27a3322ca0b95d76965d8574c24b7cc0e86e822f9b5e3f860cb7167796351c9a921ddf5ef3d36b vault-1.7.3.tar.gz
|
||||
8b7197b25acf06e545f10dd7dc5447aab6a73d3455bf89b01a4b466331eefa77c86152a47818348cfb901a0d65cff115b75ae37e0f8bb702c35cf13a3942a484 2022cb0_support-newer-jdk-for-building.patch
|
||||
9124d0feef633f405c3aea6081d4b749df9828d99d0c93d09ba52adb680a781288523d2dfc71be566b8cafd58ac97f152258174ab02294c6e97020a033ee0faa 868_update-bstats.patch
|
||||
b76b385ff62a955430db8d4d60592983e7475e1e63cd6a9e8c0be0a035662ec4472c6f9c8f09125745c198074695b3e04fe6ad96cbafa5faaba72bcf1bfee896 823_add-option-to-silence-no-update-logs.patch
|
||||
ea5e36649e65ca690fd8a075bb5f251a8b449ab780a546007e242ec465c58c8c5ae346efac5f1b52e3287f4f400c658f745d130d1e361ecca3436dcf5cb46fb5 1996cfa_finish-removal-native-support-for-abandonned-economy-plugins.patch
|
||||
"
|
|
@ -1,29 +0,0 @@
|
|||
# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
|
||||
# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
|
||||
pkgname=papermc-plugin-worldedit
|
||||
pkgver=7.3.9
|
||||
_pkgver=$pkgver
|
||||
pkgrel=0
|
||||
pkgdesc="WorldEdit is an easy-to-use in-game Minecraft map editor"
|
||||
arch='noarch !aarch64'
|
||||
url="https://github.com/EngineHub/WorldEdit"
|
||||
license="GPL-3.0"
|
||||
depends="papermc>=1.13.2"
|
||||
makedepends="openjdk21-jdk"
|
||||
source="$pkgname-$pkgver.tar.gz::https://github.com/EngineHub/WorldEdit/archive/refs/tags/$pkgver.tar.gz"
|
||||
builddir="$srcdir"/WorldEdit-$pkgver
|
||||
|
||||
build() {
|
||||
./gradlew build --parallel
|
||||
}
|
||||
|
||||
check() {
|
||||
./gradlew test
|
||||
}
|
||||
|
||||
package() {
|
||||
install -Dm644 "$builddir"/worldedit-bukkit/build/libs/worldedit-bukkit-$pkgver.jar "$pkgdir/var/lib/papermc/plugins/WorldEdit.jar"
|
||||
}
|
||||
sha512sums="
|
||||
35eb83dfcd192884a86f9bec3cbe586af6141b8c10461937b2ef112bfb4d64f5f7c6e950108a7893dc5b1054f1d0206f74ec6b4702481c0da69bf89627dbfb06 papermc-plugin-worldedit-7.3.9.tar.gz
|
||||
"
|
|
@ -1,29 +0,0 @@
|
|||
# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
|
||||
# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
|
||||
pkgname=papermc-plugin-worldguard
|
||||
pkgver=7.0.13_beta1
|
||||
_gittag=2f13ae0444409376feb6c7674591142fe854e12e
|
||||
pkgrel=0
|
||||
pkgdesc="WorldGuard lets you and players guard areas of land against griefers and undesirables"
|
||||
arch='noarch'
|
||||
url="https://github.com/EngineHub/WorldGuard"
|
||||
license="GPL-3.0"
|
||||
depends="papermc>=1.17.0"
|
||||
makedepends="openjdk21-jdk"
|
||||
source="$pkgname-$_gittag.tar.gz::https://github.com/EngineHub/WorldGuard/archive/$_gittag.tar.gz"
|
||||
builddir="$srcdir"/WorldGuard-$_gittag
|
||||
|
||||
build() {
|
||||
./gradlew build
|
||||
}
|
||||
|
||||
check() {
|
||||
./gradlew test
|
||||
}
|
||||
|
||||
package() {
|
||||
install -Dm644 "$builddir"/worldguard-bukkit/build/libs/worldguard-bukkit-*dist.jar "$pkgdir/var/lib/papermc/plugins/WorldGuard.jar"
|
||||
}
|
||||
sha512sums="
|
||||
755646330c17df22b1d4eb6f38fc8ea712eff86a0165f2dba6dc1bcd420d2d112547adf60a35f268f45730b8444e540d7d08a02a50df0238bf16c9ff7dc799ff papermc-plugin-worldguard-2f13ae0444409376feb6c7674591142fe854e12e.tar.gz
|
||||
"
|
|
@ -1,50 +0,0 @@
|
|||
# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
|
||||
# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
|
||||
pkgname=papermc
|
||||
pkgver=1.21.3
|
||||
_gittag=${pkgver/.0}
|
||||
pkgrel=0
|
||||
pkgdesc="Next generation of Minecraft server, compatible with Spigot plugins and offering uncompromising performance"
|
||||
arch='noarch'
|
||||
url="https://papermc.io/"
|
||||
license='custom'
|
||||
depends='openjdk21-jdk screen sudo bash gawk sed netcat-openbsd'
|
||||
makedepends="gradle zstd"
|
||||
options="!check"
|
||||
subpackages="$pkgname-openrc"
|
||||
source="
|
||||
https://ayakael.net/api/packages/mirrors/generic/papermc/$_gittag/papermc-$_gittag.tar.zst
|
||||
papermc.initd
|
||||
papermc.conf
|
||||
papermc.sh
|
||||
"
|
||||
|
||||
build() {
|
||||
./gradlew --parallel createMojmapBundlerJar
|
||||
}
|
||||
|
||||
check() {
|
||||
./gradlew --parallel check
|
||||
}
|
||||
|
||||
package() {
|
||||
install -Dm644 "$srcdir"/$pkgname.conf "$pkgdir"/etc/conf.d/$pkgname
|
||||
install -Dm755 "$srcdir"/$pkgname.sh "$pkgdir"/usr/bin/$pkgname
|
||||
install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
|
||||
install -Dm644 "$builddir"/build/libs/paper*.jar "$pkgdir"/var/lib/$pkgname/$pkgver.jar
|
||||
ln -s $pkgver.jar "$pkgdir"/var/lib/$pkgname/server.jar
|
||||
|
||||
# Link the log files
|
||||
mkdir -p "$pkgdir"/var/log/
|
||||
install -dm2755 "$pkgdir"/var/lib/$pkgname/logs
|
||||
ln -s "/var/lib/$pkgname"/logs "$pkgdir"/var/log/$pkgname
|
||||
|
||||
# Give the group write permissions and set user or group ID on execution
|
||||
chmod g+ws "$pkgdir"/var/lib/$pkgname
|
||||
}
|
||||
sha512sums="
|
||||
630c0fafd53082bec3992234f7422c4714c30ad0fac240c6dc80091fc7d49b57bc2cb7365366ac015d2a9217c4fd561f0649f738cb0d90ea7a7b6355f9839ff6 papermc-1.21.3.tar.zst
|
||||
c5d1bf85ceb74162aaaf2bcd2d06dc2e3dd2e37c39f0cee2be7c8dbff9970a6aff1e48a43e6d1e83e6a0ac610bd89f62b1279bf27b64afa88d9831a36aebbd3e papermc.initd
|
||||
9b8e267428731ee9255f82a93f1e8674d7e917a0f154bd395cd2280a49aa248a4b8427520b08dbb4b3a74a5471dac0e439eedc8ab94bf2e53bb8d411d2d8a789 papermc.conf
|
||||
943ba0d4c10173246bdc6497dcedd54da0788f966841c8d3381398711d79f8d5eb07a24ce28f519b6f24f59d99fa9e74bc6bb882059f343df4eeda5de3660ac7 papermc.sh
|
||||
"
|
|
@ -1,34 +0,0 @@
|
|||
# Maintainer: Petr Hodina <phodina@protonmail.com>
|
||||
pkgname=pinenote-dbus-service
|
||||
pkgver=0.2.2_pre5
|
||||
_gittag=0.2.2-dev5
|
||||
pkgrel=0
|
||||
pkgdesc="Dbus daemon for controlling driver aspects on Pine64 Pinenote"
|
||||
url="https://github.com/m-weigand/pinenote_dbus_service"
|
||||
arch="aarch64"
|
||||
license="MIT"
|
||||
makedepends="cargo"
|
||||
depends="dbus-dev"
|
||||
source="
|
||||
pinenote-dbus-service-$_gittag.tar.gz::https://github.com/m-weigand/pinenote_dbus_service/archive/refs/tags/v$_gittag.tar.gz
|
||||
pinenote.initd
|
||||
"
|
||||
|
||||
builddir="$srcdir/pinenote_dbus_service-$_gittag"
|
||||
|
||||
build() {
|
||||
cargo build --release --locked
|
||||
}
|
||||
|
||||
package() {
|
||||
cargo install --path . --root="$pkgdir/usr"
|
||||
install -Dm644 dbus_security_configuration/pinenote.conf -t "$pkgdir"/usr/share/dbus-1/system.d/
|
||||
install -Dm755 "$srcdir"/pinenote.initd $pkgdir/etc/init.d/pinenote
|
||||
rm "$pkgdir"/usr/.crates.toml
|
||||
rm "$pkgdir"/usr/.crates2.json
|
||||
}
|
||||
|
||||
sha512sums="
|
||||
10cf05f9e1e8affec97b532611a9bffb86928cabe4eb9bd321b66e8dba340e6a7916fa0c8286f81300bfa655d5596bba09f0316abcafa6c55128823c78acb807 pinenote-dbus-service-0.2.2-dev5.tar.gz
|
||||
362c20218610e7a5349eef40d54463a05906e258157e590ad1635591a548ddc60050142cfab41a0423797182e5ae392a7fe6476fc71b9c01cece384351e6f148 pinenote.initd
|
||||
"
|
|
@ -1,10 +0,0 @@
|
|||
#!/sbin/openrc-run
|
||||
|
||||
description="Launch DBus service for driver aspects"
|
||||
command="/usr/bin/pinenote_dbus_service"
|
||||
command_background=yes
|
||||
pidfile="/run/${RC_SVCNAME}.pid"
|
||||
|
||||
depend() {
|
||||
need dbus
|
||||
}
|
Loading…
Reference in a new issue