summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPawel "l0ner" Soltys <pwslts@gmail.com>2012-01-30 16:01:10 +0100
committerPawel "l0ner" Soltys <pwslts@gmail.com>2012-01-30 16:01:10 +0100
commit073b1b4fa3748a58726d33d361684cc36d730532 (patch)
tree79f780307335834af4fab659e1ced452520a8063
parent333de29542ba1d5fb9ddccc9b0169fd11b0e0fc1 (diff)
downloadtde-packaging-073b1b4fa3748a58726d33d361684cc36d730532.tar.gz
tde-packaging-073b1b4fa3748a58726d33d361684cc36d730532.zip
tqtinterface: added .install file, minor fixups, dropped prefix in oreder to use QTDIR from profile
-rw-r--r--arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD23
-rw-r--r--arch/3.5.13/trinity-base/trinity-tqtinterface/trinity-tqtinterface.install12
2 files changed, 25 insertions, 10 deletions
diff --git a/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD b/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD
index e206f6636..da4086888 100644
--- a/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD
@@ -17,12 +17,15 @@ source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/tqtinterf
'tqtpc-location.patch')
md5sums=('d54cc9fd0b35555298efd17c32471a2b'
'c15745c944d98cb7c4cb553f0ca421d4')
+install='trinity-tqtinterface.install'
-_prefix=/opt/qt3
+# istead of using prefix, we will use QTDIR from qt3 profile
+#_prefix=/opt/qt3
build() {
msg "Setting PATH, CMAKE and Trinity Environment variables"
- . /etc/profile.d/qt3.sh
+ # Source the QT and KDE profile
+ [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
@@ -31,15 +34,15 @@ build() {
msg "Starting cmake..."
cmake "../dependencies/tqtinterface" \
- -DCMAKE_INSTALL_PREFIX=${_prefix} \
+ -DCMAKE_INSTALL_PREFIX=${QTDIR} \
-DQT_PREFIX_DIR=${QTDIR} \
-DQT_INCLUDE_DIR=${QTDIR}/include \
- -DQT_VERSION=3 \
- -DMOC_EXECUTABLE=${QTDIR}/bin/moc
-# -DQT_INCLUDE_DIR=${_prefix}/include/tqt/Qt
-# -DQT_LIBRARY_DIRS=/opt/qt/lib \
+ -DMOC_EXECUTABLE=${QTDIR}/bin/moc \
+ -DQT_VERSION=3
+# -DQT_INCLUDE_DIR=${QTDIR}/include/tqt/Qt
# -DQT_LIBRARY_DIRS=/opt/qt/lib \
# -DCMAKE_SKIP_RPATH=ON || return 1
+
make
}
@@ -49,8 +52,8 @@ package() {
make DESTDIR="${pkgdir}" install
# include uic-tqt in package
-# cd ${srcdir}
-# mkdir -p ${pkgdir}/usr/bin
-# cp -Rp ${srcdir}/${_svnmod}/qtinterface/uic-tqt ${pkgdir}/usr/bin
+ #cd ${srcdir}
+ #mkdir -p ${pkgdir}/usr/bin
+ #cp -Rp ${srcdir}/${_svnmod}/qtinterface/uic-tqt ${pkgdir}/usr/bin
}
diff --git a/arch/3.5.13/trinity-base/trinity-tqtinterface/trinity-tqtinterface.install b/arch/3.5.13/trinity-base/trinity-tqtinterface/trinity-tqtinterface.install
new file mode 100644
index 000000000..2a8dc4c98
--- /dev/null
+++ b/arch/3.5.13/trinity-base/trinity-tqtinterface/trinity-tqtinterface.install
@@ -0,0 +1,12 @@
+post_install() {
+ ldconfig &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+