diff options
| author | Adrien Nader <adrien@notk.org> | 2012-07-16 08:17:12 +0200 |
|---|---|---|
| committer | Adrien Nader <adrien@notk.org> | 2012-07-16 08:17:12 +0200 |
| commit | aab2163fe7f9d3bddea5ebb28111915004e2d12f (patch) | |
| tree | eeb23a546192dcc2fec14730c2fcb018926d42ce /x | |
| parent | 56eb4879cef20e8bab319df8f49dba74648251ea (diff) | |
| parent | 92ec4e5659cab356bd20ef354db5e63907f85950 (diff) | |
Merge branch 'master' into mingw
Conflicts:
x/fontconfig/fontconfig.SlackBuild
Diffstat (limited to 'x')
| -rwxr-xr-x | x/fontconfig/fontconfig.SlackBuild | 2 | ||||
| -rw-r--r-- | x/fontconfig/fontconfig.dejavu.diff.gz | bin | 546 -> 547 bytes |
2 files changed, 1 insertions, 1 deletions
diff --git a/x/fontconfig/fontconfig.SlackBuild b/x/fontconfig/fontconfig.SlackBuild index 863b840..ff8455b 100755 --- a/x/fontconfig/fontconfig.SlackBuild +++ b/x/fontconfig/fontconfig.SlackBuild @@ -79,7 +79,7 @@ CFLAGS="-O2" \ --localstatedir=/${PREFIX}/var \ --host=${HOST_TRIPLET} \ --with-arch=$(echo "${HOST_TRIPLET}" | cut -f1 -d-) \ - --disable-static \ + --enable-static=no \ --build=$ARCH-slackware-linux make $NUMJOBS || make || exit 1 diff --git a/x/fontconfig/fontconfig.dejavu.diff.gz b/x/fontconfig/fontconfig.dejavu.diff.gz Binary files differindex d6617a7..af4ee31 100644 --- a/x/fontconfig/fontconfig.dejavu.diff.gz +++ b/x/fontconfig/fontconfig.dejavu.diff.gz |