[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 98c64b0572a5fede2c0a8485eea8adbfcf6f59c6 - IPFire-SCM

2 Mar 2011

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
       via  98c64b0572a5fede2c0a8485eea8adbfcf6f59c6 (commit)
       via  1ba6bce49999276db9dc1a5f8b8f7d24a3ceb582 (commit)
       via  b542a56611130281ffea07f0f8852037f0f7f663 (commit)
       via  8709145bcd5d36f6af65a3f2a665f2816553aa3d (commit)
       via  5b74f5147e0963ff76f4c5fa7073ed5e4d8417e0 (commit)
       via  ff041f2d8d2999db2be0ca302946c6250ad5ec72 (commit)
       via  909a742954f04976ea66e40ed4e005b3dc5107c8 (commit)
       via  6e1d865546b84394ffb3f297421b7ebf12ec8bc9 (commit)
       via  c0024b068973f6a4ee6a9804e71c95562274a513 (commit)
       via  8852b4d8786c1bae5bc82a6e244afb5d175e9c17 (commit)
       via  79b84d46de5731bfe3bcab7c99149f65d8a7a3d1 (commit)
      from  dbd0ad09cd4e8d2dbe6a0c81651e6c32449c85bb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 98c64b0572a5fede2c0a8485eea8adbfcf6f59c6
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Mar 2 23:01:45 2011 +0100
xorg-x11-proto-devel: Rebuild for pkg-config dependencies.
commit 1ba6bce49999276db9dc1a5f8b8f7d24a3ceb582
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Mar 2 23:01:42 2011 +0100
pixman: Rebuild for pkg-config dependencies.
commit b542a56611130281ffea07f0f8852037f0f7f663
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Mar 2 23:01:41 2011 +0100
pango: Rebuild for pkg-config dependencies.
commit 8709145bcd5d36f6af65a3f2a665f2816553aa3d
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Mar 2 23:01:39 2011 +0100
libxml2: Rebuild for pkg-config dependencies.
commit 5b74f5147e0963ff76f4c5fa7073ed5e4d8417e0
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Mar 2 23:01:39 2011 +0100
libXau: Rebuild for pkg-config dependencies.
commit ff041f2d8d2999db2be0ca302946c6250ad5ec72
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Mar 2 23:01:36 2011 +0100
glib2: Rebuild for pkg-config dependencies.
commit 909a742954f04976ea66e40ed4e005b3dc5107c8
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Mar 2 23:01:36 2011 +0100
freetype: Rebuild for pkg-config dependencies.
commit 6e1d865546b84394ffb3f297421b7ebf12ec8bc9
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Mar 2 23:01:36 2011 +0100
fontconfig: Rebuild for pkg-config dependencies.
commit c0024b068973f6a4ee6a9804e71c95562274a513
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Mar 2 22:34:52 2011 +0100
cairo: Rebuild for pkg-config dependencies.
commit 8852b4d8786c1bae5bc82a6e244afb5d175e9c17
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Mar 2 22:01:01 2011 +0100
build-essentials: Add automatic dependencies for pkg-config.
commit 79b84d46de5731bfe3bcab7c99149f65d8a7a3d1
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Mar 2 20:35:09 2011 +0100
pkg-config: Make package also known as "pkgconfig".
-----------------------------------------------------------------------
Summary of changes:
 pkgs/build-essentials/build-essentials.nm          |    2 +-
 .../buildsystem-tools/functions-packager-find      |   12 ++++++++++
 .../buildsystem-tools/pkg-config.prov              |   22 ++++++++++++++++++++
 .../buildsystem-tools/pkg-config.req               |   11 ++++++++++
 pkgs/cairo/cairo.nm                                |    2 +-
 pkgs/fontconfig/fontconfig.nm                      |    2 +-
 pkgs/freetype/freetype.nm                          |    4 +-
 pkgs/glib2/glib2.nm                                |    2 +-
 pkgs/libXau/libXau.nm                              |    2 +-
 pkgs/libxml2/libxml2.nm                            |    4 +-
 pkgs/pango/pango.nm                                |    2 +-
 pkgs/pixman/pixman.nm                              |    2 +-
 pkgs/pkg-config/pkg-config.nm                      |    5 +++-
 pkgs/xorg-x11-proto-devel/xorg-x11-proto-devel.nm  |    2 +-
 14 files changed, 61 insertions(+), 13 deletions(-)
 create mode 100755 pkgs/build-essentials/buildsystem-tools/pkg-config.prov
 create mode 100755 pkgs/build-essentials/buildsystem-tools/pkg-config.req
Difference in files:

diff --git a/pkgs/build-essentials/build-essentials.nm b/pkgs/build-essentials/build-essentials.nm
index 43148ef..4f8e953 100644
--- a/pkgs/build-essentials/build-essentials.nm
+++ b/pkgs/build-essentials/build-essentials.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME       = build-essentials
 PKG_VER        = $(DISTRO_VERSION)
-PKG_REL        = 1
+PKG_REL        = 2
 PKG_EPOCH      = 1
 PKG_ARCH       = noarch
diff --git a/pkgs/build-essentials/buildsystem-tools/functions-packager-find b/pkgs/build-essentials/buildsystem-tools/functions-packager-find
index bc97483..80f5457 100644
--- a/pkgs/build-essentials/buildsystem-tools/functions-packager-find
+++ b/pkgs/build-essentials/buildsystem-tools/functions-packager-find
@@ -38,6 +38,7 @@ function find_requires() {
    local others=$(find_python_requires ${dirs})
    others="${others} $(find_weak_symbols_requires ${dirs})"
    others="${others} $(find_perl_requires ${dirs})"
+	others="${others} $(find_pkgconfig_requires ${dirs})"
# Get provides, because packages should not depend on features they provide
    # by themselves.
@@ -68,6 +69,7 @@ function find_provides() {
    local others=$(find_python_provides ${dirs})
    others="${others} $(find_weak_symbols_provides ${dirs})"
    others="${others} $(find_perl_provides ${dirs})"
+	others="${others} $(find_pkgconfig_provides ${dirs})"
listsort ${PKG_PROVIDES} ${sonames} ${others}
 }
@@ -171,6 +173,16 @@ function find_perl_requires() {
    ${BASEDIR}/perl.req $(find_perl_files $@) | sort -u
 }
+function find_pkgconfig_provides() {
+	[ -x "/usr/bin/pkg-config" ] || return 0
+	find $@ | ${BASEDIR}/pkg-config.prov
+}
+
+function find_pkgconfig_requires() {
+	[ -x "/usr/bin/pkg-config" ] || return 0
+	find $@ | ${BASEDIR}/pkg-config.req
+}
+
 function find_weak_symbols_provides() {
    local dirs=$@
diff --git a/pkgs/build-essentials/buildsystem-tools/pkg-config.prov b/pkgs/build-essentials/buildsystem-tools/pkg-config.prov
new file mode 100755
index 0000000..2ef9b3c
--- /dev/null
+++ b/pkgs/build-essentials/buildsystem-tools/pkg-config.prov
@@ -0,0 +1,22 @@
+#!/bin/bash
+pkgconfig=${1:-/usr/bin/pkg-config}
+test -x $pkgconfig || exit 0
+while read filename ; do
+case "${filename}" in
+*.pc)
+	# Assume that this file doesn't contain useful information.
+	needs_pkgconfig=false
+	# Query the dependencies of the package.
+	$pkgconfig --print-provides "$filename" 2> /dev/null | while read n r v ; do
+		# We have a dependency.  Make a note that we need the pkgconfig
+		# tool for this package.
+		echo "pkgconfig($n)$r$v"
+		needs_pkgconfig=true
+	done
+	# The dependency on the pkgconfig package itself.
+	if $needs_pkgconfig ; then
+		echo pkgconfig
+	fi
+	;;
+esac
+done
diff --git a/pkgs/build-essentials/buildsystem-tools/pkg-config.req b/pkgs/build-essentials/buildsystem-tools/pkg-config.req
new file mode 100755
index 0000000..edb8bce
--- /dev/null
+++ b/pkgs/build-essentials/buildsystem-tools/pkg-config.req
@@ -0,0 +1,11 @@
+#!/bin/bash
+pkgconfig=${1:-/usr/bin/pkg-config}
+test -x $pkgconfig || exit 0
+while read filename ; do
+case "${filename}" in
+*.pc)
+	$pkgconfig --print-requires "$filename" 2> /dev/null | while read n r v ; do
+		echo "pkgconfig($n)$r$v"
+	done
+esac
+done
diff --git a/pkgs/cairo/cairo.nm b/pkgs/cairo/cairo.nm
index 779902d..bb46a6a 100644
--- a/pkgs/cairo/cairo.nm
+++ b/pkgs/cairo/cairo.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME       = cairo
 PKG_VER        = 1.10.2
-PKG_REL        = 1
+PKG_REL        = 2
PKG_MAINTAINER =
 PKG_GROUP      = System/Graphics
diff --git a/pkgs/fontconfig/fontconfig.nm b/pkgs/fontconfig/fontconfig.nm
index f280596..8c8d3d2 100644
--- a/pkgs/fontconfig/fontconfig.nm
+++ b/pkgs/fontconfig/fontconfig.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME       = fontconfig
 PKG_VER        = 2.7.1
-PKG_REL        = 0
+PKG_REL        = 1
PKG_MAINTAINER =
 PKG_GROUP      = System/Graphics
diff --git a/pkgs/freetype/freetype.nm b/pkgs/freetype/freetype.nm
index 7e0b4f0..e9249d2 100644
--- a/pkgs/freetype/freetype.nm
+++ b/pkgs/freetype/freetype.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME       = freetype
 PKG_VER        = 2.3.9
-PKG_REL        = 0
+PKG_REL        = 1
PKG_MAINTAINER =
 PKG_GROUP      = System/Graphics
@@ -34,7 +34,7 @@ PKG_URL        = http://www.freetype.org/
 PKG_LICENSE    = FTL GPLv2+
 PKG_SUMMARY    = A free and portable font rendering engine.
-PKG_BUILD_DEPS+= zlib-devel
+PKG_BUILD_DEPS+= pkg-config zlib-devel
define PKG_DESCRIPTION
    The FreeType engine is a free and portable font rendering \
diff --git a/pkgs/glib2/glib2.nm b/pkgs/glib2/glib2.nm
index f22fa05..7212e03 100644
--- a/pkgs/glib2/glib2.nm
+++ b/pkgs/glib2/glib2.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME       = glib
 PKG_VER        = 2.27.3
-PKG_REL        = 1
+PKG_REL        = 2
PKG_MAINTAINER =
 PKG_GROUP      = System/Libraries
diff --git a/pkgs/libXau/libXau.nm b/pkgs/libXau/libXau.nm
index 8bc2230..2a0b8c4 100644
--- a/pkgs/libXau/libXau.nm
+++ b/pkgs/libXau/libXau.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME       = libXau
 PKG_VER        = 1.0.6
-PKG_REL        = 0
+PKG_REL        = 1
PKG_MAINTAINER = Stefan Schantl stefan.schantl@ipfire.org
 PKG_GROUP      = X/Libraries
diff --git a/pkgs/libxml2/libxml2.nm b/pkgs/libxml2/libxml2.nm
index 4f38bb8..11102a6 100644
--- a/pkgs/libxml2/libxml2.nm
+++ b/pkgs/libxml2/libxml2.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME       = libxml2
 PKG_VER        = 2.7.7
-PKG_REL        = 0
+PKG_REL        = 1
PKG_MAINTAINER =
 PKG_GROUP      = System/Libraries
@@ -34,7 +34,7 @@ PKG_URL        = http://xmlsoft.org/
 PKG_LICENSE    = MIT
 PKG_SUMMARY    = Library providing XML and HTML support.
-PKG_BUILD_DEPS+= zlib-devel
+PKG_BUILD_DEPS+= pkg-config zlib-devel
define PKG_DESCRIPTION
    This library allows to manipulate XML files. It includes support \
diff --git a/pkgs/pango/pango.nm b/pkgs/pango/pango.nm
index 479cb9f..caa4d29 100644
--- a/pkgs/pango/pango.nm
+++ b/pkgs/pango/pango.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME       = pango
 PKG_VER        = 1.28.3
-PKG_REL        = 1
+PKG_REL        = 2
PKG_MAINTAINER =
 PKG_GROUP      = System/Libraries
diff --git a/pkgs/pixman/pixman.nm b/pkgs/pixman/pixman.nm
index e7a1e0f..bea5379 100644
--- a/pkgs/pixman/pixman.nm
+++ b/pkgs/pixman/pixman.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME       = pixman
 PKG_VER        = 0.18.4
-PKG_REL        = 0
+PKG_REL        = 1
PKG_MAINTAINER =
 PKG_GROUP      = System/Libraries
diff --git a/pkgs/pkg-config/pkg-config.nm b/pkgs/pkg-config/pkg-config.nm
index 64cadbe..1b4c818 100644
--- a/pkgs/pkg-config/pkg-config.nm
+++ b/pkgs/pkg-config/pkg-config.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME       = pkg-config
 PKG_VER        = 0.25
-PKG_REL        = 0
+PKG_REL        = 1
PKG_MAINTAINER =
 PKG_GROUP      = Development/Tools
@@ -36,6 +36,9 @@ PKG_SUMMARY    = A tool for determining compilation options.
PKG_BUILD_DEPS+= m4 popt-devel sed
+# Say we provide an alternative spelling of the package name.
+PKG_PROVIDES  += pkgconfig
+
 define PKG_DESCRIPTION
    The pkgconfig tool determines compilation options. For each required \
    library, it reads the configuration file and outputs the necessary \
diff --git a/pkgs/xorg-x11-proto-devel/xorg-x11-proto-devel.nm b/pkgs/xorg-x11-proto-devel/xorg-x11-proto-devel.nm
index 61e0ed5..6007663 100644
--- a/pkgs/xorg-x11-proto-devel/xorg-x11-proto-devel.nm
+++ b/pkgs/xorg-x11-proto-devel/xorg-x11-proto-devel.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME       = xorg-x11-proto-devel
 PKG_VER        = 7.4
-PKG_REL        = 1
+PKG_REL        = 2
 PKG_ARCH       = noarch
PKG_MAINTAINER = Stefan Schantl stefan.schantl@ipfire.org
hooks/post-receive
--
IPFire 3.x development tree

    