diff options
| author | Chris Lord <chris@openedhand.com> | 2004-09-13 19:49:07 +0000 |
|---|---|---|
| committer | Chris Lord <chris@openedhand.com> | 2004-09-13 19:49:07 +0000 |
| commit | d6543dab4e77fb9fbc35e24ab794db09239a818b (patch) | |
| tree | 1d291e2b9d0af5a58ca8a1cf639c6b43b342f876 | |
| parent | 0fac358425551279ea6482915d35e5874839045e (diff) | |
Merge bk://openembedded@openembedded.bkbits.net/packages
into chris.(none):/home/cwiiis/oe/packages
2004/09/13 19:22:25+01:00 (none)!cwiiis
Fix libipkg, modify file-selector dialog in gtk+-2.4.4.
BKrev: 4145f9b3Pc77rZiynOXK8jmTinV2fg
| -rw-r--r-- | gtk+/gtk+-2.4.4/small-gtkfilesel.patch | 0 | ||||
| -rw-r--r-- | gtk+/gtk+_2.4.4.oe | 5 | ||||
| -rw-r--r-- | ipkg/ipkg-0.99.129/uninclude-replace.patch | 10 | ||||
| -rw-r--r-- | ipkg/ipkg_0.99.129.oe | 5 |
4 files changed, 16 insertions, 4 deletions
diff --git a/gtk+/gtk+-2.4.4/small-gtkfilesel.patch b/gtk+/gtk+-2.4.4/small-gtkfilesel.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/gtk+/gtk+-2.4.4/small-gtkfilesel.patch diff --git a/gtk+/gtk+_2.4.4.oe b/gtk+/gtk+_2.4.4.oe index bd26cb6f05..e51ab57047 100644 --- a/gtk+/gtk+_2.4.4.oe +++ b/gtk+/gtk+_2.4.4.oe @@ -5,7 +5,7 @@ SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Philip Blundell <pb@handhelds.org>" DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor" -PR = "r5" +PR = "r6" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/gtk+-${PV}.tar.bz2 \ file://no-demos.patch;patch=1 \ @@ -16,7 +16,8 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/gtk+-${PV}.tar.bz2 \ file://spinbutton.patch;patch=1 \ file://disable-tooltips.patch;patch=1 \ file://gtklabel-resize-patch;patch=1 \ - file://gtk-doc.m4" + file://gtk-doc.m4 \ + file://small-gtkfilesel.patch;patch=1" inherit autotools pkgconfig flow-lossage diff --git a/ipkg/ipkg-0.99.129/uninclude-replace.patch b/ipkg/ipkg-0.99.129/uninclude-replace.patch new file mode 100644 index 0000000000..a3ed2201fd --- /dev/null +++ b/ipkg/ipkg-0.99.129/uninclude-replace.patch @@ -0,0 +1,10 @@ +--- C/includes.h 2003-03-28 19:36:22.000000000 +0000 ++++ C/includes.h 2004-07-28 03:41:11.000000000 +0100 +@@ -48,6 +48,6 @@ + # include <unistd.h> + #endif + +-#include "replace/replace.h" ++//#include "replace/replace.h" + + #endif diff --git a/ipkg/ipkg_0.99.129.oe b/ipkg/ipkg_0.99.129.oe index 8a93d235df..b3492b3c41 100644 --- a/ipkg/ipkg_0.99.129.oe +++ b/ipkg/ipkg_0.99.129.oe @@ -2,7 +2,7 @@ DESCRIPTION = "Itsy Package Manager" DESCRIPTION_libipkg = "Itsy Package Manager Library" LICENSE = "GPL" PROVIDES = "virtual/ipkg libipkg" -PR = "r2" +PR = "r3" PACKAGES =+ "libipkg-dev libipkg" FILES_libipkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so" @@ -10,7 +10,8 @@ FILES_libipkg = "${libdir}" AUTO_LIBNAME_PKGS = "libipkg" SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=familiar/dist/ipkg;tag=${@'V' + oe.data.getVar('PV',d,1).replace('.', '-')} \ - file://buffer-overflow.patch;patch=1" + file://buffer-overflow.patch;patch=1 \ + file://uninclude-replace.patch;patch=1" S = "${WORKDIR}/ipkg/C" inherit autotools pkgconfig |