diff options
| author | B. Watson <yalhcru@gmail.com> | 2022-02-26 15:55:21 -0500 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2022-02-27 22:27:51 -0600 |
| commit | f3b4a9d943618e74065b93674186ce107d462c1a (patch) | |
| tree | 8b1fa619004b1d9eb4665f45b439eec1f7b69c54 | |
| parent | 93034363aed905fb7eea0d278b9b1da93f56f443 (diff) | |
| download | slackbuilds-f3b4a9d943618e74065b93674186ce107d462c1a.tar.gz | |
graphics/hugin: Fix wxPython conflict.
Signed-off-by: B. Watson <yalhcru@gmail.com>
| -rw-r--r-- | graphics/hugin/hugin.SlackBuild | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/graphics/hugin/hugin.SlackBuild b/graphics/hugin/hugin.SlackBuild index 7589d9776c..a5d82d1b50 100644 --- a/graphics/hugin/hugin.SlackBuild +++ b/graphics/hugin/hugin.SlackBuild @@ -24,11 +24,15 @@ # 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, BUILD=2: +# - fix build if /usr/bin/wx-config points to wxPython2. +# - remove install instructions from doc dir. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=hugin VERSION=${VERSION:-2020.0.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -40,9 +44,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 @@ -78,13 +79,15 @@ 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 \ + -o -perm 511 \) -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ mkdir -p build cd build cmake \ + -DwxWidgets_CONFIG_EXECUTABLE=/usr/lib$LIBDIRSUFFIX/wx/config/gtk3-unicode-3.0 \ + -DwxWidgets_wxrc_EXECUTABLE=/usr/bin/wxrc-3.0 \ -DCMAKE_C_FLAGS="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ @@ -93,20 +96,16 @@ cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release .. -make install DESTDIR=$PKG +make install/strip DESTDIR=$PKG cd .. -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - mv $PKG/usr/share/man $PKG/usr mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING.txt Changes.txt INSTALL_cmake README \ - TODO $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING.txt Changes.txt README TODO \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh |