tags 550868 + patch thank you
Vedran, Here is a patch that seems to work. Probably needs some good runtime testing though. This also includes a "fix" for the other RC bug by just dropping the build-dep on libstdcxxx. Thanks, Barry deFreese Debian QA
diff -u bfilter-1.1.4+svn20090620/debian/changelog bfilter-1.1.4+svn20090620/debian/changelog --- bfilter-1.1.4+svn20090620/debian/changelog +++ bfilter-1.1.4+svn20090620/debian/changelog @@ -1,3 +1,12 @@ +bfilter (1.1.4+svn20090620-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Drop libstcxxx build-dep. (Closes: #547977). + * 02_js_setbranchcallback.diff - (Closes: #550868). + + Replace JS_SetBranchCallback with JS_SetOperationCallback. + + -- Barry deFreese <bdefre...@debian.org> Tue, 13 Oct 2009 11:49:41 -0400 + bfilter (1.1.4+svn20090620-1) unstable; urgency=low * New svn upstream release diff -u bfilter-1.1.4+svn20090620/debian/control bfilter-1.1.4+svn20090620/debian/control --- bfilter-1.1.4+svn20090620/debian/control +++ bfilter-1.1.4+svn20090620/debian/control @@ -4,7 +4,7 @@ Maintainer: Vedran FuraÄ <vedran.fu...@gmail.com> Homepage: http://bfilter.sf.net Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 5.0.34), libtool, - zlib1g-dev, libgtkmm-2.4-dev, libsigc++-2.0-dev, libstdc++6-4.2-dev, libace-dev, + zlib1g-dev, libgtkmm-2.4-dev, libsigc++-2.0-dev, libace-dev, libxcursor-dev, libxrender-dev, libxrandr-dev, libxi-dev, libxfixes-dev, libxext-dev, libx11-dev, libpng12-dev, libpango1.0-dev, libgtk2.0-dev, libglib2.0-dev, libfreetype6-dev, libfontconfig1-dev, libcairo2-dev (>= 1.6.4-6), @@ -97 +97 @@ - This package contains the debugging symbols for bfilter \ No newline at end of file + This package contains the debugging symbols for bfilter only in patch2: unchanged: --- bfilter-1.1.4+svn20090620.orig/debian/patches/02_js_setbranchcallback.diff +++ bfilter-1.1.4+svn20090620/debian/patches/02_js_setbranchcallback.diff @@ -0,0 +1,60 @@ +diff -Nur -x '*.orig' -x '*~' bfilter-1.1.4+svn20090620/libjs/environment/JsEnvironment.cpp bfilter-1.1.4+svn20090620.new/libjs/environment/JsEnvironment.cpp +--- bfilter-1.1.4+svn20090620/libjs/environment/JsEnvironment.cpp 2009-10-16 11:07:53.000000000 -0400 ++++ bfilter-1.1.4+svn20090620.new/libjs/environment/JsEnvironment.cpp 2009-10-16 11:08:02.000000000 -0400 +@@ -110,7 +110,7 @@ + static void errorReporter( + JSContext *cx, const char *msg, JSErrorReport *report); + +- static JSBool branchCallback(JSContext *cx, JSScript *script); ++ static JSBool branchCallback(JSContext *cx); + + static JSBool cookieGetter( + JSContext *cx, JSObject *obj, jsval id, jsval *vp); +@@ -359,7 +359,7 @@ + + JS_SetContextPrivate(m_pContext, this); + JS_SetErrorReporter(m_pContext, &errorReporter); +- JS_SetBranchCallback(m_pContext, &branchCallback); ++ JS_SetOperationCallback(m_pContext, &branchCallback); + + m_pWindowObj = jsNewObject(&m_sWindowClass, 0, 0); + if (!JS_InitStandardClasses(m_pContext, m_pWindowObj)) { +@@ -602,7 +602,7 @@ + } + + JSBool +-JsEnvironment::Context::branchCallback(JSContext* cx, JSScript* script) ++JsEnvironment::Context::branchCallback(JSContext* cx) + { + Context* context = getEnvContext(cx); + if (++context->m_branchCount < BRANCH_LIMIT) { +diff -Nur -x '*.orig' -x '*~' bfilter-1.1.4+svn20090620/libjs/environment/JsFilterContext.cpp bfilter-1.1.4+svn20090620.new/libjs/environment/JsFilterContext.cpp +--- bfilter-1.1.4+svn20090620/libjs/environment/JsFilterContext.cpp 2006-04-17 12:18:20.000000000 -0400 ++++ bfilter-1.1.4+svn20090620.new/libjs/environment/JsFilterContext.cpp 2009-10-16 11:09:14.000000000 -0400 +@@ -62,7 +62,7 @@ + + static void errorReporter(JSContext *cx, const char *msg, JSErrorReport *report); + +- static JSBool branchCallback(JSContext *cx, JSScript *script); ++ static JSBool branchCallback(JSContext *cx); + + static JSBool log(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); + +@@ -124,7 +124,7 @@ + JsRequestScope rscope(m_pContext); + + JS_SetErrorReporter(m_pContext, &errorReporter); +- JS_SetBranchCallback(m_pContext, &branchCallback); ++ JS_SetOperationCallback(m_pContext, &branchCallback); + + m_pRoot = JS_NewObject(m_pContext, 0, 0, 0); + if (!m_pRoot) { +@@ -240,7 +240,7 @@ + } + + JSBool +-JsFilterContext::Impl::branchCallback(JSContext *cx, JSScript *script) ++JsFilterContext::Impl::branchCallback(JSContext *cx) + { + Impl* impl = static_cast<Impl*>(JS_GetContextPrivate(cx)); + if (++impl->m_branchCount < BRANCH_LIMIT) {
