mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 19:50:05 +02:00
graphviz, bump version, fix build (#2253)
This commit is contained in:
Schrijvers Luc
fbrosson
218
media-gfx/graphviz/graphviz-2.40.1.recipe
Normal file
218
media-gfx/graphviz/graphviz-2.40.1.recipe
Normal file
@@ -0,0 +1,218 @@
|
||||
SUMMARY="Open source graph visualization software"
|
||||
DESCRIPTION="Graphviz is open source graph visualization software. Graph \
|
||||
visualization is a way of representing structural information as diagrams of \
|
||||
abstract graphs and networks. It has important applications in networking, \
|
||||
bioinformatics, software engineering, database and web design, machine \
|
||||
learning, and in visual interfaces for other technical domains.
|
||||
The Graphviz layout programs take descriptions of graphs in a simple text \
|
||||
language, and make diagrams in useful formats, such as images and SVG for web \
|
||||
pages, PDF or Postscript for inclusion in other documents; or display in an \
|
||||
interactive graph browser. (Graphviz also supports GXL, an XML dialect.)
|
||||
Graphviz has many useful features for concrete diagrams, such as options for \
|
||||
colors, fonts, tabular node layouts, line styles, hyperlinks, rolland custom \
|
||||
shapes."
|
||||
HOMEPAGE="https://www.graphviz.org/"
|
||||
COPYRIGHT="1994-2017 AT&T Corp."
|
||||
LICENSE="EPL v1.0"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://graphviz.gitlab.io/pub/graphviz/stable/SOURCES/graphviz.tar.gz"
|
||||
CHECKSUM_SHA256="ca5218fade0204d59947126c38439f432853543b0818d9d728c589dfe7f3a421"
|
||||
SOURCE_FILENAME="graphviz-$portVersion.tar.gz"
|
||||
PATCHES="graphviz-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="!x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
graphvizLibs="\
|
||||
libcdt \
|
||||
libcgraph \
|
||||
libgvc \
|
||||
libgvpr \
|
||||
liblab_gamut \
|
||||
libpathplan \
|
||||
libxdot \
|
||||
"
|
||||
libcdtVersion="5.0.0"
|
||||
libcgraphVersion="6.0.0"
|
||||
libgvcVersion="6.0.0"
|
||||
libgvprVersion="2.0.0"
|
||||
liblab_gamutVersion="1.0.0"
|
||||
libpathplanVersion="4.0.0"
|
||||
libxdotVersion="4.0.0"
|
||||
portVersionCompat="$portVersion compat >= 2"
|
||||
for i in $graphvizLibs; do
|
||||
eval "${i}VersionCompat=\"\$${i}Version compat >= \${${i}Version%%.*}\""
|
||||
done
|
||||
|
||||
PROVIDES="
|
||||
graphviz$secondaryArchSuffix = $portVersionCompat
|
||||
cmd:acyclic$secondaryArchSuffix
|
||||
cmd:bcomps$secondaryArchSuffix
|
||||
cmd:ccomps$secondaryArchSuffix
|
||||
cmd:circo$secondaryArchSuffix
|
||||
cmd:cluster$secondaryArchSuffix
|
||||
cmd:diffimg$secondaryArchSuffix
|
||||
cmd:dijkstra$secondaryArchSuffix
|
||||
cmd:dot_builtins$secondaryArchSuffix
|
||||
cmd:dot$secondaryArchSuffix
|
||||
cmd:dot2gxl$secondaryArchSuffix
|
||||
cmd:edgepaint$secondaryArchSuffix
|
||||
cmd:fdp$secondaryArchSuffix
|
||||
cmd:gc$secondaryArchSuffix
|
||||
cmd:gml2gv$secondaryArchSuffix
|
||||
cmd:graphml2gv$secondaryArchSuffix
|
||||
cmd:gv2gml$secondaryArchSuffix
|
||||
cmd:gv2gxl$secondaryArchSuffix
|
||||
cmd:gvcolor$secondaryArchSuffix
|
||||
cmd:gvgen$secondaryArchSuffix
|
||||
cmd:gvpack$secondaryArchSuffix
|
||||
cmd:gvpr$secondaryArchSuffix
|
||||
cmd:gvmap$secondaryArchSuffix
|
||||
cmd:gvmap.sh$secondaryArchSuffix
|
||||
cmd:gxl2dot$secondaryArchSuffix
|
||||
cmd:gxl2gv$secondaryArchSuffix
|
||||
cmd:mm2gv$secondaryArchSuffix
|
||||
cmd:neato$secondaryArchSuffix
|
||||
cmd:nop$secondaryArchSuffix
|
||||
cmd:osage$secondaryArchSuffix
|
||||
cmd:patchwork$secondaryArchSuffix
|
||||
cmd:prune$secondaryArchSuffix
|
||||
cmd:sccmap$secondaryArchSuffix
|
||||
cmd:sfdp$secondaryArchSuffix
|
||||
cmd:tred$secondaryArchSuffix
|
||||
cmd:twopi$secondaryArchSuffix
|
||||
cmd:unflatten$secondaryArchSuffix
|
||||
lib:libcdt$secondaryArchSuffix = $libcdtVersionCompat
|
||||
lib:libcgraph$secondaryArchSuffix = $libcgraphVersionCompat
|
||||
lib:libgvc$secondaryArchSuffix = $libgvcVersionCompat
|
||||
lib:libgvpr$secondaryArchSuffix = $libgvprVersionCompat
|
||||
lib:liblab_gamut$secondaryArchSuffix = $liblab_gamutVersionCompat
|
||||
lib:libpathplan$secondaryArchSuffix = $libpathplanVersionCompat
|
||||
lib:libxdot$secondaryArchSuffix = $libxdotVersionCompat
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libfreetype$secondaryArchSuffix
|
||||
lib:libexpat$secondaryArchSuffix
|
||||
lib:libfreetype$secondaryArchSuffix
|
||||
lib:libgd$secondaryArchSuffix
|
||||
lib:libpng16$secondaryArchSuffix
|
||||
lib:libjpeg$secondaryArchSuffix
|
||||
lib:libfontconfig$secondaryArchSuffix
|
||||
lib:libltdl$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
graphviz${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libcdt$secondaryArchSuffix = $libcdtVersionCompat
|
||||
devel:libcgraph$secondaryArchSuffix = $libcgraphVersionCompat
|
||||
devel:libgvc$secondaryArchSuffix = $libgvcVersionCompat
|
||||
devel:libgvpr$secondaryArchSuffix = $libgvprVersionCompat
|
||||
devel:liblab_gamut$secondaryArchSuffix = $liblab_gamutVersionCompat
|
||||
devel:libpathplan$secondaryArchSuffix = $libpathplanVersionCompat
|
||||
devel:libxdot$secondaryArchSuffix = $libxdotVersionCompat
|
||||
"
|
||||
REQUIRES_devel="
|
||||
graphviz$secondaryArchSuffix == $portVersion base
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libexpat$secondaryArchSuffix
|
||||
devel:libfreetype$secondaryArchSuffix
|
||||
devel:libgd$secondaryArchSuffix
|
||||
devel:libpng16$secondaryArchSuffix
|
||||
devel:libjpeg$secondaryArchSuffix
|
||||
devel:libfontconfig$secondaryArchSuffix
|
||||
devel:libltdl$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:aclocal
|
||||
cmd:autoconf
|
||||
cmd:automake
|
||||
cmd:autoreconf
|
||||
cmd:awk
|
||||
cmd:bison
|
||||
cmd:flex
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:libtoolize$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
cmd:freetype_config$secondaryArchSuffix
|
||||
"
|
||||
|
||||
defineDebugInfoPackage graphviz$secondaryArchSuffix \
|
||||
$binDir/acyclic \
|
||||
$binDir/bcomps \
|
||||
$binDir/ccomps \
|
||||
$binDir/circo \
|
||||
$binDir/cluster \
|
||||
$binDir/dijkstra \
|
||||
$binDir/dot_builtins \
|
||||
$binDir/dot \
|
||||
$binDir/dot2gxl \
|
||||
$binDir/edgepaint \
|
||||
$binDir/fdp \
|
||||
$binDir/gc \
|
||||
$binDir/gml2gv \
|
||||
$binDir/graphml2gv \
|
||||
$binDir/gv2gml \
|
||||
$binDir/gv2gxl \
|
||||
$binDir/gvcolor \
|
||||
$binDir/gvgen \
|
||||
$binDir/gvpack \
|
||||
$binDir/gvpr \
|
||||
$binDir/gvmap \
|
||||
$binDir/gxl2dot \
|
||||
$binDir/gxl2gv \
|
||||
$binDir/mm2gv \
|
||||
$binDir/neato \
|
||||
$binDir/nop \
|
||||
$binDir/osage \
|
||||
$binDir/patchwork \
|
||||
$binDir/prune \
|
||||
$binDir/sccmap \
|
||||
$binDir/sfdp \
|
||||
$binDir/tred \
|
||||
$binDir/twopi \
|
||||
$binDir/unflatten \
|
||||
$libDir/libcdt.so.$libcdtVersion \
|
||||
$libDir/libcgraph.so.$libcgraphVersion \
|
||||
$libDir/libgvc.so.$libgvcVersion \
|
||||
$libDir/libgvpr.so.$libgvprVersion \
|
||||
$libDir/liblab_gamut.so.$liblab_gamutVersion \
|
||||
$libDir/libpathplan.so.$libpathplanVersion \
|
||||
$libDir/libxdot.so.$libxdotVersion
|
||||
|
||||
BUILD()
|
||||
{
|
||||
./autogen.sh
|
||||
runConfigure --omit-dirs dataDir ./configure CPPFLAGS=-D_BSD_SOURCE \
|
||||
--datadir=$developDocDir \
|
||||
--enable-shared \
|
||||
--disable-perl
|
||||
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
|
||||
#remove libtool files
|
||||
rm $libDir/*.la
|
||||
rm $libDir/graphviz/*.la
|
||||
|
||||
prepareInstalledDevelLibs $graphvizLibs
|
||||
fixPkgconfig
|
||||
|
||||
packageEntries devel \
|
||||
$developDir \
|
||||
$manDir/man3
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
make check
|
||||
}
|
||||
227
media-gfx/graphviz/licenses/EPL v1.0
Normal file
227
media-gfx/graphviz/licenses/EPL v1.0
Normal file
@@ -0,0 +1,227 @@
|
||||
Eclipse Public License - v 1.0
|
||||
|
||||
THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
|
||||
PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF
|
||||
THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
|
||||
|
||||
1. DEFINITIONS
|
||||
|
||||
"Contribution" means:
|
||||
|
||||
a) in the case of the initial Contributor, the initial code and
|
||||
documentation distributed under this Agreement, and
|
||||
|
||||
b) in the case of each subsequent Contributor:
|
||||
|
||||
i) changes to the Program, and
|
||||
|
||||
ii) additions to the Program;
|
||||
|
||||
where such changes and/or additions to the Program originate from and
|
||||
are distributed by that particular Contributor. A Contribution
|
||||
'originates' from a Contributor if it was added to the Program by such
|
||||
Contributor itself or anyone acting on such Contributor's behalf.
|
||||
Contributions do not include additions to the Program which: (i) are
|
||||
separate modules of software distributed in conjunction with the
|
||||
Program under their own license agreement, and (ii) are not derivative
|
||||
works of the Program.
|
||||
|
||||
"Contributor" means any person or entity that distributes the Program.
|
||||
|
||||
"Licensed Patents" mean patent claims licensable by a Contributor which
|
||||
are necessarily infringed by the use or sale of its Contribution alone
|
||||
or when combined with the Program.
|
||||
|
||||
"Program" means the Contributions distributed in accordance with this
|
||||
Agreement.
|
||||
|
||||
"Recipient" means anyone who receives the Program under this Agreement,
|
||||
including all Contributors.
|
||||
|
||||
2. GRANT OF RIGHTS
|
||||
|
||||
a) Subject to the terms of this Agreement, each Contributor hereby
|
||||
grants Recipient a non-exclusive, worldwide, royalty-free copyright
|
||||
license to reproduce, prepare derivative works of, publicly display,
|
||||
publicly perform, distribute and sublicense the Contribution of such
|
||||
Contributor, if any, and such derivative works, in source code and
|
||||
object code form.
|
||||
|
||||
b) Subject to the terms of this Agreement, each Contributor hereby
|
||||
grants Recipient a non-exclusive, worldwide, royalty-free patent
|
||||
license under Licensed Patents to make, use, sell, offer to sell,
|
||||
import and otherwise transfer the Contribution of such Contributor, if
|
||||
any, in source code and object code form. This patent license shall
|
||||
apply to the combination of the Contribution and the Program if, at the
|
||||
time the Contribution is added by the Contributor, such addition of the
|
||||
Contribution causes such combination to be covered by the Licensed
|
||||
Patents. The patent license shall not apply to any other combinations
|
||||
which include the Contribution. No hardware per se is licensed
|
||||
hereunder.
|
||||
|
||||
c) Recipient understands that although each Contributor grants the
|
||||
licenses to its Contributions set forth herein, no assurances are
|
||||
provided by any Contributor that the Program does not infringe the
|
||||
patent or other intellectual property rights of any other entity. Each
|
||||
Contributor disclaims any liability to Recipient for claims brought by
|
||||
any other entity based on infringement of intellectual property rights
|
||||
or otherwise. As a condition to exercising the rights and licenses
|
||||
granted hereunder, each Recipient hereby assumes sole responsibility to
|
||||
secure any other intellectual property rights needed, if any. For
|
||||
example, if a third party patent license is required to allow Recipient
|
||||
to distribute the Program, it is Recipient's responsibility to acquire
|
||||
that license before distributing the Program.
|
||||
|
||||
d) Each Contributor represents that to its knowledge it has sufficient
|
||||
copyright rights in its Contribution, if any, to grant the copyright
|
||||
license set forth in this Agreement.
|
||||
|
||||
3. REQUIREMENTS
|
||||
|
||||
A Contributor may choose to distribute the Program in object code form
|
||||
under its own license agreement, provided that:
|
||||
|
||||
a) it complies with the terms and conditions of this Agreement; and
|
||||
|
||||
b) its license agreement:
|
||||
|
||||
i) effectively disclaims on behalf of all Contributors all warranties
|
||||
and conditions, express and implied, including warranties or conditions
|
||||
of title and non-infringement, and implied warranties or conditions of
|
||||
merchantability and fitness for a particular purpose;
|
||||
|
||||
ii) effectively excludes on behalf of all Contributors all liability
|
||||
for damages, including direct, indirect, special, incidental and
|
||||
consequential damages, such as lost profits;
|
||||
|
||||
iii) states that any provisions which differ from this Agreement are
|
||||
offered by that Contributor alone and not by any other party; and
|
||||
|
||||
iv) states that source code for the Program is available from such
|
||||
Contributor, and informs licensees how to obtain it in a reasonable
|
||||
manner on or through a medium customarily used for software exchange.
|
||||
|
||||
When the Program is made available in source code form:
|
||||
|
||||
a) it must be made available under this Agreement; and
|
||||
|
||||
b) a copy of this Agreement must be included with each copy of the
|
||||
Program.
|
||||
|
||||
Contributors may not remove or alter any copyright notices contained
|
||||
within the Program.
|
||||
|
||||
Each Contributor must identify itself as the originator of its
|
||||
Contribution, if any, in a manner that reasonably allows subsequent
|
||||
Recipients to identify the originator of the Contribution.
|
||||
|
||||
4. COMMERCIAL DISTRIBUTION
|
||||
|
||||
Commercial distributors of software may accept certain responsibilities
|
||||
with respect to end users, business partners and the like. While this
|
||||
license is intended to facilitate the commercial use of the Program,
|
||||
the Contributor who includes the Program in a commercial product
|
||||
offering should do so in a manner which does not create potential
|
||||
liability for other Contributors. Therefore, if a Contributor includes
|
||||
the Program in a commercial product offering, such Contributor
|
||||
("Commercial Contributor") hereby agrees to defend and indemnify every
|
||||
other Contributor ("Indemnified Contributor") against any losses,
|
||||
damages and costs (collectively "Losses") arising from claims, lawsuits
|
||||
and other legal actions brought by a third party against the
|
||||
Indemnified Contributor to the extent caused by the acts or omissions
|
||||
of such Commercial Contributor in connection with its distribution of
|
||||
the Program in a commercial product offering. The obligations in this
|
||||
section do not apply to any claims or Losses relating to any actual or
|
||||
alleged intellectual property infringement. In order to qualify, an
|
||||
Indemnified Contributor must: a) promptly notify the Commercial
|
||||
Contributor in writing of such claim, and b) allow the Commercial
|
||||
Contributor to control, and cooperate with the Commercial Contributor
|
||||
in, the defense and any related settlement negotiations. The
|
||||
Indemnified Contributor may participate in any such claim at its own
|
||||
expense.
|
||||
|
||||
For example, a Contributor might include the Program in a commercial
|
||||
product offering, Product X. That Contributor is then a Commercial
|
||||
Contributor. If that Commercial Contributor then makes performance
|
||||
claims, or offers warranties related to Product X, those performance
|
||||
claims and warranties are such Commercial Contributor's responsibility
|
||||
alone. Under this section, the Commercial Contributor would have to
|
||||
defend claims against the other Contributors related to those
|
||||
performance claims and warranties, and if a court requires any other
|
||||
Contributor to pay any damages as a result, the Commercial Contributor
|
||||
must pay those damages.
|
||||
|
||||
5. NO WARRANTY
|
||||
|
||||
EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
|
||||
PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY
|
||||
WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR
|
||||
FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible
|
||||
for determining the appropriateness of using and distributing the
|
||||
Program and assumes all risks associated with its exercise of rights
|
||||
under this Agreement , including but not limited to the risks and costs
|
||||
of program errors, compliance with applicable laws, damage to or loss
|
||||
of data, programs or equipment, and unavailability or interruption of
|
||||
operations.
|
||||
|
||||
6. DISCLAIMER OF LIABILITY
|
||||
|
||||
EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR
|
||||
ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
|
||||
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
|
||||
WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
|
||||
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
||||
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
|
||||
DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
|
||||
HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
|
||||
|
||||
7. GENERAL
|
||||
|
||||
If any provision of this Agreement is invalid or unenforceable under
|
||||
applicable law, it shall not affect the validity or enforceability of
|
||||
the remainder of the terms of this Agreement, and without further
|
||||
action by the parties hereto, such provision shall be reformed to the
|
||||
minimum extent necessary to make such provision valid and enforceable.
|
||||
|
||||
If Recipient institutes patent litigation against any entity (including
|
||||
a cross-claim or counterclaim in a lawsuit) alleging that the Program
|
||||
itself (excluding combinations of the Program with other software or
|
||||
hardware) infringes such Recipient's patent(s), then such Recipient's
|
||||
rights granted under Section 2(b) shall terminate as of the date such
|
||||
litigation is filed.
|
||||
|
||||
All Recipient's rights under this Agreement shall terminate if it fails
|
||||
to comply with any of the material terms or conditions of this
|
||||
Agreement and does not cure such failure in a reasonable period of time
|
||||
after becoming aware of such noncompliance. If all Recipient's rights
|
||||
under this Agreement terminate, Recipient agrees to cease use and
|
||||
distribution of the Program as soon as reasonably practicable. However,
|
||||
Recipient's obligations under this Agreement and any licenses granted
|
||||
by Recipient relating to the Program shall continue and survive.
|
||||
|
||||
Everyone is permitted to copy and distribute copies of this Agreement,
|
||||
but in order to avoid inconsistency the Agreement is copyrighted and
|
||||
may only be modified in the following manner. The Agreement Steward
|
||||
reserves the right to publish new versions (including revisions) of
|
||||
this Agreement from time to time. No one other than the Agreement
|
||||
Steward has the right to modify this Agreement. The Eclipse Foundation
|
||||
is the initial Agreement Steward. The Eclipse Foundation may assign the
|
||||
responsibility to serve as the Agreement Steward to a suitable separate
|
||||
entity. Each new version of the Agreement will be given a
|
||||
distinguishing version number. The Program (including Contributions)
|
||||
may always be distributed subject to the version of the Agreement under
|
||||
which it was received. In addition, after a new version of the
|
||||
Agreement is published, Contributor may elect to distribute the Program
|
||||
(including its Contributions) under the new version. Except as
|
||||
expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
|
||||
rights or licenses to the intellectual property of any Contributor
|
||||
under this Agreement, whether expressly, by implication, estoppel or
|
||||
otherwise. All rights in the Program not expressly granted under this
|
||||
Agreement are reserved.
|
||||
|
||||
This Agreement is governed by the laws of the State of New York and the
|
||||
intellectual property laws of the United States of America. No party to
|
||||
this Agreement will bring a legal action under this Agreement more than
|
||||
one year after the cause of action arose. Each party waives its rights
|
||||
to a jury trial in any resulting litigation.
|
||||
118
media-gfx/graphviz/patches/graphviz-2.40.1.patchset
Normal file
118
media-gfx/graphviz/patches/graphviz-2.40.1.patchset
Normal file
@@ -0,0 +1,118 @@
|
||||
From 36f72f0bc9c1908134d8bee4e12bf45cfa1cabcf Mon Sep 17 00:00:00 2001
|
||||
From: begasus <begasus@gmail.com>
|
||||
Date: Sun, 25 Feb 2018 15:09:25 +0100
|
||||
Subject: set Haiku font directories
|
||||
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 51166c3..59c89a5 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -133,6 +133,7 @@ UWIN=no
|
||||
CYGWIN=no
|
||||
MINGW32=no
|
||||
DARWIN9=no
|
||||
+HAIKU=no
|
||||
case "${host_os}" in
|
||||
*uwin* )
|
||||
UWIN=yes
|
||||
@@ -181,6 +182,16 @@ case "${host_os}" in
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
+ *haiku* )
|
||||
+ HAIKU=yes
|
||||
+ HAIKU_SYSTEM_FONTPATH=`finddir B_SYSTEM_FONTS_DIRECTORY`
|
||||
+ HAIKU_COMMON_FONTPATH=`finddir B_COMMON_FONTS_DIRECTORY`
|
||||
+ HAIKU_USER_FONTPATH=`finddir B_USER_FONTS_DIRECTORY`
|
||||
+ DEFAULT_FONTPATH="$HAIKU_SYSTEM_FONTPATH:$HAIKU_SYSTEM_FONTPATH/ttfonts:$HAIKU_SYSTEM_FONTPATH/psfonts:$HAIKU_COMMON_FONTPATH:$HAIKU_COMMON_FONTPATH/ttfonts:$HAIKU_COMMON_FONTPATH/psfonts:$HAIKU_USER_FONTPATH:$HAIKU_USER_FONTPATH/ttfonts:$HAIKU_USER_FONTPATH/psfonts"
|
||||
+ PATHSEPARATOR=":"
|
||||
+ NO_POSTSCRIPT_ALIAS=1
|
||||
+ BROWSER="open"
|
||||
+ ;;
|
||||
* ) # This sucks! Whatever happened to standards for file system layout? (Good job its no longer used unless fontconfig is unavailable.)
|
||||
DEFAULT_FONTPATH="/usr/share/fonts/sun/TrueType:/usr/share/fonts/TrueType:/usr/X11/lib/X11/fonts/TrueType:/usr/share/fonts/sun/Type1:/usr/openwin/lib/X11/fonts/Type1:/usr/share/fonts/X11/Type1:/usr/share/fonts/default/Type1:/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:/usr/common/share/fonts/ttf";
|
||||
PATHSEPARATOR=":"
|
||||
@@ -422,7 +433,7 @@ AC_CHECK_HEADERS(malloc.h \
|
||||
errno.h unistd.h strings.h \
|
||||
sys/time.h sys/types.h sys/select.h \
|
||||
sys/stat.h sys/mman.h \
|
||||
- sys/ioctl.h sys/inotify.h crt_externs.h)
|
||||
+ sys/ioctl.h sys/inotify.h crt_externs.h sysexits.h)
|
||||
AC_HEADER_TIME
|
||||
AC_HEADER_DIRENT
|
||||
AC_HEADER_STDBOOL
|
||||
--
|
||||
2.16.2
|
||||
|
||||
|
||||
From 153b82a722a04872484f9af6b67481ab4661f677 Mon Sep 17 00:00:00 2001
|
||||
From: begasus <begasus@gmail.com>
|
||||
Date: Sun, 25 Feb 2018 15:14:43 +0100
|
||||
Subject: undef _hdr_malloc for Haiku
|
||||
|
||||
|
||||
diff --git a/lib/vmalloc/vmhdr.h b/lib/vmalloc/vmhdr.h
|
||||
index a44793f..c71d6e3 100644
|
||||
--- a/lib/vmalloc/vmhdr.h
|
||||
+++ b/lib/vmalloc/vmhdr.h
|
||||
@@ -39,6 +39,10 @@ extern "C" {
|
||||
|
||||
#include "FEATURE/vmalloc"
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+ #undef _hdr_malloc
|
||||
+#endif
|
||||
+
|
||||
#undef free
|
||||
#undef malloc
|
||||
#undef realloc
|
||||
--
|
||||
2.16.2
|
||||
|
||||
|
||||
From ad68852fef2a28a874529b81447557e39d296615 Mon Sep 17 00:00:00 2001
|
||||
From: begasus <begasus@gmail.com>
|
||||
Date: Sun, 25 Feb 2018 15:17:14 +0100
|
||||
Subject: set default font for Haiku
|
||||
|
||||
|
||||
diff --git a/lib/common/const.h b/lib/common/const.h
|
||||
index 605dabd..884bc49 100644
|
||||
--- a/lib/common/const.h
|
||||
+++ b/lib/common/const.h
|
||||
@@ -66,6 +66,8 @@
|
||||
#define MIN_FONTSIZE 1.0
|
||||
#if defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) || defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
|
||||
#define DEFAULT_FONTNAME "TimesNewRomanPSMT"
|
||||
+#elif defined (__HAIKU__)
|
||||
+ #define DEFAULT_FONTNAME "DejaVuSans"
|
||||
#else
|
||||
#define DEFAULT_FONTNAME "Times-Roman"
|
||||
#endif
|
||||
--
|
||||
2.16.2
|
||||
|
||||
|
||||
From 0101b5128196e9b26b523c3c689ef5f440a6b4ec Mon Sep 17 00:00:00 2001
|
||||
From: begasus <begasus@gmail.com>
|
||||
Date: Mon, 26 Feb 2018 19:20:59 +0100
|
||||
Subject: Don't define waitpid unless necessary
|
||||
|
||||
|
||||
diff --git a/lib/sfio/sfhdr.h b/lib/sfio/sfhdr.h
|
||||
index 9558c03..6930ff6 100644
|
||||
--- a/lib/sfio/sfhdr.h
|
||||
+++ b/lib/sfio/sfhdr.h
|
||||
@@ -906,7 +906,7 @@ extern "C" {
|
||||
#endif
|
||||
|
||||
extern time_t time(time_t *);
|
||||
- extern int waitpid(int, int *, int);
|
||||
+ extern pid_t waitpid(pid_t, int *, int);
|
||||
#ifndef WIN32
|
||||
extern void _exit(int);
|
||||
#endif
|
||||
--
|
||||
2.16.2
|
||||
|
||||
Reference in New Issue
Block a user