From 44b0df4c982557c6be0b3d90c6c6c2b94d419864 Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Tue, 8 Feb 2022 16:34:50 -0500 Subject: [PATCH] system/winusb: Fix 15.0 build and wx 2/3 stupidity. Signed-off-by: B. Watson Signed-off-by: Willy Sudiarto Raharjo --- system/winusb/winusb.SlackBuild | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/system/winusb/winusb.SlackBuild b/system/winusb/winusb.SlackBuild index 19f545dfa6..900f95814a 100644 --- a/system/winusb/winusb.SlackBuild +++ b/system/winusb/winusb.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. +# 20220208 bkw: Modified by SlackBuilds.org, to fix the build on 15.0 +# and work around the /usr/bin/wx-config brain damage. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=winusb @@ -40,9 +43,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 @@ -88,6 +88,7 @@ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --with-wx-config=/usr/lib$LIBDIRSUFFIX/wx/config/gtk2-unicode-release-2.8 \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -111,8 +112,8 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild # For pkexec configuration mkdir -p $PKG/usr/share/polkit-1/actions sed -i 's/^\(Exec\)=winusbgui$/\1=winusbgui_polkit/' $PKG/usr/share/applications/winusbgui.desktop -install -m0755 -o 0:0 $CWD/winusbgui_polkit $PKG/usr/bin -install -m0644 -o 0:0 $CWD/com.slackware.pkexec.winusb.policy $PKG/usr/share/polkit-1/actions +install -m0755 -o root -g root $CWD/winusbgui_polkit $PKG/usr/bin +install -m0644 -o root -g root $CWD/com.slackware.pkexec.winusb.policy $PKG/usr/share/polkit-1/actions mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc