[oe-commits] org.oe.dev libglade: consolidate and unify
Laibsch commit
openembedded-commits at lists.openembedded.org
Wed Feb 6 16:06:10 UTC 2008
libglade: consolidate and unify
Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 55373d0f032518e68dd4f39df8983ede9ea7659b
ViewMTN: http://monotone.openembedded.org/revision/info/55373d0f032518e68dd4f39df8983ede9ea7659b
Files:
1
packages/libglade/libglade-2.0.1
packages/libglade/libglade-2.0.1/glade-cruft.patch
packages/libglade/libglade-2.4.0
packages/libglade/libglade-2.4.0/glade-cruft.patch
packages/libglade/libglade-2.4.0/no-xml2.patch
packages/libglade/libglade-2.4.2
packages/libglade/libglade-2.4.2/glade-cruft.patch
packages/libglade/libglade-2.4.2/no-xml2.patch
packages/libglade/libglade-2.5.1
packages/libglade/libglade-2.5.1/glade-cruft.patch
packages/libglade/libglade-2.5.1/no-xml2.patch
packages/libglade/libglade-2.0.1/gtk-2.0.m4
packages/libglade/files/gtk-2.0.m4
packages/libglade/libglade-2.5.1/no-deprecation.patch
packages/libglade/files/no-deprecation.patch
packages/libglade/libglade-2.6.2
packages/libglade/files
packages/libglade/libglade_2.6.2.bb
packages/libglade/libglade.inc
packages/libglade/libglade_2.0.1.bb
packages/libglade/libglade_2.4.0.bb
packages/libglade/libglade_2.4.2.bb
packages/libglade/libglade_2.5.1.bb
Diffs:
#
# mt diff -r04dd9db8522b291497f09661879dbb904c490691 -r55373d0f032518e68dd4f39df8983ede9ea7659b
#
#
#
# delete "packages/libglade/libglade-2.0.1"
#
# delete "packages/libglade/libglade-2.0.1/glade-cruft.patch"
#
# delete "packages/libglade/libglade-2.4.0"
#
# delete "packages/libglade/libglade-2.4.0/glade-cruft.patch"
#
# delete "packages/libglade/libglade-2.4.0/no-xml2.patch"
#
# delete "packages/libglade/libglade-2.4.2"
#
# delete "packages/libglade/libglade-2.4.2/glade-cruft.patch"
#
# delete "packages/libglade/libglade-2.4.2/no-xml2.patch"
#
# delete "packages/libglade/libglade-2.5.1"
#
# delete "packages/libglade/libglade-2.5.1/glade-cruft.patch"
#
# delete "packages/libglade/libglade-2.5.1/no-xml2.patch"
#
# rename "packages/libglade/libglade-2.0.1/gtk-2.0.m4"
# to "packages/libglade/files/gtk-2.0.m4"
#
# rename "packages/libglade/libglade-2.5.1/no-deprecation.patch"
# to "packages/libglade/files/no-deprecation.patch"
#
# rename "packages/libglade/libglade-2.6.2"
# to "packages/libglade/files"
#
# rename "packages/libglade/libglade_2.6.2.bb"
# to "packages/libglade/libglade.inc"
#
# add_file "packages/libglade/libglade_2.6.2.bb"
# content [260a55eda5df2583b5a81605299e62f43424f7c7]
#
# patch "packages/libglade/libglade.inc"
# from [d94670ece5e8b9e8e3e0ba00b7744b565be182af]
# to [436c12a98f08dbbdf23435a5f7427334a373b13b]
#
# patch "packages/libglade/libglade_2.0.1.bb"
# from [5b9997972462185f7650879d29314cf970269214]
# to [4f7237e7991a74e49681d098a30a11727f4f6eda]
#
# patch "packages/libglade/libglade_2.4.0.bb"
# from [1522a52bfc4e1fd114cbcbdf0dcc668d5d2ae51d]
# to [4e7c0d5e52113288c7c519a8b542e7638929bc46]
#
# patch "packages/libglade/libglade_2.4.2.bb"
# from [77537a247a98aa71ce5b3b06eb9ab78407ee23a3]
# to [883f2c0f0b8d2ec182afa3f3cd1b08c0c0d80257]
#
# patch "packages/libglade/libglade_2.5.1.bb"
# from [ea9815d992df837e1c5913b615a6ea5130f2d9e5]
# to [71f7284eedd6ea02babe87719f55b96727f9cb09]
#
============================================================
--- packages/libglade/libglade_2.6.2.bb 260a55eda5df2583b5a81605299e62f43424f7c7
+++ packages/libglade/libglade_2.6.2.bb 260a55eda5df2583b5a81605299e62f43424f7c7
@@ -0,0 +1,11 @@
+require libglade.inc
+
+PR = "r2"
+
+inherit gnome
+
+SRC_URI += "file://glade-cruft.patch;patch=1 file://no-xml2.patch;patch=1"
+
+EXTRA_OECONF += "--without-libxml2"
+
+LDFLAGS += "-lz"
============================================================
--- packages/libglade/libglade_2.6.2.bb d94670ece5e8b9e8e3e0ba00b7744b565be182af
+++ packages/libglade/libglade.inc 436c12a98f08dbbdf23435a5f7427334a373b13b
@@ -1,25 +1,12 @@
-LICENSE = "LGPL"
DESCRIPTION = "Runtime support for GTK interface builder"
+HOMEPAGE = "http://glade.gnome.org/"
SECTION = "libs"
PRIORITY = "optional"
+LICENSE = "LGPL"
DEPENDS = "gtk+ gtk-doc"
-inherit autotools pkgconfig gnome
+inherit autotools pkgconfig
-PR = "r1"
-
-SRC_URI += "file://glade-cruft.patch;patch=1 file://no-xml2.patch;patch=1"
-
-EXTRA_OECONF += "--without-libxml2"
-
-LDFLAGS += "-lz"
-
-PACKAGES += " ${PN}-data"
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-data = "${datadir}/xml/libglade/glade-2.0.dtd"
-FILES_${PN}-dev += "${bindir}/libglade-convert"
-#RDEPENDS_${PN} = "${PN}-data"
-
headers = "glade-build.h glade-init.h glade-parser.h glade-xml.h glade.h"
do_stage () {
@@ -30,3 +17,9 @@ do_stage () {
install -m 0644 ${S}/glade/$i ${STAGING_INCDIR}/libglade-2.0/glade/$i
done
}
+
+PACKAGES += " ${PN}-data"
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-data = "${datadir}/xml/libglade/glade-2.0.dtd"
+FILES_${PN}-dev += "${bindir}/libglade-convert"
+#RDEPENDS_${PN} = "${PN}-data"
============================================================
--- packages/libglade/libglade_2.0.1.bb 5b9997972462185f7650879d29314cf970269214
+++ packages/libglade/libglade_2.0.1.bb 4f7237e7991a74e49681d098a30a11727f4f6eda
@@ -1,27 +1,13 @@
-LICENSE = "LGPL"
-DESCRIPTION = "Runtime support for GTK interface builder"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "libxml2 gtk+"
+require libglade.inc
+PR = "r1"
+DEPENDS += "libxml2"
+
SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/libglade/2.0/libglade-${PV}.tar.bz2 \
file://glade-cruft.patch;patch=1;pnum=0 \
file://gtk-2.0.m4"
-inherit autotools pkgconfig
-
-headers = "glade-build.h glade-init.h glade-parser.h glade-xml.h glade.h"
-
do_configure_prepend() {
install -d m4
install ${WORKDIR}/gtk-2.0.m4 m4/
}
-
-do_stage () {
- oe_libinstall -a -so -C glade libglade-2.0 ${STAGING_LIBDIR}
-
- mkdir -p ${STAGING_INCDIR}/libglade-2.0/glade
- for i in ${headers}; do
- install -m 0644 ${S}/glade/$i ${STAGING_INCDIR}/libglade-2.0/glade/$i
- done
-}
============================================================
--- packages/libglade/libglade_2.4.0.bb 1522a52bfc4e1fd114cbcbdf0dcc668d5d2ae51d
+++ packages/libglade/libglade_2.4.0.bb 4e7c0d5e52113288c7c519a8b542e7638929bc46
@@ -1,30 +1,9 @@
-LICENSE = "LGPL"
-DESCRIPTION = "Runtime support for GTK interface builder"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "gtk+ gtk-doc"
+require libglade.inc
-inherit autotools pkgconfig gnome
+PR = "r3"
-PR = "r2"
+inherit gnome
SRC_URI += "file://glade-cruft.patch;patch=1 file://no-xml2.patch;patch=1"
EXTRA_OECONF += "--without-libxml2"
-
-PACKAGES += " ${PN}-data"
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-data = "${datadir}/xml/libglade/glade-2.0.dtd"
-FILES_${PN}-dev += "${bindir}/libglade-convert"
-#RDEPENDS_${PN} = "${PN}-data"
-
-headers = "glade-build.h glade-init.h glade-parser.h glade-xml.h glade.h"
-
-do_stage () {
- oe_libinstall -a -so -C glade libglade-2.0 ${STAGING_LIBDIR}
-
- mkdir -p ${STAGING_INCDIR}/libglade-2.0/glade
- for i in ${headers}; do
- install -m 0644 ${S}/glade/$i ${STAGING_INCDIR}/libglade-2.0/glade/$i
- done
-}
============================================================
--- packages/libglade/libglade_2.4.2.bb 77537a247a98aa71ce5b3b06eb9ab78407ee23a3
+++ packages/libglade/libglade_2.4.2.bb 883f2c0f0b8d2ec182afa3f3cd1b08c0c0d80257
@@ -1,32 +1,11 @@
-LICENSE = "LGPL"
-DESCRIPTION = "Runtime support for GTK interface builder"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "gtk+ gtk-doc"
+require libglade.inc
-inherit autotools pkgconfig gnome
+PR = "r1"
-PR = "r0"
+inherit gnome
SRC_URI += "file://glade-cruft.patch;patch=1 file://no-xml2.patch;patch=1"
EXTRA_OECONF += "--without-libxml2"
LDFLAGS += "-lz"
-
-PACKAGES += " ${PN}-data"
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-data = "${datadir}/xml/libglade/glade-2.0.dtd"
-FILES_${PN}-dev += "${bindir}/libglade-convert"
-#RDEPENDS_${PN} = "${PN}-data"
-
-headers = "glade-build.h glade-init.h glade-parser.h glade-xml.h glade.h"
-
-do_stage () {
- oe_libinstall -a -so -C glade libglade-2.0 ${STAGING_LIBDIR}
-
- mkdir -p ${STAGING_INCDIR}/libglade-2.0/glade
- for i in ${headers}; do
- install -m 0644 ${S}/glade/$i ${STAGING_INCDIR}/libglade-2.0/glade/$i
- done
-}
============================================================
--- packages/libglade/libglade_2.5.1.bb ea9815d992df837e1c5913b615a6ea5130f2d9e5
+++ packages/libglade/libglade_2.5.1.bb 71f7284eedd6ea02babe87719f55b96727f9cb09
@@ -1,12 +1,8 @@
-LICENSE = "LGPL"
-DESCRIPTION = "Runtime support for GTK interface builder"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "gtk+ gtk-doc"
+require libglade.inc
-inherit autotools pkgconfig gnome
+PR = "r2"
-PR = "r1"
+inherit gnome
SRC_URI += "file://glade-cruft.patch;patch=1 file://no-xml2.patch;patch=1 \
file://no-deprecation.patch;patch=1"
@@ -14,20 +10,3 @@ LDFLAGS += "-lz"
EXTRA_OECONF += "--without-libxml2"
LDFLAGS += "-lz"
-
-PACKAGES += " ${PN}-data"
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-data = "${datadir}/xml/libglade/glade-2.0.dtd"
-FILES_${PN}-dev += "${bindir}/libglade-convert"
-#RDEPENDS_${PN} = "${PN}-data"
-
-headers = "glade-build.h glade-init.h glade-parser.h glade-xml.h glade.h"
-
-do_stage () {
- oe_libinstall -a -so -C glade libglade-2.0 ${STAGING_LIBDIR}
-
- mkdir -p ${STAGING_INCDIR}/libglade-2.0/glade
- for i in ${headers}; do
- install -m 0644 ${S}/glade/$i ${STAGING_INCDIR}/libglade-2.0/glade/$i
- done
-}
More information about the Openembedded-commits
mailing list