From a9cc4b90dadd8e24a03ade08cbc6097531a13766 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Fri, 1 Feb 2019 05:53:41 +0000 Subject: Fri Feb 1 05:53:41 UTC 2019 a/glibc-solibs-2.29-x86_64-2.txz: Rebuilt. d/opencl-headers-2.2-noarch-1.txz: Upgraded. Thanks to Heinz Wiesinger. l/glibc-2.29-x86_64-2.txz: Rebuilt. l/glibc-i18n-2.29-x86_64-2.txz: Rebuilt. Reverted en_US.UTF8 date(1) format back to 24 hour. I'm pretty sure that the majority of people here in this locale will agree. l/glibc-profile-2.29-x86_64-2.txz: Rebuilt. --- source/d/opencl-headers/LICENSE.txt | 20 -------------------- source/d/opencl-headers/opencl-headers.SlackBuild | 14 +++++++------- source/d/opencl-headers/opencl-headers.url | 2 +- .../glibc/glibc-2.29.en_US.no.am.pm.date.format.diff | 14 ++++++++++++++ source/l/glibc/glibc.SlackBuild | 4 +++- 5 files changed, 25 insertions(+), 29 deletions(-) delete mode 100644 source/d/opencl-headers/LICENSE.txt create mode 100644 source/l/glibc/glibc-2.29.en_US.no.am.pm.date.format.diff (limited to 'source') diff --git a/source/d/opencl-headers/LICENSE.txt b/source/d/opencl-headers/LICENSE.txt deleted file mode 100644 index a89e4f5c0..000000000 --- a/source/d/opencl-headers/LICENSE.txt +++ /dev/null @@ -1,20 +0,0 @@ - * Copyright (c) 2008-2010 The Khronos Group Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and/or associated documentation files (the - * "Materials"), to deal in the Materials without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Materials, and to - * permit persons to whom the Materials are furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Materials. - * - * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. diff --git a/source/d/opencl-headers/opencl-headers.SlackBuild b/source/d/opencl-headers/opencl-headers.SlackBuild index 3c9e0cab4..1b33a02bf 100755 --- a/source/d/opencl-headers/opencl-headers.SlackBuild +++ b/source/d/opencl-headers/opencl-headers.SlackBuild @@ -2,8 +2,8 @@ # Slackware build script for opencl-headers -# Copyright 2016 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2016, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2016, 2019 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2016, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,8 +27,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=opencl-headers VERSION=${VERSION:-$(echo OpenCL-Headers-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -PKGVER=${PKGVER:-2.1} -BUILD=${BUILD:-2} +PKGVER=${PKGVER:-2.2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -60,18 +60,18 @@ find . \ mkdir -p $PKG/usr/include/CL -install -p -m 0644 ./* -t $PKG/usr/include/CL/ +install -p -m 0644 CL/* -t $PKG/usr/include/CL/ zcat $CWD/cl.hpp.gz > $PKG/usr/include/CL/cl.hpp zcat $CWD/cl2.hpp.gz > $PKG/usr/include/CL/cl2.hpp # Drop Direct3D related headers -for i in cl_dx9_media_sharing.h cl_d3d10.h cl_d3d11.h; do +for i in cl_dx9_media_sharing.h cl_dx9_media_sharing_intel.h cl_d3d10.h cl_d3d11.h; do rm -f $PKG/usr/include/CL/$i done mkdir -p $PKG/usr/doc/$PKGNAM-$PKGVER -cp -a $CWD/LICENSE.txt \ +cp -a LICENSE* README* \ $PKG/usr/doc/$PKGNAM-$PKGVER mkdir -p $PKG/install diff --git a/source/d/opencl-headers/opencl-headers.url b/source/d/opencl-headers/opencl-headers.url index 025ce0928..97f32488e 100644 --- a/source/d/opencl-headers/opencl-headers.url +++ b/source/d/opencl-headers/opencl-headers.url @@ -1,3 +1,3 @@ -https://github.com/KhronosGroup/OpenCL-Headers/archive/abb29588550c77f8340a6c3683531407013bf26b/OpenCL-Headers-abb29588550c77f8340a6c3683531407013bf26b.tar.gz +https://github.com/KhronosGroup/OpenCL-Headers/archive/49f07d313344ddb22701847ea5c18cb7db03b0d7/OpenCL-Headers-49f07d313344ddb22701847ea5c18cb7db03b0d7.tar.gz https://github.com/KhronosGroup/OpenCL-CLHPP/releases/download/v2.0.10/cl2.hpp https://www.khronos.org/registry/cl/api/2.1/cl.hpp diff --git a/source/l/glibc/glibc-2.29.en_US.no.am.pm.date.format.diff b/source/l/glibc/glibc-2.29.en_US.no.am.pm.date.format.diff new file mode 100644 index 000000000..0a14ca3b9 --- /dev/null +++ b/source/l/glibc/glibc-2.29.en_US.no.am.pm.date.format.diff @@ -0,0 +1,14 @@ +--- ./localedata/locales/en_US.orig 2019-01-31 10:45:36.000000000 -0600 ++++ ./localedata/locales/en_US 2019-01-31 22:35:02.033009166 -0600 +@@ -118,7 +118,10 @@ + t_fmt_ampm "%I:%M:%S %p" + % + % Appropriate date and time representation for date(1) +-date_fmt "%a %d %b %Y %r %Z" ++% [ Slackware editor's note - no thank you, US users ++% of UNIX-like systems expect a 24 hour clock, just ++% like users in the vast majority of other locales. ] ++%date_fmt "%a %d %b %Y %r %Z" + % + % Strings for AM/PM + % diff --git a/source/l/glibc/glibc.SlackBuild b/source/l/glibc/glibc.SlackBuild index c9976d6e6..3f20e6677 100755 --- a/source/l/glibc/glibc.SlackBuild +++ b/source/l/glibc/glibc.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=glibc VERSION=${VERSION:-$(echo glibc-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} CHECKOUT=${CHECKOUT:-""} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # I was considering disabling NSCD, but MoZes talked me out of it. :) #DISABLE_NSCD=" --disable-nscd " @@ -152,6 +152,8 @@ apply_patches() { zcat $CWD/glibc.ru_RU.CP1251.diff.gz | patch -p1 --verbose || exit 1 # Add a C.UTF-8 locale: zcat $CWD/glibc-c-utf8-locale.patch.gz | patch -p1 --verbose || exit 1 + # Don't use AM/PM format for date(1). That's just plain crazy. + zcat $CWD/glibc-2.29.en_US.no.am.pm.date.format.diff.gz | patch -p1 --verbose || exit 1 } # This is going to be the initial $DESTDIR: -- cgit v1.2.3