diff options
| -rw-r--r-- | development/p4v/doinst.sh | 6 | ||||
| -rw-r--r-- | development/p4v/p4admin.desktop | 9 | ||||
| -rw-r--r-- | development/p4v/p4merge.desktop | 9 | ||||
| -rw-r--r-- | development/p4v/p4v.SlackBuild | 27 | ||||
| -rw-r--r-- | development/p4v/p4v.desktop | 6 | ||||
| -rw-r--r-- | development/p4v/p4v.png | bin | 2243 -> 0 bytes |
6 files changed, 47 insertions, 10 deletions
diff --git a/development/p4v/doinst.sh b/development/p4v/doinst.sh index 5fb28930db0b9..3e5691a052b5b 100644 --- a/development/p4v/doinst.sh +++ b/development/p4v/doinst.sh @@ -1,3 +1,9 @@ if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi diff --git a/development/p4v/p4admin.desktop b/development/p4v/p4admin.desktop new file mode 100644 index 0000000000000..9f4b0ef72bacd --- /dev/null +++ b/development/p4v/p4admin.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=P4Admin +GenericName=Perforce Visual Administration Tool +Comment=Perforce Visual Administration Tool +Exec=p4admin +Icon=P4-Admin +Categories=Development; +Terminal=false +Type=Application diff --git a/development/p4v/p4merge.desktop b/development/p4v/p4merge.desktop new file mode 100644 index 0000000000000..bb8fdf657b873 --- /dev/null +++ b/development/p4v/p4merge.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=P4Merge +GenericName=Perforce Visual Merge Tool +Comment=Perforce Visual Merge Tool +Exec=p4merge %U +Icon=P4-Merge +Categories=Development; +Terminal=false +Type=Application diff --git a/development/p4v/p4v.SlackBuild b/development/p4v/p4v.SlackBuild index ac4531dedef58..56537a508dc10 100644 --- a/development/p4v/p4v.SlackBuild +++ b/development/p4v/p4v.SlackBuild @@ -33,12 +33,12 @@ set -e LOCALVER=`tar tf p4v.tgz 2> /dev/null | head -1 | cut -d- -f 2 | cut -d/ -f1` PRGNAM=p4v VERSION=${VERSION:-$LOCALVER} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -49,8 +49,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -83,6 +83,7 @@ mkdir -p $PKG/usr/lib${LIBDIRSUFFIX} rm bin/qt.conf cp -a bin $PKG/usr/bin mv lib/p4v $PKG/usr/lib${LIBDIRSUFFIX}/p4v +mv lib/icu $PKG/usr/lib${LIBDIRSUFFIX}/p4v/icu # p4vc needs to be wrapped too mv $PKG/usr/bin/p4vc $PKG/usr/bin/p4vc.bin @@ -90,6 +91,9 @@ mv $PKG/usr/bin/p4vc $PKG/usr/bin/p4vc.bin # Adapt the path for lib/lib64 sed -i "s%prefix/lib/%prefix/lib${LIBDIRSUFFIX}/%g" $PKG/usr/bin/$PRGNAM +# ICU library path +sed -i "s%lib${LIBDIRSUFFIX}/icu%lib${LIBDIRSUFFIX}/p4v/icu%g" $PKG/usr/bin/$PRGNAM + # Add Qt plugin path through environment variable since we can't use qt.conf sed -i "s%export P4VRES%export P4VRES QT_PLUGIN_PATH=\$QT5DIR/plugins%g" $PKG/usr/bin/$PRGNAM @@ -104,9 +108,18 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -mkdir -p $PKG/usr/share/{applications,pixmaps} -cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop -cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png +mkdir -p $PKG/usr/share/applications +for PRG in $PRGNAM p4admin p4merge; do + cat $CWD/$PRG.desktop > $PKG/usr/share/applications/$PRG.desktop +done + +mkdir -p $PKG/usr/share/icons/hicolor/{16x16,32x32,48x48,96x96}/apps +for PRG in P4-V P4-Admin P4-Merge; do + for SIZE in 16x16 32x32 48x48 96x96; do + ln -s ../../../../../lib${LIBDIRSUFFIX}/p4v/P4VResources/icons/${PRG}_${SIZE}.png \ + $PKG/usr/share/icons/hicolor/$SIZE/apps/${PRG}.png + done +done mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/development/p4v/p4v.desktop b/development/p4v/p4v.desktop index 7a6055ac456e2..315f01d2cec72 100644 --- a/development/p4v/p4v.desktop +++ b/development/p4v/p4v.desktop @@ -1,9 +1,9 @@ [Desktop Entry] -Name=p4v +Name=P4V GenericName=Perforce Visual Client -Comment=Use Perforce Version Control +Comment=Perforce Visual Client Exec=p4v -Icon=p4v +Icon=P4-V Categories=Development; Terminal=false Type=Application diff --git a/development/p4v/p4v.png b/development/p4v/p4v.png Binary files differdeleted file mode 100644 index 0fb0f74c10e6a..0000000000000 --- a/development/p4v/p4v.png +++ /dev/null |
