From c397ef5864ce363efbebc14ac07d75426f9ab18c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 9 Feb 2009 04:31:42 +0100 Subject: [PATCH] Fix build/run deps in some xorg lib pkgs. --HG-- extra : convert_revision : e2cc40e6fa780e8060860a56c41a59fff77a5268 --- templates/libSM/template | 5 +++-- templates/libX11/template | 5 +++-- templates/libXaw/template | 12 +++++++----- templates/libXext/template | 12 ++++++------ templates/libXmu/template | 12 +++++++----- templates/libXpm/template | 12 +++++++----- templates/libXt/template | 13 +++++++------ 7 files changed, 40 insertions(+), 31 deletions(-) diff --git a/templates/libSM/template b/templates/libSM/template index 0385aede2b..0fea3007ae 100644 --- a/templates/libSM/template +++ b/templates/libSM/template @@ -9,5 +9,6 @@ long_desc=" This package contains the library and header files for the X Session Management Library. This is from the modular X.org project." -build_depends="pkg-config-0.23 xtrans-1.2 e2fsprogs-1.41" -run_depends="glibc-2.8 xtrans-1.2 e2fsprogs-1.41" +shared_deps="libICE-1.0 e2fsprogs-1.41" +build_depends="pkg-config-0.23 xtrans-1.2 ${shared_deps}" +run_depends="glibc-2.8 ${shared_deps}" diff --git a/templates/libX11/template b/templates/libX11/template index 7b4f088dde..400f95d130 100644 --- a/templates/libX11/template +++ b/templates/libX11/template @@ -13,6 +13,7 @@ long_desc=" This is from the modular X.org X11 project." +shared_deps="libXdmcp-1.0 libXau-1.0" build_depends="pkg-config-0.23 xproto-7.0 xextproto-7.0 xtrans-1.2 - xcmiscproto-1.1 kbproto-1.0 bigreqsproto-1.0 libXdmcp-1.0 libXau-1.0" -run_depends="glibc-2.8 libXdmcp-1.0 xtrans-1.2 libXau-1.0" + xcmiscproto-1.1 kbproto-1.0 bigreqsproto-1.0 inputproto-1.4 ${shared_deps}" +run_depends="glibc-2.8 ${shared_deps}" diff --git a/templates/libXaw/template b/templates/libXaw/template index 3d4bf5a554..ce45abbeb4 100644 --- a/templates/libXaw/template +++ b/templates/libXaw/template @@ -1,15 +1,17 @@ -# Template build file for 'libXaw'. pkgname=libXaw version=1.0.4 -distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="xaw6.pc xaw7.pc xaw8.pc" short_desc="X Athena Widgets Library from modular Xorg X11" maintainer="Juan RP " -checksum=face40c68b49aee9aa9149b963566c39fb6425cb +checksum=11f4ab184fb8dc853fd95238d4de7b251427dd036643d11fd2a669232fa35af9 long_desc=" Xaw is the X Athena Widget Set. Xaw is a widget set based on the X Toolkit Intrinsics (Xt) Library. This libXaw is from the modular Xorg X11." + +shared_deps="libX11-1.1 libICE-1.0 libSM-1.1 libXext-1.0 libXt-1.0 + libXmu-1.0 libXpm-3.5 libXau-1.0 libXdmcp-1.0 e2fsprogs-1.41" +build_depends="pkg-config-0.23 xproto-7.0 xextproto-7.0 ${shared_deps}" +run_depends="glibc-2.8 ${shared_deps}" diff --git a/templates/libXext/template b/templates/libXext/template index 2154119f44..b4cfbdc0cb 100644 --- a/templates/libXext/template +++ b/templates/libXext/template @@ -1,14 +1,14 @@ -# Template build file for 'libXext'. pkgname=libXext version=1.0.4 -distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure -configure_args="--disable-malloc0returnsnull" -pkgconfig_override="xext.pc" short_desc="X Extension library" maintainer="Juan RP " -checksum=c13e54d388f2fa91e09b221ca91a2ee281f10bbc +checksum=2dfd8eace1cafacc87b4055c57efeb771a740e24141d3f113de58c2a9eebd21f long_desc=" This package contains the X Extension library from the modular X.org X11 project." + +shared_deps="libX11-1.1 libXau-1.0 libXdmcp-1.0" +build_depends="pkg-config-0.23 xproto-7.0 xextproto-7.0 ${shared_deps}" +run_depends="glibc-2.8 ${shared_deps}" diff --git a/templates/libXmu/template b/templates/libXmu/template index c3fe9cfb26..f8592b2f7f 100644 --- a/templates/libXmu/template +++ b/templates/libXmu/template @@ -1,13 +1,10 @@ -# Template build file for 'libXmu'. pkgname=libXmu version=1.0.4 -distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="xmu.pc xmuu.pc" short_desc="X Miscellaneous Utilities library" maintainer="Juan RP " -checksum=d1c1b185842456f65766df89f6a370f0d679ad29 +checksum=f83c00d6ed8f4c08effa9dcc2d7f1ff6f5a753f2b9fe1babda16618c2afa18f0 long_desc=" This Xmu library contains miscellaneous utilities and is not part of the Xlib standard. It contains routines which only use public interfaces @@ -17,3 +14,8 @@ long_desc=" This also includes the Mini Xmu library that does not use Xt and Xaw. This is from the modular X.org project." + +shared_deps="libXt-1.0 libX11-1.1 libSM-1.0 libICE-1.0 libXext-1.0 + libXau-1.0 libXdmcp-1.0 e2fsprogs-1.41" +build_depends="pkg-config-0.23 xextproto-7.0 xtrans-1.2 ${shared_deps}" +run_depends="glibc-2.8 ${shared_deps}" diff --git a/templates/libXpm/template b/templates/libXpm/template index 04f19227b0..7d300b2f03 100644 --- a/templates/libXpm/template +++ b/templates/libXpm/template @@ -1,15 +1,17 @@ -# Template build file for 'libXpm'. pkgname=libXpm version=3.5.7 -distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="xpm.pc" short_desc="X PixMap Library from modular Xorg X11" maintainer="Juan RP " -checksum=6bd355cb5f011b271b177d86db7f9a4e9d885ed3 +checksum=64701ae67ce5b0797307b75d8255bec3a0d371d0c50715ea618f5a68bcc92baa long_desc=" XPM (X PixMap) is a format for storing and retrieving X pixmaps to and from files. This libXpm is from the modular Xorg X11." + +shared_deps="libX11-1.1 libXau-1.0 libXdmcp-1.0" +build_depends="pkg-config-0.23 gettext-0.17 xproto-7.0 gettext-0.17 + ${shared_deps}" +run_depends="glibc-2.8 ${shared_deps}" diff --git a/templates/libXt/template b/templates/libXt/template index 69d69ddaad..b34f3e50d1 100644 --- a/templates/libXt/template +++ b/templates/libXt/template @@ -1,14 +1,10 @@ -# Template build file for 'libXt'. pkgname=libXt version=1.0.5 -distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure -configure_args="--disable-malloc0returnsnull" -pkgconfig_override="xt.pc" short_desc="X Toolkit Intrinsics library" maintainer="Juan RP " -checksum=7e5ef9e03dc860bf5b64b85a897dd1d2ae1ed0bf +checksum=43c472ada59a04428a463225cd4cd42cb81bc43eb687cc1890f2f1c81a3e9cf4 long_desc=" This is the X Toolkit Intrinsics library. Xt Intrinsics is a library of C routines (based on Xlib) used for designing user interfaces with @@ -16,3 +12,8 @@ long_desc=" windows, and interpreting resource files. This is from the modular X.org project." + +shared_deps="libSM-1.0 libICE-1.0 libX11-1.1 libXau-1.0 libXdmcp-1.0 + e2fsprogs-1.41" +build_depends="pkg-config-0.23 xproto-7.0 kbproto-1.0 ${shared_deps}" +run_depends="glibc-2.8 ${shared_deps}"