summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2005-11-27 17:54:51 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-11-27 17:54:51 +0000
commita76c9a11d5dc4d2d7df13ce3a9a6d0e09ab06903 (patch)
treef61196dd0c41013830da836c02e0da8c55dc551b
parentc9036b05aedc8b6c7df13f63087110fc48291b98 (diff)
osb-nrcit 20050430: add patch to improve 'stop' handling, courtesy Philippe De Swert, closes #477
-rw-r--r--packages/gtk-webcore/files/stop-load.image-loading.patch44
-rw-r--r--packages/gtk-webcore/osb-nrcit_20050430.bb5
2 files changed, 47 insertions, 2 deletions
diff --git a/packages/gtk-webcore/files/stop-load.image-loading.patch b/packages/gtk-webcore/files/stop-load.image-loading.patch
new file mode 100644
index 0000000000..47200825c0
--- /dev/null
+++ b/packages/gtk-webcore/files/stop-load.image-loading.patch
@@ -0,0 +1,44 @@
+--- NRCit/src/frameimpl.cpp.orig 2005-02-16 11:33:16.000000000 +0200
++++ NRCit/src/frameimpl.cpp 2005-10-28 00:44:15.000000000 +0300
+@@ -152,6 +152,7 @@
+
+ void FrameImpl::stopLoad()
+ {
++ frameLoadDelegate()->onFrameLoadFinished(this, 1);
+ closeURL();
+ }
+
+--- NRCit/src/ImageRenderer.cpp.orig 2005-02-16 11:33:16.000000000 +0200
++++ NRCit/src/ImageRenderer.cpp 2005-10-28 20:43:42.000000000 +0300
+@@ -133,19 +133,19 @@
+ g_object_ref(pixbuf);
+ } else {
+ // not loading
+- if (ir.anim) {
++ /*if (ir.anim) {
+ // is an animation => get own pixbuf, owned by iterator
+ anim = ir.anim;
+ g_object_ref(anim);
+ assert(ir.iter);
+ iter = gdk_pixbuf_animation_get_iter(anim, NULL);
+- } else {
++ } else {*/
+ // not an animation
+ assert(!ir.iter);
+ pixbuf = ir.pixbuf;
+ if (pixbuf)
+ g_object_ref(pixbuf);
+- }
++ //}
+ }
+ }
+
+@@ -415,7 +417,7 @@
+
+ void ImageRenderer::stopAnimation()
+ {
+- //stopped = true;
++ stopped = true;
+ }
+
+ void ImageRenderer::tileInRect(GdkRectangle* r, int sx, int sy, CGContextRef context)
diff --git a/packages/gtk-webcore/osb-nrcit_20050430.bb b/packages/gtk-webcore/osb-nrcit_20050430.bb
index 6d53ff3ecc..6daa6a2016 100644
--- a/packages/gtk-webcore/osb-nrcit_20050430.bb
+++ b/packages/gtk-webcore/osb-nrcit_20050430.bb
@@ -7,12 +7,13 @@ SECTION = "gpe"
FIXEDCVSDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
PV = "0.5.0+cvs${FIXEDCVSDATE}"
-PR = "r1"
+PR = "r2"
DEPENDS = "curl librsvg osb-nrcore"
SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gtk-webcore;module=NRCit;date=${FIXEDCVSDATE} \
- file://gdk-colorspace.diff;patch=1"
+ file://stop-load.image-loading.patch;patch=1 \
+ file://gdk-colorspace.diff;patch=1"
S = "${WORKDIR}/NRCit"
inherit autotools pkgconfig