| 1 |
hwoarang 10/05/04 13:49:28 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: qt-assistant-4.6.2-r2.ebuild |
| 5 |
Removed: qt-assistant-4.6.2-r1.ebuild |
| 6 |
Log: |
| 7 |
Finally fixing bug #318163 |
| 8 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.78 x11-libs/qt-assistant/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/ChangeLog?rev=1.78&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/ChangeLog?rev=1.78&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/ChangeLog?r1=1.77&r2=1.78 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v |
| 20 |
retrieving revision 1.77 |
| 21 |
retrieving revision 1.78 |
| 22 |
diff -u -r1.77 -r1.78 |
| 23 |
--- ChangeLog 2 May 2010 19:22:00 -0000 1.77 |
| 24 |
+++ ChangeLog 4 May 2010 13:49:28 -0000 1.78 |
| 25 |
@@ -1,6 +1,12 @@ |
| 26 |
# ChangeLog for x11-libs/qt-assistant |
| 27 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.77 2010/05/02 19:22:00 hwoarang Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.78 2010/05/04 13:49:28 hwoarang Exp $ |
| 30 |
+ |
| 31 |
+*qt-assistant-4.6.2-r2 (04 May 2010) |
| 32 |
+ |
| 33 |
+ 04 May 2010; Markos Chandras <hwoarang@g.o> |
| 34 |
+ -qt-assistant-4.6.2-r1.ebuild, +qt-assistant-4.6.2-r2.ebuild: |
| 35 |
+ Finally fixing bug #318163 |
| 36 |
|
| 37 |
02 May 2010; Markos Chandras <hwoarang@g.o> |
| 38 |
qt-assistant-4.6.2-r1.ebuild: |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.1 x11-libs/qt-assistant/qt-assistant-4.6.2-r2.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.6.2-r2.ebuild?rev=1.1&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.6.2-r2.ebuild?rev=1.1&content-type=text/plain |
| 46 |
|
| 47 |
Index: qt-assistant-4.6.2-r2.ebuild |
| 48 |
=================================================================== |
| 49 |
# Copyright 1999-2010 Gentoo Foundation |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.6.2-r2.ebuild,v 1.1 2010/05/04 13:49:28 hwoarang Exp $ |
| 52 |
|
| 53 |
EAPI="2" |
| 54 |
inherit qt4-build |
| 55 |
|
| 56 |
DESCRIPTION="The assistant help module for the Qt toolkit" |
| 57 |
SLOT="4" |
| 58 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" |
| 59 |
IUSE="trace" |
| 60 |
|
| 61 |
DEPEND="~x11-libs/qt-gui-${PV}[aqua=,trace?] |
| 62 |
~x11-libs/qt-sql-${PV}[aqua=,sqlite] |
| 63 |
~x11-libs/qt-webkit-${PV}[aqua=]" |
| 64 |
RDEPEND="${DEPEND}" |
| 65 |
|
| 66 |
PATCHES=( "${FILESDIR}/${PN}-4.6.1-tools.patch" ) |
| 67 |
|
| 68 |
# Pixeltool isn't really assistant related, but it relies on |
| 69 |
# the assistant libraries. doc/qch/ |
| 70 |
QT4_TARGET_DIRECTORIES=" |
| 71 |
tools/assistant |
| 72 |
tools/pixeltool |
| 73 |
tools/qdoc3" |
| 74 |
QT4_EXTRACT_DIRECTORIES=" |
| 75 |
tools/ |
| 76 |
demos/ |
| 77 |
examples/ |
| 78 |
src/ |
| 79 |
include/ |
| 80 |
doc/" |
| 81 |
|
| 82 |
pkg_setup() { |
| 83 |
use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} |
| 84 |
tools/qttracereplay" |
| 85 |
QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} \ |
| 86 |
${QT4_EXTRACT_DIRECTORIES}" |
| 87 |
qt4-build_pkg_setup |
| 88 |
} |
| 89 |
|
| 90 |
src_configure() { |
| 91 |
myconf="${myconf} -no-xkb -no-fontconfig -no-xrender -no-xrandr |
| 92 |
-no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl |
| 93 |
-no-nas-sound -no-dbus -iconv -no-cups -no-nis -no-gif -no-libpng |
| 94 |
-no-libmng -no-libjpeg -no-openssl -system-zlib -no-phonon |
| 95 |
-no-xmlpatterns -no-freetype -no-libtiff -no-accessibility |
| 96 |
-no-fontconfig -no-glib -no-multimedia -no-qt3support -no-svg" |
| 97 |
qt4-build_src_configure |
| 98 |
} |
| 99 |
|
| 100 |
src_compile() { |
| 101 |
# help libQtHelp find freshly built libQtCLucene (bug #289811) |
| 102 |
export LD_LIBRARY_PATH="${S}/lib" |
| 103 |
export DYLD_LIBRARY_PATH="${S}/lib:${S}/lib/QtHelp.framework" |
| 104 |
qt4-build_src_compile |
| 105 |
# ugly hack to build docs |
| 106 |
cd "${S}" |
| 107 |
qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" projects.pro || die "qmake projects faied" |
| 108 |
emake qch_docs || die "emake docs failed" |
| 109 |
} |
| 110 |
|
| 111 |
src_install() { |
| 112 |
qt4-build_src_install |
| 113 |
# install documentation |
| 114 |
# note that emake install_qchdocs fails for undefined reason so we use a |
| 115 |
# workaround |
| 116 |
cd "${S}" |
| 117 |
insinto ${QTDOCDIR#${EPREFIX}} |
| 118 |
doins -r "${S}"/doc/qch || die "doins qch documentation failed" |
| 119 |
dobin "${S}"/bin/qdoc3 || die "Installing qdoc3 failed" |
| 120 |
#emake INSTALL_ROOT="${D}" install_qchdocs || die "emake install_qchdocs failed" |
| 121 |
# install correct assistant icon, bug 241208 |
| 122 |
dodir /usr/share/pixmaps/ || die "dodir failed" |
| 123 |
insinto /usr/share/pixmaps/ || die "insinto failed" |
| 124 |
doins tools/assistant/tools/assistant/images/assistant.png \ |
| 125 |
|| die "doins failed" |
| 126 |
# Note: absolute image path required here! |
| 127 |
make_desktop_entry /usr/bin/assistant Assistant \ |
| 128 |
/usr/share/pixmaps/assistant.png 'Qt;Development;GUIDesigner' \ |
| 129 |
|| die "make_desktop_entry failed" |
| 130 |
} |
Archives