Commit graph

112 commits

Author SHA1 Message Date
cube
403e256ff6 Merge cube-native-xorg, so that pkgsrc-current can be used with the native
X.Org found in NetBSD-current.

Thanks a lot to all who helped, especially Matthias Scheler who did
repeated tests on Mac OS X and older versions of NetBSD to make sure the
support for those platforms wouldn't be broken (or at least, not fatally,
as I would still expect a few hiccups here and there, because there is
only so much one can test in such limited time).

On the infrastructure side, this branch brings pkgconfig-builtin.mk, in
order to write very easily new builtin.mk files.  It can actually handle
more than just pkgconfig files, but it will provide a version if it finds
such a file.  x11.builtin.mk has also been made more useful and now all
existing (and future!) native-X11-related builtin.mk files should include
it.
2008-10-05 21:36:32 +00:00
wiz
8b1e975b94 Update to 2.6.0:
Major changes since 2.5.0:

      * Handle bitmap-only TTF files that do not have a GLYF table
      * Ignore point size and DPI for bitmap (PCF) fonts.
      * Add fantasy and cursive generic families
      * Merge Fedora and Mandriva configuration options
      * Build fixes for cross compile and Win32 platforms
2008-06-21 18:47:44 +00:00
wiz
247bb52560 Update to 2.5.0:
2.5

Keith Packard (4):
      Document several function return values (Bug 13145).
      Document that Match calls FcFontRenderPrepare (bug 13162).
      Document that FcConfigGetFonts returns the internal fontset (bug 13197)
      Revert "Remove fcprivate.h, move the remaining macros to fcint.h."

Tor Lillqvist (1):
      Workaround for stat() brokenness in Microsoft's C library (bug 8526)

2.4.92 (2.5 RC2)

Behdad Esfahbod (14):
      Make fc-match --sort call FcFontRenderPrepare.
      Port fonts-persian.conf to new alias syntax with binding="same"
      Fix trivial bugs in edit-sgml.c
      Add FcGetLangs() and FcLangGetCharSet().
      Add/update config files from Fedora.
      Split 40-generic.conf into 40-nonlatin.conf and 45-latin.conf
      Use binding="same" in 30-urw-aliases.conf and remove duplicate entries.
      Remove redundant/obsolete comments from conf files.
      Remove 20-lohit-gujarati.conf.  It's covered by 25-unhint-nonlatin.conf now.
      Oops, fix Makefile.am.
      Remove 25-unhint-nonlatin.conf from default configuration by not linking it.
      Fix documented conf-file naming format in README
      Remove list of available conf files from README.
      Simplify/improve 30-metric-aliases.conf

Keith Packard (25):
      Also check configDirs mtimes in FcConfigUptoDate
      Respect "binding" attribute in <alias> entries.
      Correct documentation for FcAtomicLock (Bug 12947).
      Remove fcprivate.h, move the remaining macros to fcint.h.
      Correct documentation for FcConfigUptoDate (bug 12948).
      Document skipping of fonts from FcFileScan/FcDirScan.
      Make file_stat argument to FcDirCacheLoadFile optional.
      Clean up exported names in fontconfig.h.
      Track line numbers in sgml edit tool input.
      Typo error in function name: Inverval -> interval
      Don't check cache file time stamps when cleaning cache dir.
      Use FcLangDifferentTerritory instead of FcLangDifferentCountry.
      Verify documentation covers exposed symbols.
      Document previously undocumented functions. (bug 12963)
      Update documentation for FcStrCopyFilename (bug 12964).
      Update documentation for stale FcConfigGetConfig function.
      Have FcConfigSetCurrent accept the current configuration and simply return
      Remove references to FcConfigParse and FcConfigLoad.
      Replace incorrect documentation uses of 'char' with 'FcChar8' (bug 13002).
      Fix formatting syntax in doc/fccache.fncs
      Generate fccache.sgml, fcdircache.sgml and fclangset.sgml.
      Formatting syntax mistake in doc/fclangset.fncs.
      Link new function documentation into the fontconfig-devel.sgml
      Ignore new generated documentation
      Export FcConfig{G,S}etRescanInverval from .so, mark as deprecated.

2.4.91 (2.5 RC1)

Behdad Esfahbod (1):
      Update CaseFolding.txt to Unicode 5.1.0

Dwayne Bailey (1):
      Add/fix *.orth files for South African languages

Hideki Yamane (1):
      Handle Japanese fonts better. (debian bug #435971)

Keith Packard (32):
      rehash increment could be zero, causing rehash infinite loop.
      Work around FreeType bug when glyph name buffer is too small.
      Free temporary string in FcDirCacheUnlink (Bug #11758)
      Fix ChangeLog generation to avoid circular make dependency
      Store font directory mtime in cache file.
      Comment about mmaping cache files was misleading.
      Make FC_FULLNAME include all fullname entries, elide nothing. [bug 12827]
      Remove unneeded call to access(2) in fc-cache.
      Improve verbose messages from fc-cache.
      Verbose message about cleaning directories was imprecise
      Don't use X_OK bit when checking for writable directories (bug 12438)
      Have fc-cache remove invalid cache files from cache directories.
      FcConfigParseAndLoad doc was missing the last param.
      Place language name in constant array instead of pointer.
      Must not insert cache into hash table before completely validating.
      Eliminate relocations for glyph name table.
      Eliminate relocations from FcCodePageRange structure (bug 10982).
      Leave generated headers out of distribution (bug 12734).
      Move <cachedir> elements to the end of fonts.conf.
      Add BRAILLE PATTERN BLANK to list of blank glyphs.
      Replace makealias pattern with something supported by POSIX grep (bug 11083)
      FcInit should return FcFalse when FcInitLoadConfigAndFonts fails. (bug 10976)
      There is no U+1257 (bug 10899).
      Spelling errors in documentation. (bug 10879).
      Oops. Left debugging printf in previous commit.
      Handle UltraBlack weight.
      Fix parallel build in fontconfig/docs (bug 10481).
      Distribute man source files for command line programs (bug 9678).
      Ensure weight/slant values present even when style is supplied (bug 9313).
      fontconfig needs configure option to use gnu iconv (bug 4083).
      Match 'ultra' on word boundaries to detect ultra bold fonts. (bug 2511)
      Build fix for Solaris 10 with GCC.

Mike FABIAN (1):
      Avoid crashes if config files contain junk.

Stephan Kulow (1):
      Make FcPatternDuplicate copy the binding instead of always using Strong.

Tilman Sauerbeck (2):
      Store FcNoticeFoundries in read-only memory.
      Store FcVendorFoundries in read-only memory.
2007-11-30 22:31:15 +00:00
reed
e098a0e88f The ABI and API changed in 2.4.2.
So get rid of BUILDLINK_ABI_DEPENDS.fontconfig.
And increase BUILDLINK_API_DEPENDS.fontconfig to fontconfig>=2.4.2.

Noticed this when using a binary package for qt4-libs built on
different system:

/usr/pkg/qt4/lib/libQtGui.so: undefined reference to `FcFreeTypeQueryFace'

I am not bumping the PKGREVISIONs for all the dependents, since the
upgrade to fontconfig 2.4.2 happened ten months ago.
2007-10-16 18:12:56 +00:00
joerg
f059d1812b Kill the platform "detection" logic and just wire the host cpu as
detected by autoconf for use in the fontconfig cache file names.

Pass down CC_FOR_BUILD when doing cross-compilation.

A script for how to do the original fc-arch dance in a cross-compile
safe way was sent to the authors as well as a question why this was
done. No reply received so far.

Bump revision. Note that you might want to clean /var/cache/fontconfig
after installing this.

Supported-by: Google SoC 2007.
2007-08-01 16:33:39 +00:00
tv
5532a71736 Remove third patch hunk with the #undef; it's redundant. 2007-01-30 17:03:50 +00:00
tv
9bbfee387f De-GNUify grep expression in makealias ("\>" is not portable).
Add Interix intptr definitions to internal .h.
2007-01-30 16:42:21 +00:00
joerg
0cf5e37d3e fontconfig's configure doesn't support multiple --with-add-fonts,
so list them explictly in one option. This fixes the build for
non-modular Xorg as noticed by tron@ in PR 35397. Bump revision.
2007-01-11 11:25:57 +00:00
joerg
7bf1faaf1b Include the ghostscript fonts in the search path by default, if they are
installed. Bump revision.
2007-01-09 08:58:29 +00:00
wiz
11af7f580d Update to 2.4.2:
2.4.2

 Han-Wen Nienhuys:
       FcStrCanonFileName buggy for mingw. (bug 8311)
       More fixes for Win32 building (bug 8311)

 Kean Johnston:
       Don't use varargs CPP macros in fccache.c. (bug 8733)

 Keith Packard:
       Remove documentation for non-existant FcConfigNormalizeFontDir.
       Build fontconfig.def from header files when needed.
       Detect and use available random number generator (bug 8308)
       Add sparc64 architecture string.
       FcStrCanonAbsoluteFilename should be static.
       Use explicit platform/nameid order when scanning ttf files.
       Warn (and recover) from config file without <cachedir> elements.
       Avoid writing uninitialized structure pad bytes to cache files.
       Fix grep pattern in makealias to work on non-Gnu grep (bug 8368).
       Add FcFreeTypeQueryFace external API. Bug #7311.
       Segfault scanning non-font files. Disallow scan edit of user vars. (#8767)
       Add space between type and formal in devel man pages (bug 8935)

 Mike FABIAN:
       Do not clean cache files for different architectures

 Peter Breitenlohner:
       A VPATH build of fontconfig-2.4.1 fails for various reasons. Bug 8933.
       Use <literal> instead of <sgmltag> when documenting fonts.conf. Bug 8935.
       Fix fc-cat documentation (bug 8935).
2006-12-04 12:41:51 +00:00
tv
ca8a7c2388 On Interix, [u]intptr_t exists and is pulled in by <std*.h> even though
neither <inttypes.h> nor <stdint.h> exist.  So skip the #error.
2006-11-28 16:15:30 +00:00
joerg
166e92758f DESTDIR support. 2006-11-03 07:12:24 +00:00
markd
8ccd7eb576 Fix build on Solaris. 2006-10-09 10:54:12 +00:00
wiz
98979e8e2a regen patch-ad (for MacOS X). 2006-10-04 17:15:05 +00:00
wiz
48bad6fe94 Update to 2.4.1:
This fixes the build on a couple of systems (m68k and mipsel), and
re-implements a function that was broken by the cache file rework that
is needed for lilypond.
2006-10-03 18:16:13 +00:00
jnemeth
52dec5ae9f add support for sparc64
approved for commit during freeze by wiz@
2006-09-19 08:47:22 +00:00
joerg
2ab0c4a3c4 Honour VARBASE for the fontconfig cache. Use INSTALL script to create it
if necessary and run fc-cache to set up the initial database.
Remove the cache at DEINSTALL time. Bump revision for this.
2006-09-17 18:20:20 +00:00
tron
3a4cd0366f Specify architecture with "--with-arch" under Mac OS X because the
auto detection is broken. Fix based on a suggestion by Mark E. Perkins.
This fixes PR pkg/34509.
2006-09-14 15:07:12 +00:00
joerg
2f37dc514b Create one directory at a time, Solaris install doesn't like multiple
arguments.
2006-09-12 14:52:17 +00:00
wiz
a9e97dfc2b Update to 2.4.0:
Fontconfig version 2.4 is API and ABI compatible with the 2.3
release, although some significant internal restructuring has
occurred.

Major changes from the 2.3 series:

* Shared mmap'ed cache files. All font cache files are mapped
  read-only and shared across multiple processes. Startup
  performance and memory footprint of the library have, as a
  result, been significantly improved.

* Configuration split into multiple files. While 2.3 provided
  the ability to incorporate additional configuration files from
  a directory, it didn't use them extensively. The new configuration
  structure places most of the configuration into separate files
  and provides conventions for naming them that are designed to
  permit user and distribution customization of the library
  without needing to edit the master config file.

* Eliminate internal symbols from shared library symbol table.
  The shared library now exports precisely the list of symbols
  present in the public header files. Use of private symbols,
  always unsupported, will now result in failure to link and run.

Thanks to all who have made this release possible, especially
Patrick Lam who built the shared cache file code and performed most
of the maintenance over the last year.

Keith Packard 2006-9-9
2006-09-11 18:53:16 +00:00
minskim
7009a02d9a Remove obsolete BUILDLINK_API_DEPENDS. 2006-07-23 01:09:11 +00:00
jlam
c16221a4db Change the format of BUILDLINK_ORDER to contain depth information as well,
and add a new helper target and script, "show-buildlink3", that outputs
a listing of the buildlink3.mk files included as well as the depth at
which they are included.

For example, "make show-buildlink3" in fonts/Xft2 displays:

	zlib
	fontconfig
	    iconv
	    zlib
	    freetype2
	    expat
	freetype2
	Xrender
	    renderproto
2006-07-08 23:10:35 +00:00
jlam
9430e49307 Track information in a new variable BUILDLINK_ORDER that informs us
of the order in which buildlink3.mk files are (recursively) included
by a package Makefile.
2006-07-08 22:38:58 +00:00
tron
3d607a7a4c Use patch provided by the FreeType2 maintaines to make this build with
version 2.2.1 and newer of the "freetype2" package. Bump package
revision because of this fix.
2006-05-29 22:38:06 +00:00
heinz
089d51008d Added appropriate TEST_TARGET. 2006-04-14 07:08:07 +00:00
rillig
96fc47c14f Aligned the last line of the buildlink3.mk files with the first line, so
that they look nicer.
2006-04-12 10:26:59 +00:00
reed
5abef9be14 Over 1200 files touched but no revisions bumped :)
RECOMMENDED is removed. It becomes ABI_DEPENDS.

BUILDLINK_RECOMMENDED.foo becomes BUILDLINK_ABI_DEPENDS.foo.

BUILDLINK_DEPENDS.foo becomes BUILDLINK_API_DEPENDS.foo.

BUILDLINK_DEPENDS does not change.

IGNORE_RECOMMENDED (which defaulted to "no") becomes USE_ABI_DEPENDS
which defaults to "yes".

Added to obsolete.mk checking for IGNORE_RECOMMENDED.

I did not manually go through and fix any aesthetic tab/spacing issues.

I have tested the above patch on DragonFly building and packaging
subversion and pkglint and their many dependencies.

I have also tested USE_ABI_DEPENDS=no on my NetBSD workstation (where I
have used IGNORE_RECOMMENDED for a long time). I have been an active user
of IGNORE_RECOMMENDED since it was available.

As suggested, I removed the documentation sentences suggesting bumping for
"security" issues.

As discussed on tech-pkg.

I will commit to revbump, pkglint, pkg_install, createbuildlink separately.

Note that if you use wip, it will fail!  I will commit to pkgsrc-wip
later (within day).
2006-04-06 06:21:32 +00:00
jlam
d71a98aa8e Avoid extra stat() calls by not repeatedly checking whether a file
exists on the disk -- we can just check whether a variable defined by
find-files.mk is "__nonexistent__" or not.
2006-03-30 18:06:17 +00:00
jlam
9c8b5ede43 Point MAINTAINER to pkgsrc-users@NetBSD.org in the case where no
developer is officially maintaining the package.

The rationale for changing this from "tech-pkg" to "pkgsrc-users" is
that it implies that any user can try to maintain the package (by
submitting patches to the mailing list).  Since the folks most likely
to care about the package are the folks that want to use it or are
already using it, this would leverage the energy of users who aren't
developers.
2006-03-04 21:28:51 +00:00
joerg
5911def816 Recursive revision bump / recommended bump for gettext ABI change. 2006-02-05 23:08:03 +00:00
wiz
768c589c29 Bump BUILDLINK_RECOMMENDED of textproc/expat to 2.0.0 because
of the shlib major bump.
PKGREVISION++ for the dependencies.
2006-01-24 07:31:52 +00:00
jlam
dc9594e09d Remove USE_PKGINSTALL from pkgsrc now that mk/install/pkginstall.mk
automatically detects whether we want the pkginstall machinery to be
used by the package Makefile.
2005-12-29 06:21:30 +00:00
rillig
579e977969 Ran "pkglint --autofix", which corrected some of the quoting issues in
CONFIGURE_ARGS.
2005-12-05 23:55:01 +00:00
hira
217f67e27d Clean up additional font path. OK'd by reed@.
If you installed fontconfig-2.3.2, please remove <dir></dir> entry
from ${LOCALBASE}/etc/fontconfig/fonts.conf.
2005-09-05 15:18:42 +00:00
reed
a8c2f2c6fb Remove the MESSAGE. It is not required. The library will build
caches for individuals as needed.

Remove gnome from CATEGORIES.

Redo the added font paths because ${LOCALBASE}/lib/X11/fonts is
already default as configured above, so don't need to add again.
And don't need to list sub-directories of "fonts" because fontconfig
already looks in sub-directories too. (I have been using this over
a year on various systems like this.)

Update to 2.3.2. Changes include:
        * fc-cache/fc-cache.c: (scanDirs):
        Fix a few minor leaks in error cases.
        * fc-cache/fc-cache.c: (main):
        Destroy font configuration on exit to help valgrind
        * fonts.conf.in:
        * src/fcfreetype.c: (FcSfntNameTranscode), (FcFreeTypeCharIndex),
        (FcFreeTypeCheckGlyph):
        Use own transcoding routines in preference to iconv
        which appears to have leaks in some translators.
        Call iconv_close after using iconv (oops).

        Prefer unicode encoding of Euro char as some
        fonts mis-encode Euro in other ones.

        Must fetch bitmap glyphs to get width values
        to check for monospace/dual-width fonts.

Complete changes at
http://www.fontconfig.org/release/ChangeLog-2.3.2

Note that manpage for fc-cache(1) is not installed yet. It is in SGML.

Also note that the new version provides same library version
libfontconfig.so.1.0.4. This was reported to developer and was an
accidently oversite. Nevertheless, it is still ABI compatible.
2005-07-28 16:40:03 +00:00
jlam
7d6695d6cf Never use docbook2html to regenerate documentation files. That's too
heavy of a build dependency to drag in, and the SGML template files
are not completely standardized.  This should fix PR pkg/29392.
2005-06-07 19:38:52 +00:00
jlam
08c60ab83d Coalesce the common makefile code in the builtin.mk file that inspect
the X11 distribution using imake into mk/buildlink3/imake-check.mk.
imake-check.mk calls out to a helper shell script mk/buildlink3/imake-check
that generates the required Imakefiles and runs imake.  Remove the
now extraneous builtin-imake.mk files as the builtin.mk files can now
contain the name of the imake symbol to check.
2005-06-03 19:12:49 +00:00
jlam
c85165ac07 Only check for the existence of the first word of ${IMAKE} since it may
contain a command plus arguments.  We use the standard idiom to extract
the first word of a list stored in a make variable:

	VAR_CMD=	${VAR:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}

XXX This can be replaced with a more succinct use of variable modifiers
XXX when we update the bootstrap bmake to match the latest NetBSD make
XXX sources, i.e.:
XXX
XXX	VAR_CMD=	${VAR:[1]}
2005-06-03 17:02:36 +00:00
jlam
88aeda0672 Don't require a read-write pkgsrc tree when invoking imake. We avoid
this requirement by using TMPDIR as the read-write location demanded
by using imake.
2005-06-03 16:03:09 +00:00
jlam
7debfabe11 Use IMAKE_MAKE instead of MAKE to process the makefile generated by imake. 2005-06-01 18:33:02 +00:00
jlam
95fd1f6ec9 Massive cleanup of buildlink3.mk and builtin.mk files in pkgsrc.
Several changes are involved since they are all interrelated.  These
changes affect about 1000 files.

The first major change is rewriting bsd.builtin.mk as well as all of
the builtin.mk files to follow the new example in bsd.builtin.mk.
The loop to include all of the builtin.mk files needed by the package
is moved from bsd.builtin.mk and into bsd.buildlink3.mk.  bsd.builtin.mk
is now included by each of the individual builtin.mk files and provides
some common logic for all of the builtin.mk files.  Currently, this
includes the computation for whether the native or pkgsrc version of
the package is preferred.  This causes USE_BUILTIN.* to be correctly
set when one builtin.mk file includes another.

The second major change is teach the builtin.mk files to consider
files under ${LOCALBASE} to be from pkgsrc-controlled packages.  Most
of the builtin.mk files test for the presence of built-in software by
checking for the existence of certain files, e.g. <pthread.h>, and we
now assume that if that file is under ${LOCALBASE}, then it must be
from pkgsrc.  This modification is a nod toward LOCALBASE=/usr.  The
exceptions to this new check are the X11 distribution packages, which
are handled specially as noted below.

The third major change is providing builtin.mk and version.mk files
for each of the X11 distribution packages in pkgsrc.  The builtin.mk
file can detect whether the native X11 distribution is the same as
the one provided by pkgsrc, and the version.mk file computes the
version of the X11 distribution package, whether it's built-in or not.

The fourth major change is that the buildlink3.mk files for X11 packages
that install parts which are part of X11 distribution packages, e.g.
Xpm, Xcursor, etc., now use imake to query the X11 distribution for
whether the software is already provided by the X11 distribution.
This is more accurate than grepping for a symbol name in the imake
config files.  Using imake required sprinkling various builtin-imake.mk
helper files into pkgsrc directories.  These files are used as input
to imake since imake can't use stdin for that purpose.

The fifth major change is in how packages note that they use X11.
Instead of setting USE_X11, package Makefiles should now include
x11.buildlink3.mk instead.  This causes the X11 package buildlink3
and builtin logic to be executed at the correct place for buildlink3.mk
and builtin.mk files that previously set USE_X11, and fixes packages
that relied on buildlink3.mk files to implicitly note that X11 is
needed.  Package buildlink3.mk should also include x11.buildlink3.mk
when linking against the package libraries requires also linking
against the X11 libraries.  Where it was obvious, redundant inclusions
of x11.buildlink3.mk have been removed.
2005-06-01 18:02:37 +00:00
jlam
585534220c Remove USE_GNU_TOOLS and replace with the correct USE_TOOLS definitions:
USE_GNU_TOOLS	-> USE_TOOLS
	awk		-> gawk
	m4		-> gm4
	make		-> gmake
	sed		-> gsed
	yacc		-> bison
2005-05-22 20:07:36 +00:00
kristerw
c360d873c9 Include converters/libiconv/buildlink3.mk. 2005-04-21 17:40:19 +00:00
dmcmahill
8daea2c9a3 add libiconv buildlink3.mk file. fontconfig directly calls iconv().
Should address the 'fontconfig core dumps' on solaris bug reported in
PR29837
2005-04-12 12:38:40 +00:00
tv
f816d81489 Remove USE_BUILDLINK3 and NO_BUILDLINK; these are no longer used. 2005-04-11 21:44:48 +00:00
wiz
faef6faeff Update to 2.3.1:
* Fix manuals in section 3 so they get built and installed.

 * Rework GSUB/GPOS script parsing to avoid crashing when presented
   with broken fonts.

 * Add a few more example configuration files to /etc/fonts/conf.d
   from the debian packaging.
2005-03-22 14:05:54 +00:00
wiz
f36b8499cb Sort. 2005-03-01 23:39:02 +00:00
wiz
3ad11e5ab4 Update to 2.3.0:
Fix memory leak of patterns rejected by configuration (#2518)

Create prototype $PREFIX/etc/fontconfig/conf.d directory and populate
it with a few sample files.  These samples are unused as the file
names don't start with numbers.

Update documentation.
2005-03-01 23:38:14 +00:00
wiz
0b23075977 Update to 2.2.99:
Fontconfig 2.2.99 contains a few minor bug fixes plus the addition of
polite type warnings for the config file. This latter change could use a
bit of exposure to existing config files to see if it whines about
legitimate configurations.
2005-02-26 16:39:51 +00:00
agc
c1e24f7e2b Add RMD160 digests to the SHA1 ones. 2005-02-23 19:18:25 +00:00