Commit 4b1290d2 authored by abveritas's avatar abveritas

renaming qt-mobility, rebuild fro missing deps

parent a284f18c
# Support packages for Desktop
pkgname=qt-mobility
pkgver=1.2.0
pkgrel=2
pkgdesc="Qt APIs for mobile device functionality"
arch=('x86_64' 'i686')
url="http://qt.nokia.com"
license=('LGPL')
depends=('qt>=4.7' 'bluez')
makedepends=('perl' 'mesa')
optdepends=('networkmanager: Bearer Management'
'tracker: Document Gallery'
'gstreamer0.10-plugins>=0.10.19: Multimedia mediaservice plugins')
source=(http://get.qt.nokia.com/qt/add-ons/$pkgname-opensource-src-$pkgver.tar.gz
use_isabspath.patch
gcc-4.7_unistd.patch
no_rpath.patch
fix_translations_install_path.patch
QTMOBILITY-790_subdirs_for_serviceframework-b90cee3.patch
Fix_metaobjectbuilder_build_errors_4.8_and_4.7-f102053.patch)
md5sums=('ea5db5a8d3dd4709c2926dceda646bd8'
'c7051d3e8c016b26ead62818e203b201'
'5ff7e6e3c53615b7f67dceaf927be406'
'98489d85f6372af60aadac6a621069c5'
'7e02a52caef126aa7e6d9559dd4c2e4d'
'0f958da15a65464cdf0d2d7e8afe563a'
'dcba6a085c4b1c2804ecf1a2df5cd35d')
build() {
cd "$srcdir/${pkgname}-opensource-src-${pkgver}"
patch -Np1 -i ../use_isabspath.patch
patch -Np1 -i ../gcc-4.7_unistd.patch
patch -Np1 -i ../no_rpath.patch
patch -Np1 -i ../fix_translations_install_path.patch
patch -Np1 -i ../QTMOBILITY-790_subdirs_for_serviceframework-b90cee3.patch
patch -Np1 -i ../Fix_metaobjectbuilder_build_errors_4.8_and_4.7-f102053.patch
./configure -prefix /usr \
-plugindir /usr/lib/qt/plugins \
-examples \
-release \
-silent
make
}
package() {
cd "$srcdir/${pkgname}-opensource-src-${pkgver}"
make INSTALL_ROOT="$pkgdir/" install
# Install docs
install -d ${pkgdir}/usr/share/doc/qt
cp -r doc/qch ${pkgdir}/usr/share/doc/qt/
install -d ${pkgdir}/usr/share/doc/qt/html/qtmobility
cp -a doc/html/* ${pkgdir}/usr/share/doc/qt/html/qtmobility
}
Description: install translations in /usr/share/qtmobility/translations/
instead of /usr/translations/
Author: Fathi Boudra <fabo@debian.org>
---
translations/translations.pro | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/translations/translations.pro
+++ b/translations/translations.pro
@@ -99,7 +99,7 @@ isEmpty(vcproj) {
}
qmfiles.files = $$prependAll(LANGUAGES, $$OUT_PWD/qtmobility_,.qm)
-meego|maemo6 {
+meego|maemo6|linux-* {
qmfiles.path = $${QT_MOBILITY_PREFIX}/share/qtmobility/translations
} else {
qmfiles.path = $${QT_MOBILITY_PREFIX}/translations
---
plugins/multimedia/pulseaudio/qaudioinput_pulse.cpp | 2 ++
plugins/multimedia/pulseaudio/qaudiooutput_pulse.cpp | 2 ++
plugins/multimedia/pulseaudio/qpulseaudioengine.cpp | 2 ++
3 files changed, 6 insertions(+)
--- a/plugins/multimedia/pulseaudio/qaudiooutput_pulse.cpp
+++ b/plugins/multimedia/pulseaudio/qaudiooutput_pulse.cpp
@@ -39,6 +39,8 @@
**
****************************************************************************/
+#include <unistd.h>
+
#include <QtCore/qcoreapplication.h>
#include <QtCore/qdebug.h>
--- a/plugins/multimedia/pulseaudio/qaudioinput_pulse.cpp
+++ b/plugins/multimedia/pulseaudio/qaudioinput_pulse.cpp
@@ -39,6 +39,8 @@
**
****************************************************************************/
+#include <unistd.h>
+
#include <QtCore/qcoreapplication.h>
#include <QtCore/qdebug.h>
--- a/plugins/multimedia/pulseaudio/qpulseaudioengine.cpp
+++ b/plugins/multimedia/pulseaudio/qpulseaudioengine.cpp
@@ -39,6 +39,8 @@
**
****************************************************************************/
+#include <unistd.h>
+
#include <QtCore/qdebug.h>
#include <qaudiodeviceinfo.h>
Description: Remove rpath
Author: Fathi Boudra <fabo@debian.org>
---
common.pri | 2 --
examples/audiodevices/audiodevices.pro | 2 --
examples/audioinput/audioinput.pro | 2 --
examples/audiooutput/audiooutput.pro | 2 --
examples/audiorecorder/audiorecorder.pro | 2 --
examples/declarative-systeminfo/device/device.pro | 3 ---
examples/radio/radio.pro | 2 --
examples/videographicsitem/videographicsitem.pro | 1 -
examples/videowidget/videowidget.pro | 2 --
features/basic_examples_setup.pri | 1 -
features/mobility.prf.template | 1 -
11 files changed, 20 deletions(-)
--- a/common.pri
+++ b/common.pri
@@ -115,7 +115,6 @@ contains(build_unit_tests, yes) {
MOC_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET/moc
RCC_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET/rcc
UI_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET/ui
- QMAKE_RPATHDIR += $$QT_MOBILITY_LIB
} else {
# Unit test code (no plugins! test plugins are just normal plugins installed elsewhere)
testcase:QT *= testlib
@@ -126,7 +125,6 @@ contains(build_unit_tests, yes) {
MOC_DIR = $$OUTPUT_DIR/build/tests/$$SUBDIRPART/$$TARGET/moc
RCC_DIR = $$OUTPUT_DIR/build/tests/$$SUBDIRPART/$$TARGET/rcc
UI_DIR = $$OUTPUT_DIR/build/tests/$$SUBDIRPART/$$TARGET/ui
- QMAKE_RPATHDIR += $$OUTPUT_DIR/lib
}
contains(TEMPLATE,.*lib):DEFINES += QT_SHARED
--- a/examples/audiodevices/audiodevices.pro
+++ b/examples/audiodevices/audiodevices.pro
@@ -7,8 +7,6 @@ include(../mobility_examples.pri)
CONFIG += mobility
MOBILITY = multimedia
-QMAKE_RPATHDIR += $$DESTDIR
-
HEADERS = audiodevices.h
SOURCES = audiodevices.cpp \
--- a/examples/audioinput/audioinput.pro
+++ b/examples/audioinput/audioinput.pro
@@ -7,8 +7,6 @@ include(../mobility_examples.pri)
CONFIG += mobility
MOBILITY = multimedia
-QMAKE_RPATHDIR += $$DESTDIR
-
HEADERS = audioinput.h
SOURCES = audioinput.cpp \
--- a/examples/audiooutput/audiooutput.pro
+++ b/examples/audiooutput/audiooutput.pro
@@ -7,8 +7,6 @@ include(../mobility_examples.pri)
CONFIG += mobility
MOBILITY = multimedia
-QMAKE_RPATHDIR += $$DESTDIR
-
HEADERS = audiooutput.h
SOURCES = audiooutput.cpp \
--- a/examples/audiorecorder/audiorecorder.pro
+++ b/examples/audiorecorder/audiorecorder.pro
@@ -7,8 +7,6 @@ include(../mobility_examples.pri)
CONFIG += mobility
MOBILITY = multimedia
-QMAKE_RPATHDIR += $$DESTDIR
-
HEADERS = \
audiorecorder.h
--- a/examples/radio/radio.pro
+++ b/examples/radio/radio.pro
@@ -7,8 +7,6 @@ include(../mobility_examples.pri)
CONFIG += mobility
MOBILITY = multimedia
-QMAKE_RPATHDIR += $$DESTDIR
-
HEADERS = \
radio.h
--- a/examples/videowidget/videowidget.pro
+++ b/examples/videowidget/videowidget.pro
@@ -7,8 +7,6 @@ include(../mobility_examples.pri)
CONFIG += mobility
MOBILITY = multimedia
-QMAKE_RPATHDIR += $$DESTDIR
-
HEADERS = \
videoplayer.h \
videowidget.h \
--- a/examples/videographicsitem/videographicsitem.pro
+++ b/examples/videographicsitem/videographicsitem.pro
@@ -7,7 +7,6 @@ include(../mobility_examples.pri)
CONFIG += mobility
MOBILITY = multimedia
-QMAKE_RPATHDIR += $$DESTDIR
!symbian:contains(QT_CONFIG, opengl): QT += opengl
--- a/features/basic_examples_setup.pri
+++ b/features/basic_examples_setup.pri
@@ -42,7 +42,6 @@ mac:contains(QT_CONFIG,qt_framework) {
}
QMAKE_LIBDIR = $$OUTPUT_DIR/lib
-QMAKE_RPATHDIR+=$$QT_MOBILITY_LIB
INCLUDEPATH+= $$QT_MOBILITY_SOURCE_TREE/src/global
maemo6 {
--- a/features/mobility.prf.template
+++ b/features/mobility.prf.template
@@ -36,7 +36,6 @@ defineTest(qtMobilityAddLibrary) {
LIBS+= -L$${MOBILITY_LIB}
}
-QMAKE_RPATHDIR+=$${MOBILITY_LIB}
# versit depends on contacts
contains(MOBILITY, versit) {
--- a/examples/declarative-systeminfo/device/device.pro
+++ b/examples/declarative-systeminfo/device/device.pro
@@ -17,6 +17,3 @@ symbian {
}
RESOURCES += device.qrc
-QMAKE_LFLAGS_DEBUG += "-Wl,-rpath,/home/user/qt/lib"
-QMAKE_LFLAGS_RPATH += "-Wl,-rpath,/home/user/qt/lib"
-QMAKE_LFLAGS_RELEASE += "-Wl,-rpath,/home/user/qt/lib"
Description: use isAbsPath() for Debian instead of pathhelper.
pathhelper uses abs_path and returns undef for non-existent path.
Author: Fathi Boudra <fabo@debian.org>
---
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/configure
+++ b/configure
@@ -58,7 +58,7 @@ isAbsPath() {
# maemo we do not want to follow symbolic links that are
# introduced by scratchbox
absPath() {
- if [ "$2" = "maemo5" -o "$2" = "maemo6" -o "$2" = "meego" ]; then
+ if [ "$2" = "maemo5" -o "$2" = "maemo6" -o "$2" = "meego" -o "$2" = "" ]; then
if [ `isAbsPath $1` = '1' ]; then
echo $1;
else
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment