diff options
author | B. Watson <yalhcru@gmail.com> | 2022-02-27 01:51:39 -0500 |
---|---|---|
committer | Robby Workman <rworkman@slackbuilds.org> | 2022-02-27 22:27:51 -0600 |
commit | 7b927af2a1754d88f5150ff3170f7fabb454f742 (patch) | |
tree | 8c6c2fb6acb3e87a7a2e4bef12fe30eb21aff088 /graphics | |
parent | f3b4a9d943618e74065b93674186ce107d462c1a (diff) |
graphics/Pixie: Fix 15.0 build.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/Pixie/Pixie.SlackBuild | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/graphics/Pixie/Pixie.SlackBuild b/graphics/Pixie/Pixie.SlackBuild index 3bf4d4c4b9ce0..89de46056ea4c 100644 --- a/graphics/Pixie/Pixie.SlackBuild +++ b/graphics/Pixie/Pixie.SlackBuild @@ -22,6 +22,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20220222 bkw: Modified by SlackBuilds.org: fix build on 15.0. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=Pixie @@ -38,9 +40,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -76,9 +75,9 @@ cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # Patch code for more accurate pointer casting patch -p1 < $CWD/Pixie-2.2.6-strict.patch @@ -94,6 +93,14 @@ sed -i \ patch -p1 < $CWD/Pixie.patch +# 20220226 bkw: Slackware 15.0 hasn't got this header (and we didn't need it): +sed -i '/include.*<sys\/sysctl\.h>/d' src/common/os.cpp + +# 20220226 bkw: newer STL, has min() and max(), which step on the ones +# defined here. Rename. +grep -rl '\<min *(' src | xargs sed -i 's,\<min *(,Min(,g' +grep -rl '\<max *(' src | xargs sed -i 's,\<max *(,Max(,g' + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -108,13 +115,8 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-openexr-threads make -make install DESTDIR=$PKG - -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 - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +make install-strip DESTDIR=$PKG +gzip -9 $PKG/usr/man/man*/* # Evidently, configure is somewhat broken: mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html @@ -129,6 +131,8 @@ rm -rf $PKG/usr/share/doc cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +rm -f $PKG/usr/lib*/*.la + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc |