Merge updates from master

This commit is contained in:
Repository mirror & CI
2020-07-28 09:35:13 +00:00
12 changed files with 246 additions and 8 deletions

View File

@@ -1,4 +1,4 @@
From 657e2966e556c78f121075c69fe1ba8d2b4dcb73 Mon Sep 17 00:00:00 2001
From 5198a9c94b40ff157c284df413be5402f1b75118 Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Wed, 8 Jul 2020 11:57:35 +0200
Subject: [PATCH] Use correct versions when binding globals
@@ -17,7 +17,7 @@ Closes: https://github.com/cyclopsian/wdisplays/issues/18
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/outputs.c b/src/outputs.c
index 9ebf7e5..40410ec 100644
index 9ebf7e5..a5007e8 100644
--- a/src/outputs.c
+++ b/src/outputs.c
@@ -534,20 +534,20 @@ static void registry_handle_global(void *data, struct wl_registry *registry,
@@ -31,7 +31,7 @@ index 9ebf7e5..40410ec 100644
} else if (strcmp(interface, zxdg_output_manager_v1_interface.name) == 0) {
state->xdg_output_manager = wl_registry_bind(registry, name,
- &zxdg_output_manager_v1_interface, version);
+ &zxdg_output_manager_v1_interface, 3);
+ &zxdg_output_manager_v1_interface, 2);
} else if(strcmp(interface, zwlr_screencopy_manager_v1_interface.name) == 0) {
state->copy_manager = wl_registry_bind(registry, name,
- &zwlr_screencopy_manager_v1_interface, version);
@@ -46,4 +46,3 @@ index 9ebf7e5..40410ec 100644
}
}

View File

@@ -10,6 +10,7 @@ case "${PV}" in
;;
*)
SRC_URI="${EGIT_REPO_URI}/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
esac
inherit meson xdg
@@ -24,6 +25,4 @@ DEPEND="${BDEPEND}"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64"
PATCHES=("${FILESDIR}/${P}-pull20.patch")

View File

@@ -10,6 +10,7 @@ case "${PV}" in
;;
*)
SRC_URI="${EGIT_REPO_URI}/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
esac
inherit meson xdg
@@ -23,5 +24,3 @@ DEPEND="${BDEPEND}"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS=""

View File

@@ -0,0 +1 @@
DIST v1.14.3.tar.gz 317004 BLAKE2B 9ff327dde9e4fb361e87e40b835cf5324f639b0f2d61ff762854d685a381c0f2b098545c295eae0b92fdb67aea23cd03379af3bae22a9a928e4dcb3d5b40f689 SHA512 66971ed49c7d90bf249fe5b48848c05f2e085cca04a448fd818b69a0fcd27b8739414ec506f429ef4ca9ae45f7a8919fdfefbd9206bb5bb475ca3e783f5ef494

View File

@@ -0,0 +1,51 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=(python3_{6,7,8})
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit eutils distutils-r1
DESCRIPTION="Download image galleries and collections from several image hosting sites"
HOMEPAGE="https://github.com/mikf/gallery-dl"
if [[ "${PV}" == *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
KEYWORDS=""
else
SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz"
KEYWORDS="~amd64"
fi
RESTRICT="test"
LICENSE="GPL-2"
SLOT="0"
IUSE="bash-completion zsh-completion"
RDEPEND="
>=dev-python/requests-2.11.0[${PYTHON_USEDEP}]
"
# tests require network access
distutils_enable_tests setup.py
src_compile() {
if use bash-completion || use zsh-completion
then
emake completion
fi
emake man
# this will install shell completion and man pages generated above (if any)
distutils-r1_src_compile
}
pkg_postinst() {
elog "Optional dependencies:"
elog "media-video/ffmpeg - for Pixiv Ugoira to WebM conversion"
elog "net-misc/youtube-dl - for video downloads"
}

View File

@@ -0,0 +1,51 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=(python3_{6,7,8})
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit eutils distutils-r1
DESCRIPTION="Download image galleries and collections from several image hosting sites"
HOMEPAGE="https://github.com/mikf/gallery-dl"
if [[ "${PV}" == *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
KEYWORDS=""
else
SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz"
KEYWORDS="~amd64"
fi
RESTRICT="test"
LICENSE="GPL-2"
SLOT="0"
IUSE="bash-completion zsh-completion"
RDEPEND="
>=dev-python/requests-2.11.0[${PYTHON_USEDEP}]
"
# tests require network access
distutils_enable_tests setup.py
src_compile() {
if use bash-completion || use zsh-completion
then
emake completion
fi
emake man
# this will install shell completion and man pages generated above (if any)
distutils-r1_src_compile
}
pkg_postinst() {
elog "Optional dependencies:"
elog "media-video/ffmpeg - for Pixiv Ugoira to WebM conversion"
elog "net-misc/youtube-dl - for video downloads"
}

View File

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>xgqt@protonmail.com</email>
<name>Maciej Barć</name>
</maintainer>
<upstream>
<remote-id type="github">mikf/gallery-dl</remote-id>
</upstream>
<longdescription>
gallery-dl is a command-line program to download image-galleries and -collections from several image hosting sites.
It is a cross-platform tool with many configuration options and powerful filenaming capabilities.
</longdescription>
</pkgmetadata>

View File

@@ -0,0 +1,2 @@
DIST code-server-3.4.1-linux-amd64.tar.gz 74127655 BLAKE2B 95e916e64c886688b370407ba932624a70b024cae64a57e7eb77f31c6a352138313fbced149adf2ee698d925b9e2a818823b25931a42a01d5e2eaedb082bbf1d SHA512 efd55c84fda96f22bec79b54f60d02a8d098f41cef77549c805c125eb845efae43d3f4703908f0542a78146eda67ebd9787f89b1c14b1b8044fdfd534f2b9173
DIST code-server-3.4.1-linux-arm64.tar.gz 73470946 BLAKE2B 278a1fef95b612242f4126eea53d7b8dc824fc5dda55ff6b2f1e7752d3ebecebcf30045c1c2bb2a18d1ad7999b20c29398a3c5715920d6e8d8c94eaa76e8a619 SHA512 24168006e737a6579869b8e4b157e21d9ef85282b811783163f0d2291e47bee7e0794c8327663182922b473ff57999432e6c53502849836a53d300728341d1bc

View File

@@ -0,0 +1,83 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
MY_PN="${PN/-bin/}"
MY_PV="${MY_PN}-${PV}"
BASE_URI="https://github.com/cdr/${MY_PN}/releases/download/${PV}/${MY_PV}-linux"
inherit systemd
DESCRIPTION="VS Code in the browser (binary version with unbundled node and ripgrep)"
HOMEPAGE="https://coder.com/"
SRC_URI="
amd64? ( ${BASE_URI}-amd64.tar.gz )
arm64? ( ${BASE_URI}-arm64.tar.gz )
"
LICENSE="MIT"
SLOT="0"
KEYWORDS="-* ~amd64 ~arm64"
IUSE=""
# In case we ever make a non-"-binary" pkg
DEPEND="
!www-apps/code-server
"
RDEPEND="
${DEPEND}
>=net-libs/nodejs-12.16.1[ssl]
sys-apps/ripgrep
"
S="${WORKDIR}/${MY_PV}-linux-${ARCH}"
PATCHES=(
"${FILESDIR}/${PN}-${PV}-node.patch"
)
src_prepare() {
default
# We remove as much precompiled code as we can,
# node modules not written in JS cannot be removed
# thus "-bin".
# use system node
rm node || die
rm lib/node || die
# remove bundled ripgrep binary
rm lib/vscode/node_modules/vscode-ripgrep/bin/rg || die
# not needed
rm code-server || die
rm postinstall.sh || die
}
src_install() {
# already in /usr/portage/licenses/MIT
rm LICENSE.txt || die
local mydocs="README.md ThirdPartyNotices.txt"
for doc in ${mydocs}
do
(dodoc "${doc}" && rm "${doc}") || die
done
insinto "/usr/lib/${MY_PN}"
doins -r .
fperms +x "${EPREFIX}/usr/lib/${MY_PN}/bin/${MY_PN}"
dosym "${EPREFIX}/usr/lib/${MY_PN}/bin/${MY_PN}" "${EPREFIX}/usr/bin/${MY_PN}"
dosym "${EPREFIX}/usr/bin/rg" "${EPREFIX}/usr/lib/${MY_PN}/lib/vscode/node_modules/vscode-ripgrep/bin/rg"
systemd_dounit "${FILESDIR}/${MY_PN}.service"
}
pkg_postinst() {
elog "When using code-server systemd service run it as a user"
elog "For example: 'systemctl --user enable --now code-server'"
}

View File

@@ -0,0 +1,8 @@
--- a/bin/code-server
+++ b/bin/code-server
@@ -33,4 +33,4 @@ root() {
}
ROOT="$(root)"
-exec "$ROOT/lib/node" "$ROOT" "$@"
+exec node "$ROOT" --disable-telemetry "$@"

View File

@@ -0,0 +1,11 @@
[Unit]
Description=code-server
After=network.target
[Service]
Type=exec
ExecStart=/usr/bin/code-server
Restart=always
[Install]
WantedBy=default.target

View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>xgqt@protonmail.com</email>
<name>Maciej Barć</name>
</maintainer>
<upstream>
<remote-id type="github">cdr/code-server</remote-id>
</upstream>
<longdescription>
Run VS Code on any machine anywhere and access it in the browser.
Code on your Chromebook, tablet, and laptop with a consistent development environment.
Develop on a Linux machine and pick up from any device with a web browser.
Take advantage of large cloud servers to speed up tests, compilations, downloads, and more.
Preserve battery life when you're on the go as all intensive tasks runs on your server.
Make use of a spare computer you have lying around and turn it into a full development environment.
</longdescription>
</pkgmetadata>