From 7605cfde74dda18b76492d43128cba67ad873ae0 Mon Sep 17 00:00:00 2001 From: David Sullins Date: Sun, 14 Aug 2016 22:50:04 +0100 Subject: [PATCH] development/p4v: Updated for version 2015.2.1315639. Signed-off-by: David Spencer --- development/p4v/doinst.sh | 6 ++++++ development/p4v/p4admin.desktop | 9 +++++++++ development/p4v/p4merge.desktop | 9 +++++++++ development/p4v/p4v.SlackBuild | 27 ++++++++++++++++++++------- development/p4v/p4v.desktop | 6 +++--- development/p4v/p4v.png | Bin 2243 -> 0 bytes 6 files changed, 47 insertions(+), 10 deletions(-) create mode 100644 development/p4v/p4admin.desktop create mode 100644 development/p4v/p4merge.desktop delete mode 100644 development/p4v/p4v.png diff --git a/development/p4v/doinst.sh b/development/p4v/doinst.sh index 5fb28930db..3e5691a052 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 0000000000..9f4b0ef72b --- /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 0000000000..bb8fdf657b --- /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 ac4531dede..56537a508d 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 7a6055ac45..315f01d2ce 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 deleted file mode 100644 index 0fb0f74c10e6a537b62f7e1c5012e5a07abe5509..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2243 zcmV;!2t4CCW*N!_6UwvPP_Od#P#pOo^Aq2J~ z9a~^~^(cC4rcpd`zJ6@E5*`QqD*@Z}iJ{x>z5S}YGGX10nu=nv;f$ZIof$vp{}QOJ zzHhHi*f!F>Wt8KQqS6 zt=-w?(Y^yu{`A2o5ATomFngAu+T_%Uc|13GVf>u`Vw$`GB$ogXHU-6tNt`u~TM7_T zAdE(+7-KZX2#^-ivgq&0a{Gb8Rw4BFey&X0$+z66fFcld_qLBc{^KwH=803J#+ZDY?7sU@wCToumL)Se26{8>-JToVJk)mR z(onCgk>WIB+5{7ld$ZmAkCDd$6(e2&@mVrAp}vFaB(r# z&mF0sJU`n!0eFrjvR4f__uO_+?F|HE9Gk%&o1tE7wCz(n9)9G(L-*N>|H-)Xvq;N9 zn-+=VNU>Z~f$J*|2!RMt>qrPjU@jBc07@Z@Ap#bFsaTnnr6jYZ?W&%=&4m~#AY)^8 zUN?MA?=^e(wpGs+YK!MlVN6qJD0H<0f-p=dR+73O8V_iuAPlrLnuY+e-WC#N2xA=s zRbVF9(WdqvzHt+s1E^SGv_@;h$mYR~oqDOO_V$~oMuW4HwdTaxQYn{7494I$6~#(Y z)7sR5AgzFY?-59+1;QwVlVQV#y!_f7a;M*nGnww(E!Q5}v-z&ucHUf{K91HJr4)W5 z@x3w`9iVfHDPO5yzwDm6>C=Px?%|HU;zb|NPbgNCS}MIDRls^501VOwVbI24XR_?s zy+MBFpxB+u>D?lq!*n>*XO82ST^y{PC!F=EZ;4C%*c?_FIH) z6UPa)x>CzkRZWuzYe>lY3akksz_u-#O-0jJn3XyzanYt_l3t*AXGJqPA0Uzl3wZgB zaQ3&axUcp1W#X-ya-FKFND@uS(_z`us{ooQ0j~rgbyNeEG^i+Ku@ckpR{^)4$68RX z!f07eN^ z0JejW0v$J*nW^aK$HU^(lJbl(Mk%c}ZtUGKxUsjdvb-V!&!?|lQSlQ0`J>*ymMX~^ zU~Y6Ix2=$~vW-%cFxC{S+Vey0u2H~y0SK)Su`kFJ5JC_~G1Ci8^X$tj6Q`zvHvo5F zuxIp3*KWVt$eQSKA~p>e%C3q2e5`T&;$n0XmUSXI^PcoSF*8fhpjeV+nU`YsVlO z;wYgWD3;1mmGug^Q~|j*p_Cv~I}j}*3awP=WbL+ZeEW{OAGl}BuC3MuM!Q2YQkxgY z8>jz1(KuoZZv*Fn3!Mc^Y}u3>BGM$WrdChXQYEUS02*lpE;-(%3TOjfEfzv3v=&H9 zVq0h_Mcb{1_ucV@J4bKIEFU9ox>RbBdGQ(tj+!#Mt1JIdE2nHbkYh;1bNxG&(!FjVZ#_2? zT|9cS@~b$}GpzOAp3cm^{nz(AoN*Xd%JfKqlW#Mb?Rz#|w{u%(VXVVvu&<4bBe6|P zSKg56SbLQiXlqBe_fso+G|N@A5jd8juiKy#&6&w2PrtBy;;ComznLg=8t^ZzP;sM) zmyQ-62et!SfoxYHbIs0O{X05ig{37XmMAQYl$1QcRjrQ6XfOsNVvr3C0wE=i1z=IG zL`V!O(abG1tBEp0Kn0jxtAYe@Q#Mxt)04M)oWRSL=Al`UEX+%!lprM9&SInu#vqKw z=mfN4bfk-+!8}H5;)ciD#e}k_X}1-|7#7QM1Ly|Y0r_qj#=y!dfQlC%dG>FmCmf3* z1pNYXfCaRY3kd=P!WgYpPhNEVE6utXC$)Qy_F}68Z$Y+J^h6zy^Q!Iydzp1OVj&&MXPS;D) zp+5`&L+ePA4|+!kI)?Ic+sag(u#q5ahmxngL>ZS>_3E@fViK-+8-6$-?;Exy^Rx3& z=O6x3^suDt$RHOgdWlxKeOkAmTALg``nTcxhLobCzso+*=7{Y^h%J^By(KrUcnx(L zm;f%)BH_maV9k1iv{ciR{x1XX&?4Zvi|FG3AZZy)o|a+^t4{r)Zn- RTG0Ri002ovPDHLkV1jidQVIY7