From 646a5c1cbfd95873950a87b5f75d52073a967023 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 28 May 2018 19:12:29 +0000 Subject: Mon May 28 19:12:29 UTC 2018 a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded. --- source/l/PyQt/PyQt.SlackBuild | 51 ++++++++++++++++++++++++++++++++++--------- source/l/PyQt/slack-desc | 6 ++--- 2 files changed, 44 insertions(+), 13 deletions(-) (limited to 'source/l/PyQt') diff --git a/source/l/PyQt/PyQt.SlackBuild b/source/l/PyQt/PyQt.SlackBuild index 16e955621..7ca9a037e 100755 --- a/source/l/PyQt/PyQt.SlackBuild +++ b/source/l/PyQt/PyQt.SlackBuild @@ -1,9 +1,9 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for PyQt # Copyright 2008 Aleksandar Samardzic -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,11 +26,11 @@ # Modified by Robby Workman # Modified by Eric Hameleers -PKGNAM=PyQt -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +cd $(dirname $0) ; CWD=$(pwd) -NUMJOBS=${NUMJOBS:--j7} +PKGNAM=PyQt +VERSION=${VERSION:-$(echo ${PKGNAM}4_gpl_x11-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) @@ -44,7 +44,16 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 "$PKGNAM-$(echo $VERSION |tr - _)-$ARCH-$BUILD.txz" + exit 0 +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} + TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -60,12 +69,15 @@ else SLKCFLAGS="-O2" fi +PYTHONLIB=$( python -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' ) +PYTHON3LIB=$( python3 -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' ) + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PKGNAM-x11-gpl-$VERSION -tar xvf $CWD/$PKGNAM-x11-gpl-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-x11-gpl-$VERSION || exit 1 +rm -rf ${PKGNAM}4_gpl_x11-$VERSION +tar xvf $CWD/${PKGNAM}4_gpl_x11-$VERSION.tar.xz || exit 1 +cd ${PKGNAM}4_gpl_x11-$VERSION || exit 1 # Fix phonon detection: zcat $CWD/$PKGNAM.phonon.diff.gz | patch -p1 --verbose || exit 1 @@ -83,14 +95,33 @@ export QTDIR=/usr/lib${LIBDIRSUFFIX}/qt export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" +python3 configure.py --confirm-license --verbose + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG INSTALL_ROOT=$PKG || exit 1 + +mv $PKG/usr/bin/pyuic4 $PKG/usr/bin/pyuic4-py3 + +make clean + python configure.py --confirm-license --verbose make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG INSTALL_ROOT=$PKG || exit 1 +rm -rf $PKG/$PYTHON3LIB/PyQt4/uic/port_v2/ +rm -rf $PKG/$PYTHONLIB/PyQt4/uic/port_v3/ + find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +# Remove rpaths: +for file in $(find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : 2> /dev/null) ; do + if [ ! "$(patchelf --print-rpath $file 2> /dev/null)" = "" ]; then + patchelf --remove-rpath $file + fi +done + mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ GPL_EXCEPTION*.TXT LICENSE.* NEWS OPENSOURCE-NOTICE.TXT README THANKS doc/* \ diff --git a/source/l/PyQt/slack-desc b/source/l/PyQt/slack-desc index f713c87c3..9aa7ae94e 100644 --- a/source/l/PyQt/slack-desc +++ b/source/l/PyQt/slack-desc @@ -1,8 +1,8 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# 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 +# 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------------------------------------------------------| -- cgit v1.2.3-65-gdbad