From 6895aaef8c871c1601b03ffebd7e20ae633d3b58 Mon Sep 17 00:00:00 2001
From: "Pawel \"l0ner\" Soltys" <pwslts@gmail.com>
Date: Sun, 29 Jan 2012 12:21:08 +0100
Subject: tqtinterface: changed installation prefix 	- cleaned up 	-
 added patch for tqt.pc installation location 		(needed later for
 compiling things with autotools) 	- changed $QTDIR to $QT3DIR

---
 .../trinity-base/trinity-tqtinterface/PKGBUILD     | 39 +++++++++-------------
 .../trinity-tqtinterface/tqtpc-location.patch      | 11 ++++++
 2 files changed, 26 insertions(+), 24 deletions(-)
 create mode 100644 arch/3.5.13/trinity-base/trinity-tqtinterface/tqtpc-location.patch

(limited to 'arch')

diff --git a/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD b/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD
index 2785c567e..5f11fd233 100644
--- a/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD
@@ -10,21 +10,15 @@ license=('GPL2')
 groups=('trinity-base')
 pkgdesc="Trinity - TQt interface"
 depends=('trinity-qt3')
-         # python2-sip
-         # trinity-pyqt3
 makedepends=('pkgconfig' 'cmake')
-            # libxi
-            # libxft
-            # libxrandr
-            # libxcursor
-            # libxinerama
-            # mesa
 conflicts=('kdemod3-tqtinterface')
 makeopts=('libtool' '!emptydirs')
-source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/tqtinterface-3.5.13.tar.gz)
-md5sums=('d54cc9fd0b35555298efd17c32471a2b')
+source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/tqtinterface-3.5.13.tar.gz'
+        'tqtpc-location.patch')
+md5sums=('d54cc9fd0b35555298efd17c32471a2b'
+         'c15745c944d98cb7c4cb553f0ca421d4')
 
-_prefix=/usr
+_prefix=/opt/qt
 
 build() {
    msg "Setting PATH, CMAKE and Trinity Environment variables"
@@ -38,28 +32,25 @@ build() {
    msg "Starting cmake..."
    cmake "../dependencies/tqtinterface" \
      -DCMAKE_INSTALL_PREFIX=${_prefix} \
-     -DQT_PREFIX_DIR=${QTDIR} \
-     -DQT_INCLUDE_DIR=${QTDIR}/include \
+     -DQT_PREFIX_DIR=${QT3DIR} \
+     -DQT_INCLUDE_DIR=${QT3DIR}/include \
      -DQT_VERSION=3 \
-     -DMOC_EXECUTABLE=${QTDIR}/bin/moc || return 1
-   #     -DQT_INCLUDE_DIR=${_prefix}/include/tqt/Qt
-   #     -DQT_LIBRARY_DIRS=/opt/qt/lib \
-   #     -DWITH_QT3=ON \
-   #     -DQT_LIBRARY_DIRS=/opt/qt/lib \
-   #     -DCMAKE_SKIP_RPATH=ON || return 1
+     -DMOC_EXECUTABLE=${QT3DIR}/bin/moc
+#     -DQT_INCLUDE_DIR=${_prefix}/include/tqt/Qt
+#     -DQT_LIBRARY_DIRS=/opt/qt/lib \
+#     -DQT_LIBRARY_DIRS=/opt/qt/lib \
+#     -DCMAKE_SKIP_RPATH=ON || return 1
    make
 }
 
 package() {
    msg "Packaging - $pkgname-$pkgver"
-   #   cd ${_svnmod}
    cd ${srcdir}/build
    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
 
-   #   rm -r ${srcdir}/${_svnmod}
 }
diff --git a/arch/3.5.13/trinity-base/trinity-tqtinterface/tqtpc-location.patch b/arch/3.5.13/trinity-base/trinity-tqtinterface/tqtpc-location.patch
new file mode 100644
index 000000000..f256e925c
--- /dev/null
+++ b/arch/3.5.13/trinity-base/trinity-tqtinterface/tqtpc-location.patch
@@ -0,0 +1,11 @@
+--- dependencies/tqtinterface/CMakeLists.txt	2011-03-28 00:12:24.000000000 +0200
++++ dependencies/tqtinterface/CMakeLists.txt.new	2012-01-29 12:15:16.000000000 +0100
+@@ -35,7 +35,7 @@
+ tde_setup_install_path( BIN_INSTALL_DIR       "${EXEC_INSTALL_PREFIX}/bin"  )
+ tde_setup_install_path( LIB_INSTALL_DIR       "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}" )
+ tde_setup_install_path( INCLUDE_INSTALL_DIR   "${CMAKE_INSTALL_PREFIX}/include/tqt" )
+-tde_setup_install_path( PKGCONFIG_INSTALL_DIR "/usr/lib${LIB_SUFFIX}/pkgconfig" )
++tde_setup_install_path( PKGCONFIG_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig" )
+ 
+ 
+ ##### tqtinterface sources ######################
-- 
cgit v1.2.1