From 02056549bf9950d4e854dad95426ff1ad42fefc7 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 28 Oct 2019 20:22:51 +0000 Subject: Mon Oct 28 20:22:51 UTC 2019 l/imagemagick-6.9.10_70-x86_64-1.txz: Upgraded. x/libinput-1.14.3-x86_64-1.txz: Upgraded. x/mkfontdir-1.0.7-noarch-2.txz: Removed. The mkfontdir wrapper script and man page are provided by recent versions of the mkfontscale package, making the mkfontdir package redundant. Thanks to DarkVision. x/mkfontscale-1.2.1-x86_64-2.txz: Rebuilt. Moved the mkfontdir install script to this package since it includes the mkfontdir wrapper script now. xap/gimp-2.10.14-x86_64-1.txz: Upgraded. --- source/x/x11/build/mkfontdir | 1 - source/x/x11/build/mkfontscale | 2 +- source/x/x11/patch/xorg-server.patch | 6 ++---- source/x/x11/post-install/mkfontdir.post-install | 4 ---- .../x11/post-install/mkfontdir/setup.04.mkfontdir | 23 ---------------------- source/x/x11/post-install/mkfontscale.post-install | 4 ++++ .../post-install/mkfontscale/setup.04.mkfontdir | 23 ++++++++++++++++++++++ source/x/x11/slack-desc/mkfontdir | 19 ------------------ source/x/x11/slack-desc/mkfontscale | 4 ++-- 9 files changed, 32 insertions(+), 54 deletions(-) delete mode 100644 source/x/x11/build/mkfontdir delete mode 100644 source/x/x11/post-install/mkfontdir.post-install delete mode 100644 source/x/x11/post-install/mkfontdir/setup.04.mkfontdir create mode 100644 source/x/x11/post-install/mkfontscale.post-install create mode 100644 source/x/x11/post-install/mkfontscale/setup.04.mkfontdir delete mode 100644 source/x/x11/slack-desc/mkfontdir (limited to 'source/x/x11') diff --git a/source/x/x11/build/mkfontdir b/source/x/x11/build/mkfontdir deleted file mode 100644 index 0cfbf0888..000000000 --- a/source/x/x11/build/mkfontdir +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/mkfontscale b/source/x/x11/build/mkfontscale index d00491fd7..0cfbf0888 100644 --- a/source/x/x11/build/mkfontscale +++ b/source/x/x11/build/mkfontscale @@ -1 +1 @@ -1 +2 diff --git a/source/x/x11/patch/xorg-server.patch b/source/x/x11/patch/xorg-server.patch index 6ce93ee95..6099fad0f 100644 --- a/source/x/x11/patch/xorg-server.patch +++ b/source/x/x11/patch/xorg-server.patch @@ -24,7 +24,5 @@ zcat $CWD/patch/xorg-server/0001-autobind-GPUs-to-the-screen.patch.gz | patch -p zcat $CWD/patch/xorg-server/0001-xfree86-use-modesetting-driver-by-default-on-GeForce.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } # Patch to build with libglvnd-1.2.0: -zcat $CWD/patch/xorg-server/c7486613b0dc586f93f6ba293d9b55c69995b05c.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; -} -zcat $CWD/patch/xorg-server/e6ef2b12404dfec7f23592a3524d2a63d9d25802.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; -} +zcat $CWD/patch/xorg-server/e6ef2b12404dfec7f23592a3524d2a63d9d25802.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +zcat $CWD/patch/xorg-server/c7486613b0dc586f93f6ba293d9b55c69995b05c.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/x/x11/post-install/mkfontdir.post-install b/source/x/x11/post-install/mkfontdir.post-install deleted file mode 100644 index 00a3a22db..000000000 --- a/source/x/x11/post-install/mkfontdir.post-install +++ /dev/null @@ -1,4 +0,0 @@ -mkdir -p $PKG/var/log/setup -cp -a $CWD/post-install/mkfontdir/setup.04.mkfontdir $PKG/var/log/setup/setup.04.mkfontdir -chown root:root $PKG/var/log/setup/setup.04.mkfontdir -chmod 755 $PKG/var/log/setup/setup.04.mkfontdir diff --git a/source/x/x11/post-install/mkfontdir/setup.04.mkfontdir b/source/x/x11/post-install/mkfontdir/setup.04.mkfontdir deleted file mode 100644 index b54076332..000000000 --- a/source/x/x11/post-install/mkfontdir/setup.04.mkfontdir +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -#BLURB="Run mkfontdir and mkfontscale in font directories." -# Just in case. -chroot . /sbin/ldconfig 1> /dev/null 2> /dev/null -if [ -x usr/bin/fc-cache ]; then - if [ "$COLOR" = "on" -o -r $TMP/SeTcolor ]; then - dialog --title "MKFONTDIR AND MKFONTSCALE UPDATE" --infobox \ - "Please wait while we run mkfontscale and mkfontdir in \ -your font directories." 4 68 - else - echo "Please wait while we run mkfontscale and mkfontdir in your font directories." - fi - for fontdir in 100dpi 75dpi OTF Speedo TTF Type1 cyrillic ; do - if [ -d usr/share/fonts/$fontdir ]; then - chroot . mkfontscale /usr/share/fonts/$fontdir 1> /dev/null 2> /dev/null - chroot . mkfontdir /usr/share/fonts/$fontdir 1> /dev/null 2> /dev/null - fi - done - if [ -d usr/share/fonts/misc ]; then - chroot . mkfontscale /usr/share/fonts/misc 1> /dev/null 2> /dev/null - chroot . mkfontdir -e /usr/share/fonts/encodings -e /usr/share/fonts/encodings/large /usr/share/fonts/misc 1> /dev/null 2> /dev/null - fi -fi diff --git a/source/x/x11/post-install/mkfontscale.post-install b/source/x/x11/post-install/mkfontscale.post-install new file mode 100644 index 000000000..8c2739ca4 --- /dev/null +++ b/source/x/x11/post-install/mkfontscale.post-install @@ -0,0 +1,4 @@ +mkdir -p $PKG/var/log/setup +cp -a $CWD/post-install/mkfontscale/setup.04.mkfontdir $PKG/var/log/setup/setup.04.mkfontdir +chown root:root $PKG/var/log/setup/setup.04.mkfontdir +chmod 755 $PKG/var/log/setup/setup.04.mkfontdir diff --git a/source/x/x11/post-install/mkfontscale/setup.04.mkfontdir b/source/x/x11/post-install/mkfontscale/setup.04.mkfontdir new file mode 100644 index 000000000..b54076332 --- /dev/null +++ b/source/x/x11/post-install/mkfontscale/setup.04.mkfontdir @@ -0,0 +1,23 @@ +#!/bin/sh +#BLURB="Run mkfontdir and mkfontscale in font directories." +# Just in case. +chroot . /sbin/ldconfig 1> /dev/null 2> /dev/null +if [ -x usr/bin/fc-cache ]; then + if [ "$COLOR" = "on" -o -r $TMP/SeTcolor ]; then + dialog --title "MKFONTDIR AND MKFONTSCALE UPDATE" --infobox \ + "Please wait while we run mkfontscale and mkfontdir in \ +your font directories." 4 68 + else + echo "Please wait while we run mkfontscale and mkfontdir in your font directories." + fi + for fontdir in 100dpi 75dpi OTF Speedo TTF Type1 cyrillic ; do + if [ -d usr/share/fonts/$fontdir ]; then + chroot . mkfontscale /usr/share/fonts/$fontdir 1> /dev/null 2> /dev/null + chroot . mkfontdir /usr/share/fonts/$fontdir 1> /dev/null 2> /dev/null + fi + done + if [ -d usr/share/fonts/misc ]; then + chroot . mkfontscale /usr/share/fonts/misc 1> /dev/null 2> /dev/null + chroot . mkfontdir -e /usr/share/fonts/encodings -e /usr/share/fonts/encodings/large /usr/share/fonts/misc 1> /dev/null 2> /dev/null + fi +fi diff --git a/source/x/x11/slack-desc/mkfontdir b/source/x/x11/slack-desc/mkfontdir deleted file mode 100644 index 3f97b7e84..000000000 --- a/source/x/x11/slack-desc/mkfontdir +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -mkfontdir: mkfontdir (X11 font utility) -mkfontdir: -mkfontdir: mkfontdir creates the fonts.dir files needed by the legacy X server -mkfontdir: core font system. The current implementation is a simple wrapper -mkfontdir: script around the mkfontscale program, which must be built and -mkfontdir: installed first. -mkfontdir: -mkfontdir: -mkfontdir: -mkfontdir: -mkfontdir: diff --git a/source/x/x11/slack-desc/mkfontscale b/source/x/x11/slack-desc/mkfontscale index 176336f79..0f1f9060e 100644 --- a/source/x/x11/slack-desc/mkfontscale +++ b/source/x/x11/slack-desc/mkfontscale @@ -9,8 +9,8 @@ mkfontscale: mkfontscale (X11 font utility) mkfontscale: mkfontscale: mkfontscale creates the fonts.scale and fonts.dir index files used -mkfontscale: by the legacy X11 font system. -mkfontscale: +mkfontscale: by the legacy X11 font system. This package also includes a mkfontdir +mkfontscale: wrapper script that calls mkfontscale with appropriate options. mkfontscale: mkfontscale: mkfontscale: -- cgit v1.2.3