diff options
| author | B. Watson <yalhcru@gmail.com> | 2022-02-23 00:01:08 -0500 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2022-02-23 20:10:27 +0700 |
| commit | 0f3ba2783edc290ad5725552e522d72375928996 (patch) | |
| tree | 2fa30bdad4df5ea927a6d9a303ad4331729b546e | |
| parent | 60c29314ea34e6f1d1c7be8f38475093168216f0 (diff) | |
| download | slackbuilds-0f3ba2783edc290ad5725552e522d72375928996.tar.gz | |
games/Scorched3D: Fix wxPython/wxGTK3 conflict.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | games/Scorched3D/Scorched3D.SlackBuild | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/games/Scorched3D/Scorched3D.SlackBuild b/games/Scorched3D/Scorched3D.SlackBuild index b714c53e65..5886671d0b 100644 --- a/games/Scorched3D/Scorched3D.SlackBuild +++ b/games/Scorched3D/Scorched3D.SlackBuild @@ -22,6 +22,9 @@ # 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: use wxGTK3 regardless +# of where the /usr/bin/wx-config symlink points. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=Scorched3D @@ -38,9 +41,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 @@ -77,9 +77,9 @@ cd scorched 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 {} \+ # Apply patches from Fedora @@ -100,6 +100,7 @@ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --with-wx-config=/usr/lib$LIBDIRSUFFIX/wx/config/gtk3-unicode-3.0 \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ |