summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Boor <florian.boor@kernelconcepts.de>2007-05-16 00:17:58 +0000
committerFlorian Boor <florian.boor@kernelconcepts.de>2007-05-16 00:17:58 +0000
commit5a31e33258c19b0ca28bf72910db0b3fd0ffb96d (patch)
tree3fcc2c9f12c743f0d5a61499b734614cf49565c4
parentafb0b01f1860f482b916fa3570912dc2091c928f (diff)
parent516830b16ecd87cb387d80bfcab53496beae3425 (diff)
merge of 'b43a990c14ad8ab39c9290ff13c74413357d3365'
and 'e39fd671622f6b7d265429c36cb31a14283b6232'
-rw-r--r--packages/gpe-bluetooth/gpe-bluetooth_svn.bb8
-rw-r--r--packages/gtk-webcore/osb-jscore_svn.bb8
-rw-r--r--packages/gtk-webcore/osb-nrcit_svn.bb2
-rw-r--r--packages/gtk-webcore/osb-nrcore_svn.bb11
4 files changed, 24 insertions, 5 deletions
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_svn.bb b/packages/gpe-bluetooth/gpe-bluetooth_svn.bb
new file mode 100644
index 0000000000..26b0215238
--- /dev/null
+++ b/packages/gpe-bluetooth/gpe-bluetooth_svn.bb
@@ -0,0 +1,8 @@
+require gpe-bluetooth.inc
+
+PV = "0.54+svn${SRCDATE}"
+PR = "r0"
+
+SRC_URI = "${GPE_SVN}"
+
+S = ${WORKDIR}/${PN} \ No newline at end of file
diff --git a/packages/gtk-webcore/osb-jscore_svn.bb b/packages/gtk-webcore/osb-jscore_svn.bb
index 25e42cd85c..51597b0908 100644
--- a/packages/gtk-webcore/osb-jscore_svn.bb
+++ b/packages/gtk-webcore/osb-jscore_svn.bb
@@ -6,7 +6,7 @@ PRIORITY = "optional"
DEFAULT_PREFERENCE = "-1"
PV = "0.5.2+svn${SRCDATE}"
-PR = "r0"
+PR = "r1"
SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=JavaScriptCore;proto=https \
file://gcc4-fno-threadsafe-statics-JavaScriptCore.patch;patch=1"
@@ -28,14 +28,14 @@ do_configure () {
}
do_stage () {
- oe_libinstall -so -C kjs libjscore ${STAGING_LIBDIR}
+ oe_libinstall -so -C kjs libgtk_webcore_jscore ${STAGING_LIBDIR}
autotools_stage_includes
install -d ${STAGING_INCDIR}/osb/JavaScriptCore
for i in ${S}/kjs/*.h ${S}/kjs/new; do
install -m 0644 $i ${STAGING_INCDIR}/osb/JavaScriptCore
- install -d ${STAGING_INCDIR}/../share/osb-jscore
- install -m 0755 ${S}/kjs/create_hash_table ${STAGING_INCDIR}/../share/osb-jscore
+ install -d ${STAGING_INCDIR}/../share/gtk-webcore-jscore
+ install -m 0755 ${S}/kjs/create_hash_table ${STAGING_INCDIR}/../share/gtk-webcore-jscore
done
}
diff --git a/packages/gtk-webcore/osb-nrcit_svn.bb b/packages/gtk-webcore/osb-nrcit_svn.bb
index e42bcd4445..78f3af7b6f 100644
--- a/packages/gtk-webcore/osb-nrcit_svn.bb
+++ b/packages/gtk-webcore/osb-nrcit_svn.bb
@@ -29,7 +29,7 @@ do_configure () {
}
do_stage () {
- oe_libinstall -so -C src libnrcit ${STAGING_LIBDIR}
+ oe_libinstall -so -C src libgtk_webcore_nrcit ${STAGING_LIBDIR}
autotools_stage_includes
diff --git a/packages/gtk-webcore/osb-nrcore_svn.bb b/packages/gtk-webcore/osb-nrcore_svn.bb
index 7959a7e752..a6a70059fa 100644
--- a/packages/gtk-webcore/osb-nrcore_svn.bb
+++ b/packages/gtk-webcore/osb-nrcore_svn.bb
@@ -11,3 +11,14 @@ SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;modul
S = "${WORKDIR}/NRCore"
+do_stage () {
+ oe_libinstall -so libgtk_webcore_nrcore ${STAGING_LIBDIR}
+ oe_libinstall -so -C kwiq libgtk_webcore_nrcore_kwiq_gtk ${STAGING_LIBDIR}
+
+ autotools_stage_includes
+
+ install -d ${STAGING_INCDIR}/osb/NRCore
+ for i in ${S}/kwiq/WebCore*.h ${S}/kwiq/KWIQ*.h; do
+ install -m 0644 $i ${STAGING_INCDIR}/osb/NRCore
+ done
+}