From ae3ef1513389056a61280db184943bb0ede3a1ae Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 18 Dec 2010 17:20:57 +0100 Subject: [PATCH] qt-devel-tools: do not install the phonon-gstreamer.png file, qt-plugin-gstreamer pkg was removed. --- srcpkgs/qt/files/gstreamer-logo.png | Bin 2442 -> 0 bytes srcpkgs/qt/qt-devel-tools.template | 1 + srcpkgs/qt/template | 23 ++++++++++------------- 3 files changed, 11 insertions(+), 13 deletions(-) delete mode 100644 srcpkgs/qt/files/gstreamer-logo.png diff --git a/srcpkgs/qt/files/gstreamer-logo.png b/srcpkgs/qt/files/gstreamer-logo.png deleted file mode 100644 index 0994c819fa29abae0f04ab1e53c3a2b983d7a14f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2442 zcmeAS@N?(olHy`uVBq!ia0y~yU}#`qU{K&-V_;yorBtBGz`(#*9OUlAumbbNq%pgKfq{W7$=lt9;Xep2*t>i(0|Te5r;B4q#jUr|+*87WMgD!g z(j2mA#TucNE9?JN|F1I*%68FT9VDTtyRbbVLse*|qiL}5S(Rlo?VUWQEo8s?%F*k^ z!ixezfpQZAwZ6<+_UzZU8{4h4QTKO!pHq8o=kquD^J~9Z{_i;-?z5?8 zA6J;d1<4NfL(>vdnEE4@Rjw5k4Lu%yD5ce@_ktelkCi5G_lPVE@z|4ihw%-Aj<^i7 z8AJae3#Tj3me@Udq;)7@7gKS7djIV`k21IKnJmw9jVUu<)NzmWH-^;>k$>(~Pr73w z9({IJ=vR}Nd%On>k{YfzxJ)RsHW1OSFO0Yk5?wd(WpRk7%+nZvAd%W!%H%(_h)L0>LwD;n}7kZ6n z4$Q5nm)kVobuV+HWaDWY-sz87gsP1rtsgRO`WVBUqcF)kQJ|iQ=Si~h-JFM+JLW9E z(Q?D<-_3tged}s=-DK3Z=5479=laCY=$YCpy(h#^n6=rU?YG0bpoHy8ewJ+=mc3=EB&(_ zeP^4k)q3*xXSK;To}TS{*O`~Tx>9^GeG>1lzQ4L#X1A8Ts4rrPicUdyhonsST(Q+5Z>nq8ko6)R87R}Onn;QB)F zi+KO@goJ(#d#~bWS7#nNmLh#TV_vap=8*&08mkW_SKYhEmRZ=bah>qj{?i+$WXxum zc{WjCvEv)Bvj2WdlK20AV4K7F_rTK2=l9jJT(tk;_b>BDxZZvBDc9z+@8n*$ZJx!m z(uIrXMfKjlA*^(L)t&fdQK^@2X5<~ZoS;8R{mJ&OZO$&Y-z+L|xgV;sU4*6Os>Hg& z$rBSfZ-(VIT#5)R3wXtr+PP?c;3AvwDesSef4@|hT_S4QiG5WHAL=+#_z(QEV>-Xv zp-O-M|HZ{!nN@QQ8p>TNWdrw}O}$#fc1gda^WW@_s@+@XY-3V9UyxxRH!;{*;@VrM zvJ<&UGT|}ruJubDPBPtB;`m~>*SBR8cpq$9-}OS<`^3Db7E9;JOb_n)kiWFJ(MGLG zoxR!a-uqnU4sq?hc7j?bk3P^ZAuF@tu2M`jbNjbTbDy0|=wP{q2VXO&1Qt|$| zot)q?arsQ<1qXEGZ}3ep)mvo9WSGb6kTj)h+j9-owIW; zdrZ1NqrYy;t?s>_w=36&<(a4z%uwIt?E4|x@L*Y1sr_TIqut-MTY{#GEDr`RbOkS7$2>RQ+QV5U1&9BIgdolW)GbG7Ur%09X1&hC?UYSH2acb?CE#IiAI_sZlY2an9rOyc#9 zyCY)CW~lD8Xp-+GcL%ectBdwOb=8c?ZA@Vh{9E7C_v(;)690v;37gu~E&9&w*z*4J zsq|Ev6(UoW)g+6or(NuK^=o$ezkG7{)W#)iR~$KVQ>oSsLG$drg{Ft zy_bu)lHV)m3u>wfe6qf}=bF{l#rG{+%yn$u1#a+OEnA%DH_!Qtq0^Pq{VG4}_Pw&z z*v8nqRq4lTg}l{$9IiPkM>SnbMM^)vt)0{7>-BS8A=}&SHE*+aU#}^f`$a}GR_prY z?R7UxVx}BiA-jAKjAK12U2 zCwoPHe*MvO{E@P}>M!g48Vj^Hw56)g-MsPDd8O}XwkK_VdH1c~JdP#Z%3(ilDkVr| zEmnEguly&m#{9#IeFZ`+7hrx9y7cye0N1-CxoH>J?uvK(G+m&;x1;Nwz>=Q6 znR#!Y2u{zl&a8f*{J`T=M3!A`E8j2IQw(j!2TRP>y-;|6^3&aW{>97Fq|UI&KbX2c zSn2fh%2igT!aLWWpZR3%0fPm`7vw7hH5kemeQiVM?pmq$VMzyT&L5V53)e0L2c}$l ZpZJ#TchV2RxeN>p44$rjF6*2UngF^YpF02m diff --git a/srcpkgs/qt/qt-devel-tools.template b/srcpkgs/qt/qt-devel-tools.template index a32dfd540e6..bf5d1ebc771 100644 --- a/srcpkgs/qt/qt-devel-tools.template +++ b/srcpkgs/qt/qt-devel-tools.template @@ -6,6 +6,7 @@ long_desc="${long_desc} This packages contains tools used to assist in Qt development, including the Qt Assistant, Linguist, D-Bus Viewer and Pixel Tool applications. " +revision=1 gtk_iconcache_dirs="/usr/share/icons/hicolor" Add_dependency run libgcc diff --git a/srcpkgs/qt/template b/srcpkgs/qt/template index b3012da0f6b..4fa2df599c9 100644 --- a/srcpkgs/qt/template +++ b/srcpkgs/qt/template @@ -89,36 +89,33 @@ do_build() -plugin-sql-mysql -plugin-sql-psql -no-sql-oci \ -no-sql-odbc -no-sql-sqlite2 \ -no-cups -dbus-linked -no-nas-sound -iconv -shared \ - -release -fast -no-sql-tds || return 1 + -release -fast -no-sql-tds - make ${makejobs} || return 1 + make ${makejobs} } do_install() { local hicolordir=${DESTDIR}/usr/share/icons/hicolor - cd ${wrksrc} || return 1 - make INSTALL_ROOT=${DESTDIR} install || return 1 + cd ${wrksrc} + make INSTALL_ROOT=${DESTDIR} install # install missing icons and desktop files for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do size=$(echo $(basename ${icon}) | cut -d- -f2) install -D -m644 ${icon} \ - ${hicolordir}/${size}x${size}/apps/linguist.png \ - || return 1 + ${hicolordir}/${size}x${size}/apps/linguist.png done install -D -m644 src/gui/dialogs/images/qtlogo-64.png \ - ${hicolordir}/64x64/apps/qtlogo.png || return 1 + ${hicolordir}/64x64/apps/qtlogo.png install -D -m644 src/gui/dialogs/images/qtlogo-64.png \ - ${DESTDIR}/usr/share/pixmaps/qtlogo.png || return 1 + ${DESTDIR}/usr/share/pixmaps/qtlogo.png install -D -m644 tools/assistant/tools/assistant/images/assistant.png \ - ${hicolordir}/32x32/apps/assistant.png || return 1 + ${hicolordir}/32x32/apps/assistant.png install -D -m644 tools/designer/src/designer/images/designer.png \ - ${hicolordir}/128x128/apps/designer.png || return 1 - install -D -m644 ${FILESDIR}/gstreamer-logo.png \ - ${hicolordir}/128x128/apps/phonon-gstreamer.png || return 1 + ${hicolordir}/128x128/apps/designer.png install -d ${DESTDIR}/usr/share/applications install -m644 ${FILESDIR}/*.desktop \ - ${DESTDIR}/usr/share/applications || return 1 + ${DESTDIR}/usr/share/applications }