diff options
| author | Adrian Davey <ade@beth2.org> | 2006-01-16 16:05:31 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-16 16:05:31 +0000 |
| commit | 5296d0212e55e49fd0afce08751c54b5057a84fa (patch) | |
| tree | 502beaa92d47c0e76cf5f1b5c4cd5e42f5f74d67 | |
| parent | c10a9dc08e6f05e1b7ea6cbd90476c573ba75c4a (diff) | |
| parent | 04c2dc3bcf1aa6282713546208db8591e5487db8 (diff) | |
merge of 11e32f6f530670e04143728af2b7b193a6d33ba2
and 36b037a423c8b35b017dc3b821094d570ea82d5a
| -rw-r--r-- | conf/distro/openzaurus-unstable.conf | 2 | ||||
| -rw-r--r-- | packages/libcontactsdb/libcontactsdb_cvs.bb | 2 | ||||
| -rw-r--r-- | packages/sylpheed/files/Makefile-am.patch | 12 | ||||
| -rw-r--r-- | packages/sylpheed/sylpheed_1.9.12.bb | 7 | ||||
| -rw-r--r-- | packages/xserver/xserver-kdrive_20050207.bb | 5 |
5 files changed, 22 insertions, 6 deletions
diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf index 009f9c9290..072c69c5a0 100644 --- a/conf/distro/openzaurus-unstable.conf +++ b/conf/distro/openzaurus-unstable.conf @@ -58,7 +58,7 @@ PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie" # PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" PREFERRED_PROVIDER_x11 = "diet-x11" -include conf/distro/preferred-gpe-versions-2.7.inc +include conf/distro/preferred-gpe-versions-2.8.inc # # E diff --git a/packages/libcontactsdb/libcontactsdb_cvs.bb b/packages/libcontactsdb/libcontactsdb_cvs.bb index 229326752d..c6a8fad421 100644 --- a/packages/libcontactsdb/libcontactsdb_cvs.bb +++ b/packages/libcontactsdb/libcontactsdb_cvs.bb @@ -10,6 +10,8 @@ S = "${WORKDIR}/${PN}" PV = "0.1+cvs${SRCDATE}" PR = "r0" +DEFAULT_PREFERENCE = "-1" + inherit autotools gpe pkgconfig SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" diff --git a/packages/sylpheed/files/Makefile-am.patch b/packages/sylpheed/files/Makefile-am.patch new file mode 100644 index 0000000000..d1fb09ffcf --- /dev/null +++ b/packages/sylpheed/files/Makefile-am.patch @@ -0,0 +1,12 @@ +--- sylpheed-1.9.12/src/Makefile.am.orig 2006-01-16 13:14:05.000000000 +0000 ++++ sylpheed-1.9.12/src/Makefile.am 2006-01-16 13:14:19.000000000 +0000 +@@ -177,8 +177,7 @@ + -DG_LOG_DOMAIN=\"Sylpheed\" \ + $(GTK_CFLAGS) \ + $(GDK_PIXBUF_CFLAGS) \ +- $(GPGME_CFLAGS) \ +- -I$(includedir) ++ $(GPGME_CFLAGS) + + sylpheed_LDADD = \ + $(INTLLIBS) \ diff --git a/packages/sylpheed/sylpheed_1.9.12.bb b/packages/sylpheed/sylpheed_1.9.12.bb index a6b8cb1738..b02aead205 100644 --- a/packages/sylpheed/sylpheed_1.9.12.bb +++ b/packages/sylpheed/sylpheed_1.9.12.bb @@ -3,15 +3,16 @@ DESCRIPTION = "Mail user agent" DEPENDS = "gtk+ gpgme gnutls" MAINTAINER = "Phil Blundell <pb@handhelds.org>" LICENSE = "GPL" -PR = "r2" +PR = "r3" SRC_URI = "http://sylpheed.good-day.net/sylpheed/v1.9/sylpheed-1.9.12.tar.bz2 \ - file://sylpheed-gnutls.patch;patch=1" + file://sylpheed-gnutls.patch;patch=1 \ + file://Makefile-am.patch;patch=1" FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications" FILES_${PN}-doc += "${datadir}" -EXTRA_OECONF = "--enable-gnutls --includedir=${STAGING_INCDIR}" +EXTRA_OECONF = "--enable-gnutls" CFLAGS += "-D_GNU_SOURCE" diff --git a/packages/xserver/xserver-kdrive_20050207.bb b/packages/xserver/xserver-kdrive_20050207.bb index 6ebbd2ce40..788b8580c4 100644 --- a/packages/xserver/xserver-kdrive_20050207.bb +++ b/packages/xserver/xserver-kdrive_20050207.bb @@ -20,7 +20,7 @@ DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Ep DESCRIPTION_xserver-kdrive-fake = "Fake X server" DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" -PR = "r10" +PR = "r11" FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" FILES_xserver-kdrive-ati = "${bindir}/Xati" @@ -66,4 +66,5 @@ S = "${WORKDIR}/xserver" inherit autotools pkgconfig -EXTRA_OECONF = "--enable-composite --disable-xinerama" +LDFLAGS += " -lXfont -lXdmcp -lXau " +EXTRA_OECONF = "--enable-static=no --disable-static --enable-composite --disable-xinerama" |