diff options
| author | B. Watson <yalhcru@gmail.com> | 2022-02-26 13:28:44 -0500 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2022-02-26 17:34:49 -0600 |
| commit | 8e1b43e63d4e21d08a0017ab46f06c64718cbadc (patch) | |
| tree | 9c63299d7d2649d30fdabc7bc14f20bfca783d13 | |
| parent | 1201ba5d91138fda0045a41de1d205f4baa94575 (diff) | |
| download | slackbuilds-8e1b43e63d4e21d08a0017ab46f06c64718cbadc.tar.gz | |
graphics/urbanlightscape: Fix wxPython conflict.
Signed-off-by: B. Watson <yalhcru@gmail.com>
| -rw-r--r-- | graphics/urbanlightscape/urbanlightscape.SlackBuild | 22 | ||||
| -rw-r--r-- | graphics/urbanlightscape/urbanlightscape.desktop | 2 |
2 files changed, 14 insertions, 10 deletions
diff --git a/graphics/urbanlightscape/urbanlightscape.SlackBuild b/graphics/urbanlightscape/urbanlightscape.SlackBuild index b1c2b33c71..9c8bee68d3 100644 --- a/graphics/urbanlightscape/urbanlightscape.SlackBuild +++ b/graphics/urbanlightscape/urbanlightscape.SlackBuild @@ -22,6 +22,10 @@ # 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: +# - always use wxGTK3, regardless of /usr/bin/wx-config symlink. +# - abs path to icon in .desktop. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=urbanlightscape @@ -38,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 @@ -75,9 +76,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 {} \+ + +# 20220226 bkw: always use wxGTK3. this configure script has no +# --with-wx-config or similar, so use PATH. +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" \ @@ -91,10 +98,7 @@ CXXFLAGS="$SLKCFLAGS" \ --build=$ARCH-slackware-linux make -make install DESTDIR=$PKG - -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 +make install-strip DESTDIR=$PKG mkdir -p $PKG/usr/share/applications install -D -m644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop diff --git a/graphics/urbanlightscape/urbanlightscape.desktop b/graphics/urbanlightscape/urbanlightscape.desktop index 09f2c5d48a..1803e5ca51 100644 --- a/graphics/urbanlightscape/urbanlightscape.desktop +++ b/graphics/urbanlightscape/urbanlightscape.desktop @@ -2,7 +2,7 @@ Name=Urban Lightscape Comment=A photo filter for exposure, brightness and lighting correction Exec=urbanlightscape -Icon=urbanlightscape +Icon=/usr/share/pixmaps/urbanlightscape.png Terminal=false Type=Application Categories=Graphics;Photography; |