mirror of
https://github.com/gentoo-mirror/guru.git
synced 2026-07-18 11:33:15 -04:00
Merge updates from master
This commit is contained in:
@@ -23,13 +23,16 @@ RDEPEND="
|
||||
app-accessibility/at-spi2-atk
|
||||
app-crypt/libsecret[crypt]
|
||||
dev-libs/nss
|
||||
media-libs/alsa-lib
|
||||
media-libs/libpng:0/16
|
||||
x11-libs/cairo
|
||||
x11-libs/gtk+:3
|
||||
x11-libs/libnotify
|
||||
x11-libs/libxkbcommon
|
||||
x11-libs/libXScrnSaver
|
||||
x11-libs/libXtst
|
||||
x11-libs/pango"
|
||||
x11-libs/pango
|
||||
"
|
||||
|
||||
QA_PRESTRIPPED="*"
|
||||
|
||||
|
||||
@@ -23,14 +23,16 @@ RDEPEND="
|
||||
app-accessibility/at-spi2-atk
|
||||
app-crypt/libsecret[crypt]
|
||||
dev-libs/nss
|
||||
media-libs/alsa-lib
|
||||
media-libs/libpng:0/16
|
||||
x11-libs/cairo
|
||||
x11-libs/gtk+:3
|
||||
x11-libs/libnotify
|
||||
x11-libs/libxkbfile
|
||||
x11-libs/libxkbcommon
|
||||
x11-libs/libXScrnSaver
|
||||
x11-libs/libXtst
|
||||
x11-libs/pango"
|
||||
x11-libs/pango
|
||||
"
|
||||
|
||||
QA_PRESTRIPPED="*"
|
||||
|
||||
|
||||
@@ -23,14 +23,16 @@ RDEPEND="
|
||||
app-accessibility/at-spi2-atk
|
||||
app-crypt/libsecret[crypt]
|
||||
dev-libs/nss
|
||||
media-libs/alsa-lib
|
||||
media-libs/libpng:0/16
|
||||
x11-libs/cairo
|
||||
x11-libs/gtk+:3
|
||||
x11-libs/libnotify
|
||||
x11-libs/libxkbfile
|
||||
x11-libs/libxkbcommon
|
||||
x11-libs/libXScrnSaver
|
||||
x11-libs/libXtst
|
||||
x11-libs/pango"
|
||||
x11-libs/pango
|
||||
"
|
||||
|
||||
QA_PRESTRIPPED="*"
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
EAPI="7"
|
||||
|
||||
PYTHON_COMPAT=( python3_{7,8} )
|
||||
inherit font python-single-r1
|
||||
inherit font python-any-r1
|
||||
|
||||
DESCRIPTION="A IBM 3270 Terminal font in a modern format"
|
||||
HOMEPAGE="https://github.com/rbanffy/3270font"
|
||||
@@ -22,20 +22,16 @@ HTML_DOCS=( "DESCRIPTION.en_us.html" )
|
||||
|
||||
PATCHES=( "${FILESDIR}/remove-useless-tests.patch" )
|
||||
RDEPEND="
|
||||
${PYTHON_DEPS}
|
||||
media-gfx/fontforge
|
||||
"
|
||||
DEPEND="
|
||||
${PYTHON_DEPS}
|
||||
${RDEPEND}
|
||||
test? (
|
||||
$(python_gen_cond_dep '
|
||||
dev-python/ipdb[${PYTHON_USEDEP}]
|
||||
dev-python/pillow[${PYTHON_USEDEP}]
|
||||
')
|
||||
dev-python/ipdb
|
||||
dev-python/pillow
|
||||
)
|
||||
"
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
FONT_S="${S}/build"
|
||||
FONT_SUFFIX="otf ttf pfm woff"
|
||||
|
||||
@@ -79,6 +79,12 @@ PATCHES=(
|
||||
"${FILESDIR}/0001-Makefile-Optionally-avoid-installation-of-Ubuntu-spe.patch"
|
||||
)
|
||||
|
||||
src_compile() {
|
||||
# Set GO_LINK_FLAGS to the empty string, as fscrypt strips the
|
||||
# binary by default. See bug #783780.
|
||||
emake GO_LINK_FLAGS=""
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake \
|
||||
DESTDIR="${ED}" \
|
||||
11
sys-libs/safeclib/files/gh96.patch
Normal file
11
sys-libs/safeclib/files/gh96.patch
Normal file
@@ -0,0 +1,11 @@
|
||||
--- a/src/safeclib_private.h
|
||||
+++ b/src/safeclib_private.h
|
||||
@@ -52,6 +52,8 @@
|
||||
/* Needed since the switch to time64_t */
|
||||
#if defined CONFIG_COMPAT_32BIT_TIME && defined _LINUX_TIME64_H && defined __VDSO_TIME32_H
|
||||
#define time_t old_time32_t
|
||||
+#elif defined _LINUX_TIME64_H && !defined __VDSO_TIME32_H
|
||||
+#define time_t time64_t
|
||||
#endif
|
||||
|
||||
#define RCNEGATE(x) (-(x))
|
||||
@@ -3,7 +3,8 @@
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit autotools linux-mod
|
||||
MODULE_OPTIONAL_USE=modules
|
||||
inherit autotools linux-info linux-mod
|
||||
|
||||
MY_REV="986f6d34e49637d68cb41221307231f0ea79ca4d"
|
||||
|
||||
@@ -16,30 +17,42 @@ SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="+constraint-handler doc +extensions modules norm-compat +nullslack test unsafe valgrind"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
PATCHES=( "${FILESDIR}/gh96.patch" )
|
||||
BDEPEND="
|
||||
doc? ( app-doc/doxygen[dot] )
|
||||
valgrind? ( dev-util/valgrind )
|
||||
"
|
||||
|
||||
S="${WORKDIR}/${PN}-${MY_REV}"
|
||||
MODULE_NAMES="slkm(misc:${S}-module:${S}-module)"
|
||||
MODULE_NAMES="slkm(misc:${S}:${S})"
|
||||
BUILD_TARGETS="all"
|
||||
BUILD_PARAMS="-f Makefile.kernel V=1"
|
||||
BUILD_PARAMS="-f Makefile.kernel"
|
||||
|
||||
pkg_setup() {
|
||||
if use modules ; then
|
||||
CONFIG_CHECK="COMPAT_32BIT_TIME"
|
||||
ERROR_COMPAT_32BIT_TIME="module require COMPAT_32BIT_TIME to build"
|
||||
fi
|
||||
linux-mod_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eautoreconf
|
||||
|
||||
if use modules ; then
|
||||
#duplicate the working folder
|
||||
#one for the library and one for the module
|
||||
cd "${WORKDIR}" || die
|
||||
cp -r "${S}" "${S}-module" || die
|
||||
fi
|
||||
#duplicate the working folder
|
||||
#one for the library and one for the module
|
||||
cd "${WORKDIR}" || die
|
||||
cp -r "${S}" "${S}-lib" || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
if use modules ; then
|
||||
set_kvobj ko
|
||||
econf "${myconf[@]}" --disable-wchar
|
||||
fi
|
||||
|
||||
cd "${S}-lib" || die
|
||||
#forcing wchar because of https://github.com/rurban/safeclib/issues/95
|
||||
local myconf=(
|
||||
--disable-static
|
||||
@@ -54,38 +67,32 @@ src_configure() {
|
||||
$(use_enable unsafe)
|
||||
$(use_enable valgrind)
|
||||
)
|
||||
|
||||
econf "${myconf[@]}" --enable-wchar
|
||||
|
||||
if use modules ; then
|
||||
cd "${S}-module" || die
|
||||
econf "${myconf[@]}" --disable-wchar
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
default
|
||||
|
||||
if use modules ; then
|
||||
cd "${S}-module" || die
|
||||
export src="${S}-module"
|
||||
linux-mod_src_compile
|
||||
fi
|
||||
|
||||
cd "${S}-lib" || die
|
||||
default
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if use modules ; then
|
||||
linux-mod_src_install
|
||||
fi
|
||||
|
||||
cd "${S}-lib" || die
|
||||
# wcsstr towupper towlower manpages collide with sys-apps/man-pages
|
||||
# what to do?
|
||||
default
|
||||
einstalldocs
|
||||
use doc && dodoc -r doc/.
|
||||
|
||||
if use modules ; then
|
||||
cd "${S}-module" || die
|
||||
linux-mod_src_install
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
cd "${S}-lib" || die
|
||||
emake check
|
||||
}
|
||||
|
||||
@@ -24,6 +24,7 @@ RDEPEND="
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtdbus:5
|
||||
dev-qt/qtwidgets:5
|
||||
x11-libs/libXxf86vm
|
||||
"
|
||||
DEPEND="
|
||||
|
||||
@@ -24,6 +24,7 @@ RDEPEND="
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtdbus:5
|
||||
dev-qt/qtwidgets:5
|
||||
x11-libs/libXxf86vm
|
||||
"
|
||||
DEPEND="
|
||||
|
||||
@@ -24,6 +24,7 @@ RDEPEND="
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtdbus:5
|
||||
dev-qt/qtwidgets:5
|
||||
x11-libs/libXxf86vm
|
||||
"
|
||||
DEPEND="
|
||||
|
||||
@@ -24,6 +24,7 @@ RDEPEND="
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtdbus:5
|
||||
dev-qt/qtwidgets:5
|
||||
x11-libs/libXxf86vm
|
||||
"
|
||||
DEPEND="
|
||||
|
||||
@@ -19,7 +19,7 @@ DEPEND="
|
||||
media-libs/fontconfig:=
|
||||
media-libs/libjpeg-turbo
|
||||
sys-libs/pam
|
||||
x11-libs/cairo
|
||||
x11-libs/cairo[X]
|
||||
x11-libs/libxcb
|
||||
x11-libs/libxkbcommon[X]
|
||||
x11-libs/xcb-util
|
||||
|
||||
@@ -19,7 +19,7 @@ DEPEND="
|
||||
media-libs/fontconfig:=
|
||||
media-libs/libjpeg-turbo
|
||||
sys-libs/pam
|
||||
x11-libs/cairo
|
||||
x11-libs/cairo[X]
|
||||
x11-libs/libxcb
|
||||
x11-libs/libxkbcommon[X]
|
||||
x11-libs/xcb-util
|
||||
|
||||
@@ -17,7 +17,7 @@ DEPEND="
|
||||
media-libs/fontconfig:=
|
||||
media-libs/libjpeg-turbo
|
||||
sys-libs/pam
|
||||
x11-libs/cairo
|
||||
x11-libs/cairo[X]
|
||||
x11-libs/libxcb
|
||||
x11-libs/libxkbcommon[X]
|
||||
x11-libs/xcb-util
|
||||
|
||||
@@ -60,7 +60,3 @@ src_install(){
|
||||
doicon -s "${i}" ../terminus-"${i}".png
|
||||
done
|
||||
}
|
||||
|
||||
pkg_postinst(){
|
||||
xdg_desktop_database_update
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user