Merge updates from master

This commit is contained in:
Repository mirror & CI
2020-08-24 08:13:04 +00:00
31 changed files with 245 additions and 417 deletions

View File

@@ -1 +0,0 @@
DIST vterm-20200504.544.tar 184320 BLAKE2B 9a705ef3e36b8b1991e9b152b59a40f5d784631ee613056ccedffc85c690c83b0860f900d1494388047b2fec8ef7803adc7c5550b2d210e3cda95ebd8894be5c SHA512 c2971628778e9128efae5c567bd0e9453a8260032d0c220e4348e135e2d2c1af56429eebe613641bd13a148dec53e10c4604dd93a0261f2db74a1bcb8a240ff8

View File

@@ -1,2 +0,0 @@
(add-to-list 'load-path "@SITELISP@")
(load "vterm-autoloads" nil t)

View File

@@ -1,26 +0,0 @@
function vterm_printf(){
if [ -n "$TMUX" ]; then
# Tell tmux to pass the escape sequences through
# (Source: http://permalink.gmane.org/gmane.comp.terminal-emulators.tmux.user/1324)
printf "\ePtmux;\e\e]%s\007\e\\" "$1"
elif [ "${TERM%%-*}" = "screen" ]; then
# GNU screen (screen, screen-256color, screen-256color-bce)
printf "\eP\e]%s\007\e\\" "$1"
else
printf "\e]%s\e\\" "$1"
fi
}
if [[ "$INSIDE_EMACS" = 'vterm' ]]; then
function clear(){
vterm_printf "51;Evterm-clear-scrollback";
tput clear;
}
fi
PROMPT_COMMAND='echo -ne "\033]0;\h:\w\007"'
vterm_prompt_end(){
vterm_printf "51;A$(whoami)@$(hostname):$(pwd)"
}
PS1=$PS1'\[$(vterm_prompt_end)\]'

View File

@@ -1,30 +0,0 @@
function vterm_printf;
if [ -n "$TMUX" ]
# tell tmux to pass the escape sequences through
# (Source: http://permalink.gmane.org/gmane.comp.terminal-emulators.tmux.user/1324)
printf "\ePtmux;\e\e]%s\007\e\\" "$argv"
else if string match -q -- "screen*" "$TERM"
# GNU screen (screen, screen-256color, screen-256color-bce)
printf "\eP\e]%s\007\e\\" "$argv"
else
printf "\e]%s\e\\" "$argv"
end
end
function fish_title
hostname
echo ":"
pwd
end
function vterm_prompt_end;
vterm_printf '51;A'(whoami)'@'(hostname)':'(pwd)
end
functions -c fish_prompt vterm_old_fish_prompt
function fish_prompt --description 'Write out the prompt; do not replace this. Instead, put this at end of your file.'
# Remove the trailing newline from the original prompt. This is done
# using the string builtin from fish, but to make sure any escape codes
# are correctly interpreted, use %b for printf.
printf "%b" (string join "\n" (vterm_old_fish_prompt))
vterm_prompt_end
end

View File

@@ -1,25 +0,0 @@
function vterm_printf(){
if [ -n "$TMUX" ]; then
# Tell tmux to pass the escape sequences through
# (Source: http://permalink.gmane.org/gmane.comp.terminal-emulators.tmux.user/1324)
printf "\ePtmux;\e\e]%s\007\e\\" "$1"
elif [ "${TERM%%-*}" = "screen" ]; then
# GNU screen (screen, screen-256color, screen-256color-bce)
printf "\eP\e]%s\007\e\\" "$1"
else
printf "\e]%s\e\\" "$1"
fi
}
if [[ "$INSIDE_EMACS" = 'vterm' ]]; then
alias clear='vterm_printf "51;Evterm-clear-scrollback";tput clear'
fi
autoload -U add-zsh-hook
add-zsh-hook -Uz chpwd (){ print -Pn "\e]2;%m:%2~\a" }
vterm_prompt_end() {
vterm_printf "51;A$(whoami)@$(hostname):$(pwd)";
}
setopt PROMPT_SUBST
PROMPT=$PROMPT'%{$(vterm_prompt_end)%}'

View File

@@ -1,26 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>arjan@adriaan.se</email>
<name>Arjan Adriaanse</name>
</maintainer>
<longdescription>
Emacs-libvterm (vterm) is fully-fledged terminal emulator inside GNU
Emacs based on libvterm, a C library. As a result of using compiled
code (instead of elisp), emacs-libvterm is fully capable, fast, and
it can seamlessly handle large outputs.
This package automatically compiles the needed module and provides
configurations for better integration with some shells.
</longdescription>
<upstream>
<maintainer status="active">
<email>fuermetz@mailbox.org</email>
<name>Lukas Fürmetz</name>
</maintainer>
<doc>https://github.com/akermu/emacs-libvterm/blob/master/README.md</doc>
<bugs-to>https://github.com/akermu/emacs-libvterm/issues</bugs-to>
<remote-id type="github">akermu/emacs-libvterm</remote-id>
</upstream>
</pkgmetadata>

View File

@@ -1,63 +0,0 @@
# Copyright 2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit elisp cmake
DESCRIPTION="Emacs libvterm integration"
HOMEPAGE="https://github.com/akermu/emacs-libvterm"
SRC_URI="https://melpa.org/packages/${PN}-${PV}.tar -> ${P}.tar"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
RDEPEND="
app-editors/emacs[dynamic-loading]
dev-libs/libvterm
"
ELISP_REMOVE="${PN}-pkg.el"
SITEFILE="50${PN}-gentoo.el"
src_configure() {
elisp-make-autoload-file
local mycmakeargs=(
"USE_SYSTEM_LIBVTERM=yes"
)
cmake_src_configure
}
src_compile() {
elisp_src_compile
cmake_src_compile
}
src_install() {
elisp_src_install
dodoc README.md
# install vterm module
elisp-install "${PN}" *.so
# add shell config files
if has_version app-shells/bash; then
elog "Adding configuration for bash."
insinto /etc/bash/bashrc.d/
newins "${FILESDIR}/bashrc" bash-emacs-vterm.sh
fi
if has_version app-shells/zsh; then
elog "Adding configuration for zsh."
insinto /etc/profile.d/
newins "${FILESDIR}/zshrc" zsh-emacs-vterm.sh
fi
if has_version app-shells/fish; then
elog "Adding configuration for fish."
insinto /etc/fish/conf.d/
newins "${FILESDIR}/config.fish" emacs-vterm.fish
fi
}

View File

@@ -1,60 +0,0 @@
# Copyright 2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit elisp cmake
DESCRIPTION="Emacs libvterm integration"
HOMEPAGE="https://github.com/akermu/emacs-libvterm"
SRC_URI="https://melpa.org/packages/${PN}-${PV}.tar -> ${P}.tar"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
RDEPEND="
>=app-editors/emacs-26.1[dynamic-loading]
dev-libs/libvterm
"
ELISP_REMOVE="${PN}-pkg.el"
SITEFILE="50${PN}-gentoo.el"
DOC="README.md"
src_configure() {
elisp_src_configure
local mycmakeargs=( "USE_SYSTEM_LIBVTERM=yes" )
cmake_src_configure
}
src_compile() {
elisp_src_compile
cmake_src_compile
}
src_install() {
elisp_src_install
# install vterm module
elisp-install ${PN} *.so
# add shell config files
if has_version app-shells/bash; then
elog "Adding configuration for bash."
insinto /etc/bash/bashrc.d/
newins "${FILESDIR}/bashrc" emacs-vterm-bash.sh
fi
if has_version app-shells/zsh; then
elog "Adding configuration for zsh."
insinto /etc/profile.d/
newins "${FILESDIR}/zshrc" emacs-vterm-bash.sh
fi
if has_version app-shells/fish; then
elog "Adding configuration for fish."
insinto /etc/fish/conf.d/
newins "${FILESDIR}/config.fish" emacs-vterm.fish
fi
}

View File

@@ -1 +1,2 @@
DIST fet.sh-1.5.tar.gz 29363 BLAKE2B dc864b3db1a3bffd798cd37d7b116682929ccdf111be26c91f2b61e4a14732b6220c97aeaf244179a31eb6e05e73596efd846f0a16712076c0587df0ad3f9a16 SHA512 6a974cc2bf4eb7d4fc513229bc94daac3bc4a1f38e5af8898af8bee25bd88e20883d839b786444452c2dc4a58eeebc433b60047d5849ce404ae9775cc39451eb
DIST fet.sh-1.6.tar.gz 145379 BLAKE2B a906cf9bec877e6b1013eea33be5f5b1aef82c20921b4d5a47db36b3682a98ca4354f03f1e467181aa249ef63fae3814f9496a7ef202e7080bc68d64c443f5d1 SHA512 8d74b00a47d1ab50f3b7909cf2e7558b908587d7f5872b221812dfaae98b4f7f894dd2899dd9e2f760e4243cabdd594c8a1901cafbf2fac6f6e39fa6fd802fe2

View File

@@ -0,0 +1,26 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DESCRIPTION="A fetch written in POSIX shell without any external commands"
HOMEPAGE="https://github.com/6gk/fet.sh"
case "${PV}" in
9999)
inherit git-r3
EGIT_REPO_URI="https://github.com/6gk/fet.sh.git"
;;
*)
P0="fet.sh-${PV}"
SRC_URI="https://github.com/6gk/fet.sh/archive/v${PV}.tar.gz -> ${P0}.tar.gz"
S="${WORKDIR}/${P0}"
KEYWORDS="~amd64"
esac
LICENSE="ISC"
SLOT="0"
src_install() {
dobin fet.sh
}

View File

@@ -1 +1 @@
DIST mobile-datovka-v1.9.1.tar.gz 1923725 BLAKE2B 665527c5071373cf02adb971e5250c80e31a949f2aba39666b47e9a19c086d737e629c69ad25fd673bead1b22e976d5a5c341a90bfea8c77caa5b358b02dc44a SHA512 e2ea35173e3465401f1b7217b84592731da83d61dfe964db5f7706862fe68bb9e0b783e5d52dece3392351b2793d8b284668108132c6f6d1c66a371221d6fde3
DIST mobile-datovka-v1.10.0.tar.gz 1998167 BLAKE2B 2a0a577ed145e85f6d87d5c4c6b7cdb7cda33a484e85983d372af5d1e115efe8d6dab986069e1bcf2a59bb2000043dd7f3037d954bdf0d4ce62b0482d57091f5 SHA512 8ef485f34af55a6057f29c2e13db7d7210303537fc3841ea4553d4a013b8ca97f184a5cf995038c6885703fff8c9c96889e6a8b2b8b36e98dcf84cc4b61d5dc9

View File

@@ -1,83 +0,0 @@
From a8c24f3699563a5ccc6dd6c49b16444af51b50a8 Mon Sep 17 00:00:00 2001
From: David Heidelberg <david@ixit.cz>
Date: Fri, 24 Apr 2020 00:23:43 +0200
Subject: [PATCH 2/3] add metainfo for distributions
Nice to have for mobile Linux (Librem 5 & PinePhone)
Signed-off-by: David Heidelberg <david@ixit.cz>
---
linux/nic.cz.mobile-datovka.metainfo.xml | 61 ++++++++++++++++++++++++
1 file changed, 61 insertions(+)
create mode 100644 linux/nic.cz.mobile-datovka.metainfo.xml
diff --git a/linux/nic.cz.mobile-datovka.metainfo.xml b/linux/nic.cz.mobile-datovka.metainfo.xml
new file mode 100644
index 0000000..c5d3cc6
--- /dev/null
+++ b/linux/nic.cz.mobile-datovka.metainfo.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014-2020 CZ.NIC Labs -->
+<application>
+ <id type="desktop">nic.cz.mobile=datovka.desktop</id>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>GPL-3.0-or-later</project_license>
+
+ <name>Mobile Datovka</name>
+ <name xml:lang="cs">Mobilní Datovka</name>
+
+ <summary>A free graphical user interface for data boxes</summary>
+ <summary xml:lang="cs">Svobodné uživatelské rozhraní pro datové schránky</summary>
+
+ <description>
+ <p>
+ Datovka is a multiplatform desktop application for accessing data boxes.
+ A data box is an electronic storage site in Czech Republic. It is intended
+ for delivery of official documents and for communication with public
+ authority bodies.
+ </p>
+ <p xml:lang="cs">
+ Datovka je multiplatformní desktopová aplikace pro přístup k datovým schránkám.
+ Datová schránka v České republice je elektronické úložiště, které je určeno
+ k doručování dokumentů a pro komunikaci s orgány veřejné moci.
+ </p>
+
+ <p>
+ Datovka allows receiving, sending, and checking the integrity of data messages,
+ exporting proofs of delivery or full messages, exporting complete
+ correspondence for a defined period, etc.
+ </p>
+ <p xml:lang="cs">
+ Z Datovky je možné číst zprávy, odesílat zprávy, kontrolovat integritu datových zpráv,
+ exportovat doručenky i celé zprávy, exportovat přehled korespondence za určité
+ časové období, apod.
+ </p>
+
+ <p>
+ The user interface resembles the interface of common e-mail clients.
+ </p>
+ <p xml:lang="cs">
+ Uživatelské rozhraní aplikace se podobá rozhraní běžných poštovních klientů.
+ </p>
+ </description>
+
+ <kudos>
+ <kudo>HiDpiIcon</kudo>
+ <kudo>ModernToolkit</kudo>
+ </kudos>
+
+ <screenshots>
+ <screenshot type="default">
+ <image>https://www.datovka.cz/images/mobile-main.png</image>
+ <caption>Main window of the application</caption>
+ <caption xml:lang="cs">Hlavní okno aplikace</caption>
+ </screenshot>
+ </screenshots>
+
+ <updatecontact>datove-schranky@labs.nic.cz</updatecontact>
+ <url type="homepage">https://www.datovka.cz/cs/pages/mobilni-datovka.html</url>
+</application>
--
2.26.2

View File

@@ -1,68 +0,0 @@
From 795e069727216e95708453b03b80ca99a98ea78f Mon Sep 17 00:00:00 2001
From: David Heidelberg <david@ixit.cz>
Date: Fri, 24 Apr 2020 00:29:20 +0200
Subject: [PATCH 3/3] Support Linux (phones and desktop)
Signed-off-by: David Heidelberg <david@ixit.cz>
---
linux/nic.cz.mobile-datovka.desktop | 10 ++++++++++
mobile-datovka.pro | 26 +++++++++++++++++++++++++-
2 files changed, 35 insertions(+), 1 deletion(-)
create mode 100644 linux/nic.cz.mobile-datovka.desktop
diff --git a/linux/nic.cz.mobile-datovka.desktop b/linux/nic.cz.mobile-datovka.desktop
new file mode 100644
index 0000000..6089407
--- /dev/null
+++ b/linux/nic.cz.mobile-datovka.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=Mobile Datovka
+GenericName=Datovka
+Comment=Mobile client for ISDS
+Exec=mobile-datovka
+Icon=datovka
+Terminal=false
+Categories=Office;Email;Qt;
diff --git a/mobile-datovka.pro b/mobile-datovka.pro
index 635279f..1ff6f7d 100644
--- a/mobile-datovka.pro
+++ b/mobile-datovka.pro
@@ -380,7 +380,31 @@ RESOURCES += \
# Linux target.
linux {
- ICON = res/datovka.png
+ isEmpty(PREFIX) {
+ PREFIX = "/usr/local"
+ }
+
+ BINDIR="$${PREFIX}/bin"
+ DATADIR="$${PREFIX}/share"
+
+ LOCALE_INST_DIR = "$${DATADIR}/$${APP_NAME}/localisations"
+
+ target.path = "$${BINDIR}"
+
+ desktop.path = "$${DATADIR}/applications"
+ desktop.files += "linux/nic.cz.mobile-datovka.desktop"
+
+ metainfo.path = "$${DATADIR}/metainfo"
+ metainfo.files += "linux/nic.cz.mobile-datovka.metadata.xml"
+
+ icon64.path = "$${DATADIR}/icons/hicolor/64x64/apps"
+ icon64.files += "res/datovka.png"
+
+ localisation.path = "$${LOCALE_INST_DIR}"
+ localisation.files += res/locale/datovka_cs.qm \
+ res/locale/datovka_en.qm
+
+ INSTALLS += target desktop metainfo icon64
}
# iOS target.
--
2.26.2

View File

@@ -37,11 +37,6 @@ DEPEND="
S="${WORKDIR}/${PN}-v${PV}"
PATCHES=(
"${FILESDIR}/${P}-0001-add-metainfo-for-distributions.patch"
"${FILESDIR}/${P}-0002-Support-Linux-phones-and-desktop.patch"
)
src_configure() {
lrelease ${PN}.pro || die
eqmake5 PREFIX="/usr" TEXT_FILES_INST_DIR="/usr/share/${PN}/"

View File

@@ -1,4 +1,5 @@
DIST version-0.10.0_alpha.tar.gz 43842 BLAKE2B c16d5524c6ffe860e4bef69702299f52dc32adae9f9966ccdcd45a8fdf000ed784eeb9eb109d1b7c91084f4120a64552b2aee14deec955ea0c773aee31077b2a SHA512 d7a0231e8519b298411bd2c63d7cea847381968b5db6be902507c9be7eb275a206d5c64cede284ab819397ffe647944c95069ee0dc8725e66ee2c02ef4bc8cfb
DIST version-0.14.2_alpha.tar.gz 46401 BLAKE2B 1c850c21d1ba8feb20e61876e3ee9fd4208dbca572f97e15ac8d3688653f0e4e94022224346f5971c9be1996a09b95c33ffd62bb51e0d8d9496ce2f9eccb031f SHA512 e6c01d5e5eff6e32cae283bb82a7b0626fa4d93e3a78265d206a5f5f34f47037ea324e0418f28ca3c4794bb5484215501acbc4586ddd8bcf0eaf5684dbf3a26b
DIST version-0.6.1_alpha.tar.gz 24986 BLAKE2B a78b7b1a5a2aec26afba6916483a40ac17c2aafae45511d3ba35bf28ec8466e1b696f235e1d3d54c83bffa5e9f974c7f2cd8f188e637d8b315e876d91741fae2 SHA512 ff68c7cfec5c59a1cfb8a600a1a439e7bdacba464c27e114f6fc0879caaf66cf04447e8dfff5c4afc02808fd19677f979520121b00c2d1f0a4995c5adade728d
DIST version-0.6.2_alpha.tar.gz 35658 BLAKE2B 89be24ecf24ac711045711f65303eb2deae9cccaf8d1fbc28c8f07e4d1fff3234e5ffdb0686de05fa29becca9d4eba2875307a4842f0f1aa66a8910d74f984cc SHA512 1fbb9295209e58babe1039ded6295024db040b4c5775f405be4af5e49035d9d968f322d919b055567340998828d04bafab7a140d98807d4a0d8eeedda7ed2dba
DIST version-0.9.0_alpha.tar.gz 41858 BLAKE2B 801f5c820484fb54cb4c030f20d2c287fd7054ac363065fe534b3d1e300a1078f49ca3770b3bec966aa161e3b4005934f4f4ed8ba8eecaedd17930e00561fd85 SHA512 bcba979bbf4016582d74c7fcc5882ea6e0e20a8884a398e4e87697fd3b0b44829f9b2e513aaa6f2f313cc0f319a48810795c640128b0f934310352d68803ca90

View File

@@ -0,0 +1,34 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit autotools
MYPV="${PV/_alpha/-alpha}"
DESCRIPTION="A command line function for package version management."
HOMEPAGE="https://github.com/azaeldevel/octetos-version"
SRC_URI="https://github.com/azaeldevel/octetos-${PN}/archive/${MYPV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
IUSE=""
DEPEND=""
RDEPEND="${DEPEND}"
BDEPEND="
dev-libs/octetos-core
"
S="${WORKDIR}/octetos-${PN}-${MYPV}"
src_prepare() {
default
eautoreconf -fi
}
src_configure() {
econf --with-portage
}

View File

@@ -0,0 +1 @@
DIST octetos-biblion-0.1.1_alpha.tar.gz 42552 BLAKE2B 2cc0929a668517e600654e8e2a0479cf2b69a0fbdfe31e2dad468ef03dd2cc0044517af691b0e75e3c20b6dd5154156961646c6cba16660d029ee3d6cd8e363a SHA512 1a74025d609b2844c1b2662846506994af95b171578444ea29f4ab35adab2d9da7098f27e2f82b01d6b27e8b51343a7d5bbfbdfc810608553493393da08a61f2

View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>azael.devel@gmail.com</email>
<name>Azael Reyes</name>
</maintainer>
</pkgmetadata>

View File

@@ -0,0 +1,31 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit autotools
MYPV="${PV/_alpha/-alpha/}"
DESCRIPTION="Library for reading biblia."
HOMEPAGE="https://github.com/azaeldevel/octetos-core"
SRC_URI="https://github.com/azaeldevel/${PN}/archive/${MYPV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
IUSE=""
DEPEND="
dev-libs/octetos-core
"
RDEPEND="${DEPEND}"
BDEPEND="dev-util/cunit"
S="${WORKDIR}/${PN}-${MYPV}"
src_prepare() {
default
eautoreconf -fi
}

View File

@@ -18,13 +18,13 @@ KEYWORDS="~amd64"
IUSE=""
DEPEND="
sys-devel/bison
dev-libs/libconfig
dev-perl/XML-Parser
dev-util/intltool
"
RDEPEND="${DEPEND}"
BDEPEND="
sys-devel/bison
dev-util/intltool
>=sys-devel/gcc-8.1
"

View File

@@ -18,13 +18,13 @@ KEYWORDS="~amd64"
IUSE=""
DEPEND="
sys-devel/bison
dev-libs/libconfig
dev-perl/XML-Parser
dev-util/intltool
"
RDEPEND="${DEPEND}"
BDEPEND="
sys-devel/bison
dev-util/intltool
>=sys-devel/gcc-8.1
"

View File

@@ -1,3 +1,5 @@
DIST verilator-4.034.tar.gz 2612571 BLAKE2B ff4fd49f3ef09fb17c7cce799b2c39f89ce327245b11d2f6ab9a6644e04654d637be4689e4b8d8841e37c889f7d614a41b9e475a276de8adf80587cf14fc9d3b SHA512 04c9c0f51c5c8262cd8e8338204ed6729a3f5be399e012252dd2c102f6474a9abcfdb693bc13eb4fcf7e74e0a6dfa375c3b6592fbc5b5ad2ed07f852a4a06646
DIST verilator-4.032.tar.gz 2497830 BLAKE2B eb318e0326be9f72b32bd98f8a6de74516bda4bdf2d21d572c72e92759a4ee64e514fdb3dae20c8bea40e72d493775a02766e7ea619dd8eb541f3450278b0b20 SHA512 2b34d0b6d94babb74b443b3f3ae4e6c9f15423a0b078df72930c4f75b4a831843a4d4b901dc586725a67a49c6f5308402fef4c9ca72b88b13b01746b36d2fb20
DIST verilator-4.034.tar.gz 1998271 BLAKE2B 456ee4c8e7d28dd979f74cd8c6b5e734d33267b5dba1926f82b6827fbc1b2625aafc4f4d088c961be1632957966ab350767f836ed7eee1f1f01b4315f1c8f2b2 SHA512 5651cf2c102df10b3784799968f8e554d0116487a962b99fd03526b71af67cb49c932eaaef260b19cbfc80a47747dd6e8d04b461f663522cd1f05ad9843002d3
DIST verilator-4.036.tar.gz 2064470 BLAKE2B 210d39747e132ce1de8673e971c8765a28eeb23f30902dd032acb67a6d5f9fce2eae8c4edec00b839c6e81ff0985a99e4b065b4a570531f393d47802121eea93 SHA512 2f83bf144346aed4ff6bd208af56ed19cbe562c51324b8dc3243419b63734ff15c805fd6e7d5c2109af9cf51f7d44e249d7f1cc1a383bab428503de317e1d60c
DIST verilator-4.038.tar.gz 2085353 BLAKE2B 330162ed8786b6ac1127e844224ad4a3cfc20e6bc2bbf8f1662ae23e3b18b8b908b145390a2e284ff2b70299b9475d25da7eb23643c70b617d95061c7a4a79c3 SHA512 a963aeccd4bb36a3ac39a5e831ec2600b87c0b46c787fa38900b7bd0ae59fb75dbfaf6261d1050ae1bd29fdb8b0b6a1957f08559c36c498f49738819b4d56d68
DIST verilator-4.040.tar.gz 2094439 BLAKE2B 52303784d0385884280b254bc9a259880184e852a1102d0ad0b1d81490c63a6900789cefc1b3138cdbaec9f35c1593d464355cf58be12a7abb33d9d3c3161648 SHA512 5084b367bddca62df3fe4de1ef8c0c04d02bbf104b433d6caedfd9334659fda323dc4ce650138a3b16e0d9d87fb89453d8fc3fd4f9be298359baf03d986d8e01

View File

@@ -1,17 +1,13 @@
diff --git a/src/Makefile_obj.in b/src/Makefile_obj.in
index 911f97e1..63799569 100644
--- a/src/Makefile_obj.in
+++ b/src/Makefile_obj.in
@@ -323,6 +323,12 @@ V3ParseBison.h: V3ParseBison.c
V3ParseBison.c: verilog.y $(BISONPRE)
@echo "If you get errors from verilog.y below, try upgrading bison to version 1.875 or newer."
$(PERL) $(BISONPRE) --yacc ${YACC} -d -v -o V3ParseBison.c $<
+ # Unfortunately bison 3.6.1 have break changes caused compile error.
+ # Workaround issue https://github.com/verilator/verilator/issues/2320
+ # This workaround is safe for the old version of bison.
+ # TODO: code should removed when bison fixed the problem.
+ @sed -ie 's#/\* "/\*.*\*/" \*/##g' V3ParseBison.c
+ @sed -ie 's#/\* "/\*.*\*/" \*/##g' V3ParseBison.h
V3Lexer_pregen.yy.cpp: verilog.l V3ParseBison.h $(HEADERS)
${LEX} --version
diff --git a/src/bisonpre b/src/bisonpre
index 39597957..48cf26eb 100755
--- a/src/bisonpre
+++ b/src/bisonpre
@@ -212,6 +212,8 @@ sub clean_output {
$line =~ s!\(YY_\("!(YY_((char*)"!g;
# Fix bison 2.3 glr-parser warning about yyerrorloc.YYTYPE::yydummy uninit
$line =~ s!(YYLTYPE yyerrloc;)!$1 yyerrloc.yydummy=0;/*bisonpre*/!g;
+ # Fix bison 3.6.1 unexpected nested-comment
+ $line =~ s!/\* "/\*.*\*/" \*/!!g;
$fh->write($line);
}
$fh->close;

View File

@@ -0,0 +1,19 @@
diff --git a/src/verilog.y b/src/verilog.y
index 2f16ef23..1175542c 100644
--- a/src/verilog.y
+++ b/src/verilog.y
@@ -301,6 +301,15 @@ class AstSenTree;
// Bison 3.0 and newer
BISONPRE_VERSION(3.0,%define parse.error verbose)
+// We run bison with the -d argument. This tells it to generate a
+// header file with token names. Old versions of bison pasted the
+// contents of that file into the generated source as well; newer
+// versions just include it.
+//
+// Since we run bison through ../bisonpre, it doesn't know the correct
+// header file name, so we need to tell it.
+BISONPRE_VERSION(3.7,%define api.header.include {"V3ParseBison.h"})
+
// When writing Bison patterns we use yTOKEN instead of "token",
// so Bison will error out on unknown "token"s.

View File

@@ -0,0 +1,49 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
inherit autotools
DESCRIPTION="The fast free Verilog/SystemVerilog simulator"
HOMEPAGE="
https://verilator.org
https://github.com/verilator/verilator
"
if [[ "${PV}" == "9999" ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
else
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
LICENSE="|| ( Artistic-2 LGPL-3 )"
SLOT="0"
RDEPEND="
dev-lang/perl
sys-libs/zlib
"
DEPEND="
${RDEPEND}
"
BDEPEND="
sys-devel/bison
sys-devel/flex
"
PATCHES=(
# https://github.com/verilator/verilator/issues/2320
"${FILESDIR}"/${PN}-4.034-fix-bison.patch
# https://github.com/verilator/verilator/pull/2505
"${FILESDIR}"/${PN}-4.040-fix-bison.patch
)
src_prepare() {
default
eautoconf --force
}

View File

@@ -39,6 +39,8 @@ BDEPEND="
PATCHES=(
# https://github.com/verilator/verilator/issues/2320
"${FILESDIR}"/${PN}-4.034-fix-bison.patch
# https://github.com/verilator/verilator/pull/2505
"${FILESDIR}"/${PN}-4.040-fix-bison.patch
)
src_prepare() {

View File

@@ -37,8 +37,8 @@ BDEPEND="
"
PATCHES=(
# https://github.com/verilator/verilator/issues/2320
"${FILESDIR}"/${PN}-4.034-fix-bison.patch
# https://github.com/verilator/verilator/pull/2505
"${FILESDIR}"/${PN}-4.040-fix-bison.patch
)
src_prepare() {

View File

@@ -37,8 +37,8 @@ BDEPEND="
"
PATCHES=(
# https://github.com/verilator/verilator/issues/2320
"${FILESDIR}"/${PN}-4.034-fix-bison.patch
# https://github.com/verilator/verilator/pull/2505
"${FILESDIR}"/${PN}-4.040-fix-bison.patch
)
src_prepare() {

View File

@@ -0,0 +1,47 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
inherit autotools
DESCRIPTION="The fast free Verilog/SystemVerilog simulator"
HOMEPAGE="
https://verilator.org
https://github.com/verilator/verilator
"
if [[ "${PV}" == "9999" ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
else
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
LICENSE="|| ( Artistic-2 LGPL-3 )"
SLOT="0"
RDEPEND="
dev-lang/perl
sys-libs/zlib
"
DEPEND="
${RDEPEND}
"
BDEPEND="
sys-devel/bison
sys-devel/flex
"
PATCHES=(
# https://github.com/verilator/verilator/pull/2505
"${FILESDIR}"/${PN}-4.040-fix-bison.patch
)
src_prepare() {
default
eautoconf --force
}

View File

@@ -1 +1 @@
DIST flatpak-1.8.1.tar.xz 1423484 BLAKE2B 74ae70668f02c99f97d2239d12f12b0a6cd403c9920b2edd3dae5119bdae3095d743fb416a3a9ebdd71a3e9b8232755b1a4813934e541d874cba0b811d6f7041 SHA512 37c1b1a4c64cae06f94d6e2c9715c8db996fc66574abbc0d2f41d695e36e5ff8812121c1a704f4fb20b552ff9af8125314e4436b15a85f86dba2053c5ed477d8
DIST flatpak-1.8.2.tar.xz 1424468 BLAKE2B 4ade582176cd4ed494d0afc2a75b81168dc2263183d4ec2ef731b2d3ccbd96a7cc0fdb012f07966b4429529ab69c79b32abbcc4c1a8640b030d3ba2edfbce36d SHA512 f27c05b2621328dce31e4c31ae097765864bac84f6c1fada23f48c0235c6b85f447948a07861653f7bed4e17e43f8ff3d2c60263e23426c765c787b5f447a4e2