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

diff --git a/gtk+/gtk+-2.4.4/small-gtkfilesel.patch b/gtk+/gtk+-2.4.4/small-gtkfilesel.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gtk+/gtk+_2.4.4.oe b/gtk+/gtk+_2.4.4.oe
index bd26cb6..e51ab57 100644 (file)
--- 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 (file)
index 0000000..a3ed220
--- /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 8a93d23..b3492b3 100644 (file)
--- 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