root
2 years ago
parent
688815c97b
commit
df7efe96ea
Binary file not shown.
Binary file not shown.
@ -1,3 +1,2 @@
|
||||
DIST kontrast-21.08.3.tar.xz 125632 BLAKE2B 8734de15fcfd542d037cde92e6a80060e9c6628cd69d3cfee1f1f4c9b8938647d83924381966600ac9978acfa14723e0920c98f3ce2e666ddfdb624b8cc5f010 SHA512 193d372cdcecb3b90a352fb2deb24528d004c44e50c834e02a63c562eb97bd1f528fd81254bfc3ab7152edcc9894129eae7c6e1826a9ae42bc5ab22bf9a660c9
|
||||
DIST kontrast-21.12.3.tar.xz 125760 BLAKE2B b72d78961d22fc0eb51c0a64f9a7381ef9e87709d9fc24a08c3b08c60ad8102eadbc97943e72b1153f950654f442f97190d1e34c3beb24f4f8ea070f923dba55 SHA512 36d084f0801d393a0d7bdd771d23163a192e6d0e50f6499b9080e3928f5f3982dcee81c3e3453f8de2ece721c508479928fdff4a971cfef945acadd917e19581
|
||||
DIST kontrast-22.04.0.tar.xz 125872 BLAKE2B a04569299df54635687d0e30b7453d4fa7dfe9699cbac4da82749d0e0e37e2f6006b1d7e0de88813c1103b59dd10141d6c034fd51bebe0846120790d4aa0cfa2 SHA512 cf8103b28b0e2658c251af2e9adcc7099a55655d4f59a6d410bfbf12fe20830f6be80ab28bd80534e0a20d7ad6b8f83740bb022b1c1602f9c24a0cd94198cbfd
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
KDE_GEAR="true"
|
||||
KFMIN=5.84.0
|
||||
QTMIN=5.15.2
|
||||
inherit ecm kde.org
|
||||
|
||||
DESCRIPTION="Tool to check contrast for colors to verify they are correctly accessible"
|
||||
HOMEPAGE="https://apps.kde.org/kontrast/"
|
||||
|
||||
LICENSE="GPL-3+"
|
||||
SLOT="5"
|
||||
KEYWORDS="amd64 arm64 ~riscv x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
>=dev-qt/qtdbus-${QTMIN}:5
|
||||
>=dev-qt/qtdeclarative-${QTMIN}:5
|
||||
>=dev-qt/qtgui-${QTMIN}:5
|
||||
>=dev-qt/qtquickcontrols2-${QTMIN}:5
|
||||
>=dev-qt/qtsql-${QTMIN}:5
|
||||
>=dev-qt/qtsvg-${QTMIN}:5
|
||||
>=dev-qt/qtwidgets-${QTMIN}:5
|
||||
>=kde-frameworks/kcoreaddons-${KFMIN}:5
|
||||
>=kde-frameworks/ki18n-${KFMIN}:5
|
||||
>=kde-frameworks/kirigami-${KFMIN}:5
|
||||
"
|
||||
RDEPEND="${DEPEND}
|
||||
kde-plasma/xdg-desktop-portal-kde
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
ecm_src_prepare
|
||||
ecm_punt_bogus_dep KF5 Declarative
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
@ -1,3 +1,2 @@
|
||||
DIST dolphin-plugins-21.08.3.tar.xz 254604 BLAKE2B 9a7a9c7a1cf82d458c1fd0bbce6b47c233b8a7a20bd1d1696bc75d6b04c8e4a9d6464025d8ad39b3bb96b8dd428fb880a5d318f7c0d13ef3bc8bf24a42c24169 SHA512 2fb7fbd6490d768f3eb7d756429d858337b8088a7c87836ed4a54fc3f863f50c4973bbe2ae149d53d2769d7ce3c31fbd737bc4afc74fd14260a158da83992076
|
||||
DIST dolphin-plugins-21.12.3.tar.xz 254696 BLAKE2B e669a8acbf8b5559a602dd3ae646e2384b89a672bb0ed42d2f094b75a1eaefd6994644daaa70d17f9baba8ea491cef632090050b93e0f5e0b50f203a6166338e SHA512 3dad72b6e0283a8c825aded82e9d15bc5e03303bbfc6dd8f1e6af2cb3892ec9b04a3c97f01246e20abe6d86e5a91fa1c4f8fff48ed24186a3780009a78298d23
|
||||
DIST dolphin-plugins-22.04.0.tar.xz 256164 BLAKE2B 8980f3d7687b456edc81d69027c66f1e7801fa5876ef605a021caecae02b7b30596b1b9bdd8c0de2b5c6c98393eafb75bedc6f0d411d144fa430619778ff7f97 SHA512 3c7dcc1404cbfbb0a4805eb1116dae53b03fa1b49ee483b09009f32035d0939fc8bedd65866765e94d5294185f42bda4b6aaba6486c52ea2a524e5678e6b4c28
|
||||
|
||||
@ -1,65 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
ECM_HANDBOOK="false"
|
||||
KDE_GEAR="true"
|
||||
KDE_ORG_CATEGORY="sdk"
|
||||
KDE_ORG_NAME="dolphin-plugins"
|
||||
MY_PLUGIN_NAME="mountiso"
|
||||
KFMIN=5.84.0
|
||||
PVCUT=$(ver_cut 1-3)
|
||||
QTMIN=5.15.2
|
||||
inherit ecm kde.org
|
||||
|
||||
DESCRIPTION="Dolphin plugin for ISO loopback device mounting"
|
||||
HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
|
||||
|
||||
LICENSE="GPL-2" # TODO: CHECK
|
||||
SLOT="5"
|
||||
KEYWORDS="amd64 arm64 ~ppc64 x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
>=dev-qt/qtdbus-${QTMIN}:5
|
||||
>=dev-qt/qtgui-${QTMIN}:5
|
||||
>=dev-qt/qtwidgets-${QTMIN}:5
|
||||
>=kde-apps/dolphin-${PVCUT}:5
|
||||
>=kde-frameworks/kcompletion-${KFMIN}:5
|
||||
>=kde-frameworks/kconfig-${KFMIN}:5
|
||||
>=kde-frameworks/kcoreaddons-${KFMIN}:5
|
||||
>=kde-frameworks/ki18n-${KFMIN}:5
|
||||
>=kde-frameworks/kio-${KFMIN}:5
|
||||
>=kde-frameworks/ktextwidgets-${KFMIN}:5
|
||||
>=kde-frameworks/solid-${KFMIN}:5
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_prepare() {
|
||||
ecm_src_prepare
|
||||
# kxmlgui, qtnetwork only required by dropbox
|
||||
ecm_punt_bogus_dep Qt5 Network
|
||||
ecm_punt_bogus_dep KF5 XmlGui
|
||||
# delete non-${PN} translations
|
||||
if [[ ${KDE_BUILD_TYPE} = release ]]; then
|
||||
find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DBUILD_${MY_PLUGIN_NAME}=ON
|
||||
-DBUILD_bazaar=OFF
|
||||
-DBUILD_dropbox=OFF
|
||||
-DBUILD_git=OFF
|
||||
-DBUILD_hg=OFF
|
||||
-DBUILD_svn=OFF
|
||||
)
|
||||
ecm_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
ecm_src_install
|
||||
rm "${D}"/usr/share/metainfo/org.kde.dolphin-plugins.metainfo.xml || die
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
@ -1 +1,2 @@
|
||||
DIST gnome-text-editor-42.0.tar.xz 1126224 BLAKE2B 7e02cea493696630284d7994f1d227a5589ad7aa7d7b98e5f67655ebcd69f7e2ded1195368e666ad26621b6b32168c7defde1cd3c2e278ca8741bf572979154e SHA512 4462ef0e0113863e752ce2c4d499386cbf9d72c67126fb60512eea39bd53bed6d56b2a62511e9af62024f9704ba722411ebbd5040aabcefce0b460925b91ad1f
|
||||
DIST gnome-text-editor-42.1.tar.xz 1131572 BLAKE2B 8d1b59131d8230af0dc9e3029798f1200b6a00f8991e912c34ce4808ca5517e14763825aa8ed7aecdac88e422e9d224d3c027282f6373c023c4ffe9f3e4896b6 SHA512 4616750d15d61b2bd2c708e414b564d0aa6c1202c765fbb895e60cdb46f8335fbefa70a24e8d99f208b186f2c8c244b752475cefdbe0184a67b60de116d5ac2f
|
||||
|
||||
@ -0,0 +1,60 @@
|
||||
# Copyright 2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit gnome.org gnome2-utils meson xdg
|
||||
|
||||
DESCRIPTION="A simple text editor for the GNOME desktop"
|
||||
HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-text-editor"
|
||||
SRC_URI="mirror://gnome/sources/gnome-text-editor/42/gnome-text-editor-${PV/_/.}.tar.xz"
|
||||
S="${WORKDIR}/gnome-text-editor-${PV/_/.}"
|
||||
|
||||
LICENSE="GPL-3+ CC-BY-SA-3.0"
|
||||
SLOT="0"
|
||||
|
||||
IUSE="spell"
|
||||
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
DEPEND="
|
||||
>=dev-libs/glib-2.69:2
|
||||
>=gui-libs/gtk-4.6:4
|
||||
>=gui-libs/gtksourceview-5.4.1:5
|
||||
gui-libs/libadwaita:1
|
||||
dev-libs/libpcre
|
||||
spell? (
|
||||
>=app-text/enchant-2.2.0:2
|
||||
dev-libs/icu:=
|
||||
)
|
||||
"
|
||||
RDEPEND="${DEPEND}
|
||||
gnome-base/gsettings-desktop-schemas
|
||||
"
|
||||
BDEPEND="
|
||||
dev-util/glib-utils
|
||||
dev-util/itstool
|
||||
>=sys-devel/gettext-0.21
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PV}-appdata-fix-appstream-validation.patch
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
local emesonargs=(
|
||||
$(meson_feature spell enchant)
|
||||
)
|
||||
meson_src_configure
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
xdg_pkg_postinst
|
||||
gnome2_schemas_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
xdg_pkg_postrm
|
||||
gnome2_schemas_update
|
||||
}
|
||||
Binary file not shown.
@ -0,0 +1 @@
|
||||
DIST exwm-0.26.tar.gz 75687 BLAKE2B 59f272339196198f4d8977e8a2a6badb0293dba52b5049fe28e3cf6a46b578ecf58a0cbb874744c25ba868ac9ec78ebde6afcc588f3861dd459cd1392d096b92 SHA512 f8492836105da5e6494ff65f4972a26c9be55bc54de72857b4fea9be84b392e2cb135241b74dede773e0fdcf2b216f2e1d750709ee0a7dc16afe8b6672676a17
|
||||
@ -0,0 +1,27 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit elisp
|
||||
|
||||
DESCRIPTION="Emacs X Window Manager"
|
||||
HOMEPAGE="https://github.com/ch11ng/exwm/"
|
||||
SRC_URI="https://github.com/ch11ng/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
RDEPEND="app-emacs/xelb"
|
||||
BDEPEND="${RDEPEND}"
|
||||
|
||||
DOCS=( README.md )
|
||||
SITEFILE="50${PN}-gentoo.el"
|
||||
|
||||
src_install() {
|
||||
elisp_src_install
|
||||
|
||||
insinto ${SITEETC}/${PN}/examples
|
||||
doins xinitrc
|
||||
}
|
||||
@ -0,0 +1 @@
|
||||
(add-to-list 'load-path "@SITELISP@")
|
||||
@ -0,0 +1,13 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>gnu-emacs@gentoo.org</email>
|
||||
<name>Gentoo GNU Emacs project</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<bugs-to>https://github.com/ch11ng/exwm/issues/</bugs-to>
|
||||
<remote-id type="github">ch11ng/exwm</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@ -0,0 +1 @@
|
||||
DIST xelb-0.18.tar.gz 127797 BLAKE2B d438bea5142dc233d272959e9ca683d55cf1b61a97b002bf6864425a83c9238fca37aa7387f38dac3c3c8064b9ca8c5a64f934ef60360273df1453a152778785 SHA512 72048e12028811b5beb206102bef27b519bf0524e801f2eec5b3eac8dee785a99dc165e6ecafe14680a5fc0025d7d720db76df5fbbcb9a65070402a29de6ad0b
|
||||
@ -0,0 +1 @@
|
||||
(add-to-list 'load-path "@SITELISP@")
|
||||
@ -0,0 +1,13 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>gnu-emacs@gentoo.org</email>
|
||||
<name>Gentoo GNU Emacs project</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<bugs-to>https://github.com/ch11ng/xelb/issues/</bugs-to>
|
||||
<remote-id type="github">ch11ng/xelb</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@ -0,0 +1,24 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
NEED_EMACS=24.4
|
||||
|
||||
inherit elisp
|
||||
|
||||
DESCRIPTION="X protocol Emacs Lisp Binding"
|
||||
HOMEPAGE="https://github.com/ch11ng/xelb/"
|
||||
SRC_URI="https://github.com/ch11ng/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
RDEPEND="
|
||||
app-editors/emacs[gui]
|
||||
x11-apps/xauth
|
||||
"
|
||||
|
||||
DOCS=( README.md )
|
||||
SITEFILE="50${PN}-gentoo.el"
|
||||
@ -1 +1 @@
|
||||
DIST 86Box-3.4.tar.gz 4218439 BLAKE2B ea5dbc31ca3b801f45c9923d0723fcf7f71dfda2a3835b54ee9c700650f28dbb8ed8644b0344c7cfea244fd755847842466bf203482b5eabde85f72b60b15fd8 SHA512 a60034e027bd188343c8eaefe6c56699bf5f7b8016cb1443b081655377bddbd84159cd63362d268a73fc6a5f92ec38544d2fb82aacdb40e8d0eec83bba00cff0
|
||||
DIST 86Box-3.4.1.tar.gz 4221251 BLAKE2B 20e3dfbab2a624a834766e4b7767fade045358ef394d3178d02b909e1e696b723e89618bf97e0636bfff882353ae77be23fccc4367513f95fc2e4a08c22d53c5 SHA512 76a4f8d129bdad6d4eef5d34c68b4a90840b00ba0bc2771d07a24ffcf7baa8db6ce2a23936675e0126a2938f48486a734bcebae7f2df2bbaf67ffa7e8dc3b5fa
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1 +1,2 @@
|
||||
DIST apvlv-0.1.5.tar.gz 4254177 BLAKE2B 53bb949838353e7e8387219d086b8c7efef78d4bff15196c68e3d0fe6c298be8a771ecce4e156254f1d072d1715794caff640ebe795f8da73e09d6a4fe4addc9 SHA512 680b2d6e272cda34b0b9065f5fdf7b917a4e3ed4d54a6e78cb41a60cf43374c687b506d4148d6cecf87912957fbe6bc4c77e9278616fd236e49ade15774e1ccd
|
||||
DIST apvlv-0.4.0.tar.gz 4361302 BLAKE2B 99d61df285ff3b910ace50bc4b1b62601fe7ca9037f835262a8eac179ddcccff5f772121b223e38050243d4bc2da9532e17d9b38fbceb786971d77fea006f91d SHA512 a25033e52acf34b486101953ffaa5de604e3321f9b4705e94fa157596ef560351c1712ed830b2a950f92c054b600a33f903be58f8a7d222c27e5125fedf4245b
|
||||
|
||||
@ -0,0 +1,57 @@
|
||||
# Copyright 2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit xdg cmake desktop
|
||||
|
||||
DESCRIPTION="Alf's PDF/DJVU/EPUB Viewer like Vim"
|
||||
HOMEPAGE="https://github.com/naihe2010/apvlv/"
|
||||
SRC_URI="https://github.com/naihe2010/apvlv/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="debug djvu"
|
||||
|
||||
RDEPEND="
|
||||
app-text/ebook-tools
|
||||
>=app-text/poppler-0.5.0:=[cairo,xpdf-headers(+)]
|
||||
dev-libs/glib:2
|
||||
dev-libs/libxml2
|
||||
net-libs/webkit-gtk:=
|
||||
x11-libs/cairo
|
||||
x11-libs/gdk-pixbuf:2
|
||||
x11-libs/gtk+:3
|
||||
x11-libs/pango
|
||||
djvu? ( app-text/djvu )
|
||||
"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
app-text/ghostscript-gpl
|
||||
media-libs/freetype
|
||||
"
|
||||
BDEPEND="
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-cmake-cxxflags.patch
|
||||
"${FILESDIR}"/${P}-icon.patch
|
||||
)
|
||||
src_prepare() {
|
||||
cmake_src_prepare
|
||||
}
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DAPVLV_WITH_DJVU=$(usex djvu)
|
||||
-DAPVLV_ENABLE_DEBUG=$(usex debug)
|
||||
-DAPVLV_WITH_TXT=ON
|
||||
-DDOCDIR="/usr/share/doc/${PF}"
|
||||
)
|
||||
cmake_src_configure
|
||||
}
|
||||
src_install() {
|
||||
cmake_src_install
|
||||
newicon -s 32 icons/pdf.png ${PN}.png
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -3,7 +3,7 @@
|
||||
IF (WIN32)
|
||||
ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
|
||||
ELSE (WIN32)
|
||||
- SET(CMAKE_CXX_FLAGS "-Wall -fno-strict-aliasing")
|
||||
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fno-strict-aliasing")
|
||||
|
||||
OPTION(APVLV_ENABLE_DEBUG "If build binary with debug information." OFF)
|
||||
IF (APVLV_ENABLE_DEBUG)
|
||||
@ -0,0 +1,10 @@
|
||||
--- a/apvlv.desktop
|
||||
+++ b/apvlv.desktop
|
||||
@@ -2,6 +2,7 @@
|
||||
Version=1.0
|
||||
Type=Application
|
||||
Name=apvlv
|
||||
+Icon=apvlv
|
||||
Comment=A minimalistic document viewer
|
||||
Comment[de]=Ein minimalistischer Dokumenten-Betrachter
|
||||
Comment[fr]=Un visionneur de document minimaliste
|
||||
Binary file not shown.
Binary file not shown.
@ -1,2 +1,2 @@
|
||||
DIST mycli-1.22.2_p20201026.tar.gz 269338 BLAKE2B 42f4349e65a43829691fd7fa0fa1a57968cf34ffba04156ae221d7a2713179826fc09903e45b6f05fbf05688f956a9cd95e87393179992378766b3a3a6ef9c6e SHA512 70d68d7517322b28783c324d463664c2794ba26cc78e0eee056891ce43dbce57c4dd9c13982ac2976af07ff1fa3d4552cb22bf42b9c7885c93483ba86b873636
|
||||
DIST mycli-1.24.1.tar.gz 275983 BLAKE2B cc03ebd0f4de1fabbd1c186139aac04a50d01529190972cac63765a4d3e688e994c112d001489bf1dfb17541370e0c348a368d85a86b7eed335b775b96897765 SHA512 5f8ffb98fd285d2e556bef7cefdc77588983c0028c7c24084710633fb469ae3c5ab2232ca23e87406d44d87e503c113039e6884ec9efd603f45b3ab7ed7c0925
|
||||
DIST mycli-1.25.0.tar.gz 277022 BLAKE2B eabb07003741bc041fcfc7be92beade5bdf0c19d0be00b1a98037d38b164043e5280254b9c8446254928253f6059c33ae9395df780a2f30c5d9cbebffe020895 SHA512 e20b1466f0f2bf81f0d65bd23f97eae6b0943029c89d9d45f84368abc5f12c3054c09a45c4daea47831a192417e2e5be7bcd6622ea518e57b68f975a028d3f79
|
||||
|
||||
@ -1,470 +0,0 @@
|
||||
diff --git a/.travis.yml b/.travis.yml
|
||||
index 0afb5cc..182dea7 100644
|
||||
--- a/.travis.yml
|
||||
+++ b/.travis.yml
|
||||
@@ -12,7 +12,7 @@ matrix:
|
||||
|
||||
install:
|
||||
- pip install -r requirements-dev.txt
|
||||
- - pip install -e .
|
||||
+ - pip install --no-cache-dir -e .
|
||||
- sudo rm -f /etc/mysql/conf.d/performance-schema.cnf
|
||||
- sudo service mysql restart
|
||||
|
||||
diff --git a/README.md b/README.md
|
||||
index efe804d..d5a0687 100644
|
||||
--- a/README.md
|
||||
+++ b/README.md
|
||||
@@ -96,6 +96,7 @@ $ sudo apt-get install mycli # Only on debian or ubuntu
|
||||
--local-infile BOOLEAN Enable/disable LOAD DATA LOCAL INFILE.
|
||||
--login-path TEXT Read this path from the login file.
|
||||
-e, --execute TEXT Execute command and quit.
|
||||
+ --init-command TEXT SQL statement to execute after connecting.
|
||||
--help Show this message and exit.
|
||||
|
||||
Features
|
||||
diff --git a/changelog.md b/changelog.md
|
||||
index a4fea35..508c801 100644
|
||||
--- a/changelog.md
|
||||
+++ b/changelog.md
|
||||
@@ -1,9 +1,22 @@
|
||||
+TBD
|
||||
+===
|
||||
+
|
||||
+Features:
|
||||
+---------
|
||||
+
|
||||
+* Add an option `--init-command` to execute SQL after connecting (Thanks: [KITAGAWA Yasutaka]).
|
||||
+
|
||||
+Bug Fixes:
|
||||
+----------
|
||||
+* Fixed compatibility with sqlparse 0.4 (Thanks: [mtorromeo]).
|
||||
+
|
||||
1.22.2
|
||||
======
|
||||
|
||||
Bug Fixes:
|
||||
----------
|
||||
-* Make the `pwd` module optional.
|
||||
+
|
||||
+* Make the `pwd` module optional.
|
||||
|
||||
1.22.1
|
||||
======
|
||||
@@ -18,6 +31,11 @@ Features:
|
||||
* Add an option `--list-ssh-config` to list ssh configurations.
|
||||
* Add an option `--ssh-config-path` to choose ssh configuration path.
|
||||
|
||||
+Bug Fixes:
|
||||
+----------
|
||||
+
|
||||
+* Fix specifying empty password with `--password=''` when config file has a password set (Thanks: [Zach DeCook]).
|
||||
+
|
||||
|
||||
1.21.1
|
||||
======
|
||||
@@ -28,6 +46,7 @@ Bug Fixes:
|
||||
|
||||
* Fix broken auto-completion for favorite queries (Thanks: [Amjith]).
|
||||
* Fix undefined variable exception when running with --no-warn (Thanks: [Georgy Frolov])
|
||||
+* Support setting color for null value (Thanks: [laixintao])
|
||||
|
||||
1.21.0
|
||||
======
|
||||
@@ -768,3 +787,6 @@ Bug Fixes:
|
||||
[François Pietka]: https://github.com/fpietka
|
||||
[Frederic Aoustin]: https://github.com/fraoustin
|
||||
[Georgy Frolov]: https://github.com/pasenor
|
||||
+[Zach DeCook]: https://zachdecook.com
|
||||
+[laixintao]: https://github.com/laixintao
|
||||
+[mtorromeo]: https://github.com/mtorromeo
|
||||
diff --git a/mycli/AUTHORS b/mycli/AUTHORS
|
||||
index b3636d9..a1204b0 100644
|
||||
--- a/mycli/AUTHORS
|
||||
+++ b/mycli/AUTHORS
|
||||
@@ -72,6 +72,10 @@ Contributors:
|
||||
* Jakub Boukal
|
||||
* Takeshi D. Itoh
|
||||
* laixintao
|
||||
+ * Zach DeCook
|
||||
+ * kevinhwang91
|
||||
+ * KITAGAWA Yasutaka
|
||||
+ * Massimiliano Torromeo
|
||||
|
||||
Creator:
|
||||
--------
|
||||
diff --git a/mycli/clistyle.py b/mycli/clistyle.py
|
||||
index c94f793..293f0f4 100644
|
||||
--- a/mycli/clistyle.py
|
||||
+++ b/mycli/clistyle.py
|
||||
@@ -34,6 +34,7 @@ TOKEN_TO_PROMPT_STYLE = {
|
||||
Token.Output.Header: 'output.header',
|
||||
Token.Output.OddRow: 'output.odd-row',
|
||||
Token.Output.EvenRow: 'output.even-row',
|
||||
+ Token.Output.Null: 'output.null',
|
||||
Token.Prompt: 'prompt',
|
||||
Token.Continuation: 'continuation',
|
||||
}
|
||||
diff --git a/mycli/main.py b/mycli/main.py
|
||||
index 03797a0..dffd724 100755
|
||||
--- a/mycli/main.py
|
||||
+++ b/mycli/main.py
|
||||
@@ -98,7 +98,7 @@ class MyCli(object):
|
||||
xdg_config_home = "~/.config"
|
||||
system_config_files = [
|
||||
'/etc/myclirc',
|
||||
- os.path.join(xdg_config_home, "mycli", "myclirc")
|
||||
+ os.path.join(os.path.expanduser(xdg_config_home), "mycli", "myclirc")
|
||||
]
|
||||
|
||||
default_config_file = os.path.join(PACKAGE_ROOT, 'myclirc')
|
||||
@@ -152,7 +152,7 @@ class MyCli(object):
|
||||
c['main'].as_bool('auto_vertical_output')
|
||||
|
||||
# Write user config if system config wasn't the last config loaded.
|
||||
- if c.filename not in self.system_config_files:
|
||||
+ if c.filename not in self.system_config_files and not os.path.exists(myclirc):
|
||||
write_default_config(self.default_config_file, myclirc)
|
||||
|
||||
# audit log
|
||||
@@ -363,7 +363,7 @@ class MyCli(object):
|
||||
def connect(self, database='', user='', passwd='', host='', port='',
|
||||
socket='', charset='', local_infile='', ssl='',
|
||||
ssh_user='', ssh_host='', ssh_port='',
|
||||
- ssh_password='', ssh_key_filename=''):
|
||||
+ ssh_password='', ssh_key_filename='', init_command=''):
|
||||
|
||||
cnf = {'database': None,
|
||||
'user': None,
|
||||
@@ -396,7 +396,7 @@ class MyCli(object):
|
||||
port = port or cnf['port']
|
||||
ssl = ssl or {}
|
||||
|
||||
- passwd = passwd or cnf['password']
|
||||
+ passwd = passwd if isinstance(passwd, str) else cnf['password']
|
||||
charset = charset or cnf['default-character-set'] or 'utf8'
|
||||
|
||||
# Favor whichever local_infile option is set.
|
||||
@@ -420,7 +420,7 @@ class MyCli(object):
|
||||
self.sqlexecute = SQLExecute(
|
||||
database, user, passwd, host, port, socket, charset,
|
||||
local_infile, ssl, ssh_user, ssh_host, ssh_port,
|
||||
- ssh_password, ssh_key_filename
|
||||
+ ssh_password, ssh_key_filename, init_command
|
||||
)
|
||||
except OperationalError as e:
|
||||
if ('Access denied for user' in e.args[1]):
|
||||
@@ -429,7 +429,7 @@ class MyCli(object):
|
||||
self.sqlexecute = SQLExecute(
|
||||
database, user, new_passwd, host, port, socket,
|
||||
charset, local_infile, ssl, ssh_user, ssh_host,
|
||||
- ssh_port, ssh_password, ssh_key_filename
|
||||
+ ssh_port, ssh_password, ssh_key_filename, init_command
|
||||
)
|
||||
else:
|
||||
raise e
|
||||
@@ -1051,6 +1051,8 @@ class MyCli(object):
|
||||
help='Read this path from the login file.')
|
||||
@click.option('-e', '--execute', type=str,
|
||||
help='Execute command and quit.')
|
||||
+@click.option('--init-command', type=str,
|
||||
+ help='SQL statement to execute after connecting.')
|
||||
@click.argument('database', default='', nargs=1)
|
||||
def cli(database, user, host, port, socket, password, dbname,
|
||||
version, verbose, prompt, logfile, defaults_group_suffix,
|
||||
@@ -1058,7 +1060,8 @@ def cli(database, user, host, port, socket, password, dbname,
|
||||
ssl_ca, ssl_capath, ssl_cert, ssl_key, ssl_cipher,
|
||||
ssl_verify_server_cert, table, csv, warn, execute, myclirc, dsn,
|
||||
list_dsn, ssh_user, ssh_host, ssh_port, ssh_password,
|
||||
- ssh_key_filename, list_ssh_config, ssh_config_path, ssh_config_host):
|
||||
+ ssh_key_filename, list_ssh_config, ssh_config_path, ssh_config_host,
|
||||
+ init_command):
|
||||
"""A MySQL terminal client with auto-completion and syntax highlighting.
|
||||
|
||||
\b
|
||||
@@ -1182,7 +1185,8 @@ def cli(database, user, host, port, socket, password, dbname,
|
||||
ssh_host=ssh_host,
|
||||
ssh_port=ssh_port,
|
||||
ssh_password=ssh_password,
|
||||
- ssh_key_filename=ssh_key_filename
|
||||
+ ssh_key_filename=ssh_key_filename,
|
||||
+ init_command=init_command
|
||||
)
|
||||
|
||||
mycli.logger.debug('Launch Params: \n'
|
||||
diff --git a/mycli/myclirc b/mycli/myclirc
|
||||
index 534b201..ba3ea1e 100644
|
||||
--- a/mycli/myclirc
|
||||
+++ b/mycli/myclirc
|
||||
@@ -111,6 +111,7 @@ bottom-toolbar.transaction.failed = 'bg:#222222 #ff005f bold'
|
||||
output.header = "#00ff5f bold"
|
||||
output.odd-row = ""
|
||||
output.even-row = ""
|
||||
+output.null = "#808080"
|
||||
|
||||
# Favorite queries.
|
||||
[favorite_queries]
|
||||
diff --git a/mycli/packages/completion_engine.py b/mycli/packages/completion_engine.py
|
||||
index 2b19c32..3cff2cc 100644
|
||||
--- a/mycli/packages/completion_engine.py
|
||||
+++ b/mycli/packages/completion_engine.py
|
||||
@@ -2,7 +2,6 @@ import os
|
||||
import sys
|
||||
import sqlparse
|
||||
from sqlparse.sql import Comparison, Identifier, Where
|
||||
-from sqlparse.compat import text_type
|
||||
from .parseutils import last_word, extract_tables, find_prev_keyword
|
||||
from .special import parse_special_command
|
||||
|
||||
@@ -55,7 +54,7 @@ def suggest_type(full_text, text_before_cursor):
|
||||
stmt_start, stmt_end = 0, 0
|
||||
|
||||
for statement in parsed:
|
||||
- stmt_len = len(text_type(statement))
|
||||
+ stmt_len = len(str(statement))
|
||||
stmt_start, stmt_end = stmt_end, stmt_end + stmt_len
|
||||
|
||||
if stmt_end >= current_pos:
|
||||
diff --git a/mycli/sqlexecute.py b/mycli/sqlexecute.py
|
||||
index c68af0f..7534982 100644
|
||||
--- a/mycli/sqlexecute.py
|
||||
+++ b/mycli/sqlexecute.py
|
||||
@@ -42,7 +42,7 @@ class SQLExecute(object):
|
||||
|
||||
def __init__(self, database, user, password, host, port, socket, charset,
|
||||
local_infile, ssl, ssh_user, ssh_host, ssh_port, ssh_password,
|
||||
- ssh_key_filename):
|
||||
+ ssh_key_filename, init_command=None):
|
||||
self.dbname = database
|
||||
self.user = user
|
||||
self.password = password
|
||||
@@ -59,12 +59,13 @@ class SQLExecute(object):
|
||||
self.ssh_port = ssh_port
|
||||
self.ssh_password = ssh_password
|
||||
self.ssh_key_filename = ssh_key_filename
|
||||
+ self.init_command = init_command
|
||||
self.connect()
|
||||
|
||||
def connect(self, database=None, user=None, password=None, host=None,
|
||||
port=None, socket=None, charset=None, local_infile=None,
|
||||
ssl=None, ssh_host=None, ssh_port=None, ssh_user=None,
|
||||
- ssh_password=None, ssh_key_filename=None):
|
||||
+ ssh_password=None, ssh_key_filename=None, init_command=None):
|
||||
db = (database or self.dbname)
|
||||
user = (user or self.user)
|
||||
password = (password or self.password)
|
||||
@@ -79,6 +80,7 @@ class SQLExecute(object):
|
||||
ssh_port = (ssh_port or self.ssh_port)
|
||||
ssh_password = (ssh_password or self.ssh_password)
|
||||
ssh_key_filename = (ssh_key_filename or self.ssh_key_filename)
|
||||
+ init_command = (init_command or self.init_command)
|
||||
_logger.debug(
|
||||
'Connection DB Params: \n'
|
||||
'\tdatabase: %r'
|
||||
@@ -93,9 +95,11 @@ class SQLExecute(object):
|
||||
'\tssh_host: %r'
|
||||
'\tssh_port: %r'
|
||||
'\tssh_password: %r'
|
||||
- '\tssh_key_filename: %r',
|
||||
+ '\tssh_key_filename: %r'
|
||||
+ '\tinit_command: %r',
|
||||
db, user, host, port, socket, charset, local_infile, ssl,
|
||||
- ssh_user, ssh_host, ssh_port, ssh_password, ssh_key_filename
|
||||
+ ssh_user, ssh_host, ssh_port, ssh_password, ssh_key_filename,
|
||||
+ init_command
|
||||
)
|
||||
conv = conversions.copy()
|
||||
conv.update({
|
||||
@@ -110,12 +114,16 @@ class SQLExecute(object):
|
||||
if ssh_host:
|
||||
defer_connect = True
|
||||
|
||||
+ client_flag = pymysql.constants.CLIENT.INTERACTIVE
|
||||
+ if init_command and len(list(special.split_queries(init_command))) > 1:
|
||||
+ client_flag |= pymysql.constants.CLIENT.MULTI_STATEMENTS
|
||||
+
|
||||
conn = pymysql.connect(
|
||||
database=db, user=user, password=password, host=host, port=port,
|
||||
unix_socket=socket, use_unicode=True, charset=charset,
|
||||
- autocommit=True, client_flag=pymysql.constants.CLIENT.INTERACTIVE,
|
||||
+ autocommit=True, client_flag=client_flag,
|
||||
local_infile=local_infile, conv=conv, ssl=ssl, program_name="mycli",
|
||||
- defer_connect=defer_connect
|
||||
+ defer_connect=defer_connect, init_command=init_command
|
||||
)
|
||||
|
||||
if ssh_host:
|
||||
@@ -146,6 +154,7 @@ class SQLExecute(object):
|
||||
self.socket = socket
|
||||
self.charset = charset
|
||||
self.ssl = ssl
|
||||
+ self.init_command = init_command
|
||||
# retrieve connection id
|
||||
self.reset_connection_id()
|
||||
|
||||
diff --git a/requirements-dev.txt b/requirements-dev.txt
|
||||
index 8e206a5..7a38ed5 100644
|
||||
--- a/requirements-dev.txt
|
||||
+++ b/requirements-dev.txt
|
||||
@@ -3,8 +3,8 @@ pytest!=3.3.0
|
||||
pytest-cov==2.4.0
|
||||
tox
|
||||
twine==1.12.1
|
||||
-behave
|
||||
-pexpect
|
||||
+behave>=1.2.4
|
||||
+pexpect==3.3
|
||||
coverage==5.0.4
|
||||
codecov==2.0.9
|
||||
autopep8==1.3.3
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 156cd1a..fbab22e 100755
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -24,7 +24,7 @@ install_requirements = [
|
||||
'sqlparse>=0.3.0,<0.4.0',
|
||||
'configobj >= 5.0.5',
|
||||
'cryptography >= 1.0.0',
|
||||
- 'cli_helpers[styles] > 1.1.0',
|
||||
+ 'cli_helpers[styles] >= 2.0.1',
|
||||
]
|
||||
|
||||
|
||||
@@ -65,7 +65,7 @@ class test(TestCommand):
|
||||
def initialize_options(self):
|
||||
TestCommand.initialize_options(self)
|
||||
self.pytest_args = ''
|
||||
- self.behave_args = ''
|
||||
+ self.behave_args = '--no-capture'
|
||||
|
||||
def run_tests(self):
|
||||
unit_test_errno = subprocess.call(
|
||||
diff --git a/test/features/environment.py b/test/features/environment.py
|
||||
index 1a49dbe..cb35140 100644
|
||||
--- a/test/features/environment.py
|
||||
+++ b/test/features/environment.py
|
||||
@@ -16,7 +16,7 @@ def before_all(context):
|
||||
os.environ['LINES'] = "100"
|
||||
os.environ['COLUMNS'] = "100"
|
||||
os.environ['EDITOR'] = 'ex'
|
||||
- os.environ['LC_ALL'] = 'en_US.utf8'
|
||||
+ os.environ['LC_ALL'] = 'en_US.UTF-8'
|
||||
os.environ['PROMPT_TOOLKIT_NO_CPR'] = '1'
|
||||
|
||||
test_dir = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
|
||||
@@ -118,11 +118,12 @@ def after_scenario(context, _):
|
||||
host = context.conf['host']
|
||||
dbname = context.currentdb
|
||||
context.cli.expect_exact(
|
||||
- '{0}@{1}:{2}> '.format(
|
||||
+ '{0}@{1}:{2}>'.format(
|
||||
user, host, dbname
|
||||
),
|
||||
timeout=5
|
||||
)
|
||||
+ context.cli.sendcontrol('c')
|
||||
context.cli.sendcontrol('d')
|
||||
context.cli.expect_exact(pexpect.EOF, timeout=5)
|
||||
|
||||
diff --git a/test/features/steps/crud_database.py b/test/features/steps/crud_database.py
|
||||
index a0bfa53..be6dec0 100644
|
||||
--- a/test/features/steps/crud_database.py
|
||||
+++ b/test/features/steps/crud_database.py
|
||||
@@ -64,15 +64,13 @@ def step_see_prompt(context):
|
||||
user = context.conf['user']
|
||||
host = context.conf['host']
|
||||
dbname = context.currentdb
|
||||
- wrappers.expect_exact(context, '{0}@{1}:{2}> '.format(
|
||||
- user, host, dbname), timeout=5)
|
||||
- context.atprompt = True
|
||||
+ wrappers.wait_prompt(context, '{0}@{1}:{2}> '.format(user, host, dbname))
|
||||
|
||||
|
||||
@then('we see help output')
|
||||
def step_see_help(context):
|
||||
for expected_line in context.fixture_data['help_commands.txt']:
|
||||
- wrappers.expect_exact(context, expected_line + '\r\n', timeout=1)
|
||||
+ wrappers.expect_exact(context, expected_line, timeout=1)
|
||||
|
||||
|
||||
@then('we see database created')
|
||||
@@ -96,10 +94,7 @@ def step_see_db_dropped_no_default(context):
|
||||
context.currentdb = None
|
||||
|
||||
wrappers.expect_exact(context, 'Query OK, 0 rows affected', timeout=2)
|
||||
- wrappers.expect_exact(context, '{0}@{1}:{2}> '.format(
|
||||
- user, host, database), timeout=5)
|
||||
-
|
||||
- context.atprompt = True
|
||||
+ wrappers.wait_prompt(context, '{0}@{1}:{2}>'.format(user, host, database))
|
||||
|
||||
|
||||
@then('we see database connected')
|
||||
diff --git a/test/features/steps/wrappers.py b/test/features/steps/wrappers.py
|
||||
index 565ca59..de833dd 100644
|
||||
--- a/test/features/steps/wrappers.py
|
||||
+++ b/test/features/steps/wrappers.py
|
||||
@@ -88,7 +88,7 @@ def wait_prompt(context, prompt=None):
|
||||
user = context.conf['user']
|
||||
host = context.conf['host']
|
||||
dbname = context.currentdb
|
||||
- prompt = '{0}@{1}:{2}> '.format(
|
||||
+ prompt = '{0}@{1}:{2}>'.format(
|
||||
user, host, dbname),
|
||||
expect_exact(context, prompt, timeout=5)
|
||||
context.atprompt = True
|
||||
diff --git a/test/test_main.py b/test/test_main.py
|
||||
index 3f92bd1..707c359 100644
|
||||
--- a/test/test_main.py
|
||||
+++ b/test/test_main.py
|
||||
@@ -492,3 +492,37 @@ def test_ssh_config(monkeypatch):
|
||||
MockMyCli.connect_args["ssh_host"] == "arg_host" and \
|
||||
MockMyCli.connect_args["ssh_port"] == 3 and \
|
||||
MockMyCli.connect_args["ssh_key_filename"] == "/path/to/key"
|
||||
+
|
||||
+
|
||||
+@dbtest
|
||||
+def test_init_command_arg(executor):
|
||||
+ init_command = "set sql_select_limit=1000"
|
||||
+ sql = 'show variables like "sql_select_limit";'
|
||||
+ runner = CliRunner()
|
||||
+ result = runner.invoke(
|
||||
+ cli, args=CLI_ARGS + ["--init-command", init_command], input=sql
|
||||
+ )
|
||||
+
|
||||
+ expected = "sql_select_limit\t1000\n"
|
||||
+ assert result.exit_code == 0
|
||||
+ assert expected in result.output
|
||||
+
|
||||
+
|
||||
+@dbtest
|
||||
+def test_init_command_multiple_arg(executor):
|
||||
+ init_command = 'set sql_select_limit=2000; set max_join_size=20000'
|
||||
+ sql = (
|
||||
+ 'show variables like "sql_select_limit";\n'
|
||||
+ 'show variables like "max_join_size"'
|
||||
+ )
|
||||
+ runner = CliRunner()
|
||||
+ result = runner.invoke(
|
||||
+ cli, args=CLI_ARGS + ['--init-command', init_command], input=sql
|
||||
+ )
|
||||
+
|
||||
+ expected_sql_select_limit = 'sql_select_limit\t2000\n'
|
||||
+ expected_max_join_size = 'max_join_size\t20000\n'
|
||||
+
|
||||
+ assert result.exit_code == 0
|
||||
+ assert expected_sql_select_limit in result.output
|
||||
+ assert expected_max_join_size in result.output
|
||||
diff --git a/test/test_tabular_output.py b/test/test_tabular_output.py
|
||||
index 7d7d000..c20c7de 100644
|
||||
--- a/test/test_tabular_output.py
|
||||
+++ b/test/test_tabular_output.py
|
||||
@@ -16,7 +16,7 @@ from pymysql.constants import FIELD_TYPE
|
||||
@pytest.fixture
|
||||
def mycli():
|
||||
cli = MyCli()
|
||||
- cli.connect(None, USER, PASSWORD, HOST, PORT, None)
|
||||
+ cli.connect(None, USER, PASSWORD, HOST, PORT, None, init_command=None)
|
||||
return cli
|
||||
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -0,0 +1,54 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit flag-o-matic linux-info multilib-minimal
|
||||
|
||||
DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
|
||||
HOMEPAGE="https://01.org/ell"
|
||||
if [[ "${PV}" == *9999 ]] ; then
|
||||
inherit autotools git-r3
|
||||
EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
|
||||
else
|
||||
SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
|
||||
fi
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
|
||||
IUSE="pie test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND=""
|
||||
DEPEND="test? ( sys-apps/dbus )"
|
||||
|
||||
CONFIG_CHECK="
|
||||
~TIMERFD
|
||||
~EVENTFD
|
||||
~CRYPTO_USER_API
|
||||
~CRYPTO_USER_API_HASH
|
||||
~CRYPTO_MD5
|
||||
~CRYPTO_SHA1
|
||||
~KEY_DH_OPERATIONS
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
[[ "${PV}" == *9999 ]] && eautoreconf
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
append-cflags "-fsigned-char" #662694
|
||||
local myeconfargs=(
|
||||
$(use_enable pie)
|
||||
)
|
||||
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
local DOCS=( ChangeLog README )
|
||||
einstalldocs
|
||||
|
||||
find "${ED}" -name "*.la" -delete || die
|
||||
}
|
||||
@ -0,0 +1,70 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
CMAKE_BUILD_TYPE="Release"
|
||||
MY_PN="${PN/intel-/}"
|
||||
MY_P="${MY_PN}-${PV}"
|
||||
|
||||
inherit cmake flag-o-matic
|
||||
|
||||
DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver"
|
||||
HOMEPAGE="https://github.com/intel/compute-runtime"
|
||||
SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="+l0 +vaapi"
|
||||
|
||||
RDEPEND=">=media-libs/gmmlib-22.0.2:="
|
||||
|
||||
DEPEND="
|
||||
${DEPEND}
|
||||
dev-libs/intel-metrics-library
|
||||
dev-libs/libnl:3
|
||||
dev-libs/libxml2:2
|
||||
>=dev-util/intel-graphics-compiler-1.0.10713
|
||||
>=dev-util/intel-graphics-system-controller-0.2.4
|
||||
media-libs/mesa
|
||||
>=virtual/opencl-3
|
||||
l0? ( >=dev-libs/level-zero-1.7.15 )
|
||||
vaapi? (
|
||||
x11-libs/libdrm[video_cards_intel]
|
||||
x11-libs/libva
|
||||
)
|
||||
"
|
||||
|
||||
BDEPEND="virtual/pkgconfig"
|
||||
|
||||
DOCS=( "README.md" "FAQ.md" )
|
||||
|
||||
src_configure() {
|
||||
# See https://github.com/intel/compute-runtime/issues/531
|
||||
filter-flags -flto=* -flto
|
||||
|
||||
local mycmakeargs=(
|
||||
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
|
||||
-DCMAKE_INSTALL_LIBDIR="$(get_libdir)"
|
||||
-DBUILD_WITH_L0="$(usex l0)"
|
||||
-DDISABLE_LIBVA="$(usex !vaapi)"
|
||||
-DNEO__METRICS_LIBRARY_INCLUDE_DIR="${ESYSROOT}/usr/include"
|
||||
-DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include"
|
||||
-DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors"
|
||||
-DSUPPORT_DG1="ON"
|
||||
|
||||
# See https://github.com/intel/intel-graphics-compiler/issues/204
|
||||
-DNEO_DISABLE_BUILTINS_COMPILATION="ON"
|
||||
|
||||
# If enabled, tests are automatically run during
|
||||
# the compile phase and we cannot run them because
|
||||
# they require permissions to access the hardware.
|
||||
-DSKIP_UNIT_TESTS="1"
|
||||
|
||||
-Wno-dev
|
||||
)
|
||||
|
||||
cmake_src_configure
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST intel-vc-intrinsics-0.1.0.tar.gz 135780 BLAKE2B cb7c84c14a1fb9655e59ad559e24b3d1072f88390bc2b29ea614217049225dc371395849a7af81607a098a42228a249bdfa09fa72874eee4e20a78a0c4371087 SHA512 683c012900acfe331f29c4e88c0a0b0a4e5d84b146faed56757a70d5f9a94678a03c18bd46e269606761e0da4cad5b31f12cb50101d5f810044615971d2b5b9f
|
||||
DIST intel-vc-intrinsics-0.2.0.tar.gz 135891 BLAKE2B 6118dbc43ca8e3363384f3ea6442480cd353758233f144717888e4c61f5d02ffe97be6f2936f74564da9aacc662e832be6f2371d86472a131232e2abd490c1cb SHA512 1a1b34a5a030141825c906a321b39da32b2cc989f1f3ad034881f4c5c55f27e7e63be7d5db264ba1b1249b589d7eee679061a9704ece610b4f29bdb88f0f19d5
|
||||
|
||||
@ -0,0 +1,37 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
CMAKE_BUILD_TYPE="Release"
|
||||
LLVM_MAX_SLOT="13"
|
||||
MY_PN="${PN/intel-/}"
|
||||
MY_P="${MY_PN}-${PV}"
|
||||
PYTHON_COMPAT=( python3_{8..10} )
|
||||
|
||||
inherit cmake llvm python-any-r1
|
||||
|
||||
DESCRIPTION="A set of new intrinsics on top of core LLVM IR instructions"
|
||||
HOMEPAGE="https://github.com/intel/vc-intrinsics"
|
||||
SRC_URI="https://github.com/intel/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
DEPEND="
|
||||
dev-libs/libxml2:2=
|
||||
sys-devel/llvm:${LLVM_MAX_SLOT}
|
||||
sys-libs/zlib
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
BDEPEND="${PYTHON_DEPS}"
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DLLVM_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
|
||||
)
|
||||
|
||||
cmake_src_configure
|
||||
}
|
||||
@ -1,3 +1,2 @@
|
||||
DIST kopeninghours-21.08.3.tar.xz 65904 BLAKE2B 88169a5881a49fbb6728d706585d2e2d4c88d2eb66360917c1d0cef0cb7239de378d69afc1970f038e9c52756fe6097d5e423577a29e77c071e0b5ad54b7c6c2 SHA512 9fe8181b4c4e9427a6eba133a51b119e86378933ebf5bdbfe5a78c711837ccdbaa8baa04cb10e234febe7596c7e7e515dda8e09f8568bd785b0a3e061f6d8bcf
|
||||
DIST kopeninghours-21.12.3.tar.xz 68916 BLAKE2B d80275c195231ca52e0042149d685224c9ffadd6d341ddce1af6f46df451442e924f282119c91ab004dcabb64b112de559bbbcddc2a91daee5cf9a76b84fb4bb SHA512 42bdbe8172ff5ff89469786f3d544db4a07bc0d1de9a54b8525dc8789d0f4328159ee815c07595463f190073433de567fb2d3496d261daa46aac70354b3da6ae
|
||||
DIST kopeninghours-22.04.0.tar.xz 69016 BLAKE2B 6e432bb2981b4eb62970fef37390ff871ee51a09e964434f2c43bf89de8ab2568b4843369fa99166fc731937989a155c9f391c2cc32c023f4be56ff886fabc60 SHA512 21bbd64000dec12015a5a2904f414876602a1b7096d6c64f4b327ed4d38d5a38d5058138a422c6fe41f7e205508b753b9d0502b1379d0e8816f1d4929d3fe45c
|
||||
|
||||
@ -1,64 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
ECM_TEST="true"
|
||||
KDE_GEAR="true"
|
||||
PVCUT=$(ver_cut 1-3)
|
||||
KFMIN=5.84.0
|
||||
QTMIN=5.15.2
|
||||
PYTHON_COMPAT=( python3_{8..10} )
|
||||
inherit ecm kde.org python-single-r1
|
||||
|
||||
DESCRIPTION="Library for parsing and evaluating OSM opening hours expressions"
|
||||
HOMEPAGE="https://api.kde.org/kopeninghours/html/index.html
|
||||
https://invent.kde.org/libraries/kopeninghours"
|
||||
|
||||
LICENSE="LGPL-2+"
|
||||
SLOT="5"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="python"
|
||||
|
||||
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
|
||||
|
||||
DEPEND="
|
||||
>=dev-libs/kpublictransport-${PVCUT}:5
|
||||
>=dev-qt/qtdeclarative-${QTMIN}:5
|
||||
>=kde-frameworks/kholidays-${KFMIN}:5
|
||||
>=kde-frameworks/ki18n-${KFMIN}:5
|
||||
sys-libs/zlib
|
||||
python? (
|
||||
$(python_gen_cond_dep '
|
||||
>=dev-libs/boost-1.70:=[python,${PYTHON_USEDEP}]
|
||||
')
|
||||
)
|
||||
"
|
||||
RDEPEND="${DEPEND}
|
||||
${PYTHON_DEPS}
|
||||
>=dev-qt/qtquickcontrols2-${QTMIN}:5
|
||||
"
|
||||
BDEPEND="
|
||||
sys-devel/bison
|
||||
sys-devel/flex
|
||||
"
|
||||
|
||||
PATCHES=( "${FILESDIR}"/${PN}-21.03.90-boostpython.patch )
|
||||
|
||||
pkg_setup() {
|
||||
ecm_pkg_setup
|
||||
python_setup
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DBOOSTPYTHON_VERSION_MAJOR_MINOR=${EPYTHON}
|
||||
$(cmake_use_find_package python Boost)
|
||||
)
|
||||
ecm_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
ecm_src_install
|
||||
python_optimize
|
||||
}
|
||||
@ -1,3 +1,2 @@
|
||||
DIST kosmindoormap-21.08.3.tar.xz 342772 BLAKE2B e30c0645105627b304162187ac9c84e8ebef0bbf5db17b28c1239428ec982eed526a7f29f7e543d1c1fb660d90d641358c1d0e8b1c6d6c40c5b11e471b25be52 SHA512 3a2337b433c25c16f2e69ab1a42e9324e8e176eaf85094a08d95a542af479e65637544a8486d481a3fe811e5c90aee1bcf803d92f3225db7c53c75840247e642
|
||||
DIST kosmindoormap-21.12.3.tar.xz 351272 BLAKE2B 8fde9196e18062770c63eb2b636bf3bfea65d8575f4d67106c28fcf3349c6d9bfa3bd1d48a8978b3ec2e2d027f89be3338b88cdfd4b59b7609cc9bba2aeab689 SHA512 f2f5bc04dbb9943114d9807787d98ad4a4963be556c5f2ec332c59bc60533abbf6d39b982f79264ff3d764cb4b8e60501d711039e0fc475500abbd800fc13b86
|
||||
DIST kosmindoormap-22.04.0.tar.xz 351100 BLAKE2B bfc1401ff87fe10c0bee0b395dbb1386ed424521d72622450038851b768e429323966a8417a0605a456ca19bee58ba1a555e94e54e7bf40abbf9eb863ba3bab1 SHA512 477c1674ebf11a664e7286723a616c6146cfa54827c1eee8aa68e907bd3be068dd8fc90829895fdecff6827bdd3e930728100393071e5dcd6107d0317d318e58
|
||||
|
||||
@ -1,48 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
ECM_TEST="true"
|
||||
KDE_GEAR="true"
|
||||
PVCUT=$(ver_cut 1-3)
|
||||
KFMIN=5.84.0
|
||||
QTMIN=5.15.2
|
||||
inherit ecm kde.org
|
||||
|
||||
DESCRIPTION="Data Model and Extraction System for Travel Reservation information"
|
||||
HOMEPAGE="https://invent.kde.org/libraries/kosmindoormap"
|
||||
|
||||
LICENSE="LGPL-2+"
|
||||
SLOT="5"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="+openinghours"
|
||||
|
||||
COMMON_DEPEND="
|
||||
>=dev-libs/kpublictransport-${PVCUT}:5
|
||||
dev-libs/protobuf:=
|
||||
>=dev-qt/qtdeclarative-${QTMIN}:5
|
||||
>=dev-qt/qtgui-${QTMIN}:5
|
||||
>=dev-qt/qtnetwork-${QTMIN}:5
|
||||
>=kde-frameworks/ki18n-${KFMIN}:5
|
||||
sys-libs/zlib
|
||||
openinghours? ( >=dev-libs/kopeninghours-${PVCUT}:5 )
|
||||
"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
>=dev-qt/qtquickcontrols2-${QTMIN}:5
|
||||
"
|
||||
BDEPEND="
|
||||
sys-devel/bison
|
||||
sys-devel/flex
|
||||
"
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_OsmTools=ON # we have no use for it
|
||||
$(cmake_use_find_package openinghours KOpeningHours)
|
||||
)
|
||||
ecm_src_configure
|
||||
}
|
||||
@ -1,3 +1,2 @@
|
||||
DIST kpublictransport-21.08.3.tar.xz 411364 BLAKE2B 46d4681e98037d84d5813c62f13d76831922f9b2a3c04a51885292d702fa569f276dbd00056ee79cfecfebc4597d1ddde3c497b2d72e585ec5c14006253944e5 SHA512 bcd422855de8f224f7a30f09cd95345bd8637d3fb7a32ba0a7efe5c4bd350aed02cd6d8f186b4bfb467d50ce4ae927f360ccb5d188dadfbfa4e498ca4665df72
|
||||
DIST kpublictransport-21.12.3.tar.xz 480780 BLAKE2B 949c394497fcd76af7e4cc3d83e1db74cbef221f9f468a4ac247e82000503468e204eaa45ee61b4f5d05d84c1f4878484db342ff760d101a6a0a7b0960937baf SHA512 495fc7e92bab00fa0953fa81d2cb73e37055f8ccee899c8d9f8783e85f83e7f6a4c04a1e48ed607d565926bdc9fcadc539a2738b7c898a07aa6934f5e15038eb
|
||||
DIST kpublictransport-22.04.0.tar.xz 484884 BLAKE2B 6712d73ff46a1b16c5a66df644367fba45c82e0b767ff1f110bd18cf50725742a682dc11f453288a8f677868d4f0da313c9f73d1f26980aaca39a1fa2e3999cc SHA512 61c3125d050bfd4717a44ca087acaea110690c44fd6e9ef2b165286d2c88124ddf99f45aeddb33969d087e257e8593ed4b545b164caa99d32f1c98faacc4815b
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
ECM_TEST="true"
|
||||
KDE_GEAR="true"
|
||||
KFMIN=5.84.0
|
||||
QTMIN=5.15.2
|
||||
inherit ecm kde.org
|
||||
|
||||
DESCRIPTION="Library for accessing public transport timetables and other information"
|
||||
HOMEPAGE="https://invent.kde.org/libraries/kpublictransport
|
||||
https://www.volkerkrause.eu/2019/03/02/kpublictransport-introduction.html"
|
||||
|
||||
LICENSE="LGPL-2+"
|
||||
SLOT="5"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-libs/protobuf:=
|
||||
>=dev-qt/qtdeclarative-${QTMIN}:5
|
||||
>=dev-qt/qtgui-${QTMIN}:5
|
||||
>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
|
||||
sys-libs/zlib
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
|
||||
"
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_OsmTools=ON # we have no use for it
|
||||
)
|
||||
ecm_src_configure
|
||||
}
|
||||
@ -0,0 +1,28 @@
|
||||
From b31e07dbf40c3998dd466829e818f5870296272d Mon Sep 17 00:00:00 2001
|
||||
From: Mike Gilbert <floppym@gentoo.org>
|
||||
Date: Fri, 22 Apr 2022 20:14:05 -0400
|
||||
Subject: [PATCH] testapi: remove leading slash from "/missing.xml"
|
||||
|
||||
Fixes an error when running tests in a sandbox on Gentoo Linux.
|
||||
|
||||
Bug: https://bugs.gentoo.org/839804
|
||||
---
|
||||
testapi.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/testapi.c b/testapi.c
|
||||
index d4258c43..c7a5b163 100644
|
||||
--- a/testapi.c
|
||||
+++ b/testapi.c
|
||||
@@ -442,7 +442,7 @@ static void des_eaten_name(int no ATTRIBUTE_UNUSED, xmlChar *val ATTRIBUTE_UNUSE
|
||||
#define gen_nb_fileoutput 6
|
||||
|
||||
static const char *gen_fileoutput(int no, int nr ATTRIBUTE_UNUSED) {
|
||||
- if (no == 0) return("/missing.xml");
|
||||
+ if (no == 0) return("missing.xml");
|
||||
if (no == 1) return("<foo/>");
|
||||
if (no == 2) return(REMOTE2GOOD);
|
||||
if (no == 3) return(REMOTE1GOOD);
|
||||
--
|
||||
2.35.1
|
||||
|
||||
Binary file not shown.
@ -1,4 +1,4 @@
|
||||
(push "@SLITELISP@" load-path) ; directory containing merlin.el
|
||||
(add-to-list 'load-path "@SITELISP@")
|
||||
(autoload 'merlin-mode "merlin" "Merlin mode" t)
|
||||
(add-hook 'tuareg-mode-hook 'merlin-mode)
|
||||
(add-hook 'caml-mode-hook 'merlin-mode)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
@ -1,3 +1,4 @@
|
||||
DIST ppx_expect-0.14.0.tar.gz 45661 BLAKE2B 0cba3840743d45f0f11936f090319aab3237c7a14389eb6d035a3b7cdac91e0b169c3ed84407e1bb01a00738bf97b62dba313965e93a2177388666764fe5854b SHA512 7de5d84640d16101d38140b5f621301c9935e3161a7c7d978373940be92fa7f14cad429e79eec294a20d1f379e969cf3c25d15810f1a4d3ad1bb8ba0eb7d7109
|
||||
DIST ppx_expect-0.14.1.tar.gz 45699 BLAKE2B b52d579d92156344ff44d30c88603840eb7d6a0d346de49fcbc01ef16fe3c33e664486de4cb2d09f74e853e39b9a01778e7e0f489497fdd34fc9582d895a0d3b SHA512 fd98e79d5b3bb935b2a4077a07894c159b48e142268c2e30ebff2cbfecc92266b454be69f5080b315eefa9184372e5e5248bd8a3b2b9d6cad59e2d517c94bd02
|
||||
DIST ppx_expect-0.14.2.tar.gz 45703 BLAKE2B cd1371f6e7e0519c1b30c6d471a1f4be6cbeffa0bf65de1472c9809265c35c307cd36ebb12548f60ab2acb6e9786556f29ae4752ee5cfbfa19fdc2dc14f16aa6 SHA512 bb00e15057ea403241781d2d6a385200496adc79680a01d031416192f8c93efd75a6998602a90d0aba7fcb2110e876b058126bb6397d5ba7fe5dd48c03202169
|
||||
DIST ppx_expect-0.15.0.tar.gz 48825 BLAKE2B 9363497cc5a507d4f9c51be11a3fef254cbd2541c146a1248755763bed6f54a69738ed72ac590e270856b9c04a5949c9bbd59ba25bc8e7d1fc9d76574bcc70c3 SHA512 945ebd31a94debd4a65c3a8dd7e6481e7debe043c48a60bab4085f9d05cba5b8663bf0f5498cb4cd0e86a24182b21006506f20873e5242b31db5de5629113ade
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue