mirror of
https://github.com/gentoo-mirror/guru.git
synced 2026-07-15 18:13:10 -04:00
Merge updates from master
This commit is contained in:
Repository mirror & CI
@@ -13,5 +13,8 @@
|
||||
</longdescription>
|
||||
<upstream>
|
||||
<remote-id type="github">kernaltrap8/tinyfetch</remote-id>
|
||||
</upstream>
|
||||
</upstream>
|
||||
<use>
|
||||
<flag name="pci">Enables the use of pciutils to detect GPU names</flag>
|
||||
</use>
|
||||
</pkgmetadata>
|
||||
|
||||
@@ -5,12 +5,18 @@ EAPI=8
|
||||
|
||||
inherit meson
|
||||
|
||||
DESCRIPTION="fetch program written in pure C"
|
||||
HOMEPAGE="https://github.com/kernaltrap8/tinyfetch"
|
||||
|
||||
if [[ ${PV} == 9999 ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://github.com/kernaltrap8/tinyfetch"
|
||||
S="${WORKDIR}/${PN}-9999"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
|
||||
IUSE="+pci"
|
||||
|
||||
RDEPEND="
|
||||
@@ -19,16 +25,3 @@ RDEPEND="
|
||||
)
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
DESCRIPTION="fetch program written in pure C"
|
||||
HOMEPAGE="https://github.com/kernaltrap8/tinyfetch"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
|
||||
src_unpack() {
|
||||
if use pci ; then
|
||||
EGIT_BRANCH=pci
|
||||
fi
|
||||
git-r3_src_unpack
|
||||
}
|
||||
|
||||
@@ -9,4 +9,7 @@
|
||||
<remote-id type="github">sxyazi/yazi</remote-id>
|
||||
<bugs-to>https://github.com/sxyazi/yazi/issues</bugs-to>
|
||||
</upstream>
|
||||
<use>
|
||||
<flag name="cli">Install CLI Data Distribution Service</flag>
|
||||
</use>
|
||||
</pkgmetadata>
|
||||
|
||||
@@ -324,7 +324,11 @@ LICENSE+="
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
QA_FLAGS_IGNORED="usr/bin/${PN}"
|
||||
IUSE="+cli"
|
||||
|
||||
QA_FLAGS_IGNORED="
|
||||
usr/bin/ya.*
|
||||
"
|
||||
|
||||
DOCS=(
|
||||
README.md
|
||||
@@ -336,13 +340,26 @@ src_prepare() {
|
||||
eapply_user
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cargo_src_compile
|
||||
use cli && cargo_src_compile -p "${PN}-cli"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin target/$(usex debug debug release)/yazi
|
||||
dobin "$(cargo_target_dir)/${PN}"
|
||||
use cli && dobin "$(cargo_target_dir)/ya"
|
||||
|
||||
newbashcomp "${S}/yazi-boot/completions/${PN}.bash" "${PN}"
|
||||
dozshcomp "${S}/yazi-boot/completions/_${PN}"
|
||||
dofishcomp "${S}/yazi-boot/completions/${PN}.fish"
|
||||
|
||||
if use cli
|
||||
then
|
||||
newbashcomp "${S}/yazi-cli/completions/ya.bash" "ya"
|
||||
dozshcomp "${S}/yazi-cli/completions/_ya"
|
||||
dofishcomp "${S}/yazi-cli/completions/ya.fish"
|
||||
fi
|
||||
|
||||
domenu "assets/${PN}.desktop"
|
||||
einstalldocs
|
||||
}
|
||||
2
app-text/jrnl/Manifest
Normal file
2
app-text/jrnl/Manifest
Normal file
@@ -0,0 +1,2 @@
|
||||
DIST jrnl-4.1.tar.gz 671439 BLAKE2B f5781f1dd042e89779e8437765abedb76ab71cfe48ea14d5f8ff1b8a32d5d1d73a78b125615cf868964f8fab21833d3b923ad07b7893b652938963339c6db2b0 SHA512 c5e17b8dd863cdf251f5622099e07645d65ecb27a4b765df6b6c6f89a482e73b800e4906f14ffffc9567b3f9620f87f98fcc0b5ae355a22368f90a3279718252
|
||||
DIST jrnl-9999.tar.gz 672471 BLAKE2B ad5403f4ffa3e89baece625e9b247517b5413eea2eb4f4aff68404309309a25bd718da9f8cacb05241de84619530a36e67d03a10c3cd291fd991f45a10261e95 SHA512 007eb5289b453c524aa538ec3ff4ccc9fde2a94b0564cba073ead30b509867b11d2bef34867a1c50e43fd8c41c6077ed0d2cbee434468b5757e223f10e50d1ec
|
||||
11
app-text/jrnl/files/test_fixes.patch
Normal file
11
app-text/jrnl/files/test_fixes.patch
Normal file
@@ -0,0 +1,11 @@
|
||||
--- a/tests/lib/when_steps.py
|
||||
+++ b/tests/lib/when_steps.py
|
||||
@@ -7,7 +7,7 @@
|
||||
from pytest_bdd import when
|
||||
from pytest_bdd.parsers import parse
|
||||
from pytest_bdd.parsers import re
|
||||
-from pytest_bdd.steps import inject_fixture
|
||||
+from pytest_bdd.compat import inject_fixture
|
||||
|
||||
from jrnl.main import run
|
||||
|
||||
20
app-text/jrnl/files/tomli.patch
Normal file
20
app-text/jrnl/files/tomli.patch
Normal file
@@ -0,0 +1,20 @@
|
||||
Patching out toml in favor for tomli as the latter is already included in the Gentoo repo
|
||||
|
||||
--- a/tests/lib/fixtures.py
|
||||
+++ b/tests/lib/fixtures.py
|
||||
@@ -9,7 +9,7 @@
|
||||
from unittest.mock import Mock
|
||||
from unittest.mock import patch
|
||||
|
||||
-import toml
|
||||
+import tomli
|
||||
from keyring import backend
|
||||
from keyring import errors
|
||||
from pytest import fixture
|
||||
@@ -204,7 +204,7 @@
|
||||
@fixture
|
||||
def toml_version(working_dir):
|
||||
pyproject = os.path.join(working_dir, "..", "pyproject.toml")
|
||||
- pyproject_contents = toml.load(pyproject)
|
||||
+ pyproject_contents = tomli.load(pyproject)
|
||||
return pyproject_contents["tool"]["poetry"]["version"]
|
||||
42
app-text/jrnl/jrnl-4.1.ebuild
Normal file
42
app-text/jrnl/jrnl-4.1.ebuild
Normal file
@@ -0,0 +1,42 @@
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{10..12} )
|
||||
|
||||
DISTUTILS_USE_PEP517=poetry
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Collect your thoughts and notes without leaving the command line"
|
||||
HOMEPAGE="https://jrnl.sh"
|
||||
SRC_URI="https://github.com/jrnl-org/jrnl/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="test"
|
||||
|
||||
PATCHES="
|
||||
${FILESDIR}/tomli.patch
|
||||
${FILESDIR}/test_fixes.patch
|
||||
"
|
||||
|
||||
DEPEND="
|
||||
dev-python/rich
|
||||
dev-python/colorama
|
||||
dev-python/cryptography
|
||||
dev-python/keyring
|
||||
dev-python/parsedatetime
|
||||
dev-python/python-dateutil
|
||||
dev-python/pyxdg
|
||||
dev-python/ruamel-yaml
|
||||
dev-python/tzlocal
|
||||
test? (
|
||||
<dev-python/pytest-8.1
|
||||
dev-python/pytest-bdd
|
||||
dev-python/pytest-xdist
|
||||
dev-python/tomli
|
||||
)
|
||||
"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
distutils_enable_tests pytest
|
||||
42
app-text/jrnl/jrnl-9999.ebuild
Normal file
42
app-text/jrnl/jrnl-9999.ebuild
Normal file
@@ -0,0 +1,42 @@
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{10..12} )
|
||||
|
||||
DISTUTILS_USE_PEP517=poetry
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Collect your thoughts and notes without leaving the command line"
|
||||
HOMEPAGE="https://jrnl.sh"
|
||||
SRC_URI="https://github.com/jrnl-org/jrnl/archive/refs/heads/develop.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
S="${WORKDIR}/${PN}-develop"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="test"
|
||||
|
||||
PATCHES="
|
||||
${FILESDIR}/tomli.patch
|
||||
"
|
||||
|
||||
DEPEND="
|
||||
dev-python/rich
|
||||
dev-python/colorama
|
||||
dev-python/cryptography
|
||||
dev-python/keyring
|
||||
dev-python/parsedatetime
|
||||
dev-python/python-dateutil
|
||||
dev-python/pyxdg
|
||||
dev-python/ruamel-yaml
|
||||
dev-python/tzlocal
|
||||
test? (
|
||||
dev-python/pytest
|
||||
dev-python/pytest-bdd
|
||||
dev-python/pytest-xdist
|
||||
dev-python/tomli
|
||||
)
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
distutils_enable_tests pytest
|
||||
11
app-text/jrnl/metadata.xml
Normal file
11
app-text/jrnl/metadata.xml
Normal file
@@ -0,0 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM 'https://www.gentoo.org/dtd/metadata.dtd'>
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>mailgentoo@kaats.ch</email>
|
||||
<name>Erwin Kaats</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="github">jrnl-org/jrnl</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@@ -1 +1 @@
|
||||
DIST komikku-1.48.1.tar.gz 4913987 BLAKE2B db1126a89dc93b011208153df171c1eedf8f44b1dffff455e8d0343153d88fde12a7612896389cfdbc1b61eae3c3bd09a1df86ea5de8747752a196f6a234f338 SHA512 be4731e9b3da2699f12eb39a35ff5b54cf39c55a91b68c72db6d9800129635408dff369bd2c76c8c9372ff6266d3101b43aa15880999887524db12d3df17733c
|
||||
DIST komikku-1.49.0.tar.gz 4922860 BLAKE2B 708f6c57e5023a949d0d225f0370ec477cdd8430f5cd59d309ea3619875cc4b441c065fe33823771223ce099a68f5764d27eaf6a3ab287bf818428a86678a9b6 SHA512 aef5cc7ffb7b165bc7af90fefb6029e75cde348c684862454478fce41c2bcd2308bfbe0d1455bd011011a7cdf3805aacee7a297701c6ab0931c2b5620a454df2
|
||||
|
||||
@@ -3,6 +3,8 @@
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit toolchain-funcs
|
||||
|
||||
DESCRIPTION="Utilities for Broadcom-based cable modems"
|
||||
HOMEPAGE="https://github.com/jclehner/bcm2-utils"
|
||||
SRC_URI="https://github.com/jclehner/bcm2-utils/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
@@ -19,6 +21,11 @@ src_prepare(){
|
||||
sed -i 's@shell git describe --always@shell git describe --always 2>/dev/null@' "Makefile" || die
|
||||
}
|
||||
|
||||
src_compile(){
|
||||
emake CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS} \
|
||||
LDFLAGS=${LDFLAGS}
|
||||
}
|
||||
|
||||
src_install(){
|
||||
mkdir -p "${D}/usr/bin" || die
|
||||
emake PREFIX="${D}/usr" install
|
||||
|
||||
@@ -1 +1 @@
|
||||
DIST libtypec-0.5.1.tar.gz 35289 BLAKE2B c6d9fd060e999568b3f348d68cc49665c38d0d0adcf5761e236e14b0ae095ddb06b65226a98495e804ee0bf41dc42526c78e00c1b9e8fdf2dc65a56818a10253 SHA512 9acdb2e0963d85b8f6868b0ad18f644466aa8b0bb868bafd823ac3a8179370a68f1a69c8357705c70733a1cf0a750e484c1f4aa1816a1dc887a52024f9dffcce
|
||||
DIST libtypec-0.5.2.tar.gz 37224 BLAKE2B 691c62e4be16cb02143cec3f4391272bb54bd8eafa36b43614b96a4cd086069ed41f74741f0c36d8b39e3386384f0147551754e24e2742fff9452ec410f3b4ef SHA512 9dc71ba9a6f74f04fe96f4b5b632c83c52aa2ed693b743074b4943b5a9899433cad615770f527abdfa0d86008e7b326a028d8cd50dcd2caecf9805889f286c6f
|
||||
|
||||
@@ -1,76 +0,0 @@
|
||||
From 36a5bd5a1aeccba392d9a764be0f7651d08d33ce Mon Sep 17 00:00:00 2001
|
||||
From: Adrian Ratiu <adrian.ratiu@collabora.com>
|
||||
Date: Mon, 20 May 2024 17:37:19 +0300
|
||||
Subject: [PATCH 1/3] meson: fix build based on Gentoo testing
|
||||
|
||||
While releasing v0.5.1 upstream forgot to also bump the
|
||||
meson build version. :) The meson project version was
|
||||
also not set.
|
||||
|
||||
There are also two discrepancies between meson and cmake:
|
||||
|
||||
1. meson installs libtypec.so.1 whereas cmake installs
|
||||
libtypec.so.0.5.1.
|
||||
|
||||
2. meson uses soversion = 0 for the ABI version while
|
||||
cmake uses 5.
|
||||
|
||||
We fix these discrepancies so that mesan installs the
|
||||
same files as cmake.
|
||||
|
||||
Upstream-Status: In progress [https://github.com/libtypec/libtypec/pull/1]
|
||||
|
||||
Signed-off-by: Adrian Ratiu <adrian.ratiu@collabora.com>
|
||||
---
|
||||
meson.build | 13 +++++++++++--
|
||||
utils/meson.build | 2 +-
|
||||
2 files changed, 12 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index a581926..5512f77 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -1,14 +1,23 @@
|
||||
project('libtypec','c',
|
||||
license: 'MIT',
|
||||
+version: '0.5.1',
|
||||
default_options : [
|
||||
'warning_level=0'])
|
||||
|
||||
conf_data = configuration_data()
|
||||
conf_data.set('libtypec_VERSION_MAJOR', '0')
|
||||
conf_data.set('libtypec_VERSION_MINOR', '5')
|
||||
-conf_data.set('libtypec_VERSION_PATCH', '0')
|
||||
+conf_data.set('libtypec_VERSION_PATCH', '1')
|
||||
|
||||
+libudev_dep = dependency('libudev', required: true)
|
||||
|
||||
configure_file(input : 'libtypec_config.h.in', output : 'libtypec_config.h', configuration : conf_data)
|
||||
|
||||
-both_libraries('typec', 'libtypec.c', 'libtypec_sysfs_ops.c', 'libtypec_dbgfs_ops.c', soversion : '1')
|
||||
\ No newline at end of file
|
||||
+library('typec',
|
||||
+ 'libtypec.c',
|
||||
+ 'libtypec_sysfs_ops.c',
|
||||
+ 'libtypec_dbgfs_ops.c',
|
||||
+ version : '0.5.1',
|
||||
+ soversion : '5',
|
||||
+ dependencies: libudev_dep,
|
||||
+)
|
||||
\ No newline at end of file
|
||||
diff --git a/utils/meson.build b/utils/meson.build
|
||||
index d901167..8519541 100644
|
||||
--- a/utils/meson.build
|
||||
+++ b/utils/meson.build
|
||||
@@ -6,7 +6,7 @@ default_options : [
|
||||
conf_data = configuration_data()
|
||||
conf_data.set('libtypec_utils_VERSION_MAJOR', '0')
|
||||
conf_data.set('libtypec_utils_VERSION_MINOR', '5')
|
||||
-conf_data.set('libtypec_utils_VERSION_PATCH', '0')
|
||||
+conf_data.set('libtypec_utils_VERSION_PATCH', '1')
|
||||
|
||||
|
||||
configure_file(input : 'libtypec_utils_config.h.in', output : 'libtypec_utils_config.h', configuration : conf_data)
|
||||
--
|
||||
2.44.1
|
||||
|
||||
@@ -1,74 +0,0 @@
|
||||
From b59c48ce61eeca56742a4164f42139997cf84363 Mon Sep 17 00:00:00 2001
|
||||
From: Adrian Ratiu <adrian.ratiu@collabora.com>
|
||||
Date: Tue, 21 May 2024 11:52:05 +0300
|
||||
Subject: [PATCH 3/3] meson.build: install lib and headers
|
||||
|
||||
This ensures lib and headers are properly installed in
|
||||
meson build, without having to hardcode for eg the builddir.
|
||||
|
||||
Upstream-Status: In progress [https://github.com/libtypec/libtypec/pull/1]
|
||||
|
||||
Signed-off-by: Adrian Ratiu <adrian.ratiu@collabora.com>
|
||||
---
|
||||
meson.build | 7 +++++++
|
||||
utils/meson.build | 25 +++++++++++++++++++++----
|
||||
2 files changed, 28 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 7a7c28a..903c506 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -21,4 +21,11 @@ library('typec',
|
||||
version : meson.project_version(),
|
||||
soversion : '5',
|
||||
dependencies: libudev_dep,
|
||||
+ install: true,
|
||||
+)
|
||||
+
|
||||
+install_headers(
|
||||
+ 'libtypec.h',
|
||||
+ meson.current_build_dir() + '/libtypec_config.h',
|
||||
+ install_dir: 'include'
|
||||
)
|
||||
diff --git a/utils/meson.build b/utils/meson.build
|
||||
index 9bd2245..7796d0a 100644
|
||||
--- a/utils/meson.build
|
||||
+++ b/utils/meson.build
|
||||
@@ -12,13 +12,30 @@ conf_data.set('libtypec_utils_VERSION_PATCH', split[2])
|
||||
|
||||
configure_file(input : 'libtypec_utils_config.h.in', output : 'libtypec_utils_config.h', configuration : conf_data)
|
||||
|
||||
+# Include current build dir for the above generated file
|
||||
+inc_dir = include_directories('.')
|
||||
+
|
||||
cc = meson.get_compiler('c')
|
||||
|
||||
dep = declare_dependency(
|
||||
- dependencies : cc.find_library('typec', dirs : [meson.current_source_dir()]),
|
||||
- include_directories : include_directories('../../builddir/'),
|
||||
+ dependencies : cc.find_library('typec')
|
||||
)
|
||||
+
|
||||
udev_dep = meson.get_compiler('c').find_library('udev')
|
||||
|
||||
-executable('lstypec', 'lstypec.c', 'names.c' ,dependencies : [dep,udev_dep])
|
||||
-executable('typecstatus', 'typecstatus.c', 'names.c',dependencies : [dep,udev_dep])
|
||||
+executable(
|
||||
+ 'lstypec',
|
||||
+ 'lstypec.c', 'names.c',
|
||||
+ dependencies: [dep, udev_dep],
|
||||
+ include_directories: inc_dir,
|
||||
+ install: true,
|
||||
+ install_dir: get_option('bindir')
|
||||
+)
|
||||
+executable(
|
||||
+ 'typecstatus',
|
||||
+ 'typecstatus.c', 'names.c',
|
||||
+ dependencies: [dep, udev_dep],
|
||||
+ include_directories: inc_dir,
|
||||
+ install: true,
|
||||
+ install_dir: get_option('bindir')
|
||||
+)
|
||||
--
|
||||
2.44.1
|
||||
|
||||
@@ -1,73 +0,0 @@
|
||||
From 56f5af15bc4796cf903ef5e9f82ed8514190e6bf Mon Sep 17 00:00:00 2001
|
||||
From: Adrian Ratiu <adrian.ratiu@collabora.com>
|
||||
Date: Tue, 21 May 2024 10:38:37 +0300
|
||||
Subject: [PATCH 2/3] meson.build: reduce version duplication
|
||||
|
||||
Gentoo dev Matt Turner asked us to reduce version duplication
|
||||
in the meson.build files, to decrease the risks of getting
|
||||
the version wrong like in the past by forgetting to bump the
|
||||
minor version everywhere the version number is hardcoded.
|
||||
|
||||
Upstream-Status: In progress [https://github.com/libtypec/libtypec/pull/1]
|
||||
|
||||
Signed-off-by: Adrian Ratiu <adrian.ratiu@collabora.com>
|
||||
---
|
||||
meson.build | 11 ++++++-----
|
||||
utils/meson.build | 9 +++++----
|
||||
2 files changed, 11 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 5512f77..7a7c28a 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -5,9 +5,10 @@ default_options : [
|
||||
'warning_level=0'])
|
||||
|
||||
conf_data = configuration_data()
|
||||
-conf_data.set('libtypec_VERSION_MAJOR', '0')
|
||||
-conf_data.set('libtypec_VERSION_MINOR', '5')
|
||||
-conf_data.set('libtypec_VERSION_PATCH', '1')
|
||||
+split = meson.project_version().split('.')
|
||||
+conf_data.set('libtypec_VERSION_MAJOR', split[0])
|
||||
+conf_data.set('libtypec_VERSION_MINOR', split[1])
|
||||
+conf_data.set('libtypec_VERSION_PATCH', split[2])
|
||||
|
||||
libudev_dep = dependency('libudev', required: true)
|
||||
|
||||
@@ -17,7 +18,7 @@ library('typec',
|
||||
'libtypec.c',
|
||||
'libtypec_sysfs_ops.c',
|
||||
'libtypec_dbgfs_ops.c',
|
||||
- version : '0.5.1',
|
||||
+ version : meson.project_version(),
|
||||
soversion : '5',
|
||||
dependencies: libudev_dep,
|
||||
-)
|
||||
\ No newline at end of file
|
||||
+)
|
||||
diff --git a/utils/meson.build b/utils/meson.build
|
||||
index 8519541..9bd2245 100644
|
||||
--- a/utils/meson.build
|
||||
+++ b/utils/meson.build
|
||||
@@ -1,13 +1,14 @@
|
||||
project('libtypec_utils','c',
|
||||
license: 'MIT',
|
||||
+version: '0.5.1',
|
||||
default_options : [
|
||||
'warning_level=0'])
|
||||
|
||||
conf_data = configuration_data()
|
||||
-conf_data.set('libtypec_utils_VERSION_MAJOR', '0')
|
||||
-conf_data.set('libtypec_utils_VERSION_MINOR', '5')
|
||||
-conf_data.set('libtypec_utils_VERSION_PATCH', '1')
|
||||
-
|
||||
+split = meson.project_version().split('.')
|
||||
+conf_data.set('libtypec_utils_VERSION_MAJOR', split[0])
|
||||
+conf_data.set('libtypec_utils_VERSION_MINOR', split[1])
|
||||
+conf_data.set('libtypec_utils_VERSION_PATCH', split[2])
|
||||
|
||||
configure_file(input : 'libtypec_utils_config.h.in', output : 'libtypec_utils_config.h', configuration : conf_data)
|
||||
|
||||
--
|
||||
2.44.1
|
||||
|
||||
@@ -9,12 +9,6 @@ DESCRIPTION="Library to interface with USB Type-C/Power Delivery devices"
|
||||
HOMEPAGE="https://github.com/libtypec/libtypec"
|
||||
SRC_URI="https://github.com/libtypec/libtypec/archive/refs/tags/libtypec-${PV}.tar.gz"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-0.5.1-meson-fix-build-based-on-Gentoo-testing.patch
|
||||
"${FILESDIR}"/${PN}-0.5.1-meson.build-reduce-version-duplication.patch
|
||||
"${FILESDIR}"/${PN}-0.5.1-meson.build-install-lib-and-headers.patch
|
||||
)
|
||||
|
||||
S="${WORKDIR}/libtypec-libtypec-${PV}"
|
||||
|
||||
LICENSE="MIT"
|
||||
@@ -1 +1 @@
|
||||
DIST libtypec-0.5.1.tar.gz 35289 BLAKE2B c6d9fd060e999568b3f348d68cc49665c38d0d0adcf5761e236e14b0ae095ddb06b65226a98495e804ee0bf41dc42526c78e00c1b9e8fdf2dc65a56818a10253 SHA512 9acdb2e0963d85b8f6868b0ad18f644466aa8b0bb868bafd823ac3a8179370a68f1a69c8357705c70733a1cf0a750e484c1f4aa1816a1dc887a52024f9dffcce
|
||||
DIST libtypec-0.5.2.tar.gz 37224 BLAKE2B 691c62e4be16cb02143cec3f4391272bb54bd8eafa36b43614b96a4cd086069ed41f74741f0c36d8b39e3386384f0147551754e24e2742fff9452ec410f3b4ef SHA512 9dc71ba9a6f74f04fe96f4b5b632c83c52aa2ed693b743074b4943b5a9899433cad615770f527abdfa0d86008e7b326a028d8cd50dcd2caecf9805889f286c6f
|
||||
|
||||
@@ -1,76 +0,0 @@
|
||||
From 36a5bd5a1aeccba392d9a764be0f7651d08d33ce Mon Sep 17 00:00:00 2001
|
||||
From: Adrian Ratiu <adrian.ratiu@collabora.com>
|
||||
Date: Mon, 20 May 2024 17:37:19 +0300
|
||||
Subject: [PATCH 1/3] meson: fix build based on Gentoo testing
|
||||
|
||||
While releasing v0.5.1 upstream forgot to also bump the
|
||||
meson build version. :) The meson project version was
|
||||
also not set.
|
||||
|
||||
There are also two discrepancies between meson and cmake:
|
||||
|
||||
1. meson installs libtypec.so.1 whereas cmake installs
|
||||
libtypec.so.0.5.1.
|
||||
|
||||
2. meson uses soversion = 0 for the ABI version while
|
||||
cmake uses 5.
|
||||
|
||||
We fix these discrepancies so that mesan installs the
|
||||
same files as cmake.
|
||||
|
||||
Upstream-Status: In progress [https://github.com/libtypec/libtypec/pull/1]
|
||||
|
||||
Signed-off-by: Adrian Ratiu <adrian.ratiu@collabora.com>
|
||||
---
|
||||
meson.build | 13 +++++++++++--
|
||||
utils/meson.build | 2 +-
|
||||
2 files changed, 12 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index a581926..5512f77 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -1,14 +1,23 @@
|
||||
project('libtypec','c',
|
||||
license: 'MIT',
|
||||
+version: '0.5.1',
|
||||
default_options : [
|
||||
'warning_level=0'])
|
||||
|
||||
conf_data = configuration_data()
|
||||
conf_data.set('libtypec_VERSION_MAJOR', '0')
|
||||
conf_data.set('libtypec_VERSION_MINOR', '5')
|
||||
-conf_data.set('libtypec_VERSION_PATCH', '0')
|
||||
+conf_data.set('libtypec_VERSION_PATCH', '1')
|
||||
|
||||
+libudev_dep = dependency('libudev', required: true)
|
||||
|
||||
configure_file(input : 'libtypec_config.h.in', output : 'libtypec_config.h', configuration : conf_data)
|
||||
|
||||
-both_libraries('typec', 'libtypec.c', 'libtypec_sysfs_ops.c', 'libtypec_dbgfs_ops.c', soversion : '1')
|
||||
\ No newline at end of file
|
||||
+library('typec',
|
||||
+ 'libtypec.c',
|
||||
+ 'libtypec_sysfs_ops.c',
|
||||
+ 'libtypec_dbgfs_ops.c',
|
||||
+ version : '0.5.1',
|
||||
+ soversion : '5',
|
||||
+ dependencies: libudev_dep,
|
||||
+)
|
||||
\ No newline at end of file
|
||||
diff --git a/utils/meson.build b/utils/meson.build
|
||||
index d901167..8519541 100644
|
||||
--- a/utils/meson.build
|
||||
+++ b/utils/meson.build
|
||||
@@ -6,7 +6,7 @@ default_options : [
|
||||
conf_data = configuration_data()
|
||||
conf_data.set('libtypec_utils_VERSION_MAJOR', '0')
|
||||
conf_data.set('libtypec_utils_VERSION_MINOR', '5')
|
||||
-conf_data.set('libtypec_utils_VERSION_PATCH', '0')
|
||||
+conf_data.set('libtypec_utils_VERSION_PATCH', '1')
|
||||
|
||||
|
||||
configure_file(input : 'libtypec_utils_config.h.in', output : 'libtypec_utils_config.h', configuration : conf_data)
|
||||
--
|
||||
2.44.1
|
||||
|
||||
@@ -1,74 +0,0 @@
|
||||
From b59c48ce61eeca56742a4164f42139997cf84363 Mon Sep 17 00:00:00 2001
|
||||
From: Adrian Ratiu <adrian.ratiu@collabora.com>
|
||||
Date: Tue, 21 May 2024 11:52:05 +0300
|
||||
Subject: [PATCH 3/3] meson.build: install lib and headers
|
||||
|
||||
This ensures lib and headers are properly installed in
|
||||
meson build, without having to hardcode for eg the builddir.
|
||||
|
||||
Upstream-Status: In progress [https://github.com/libtypec/libtypec/pull/1]
|
||||
|
||||
Signed-off-by: Adrian Ratiu <adrian.ratiu@collabora.com>
|
||||
---
|
||||
meson.build | 7 +++++++
|
||||
utils/meson.build | 25 +++++++++++++++++++++----
|
||||
2 files changed, 28 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 7a7c28a..903c506 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -21,4 +21,11 @@ library('typec',
|
||||
version : meson.project_version(),
|
||||
soversion : '5',
|
||||
dependencies: libudev_dep,
|
||||
+ install: true,
|
||||
+)
|
||||
+
|
||||
+install_headers(
|
||||
+ 'libtypec.h',
|
||||
+ meson.current_build_dir() + '/libtypec_config.h',
|
||||
+ install_dir: 'include'
|
||||
)
|
||||
diff --git a/utils/meson.build b/utils/meson.build
|
||||
index 9bd2245..7796d0a 100644
|
||||
--- a/utils/meson.build
|
||||
+++ b/utils/meson.build
|
||||
@@ -12,13 +12,30 @@ conf_data.set('libtypec_utils_VERSION_PATCH', split[2])
|
||||
|
||||
configure_file(input : 'libtypec_utils_config.h.in', output : 'libtypec_utils_config.h', configuration : conf_data)
|
||||
|
||||
+# Include current build dir for the above generated file
|
||||
+inc_dir = include_directories('.')
|
||||
+
|
||||
cc = meson.get_compiler('c')
|
||||
|
||||
dep = declare_dependency(
|
||||
- dependencies : cc.find_library('typec', dirs : [meson.current_source_dir()]),
|
||||
- include_directories : include_directories('../../builddir/'),
|
||||
+ dependencies : cc.find_library('typec')
|
||||
)
|
||||
+
|
||||
udev_dep = meson.get_compiler('c').find_library('udev')
|
||||
|
||||
-executable('lstypec', 'lstypec.c', 'names.c' ,dependencies : [dep,udev_dep])
|
||||
-executable('typecstatus', 'typecstatus.c', 'names.c',dependencies : [dep,udev_dep])
|
||||
+executable(
|
||||
+ 'lstypec',
|
||||
+ 'lstypec.c', 'names.c',
|
||||
+ dependencies: [dep, udev_dep],
|
||||
+ include_directories: inc_dir,
|
||||
+ install: true,
|
||||
+ install_dir: get_option('bindir')
|
||||
+)
|
||||
+executable(
|
||||
+ 'typecstatus',
|
||||
+ 'typecstatus.c', 'names.c',
|
||||
+ dependencies: [dep, udev_dep],
|
||||
+ include_directories: inc_dir,
|
||||
+ install: true,
|
||||
+ install_dir: get_option('bindir')
|
||||
+)
|
||||
--
|
||||
2.44.1
|
||||
|
||||
@@ -1,73 +0,0 @@
|
||||
From 56f5af15bc4796cf903ef5e9f82ed8514190e6bf Mon Sep 17 00:00:00 2001
|
||||
From: Adrian Ratiu <adrian.ratiu@collabora.com>
|
||||
Date: Tue, 21 May 2024 10:38:37 +0300
|
||||
Subject: [PATCH 2/3] meson.build: reduce version duplication
|
||||
|
||||
Gentoo dev Matt Turner asked us to reduce version duplication
|
||||
in the meson.build files, to decrease the risks of getting
|
||||
the version wrong like in the past by forgetting to bump the
|
||||
minor version everywhere the version number is hardcoded.
|
||||
|
||||
Upstream-Status: In progress [https://github.com/libtypec/libtypec/pull/1]
|
||||
|
||||
Signed-off-by: Adrian Ratiu <adrian.ratiu@collabora.com>
|
||||
---
|
||||
meson.build | 11 ++++++-----
|
||||
utils/meson.build | 9 +++++----
|
||||
2 files changed, 11 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 5512f77..7a7c28a 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -5,9 +5,10 @@ default_options : [
|
||||
'warning_level=0'])
|
||||
|
||||
conf_data = configuration_data()
|
||||
-conf_data.set('libtypec_VERSION_MAJOR', '0')
|
||||
-conf_data.set('libtypec_VERSION_MINOR', '5')
|
||||
-conf_data.set('libtypec_VERSION_PATCH', '1')
|
||||
+split = meson.project_version().split('.')
|
||||
+conf_data.set('libtypec_VERSION_MAJOR', split[0])
|
||||
+conf_data.set('libtypec_VERSION_MINOR', split[1])
|
||||
+conf_data.set('libtypec_VERSION_PATCH', split[2])
|
||||
|
||||
libudev_dep = dependency('libudev', required: true)
|
||||
|
||||
@@ -17,7 +18,7 @@ library('typec',
|
||||
'libtypec.c',
|
||||
'libtypec_sysfs_ops.c',
|
||||
'libtypec_dbgfs_ops.c',
|
||||
- version : '0.5.1',
|
||||
+ version : meson.project_version(),
|
||||
soversion : '5',
|
||||
dependencies: libudev_dep,
|
||||
-)
|
||||
\ No newline at end of file
|
||||
+)
|
||||
diff --git a/utils/meson.build b/utils/meson.build
|
||||
index 8519541..9bd2245 100644
|
||||
--- a/utils/meson.build
|
||||
+++ b/utils/meson.build
|
||||
@@ -1,13 +1,14 @@
|
||||
project('libtypec_utils','c',
|
||||
license: 'MIT',
|
||||
+version: '0.5.1',
|
||||
default_options : [
|
||||
'warning_level=0'])
|
||||
|
||||
conf_data = configuration_data()
|
||||
-conf_data.set('libtypec_utils_VERSION_MAJOR', '0')
|
||||
-conf_data.set('libtypec_utils_VERSION_MINOR', '5')
|
||||
-conf_data.set('libtypec_utils_VERSION_PATCH', '1')
|
||||
-
|
||||
+split = meson.project_version().split('.')
|
||||
+conf_data.set('libtypec_utils_VERSION_MAJOR', split[0])
|
||||
+conf_data.set('libtypec_utils_VERSION_MINOR', split[1])
|
||||
+conf_data.set('libtypec_utils_VERSION_PATCH', split[2])
|
||||
|
||||
configure_file(input : 'libtypec_utils_config.h.in', output : 'libtypec_utils_config.h', configuration : conf_data)
|
||||
|
||||
--
|
||||
2.44.1
|
||||
|
||||
@@ -9,12 +9,6 @@ DESCRIPTION="Library to interface with USB Type-C/Power Delivery devices"
|
||||
HOMEPAGE="https://github.com/libtypec/libtypec"
|
||||
SRC_URI="https://github.com/libtypec/libtypec/archive/refs/tags/${P}.tar.gz"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-0.5.1-meson-fix-build-based-on-Gentoo-testing.patch
|
||||
"${FILESDIR}"/${PN}-0.5.1-meson.build-reduce-version-duplication.patch
|
||||
"${FILESDIR}"/${PN}-0.5.1-meson.build-install-lib-and-headers.patch
|
||||
)
|
||||
|
||||
S="${WORKDIR}/${PN}-${P}"
|
||||
|
||||
LICENSE="MIT"
|
||||
@@ -23,7 +23,7 @@ else
|
||||
KEYWORDS="~amd64 ~arm64"
|
||||
fi
|
||||
LICENSE="MIT test? ( ISC Apache-2.0 MIT BSD CC0-1.0 0BSD )"
|
||||
# nodejs package and deps used to test
|
||||
# nodejs module and deps used to test
|
||||
SLOT="3"
|
||||
RDEPEND=" ${DEPEND}
|
||||
>=dev-python/httpx-0.23.0[${PYTHON_USEDEP}]
|
||||
@@ -44,7 +44,6 @@ BDEPEND="test? (
|
||||
)"
|
||||
|
||||
distutils_enable_tests pytest
|
||||
RESTRICT="mirror" #mirror restricted only because overlay
|
||||
RESTRICT+=" !test? ( test )"
|
||||
|
||||
src_unpack() {
|
||||
@@ -69,24 +68,33 @@ python_test() {
|
||||
local EPYTEST_DESELECT=(
|
||||
tests/test_client.py::TestCloudflare::test_validate_headers
|
||||
tests/test_client.py::TestAsyncCloudflare::test_validate_headers )
|
||||
|
||||
#intermittently fail for unknown reasons, passed along to upstream
|
||||
EPYTEST_DESELECT+=(
|
||||
tests/test_client.py::TestAsyncCloudflare::test_copy_build_request
|
||||
tests/test_client.py::TestCloudflare::test_copy_build_request )
|
||||
epytest
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# Run prism mock api server, this is what needs nodejs
|
||||
start_mock
|
||||
distutils-r1_src_test
|
||||
stop_mock
|
||||
}
|
||||
start_mock() {
|
||||
# Run prism mock api server, this is what needs nodejs
|
||||
node --no-warnings node_modules/@stoplight/prism-cli/dist/index.js mock \
|
||||
"cloudflare-spec.yml" >prism.log &
|
||||
local MOCK_PID=$!
|
||||
"cloudflare-spec.yml" >prism.log || die "Failed starting prism" &
|
||||
echo $! >"${T}/mock.pid" || die
|
||||
# Wait for server to come online
|
||||
echo -n "Waiting for mockserver"
|
||||
while ! grep -q "✖ fatal\|Prism is listening" "prism.log" ; do
|
||||
echo -n "."
|
||||
echo -n "." || die
|
||||
sleep 0.5
|
||||
done
|
||||
if grep -q "✖ fatal" prism.log; then
|
||||
die "Prism mock server failed"
|
||||
fi
|
||||
distutils-r1_src_test
|
||||
kill "${MOCK_PID}"
|
||||
}
|
||||
stop_mock() {
|
||||
kill $(cat "${T}/mock.pid") || die
|
||||
}
|
||||
|
||||
@@ -1 +1,2 @@
|
||||
DIST types-protobuf-4.24.0.20240408.tar.gz 52102 BLAKE2B 3312ddd8e28ee490f6ae94978d5ebfca353cbd9051862629cdde08474ae657130bf87cda8cb06f33ea2d38ccb5bfe9097ef3d8f4bb77fba94707b9914ff33466 SHA512 adb4d69ef5d8bab15e6e311c7d1013725419f2b681e64befea2cc435fec69cf0d0e70431ae65b9f617e8b4c86957fdaae88abd57cc306fa55ad51d3c09d5f222
|
||||
DIST types-protobuf-5.27.0.20240626.tar.gz 54215 BLAKE2B 49f791cf6cc8cdc0b16172c2afc2f22eb15c8ecb73b89fa323779227e12105dd82fe316e58a2fa9b0421a3e91f0b8206e7b073cf0193a705be3cc339c53df525 SHA512 f7e572985639ef19b4a257e0bc2a931f4c745eb3c8f10d98ccd6c95133b0df3486b40b86418045b94854c46a26da510be1f63c524005580cf1446364aca4eade
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
# Copyright 2023-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
DISTUTILS_USE_PEP517=setuptools
|
||||
PYPI_NO_NORMALIZE=1
|
||||
PYTHON_COMPAT=( python3_{10..12} )
|
||||
inherit distutils-r1 pypi
|
||||
|
||||
DESCRIPTION="Typing stubs for protobuf"
|
||||
HOMEPAGE="
|
||||
https://pypi.org/project/types-protobuf/
|
||||
https://github.com/python/typeshed/tree/master/stubs/protobuf/
|
||||
"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
@@ -1 +1 @@
|
||||
DIST types-requests-2.31.0.20240311.tar.gz 16824 BLAKE2B 310a7f4e49189f2ff1b1d65ad7ecd1958a33606ec36ad4d42e3ef793b71df1cf823c73a151a948102c055480b2c992675ec3699c4f67274b454d154a3fb24d5d SHA512 e7116a2225cab57918c3a9e081bebaa173c9a5496889e6ec1c9bc28c94e56c40fc0f785403ceec259a44049f61a9f731434532cf5c186d785d5d20eba7362f3a
|
||||
DIST types-requests-2.32.0.20240622.tar.gz 17675 BLAKE2B 8535aabe9bbb9a77e87be71c7a18aad791dcb426f58ed1238dae553aec1646035a4763acf26ffdb7cb83a2d16080651372ea500080df69a4b5352a6de1064194 SHA512 8423eab482aedbcd23dfe4a2d8b8e09c5d0d2bceb139abe7bdc9e680f7ee7706b1a5026fce4ef6ef3eab70db5317db708323c5c9a3273df9a2830a5c6e47780a
|
||||
|
||||
@@ -1 +1 @@
|
||||
DIST catwalk 1591960 BLAKE2B 7e4117719f386b9ddb2f51ecf5bb651b89550c2f60d1934711c773f81e054d9ddb54f1e5ffa8c7e87e64bcad43d98f80da2dd9779dd2037470cf73e19bd44cd0 SHA512 1e914bbf0e4811b50d7b2d483319be93701e19940b77ccf21584e06a301c99dd6410a806bb15cfe74282e2a06e3f8f4dcc9893356d516dad4444d57d7910185d
|
||||
DIST catppuccin-catwalk-1.3.2 1591960 BLAKE2B 7e4117719f386b9ddb2f51ecf5bb651b89550c2f60d1934711c773f81e054d9ddb54f1e5ffa8c7e87e64bcad43d98f80da2dd9779dd2037470cf73e19bd44cd0 SHA512 1e914bbf0e4811b50d7b2d483319be93701e19940b77ccf21584e06a301c99dd6410a806bb15cfe74282e2a06e3f8f4dcc9893356d516dad4444d57d7910185d
|
||||
|
||||
@@ -1,16 +1,15 @@
|
||||
# Copyright 2024 Catppuccin
|
||||
# Copyright 2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
DESCRIPTION="Soothing pastel previews for the high-spirited!"
|
||||
HOMEPAGE="https://github.com/catppuccin/catwalk"
|
||||
SRC_URI="https://github.com/catppuccin/catwalk/releases/download/v"${PV}"/catwalk-x86_64-unknown-linux-gnu -> catwalk"
|
||||
SRC_URI="https://github.com/catppuccin/catwalk/releases/download/v${PV}/catwalk-x86_64-unknown-linux-gnu -> ${P}"
|
||||
S="${WORKDIR}"
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
src_install() {
|
||||
insinto /usr/bin
|
||||
doins /var/tmp/portage/dev-util/catppuccin-catwalk-"${PV}"/distdir/catwalk
|
||||
newbin "${DISTDIR}"/${P} catwalk
|
||||
}
|
||||
|
||||
1
dev-util/catppuccin-whiskers/Manifest
Normal file
1
dev-util/catppuccin-whiskers/Manifest
Normal file
@@ -0,0 +1 @@
|
||||
DIST catppuccin-whiskers-2.4.0 6171208 BLAKE2B 02f8ec5c9a4cf623b20130c757bfb6bbb9b9e029c75f41fb1b09bc031df5477a43ec06a78b70ac38eef60605d7ae34e6a1cc600cbd45849b7848cf0bf8ea2c4f SHA512 c786b55ebc44179ea3a14e86c5e862d9455586194d7fed856d897dac82312393fd310cd5ede4b3cb70c599daa5e5754c4c52622f10a98d2f4f68c72ab2c76ad5
|
||||
@@ -0,0 +1,15 @@
|
||||
# Copyright 2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
DESCRIPTION="Soothing port creation tool for the high-spirited!"
|
||||
HOMEPAGE="https://github.com/catppuccin/whiskers"
|
||||
SRC_URI="https://github.com/catppuccin/whiskers/releases/download/v${PV}/whiskers-x86_64-unknown-linux-gnu -> ${P}"
|
||||
S="${WORKDIR}"
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
src_install() {
|
||||
newbin "${DISTDIR}"/${P} whiskers
|
||||
}
|
||||
11
dev-util/catppuccin-whiskers/metadata.xml
Normal file
11
dev-util/catppuccin-whiskers/metadata.xml
Normal file
@@ -0,0 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>somerand0mcat@hotmail.com</email>
|
||||
<name>Omar</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="github">catppuccin/whiskers</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@@ -1,6 +1,10 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>dev@dyama.net</email>
|
||||
<name>Daichi Yamamoto</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="github">JuliaLang/juliaup</remote-id>
|
||||
</upstream>
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<use>
|
||||
<flag name="discord">Enables Discord Rich Presence</flag>
|
||||
<flag name="faudio">Add faudio sound backend support</flag>
|
||||
<flag name="llvm">Use llvm idk what for</flag>
|
||||
<flag name="llvm">Use llvm backend for PPU cache generation</flag>
|
||||
<flag name="vulkan">Build vulkan renderer</flag>
|
||||
</use>
|
||||
</pkgmetadata>
|
||||
|
||||
@@ -6,7 +6,7 @@ EAPI=8
|
||||
MY_PN="BambuStudio"
|
||||
WX_GTK_VER="3.0-gtk3"
|
||||
|
||||
inherit desktop unpacker xdg
|
||||
inherit desktop wrapper xdg
|
||||
|
||||
DESCRIPTION="Bambu Studio is a cutting-edge, feature-rich slicing software"
|
||||
HOMEPAGE="https://bambulab.com"
|
||||
@@ -15,7 +15,6 @@ SRC_URI="
|
||||
https://github.com/bambulab/${MY_PN}/releases/download/v${PV}/Bambu_Studio_linux_fedora-v${PV}.AppImage \
|
||||
-> ${P}.AppImage
|
||||
"
|
||||
S="${WORKDIR}/${P}"
|
||||
|
||||
LICENSE="AGPL-3"
|
||||
SLOT="0"
|
||||
@@ -55,10 +54,7 @@ src_unpack() {
|
||||
}
|
||||
|
||||
src_install() {
|
||||
rm "${S}"/squashfs-root/*.AppImage || die
|
||||
rm "${S}"/squashfs-root/*.desktop || die
|
||||
rm "${S}"/squashfs-root/.DirIcon || die
|
||||
rm -r "${S}"/squashfs-root/usr || die
|
||||
rm -r squashfs-root/{*.{AppImage,desktop},.DirIcon,usr} || die
|
||||
patchelf --replace-needed libwebkit2gtk-4.0.so.37 libwebkit2gtk-4.1.so.0 \
|
||||
"${S}"/squashfs-root/bin/bambu-studio || die
|
||||
patchelf --replace-needed libjavascriptcoregtk-4.0.so.18 libjavascriptcoregtk-4.1.so.0 \
|
||||
@@ -72,5 +68,5 @@ src_install() {
|
||||
fperms +x "/opt/${PN}/AppRun" "/opt/${PN}/bin/bambu-studio"
|
||||
doicon -s 192 "${S}"/squashfs-root/BambuStudio.png
|
||||
domenu "${FILESDIR}/bambu-studio.desktop"
|
||||
dobin "${FILESDIR}/bambu-studio"
|
||||
make_wrapper bambu-studio "/opt/${PN}/AppRun"
|
||||
}
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
#!/bin/sh
|
||||
exec "/opt/bambustudio-bin/AppRun" "$1"
|
||||
|
||||
@@ -1,2 +1 @@
|
||||
DIST ooni-probe-cli-3.18.0.tar.gz 25969796 BLAKE2B e618d0441dcdb5f8df856127b6c4c2d65064dfe92e2e7c8a56d8fbb530e7a9470d4311e252b50fea0617c9a9650ca12cad52f6fc6d85b71a071809b67aa21452 SHA512 adbadb552309f09a79797d78cb91480a953d9f50af1a8200666b6c6644f32cc4e7569bf281ea6ee47e8c3b94ddf90a473770c40927fb39c122908a1b88f8d6bb
|
||||
DIST ooni-probe-cli-3.18.1.tar.gz 26317728 BLAKE2B 854c011d706a79f65e0fd32918bc7069e6e2e2800dd25e846b035c53ef14fe65787920f33eda9e48626c63a93793b5e63c8819cd0d525d2250cce05750245044 SHA512 d26cebdbf8634d1b65fe32a187a8445c713c66b6d01251d32e88d45e58b0019b0e45407185eb23db2fd65ca65d251b879fb4a95e06cf3d86486b3aff6b949b98
|
||||
DIST ooni-probe-cli-3.22.0.tar.gz 26961384 BLAKE2B 31792ad2bf792d19edc61b12894c91b85c33445808b70880d2f32f3b83665e80577d830ce255ae114c4de163e2f93bb8a73eea3b6d2a4143c6623c9a15fe5c8d SHA512 28f845a3e50eb50a9d7d9411ad0d5cbb6ae08b3238bb4cd7f85dd4fbdaa833203bcf8387287b5b45ccc51196caab4981ec85d7bb9cd199ba04f7b0d2568e20a4
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<!-- maintainer-needed -->
|
||||
<maintainer type="person">
|
||||
<email>eli.burch@burchbytes.com</email>
|
||||
<name>Eli Burch</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="github">ooni/probe-cli</remote-id>
|
||||
<bugs-to>https://github.com/ooni/probe/issues/new?labels=ooni/probe-cli&assignee=bassosimone</bugs-to>
|
||||
|
||||
@@ -1,53 +0,0 @@
|
||||
# Copyright 2022-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit go-module
|
||||
|
||||
MY_PN=${PN#ooni-}
|
||||
DESCRIPTION="OONI Probe network measurement tool for detecting internet censorship"
|
||||
HOMEPAGE="https://ooni.org https://github.com/ooni/probe-cli"
|
||||
SRC_URI="https://github.com/ooni/${MY_PN}/releases/download/v${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="0BSD Apache-2.0 BSD BSD-2 CC0-1.0 GPL-3 GPL-3+ ISC LGPL-3 MIT MPL-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
PROPERTIES="test_network"
|
||||
RESTRICT="test"
|
||||
|
||||
DEPEND="dev-db/sqlite:3[icu]"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
DOCS=( docs CODEOWNERS {CODE_OF_CONDUCT,CONTRIBUTING,DESIGN,Readme}.md )
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# remove ooni's build tool
|
||||
rm -r internal/cmd/buildtool || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
GOFLAGS+=" -tags=shaping"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
ego build ./cmd/ooniprobe
|
||||
ego build ./internal/cmd/miniooni
|
||||
ego build ./internal/cmd/oohelperd
|
||||
}
|
||||
|
||||
src_test() {
|
||||
local -x GOFLAGS
|
||||
GOFLAGS="${GOFLAGS//-v/}"
|
||||
GOFLAGS="${GOFLAGS//-x/}"
|
||||
|
||||
ego test -short -race ./...
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin ooniprobe miniooni oohelperd
|
||||
einstalldocs
|
||||
}
|
||||
@@ -1,22 +1,18 @@
|
||||
# Copyright 2022-2023 Gentoo Authors
|
||||
# Copyright 2022-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit go-module
|
||||
|
||||
MY_PN=${PN#ooni-}
|
||||
DESCRIPTION="OONI Probe network measurement tool for detecting internet censorship"
|
||||
HOMEPAGE="https://ooni.org https://github.com/ooni/probe-cli"
|
||||
SRC_URI="https://github.com/ooni/${MY_PN}/releases/download/v${PV}/${P}.tar.gz"
|
||||
SRC_URI="https://github.com/ooni/probe-cli/releases/download/v${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="0BSD Apache-2.0 BSD BSD-2 CC0-1.0 GPL-3 GPL-3+ ISC LGPL-3 MIT MPL-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
PROPERTIES="test_network"
|
||||
RESTRICT="test"
|
||||
|
||||
DEPEND="dev-db/sqlite:3[icu]"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
@@ -36,6 +36,8 @@ RDEPEND="
|
||||
QA_PREBUILT="*"
|
||||
|
||||
src_install() {
|
||||
sed -i "s|SCRIPT_DIR=.*|SCRIPT_DIR=\"/opt/Mullvad VPN/\"|g" "${S}"/opt/Mullvad\ VPN/mullvad-vpn
|
||||
|
||||
# Using doins -r would strip executable bits from all binaries
|
||||
cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files"
|
||||
fperms +x "/opt/Mullvad VPN/chrome_crashpad_handler"
|
||||
@@ -47,6 +49,7 @@ src_install() {
|
||||
dobin "${S}"/usr/bin/mullvad
|
||||
dobin "${S}"/usr/bin/mullvad-daemon
|
||||
dobin "${S}"/usr/bin/mullvad-exclude
|
||||
dosym "../../opt/Mullvad VPN/mullvad-vpn" /usr/bin/mullvad-vpn
|
||||
dosym "../../opt/Mullvad VPN/resources/mullvad-problem-report" /usr/bin/mullvad-problem-report
|
||||
|
||||
# mullvad-exclude uses cgroups to manage exclusions, which requires root permissions, but is
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Copyright 2024 Catppuccin
|
||||
# Copyright 2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
Reference in New Issue
Block a user