glib-2.0 - Remove '-w' from perl interpreter for glib-mkenums and change interpreter...

         - Add some files to glib-2.0-dev that don't normally get pulled in

diff --git a/packages/glib-2.0/files/glib-mkenums-nowarn.patch b/packages/glib-2.0/files/glib-mkenums-nowarn.patch
new file mode 100644 (file)
index 0000000..1ab6e37
--- /dev/null
+++ b/packages/glib-2.0/files/glib-mkenums-nowarn.patch
@@ -0,0 +1,8 @@
+--- glib-2.6.5/gobject/glib-mkenums.in.orig    2006-06-15 21:28:23.436946024 -0600
++++ glib-2.6.5/gobject/glib-mkenums.in 2006-06-15 21:28:35.417124760 -0600
+@@ -1,4 +1,4 @@
+-#!@PERL_PATH@ -w
++#!@PERL_PATH@
+ 
+ # glib-mkenums.pl 
+ # Information about the current enumeration

diff --git a/packages/glib-2.0/glib-2.0-native_2.6.5.bb b/packages/glib-2.0/glib-2.0-native_2.6.5.bb
index e0cfb8b6fbbb3ac498815375b6f22cd977566933..7a4d385fe9ec3d1e610be392ef7cff7d0fe3fe76 100644 (file)
--- a/packages/glib-2.0/glib-2.0-native_2.6.5.bb
+++ b/packages/glib-2.0/glib-2.0-native_2.6.5.bb
@@ -10,10 +10,12 @@ MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "gtk-doc-native"
 PR = "r4"
 
+export PERL_PATH="/usr/bin/env perl"
 EXTRA_OECONF = "--disable-debug"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/glib-${PV}.tar.bz2 \
           file://glib-gettextize-dir.patch;patch=1 \
+          file://glib-mkenums-nowarn.patch;patch=1 \
            file://glibconfig-sysdefs.h \
            file://configure-libtool.patch;patch=1"
 

diff --git a/packages/glib-2.0/glib-2.0_2.4.5.bb b/packages/glib-2.0/glib-2.0_2.4.5.bb
index 32d25876c9d1feef9d36081e9b61d829c139775b..bb4127f84ddfbb6f2a6068aaba5a8f90140e39cc 100644 (file)
--- a/packages/glib-2.0/glib-2.0_2.4.5.bb
+++ b/packages/glib-2.0/glib-2.0_2.4.5.bb
@@ -14,6 +14,11 @@ PACKAGES =+ "glib-2.0-utils "
 LEAD_SONAME = "libglib-2.0.*"
 FILES_glib-2.0-utils = "${bindir}/*"
 
+# Add some files to glib-2.0 dev that normally don't get pulled in
+
+FILES_${PN}-dev += "${libdir}/glib-2.0/include/glibconfig.h \
+       ${datadir}/glib-2.0/gettext/po/Makefile.in.in"
+
 EXTRA_OECONF = "--disable-debug"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/glib-${PV}.tar.bz2 \

diff --git a/packages/glib-2.0/glib-2.0_2.4.6.bb b/packages/glib-2.0/glib-2.0_2.4.6.bb
index e250d34c9c3e28139d9d0826732656c842b173a3..e3722a8e96fe6467cc40abef4ddd5f29dc9ea577 100644 (file)
--- a/packages/glib-2.0/glib-2.0_2.4.6.bb
+++ b/packages/glib-2.0/glib-2.0_2.4.6.bb
@@ -15,6 +15,11 @@ PR = "r4"
 LEAD_SONAME = "libglib-2.0.*"
 FILES_glib-2.0-utils = "${bindir}/*"
 
+# Add some files to glib-2.0 dev that normally don't get pulled in
+
+FILES_${PN}-dev += "${libdir}/glib-2.0/include/glibconfig.h \
+       ${datadir}/glib-2.0/gettext/po/Makefile.in.in"
+
 EXTRA_OECONF = "--disable-debug"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/glib-${PV}.tar.bz2 \

diff --git a/packages/glib-2.0/glib-2.0_2.6.0.bb b/packages/glib-2.0/glib-2.0_2.6.0.bb
index 227bc8a3fc900c38c030c713cab7a16b3615a475..212afa7e0182171bd46595c80d9faa1863c117ec 100644 (file)
--- a/packages/glib-2.0/glib-2.0_2.6.0.bb
+++ b/packages/glib-2.0/glib-2.0_2.6.0.bb
@@ -15,6 +15,11 @@ PR = "r1"
 LEAD_SONAME = "libglib-2.0.*"
 FILES_glib-2.0-utils = "${bindir}/*"
 
+# Add some files to glib-2.0 dev that normally don't get pulled in
+
+FILES_${PN}-dev += "${libdir}/glib-2.0/include/glibconfig.h \
+       ${datadir}/glib-2.0/gettext/po/Makefile.in.in"
+
 EXTRA_OECONF = "--disable-debug"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/glib-${PV}.tar.bz2 \

diff --git a/packages/glib-2.0/glib-2.0_2.6.1.bb b/packages/glib-2.0/glib-2.0_2.6.1.bb
index 61e9abae0ebfa42477900e0c20af3901b9e63b97..64047a865f9fa134934d18196f500ad4bbf3224d 100644 (file)
--- a/packages/glib-2.0/glib-2.0_2.6.1.bb
+++ b/packages/glib-2.0/glib-2.0_2.6.1.bb
@@ -15,6 +15,11 @@ PR = "r1"
 LEAD_SONAME = "libglib-2.0.*"
 FILES_glib-2.0-utils = "${bindir}/*"
 
+# Add some files to glib-2.0 dev that normally don't get pulled in
+
+FILES_${PN}-dev += "${libdir}/glib-2.0/include/glibconfig.h \
+       ${datadir}/glib-2.0/gettext/po/Makefile.in.in"
+
 EXTRA_OECONF = "--disable-debug"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/glib-${PV}.tar.bz2 \

diff --git a/packages/glib-2.0/glib-2.0_2.6.2.bb b/packages/glib-2.0/glib-2.0_2.6.2.bb
index 61e9abae0ebfa42477900e0c20af3901b9e63b97..64047a865f9fa134934d18196f500ad4bbf3224d 100644 (file)
--- a/packages/glib-2.0/glib-2.0_2.6.2.bb
+++ b/packages/glib-2.0/glib-2.0_2.6.2.bb
@@ -15,6 +15,11 @@ PR = "r1"
 LEAD_SONAME = "libglib-2.0.*"
 FILES_glib-2.0-utils = "${bindir}/*"
 
+# Add some files to glib-2.0 dev that normally don't get pulled in
+
+FILES_${PN}-dev += "${libdir}/glib-2.0/include/glibconfig.h \
+       ${datadir}/glib-2.0/gettext/po/Makefile.in.in"
+
 EXTRA_OECONF = "--disable-debug"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/glib-${PV}.tar.bz2 \

diff --git a/packages/glib-2.0/glib-2.0_2.6.3.bb b/packages/glib-2.0/glib-2.0_2.6.3.bb
index 61e9abae0ebfa42477900e0c20af3901b9e63b97..64047a865f9fa134934d18196f500ad4bbf3224d 100644 (file)
--- a/packages/glib-2.0/glib-2.0_2.6.3.bb
+++ b/packages/glib-2.0/glib-2.0_2.6.3.bb
@@ -15,6 +15,11 @@ PR = "r1"
 LEAD_SONAME = "libglib-2.0.*"
 FILES_glib-2.0-utils = "${bindir}/*"
 
+# Add some files to glib-2.0 dev that normally don't get pulled in
+
+FILES_${PN}-dev += "${libdir}/glib-2.0/include/glibconfig.h \
+       ${datadir}/glib-2.0/gettext/po/Makefile.in.in"
+
 EXTRA_OECONF = "--disable-debug"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/glib-${PV}.tar.bz2 \

diff --git a/packages/glib-2.0/glib-2.0_2.6.4.bb b/packages/glib-2.0/glib-2.0_2.6.4.bb
index 61e9abae0ebfa42477900e0c20af3901b9e63b97..64047a865f9fa134934d18196f500ad4bbf3224d 100644 (file)
--- a/packages/glib-2.0/glib-2.0_2.6.4.bb
+++ b/packages/glib-2.0/glib-2.0_2.6.4.bb
@@ -15,6 +15,11 @@ PR = "r1"
 LEAD_SONAME = "libglib-2.0.*"
 FILES_glib-2.0-utils = "${bindir}/*"
 
+# Add some files to glib-2.0 dev that normally don't get pulled in
+
+FILES_${PN}-dev += "${libdir}/glib-2.0/include/glibconfig.h \
+       ${datadir}/glib-2.0/gettext/po/Makefile.in.in"
+
 EXTRA_OECONF = "--disable-debug"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/glib-${PV}.tar.bz2 \

diff --git a/packages/glib-2.0/glib-2.0_2.8.1.bb b/packages/glib-2.0/glib-2.0_2.8.1.bb
index f501487fb981537c51a88bde3454b6f82ac3ebd7..b3891f108bd8180a797fb7ed10965a4e10066afa 100644 (file)
--- a/packages/glib-2.0/glib-2.0_2.8.1.bb
+++ b/packages/glib-2.0/glib-2.0_2.8.1.bb
@@ -15,6 +15,11 @@ PR = "r1"
 LEAD_SONAME = "libglib-2.0.*"
 FILES_glib-2.0-utils = "${bindir}/*"
 
+# Add some files to glib-2.0 dev that normally don't get pulled in
+
+FILES_${PN}-dev += "${libdir}/glib-2.0/include/glibconfig.h \
+       ${datadir}/glib-2.0/gettext/po/Makefile.in.in"
+
 EXTRA_OECONF = "--disable-debug"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/glib-${PV}.tar.bz2 \

diff --git a/packages/glib-2.0/glib-2.0_2.8.2.bb b/packages/glib-2.0/glib-2.0_2.8.2.bb
index 1c06176e010de06ad889655d82730411941f842d..22849917d6b4ce78479c00d0828c37311d26c860 100644 (file)
--- a/packages/glib-2.0/glib-2.0_2.8.2.bb
+++ b/packages/glib-2.0/glib-2.0_2.8.2.bb
@@ -15,6 +15,11 @@ PR = "r3"
 LEAD_SONAME = "libglib-2.0.*"
 FILES_glib-2.0-utils = "${bindir}/*"
 
+# Add some files to glib-2.0 dev that normally don't get pulled in
+
+FILES_${PN}-dev += "${libdir}/glib-2.0/include/glibconfig.h \
+       ${datadir}/glib-2.0/gettext/po/Makefile.in.in"
+
 EXTRA_OECONF = "--disable-debug"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/glib-${PV}.tar.bz2 \

diff --git a/packages/glib-2.0/glib-2.0_2.8.4.bb b/packages/glib-2.0/glib-2.0_2.8.4.bb
index fc22bb866eed9efe81ee106de079f141f8c41978..778e3118d14443e8146ef9aca995e84d1fe2451a 100644 (file)
--- a/packages/glib-2.0/glib-2.0_2.8.4.bb
+++ b/packages/glib-2.0/glib-2.0_2.8.4.bb
@@ -13,7 +13,8 @@ PR = "r2"
 
 LEAD_SONAME = "libglib-2.0.*"
 FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${libdir}/glib-2.0/include ${datadir}/glib-2.0/gettext"
+FILES_${PN}-dev += "${libdir}/glib-2.0/include ${datadir}/glib-2.0/gettext \
+       ${libdir}/glib-2.0/include/glibconfig.h"
 FILES_glib-2.0-utils = "${bindir}/*"
 
 EXTRA_OECONF = "--disable-debug"