diff options
| -rw-r--r-- | gis/saga-gis/saga-gis.SlackBuild | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/gis/saga-gis/saga-gis.SlackBuild b/gis/saga-gis/saga-gis.SlackBuild index 2b5e146c4432..7779fd7b1505 100644 --- a/gis/saga-gis/saga-gis.SlackBuild +++ b/gis/saga-gis/saga-gis.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. +# 20220301 bkw: Modified by SlackBuilds.org: fix wxPython/wxGTK3 conflict. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=saga-gis @@ -40,9 +42,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,9 +77,9 @@ cd $SRCNAM-$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 {} \+ if [ "$OPENCV" != "ON" ] ; then sed -i "s/CVFOUND=1/true/g" configure @@ -88,6 +87,12 @@ fi sed -i "s/isinf/std::isinf/g" src/saga_core/saga_gui/wksp_map_layer.cpp +# 20220308 bkw: no configure option or environment variable for the +# wx config script to use, so force it this way: +mkdir -p wxtmp +ln -s /usr/lib$LIBDIRSUFFIX/wx/config/gtk3-unicode-3.0 wxtmp/wx-config +export PATH=$(pwd)/wxtmp:$PATH + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ PYTHON=python3 \ @@ -102,6 +107,7 @@ PYTHON=python3 \ make make install DESTDIR=$PKG +exit 0 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 |