From 54e28a4fd5da555749485e11a7e8acec95aabb64 Mon Sep 17 00:00:00 2001 From: begasus Date: Thu, 9 Aug 2018 19:54:30 +0200 Subject: [PATCH] libXcb, bump revision, use correct REQUIRES_devel --- x11-libs/libxcb/libxcb-1.13.recipe | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/x11-libs/libxcb/libxcb-1.13.recipe b/x11-libs/libxcb/libxcb-1.13.recipe index bb5e88e47..107a64fd5 100644 --- a/x11-libs/libxcb/libxcb-1.13.recipe +++ b/x11-libs/libxcb/libxcb-1.13.recipe @@ -10,7 +10,7 @@ for one or the other." HOMEPAGE="https://xcb.freedesktop.org/" COPYRIGHT="2001-2006 Bart Massey, Jamey Sharp, and Josh Triplett" LICENSE="MIT (no promotion)" -REVISION="2" +REVISION="3" SOURCE_URI="https://xcb.freedesktop.org/dist/libxcb-$portVersion.tar.bz2" CHECKSUM_SHA256="188c8752193c50ff2dbe89db4554c63df2e26a2e47b0fa415a70918b5b851daa" PATCHES="libxcb-$portVersion.patchset" @@ -85,8 +85,8 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - lib:libxau$secondaryArchSuffix - lib:libxdmcp$secondaryArchSuffix + lib:libXau$secondaryArchSuffix + lib:libXdmcp$secondaryArchSuffix " PROVIDES_devel=" @@ -118,13 +118,17 @@ PROVIDES_devel=" " REQUIRES_devel=" libxcb$secondaryArchSuffix == $portVersion base + devel:libpthread_stubs + devel:libXau$secondaryArchSuffix + devel:libXdmcp$secondaryArchSuffix + devel:xcb_proto " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libpthread_stubs - devel:libxau$secondaryArchSuffix - devel:libxdmcp$secondaryArchSuffix + devel:libXau$secondaryArchSuffix + devel:libXdmcp$secondaryArchSuffix devel:util_macros devel:xcb_proto devel:xproto @@ -154,8 +158,7 @@ defineDebugInfoPackage libxcb$secondaryArchSuffix "${debugList[@]}" BUILD() { - libtoolize --force --copy --install - ./autogen.sh -V + autoreconf -vfi runConfigure ./configure make $jobArgs } @@ -163,6 +166,8 @@ BUILD() INSTALL() { make install + install -d -m 755 "$docDir" + install -m 644 -t "$docDir" README # remove libtool library files rm $libDir/libxcb*.la @@ -171,7 +176,7 @@ INSTALL() fixPkgconfig if [ -n "$secondaryArchSuffix" ]; then - rm -rf $documentationDir + rm -rf $documentationDir/man fi # devel package