diff options
Diffstat (limited to 'source')
| -rw-r--r-- | source/x/x11/build/mkfontdir | 1 | ||||
| -rw-r--r-- | source/x/x11/build/mkfontscale | 2 | ||||
| -rw-r--r-- | source/x/x11/patch/xorg-server.patch | 6 | ||||
| -rw-r--r-- | source/x/x11/post-install/mkfontscale.post-install (renamed from source/x/x11/post-install/mkfontdir.post-install) | 2 | ||||
| -rw-r--r-- | source/x/x11/post-install/mkfontscale/setup.04.mkfontdir (renamed from source/x/x11/post-install/mkfontdir/setup.04.mkfontdir) | 0 | ||||
| -rw-r--r-- | source/x/x11/slack-desc/mkfontdir | 19 | ||||
| -rw-r--r-- | source/x/x11/slack-desc/mkfontscale | 4 | ||||
| -rwxr-xr-x | source/xap/gimp/gimp.SlackBuild | 2 |
8 files changed, 7 insertions, 29 deletions
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/mkfontscale.post-install index 00a3a22db..8c2739ca4 100644 --- a/source/x/x11/post-install/mkfontdir.post-install +++ b/source/x/x11/post-install/mkfontscale.post-install @@ -1,4 +1,4 @@ mkdir -p $PKG/var/log/setup -cp -a $CWD/post-install/mkfontdir/setup.04.mkfontdir $PKG/var/log/setup/setup.04.mkfontdir +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/mkfontdir/setup.04.mkfontdir b/source/x/x11/post-install/mkfontscale/setup.04.mkfontdir index b54076332..b54076332 100644 --- a/source/x/x11/post-install/mkfontdir/setup.04.mkfontdir +++ b/source/x/x11/post-install/mkfontscale/setup.04.mkfontdir 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: diff --git a/source/xap/gimp/gimp.SlackBuild b/source/xap/gimp/gimp.SlackBuild index a0a791fa4..57c7aa7d5 100755 --- a/source/xap/gimp/gimp.SlackBuild +++ b/source/xap/gimp/gimp.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gimp VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then |