From befd281b64b3d55169692c844ed2f3390c3086e0 Mon Sep 17 00:00:00 2001 From: John Scipione Date: Thu, 29 May 2014 21:57:02 +0000 Subject: [PATCH 01/11] Add NetPulse 0.2.3 receipe --- haiku-apps/netpulse/netpulse-0.2.3.recipe | 41 +++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 haiku-apps/netpulse/netpulse-0.2.3.recipe diff --git a/haiku-apps/netpulse/netpulse-0.2.3.recipe b/haiku-apps/netpulse/netpulse-0.2.3.recipe new file mode 100644 index 000000000..48b773d96 --- /dev/null +++ b/haiku-apps/netpulse/netpulse-0.2.3.recipe @@ -0,0 +1,41 @@ +SUMMARY="NetPulse by Carlos Hasan" +DESCRIPTION="Network status replicant that gives an indication of data being sent or received over the network." +HOMEPAGE="https://github.com/HaikuArchive/NetPulse" +SRC_URI="git://github.com/jscipione/NetPulse#a04b459309827ace18418539618bf07511000aac" +COPYRIGHT="Copyright 2001 Carlos Hasan" +LICENSE="MIT" +REVISION="1" + +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86 ?x86_64" + +PROVIDES=" + netpulse = $portVersion + " +REQUIRES="" + +BUILD_REQUIRES="haiku >= $haikuVersion" + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + makefile_engine + cmd:gcc$secondaryArchSuffix + cmd:make + cmd:mkdepend + " + +BUILD() +{ + make $jobArgs +} + +INSTALL() +{ + mkdir -p $appsDir + cp objects*/NetPulse $appsDir/NetPulse + + # Add a symlink to the Desktop applets directory in Deskbar + desktopAppletsDir="$dataDir/deskbar/menu/Desktop applets" + mkdir -p "$desktopAppletsDir" + ln -s $appsDir/NetPulse "$desktopAppletsDir" +} From 1612302b645cebb7f27e1513c86f04383e9dd755 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Fri, 30 May 2014 00:52:19 +0200 Subject: [PATCH 02/11] Fix unintended binutils-dependency on flex --- sys-devel/binutils/binutils-2.24_2014_03_19.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-devel/binutils/binutils-2.24_2014_03_19.recipe b/sys-devel/binutils/binutils-2.24_2014_03_19.recipe index 46a3b7360..f891e921f 100644 --- a/sys-devel/binutils/binutils-2.24_2014_03_19.recipe +++ b/sys-devel/binutils/binutils-2.24_2014_03_19.recipe @@ -5,7 +5,7 @@ srcGitRev="c20a732df8f8b6d0f32c872817f3a0498a5c4761" SRC_URI="https://github.com/haiku/buildtools/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="6d3b677cd8ef777bf6fb3186a15b5122e46345595a996370325c758b3d8a4ab6" SRC_FILENAME="binutils-$portVersion.tar.gz" -REVISION="5" +REVISION="6" LICENSE=" GNU GPL v2 GNU LGPL v2 @@ -95,7 +95,7 @@ BUILD() # it, however, since these binutils may be used by the bootstrap-gcc, # which passes --sysroot= to ld. - make $jobArgs + make $jobArgs LEXLIB= } INSTALL() From e63177b0b99f7ef658723dfe118e2b7e0589faa0 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Fri, 30 May 2014 10:05:41 +0000 Subject: [PATCH 03/11] Update Pe-recipe to current upstream version. --- haiku-apps/pe/pe-2.4.4_2014_05_29.recipe | 76 ++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 haiku-apps/pe/pe-2.4.4_2014_05_29.recipe diff --git a/haiku-apps/pe/pe-2.4.4_2014_05_29.recipe b/haiku-apps/pe/pe-2.4.4_2014_05_29.recipe new file mode 100644 index 000000000..1b5134999 --- /dev/null +++ b/haiku-apps/pe/pe-2.4.4_2014_05_29.recipe @@ -0,0 +1,76 @@ +SUMMARY="A programmer's editor" +DESCRIPTION=" +Pe is a native programmer's editor for Haiku. It features syntax highlighting \ +and a structural view for several programming language, as well as basic \ +support for Makefile and Jamfile project management. +" +HOMEPAGE="https://github.com/olta/pe" +LICENSE=" + BSD (4-clause) + MIT + " + +COPYRIGHT=" + 1996-2002 Maarteen Hekkelman + 2003-2014 Team Pe + " + +srcrev="8c23b804617361c0ce25dc42fce1c6dea46bbde5" +SOURCE_DIR="pe-$srcrev" +SRC_URI="https://github.com/olta/pe/archive/$srcrev.tar.gz" +CHECKSUM_SHA256="b3cb6b102a4b509aa6882d7c5a1dd55b3bc6fb072a9a784f98be03809967c247" +SRC_FILENAME="pe-$srcrev.tar.gz" + + +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + pe = $portVersion + app:Pe = $portVersion compat >= 2 + cmd:lpe = $portVersion compat >= 2 + " + +REQUIRES=" + haiku + lib:libpcre + lib:libpcreposix + " + +BUILD_REQUIRES=" + haiku_devel + devel:libpcre + devel:libpcreposix + " + +BUILD_PREREQUIRES=" + cmd:bison + cmd:flex + cmd:gcc + cmd:jam + cmd:ld + " + +USER_SETTINGS_FILES=" + settings/pe directory + " + +BUILD() +{ + jam -q + # multi-job builds don't work reliably +} + +INSTALL() +{ + peDir=$appsDir/Pe + + mkdir -p $appsDir + cp -a generated/distro $peDir + cp -a doc $peDir/Documentation + + mkdir $binDir + ln -sfn $peDir/lpe $binDir + + addAppDeskbarSymlink $peDir/Pe +} From 83b94d3ee248e8e41442dc072265fa7b0b03c319 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 30 May 2014 20:38:14 +0000 Subject: [PATCH 04/11] gcc: add recipe for version 4.8.3 --- sys-devel/gcc/gcc-4.8.3_2014_05_28.recipe | 164 ++++++++++++++++++++++ 1 file changed, 164 insertions(+) create mode 100644 sys-devel/gcc/gcc-4.8.3_2014_05_28.recipe diff --git a/sys-devel/gcc/gcc-4.8.3_2014_05_28.recipe b/sys-devel/gcc/gcc-4.8.3_2014_05_28.recipe new file mode 100644 index 000000000..988a28ed2 --- /dev/null +++ b/sys-devel/gcc/gcc-4.8.3_2014_05_28.recipe @@ -0,0 +1,164 @@ +SUMMARY="C/C++ cross-compiler for target ${effectiveTargetMachineTriple}" +DESCRIPTION=" +Standard compiler for x86 platform. +" +HOMEPAGE="http://gcc.gnu.org" + +srcGitRev="3ad9ac2317f63b65937473c4fbe37c9e93e3a116" +SRC_URI="https://github.com/haiku/buildtools/archive/$srcGitRev.tar.gz" +CHECKSUM_SHA256="85499c650421b68f9830d3fb2ddfafb8789a3e1ffce75e8dd27aaed678135df0" +SRC_FILENAME="$portVersionedName.tar.gz" +REVISION="1" +LICENSE=" + GNU GPL v2 + GNU LGPL v2 + " +COPYRIGHT="1988-2013 Free Software Foundation, Inc." + + +ARCHITECTURES="x86 x86_64 arm" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + gcc$secondaryArchSuffix = $portVersion compat >= 4 + cmd:c++$secondaryArchSuffix = $portVersion compat >= 4 + cmd:cc$secondaryArchSuffix = $portVersion compat >= 4 + cmd:cpp$secondaryArchSuffix = $portVersion compat >= 4 + cmd:g++$secondaryArchSuffix = $portVersion compat >= 4 + cmd:gcc$secondaryArchSuffix = $portVersion compat >= 4 + cmd:gcc_4.8.3$secondaryArchSuffix = $portVersion compat >= 4 + cmd:gcov$secondaryArchSuffix = $portVersion compat >= 4 + lib:libstdc++$secondaryArchSuffix = $portVersion compat >= 4 + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + cmd:as$secondaryArchSuffix + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:autoconf + cmd:awk + cmd:find + cmd:flex + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:makeinfo + cmd:sed + cmd:strip + cmd:tar + cmd:xargs + " + +SOURCE_DIR="buildtools-$srcGitRev/gcc" + +sourceDir=$(pwd) +relativeInstallDir="develop/tools$secondaryArchSubDir" +installDir="$prefix/$relativeInstallDir" +objectsDir=$(pwd)/../${portVersionedName}-obj + +BUILD() +{ + rm -rf $objectsDir + + # Touch some files generated by bison, so that bison won't run to update + # them. Fixes issues with newer bison versions. + # And while at it, touch gperf target, too (as gperf may not be installed). + (cd $sourceDir/gcc; touch c-parse.c c-parse.h cexp.c cp/parse.c \ + cp/parse.h c-gperf.h) + + mkdir -p $objectsDir + cd $objectsDir + + local additionalConfigureFlags + if [ -n "$secondaryArchSuffix" ]; then + additionalConfigureFlags="\ + --with-hybrid-secondary=${effectiveTargetArchitecture}" + fi + if [ $effectiveTargetArchitecture == x86_64 ]; then + # disable multilib support, as x86_64 by default tries to build the + # 32-bit libraries, too, which fails as no 32-bit libroot is available + additionalConfigureFlags+=" --disable-multilib" + fi + + CFLAGS="-O2 -U_FORTIFY_SOURCE" CXXFLAGS="-O2" "$sourceDir/configure" \ + --build=$effectiveTargetMachineTriple \ + --prefix=$installDir --libexecdir=$installDir/lib --mandir=$manDir \ + --docdir=$docDir --enable-threads=posix \ + --disable-nls --enable-shared --with-gnu-ld \ + --enable-languages=c,c++ --enable-lto --enable-frame-pointer \ + --with-pkgversion=$(echo $portVersion | cut -c 7-) \ + $additionalConfigureFlags + + make $jobArgs +} + +INSTALL() +{ + cd $objectsDir + + make install-strip + make install-html + + ### HTML documentation #################################### + + echo "Organizing HTML documentation..." + cd $docDir + for dir in gmp libquadmath mpc mpfr; do + mv ${dir}.html $dir + ln -s $dir/index.html ${dir}.html + done + + ### Strip ################################################# + + echo "Strip debug info" + + cd $installDir + strip --strip-debug bin/* + for f in cc1 cc1plus collect2 lto1; do + strip --strip-debug lib/gcc/$effectiveTargetMachineTriple/*/$f + done + strip --strip-debug lib/*.a + + ### Disable ASLR ########################################## + + echo "Add SYS:ENV attribute to disable ASLR" + + cd $installDir + for f in bin/*; do + if [ -r "$f" ]; then + addattr SYS:ENV DISABLE_ASLR=1 $f + fi + done + for f in cc1 cc1plus collect2 lto1; do + addattr SYS:ENV DISABLE_ASLR=1 \ + lib/gcc/$effectiveTargetMachineTriple/*/$f + done + + ### Symlinks ############################################## + + echo "Creating required symlinks" + + # create missing cc symlink + ln -sf gcc $installDir/bin/cc + + # make all tools available via default paths + mkdir -p $binDir + for f in c++ cc cpp g++ gcc gcov; do + symlinkRelative -sfn $installDir/bin/$f $binDir + done + + ### Cleanup ############################################### + + echo "Cleanup" + rm -rf $installDir/info + rm -rf $installDir/share +} From b7d5989d8d0cc3669531cebcfbd89f47b67288fa Mon Sep 17 00:00:00 2001 From: John Scipione Date: Fri, 30 May 2014 17:55:41 -0400 Subject: [PATCH 05/11] Split the description up over multiple lines --- haiku-apps/netpulse/netpulse-0.2.3.recipe | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/haiku-apps/netpulse/netpulse-0.2.3.recipe b/haiku-apps/netpulse/netpulse-0.2.3.recipe index 48b773d96..f2d0d5733 100644 --- a/haiku-apps/netpulse/netpulse-0.2.3.recipe +++ b/haiku-apps/netpulse/netpulse-0.2.3.recipe @@ -1,5 +1,8 @@ SUMMARY="NetPulse by Carlos Hasan" -DESCRIPTION="Network status replicant that gives an indication of data being sent or received over the network." +DESCRIPTION=" + Network status replicant that gives an indication of data being sent \ + or received over the network. + " HOMEPAGE="https://github.com/HaikuArchive/NetPulse" SRC_URI="git://github.com/jscipione/NetPulse#a04b459309827ace18418539618bf07511000aac" COPYRIGHT="Copyright 2001 Carlos Hasan" From 0cb945f6cb91ce59231df05b8c2a0cc25a9d8c6b Mon Sep 17 00:00:00 2001 From: Hamish Morrison Date: Sat, 31 May 2014 20:21:54 +0100 Subject: [PATCH 06/11] openjdk: add recipe for 7u80_b00 --- dev-lang/openjdk/openjdk-1.7_u80_b00.recipe | 174 ++++++++++++++++++++ 1 file changed, 174 insertions(+) create mode 100644 dev-lang/openjdk/openjdk-1.7_u80_b00.recipe diff --git a/dev-lang/openjdk/openjdk-1.7_u80_b00.recipe b/dev-lang/openjdk/openjdk-1.7_u80_b00.recipe new file mode 100644 index 000000000..b1b2e52e5 --- /dev/null +++ b/dev-lang/openjdk/openjdk-1.7_u80_b00.recipe @@ -0,0 +1,174 @@ +SUMMARY="Open-source implementation of the Java Platform, SE" +DESCRIPTION=" +Open-source implementation of the Java Platform, Standard Edition. +" +HOMEPAGE="http://openjdk.java.net/" +COPYRIGHT="2005, 2006, Oracle and/or its affiliates" +LICENSE="GNU GPL v2" + +SRC_URI="https://dl.dropboxusercontent.com/u/61946213/j2sdk-image-140528.tar.xz" +CHECKSUM_SHA256="fe9ad5156baf62a14213667f18bf88035daf5f24d6370afc9af30d079d8609a3" +SOURCE_DIR="j2sdk-image" + +SRC_URI_2="http://www.eu.apache.org/dist/ant/binaries/apache-ant-1.9.4-bin.zip" +CHECKSUM_SHA256_2="973d97d656e65561e2753823de6cf6db35570aaf93eeec6e7cb3d68e1ec4d0e8" +SOURCE_DIR_2="apache-ant-1.9.4" + +SRC_URI_3="hg+http://hg.openjdk.java.net/jdk7u/jdk7u#jdk7u80-b00" +SRC_URI_4="hg+http://hg.openjdk.java.net/jdk7u/jdk7u/langtools#jdk7u80-b00" +SRC_URI_5="hg+http://bitbucket.org/hamishm/haiku-jdk7u-corba" +SRC_URI_6="hg+http://hg.openjdk.java.net/jdk7u/jdk7u/jaxp#jdk7u80-b00" +SRC_URI_7="hg+http://hg.openjdk.java.net/jdk7u/jdk7u/jaxws#jdk7u80-b00" +SRC_URI_8="hg+http://bitbucket.org/hamishm/haiku-jdk7u-hotspot" +SRC_URI_9="hg+http://bitbucket.org/hamishm/haiku-jdk7u-jdk" + +REVISION="2" +ARCHITECTURES="x86" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +DISABLE_SOURCE_PACKAGE=yes + # at least as long as Ant and a complete SDK image are part of the sources + +PROVIDES=" + openjdk = $portVersion compat >= 1 + cmd:apt = $portVersion compat >= 1 + cmd:extcheck = $portVersion compat >= 1 + cmd:idlj = $portVersion compat >= 1 + cmd:jar = $portVersion compat >= 1 + cmd:jarsigner = $portVersion compat >= 1 + cmd:java = $portVersion compat >= 1 + cmd:java_config = $portVersion compat >= 1 + cmd:javac = $portVersion compat >= 1 + cmd:javadoc = $portVersion compat >= 1 + cmd:javah = $portVersion compat >= 1 + cmd:javap = $portVersion compat >= 1 + cmd:jcmd = $portVersion compat >= 1 + cmd:jconsole = $portVersion compat >= 1 + cmd:jdb = $portVersion compat >= 1 + cmd:jhat = $portVersion compat >= 1 + cmd:jinfo = $portVersion compat >= 1 + cmd:jmap = $portVersion compat >= 1 + cmd:jps = $portVersion compat >= 1 + cmd:jrunscript = $portVersion compat >= 1 + cmd:jsadebugd = $portVersion compat >= 1 + cmd:jstack = $portVersion compat >= 1 + cmd:jstat = $portVersion compat >= 1 + cmd:jstatd = $portVersion compat >= 1 + cmd:keytool = $portVersion compat >= 1 + cmd:native2ascii = $portVersion compat >= 1 + cmd:orbd = $portVersion compat >= 1 + cmd:pack200 = $portVersion compat >= 1 + cmd:rmic = $portVersion compat >= 1 + cmd:rmid = $portVersion compat >= 1 + cmd:rmiregistry = $portVersion compat >= 1 + cmd:schemagen = $portVersion compat >= 1 + cmd:serialver = $portVersion compat >= 1 + cmd:servertool = $portVersion compat >= 1 + cmd:tnameserv = $portVersion compat >= 1 + cmd:unpack200 = $portVersion compat >= 1 + cmd:wsgen = $portVersion compat >= 1 + cmd:wsimport = $portVersion compat >= 1 + cmd:xjc = $portVersion compat >= 1 + " + +REQUIRES=" + haiku$secondaryArchSuffx >= $haikuVersion + lib:libfreetype$secondaryArchSuffix + lib:libiconv$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libfreetype$secondaryArchSuffix + devel:libiconv$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " + +BUILD_PREREQUIRES=" + cmd:cpio >= 2.10 + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:sed + cmd:tar + cmd:zip + cmd:awk + cmd:hostname + cmd:find + cmd:unzip + cmd:unzipsfx + cmd:head + " + +BUILD() +{ + OPENJDK_DIR=$(dirname $sourceDir) + + # prepare the directory structure + cd $OPENJDK_DIR + ln -sfn $sourceDir3 jdk + ln -sfn $sourceDir4 jdk/langtools + ln -sfn $sourceDir5 jdk/corba + ln -sfn $sourceDir6 jdk/jaxp + ln -sfn $sourceDir7 jdk/jaxws + ln -sfn $sourceDir8 jdk/hotspot + ln -sfn $sourceDir9 jdk/jdk + + chmod u+x ${sourceDir2}/bin/ant + + # set up environment + export ALT_BOOTDIR=${OPENJDK_DIR}/j2sdk-image + export ALT_JDK_IMPORT_PATH=$ALT_BOOTDIR + export ANT_HOME=${sourceDir2} + export ALT_OUTPUTDIR=${OPENJDK_DIR}/output + export ALT_UNIXCOMMAND_PATH= + + export LC_ALL=C + + # If ASLR is enabled, the JVM can fail to find a large enough area for + # the heap. + export DISABLE_ASLR=1 + + if [ -n "$secondaryArchSuffix" ]; then + export ALT_COMPILER_PATH=`finddir B_SYSTEM_BIN_DIRECTORY`$secondaryArchSubDir + export ALT_FREETYPE_HEADERS_PATH=`finddir B_SYSTEM_HEADERS_DIRECTORY`$secondaryArchSubDir + fi + + export USE_EXTERNAL_ZLIB=true + + # Build. + cd jdk + make +} + +INSTALL() +{ + # install the generated SDK image dir + cd .. + jdkDir=$libDir/openjdk + mkdir -p $(dirname $jdkDir) + cp -a output/j2sdk-image $jdkDir + + # symlink the executables to binDir + mkdir -p $binDir + symlinkRelative -s $jdkDir/bin/* $binDir + # TODO: We should probably link only a subset. + + # create a java-config script in binDir + javaConfig=$binDir/java-config + sed -e "s,%JAVA_HOME%,$jdkDir," $portDir/sources/java-config.in \ + > $javaConfig + chmod a+x $javaConfig + + # create a profile.d file that sets up JAVA_HOME + jdkProfile=$dataDir/profile.d/openjdk.sh + mkdir -p $(dirname $jdkProfile) + echo 'JAVA_HOME=`java-config -H`' > $jdkProfile + echo "export JAVA_HOME" >> $jdkProfile +} From 59330a1e4c4aa88230063b0b3267935d37f4d628 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 1 Jun 2014 21:40:02 +0000 Subject: [PATCH 07/11] perl: enable x86_gcc2 and x86 --- dev-lang/perl/perl-5.18.2.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-lang/perl/perl-5.18.2.recipe b/dev-lang/perl/perl-5.18.2.recipe index 2b384eed6..19c28d011 100644 --- a/dev-lang/perl/perl-5.18.2.recipe +++ b/dev-lang/perl/perl-5.18.2.recipe @@ -21,7 +21,7 @@ LICENSE="GNU GPL v1 SRC_URI="http://www.cpan.org/src/perl-5.18.2.tar.gz" CHECKSUM_SHA256="7cbed5ef11900e8f68041215eea0de5e443d53393f84c41d5c9c69c150a4982f" REVISION="2" -ARCHITECTURES="?x86_gcc2 ?x86 x86_64 arm" +ARCHITECTURES="x86_gcc2 x86 x86_64 arm" PATCHES="perl-5.18.1.patchset" From 51e53fcbc412667a5fdf8617c862b4bbcc61ded8 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 1 Jun 2014 21:41:36 +0000 Subject: [PATCH 08/11] readline: enable x86 --- sys-libs/readline/readline-6.3.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-libs/readline/readline-6.3.recipe b/sys-libs/readline/readline-6.3.recipe index 1d75f1f1a..876829e16 100644 --- a/sys-libs/readline/readline-6.3.recipe +++ b/sys-libs/readline/readline-6.3.recipe @@ -16,8 +16,8 @@ LICENSE="GNU GPL v3" SRC_URI="ftp://ftp.gnu.org/gnu/readline/readline-6.3.tar.gz" CHECKSUM_SHA256="56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" REVISION="2" -ARCHITECTURES="x86_gcc2 ?x86 x86_64" -SECONDARY_ARCHITECTURES="?x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="readline-6.3.patch" From 889bf28c3d978919b41243f475cdded20508e145 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 2 Jun 2014 13:16:50 +0200 Subject: [PATCH 09/11] Add quassel 0.10.0 recipe provided by Arfonzo. --- net-irc/quassel/quassel-0.10.0.recipe | 99 +++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 net-irc/quassel/quassel-0.10.0.recipe diff --git a/net-irc/quassel/quassel-0.10.0.recipe b/net-irc/quassel/quassel-0.10.0.recipe new file mode 100644 index 000000000..7ff786c32 --- /dev/null +++ b/net-irc/quassel/quassel-0.10.0.recipe @@ -0,0 +1,99 @@ +SUMMARY="Quassel IRC." +DESCRIPTION=" +Quassel IRC is a modern, cross-platform, distributed IRC client, +meaning that one (or multiple) client(s) can attach to and detach +from a central core -- much like the popular combination of screen +and a text-based IRC client such as WeeChat, but graphical. In +addition to this unique feature, we aim to bring a pleasurable, +comfortable chatting experience to all major platforms (including +Linux, Windows, and MacOS X as well as Android smartphones), making +communication with your peers not only convenient, but also +ubiquitous available. + " +HOMEPAGE="http://quassel-irc.org" +SRC_URI="http://quassel-irc.org/pub/quassel-0.10.0.tar.bz2" +CHECKSUM_MD5="382466a7790979c172b7d7edf10a2981" +REVISION="1" +LICENSE=" + GNU GPL v2 + GNU GPL v3 + " +COPYRIGHT="2005-2014, the Quassel IRC Team" + +ARCHITECTURES="x86" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi + +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + quassel${secondaryArchSuffix} = $portVersion + cmd:quassel${secondaryArchSuffix} + cmd:quasselcore${secondaryArchSuffix} + cmd:quasselclient${secondaryArchSuffix} + " + +REQUIRES=" + haiku${secondaryArchSuffix} >= $haikuVersion + qtcore${secondaryArchSuffix} >= 4.8 + " + +PATCHES=" + quassel-0.9.2.patchset + " + +BUILD_PREREQUIRES=" + cmd:cmake + cmd:g++${secondaryArchSuffix} + cmd:make + cmd:pkg_config + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + qtcore${secondaryArchSuffix}_devel >= 4.8 + " + +BUILD() +{ + mkdir -p build + cd build + cmake -DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_C_COMPILER="gcc" -DCMAKE_CXX_COMPILER="g++" .. + make +} + +INSTALL() +{ + cd build + + # Optional: strip the binaries before installing. + # To be updated/removed whenever resources are added. + echo "Stripping binaries ..." + strip quassel + strip quasselcore + strip quasselclient + + # Add Haiku resources. + xres -o quassel ../Haiku/Quassel.rsrc + xres -o quasselclient ../Haiku/Quassel.rsrc + xres -o quasselcore ../Haiku/Quassel.rsrc + mimeset -f quassel + mimeset -f quasselclient + mimeset -f quasselcore + + echo "Copying binaries to ${appsDir} ..." + mkdir -p ${appsDir}/Quassel + cp quassel ${appsDir}/Quassel + cp quasselcore ${appsDir}/Quassel + cp quasselclient ${appsDir}/Quassel + + DIR_QUASSEL_DESKBAR="${dataDir}/deskbar/menu/Applications/Quassel" + mkdir -p ${DIR_QUASSEL_DESKBAR} + echo "Making links for Deskbar in ${DIR_QUASSEL_DESKBAR} ..." + addAppDeskbarSymlink ${appsDir}/Quassel/quassel "Quassel/Quassel" + addAppDeskbarSymlink ${appsDir}/Quassel/quasselcore "Quassel/Quassel Core" + addAppDeskbarSymlink ${appsDir}/Quassel/quasselclient "Quassel/Quassel Client" +} From b41fbe8e154a1e1fe58a6618ed25d037b29a5c5e Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 2 Jun 2014 17:25:31 +0000 Subject: [PATCH 10/11] fixed uses of libssl and libcrypto on secondary arch. --- app-arch/xar/xar-1.5.2.recipe | 18 ++++++++-------- dev-libs/libevent/libevent-2.0.21.recipe | 6 +++--- net-misc/neon/neon-0.29.6.recipe | 26 ++++++++++++------------ 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/app-arch/xar/xar-1.5.2.recipe b/app-arch/xar/xar-1.5.2.recipe index 453ca3eaf..5e53622bf 100644 --- a/app-arch/xar/xar-1.5.2.recipe +++ b/app-arch/xar/xar-1.5.2.recipe @@ -14,7 +14,7 @@ COPYRIGHT="2005 Rob Braun" HOMEPAGE="http://code.google.com/p/xar/" SRC_URI="http://xar.googlecode.com/files/xar-1.5.2.tar.gz" CHECKSUM_SHA256="4c5d5682803cdfab16d72365cf51fc4075d597c5eeaa8c7d1990fea98cdae3e6" -REVISION="1" +REVISION="2" ARCHITECTURES="x86" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building @@ -33,21 +33,21 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion - lib:libxml2 - lib:libcrypto - lib:libz - lib:libbz2 + lib:libxml2$secondaryArchSuffix + lib:libcrypto$secondaryArchSuffix + lib:libz$secondaryArchSuffix + lib:libbz2$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libxml2$secondaryArchSuffix + devel:libcrypto$secondaryArchSuffix + devel:libz$secondaryArchSuffix + devel:libbz2$secondaryArchSuffix " BUILD_PREREQUIRES=" - devel:libxml2 - devel:libcrypto - devel:libz - devel:libbz2 cmd:libtoolize cmd:aclocal cmd:autoconf diff --git a/dev-libs/libevent/libevent-2.0.21.recipe b/dev-libs/libevent/libevent-2.0.21.recipe index 0bbaccf31..cf0e2dd87 100644 --- a/dev-libs/libevent/libevent-2.0.21.recipe +++ b/dev-libs/libevent/libevent-2.0.21.recipe @@ -14,7 +14,7 @@ CHECKSUM_SHA256="22a530a8a5ba1cb9c080cba033206b17dacd21437762155c6d30ee6469f574f LICENSE="BSD (3-clause)" COPYRIGHT="2000-2007 Niels Provos, 2005 Nick Mathewson, and other contributors." -REVISION="4" +REVISION="5" ARCHITECTURES="x86_gcc2 x86" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -123,6 +123,6 @@ PROVIDES_devel=" REQUIRES_devel=" libevent$secondaryArchSuffix == $portVersion base - devel:libssl - devel:libcrypto + devel:libssl$secondaryArchSuffix + devel:libcrypto$secondaryArchSuffix " diff --git a/net-misc/neon/neon-0.29.6.recipe b/net-misc/neon/neon-0.29.6.recipe index 97beb5a63..39bd445f8 100644 --- a/net-misc/neon/neon-0.29.6.recipe +++ b/net-misc/neon/neon-0.29.6.recipe @@ -21,7 +21,7 @@ LICENSE="GNU LGPL v2" COPYRIGHT="1999-2011 Joe Orton" SRC_URI="http://www.webdav.org/neon/neon-0.29.6.tar.gz" CHECKSUM_SHA256="9c640b728d6dc80ef1e48f83181166ab6bc95309cece5537e01ffdd01b96eb43" -REVISION="8" +REVISION="9" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -35,26 +35,26 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion - lib:libcrypto - lib:libncurses - lib:libssl - lib:libxml2 - lib:libz + lib:libcrypto$secondaryArchSuffix + lib:libncurses$secondaryArchSuffix + lib:libssl$secondaryArchSuffix + lib:libxml2$secondaryArchSuffix + lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" - devel:libcrypto - devel:libncurses - devel:libssl - devel:libxml2 >= 2.7.8 - devel:libz + devel:libcrypto$secondaryArchSuffix + devel:libncurses$secondaryArchSuffix + devel:libssl$secondaryArchSuffix + devel:libxml2$secondaryArchSuffix >= 2.7.8 + devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:libtoolize - cmd:gcc - cmd:ld + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:make " From ce7e5754a72ac4afd446e0a90affa24b08dd749a Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 2 Jun 2014 18:37:27 +0000 Subject: [PATCH 11/11] tiff: remove dependency on libgl, include SupportDefs.h * also add secondary arch suffixes * enable other architectures --- media-libs/tiff/patches/tiff-3.9.6.patchset | 128 ++++++++++++++++++++ media-libs/tiff/tiff-3.9.6.recipe | 19 ++- 2 files changed, 137 insertions(+), 10 deletions(-) create mode 100644 media-libs/tiff/patches/tiff-3.9.6.patchset diff --git a/media-libs/tiff/patches/tiff-3.9.6.patchset b/media-libs/tiff/patches/tiff-3.9.6.patchset new file mode 100644 index 000000000..865ec409c --- /dev/null +++ b/media-libs/tiff/patches/tiff-3.9.6.patchset @@ -0,0 +1,128 @@ +From a82320c3f0bf541c6c400cbaafda7a5f50b6ba12 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Mon, 2 Jun 2014 20:07:15 +0000 +Subject: checks for uint32, uint16, uint8 and uses SupportsDefs.h + + +diff --git a/configure.ac b/configure.ac +index d48a58b..763ed52 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -154,11 +154,14 @@ AC_CHECK_SIZEOF(long) + AC_HEADER_TIME + AC_STRUCT_TM + dnl Some compilers (IBM VisualAge) has these types defined, so check it here: +-AC_CHECK_TYPES([int8, int16, int32],,, ++AC_CHECK_TYPES([int8, int16, int32, uint8, uint16, uint32],,, + [ + #if HAVE_INTTYPES_H + # include + #endif ++#ifdef __HAIKU__ ++# include ++#endif + ]) + + # Obtain size of a 'signed long' and define as SIZEOF_SIGNED_LONG +diff --git a/libtiff/tif_config.h.in b/libtiff/tif_config.h.in +index 01e54de..41a5772 100644 +--- a/libtiff/tif_config.h.in ++++ b/libtiff/tif_config.h.in +@@ -142,6 +142,15 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_SYS_TYPES_H + ++/* Define to 1 if the system has the type `uint16'. */ ++#undef HAVE_UINT16 ++ ++/* Define to 1 if the system has the type `uint32'. */ ++#undef HAVE_UINT32 ++ ++/* Define to 1 if the system has the type `uint8'. */ ++#undef HAVE_UINT8 ++ + /* Define to 1 if you have the header file. */ + #undef HAVE_UNISTD_H + +diff --git a/libtiff/tiff.h b/libtiff/tiff.h +index 0d4ab9f..c70f214 100644 +--- a/libtiff/tiff.h ++++ b/libtiff/tiff.h +@@ -28,6 +28,10 @@ + #define _TIFF_ + + #include "tiffconf.h" ++#ifdef __HAIKU__ ++ #include ++ // needed for uint* types, avoid massive changes in libtiff ++#endif + + /* + * Tag Image File Format (TIFF) +@@ -64,22 +68,30 @@ + #ifndef HAVE_INT8 + typedef signed char int8; /* NB: non-ANSI compilers may not grok */ + #endif ++#ifndef HAVE_UINT8 + typedef unsigned char uint8; ++#endif + #ifndef HAVE_INT16 + typedef short int16; + #endif ++#ifndef HAVE_UINT16 + typedef unsigned short uint16; /* sizeof (uint16) must == 2 */ ++#endif + #if SIZEOF_INT == 4 + #ifndef HAVE_INT32 + typedef int int32; + #endif ++#ifndef HAVE_UINT32 + typedef unsigned int uint32; /* sizeof (uint32) must == 4 */ ++#endif + #elif SIZEOF_LONG == 4 + #ifndef HAVE_INT32 + typedef long int32; + #endif ++#ifndef HAVE_UINT32 + typedef unsigned long uint32; /* sizeof (uint32) must == 4 */ + #endif ++#endif + + /* For TIFFReassignTagToIgnore */ + enum TIFFIgnoreSense /* IGNORE tag table */ +diff --git a/libtiff/tiffconf.h.in b/libtiff/tiffconf.h.in +index 1a52b37..3cdcc28 100644 +--- a/libtiff/tiffconf.h.in ++++ b/libtiff/tiffconf.h.in +@@ -16,6 +16,15 @@ + /* Define to 1 if the system has the type `int8'. */ + #undef HAVE_INT8 + ++/* Define to 1 if the system has the type `uint16'. */ ++#undef HAVE_UINT16 ++ ++/* Define to 1 if the system has the type `uint32'. */ ++#undef HAVE_UINT32 ++ ++/* Define to 1 if the system has the type `uint8'. */ ++#undef HAVE_UINT8 ++ + /* The size of a `int', as computed by sizeof. */ + #undef SIZEOF_INT + +diff --git a/libtiff/tiffiop.h b/libtiff/tiffiop.h +index f65f855..3f0e9f7 100644 +--- a/libtiff/tiffiop.h ++++ b/libtiff/tiffiop.h +@@ -62,7 +62,7 @@ extern void *lfind(const void *, const void *, size_t *, size_t, + utilities may use it. + */ + +-#if !defined(__xlC__) && !defined(__xlc__) // Already defined there (#2301) ++#if !defined(__xlC__) && !defined(__xlc__) && !defined(__HAIKU__) // Already defined there (#2301) + typedef TIFF_INT64_T int64; + typedef TIFF_UINT64_T uint64; + #endif +-- +1.8.3.4 + diff --git a/media-libs/tiff/tiff-3.9.6.recipe b/media-libs/tiff/tiff-3.9.6.recipe index 962371475..e1f605fbf 100644 --- a/media-libs/tiff/tiff-3.9.6.recipe +++ b/media-libs/tiff/tiff-3.9.6.recipe @@ -12,9 +12,11 @@ LICENSE="MIT" COPYRIGHT="1988-1997 Sam Leffler 1991-1997 Silicon Graphics, Inc." -REVISION="1" -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" -SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" +REVISION="2" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PATCHES="${portVersionedName}.patchset" PROVIDES=" tiff$secondaryArchSuffix = $portVersion compat >= 3 @@ -23,14 +25,12 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion - lib:libglu - lib:libjpeg - lib:libz + lib:libjpeg$secondaryArchSuffix + lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" - devel:libglu - devel:libjpeg - devel:libz + devel:libjpeg$secondaryArchSuffix + devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion @@ -121,7 +121,6 @@ if [ -z "$secondaryArchSuffix" ]; then " REQUIRES_tools=" haiku >= $haikuVersion - lib:libGL lib:libjpeg lib:libz tiff == $portVersion base