From 11188bac43ca2c37387c76b706fba6b7f83811c3 Mon Sep 17 00:00:00 2001 From: begasus Date: Mon, 13 Aug 2018 14:30:37 +0200 Subject: [PATCH] fixup! libXcb, bump revision, use correct REQUIRES_devel --- x11-libs/libxcb/libxcb-1.13.recipe | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/x11-libs/libxcb/libxcb-1.13.recipe b/x11-libs/libxcb/libxcb-1.13.recipe index 107a64fd5..12b1b6c79 100644 --- a/x11-libs/libxcb/libxcb-1.13.recipe +++ b/x11-libs/libxcb/libxcb-1.13.recipe @@ -85,6 +85,7 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix + lib:libcheck$secondaryArchSuffix lib:libXau$secondaryArchSuffix lib:libXdmcp$secondaryArchSuffix " @@ -126,6 +127,7 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel + devel:libcheck$secondaryArchSuffix devel:libpthread_stubs devel:libXau$secondaryArchSuffix devel:libXdmcp$secondaryArchSuffix @@ -136,12 +138,14 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:aclocal cmd:autoconf - #cmd:doxygen +# cmd:dot$secondaryArchSuffix +# cmd:doxygen cmd:gcc$secondaryArchSuffix cmd:libtoolize$secondaryArchSuffix cmd:make cmd:pkg_config$secondaryArchSuffix cmd:python + cmd:xsltproc " debugList=( @@ -159,15 +163,16 @@ defineDebugInfoPackage libxcb$secondaryArchSuffix "${debugList[@]}" BUILD() { autoreconf -vfi - runConfigure ./configure + runConfigure --omit-dirs docDir ./configure --docdir=$developDocDir +# doxygen -u doc/xcb.doxygen make $jobArgs } INSTALL() { make install - install -d -m 755 "$docDir" - install -m 644 -t "$docDir" README + install -d -m 755 "$developDocDir" + install -m 644 -t "$developDocDir" README # remove libtool library files rm $libDir/libxcb*.la @@ -176,12 +181,19 @@ INSTALL() fixPkgconfig if [ -n "$secondaryArchSuffix" ]; then - rm -rf $documentationDir/man + rm -rf $manDir + maybe_manDir_man3= + else + maybe_manDir_man3=$manDir/man3 fi # devel package packageEntries devel \ - $developDir + $developDir \ + $maybe_manDir_man3 + +# remove the empty $documentationDir on primary architecture + rm -fr $documentationDir } TEST()