--- pyxpcom-9.0~hg20111212.orig/config/rules.mk +++ pyxpcom-9.0~hg20111212/config/rules.mk @@ -1668,7 +1668,7 @@ $(REPORT_BUILD) $(PYTHON_PATH) \ -I$(LIBXUL_SDK)/sdk/bin/ply \ - $(LIBXUL_SDK)/sdk/bin/header.py --cachedir=$(LIBXUL_SDK)/sdk/bin $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ + $(LIBXUL_SDK)/sdk/bin/header.py --cachedir=$(CURDIR)/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ @if test -n "$(findstring $*.h, $(EXPORTS))"; \ then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi @@ -1679,7 +1679,7 @@ $(REPORT_BUILD) $(PYTHON_PATH) \ -I$(LIBXUL_SDK)/sdk/bin/ply \ - $(LIBXUL_SDK)/sdk/bin/typelib.py --cachedir=$(LIBXUL_SDK)/sdk/bin $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ + $(LIBXUL_SDK)/sdk/bin/typelib.py --cachedir=$(CURDIR)/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ # no need to link together if XPIDLSRCS contains only XPIDL_MODULE ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS))) --- pyxpcom-9.0~hg20111212.orig/debian/changelog +++ pyxpcom-9.0~hg20111212/debian/changelog @@ -0,0 +1,112 @@ +pyxpcom (1:9.0~hg20111212-2+rpi1) jessie-staging; urgency=medium + + * Force python library dir to multiarch path (Closes: 713221) + * Bump python-dev build-depends accordingly. + * Change build-dependency from xulrunner-dev to xulrunner-10.0-dev + + -- Peter Michael Green Fri, 07 Feb 2014 12:10:26 +0000 + +pyxpcom (1:9.0~hg20111212-2) unstable; urgency=low + + * config/rules: Don't use SDK bin directory as temporary directory. + bz#728146. + * xpcom/src/PyGInputStream.cpp, xpcom/src/PyGModule.cpp, + xpcom/src/PyIInterfaceInfo.cpp, xpcom/src/PyISimpleEnumerator.cpp, + xpcom/src/PyIVariant.cpp, xpcom/src/VariantUtils.cpp, + xpcom/test/test_component/py_test_component.idl: Replace PRBool with bool + where it is necessary. bz#728148. + * xpcom/src/PyIInterfaceInfo.cpp: GetLengthIsArgNumberForParam was removed + in bz#677788. bz#728149. + + -- Mike Hommey Fri, 17 Feb 2012 10:33:18 +0100 + +pyxpcom (1:9.0~hg20111212-1) unstable; urgency=low + + * New upstream release + * debian/control: Bump build dependency on xulrunner-dev. + * xpcom/test/test_component/py_test_component.idl: Fix BiggerLong to avoid + failure to build. bz#720994. + + -- Mike Hommey Wed, 25 Jan 2012 14:51:00 +0100 + +pyxpcom (1:8.0~hg20111006-1) unstable; urgency=low + + * New upstream release + * debian/control: Bump build dependency on xulrunner-dev. + + -- Mike Hommey Fri, 11 Nov 2011 11:08:37 +0100 + +pyxpcom (1:7.0~hg20110908-1) unstable; urgency=low + + * New upstream release: + - Fixes FTBFS xulrunner-dev >= 6.0. Closes: #640564. + * debian/control: Bump build dependency on xulrunner-dev. + + -- Mike Hommey Fri, 16 Sep 2011 10:22:13 +0200 + +pyxpcom (1:2.0~hg20110502-3) unstable; urgency=low + + * debian/control: + - Remove build dependency on python-support. + - Build depend on python-dev >= 2.6.6-3~. + - Remove XB-Python-Version header. + - Add X-Python-Version: current to only package for a single version of + python, since multiple versions can't work. + - Bump Standards-Version to 3.9.2.0. No changes required. + * debian/rules: Add --with python2 to dh call. + + -- Mike Hommey Fri, 29 Jul 2011 10:02:12 +0200 + +pyxpcom (1:2.0~hg20110502-2) unstable; urgency=low + + * Upload to unstable. + + -- Mike Hommey Fri, 15 Jul 2011 23:23:33 +0200 + +pyxpcom (1:2.0~hg20110502-1) experimental; urgency=low + + * New upstream snapshot. + - Compatible with xulrunner 2.0 and 5.0. Closes: #631044. + * debian/control: Build depend on xulrunner-dev >= 2.0. + * dom/src/nsPyContext.h, dom/src/nsPyDOMModule.cpp, dom/src/nsPyContext.cpp: + Drop our patches for xulrunner 1.9.1 support. + + -- Mike Hommey Mon, 20 Jun 2011 09:59:26 +0900 + +pyxpcom (1:0.0~hg20100212-5) unstable; urgency=low + + * debian/postinst.in: Fix symbolic link destination, and fix the way + it is created. + + -- Mike Hommey Sat, 08 Jan 2011 11:04:50 +0100 + +pyxpcom (1:0.0~hg20100212-4) unstable; urgency=low + + * debian/control: Conflicts with xulrunner-1.9.1 <= 1.9.1.11-1. + Closes: #596459. + * debian/prerm.in, debian/postinst.in, debian/install.in: Install + libpyloader.so in /usr/lib/python-xpcom and create a symbolic link + in xulrunner components directory so that component registration + (which we need to trigger by hand) always work. Closes: #582071. + + -- Mike Hommey Fri, 07 Jan 2011 14:40:06 +0100 + +pyxpcom (1:0.0~hg20100212-3) unstable; urgency=low + + * debian/control: Replace Pre-Depends with plain dependency for xulrunner. + Closes: #606791. + + -- Mike Hommey Sat, 25 Dec 2010 10:58:37 +0100 + +pyxpcom (1:0.0~hg20100212-2) unstable; urgency=low + + * debian/rules: unset USE_ELF_DYNSTR_GC during build. Fixes FTBFS on i386. + bz#564746. + + -- Mike Hommey Thu, 26 Aug 2010 10:05:32 +0200 + +pyxpcom (1:0.0~hg20100212-1) unstable; urgency=low + + * Initial release. (Closes: #591894) + + -- Mike Hommey Fri, 20 Aug 2010 11:26:58 +0200 --- pyxpcom-9.0~hg20111212.orig/debian/compat +++ pyxpcom-9.0~hg20111212/debian/compat @@ -0,0 +1 @@ +7 --- pyxpcom-9.0~hg20111212.orig/debian/control +++ pyxpcom-9.0~hg20111212/debian/control @@ -0,0 +1,35 @@ +Source: pyxpcom +Priority: extra +Section: python +Maintainer: Maintainers of Mozilla-related packages +Uploaders: Mike Hommey +Build-Depends: debhelper (>= 7.0.50~), + autoconf2.13, + dpkg-dev (>= 1.15.7), + pkg-config, + python-dev (>= 2.7.5), + xulrunner-10.0-dev (>= 9.0), + zip +Standards-Version: 3.9.2.0 +X-Python-Version: current + +Package: python-xpcom +Architecture: any +Provides: ${python:Provides} +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${python:Depends}, + ${xulrunner:Depends} +Breaks: epiphany-gecko (<< 2.28) +Conflicts: xulrunner-1.9.1 (<= 1.9.1.11-1) +Description: XPCOM bindings for Python + PyXPCOM allows for communication between Python and XPCOM, such that a + Python application can access XPCOM objects, and XPCOM can access any + Python class that implements an XPCOM interface. + With PyXPCOM, a developer can talk to XPCOM or embed Gecko from a + Python application. PyXPCOM is similar to JavaXPCOM (Java-XPCOM bridge) + or XPConnect (JavaScript-XPCOM bridge). + . + Install this package if you wish to access XPCOM objects from Python, or + want to use Python components from XPCOM. +Homepage: http://developer.mozilla.org/en/docs/pyxpcom --- pyxpcom-9.0~hg20111212.orig/debian/copyright +++ pyxpcom-9.0~hg20111212/debian/copyright @@ -0,0 +1,589 @@ +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 +Name: pyxpcom +Source: http://hg.mozilla.org/pyxpcom + +Copyright: 2000, 2001, ActiveState Tool Corp. + 2000, Mark Hammond + 2005, mozilla.org +License: MPL-1.1 or GPL-2 or LGPL-2.1 + +Files: debian/* +Copyright: 2010, Mike Hommey +License: GPL-2+ + +License: GPL-2 + On Debian systems, the complete text of the GNU General Public + License can be found in the file /usr/share/common-licenses/GPL-2'. + +License: LGPL-2.1 + On Debian systems, the complete text of the GNU Lesser General Public + License can be found in the file `/usr/share/common-licenses/LGPL-2.1'. + +License: MPL-1.1 + MOZILLA PUBLIC LICENSE + Version 1.1 + . + --------------- + . + 1. Definitions. + . + 1.0.1. "Commercial Use" means distribution or otherwise making the + Covered Code available to a third party. + . + 1.1. "Contributor" means each entity that creates or contributes to + the creation of Modifications. + . + 1.2. "Contributor Version" means the combination of the Original + Code, prior Modifications used by a Contributor, and the Modifications + made by that particular Contributor. + . + 1.3. "Covered Code" means the Original Code or Modifications or the + combination of the Original Code and Modifications, in each case + including portions thereof. + . + 1.4. "Electronic Distribution Mechanism" means a mechanism generally + accepted in the software development community for the electronic + transfer of data. + . + 1.5. "Executable" means Covered Code in any form other than Source + Code. + . + 1.6. "Initial Developer" means the individual or entity identified + as the Initial Developer in the Source Code notice required by Exhibit + A. + . + 1.7. "Larger Work" means a work which combines Covered Code or + portions thereof with code not governed by the terms of this License. + . + 1.8. "License" means this document. + . + 1.8.1. "Licensable" means having the right to grant, to the maximum + extent possible, whether at the time of the initial grant or + subsequently acquired, any and all of the rights conveyed herein. + . + 1.9. "Modifications" means any addition to or deletion from the + substance or structure of either the Original Code or any previous + Modifications. When Covered Code is released as a series of files, a + Modification is: + A. Any addition to or deletion from the contents of a file + containing Original Code or previous Modifications. + . + B. Any new file that contains any part of the Original Code or + previous Modifications. + . + 1.10. "Original Code" means Source Code of computer software code + which is described in the Source Code notice required by Exhibit A as + Original Code, and which, at the time of its release under this + License is not already Covered Code governed by this License. + . + 1.10.1. "Patent Claims" means any patent claim(s), now owned or + hereafter acquired, including without limitation, method, process, + and apparatus claims, in any patent Licensable by grantor. + . + 1.11. "Source Code" means the preferred form of the Covered Code for + making modifications to it, including all modules it contains, plus + any associated interface definition files, scripts used to control + compilation and installation of an Executable, or source code + differential comparisons against either the Original Code or another + well known, available Covered Code of the Contributor's choice. The + Source Code can be in a compressed or archival form, provided the + appropriate decompression or de-archiving software is widely available + for no charge. + . + 1.12. "You" (or "Your") means an individual or a legal entity + exercising rights under, and complying with all of the terms of, this + License or a future version of this License issued under Section 6.1. + For legal entities, "You" includes any entity which controls, is + controlled by, or is under common control with You. For purposes of + this definition, "control" means (a) the power, direct or indirect, + to cause the direction or management of such entity, whether by + contract or otherwise, or (b) ownership of more than fifty percent + (50%) of the outstanding shares or beneficial ownership of such + entity. + . + 2. Source Code License. + . + 2.1. The Initial Developer Grant. + The Initial Developer hereby grants You a world-wide, royalty-free, + non-exclusive license, subject to third party intellectual property + claims: + (a) under intellectual property rights (other than patent or + trademark) Licensable by Initial Developer to use, reproduce, + modify, display, perform, sublicense and distribute the Original + Code (or portions thereof) with or without Modifications, and/or + as part of a Larger Work; and + . + (b) under Patents Claims infringed by the making, using or + selling of Original Code, to make, have made, use, practice, + sell, and offer for sale, and/or otherwise dispose of the + Original Code (or portions thereof). + . + (c) the licenses granted in this Section 2.1(a) and (b) are + effective on the date Initial Developer first distributes + Original Code under the terms of this License. + . + (d) Notwithstanding Section 2.1(b) above, no patent license is + granted: 1) for code that You delete from the Original Code; 2) + separate from the Original Code; or 3) for infringements caused + by: i) the modification of the Original Code or ii) the + combination of the Original Code with other software or devices. + . + 2.2. Contributor Grant. + Subject to third party intellectual property claims, each Contributor + hereby grants You a world-wide, royalty-free, non-exclusive license + . + (a) under intellectual property rights (other than patent or + trademark) Licensable by Contributor, to use, reproduce, modify, + display, perform, sublicense and distribute the Modifications + created by such Contributor (or portions thereof) either on an + unmodified basis, with other Modifications, as Covered Code + and/or as part of a Larger Work; and + . + (b) under Patent Claims infringed by the making, using, or + selling of Modifications made by that Contributor either alone + and/or in combination with its Contributor Version (or portions + of such combination), to make, use, sell, offer for sale, have + made, and/or otherwise dispose of: 1) Modifications made by that + Contributor (or portions thereof); and 2) the combination of + Modifications made by that Contributor with its Contributor + Version (or portions of such combination). + . + (c) the licenses granted in Sections 2.2(a) and 2.2(b) are + effective on the date Contributor first makes Commercial Use of + the Covered Code. + . + (d) Notwithstanding Section 2.2(b) above, no patent license is + granted: 1) for any code that Contributor has deleted from the + Contributor Version; 2) separate from the Contributor Version; + 3) for infringements caused by: i) third party modifications of + Contributor Version or ii) the combination of Modifications made + by that Contributor with other software (except as part of the + Contributor Version) or other devices; or 4) under Patent Claims + infringed by Covered Code in the absence of Modifications made by + that Contributor. + . + 3. Distribution Obligations. + . + 3.1. Application of License. + The Modifications which You create or to which You contribute are + governed by the terms of this License, including without limitation + Section 2.2. The Source Code version of Covered Code may be + distributed only under the terms of this License or a future version + of this License released under Section 6.1, and You must include a + copy of this License with every copy of the Source Code You + distribute. You may not offer or impose any terms on any Source Code + version that alters or restricts the applicable version of this + License or the recipients' rights hereunder. However, You may include + an additional document offering the additional rights described in + Section 3.5. + . + 3.2. Availability of Source Code. + Any Modification which You create or to which You contribute must be + made available in Source Code form under the terms of this License + either on the same media as an Executable version or via an accepted + Electronic Distribution Mechanism to anyone to whom you made an + Executable version available; and if made available via Electronic + Distribution Mechanism, must remain available for at least twelve (12) + months after the date it initially became available, or at least six + (6) months after a subsequent version of that particular Modification + has been made available to such recipients. You are responsible for + ensuring that the Source Code version remains available even if the + Electronic Distribution Mechanism is maintained by a third party. + . + 3.3. Description of Modifications. + You must cause all Covered Code to which You contribute to contain a + file documenting the changes You made to create that Covered Code and + the date of any change. You must include a prominent statement that + the Modification is derived, directly or indirectly, from Original + Code provided by the Initial Developer and including the name of the + Initial Developer in (a) the Source Code, and (b) in any notice in an + Executable version or related documentation in which You describe the + origin or ownership of the Covered Code. + . + 3.4. Intellectual Property Matters + (a) Third Party Claims. + If Contributor has knowledge that a license under a third party's + intellectual property rights is required to exercise the rights + granted by such Contributor under Sections 2.1 or 2.2, + Contributor must include a text file with the Source Code + distribution titled "LEGAL" which describes the claim and the + party making the claim in sufficient detail that a recipient will + know whom to contact. If Contributor obtains such knowledge after + the Modification is made available as described in Section 3.2, + Contributor shall promptly modify the LEGAL file in all copies + Contributor makes available thereafter and shall take other steps + (such as notifying appropriate mailing lists or newsgroups) + reasonably calculated to inform those who received the Covered + Code that new knowledge has been obtained. + . + (b) Contributor APIs. + If Contributor's Modifications include an application programming + interface and Contributor has knowledge of patent licenses which + are reasonably necessary to implement that API, Contributor must + also include this information in the LEGAL file. + . + (c) Representations. + Contributor represents that, except as disclosed pursuant to + Section 3.4(a) above, Contributor believes that Contributor's + Modifications are Contributor's original creation(s) and/or + Contributor has sufficient rights to grant the rights conveyed by + this License. + . + 3.5. Required Notices. + You must duplicate the notice in Exhibit A in each file of the Source + Code. If it is not possible to put such notice in a particular Source + Code file due to its structure, then You must include such notice in a + location (such as a relevant directory) where a user would be likely + to look for such a notice. If You created one or more Modification(s) + You may add your name as a Contributor to the notice described in + Exhibit A. You must also duplicate this License in any documentation + for the Source Code where You describe recipients' rights or ownership + rights relating to Covered Code. You may choose to offer, and to + charge a fee for, warranty, support, indemnity or liability + obligations to one or more recipients of Covered Code. However, You + may do so only on Your own behalf, and not on behalf of the Initial + Developer or any Contributor. You must make it absolutely clear than + any such warranty, support, indemnity or liability obligation is + offered by You alone, and You hereby agree to indemnify the Initial + Developer and every Contributor for any liability incurred by the + Initial Developer or such Contributor as a result of warranty, + support, indemnity or liability terms You offer. + . + 3.6. Distribution of Executable Versions. + You may distribute Covered Code in Executable form only if the + requirements of Section 3.1-3.5 have been met for that Covered Code, + and if You include a notice stating that the Source Code version of + the Covered Code is available under the terms of this License, + including a description of how and where You have fulfilled the + obligations of Section 3.2. The notice must be conspicuously included + in any notice in an Executable version, related documentation or + collateral in which You describe recipients' rights relating to the + Covered Code. You may distribute the Executable version of Covered + Code or ownership rights under a license of Your choice, which may + contain terms different from this License, provided that You are in + compliance with the terms of this License and that the license for the + Executable version does not attempt to limit or alter the recipient's + rights in the Source Code version from the rights set forth in this + License. If You distribute the Executable version under a different + license You must make it absolutely clear that any terms which differ + from this License are offered by You alone, not by the Initial + Developer or any Contributor. You hereby agree to indemnify the + Initial Developer and every Contributor for any liability incurred by + the Initial Developer or such Contributor as a result of any such + terms You offer. + . + 3.7. Larger Works. + You may create a Larger Work by combining Covered Code with other code + not governed by the terms of this License and distribute the Larger + Work as a single product. In such a case, You must make sure the + requirements of this License are fulfilled for the Covered Code. + . + 4. Inability to Comply Due to Statute or Regulation. + . + If it is impossible for You to comply with any of the terms of this + License with respect to some or all of the Covered Code due to + statute, judicial order, or regulation then You must: (a) comply with + the terms of this License to the maximum extent possible; and (b) + describe the limitations and the code they affect. Such description + must be included in the LEGAL file described in Section 3.4 and must + be included with all distributions of the Source Code. Except to the + extent prohibited by statute or regulation, such description must be + sufficiently detailed for a recipient of ordinary skill to be able to + understand it. + . + 5. Application of this License. + . + This License applies to code to which the Initial Developer has + attached the notice in Exhibit A and to related Covered Code. + . + 6. Versions of the License. + . + 6.1. New Versions. + Netscape Communications Corporation ("Netscape") may publish revised + and/or new versions of the License from time to time. Each version + will be given a distinguishing version number. + . + 6.2. Effect of New Versions. + Once Covered Code has been published under a particular version of the + License, You may always continue to use it under the terms of that + version. You may also choose to use such Covered Code under the terms + of any subsequent version of the License published by Netscape. No one + other than Netscape has the right to modify the terms applicable to + Covered Code created under this License. + . + 6.3. Derivative Works. + If You create or use a modified version of this License (which you may + only do in order to apply it to code which is not already Covered Code + governed by this License), You must (a) rename Your license so that + the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", + "MPL", "NPL" or any confusingly similar phrase do not appear in your + license (except to note that your license differs from this License) + and (b) otherwise make it clear that Your version of the license + contains terms which differ from the Mozilla Public License and + Netscape Public License. (Filling in the name of the Initial + Developer, Original Code or Contributor in the notice described in + Exhibit A shall not of themselves be deemed to be modifications of + this License.) + . + 7. DISCLAIMER OF WARRANTY. + . + COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF + DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. + THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE + IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, + YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE + COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER + OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF + ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. + . + 8. TERMINATION. + . + 8.1. This License and the rights granted hereunder will terminate + automatically if You fail to comply with terms herein and fail to cure + such breach within 30 days of becoming aware of the breach. All + sublicenses to the Covered Code which are properly granted shall + survive any termination of this License. Provisions which, by their + nature, must remain in effect beyond the termination of this License + shall survive. + . + 8.2. If You initiate litigation by asserting a patent infringement + claim (excluding declatory judgment actions) against Initial Developer + or a Contributor (the Initial Developer or Contributor against whom + You file such action is referred to as "Participant") alleging that: + . + (a) such Participant's Contributor Version directly or indirectly + infringes any patent, then any and all rights granted by such + Participant to You under Sections 2.1 and/or 2.2 of this License + shall, upon 60 days notice from Participant terminate prospectively, + unless if within 60 days after receipt of notice You either: (i) + agree in writing to pay Participant a mutually agreeable reasonable + royalty for Your past and future use of Modifications made by such + Participant, or (ii) withdraw Your litigation claim with respect to + the Contributor Version against such Participant. If within 60 days + of notice, a reasonable royalty and payment arrangement are not + mutually agreed upon in writing by the parties or the litigation claim + is not withdrawn, the rights granted by Participant to You under + Sections 2.1 and/or 2.2 automatically terminate at the expiration of + the 60 day notice period specified above. + . + (b) any software, hardware, or device, other than such Participant's + Contributor Version, directly or indirectly infringes any patent, then + any rights granted to You by such Participant under Sections 2.1(b) + and 2.2(b) are revoked effective as of the date You first made, used, + sold, distributed, or had made, Modifications made by that + Participant. + . + 8.3. If You assert a patent infringement claim against Participant + alleging that such Participant's Contributor Version directly or + indirectly infringes any patent where such claim is resolved (such as + by license or settlement) prior to the initiation of patent + infringement litigation, then the reasonable value of the licenses + granted by such Participant under Sections 2.1 or 2.2 shall be taken + into account in determining the amount or value of any payment or + license. + . + 8.4. In the event of termination under Sections 8.1 or 8.2 above, + all end user license agreements (excluding distributors and resellers) + which have been validly granted by You or any distributor hereunder + prior to termination shall survive termination. + . + 9. LIMITATION OF LIABILITY. + . + UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT + (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL + DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, + OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR + ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY + CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, + WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER + COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN + INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF + LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY + RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW + PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE + EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO + THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. + . + 10. U.S. GOVERNMENT END USERS. + . + The Covered Code is a "commercial item," as that term is defined in + 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer + software" and "commercial computer software documentation," as such + terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 + C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), + all U.S. Government End Users acquire Covered Code with only those + rights set forth herein. + . + 11. MISCELLANEOUS. + . + This License represents the complete agreement concerning subject + matter hereof. If any provision of this License is held to be + unenforceable, such provision shall be reformed only to the extent + necessary to make it enforceable. This License shall be governed by + California law provisions (except to the extent applicable law, if + any, provides otherwise), excluding its conflict-of-law provisions. + With respect to disputes in which at least one party is a citizen of, + or an entity chartered or registered to do business in the United + States of America, any litigation relating to this License shall be + subject to the jurisdiction of the Federal Courts of the Northern + District of California, with venue lying in Santa Clara County, + California, with the losing party responsible for costs, including + without limitation, court costs and reasonable attorneys' fees and + expenses. The application of the United Nations Convention on + Contracts for the International Sale of Goods is expressly excluded. + Any law or regulation which provides that the language of a contract + shall be construed against the drafter shall not apply to this + License. + . + 12. RESPONSIBILITY FOR CLAIMS. + . + As between Initial Developer and the Contributors, each party is + responsible for claims and damages arising, directly or indirectly, + out of its utilization of rights under this License and You agree to + work with Initial Developer and Contributors to distribute such + responsibility on an equitable basis. Nothing herein is intended or + shall be deemed to constitute any admission of liability. + . + 13. MULTIPLE-LICENSED CODE. + . + Initial Developer may designate portions of the Covered Code as + "Multiple-Licensed". "Multiple-Licensed" means that the Initial + Developer permits you to utilize portions of the Covered Code under + Your choice of the NPL or the alternative licenses, if any, specified + by the Initial Developer in the file described in Exhibit A. + . + EXHIBIT A -Mozilla Public License. + . + ``The contents of this file are subject to the Mozilla Public License + Version 1.1 (the "License"); you may not use this file except in + compliance with the License. You may obtain a copy of the License at + http://www.mozilla.org/MPL/ + . + Software distributed under the License is distributed on an "AS IS" + basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + License for the specific language governing rights and limitations + under the License. + . + The Original Code is ______________________________________. + . + The Initial Developer of the Original Code is ________________________. + Portions created by ______________________ are Copyright (C) ______ + _______________________. All Rights Reserved. + . + Contributor(s): ______________________________________. + . + Alternatively, the contents of this file may be used under the terms + of the _____ license (the "[___] License"), in which case the + provisions of [______] License are applicable instead of those + above. If you wish to allow use of your version of this file only + under the terms of the [____] License and not to allow others to use + your version of this file under the MPL, indicate your decision by + deleting the provisions above and replace them with the notice and + other provisions required by the [___] License. If you do not delete + the provisions above, a recipient may use your version of this file + under either the MPL or the [___] License." + . + [NOTE: The text of this Exhibit A may differ slightly from the text of + the notices in the Source Code files of the Original Code. You should + use the text of this Exhibit A rather than the text found in the + Original Code Source Code for Your Modifications.] + . + ---------------------------------------------------------------------- + . + AMENDMENTS + . + The Netscape Public License Version 1.1 ("NPL") consists of the + Mozilla Public License Version 1.1 with the following Amendments, + including Exhibit A-Netscape Public License. Files identified with + "Exhibit A-Netscape Public License" are governed by the Netscape + Public License Version 1.1. + . + Additional Terms applicable to the Netscape Public License. + I. Effect. + These additional terms described in this Netscape Public + License -- Amendments shall apply to the Mozilla Communicator + client code and to all Covered Code under this License. + . + II. "Netscape's Branded Code" means Covered Code that Netscape + distributes and/or permits others to distribute under one or more + trademark(s) which are controlled by Netscape but which are not + licensed for use under this License. + . + III. Netscape and logo. + This License does not grant any rights to use the trademarks + "Netscape", the "Netscape N and horizon" logo or the "Netscape + lighthouse" logo, "Netcenter", "Gecko", "Java" or "JavaScript", + "Smart Browsing" even if such marks are included in the Original + Code or Modifications. + . + IV. Inability to Comply Due to Contractual Obligation. + Prior to licensing the Original Code under this License, Netscape + has licensed third party code for use in Netscape's Branded Code. + To the extent that Netscape is limited contractually from making + such third party code available under this License, Netscape may + choose to reintegrate such code into Covered Code without being + required to distribute such code in Source Code form, even if + such code would otherwise be considered "Modifications" under + this License. + . + V. Use of Modifications and Covered Code by Initial Developer. + V.1. In General. + The obligations of Section 3 apply to Netscape, except to + the extent specified in this Amendment, Section V.2 and V.3. + . + V.2. Other Products. + Netscape may include Covered Code in products other than the + Netscape's Branded Code which are released by Netscape + during the two (2) years following the release date of the + Original Code, without such additional products becoming + subject to the terms of this License, and may license such + additional products on different terms from those contained + in this License. + . + V.3. Alternative Licensing. + Netscape may license the Source Code of Netscape's Branded + Code, including Modifications incorporated therein, without + such Netscape Branded Code becoming subject to the terms of + this License, and may license such Netscape Branded Code on + different terms from those contained in this License. + . + VI. Litigation. + Notwithstanding the limitations of Section 11 above, the + provisions regarding litigation in Section 11(a), (b) and (c) of + the License shall apply to all disputes relating to this License. + . + EXHIBIT A-Netscape Public License. + . + "The contents of this file are subject to the Netscape Public + License Version 1.1 (the "License"); you may not use this file + except in compliance with the License. You may obtain a copy of + the License at http://www.mozilla.org/NPL/ + . + Software distributed under the License is distributed on an "AS + IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + implied. See the License for the specific language governing + rights and limitations under the License. + . + The Original Code is Mozilla Communicator client code, released + March 31, 1998. + . + The Initial Developer of the Original Code is Netscape + Communications Corporation. Portions created by Netscape are + Copyright (C) 1998-1999 Netscape Communications Corporation. All + Rights Reserved. + . + Contributor(s): ______________________________________. + . + Alternatively, the contents of this file may be used under the + terms of the _____ license (the "[___] License"), in which case + the provisions of [______] License are applicable instead of + those above. If you wish to allow use of your version of this + file only under the terms of the [____] License and not to allow + others to use your version of this file under the NPL, indicate + your decision by deleting the provisions above and replace them + with the notice and other provisions required by the [___] + License. If you do not delete the provisions above, a recipient + may use your version of this file under either the NPL or the + [___] License." --- pyxpcom-9.0~hg20111212.orig/debian/install.in +++ pyxpcom-9.0~hg20111212/debian/install.in @@ -0,0 +1,5 @@ +builddir/dist/bin/libpyxpcom.so ##XREDIR## +builddir/dist/bin/components/libpyloader.so usr/lib/python-xpcom +builddir/dist/bin/components/pyabout.py ##XREDIR##/components +builddir/dist/bin/python/* usr/lib/##PYVER##/site-packages +builddir/dist/include/PyXPCOM.h ##INCDIR## --- pyxpcom-9.0~hg20111212.orig/debian/postinst.in +++ pyxpcom-9.0~hg20111212/debian/postinst.in @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +if [ "$1" = "configure" ]; then + ln -snf ../../python-xpcom/libpyloader.so ##XREDIR##/components/libpyloader.so + dpkg-trigger ##XREDIR##/components +fi + +#DEBHELPER# --- pyxpcom-9.0~hg20111212.orig/debian/prerm.in +++ pyxpcom-9.0~hg20111212/debian/prerm.in @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +if [ "$1" = "remove" ]; then + rm -f ##XREDIR##/components/pyabout.pyo \ + ##XREDIR##/components/libpyloader.so +fi + +#DEBHELPER# --- pyxpcom-9.0~hg20111212.orig/debian/rules +++ pyxpcom-9.0~hg20111212/debian/rules @@ -0,0 +1,55 @@ +#!/usr/bin/make -f + +PYVER := $(shell pyversions -d) + +SDKDIR := $(shell pkg-config --variable=sdkdir libxul) +XREDIR := $(subst devel-,,$(SDKDIR)) +INCDIR := $(shell pkg-config --variable=includedir libxul)/$(shell pkg-config --exists libxul-unstable && pkg-config --variable=includetype libxul-unstable) + +CXXFLAGS := $(dpkg-buildflags --get CXXFLAGS) +LDFLAGS := $(dpkg-buildflags --get LDFLAGS) +ifndef CXX +CXX := g++ +endif +CXXFLAGS += -D$(shell echo $(notdir $(XREDIR)) | tr a-z-. A-Z__) +ifeq (,$(shell dpkg --compare-versions $(shell $(CXX) -dumpversion) '>=' 4.4 || echo no)) +CXXFLAGS += -std=gnu++0x +endif + +LDFLAGS += -Wl,--as-needed + +export CXXFLAGS LDFLAGS + +PP_FILES := $(patsubst %.in,%,$(wildcard debian/*.in)) +$(PP_FILES): %: %.in + sed $(foreach var,XREDIR PYVER INCDIR,-e 's|##$(var)##|$($(var))|g' )$^ > $@ + +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + +export MOZ_PYTHON_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) + +override_dh_auto_configure: + autoconf + dh_auto_configure -- --with-libxul-sdk=$(SDKDIR) --with-system-nspr + +override_dh_auto_build: + dh_auto_build -- PYTHON_SO=$(shell objdump -p /usr/lib/lib$(PYVER).so | awk '/SONAME/ {print $$2}') XREDIR=$(XREDIR) USE_ELF_DYNSTR_GC= + +override_dh_shlibdeps: + dh_shlibdeps -l$(CURDIR)/debian/python-xpcom/$(XREDIR) -l$(XREDIR) + +override_dh_gencontrol: + dh_gencontrol -- -Vxulrunner:Depends=$(notdir $(XREDIR)) + +override_dh_auto_clean: + dh_auto_clean --builddirectory=builddir + rm -f configure config/*.pyc $(PP_FILES) + +override_dh_auto_test: + +install binary binary-arch binary-indep: $(PP_FILES) + +binary binary-arch binary-indep build clean install: + dh --with python2 --builddirectory=builddir $@ + +.PHONY: binary binary-arch binary-indep build clean install --- pyxpcom-9.0~hg20111212.orig/xpcom/src/Makefile.in +++ pyxpcom-9.0~hg20111212/xpcom/src/Makefile.in @@ -83,7 +83,7 @@ include $(topsrcdir)/config/config.mk -CXXFLAGS += -DPYTHON_SO=\"libpython$(MOZ_PYTHON_VER_DOTTED).so\" +CXXFLAGS += -DPYTHON_SO=\"$(PYTHON_SO)\" # Enable this if you want useful debugging symbols. CXXFLAGS += -g --- pyxpcom-9.0~hg20111212.orig/xpcom/src/PyGInputStream.cpp +++ pyxpcom-9.0~hg20111212/xpcom/src/PyGInputStream.cpp @@ -59,7 +59,7 @@ NS_IMETHOD Available(PRUint32 *_retval); NS_IMETHOD Read(char * buf, PRUint32 count, PRUint32 *_retval); NS_IMETHOD ReadSegments(nsWriteSegmentFun writer, void * closure, PRUint32 count, PRUint32 *_retval); - NS_IMETHOD IsNonBlocking(PRBool *aNonBlocking); + NS_IMETHOD IsNonBlocking(bool *aNonBlocking); }; @@ -134,7 +134,7 @@ } NS_IMETHODIMP -PyG_nsIInputStream::IsNonBlocking(PRBool *aNonBlocking) +PyG_nsIInputStream::IsNonBlocking(bool *aNonBlocking) { NS_PRECONDITION(aNonBlocking, "null pointer"); CEnterLeavePython _celp; --- pyxpcom-9.0~hg20111212.orig/xpcom/src/PyGModule.cpp +++ pyxpcom-9.0~hg20111212/xpcom/src/PyGModule.cpp @@ -137,7 +137,7 @@ } NS_IMETHODIMP -PyG_nsIModule::CanUnload(nsIComponentManager *aCompMgr, PRBool *okToUnload) +PyG_nsIModule::CanUnload(nsIComponentManager *aCompMgr, bool *okToUnload) { NS_PRECONDITION(aCompMgr, "null pointer"); NS_PRECONDITION(okToUnload, "null pointer"); --- pyxpcom-9.0~hg20111212.orig/xpcom/src/PyIInterfaceInfo.cpp +++ pyxpcom-9.0~hg20111212/xpcom/src/PyIInterfaceInfo.cpp @@ -108,7 +108,7 @@ if (pI==NULL) return NULL; - PRBool b_ret; + bool b_ret; nsresult r; Py_BEGIN_ALLOW_THREADS; r = pI->IsScriptable(&b_ret); @@ -352,25 +352,6 @@ return PyInt_FromLong(ret); } -static PyObject *PyGetLengthIsArgNumberForParam(PyObject *self, PyObject *args) -{ - nsIInterfaceInfo *pii = GetI(self); - if (pii==NULL) - return NULL; - PRUint16 mi, pi, dim; - if (!PyArg_ParseTuple(args, "hhh:GetLengthIsArgNumberForParam", &mi, &pi, &dim)) - return NULL; - const nsXPTMethodInfo *pmi; - if (!__GetMethodInfoHelper(pii, mi, pi, &pmi)) - return NULL; - PRUint8 ret; - const nsXPTParamInfo& param_info = pmi->GetParam((PRUint8)pi); - nsresult n = pii->GetLengthIsArgNumberForParam(mi, ¶m_info, dim, &ret); - if (NS_FAILED(n)) - return PyXPCOM_BuildPyException(n); - return PyInt_FromLong(ret); -} - static PyObject *PyGetInterfaceIsArgNumberForParam(PyObject *self, PyObject *args) { nsIInterfaceInfo *pii = GetI(self); @@ -406,7 +387,6 @@ { "GetIIDForParam", PyGetIIDForParam, 1}, { "GetTypeForParam", PyGetTypeForParam, 1}, { "GetSizeIsArgNumberForParam", PyGetSizeIsArgNumberForParam, 1}, - { "GetLengthIsArgNumberForParam", PyGetLengthIsArgNumberForParam, 1}, { "GetInterfaceIsArgNumberForParam", PyGetInterfaceIsArgNumberForParam, 1}, {NULL} }; @@ -419,7 +399,6 @@ NS_IMETHOD GetIIDForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, nsIID * *_retval) = 0; NS_IMETHOD GetTypeForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, PRUint16 dimension, nsXPTType *_retval) = 0; NS_IMETHOD GetSizeIsArgNumberForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, PRUint16 dimension, PRUint8 *_retval) = 0; - NS_IMETHOD GetLengthIsArgNumberForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, PRUint16 dimension, PRUint8 *_retval) = 0; NS_IMETHOD GetInterfaceIsArgNumberForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, PRUint8 *_retval) = 0; */ --- pyxpcom-9.0~hg20111212.orig/xpcom/src/PyISimpleEnumerator.cpp +++ pyxpcom-9.0~hg20111212/xpcom/src/PyISimpleEnumerator.cpp @@ -69,7 +69,7 @@ return NULL; nsresult r; - PRBool more; + bool more; Py_BEGIN_ALLOW_THREADS; r = pI->HasMoreElements(&more); Py_END_ALLOW_THREADS; @@ -141,7 +141,7 @@ } memset(fetched, 0, sizeof(nsISupports *) * n_wanted); nsresult r = NS_OK; - PRBool more; + bool more; Py_BEGIN_ALLOW_THREADS; for (;n_fetchedHasMoreElements(&more); --- pyxpcom-9.0~hg20111212.orig/xpcom/src/PyIVariant.cpp +++ pyxpcom-9.0~hg20111212/xpcom/src/PyIVariant.cpp @@ -117,7 +117,7 @@ GET_SIMPLE(PRUint64, GetAsUint64, PyLong_FromUnsignedLongLong) GET_SIMPLE(float, GetAsFloat, PyFloat_FromDouble) GET_SIMPLE(double, GetAsDouble, PyFloat_FromDouble) -GET_SIMPLE(PRBool, GetAsBool, MyBool) +GET_SIMPLE(bool, GetAsBool, MyBool) GET_SIMPLE(char, GetAsChar, MyChar) GET_SIMPLE(PRUnichar, GetAsWChar, MyUChar) GET_SIMPLE(nsIID, GetAsID, Py_nsIID::PyObjectFromIID) --- pyxpcom-9.0~hg20111212.orig/xpcom/src/VariantUtils.cpp +++ pyxpcom-9.0~hg20111212/xpcom/src/VariantUtils.cpp @@ -837,7 +837,7 @@ case nsIDataType::VTYPE_DOUBLE: GET_FROM_V(double, v->GetAsDouble, PyFloat_FromDouble); case nsIDataType::VTYPE_BOOL: - GET_FROM_V(PRBool, v->GetAsBool, MyBool_FromBool); + GET_FROM_V(bool, v->GetAsBool, MyBool_FromBool); default: PyXPCOM_LogWarning("Converting variant to Python object - variant type '%d' unknown - using string.\n", dt); // Fall through to the string case --- pyxpcom-9.0~hg20111212.orig/xpcom/src/loader/Makefile.in +++ pyxpcom-9.0~hg20111212/xpcom/src/loader/Makefile.in @@ -74,6 +74,7 @@ EXTRA_DSO_LDOPTS += $(XPCOM_GLUE_LDOPTS) \ $(MOZ_COMPONENT_LIBS) \ + -Wl,-rpath,$(XREDIR) \ $(NULL) include $(topsrcdir)/config/rules.mk --- pyxpcom-9.0~hg20111212.orig/xpcom/src/module/Makefile.in +++ pyxpcom-9.0~hg20111212/xpcom/src/module/Makefile.in @@ -80,6 +80,7 @@ else EXTRA_DSO_LDOPTS += $(XPCOM_GLUE_LDOPTS) \ $(MOZ_COMPONENT_LIBS) \ + -Wl,-rpath,$(XREDIR) \ $(NULL) endif IMPORT_LIBRARY := $(SHARED_LIBRARY:.pyd=.lib) --- pyxpcom-9.0~hg20111212.orig/xpcom/test/test_component/py_test_component.idl +++ pyxpcom-9.0~hg20111212/xpcom/test/test_component/py_test_component.idl @@ -49,11 +49,11 @@ const long Two = 2; const long MinusOne = -1; const long BigLong = 0x7FFFFFFF; - const long BiggerLong = 0xFFFFFFFF; + const long BiggerLong = -1; const unsigned long BigULong = 0xFFFFFFFF; // Declare every type supported as an attribute. - attribute boolean boolean_value; // PRBool + attribute boolean boolean_value; // bool attribute octet octet_value; // PRUint8 attribute short short_value; // PRInt16 attribute unsigned short ushort_value; // PRUint16 @@ -178,7 +178,7 @@ // Arrays of interfaces void CheckInterfaceArray(in PRUint32 count, [array, size_is(count)] in nsISupports data, - [retval] out PRBool all_non_null); + [retval] out bool all_non_null); void CopyInterfaceArray(in PRUint32 count, [array, size_is(count)] in nsISupports data, [array, size_is(out_count)] out nsISupports out_data, @@ -191,7 +191,7 @@ // Arrays of IIDs void CheckIIDArray(in PRUint32 count, [array, size_is(count)] in nsIIDRef data, - [retval] out PRBool all_mine); + [retval] out bool all_mine); void GetIIDArray(out PRUint32 count, [array, size_is(count)] out nsIIDRef data); void ExtendIIDArray(inout PRUint32 count,