diff options
| author | B. Watson <yalhcru@gmail.com> | 2022-03-20 13:19:41 -0400 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2022-03-26 01:20:07 +0700 |
| commit | 0f4569e7a62d1ba94e8e149812c852d356e54281 (patch) | |
| tree | 6cd190b99e8a2018a90852c49085c69ee27e71aa /development | |
| parent | 6933d27dd2556476e2c449d7e8a8490aadd2b171 (diff) | |
| download | slackbuilds-0f4569e7a62d1ba94e8e149812c852d356e54281.tar.gz | |
development/xmlcopyeditor: Fix wxPython/wxGTK3 conflict.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'development')
| -rw-r--r-- | development/xmlcopyeditor/xmlcopyeditor.SlackBuild | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/development/xmlcopyeditor/xmlcopyeditor.SlackBuild b/development/xmlcopyeditor/xmlcopyeditor.SlackBuild index 2c76e09b61..a161c602fb 100644 --- a/development/xmlcopyeditor/xmlcopyeditor.SlackBuild +++ b/development/xmlcopyeditor/xmlcopyeditor.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. +# 20220320 bkw: Modified by SlackBuilds.org: use explicit path to wx +# configure script, to fix the wxPython/wxGTK3 conflict. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=xmlcopyeditor @@ -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 @@ -75,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 \ + -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 {} \+ # Fix end-of-line formatting. for FILE in $(find . -type f ! -name "*\.png" | xargs grep -Pl '\r$'); do @@ -91,6 +91,7 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --disable-dependency-tracking \ + --with-wx-config=/usr/lib$LIBDIRSUFFIX/wx/config/gtk2-unicode-release-2.8 \ --build=$ARCH-slackware-linux make |