Hello community, here is the log from the commit of package python-xpcom192 for openSUSE:Factory checked in at Tue Mar 16 01:58:04 CET 2010. -------- --- python-xpcom192/python-xpcom192.changes 2009-11-10 11:57:28.000000000 +0100 +++ /mounts/work_src_done/STABLE/python-xpcom192/python-xpcom192.changes 2010-03-05 08:08:45.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 5 08:00:02 CET 2010 - wr@rosenauer.org + +- update to snapshot 20100305 + * removed upstreamed patches + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- configure.patch pyxpcom-0.0.20091110.tar.bz2 pyxpcom-build.patch New: ---- pyxpcom-0.0.20100305.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-xpcom192.spec ++++++ --- /var/tmp/diff_new_pack.aBfYnP/_old 2010-03-16 01:57:44.000000000 +0100 +++ /var/tmp/diff_new_pack.aBfYnP/_new 2010-03-16 01:57:44.000000000 +0100 @@ -1,8 +1,8 @@ # -# spec file for package python-xpcom192 (Version 0.0.20091110) +# spec file for package python-xpcom192 (Version 0.0.20100305) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (c) 2009 Wolfgang Rosenauer +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009-2010 Wolfgang Rosenauer # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,9 +21,9 @@ Name: python-xpcom192 BuildRequires: autoconf213 gcc-c++ mozilla-xulrunner192-devel pkg-config python-devel zip -License: GPLv2+ ; LGPLv2.1+ ; MPL .. +License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Summary: Python XPCOM bindings for Gecko 1.9.2 -Version: 0.0.20091110 +Version: 0.0.20100305 Release: 1 Group: Development/Languages/Python Provides: python-xpcom @@ -31,8 +31,6 @@ Requires: mozilla-xulrunner192 Source: pyxpcom-%{version}.tar.bz2 Source1: create-tar.sh -Patch0: configure.patch -Patch1: pyxpcom-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %py_requires %define xredir %(pkg-config --variable=libdir mozilla-gtkmozembed) @@ -44,8 +42,6 @@ %prep %setup -q -n pyxpcom-%{version} -%patch0 -%patch1 %build autoconf-2.13 configure.in > configure @@ -55,7 +51,7 @@ ../configure \ --with-libxul-sdk=$(pkg-config --variable=sdkdir libxul) \ --with-system-nspr -make +make %{?jobs:-j%jobs} USE_ELF_DYNSTR_GC= %install cd objdir/dist ++++++ pyxpcom-0.0.20091110.tar.bz2 -> pyxpcom-0.0.20100305.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyxpcom-0.0.20091110/config/system-headers new/pyxpcom-0.0.20100305/config/system-headers --- old/pyxpcom-0.0.20091110/config/system-headers 2009-11-10 12:04:56.000000000 +0100 +++ new/pyxpcom-0.0.20100305/config/system-headers 2010-03-05 07:58:30.000000000 +0100 @@ -607,6 +607,7 @@ pthread.h pwd.h Python.h +marshal.h QDOffscreen.h Quickdraw.h QuickDraw.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyxpcom-0.0.20091110/configure.in new/pyxpcom-0.0.20100305/configure.in --- old/pyxpcom-0.0.20091110/configure.in 2009-11-10 12:04:56.000000000 +0100 +++ new/pyxpcom-0.0.20100305/configure.in 2010-03-05 07:58:30.000000000 +0100 @@ -1315,7 +1315,7 @@ fi - _DEFINES_CFLAGS='-include $(DEPTH)/mozilla-config.h -DMOZILLA_CLIENT' + _DEFINES_CFLAGS='-include $(LIBXUL_DIST)/include/mozilla-config.h -DMOZILLA_CLIENT' _USE_CPP_INCLUDE_FLAG=1 elif test "$SOLARIS_SUNPRO_CC"; then MKSHLIB='$(LD) $(DSO_LDOPTS) -h $@ -o $@' @@ -1367,7 +1367,7 @@ esac fi - _DEFINES_CXXFLAGS='-DMOZILLA_CLIENT -include $(DEPTH)/mozilla-config.h' + _DEFINES_CXXFLAGS='-DMOZILLA_CLIENT -include $(LIBXUL_DIST)/include/mozilla-config.h' _USE_CPP_INCLUDE_FLAG=1 AC_CACHE_CHECK(whether the compiler supports -Wno-invalid-offsetof, @@ -2143,8 +2143,8 @@ MOZ_DEBUG_FLAGS="-gstabs" _PEDANTIC= LIBS="$LIBS -lsocket -lstdc++" - _DEFINES_CFLAGS='-Wp,-include -Wp,$(DEPTH)/mozilla-config.h -DMOZILLA_CLIENT -D_POSIX_C_SOURCE=199506' - _DEFINES_CXXFLAGS='-DMOZILLA_CLIENT -Wp,-include -Wp,$(DEPTH)/mozilla-config.h -D_POSIX_C_SOURCE=199506' + _DEFINES_CFLAGS='-Wp,-include -Wp,$(LIBXUL_DIST)/include/mozilla-config.h -DMOZILLA_CLIENT -D_POSIX_C_SOURCE=199506' + _DEFINES_CXXFLAGS='-DMOZILLA_CLIENT -Wp,-include -Wp,$(LIBXUL_DIST)/include/mozilla-config.h -D_POSIX_C_SOURCE=199506' if test "$with_x" != "yes" then TK_CFLAGS='-I/usr/include/photon' @@ -4495,8 +4495,66 @@ AC_SUBST(WIN_TOP_SRC) AC_SUBST(ac_configure_args) + + + +## +## Had to add this defines hack for the Windows build - ToddW. +## + +# Save the defines header file before autoconf removes it. +# (Do not add AC_DEFINE calls after this line.) + _CONFIG_TMP=confdefs-tmp.h + _CONFIG_DEFS_H=mozilla-config.h + + cat > $_CONFIG_TMP <<\EOF +/* List of defines generated by configure. Included with preprocessor flag, + * -include, to avoid long list of -D defines on the compile command-line. + * Do not edit. + */ + +#ifndef _MOZILLA_CONFIG_H_ +#define _MOZILLA_CONFIG_H_ +EOF + +_EGREP_PATTERN='^#define (' +if test -n "$_NON_GLOBAL_ACDEFINES"; then + for f in $_NON_GLOBAL_ACDEFINES; do + _EGREP_PATTERN="${_EGREP_PATTERN}$f|" + done +fi +_EGREP_PATTERN="${_EGREP_PATTERN}dummy_never_defined)" + + sort confdefs.h | egrep -v "$_EGREP_PATTERN" >> $_CONFIG_TMP + + cat >> $_CONFIG_TMP <<\EOF + +#endif /* _MOZILLA_CONFIG_H_ */ + +EOF + + # Only write mozilla-config.h when something changes (or it doesn't exist) + if cmp -s $_CONFIG_TMP $_CONFIG_DEFS_H; then + rm $_CONFIG_TMP + else + AC_MSG_RESULT("creating $_CONFIG_DEFS_H") + mv -f $_CONFIG_TMP $_CONFIG_DEFS_H + + echo ==== $_CONFIG_DEFS_H ================================= + cat $_CONFIG_DEFS_H + fi + +dnl Probably shouldn't call this manually but we always want the output of DEFS +rm -f confdefs.h.save +mv confdefs.h confdefs.h.save +egrep -v "$_EGREP_PATTERN" confdefs.h.save > confdefs.h AC_OUTPUT_MAKE_DEFS() +MOZ_DEFINES=$DEFS AC_SUBST(MOZ_DEFINES) +rm -f confdefs.h +mv confdefs.h.save confdefs.h + + AC_OUTPUT([ config/autoconf.mk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyxpcom-0.0.20091110/dom/src/Makefile.in new/pyxpcom-0.0.20100305/dom/src/Makefile.in --- old/pyxpcom-0.0.20091110/dom/src/Makefile.in 2009-11-10 12:04:56.000000000 +0100 +++ new/pyxpcom-0.0.20100305/dom/src/Makefile.in 2010-03-05 07:58:30.000000000 +0100 @@ -17,6 +17,7 @@ FORCE_SHARED_LIB = 1 FORCE_USE_PIC = 1 +USE_STATIC_LIBS = 1 # We always need the Python and pyxpcom includes and libs. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyxpcom-0.0.20091110/dom/src/nsPyDOMModule.cpp new/pyxpcom-0.0.20100305/dom/src/nsPyDOMModule.cpp --- old/pyxpcom-0.0.20091110/dom/src/nsPyDOMModule.cpp 2009-11-10 12:04:56.000000000 +0100 +++ new/pyxpcom-0.0.20100305/dom/src/nsPyDOMModule.cpp 2010-03-05 07:58:30.000000000 +0100 @@ -51,7 +51,6 @@ #include "nsIScriptTimeoutHandler.h" #include "nsPIDOMEventTarget.h" #include "nsIArray.h" -#include "jscntxt.h" #include "nsPIDOMWindow.h" #include "nsDOMScriptObjectHolder.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyxpcom-0.0.20091110/xpcom/server/loader.py new/pyxpcom-0.0.20100305/xpcom/server/loader.py --- old/pyxpcom-0.0.20091110/xpcom/server/loader.py 2009-11-10 12:04:56.000000000 +0100 +++ new/pyxpcom-0.0.20100305/xpcom/server/loader.py 2010-03-05 07:58:30.000000000 +0100 @@ -93,6 +93,8 @@ def _getCOMModuleForLocation(self, componentFile): fqn = componentFile.path + if fqn[-4:] in (".pyc", ".pyo"): + fqn = fqn[:-1] if not fqn.endswith(".py"): raise xpcom.ServerException(nsError.NS_ERROR_INVALID_ARG) mod = self.com_modules.get(fqn) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyxpcom-0.0.20091110/xpcom/server/module.py new/pyxpcom-0.0.20100305/xpcom/server/module.py --- old/pyxpcom-0.0.20091110/xpcom/server/module.py 2009-11-10 12:04:56.000000000 +0100 +++ new/pyxpcom-0.0.20100305/xpcom/server/module.py 2010-03-05 07:58:30.000000000 +0100 @@ -80,6 +80,17 @@ loaderStr, componentType) + reg_categories = getattr(klass, "_reg_categories_", None) + if reg_categories: + catman = components.classes["@mozilla.org/categorymanager;1"]\ + .getService(components.interfaces.nsICategoryManager); + for cat_info in reg_categories: + if len(cat_info) > 2 and cat_info[2] and cat_info[0] == "app-startup": + name = "service,%s" % reg_contractid + else: + name = reg_contractid + catman.addCategoryEntry(cat_info[0], cat_info[1], name, 1, 1) + # See if this class nominates custom register_self extra_func = getattr(klass, "_reg_registrar_", (None,None))[0] if extra_func is not None: @@ -93,6 +104,14 @@ compMgr.unregisterComponentSpec(klass._reg_clsid_, location) except Exception: ok = 0 + + reg_categories = getattr(klass, "_reg_categories_", None) + if reg_categories: + catman = components.classes["@mozilla.org/categorymanager;1"]\ + .getService(components.interfaces.nsICategoryManager); + for cat_info in reg_categories: + catman.deleteCategoryEntry(cat_info[0], cat_info[1], 1) + # Give the class a bash even if we failed! extra_func = getattr(klass, "_reg_registrar_", (None,None))[1] if extra_func is not None: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyxpcom-0.0.20091110/xpcom/src/ErrorUtils.cpp new/pyxpcom-0.0.20100305/xpcom/src/ErrorUtils.cpp --- old/pyxpcom-0.0.20091110/xpcom/src/ErrorUtils.cpp 2009-11-10 12:04:56.000000000 +0100 +++ new/pyxpcom-0.0.20100305/xpcom/src/ErrorUtils.cpp 2010-03-05 07:58:30.000000000 +0100 @@ -167,7 +167,7 @@ { char *c = ToNewCString(text); LogMessage(methodName, c); - nsCRT::free(c); + NS_Free(c); } // A helper for the various logging routines. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyxpcom-0.0.20091110/xpcom/src/Makefile.in new/pyxpcom-0.0.20100305/xpcom/src/Makefile.in --- old/pyxpcom-0.0.20091110/xpcom/src/Makefile.in 2009-11-10 12:04:56.000000000 +0100 +++ new/pyxpcom-0.0.20100305/xpcom/src/Makefile.in 2010-03-05 07:58:30.000000000 +0100 @@ -51,6 +51,7 @@ REQUIRES = xpcom string $(NULL) FORCE_SHARED_LIB = 1 FORCE_USE_PIC = 1 +USE_STATIC_LIBS = 1 LOCAL_INCLUDES = $(MOZ_PYTHON_INCLUDES) EXTRA_LIBS += $(MOZ_PYTHON_LIBS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyxpcom-0.0.20091110/xpcom/src/Pyxpt_info.cpp new/pyxpcom-0.0.20100305/xpcom/src/Pyxpt_info.cpp --- old/pyxpcom-0.0.20091110/xpcom/src/Pyxpt_info.cpp 2009-11-10 12:04:56.000000000 +0100 +++ new/pyxpcom-0.0.20100305/xpcom/src/Pyxpt_info.cpp 2010-03-05 07:58:30.000000000 +0100 @@ -163,7 +163,7 @@ v = PyString_FromString(c->value.str); break; case TD_PWSTRING: - v = PyObject_FromNSString((PRUnichar *)c->value.wstr, nsCRT::strlen((PRUnichar *)c->value.wstr)); + v = PyObject_FromNSString((PRUnichar *)c->value.wstr, NS_strlen((PRUnichar *)c->value.wstr)); break; // TD_INTERFACE_TYPE = 18, // TD_INTERFACE_IS_TYPE = 19, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyxpcom-0.0.20091110/xpcom/src/VariantUtils.cpp new/pyxpcom-0.0.20100305/xpcom/src/VariantUtils.cpp --- old/pyxpcom-0.0.20091110/xpcom/src/VariantUtils.cpp 2009-11-10 12:04:56.000000000 +0100 +++ new/pyxpcom-0.0.20100305/xpcom/src/VariantUtils.cpp 2010-03-05 07:58:30.000000000 +0100 @@ -150,7 +150,7 @@ PRUint32 len /* = (PRUint32)-1*/) { return PyUnicode_FromPRUnichar(s, - len==((PRUint32)-1)? nsCRT::strlen(s) : len); + len==((PRUint32)-1)? NS_strlen(s) : len); } PYXPCOM_EXPORT PRBool @@ -556,7 +556,7 @@ Py_INCREF(Py_None); val = Py_None; } else { - val = PyUnicode_FromPRUnichar( *pp, nsCRT::strlen(*pp) ); + val = PyUnicode_FromPRUnichar( *pp, NS_strlen(*pp) ); } break; } @@ -1717,7 +1717,7 @@ ret = Py_None; Py_INCREF(Py_None); } else { - ret = PyUnicode_FromPRUnichar( us, nsCRT::strlen(us)); + ret = PyUnicode_FromPRUnichar( us, NS_strlen(us)); } break; } @@ -2071,7 +2071,7 @@ ret = Py_None; Py_INCREF(Py_None); } else { - ret = PyUnicode_FromPRUnichar( us, nsCRT::strlen(us)); + ret = PyUnicode_FromPRUnichar( us, NS_strlen(us)); } break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyxpcom-0.0.20091110/xpcom/src/loader/Makefile.in new/pyxpcom-0.0.20100305/xpcom/src/loader/Makefile.in --- old/pyxpcom-0.0.20091110/xpcom/src/loader/Makefile.in 2009-11-10 12:04:56.000000000 +0100 +++ new/pyxpcom-0.0.20100305/xpcom/src/loader/Makefile.in 2010-03-05 07:58:30.000000000 +0100 @@ -49,6 +49,7 @@ REQUIRES = pyxpcom xpcom string xpcom_obsolete $(NULL) FORCE_SHARED_LIB = 1 FORCE_USE_PIC = 1 +USE_STATIC_LIBS = 1 LOCAL_INCLUDES = $(MOZ_PYTHON_INCLUDES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyxpcom-0.0.20091110/xpcom/src/module/Makefile.in new/pyxpcom-0.0.20100305/xpcom/src/module/Makefile.in --- old/pyxpcom-0.0.20091110/xpcom/src/module/Makefile.in 2009-11-10 12:04:56.000000000 +0100 +++ new/pyxpcom-0.0.20100305/xpcom/src/module/Makefile.in 2010-03-05 07:58:30.000000000 +0100 @@ -49,6 +49,7 @@ REQUIRES = pyxpcom xpcom string $(NULL) FORCE_SHARED_LIB = 1 FORCE_USE_PIC = 1 +USE_STATIC_LIBS = 1 DLL_SUFFIX=$(MOZ_PYTHON_DLL_SUFFIX) LOCAL_INCLUDES = $(MOZ_PYTHON_INCLUDES) @@ -81,9 +82,9 @@ # default build installs into bin and lib - remove them libs:: ifeq ($(OS_ARCH),WINNT) - $(INSTALL) -m 555 $(SHARED_LIBRARY) $(DIST)/bin/python/xpcom + $(INSTALL) $(SHARED_LIBRARY) $(DIST)/bin/python/xpcom else - $(INSTALL) -m 555 $(SHARED_LIBRARY) $(DIST)/bin/python/xpcom + $(INSTALL) $(SHARED_LIBRARY) $(DIST)/bin/python/xpcom mv $(DIST)/bin/python/xpcom/$(SHARED_LIBRARY) $(DIST)/bin/python/xpcom/_xpcom.so endif rm -f $(DIST)/bin/$(SHARED_LIBRARY) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org