diff --git a/dev-lang/python/python-2.6.9.recipe b/dev-lang/python/python-2.6.9.recipe index 1501779ad..bc590b92c 100644 --- a/dev-lang/python/python-2.6.9.recipe +++ b/dev-lang/python/python-2.6.9.recipe @@ -11,9 +11,9 @@ OSI-approved open source license. HOMEPAGE="http://www.python.org" LICENSE="Python" COPYRIGHT="1990-2012, Python Software Foundation" -SRC_URI="https://www.python.org/ftp/python/2.6.9/Python-2.6.9.tar.xz" -CHECKSUM_SHA256="cae7bb995006ea5b703d9d28446f694894c441fe4bfb95d561c0ac908cd06e41" -REVISION="1" +SRC_URI="https://www.python.org/ftp/python/2.6.9/Python-2.6.9.tgz" +CHECKSUM_SHA256="7277b1285d8a82f374ef6ebaac85b003266f7939b3f2a24a3af52f9523ac94db" +REVISION="2" ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="python-2.6.9.patchset" diff --git a/dev-python/python_setuptools/python_setuptools-5.3.recipe b/dev-python/python_setuptools/python_setuptools-5.3.recipe new file mode 100644 index 000000000..439ed5614 --- /dev/null +++ b/dev-python/python_setuptools/python_setuptools-5.3.recipe @@ -0,0 +1,52 @@ +SUMMARY="Easily download, build, install, upgrade, and uninstall Python packages." +DESCRIPTION="EasyInstall (easy_install) gives you a quick and painless way \ +to install packages remotely by connecting to the cheeseshop or even other \ +websites via HTTP. It is somewhat analogous to the CPAN and PEAR tools for Perl \ +and PHP, respectively. \ +" +HOMEPAGE="https://pypi.python.org/pypi/setuptools" +SRC_URI="https://pypi.python.org/packages/source/s/setuptools/setuptools-5.3.zip" +CHECKSUM_SHA256="238142293c36d2b56c83df1886b4c1fc4af77d0c203c68b8f4e57d8995babfe5" +SOURCE_DIR="setuptools-$portVersion" +LICENSE="Python" +COPYRIGHT="2006-2014 Python Packaging Authority" +REVISION="1" +ARCHITECTURES="x86 x86_gcc2 x86_64" + +PROVIDES=" + python_setuptools = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + cmd:python + " + +BUILD_REQUIRES="" + +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:python + " + +BUILD() +{ + $portPackageLinksDir/cmd~python/bin/python setup.py build +} + +INSTALL() +{ + # GENERIC: all python_setuptools-based installs need this + pythonVersion=$(python --version 2>&1 | sed 's/Python //' | head -c3) + installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + + $portPackageLinksDir/cmd~python/bin/python setup.py install \ + --prefix=$prefix + + # easy_install cannot tolerate not being installed alongside setuptools, + # so just delete it. + rm $prefix/bin/easy_install + rm $prefix/bin/easy_install-2.6 +} diff --git a/dev-python/setuptools/licenses/Python b/dev-python/setuptools/licenses/Python deleted file mode 100644 index 1050ea9d6..000000000 --- a/dev-python/setuptools/licenses/Python +++ /dev/null @@ -1,278 +0,0 @@ -A. HISTORY OF THE SOFTWARE -========================== - -Python was created in the early 1990s by Guido van Rossum at Stichting -Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands -as a successor of a language called ABC. Guido remains Python's -principal author, although it includes many contributions from others. - -In 1995, Guido continued his work on Python at the Corporation for -National Research Initiatives (CNRI, see http://www.cnri.reston.va.us) -in Reston, Virginia where he released several versions of the -software. - -In May 2000, Guido and the Python core development team moved to -BeOpen.com to form the BeOpen PythonLabs team. In October of the same -year, the PythonLabs team moved to Digital Creations (now Zope -Corporation, see http://www.zope.com). In 2001, the Python Software -Foundation (PSF, see http://www.python.org/psf/) was formed, a -non-profit organization created specifically to own Python-related -Intellectual Property. Zope Corporation is a sponsoring member of -the PSF. - -All Python releases are Open Source (see http://www.opensource.org for -the Open Source Definition). Historically, most, but not all, Python -releases have also been GPL-compatible; the table below summarizes -the various releases. - - Release Derived Year Owner GPL- - from compatible? (1) - - 0.9.0 thru 1.2 1991-1995 CWI yes - 1.3 thru 1.5.2 1.2 1995-1999 CNRI yes - 1.6 1.5.2 2000 CNRI no - 2.0 1.6 2000 BeOpen.com no - 1.6.1 1.6 2001 CNRI yes (2) - 2.1 2.0+1.6.1 2001 PSF no - 2.0.1 2.0+1.6.1 2001 PSF yes - 2.1.1 2.1+2.0.1 2001 PSF yes - 2.2 2.1.1 2001 PSF yes - 2.1.2 2.1.1 2002 PSF yes - 2.1.3 2.1.2 2002 PSF yes - 2.2.1 2.2 2002 PSF yes - 2.2.2 2.2.1 2002 PSF yes - 2.2.3 2.2.2 2003 PSF yes - 2.3 2.2.2 2002-2003 PSF yes - 2.3.1 2.3 2002-2003 PSF yes - 2.3.2 2.3.1 2002-2003 PSF yes - 2.3.3 2.3.2 2002-2003 PSF yes - 2.3.4 2.3.3 2004 PSF yes - 2.3.5 2.3.4 2005 PSF yes - 2.4 2.3 2004 PSF yes - 2.4.1 2.4 2005 PSF yes - 2.4.2 2.4.1 2005 PSF yes - 2.4.3 2.4.2 2006 PSF yes - 2.4.4 2.4.3 2006 PSF yes - 2.5 2.4 2006 PSF yes - 2.5.1 2.5 2007 PSF yes - 2.5.2 2.5.1 2008 PSF yes - 2.5.3 2.5.2 2008 PSF yes - 2.6 2.5 2008 PSF yes - 2.6.1 2.6 2008 PSF yes - 2.6.2 2.6.1 2009 PSF yes - 2.6.3 2.6.2 2009 PSF yes - 2.6.4 2.6.3 2009 PSF yes - 2.6.5 2.6.4 2010 PSF yes - -Footnotes: - -(1) GPL-compatible doesn't mean that we're distributing Python under - the GPL. All Python licenses, unlike the GPL, let you distribute - a modified version without making your changes open source. The - GPL-compatible licenses make it possible to combine Python with - other software that is released under the GPL; the others don't. - -(2) According to Richard Stallman, 1.6.1 is not GPL-compatible, - because its license has a choice of law clause. According to - CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1 - is "not incompatible" with the GPL. - -Thanks to the many outside volunteers who have worked under Guido's -direction to make these releases possible. - - -B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON -=============================================================== - -PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 --------------------------------------------- - -1. This LICENSE AGREEMENT is between the Python Software Foundation -("PSF"), and the Individual or Organization ("Licensee") accessing and -otherwise using this software ("Python") in source or binary form and -its associated documentation. - -2. Subject to the terms and conditions of this License Agreement, PSF hereby -grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, -analyze, test, perform and/or display publicly, prepare derivative works, -distribute, and otherwise use Python alone or in any derivative version, -provided, however, that PSF's License Agreement and PSF's notice of copyright, -i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -Python Software Foundation; All Rights Reserved" are retained in Python alone or -in any derivative version prepared by Licensee. - -3. In the event Licensee prepares a derivative work that is based on -or incorporates Python or any part thereof, and wants to make -the derivative work available to others as provided herein, then -Licensee hereby agrees to include in any such work a brief summary of -the changes made to Python. - -4. PSF is making Python available to Licensee on an "AS IS" -basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR -IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND -DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS -FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT -INFRINGE ANY THIRD PARTY RIGHTS. - -5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON -FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS -A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, -OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. - -6. This License Agreement will automatically terminate upon a material -breach of its terms and conditions. - -7. Nothing in this License Agreement shall be deemed to create any -relationship of agency, partnership, or joint venture between PSF and -Licensee. This License Agreement does not grant permission to use PSF -trademarks or trade name in a trademark sense to endorse or promote -products or services of Licensee, or any third party. - -8. By copying, installing or otherwise using Python, Licensee -agrees to be bound by the terms and conditions of this License -Agreement. - - -BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0 -------------------------------------------- - -BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1 - -1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an -office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the -Individual or Organization ("Licensee") accessing and otherwise using -this software in source or binary form and its associated -documentation ("the Software"). - -2. Subject to the terms and conditions of this BeOpen Python License -Agreement, BeOpen hereby grants Licensee a non-exclusive, -royalty-free, world-wide license to reproduce, analyze, test, perform -and/or display publicly, prepare derivative works, distribute, and -otherwise use the Software alone or in any derivative version, -provided, however, that the BeOpen Python License is retained in the -Software, alone or in any derivative version prepared by Licensee. - -3. BeOpen is making the Software available to Licensee on an "AS IS" -basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR -IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND -DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS -FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT -INFRINGE ANY THIRD PARTY RIGHTS. - -4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE -SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS -AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY -DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. - -5. This License Agreement will automatically terminate upon a material -breach of its terms and conditions. - -6. This License Agreement shall be governed by and interpreted in all -respects by the law of the State of California, excluding conflict of -law provisions. Nothing in this License Agreement shall be deemed to -create any relationship of agency, partnership, or joint venture -between BeOpen and Licensee. This License Agreement does not grant -permission to use BeOpen trademarks or trade names in a trademark -sense to endorse or promote products or services of Licensee, or any -third party. As an exception, the "BeOpen Python" logos available at -http://www.pythonlabs.com/logos.html may be used according to the -permissions granted on that web page. - -7. By copying, installing or otherwise using the software, Licensee -agrees to be bound by the terms and conditions of this License -Agreement. - - -CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1 ---------------------------------------- - -1. This LICENSE AGREEMENT is between the Corporation for National -Research Initiatives, having an office at 1895 Preston White Drive, -Reston, VA 20191 ("CNRI"), and the Individual or Organization -("Licensee") accessing and otherwise using Python 1.6.1 software in -source or binary form and its associated documentation. - -2. Subject to the terms and conditions of this License Agreement, CNRI -hereby grants Licensee a nonexclusive, royalty-free, world-wide -license to reproduce, analyze, test, perform and/or display publicly, -prepare derivative works, distribute, and otherwise use Python 1.6.1 -alone or in any derivative version, provided, however, that CNRI's -License Agreement and CNRI's notice of copyright, i.e., "Copyright (c) -1995-2001 Corporation for National Research Initiatives; All Rights -Reserved" are retained in Python 1.6.1 alone or in any derivative -version prepared by Licensee. Alternately, in lieu of CNRI's License -Agreement, Licensee may substitute the following text (omitting the -quotes): "Python 1.6.1 is made available subject to the terms and -conditions in CNRI's License Agreement. This Agreement together with -Python 1.6.1 may be located on the Internet using the following -unique, persistent identifier (known as a handle): 1895.22/1013. This -Agreement may also be obtained from a proxy server on the Internet -using the following URL: http://hdl.handle.net/1895.22/1013". - -3. In the event Licensee prepares a derivative work that is based on -or incorporates Python 1.6.1 or any part thereof, and wants to make -the derivative work available to others as provided herein, then -Licensee hereby agrees to include in any such work a brief summary of -the changes made to Python 1.6.1. - -4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS" -basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR -IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND -DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS -FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT -INFRINGE ANY THIRD PARTY RIGHTS. - -5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON -1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS -A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1, -OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. - -6. This License Agreement will automatically terminate upon a material -breach of its terms and conditions. - -7. This License Agreement shall be governed by the federal -intellectual property law of the United States, including without -limitation the federal copyright law, and, to the extent such -U.S. federal law does not apply, by the law of the Commonwealth of -Virginia, excluding Virginia's conflict of law provisions. -Notwithstanding the foregoing, with regard to derivative works based -on Python 1.6.1 that incorporate non-separable material that was -previously distributed under the GNU General Public License (GPL), the -law of the Commonwealth of Virginia shall govern this License -Agreement only as to issues arising under or with respect to -Paragraphs 4, 5, and 7 of this License Agreement. Nothing in this -License Agreement shall be deemed to create any relationship of -agency, partnership, or joint venture between CNRI and Licensee. This -License Agreement does not grant permission to use CNRI trademarks or -trade name in a trademark sense to endorse or promote products or -services of Licensee, or any third party. - -8. By clicking on the "ACCEPT" button where indicated, or by copying, -installing or otherwise using Python 1.6.1, Licensee agrees to be -bound by the terms and conditions of this License Agreement. - - ACCEPT - - -CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2 --------------------------------------------------- - -Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, -The Netherlands. All rights reserved. - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation, and that the name of Stichting Mathematisch -Centrum or CWI not be used in advertising or publicity pertaining to -distribution of the software without specific, written prior -permission. - -STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO -THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE -FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT -OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/dev-python/setuptools/setuptools-0.6c11.recipe b/dev-python/setuptools/setuptools-0.6c11.recipe deleted file mode 100644 index 6bbaeaca5..000000000 --- a/dev-python/setuptools/setuptools-0.6c11.recipe +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY="Download, build, (un)install, upgrade, Python packages" -DESCRIPTION=" -Download, build, install, upgrade, and uninstall Python packages -- easily! -" -HOMEPAGE="http://pypi.python.org/pypi/setuptools" -SRC_URI="https://pypi.python.org/packages/source/s/setuptools/setuptools-$portVersion.tar.gz" -CHECKSUM_SHA256="630fea9b726320b73ee3ca6ff61732cb32675b0389be658080fe46383b87a1d3" -REVISION="1" - -ARCHITECTURES="!x86_gcc2" - -PROVIDES=" - $portName = $portVersion - " - -BUILD_PREREQUIRES=" - cmd:python - " - -BUILD() -{ - python setup.py build -} - -INSTALL() -{ - python setup.py install --root=$portDir -} - -LICENSE="Python" -COPYRIGHT="2009-2014, Phillip J. Eby" diff --git a/dev-python/setuptools/setuptools-3.3.recipe b/dev-python/setuptools/setuptools-3.3.recipe deleted file mode 100644 index f2389aa7f..000000000 --- a/dev-python/setuptools/setuptools-3.3.recipe +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY="Download, build, (un)install, upgrade, Python packages" -DESCRIPTION=" -Download, build, install, upgrade, and uninstall Python packages -- easily! -" -HOMEPAGE="http://pypi.python.org/pypi/setuptools" -SRC_URI="https://pypi.python.org/packages/source/s/setuptools/setuptools-$portVersion.tar.gz" -CHECKSUM_SHA256="f3e6155f9bb62bfd59b7f6cc2ecda21aae903e6b585f8bc55e801609c5f7814f" -REVISION="1" - -ARCHITECTURES="!x86_gcc2" - -PROVIDES=" - $portName = $portVersion - " - -BUILD_PREREQUIRES=" - cmd:python - " - -BUILD() -{ - python setup.py build -} - -INSTALL() -{ - python setup.py install --root=$portDir -} - -LICENSE="Python" -COPYRIGHT="2009-2014, Phillip J. Eby" diff --git a/dev-qt/libqt4/libqt4-4.8.6.1.recipe b/dev-qt/libqt4/libqt4-4.8.6.1.recipe index 6aeb3a088..ff48f8eb2 100644 --- a/dev-qt/libqt4/libqt4-4.8.6.1.recipe +++ b/dev-qt/libqt4/libqt4-4.8.6.1.recipe @@ -10,7 +10,7 @@ SRC_FILENAME="libqt4-$portVersion.tar.gz" SOURCE_DIR="qt4-4.8.6-haiku-1" LICENSE="GNU LGPL v2.1" COPYRIGHT="2014 Digia Plc and/or its subsidiary(-ies)." -REVISION="2" +REVISION="4" CHECKSUM_SHA256="8683b000622df6348016cea132a272ebd39f70b1b0c89b9bb043f4f0a88d879d" ARCHITECTURES="x86 ?x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then @@ -26,7 +26,7 @@ PROVIDES=" libqt4$secondaryArchSuffix = $portVersion compat >= 4.8 cmd:qtconfig$secondaryArchSuffix = $portVersion compat >= 4.8 cmd:qsystray$secondaryArchSuffix = $portVersion compat >= 4.8 - lib:libphonon$secondaryArchSuffix = $portVersion compat >= 4.8 + lib:libphonon$secondaryArchSuffix = 4.4.0 compat >= 4 lib:libQt3Support$secondaryArchSuffix = $portVersion compat >= 4.8 lib:libQtCLucene$secondaryArchSuffix = $portVersion compat >= 4.8 lib:libQtCore$secondaryArchSuffix = $portVersion compat >= 4.8 @@ -42,7 +42,7 @@ PROVIDES=" lib:libQtSql$secondaryArchSuffix = $portVersion compat >= 4.8 lib:libQtSvg$secondaryArchSuffix = $portVersion compat >= 4.8 lib:libQtTest$secondaryArchSuffix = $portVersion compat >= 4.8 - lib:libQtWebKit$secondaryArchSuffix = $portVersion compat >= 4.8 + lib:libQtWebKit$secondaryArchSuffix = 4.9.4 compat >= 4 lib:libQtXml$secondaryArchSuffix = $portVersion compat >= 4.8 lib:libQtXmlPatterns$secondaryArchSuffix = $portVersion compat >= 4.8 " @@ -107,7 +107,7 @@ PROVIDES_devel=" cmd:uic3$secondaryArchSuffix = $portVersion compat >= 4.8 cmd:xmlpatterns$secondaryArchSuffix = $portVersion compat >= 4.8 cmd:xmlpatternsvalidator$secondaryArchSuffix = $portVersion compat >= 4.8 - devel:libphonon$secondaryArchSuffix = $portVersion compat >= 4.8 + devel:libphonon$secondaryArchSuffix = 4.4.0 compat >= 4 devel:libQt3Support$secondaryArchSuffix = $portVersion compat >= 4.8 devel:libQtCLucene$secondaryArchSuffix = $portVersion compat >= 4.8 devel:libQtCore$secondaryArchSuffix = $portVersion compat >= 4.8 @@ -123,7 +123,7 @@ PROVIDES_devel=" devel:libQtSql$secondaryArchSuffix = $portVersion compat >= 4.8 devel:libQtSvg$secondaryArchSuffix = $portVersion compat >= 4.8 devel:libQtTest$secondaryArchSuffix = $portVersion compat >= 4.8 - devel:libQtWebKit$secondaryArchSuffix = $portVersion compat >= 4.8 + devel:libQtWebKit$secondaryArchSuffix = 4.9.4 compat >= 4 devel:libQtXml$secondaryArchSuffix = $portVersion compat >= 4.8 devel:libQtXmlPatterns$secondaryArchSuffix = $portVersion compat >= 4.8 devel:libQtUiTools$secondaryArchSuffix = $portVersion compat >= 4.8 @@ -131,6 +131,8 @@ PROVIDES_devel=" REQUIRES_devel=" libqt4$secondaryArchSuffix == $portVersion base + haiku$secondaryArchSuffix >= $haikuVersion + lib:libz$secondaryArchSuffix " BUILD() @@ -163,7 +165,7 @@ BUILD() make -f Makefile.gcc2 fi popd - + pushd haiku ./do-res.sh popd @@ -213,8 +215,17 @@ INSTALL() devPackageCommands="$devPackageCommands $binDir/$i" done + DIR_QT_DEVELOP_DESKBAR="${dataDir}/deskbar/menu/Applications/Qt" + mkdir -p ${DIR_QT_DEVELOP_DESKBAR} + addAppDeskbarSymlink $binDir/assistant "Qt/Qt Assistant" + addAppDeskbarSymlink $binDir/designer "Qt/Qt Designer" + addAppDeskbarSymlink $binDir/linguist "Qt/Qt Lingist" + addAppDeskbarSymlink $binDir/qmlviewer "Qt/QML Viewer" + addAppDeskbarSymlink $binDir/qhelpconverter "Qt/Qt Help Converter" + packageEntries devel $developDir \ $devPackageCommands \ + ${DIR_QT_DEVELOP_DESKBAR} \ $dataDir/Qt/mkspecs # move tests to demo/example package when it exists diff --git a/dev-util/gyp/gyp-r1948.recipe b/dev-util/gyp/gyp-r1948.recipe new file mode 100644 index 000000000..6f019f078 --- /dev/null +++ b/dev-util/gyp/gyp-r1948.recipe @@ -0,0 +1,51 @@ +SUMMARY="GYP can Generate Your Projects." +DESCRIPTION="GYP (Generate Your Projects) is a build automation tool. \ +GYP is created by Google to generate native IDE project files (such as \ +Visual Studio and Xcode) for building the Chromium web browser and is \ +licensed as open source software using the BSD software license. \ +" +HOMEPAGE="https://code.google.com/p/gyp/" +SRC_URI="svn+http://gyp.googlecode.com/svn/trunk#1948" +LICENSE="BSD (2-clause)" +COPYRIGHT="2012 Google Inc." +REVISION="1" +ARCHITECTURES="x86 x86_gcc2 x86_64" + +SOURCE_DIR="gyp-$portVersion" +PATCHES="gyp-r1948.patch" + +PROVIDES=" + gyp = $portVersion + cmd:gyp = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + cmd:python + " + +BUILD_REQUIRES=" + python_setuptools +" + +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:python + " + +BUILD() +{ + $portPackageLinksDir/cmd~python/bin/python setup.py build +} + +INSTALL() +{ + # GENERIC: all python_setuptools-based installs need this + pythonVersion=$(python --version 2>&1 | sed 's/Python //' | head -c3) + installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + + $portPackageLinksDir/cmd~python/bin/python setup.py install \ + --prefix=$prefix +} diff --git a/dev-util/gyp/patches/gyp-r1948.patch b/dev-util/gyp/patches/gyp-r1948.patch new file mode 100644 index 000000000..c4021f888 --- /dev/null +++ b/dev-util/gyp/patches/gyp-r1948.patch @@ -0,0 +1,144 @@ +From 7acf243286c74a67a0a3a80faff38572d430f160 Mon Sep 17 00:00:00 2001 +From: Augustin Cavalier +Date: Mon, 30 Jun 2014 14:41:57 -0400 +Subject: [PATCH] Make GYP work on Haiku. + +--- + gyptest.py | 1 + + pylib/gyp/common.py | 7 +++++-- + pylib/gyp/generator/make.py | 13 ++++++++++++ + pylib/gyp/haiku_tool.py | 49 +++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 68 insertions(+), 2 deletions(-) + create mode 100644 pylib/gyp/haiku_tool.py + +diff --git a/gyptest.py b/gyptest.py +index 8f3ee0f..88125b0 100755 +--- a/gyptest.py ++++ b/gyptest.py +@@ -225,6 +225,7 @@ def main(argv=None): + 'linux2': ['make', 'ninja'], + 'linux3': ['make', 'ninja'], + 'darwin': ['make', 'ninja', 'xcode'], ++ 'haiku1': ['make'], + }[sys.platform] + + for format in format_list: +diff --git a/pylib/gyp/common.py b/pylib/gyp/common.py +index df71d97..8f2d888 100644 +--- a/pylib/gyp/common.py ++++ b/pylib/gyp/common.py +@@ -420,12 +420,14 @@ def GetFlavor(params): + return 'openbsd' + if sys.platform.startswith('aix'): + return 'aix' ++ if sys.platform.startswith('haiku'): ++ return 'haiku' + + return 'linux' + + + def CopyTool(flavor, out_path): +- """Finds (flock|mac|win)_tool.gyp in the gyp directory and copies it ++ """Finds (flock|mac|win|haiku)_tool.gyp in the gyp directory and copies it + to |out_path|.""" + # aix and solaris just need flock emulation. mac and win use more complicated + # support scripts. +@@ -433,7 +435,8 @@ def CopyTool(flavor, out_path): + 'aix': 'flock', + 'solaris': 'flock', + 'mac': 'mac', +- 'win': 'win' ++ 'win': 'win', ++ 'haiku': 'haiku', + }.get(flavor, None) + if not prefix: + return +diff --git a/pylib/gyp/generator/make.py b/pylib/gyp/generator/make.py +index 8c31d10..a7db337 100644 +--- a/pylib/gyp/generator/make.py ++++ b/pylib/gyp/generator/make.py +@@ -505,6 +505,13 @@ quiet_cmd_infoplist = INFOPLIST $@ + cmd_infoplist = $(CC.$(TOOLSET)) -E -P -Wno-trigraphs -x c $(INFOPLIST_DEFINES) "$<" -o "$@" + """ + ++SHARED_HEADER_HAIKU_COMMANDS = """ ++# gyp-haiku-tool is written next to the root Makefile by gyp. ++# Use $(4) for the command, since $(2) and $(3) are used as flag by do_cmd ++# already. ++quiet_cmd_haiku_tool = HAIKUTOOL $(4) $< ++cmd_haiku_tool = ./gyp-haiku-tool $(4) $< "$@" ++""" + + def WriteRootHeaderSuffixRules(writer): + extensions = sorted(COMPILABLE_EXTENSIONS.keys(), key=str.lower) +@@ -2056,6 +2063,12 @@ def GenerateOutput(target_list, target_dicts, data, params): + 'flock': './gyp-flock-tool flock', + 'flock_index': 2, + }) ++ elif flavor == 'haiku': ++ header_params.update({ ++ 'flock': './gyp-haiku-tool flock', ++ 'flock_index': 2, ++ 'extra_commands': SHARED_HEADER_HAIKU_COMMANDS, ++ }) + + header_params.update({ + 'CC.target': GetEnvironFallback(('CC_target', 'CC'), '$(CC)'), +diff --git a/pylib/gyp/haiku_tool.py b/pylib/gyp/haiku_tool.py +new file mode 100644 +index 0000000..cf23ca5 +--- /dev/null ++++ b/pylib/gyp/haiku_tool.py +@@ -0,0 +1,49 @@ ++#!python ++# Copyright (c) 2011 Google Inc. All rights reserved. ++# Use of this source code is governed by a BSD-style license that can be ++# found in the LICENSE file. ++ ++"""These functions are executed via gyp-haiku-tool when using the Makefile ++generator.""" ++ ++import fcntl ++import os ++import struct ++import subprocess ++import sys ++ ++ ++def main(args): ++ executor = HaikuTool() ++ executor.Dispatch(args) ++ ++ ++class HaikuTool(object): ++ """This class performs all the Haiku tooling steps. The methods can either be ++ executed directly, or dispatched from an argument list.""" ++ ++ def Dispatch(self, args): ++ """Dispatches a string command to a method.""" ++ if len(args) < 1: ++ raise Exception("Not enough arguments") ++ ++ method = "Exec%s" % self._CommandifyName(args[0]) ++ getattr(self, method)(*args[1:]) ++ ++ def _CommandifyName(self, name_string): ++ """Transforms a tool name like copy-info-plist to CopyInfoPlist""" ++ return name_string.title().replace('-', '') ++ ++ def ExecFlock(self, lockfile, *cmd_list): ++ """Emulates the most basic behavior of Linux's flock(1).""" ++ # Rely on exception handling to report errors. ++ fd = os.open(lockfile, os.O_RDONLY|os.O_NOCTTY|os.O_CREAT, 0o666) ++ fcntl.flock(fd, fcntl.LOCK_EX) ++ ret = subprocess.call(cmd_list) ++ # Haiki bug -- lock is not released on file close? ++ fcntl.flock(fd, fcntl.LOCK_UN) ++ return ret ++ ++ ++if __name__ == '__main__': ++ sys.exit(main(sys.argv[1:])) +-- +1.8.3.4 +