summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2007-01-06 08:40:05 +0000
committerMarcin Juszkiewicz <hrw@openembedded.org>2007-01-06 08:40:05 +0000
commitf2a8bfcef647a757bdc86cdff43888714d3f3b0d (patch)
tree4a870fe96ffc3d048e22039410df20452601a3b7
parentd8d6c432bdc95f7ce9500ada93b1f716dafc7891 (diff)
parentc6513255ea6c80568472c317339f693f75c26407 (diff)
merge of '44f1e05faf7c7b048dbf53c08ede5b091b16a321'
and 'c9364961fa6fec14e6bb79b94e98bde8d4881912'
-rw-r--r--packages/gpe-mini-browser/gpe-mini-browser_0.19.bb2
-rw-r--r--packages/tasks/task-gpe.bb2
-rw-r--r--site/sh-common1
3 files changed, 4 insertions, 1 deletions
diff --git a/packages/gpe-mini-browser/gpe-mini-browser_0.19.bb b/packages/gpe-mini-browser/gpe-mini-browser_0.19.bb
index 225a12d4ae..74c31e09f3 100644
--- a/packages/gpe-mini-browser/gpe-mini-browser_0.19.bb
+++ b/packages/gpe-mini-browser/gpe-mini-browser_0.19.bb
@@ -4,6 +4,8 @@ SRC_URI = "http://gpe.linuxtogo.org/download/source/gpe-mini-browser-${PV}.tar.g
DEPENDS = "osb-nrcit sqlite libgpewidget"
RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg"
+PR = "r1"
+
S = "${WORKDIR}/gpe-mini-browser-${PV}"
inherit autotools
diff --git a/packages/tasks/task-gpe.bb b/packages/tasks/task-gpe.bb
index b93c5b7165..b59b3ceea3 100644
--- a/packages/tasks/task-gpe.bb
+++ b/packages/tasks/task-gpe.bb
@@ -134,5 +134,5 @@ RDEPENDS_gpe-task-sectest := "\
kismet \
hydra \
thcrut \
- driftnet \
miniclipboard"
+# driftnet \
diff --git a/site/sh-common b/site/sh-common
index 57afea2ee7..7165542ebe 100644
--- a/site/sh-common
+++ b/site/sh-common
@@ -37,6 +37,7 @@ ac_cv_time_r_type=${ac_cv_time_r_type=POSIX}
# apache
ac_cv_func_pthread_key_delete=${ac_cv_func_pthread_key_delete=yes}
apr_cv_process_shared_works=${apr_cv_process_shared_works=no}
+apr_cv_tcp_nodelay_with_cork=${apr_cv_tcp_nodelay_with_cork=yes}
ac_cv_sizeof_ssize_t=${ac_cv_sizeof_ssize_t=4}
ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no}