Merge updates from master

This commit is contained in:
Repository mirror & CI
2024-12-18 00:18:22 +00:00
38 changed files with 263 additions and 1050 deletions

View File

@@ -3,21 +3,24 @@
EAPI=8
inherit meson
PYTHON_COMPAT=( python3_{11..13} )
inherit meson python-any-r1
DESCRIPTION="ZIM file format: an offline storage solution for content coming from the Web"
HOMEPAGE="https://wiki.openzim.org/wiki/OpenZIM"
SRC_URI="https://github.com/openzim/$PN/archive/$PV.tar.gz -> $P.tar.gz"
SRC_URI="https://github.com/openzim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64"
RDEPEND="sys-libs/zlib
RDEPEND="
app-arch/lzma
dev-libs/icu
app-arch/zstd
dev-libs/xapian
sys-fs/e2fsprogs"
DEPEND="virtual/pkgconfig"
app-arch/xz-utils
app-arch/zstd:=
dev-libs/icu:=
dev-libs/xapian:=
"
DEPEND="${RDEPEND}"
BDEPEND="${PYTHON_DEPS}"

View File

@@ -1,8 +1,6 @@
DIST pulsar-bin-1.118.0-amd64.tar.gz 223330647 BLAKE2B c3915aafae95e541688c56a4f3d9e4962991e80a04b3e6a08ca7fc6fdb04c300474fb7b9ef3f9fd49947372205591fc551d673d1263a067800418a8dc1b448d6 SHA512 19206ad4b64cbe149293393041ff95727ef94e2e736e0e46ce362792bbccf4381e158a37c7d87203b1cd2968f5444bfd3a879657771f6c57f54795e038461711
DIST pulsar-bin-1.118.0-arm64.tar.gz 218245520 BLAKE2B 2614a029a9b9ec4d7cc68e957597f925f95c32a908181f9d8d8a338adf6f051d2a8093712102367ef000230370b43722a18b2baee5818ccdf52d4e3414eac78d SHA512 b66a2790cd2fdd831baa905943a4726b6f82cd24c755bc51c87ae17f2248d819ea760effa41acb7ef675da7f85223d6efadfa732fa43325f134a9b0efebb7cbe
DIST pulsar-bin-1.119.0-amd64.tar.gz 223426238 BLAKE2B a12ca733ca1a6053b899badf38a1f9d19ed22065646a42d36466740f0c277308edbb07032ef899681279ecdee53b3d1517ce5b880efc1bb2ccbe7dc69ee73c86 SHA512 e25c0e148ce5d5957ae76457016d95951a89400605c3ec3b930f956d7144a906a50faf4c126d44557831ef7bb2c3cc251fd6f29e7257461f1699ff26f08ccf0b
DIST pulsar-bin-1.119.0-arm64.tar.gz 218339722 BLAKE2B 8adaa5b41f909c539cf56035bc05220353b657329b4e87ab9d85e6cf8cb1557e1149a6278d9eaa721830f178c82e33716d90eabd521cc522e8ae38d2c978b45d SHA512 59bed4cbce00b757505c69ca759437db1602b1355054402fa0e836949dd8ad655e6191bd24e6edda6c1a38a5fa413d3677c9ebb0de335d868b7c0a59eead82db
DIST pulsar-bin-1.120.0-amd64.tar.gz 224070958 BLAKE2B 33b91b4c4d36bff9564c5e154090472e78c1188bb8baac41019c2727ed7f1079c0cb37e8d18bdd6691ddbf8eb316c74d91d7cd04de5e1a6b73f88ed838d56302 SHA512 57eb05002be85fae3b80a34b7ad170439ad2ca09cea7162e0482b39d611bc4248ff0b7b979f1a6dfe6ddfa9fec738e2d3f3015ae218ef26c7078694cb7d4b5b9
DIST pulsar-bin-1.120.0-arm64.tar.gz 218976256 BLAKE2B 39b4bc0ee83e02f65a40b457c6ae5583e1f43d807ce99c911f448e62427ffc7fead085afb0d5593f0c905b2557228d96f39c641a49afa79cd8bcfb171e0b30a0 SHA512 8dea8c099f1b39d49a2f5455fda875df11138b14e085e2c3833e67a723f352ff1b6d3b953a8626129f0e169a2f974015f8e9bcc837ee093c5bda464e0c680359
DIST pulsar-bin-1.122.0-amd64.tar.gz 229076484 BLAKE2B 225ba5f14aad1ecd225b1f28f0f8197cf1ee2af63adbc2c913764089cc5035f12fe60f07b83145063c2a6bd31514303e6d870724e3efc286b16347ef60007953 SHA512 658ce21eaf1e0cd8f2d5534425dbdb69d217a68b0f413c6d647600fb43af1d641b06967b018f38af6d5ec0157e416552a5d3ebd42d754e78a0c86fa19d7301e9
DIST pulsar-bin-1.122.0-arm64.tar.gz 223905653 BLAKE2B ba26a9889b4bddadd766b8eaa038024fd32b4318ad3a675106564d8870be920b9da1bb6b3e002e4fd86f0a373c92dd668b8b64165bec6abd26f04e51194f1eb0 SHA512 5250ba5a2ad200d558318733b7f9bdc733df3f6b9ba30cb9b727fedea7a7fa235aafe71280c27a8101472ff26dcf5b9aa27082497d7fe70e57efcb433aae4fc6
DIST pulsar-bin-1.124.0-amd64.tar.gz 228937874 BLAKE2B 8d234e0369c4dc4db49a66a96c9fc31ca6f6f9906fdff32384162e521cd4bb4eb5439e3dd31e5db35b94c75b841d282dfba3fb579097a1aad02cf70222514bcb SHA512 dd03470db97f9bca0efdc74c1db9bc0ff9a2beb1d7b998c391abd226934b703cafc8c5f404d2f89742bcacc4880434206129f220e28fad3f6cffaa9267104269
DIST pulsar-bin-1.124.0-arm64.tar.gz 223764919 BLAKE2B 9ba2388912002342c376022d609a70042f41e0a97210f4a6fbcab1e54db1247096914bc9925aaccb1490c3fa850e75e029cfb811cd33cf988aa6eed0afc2d95c SHA512 02e4b066d01020d424e12b7f9795a35d4e0ca861333fc018b8d69b0e9d288aebe70a1536f9a652f375731b54df636d20945838d36877089cac8a8890c4aa11c7

View File

@@ -1,112 +0,0 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit desktop xdg
DESCRIPTION="A Community-led Hyper-Hackable Text Editor"
HOMEPAGE="https://pulsar-edit.dev/"
SRC_URI="
amd64? ( https://github.com/pulsar-edit/pulsar/releases/download/v${PV}/Linux.pulsar-${PV}.tar.gz -> ${P}-amd64.tar.gz )
arm64? ( https://github.com/pulsar-edit/pulsar/releases/download/v${PV}/ARM.Linux.pulsar-${PV}-arm64.tar.gz -> ${P}-arm64.tar.gz )
"
S="${WORKDIR}/pulsar-${PV}"
LICENSE="MIT"
SLOT="0"
KEYWORDS="-* ~amd64 ~arm64"
# binary package; no tests available
RESTRICT="test"
RDEPEND="
app-accessibility/at-spi2-core
dev-libs/nspr
app-crypt/libsecret
dev-libs/expat
dev-libs/glib
dev-libs/nss
dev-libs/openssl-compat
dev-vcs/git
media-libs/alsa-lib
media-libs/mesa
net-misc/curl
net-print/cups
sys-apps/dbus
sys-libs/zlib
x11-libs/cairo
x11-libs/gdk-pixbuf
x11-libs/gtk+:3[X]
x11-libs/libdrm
x11-libs/libX11
x11-libs/libxcb
x11-libs/libXcomposite
x11-libs/libXdamage
x11-libs/libXext
x11-libs/libXfixes
x11-libs/libxkbcommon
x11-libs/libxkbfile
x11-libs/libxshmfence
x11-libs/libXrandr
x11-libs/pango
"
QA_PREBUILT="opt/Pulsar/*"
QA_PRESTRIPPED="opt/Pulsar/resources/*" # Files are already stripped
src_unpack(){
default
if use arm64; then
mv "pulsar-${PV}-arm64" "pulsar-${PV}" || die
fi
}
src_prepare(){
default
# We do not install licenses
rm resources/LICENSE.md || die "Failed to remove LICENSE"
}
src_install(){
dodir /opt/Pulsar
mv "${S}"/* "${ED}"/opt/Pulsar
dosym -r /opt/Pulsar/resources/pulsar.sh /usr/bin/pulsar
# Bug #906939
if use amd64; then
rm "${ED}"/opt/Pulsar/resources/app.asar.unpacked/node_modules/tree-sitter-bash/build/node_gyp_bins/python3 || die
rmdir "${ED}"/opt/Pulsar/resources/app.asar.unpacked/node_modules/tree-sitter-bash/build/node_gyp_bins || die
fi
doicon "${ED}"/opt/Pulsar/resources/pulsar.png
make_desktop_entry "/usr/bin/pulsar %F" "Pulsar" "pulsar" \
"GNOME;GTK;Utility;TextEditor;Development;" \
"GenericName=Text Editor\nStartupNotify=true\nStartupWMClass=pulsar\n" \
"MimeType=application/javascript;application/json;application/x-httpd-eruby;" \
"application/x-httpd-php;application/x-httpd-php3;application/x-httpd-php4;" \
"application/x-httpd-php5;application/x-ruby;application/x-bash;application/x-csh;" \
"application/x-sh;application/x-zsh;application/x-shellscript;application/x-sql;" \
"application/x-tcl;application/xhtml+xml;application/xml;application/xml-dtd;" \
"application/xslt+xml;text/coffeescript;text/css;text/html;text/plain;text/xml;" \
"text/xml-dtd;text/x-bash;text/x-c++;text/x-c++hdr;text/x-c++src;text/x-c;text/x-chdr;" \
"text/x-csh;text/x-csrc;text/x-dsrc;text/x-diff;text/x-go;text/x-java;text/x-java-source;" \
"text/x-makefile;text/x-markdown;text/x-objc;text/x-perl;text/x-php;text/x-python;" \
"text/x-ruby;text/x-sh;text/x-zsh;text/yaml;inode/directory"
einstalldocs
find "${ED}" -name '*.la' -delete || die
}
pkg_postinst(){
xdg_desktop_database_update
elog "To migrate configurations & saved state from Atom Editor, execute:"
elog " cp -a \$HOME/.atom \$HOME/.pulsar"
elog " cp -a \$HOME/.config/Atom \$HOME/.config/Pulsar"
}

View File

@@ -1,4 +1,4 @@
# Copyright 1999-2023 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8

View File

@@ -1,2 +1,2 @@
DIST carapace-1.1.0-deps.tar.xz 2978300 BLAKE2B 59fb5ae0c10954d3faedd8ff9fc3d045aeb807b28fe709d43fbdb7df6011ffe734fa62f2c7b3fd16b38ebf535cc65d9fcc84b901227665bace947fb781b7cca0 SHA512 7f4311952999c5634f0e948ddedba08b79066cd01596d9088974d2bd9d5bb634766b18695800221caa5456336b98ce9f0fd6cbbccf7cf135c20412d6b3bd8030
DIST carapace-1.1.0.tar.gz 15189847 BLAKE2B f54c654962aad2ca99c28d2f0db31c8e511dc75ebb2997adb278491a1c2cfb43355843103e53f4999797f71399b68327a7969bf90c09db473bf46a7bc9e2c179 SHA512 0a6dfaebf4401569299683db617dfa9caf4f90d082c44a3cbc12375e573467dcac3bbeb14c665111ba46ff772b02db55230672fb04d71494d08e35b820ea4e45
DIST carapace-1.1.1-deps.tar.xz 2977656 BLAKE2B d788d6d1685657a6e14330bd54a6ea4d5d8bde5aa0763ff29b608d86d2861ccf483d309cda00846e69ab9139973c021134b229db3abd6700427bb66f9dc0059a SHA512 a0c894aa7342a88465188c08909599bbfe45c24ebba9eb4966ac12ce17a90594ea12ee723884a1b3246695813a3a8bbd44802466f7a0ee4d8690001b650a3a63
DIST carapace-1.1.1.tar.gz 15727268 BLAKE2B 73e2378099adfed5428a8f42e5f2547f0b13d53b64443bdc0eb9441ed5f4f90422bb1fc40118431198ceb78bf432823be1b218ca63f6aa665f140ddfaff453e5 SHA512 90be0ca8a1779f5260c62790b439b28727734b71e407d14ba3c1f2b0eba7692ce5d026b1bc060057bf9664db1025e64497aacf6470938d63cff2d5ace566294d

View File

@@ -20,7 +20,7 @@ SLOT="0"
KEYWORDS="~amd64"
BDEPEND="
>=dev-lang/go-1.23.0
>=dev-lang/go-1.23.1
"
DOCS=(

View File

@@ -316,3 +316,8 @@ src_install() {
einstalldocs
}
src_test() {
export RUST_BACKTRACE=full
cargo_src_test
}

View File

@@ -1 +0,0 @@
DIST properties-cpp_0.0.2.orig.tar.gz 41108 BLAKE2B d5239c27578d524079d1475b851939c0daac8fd71f46da34427cc9888739a52682aaa55e678f07c9ea01aa635a5a62886f5a104162e3220d0a6917f4178c11ca SHA512 7ec94ce495c9630d5acc0b98051b31e7eb3e50fef9dff3a476cd91ca912937f48826fbdab57907b042b13e29786dcb3483151690374b0e09d6e1c12c6329df5a

View File

@@ -1,166 +0,0 @@
A lot of changes to cmake:
- bump cmake_minimum_required to 3.5 to avoid cmake's warnings about obsolete version
- avoid adding -Werror to C/XXFLAGS (it didn't actually get anywhere beside the tests)
- remove bundeled FindGtest in favour of use of a config file provided by GTest itself
- bumb CMAKE_CXX_STANDARD to 14 to apace modern GTest
- bump version number to 0.0.2 to match tarball
- change include instalation directrory to [/usr]/inclyde/properties-cpp/ to not clutter
the root include dir
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c7394e..6d08f34 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.5)
project(properties-cpp)
@@ -8,9 +8,10 @@ include(cmake/EnableCoverageReport.cmake)
include(cmake/PrePush.cmake)
include(GNUInstallDirs)
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wall -pedantic -Wextra -fPIC -fvisibility=hidden -pthread")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Werror -Wall -fno-strict-aliasing -fvisibility=hidden -fvisibility-inlines-hidden -pedantic -Wextra -fPIC -pthread")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pedantic -Wextra -fPIC -fvisibility=hidden -pthread")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fno-strict-aliasing -fvisibility=hidden -fvisibility-inlines-hidden -pedantic -Wextra -fPIC -pthread")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
+set(CMAKE_CXX_STANDARD 14)
#####################################################################
# Enable code coverage calculation with gcov/gcovr/lcov
@@ -29,7 +30,7 @@ ENDIF(CMAKE_BUILD_TYPE MATCHES [cC][oO][vV][eE][rR][aA][gG][eE])
set(PROPERTIES_CPP_VERSION_MAJOR 0)
set(PROPERTIES_CPP_VERSION_MINOR 0)
-set(PROPERTIES_CPP_VERSION_PATCH 1)
+set(PROPERTIES_CPP_VERSION_PATCH 2)
include(CTest)
diff --git a/cmake/FindGtest.cmake b/cmake/FindGtest.cmake
deleted file mode 100644
index 1283174..0000000
--- a/cmake/FindGtest.cmake
+++ /dev/null
@@ -1,53 +0,0 @@
-include(ExternalProject)
-include(FindPackageHandleStandardArgs)
-
-#gtest
-set(GTEST_INSTALL_DIR /usr/src/gmock/gtest/include)
-find_path(GTEST_INCLUDE_DIR gtest/gtest.h
- HINTS ${GTEST_INSTALL_DIR})
-
-#gmock
-find_path(GMOCK_INSTALL_DIR gmock/CMakeLists.txt
- HINTS /usr/src)
-if(${GMOCK_INSTALL_DIR} STREQUAL "GMOCK_INSTALL_DIR-NOTFOUND")
- message(FATAL_ERROR "google-mock package not found")
-endif()
-
-set(GMOCK_INSTALL_DIR ${GMOCK_INSTALL_DIR}/gmock)
-find_path(GMOCK_INCLUDE_DIR gmock/gmock.h)
-
-set(GMOCK_PREFIX gmock)
-set(GMOCK_BINARY_DIR ${CMAKE_BINARY_DIR}/${GMOCK_PREFIX}/libs)
-set(GTEST_BINARY_DIR ${GMOCK_BINARY_DIR}/gtest)
-
-set(GTEST_CMAKE_ARGS "")
-if (${MIR_IS_CROSS_COMPILING})
- set(GTEST_CMAKE_ARGS
- -DCMAKE_TOOLCHAIN_FILE=${CMAKE_MODULE_PATH}/LinuxCrossCompile.cmake)
-endif()
-
-ExternalProject_Add(
- GMock
- #where to build in source tree
- PREFIX ${GMOCK_PREFIX}
- #where the source is external to the project
- SOURCE_DIR ${GMOCK_INSTALL_DIR}
- #forward the compilers to the subproject so cross-arch builds work
- CMAKE_ARGS ${GTEST_CMAKE_ARGS}
- BINARY_DIR ${GMOCK_BINARY_DIR}
-
- #we don't need to install, so skip
- INSTALL_COMMAND ""
-)
-
-set(GMOCK_LIBRARY ${GMOCK_BINARY_DIR}/libgmock.a)
-set(GMOCK_MAIN_LIBRARY ${GMOCK_BINARY_DIR}/libgmock_main.a)
-set(GMOCK_BOTH_LIBRARIES ${GMOCK_LIBRARY} ${GMOCK_MAIN_LIBRARY})
-set(GTEST_LIBRARY ${GTEST_BINARY_DIR}/libgtest.a)
-set(GTEST_MAIN_LIBRARY ${GTEST_BINARY_DIR}/libgtest_main.a)
-set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARY} ${GTEST_MAIN_LIBRARY})
-set(GTEST_ALL_LIBRARIES ${GTEST_BOTH_LIBRARIES} ${GMOCK_BOTH_LIBRARIES})
-
-find_package_handle_standard_args(GTest DEFAULT_MSG
- GMOCK_INCLUDE_DIR
- GTEST_INCLUDE_DIR)
diff --git a/cmake/PrePush.cmake b/cmake/PrePush.cmake
index aba8823..5f7949b 100644
--- a/cmake/PrePush.cmake
+++ b/cmake/PrePush.cmake
@@ -79,4 +79,4 @@ add_custom_target(
add_dependencies(extract-pre-push-tarball pre-push-source-tarball)
add_dependencies(pdebuild extract-pre-push-tarball)
-add_dependencies(pre-push pdebuild android-build)
+#add_dependencies(pre-push pdebuild android-build)
diff --git a/data/properties-cpp.pc.in b/data/properties-cpp.pc.in
index da8c36d..db730c9 100644
--- a/data/properties-cpp.pc.in
+++ b/data/properties-cpp.pc.in
@@ -1,7 +1,7 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
-includedir=${exec_prefix}/include
+includedir=${exec_prefix}/include/@CMAKE_PROJECT_NAME@
Name: @CMAKE_PROJECT_NAME@
Description: A very simple convenience library for handling properties and signals in C++11.
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 3a45575..bf9663c 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -1,4 +1,4 @@
install(
DIRECTORY core
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${CMAKE_PROJECT_NAME}
)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 180498f..9303983 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,11 +1,4 @@
-set (OLD_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-# Don't treat warnings as errors in 3rd_party/{gmock,cucumber-cpp}
-string (REPLACE " -Werror " " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-find_package(Gtest REQUIRED)
-include_directories(${GMOCK_INCLUDE_DIR} ${GTEST_INCLUDE_DIR})
-set (CMAKE_CXX_FLAGS ${OLD_CMAKE_CXX_FLAGS})
-
-include_directories(${GTEST_INCLUDE_DIRS})
+find_package(GTest REQUIRED)
add_executable(
properties_test
@@ -20,13 +13,13 @@ add_executable(
target_link_libraries(
properties_test
- ${GTEST_BOTH_LIBRARIES}
+ GTest::gtest GTest::gmock GTest::gtest_main
)
target_link_libraries(
signals_test
- ${GTEST_BOTH_LIBRARIES}
+ GTest::gtest GTest::gmock GTest::gtest_main
)
add_test(properties_test ${CMAKE_CURRENT_BINARY_DIR}/properties_test)

View File

@@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gjdijkman@gjdwebserver.nl</email>
<name>Gerben Jan Dijkman</name>
</maintainer>
<longdescription lang="en">
process-cpp is a simple header-only implementation of properties and signals. It is meant to be used for developing low-level system services.
</longdescription>
<upstream>
<doc>https://github.com/lib-cpp/properties-cpp</doc>
<bugs-to>https://github.com/lib-cpp/properties-cpp/issues</bugs-to>
<remote-id type="launchpad">properties-cpp</remote-id>
</upstream>
</pkgmetadata>

View File

@@ -1,36 +0,0 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit cmake
DESCRIPTION="Simple convenience library for handling properties and signals in C++11"
HOMEPAGE="https://launchpad.net/properties-cpp"
SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${PV}.orig.tar.gz"
LICENSE="LGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
DEPEND="
dev-libs/boost
doc? (
app-text/doxygen
media-gfx/graphviz
)
test? ( dev-cpp/gtest )
"
PATCHES=(
"${FILESDIR}/properties-cpp-0.0.2-cmake-patch.patch"
)
src_prepare() {
use doc || truncate -s0 doc/CMakeLists.txt || die
use test || truncate -s0 tests/CMakeLists.txt || die
cmake_src_prepare
}

View File

@@ -4,6 +4,5 @@ DIST known_folders-12209cde192558f8b3dc098ac2330fc2a14fdd211c5433afd33085af75caa
DIST tracy-f493d4aa8ba8141d9680473fad007d8a6348628e.tar.gz 5401470 BLAKE2B 8a027bfe82842d6d3caeddcf03499a3671a99f2210a40b434e9893a60da88775c19738230e8d55cb1de020fe9f0d7d414df76f36f4a55b04a0c41c8c0de8232b SHA512 e8a844ff015b4c7a261e3251be33deced4f4a29a8fc8254244c125b391266e7a38bdf8d988ff4aac10bd0ee5538fca1e274a0d91dcde08d0bd021006cb326e6f
DIST zls-0.10.0-data-for-0.10.1.tar.xz 16668 BLAKE2B 76d6381ad09f050bccb468f2bbe3973d2059a8f09a22b39a76f0d959b46e5b72871e24267e03ae58d149628a5af728ed058e7be15c992dffc1f4072195b4beb4 SHA512 fe2ab662feee8e687a03497f7f383cf9edb2b2de7fce614f5138ead6fc45f337fd85e8cba0e352e6905618df43bae737977d70a783d4a3339e9df1f6bbe714c0
DIST zls-0.10.0.tar.gz 320226 BLAKE2B fc9c7c6e37d9347710520ddf0bc90b704ff6115210e044e68a973a2edefe024d14cf410ed0fe74400c1bed8b57f8316dc4298561f78de3abe112bc38df70404b SHA512 16a55ef0ecfac1bf43c4d917741db8389dc835cfdd9e78e9853180dad7218656c6a09b67b7185e7d87ccb2196a4deb457c3d476300eff01ce8c9bfab597576ad
DIST zls-0.13.0-deps.tar.xz 20824 BLAKE2B 8bb7a54311c3eeb38127bc7c2c3e961790d93d5d3bc00ddc725eac5a8bcbf338e58bea53224e857d7281b8ffd426976e9365c994479e5ca57cd0b1f5a234d896 SHA512 81da5f9d8abf7c20e00c3a326ac64e9fb36188404e632e3fc2b4cbab0632a03266745b7cb3e64ccea7b938af6ef0197d8ab2ef6f1211e487efd1b72651bbff60
DIST zls-0.13.0-version_data.tar.xz 14080 BLAKE2B af304ba9c6e1aa370a49254b88aa3209957c94b363bb9c2252bd7b066b6c2782c568bf2b61164d75e7aa08260dd3187e9417c583738ca41be0d2c0afd3b18cdf SHA512 8a79a5608d98619e6228bacdf929e1443814c7b37e131279ffc89066a1ae5ca00fa9edb8fe57145bd4044fc7d870893067605ec3ec0bc7fafb3145e6af159186
DIST zls-0.13.0.tar.gz 352025 BLAKE2B e244763f7270f25680b17f1c525f8ae7a268857d60393672ca1003518cf6d5ae243f384cf9d5d84f4eb27545f02dfe389c3068c5e6f91a2b3fa49df0fc4d89a9 SHA512 92b20418d1410f013ac3d4cbe432ab1b748454d013a2d1be5abd47b91ea7d2340d55b775a66eb116f4641e9f2fc3baf84a44ba8f58b1a774254e7428449bb088

View File

@@ -1,160 +0,0 @@
# Copyright 2022-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit edo
DESCRIPTION="The officially unofficial Ziglang language server"
HOMEPAGE="https://github.com/zigtools/zls"
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/zigtools/zls"
inherit git-r3
EZIG_MIN="9999"
EZIG_MAX_EXCLUSIVE="99991"
BDEPEND="dev-lang/zig:9999"
else
SRC_URI="
https://github.com/zigtools/zls/archive/refs/tags/${PV}.tar.gz -> zls-${PV}.tar.gz
https://codeberg.org/BratishkaErik/distfiles/releases/download/zls-${PV}/zls-${PV}-deps.tar.xz
https://codeberg.org/BratishkaErik/distfiles/releases/download/zls-${PV}/zls-${PV}-version_data.tar.xz
"
KEYWORDS="~amd64"
EZIG_MIN="0.13"
EZIG_MAX_EXCLUSIVE="0.14"
BDEPEND="|| ( dev-lang/zig:${EZIG_MIN} dev-lang/zig-bin:${EZIG_MIN} )"
fi
LICENSE="MIT"
SLOT="0"
RDEPEND="${BDEPEND}"
DOCS=( README.md )
# see https://github.com/ziglang/zig/issues/3382
# For now, Zig Build System doesn't support CFLAGS/LDFLAGS/etc.
QA_FLAGS_IGNORED="usr/bin/zls"
# : copied from sys-fs/ncdu :
# Many thanks to Florian Schmaus (Flowdalic)!
# Adapted from https://github.com/gentoo/gentoo/pull/28986
# Set the EZIG environment variable.
zig-set_EZIG() {
[[ -n ${EZIG} ]] && return
if [[ -n ${EZIG_OVERWRITE} ]]; then
export EZIG="${EZIG_OVERWRITE}"
return
fi
local candidates candidate selected selected_ver
candidates=$(compgen -c zig-)
for candidate in ${candidates}; do
if [[ ! ${candidate} =~ zig(-bin)?-([.0-9]+) ]]; then
continue
fi
local ver
if (( ${#BASH_REMATCH[@]} == 3 )); then
ver="${BASH_REMATCH[2]}"
else
ver="${BASH_REMATCH[1]}"
fi
if [[ -n ${EZIG_EXACT_VER} ]]; then
ver_test "${ver}" -ne "${EZIG_EXACT_VER}" && continue
selected="${candidate}"
selected_ver="${ver}"
break
fi
if [[ -n ${EZIG_MIN} ]] \
&& ver_test "${ver}" -lt "${EZIG_MIN}"; then
# Candidate does not satisfy EZIG_MIN condition.
continue
fi
if [[ -n ${EZIG_MAX_EXCLUSIVE} ]] \
&& ver_test "${ver}" -ge "${EZIG_MAX_EXCLUSIVE}"; then
# Candidate does not satisfy EZIG_MAX_EXCLUSIVE condition.
continue
fi
if [[ -n ${selected_ver} ]] \
&& ver_test "${selected_ver}" -gt "${ver}"; then
# Candidate is older than the currently selected candidate.
continue
fi
selected="${candidate}"
selected_ver="${ver}"
done
if [[ -z ${selected} ]]; then
die "Could not find (suitable) zig installation in PATH"
fi
export EZIG="${selected}"
export EZIG_VER="${ver}"
}
# Invoke zig with the optionally provided arguments.
ezig() {
zig-set_EZIG
# Unfortunately, we cannot add more args here, since syntax is different
# for every subcommands. Yes, even target/cpu :( f.i. :
# -target/-mcpu for zig build-exe vs -Dtarget/-Dcpu for zig build-
# -OReleaseSafe for zig build-exe vs -DReleaseSafe for zig build
# (or even none, if hardcoded by upstream so choice is -Drelease=true/false)
# Ofc we can patch this, but still...
edo "${EZIG}" "${@}"
}
src_unpack() {
if [[ ${PV} == 9999 ]]; then
git-r3_src_unpack
cd "${S}" || die
ezig build --fetch --global-cache-dir "${WORKDIR}/zig-eclass/" || die "Pre-fetching Zig modules failed"
local ZLS_GEN_FLAGS="--generate-version-data master --generate-version-data-path version_data.zig"
ezig build gen --verbose -- ${ZLS_GEN_FLAGS} || die "Pre-generating Zig version data failed"
else
default_src_unpack
fi
}
src_configure() {
export ZBS_ARGS=(
--prefix usr/
-Doptimize=ReleaseSafe
--system "${WORKDIR}/zig-eclass/p/"
-Dversion_data_file_path=version_data.zig
--verbose
)
}
src_compile() {
ezig build "${ZBS_ARGS[@]}"
}
src_test() {
ezig build test "${ZBS_ARGS[@]}"
}
src_install() {
DESTDIR="${ED}" ezig build install "${ZBS_ARGS[@]}"
einstalldocs
}
pkg_postinst() {
elog "You can find more information about options here: https://github.com/zigtools/zls/wiki/Configuration"
}

View File

@@ -11,6 +11,7 @@ declare -g -r -A ZBS_DEPENDENCIES=(
[known_folders-12209cde192558f8b3dc098ac2330fc2a14fdd211c5433afd33085af75caa9183147.tar.gz]='https://github.com/ziglibs/known-folders/archive/0ad514dcfb7525e32ae349b9acc0a53976f3a9fa.tar.gz'
)
# Sync with "minimum_build_zig_version" from upstream's "build.zig".
if [[ ${PV} == 9999 ]]; then
ZIG_SLOT="9999"

View File

@@ -1,3 +0,0 @@
DIST grafx2-2.7.2978-src.tgz 1104727 BLAKE2B 7ae308ea7ce3dd10966e85353111c890931a56c9bc496c4d956d89db9609e4e472280df1202e85494929979ee080a7c5daf07b629ed7002291448c87a7547cf6 SHA512 ed8d92b51cf71ee139b7c21206a088ba056642debcbbc6e650bdab9547b53159251d842eb4c5ea46b18859c0f333bad66ed60e4b91d58bacd7f02022ead7a61e
DIST grafx2-testdata-20201222.tar.bz2 36853538 BLAKE2B 506db79030f33e5308ac9f4cbed7891c836cde9c8795eb867b7df2c80bd3b3825af93099f3def6f3a0e55b8628a4139e9b1c689d317daec189037d50a9e2da93 SHA512 3be28934b8d7b945fcc21bd9e1d500dd4dfca2bb371b801ef7dbe4670529d054fb19f10fdeeb2fec9096c611c31adfcf238c4b3035b2891db4fc6e9968978c4e
DIST grafx2-v2.9.3219.tar.gz 2631545 BLAKE2B 76c67986f45f21c11d7df7f628c689f2e08d24ec54e14ed2d2d25729e471b4b045cc4d70e5c4c20ee9e6e4950439d1747b3e67308d2dacd706be762c693391d6 SHA512 db6a6092c899dbc313e4a680654d128e77b0db8af64032f412dc788b0d9fa9070847cfdb6ec8af4a4dbb35568dc992bce2ebf8f3852ecba1a12608f0a454cd74

View File

@@ -1,16 +0,0 @@
diff --git a/misc/unix/grafx2.desktop b/misc/unix/grafx2.desktop
index 9718f06..892e7b2 100644
--- a/misc/unix/grafx2.desktop
+++ b/misc/unix/grafx2.desktop
@@ -1,9 +1,9 @@
[Desktop Entry]
Name=GrafX2
Comment=Deluxe Paint Clone
-Exec=grafx2 %f
+Exec=grafx2-sdl %f
Terminal=false
Type=Application
Icon=grafx2
-Categories=Application;Graphics;
+Categories=Graphics;
MimeType=image/lbm;image/iff;image/pcx;image/tga;image/gif;image/bmp;image/x-icon;image/png;

View File

@@ -1,50 +0,0 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
LUA_COMPAT=( lua5-{1..4} )
inherit lua-single xdg
DESCRIPTION="A pixelart-oriented painting program"
HOMEPAGE="http://www.pulkomandy.tk/projects/GrafX2"
SRC_URI="http://www.pulkomandy.tk/projects/GrafX2/downloads/${P}-src.tgz"
S="${WORKDIR}/${PN}/src/"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="lua ttf"
REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
# Test phase fails: make: *** [Makefile:1146: ../bin/tests-sdl] Error 1
RESTRICT="test"
RDEPEND="
media-libs/libsdl
media-libs/sdl-image[tiff]
media-libs/freetype
media-libs/libpng
ttf? ( media-libs/sdl-ttf )
lua? ( ${LUA_DEPS} )
"
DEPEND="${RDEPEND}"
PATCHES=( "${FILESDIR}/${PN}-desktop-file.patch" )
src_prepare() {
pushd ../ && default && popd
}
src_compile() {
use ttf || MYCNF="NOTTF=1"
use lua || MYCNF="${MYCNF} NOLUA=1"
emake ${MYCNF}
}
src_install() {
emake ${MYCNF} DESTDIR="${ED}" PREFIX="/usr" install
}

View File

@@ -1,53 +0,0 @@
# Copyright 2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit xdg
DESCRIPTION="A pixelart-oriented painting program"
HOMEPAGE="http://www.pulkomandy.tk/projects/GrafX2"
SRC_URI="http://www.pulkomandy.tk/projects/GrafX2/downloads/${P}-src.tgz"
S="${WORKDIR}/${PN}/src/"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="ttf lua"
# Test phase fails: make: *** [Makefile:1146: ../bin/tests-sdl] Error 1
RESTRICT="test"
PATCHES=(
"${FILESDIR}/${PN}-desktop-file.patch"
)
RDEPEND="
media-libs/libsdl
media-libs/sdl-image[tiff]
media-libs/freetype
media-libs/libpng
ttf? ( media-libs/sdl-ttf )
lua? ( >=dev-lang/lua-5.1.0 )
"
DEPEND="${RDEPEND}"
src_prepare() {
pushd ../
eapply ${PATCHES}
eapply_user
popd
sed -i s/lua5\.1/lua/g Makefile || die
}
src_compile() {
use ttf || MYCNF="NOTTF=1"
use lua || MYCNF="${MYCNF} NOLUA=1"
emake ${MYCNF} || die "emake failed"
}
src_install() {
emake ${MYCNF} DESTDIR="${D}" PREFIX="/usr" install || die "Install failed"
}

View File

@@ -1,112 +0,0 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
LUA_COMPAT=( lua5-{1..4} )
inherit lua-single toolchain-funcs xdg
pic_samples_commit=40738b358a5a5cb33d54897b008cbccad98e63d6
pic_samples_date=20201222
DESCRIPTION="A pixelart-oriented painting program"
HOMEPAGE="http://www.pulkomandy.tk/projects/GrafX2
https://grafx2.eu/
"
SRC_URI="http://www.pulkomandy.tk/projects/GrafX2/downloads/${PN}-v${PV}.tar.gz
test? (
https://gitlab.com/GrafX2/pic-samples/-/archive/${pic_samples_commit}/pic-samples-${pic_samples_commit}.tar.bz2
-> ${PN}-testdata-${pic_samples_date}.tar.bz2
)
"
S="${WORKDIR}/${PN}-v$(ver_cut 1-2)/src"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc lua +sdl sdl2 ttf test"
REQUIRED_USE="
lua? ( ${LUA_REQUIRED_USE} )
?? ( sdl sdl2 )
ttf? ( ^^ ( sdl sdl2 ) )
"
RESTRICT="!test? ( test )"
SDL_DEPS="
media-libs/libsdl!VER!
media-libs/sdl!VER!-image[tiff]
ttf? ( media-libs/sdl!VER!-ttf )
"
RDEPEND="
media-libs/libpng
lua? ( ${LUA_DEPS} )
sdl? ( ${SDL_DEPS//!VER!/} )
sdl2? ( ${SDL_DEPS//!VER!/2} )
!sdl? ( !sdl2? ( x11-libs/libX11 ) )
ttf? ( media-libs/freetype )
"
DEPEND="$RDEPEND"
src_prepare() {
pushd .. || die
default
if use test; then
rmdir tests/pic-samples || die
mv "${WORKDIR}/pic-samples-${pic_samples_commit}" tests/pic-samples || die
fi
popd || die
# Remove optimisation and debug info from CFLAGS
sed -r -i '/^\s*COPT\s*\+?=/s!\s*(-g(|gdb|stabs)|-O\$\(OPTIM\))(\s|$)!\3!g' Makefile
}
src_configure() {
my_makeargs=(
V=1
PREFIX="${EPREFIX}/usr"
)
use sdl && my_makeargs+=( API=sdl )
use sdl2 && my_makeargs+=( API=sdl2 )
use sdl || use sdl2 || my_makeargs+=( API=x11 )
use ttf || my_makeargs+=( NOTTF=1 )
use lua || my_makeargs+=( NOLUA=1 SCRIPT_FILES="" )
tc-export CC PKG_CONFIG
}
src_compile() {
emake "${my_makeargs[@]}"
}
src_test() {
emake "${my_makeargs[@]}" check
}
src_install() {
emake "${my_makeargs[@]}" DESTDIR="${D}" install
# install documentation
cd ../doc || die
dodoc README.txt COMPILING.txt
if use doc; then
dodoc -r original_docs
insinto "/usr/share/doc/${P}"
doins quickstart.rtf
fi
# grafx2 binary usually has name grafx2-sdl or grafx2-x11 but desktop file
# references it as just grafx2, so let's create symlink to mitigate it.
local bin="$(basename "$(ls "${ED}"/usr/bin/grafx2*)" )"
[[ -z "$bin" ]] && die "failed to find installed binary"
if [[ "$bin" != "grafx2" ]]; then
echo "$bin"
dosym "$bin" "/usr/bin/grafx2" || die;
fi
}

View File

@@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
<remote-id type="gitlab">GrafX2/grafX2</remote-id>
</upstream>
<use>
<flag name="ttf">Add support for TTF fonts</flag>
<flag name="sdl">Use <pkg>media-libs/libsdl</pkg> as a rendering backend</flag>
<flag name="sdl2">Use <pkg>media-libs/libsdl2</pkg> as a rendering backend</flag>
</use>
</pkgmetadata>

View File

@@ -0,0 +1,184 @@
From d1b3545e9257b3bba26b3c2805b510af5d163048 Mon Sep 17 00:00:00 2001
From: Hugues Delorme <delorme.hugues@fougue.pro>
Date: Wed, 10 Jan 2024 16:57:08 +0100
Subject: [PATCH] Port to OpenCascade 7.8.0
---
mayo.pro | 36 +++++++++++++++++++++++---------
src/app/widget_main_control.cpp | 1 -
src/base/brep_utils.cpp | 8 +++++--
src/base/brep_utils.h | 2 +-
src/base/caf_utils.h | 4 +++-
src/base/tkernel_utils.h | 2 ++
tests/test_base.cpp | 5 +++--
diff --git a/mayo.pro b/mayo.pro
index a21b22d..f2bd14e 100644
--- a/mayo.pro
+++ b/mayo.pro
@@ -173,19 +173,36 @@ LIBS += \
-lTKXmlXCAF \
-lTKXSBase \
-versionAtLeast(OCC_VERSION_STR, 7.7.0) {
- LIBS += -lTKXDE
+versionAtLeast(OCC_VERSION_STR, 7.8.0) {
+ # -- IGES support
+ LIBS += -lTKDEIGES
+ # -- STEP support
+ LIBS += -lTKDESTEP
+ # -- STL support
+ LIBS += -lTKDESTL
+ # -- VRML support
+ LIBS += -lTKDEVRML
+} else {
+ # -- IGES support
+ LIBS += -lTKIGES -lTKXDEIGES
+ # -- STEP support
+ LIBS += -lTKSTEP -lTKSTEP209 -lTKSTEPAttr -lTKSTEPBase -lTKXDESTEP
+ # -- STL support
+ LIBS += -lTKSTL
+ # -- VRML support
+ LIBS += -lTKVRML
+
+ versionAtLeast(OCC_VERSION_STR, 7.7.0) {
+ LIBS += -lTKXDE
+ }
}
-# -- IGES support
-LIBS += -lTKIGES -lTKXDEIGES
-# -- STEP support
-LIBS += -lTKSTEP -lTKSTEP209 -lTKSTEPAttr -lTKSTEPBase -lTKXDESTEP
-# -- STL support
-LIBS += -lTKSTL
# -- OBJ/glTF support
versionAtLeast(OCC_VERSION_STR, 7.4.0) {
LIBS += -lTKRWMesh
+ versionAtLeast(OCC_VERSION_STR, 7.8.0) {
+ LIBS += -lTKDEOBJ -lTKDEGLTF
+ }
} else {
SOURCES -= \
src/io_occ/io_occ_base_mesh.cpp \
@@ -205,8 +222,7 @@ versionAtLeast(OCC_VERSION_STR, 7.4.0) {
SOURCES -= src/io_occ/io_occ_obj_writer.cpp
message(OBJ writer disabled because OpenCascade < v7.6)
}
-# -- VRML support
-LIBS += -lTKVRML
+
!versionAtLeast(OCC_VERSION_STR, 7.7.0) {
SOURCES -= src/io_occ/io_occ_vrml_reader.cpp
message(VRML reader disabled because OpenCascade < v7.7)
diff --git a/src/app/widget_main_control.cpp b/src/app/widget_main_control.cpp
index 51eca63..3240e3a 100644
--- a/src/app/widget_main_control.cpp
+++ b/src/app/widget_main_control.cpp
@@ -312,7 +312,6 @@ QWidget* WidgetMainControl::recreateLeftHeaderPlaceHolder()
WidgetGuiDocument* WidgetMainControl::widgetGuiDocument(int idx) const
{
- assert(idx == -1 || (0 <= idx && idx < m_ui->stack_GuiDocuments->count()));
return qobject_cast<WidgetGuiDocument*>(m_ui->stack_GuiDocuments->widget(idx));
}
diff --git a/src/base/brep_utils.cpp b/src/base/brep_utils.cpp
index 1b2f119..b694f5b 100644
--- a/src/base/brep_utils.cpp
+++ b/src/base/brep_utils.cpp
@@ -59,9 +59,13 @@ bool BRepUtils::moreComplex(TopAbs_ShapeEnum lhs, TopAbs_ShapeEnum rhs)
return lhs < rhs;
}
-int BRepUtils::hashCode(const TopoDS_Shape& shape)
+size_t BRepUtils::hashCode(const TopoDS_Shape& shape)
{
- return !shape.IsNull() ? shape.HashCode(INT_MAX) : -1;
+#if OCC_VERSION_HEX >= OCC_VERSION_CHECK(7, 8, 0)
+ return std::hash<TopoDS_Shape>{}(shape);
+#else
+ return shape.HashCode(INT_MAX);
+#endif
}
std::string BRepUtils::shapeToString(const TopoDS_Shape& shape)
diff --git a/src/base/brep_utils.h b/src/base/brep_utils.h
index 76830e8..a98dd2e 100644
--- a/src/base/brep_utils.h
+++ b/src/base/brep_utils.h
@@ -53,7 +53,7 @@ struct BRepUtils {
// Returns hash code computed from 'shape'
// Computation uses the internal TShape and Location, but Orientation is not considered
// Returned hash code is in the range [1, max(int)]
- static int hashCode(const TopoDS_Shape& shape);
+ static size_t hashCode(const TopoDS_Shape& shape);
// Serializes 'shape' into a string representation
static std::string shapeToString(const TopoDS_Shape& shape);
diff --git a/src/base/caf_utils.h b/src/base/caf_utils.h
index d849de5..8863aa5 100644
--- a/src/base/caf_utils.h
+++ b/src/base/caf_utils.h
@@ -6,6 +6,7 @@
#pragma once
+#include <Standard_Version.hxx>
#include <TCollection_AsciiString.hxx>
#include <TCollection_ExtendedString.hxx>
#include <TDF_Label.hxx>
@@ -43,7 +44,7 @@ struct CafUtils {
} // namespace Mayo
-
+#if OCC_VERSION_HEX < 0x070800
#include <TDF_LabelMapHasher.hxx>
namespace std {
@@ -55,6 +56,7 @@ template<> struct hash<TDF_Label> {
};
} // namespace std
+#endif
// --
// -- Implementation
diff --git a/src/base/tkernel_utils.h b/src/base/tkernel_utils.h
index 3dd4500..4f1d97a 100644
--- a/src/base/tkernel_utils.h
+++ b/src/base/tkernel_utils.h
@@ -55,6 +55,7 @@ public:
} // namespace Mayo
+#if OCC_VERSION_HEX < OCC_VERSION_CHECK(7, 8, 0)
namespace std {
// Specialization of C++11 std::hash<> functor for opencascade::handle<> objects
@@ -65,3 +66,4 @@ template<typename T> struct hash<opencascade::handle<T>> {
};
} // namespace std
+#endif
diff --git a/tests/test_base.cpp b/tests/test_base.cpp
index e98f482..b28040e 100644
--- a/tests/test_base.cpp
+++ b/tests/test_base.cpp
@@ -653,9 +653,10 @@ void TestBase::BRepUtils_test()
const TopoDS_Shape shapeNull;
const TopoDS_Shape shapeBase = BRepPrimAPI_MakeBox(25, 25, 25);
const TopoDS_Shape shapeCopy = shapeBase;
- QCOMPARE(BRepUtils::hashCode(shapeNull), -1);
- QVERIFY(BRepUtils::hashCode(shapeBase) >= 0);
+ const TopoDS_Shape shapeOther = BRepPrimAPI_MakeBox(40, 40, 40);
+ QCOMPARE(BRepUtils::hashCode(shapeNull), BRepUtils::hashCode(TopoDS_Shape{}));
QCOMPARE(BRepUtils::hashCode(shapeBase), BRepUtils::hashCode(shapeCopy));
+ QVERIFY(BRepUtils::hashCode(shapeBase) != BRepUtils::hashCode(shapeOther));
}
}
--
2.45.2

View File

@@ -17,8 +17,7 @@ RDEPEND="
dev-qt/qttranslations:6
dev-qt/qtbase:6[opengl]
>=media-libs/assimp-5.3.1
>=sci-libs/opencascade-7.7.0-r2
<sci-libs/opencascade-7.8.0
>=sci-libs/opencascade-7.8.0
"
DEPEND="${RDEPEND}"
@@ -26,6 +25,7 @@ DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}"/${P}-nogit.patch
"${FILESDIR}"/${P}-gcc14.patch
"${FILESDIR}"/${P}-opencascade7_8.patch
)
src_configure() {

View File

@@ -1,44 +0,0 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit qmake-utils desktop xdg
DESCRIPTION="Opensource 3D CAD viewer and converter"
HOMEPAGE="https://github.com/fougue/mayo"
SRC_URI="https://github.com/fougue/mayo/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
KEYWORDS="~amd64"
RDEPEND="
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qttranslations:5
dev-qt/qtwidgets:5
dev-qt/qtbase:6[opengl]
>=media-libs/assimp-5.3.1
>=sci-libs/opencascade-7.7.0-r2
<sci-libs/opencascade-7.8.0
"
DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}"/${P}-nogit.patch
"${FILESDIR}"/${P}-gcc14.patch
)
src_configure() {
eqmake5 "CASCADE_INC_DIR=/usr/include/opencascade" "CASCADE_LIB_DIR=/usr/$(get_libdir)/opencascade" "ASSIMP_INC_DIR=/usr/include/assimp" "ASSIMP_LIB_DIR=/usr/$(get_libdir)" mayo.pro
}
src_install() {
emake install INSTALL_ROOT="${ED}"
dobin mayo
newicon -s scalable images/appicon.svg mayo.svg
make_desktop_entry "mayo %F" Mayo mayo "Graphics;" "MimeType=model/step;model/iges;model/brep;image/vnd.dxf;model/obj;model/gltf+json;model/gltf+binary;model/vrml;model/stl;model/x.stl-ascii;model/x.stl-binary;application/x-amf;application/x-coff;application/x-coffexec;model/3mf;image/x-3ds;model/vnd.collada+xml;model/x3d+binary;model/x3d+fastinfoset;model/x3d+vrml;model/x3d+xml;model/x3d-vrml;application/directx;"
einstalldocs
}

View File

@@ -1,3 +1,2 @@
DIST lms-3.59.1.tar.gz 444042 BLAKE2B f5c64cf07dd25cda81809a355029e4bd474b3516ab2511027bd1099232f763d4c5731864ff9fba815e96a681a22abb2cbd67e73534d4b2381e4bf0bd6f55f4b1 SHA512 c1fedf82548daf3f433227f0b65b294930215f688121a14572beac0f17d87f5dcd63315d4606056258e4d7bd41cbe76b9df0140ddbac2a9e478b0f5c158a29fd
DIST lms-3.60.0.tar.gz 458598 BLAKE2B 8506d484e130a6c6f4e4e4393258cb5c920badcabe54c06b785efe075a4b11a619d42bbd48ace5ebf4bd7fa4a1d74a8ecdc75bb4e073a01d4b046241afc2d1b2 SHA512 4e7e454e0075a3257d0b2e7a128f37bd9aad6d89734f283e6d24d35635b1a02c647f30f22af9641b1d1867684e7adeb6672c60c448d2f822d0a1d5ec4ce2460c
DIST lms-3.60.1.tar.gz 458729 BLAKE2B aaa5872e4fe9aee0e494f39404620468a1159e1a1948bdbf28403ea37850a9c6337d5311cf1068c6ad58912b5d0b11b8edb659f2d0068b877484a587e9a2ce4c SHA512 d5068192167a706d0e144033ff4146bbbae29be2b1bd8fda858d0cb7b6196fe1a0c7f1286656b387ea8c874b4793a8f5b9eb239e7d6793a8c0367e45272afec2
DIST lms-3.61.0.tar.gz 465049 BLAKE2B b4d08b92c31c09734d5961c634839b729a6497e6319463d0d5ae919330d1a195d12d2cfeb5171e3a879d7bf81c34a44aa8493eecd2cb1aed76cd400a02db0687 SHA512 ea812f0fa0ad89319a1d219205092025f63883ca3b8612e2fc8ff286362fd7961a793d19e23fb8a6393bd796dedff14f6f94f6e96c6403ae456c1cf05cfc7fbf

View File

@@ -1,68 +0,0 @@
# Copyright 2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit cmake pam systemd
DESCRIPTION="Lightweight Music Server."
HOMEPAGE="https://lms-demo.poupon.dev/ https://github.com/epoupon/lms"
SRC_URI="https://github.com/epoupon/lms/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
IUSE="test stb"
RESTRICT="!test? ( test )"
RDEPEND="
app-arch/libarchive
acct-user/lms
dev-cpp/wt
dev-libs/boost
dev-libs/libconfig[cxx]
media-libs/taglib
media-video/ffmpeg[mp3,opus]
sys-libs/pam
!stb? ( media-gfx/graphicsmagick )
"
DEPEND="
${RDEPEND}
stb? ( dev-libs/stb )
"
BDEPEND="
test? ( dev-cpp/gtest )
"
src_configure() {
local mycmakeargs=(
-DLMS_IMAGE_BACKEND=$(usex stb stb graphicsmagick)
-DENABLE_TESTS=$(usex test)
)
cmake_src_configure
}
src_install() {
cmake_src_install
systemd_newunit conf/systemd/default.service lms.service
newinitd "${FILESDIR}/lms.init" lms
dopamd conf/pam/lms
mv "${ED}/usr/share/lms/lms.conf" "${ED}/etc/lms.conf" || die
# Already installed in the proper directory
rm "${ED}/usr/share/lms/default.service" || die
rm "${ED}/usr/share/lms/lms" || die
keepdir /var/log/lms
fowners -R lms:lms /var/log/lms
keepdir /var/lms
fowners lms:lms /var/lms
}

View File

@@ -1,3 +1,3 @@
DIST baresip-3.15.0.tar.gz 1171797 BLAKE2B 8f8e35de141260c53e88b63ddd8e54bb86bf3e0cf5a01a55dddd1891eeedea03de700399d110e7e095339b719bd74f56206b1bd3671ee349263b4dadd24524d3 SHA512 20d426d749c2cdbaab09ed92be5ef089c85bb1bf693eab272de673be1ad5457624487e5de2f4675be6246cfead1b6181e60ec35624aadf88909d0d625228d966
DIST baresip-3.16.0.tar.gz 1172715 BLAKE2B cb1e33ae00c27c9bd1f0ad1abc0115fba345e5b6a4f78423f499d4a319b0013073d57fe42eaf051e86714dfa05ef2644b4eee342f61cbad333b588568d82f7cb SHA512 90a85a36ca9684f32f396fdce21de3df8d203e5821ed214bda15c819aae82ec947a02c46bd2869ca5015cdd9dcab9f4167c6a7893c53e1b9df4e67f29724667a
DIST baresip-3.17.0.tar.gz 1173530 BLAKE2B 34bebfa51f29da13017309af03dcdaa3adb5c7e8a4726f1700b3d7ab116c23edd6c01e452c2a50404d480532a74fd4d6a0515d1f1ea1444cbb01de8ef03e162b SHA512 3cd35f0ea34b21a1d9b7a7b140b0390becc14947c1fdd1fa0f6aa188efcc5e9f50d680ef334712dc294699b049d3014b4bd0a91c3380aabe5a6366a7400d48c9
DIST baresip-3.18.0.tar.gz 1179585 BLAKE2B 658fbc810c2d4b80c285f1788ab520af9a02cfbb10145b18b756c5774acbea2d33b8dda9c60415e833320f3338aa658d0e5d9f41f3baff0422e180dc894f9e24 SHA512 98d7c73a23ae64964b82504dd3ddc1386d197a0da04af726b572364549b1c874829e7b4db4ec5fdf8eafd2ea4fb4a653dff4aec517036d7989a1cf6a6f38f8ac

View File

@@ -1,3 +1,3 @@
DIST re-3.15.0.tar.gz 611848 BLAKE2B f9e080279439de741824079f81bc07231af5b945499082963e52300bd1e137b3096d197047a2e2a76f7bec90e6598df6c9937cc6ed9f9f9a75b3634c20b167f9 SHA512 d70d9b97ff13b11db74b1421ce8f401276b35d9345e24f0291d194825fe1db7f483aa29f4077f6fe52844d53ee201e11abc902580b6786d9e54ba3458a7a4e42
DIST re-3.16.0.tar.gz 612463 BLAKE2B 744b0f21bfe60373da820f3b5025701466e3e63fc3d8f5f00fb96485fbddadaf8679e0f71c29139aaf4683caaa15a5221410cc26f7808dcf49b77ed6c0aa78eb SHA512 a32a7a4bebde4c6260d3034ed180dd3d1615af6f12d958597adbf5ebee5057d0a492cc7d05fc6236432e9a03f3cabc46c6bb4f0b181df3e4f70cc951e42cf720
DIST re-3.17.0.tar.gz 613304 BLAKE2B 9bd59655cde615ffe31c658ed47bc0be15a44063d073aa5d3bafc346f5110f00c27151b1f1c98d2ea0d7552976768dbbab03360cedd6d27dbb5180d118ded07a SHA512 8de8d847d317b18333813a0e5c28fab4aebb16e5e383c8acb6e963d1cf8b0a90e11fc46a3438c5202ae3ecfc8b6572a649161b6ea45b4467764413b689caad58
DIST re-3.18.0.tar.gz 613187 BLAKE2B 584f360c388f1c4d2937348a2a1c2824b885381905f4f66aeb3e6fea0a6ebb397dca86c94fe7b6c2b54de569032a9b35a3676d4bef35668c66cfed8620836dec SHA512 db9c67a60803a224a87aa4104d5a0a349d09946b5bf7c8b18fd121ed7517d25a5412b0516dfc6a386218db9d5020b65ac1253966052a4978075e6bfcb71dc908

View File

@@ -0,0 +1 @@
DIST easyroam_connect_desktop-1.3.5+1.3.5-linux.deb 8806992 BLAKE2B ae338b4295162296fb9b30aa1455e2f77d94418f8d6908cd3313d5465fa7c4632514cc615f399f61120aa8ee4555d10fcc840e01c1cababd1406ca7cacfe08a8 SHA512 23f0ea1359f87c63438b503851b3c25c73636960cadbad762d5c44c5640d09f62ecc32b943510e2adff307058c9d001418adc918692de6eceea4668d05bbd18c

View File

@@ -0,0 +1,41 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit unpacker
DESCRIPTION="Easily connect your device to eduroam®."
HOMEPAGE="https://www.easyroam.de/"
SRC_URI="https://packages.easyroam.de/repos/easyroam-desktop/pool/main/e/easyroam-desktop/easyroam_connect_desktop-${PV}+${PV}-linux.deb"
S="${WORKDIR}"
LICENSE="all-rights-reserved"
SLOT="0"
KEYWORDS="-* amd64"
RDEPEND="
dev-libs/glib
x11-libs/gtk+
x11-libs/pango
x11-libs/cairo
media-libs/harfbuzz
app-crypt/libsecret
net-misc/networkmanager
net-libs/webkit-gtk:4.1[keyring]
net-libs/libsoup:3.0
net-libs/glib-networking
"
DEPEND="${RDEPEND}"
src_prepare() {
sed -i \
"s/Exec=easyroam_connect_desktop/Exec=\/usr\/share\/easyroam_connect_desktop\/easyroam_connect_desktop/" \
"${S}/usr/share/applications/easyroam_connect_desktop.desktop"
default
}
src_install() {
mv "${S}/usr" "${D}/"
}

View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gentoo@liv.nrw</email>
<name>Liv (pelsh) Hugger</name>
</maintainer>
</pkgmetadata>

View File

@@ -1,45 +0,0 @@
DIST atk-0.7.0.crate 43814 BLAKE2B dc1d569df7a53506b50d484f7d04240ec3179b3915abacc5790310fa0b03587df07cf3ec5ed9922a877eb2d82c1cf3eef937bace3e2cf1b30895be27131b80a3 SHA512 4369d48607d58cfde6fd1dbe006eca2ffbf0212750d991b0a534586e75496e9cb99636e2b916ae3e6c3cbc0aa3345bddf1b2e7d2561a9c16769646029be9041b
DIST atk-sys-0.9.1.crate 21064 BLAKE2B 752cd426951051af696413725189286f465433388dfa84efc2ef6963af6b387b56cee830fd595c39049f9721f4c9b3c51828c3d17c7362b85a6cf648e17e5dbb SHA512 a2eb083abfd585bb7bea6415c1b0a6981c1e071b11dbbd41442d5ab438219d13ab28bf957640616644fb11760d2371c929f379ab414b8b00b297f3af25680a92
DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
DIST cairo-rs-0.7.1.crate 45803 BLAKE2B f12439219c6df2d35464d2e20c7e5b9a2ab3a5c92a87fd93f491b4e483553d4b078ff787e0e502f58a97521918a9e0633ffdf765c9087edd257087c9c72ba870 SHA512 3a8825c352ebea72d7cfc947654e85e0395990c4572913858d71b6c7eabb60efec0a9e9fdebb409530aed5535edaec5fcfb0f77f1f2dd6794503feff2e384ba7
DIST cairo-sys-rs-0.9.2.crate 11650 BLAKE2B ac664b7976de57907ae543c1afc2fd8fe166b2a147e1be31d6f60aec0b08949bb53b9f59c16e02f33a299a225f8e8202c5d7ad744c6aa8c5f03ec421a773ff33 SHA512 cab877b76951212710c7e668093fda218ac9c7e1e26fcffc448d759a3f968a7faeeea347025189a1aee7579b15916c141d0d727f986bb7061183a695b52bf39b
DIST cc-1.0.68.crate 55936 BLAKE2B 9bbbeda78b8c3aca487e770cddbe11bf4686424bd33d023ad66e1fbdfc8dcbc17fd85c15905e0edbed8745202c01aea13d4f03a7f8f655e5806da152565419aa SHA512 faca9aa91488808f920f1d88422cc8a69790aa6dbd7bd2cc5d08a579d248faafd0fd675e8499e56aef6715398c278db1fa2079511d211d41aa65741de5d5ac8c
DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
DIST dtoa-0.4.8.crate 16175 BLAKE2B 5fff15e66c2edeb9eb9da89c66389b3a9bbb891d75afc3bb7da4dcbe9cad9e50af318cc8cc01cc7e56730763e8ea8ceb33b9447d1a7fa52a8d0f0d2060a97522 SHA512 fe1701ba2c40988b92f5f4ef78a8c81718b140ff8ca2d04023b09a89440e6ddb53ef36d1ebd9dd3e948428b361ed6611bd24ec1a31b5010c220c555e1f0bf6b8
DIST fragile-0.3.0.crate 10203 BLAKE2B 3b04d4acc57f5a76a0d2625db8b0d643f2199e175110b47ee40fc82afd3d1d01c75d92e0d1ec798340a93afb939f215504a16346730955b475e321246ed8bc09 SHA512 5307919178a440abf932857162b66b7a1a769513820c55c6827e8031894029f2d84920773899e6ae39ba1d8a8c0da2816ce9af7007416ab4e0e2c115090d8a1c
DIST gdk-0.11.0.crate 83537 BLAKE2B d616ec093a3ab852d068760f55ed5b39c90389d2a2c320d6a041cda12f98d99e873a0d26803335c3bfadb8289f32f06b2d5a961c16cd18c0baf6e4d91138f607 SHA512 483bbc99f06b9cf23ea3aabd540138711868bbd95bafbac20fdcf56e8e445fb3c44b79ef5f3c43015a21288e19adf399f446f971cf3413498c7d80ac500a98e0
DIST gdk-pixbuf-0.7.0.crate 15011 BLAKE2B ee46401bd80b5b5f865d7bac2b1ec28e01db657e4e0716b585bc72faebc6bb0ca694811e487a4dcc67d2572fc1e49775382e79abbccc3d8f8caa2f5b5848e9cb SHA512 a413656b7c18acc030225b14134b1481902d19e1845ec73cf430921020dee7c99dd5e5469f60780aed2d3552d83792c6a193ddeba686324284eff2d78cc0b813
DIST gdk-pixbuf-sys-0.9.1.crate 8641 BLAKE2B 8cbeffd4acbdd38ba43b5b39a84e0d20d9ea0230115f09f8b0c0e95b405027fee1a65e452e2abd2485097036c9f5dca8e01069f51a5651199db9be50aef6087a SHA512 22ca779b0065289da0bbc024bbc23cabc5e2fc81f8ea781107a83e41504edcf42d3dcde7079b091f1070596566df1f2180d226dcab21d8c388d7505d0fb171a7
DIST gdk-sys-0.9.1.crate 59958 BLAKE2B 9e0c30d138b908ff56dfe9db5b0ed75a1ed14c9f3158df3b595346888cc40c08d8df8d204ab59fff8391a87396cf6c29a9881c8dfb5fdeb3e8d82bff76869961 SHA512 9064f3a0f9e1512ca1eeb5a0ca27234d908948f53b0c4d7d38aeb184ca83846812187fa485a35bb311f778e4d14e25ac0353cd3c4b8d5002fd03e9bce2f82dcd
DIST gio-0.7.0.crate 123602 BLAKE2B 6f1d4e5f1bcba83495c5c5181d7ac39b437c33ff016d26292763266a49aca4320e2db9ae8dd5c2a1036739a10c709133575e411bcc24f80eda7f294b3df2a61b SHA512 2d46776fc64b9d63fd8dbd485ea3fc80a49bb86ff945628c81f33f877243c747fadae3bbb6ce228ca3e96870655a57c4d2881ee1454da2e310a7ad83d4a0e952
DIST gio-sys-0.9.1.crate 70278 BLAKE2B 58e92398a7df7faf06c5f6ab0bdd1d5fa5e31dca2c578b3b0156dd710a9ad1e65a896441ac68e81aae245bcc98e6d8c964ad5cfd83efeea17594e8aca3e18124 SHA512 d254e9fc43d7e173491e8f39afb6314f9dc357576f1d278669dac9d95c487d4cc91a31a248ae11ca1800c397dc528f55844ef909d8da474c09ae69c291b75a02
DIST glib-0.8.2.crate 121579 BLAKE2B 34de3fc241b2dc40f5c57fb0474fba70b838babc7acbb57391dc5182f3f29f27be4585a2856f0ff99a9cebb7521689e094f8e7e494abbe78c863ce63c4fd3f39 SHA512 7b86a1581c30cd9de24d9f1bd915dc020679237b62cef34ef85e07a0aa9151e26b0356536281fc769aeb4788265310f5d6becd63ed503e0662a284f17228a0fd
DIST glib-sys-0.9.1.crate 49213 BLAKE2B b3e44c85bcb5ea059bc1c67ffd02cd1893f11a1b40401a224383a5e824580bc5a3fc3700b507aa00fa04d249c00ff15d4f529add549cc791ce7c364c96180077 SHA512 03a2f045399e7605830d5a8616380a55854aec25c9f97b2d9f994e94ba1d0eee3026022f2b7980b84f81bc5a617efa71ffe6b6f63fcb19ae117b39432cb6f5d9
DIST gobject-sys-0.9.1.crate 17741 BLAKE2B 1fcfd31fd63f03a80ed4656b8eab30deecb469f622da1da36448df1f9d4b7908d8627c52c1fd4a879a3e92ca1faf13c9e209df13084f97874fa0a0319f126d0c SHA512 4ba8006daa38f9311341bc1fe9a2fd0ccc6fbc69321fd615186f81d73e388e7368f994a4be0d82fd4c2c4761973ce4fdec978571fb8ac2bc268748dccb6a0522
DIST gtk-0.7.0.crate 499790 BLAKE2B ce5459f73c2ef5e9189e002bb9cbf659eaa1f10dcd8b7bb97613d9f30f6cf0736c712bb1ac1ad0205ab15aad97e3c368932dc47a9d16743dd8fc1f3cc024965c SHA512 e018b6f6807b5c06691f11cd942f665cb754c1cb7863498c1bd4f4bd539525349f1672e1dccb116a464134ff72641f8109d430d2a83898afbfa207442b840a46
DIST gtk-sys-0.9.2.crate 125577 BLAKE2B fb1ac82f8e6f49cdee5e49666b85d5b3ed578a526d2e74f0c0913d57b7fac113fb9f35a5ff840ca6a29c0b0d4549e5ce0dd84d54b9adb8ecaeea73ed3ff07738 SHA512 4e3c61289dfed69743332f7b7986a8a1a63ba0b62bfc6e673a8ca44c9b25db485aeb5a28bd69cb3f6984dae1f2de06035f3441b2d212296b13df742f13bae1c1
DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
DIST libc-0.2.97.crate 517712 BLAKE2B ad769579a8e89e9e0ea6a08b8fd82b69a3a299721d63b63efcb436b333021c097933565e86f4b66ffcce6a589718bed2aacb36b80a936dd3dda763b9c0c240d7 SHA512 9b94a43d7da1e419900f7a016d5eb958bc42a006e1bb621ab8e2be2167e91f05cee81144c25e81a85c1b1ea2a26ff88980a4cc292fd42db8b09c5c49bf5531ed
DIST linked-hash-map-0.5.4.crate 16166 BLAKE2B d6bfa091265355ae124885f76212c968f2a87af80f3d306c13223ab7fa1d6a449ffda8d042bdb887501d2ffd8adbc638f18cdfeefc16c39a1eb9f57b7c658bf0 SHA512 2938883357ec0e7d9c9fc5746063ae419c97250ddceeb8de3480c89e97e0a29d175cc9199bdb3ddf81cd5d6a2a1e319ee1644a7309eea96058221074cf87c0b6
DIST maplit-1.0.2.crate 8871 BLAKE2B 3cf975d35de2d2fbd50227a6d2c5e72227e99197b620c8f29be97bd3666ec162deeef0d9e6bd327a063f175201beeb73c4ed27272449b1df0b78238b2d36ca22 SHA512 917b5cf665e12b687035c895b60b2ae05622963f495f5693515fd24d56f49e95a06ffced68606d061bd20822c655100035930673fd4b0d4790168763b6961a9f
DIST memmap-0.7.0.crate 15214 BLAKE2B 44a5bde9b85b2c378fd4c6ebfaa322ef8d0076472d6c7322f7aa95b8aba3514fd5212b4429eb369d30d0327377e36c626de474ea5e1f764bd4fae595680a04f8 SHA512 3a7c7f963111c2afeaa0381aaa6a57f0f57600392693ee1807d54771bc058ea0f86ac6e8afbe858e45f9f17b685430bf256dba1126b8074ace3aafc07bc14bfa
DIST pango-0.7.0.crate 41066 BLAKE2B 5bb58db5a2221925784993eb110fe9e55db5f31b90a6c174d560266dafabe9e7115f3e482f3bd1fe173309889e0617003b11ed65866411412b7f2066306e324c SHA512 6bccd8f21b467877a36473220da34fa2f67657b3ae24577f03d77fdac0cbc69d68624809697645e16742f1a3a499ec0b36a9a3723ca33fd34fd665290246c27f
DIST pango-sys-0.9.1.crate 21273 BLAKE2B 62cc1f12c8a30710d3b56eeef89afc00c1c0153526818d3bc82636f1c3e13dfbd49812e54045b6dbf6f80205c036f58050d1bdc6425e165dfa87987bfccf1575 SHA512 4fd2f3f74497f134946b33a2822b054758c390c345ebd4375540a7adcc000fadf562d8e8ecb4fb05b3e5824982dc4156c450ee61f6b8a1315d5dd488124b10ac
DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
DIST proc-macro2-1.0.27.crate 38625 BLAKE2B a55e2404e3c7444c6da8aca6c0e7702b865ec56cfd2c20fec319e737fc83b00bbf505c15dadaa8740d5a6d07c089ed4854a173049b1be9872bba132ae7cbc8db SHA512 3227bcaa726e88bfdb1b4d1243a4eb216ad2394a7a3b4b258de342ac76a1ab1a39a07f28f3490e42e2c2034176bf0d84b1c1fcadba2444c0abcc5878b02f93a4
DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
DIST regex-1.3.9.crate 236683 BLAKE2B 29bd39b138a8168015bb7a6b36bb5f7f9918b7c00bca28a720f3dffd5b805d3374a6648a04792585e85922e099faf547e5d02aeb23008b7802424351633ea23a SHA512 425713d3eeb4132d4056e6c1a08bc2fa5032b9971987c531b5707a9b5670ae15f037bd68921f1545580801957d1ea283eff87e533477364c7f76823800202f74
DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
DIST serde-1.0.126.crate 75138 BLAKE2B 51f37473483da8a05670a213f02e119173e4c97a49313cf855ff3e547bb0969fcd84ccb7d1554e7c1761b388ac5cd917cd7e680e3ac23d2504412f75401c0937 SHA512 f22ec92b2eaed0819610ae2c4471eb12aa3a4209f5fbfe829c2329010813837d11ffc02d7809335df6a978cf7944095fae79c7593324dfd49becc7633dd626ed
DIST serde_derive-1.0.126.crate 54189 BLAKE2B fa3ca8ef2e7d9bd29e682ac7df066bab05301c2b92dc8f12d254a7e8b29e8d8a83d5405def3050db00f7e396fdd14f18cfac7918a5218d4b6822463c7c0f5c5d SHA512 e3c430b82def037d2f1dcc96ff7dc075636c81ab8f12e07ba09d232bc8224204c7b0cddc994c1ec98400e50340e03d6bad0dfa624b4d869e5f29d72b293d30bf
DIST serde_yaml-0.8.17.crate 40805 BLAKE2B 8f70ed3efa5afa1f8f45b2c107463799269d745705ac2b90e8ce69c090f4f52721d49723dc48967bdbab30efe853c661631063fe16bc3ceaed4d0158f90ffbcb SHA512 3e7a4baa156ca1d9655a76fbaccd2d87b6929165972f6390316c9d4d55fc9815827e3c4bbb8a1c594f048dcc9c3fd6f4c55370df27f6257dbc28e2066274a7c1
DIST squeekboard-1.17.1.tar.gz 186976 BLAKE2B 18499f3baedaa587a4a57d2a1ceb6cd4b7424482ae08d7770d49a97adde9e1dfe54a479742dfda566256147f4e99b9191550122c3ec15fd57be55f812a5219b9 SHA512 e0c5a713b3ee60d8d4ec38e955be23300c6b5b8d174c57ca6c159a077e3478f9ef0d3160b3860dd83ebaac954a187e75ffc65690add4845e6d9144f6e30c0fce
DIST syn-1.0.73.crate 232706 BLAKE2B c580f9ab914c54e731c8503c9b9d577d05032edb6bd12d7a183a3c0e3532fcf24196479a9ee40d09cb7e09ba6d94add36e338331affc2625058ce54419621ee4 SHA512 b37beb1b6d483cfdbc44d806af9955cdf52c4b0d5f918782019b089d06e107c7e23ced343a3bece20235a24752783795ebba8e603b61a6302e82ee7027843d8b
DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
DIST xkbcommon-0.4.0.crate 57500 BLAKE2B 16f1dddb82ff216088af9724ed4dc83469625e2c40e1ffed18b10b544f4e1dd8a7cc3570f5650407040adf09fc767e6d6c8474d838a3054ec11fa25d422eb321 SHA512 968dba8b059de25219cab2416aaa696cd937013cdbad33e77007f1ba64ff0d393dc6c6ba9ac9991292837a1e69af99fedbeeb46b8320b1d3906e8cb7a24ec372
DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0

View File

@@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gjdijkman@gjdwebserver.nl</email>
<name>Gerben Jan Dijkman</name>
</maintainer>
<upstream>
<bugs-to>https://source.puri.sm/Librem5/squeekboard/-/issues</bugs-to>
<remote-id type="gnome-gitlab">World/Phosh/squeekboard</remote-id>
</upstream>
</pkgmetadata>

View File

@@ -1,101 +0,0 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
CRATES="
atk@0.7.0
atk-sys@0.9.1
bitflags@1.2.1
cairo-rs@0.7.1
cairo-sys-rs@0.9.2
cc@1.0.68
clap@2.33.3
dtoa@0.4.8
fragile@0.3.0
gdk@0.11.0
gdk-pixbuf@0.7.0
gdk-pixbuf-sys@0.9.1
gdk-sys@0.9.1
gio@0.7.0
gio-sys@0.9.1
glib@0.8.2
glib-sys@0.9.1
gobject-sys@0.9.1
gtk@0.7.0
gtk-sys@0.9.2
lazy_static@1.4.0
libc@0.2.97
linked-hash-map@0.5.4
maplit@1.0.2
memmap@0.7.0
pango@0.7.0
pango-sys@0.9.1
pkg-config@0.3.19
proc-macro2@1.0.27
quote@1.0.9
regex@1.3.9
regex-syntax@0.6.25
serde@1.0.126
serde_derive@1.0.126
serde_yaml@0.8.17
syn@1.0.73
textwrap@0.11.0
unicode-width@0.1.8
unicode-xid@0.2.2
winapi@0.3.9
winapi-i686-pc-windows-gnu@0.4.0
winapi-x86_64-pc-windows-gnu@0.4.0
xkbcommon@0.4.0
yaml-rust@0.4.5
"
inherit cargo gnome2-utils meson toolchain-funcs xdg
DESCRIPTION="Virtual keyboard supporting Wayland, built primarily for the Librem 5 phone"
HOMEPAGE="https://gitlab.gnome.org/World/Phosh/squeekboard"
SRC_URI="
https://gitlab.gnome.org/World/Phosh/squeekboard/-/archive/v${PV}/squeekboard-v${PV}.tar.gz -> ${P}.tar.gz
${CARGO_CRATE_URIS}
"
S="${WORKDIR}/${PN}-v${PV}"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~arm64"
RDEPEND="
${PYTHON_DEPS}
dev-libs/feedbackd
dev-libs/wayland
dev-libs/wayland-protocols
gnome-base/gnome-desktop
media-fonts/noto-emoji
x11-libs/gtk+:3[wayland]
"
BDEPEND="
dev-util/gtk-doc
dev-util/intltool
virtual/pkgconfig
"
QA_FLAGS_IGNORED="/usr/bin/squeekboard-test-layout"
src_install() {
CC="$(tc-getCC)"
meson_src_install
insinto /usr/bin
doins "${S}/tools/squeekboard-restyled"
}
pkg_postinst() {
xdg_pkg_postinst
gnome2_schemas_update
}
pkg_postrm() {
xdg_pkg_postrm
gnome2_schemas_update
}

View File

@@ -80,22 +80,6 @@ dev-python/prawcore
dev-python/sphinx-rtd-dark-mode
dev-python/betamax-serializers
# Takuya Wakazono <pastalian46@gmail.com> (2024-11-17)
# This ebuild has been broken since 2022 because it tries to pull
# dependencies from the internet.
# Removal on 2024-12-17. Bug #817947, #924133.
phosh-base/squeekboard
# Takuya Wakazono <pastalian46@gmail.com> (2024-11-17)
# Unmaintained since 2021, no maintainer.
# Removal on 2024-12-17.
media-gfx/grafx2
# Takuya Wakazono <pastalian46@gmail.com> (2024-11-17)
# Unmaintained in guru, no reverse dependencies.
# Removal on 2024-12-17.
dev-libs/properties-cpp
# Julien Roy <julien@jroy.ca> (2024-11-15)
# >=x11-themes/adw-gtk3-5.4 requires >=gui-libs/gtk-4.16
# which is not packaged in ::gentoo

View File

@@ -9,6 +9,5 @@ move dev-python/pifpaf dev-util/pifpaf
move x11-wm/phoc gui-wm/phoc
move gui-wm/phosh phosh-base/phosh-shell
move gui-apps/phosh-tour phosh-base/phosh-tour
move x11-misc/squeekboard phosh-base/squeekboard
move sys-devel/gdb-dashboard dev-debug/gdb-dashboard
move app-editors/kak-lsp app-editors/kakoune-lsp