mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 19:50:05 +02:00
ghostscript8: actually build the BeOS code
This commit is contained in:
@@ -6,8 +6,8 @@ description language files, for the display or printing of document pages, and \
|
||||
the conversion between PostScript and PDF files."
|
||||
HOMEPAGE="https://ghostscript.com/"
|
||||
COPYRIGHT="2001-2018 Artifex Software, Inc."
|
||||
LICENSE="AGPL-3.0"
|
||||
REVISION="1"
|
||||
LICENSE="AFPL"
|
||||
REVISION="2"
|
||||
SOURCE_URI="https://sourceforge.net/projects/ghostscript/files/AFPL%20Ghostscript/$portVersion/ghostscript-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="343aaf45cd52539a04ec2172259c8c39b87f613e1a493c74a275350a1ecc6b6a"
|
||||
SOURCE_DIR="ghostscript-$portVersion"
|
||||
@@ -23,7 +23,7 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
|
||||
fi
|
||||
|
||||
PROVIDES="
|
||||
ghostscript_gpl$secondaryArchSuffix = $portVersion
|
||||
ghostscript8$secondaryArchSuffix = $portVersion
|
||||
cmd:bdftops
|
||||
cmd:dvipdf
|
||||
cmd:eps2eps
|
||||
@@ -69,18 +69,17 @@ REQUIRES="
|
||||
lib:libjpeg$secondaryArchSuffix
|
||||
lib:liblcms2$secondaryArchSuffix
|
||||
lib:libpaper$secondaryArchSuffix
|
||||
lib:libpng16$secondaryArchSuffix
|
||||
lib:libtiff$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
ghostscript_gpl${secondaryArchSuffix}_devel = $portVersion
|
||||
ghostscript8${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libgs$secondaryArchSuffix = 8.14 compat >= 8
|
||||
"
|
||||
|
||||
REQUIRES_devel="
|
||||
ghostscript_gpl$secondaryArchSuffix == $portVersion base
|
||||
ghostscript8$secondaryArchSuffix == $portVersion base
|
||||
"
|
||||
|
||||
|
||||
@@ -93,7 +92,6 @@ BUILD_REQUIRES="
|
||||
devel:libjpeg$secondaryArchSuffix
|
||||
devel:liblcms2$secondaryArchSuffix
|
||||
devel:libpaper$secondaryArchSuffix
|
||||
devel:libpng16$secondaryArchSuffix
|
||||
devel:libtiff$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
"
|
||||
@@ -108,12 +106,23 @@ BUILD_PREREQUIRES="
|
||||
cmd:sed
|
||||
"
|
||||
|
||||
defineDebugInfoPackage ghostscript_gpl$secondaryArchSuffix \
|
||||
defineDebugInfoPackage ghostscript8$secondaryArchSuffix \
|
||||
"$commandBinDir"/gs \
|
||||
"$libDir"/libgs.so.8.14
|
||||
|
||||
BUILD()
|
||||
{
|
||||
# Set up fonts paths
|
||||
local FONTPATH
|
||||
for path in \
|
||||
$(findpaths B_FIND_PATH_FONTS_DIRECTORY otfonts) \
|
||||
$(findpaths B_FIND_PATH_FONTS_DIRECTORY psfonts) \
|
||||
$(findpaths B_FIND_PATH_FONTS_DIRECTORY ttfonts) \
|
||||
$(findpaths B_FIND_PATH_FONTS_DIRECTORY X11)
|
||||
do
|
||||
FONTPATH="$FONTPATH${FONTPATH:+:}$path"
|
||||
done
|
||||
|
||||
# Force configure to use system-libs
|
||||
rm -rf {freetype,jbig2dec,jpeg,lcms2,libpng,tiff,zlib}
|
||||
|
||||
@@ -121,11 +130,11 @@ BUILD()
|
||||
|
||||
# Do configure
|
||||
runConfigure --omit-dirs binDir ./configure \
|
||||
--bindir=$commandBinDir EXTRALIBS=-lbe\
|
||||
--bindir=$commandBinDir --with-fontpath="$FONTPATH" EXTRALIBS=-lbe
|
||||
|
||||
# Do make
|
||||
EXTRALIBS=-lbe make
|
||||
EXTRALIBS=-lbe make so
|
||||
make
|
||||
make so
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
|
||||
258
app-text/ghostscript_gpl/licenses/AFPL
Normal file
258
app-text/ghostscript_gpl/licenses/AFPL
Normal file
@@ -0,0 +1,258 @@
|
||||
|
||||
Aladdin Free Public License
|
||||
(Version 9, September 18, 2000)
|
||||
|
||||
Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000 Aladdin Enterprises,
|
||||
Menlo Park, California, U.S.A. All rights reserved.
|
||||
|
||||
NOTE: This License is not the same as any of the GNU Licenses
|
||||
published by the Free Software Foundation. Its terms are
|
||||
substantially different from those of the GNU Licenses. If you are
|
||||
familiar with the GNU Licenses, please read this license with extra
|
||||
care.
|
||||
|
||||
Aladdin Enterprises hereby grants to anyone the permission to apply
|
||||
this License to their own work, as long as the entire License
|
||||
(including the above notices and this paragraph) is copied with no
|
||||
changes, additions, or deletions except for changing the first
|
||||
paragraph of Section 0 to include a suitable description of the work
|
||||
to which the license is being applied and of the person or entity that
|
||||
holds the copyright in the work, and, if the License is being applied
|
||||
to a work created in a country other than the United States, replacing
|
||||
the first paragraph of Section 6 with an appropriate reference to the
|
||||
laws of the appropriate country.
|
||||
|
||||
This License is not an Open Source license: among other things, it
|
||||
places restrictions on distribution of the Program, specifically
|
||||
including sale of the Program. While Aladdin Enterprises respects and
|
||||
supports the philosophy of the Open Source Definition, and shares the
|
||||
desire of the GNU project to keep licensed software freely
|
||||
redistributable in both source and object form, we feel that Open
|
||||
Source licenses unfairly prevent developers of useful software from
|
||||
being compensated proportionately when others profit financially from
|
||||
their work. This License attempts to ensure that those who receive,
|
||||
redistribute, and contribute to the licensed Program according to the
|
||||
Open Source and Free Software philosophies have the right to do so,
|
||||
while retaining for the developer(s) of the Program the power to make
|
||||
those who use the Program to enhance the value of commercial products
|
||||
pay for the privilege of doing so.
|
||||
|
||||
0. Subject Matter
|
||||
|
||||
This License applies to the computer program known as "AFPL
|
||||
Ghostscript." The "Program", below, refers to such program. The
|
||||
Program is a copyrighted work whose copyright is held by artofcode
|
||||
LLC, located in Benicia, California (the "Licensor"). Please note that
|
||||
AFPL Ghostscript is neither the program known as "GNU Ghostscript" nor
|
||||
the version of Ghostscript available for commercial licensing from
|
||||
Artifex Software Inc.
|
||||
|
||||
A "work based on the Program" means either the Program or any
|
||||
derivative work of the Program, as defined in the United States
|
||||
Copyright Act of 1976, such as a translation or a modification.
|
||||
|
||||
BY MODIFYING OR DISTRIBUTING THE PROGRAM (OR ANY WORK BASED ON THE
|
||||
PROGRAM), YOU INDICATE YOUR ACCEPTANCE OF THIS LICENSE TO DO SO, AND
|
||||
ALL ITS TERMS AND CONDITIONS FOR COPYING, DISTRIBUTING OR MODIFYING
|
||||
THE PROGRAM OR WORKS BASED ON IT. NOTHING OTHER THAN THIS LICENSE
|
||||
GRANTS YOU PERMISSION TO MODIFY OR DISTRIBUTE THE PROGRAM OR ITS
|
||||
DERIVATIVE WORKS. THESE ACTIONS ARE PROHIBITED BY LAW. IF YOU DO NOT
|
||||
ACCEPT THESE TERMS AND CONDITIONS, DO NOT MODIFY OR DISTRIBUTE THE
|
||||
PROGRAM.
|
||||
|
||||
1. Licenses.
|
||||
|
||||
Licensor hereby grants you the following rights, provided that you
|
||||
comply with all of the restrictions set forth in this License and
|
||||
provided, further, that you distribute an unmodified copy of this
|
||||
License with the Program:
|
||||
(a)
|
||||
You may copy and distribute literal (i.e., verbatim) copies of
|
||||
the Program's source code as you receive it throughout the
|
||||
world, in any medium.
|
||||
(b)
|
||||
You may modify the Program, create works based on the Program
|
||||
and distribute copies of such throughout the world, in any
|
||||
medium.
|
||||
|
||||
2. Restrictions.
|
||||
|
||||
This license is subject to the following restrictions:
|
||||
(a)
|
||||
Distribution of the Program or any work based on the Program by
|
||||
a commercial organization to any third party is prohibited if
|
||||
any payment is made in connection with such distribution,
|
||||
whether directly (as in payment for a copy of the Program) or
|
||||
indirectly (as in payment for some service related to the
|
||||
Program, or payment for some product or service that includes a
|
||||
copy of the Program "without charge"; these are only examples,
|
||||
and not an exhaustive enumeration of prohibited activities).
|
||||
The following methods of distribution involving payment shall
|
||||
not in and of themselves be a violation of this restriction:
|
||||
(i)
|
||||
Posting the Program on a public access information storage
|
||||
and retrieval service for which a fee is received for
|
||||
retrieving information (such as an on-line service),
|
||||
provided that the fee is not content-dependent (i.e., the
|
||||
fee would be the same for retrieving the same volume of
|
||||
information consisting of random data) and that access to
|
||||
the service and to the Program is available independent of
|
||||
any other product or service. An example of a service that
|
||||
does not fall under this section is an on-line service
|
||||
that is operated by a company and that is only available
|
||||
to customers of that company. (This is not an exhaustive
|
||||
enumeration.)
|
||||
(ii)
|
||||
Distributing the Program on removable computer-readable
|
||||
media, provided that the files containing the Program are
|
||||
reproduced entirely and verbatim on such media, that all
|
||||
information on such media be redistributable for
|
||||
non-commercial purposes without charge, and that such
|
||||
media are distributed by themselves (except for
|
||||
accompanying documentation) independent of any other
|
||||
product or service. Examples of such media include CD-ROM,
|
||||
magnetic tape, and optical storage media. (This is not
|
||||
intended to be an exhaustive list.) An example of a
|
||||
distribution that does not fall under this section is a
|
||||
CD-ROM included in a book or magazine. (This is not an
|
||||
exhaustive enumeration.)
|
||||
(b)
|
||||
Activities other than copying, distribution and modification of
|
||||
the Program are not subject to this License and they are
|
||||
outside its scope. Functional use (running) of the Program is
|
||||
not restricted, and any output produced through the use of the
|
||||
Program is subject to this license only if its contents
|
||||
constitute a work based on the Program (independent of having
|
||||
been made by running the Program).
|
||||
(c)
|
||||
You must meet all of the following conditions with respect to
|
||||
any work that you distribute or publish that in whole or in
|
||||
part contains or is derived from the Program or any part
|
||||
thereof ("the Work"):
|
||||
(i)
|
||||
If you have modified the Program, you must cause the Work
|
||||
to carry prominent notices stating that you have modified
|
||||
the Program's files and the date of any change. In each
|
||||
source file that you have modified, you must include a
|
||||
prominent notice that you have modified the file,
|
||||
including your name, your e-mail address (if any), and the
|
||||
date and purpose of the change;
|
||||
(ii)
|
||||
You must cause the Work to be licensed as a whole and at
|
||||
no charge to all third parties under the terms of this
|
||||
License;
|
||||
(iii)
|
||||
If the Work normally reads commands interactively when
|
||||
run, you must cause it, at each time the Work commences
|
||||
operation, to print or display an announcement including
|
||||
an appropriate copyright notice and a notice that there is
|
||||
no warranty (or else, saying that you provide a warranty).
|
||||
Such notice must also state that users may redistribute
|
||||
the Work only under the conditions of this License and
|
||||
tell the user how to view the copy of this License
|
||||
included with the Work. (Exceptions: if the Program is
|
||||
interactive but normally prints or displays such an
|
||||
announcement only at the request of a user, such as in an
|
||||
"About box", the Work is required to print or display the
|
||||
notice only under the same circumstances; if the Program
|
||||
itself is interactive but does not normally print such an
|
||||
announcement, the Work is not required to print an
|
||||
announcement.);
|
||||
(iv)
|
||||
You must accompany the Work with the complete
|
||||
corresponding machine-readable source code, delivered on a
|
||||
medium customarily used for software interchange. The
|
||||
source code for a work means the preferred form of the
|
||||
work for making modifications to it. For an executable
|
||||
work, complete source code means all the source code for
|
||||
all modules it contains, plus any associated interface
|
||||
definition files, plus the scripts used to control
|
||||
compilation and installation of the executable code. If
|
||||
you distribute with the Work any component that is
|
||||
normally distributed (in either source or binary form)
|
||||
with the major components (compiler, kernel, and so on) of
|
||||
the operating system on which the executable runs, you
|
||||
must also distribute the source code of that component if
|
||||
you have it and are allowed to do so;
|
||||
(v)
|
||||
If you distribute any written or printed material at all
|
||||
with the Work, such material must include either a written
|
||||
copy of this License, or a prominent written indication
|
||||
that the Work is covered by this License and written
|
||||
instructions for printing and/or displaying the copy of
|
||||
the License on the distribution medium;
|
||||
(vi)
|
||||
You may not impose any further restrictions on the
|
||||
recipient's exercise of the rights granted herein.
|
||||
|
||||
If distribution of executable or object code is made by offering the
|
||||
equivalent ability to copy from a designated place, then offering
|
||||
equivalent ability to copy the source code from the same place counts
|
||||
as distribution of the source code, even though third parties are not
|
||||
compelled to copy the source code along with the object code.
|
||||
|
||||
3. Reservation of Rights.
|
||||
|
||||
No rights are granted to the Program except as expressly set forth
|
||||
herein. You may not copy, modify, sublicense, or distribute the
|
||||
Program except as expressly provided under this License. Any attempt
|
||||
otherwise to copy, modify, sublicense or distribute the Program is
|
||||
void, and will automatically terminate your rights under this License.
|
||||
However, parties who have received copies, or rights, from you under
|
||||
this License will not have their licenses terminated so long as such
|
||||
parties remain in full compliance.
|
||||
|
||||
4. Other Restrictions.
|
||||
|
||||
If the distribution and/or use of the Program is restricted in certain
|
||||
countries for any reason, Licensor may add an explicit geographical
|
||||
distribution limitation excluding those countries, so that
|
||||
distribution is permitted only in or among countries not thus
|
||||
excluded. In such case, this License incorporates the limitation as if
|
||||
written in the body of this License.
|
||||
|
||||
5. Limitations.
|
||||
|
||||
THE PROGRAM IS PROVIDED TO YOU "AS IS," WITHOUT WARRANTY. THERE IS NO
|
||||
WARRANTY FOR THE PROGRAM, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT
|
||||
NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
|
||||
THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS
|
||||
WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||
|
||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL LICENSOR, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE
|
||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
|
||||
ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT
|
||||
NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
|
||||
LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
|
||||
TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
|
||||
PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
|
||||
|
||||
6. General.
|
||||
|
||||
This License is governed by the laws of the State of California,
|
||||
U.S.A., excluding choice of law rules.
|
||||
|
||||
If any part of this License is found to be in conflict with the law,
|
||||
that part shall be interpreted in its broadest meaning consistent with
|
||||
the law, and no other parts of the License shall be affected.
|
||||
|
||||
For United States Government users, the Program is provided with
|
||||
RESTRICTED RIGHTS. If you are a unit or agency of the United States
|
||||
Government or are acquiring the Program for any such unit or agency,
|
||||
the following apply:
|
||||
|
||||
If the unit or agency is the Department of Defense ("DOD"), the
|
||||
Program and its documentation are classified as "commercial
|
||||
computer software" and "commercial computer software documentation"
|
||||
respectively and, pursuant to DFAR Section 227.7202, the Government
|
||||
is acquiring the Program and its documentation in accordance with
|
||||
the terms of this License. If the unit or agency is other than DOD,
|
||||
the Program and its documentation are classified as "commercial
|
||||
computer software" and "commercial computer software documentation"
|
||||
respectively and, pursuant to FAR Section 12.212, the Government is
|
||||
acquiring the Program and its documentation in accordance with the
|
||||
terms of this License.
|
||||
@@ -1,4 +1,4 @@
|
||||
From 54854058708ca5ce832673657d11740e438d1c06 Mon Sep 17 00:00:00 2001
|
||||
From bbf663ff8712fd4dbf53ac5a277dfb0daa142afe Mon Sep 17 00:00:00 2001
|
||||
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
||||
Date: Fri, 15 Mar 2019 08:17:45 +0100
|
||||
Subject: Fix build on Haiku using Unix makefiles.
|
||||
@@ -49,7 +49,7 @@ index 2570d69..8626ba4 100644
|
||||
2.19.1
|
||||
|
||||
|
||||
From 5bd1c298bc8323529c3b4643a476985ae50e2f2a Mon Sep 17 00:00:00 2001
|
||||
From 755d5a40ca11958285eec7b23b374f534d035e9b Mon Sep 17 00:00:00 2001
|
||||
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
||||
Date: Fri, 15 Mar 2019 10:16:42 +0100
|
||||
Subject: Import the BeOS patches.
|
||||
@@ -2597,38 +2597,78 @@ index f0d4944..e4e3113 100644
|
||||
2.19.1
|
||||
|
||||
|
||||
From 19af04b33eb441990280602f1939d05455cbb8ff Mon Sep 17 00:00:00 2001
|
||||
From fce66044f86a06f28def6a45ae043b7aae9010aa Mon Sep 17 00:00:00 2001
|
||||
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
||||
Date: Fri, 15 Mar 2019 19:30:01 +0100
|
||||
Subject: Fix the build.
|
||||
|
||||
Not in the cleanest way...
|
||||
Move some of the BeOS changes into configure.ac/Makefile.in
|
||||
|
||||
diff --git a/src/Makefile.in b/src/Makefile.in
|
||||
index 22c7773..5151451 100644
|
||||
--- a/src/Makefile.in
|
||||
+++ b/src/Makefile.in
|
||||
@@ -282,6 +282,8 @@ XLIBDIR=
|
||||
#XLIBS=Xt Xext X11
|
||||
XLIBS=@XLIBS@
|
||||
|
||||
+BELIBS=@BELIBS@
|
||||
+
|
||||
# Define whether this platform has floating point hardware:
|
||||
# FPU_TYPE=2 means floating point is faster than fixed point.
|
||||
# (This is the case on some RISCs with multiple instruction dispatch.)
|
||||
@@ -353,7 +355,7 @@ EXTEND_NAMES=0
|
||||
# devs.mak and contrib.mak for the list of available devices.
|
||||
|
||||
#DEVICE_DEVS=$(DISPLAY_DEV) $(DD)x11.dev $(DD)x11alpha.dev $(DD)x11cmyk.dev $(DD)x11gray2.dev $(DD)x11gray4.dev $(DD)x11mono.dev
|
||||
-DEVICE_DEVS=$(DISPLAY_DEV) @X11DEVS@
|
||||
+DEVICE_DEVS=$(DISPLAY_DEV) @X11DEVS@ @BEDEVS@
|
||||
|
||||
DEVICE_DEVS1=$(DD)bmpmono.dev $(DD)bmpgray.dev $(DD)bmpsep1.dev $(DD)bmpsep8.dev $(DD)bmp16.dev $(DD)bmp256.dev $(DD)bmp16m.dev $(DD)bmp32b.dev
|
||||
DEVICE_DEVS2=
|
||||
diff --git a/src/configure.ac b/src/configure.ac
|
||||
index a18f4d0..e145051 100644
|
||||
--- a/src/configure.ac
|
||||
+++ b/src/configure.ac
|
||||
@@ -308,6 +308,12 @@ fi
|
||||
AC_SUBST(X11DEVS)
|
||||
AC_SUBST(XLIBS)
|
||||
|
||||
+BELIBS='-lbe'
|
||||
+AC_SUBST(BELIBS)
|
||||
+
|
||||
+BEDEVS='$(DD)beos.dev $(DD)bealpha2.dev $(DD)bealpha4.dev $(DD)bealpht2.dev $(DD)bealpht4.dev'
|
||||
+AC_SUBST(BEDEVS)
|
||||
+
|
||||
dnl executible name
|
||||
AC_ARG_WITH(gs, AC_HELP_STRING([--with-gs=NAME],
|
||||
[name of the ghostscript executible [[gs]]]),
|
||||
diff --git a/src/contrib.mak b/src/contrib.mak
|
||||
index bc889fb..1a9069a 100644
|
||||
index bc889fb..a9eba37 100644
|
||||
--- a/src/contrib.mak
|
||||
+++ b/src/contrib.mak
|
||||
@@ -863,20 +863,20 @@ $(GLOBJ)gdevsunr.$(OBJ) : $(GLSRC)gdevsunr.c $(PDEVH)
|
||||
### by Michael Pfeiffer <michael.pfeiffer@utanet.at>; ###
|
||||
### anti-aliasing drivers by Michael Pfeiffer. ###
|
||||
@@ -865,18 +865,23 @@ $(GLOBJ)gdevsunr.$(OBJ) : $(GLSRC)gdevsunr.c $(PDEVH)
|
||||
|
||||
-$(DD)beos.dev: $(GLOBJ)gdevbe.$(OBJ)
|
||||
- $(SETDEV) $(DD)beos $(GLOBJ)gdevbe.$(OBJ)
|
||||
+$(DD)unix.dev: $(GLOBJ)gdevbe.$(OBJ)
|
||||
+ $(SETDEV) $(DD)unix $(GLOBJ)gdevbe.$(OBJ)
|
||||
$(DD)beos.dev: $(GLOBJ)gdevbe.$(OBJ)
|
||||
$(SETDEV) $(DD)beos $(GLOBJ)gdevbe.$(OBJ)
|
||||
+ $(ADDMOD) $(DD)beos -lib $(BELIBS)
|
||||
|
||||
$(DD)bealpha2.dev: $(GLOBJ)gdevbe.$(OBJ)
|
||||
$(SETDEV) $(DD)bealpha2 $(GLOBJ)gdevbe.$(OBJ)
|
||||
+ $(ADDMOD) $(DD)bealpha2 -lib $(BELIBS)
|
||||
|
||||
$(DD)bealpha4.dev: $(GLOBJ)gdevbe.$(OBJ)
|
||||
$(SETDEV) $(DD)bealpha4 $(GLOBJ)gdevbe.$(OBJ)
|
||||
-
|
||||
+ $(ADDMOD) $(DD)bealpha4 -lib $(BELIBS)
|
||||
+
|
||||
$(DD)bealpht2.dev: $(GLOBJ)gdevbe.$(OBJ)
|
||||
$(SETDEV) $(DD)bealpht2 $(GLOBJ)gdevbe.$(OBJ)
|
||||
+ $(ADDMOD) $(DD)bealpht2 -lib $(BELIBS)
|
||||
|
||||
$(DD)bealpht4.dev: $(GLOBJ)gdevbe.$(OBJ)
|
||||
$(SETDEV) $(DD)bealpht4 $(GLOBJ)gdevbe.$(OBJ)
|
||||
+ $(ADDMOD) $(DD)bealpht4 -lib $(BELIBS)
|
||||
|
||||
- $(GLOBJ)gdevbe.$(OBJ): $(GLSRC)gdevbe.cpp $(GLSRC)gdevbe.h $(GDEV)
|
||||
+$(GLOBJ)gdevbe.$(OBJ): $(GLSRC)gdevbe.cpp $(GLSRC)gdevbe.h $(GDEV)
|
||||
@@ -2659,19 +2699,25 @@ index db03cd6..ee3848a 100644
|
||||
path->Append(kPreferencesFile) == B_OK;
|
||||
}
|
||||
|
||||
diff --git a/src/ugcclib.mak b/src/ugcclib.mak
|
||||
index faca15d..1d5e256 100644
|
||||
--- a/src/ugcclib.mak
|
||||
+++ b/src/ugcclib.mak
|
||||
@@ -93,7 +93,7 @@ CFLAGS_PROFILE=-pg -O2
|
||||
CFLAGS=$(CFLAGS_DEBUG) $(GCFLAGS) $(XCFLAGS)
|
||||
LDFLAGS=$(XLDFLAGS)
|
||||
STDLIBS=-lm
|
||||
-EXTRALIBS=
|
||||
+EXTRALIBS=-lbe
|
||||
XINCLUDE=-I/usr/X11R6/include
|
||||
XLIBDIRS=-L/usr/X11R6/lib
|
||||
XLIBDIR=
|
||||
diff --git a/src/stdpre.h b/src/stdpre.h
|
||||
index 101d4b9..932b678 100644
|
||||
--- a/src/stdpre.h
|
||||
+++ b/src/stdpre.h
|
||||
@@ -281,13 +281,7 @@ typedef unsigned long ulong;
|
||||
* and the MetroWerks C++ compiler insists that bool be equivalent to
|
||||
* unsigned char.
|
||||
*/
|
||||
-#ifndef __cplusplus
|
||||
-#ifdef __BEOS__
|
||||
-typedef unsigned char bool;
|
||||
-#else
|
||||
-typedef int bool;
|
||||
-#endif
|
||||
-#endif
|
||||
+#include <stdbool.h>
|
||||
/*
|
||||
* Older versions of MetroWerks CodeWarrior defined true and false, but they're now
|
||||
* an enum in the (MacOS) Universal Interfaces. The only way around this is to escape
|
||||
diff --git a/src/unix-aux.mak b/src/unix-aux.mak
|
||||
index 6aded32..29c585d 100644
|
||||
--- a/src/unix-aux.mak
|
||||
@@ -2711,31 +2757,26 @@ index ab84c1b..0c9c04a 100644
|
||||
# ------------------------- Recursive make targets ------------------------- #
|
||||
|
||||
diff --git a/src/unix-gcc.mak b/src/unix-gcc.mak
|
||||
index e4e3113..943c5af 100644
|
||||
index e4e3113..1d14d0a 100644
|
||||
--- a/src/unix-gcc.mak
|
||||
+++ b/src/unix-gcc.mak
|
||||
@@ -367,7 +367,7 @@ EXTEND_NAMES=0
|
||||
@@ -256,7 +256,7 @@ LDFLAGS=$(XLDFLAGS)
|
||||
# Solaris may need -lnsl -lsocket -lposix4.
|
||||
# (Libraries required by individual drivers are handled automatically.)
|
||||
|
||||
-EXTRALIBS=-lbe
|
||||
+EXTRALIBS=
|
||||
|
||||
# Define the standard libraries to search at the end of linking.
|
||||
# Most platforms require -lpthread for the POSIX threads library;
|
||||
@@ -367,7 +367,6 @@ EXTEND_NAMES=0
|
||||
# Choose the device(s) to include. See devs.mak for details,
|
||||
# devs.mak and contrib.mak for the list of available devices.
|
||||
|
||||
-DEVICE_DEVS=$(DISPLAY_DEV) $(DD)beos.dev $(DD)bealpha2.dev $(DD)bealpha4.dev $(DD)bealpht2.dev $(DD)bealpht4.dev
|
||||
+DEVICE_DEVS=$(DISPLAY_DEV) $(DD)unix.dev $(DD)bealpha2.dev $(DD)bealpha4.dev $(DD)bealpht2.dev $(DD)bealpht4.dev
|
||||
#DEVICE_DEVS=$(DISPLAY_DEV) $(DD)x11.dev $(DD)x11alpha.dev $(DD)x11cmyk.dev $(DD)x11gray2.dev $(DD)x11gray4.dev $(DD)x11mono.dev
|
||||
|
||||
#DEVICE_DEVS1=
|
||||
diff --git a/src/unixansi.mak b/src/unixansi.mak
|
||||
index 3425785..cc7a8a7 100644
|
||||
--- a/src/unixansi.mak
|
||||
+++ b/src/unixansi.mak
|
||||
@@ -237,7 +237,7 @@ LDFLAGS=$(XLDFLAGS)
|
||||
# Solaris may need -lnsl -lsocket -lposix4.
|
||||
# (Libraries required by individual drivers are handled automatically.)
|
||||
|
||||
-EXTRALIBS=
|
||||
+EXTRALIBS=-lbe
|
||||
|
||||
# Define the standard libraries to search at the end of linking.
|
||||
# Most platforms require -lpthread for the POSIX threads library;
|
||||
diff --git a/src/unixlink.mak b/src/unixlink.mak
|
||||
index e8b122e..bcaf1a8 100644
|
||||
--- a/src/unixlink.mak
|
||||
|
||||
Reference in New Issue
Block a user