[oe-commits] org.oe.dev gtk+: various fixes
koen commit
openembedded-commits at lists.openembedded.org
Sun Oct 22 13:22:02 UTC 2006
gtk+: various fixes
* drop 2.10.0 and 2.10.1
* ship gtk-update-icon-cache (from Poky)
* fix -dev packages (from Poky)
* fix -dbg packages (from Poky)
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: c1656691540333cfa24d768dfa15b6c02ea73ac5
ViewMTN: http://monotone.openembedded.org/revision.psp?id=c1656691540333cfa24d768dfa15b6c02ea73ac5
Files:
1
packages/gtk+/gtk+-2.10.0/automake-lossage.patch
packages/gtk+/gtk+-2.10.0/disable-print.patch
packages/gtk+/gtk+-2.10.0/disable-tooltips.patch
packages/gtk+/gtk+-2.10.0/gtk+-handhelds.patch
packages/gtk+/gtk+-2.10.0/gtklabel-resize-patch
packages/gtk+/gtk+-2.10.0/hardcoded_libtool.patch
packages/gtk+/gtk+-2.10.0/menu-deactivate.patch
packages/gtk+/gtk+-2.10.0/migration.patch
packages/gtk+/gtk+-2.10.0/no-demos.patch
packages/gtk+/gtk+-2.10.0/no-xwc.patch
packages/gtk+/gtk+-2.10.0/run-iconcache.patch
packages/gtk+/gtk+-2.10.0/scroll-timings.patch
packages/gtk+/gtk+-2.10.0/single-click.patch
packages/gtk+/gtk+-2.10.0/small-gtkfilesel.patch
packages/gtk+/gtk+-2.10.0/spinbutton.patch
packages/gtk+/gtk+-2.10.0/xsettings.patch
packages/gtk+/gtk+-2.10.1/automake-lossage.patch
packages/gtk+/gtk+-2.10.1/disable-print.patch
packages/gtk+/gtk+-2.10.1/disable-tooltips.patch
packages/gtk+/gtk+-2.10.1/gtk+-handhelds.patch
packages/gtk+/gtk+-2.10.1/gtklabel-resize-patch
packages/gtk+/gtk+-2.10.1/hardcoded_libtool.patch
packages/gtk+/gtk+-2.10.1/menu-deactivate.patch
packages/gtk+/gtk+-2.10.1/migration.patch
packages/gtk+/gtk+-2.10.1/no-demos.patch
packages/gtk+/gtk+-2.10.1/no-xwc.patch
packages/gtk+/gtk+-2.10.1/run-iconcache.patch
packages/gtk+/gtk+-2.10.1/scroll-timings.patch
packages/gtk+/gtk+-2.10.1/single-click.patch
packages/gtk+/gtk+-2.10.1/small-gtkfilesel.patch
packages/gtk+/gtk+-2.10.1/spinbutton.patch
packages/gtk+/gtk+-2.10.1/xsettings.patch
packages/gtk+/gtk+_2.10.0.bb
packages/gtk+/gtk+_2.10.1.bb
packages/gtk+/gtk+_2.10.3.bb
packages/gtk+/gtk+_2.6.10.bb
packages/gtk+/gtk+_2.8.16.bb
packages/gtk+/gtk+_2.8.9.bb
Diffs:
#
# mt diff -r541ed8e8466cd4f19a006e9965e9f3e66fe34439 -rc1656691540333cfa24d768dfa15b6c02ea73ac5
#
#
#
# delete "packages/gtk+/gtk+-2.10.0/automake-lossage.patch"
#
# delete "packages/gtk+/gtk+-2.10.0/disable-print.patch"
#
# delete "packages/gtk+/gtk+-2.10.0/disable-tooltips.patch"
#
# delete "packages/gtk+/gtk+-2.10.0/gtk+-handhelds.patch"
#
# delete "packages/gtk+/gtk+-2.10.0/gtklabel-resize-patch"
#
# delete "packages/gtk+/gtk+-2.10.0/hardcoded_libtool.patch"
#
# delete "packages/gtk+/gtk+-2.10.0/menu-deactivate.patch"
#
# delete "packages/gtk+/gtk+-2.10.0/migration.patch"
#
# delete "packages/gtk+/gtk+-2.10.0/no-demos.patch"
#
# delete "packages/gtk+/gtk+-2.10.0/no-xwc.patch"
#
# delete "packages/gtk+/gtk+-2.10.0/run-iconcache.patch"
#
# delete "packages/gtk+/gtk+-2.10.0/scroll-timings.patch"
#
# delete "packages/gtk+/gtk+-2.10.0/single-click.patch"
#
# delete "packages/gtk+/gtk+-2.10.0/small-gtkfilesel.patch"
#
# delete "packages/gtk+/gtk+-2.10.0/spinbutton.patch"
#
# delete "packages/gtk+/gtk+-2.10.0/xsettings.patch"
#
# delete "packages/gtk+/gtk+-2.10.1/automake-lossage.patch"
#
# delete "packages/gtk+/gtk+-2.10.1/disable-print.patch"
#
# delete "packages/gtk+/gtk+-2.10.1/disable-tooltips.patch"
#
# delete "packages/gtk+/gtk+-2.10.1/gtk+-handhelds.patch"
#
# delete "packages/gtk+/gtk+-2.10.1/gtklabel-resize-patch"
#
# delete "packages/gtk+/gtk+-2.10.1/hardcoded_libtool.patch"
#
# delete "packages/gtk+/gtk+-2.10.1/menu-deactivate.patch"
#
# delete "packages/gtk+/gtk+-2.10.1/migration.patch"
#
# delete "packages/gtk+/gtk+-2.10.1/no-demos.patch"
#
# delete "packages/gtk+/gtk+-2.10.1/no-xwc.patch"
#
# delete "packages/gtk+/gtk+-2.10.1/run-iconcache.patch"
#
# delete "packages/gtk+/gtk+-2.10.1/scroll-timings.patch"
#
# delete "packages/gtk+/gtk+-2.10.1/single-click.patch"
#
# delete "packages/gtk+/gtk+-2.10.1/small-gtkfilesel.patch"
#
# delete "packages/gtk+/gtk+-2.10.1/spinbutton.patch"
#
# delete "packages/gtk+/gtk+-2.10.1/xsettings.patch"
#
# delete "packages/gtk+/gtk+_2.10.0.bb"
#
# delete "packages/gtk+/gtk+_2.10.1.bb"
#
# patch "packages/gtk+/gtk+_2.10.3.bb"
# from [d12078d2a6d9259a1ef1f7bcb8bc87cb756c22e0]
# to [0544722b7add454700957f48f93158a693598ac6]
#
# patch "packages/gtk+/gtk+_2.6.10.bb"
# from [04836ee19148a317fdfb165b07c1b8eeb8c6702a]
# to [d51cb7ad72b124f7f36ef3acd12e60f6cef2a8f0]
#
# patch "packages/gtk+/gtk+_2.8.16.bb"
# from [8d295805aa787dc71bd7bf18ec5375eda37b2e84]
# to [e08b612ea805b2a48c5d28753416be75dd839464]
#
# patch "packages/gtk+/gtk+_2.8.9.bb"
# from [953a6c4676bbbcc8a18749d3751d9359101699ee]
# to [41ef94b7bab795a01b7ce04ae86c990521f8a2b0]
#
============================================================
--- packages/gtk+/gtk+_2.10.3.bb d12078d2a6d9259a1ef1f7bcb8bc87cb756c22e0
+++ packages/gtk+/gtk+_2.10.3.bb 0544722b7add454700957f48f93158a693598ac6
@@ -5,7 +5,7 @@ DEPENDS = "glib-2.0 pango atk jpeg libpn
SECTION = "libs"
PRIORITY = "optional"
DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo cups"
-PR = "r1"
+PR = "r2"
# disable per default - untested and not all patches included.
DEFAULT_PREFERENCE = "-1"
@@ -31,12 +31,24 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-quer
inherit autotools pkgconfig
FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
+ ${bindir}/gtk-update-icon-cache \
${bindir}/gtk-query-immodules-2.0 \
${libdir}/lib*.so.* \
${datadir}/themes ${sysconfdir} \
${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so"
-FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource"
+FILES_${PN}-dev += " \
+ ${datadir}/gtk-2.0/include \
+ ${libdir}/gtk-2.0/include \
+ ${libdir}/gtk-2.0/${LIBV}/loaders/*.la \
+ ${libdir}/gtk-2.0/${LIBV}/immodules/*.la \
+ ${libdir}/gtk-2.0/${LIBV}/engines/*.la \
+ ${bindir}/gdk-pixbuf-csource"
+FILES_${PN}-dbg += " \
+ ${libdir}/gtk-2.0/${LIBV}/loaders/.debug/* \
+ ${libdir}/gtk-2.0/${LIBV}/immodules/.debug/* \
+ ${libdir}/gtk-2.0/${LIBV}/engines/.debug/*"
+
RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans"
RRECOMMENDS_${PN}_angstrom = "glibc-gconv-iso8859-1 ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm"
RRECOMMENDS_${PN}_openzaurus = "glibc-gconv-iso8859-1 ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm"
============================================================
--- packages/gtk+/gtk+_2.6.10.bb 04836ee19148a317fdfb165b07c1b8eeb8c6702a
+++ packages/gtk+/gtk+_2.6.10.bb d51cb7ad72b124f7f36ef3acd12e60f6cef2a8f0
@@ -5,7 +5,7 @@ DEPENDS = "glib-2.0 pango atk jpeg libpn
SECTION = "libs"
PRIORITY = "optional"
DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt"
-PR = "r3"
+PR = "r4"
SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \
file://help.patch;patch=1 \
@@ -27,12 +27,24 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-quer
inherit autotools pkgconfig
FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
+ ${bindir}/gtk-update-icon-cache \
${bindir}/gtk-query-immodules-2.0 \
${libdir}/lib*.so.* \
${datadir}/themes ${sysconfdir} \
${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so"
-FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource"
+FILES_${PN}-dev += " \
+ ${datadir}/gtk-2.0/include \
+ ${libdir}/gtk-2.0/include \
+ ${libdir}/gtk-2.0/${LIBV}/loaders/*.la \
+ ${libdir}/gtk-2.0/${LIBV}/immodules/*.la \
+ ${libdir}/gtk-2.0/${LIBV}/engines/*.la \
+ ${bindir}/gdk-pixbuf-csource"
+FILES_${PN}-dbg += " \
+ ${libdir}/gtk-2.0/${LIBV}/loaders/.debug/* \
+ ${libdir}/gtk-2.0/${LIBV}/immodules/.debug/* \
+ ${libdir}/gtk-2.0/${LIBV}/engines/.debug/*"
+
RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans"
EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration"
============================================================
--- packages/gtk+/gtk+_2.8.16.bb 8d295805aa787dc71bd7bf18ec5375eda37b2e84
+++ packages/gtk+/gtk+_2.8.16.bb e08b612ea805b2a48c5d28753416be75dd839464
@@ -5,7 +5,7 @@ DEPENDS = "glib-2.0 pango atk jpeg libpn
SECTION = "libs"
PRIORITY = "optional"
DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo"
-PR = "r3"
+PR = "r4"
DEFAULT_PREFERENCE = "-1"
@@ -36,7 +36,17 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-quer
${libdir}/lib*.so.* \
${datadir}/themes ${sysconfdir} \
${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so"
-FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource"
+FILES_${PN}-dev += " \
+ ${datadir}/gtk-2.0/include \
+ ${libdir}/gtk-2.0/include \
+ ${libdir}/gtk-2.0/${LIBV}/loaders/*.la \
+ ${libdir}/gtk-2.0/${LIBV}/immodules/*.la \
+ ${libdir}/gtk-2.0/${LIBV}/engines/*.la \
+ ${bindir}/gdk-pixbuf-csource"
+FILES_${PN}-dbg += " \
+ ${libdir}/gtk-2.0/${LIBV}/loaders/.debug/* \
+ ${libdir}/gtk-2.0/${LIBV}/immodules/.debug/* \
+ ${libdir}/gtk-2.0/${LIBV}/engines/.debug/*"
RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans"
============================================================
--- packages/gtk+/gtk+_2.8.9.bb 953a6c4676bbbcc8a18749d3751d9359101699ee
+++ packages/gtk+/gtk+_2.8.9.bb 41ef94b7bab795a01b7ce04ae86c990521f8a2b0
@@ -5,7 +5,7 @@ DEPENDS = "glib-2.0 pango atk jpeg libpn
SECTION = "libs"
PRIORITY = "optional"
DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo"
-PR = "r5"
+PR = "r6"
SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \
file://no-xwc.patch;patch=1 \
@@ -31,8 +31,18 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-quer
${datadir}/themes ${sysconfdir} \
${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so \
${bindir}/gtk-update-icon-cache"
+FILES_${PN}-dev += " \
+ ${datadir}/gtk-2.0/include \
+ ${libdir}/gtk-2.0/include \
+ ${libdir}/gtk-2.0/${LIBV}/loaders/*.la \
+ ${libdir}/gtk-2.0/${LIBV}/immodules/*.la \
+ ${libdir}/gtk-2.0/${LIBV}/engines/*.la \
+ ${bindir}/gdk-pixbuf-csource"
+FILES_${PN}-dbg += " \
+ ${libdir}/gtk-2.0/${LIBV}/loaders/.debug/* \
+ ${libdir}/gtk-2.0/${LIBV}/immodules/.debug/* \
+ ${libdir}/gtk-2.0/${LIBV}/engines/.debug/*"
-FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource"
RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans"
RRECOMMENDS_${PN}_angstrom = "glibc-gconv-iso8859-1 ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm"
More information about the Openembedded-commits
mailing list