[SCM] mediatomb/master: Drop -fpermissive from js_1.8_support.patch.
zumbi at users.alioth.debian.org
zumbi at users.alioth.debian.org
Sun Mar 11 14:33:55 UTC 2012
The following commit has been merged in the master branch:
commit bfae3b10b35b1021fa4bac7e5a67bf1efbdc2709
Author: Hector Oron <hector.oron at gmail.com>
Date: Sun Mar 11 15:20:01 2012 +0100
Drop -fpermissive from js_1.8_support.patch.
It makes unapply patches to fail after build has finalized.
Signed-off-by: Hector Oron <hector.oron at gmail.com>
diff --git a/debian/changelog b/debian/changelog
index b05e904..a982f5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,7 +20,11 @@ mediatomb (0.12.1-3) UNRELEASED; urgency=low
* Most of the patches originate from the Fedora mediatomb maintainers. Thanks
go to them.
- -- Miguel Colon <debian.micove at gmail.com> Sat, 03 Mar 2012 23:40:25 -0500
+ [ Hector Oron ]
+ * Drop -fpermissive from js_1.8_support.patch, as it makes unapply patches
+ to fail after build has finalized.
+
+ -- Hector Oron <zumbi at debian.org> Sun, 11 Mar 2012 15:18:01 +0100
mediatomb (0.12.1-2) unstable; urgency=low
diff --git a/debian/patches/js_1.8_support.patch b/debian/patches/js_1.8_support.patch
index 01ce655..a869df9 100644
--- a/debian/patches/js_1.8_support.patch
+++ b/debian/patches/js_1.8_support.patch
@@ -4,22 +4,11 @@ Bug-Debian: http://bugs.debian.org/631046
Forwarded: http://sourceforge.net/tracker/?func=detail&aid=3409482&group_id=129766&atid=715782
Last-Update: 2012-03-03
-diff -up mediatomb-0.12.1-back/build/Makefile.in.tonewjs mediatomb-0.12.1-back/build/Makefile.in
---- mediatomb-0.12.1-back/build/Makefile.in.tonewjs 2010-04-08 00:40:15.000000000 +0200
-+++ mediatomb-0.12.1-back/build/Makefile.in 2011-04-19 17:17:01.343509944 +0200
-@@ -257,7 +257,7 @@ CURL_LIBS = @CURL_LIBS@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
- CXXDEPMODE = @CXXDEPMODE@
--CXXFLAGS = @CXXFLAGS@
-+CXXFLAGS = -fpermissive @CXXFLAGS@
- CYGPATH_W = @CYGPATH_W@
- DB_AUTOCREATE_OPTION_ENABLED = @DB_AUTOCREATE_OPTION_ENABLED@
- DB_AUTOCREATE_OPTION_REQUESTED = @DB_AUTOCREATE_OPTION_REQUESTED@
-diff -up mediatomb-0.12.1-back/src/scripting/import_script.cc.tonewjs mediatomb-0.12.1-back/src/scripting/import_script.cc
---- mediatomb-0.12.1-back/src/scripting/import_script.cc.tonewjs 2011-04-18 13:10:48.000000000 +0200
-+++ mediatomb-0.12.1-back/src/scripting/import_script.cc 2011-04-18 13:29:36.000000000 +0200
-@@ -53,8 +53,8 @@ ImportScript::ImportScript(Ref<Runtime>
+Index: mediatomb-0.12.1/src/scripting/import_script.cc
+===================================================================
+--- mediatomb-0.12.1.orig/src/scripting/import_script.cc 2012-03-11 13:59:37.504024032 +0000
++++ mediatomb-0.12.1/src/scripting/import_script.cc 2012-03-11 13:59:42.456024047 +0000
+@@ -53,8 +53,8 @@
try
{
load(scriptPath);
@@ -30,7 +19,7 @@ diff -up mediatomb-0.12.1-back/src/scripting/import_script.cc.tonewjs mediatomb-
}
catch (Exception ex)
{
-@@ -117,7 +117,7 @@ ImportScript::~ImportScript()
+@@ -117,7 +117,7 @@
#endif
if (root)
@@ -39,10 +28,11 @@ diff -up mediatomb-0.12.1-back/src/scripting/import_script.cc.tonewjs mediatomb-
#ifdef JS_THREADSAFE
JS_EndRequest(cx);
-diff -up mediatomb-0.12.1-back/src/scripting/js_functions.cc.tonewjs mediatomb-0.12.1-back/src/scripting/js_functions.cc
---- mediatomb-0.12.1-back/src/scripting/js_functions.cc.tonewjs 2011-04-18 13:29:55.000000000 +0200
-+++ mediatomb-0.12.1-back/src/scripting/js_functions.cc 2011-04-19 16:48:04.009229611 +0200
-@@ -49,7 +49,7 @@ using namespace zmm;
+Index: mediatomb-0.12.1/src/scripting/js_functions.cc
+===================================================================
+--- mediatomb-0.12.1.orig/src/scripting/js_functions.cc 2012-03-11 13:59:37.520024032 +0000
++++ mediatomb-0.12.1/src/scripting/js_functions.cc 2012-03-11 13:59:42.456024047 +0000
+@@ -49,7 +49,7 @@
extern "C" {
JSBool
@@ -51,7 +41,7 @@ diff -up mediatomb-0.12.1-back/src/scripting/js_functions.cc.tonewjs mediatomb-0
{
uintN i;
JSString *str;
-@@ -60,19 +60,21 @@ js_print(JSContext *cx, JSObject *obj, u
+@@ -60,19 +60,21 @@
if (!str)
return JS_TRUE;
argv[i] = STRING_TO_JSVAL(str);
@@ -76,7 +66,7 @@ diff -up mediatomb-0.12.1-back/src/scripting/js_functions.cc.tonewjs mediatomb-0
try
{
-@@ -91,7 +93,7 @@ js_copyObject(JSContext *cx, JSObject *o
+@@ -91,7 +93,7 @@
self->cdsObject2jsObject(cds_obj, js_cds_clone_obj);
@@ -85,7 +75,7 @@ diff -up mediatomb-0.12.1-back/src/scripting/js_functions.cc.tonewjs mediatomb-0
return JS_TRUE;
-@@ -110,7 +112,7 @@ js_copyObject(JSContext *cx, JSObject *o
+@@ -110,7 +112,7 @@
}
JSBool
@@ -94,7 +84,7 @@ diff -up mediatomb-0.12.1-back/src/scripting/js_functions.cc.tonewjs mediatomb-0
{
try
{
-@@ -126,7 +128,7 @@ js_addCdsObject(JSContext *cx, JSObject
+@@ -126,7 +128,7 @@
Ref<StringConverter> p2i;
Ref<StringConverter> i2i;
@@ -103,7 +93,7 @@ diff -up mediatomb-0.12.1-back/src/scripting/js_functions.cc.tonewjs mediatomb-0
if (self == NULL)
{
-@@ -156,20 +158,20 @@ js_addCdsObject(JSContext *cx, JSObject
+@@ -156,20 +158,20 @@
if (!str)
path = _("/");
else
@@ -128,7 +118,7 @@ diff -up mediatomb-0.12.1-back/src/scripting/js_functions.cc.tonewjs mediatomb-0
if (js_orig_obj == NULL)
{
-@@ -285,8 +287,7 @@ js_addCdsObject(JSContext *cx, JSObject
+@@ -285,8 +287,7 @@
JSString *str2 = JS_NewStringCopyN(cx, tmp.c_str(), tmp.length());
if (!str2)
return JS_TRUE;
@@ -138,7 +128,7 @@ diff -up mediatomb-0.12.1-back/src/scripting/js_functions.cc.tonewjs mediatomb-0
return JS_TRUE;
}
catch (ServerShutdownException se)
-@@ -302,7 +303,7 @@ js_addCdsObject(JSContext *cx, JSObject
+@@ -302,7 +303,7 @@
return JS_TRUE;
}
@@ -147,7 +137,7 @@ diff -up mediatomb-0.12.1-back/src/scripting/js_functions.cc.tonewjs mediatomb-0
{
try
{
-@@ -321,7 +322,7 @@ static JSBool convert_charset_generic(JS
+@@ -321,7 +322,7 @@
{
str = JS_ValueToString(cx, argv[0]);
if (str)
@@ -156,7 +146,7 @@ diff -up mediatomb-0.12.1-back/src/scripting/js_functions.cc.tonewjs mediatomb-0
}
if (result != nil)
-@@ -330,7 +331,7 @@ static JSBool convert_charset_generic(JS
+@@ -330,7 +331,7 @@
JSString *str2 = JS_NewStringCopyN(cx, result.c_str(), result.length());
if (!str2)
return JS_TRUE;
@@ -165,7 +155,7 @@ diff -up mediatomb-0.12.1-back/src/scripting/js_functions.cc.tonewjs mediatomb-0
}
}
catch (ServerShutdownException se)
-@@ -347,24 +348,23 @@ static JSBool convert_charset_generic(JS
+@@ -347,24 +348,23 @@
}
@@ -198,9 +188,10 @@ diff -up mediatomb-0.12.1-back/src/scripting/js_functions.cc.tonewjs mediatomb-0
}
} // extern "C"
-diff -up mediatomb-0.12.1-back/src/scripting/js_functions.h.tonewjs mediatomb-0.12.1-back/src/scripting/js_functions.h
---- mediatomb-0.12.1-back/src/scripting/js_functions.h.tonewjs 2010-03-25 15:58:05.000000000 +0100
-+++ mediatomb-0.12.1-back/src/scripting/js_functions.h 2011-04-18 13:59:29.000000000 +0200
+Index: mediatomb-0.12.1/src/scripting/js_functions.h
+===================================================================
+--- mediatomb-0.12.1.orig/src/scripting/js_functions.h 2012-03-11 13:59:37.584024033 +0000
++++ mediatomb-0.12.1/src/scripting/js_functions.h 2012-03-11 13:59:42.456024047 +0000
@@ -40,18 +40,18 @@
extern "C" {
@@ -227,10 +218,11 @@ diff -up mediatomb-0.12.1-back/src/scripting/js_functions.h.tonewjs mediatomb-0.
} // extern "C"
-diff -up mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc.tonewjs mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc
---- mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc.tonewjs 2011-04-18 13:34:14.000000000 +0200
-+++ mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc 2011-04-18 13:51:59.000000000 +0200
-@@ -46,9 +46,9 @@ using namespace zmm;
+Index: mediatomb-0.12.1/src/scripting/playlist_parser_script.cc
+===================================================================
+--- mediatomb-0.12.1.orig/src/scripting/playlist_parser_script.cc 2012-03-11 13:59:37.540024032 +0000
++++ mediatomb-0.12.1/src/scripting/playlist_parser_script.cc 2012-03-11 13:59:42.456024047 +0000
+@@ -46,9 +46,9 @@
extern "C" {
static JSBool
@@ -242,7 +234,7 @@ diff -up mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc.tonewjs m
String line;
-@@ -69,7 +69,7 @@ js_readln(JSContext *cx, JSObject *obj,
+@@ -69,7 +69,7 @@
JSString *jsline = JS_NewStringCopyZ(cx, line.c_str());
@@ -251,7 +243,7 @@ diff -up mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc.tonewjs m
return JS_TRUE;
}
-@@ -93,8 +93,8 @@ PlaylistParserScript::PlaylistParserScri
+@@ -93,8 +93,8 @@
String scriptPath = ConfigManager::getInstance()->getOption(CFG_IMPORT_SCRIPTING_PLAYLIST_SCRIPT);
load(scriptPath);
@@ -262,7 +254,7 @@ diff -up mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc.tonewjs m
}
catch (Exception ex)
{
-@@ -245,7 +245,7 @@ PlaylistParserScript::~PlaylistParserScr
+@@ -245,7 +245,7 @@
#endif
if (root)
@@ -271,10 +263,11 @@ diff -up mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc.tonewjs m
#ifdef JS_THREADSAFE
JS_EndRequest(cx);
-diff -up mediatomb-0.12.1-back/src/scripting/script.cc.tonewjs mediatomb-0.12.1-back/src/scripting/script.cc
---- mediatomb-0.12.1-back/src/scripting/script.cc.tonewjs 2011-04-18 13:53:07.000000000 +0200
-+++ mediatomb-0.12.1-back/src/scripting/script.cc 2011-04-19 18:26:34.460338804 +0200
-@@ -87,7 +87,7 @@ String Script::getProperty(JSObject *obj
+Index: mediatomb-0.12.1/src/scripting/script.cc
+===================================================================
+--- mediatomb-0.12.1.orig/src/scripting/script.cc 2012-03-11 13:59:37.556024031 +0000
++++ mediatomb-0.12.1/src/scripting/script.cc 2012-03-11 13:59:42.460024047 +0000
+@@ -87,7 +87,7 @@
str = JS_ValueToString(cx, val);
if (! str)
return nil;
@@ -283,7 +276,7 @@ diff -up mediatomb-0.12.1-back/src/scripting/script.cc.tonewjs mediatomb-0.12.1-
}
int Script::getBoolProperty(JSObject *obj, String name)
-@@ -427,14 +427,14 @@ static JSFunctionSpec js_global_function
+@@ -427,14 +427,14 @@
try
{
common_script = _load(common_scr_path);
@@ -301,7 +294,7 @@ diff -up mediatomb-0.12.1-back/src/scripting/script.cc.tonewjs mediatomb-0.12.1-
log_js("Unable to load %s: %s\n", common_scr_path.c_str(),
e.getMessage().c_str());
-@@ -460,7 +460,7 @@ Script::~Script()
+@@ -460,7 +460,7 @@
JS_BeginRequest(cx);
#endif
if (common_root)
@@ -310,7 +303,7 @@ diff -up mediatomb-0.12.1-back/src/scripting/script.cc.tonewjs mediatomb-0.12.1-
/*
* scripts are unrooted and will be cleaned up by GC
-@@ -504,11 +504,11 @@ void Script::initGlobalObject()
+@@ -504,11 +504,11 @@
static JSClass global_class =
{
"global", /* name */
@@ -324,7 +317,7 @@ diff -up mediatomb-0.12.1-back/src/scripting/script.cc.tonewjs mediatomb-0.12.1-
JS_EnumerateStandardClasses, /* enumerate */
JS_ResolveStub, /* resolve */
JS_ConvertStub, /* convert */
-@@ -517,7 +517,7 @@ void Script::initGlobalObject()
+@@ -517,7 +517,7 @@
};
/* create the global object here */
@@ -333,7 +326,7 @@ diff -up mediatomb-0.12.1-back/src/scripting/script.cc.tonewjs mediatomb-0.12.1-
if (! glob)
throw _Exception(_("Scripting: could not initialize glboal class"));
-@@ -539,12 +539,12 @@ void Script::defineFunctions(JSFunctionS
+@@ -539,12 +539,12 @@
throw _Exception(_("Scripting: JS_DefineFunctions failed"));
}
@@ -348,7 +341,7 @@ diff -up mediatomb-0.12.1-back/src/scripting/script.cc.tonewjs mediatomb-0.12.1-
String scriptText = read_text_file(scriptPath);
-@@ -571,14 +571,11 @@ JSScript *Script::_load(zmm::String scri
+@@ -571,14 +571,11 @@
void Script::load(zmm::String scriptPath)
{
@@ -364,7 +357,7 @@ diff -up mediatomb-0.12.1-back/src/scripting/script.cc.tonewjs mediatomb-0.12.1-
{
jsval ret_val;
-@@ -662,7 +659,7 @@ Ref<CdsObject> Script::jsObject2cdsObjec
+@@ -662,7 +659,7 @@
JSObject *js_meta = getObjectProperty(js, _("meta"));
if (js_meta)
{
@@ -373,7 +366,7 @@ diff -up mediatomb-0.12.1-back/src/scripting/script.cc.tonewjs mediatomb-0.12.1-
/// \todo: only metadata enumerated in MT_KEYS is taken
for (int i = 0; i < M_MAX; i++)
{
-@@ -687,7 +684,7 @@ Ref<CdsObject> Script::jsObject2cdsObjec
+@@ -687,7 +684,7 @@
}
}
}
@@ -382,10 +375,11 @@ diff -up mediatomb-0.12.1-back/src/scripting/script.cc.tonewjs mediatomb-0.12.1-
}
// stuff that has not been exported to js
-diff -up mediatomb-0.12.1-back/src/scripting/script.h.tonewjs mediatomb-0.12.1-back/src/scripting/script.h
---- mediatomb-0.12.1-back/src/scripting/script.h.tonewjs 2011-04-18 12:56:14.000000000 +0200
-+++ mediatomb-0.12.1-back/src/scripting/script.h 2011-04-18 12:56:51.000000000 +0200
-@@ -66,8 +66,8 @@ public:
+Index: mediatomb-0.12.1/src/scripting/script.h
+===================================================================
+--- mediatomb-0.12.1.orig/src/scripting/script.h 2012-03-11 13:59:37.484024032 +0000
++++ mediatomb-0.12.1/src/scripting/script.h 2012-03-11 13:59:42.460024047 +0000
+@@ -66,8 +66,8 @@
JSRuntime *rt;
JSContext *cx;
JSObject *glob;
@@ -396,7 +390,7 @@ diff -up mediatomb-0.12.1-back/src/scripting/script.h.tonewjs mediatomb-0.12.1-b
public:
Script(zmm::Ref<Runtime> runtime);
-@@ -115,8 +115,8 @@ private:
+@@ -115,8 +115,8 @@
JSObject *common_root;
void initGlobalObject();
--
MediaTomb packaging
More information about the pkg-multimedia-commits
mailing list