diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-05-22 16:47:36 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-05-22 16:47:36 +0000 |
| commit | 2b8f679ffe5929b5a11eb71e514aa4997c36f13e (patch) | |
| tree | cab0f25aca03f6162bd268a401945fbfbb63bff9 /gtk+ | |
| parent | 5df179157f90b18f437c6978efb451f515e3d1c9 (diff) | |
Merges.
2004/05/22 12:46:48-04:00 local!kergoth
Bugfixes per the recent FILESDIR cleanup.
2004/05/22 01:03:38-04:00 local!kergoth
Run a perl script against the repo to kill off direct FILESDIR usage
in favor of relative file:// paths in SRC_URI, and WORKDIR references
in functions.
2004/05/21 23:07:58-04:00 local!kergoth
Switch file:// FILESDIR uris in SRC_URI to the new relative path format.
BKrev: 40af8428aNyDLBX0MRtyso3VCpMv1w
Diffstat (limited to 'gtk+')
| -rw-r--r-- | gtk+/gtk+_2.2.4.oe | 18 | ||||
| -rw-r--r-- | gtk+/gtk+_2.4.1.oe | 11 |
2 files changed, 16 insertions, 13 deletions
diff --git a/gtk+/gtk+_2.2.4.oe b/gtk+/gtk+_2.2.4.oe index 182527e546..36c78afee7 100644 --- a/gtk+/gtk+_2.2.4.oe +++ b/gtk+/gtk+_2.2.4.oe @@ -7,19 +7,21 @@ MAINTAINER = "Philip Blundell <pb@handhelds.org>" DEPENDS = "pango atk jpeg libpng xext" SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.2/gtk+-${PV}.tar.bz2 \ - http://handhelds.org/packages/gtk-2.0/gtk+-2.2.4.diff.bz2;patch=1;pnum=1 \ - file://${FILESDIR}/automake-lossage.patch;patch=1;pnum=0 \ - file://${FILESDIR}/configure-lossage.patch;patch=1;pnum=0 \ - file://${FILESDIR}/no-demos.patch;patch=1 \ - file://${FILESDIR}/libtool-lossage.patch;patch=1;pnum=0 \ - file://${FILESDIR}/no-xwc.patch;patch=1;pnum=0" + http://handhelds.org/packages/gtk-2.0/gtk+-2.2.4.diff.bz2;patch=1;pnum=1 \ + file://automake-lossage.patch;patch=1;pnum=0 \ + file://configure-lossage.patch;patch=1;pnum=0 \ + file://no-demos.patch;patch=1 \ + file://libtool-lossage.patch;patch=1;pnum=0 \ + file://no-xwc.patch;patch=1;pnum=0 \ + file://glib-2.0.m4 \ + file://glib-gettext.m4" inherit autotools pkgconfig do_configure_prepend() { install -d m4 - install ${FILESDIR}/glib-2.0.m4 m4/ - install ${FILESDIR}/glib-gettext.m4 m4/ + install ${WORKDIR}/glib-2.0.m4 m4/ + install ${WORKDIR}/glib-gettext.m4 m4/ } EXTRA_OECONF = "--without-libtiff --enable-debug=no --disable-cruft" diff --git a/gtk+/gtk+_2.4.1.oe b/gtk+/gtk+_2.4.1.oe index 39a9676773..b542080c5f 100644 --- a/gtk+/gtk+_2.4.1.oe +++ b/gtk+/gtk+_2.4.1.oe @@ -7,16 +7,17 @@ MAINTAINER = "Philip Blundell <pb@handhelds.org>" DEPENDS = "glib-2.0 pango atk jpeg libpng xext" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/gtk+-${PV}.tar.bz2 \ - file://${FILESDIR}/no-demos.patch;patch=1 \ - file://${FILESDIR}/automake-lossage.patch;patch=1 \ - file://${FILESDIR}/gtk-doc.m4 \ - file://${FILESDIR}/gtk+-handhelds.patch;patch=1" + file://no-demos.patch;patch=1 \ + file://automake-lossage.patch;patch=1 \ + file://gtk-doc.m4 \ + file://gtk+-handhelds.patch;patch=1 \ + file://gtk-doc.m4" inherit autotools pkgconfig do_configure_prepend() { install -d m4 - install ${FILESDIR}/gtk-doc.m4 m4/ + install ${WORKDIR}/gtk-doc.m4 m4/ } # gcc-3.4 blows up in gtktext with -frename-registers on arm-linux |