summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2020-12-25 06:10:08 +0000
committer Eric Hameleers <alien@slackware.com>2020-12-25 17:59:48 +0100
commit6ca133bba768c73be2f69616014a53d1389b2633 (patch)
treeb7c0d11f24feda1a9d87767696a82e3c5ba16a1b
parent0cde31b79d54a3553040d395d63f4ef79959892d (diff)
downloadcurrent-6ca133bba768c73be2f69616014a53d1389b2633.tar.gz
current-6ca133bba768c73be2f69616014a53d1389b2633.tar.xz
Fri Dec 25 06:10:08 UTC 202020201225061008
l/harfbuzz-2.7.3-x86_64-2.txz: Rebuilt. Seems the --enable-introspection option didn't work, so rebuild with meson since that's probably what most of the developers do. Fixes blueman. Thanks to marav for the bug report.
-rw-r--r--ChangeLog.rss18
-rw-r--r--ChangeLog.txt6
-rw-r--r--FILELIST.TXT46
-rwxr-xr-xsource/l/harfbuzz/harfbuzz.SlackBuild47
4 files changed, 70 insertions, 47 deletions
diff --git a/ChangeLog.rss b/ChangeLog.rss
index 9ccc16e5..e0795da5 100644
--- a/ChangeLog.rss
+++ b/ChangeLog.rss
@@ -11,10 +11,24 @@
<description>Tracking Slackware development in git.</description>
<language>en-us</language>
<id xmlns="http://www.w3.org/2005/Atom">urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f</id>
- <pubDate>Fri, 25 Dec 2020 00:52:08 GMT</pubDate>
- <lastBuildDate>Fri, 25 Dec 2020 07:59:44 GMT</lastBuildDate>
+ <pubDate>Fri, 25 Dec 2020 06:10:08 GMT</pubDate>
+ <lastBuildDate>Fri, 25 Dec 2020 16:59:40 GMT</lastBuildDate>
<generator>maintain_current_git.sh v 1.12</generator>
<item>
+ <title>Fri, 25 Dec 2020 06:10:08 GMT</title>
+ <pubDate>Fri, 25 Dec 2020 06:10:08 GMT</pubDate>
+ <link>https://git.slackware.nl/current/tag/?h=20201225061008</link>
+ <guid isPermaLink="false">20201225061008</guid>
+ <description>
+ <![CDATA[<pre>
+l/harfbuzz-2.7.3-x86_64-2.txz: Rebuilt.
+ Seems the --enable-introspection option didn't work, so rebuild with meson
+ since that's probably what most of the developers do. Fixes blueman.
+ Thanks to marav for the bug report.
+ </pre>]]>
+ </description>
+ </item>
+ <item>
<title>Fri, 25 Dec 2020 00:52:08 GMT</title>
<pubDate>Fri, 25 Dec 2020 00:52:08 GMT</pubDate>
<link>https://git.slackware.nl/current/tag/?h=20201225005208</link>
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 995e17c9..143b0287 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,9 @@
+Fri Dec 25 06:10:08 UTC 2020
+l/harfbuzz-2.7.3-x86_64-2.txz: Rebuilt.
+ Seems the --enable-introspection option didn't work, so rebuild with meson
+ since that's probably what most of the developers do. Fixes blueman.
+ Thanks to marav for the bug report.
++--------------------------+
Fri Dec 25 00:52:08 UTC 2020
Here are some updates to provide a little holiday cheer. The kernels are
rebuilt (yeah, we'll probably have new ones tomorrow but whatever) to build in
diff --git a/FILELIST.TXT b/FILELIST.TXT
index 4f9cdd98..d643e12a 100644
--- a/FILELIST.TXT
+++ b/FILELIST.TXT
@@ -1,20 +1,20 @@
-Fri Dec 25 00:56:33 UTC 2020
+Fri Dec 25 06:13:19 UTC 2020
Here is the file list for this directory. If you are using a
mirror site and find missing or extra files in the disk
subdirectories, please have the archive administrator refresh
the mirror.
-drwxr-xr-x 12 root root 4096 2020-12-25 00:52 .
+drwxr-xr-x 12 root root 4096 2020-12-25 06:10 .
-rw-r--r-- 1 root root 10064 2016-06-30 18:39 ./ANNOUNCE.14_2
-rw-r--r-- 1 root root 14975 2020-02-08 21:06 ./CHANGES_AND_HINTS.TXT
--rw-r--r-- 1 root root 1064982 2020-12-23 21:24 ./CHECKSUMS.md5
--rw-r--r-- 1 root root 163 2020-12-23 21:24 ./CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 1059177 2020-12-25 00:56 ./CHECKSUMS.md5
+-rw-r--r-- 1 root root 163 2020-12-25 00:56 ./CHECKSUMS.md5.asc
-rw-r--r-- 1 root root 17976 1994-06-10 02:28 ./COPYING
-rw-r--r-- 1 root root 35147 2007-06-30 04:21 ./COPYING3
-rw-r--r-- 1 root root 19573 2016-06-23 20:08 ./COPYRIGHT.TXT
-rw-r--r-- 1 root root 616 2006-10-02 04:37 ./CRYPTO_NOTICE.TXT
--rw-r--r-- 1 root root 1159414 2020-12-25 00:52 ./ChangeLog.txt
+-rw-r--r-- 1 root root 1159699 2020-12-25 06:10 ./ChangeLog.txt
drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI
drwxr-xr-x 2 root root 4096 2020-12-25 00:42 ./EFI/BOOT
-rw-r--r-- 1 root root 1417216 2019-07-05 18:54 ./EFI/BOOT/bootx64.efi
@@ -25,9 +25,9 @@ drwxr-xr-x 2 root root 4096 2020-12-25 00:42 ./EFI/BOOT
-rwxr-xr-x 1 root root 2504 2019-07-05 18:54 ./EFI/BOOT/make-grub.sh
-rw-r--r-- 1 root root 10722 2013-09-21 19:02 ./EFI/BOOT/osdetect.cfg
-rw-r--r-- 1 root root 1273 2013-08-12 21:08 ./EFI/BOOT/tools.cfg
--rw-r--r-- 1 root root 1385980 2020-12-23 21:24 ./FILELIST.TXT
+-rw-r--r-- 1 root root 1381140 2020-12-25 00:56 ./FILELIST.TXT
-rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY
--rw-r--r-- 1 root root 842116 2020-12-25 00:56 ./PACKAGES.TXT
+-rw-r--r-- 1 root root 842116 2020-12-25 06:12 ./PACKAGES.TXT
-rw-r--r-- 1 root root 8564 2016-06-28 21:33 ./README.TXT
-rw-r--r-- 1 root root 3629 2020-12-25 00:29 ./README.initrd
-rw-r--r-- 1 root root 34412 2017-12-01 17:44 ./README_CRYPT.TXT
@@ -714,11 +714,11 @@ drwxr-xr-x 2 root root 4096 2012-09-20 18:06 ./patches
-rw-r--r-- 1 root root 575 2012-09-20 18:06 ./patches/FILE_LIST
-rw-r--r-- 1 root root 14 2012-09-20 18:06 ./patches/MANIFEST.bz2
-rw-r--r-- 1 root root 224 2012-09-20 18:06 ./patches/PACKAGES.TXT
-drwxr-xr-x 17 root root 4096 2020-12-25 00:56 ./slackware64
--rw-r--r-- 1 root root 329262 2020-12-25 00:56 ./slackware64/CHECKSUMS.md5
--rw-r--r-- 1 root root 163 2020-12-25 00:56 ./slackware64/CHECKSUMS.md5.asc
--rw-r--r-- 1 root root 408648 2020-12-25 00:55 ./slackware64/FILE_LIST
--rw-r--r-- 1 root root 4015703 2020-12-25 00:55 ./slackware64/MANIFEST.bz2
+drwxr-xr-x 17 root root 4096 2020-12-25 06:12 ./slackware64
+-rw-r--r-- 1 root root 329262 2020-12-25 06:12 ./slackware64/CHECKSUMS.md5
+-rw-r--r-- 1 root root 163 2020-12-25 06:12 ./slackware64/CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 408648 2020-12-25 06:12 ./slackware64/FILE_LIST
+-rw-r--r-- 1 root root 4022648 2020-12-25 06:12 ./slackware64/MANIFEST.bz2
lrwxrwxrwx 1 root root 15 2009-08-23 23:34 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT
drwxr-xr-x 2 root root 24576 2020-12-25 00:55 ./slackware64/a
-rw-r--r-- 1 root root 327 2018-06-24 18:44 ./slackware64/a/aaa_base-14.2-x86_64-5.txt
@@ -2691,7 +2691,7 @@ drwxr-xr-x 2 root root 77824 2020-12-25 00:55 ./slackware64/kde
-rw-r--r-- 1 root root 296 2020-12-11 06:35 ./slackware64/kde/zeroconf-ioslave-20.12.0-x86_64-1.txt
-rw-r--r-- 1 root root 52464 2020-12-11 06:35 ./slackware64/kde/zeroconf-ioslave-20.12.0-x86_64-1.txz
-rw-r--r-- 1 root root 163 2020-12-11 06:35 ./slackware64/kde/zeroconf-ioslave-20.12.0-x86_64-1.txz.asc
-drwxr-xr-x 2 root root 73728 2020-12-25 00:55 ./slackware64/l
+drwxr-xr-x 2 root root 73728 2020-12-25 06:12 ./slackware64/l
-rw-r--r-- 1 root root 329 2020-12-24 21:11 ./slackware64/l/GConf-3.2.6-x86_64-5.txt
-rw-r--r-- 1 root root 928300 2020-12-24 21:11 ./slackware64/l/GConf-3.2.6-x86_64-5.txz
-rw-r--r-- 1 root root 163 2020-12-24 21:11 ./slackware64/l/GConf-3.2.6-x86_64-5.txz.asc
@@ -3034,9 +3034,9 @@ drwxr-xr-x 2 root root 73728 2020-12-25 00:55 ./slackware64/l
-rw-r--r-- 1 root root 428 2020-12-07 19:38 ./slackware64/l/gvfs-1.46.1-x86_64-2.txt
-rw-r--r-- 1 root root 1045412 2020-12-07 19:38 ./slackware64/l/gvfs-1.46.1-x86_64-2.txz
-rw-r--r-- 1 root root 163 2020-12-07 19:38 ./slackware64/l/gvfs-1.46.1-x86_64-2.txz.asc
--rw-r--r-- 1 root root 225 2020-12-24 19:59 ./slackware64/l/harfbuzz-2.7.3-x86_64-1.txt
--rw-r--r-- 1 root root 779772 2020-12-24 19:59 ./slackware64/l/harfbuzz-2.7.3-x86_64-1.txz
--rw-r--r-- 1 root root 163 2020-12-24 19:59 ./slackware64/l/harfbuzz-2.7.3-x86_64-1.txz.asc
+-rw-r--r-- 1 root root 225 2020-12-25 06:07 ./slackware64/l/harfbuzz-2.7.3-x86_64-2.txt
+-rw-r--r-- 1 root root 840960 2020-12-25 06:07 ./slackware64/l/harfbuzz-2.7.3-x86_64-2.txz
+-rw-r--r-- 1 root root 163 2020-12-25 06:07 ./slackware64/l/harfbuzz-2.7.3-x86_64-2.txz.asc
-rw-r--r-- 1 root root 506 2018-04-13 14:49 ./slackware64/l/hicolor-icon-theme-0.17-noarch-2.txt
-rw-r--r-- 1 root root 14164 2018-04-13 14:49 ./slackware64/l/hicolor-icon-theme-0.17-noarch-2.txz
-rw-r--r-- 1 root root 163 2018-04-13 14:49 ./slackware64/l/hicolor-icon-theme-0.17-noarch-2.txz.asc
@@ -5469,11 +5469,11 @@ drwxr-xr-x 2 root root 4096 2019-02-17 23:51 ./slackware64/y
-rw-r--r-- 1 root root 1147 2018-03-01 07:55 ./slackware64/y/maketag
-rw-r--r-- 1 root root 1147 2018-03-01 07:55 ./slackware64/y/maketag.ez
-rw-r--r-- 1 root root 14 2018-03-01 07:55 ./slackware64/y/tagfile
-drwxr-xr-x 18 root root 4096 2020-12-25 00:56 ./source
--rw-r--r-- 1 root root 561087 2020-12-25 00:56 ./source/CHECKSUMS.md5
--rw-r--r-- 1 root root 163 2020-12-25 00:56 ./source/CHECKSUMS.md5.asc
--rw-r--r-- 1 root root 781507 2020-12-25 00:56 ./source/FILE_LIST
--rw-r--r-- 1 root root 22227234 2020-12-25 00:56 ./source/MANIFEST.bz2
+drwxr-xr-x 18 root root 4096 2020-12-25 06:13 ./source
+-rw-r--r-- 1 root root 561087 2020-12-25 06:13 ./source/CHECKSUMS.md5
+-rw-r--r-- 1 root root 163 2020-12-25 06:13 ./source/CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 781507 2020-12-25 06:13 ./source/FILE_LIST
+-rw-r--r-- 1 root root 22244073 2020-12-25 06:13 ./source/MANIFEST.bz2
-rw-r--r-- 1 root root 1314 2006-10-02 04:40 ./source/README.TXT
drwxr-xr-x 121 root root 4096 2020-12-24 21:26 ./source/a
-rw-r--r-- 1 root root 1034 2019-05-04 17:56 ./source/a/FTBFSlog
@@ -9427,7 +9427,7 @@ drwxr-xr-x 2 root root 4096 2020-11-11 22:13 ./source/kde/kde/src/plasma-
-rw-r--r-- 1 root root 488 2020-12-01 11:46 ./source/kde/kde/src/plasma/systemsettings-5.20.4.tar.xz.sig
-rw-r--r-- 1 root root 81796 2020-12-01 11:46 ./source/kde/kde/src/plasma/xdg-desktop-portal-kde-5.20.4.tar.xz
-rw-r--r-- 1 root root 488 2020-12-01 11:46 ./source/kde/kde/src/plasma/xdg-desktop-portal-kde-5.20.4.tar.xz.sig
-drwxr-xr-x 357 root root 12288 2020-12-24 21:38 ./source/l
+drwxr-xr-x 357 root root 12288 2020-12-25 05:58 ./source/l
-rw-r--r-- 1 root root 4460 2020-03-25 19:00 ./source/l/FTBFSlog
drwxr-xr-x 3 root root 4096 2020-12-06 05:55 ./source/l/GConf
-rw-r--r-- 1 root root 1559904 2013-01-22 02:48 ./source/l/GConf/GConf-3.2.6.tar.xz
@@ -10086,7 +10086,7 @@ drwxr-xr-x 2 root root 4096 2020-12-06 06:08 ./source/l/gvfs
-rw-r--r-- 1 root root 882 2018-02-27 06:12 ./source/l/gvfs/slack-desc
drwxr-xr-x 2 root root 4096 2020-12-24 19:58 ./source/l/harfbuzz
-rw-r--r-- 1 root root 7879674 2020-12-23 21:15 ./source/l/harfbuzz/harfbuzz-2.7.3.tar.lz
--rwxr-xr-x 1 root root 3992 2020-12-24 19:59 ./source/l/harfbuzz/harfbuzz.SlackBuild
+-rwxr-xr-x 1 root root 4078 2020-12-25 06:05 ./source/l/harfbuzz/harfbuzz.SlackBuild
-rw-r--r-- 1 root root 46 2020-04-20 19:19 ./source/l/harfbuzz/harfbuzz.url
-rw-r--r-- 1 root root 713 2020-04-20 19:20 ./source/l/harfbuzz/slack-desc
drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/l/hicolor-icon-theme
diff --git a/source/l/harfbuzz/harfbuzz.SlackBuild b/source/l/harfbuzz/harfbuzz.SlackBuild
index 4ba20e71..743555f1 100755
--- a/source/l/harfbuzz/harfbuzz.SlackBuild
+++ b/source/l/harfbuzz/harfbuzz.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=harfbuzz
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -77,30 +77,33 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-if [ ! -r configure ]; then
- NOCONFIGURE=1 ./autogen.sh
-fi
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
+# Configure, build, and install:
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir meson-build
+cd meson-build
+meson setup \
--prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --libdir=lib${LIBDIRSUFFIX} \
+ --libexecdir=/usr/libexec \
+ --bindir=/usr/bin \
+ --sbindir=/usr/sbin \
+ --includedir=/usr/include \
+ --datadir=/usr/share \
+ --mandir=/usr/man \
--sysconfdir=/etc \
--localstatedir=/var \
- --mandir=/usr/man \
- --with-glib=yes \
- --with-gobject=yes \
- --with-graphite2=auto \
- --enable-introspection=yes \
- --docdir=/usr/doc/$PKGNAM-$VERSION \
- --build=$ARCH-slackware-linux || exit 1
-
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-# Don't ship .la files:
-rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+ --buildtype=release \
+ -Dglib=enabled \
+ -Dgobject=enabled \
+ -Dgraphite=enabled \
+ -Dintrospection=enabled \
+ -Dtests=disabled \
+ -Dbenchmark=disabled \
+ .. || exit 1
+ "${NINJA:=ninja}" $NUMJOBS || exit 1
+ DESTDIR=$PKG $NINJA install || exit 1
+cd ..
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true