diff options
Diffstat (limited to 'source')
| -rwxr-xr-x | source/a/glibc-zoneinfo/glibc-zoneinfo.SlackBuild | 10 | ||||
| -rw-r--r-- | source/a/glibc-zoneinfo/zic.default.fat | 11 | ||||
| -rwxr-xr-x | source/l/freetype/freetype.SlackBuild | 4 | ||||
| -rw-r--r-- | source/l/freetype/freetype.illadvisederror.diff | 31 |
4 files changed, 18 insertions, 38 deletions
diff --git a/source/a/glibc-zoneinfo/glibc-zoneinfo.SlackBuild b/source/a/glibc-zoneinfo/glibc-zoneinfo.SlackBuild index 42d3be94..1efc702d 100755 --- a/source/a/glibc-zoneinfo/glibc-zoneinfo.SlackBuild +++ b/source/a/glibc-zoneinfo/glibc-zoneinfo.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2015, 2016, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2015, 2016, 2018, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=glibc-zoneinfo ZONE_VERSIONS="$(echo tzdata* | cut -f1 -d . | cut -b7-11)" -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -84,8 +84,12 @@ cd $TMP rm -rf tzcodedata-build mkdir tzcodedata-build cd tzcodedata-build -tar xzf $CWD/tzdata?????.tar.gz || exit 1 tar xzf $CWD/tzcode?????.tar.gz || exit 1 +tar xzf $CWD/tzdata?????.tar.gz || exit 1 + +# Default to more bloated (but more compatible) "fat" format with zic. +# This was the default prior to tzcode2020b. +zcat $CWD/zic.default.fat.gz | patch -p1 --verbose || exit 1 chown -R root:root . find . \ diff --git a/source/a/glibc-zoneinfo/zic.default.fat b/source/a/glibc-zoneinfo/zic.default.fat new file mode 100644 index 00000000..62832bb1 --- /dev/null +++ b/source/a/glibc-zoneinfo/zic.default.fat @@ -0,0 +1,11 @@ +--- ./zic.c.orig 2020-10-03 17:11:18.000000000 -0500 ++++ ./zic.c 2020-10-12 13:03:20.086014967 -0500 +@@ -668,7 +668,7 @@ + } + + #ifndef ZIC_BLOAT_DEFAULT +-# define ZIC_BLOAT_DEFAULT "slim" ++# define ZIC_BLOAT_DEFAULT "fat" + #endif + + int diff --git a/source/l/freetype/freetype.SlackBuild b/source/l/freetype/freetype.SlackBuild index 98f63ce4..cb6aa5c1 100755 --- a/source/l/freetype/freetype.SlackBuild +++ b/source/l/freetype/freetype.SlackBuild @@ -77,10 +77,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# This breaks far too many things. Freetype2 developers will have to get their -# punishment on someone else's distribution. -zcat $CWD/freetype.illadvisederror.diff.gz | patch -p1 --verbose || exit 1 - # The line below enables code patented by Microsoft, so don't uncomment it # unless you have a license to use the code and take all legal responsibility # for doing so. With the new subpixel hinting modes there's not much reason diff --git a/source/l/freetype/freetype.illadvisederror.diff b/source/l/freetype/freetype.illadvisederror.diff deleted file mode 100644 index fee71076..00000000 --- a/source/l/freetype/freetype.illadvisederror.diff +++ /dev/null @@ -1,31 +0,0 @@ -diff -Nur freetype-2.6.1.orig/include/freetype/freetype.h freetype-2.6.1/include/freetype/freetype.h ---- freetype-2.6.1.orig/include/freetype/freetype.h 2015-10-03 23:54:01.000000000 -0500 -+++ freetype-2.6.1/include/freetype/freetype.h 2015-10-04 22:13:40.233912984 -0500 -@@ -20,13 +20,20 @@ - #define __FREETYPE_H__ - - --#ifndef FT_FREETYPE_H --#error "`ft2build.h' hasn't been included yet!" --#error "Please always use macros to include FreeType header files." --#error "Example:" --#error " #include <ft2build.h>" --#error " #include FT_FREETYPE_H" --#endif -+/***************************************************************************/ -+/* */ -+/* If you think breaking almost 100% of all source that links with */ -+/* freetype (anything using a configure file for sure) is a good idea, */ -+/* then feel free to uncomment this block. */ -+/* */ -+/* #ifndef FT_FREETYPE_H */ -+/* #error "`ft2build.h' hasn't been included yet!" */ -+/* #error "Please always use macros to include FreeType header files." */ -+/* #error "Example:" */ -+/* #error " #include <ft2build.h>" */ -+/* #error " #include FT_FREETYPE_H" */ -+/* #endif */ -+/***************************************************************************/ - - - #include <ft2build.h> |