parent
6b61de937d
commit
2bc43091db
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,2 +1 @@
|
||||
DIST gnome-autoar-0.2.4.tar.xz 294956 BLAKE2B 20e2054f996443f7c3d84d91c41705c8c63df8aea626cb54c17a9cb0c20c7109dc1dba99ad9489d8870674b0a3bbdef23da6ef07684f9c01870d421873d5bed1 SHA512 66750ae30bf9f59820f06653898eb33ac4edbb63976a02d15417118a068abd9292350220713813ddfdd1f2e77db7b3a8f8980f0c70a93d1bb87a9405e013de19
|
||||
DIST gnome-autoar-0.3.0.tar.xz 297072 BLAKE2B 7c7204d605c80a6e0735e0be6dec1024e6073cb99d6bde885a1c8b10b7f6e6476a181c99b5bbb755abfdf86bc56aff3d9b174189ff29cc58d24607b482f242ab SHA512 2f5962e115b25be9578ecad51d9906e426bb60b675e42b364d9f0b67f0751cf59d4afd4dbfc8adc0d13256e5dcee445c5195262e6ff0839ef88350b1c6e5293a
|
||||
|
||||
@ -1,43 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
VALA_USE_DEPEND="vapigen"
|
||||
|
||||
inherit gnome2 vala
|
||||
|
||||
DESCRIPTION="Automatic archives creating and extracting library"
|
||||
HOMEPAGE="https://git.gnome.org/browse/gnome-autoar"
|
||||
|
||||
LICENSE="LGPL-2.1+"
|
||||
SLOT="0"
|
||||
IUSE="gtk +introspection vala"
|
||||
REQUIRED_USE="vala? ( introspection )"
|
||||
|
||||
KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
|
||||
|
||||
RDEPEND="
|
||||
>=app-arch/libarchive-3.2.0
|
||||
>=dev-libs/glib-2.35.6:2
|
||||
gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] )
|
||||
introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="
|
||||
>=dev-util/gtk-doc-am-1.14
|
||||
virtual/pkgconfig
|
||||
vala? ( $(vala_depend) )
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
use vala && vala_src_prepare
|
||||
gnome2_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
gnome2_src_configure \
|
||||
--disable-static \
|
||||
$(use_enable introspection) \
|
||||
$(use_enable vala) \
|
||||
$(use_enable gtk)
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,3 +1 @@
|
||||
DIST pdfpc-4.3.0.tar.gz 107235 BLAKE2B 290a11f970ca16ea3ce3d724f1e62cd1b347b51dfc70162e61f80fb2ef630e18963c55ff99741c9c6a0fdd85c109371e660614b0af15b63dae524e21f534001c SHA512 a7e3efecd988ecdec8b0856a7a140ef8f6f3abcc56ecd7c1193f8b1c3723c9193fa3ea48dd9286d8c90d72983fc5a8ad75be7a40cd2c6196cc1361fa3c338ac0
|
||||
DIST pdfpc-4.4.0.tar.gz 7733136 BLAKE2B e0bae93803561e8d7a96621baef4e8e2d038324dd28c31ce9cc05a8e42dafda101eb7eb2cea258bd66a41dff904c6a95e8c9cb50b236780564b9501edf3aeef8 SHA512 4f5d013ae513ba5f106638401cccd280e1a77535747663963a566c8b9ddc7b87c0ae1859220586ed66d294902674d54cea4256c72320ad3005e3e47cc8ea57a3
|
||||
DIST pdfpc-4.4.1.tar.gz 7733986 BLAKE2B 4232dedbda6423e95259169348a36196a539ed966e50a230390a6f99dbff6c9710d0c41be11436005454858a213ff5f07d1b1f26fd67973f20812111eea81d79 SHA512 61db48eae75f0e55f7d7b728bc107827b9f141826c3c55be4fb90faf95eaac2dbef1858eb1b7a3e5980130ee09c4096812a3403451f2a52052c29e4fb7be458f
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
VALA_MIN_API_VERSION="0.32"
|
||||
VALA_MAX_API_VERSION="0.36" # fix sed line if you increase this
|
||||
|
||||
inherit vala cmake-utils
|
||||
|
||||
DESCRIPTION="Presenter console with multi-monitor support for PDF files"
|
||||
HOMEPAGE="https://pdfpc.github.io"
|
||||
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="gstreamer"
|
||||
|
||||
RDEPEND="app-text/poppler[cairo]
|
||||
dev-libs/glib:2
|
||||
dev-libs/libgee:0.8
|
||||
gnome-base/librsvg
|
||||
gstreamer? ( media-libs/gstreamer:1.0
|
||||
media-libs/gst-plugins-base:1.0 )
|
||||
sys-apps/dbus
|
||||
x11-libs/gtk+:3"
|
||||
DEPEND="${RDEPEND}
|
||||
$(vala_depend)"
|
||||
|
||||
src_prepare() {
|
||||
cmake-utils_src_prepare
|
||||
|
||||
sed -i -e "s/valac/valac valac-0.36 valac-0.34 valac-0.32/" cmake/vala/FindVala.cmake || die
|
||||
vala_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DSYSCONFDIR="${EPREFIX}/etc"
|
||||
-DMOVIES=$(usex gstreamer on off)
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
@ -1,47 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
VALA_MIN_API_VERSION="0.34"
|
||||
VALA_MAX_API_VERSION="0.48" # append versions in sed line if increased
|
||||
|
||||
inherit cmake vala
|
||||
|
||||
DESCRIPTION="Presenter console with multi-monitor support for PDF files"
|
||||
HOMEPAGE="https://pdfpc.github.io"
|
||||
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="+gstreamer"
|
||||
|
||||
RDEPEND="
|
||||
app-text/poppler:=[cairo]
|
||||
dev-libs/glib:2
|
||||
dev-libs/libgee:0.8=
|
||||
gnome-base/librsvg
|
||||
sys-apps/dbus
|
||||
x11-libs/gtk+:3
|
||||
gstreamer? (
|
||||
media-libs/gstreamer:1.0=
|
||||
media-libs/gst-plugins-base:1.0=
|
||||
)
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="$(vala_depend)"
|
||||
|
||||
src_prepare() {
|
||||
cmake_src_prepare
|
||||
|
||||
sed -i -e "s/valac/valac valac-0.48 valac-0.46 valac-0.44 valac-0.40 valac-0.36/" cmake/vala/FindVala.cmake || die
|
||||
vala_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DMOVIES=$(usex gstreamer on off)
|
||||
)
|
||||
cmake_src_configure
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
@ -1,29 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
DESCRIPTION="Tools for accessing and converting various ebook file formats"
|
||||
HOMEPAGE="https://sourceforge.net/projects/ebook-tools/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
|
||||
IUSE="+lit2epub"
|
||||
|
||||
DEPEND="
|
||||
dev-libs/libxml2
|
||||
dev-libs/libzip:=
|
||||
"
|
||||
RDEPEND="${DEPEND}
|
||||
lit2epub? ( app-text/convertlit )
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
cmake-utils_src_prepare
|
||||
|
||||
use lit2epub || sed -i -e '\|lit2epub|d' -- 'src/tools/CMakeLists.txt' || die
|
||||
}
|
||||
Binary file not shown.
@ -1,3 +1 @@
|
||||
DIST ms-gsl-2.0.0.tar.gz 64726 BLAKE2B ab40725aa38af7c5651e22ebf32d4bd9c27a10be2e206fd4c3c0173ad21da262beddef022b7b158653b185cfc3269f2b6e80d99fe65f601ffc3e770b143b03f8 SHA512 7339527222c8a97a94c0bb4038b3d142045ec5d80995e628574ac96f4d9d13c41ad70fbe0d8390586dc0db8d9ea55107dbc95de80f7335eb78ef9d2e7047d726
|
||||
DIST ms-gsl-2.1.0.tar.gz 67289 BLAKE2B 5a247028b71521d7851a6aa5f24936dfb1c7f283854724d8d4bf2d9d9ac3a928c0e5b42a280d8a0a0254d9f6fa958bf1283dab674c649bdaaa7b38ef38f3b1ba SHA512 4382b8feadf4608b06b66a78ca51b0f60a6e8b41b183aec6ac8f8e2e9f0b39705dea513fd708012ed8390c1a4f88d7df454f05166b76bee24ae843835cd4a2ca
|
||||
DIST ms-gsl-3.1.0.tar.gz 78196 BLAKE2B 32334891a11004a6919645814154fdb108a4582a00ac0002c0af9a524978cc8316bebb07192e260b800f462d5424c476fc22be59cca59c0f3d9d7606ab8c4181 SHA512 2916df9ee165fc803ffae0a56518f2ba92870e279984913ff591559e1459943c3ffbc1f5a0d819ad8233f0c9034012de3616aa4e10557d87c7285d8425d10696
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
Add CMake option to disable upstream's catch download, we always want to use the
|
||||
system wide installed version. Gentoo bug 636828.
|
||||
|
||||
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
|
||||
index 86ce5a4..b36df56 100644
|
||||
--- a/tests/CMakeLists.txt
|
||||
+++ b/tests/CMakeLists.txt
|
||||
@@ -10,7 +10,9 @@ list(APPEND CATCH_CMAKE_ARGS
|
||||
"-DNO_SELFTEST=true"
|
||||
)
|
||||
|
||||
-if(GIT_FOUND)
|
||||
+option(FORCE_SYSTEM_CATCH "Force usage of system-wide catch install" OFF)
|
||||
+
|
||||
+if(NOT ${FORCE_SYSTEM_CATCH} AND GIT_FOUND)
|
||||
# add catch
|
||||
ExternalProject_Add(
|
||||
catch
|
||||
--
|
||||
2.13.6
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
DESCRIPTION="Guideline Support Library implementation by Microsoft"
|
||||
HOMEPAGE="https://github.com/Microsoft/GSL"
|
||||
SRC_URI="https://github.com/Microsoft/GSL/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
S="${WORKDIR}/GSL-${PV}"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~ppc64 x86"
|
||||
IUSE="test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
# header only library
|
||||
RDEPEND=""
|
||||
DEPEND="test? ( dev-cpp/catch:1 )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-1.0.0-use_system_catch-636828.patch"
|
||||
"${FILESDIR}/${PN}-1.0.0-disable_Werror-644042.patch"
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DGSL_TEST=$(usex test)
|
||||
)
|
||||
use test && mycmakeargs+=( -DFORCE_SYSTEM_CATCH=ON )
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
@ -1,35 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
DESCRIPTION="Guideline Support Library implementation by Microsoft"
|
||||
HOMEPAGE="https://github.com/Microsoft/GSL"
|
||||
SRC_URI="https://github.com/Microsoft/GSL/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
S="${WORKDIR}/GSL-${PV}"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~ppc64 ~x86"
|
||||
IUSE="test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
# header only library
|
||||
RDEPEND=""
|
||||
DEPEND="test? ( dev-cpp/catch:1 )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-1.0.0-use_system_catch-636828.patch"
|
||||
"${FILESDIR}/${PN}-1.0.0-disable_Werror-644042.patch"
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DGSL_TEST=$(usex test)
|
||||
)
|
||||
use test && mycmakeargs+=( -DFORCE_SYSTEM_CATCH=ON )
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
@ -1,133 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
CMAKE_REMOVE_MODULES="yes"
|
||||
CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB"
|
||||
|
||||
inherit eutils cmake-utils vcs-snapshot
|
||||
|
||||
DESCRIPTION="Object-oriented Graphics Rendering Engine"
|
||||
HOMEPAGE="https://www.ogre3d.org/"
|
||||
SRC_URI="https://bitbucket.org/sinbad/ogre/get/v${PV//./-}.tar.bz2 -> ${P}.tar.bz2"
|
||||
|
||||
LICENSE="MIT public-domain"
|
||||
SLOT="0/1.9.0"
|
||||
KEYWORDS="amd64 ~arm x86"
|
||||
|
||||
# gles1 currently broken wrt bug #418201
|
||||
# gles1 does not even build wrt bug #506058
|
||||
IUSE="+boost cg doc double-precision examples +freeimage gl3plus gles2 gles3 ois +opengl poco profile tbb threads tools +zip"
|
||||
|
||||
REQUIRED_USE="threads? ( ^^ ( boost poco tbb ) )
|
||||
examples? ( ois )
|
||||
poco? ( threads )
|
||||
tbb? ( threads )
|
||||
gl3plus? ( !gles2 !gles3 )
|
||||
gles3? ( gles2 )
|
||||
gl3plus? ( opengl )"
|
||||
|
||||
RESTRICT="test" #139905
|
||||
|
||||
RDEPEND="
|
||||
media-libs/freetype:2
|
||||
virtual/opengl
|
||||
virtual/glu
|
||||
x11-libs/libX11
|
||||
x11-libs/libXaw
|
||||
x11-libs/libXrandr
|
||||
x11-libs/libXt
|
||||
boost? ( dev-libs/boost:= )
|
||||
cg? ( media-gfx/nvidia-cg-toolkit )
|
||||
freeimage? ( media-libs/freeimage )
|
||||
gles2? ( >=media-libs/mesa-9.0.0[gles2] )
|
||||
gles3? ( >=media-libs/mesa-10.0.0[gles2] )
|
||||
gl3plus? ( >=media-libs/mesa-9.2.5 )
|
||||
ois? ( dev-games/ois )
|
||||
threads? (
|
||||
poco? ( dev-libs/poco )
|
||||
tbb? ( dev-cpp/tbb )
|
||||
)
|
||||
tools? ( dev-libs/tinyxml[stl] )
|
||||
zip? ( sys-libs/zlib dev-libs/zziplib )"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
x11-base/xorg-proto
|
||||
doc? ( app-doc/doxygen )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-remove_resource_path_to_bindir.patch"
|
||||
"${FILESDIR}/${P}-remove_media_path_to_bindir.patch"
|
||||
"${FILESDIR}/${P}-gcc52.patch"
|
||||
"${FILESDIR}/${P}-samples.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
sed -i \
|
||||
-e "s:share/OGRE/docs:share/doc/${PF}:" \
|
||||
Docs/CMakeLists.txt || die
|
||||
# Stupid build system hardcodes release names
|
||||
sed -i \
|
||||
-e '/CONFIGURATIONS/s:CONFIGURATIONS Release.*::' \
|
||||
CMake/Utils/OgreConfigTargets.cmake || die
|
||||
|
||||
# make sure we're not using the included tinyxml
|
||||
rm -f Tools/XMLConverter/{include,src}/tiny*.*
|
||||
|
||||
# Fix some path issues
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DOGRE_FULL_RPATH=NO
|
||||
$(cmake-utils_use boost OGRE_USE_BOOST)
|
||||
$(cmake-utils_use cg OGRE_BUILD_PLUGIN_CG)
|
||||
$(cmake-utils_use doc OGRE_INSTALL_DOCS)
|
||||
$(cmake-utils_use double-precision OGRE_CONFIG_DOUBLE)
|
||||
$(cmake-utils_use freeimage OGRE_CONFIG_ENABLE_FREEIMAGE)
|
||||
$(cmake-utils_use opengl OGRE_BUILD_RENDERSYSTEM_GL)
|
||||
$(cmake-utils_use gl3plus OGRE_BUILD_RENDERSYSTEM_GL3PLUS)
|
||||
-DOGRE_BUILD_RENDERSYSTEM_GLES=FALSE
|
||||
$(cmake-utils_use gles2 OGRE_BUILD_RENDERSYSTEM_GLES2)
|
||||
$(cmake-utils_use gles3 OGRE_CONFIG_ENABLE_GLES3_SUPPORT)
|
||||
$(cmake-utils_use profile OGRE_PROFILING)
|
||||
$(cmake-utils_use examples OGRE_BUILD_SAMPLES)
|
||||
$(cmake-utils_use examples OGRE_INSTALL_SAMPLES)
|
||||
$(cmake-utils_use examples OGRE_INSTALL_SAMPLES_SOURCE)
|
||||
-DOGRE_BUILD_TESTS=FALSE
|
||||
-DOGRE_CONFIG_THREADS=$(usex threads 2 0)
|
||||
$(cmake-utils_use tools OGRE_BUILD_TOOLS)
|
||||
$(cmake-utils_use zip OGRE_CONFIG_ENABLE_ZIP)
|
||||
)
|
||||
|
||||
if use threads ; then
|
||||
local f
|
||||
for f in boost poco tbb ; do
|
||||
use ${f} || continue
|
||||
mycmakeargs+=( -DOGRE_CONFIG_THREAD_PROVIDER=${f} )
|
||||
break
|
||||
done
|
||||
fi
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
|
||||
CONFIGDIR=/etc/OGRE
|
||||
SHAREDIR=/usr/share/OGRE
|
||||
|
||||
# plugins and resources are the main configuration
|
||||
insinto "${CONFIGDIR}"
|
||||
doins "${CMAKE_BUILD_DIR}"/bin/plugins.cfg
|
||||
doins "${CMAKE_BUILD_DIR}"/bin/resources.cfg
|
||||
dosym "${CONFIGDIR}"/plugins.cfg "${SHAREDIR}"/plugins.cfg
|
||||
dosym "${CONFIGDIR}"/resources.cfg "${SHAREDIR}"/resources.cfg
|
||||
|
||||
# These are only for the sample browser
|
||||
insinto "${SHAREDIR}"
|
||||
doins "${CMAKE_BUILD_DIR}"/bin/quakemap.cfg
|
||||
doins "${CMAKE_BUILD_DIR}"/bin/samples.cfg
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
@ -1,6 +1 @@
|
||||
DIST glib-2.62.6.tar.xz 4703424 BLAKE2B 0a27245be2575c574dcc730dd051a8c284f421dbc46579aadc5fbbacb8f934af4374b61bb26085e5c9ab78a868c567818f3fb9d67adddce37f5c4fec00e0d276 SHA512 8e3972a371f3c1a50b7d245b30e4f740583ad72ba4ab325e0e15e0732be44dfb69b603fb39dcf4989255a23a181e9ea5dd25982dd94c386cd9f21952243ad6f5
|
||||
DIST glib-2.64.5.tar.xz 4778456 BLAKE2B 7fdee0e16a7ac820f4c4f7dc66d37add464d3005e89e6013302d3ef103319331811d68e9b42db072b82242c3d7badfbd085b69333e770012def89dc8aae7a2eb SHA512 a87537274619b6de88a0e68555059036ac18c748b5005c8d84728646b0db342fde0b8c5b303b9ad79f64d71ea4ed990d52a4fbd68cda3ca74aed5fe4d497e060
|
||||
DIST glib-2.66.2.tar.xz 4836456 BLAKE2B 5484a7fe497dbe06df7ce11dbc8836c95dbb01e6e309516b82158f2915eeee36ccbe6e904cb6ae9a5a0223ccc0b52f6e64d61a418bf790538bc90388430977b2 SHA512 30278c066c6b209f45fcfdb9ffc4732236451464506b93c0fff0964ff8aac58c15be85c3793c686d4740d9d97857984bc0ab71e38d5da11c5fd860e569fb6cb9
|
||||
DIST glib-2.66.3.tar.xz 4837796 BLAKE2B 44632477b56bea5b6324deccc17e2d6b72e00dba518f9fc3ec5edad8b20df59f8bf9087e5de16b587b72c2f143d9ab650c478666132b1564da9bf333f380a4e3 SHA512 ab2670ae4eeb3b561c0e71ff9153908f450e430cd43771bfee09233a65826dc16462537ec64bdfcced867f4c8663341b6b9d17af5ba0fab8564b8f21b04a45d7
|
||||
DIST glib-2.66.4.tar.xz 4838124 BLAKE2B de2b8690c9ef9d66378b396ec0abe2bc83380654b3ca2e221678fb6dc9bf449c544a7e2b2a662739f7b400e9ce0a5a0af115ba2f06b8f5597967e518fdec4937 SHA512 b3bc3e6e5cca793139848940e5c0894f1c7e3bd3a770b213a1ea548ac54a2432aebb140ed54518712fb8af36382b3b13d5f7ffd3d87ff63cba9e2f55434f7260
|
||||
DIST glib-2.66.7.tar.xz 4844892 BLAKE2B 2d128e8c933a8c5bd27734e96e50244f27c29199823e2185e8cfa5b4bbc0ca23f761c9de275c9941672eb945e302178b3cb4b5bd577f375ad953a97dddc70e34 SHA512 f6e6cc0fe2ab4a31a623bf9a1e63f833783e044e7ed55b66a84fc0cbf1410eec233fe0e226abb20aac0e40167a9624bf5e65197f9eed879da1293af44408d530
|
||||
|
||||
@ -1,267 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
PYTHON_COMPAT=( python3_7 )
|
||||
|
||||
inherit flag-o-matic gnome.org gnome2-utils linux-info meson multilib multilib-minimal python-any-r1 toolchain-funcs xdg
|
||||
|
||||
DESCRIPTION="The GLib library of C routines"
|
||||
HOMEPAGE="https://www.gtk.org/"
|
||||
|
||||
LICENSE="LGPL-2.1+"
|
||||
SLOT="2"
|
||||
IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
|
||||
|
||||
# * libelf isn't strictly necessary, but makes gresource tool more useful, and
|
||||
# the check is automagic in gio/meson.build. gresource is not a multilib tool
|
||||
# right now, thus it doesn't matter if non-native ABI libelf exists or not
|
||||
# (non-native binary is overwritten, it doesn't matter if libelf was linked to).
|
||||
# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
|
||||
# these are used by GIO, which glib[static-libs] consumers don't really seem
|
||||
# to need at all, thus not imposing the deps for now and once some consumers
|
||||
# are actually found to static link libgio-2.0.a, we can revisit and either add
|
||||
# them or just put the (build) deps in that rare consumer instead of recursive
|
||||
# RDEPEND here (due to lack of recursive DEPEND).
|
||||
RDEPEND="
|
||||
!<dev-util/gdbus-codegen-${PV}
|
||||
>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
|
||||
>=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?]
|
||||
>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
|
||||
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
|
||||
>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
|
||||
kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
|
||||
selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
|
||||
xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
|
||||
virtual/libelf:0=
|
||||
fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
# libxml2 used for optional tests that get automatically skipped
|
||||
BDEPEND="
|
||||
app-text/docbook-xsl-stylesheets
|
||||
dev-libs/libxslt
|
||||
>=sys-devel/gettext-0.19.8
|
||||
gtk-doc? ( >=dev-util/gtk-doc-1.20
|
||||
app-text/docbook-xml-dtd:4.2
|
||||
app-text/docbook-xml-dtd:4.5 )
|
||||
systemtap? ( >=dev-util/systemtap-1.3 )
|
||||
${PYTHON_DEPS}
|
||||
test? ( >=sys-apps/dbus-1.2.14 )
|
||||
virtual/pkgconfig
|
||||
"
|
||||
# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
|
||||
|
||||
PDEPEND="
|
||||
dbus? ( gnome-base/dconf )
|
||||
mime? ( x11-misc/shared-mime-info )
|
||||
"
|
||||
# shared-mime-info needed for gio/xdgmime, bug #409481
|
||||
# dconf is needed to be able to save settings, bug #498436
|
||||
|
||||
MULTILIB_CHOST_TOOLS=(
|
||||
/usr/bin/gio-querymodules$(get_exeext)
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
if use kernel_linux ; then
|
||||
CONFIG_CHECK="~INOTIFY_USER"
|
||||
if use test ; then
|
||||
CONFIG_CHECK="~IPV6"
|
||||
WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
|
||||
fi
|
||||
linux-info_pkg_setup
|
||||
fi
|
||||
python-any-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if use test; then
|
||||
# TODO: Review the test exclusions, especially now with meson
|
||||
# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
|
||||
if ! has_version dev-util/desktop-file-utils ; then
|
||||
ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
|
||||
ewarn "think on installing it to get these tests run."
|
||||
sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
|
||||
sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
|
||||
fi
|
||||
|
||||
# gdesktopappinfo requires existing terminal (gnome-terminal or any
|
||||
# other), falling back to xterm if one doesn't exist
|
||||
#if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
|
||||
# ewarn "Some tests will be skipped due to missing terminal program"
|
||||
# These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
|
||||
# Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails
|
||||
sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
|
||||
# desktop-app-info/launch* might fail similarly
|
||||
sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
|
||||
#fi
|
||||
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=722604
|
||||
sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
|
||||
sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
|
||||
|
||||
ewarn "Tests for search-utils have been skipped"
|
||||
sed -i -e "/search-utils/d" glib/tests/meson.build || die
|
||||
|
||||
# Play nice with network-sandbox, but this approach would defeat the purpose of the test
|
||||
#sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
|
||||
else
|
||||
# Don't build tests, also prevents extra deps, bug #512022
|
||||
sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
|
||||
fi
|
||||
|
||||
# Don't build fuzzing binaries - not used
|
||||
sed -i -e '/subdir.*fuzzing/d' meson.build || die
|
||||
|
||||
# gdbus-codegen is a separate package
|
||||
sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
|
||||
|
||||
# Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
|
||||
sed -i -e '/install_dir/d' gio/tests/meson.build || die
|
||||
|
||||
cat > "${T}/glib-test-ld-wrapper" <<-EOF
|
||||
#!/usr/bin/env sh
|
||||
exec \${LD:-ld} "\$@"
|
||||
EOF
|
||||
chmod a+x "${T}/glib-test-ld-wrapper" || die
|
||||
sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
|
||||
|
||||
xdg_src_prepare
|
||||
gnome2_environment_reset
|
||||
# TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
if use debug; then
|
||||
append-cflags -DG_ENABLE_DEBUG
|
||||
else
|
||||
append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833
|
||||
fi
|
||||
|
||||
# TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property)
|
||||
#if tc-is-cross-compiler ; then
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=756473
|
||||
# TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property
|
||||
#case ${CHOST} in
|
||||
#hppa*|metag*) export glib_cv_stack_grows=yes ;;
|
||||
#*) export glib_cv_stack_grows=no ;;
|
||||
#esac
|
||||
#fi
|
||||
|
||||
local emesonargs=(
|
||||
-Ddefault_library=$(usex static-libs both shared)
|
||||
$(meson_feature selinux)
|
||||
$(meson_use xattr)
|
||||
-Dlibmount=true # only used if host_system == 'linux'
|
||||
-Dinternal_pcre=false
|
||||
-Dman=true
|
||||
$(meson_use systemtap dtrace)
|
||||
$(meson_use systemtap)
|
||||
-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
|
||||
$(meson_use fam)
|
||||
-Dinstalled_tests=false
|
||||
-Dnls=enabled
|
||||
-Doss_fuzz=disabled
|
||||
)
|
||||
meson_src_configure
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
meson_src_compile
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
export XDG_CONFIG_DIRS=/etc/xdg
|
||||
export XDG_DATA_DIRS=/usr/local/share:/usr/share
|
||||
export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
|
||||
export LC_TIME=C # bug #411967
|
||||
unset GSETTINGS_BACKEND # bug #596380
|
||||
python_setup
|
||||
|
||||
# Related test is a bit nitpicking
|
||||
mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
|
||||
chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
|
||||
|
||||
meson_src_test --timeout-multiplier 2 --no-suite flaky
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
meson_src_install
|
||||
keepdir /usr/$(get_libdir)/gio/modules
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
einstalldocs
|
||||
|
||||
# These are installed by dev-util/glib-utils
|
||||
# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson
|
||||
rm "${ED}/usr/bin/glib-genmarshal" || die
|
||||
rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
|
||||
rm "${ED}/usr/bin/glib-mkenums" || die
|
||||
rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
|
||||
rm "${ED}/usr/bin/gtester-report" || die
|
||||
rm "${ED}/usr/share/man/man1/gtester-report.1" || die
|
||||
# gdbus-codegen manpage installed by dev-util/gdbus-codegen
|
||||
rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
xdg_pkg_preinst
|
||||
|
||||
# Make gschemas.compiled belong to glib alone
|
||||
local cache="/usr/share/glib-2.0/schemas/gschemas.compiled"
|
||||
|
||||
if [[ -e ${EROOT}${cache} ]]; then
|
||||
cp "${EROOT}"${cache} "${ED}"/${cache} || die
|
||||
else
|
||||
touch "${ED}"${cache} || die
|
||||
fi
|
||||
|
||||
multilib_pkg_preinst() {
|
||||
# Make giomodule.cache belong to glib alone
|
||||
local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache"
|
||||
|
||||
if [[ -e ${EROOT}${cache} ]]; then
|
||||
cp "${EROOT}"${cache} "${ED}"${cache} || die
|
||||
else
|
||||
touch "${ED}"${cache} || die
|
||||
fi
|
||||
}
|
||||
|
||||
# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
|
||||
# file due to inability to create it and GIO might not look at any of the modules there
|
||||
if ! tc-is-cross-compiler ; then
|
||||
multilib_foreach_abi multilib_pkg_preinst
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
xdg_pkg_postinst
|
||||
# glib installs no schemas itself, but we force update for fresh install in case
|
||||
# something has dropped in a schemas file without direct glib dep; and for upgrades
|
||||
# in case the compiled schema format could have changed
|
||||
gnome2_schemas_update
|
||||
|
||||
multilib_pkg_postinst() {
|
||||
gnome2_giomodule_cache_update \
|
||||
|| die "Update GIO modules cache failed (for ${ABI})"
|
||||
}
|
||||
multilib_foreach_abi multilib_pkg_postinst
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
xdg_pkg_postrm
|
||||
gnome2_schemas_update
|
||||
|
||||
if [[ -z ${REPLACED_BY_VERSION} ]]; then
|
||||
multilib_pkg_postrm() {
|
||||
rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache
|
||||
}
|
||||
multilib_foreach_abi multilib_pkg_postrm
|
||||
rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled
|
||||
fi
|
||||
}
|
||||
@ -1,281 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
PYTHON_COMPAT=( python3_{7,8} )
|
||||
|
||||
inherit flag-o-matic gnome.org gnome2-utils linux-info meson multilib multilib-minimal python-any-r1 toolchain-funcs xdg
|
||||
|
||||
DESCRIPTION="The GLib library of C routines"
|
||||
HOMEPAGE="https://www.gtk.org/"
|
||||
|
||||
LICENSE="LGPL-2.1+"
|
||||
SLOT="2"
|
||||
IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
|
||||
|
||||
# * libelf isn't strictly necessary, but makes gresource tool more useful, and
|
||||
# the check is automagic in gio/meson.build. gresource is not a multilib tool
|
||||
# right now, thus it doesn't matter if non-native ABI libelf exists or not
|
||||
# (non-native binary is overwritten, it doesn't matter if libelf was linked to).
|
||||
# * elfutils (via libelf) does not build on Windows. gresources are not embedded
|
||||
# within ELF binaries on that platform anyway and inspecting ELF binaries from
|
||||
# other platforms is not that useful so exclude the dependency in this case.
|
||||
# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
|
||||
# these are used by GIO, which glib[static-libs] consumers don't really seem
|
||||
# to need at all, thus not imposing the deps for now and once some consumers
|
||||
# are actually found to static link libgio-2.0.a, we can revisit and either add
|
||||
# them or just put the (build) deps in that rare consumer instead of recursive
|
||||
# RDEPEND here (due to lack of recursive DEPEND).
|
||||
RDEPEND="
|
||||
!<dev-util/gdbus-codegen-${PV}
|
||||
>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
|
||||
>=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?]
|
||||
>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
|
||||
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
|
||||
>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
|
||||
kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
|
||||
selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
|
||||
xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
|
||||
!kernel_Winnt? ( virtual/libelf:0= )
|
||||
fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
# libxml2 used for optional tests that get automatically skipped
|
||||
BDEPEND="
|
||||
app-text/docbook-xsl-stylesheets
|
||||
dev-libs/libxslt
|
||||
>=sys-devel/gettext-0.19.8
|
||||
gtk-doc? ( >=dev-util/gtk-doc-1.32-r2
|
||||
app-text/docbook-xml-dtd:4.2
|
||||
app-text/docbook-xml-dtd:4.5 )
|
||||
systemtap? ( >=dev-util/systemtap-1.3 )
|
||||
${PYTHON_DEPS}
|
||||
test? ( >=sys-apps/dbus-1.2.14 )
|
||||
virtual/pkgconfig
|
||||
"
|
||||
# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
|
||||
|
||||
PDEPEND="
|
||||
dbus? ( gnome-base/dconf )
|
||||
mime? ( x11-misc/shared-mime-info )
|
||||
"
|
||||
# shared-mime-info needed for gio/xdgmime, bug #409481
|
||||
# dconf is needed to be able to save settings, bug #498436
|
||||
|
||||
MULTILIB_CHOST_TOOLS=(
|
||||
/usr/bin/gio-querymodules$(get_exeext)
|
||||
)
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
if use kernel_linux ; then
|
||||
CONFIG_CHECK="~INOTIFY_USER"
|
||||
if use test ; then
|
||||
CONFIG_CHECK="~IPV6"
|
||||
WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
|
||||
fi
|
||||
linux-info_pkg_setup
|
||||
fi
|
||||
python-any-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if use test; then
|
||||
# TODO: Review the test exclusions, especially now with meson
|
||||
# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
|
||||
if ! has_version dev-util/desktop-file-utils ; then
|
||||
ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
|
||||
ewarn "think on installing it to get these tests run."
|
||||
sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
|
||||
sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
|
||||
fi
|
||||
|
||||
# gdesktopappinfo requires existing terminal (gnome-terminal or any
|
||||
# other), falling back to xterm if one doesn't exist
|
||||
#if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
|
||||
# ewarn "Some tests will be skipped due to missing terminal program"
|
||||
# These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
|
||||
# Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails
|
||||
sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
|
||||
# desktop-app-info/launch* might fail similarly
|
||||
sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
|
||||
#fi
|
||||
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=722604
|
||||
sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
|
||||
sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
|
||||
|
||||
ewarn "Tests for search-utils have been skipped"
|
||||
sed -i -e "/search-utils/d" glib/tests/meson.build || die
|
||||
|
||||
# Play nice with network-sandbox, but this approach would defeat the purpose of the test
|
||||
#sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
|
||||
else
|
||||
# Don't build tests, also prevents extra deps, bug #512022
|
||||
sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
|
||||
fi
|
||||
|
||||
# Don't build fuzzing binaries - not used
|
||||
sed -i -e '/subdir.*fuzzing/d' meson.build || die
|
||||
|
||||
# gdbus-codegen is a separate package
|
||||
sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
|
||||
|
||||
# Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
|
||||
sed -i -e '/install_dir/d' gio/tests/meson.build || die
|
||||
|
||||
cat > "${T}/glib-test-ld-wrapper" <<-EOF
|
||||
#!/usr/bin/env sh
|
||||
exec \${LD:-ld} "\$@"
|
||||
EOF
|
||||
chmod a+x "${T}/glib-test-ld-wrapper" || die
|
||||
sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
|
||||
|
||||
xdg_src_prepare
|
||||
gnome2_environment_reset
|
||||
# TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
if use debug; then
|
||||
append-cflags -DG_ENABLE_DEBUG
|
||||
else
|
||||
append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833
|
||||
fi
|
||||
|
||||
# TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property)
|
||||
#if tc-is-cross-compiler ; then
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=756473
|
||||
# TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property
|
||||
#case ${CHOST} in
|
||||
#hppa*|metag*) export glib_cv_stack_grows=yes ;;
|
||||
#*) export glib_cv_stack_grows=no ;;
|
||||
#esac
|
||||
#fi
|
||||
|
||||
local emesonargs=(
|
||||
-Ddefault_library=$(usex static-libs both shared)
|
||||
$(meson_feature selinux)
|
||||
$(meson_use xattr)
|
||||
-Dlibmount=enabled # only used if host_system == 'linux'
|
||||
-Dinternal_pcre=false
|
||||
-Dman=true
|
||||
$(meson_use systemtap dtrace)
|
||||
$(meson_use systemtap)
|
||||
-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
|
||||
$(meson_use fam)
|
||||
-Dinstalled_tests=false
|
||||
-Dnls=enabled
|
||||
-Doss_fuzz=disabled
|
||||
)
|
||||
meson_src_configure
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
meson_src_compile
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
export XDG_CONFIG_DIRS=/etc/xdg
|
||||
export XDG_DATA_DIRS=/usr/local/share:/usr/share
|
||||
export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
|
||||
export LC_TIME=C # bug #411967
|
||||
unset GSETTINGS_BACKEND # bug #596380
|
||||
python_setup
|
||||
|
||||
# Related test is a bit nitpicking
|
||||
mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
|
||||
chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
|
||||
|
||||
meson_src_test --timeout-multiplier 2 --no-suite flaky
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
meson_src_install
|
||||
keepdir /usr/$(get_libdir)/gio/modules
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
einstalldocs
|
||||
|
||||
# These are installed by dev-util/glib-utils
|
||||
# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson
|
||||
rm "${ED}/usr/bin/glib-genmarshal" || die
|
||||
rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
|
||||
rm "${ED}/usr/bin/glib-mkenums" || die
|
||||
rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
|
||||
rm "${ED}/usr/bin/gtester-report" || die
|
||||
rm "${ED}/usr/share/man/man1/gtester-report.1" || die
|
||||
# gdbus-codegen manpage installed by dev-util/gdbus-codegen
|
||||
rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
xdg_pkg_preinst
|
||||
|
||||
# Make gschemas.compiled belong to glib alone
|
||||
local cache="/usr/share/glib-2.0/schemas/gschemas.compiled"
|
||||
|
||||
if [[ -e ${EROOT}${cache} ]]; then
|
||||
cp "${EROOT}"${cache} "${ED}"/${cache} || die
|
||||
else
|
||||
touch "${ED}"${cache} || die
|
||||
fi
|
||||
|
||||
multilib_pkg_preinst() {
|
||||
# Make giomodule.cache belong to glib alone
|
||||
local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache"
|
||||
|
||||
if [[ -e ${EROOT}${cache} ]]; then
|
||||
cp "${EROOT}"${cache} "${ED}"${cache} || die
|
||||
else
|
||||
touch "${ED}"${cache} || die
|
||||
fi
|
||||
}
|
||||
|
||||
# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
|
||||
# file due to inability to create it and GIO might not look at any of the modules there
|
||||
if ! tc-is-cross-compiler ; then
|
||||
multilib_foreach_abi multilib_pkg_preinst
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
xdg_pkg_postinst
|
||||
# glib installs no schemas itself, but we force update for fresh install in case
|
||||
# something has dropped in a schemas file without direct glib dep; and for upgrades
|
||||
# in case the compiled schema format could have changed
|
||||
gnome2_schemas_update
|
||||
|
||||
multilib_pkg_postinst() {
|
||||
gnome2_giomodule_cache_update \
|
||||
|| die "Update GIO modules cache failed (for ${ABI})"
|
||||
}
|
||||
multilib_foreach_abi multilib_pkg_postinst
|
||||
|
||||
for v in ${REPLACING_VERSIONS}; do
|
||||
if ver_test "$v" "-lt" "2.63.6"; then
|
||||
ewarn "glib no longer installs the gio-launch-desktop binary. You may need"
|
||||
ewarn "to restart your session for \"Open With\" dialogs to work."
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
xdg_pkg_postrm
|
||||
gnome2_schemas_update
|
||||
|
||||
if [[ -z ${REPLACED_BY_VERSION} ]]; then
|
||||
multilib_pkg_postrm() {
|
||||
rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache
|
||||
}
|
||||
multilib_foreach_abi multilib_pkg_postrm
|
||||
rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled
|
||||
fi
|
||||
}
|
||||
@ -1,283 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
PYTHON_COMPAT=( python3_{7,8,9} )
|
||||
|
||||
inherit flag-o-matic gnome.org gnome2-utils linux-info meson multilib multilib-minimal python-any-r1 toolchain-funcs xdg
|
||||
|
||||
DESCRIPTION="The GLib library of C routines"
|
||||
HOMEPAGE="https://www.gtk.org/"
|
||||
|
||||
LICENSE="LGPL-2.1+"
|
||||
SLOT="2"
|
||||
IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs sysprof systemtap test utils xattr"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
|
||||
|
||||
# * libelf isn't strictly necessary, but makes gresource tool more useful, and
|
||||
# the check is automagic in gio/meson.build. gresource is not a multilib tool
|
||||
# right now, thus it doesn't matter if non-native ABI libelf exists or not
|
||||
# (non-native binary is overwritten, it doesn't matter if libelf was linked to).
|
||||
# * elfutils (via libelf) does not build on Windows. gresources are not embedded
|
||||
# within ELF binaries on that platform anyway and inspecting ELF binaries from
|
||||
# other platforms is not that useful so exclude the dependency in this case.
|
||||
# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
|
||||
# these are used by GIO, which glib[static-libs] consumers don't really seem
|
||||
# to need at all, thus not imposing the deps for now and once some consumers
|
||||
# are actually found to static link libgio-2.0.a, we can revisit and either add
|
||||
# them or just put the (build) deps in that rare consumer instead of recursive
|
||||
# RDEPEND here (due to lack of recursive DEPEND).
|
||||
RDEPEND="
|
||||
!<dev-util/gdbus-codegen-2.66.0
|
||||
>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
|
||||
>=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?]
|
||||
>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
|
||||
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
|
||||
>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
|
||||
kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
|
||||
selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
|
||||
xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
|
||||
!kernel_Winnt? ( virtual/libelf:0= )
|
||||
fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
|
||||
sysprof? ( >=dev-util/sysprof-capture-3.38:4[${MULTILIB_USEDEP}] )
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
# libxml2 used for optional tests that get automatically skipped
|
||||
BDEPEND="
|
||||
app-text/docbook-xsl-stylesheets
|
||||
dev-libs/libxslt
|
||||
>=sys-devel/gettext-0.19.8
|
||||
gtk-doc? ( >=dev-util/gtk-doc-1.32-r2
|
||||
app-text/docbook-xml-dtd:4.2
|
||||
app-text/docbook-xml-dtd:4.5 )
|
||||
systemtap? ( >=dev-util/systemtap-1.3 )
|
||||
${PYTHON_DEPS}
|
||||
test? ( >=sys-apps/dbus-1.2.14 )
|
||||
virtual/pkgconfig
|
||||
"
|
||||
# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
|
||||
|
||||
PDEPEND="
|
||||
dbus? ( gnome-base/dconf )
|
||||
mime? ( x11-misc/shared-mime-info )
|
||||
"
|
||||
# shared-mime-info needed for gio/xdgmime, bug #409481
|
||||
# dconf is needed to be able to save settings, bug #498436
|
||||
|
||||
MULTILIB_CHOST_TOOLS=(
|
||||
/usr/bin/gio-querymodules$(get_exeext)
|
||||
)
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
if use kernel_linux ; then
|
||||
CONFIG_CHECK="~INOTIFY_USER"
|
||||
if use test ; then
|
||||
CONFIG_CHECK="~IPV6"
|
||||
WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
|
||||
fi
|
||||
linux-info_pkg_setup
|
||||
fi
|
||||
python-any-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if use test; then
|
||||
# TODO: Review the test exclusions, especially now with meson
|
||||
# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
|
||||
if ! has_version dev-util/desktop-file-utils ; then
|
||||
ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
|
||||
ewarn "think on installing it to get these tests run."
|
||||
sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
|
||||
sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
|
||||
fi
|
||||
|
||||
# gdesktopappinfo requires existing terminal (gnome-terminal or any
|
||||
# other), falling back to xterm if one doesn't exist
|
||||
#if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
|
||||
# ewarn "Some tests will be skipped due to missing terminal program"
|
||||
# These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
|
||||
# Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails
|
||||
sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
|
||||
# desktop-app-info/launch* might fail similarly
|
||||
sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
|
||||
#fi
|
||||
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=722604
|
||||
sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
|
||||
sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
|
||||
|
||||
ewarn "Tests for search-utils have been skipped"
|
||||
sed -i -e "/search-utils/d" glib/tests/meson.build || die
|
||||
|
||||
# Play nice with network-sandbox, but this approach would defeat the purpose of the test
|
||||
#sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
|
||||
else
|
||||
# Don't build tests, also prevents extra deps, bug #512022
|
||||
sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
|
||||
fi
|
||||
|
||||
# Don't build fuzzing binaries - not used
|
||||
sed -i -e '/subdir.*fuzzing/d' meson.build || die
|
||||
|
||||
# gdbus-codegen is a separate package
|
||||
sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
|
||||
|
||||
# Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
|
||||
sed -i -e '/install_dir/d' gio/tests/meson.build || die
|
||||
|
||||
cat > "${T}/glib-test-ld-wrapper" <<-EOF
|
||||
#!/usr/bin/env sh
|
||||
exec \${LD:-ld} "\$@"
|
||||
EOF
|
||||
chmod a+x "${T}/glib-test-ld-wrapper" || die
|
||||
sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
|
||||
|
||||
xdg_src_prepare
|
||||
gnome2_environment_reset
|
||||
# TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
if use debug; then
|
||||
append-cflags -DG_ENABLE_DEBUG
|
||||
else
|
||||
append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833
|
||||
fi
|
||||
|
||||
# TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property)
|
||||
#if tc-is-cross-compiler ; then
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=756473
|
||||
# TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property
|
||||
#case ${CHOST} in
|
||||
#hppa*|metag*) export glib_cv_stack_grows=yes ;;
|
||||
#*) export glib_cv_stack_grows=no ;;
|
||||
#esac
|
||||
#fi
|
||||
|
||||
local emesonargs=(
|
||||
-Ddefault_library=$(usex static-libs both shared)
|
||||
$(meson_feature selinux)
|
||||
$(meson_use xattr)
|
||||
-Dlibmount=enabled # only used if host_system == 'linux'
|
||||
-Dinternal_pcre=false
|
||||
-Dman=true
|
||||
$(meson_use systemtap dtrace)
|
||||
$(meson_use systemtap)
|
||||
$(meson_feature sysprof)
|
||||
-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
|
||||
$(meson_use fam)
|
||||
-Dinstalled_tests=false
|
||||
-Dnls=enabled
|
||||
-Doss_fuzz=disabled
|
||||
)
|
||||
meson_src_configure
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
meson_src_compile
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
export XDG_CONFIG_DIRS=/etc/xdg
|
||||
export XDG_DATA_DIRS=/usr/local/share:/usr/share
|
||||
export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
|
||||
export LC_TIME=C # bug #411967
|
||||
unset GSETTINGS_BACKEND # bug #596380
|
||||
python_setup
|
||||
|
||||
# Related test is a bit nitpicking
|
||||
mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
|
||||
chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
|
||||
|
||||
meson_src_test --timeout-multiplier 2 --no-suite flaky
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
meson_src_install
|
||||
keepdir /usr/$(get_libdir)/gio/modules
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
einstalldocs
|
||||
|
||||
# These are installed by dev-util/glib-utils
|
||||
# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson
|
||||
rm "${ED}/usr/bin/glib-genmarshal" || die
|
||||
rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
|
||||
rm "${ED}/usr/bin/glib-mkenums" || die
|
||||
rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
|
||||
rm "${ED}/usr/bin/gtester-report" || die
|
||||
rm "${ED}/usr/share/man/man1/gtester-report.1" || die
|
||||
# gdbus-codegen manpage installed by dev-util/gdbus-codegen
|
||||
rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
xdg_pkg_preinst
|
||||
|
||||
# Make gschemas.compiled belong to glib alone
|
||||
local cache="/usr/share/glib-2.0/schemas/gschemas.compiled"
|
||||
|
||||
if [[ -e ${EROOT}${cache} ]]; then
|
||||
cp "${EROOT}"${cache} "${ED}"/${cache} || die
|
||||
else
|
||||
touch "${ED}"${cache} || die
|
||||
fi
|
||||
|
||||
multilib_pkg_preinst() {
|
||||
# Make giomodule.cache belong to glib alone
|
||||
local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache"
|
||||
|
||||
if [[ -e ${EROOT}${cache} ]]; then
|
||||
cp "${EROOT}"${cache} "${ED}"${cache} || die
|
||||
else
|
||||
touch "${ED}"${cache} || die
|
||||
fi
|
||||
}
|
||||
|
||||
# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
|
||||
# file due to inability to create it and GIO might not look at any of the modules there
|
||||
if ! tc-is-cross-compiler ; then
|
||||
multilib_foreach_abi multilib_pkg_preinst
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
xdg_pkg_postinst
|
||||
# glib installs no schemas itself, but we force update for fresh install in case
|
||||
# something has dropped in a schemas file without direct glib dep; and for upgrades
|
||||
# in case the compiled schema format could have changed
|
||||
gnome2_schemas_update
|
||||
|
||||
multilib_pkg_postinst() {
|
||||
gnome2_giomodule_cache_update \
|
||||
|| die "Update GIO modules cache failed (for ${ABI})"
|
||||
}
|
||||
multilib_foreach_abi multilib_pkg_postinst
|
||||
|
||||
for v in ${REPLACING_VERSIONS}; do
|
||||
if ver_test "$v" "-lt" "2.63.6"; then
|
||||
ewarn "glib no longer installs the gio-launch-desktop binary. You may need"
|
||||
ewarn "to restart your session for \"Open With\" dialogs to work."
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
xdg_pkg_postrm
|
||||
gnome2_schemas_update
|
||||
|
||||
if [[ -z ${REPLACED_BY_VERSION} ]]; then
|
||||
multilib_pkg_postrm() {
|
||||
rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache
|
||||
}
|
||||
multilib_foreach_abi multilib_pkg_postrm
|
||||
rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled
|
||||
fi
|
||||
}
|
||||
@ -1,283 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
PYTHON_COMPAT=( python3_{7,8,9} )
|
||||
|
||||
inherit flag-o-matic gnome.org gnome2-utils linux-info meson multilib multilib-minimal python-any-r1 toolchain-funcs xdg
|
||||
|
||||
DESCRIPTION="The GLib library of C routines"
|
||||
HOMEPAGE="https://www.gtk.org/"
|
||||
|
||||
LICENSE="LGPL-2.1+"
|
||||
SLOT="2"
|
||||
IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs sysprof systemtap test utils xattr"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
|
||||
|
||||
# * libelf isn't strictly necessary, but makes gresource tool more useful, and
|
||||
# the check is automagic in gio/meson.build. gresource is not a multilib tool
|
||||
# right now, thus it doesn't matter if non-native ABI libelf exists or not
|
||||
# (non-native binary is overwritten, it doesn't matter if libelf was linked to).
|
||||
# * elfutils (via libelf) does not build on Windows. gresources are not embedded
|
||||
# within ELF binaries on that platform anyway and inspecting ELF binaries from
|
||||
# other platforms is not that useful so exclude the dependency in this case.
|
||||
# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
|
||||
# these are used by GIO, which glib[static-libs] consumers don't really seem
|
||||
# to need at all, thus not imposing the deps for now and once some consumers
|
||||
# are actually found to static link libgio-2.0.a, we can revisit and either add
|
||||
# them or just put the (build) deps in that rare consumer instead of recursive
|
||||
# RDEPEND here (due to lack of recursive DEPEND).
|
||||
RDEPEND="
|
||||
!<dev-util/gdbus-codegen-${PV}
|
||||
>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
|
||||
>=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?]
|
||||
>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
|
||||
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
|
||||
>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
|
||||
kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
|
||||
selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
|
||||
xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
|
||||
!kernel_Winnt? ( virtual/libelf:0= )
|
||||
fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
|
||||
sysprof? ( >=dev-util/sysprof-capture-3.38:4[${MULTILIB_USEDEP}] )
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
# libxml2 used for optional tests that get automatically skipped
|
||||
BDEPEND="
|
||||
app-text/docbook-xsl-stylesheets
|
||||
dev-libs/libxslt
|
||||
>=sys-devel/gettext-0.19.8
|
||||
gtk-doc? ( >=dev-util/gtk-doc-1.33
|
||||
app-text/docbook-xml-dtd:4.2
|
||||
app-text/docbook-xml-dtd:4.5 )
|
||||
systemtap? ( >=dev-util/systemtap-1.3 )
|
||||
${PYTHON_DEPS}
|
||||
test? ( >=sys-apps/dbus-1.2.14 )
|
||||
virtual/pkgconfig
|
||||
"
|
||||
# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
|
||||
|
||||
PDEPEND="
|
||||
dbus? ( gnome-base/dconf )
|
||||
mime? ( x11-misc/shared-mime-info )
|
||||
"
|
||||
# shared-mime-info needed for gio/xdgmime, bug #409481
|
||||
# dconf is needed to be able to save settings, bug #498436
|
||||
|
||||
MULTILIB_CHOST_TOOLS=(
|
||||
/usr/bin/gio-querymodules$(get_exeext)
|
||||
)
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
if use kernel_linux ; then
|
||||
CONFIG_CHECK="~INOTIFY_USER"
|
||||
if use test ; then
|
||||
CONFIG_CHECK="~IPV6"
|
||||
WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
|
||||
fi
|
||||
linux-info_pkg_setup
|
||||
fi
|
||||
python-any-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if use test; then
|
||||
# TODO: Review the test exclusions, especially now with meson
|
||||
# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
|
||||
if ! has_version dev-util/desktop-file-utils ; then
|
||||
ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
|
||||
ewarn "think on installing it to get these tests run."
|
||||
sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
|
||||
sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
|
||||
fi
|
||||
|
||||
# gdesktopappinfo requires existing terminal (gnome-terminal or any
|
||||
# other), falling back to xterm if one doesn't exist
|
||||
#if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
|
||||
# ewarn "Some tests will be skipped due to missing terminal program"
|
||||
# These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
|
||||
# Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails
|
||||
sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
|
||||
# desktop-app-info/launch* might fail similarly
|
||||
sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
|
||||
#fi
|
||||
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=722604
|
||||
sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
|
||||
sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
|
||||
|
||||
ewarn "Tests for search-utils have been skipped"
|
||||
sed -i -e "/search-utils/d" glib/tests/meson.build || die
|
||||
|
||||
# Play nice with network-sandbox, but this approach would defeat the purpose of the test
|
||||
#sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
|
||||
else
|
||||
# Don't build tests, also prevents extra deps, bug #512022
|
||||
sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
|
||||
fi
|
||||
|
||||
# Don't build fuzzing binaries - not used
|
||||
sed -i -e '/subdir.*fuzzing/d' meson.build || die
|
||||
|
||||
# gdbus-codegen is a separate package
|
||||
sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
|
||||
|
||||
# Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
|
||||
sed -i -e '/install_dir/d' gio/tests/meson.build || die
|
||||
|
||||
cat > "${T}/glib-test-ld-wrapper" <<-EOF
|
||||
#!/usr/bin/env sh
|
||||
exec \${LD:-ld} "\$@"
|
||||
EOF
|
||||
chmod a+x "${T}/glib-test-ld-wrapper" || die
|
||||
sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
|
||||
|
||||
xdg_src_prepare
|
||||
gnome2_environment_reset
|
||||
# TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
if use debug; then
|
||||
append-cflags -DG_ENABLE_DEBUG
|
||||
else
|
||||
append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833
|
||||
fi
|
||||
|
||||
# TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property)
|
||||
#if tc-is-cross-compiler ; then
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=756473
|
||||
# TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property
|
||||
#case ${CHOST} in
|
||||
#hppa*|metag*) export glib_cv_stack_grows=yes ;;
|
||||
#*) export glib_cv_stack_grows=no ;;
|
||||
#esac
|
||||
#fi
|
||||
|
||||
local emesonargs=(
|
||||
-Ddefault_library=$(usex static-libs both shared)
|
||||
$(meson_feature selinux)
|
||||
$(meson_use xattr)
|
||||
-Dlibmount=enabled # only used if host_system == 'linux'
|
||||
-Dinternal_pcre=false
|
||||
-Dman=true
|
||||
$(meson_use systemtap dtrace)
|
||||
$(meson_use systemtap)
|
||||
$(meson_feature sysprof)
|
||||
-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
|
||||
$(meson_use fam)
|
||||
-Dinstalled_tests=false
|
||||
-Dnls=enabled
|
||||
-Doss_fuzz=disabled
|
||||
)
|
||||
meson_src_configure
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
meson_src_compile
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
export XDG_CONFIG_DIRS=/etc/xdg
|
||||
export XDG_DATA_DIRS=/usr/local/share:/usr/share
|
||||
export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
|
||||
export LC_TIME=C # bug #411967
|
||||
unset GSETTINGS_BACKEND # bug #596380
|
||||
python_setup
|
||||
|
||||
# Related test is a bit nitpicking
|
||||
mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
|
||||
chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
|
||||
|
||||
meson_src_test --timeout-multiplier 2 --no-suite flaky
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
meson_src_install
|
||||
keepdir /usr/$(get_libdir)/gio/modules
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
einstalldocs
|
||||
|
||||
# These are installed by dev-util/glib-utils
|
||||
# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson
|
||||
rm "${ED}/usr/bin/glib-genmarshal" || die
|
||||
rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
|
||||
rm "${ED}/usr/bin/glib-mkenums" || die
|
||||
rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
|
||||
rm "${ED}/usr/bin/gtester-report" || die
|
||||
rm "${ED}/usr/share/man/man1/gtester-report.1" || die
|
||||
# gdbus-codegen manpage installed by dev-util/gdbus-codegen
|
||||
rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
xdg_pkg_preinst
|
||||
|
||||
# Make gschemas.compiled belong to glib alone
|
||||
local cache="/usr/share/glib-2.0/schemas/gschemas.compiled"
|
||||
|
||||
if [[ -e ${EROOT}${cache} ]]; then
|
||||
cp "${EROOT}"${cache} "${ED}"/${cache} || die
|
||||
else
|
||||
touch "${ED}"${cache} || die
|
||||
fi
|
||||
|
||||
multilib_pkg_preinst() {
|
||||
# Make giomodule.cache belong to glib alone
|
||||
local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache"
|
||||
|
||||
if [[ -e ${EROOT}${cache} ]]; then
|
||||
cp "${EROOT}"${cache} "${ED}"${cache} || die
|
||||
else
|
||||
touch "${ED}"${cache} || die
|
||||
fi
|
||||
}
|
||||
|
||||
# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
|
||||
# file due to inability to create it and GIO might not look at any of the modules there
|
||||
if ! tc-is-cross-compiler ; then
|
||||
multilib_foreach_abi multilib_pkg_preinst
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
xdg_pkg_postinst
|
||||
# glib installs no schemas itself, but we force update for fresh install in case
|
||||
# something has dropped in a schemas file without direct glib dep; and for upgrades
|
||||
# in case the compiled schema format could have changed
|
||||
gnome2_schemas_update
|
||||
|
||||
multilib_pkg_postinst() {
|
||||
gnome2_giomodule_cache_update \
|
||||
|| die "Update GIO modules cache failed (for ${ABI})"
|
||||
}
|
||||
multilib_foreach_abi multilib_pkg_postinst
|
||||
|
||||
for v in ${REPLACING_VERSIONS}; do
|
||||
if ver_test "$v" "-lt" "2.63.6"; then
|
||||
ewarn "glib no longer installs the gio-launch-desktop binary. You may need"
|
||||
ewarn "to restart your session for \"Open With\" dialogs to work."
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
xdg_pkg_postrm
|
||||
gnome2_schemas_update
|
||||
|
||||
if [[ -z ${REPLACED_BY_VERSION} ]]; then
|
||||
multilib_pkg_postrm() {
|
||||
rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache
|
||||
}
|
||||
multilib_foreach_abi multilib_pkg_postrm
|
||||
rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled
|
||||
fi
|
||||
}
|
||||
@ -1,290 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
PYTHON_COMPAT=( python3_{7,8,9} )
|
||||
|
||||
inherit flag-o-matic gnome.org gnome2-utils linux-info meson multilib multilib-minimal python-any-r1 toolchain-funcs xdg
|
||||
|
||||
DESCRIPTION="The GLib library of C routines"
|
||||
HOMEPAGE="https://www.gtk.org/"
|
||||
|
||||
LICENSE="LGPL-2.1+"
|
||||
SLOT="2"
|
||||
IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs sysprof systemtap test utils xattr"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
|
||||
|
||||
# * libelf isn't strictly necessary, but makes gresource tool more useful, and
|
||||
# the check is automagic in gio/meson.build. gresource is not a multilib tool
|
||||
# right now, thus it doesn't matter if non-native ABI libelf exists or not
|
||||
# (non-native binary is overwritten, it doesn't matter if libelf was linked to).
|
||||
# * elfutils (via libelf) does not build on Windows. gresources are not embedded
|
||||
# within ELF binaries on that platform anyway and inspecting ELF binaries from
|
||||
# other platforms is not that useful so exclude the dependency in this case.
|
||||
# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
|
||||
# these are used by GIO, which glib[static-libs] consumers don't really seem
|
||||
# to need at all, thus not imposing the deps for now and once some consumers
|
||||
# are actually found to static link libgio-2.0.a, we can revisit and either add
|
||||
# them or just put the (build) deps in that rare consumer instead of recursive
|
||||
# RDEPEND here (due to lack of recursive DEPEND).
|
||||
RDEPEND="
|
||||
!<dev-util/gdbus-codegen-${PV}
|
||||
>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
|
||||
>=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?]
|
||||
>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
|
||||
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
|
||||
>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
|
||||
kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
|
||||
selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
|
||||
xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
|
||||
!kernel_Winnt? ( virtual/libelf:0= )
|
||||
fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
|
||||
sysprof? ( >=dev-util/sysprof-capture-3.38:4[${MULTILIB_USEDEP}] )
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
# libxml2 used for optional tests that get automatically skipped
|
||||
BDEPEND="
|
||||
app-text/docbook-xsl-stylesheets
|
||||
dev-libs/libxslt
|
||||
>=sys-devel/gettext-0.19.8
|
||||
gtk-doc? ( >=dev-util/gtk-doc-1.33
|
||||
app-text/docbook-xml-dtd:4.2
|
||||
app-text/docbook-xml-dtd:4.5 )
|
||||
systemtap? ( >=dev-util/systemtap-1.3 )
|
||||
${PYTHON_DEPS}
|
||||
test? ( >=sys-apps/dbus-1.2.14 )
|
||||
virtual/pkgconfig
|
||||
"
|
||||
# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
|
||||
|
||||
PDEPEND="
|
||||
dbus? ( gnome-base/dconf )
|
||||
mime? ( x11-misc/shared-mime-info )
|
||||
"
|
||||
# shared-mime-info needed for gio/xdgmime, bug #409481
|
||||
# dconf is needed to be able to save settings, bug #498436
|
||||
|
||||
MULTILIB_CHOST_TOOLS=(
|
||||
/usr/bin/gio-querymodules$(get_exeext)
|
||||
)
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
if use kernel_linux ; then
|
||||
CONFIG_CHECK="~INOTIFY_USER"
|
||||
if use test ; then
|
||||
CONFIG_CHECK="~IPV6"
|
||||
WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
|
||||
fi
|
||||
linux-info_pkg_setup
|
||||
fi
|
||||
python-any-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if use test; then
|
||||
# TODO: Review the test exclusions, especially now with meson
|
||||
# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
|
||||
if ! has_version dev-util/desktop-file-utils ; then
|
||||
ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
|
||||
ewarn "think on installing it to get these tests run."
|
||||
sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
|
||||
sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
|
||||
fi
|
||||
|
||||
# gdesktopappinfo requires existing terminal (gnome-terminal or any
|
||||
# other), falling back to xterm if one doesn't exist
|
||||
#if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
|
||||
# ewarn "Some tests will be skipped due to missing terminal program"
|
||||
# These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
|
||||
# Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails
|
||||
sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
|
||||
# desktop-app-info/launch* might fail similarly
|
||||
sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
|
||||
#fi
|
||||
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=722604
|
||||
sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
|
||||
sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
|
||||
|
||||
ewarn "Tests for search-utils have been skipped"
|
||||
sed -i -e "/search-utils/d" glib/tests/meson.build || die
|
||||
|
||||
# Play nice with network-sandbox, but this approach would defeat the purpose of the test
|
||||
#sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
|
||||
else
|
||||
# Don't build tests, also prevents extra deps, bug #512022
|
||||
sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
|
||||
fi
|
||||
|
||||
# Don't build fuzzing binaries - not used
|
||||
sed -i -e '/subdir.*fuzzing/d' meson.build || die
|
||||
|
||||
# gdbus-codegen is a separate package
|
||||
sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
|
||||
|
||||
# Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
|
||||
sed -i -e '/install_dir/d' gio/tests/meson.build || die
|
||||
|
||||
cat > "${T}/glib-test-ld-wrapper" <<-EOF
|
||||
#!/usr/bin/env sh
|
||||
exec \${LD:-ld} "\$@"
|
||||
EOF
|
||||
chmod a+x "${T}/glib-test-ld-wrapper" || die
|
||||
sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
|
||||
|
||||
xdg_src_prepare
|
||||
gnome2_environment_reset
|
||||
# TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
if use debug; then
|
||||
append-cflags -DG_ENABLE_DEBUG
|
||||
else
|
||||
append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833
|
||||
fi
|
||||
|
||||
# TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property)
|
||||
#if tc-is-cross-compiler ; then
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=756473
|
||||
# TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property
|
||||
#case ${CHOST} in
|
||||
#hppa*|metag*) export glib_cv_stack_grows=yes ;;
|
||||
#*) export glib_cv_stack_grows=no ;;
|
||||
#esac
|
||||
#fi
|
||||
|
||||
local emesonargs=(
|
||||
-Ddefault_library=$(usex static-libs both shared)
|
||||
$(meson_feature selinux)
|
||||
$(meson_use xattr)
|
||||
-Dlibmount=enabled # only used if host_system == 'linux'
|
||||
-Dinternal_pcre=false
|
||||
-Dman=true
|
||||
$(meson_use systemtap dtrace)
|
||||
$(meson_use systemtap)
|
||||
$(meson_feature sysprof)
|
||||
-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
|
||||
$(meson_use fam)
|
||||
-Dinstalled_tests=false
|
||||
-Dnls=enabled
|
||||
-Doss_fuzz=disabled
|
||||
)
|
||||
meson_src_configure
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
meson_src_compile
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
export XDG_CONFIG_DIRS=/etc/xdg
|
||||
export XDG_DATA_DIRS=/usr/local/share:/usr/share
|
||||
export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
|
||||
export LC_TIME=C # bug #411967
|
||||
unset GSETTINGS_BACKEND # bug #596380
|
||||
python_setup
|
||||
|
||||
# Related test is a bit nitpicking
|
||||
mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
|
||||
chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
|
||||
|
||||
meson_src_test --timeout-multiplier 2 --no-suite flaky
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
meson_src_install
|
||||
keepdir /usr/$(get_libdir)/gio/modules
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
einstalldocs
|
||||
|
||||
# These are installed by dev-util/glib-utils
|
||||
# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson
|
||||
rm "${ED}/usr/bin/glib-genmarshal" || die
|
||||
rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
|
||||
rm "${ED}/usr/bin/glib-mkenums" || die
|
||||
rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
|
||||
rm "${ED}/usr/bin/gtester-report" || die
|
||||
rm "${ED}/usr/share/man/man1/gtester-report.1" || die
|
||||
# gdbus-codegen manpage installed by dev-util/gdbus-codegen
|
||||
rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
xdg_pkg_preinst
|
||||
|
||||
# Make gschemas.compiled belong to glib alone
|
||||
local cache="/usr/share/glib-2.0/schemas/gschemas.compiled"
|
||||
|
||||
if [[ -e ${EROOT}${cache} ]]; then
|
||||
cp "${EROOT}"${cache} "${ED}"/${cache} || die
|
||||
else
|
||||
touch "${ED}"${cache} || die
|
||||
fi
|
||||
|
||||
multilib_pkg_preinst() {
|
||||
# Make giomodule.cache belong to glib alone
|
||||
local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache"
|
||||
|
||||
if [[ -e ${EROOT}${cache} ]]; then
|
||||
cp "${EROOT}"${cache} "${ED}"${cache} || die
|
||||
else
|
||||
touch "${ED}"${cache} || die
|
||||
fi
|
||||
}
|
||||
|
||||
# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
|
||||
# file due to inability to create it and GIO might not look at any of the modules there
|
||||
if ! tc-is-cross-compiler ; then
|
||||
multilib_foreach_abi multilib_pkg_preinst
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
xdg_pkg_postinst
|
||||
# glib installs no schemas itself, but we force update for fresh install in case
|
||||
# something has dropped in a schemas file without direct glib dep; and for upgrades
|
||||
# in case the compiled schema format could have changed
|
||||
gnome2_schemas_update
|
||||
|
||||
multilib_pkg_postinst() {
|
||||
gnome2_giomodule_cache_update \
|
||||
|| die "Update GIO modules cache failed (for ${ABI})"
|
||||
}
|
||||
if ! tc-is-cross-compiler ; then
|
||||
multilib_foreach_abi multilib_pkg_postinst
|
||||
else
|
||||
ewarn "Updating of GIO modules cache skipped due to cross-compilation."
|
||||
ewarn "You might want to run gio-querymodules manually on the target for"
|
||||
ewarn "your final image for performance reasons and re-run it when packages"
|
||||
ewarn "installing GIO modules get upgraded or added to the image."
|
||||
fi
|
||||
|
||||
for v in ${REPLACING_VERSIONS}; do
|
||||
if ver_test "$v" "-lt" "2.63.6"; then
|
||||
ewarn "glib no longer installs the gio-launch-desktop binary. You may need"
|
||||
ewarn "to restart your session for \"Open With\" dialogs to work."
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
xdg_pkg_postrm
|
||||
gnome2_schemas_update
|
||||
|
||||
if [[ -z ${REPLACED_BY_VERSION} ]]; then
|
||||
multilib_pkg_postrm() {
|
||||
rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache
|
||||
}
|
||||
multilib_foreach_abi multilib_pkg_postrm
|
||||
rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled
|
||||
fi
|
||||
}
|
||||
@ -1,3 +1,4 @@
|
||||
DIST libpcre2-10.34-patchset-01.tar.xz 1208 BLAKE2B 615b7eff085bd52bb3aed30c90ec5b8cec406f96c58bdfb0304dd59311517662067e68f85bc9930ed6f749820ecfe3c483e261616187bc1077ebb053670d4950 SHA512 d881665701bc330f237d19ee48491a81dc8b952b0b8e529eb83c3ffdf14710f68eb934f872ed76ef6b0bee1864261453e7e71e60e14217c004e4e12c6baa499f
|
||||
DIST libpcre2-10.36-patchset-01.tar.xz 1364 BLAKE2B bfef3c876a092e06972107b44794c23b758a030181f3040c8b722db166789eac794783169b468fc71334fd660bc2f1c31422a8cb8e5bdc18a69b72654b1b59b2 SHA512 04324d1efa6d155fa3ffbc328638e4674bea305fef7f57d4369ab4a6399a0f489b4c0ecfb49643feff310d91872e1673e965c48a5c60f1bf54a319f0d275c306
|
||||
DIST pcre2-10.35.tar.bz2 1725214 BLAKE2B f97412258f0d2c09dc18c5973156e616730ae301713a0172fb2f467e5d2857bf64c6d02ac247e797ce4c96e2fb9b122888f71aede3f5eb3540731f6c3c254ed4 SHA512 ecfb8d48e219daff02874783b7b436fe7d70d8471e44eb66e1e29abb7b0aa67547e6b5fba7058b074ac90eef265ece7d12728f80afdda45b6b8124435f4561fd
|
||||
DIST pcre2-10.36.tar.bz2 1722310 BLAKE2B 5c70b7b1b0644edbcc29d3486fc0f3e2d0cb4822f4f3f3e7df603b4f4e27656a2e7f71389628ceb9bd7acc746ce4b626cd2a128d894840b22796841d1269765f SHA512 fc2a920562c80c3d31cedd94028fab55314ae0fb168cac7178f286c344a11fc514939edc3b83b8e0b57c872db4e595fd5530fd1d4b8c779be629553e9ec965a3
|
||||
|
||||
@ -0,0 +1,91 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit flag-o-matic libtool multilib-minimal toolchain-funcs usr-ldscript
|
||||
|
||||
PATCH_SET="${PN}-10.36-patchset-01.tar.xz"
|
||||
|
||||
DESCRIPTION="Perl-compatible regular expression library"
|
||||
HOMEPAGE="https://www.pcre.org/"
|
||||
MY_P="pcre2-${PV/_rc/-RC}"
|
||||
if [[ ${PV} != *_rc* ]] ; then
|
||||
# Only the final releases are available here.
|
||||
SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2
|
||||
https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2"
|
||||
else
|
||||
SRC_URI="https://ftp.pcre.org/pub/pcre/Testing/${MY_P}.tar.bz2"
|
||||
fi
|
||||
|
||||
if [[ -n "${PATCH_SET}" ]] ; then
|
||||
SRC_URI+=" https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}
|
||||
https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}"
|
||||
fi
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
|
||||
REQUIRED_USE="?? ( libedit readline )"
|
||||
|
||||
BDEPEND="
|
||||
virtual/pkgconfig
|
||||
userland_GNU? ( >=sys-apps/findutils-4.4.0 )
|
||||
"
|
||||
RDEPEND="
|
||||
bzip2? ( app-arch/bzip2 )
|
||||
libedit? ( dev-libs/libedit )
|
||||
readline? ( sys-libs/readline:0= )
|
||||
zlib? ( sys-libs/zlib )
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
MULTILIB_CHOST_TOOLS=(
|
||||
/usr/bin/pcre2-config
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
[[ -d "${WORKDIR}/patches" ]] && eapply "${WORKDIR}"/patches
|
||||
|
||||
default
|
||||
|
||||
elibtoolize
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local myeconfargs=(
|
||||
--enable-pcre2-8
|
||||
--enable-shared
|
||||
--with-match-limit-depth=$(usex recursion-limit 8192 MATCH_LIMIT)
|
||||
$(multilib_native_use_enable bzip2 pcre2grep-libbz2)
|
||||
$(multilib_native_use_enable libedit pcre2test-libedit)
|
||||
$(multilib_native_use_enable readline pcre2test-libreadline)
|
||||
$(multilib_native_use_enable zlib pcre2grep-libz)
|
||||
$(use_enable jit)
|
||||
$(use_enable jit pcre2grep-jit)
|
||||
$(use_enable pcre16 pcre2-16)
|
||||
$(use_enable pcre32 pcre2-32)
|
||||
$(use_enable static-libs static)
|
||||
$(use_enable unicode)
|
||||
)
|
||||
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=")
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
emake \
|
||||
DESTDIR="${D}" \
|
||||
$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
|
||||
install
|
||||
multilib_is_native_abi && gen_usr_ldscript -a pcre2-posix
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
find "${ED}" -type f -name "*.la" -delete || die
|
||||
}
|
||||
@ -1,3 +1 @@
|
||||
DIST zziplib-0.13.71.tar.gz 1150654 BLAKE2B 00394de5da8b3c5b95ef0aea060e523354845261b846e3c876b13d2d05c6569496475a279d6b211c3215a6f17e6bfe53958baabcebb13cd72d30a9f0c40d9449 SHA512 e035d0ac26dca78335ae3defc652543ff7b353a1a95d76ed1beeb21a08e16f287a62d488f528cfbb77d5b558581b68d439aa0823577524e9aa61a3cf5f208cb5
|
||||
DIST zziplib-0.13.71_p20201021.tar.gz 1151849 BLAKE2B b4caf8b6b03d8de742d4e727a2aa03dd8b5e96df50c6e9d5aaf2df9bc072cd8389959019e41c06bd808f3df8e710dd11d198438bf70e58e5ae278a882d854d5b SHA512 ebbc5bc9e403e203d36cacb0ec5aea9d1750f1a8b144a41748c9475e6cc0b1c3af197a4ef7df5f38f90be40bd4f9b68edbcb4624ceff1d48a47127065e570cb3
|
||||
DIST zziplib-0.13.72.tar.gz 1162175 BLAKE2B ff5617645e25040e4666e5440651fbb2b04c0505c7bda08b158f44c63c5dd53ec97a9942908314c3b103a4685be49368e964d249fcf9b9d685e328f0ebabdedd SHA512 4bb089e74813c6fac9657cd96e44e4a6469bf86aba3980d885c4573e8db45e74fd07bbdfcec9f36297c72227c8c0b2c37dab1bc4326cef8529960e482fe501c8
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
Index: zziplib-0.13.69/bins/unzip-mem.c
|
||||
===================================================================
|
||||
--- zziplib-0.13.69.orig/bins/unzip-mem.c
|
||||
+++ zziplib-0.13.69/bins/unzip-mem.c
|
||||
@@ -93,7 +93,7 @@ static void zzip_mem_entry_make(ZZIP_MEM
|
||||
{
|
||||
FILE* file = fopen (entry->zz_name, "wb");
|
||||
if (file) { zzip_mem_entry_pipe (disk, entry, file); fclose (file); }
|
||||
- perror (entry->zz_name);
|
||||
+ else perror (entry->zz_name);
|
||||
if (status < EXIT_WARNINGS) status = EXIT_WARNINGS;
|
||||
}
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
commit 03ddd0ce0864e629256bc078eaadb0d21d0df6d9
|
||||
Author: Guido Draheim <guidod@gmx.de>
|
||||
Date: Sat Apr 18 02:11:37 2020 +0200
|
||||
|
||||
#58 manvolnum should be in .so (see other) manpages
|
||||
|
||||
diff --git a/docs/dbk2man.py b/docs/dbk2man.py
|
||||
index 49cac4e..e0d93d2 100755
|
||||
--- a/docs/dbk2man.py
|
||||
+++ b/docs/dbk2man.py
|
||||
@@ -387,7 +387,7 @@ def refentry2(man, refentry, subdirectory = ".", title = ""):
|
||||
refentrytitle = manpage
|
||||
filename = "%s/man%s/%s.%s" % (subdirectory, manvolnum, manpage, manvolnum)
|
||||
if manpage != refentrytitle:
|
||||
- manpagetext = ".so %s.%s\n" % (refentrytitle, manvolnum)
|
||||
+ manpagetext = ".so man%s/%s.%s\n" % (manvolnum, refentrytitle, manvolnum)
|
||||
writefile(filename, manpagetext)
|
||||
else:
|
||||
manpagetext = text
|
||||
@ -1,54 +0,0 @@
|
||||
commit 31d8a958610592bce683366c0808fb610f67a366
|
||||
Author: Guido Draheim <guidod@gmx.de>
|
||||
Date: Sun Apr 19 18:25:16 2020 +0200
|
||||
|
||||
copy directory instead of unpacking manpages.tar to install-man #93
|
||||
|
||||
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
|
||||
index 623da24..b679f7b 100644
|
||||
--- a/docs/CMakeLists.txt
|
||||
+++ b/docs/CMakeLists.txt
|
||||
@@ -174,33 +174,28 @@ add_custom_target(install-site
|
||||
DEPENDS site.html zziplib.html zzipmmapped.html zzipfseeko.html
|
||||
VERBATIM)
|
||||
add_custom_target(install-htmpages
|
||||
- COMMAND ${BASH} -c "ls -l ${CMAKE_CURRENT_BINARY_DIR}/*pages.tar"
|
||||
COMMAND ${BASH} -c "mkdir -vp $DESTDIR${docdir} >&2 || ls -ld $DESTDIR${docdir} >&2"
|
||||
- COMMAND ${BASH} -c "cd $DESTDIR${docdir} && tar x -f ${outdir}/htmpages.tar"
|
||||
+ COMMAND ${BASH} -c "cp -r ${outdir}/html $DESTDIR${docdir}/"
|
||||
COMMAND ${BASH} -c "cd $DESTDIR${docdir} && mv html man"
|
||||
DEPENDS htmpages.tar
|
||||
VERBATIM)
|
||||
add_custom_target(install-manpages
|
||||
- COMMAND ${BASH} -c "ls -l ${CMAKE_CURRENT_BINARY_DIR}/*pages.tar"
|
||||
COMMAND ${BASH} -c "mkdir -vp $DESTDIR${mandir} >&2 || ls -ld $DESTDIR${mandir} >&2"
|
||||
- COMMAND ${BASH} -c "cd $DESTDIR${mandir} && tar xf ${outdir}/manpages.tar"
|
||||
+ COMMAND ${BASH} -c "cp -r ${outdir}/man3 $DESTDIR${mandir}/"
|
||||
DEPENDS manpages.tar
|
||||
VERBATIM)
|
||||
-
|
||||
+if(ZZIP_HTMPAGES)
|
||||
+ install(CODE "message(STATUS \"Installing: html pages to ${docdir}/man\")")
|
||||
+ install(DIRECTORY html/ DESTINATION ${docdir}/man MESSAGE_NEVER)
|
||||
+endif()
|
||||
+if(ZZIP_MANPAGES)
|
||||
+ install(CODE "message(STATUS \"Installing: man3 pages to ${mandir}/man3\")")
|
||||
+ install(DIRECTORY man3/ DESTINATION ${mandir}/man3 MESSAGE_NEVER)
|
||||
+endif()
|
||||
add_custom_target(install-docs DEPENDS install-manpages install-htmpages install-site)
|
||||
add_custom_target(install-mans DEPENDS install-manpages)
|
||||
-
|
||||
-if(ZZIP_MANPAGES)
|
||||
-add_custom_target(install-man ALL DEPENDS install-manpages)
|
||||
-else()
|
||||
add_custom_target(install-man DEPENDS install-manpages)
|
||||
-endif()
|
||||
-
|
||||
-if(ZZIP_HTMPAGES)
|
||||
-add_custom_target(install-htm ALL DEPENDS install-htmpages)
|
||||
-else()
|
||||
add_custom_target(install-htm DEPENDS install-htmpages)
|
||||
-endif()
|
||||
|
||||
# messages #######################################################
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
diff --git a/SDL/CMakeLists.txt b/SDL/CMakeLists.txt
|
||||
index 7ceba4a..c1b8172 100644
|
||||
--- a/SDL/CMakeLists.txt
|
||||
+++ b/SDL/CMakeLists.txt
|
||||
@@ -47,6 +47,7 @@ endif()
|
||||
|
||||
if(SDL_FOUND)
|
||||
if(UNIX)
|
||||
+find_package ( UnixCommands REQUIRED ) # bash
|
||||
join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
|
||||
join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
|
||||
join_paths(pc_zzipsdldir "\${prefix}" "${zzipsdldir}")
|
||||
diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt
|
||||
index a9f6e3a..2cdd275 100644
|
||||
--- a/zzip/CMakeLists.txt
|
||||
+++ b/zzip/CMakeLists.txt
|
||||
@@ -194,6 +194,7 @@ SET_TARGET_PROPERTIES(libzzipmmapped PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVE
|
||||
endif()
|
||||
|
||||
if(ZZIPCOMPAT)
|
||||
+find_package ( UnixCommands REQUIRED ) # bash
|
||||
add_custom_command(OUTPUT compat/zzip.h
|
||||
COMMAND ${BASH} -c "rm -rf compat; mkdir compat"
|
||||
COMMAND ${BASH} -c "echo '#ifndef ZZIP_WARNING' > compat/zzip.h"
|
||||
@@ -215,6 +216,7 @@ add_custom_target(compat ALL DEPENDS compat/zzip.h)
|
||||
endif()
|
||||
|
||||
if(UNIX)
|
||||
+find_package ( UnixCommands REQUIRED ) # bash
|
||||
join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
|
||||
join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
|
||||
add_custom_command(OUTPUT zziplib.pc
|
||||
diff --git a/zzipwrap/CMakeLists.txt b/zzipwrap/CMakeLists.txt
|
||||
index 220d93b..d0bf1ae 100644
|
||||
--- a/zzipwrap/CMakeLists.txt
|
||||
+++ b/zzipwrap/CMakeLists.txt
|
||||
@@ -49,6 +49,7 @@ target_link_libraries(zzipwrap libzzipwrap )
|
||||
target_include_directories(zzipwrap PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
|
||||
if(UNIX)
|
||||
+find_package ( UnixCommands REQUIRED ) # bash
|
||||
join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
|
||||
join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
|
||||
add_custom_command(OUTPUT zzipwrap.pc
|
||||
@ -1,33 +0,0 @@
|
||||
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
|
||||
index b679f7b..cafa6b4 100644
|
||||
--- a/docs/CMakeLists.txt
|
||||
+++ b/docs/CMakeLists.txt
|
||||
@@ -126,9 +126,10 @@ add_custom_command(OUTPUT manpages.tar
|
||||
COMMAND ${BASH} -c "test -d man3/man3 && mv man3 man3_; test -d man3_/man3 && mv man3_/man3 .; rm -rf man3_"
|
||||
COMMAND ${BASH} -c "chmod 664 man3/*.3"
|
||||
COMMAND ${BASH} -c "tar cf manpages.tar man3"
|
||||
- COMMAND ${BASH} -c "ls -l `pwd`/manpages.tar `pwd`/htmpages.tar >&2 || true"
|
||||
+ COMMAND ${BASH} -c "ls -l `pwd`/manpages.tar >&2 || true"
|
||||
DEPENDS zziplib.xml zzipmmapped.xml zzipfseeko.xml
|
||||
VERBATIM)
|
||||
+if(ZZIP_HTMPAGES)
|
||||
add_custom_command(OUTPUT htmpages.tar
|
||||
COMMAND ${BASH} -c "test -d html && rm -rf html; mkdir html"
|
||||
COMMAND ${PY} ${srcdir}/dbk2man.py -o html html zziplib.xml
|
||||
@@ -139,6 +140,7 @@ add_custom_command(OUTPUT htmpages.tar
|
||||
COMMAND ${BASH} -c "ls -l `pwd`/htmpages.tar `pwd`/manpages.tar >&2 || true"
|
||||
DEPENDS zziplib.xml zzipmmapped.xml zzipfseeko.xml
|
||||
VERBATIM)
|
||||
+endif()
|
||||
|
||||
add_custom_target(manpages DEPENDS manpages.tar)
|
||||
add_custom_target(htmpages DEPENDS htmpages.tar)
|
||||
@@ -190,7 +192,7 @@ if(ZZIP_HTMPAGES)
|
||||
endif()
|
||||
if(ZZIP_MANPAGES)
|
||||
install(CODE "message(STATUS \"Installing: man3 pages to ${mandir}/man3\")")
|
||||
- install(DIRECTORY man3/ DESTINATION ${mandir}/man3 MESSAGE_NEVER)
|
||||
+ install(DIRECTORY ${outdir}/man3/ DESTINATION ${mandir}/man3 MESSAGE_NEVER)
|
||||
endif()
|
||||
add_custom_target(install-docs DEPENDS install-manpages install-htmpages install-site)
|
||||
add_custom_target(install-mans DEPENDS install-manpages)
|
||||
@ -1,26 +0,0 @@
|
||||
commit 497c1598cea9dcb13d210de59b1dc65425ca5fdb
|
||||
Author: Jan Tojnar <jtojnar@gmail.com>
|
||||
Date: Thu Apr 16 20:09:11 2020 +0200
|
||||
|
||||
build: Produce more correct pc file with zzipsdldir
|
||||
|
||||
Just like described in commit 892dea3b82208654cc9f57ffc4ef555d0d934cf5,
|
||||
the CMAKE_INSTALL_INCLUDEDIR variable can be absolute path so simply
|
||||
appending it to \${prefix} might not work.
|
||||
|
||||
diff --git a/SDL/CMakeLists.txt b/SDL/CMakeLists.txt
|
||||
index 7ceba4a..6a4f860 100644
|
||||
--- a/SDL/CMakeLists.txt
|
||||
+++ b/SDL/CMakeLists.txt
|
||||
@@ -49,9 +49,10 @@ if(SDL_FOUND)
|
||||
if(UNIX)
|
||||
join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
|
||||
join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
|
||||
+join_paths(pc_zzipsdldir "\${prefix}" "${zzipsdldir}")
|
||||
add_custom_command(OUTPUT SDL_rwops_zzip.pc
|
||||
COMMAND ${BASH} -c "echo 'prefix=${CMAKE_INSTALL_PREFIX}' > SDL_rwops_zzip.pc"
|
||||
- COMMAND ${BASH} -c "echo 'zzipsdldir=\${prefix}/${zzipsdldir}' >> SDL_rwops_zzip.pc"
|
||||
+ COMMAND ${BASH} -c "echo 'zzipsdldir=${pc_zzipsdldir}' >> SDL_rwops_zzip.pc"
|
||||
COMMAND ${BASH} -c "echo '' >> SDL_rwops_zzip.pc"
|
||||
COMMAND ${BASH} -c "echo 'Name: SDL_rwops_zzip' >> SDL_rwops_zzip.pc"
|
||||
COMMAND ${BASH} -c "echo 'Version: ${PROJECT_VERSION}' >> SDL_rwops_zzip.pc"
|
||||
@ -1,317 +0,0 @@
|
||||
commit 5583ccc7a247ee27556ede344e93d3ac1dc72e9b
|
||||
Author: Guido Draheim <guidod@gmx.de>
|
||||
Date: Sat Apr 18 01:39:56 2020 +0200
|
||||
|
||||
reorganize ZZIP_OPTIONFLAGS and make install-man ON by default if UNIX
|
||||
|
||||
# diff --git a/GNUmakefile b/GNUmakefile
|
||||
# index 3571fd1..53077b0 100644
|
||||
# --- a/GNUmakefile
|
||||
# +++ b/GNUmakefile
|
||||
# @@ -10,10 +10,16 @@ default:
|
||||
# @ test ! -f Makefile || test -f build/Makefile || echo 'DONE make all - please run make check (before make install)'
|
||||
#
|
||||
# .PHONY: build-am build-cm
|
||||
# -build-cm: ; mkdir build-cm; cd build-cm && cmake .. -DCMAKE_INSTALL_PREFIX:PATH=$$HOME/local
|
||||
# build-am: ; mkdir build-am; cd build-am && sh ../configure --prefix=$$HOME/local --enable-sdl
|
||||
# -cm cmake: ; rm -rf build-cm; $(MAKE) build-cm && cd build-cm && $(MAKE) all
|
||||
# +build-cm: ; mkdir build-cm; cd build-cm && cmake .. -DCMAKE_INSTALL_PREFIX:PATH=$$HOME/local
|
||||
# +build-nj: ; mkdir build-nj; cd build-nj && cmake .. -DCMAKE_INSTALL_PREFIX:PATH=$$HOME/local -GNinja
|
||||
# +build-nm: ; mkdir build-nj; cd build-nj && cmake .. -DCMAKE_INSTALL_PREFIX:PATH=$$HOME/local -GNmake
|
||||
# am autom: ; rm -rf build-am; $(MAKE) build-am && cd build-am && $(MAKE) all
|
||||
# +cm cmake: ; rm -rf build-cm; $(MAKE) build-cm && cd build-cm && $(MAKE) all
|
||||
# +nj ninja: ; rm -rf build-nj; $(MAKE) build-nj && cd build-nj && ninja
|
||||
# +
|
||||
# +build-cm2: ; mkdir build-cm2; cd build-cm2 && cmake .. -DCMAKE_INSTALL_PREFIX:PATH=$$HOME/local -DZZIP_MANPAGES=OFF
|
||||
# +cm2: ; rm -rf build-cm2; $(MAKE) build-cm2 && cd build-cm2 && $(MAKE) all
|
||||
#
|
||||
# new: ; rm -rf build; $(MAKE) default
|
||||
#
|
||||
diff --git a/SDL/CMakeLists.txt b/SDL/CMakeLists.txt
|
||||
index 7ceba4a..c0d68d4 100644
|
||||
--- a/SDL/CMakeLists.txt
|
||||
+++ b/SDL/CMakeLists.txt
|
||||
@@ -14,6 +14,15 @@ option(BUILD_STATIC_LIBS "Build the static library" OFF)
|
||||
option(BUILD_TESTS "Build test programs" OFF)
|
||||
option(MSVC_STATIC_RUNTIME "Build with static runtime libs (/MT)" ON)
|
||||
|
||||
+if(UNIX)
|
||||
+option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" ON)
|
||||
+option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" ON)
|
||||
+else()
|
||||
+option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" OFF)
|
||||
+option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" OFF)
|
||||
+endif()
|
||||
+
|
||||
+
|
||||
# Zlib library needed
|
||||
find_package ( ZLIB REQUIRED )
|
||||
# pkg_search_module ( ZZIP zzip )
|
||||
@@ -46,7 +55,7 @@ endif()
|
||||
# pkgconfig ######################################################
|
||||
|
||||
if(SDL_FOUND)
|
||||
-if(UNIX)
|
||||
+if(ZZIP_PKGCONFIG)
|
||||
join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
|
||||
join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
|
||||
join_paths(pc_zzipsdldir "\${prefix}" "${zzipsdldir}")
|
||||
@@ -64,5 +73,11 @@ add_custom_target(pkgconfig-sdl ALL DEPENDS SDL_rwops_zzip.pc)
|
||||
|
||||
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/SDL_rwops_zzip.pc
|
||||
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" )
|
||||
-endif()
|
||||
-endif()
|
||||
+endif(ZZIP_PKGCONFIG)
|
||||
+endif(SDL_FOUND)
|
||||
+
|
||||
+# messages ##################################################
|
||||
+
|
||||
+message(STATUS "installing SDL_rwops_zzip example headers: ${SDL_FOUND}")
|
||||
+message(STATUS "installing SDL_rwops_zzip pkgconfig files: ${ZZIP_PKGCONFIG}")
|
||||
+
|
||||
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
|
||||
index d1284e6..623da24 100644
|
||||
--- a/docs/CMakeLists.txt
|
||||
+++ b/docs/CMakeLists.txt
|
||||
@@ -9,6 +9,14 @@ option(BUILD_SHARED_LIBS "Build a shared library" ON)
|
||||
option(BUILD_STATIC_LIBS "Build the static library" OFF)
|
||||
option(BUILD_TESTS "Build test programs" OFF)
|
||||
option(MSVC_STATIC_RUNTIME "Build with static runtime libs (/MT)" ON)
|
||||
+option(ZZIP_HTMLSITE "Generate site html pages from docs" OFF)
|
||||
+option(ZZIP_HTMPAGES "Generate html manpages from sources" OFF)
|
||||
+
|
||||
+if(UNIX)
|
||||
+option(ZZIP_MANPAGES "Generate man3 manpages from sources" ON)
|
||||
+else()
|
||||
+option(ZZIP_MANPAGES "Generate man3 manpages from sources" OFF)
|
||||
+endif()
|
||||
|
||||
# Zlib library needed
|
||||
find_package ( ZLIB REQUIRED )
|
||||
@@ -132,14 +140,24 @@ add_custom_command(OUTPUT htmpages.tar
|
||||
DEPENDS zziplib.xml zzipmmapped.xml zzipfseeko.xml
|
||||
VERBATIM)
|
||||
|
||||
-add_custom_target(mans DEPENDS manpages)
|
||||
-add_custom_target(man DEPENDS manpages)
|
||||
-add_custom_target(htm DEPENDS htmpages)
|
||||
add_custom_target(manpages DEPENDS manpages.tar)
|
||||
add_custom_target(htmpages DEPENDS htmpages.tar)
|
||||
add_custom_target(doc DEPENDS zziplib.xml zzipmmapped.xml zzipfseeko.xml site.html)
|
||||
add_custom_target(docs DEPENDS doc manpages htmpages)
|
||||
+add_custom_target(mans DEPENDS manpages)
|
||||
+
|
||||
+if(ZZIP_MANPAGES)
|
||||
+add_custom_target(man ALL DEPENDS manpages)
|
||||
+else()
|
||||
+add_custom_target(man DEPENDS manpages)
|
||||
+endif()
|
||||
+if(ZZIP_HTMPAGES)
|
||||
+add_custom_target(htm ALL DEPENDS htmpages)
|
||||
+else()
|
||||
+add_custom_target(htm DEPENDS htmpages)
|
||||
+endif()
|
||||
|
||||
+# install ########################################################
|
||||
|
||||
string(REPLACE ";" " " all_bins_FILES "${bins_FILES}")
|
||||
string(REPLACE ";" " " all_SDLs_FILES "${SDLs_FILES}")
|
||||
@@ -168,13 +186,24 @@ add_custom_target(install-manpages
|
||||
COMMAND ${BASH} -c "cd $DESTDIR${mandir} && tar xf ${outdir}/manpages.tar"
|
||||
DEPENDS manpages.tar
|
||||
VERBATIM)
|
||||
+
|
||||
add_custom_target(install-docs DEPENDS install-manpages install-htmpages install-site)
|
||||
add_custom_target(install-mans DEPENDS install-manpages)
|
||||
-add_custom_target(install-man DEPENDS install-manpages)
|
||||
|
||||
-# install ########################################################
|
||||
-set(mandir ${CMAKE_INSTALL_FULL_MANDIR})
|
||||
-install(CODE "execute_process(COMMAND ${BASH} -c \"set -e
|
||||
- mkdir -vp $DESTDIR/${mandir} || ls -ld $DESTDIR/${mandir}
|
||||
- cd $DESTDIR/${mandir} && tar xf ${CMAKE_CURRENT_BINARY_DIR}/manpages.tar
|
||||
- \")")
|
||||
+if(ZZIP_MANPAGES)
|
||||
+add_custom_target(install-man ALL DEPENDS install-manpages)
|
||||
+else()
|
||||
+add_custom_target(install-man DEPENDS install-manpages)
|
||||
+endif()
|
||||
+
|
||||
+if(ZZIP_HTMPAGES)
|
||||
+add_custom_target(install-htm ALL DEPENDS install-htmpages)
|
||||
+else()
|
||||
+add_custom_target(install-htm DEPENDS install-htmpages)
|
||||
+endif()
|
||||
+
|
||||
+# messages #######################################################
|
||||
+
|
||||
+message(STATUS "html site to be generated: ${ZZIP_HTMLSITE}" )
|
||||
+message(STATUS "man pages to be generated: ${ZZIP_MANPAGES}" )
|
||||
+message(STATUS "htm pages to be generated: ${ZZIP_HTMPAGES}" )
|
||||
diff --git a/testbuilds/centos7-build.dockerfile b/testbuilds/centos7-build.dockerfile
|
||||
index 4509b68..0b7b656 100644
|
||||
--- a/testbuilds/centos7-build.dockerfile
|
||||
+++ b/testbuilds/centos7-build.dockerfile
|
||||
@@ -19,4 +19,4 @@ RUN mkdir src/build
|
||||
RUN cd src/build && cmake3 ..
|
||||
RUN cd src/build && make
|
||||
RUN $no_check || (cd src/build && make check)
|
||||
-RUN $no_install || (cd src/build && make install)
|
||||
+RUN $no_install || (cd src/build && make install VERBOSE=1)
|
||||
diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt
|
||||
index a9f6e3a..2f7eda5 100644
|
||||
--- a/zzip/CMakeLists.txt
|
||||
+++ b/zzip/CMakeLists.txt
|
||||
@@ -18,8 +18,16 @@ option(BUILD_STATIC_LIBS "Build the static library" OFF)
|
||||
option(MSVC_STATIC_RUNTIME "Build with static runtime libs (/MT)" ON)
|
||||
option(ZZIPMMAPPED "Build libzzipmmapped (not fully portable)" ON)
|
||||
option(ZZIPFSEEKO "Build libzzipfseeko (based on posix.1 api)" ON)
|
||||
-option(ZZIPCOMPAT "Build compatibility with old libzzip releases" ON)
|
||||
-option(ZZIPLIBTOOL "Ensure binary compatibility with libtool" ON)
|
||||
+
|
||||
+if(UNIX)
|
||||
+option(ZZIP_COMPAT "Build compatibility with old libzzip releases" ON)
|
||||
+option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" ON)
|
||||
+option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" ON)
|
||||
+else()
|
||||
+option(ZZIP_COMPAT "Build compatibility with old libzzip releases" OFF)
|
||||
+option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" OFF)
|
||||
+option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" OFF)
|
||||
+endif()
|
||||
|
||||
# used in zzip/_config.h
|
||||
set(ZZIP_PACKAGE "${PROJECT_NAME}lib")
|
||||
@@ -27,7 +35,7 @@ set(ZZIP_VERSION "${PROJECT_VERSION}")
|
||||
set(ZZIP_PACKAGE_NAME "${PROJECT_NAME}lib")
|
||||
set(ZZIP_PACKAGE_VERSION "${PROJECT_VERSION}")
|
||||
|
||||
-if(ZZIPCOMPAT)
|
||||
+if(ZZIP_COMPAT)
|
||||
find_package ( UnixCommands REQUIRED ) # bash cp mv rm gzip tar
|
||||
endif()
|
||||
|
||||
@@ -193,7 +201,7 @@ set_target_properties(libzzipmmapped PROPERTIES OUTPUT_NAME "zzipmmapped" RELEAS
|
||||
SET_TARGET_PROPERTIES(libzzipmmapped PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVERSION ${VERNUM})
|
||||
endif()
|
||||
|
||||
-if(ZZIPCOMPAT)
|
||||
+if(ZZIP_COMPAT)
|
||||
add_custom_command(OUTPUT compat/zzip.h
|
||||
COMMAND ${BASH} -c "rm -rf compat; mkdir compat"
|
||||
COMMAND ${BASH} -c "echo '#ifndef ZZIP_WARNING' > compat/zzip.h"
|
||||
@@ -212,9 +220,9 @@ add_custom_command(OUTPUT compat/zzip.h
|
||||
BYPRODUCTS compat/zziplib.h compat/zzip-io.h
|
||||
VERBATIM)
|
||||
add_custom_target(compat ALL DEPENDS compat/zzip.h)
|
||||
-endif()
|
||||
+endif(ZZIP_COMPAT)
|
||||
|
||||
-if(UNIX)
|
||||
+if(ZZIP_PKGCONFIG)
|
||||
join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
|
||||
join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
|
||||
add_custom_command(OUTPUT zziplib.pc
|
||||
@@ -235,12 +243,12 @@ add_custom_command(OUTPUT zziplib.pc
|
||||
BYPRODUCTS zzipmmapped.pc zzipfseeko.pc
|
||||
VERBATIM)
|
||||
add_custom_target(pkgconfig ALL DEPENDS zziplib.pc)
|
||||
-endif()
|
||||
+endif(ZZIP_PKGCONFIG)
|
||||
|
||||
# install ########################################################
|
||||
set(outdir ${CMAKE_CURRENT_BINARY_DIR})
|
||||
|
||||
-if(UNIX)
|
||||
+if(ZZIP_PKGCONFIG)
|
||||
install(FILES ${outdir}/zziplib.pc ${outdir}/zzipmmapped.pc ${outdir}/zzipfseeko.pc
|
||||
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" )
|
||||
endif()
|
||||
@@ -264,7 +272,7 @@ install(TARGETS libzzipmmapped
|
||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
endif()
|
||||
|
||||
-if(ZZIPCOMPAT)
|
||||
+if(ZZIP_COMPAT)
|
||||
install(FILES ${outdir}/compat/zzip.h ${outdir}/compat/zziplib.h ${outdir}/compat/zzip-io.h
|
||||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
|
||||
if(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG)
|
||||
@@ -289,7 +297,7 @@ if(ZZIPCOMPAT)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
-if(ZZIPLIBTOOL)
|
||||
+if(ZZIP_LIBTOOL)
|
||||
if(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG)
|
||||
set(lib ${CMAKE_SHARED_LIBRARY_PREFIX})
|
||||
set(dll ${CMAKE_SHARED_LIBRARY_SUFFIX})
|
||||
@@ -340,4 +348,12 @@ if(ZZIPLIBTOOL)
|
||||
ln -svf ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.12
|
||||
\")")
|
||||
endif()
|
||||
-endif()
|
||||
+endif(ZZIP_LIBTOOL)
|
||||
+
|
||||
+## messages ##############################################
|
||||
+
|
||||
+message(STATUS "lib zzipfseeko to be compiled: ${ZZIPFSEEKO}")
|
||||
+message(STATUS "lib zzipmmapped to be compiled: ${ZZIPFSEEKO}")
|
||||
+message(STATUS "lib zzip symlinks as by libtool: ${ZZIP_LIBTOOL}")
|
||||
+message(STATUS "installing zzip compat headers: ${ZZIP_COMPAT}")
|
||||
+message(STATUS "installing zzip pkgconfig files: ${ZZIP_PKGCONFIG}")
|
||||
diff --git a/zzipwrap/CMakeLists.txt b/zzipwrap/CMakeLists.txt
|
||||
index 220d93b..8ae0587 100644
|
||||
--- a/zzipwrap/CMakeLists.txt
|
||||
+++ b/zzipwrap/CMakeLists.txt
|
||||
@@ -13,7 +13,14 @@ option(BUILD_SHARED_LIBS "Build a shared library" ON)
|
||||
option(BUILD_STATIC_LIBS "Build the static library" OFF)
|
||||
option(BUILD_TESTS "Build test programs" OFF)
|
||||
option(MSVC_STATIC_RUNTIME "Build with static runtime libs (/MT)" ON)
|
||||
-option(ZZIPLIBTOOL "Ensure binary compatibility with libtool" ON)
|
||||
+
|
||||
+if(UNIX)
|
||||
+option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" ON)
|
||||
+option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" ON)
|
||||
+else()
|
||||
+option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" OFF)
|
||||
+option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" OFF)
|
||||
+endif()
|
||||
|
||||
check_include_files ( unistd.h ZZIP_HAVE_UNISTD_H )
|
||||
# set ( ZZIP_HAVE_ZLIB_H 1 )
|
||||
@@ -48,7 +55,7 @@ add_executable(zzipwrap ${zzipwrap_SRCS} )
|
||||
target_link_libraries(zzipwrap libzzipwrap )
|
||||
target_include_directories(zzipwrap PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
|
||||
-if(UNIX)
|
||||
+if(ZZIP_PKGCONFIG)
|
||||
join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
|
||||
join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
|
||||
add_custom_command(OUTPUT zzipwrap.pc
|
||||
@@ -69,7 +76,7 @@ endif()
|
||||
# install ########################################################
|
||||
set(outdir ${CMAKE_CURRENT_BINARY_DIR})
|
||||
|
||||
-if(UNIX)
|
||||
+if(ZZIP_PKGCONFIG)
|
||||
install(FILES ${outdir}/zzipwrap.pc
|
||||
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" )
|
||||
endif()
|
||||
@@ -79,7 +86,7 @@ install(TARGETS libzzipwrap
|
||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
|
||||
-if(ZZIPLIBTOOL)
|
||||
+if(ZZIP_LIBTOOL)
|
||||
if(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG)
|
||||
set(lib ${CMAKE_SHARED_LIBRARY_PREFIX})
|
||||
set(dll ${CMAKE_SHARED_LIBRARY_SUFFIX})
|
||||
@@ -95,3 +102,8 @@ if(ZZIPLIBTOOL)
|
||||
\")")
|
||||
endif()
|
||||
endif()
|
||||
+
|
||||
+# messages #######################################################
|
||||
+
|
||||
+message(STATUS "lib zzipwrap symlinks as by libtool: ${ZZIP_LIBTOOL}")
|
||||
+message(STATUS "installing zzipwrap pkgconfig files: ${ZZIP_PKGCONFIG}")
|
||||
@ -1,51 +0,0 @@
|
||||
commit 75e22f3c365b62acbad8d8645d5404242800dfba
|
||||
Author: Guido Draheim <guidod@gmx.de>
|
||||
Date: Fri Apr 17 20:47:59 2020 +0200
|
||||
|
||||
#88 use shell $DESTDIR instead of make $(DESTDIR)
|
||||
|
||||
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
|
||||
index 442e877..d1284e6 100644
|
||||
--- a/docs/CMakeLists.txt
|
||||
+++ b/docs/CMakeLists.txt
|
||||
@@ -145,27 +145,27 @@ string(REPLACE ";" " " all_bins_FILES "${bins_FILES}")
|
||||
string(REPLACE ";" " " all_SDLs_FILES "${SDLs_FILES}")
|
||||
add_custom_target(install-site
|
||||
COMMAND ${BASH} -c "ls -l ${CMAKE_CURRENT_BINARY_DIR}/site.html"
|
||||
- COMMAND ${BASH} -c "mkdir -vp $(DESTDIR)${docdir} >&2 || ls -ld $(DESTDIR)${docdir} >&2"
|
||||
- COMMAND ${BASH} -c "cd ${outdir} && cp zziplib.html zzipmmapped.html zzipfseeko.html $(DESTDIR)${docdir}/"
|
||||
- COMMAND ${BASH} -c "cd ${srcdir} && cp README.* COPYING.* $(DESTDIR)${docdir}/"
|
||||
- COMMAND ${BASH} -c "cd ${topdir} && cp ChangeLog $(DESTDIR)${docdir}/"
|
||||
- COMMAND ${BASH} -c "cd ${topdir} && cp ${all_bins_FILES} $(DESTDIR)${docdir}/"
|
||||
- COMMAND ${BASH} -c "cd ${topdir} && cp ${all_SDLs_FILES} $(DESTDIR)${docdir}/"
|
||||
- COMMAND ${BASH} -c "cd $(DESTDIR)${docdir} && cp ${outdir}/*.html ."
|
||||
- COMMAND ${BASH} -c "cd $(DESTDIR)${docdir} && ln -s zzip-index.html index.html"
|
||||
+ COMMAND ${BASH} -c "mkdir -vp $DESTDIR${docdir} >&2 || ls -ld $DESTDIR${docdir} >&2"
|
||||
+ COMMAND ${BASH} -c "cd ${outdir} && cp zziplib.html zzipmmapped.html zzipfseeko.html $DESTDIR${docdir}/"
|
||||
+ COMMAND ${BASH} -c "cd ${srcdir} && cp README.* COPYING.* $DESTDIR${docdir}/"
|
||||
+ COMMAND ${BASH} -c "cd ${topdir} && cp ChangeLog $DESTDIR${docdir}/"
|
||||
+ COMMAND ${BASH} -c "cd ${topdir} && cp ${all_bins_FILES} $DESTDIR${docdir}/"
|
||||
+ COMMAND ${BASH} -c "cd ${topdir} && cp ${all_SDLs_FILES} $DESTDIR${docdir}/"
|
||||
+ COMMAND ${BASH} -c "cd $DESTDIR${docdir} && cp ${outdir}/*.html ."
|
||||
+ COMMAND ${BASH} -c "cd $DESTDIR${docdir} && ln -s zzip-index.html index.html"
|
||||
DEPENDS site.html zziplib.html zzipmmapped.html zzipfseeko.html
|
||||
VERBATIM)
|
||||
add_custom_target(install-htmpages
|
||||
COMMAND ${BASH} -c "ls -l ${CMAKE_CURRENT_BINARY_DIR}/*pages.tar"
|
||||
- COMMAND ${BASH} -c "mkdir -vp $(DESTDIR)${docdir} >&2 || ls -ld $(DESTDIR)${docdir} >&2"
|
||||
- COMMAND ${BASH} -c "cd $(DESTDIR)${docdir} && tar x -f ${outdir}/htmpages.tar"
|
||||
- COMMAND ${BASH} -c "cd $(DESTDIR)${docdir} && mv html man"
|
||||
+ COMMAND ${BASH} -c "mkdir -vp $DESTDIR${docdir} >&2 || ls -ld $DESTDIR${docdir} >&2"
|
||||
+ COMMAND ${BASH} -c "cd $DESTDIR${docdir} && tar x -f ${outdir}/htmpages.tar"
|
||||
+ COMMAND ${BASH} -c "cd $DESTDIR${docdir} && mv html man"
|
||||
DEPENDS htmpages.tar
|
||||
VERBATIM)
|
||||
add_custom_target(install-manpages
|
||||
COMMAND ${BASH} -c "ls -l ${CMAKE_CURRENT_BINARY_DIR}/*pages.tar"
|
||||
- COMMAND ${BASH} -c "mkdir -vp $(DESTDIR)${mandir} >&2 || ls -ld $(DESTDIR)${mandir} >&2"
|
||||
- COMMAND ${BASH} -c "cd $(DESTDIR)${mandir} && tar xf ${outdir}/manpages.tar"
|
||||
+ COMMAND ${BASH} -c "mkdir -vp $DESTDIR${mandir} >&2 || ls -ld $DESTDIR${mandir} >&2"
|
||||
+ COMMAND ${BASH} -c "cd $DESTDIR${mandir} && tar xf ${outdir}/manpages.tar"
|
||||
DEPENDS manpages.tar
|
||||
VERBATIM)
|
||||
add_custom_target(install-docs DEPENDS install-manpages install-htmpages install-site)
|
||||
@ -1,137 +0,0 @@
|
||||
commit ddaa538e8cfa46413b0e92613b54123e4b759616
|
||||
Author: Guido Draheim <guidod@gmx.de>
|
||||
Date: Fri Apr 17 20:46:30 2020 +0200
|
||||
|
||||
#88 adding testbuilds/opensuse15-ninja-sdl2.dockerfile
|
||||
|
||||
diff --git a/testbuilds.py b/testbuilds.py
|
||||
index 756e77e..35ac70c 100755
|
||||
--- a/testbuilds.py
|
||||
+++ b/testbuilds.py
|
||||
@@ -1080,6 +1080,42 @@ class ZZiplibBuildTest(unittest.TestCase):
|
||||
cmd = "docker rmi {images}:{testname}"
|
||||
sx____(cmd.format(**locals()))
|
||||
self.rm_testdir()
|
||||
+ def test_431_opensuse15_ninja_sdl2_dockerfile(self):
|
||||
+ if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test")
|
||||
+ testname=self.testname()
|
||||
+ testdir = self.testdir()
|
||||
+ dockerfile="testbuilds/opensuse15-ninja-sdl2.dockerfile"
|
||||
+ addhosts = self.local_addhosts(dockerfile)
|
||||
+ savename = docname(dockerfile)
|
||||
+ saveto = SAVETO
|
||||
+ images = IMAGES
|
||||
+ build = "build --build-arg=no_check=true"
|
||||
+ cmd = "docker {build} . -f {dockerfile} {addhosts} --tag {images}:{testname}"
|
||||
+ sh____(cmd.format(**locals()))
|
||||
+ cmd = "docker rm --force {testname}"
|
||||
+ sx____(cmd.format(**locals()))
|
||||
+ cmd = "docker run -d --name {testname} {images}:{testname} sleep 60"
|
||||
+ sh____(cmd.format(**locals()))
|
||||
+ #:# container = self.ip_container(testname)
|
||||
+ cmd = "docker exec {testname} ls -l /usr/local/bin"
|
||||
+ sh____(cmd.format(**locals()))
|
||||
+ cmd = "docker exec {testname} find /usr/local/include -type f"
|
||||
+ sh____(cmd.format(**locals()))
|
||||
+ cmd = "docker exec {testname} bash -c 'ls -l /usr/local/lib64/libzz*'"
|
||||
+ sh____(cmd.format(**locals()))
|
||||
+ #
|
||||
+ cmd = "docker exec {testname} bash -c 'test -d /usr/local/include/SDL_rwops_zzip'"
|
||||
+ sh____(cmd.format(**locals()))
|
||||
+ #
|
||||
+ cmd = "docker rm --force {testname}"
|
||||
+ sx____(cmd.format(**locals()))
|
||||
+ cmd = "docker rmi {saveto}/{savename}:latest"
|
||||
+ sx____(cmd.format(**locals()))
|
||||
+ cmd = "docker tag {images}:{testname} {saveto}/{savename}:latest"
|
||||
+ sh____(cmd.format(**locals()))
|
||||
+ cmd = "docker rmi {images}:{testname}"
|
||||
+ sx____(cmd.format(**locals()))
|
||||
+ self.rm_testdir()
|
||||
def test_701_centos7_am_docs_dockerfile(self):
|
||||
if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test")
|
||||
testname=self.testname()
|
||||
@@ -1520,6 +1556,53 @@ class ZZiplibBuildTest(unittest.TestCase):
|
||||
cmd = "docker rm --force {testname2}"
|
||||
sx____(cmd.format(**locals()))
|
||||
self.rm_testdir()
|
||||
+ def test_9431_opensuse_ninja_sdl2_dockerfile(self):
|
||||
+ if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test")
|
||||
+ testname1=self.testname() + "_1"
|
||||
+ testname2=self.testname() + "_2"
|
||||
+ testdir = self.testdir()
|
||||
+ dockerfile1="testbuilds/opensuse15-sdl2.dockerfile"
|
||||
+ dockerfile2="testbuilds/opensuse15-ninja-sdl2.dockerfile"
|
||||
+ addhosts = self.local_addhosts(dockerfile1)
|
||||
+ savename1 = docname(dockerfile1)
|
||||
+ savename2 = docname(dockerfile2)
|
||||
+ saveto = SAVETO
|
||||
+ images = IMAGES
|
||||
+ cmd = "docker rm --force {testname1}"
|
||||
+ sx____(cmd.format(**locals()))
|
||||
+ cmd = "docker rm --force {testname2}"
|
||||
+ sx____(cmd.format(**locals()))
|
||||
+ cmd = "docker run -d --name {testname1} {addhosts} {saveto}/{savename1} sleep 600"
|
||||
+ sh____(cmd.format(**locals()))
|
||||
+ cmd = "docker run -d --name {testname2} {addhosts} {saveto}/{savename2} sleep 600"
|
||||
+ #
|
||||
+ sh____(cmd.format(**locals()))
|
||||
+ cmd = "docker exec {testname2} bash -c 'cd /usr/local && tar czvf /local.tgz .'"
|
||||
+ sh____(cmd.format(**locals()))
|
||||
+ cmd = "docker cp {testname2}:/local.tgz tmp.local.tgz"
|
||||
+ sh____(cmd.format(**locals()))
|
||||
+ cmd = "docker cp tmp.local.tgz {testname1}:/local.tgz"
|
||||
+ sh____(cmd.format(**locals()))
|
||||
+ cmd = "rm tmp.local.tgz"
|
||||
+ sh____(cmd.format(**locals()))
|
||||
+ cmd = "docker exec {testname1} mkdir -p /new/local"
|
||||
+ sh____(cmd.format(**locals()))
|
||||
+ cmd = "docker exec {testname1} bash -c 'cd /new/local && tar xzvf /local.tgz'"
|
||||
+ sh____(cmd.format(**locals()))
|
||||
+ #
|
||||
+ item="{}"
|
||||
+ end="\\;"
|
||||
+ cmd = "docker exec {testname1} diff -urw --no-dereference /usr/local /new/local"
|
||||
+ sx____(cmd.format(**locals()))
|
||||
+ out = output(cmd.format(**locals()))
|
||||
+ self.assertFalse(greps(out, "---"))
|
||||
+ self.assertFalse(greps(out, "Only"))
|
||||
+ #
|
||||
+ cmd = "docker rm --force {testname1}"
|
||||
+ sx____(cmd.format(**locals()))
|
||||
+ cmd = "docker rm --force {testname2}"
|
||||
+ sx____(cmd.format(**locals()))
|
||||
+ self.rm_testdir()
|
||||
def test_9711_centos7_docs_dockerfile(self):
|
||||
if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test")
|
||||
testname1=self.testname() + "_1"
|
||||
diff --git a/testbuilds/opensuse15-ninja-sdl2.dockerfile b/testbuilds/opensuse15-ninja-sdl2.dockerfile
|
||||
new file mode 100644
|
||||
index 0000000..8a46dd4
|
||||
--- /dev/null
|
||||
+++ b/testbuilds/opensuse15-ninja-sdl2.dockerfile
|
||||
@@ -0,0 +1,24 @@
|
||||
+FROM opensuse/leap:15.1
|
||||
+ARG no_check=false
|
||||
+ARG no_install=false
|
||||
+# -DMAKE_INSTALL_PREFIX:PATH=/usr
|
||||
+
|
||||
+RUN zypper refresh repo-oss
|
||||
+RUN zypper install -r repo-oss -y gcc zlib-devel python3 cmake unzip zip gzip tar libSDL2-devel ninja
|
||||
+
|
||||
+RUN mkdir src
|
||||
+COPY CMakeLists.txt README COPYING.LIB ChangeLog src/
|
||||
+COPY CMakeScripts src/CMakeScripts
|
||||
+COPY bins src/bins
|
||||
+COPY docs src/docs
|
||||
+COPY test src/test
|
||||
+COPY SDL src/SDL
|
||||
+COPY zzipwrap src/zzipwrap
|
||||
+COPY zzip src/zzip
|
||||
+
|
||||
+RUN mkdir src/build
|
||||
+RUN cd src/build && cmake .. -GNinja
|
||||
+RUN cd src/build && ninja
|
||||
+RUN $no_check || (cd src/build && ninja check VERBOSE=1)
|
||||
+RUN $no_install || (cd src/build && ninja install)
|
||||
+
|
||||
@ -1,68 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{7,8,9} )
|
||||
|
||||
inherit cmake flag-o-matic python-any-r1
|
||||
|
||||
DESCRIPTION="Lightweight library for extracting data from files archived in a single zip file"
|
||||
HOMEPAGE="https://github.com/gdraheim/zziplib http://zziplib.sourceforge.net/"
|
||||
SRC_URI="https://github.com/gdraheim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
|
||||
SLOT="0/13"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="doc sdl static-libs test"
|
||||
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
BDEPEND="
|
||||
doc? (
|
||||
${PYTHON_DEPS}
|
||||
)
|
||||
test? (
|
||||
${PYTHON_DEPS}
|
||||
app-arch/zip
|
||||
)
|
||||
"
|
||||
DEPEND="
|
||||
sys-libs/zlib
|
||||
sdl? ( >=media-libs/libsdl-1.2.6 )
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-0.13.69-009-perror.patch
|
||||
"${FILESDIR}"/${PN}-0.13.71-join-paths-pc-zzipsdldir.patch
|
||||
"${FILESDIR}"/${PN}-0.13.71-find-bash.patch
|
||||
"${FILESDIR}"/${PN}-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch
|
||||
"${FILESDIR}"/${PN}-0.13.71-shell-DESTDIR.patch
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
(use test || use doc) && python-any-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
cmake_src_prepare
|
||||
|
||||
(use test || use doc) && python_fix_shebang .
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
append-flags -fno-strict-aliasing # bug reported upstream
|
||||
|
||||
local mycmakeargs=(
|
||||
-DZZIPCOMPAT=OFF
|
||||
-DZZIPSDL="$(usex sdl ON OFF)"
|
||||
-DBUILD_STATIC_LIBS="$(usex static-libs ON OFF)"
|
||||
-DBUILD_TESTS="$(usex test ON OFF)"
|
||||
-DZZIPTEST="$(usex test ON OFF)"
|
||||
-DZZIPDOCS="$(usex doc ON OFF)"
|
||||
-DZZIPWRAP=OFF
|
||||
)
|
||||
|
||||
cmake_src_configure
|
||||
}
|
||||
@ -1,55 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{7..9} )
|
||||
|
||||
inherit cmake flag-o-matic python-any-r1
|
||||
|
||||
MY_COMMIT="3921fc43bca7283f126bfb2e47ec7e7e24b5a5ea" # master Oct 21, 2020
|
||||
DESCRIPTION="Lightweight library for extracting data from files archived in a single zip file"
|
||||
HOMEPAGE="https://github.com/gdraheim/zziplib http://zziplib.sourceforge.net/"
|
||||
SRC_URI="https://github.com/gdraheim/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
|
||||
SLOT="0/13"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="sdl static-libs"
|
||||
|
||||
# Tests require internet access
|
||||
# https://github.com/gdraheim/zziplib/issues/24
|
||||
|
||||
BDEPEND="
|
||||
${PYTHON_DEPS}
|
||||
"
|
||||
DEPEND="
|
||||
sys-libs/zlib
|
||||
sdl? ( >=media-libs/libsdl-1.2.6 )
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
S="${WORKDIR}/${PN}-${MY_COMMIT}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-0.13.71-reorganize-ZZIP_OPTIONFLAGS.patch # https://github.com/gdraheim/zziplib/commit/5583ccc
|
||||
"${FILESDIR}"/${PN}-0.13.71-58_manvolnum_should_be_in_.so.patch # https://github.com/gdraheim/zziplib/commit/03ddd0c
|
||||
"${FILESDIR}"/${PN}-0.13.71-copy_directory_instead_of_unpacking.patch # https://github.com/gdraheim/zziplib/commit/31d8a95
|
||||
"${FILESDIR}"/${PN}-0.13.71-installing-man3-pages.patch # https://github.com/gdraheim/zziplib/issues/93#issuecomment-616219417
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
# https://github.com/gdraheim/zziplib/commit/f3bfc0dd6663b7df272cc0cf17f48838ad724a2f#diff-b7b1e314614cf326c6e2b6eba1540682R100
|
||||
append-flags -fno-strict-aliasing
|
||||
|
||||
local mycmakeargs=(
|
||||
-DZZIPSDL="$(usex sdl)"
|
||||
-DBUILD_STATIC_LIBS="$(usex static-libs)"
|
||||
-DBUILD_TESTS=OFF
|
||||
-DZZIPTEST=OFF
|
||||
-DZZIPDOCS=ON
|
||||
-DZZIPWRAP=OFF
|
||||
)
|
||||
|
||||
cmake_src_configure
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
@ -1,2 +1,3 @@
|
||||
DIST aniso8601-8.0.0.tar.gz 37007 BLAKE2B bb5f42928308fab7746cbea364c03db4813b1b25883495d0488eb755e14f465300662b07c4ccfd03328a0c0f07ed87056ccc13f2652648c4838b0433740fc3ab SHA512 1e6c43f77993e829833d819f7c2b9b1d31f30ca46e258faac0e0b3be864da07436ae34f05710309302477bb3eede5966c95ef3b124c9b353b306c2272dc4cb9d
|
||||
DIST aniso8601-8.1.1.tar.gz 39143 BLAKE2B d72161923e164032e1b9e4ed317d688d70b2a16bec6c23966f76abbb4d10f24def18df41fcca4e8f45e6145f4f067ec5483f34305a33eee3445d4706df188a99 SHA512 f9c3412c5e7dec04cca56df5806a747779848adb90137293368b4d50c365692b1d1f792a00f57172925229ccdee34ef5b50cc2d06f4c9b4d697c651e5a2e3674
|
||||
DIST aniso8601-9.0.0.tar.gz 46924 BLAKE2B 2dc0d24b536de48b3c1367203d685b00fcde8b257fc407ad38461422d4b278af1f29bd32dd74136c72204530d874d427d967f711aa69c9224c47ea3883a70102 SHA512 e0fc9ab1de36ddc7a78c0fdd139769312302bb2f8d7ce874aba1e714c7da25ed153a883ef92e62ad9f1a0c4d192c43cc939b8e82405f9f60b7d4b400f104e348
|
||||
|
||||
@ -0,0 +1,19 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
PYTHON_COMPAT=( python3_{7..9} pypy3 )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="A library for parsing ISO 8601 strings"
|
||||
HOMEPAGE="https://bitbucket.org/nielsenb/aniso8601/ https://pypi.org/project/aniso8601/"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm64 ~x86"
|
||||
|
||||
RDEPEND=">=dev-python/python-dateutil-2.7.3[${PYTHON_USEDEP}]"
|
||||
|
||||
distutils_enable_tests unittest
|
||||
@ -0,0 +1,56 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
PYTHON_COMPAT=( python3_{7..9} )
|
||||
DISTUTILS_USE_SETUPTOOLS=bdepend
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="The AWS SDK for Python"
|
||||
HOMEPAGE="https://github.com/boto/boto3"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
|
||||
if [[ "${PV}" == "9999" ]]; then
|
||||
EGIT_REPO_URI="https://github.com/boto/boto3"
|
||||
inherit git-r3
|
||||
BOTOCORE_PV=${PV}
|
||||
else
|
||||
SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
|
||||
|
||||
# botocore is x.(y+3).z
|
||||
BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
|
||||
fi
|
||||
|
||||
RDEPEND="
|
||||
>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
|
||||
>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
|
||||
"
|
||||
BDEPEND="
|
||||
test? (
|
||||
dev-python/mock[${PYTHON_USEDEP}]
|
||||
)
|
||||
"
|
||||
|
||||
distutils_enable_sphinx docs/source \
|
||||
'dev-python/guzzle_sphinx_theme'
|
||||
distutils_enable_tests nose
|
||||
|
||||
python_prepare_all() {
|
||||
# don't lock versions to narrow ranges
|
||||
sed -e '/botocore/ d' \
|
||||
-e '/jmespath/ d' \
|
||||
-e '/s3transfer/ d' \
|
||||
-i setup.py || die
|
||||
|
||||
# prevent an infinite loop
|
||||
rm tests/functional/docs/test_smoke.py || die
|
||||
|
||||
distutils-r1_python_prepare_all
|
||||
}
|
||||
|
||||
python_test() {
|
||||
nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue