summaryrefslogtreecommitdiff
path: root/source/x/x11
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2019-01-30 04:27:03 +0000
committerEric Hameleers <alien@slackware.com>2019-01-30 17:59:47 +0100
commit01d519c790743d682b1f1b9d97d3eb3c1b47b67d (patch)
treefc5797284fc538ee5eb85f7ff9db018cddc30016 /source/x/x11
parent72d68bbefb882dd4ab6c9bb78c46592fd8ec8b9b (diff)
downloadcurrent-01d519c790743d682b1f1b9d97d3eb3c1b47b67d.tar.gz
Wed Jan 30 04:27:03 UTC 201920190130042703
d/bison-3.3.1-x86_64-1.txz: Upgraded. l/imagemagick-6.9.10_25-x86_64-1.txz: Upgraded. l/mozilla-nss-3.42-x86_64-1.txz: Upgraded. n/libgpg-error-1.35-x86_64-1.txz: Upgraded. n/whois-5.4.1-x86_64-1.txz: Upgraded. x/xf86-video-nouveau-1.0.16-x86_64-1.txz: Upgraded. xap/mozilla-firefox-60.5.0esr-x86_64-1.txz: Upgraded. This release contains security fixes and improvements. For more information, see: https://www.mozilla.org/security/known-vulnerabilities/firefoxESR.html https://www.mozilla.org/en-US/security/advisories/mfsa2019-02/ https://www.mozilla.org/en-US/security/advisories/mfsa2019-02/#CVE-2018-18500 https://www.mozilla.org/en-US/security/advisories/mfsa2019-02/#CVE-2018-18505 https://www.mozilla.org/en-US/security/advisories/mfsa2019-02/#CVE-2018-18501 (* Security fix *) xap/mozilla-thunderbird-60.5.0-x86_64-1.txz: Upgraded. This is a bugfix release. For more information, see: https://www.mozilla.org/en-US/thunderbird/60.5.0/releasenotes/ xfce/Thunar-1.8.4-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/x/x11')
-rw-r--r--source/x/x11/build/xf86-video-nouveau2
-rwxr-xr-xsource/x/x11/x11.SlackBuild98
2 files changed, 51 insertions, 49 deletions
diff --git a/source/x/x11/build/xf86-video-nouveau b/source/x/x11/build/xf86-video-nouveau
index 00750edc..d00491fd 100644
--- a/source/x/x11/build/xf86-video-nouveau
+++ b/source/x/x11/build/xf86-video-nouveau
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/x11.SlackBuild b/source/x/x11/x11.SlackBuild
index 780aaf52..af97a761 100755
--- a/source/x/x11/x11.SlackBuild
+++ b/source/x/x11/x11.SlackBuild
@@ -326,55 +326,57 @@ no_usr_share_doc() {
done
- # Nothing here? Must have been fully modular. :-)
- if [ ! -d ${SLACK_X_BUILD_DIR}/package-${x_source_dir}/etc -a \
- ! -d ${SLACK_X_BUILD_DIR}/package-${x_source_dir}/usr ]; then
- continue
- fi
-
- # Build an "x11-<sourcedir>" package for anything that wasn't built modular:
- # It's safer to consider these to have binaries in them. ;-)
- PKGARCH=$ARCH
- cd $PKG
- process_man_pages
- process_info_pages
- no_usr_share_doc
- # If there are post-install things to do for the combined package,
- # we do them here. This could be used for things like making a
- # VERSION number for a combined package. :-)
- if [ -r $CWD/post-install/x11-${x_source_dir}.post-install ]; then
- RUNSCRIPT=$(mktemp -p $TMP) || exit 1
- cat $CWD/post-install/x11-${x_source_dir}.post-install \
- | sed -e "s#usr/lib#usr/lib${LIBDIRSUFFIX}#g" > $RUNSCRIPT
- . $RUNSCRIPT
- rm -f $RUNSCRIPT
- fi
- mkdir -p $PKG/install
- if [ -r $CWD/slack-desc/x11-${x_source_dir} ]; then
- cat $CWD/slack-desc/x11-${x_source_dir} > $PKG/install/slack-desc
- else
- touch $PKG/install/slack-desc-missing
- fi
- if [ -r $CWD/doinst.sh/x11-${x_source_dir} ]; then
- cat $CWD/doinst.sh/x11-${x_source_dir} \
- | sed -e "s#usr/lib#usr/lib${LIBDIRSUFFIX}#g" \
- >> $PKG/install/doinst.sh
- fi
- if [ -r $CWD/build/x11-${PKGNAME} ]; then
- SRCDIRBUILD=$(cat $CWD/build/x11-${PKGNAME})
- else
- SRCDIRBUILD=$BUILD
- fi
- if [ -r $CWD/makepkg/${PKGNAME} ]; then
- BUILD=$MODBUILD . $CWD/makepkg/${PKGNAME}
- else
- /sbin/makepkg -l y -c n ${SLACK_X_BUILD_DIR}/x11-${x_source_dir}-${VERSION}-${PKGARCH}-${SRCDIRBUILD}.txz
- if [ "$UPGRADE_PACKAGES" = "yes" ]; then
- /sbin/upgradepkg --install-new ${SLACK_X_BUILD_DIR}/x11-${x_source_dir}-${VERSION}-${PKGARCH}-${SRCDIRBUILD}.txz
- elif [ "$UPGRADE_PACKAGES" = "always" ]; then
- /sbin/upgradepkg --install-new --reinstall ${SLACK_X_BUILD_DIR}/x11-${x_source_dir}-${VERSION}-${PKGARCH}-${SRCDIRBUILD}.txz
+ # If we have anything here in /etc or /usr, then the build was not fully
+ # modular and we should package up whatever's there as an x11-<sourcedir>
+ # package:
+ if [ -d ${SLACK_X_BUILD_DIR}/package-${x_source_dir}/etc -o \
+ -d ${SLACK_X_BUILD_DIR}/package-${x_source_dir}/usr ]; then
+
+ # Build an "x11-<sourcedir>" package for anything that wasn't built modular:
+ # It's safer to consider these to have binaries in them. ;-)
+ PKGARCH=$ARCH
+ cd $PKG
+ process_man_pages
+ process_info_pages
+ no_usr_share_doc
+ # If there are post-install things to do for the combined package,
+ # we do them here. This could be used for things like making a
+ # VERSION number for a combined package. :-)
+ if [ -r $CWD/post-install/x11-${x_source_dir}.post-install ]; then
+ RUNSCRIPT=$(mktemp -p $TMP) || exit 1
+ cat $CWD/post-install/x11-${x_source_dir}.post-install \
+ | sed -e "s#usr/lib#usr/lib${LIBDIRSUFFIX}#g" > $RUNSCRIPT
+ . $RUNSCRIPT
+ rm -f $RUNSCRIPT
fi
- fi
+ mkdir -p $PKG/install
+ if [ -r $CWD/slack-desc/x11-${x_source_dir} ]; then
+ cat $CWD/slack-desc/x11-${x_source_dir} > $PKG/install/slack-desc
+ else
+ touch $PKG/install/slack-desc-missing
+ fi
+ if [ -r $CWD/doinst.sh/x11-${x_source_dir} ]; then
+ cat $CWD/doinst.sh/x11-${x_source_dir} \
+ | sed -e "s#usr/lib#usr/lib${LIBDIRSUFFIX}#g" \
+ >> $PKG/install/doinst.sh
+ fi
+ if [ -r $CWD/build/x11-${PKGNAME} ]; then
+ SRCDIRBUILD=$(cat $CWD/build/x11-${PKGNAME})
+ else
+ SRCDIRBUILD=$BUILD
+ fi
+ if [ -r $CWD/makepkg/${PKGNAME} ]; then
+ BUILD=$MODBUILD . $CWD/makepkg/${PKGNAME}
+ else
+ /sbin/makepkg -l y -c n ${SLACK_X_BUILD_DIR}/x11-${x_source_dir}-${VERSION}-${PKGARCH}-${SRCDIRBUILD}.txz
+ if [ "$UPGRADE_PACKAGES" = "yes" ]; then
+ /sbin/upgradepkg --install-new ${SLACK_X_BUILD_DIR}/x11-${x_source_dir}-${VERSION}-${PKGARCH}-${SRCDIRBUILD}.txz
+ elif [ "$UPGRADE_PACKAGES" = "always" ]; then
+ /sbin/upgradepkg --install-new --reinstall ${SLACK_X_BUILD_DIR}/x11-${x_source_dir}-${VERSION}-${PKGARCH}-${SRCDIRBUILD}.txz
+ fi
+ fi
+
+ fi # build x11-<sourcedir> package
)
done
)