Compare commits

..

4 Commits
master ... el6

Author SHA1 Message Date
Rex Dieter 57b7a6bda2 drop BR: qt4-webkit-devel
BR: gstreamer-plugins-bad-free-devel gstreamer-plugins-base-devel libXv-devel
tweaks for qt-4.6 (el6)
2011-05-23 14:04:51 -05:00
Rex Dieter 7acd80bd90 Merge branch 'origin/master' (early part) into el6
Conflicts:
	.gitignore
2011-05-23 13:46:22 -05:00
Fedora Release Engineering 58f2dda843 dist-git conversion 2010-07-29 11:08:01 +00:00
Kevin Fenzi a24813ad68 Initialize branch EL-6 for qt-mobility 2010-07-15 05:34:23 +00:00
10 changed files with 85 additions and 745 deletions

3
.gitignore vendored
View File

@ -1,2 +1 @@
/qt-mobility-opensource-src-1.2.2-20120224git.tar.xz
/qt-mobility-opensource-src-1.2.2-169da60c.tar.xz
/qt-mobility-opensource-src-1.1.3.tar.gz

View File

@ -0,0 +1,11 @@
diff -up qt-mobility-opensource-src-1.1.0/translations/translations.pro.translationsdir qt-mobility-opensource-src-1.1.0/translations/translations.pro
--- qt-mobility-opensource-src-1.1.0/translations/translations.pro.translationsdir 2010-11-01 01:36:10.000000000 -0500
+++ qt-mobility-opensource-src-1.1.0/translations/translations.pro 2010-12-08 11:29:30.007096486 -0600
@@ -97,6 +97,6 @@ isEmpty(vcproj) {
}
qmfiles.files = $$prependAll(LANGUAGES, $$OUT_PWD/qtmobility_,.qm)
-qmfiles.path = $${QT_MOBILITY_PREFIX}/translations
+qmfiles.path = $$[QT_INSTALL_TRANSLATIONS]
qmfiles.CONFIG += no_check_exist
INSTALLS += qmfiles

View File

@ -1,48 +0,0 @@
diff -up qt-mobility-opensource-src-1.2.0/plugins/multimedia/pulseaudio/qaudioinput_pulse.cpp.include-unistdh qt-mobility-opensource-src-1.2.0/plugins/multimedia/pulseaudio/qaudioinput_pulse.cpp
--- qt-mobility-opensource-src-1.2.0/plugins/multimedia/pulseaudio/qaudioinput_pulse.cpp.include-unistdh 2011-09-22 08:59:10.000000000 +0200
+++ qt-mobility-opensource-src-1.2.0/plugins/multimedia/pulseaudio/qaudioinput_pulse.cpp 2012-02-24 16:57:04.865999890 +0100
@@ -42,6 +42,8 @@
#include <QtCore/qcoreapplication.h>
#include <QtCore/qdebug.h>
+#include <unistd.h>
+
#include "qaudioinput_pulse.h"
#include "qaudiodeviceinfo_pulse.h"
#include "qpulseaudioengine.h"
diff -up qt-mobility-opensource-src-1.2.0/plugins/multimedia/pulseaudio/qaudiooutput_pulse.cpp.include-unistdh qt-mobility-opensource-src-1.2.0/plugins/multimedia/pulseaudio/qaudiooutput_pulse.cpp
--- qt-mobility-opensource-src-1.2.0/plugins/multimedia/pulseaudio/qaudiooutput_pulse.cpp.include-unistdh 2011-09-22 08:59:10.000000000 +0200
+++ qt-mobility-opensource-src-1.2.0/plugins/multimedia/pulseaudio/qaudiooutput_pulse.cpp 2012-02-24 16:55:33.570998677 +0100
@@ -42,6 +42,8 @@
#include <QtCore/qcoreapplication.h>
#include <QtCore/qdebug.h>
+#include <unistd.h>
+
#include "qaudiooutput_pulse.h"
#include "qaudiodeviceinfo_pulse.h"
#include "qpulseaudioengine.h"
diff -up qt-mobility-opensource-src-1.2.0/plugins/multimedia/pulseaudio/qpulseaudioengine.cpp.include-unistdh qt-mobility-opensource-src-1.2.0/plugins/multimedia/pulseaudio/qpulseaudioengine.cpp
--- qt-mobility-opensource-src-1.2.0/plugins/multimedia/pulseaudio/qpulseaudioengine.cpp.include-unistdh 2011-09-22 08:59:10.000000000 +0200
+++ qt-mobility-opensource-src-1.2.0/plugins/multimedia/pulseaudio/qpulseaudioengine.cpp 2012-02-24 16:57:59.394997614 +0100
@@ -41,6 +41,8 @@
#include <QtCore/qdebug.h>
+#include <unistd.h>
+
#include <qaudiodeviceinfo.h>
#include "qpulseaudioengine.h"
#include "qaudiodeviceinfo_pulse.h"
diff -up qt-mobility-opensource-src-1.2.0/src/systeminfo/linux/qsysteminfo_linux.cpp.include-unistdh qt-mobility-opensource-src-1.2.0/src/systeminfo/linux/qsysteminfo_linux.cpp
--- qt-mobility-opensource-src-1.2.0/src/systeminfo/linux/qsysteminfo_linux.cpp.include-unistdh 2011-09-22 08:59:10.000000000 +0200
+++ qt-mobility-opensource-src-1.2.0/src/systeminfo/linux/qsysteminfo_linux.cpp 2012-02-24 16:26:00.676000009 +0100
@@ -51,6 +51,8 @@
#endif // Q_WS_X11
#endif // Q_WS_MAEMO_6
+#include <unistd.h>
+
QTM_BEGIN_NAMESPACE
QSystemInfoPrivate::QSystemInfoPrivate(QSystemInfoLinuxCommonPrivate *parent)

View File

@ -1,12 +0,0 @@
diff -up qt-mobility-opensource-src-1.2.0/translations/translations.pro.translationsdir qt-mobility-opensource-src-1.2.0/translations/translations.pro
--- qt-mobility-opensource-src-1.2.0/translations/translations.pro.translationsdir 2011-05-10 10:06:16.000000000 +0200
+++ qt-mobility-opensource-src-1.2.0/translations/translations.pro 2011-05-13 16:35:38.646709799 +0200
@@ -102,7 +102,7 @@ qmfiles.files = $$prependAll(LANGUAGES,
meego|maemo6 {
qmfiles.path = $${QT_MOBILITY_PREFIX}/share/qtmobility/translations
} else {
- qmfiles.path = $${QT_MOBILITY_PREFIX}/translations
+ qmfiles.path = $$[QT_INSTALL_TRANSLATIONS]
}
qmfiles.CONFIG += no_check_exist
INSTALLS += qmfiles

View File

@ -1,20 +0,0 @@
diff -up qt-mobility-opensource-src-1.2.2/plugins/multimedia/gstreamer/qvideosurfacegstsink.cpp.gcc6 qt-mobility-opensource-src-1.2.2/plugins/multimedia/gstreamer/qvideosurfacegstsink.cpp
--- qt-mobility-opensource-src-1.2.2/plugins/multimedia/gstreamer/qvideosurfacegstsink.cpp.gcc6 2014-03-25 14:26:00.000000000 -0500
+++ qt-mobility-opensource-src-1.2.2/plugins/multimedia/gstreamer/qvideosurfacegstsink.cpp 2016-02-07 14:50:45.827775718 -0600
@@ -342,12 +342,12 @@ struct RgbFormat
static const RgbFormat qt_rgbColorLookup[] =
{
- { QVideoFrame::Format_RGB32 , 32, 24, 4321, 0x0000FF00, 0x00FF0000, 0xFF000000, 0x00000000 },
+ { QVideoFrame::Format_RGB32 , 32, 24, 4321, 0x0000FF00, 0x00FF0000, (int)0xFF000000, 0x00000000 },
{ QVideoFrame::Format_RGB32 , 32, 24, 1234, 0x00FF0000, 0x0000FF00, 0x000000FF, 0x00000000 },
- { QVideoFrame::Format_BGR32 , 32, 24, 4321, 0xFF000000, 0x00FF0000, 0x0000FF00, 0x00000000 },
+ { QVideoFrame::Format_BGR32 , 32, 24, 4321, (int)0xFF000000, 0x00FF0000, 0x0000FF00, 0x00000000 },
{ QVideoFrame::Format_BGR32 , 32, 24, 1234, 0x000000FF, 0x0000FF00, 0x00FF0000, 0x00000000 },
- { QVideoFrame::Format_ARGB32, 32, 24, 4321, 0x0000FF00, 0x00FF0000, 0xFF000000, 0x000000FF },
- { QVideoFrame::Format_ARGB32, 32, 24, 1234, 0x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000 },
+ { QVideoFrame::Format_ARGB32, 32, 24, 4321, 0x0000FF00, 0x00FF0000, (int)0xFF000000, 0x000000FF },
+ { QVideoFrame::Format_ARGB32, 32, 24, 1234, 0x00FF0000, 0x0000FF00, 0x000000FF, (int)0xFF000000 },
{ QVideoFrame::Format_RGB24 , 24, 24, 4321, 0x00FF0000, 0x0000FF00, 0x000000FF, 0x00000000 },
{ QVideoFrame::Format_BGR24 , 24, 24, 4321, 0x000000FF, 0x0000FF00, 0x00FF0000, 0x00000000 },
{ QVideoFrame::Format_RGB565, 16, 16, 1234, 0x0000F800, 0x000007E0, 0x0000001F, 0x00000000 }

View File

@ -1,219 +0,0 @@
diff -up qt-mobility-opensource-src-1.2.2/common.pri.no_rpath qt-mobility-opensource-src-1.2.2/common.pri
--- qt-mobility-opensource-src-1.2.2/common.pri.no_rpath 2014-03-25 14:26:00.000000000 -0500
+++ qt-mobility-opensource-src-1.2.2/common.pri 2014-06-04 21:48:47.572302276 -0500
@@ -105,7 +105,7 @@ 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
+ #QMAKE_RPATHDIR += $$QT_MOBILITY_LIB
} else {
# Unit test code (no plugins! test plugins are just normal plugins installed elsewhere)
testcase:QT *= testlib
diff -up qt-mobility-opensource-src-1.2.2/examples/annotatedurl/annotatedurl.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/annotatedurl/annotatedurl.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/audiodevices/audiodevices.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/audiodevices/audiodevices.pro
--- qt-mobility-opensource-src-1.2.2/examples/audiodevices/audiodevices.pro.no_rpath 2014-03-25 14:26:00.000000000 -0500
+++ qt-mobility-opensource-src-1.2.2/examples/audiodevices/audiodevices.pro 2014-06-04 21:48:47.579302202 -0500
@@ -7,7 +7,7 @@ include(../mobility_examples.pri)
CONFIG += mobility
MOBILITY = multimedia
-QMAKE_RPATHDIR += $$DESTDIR
+#QMAKE_RPATHDIR += $$DESTDIR
HEADERS = audiodevices.h
diff -up qt-mobility-opensource-src-1.2.2/examples/audioinput/audioinput.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/audioinput/audioinput.pro
--- qt-mobility-opensource-src-1.2.2/examples/audioinput/audioinput.pro.no_rpath 2014-03-25 14:26:00.000000000 -0500
+++ qt-mobility-opensource-src-1.2.2/examples/audioinput/audioinput.pro 2014-06-04 21:48:47.579302202 -0500
@@ -7,7 +7,7 @@ include(../mobility_examples.pri)
CONFIG += mobility
MOBILITY = multimedia
-QMAKE_RPATHDIR += $$DESTDIR
+#QMAKE_RPATHDIR += $$DESTDIR
HEADERS = audioinput.h
diff -up qt-mobility-opensource-src-1.2.2/examples/audiooutput/audiooutput.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/audiooutput/audiooutput.pro
--- qt-mobility-opensource-src-1.2.2/examples/audiooutput/audiooutput.pro.no_rpath 2014-03-25 14:26:00.000000000 -0500
+++ qt-mobility-opensource-src-1.2.2/examples/audiooutput/audiooutput.pro 2014-06-04 21:48:47.579302202 -0500
@@ -7,7 +7,7 @@ include(../mobility_examples.pri)
CONFIG += mobility
MOBILITY = multimedia
-QMAKE_RPATHDIR += $$DESTDIR
+#QMAKE_RPATHDIR += $$DESTDIR
HEADERS = audiooutput.h
diff -up qt-mobility-opensource-src-1.2.2/examples/audiorecorder/audiorecorder.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/audiorecorder/audiorecorder.pro
--- qt-mobility-opensource-src-1.2.2/examples/audiorecorder/audiorecorder.pro.no_rpath 2014-03-25 14:26:00.000000000 -0500
+++ qt-mobility-opensource-src-1.2.2/examples/audiorecorder/audiorecorder.pro 2014-06-04 21:48:47.580302191 -0500
@@ -7,7 +7,7 @@ include(../mobility_examples.pri)
CONFIG += mobility
MOBILITY = multimedia
-QMAKE_RPATHDIR += $$DESTDIR
+#QMAKE_RPATHDIR += $$DESTDIR
HEADERS = \
audiorecorder.h
diff -up qt-mobility-opensource-src-1.2.2/examples/battery-charge/battery-charge.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/battery-charge/battery-charge.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/battery-charge/battery-publisher/battery-publisher.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/battery-charge/battery-publisher/battery-publisher.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/bearercloud/bearercloud.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/bearercloud/bearercloud.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/bearermonitor/bearermonitor.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/bearermonitor/bearermonitor.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/bluetoothtransferplugin/bluetoothtransferplugin.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/bluetoothtransferplugin/bluetoothtransferplugin.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/btchat/btchat.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/btchat/btchat.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/btfiletransfer/btfiletransfer.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/btfiletransfer/btfiletransfer.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/btscanner/btscanner.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/btscanner/btscanner.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/calendardemo/calendardemo.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/calendardemo/calendardemo.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/camera/camera.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/camera/camera.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/connectivity/connectivity.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/connectivity/connectivity.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/declarative-camera/declarative-camera.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/declarative-camera/declarative-camera.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/declarative-connectivity/declarative-connectivity.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/declarative-connectivity/declarative-connectivity.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/declarative-connectivity/poster/poster.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/declarative-connectivity/poster/poster.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/declarative-connectivity/scanner/scanner.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/declarative-connectivity/scanner/scanner.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/declarative-location/declarative-location.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/declarative-location/declarative-location.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/declarative-location/flickr/flickr.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/declarative-location/flickr/flickr.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/declarative-location/landmarkmap/landmarkmap.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/declarative-location/landmarkmap/landmarkmap.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/declarative-location/mapviewer/mapviewer.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/declarative-location/mapviewer/mapviewer.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/declarative-messages/declarative-messages.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/declarative-messages/declarative-messages.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/declarative-music-browser/declarative-music-browser.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/declarative-music-browser/declarative-music-browser.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/declarative-sfw-dialer/declarative-sfw-dialer/declarative-sfw-dialer.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/declarative-sfw-dialer/declarative-sfw-dialer/declarative-sfw-dialer.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/declarative-sfw-dialer/declarative-sfw-dialer.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/declarative-sfw-dialer/declarative-sfw-dialer.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/declarative-sfw-dialer/landlinedialer/landlinedialer.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/declarative-sfw-dialer/landlinedialer/landlinedialer.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/declarative-sfw-dialer/remotedialer/remotedialer.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/declarative-sfw-dialer/remotedialer/remotedialer.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/declarative-sfw-dialer/voipdialer/voipdialer.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/declarative-sfw-dialer/voipdialer/voipdialer.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/declarative-sfw-notes/declarative-sfw-notes.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/declarative-sfw-notes/declarative-sfw-notes.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/declarative-systeminfo/battery2/battery2.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/declarative-systeminfo/battery2/battery2.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/declarative-systeminfo/battery/battery.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/declarative-systeminfo/battery/battery.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/declarative-systeminfo/declarative-systeminfo.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/declarative-systeminfo/declarative-systeminfo.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/declarative-systeminfo/device/device.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/declarative-systeminfo/device/device.pro
--- qt-mobility-opensource-src-1.2.2/examples/declarative-systeminfo/device/device.pro.no_rpath 2014-03-25 14:26:00.000000000 -0500
+++ qt-mobility-opensource-src-1.2.2/examples/declarative-systeminfo/device/device.pro 2014-06-04 21:49:46.959671949 -0500
@@ -17,6 +17,6 @@ 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"
+#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"
diff -up qt-mobility-opensource-src-1.2.2/examples/declarative-systeminfo/network/network.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/declarative-systeminfo/network/network.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/declarative-systeminfo/storage/storage.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/declarative-systeminfo/storage/storage.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/documentproperties/documentproperties.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/documentproperties/documentproperties.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/filemanagerplugin/filemanagerplugin.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/filemanagerplugin/filemanagerplugin.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/flickrdemo/flickrdemo.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/flickrdemo/flickrdemo.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/hapticsplayer/hapticsplayer.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/hapticsplayer/hapticsplayer.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/hapticsquare/hapticsquare.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/hapticsquare/hapticsquare.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/keepintouch/keepintouch.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/keepintouch/keepintouch.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/landmarkbrowser/landmarkbrowser.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/landmarkbrowser/landmarkbrowser.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/logfilepositionsource/logfilepositionsource.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/logfilepositionsource/logfilepositionsource.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/mapsdemo/mapsdemo.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/mapsdemo/mapsdemo.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/mediabrowser/mediabrowser.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/mediabrowser/mediabrowser.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/ndefeditor/ndefeditor.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/ndefeditor/ndefeditor.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/notesmanagerplugin/notesmanagerplugin.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/notesmanagerplugin/notesmanagerplugin.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/publish-subscribe/publish-subscribe.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/publish-subscribe/publish-subscribe.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/qmlorganizer/qmlorganizer.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/qmlorganizer/qmlorganizer.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/qsystemalignedtimer/qsystemalignedtimer.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/qsystemalignedtimer/qsystemalignedtimer.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/querymessages/querymessages.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/querymessages/querymessages.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/quickstart/quickstart.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/quickstart/quickstart.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/radio/radio.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/radio/radio.pro
--- qt-mobility-opensource-src-1.2.2/examples/radio/radio.pro.no_rpath 2014-03-25 14:26:00.000000000 -0500
+++ qt-mobility-opensource-src-1.2.2/examples/radio/radio.pro 2014-06-04 21:48:47.590302085 -0500
@@ -7,7 +7,7 @@ include(../mobility_examples.pri)
CONFIG += mobility
MOBILITY = multimedia
-QMAKE_RPATHDIR += $$DESTDIR
+#QMAKE_RPATHDIR += $$DESTDIR
HEADERS = \
radio.h
diff -up qt-mobility-opensource-src-1.2.2/examples/samplephonebook/samplephonebook.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/samplephonebook/samplephonebook.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/sensors/accel/accel.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/sensors/accel/accel.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/sensors/arrowkeys/arrowkeys.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/sensors/arrowkeys/arrowkeys.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/sensors/cubehouse/cubehouse.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/sensors/cubehouse/cubehouse.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/sensors/grueapp/grueapp.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/sensors/grueapp/grueapp.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/sensors/grueplugin/grueplugin.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/sensors/grueplugin/grueplugin.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/sensors/metadata2/metadata2.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/sensors/metadata2/metadata2.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/sensors/metadata/metadata.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/sensors/metadata/metadata.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/sensors/orientation/orientation.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/sensors/orientation/orientation.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/sensors/sensor_explorer/sensor_explorer.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/sensors/sensor_explorer/sensor_explorer.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/sensors/sensors.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/sensors/sensors.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/sensors/shakeit/shakeit.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/sensors/shakeit/shakeit.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/sensors/show_acceleration/show_acceleration.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/sensors/show_acceleration/show_acceleration.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/sensors/show_als/show_als.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/sensors/show_als/show_als.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/sensors/show_compass/show_compass.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/sensors/show_compass/show_compass.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/sensors/show_gyroscope/show_gyroscope.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/sensors/show_gyroscope/show_gyroscope.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/sensors/show_light/show_light.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/sensors/show_light/show_light.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/sensors/show_magneticflux/show_magneticflux.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/sensors/show_magneticflux/show_magneticflux.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/sensors/show_orientation/show_orientation.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/sensors/show_orientation/show_orientation.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/sensors/show_proximity/show_proximity.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/sensors/show_proximity/show_proximity.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/sensors/show_reflectance/show_reflectance.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/sensors/show_reflectance/show_reflectance.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/sensors/show_rotation/show_rotation.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/sensors/show_rotation/show_rotation.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/sensors/show_tap_gui/show_tap_gui.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/sensors/show_tap_gui/show_tap_gui.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/sensors/show_tap/show_tap.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/sensors/show_tap/show_tap.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/servicebrowser/servicebrowser.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/servicebrowser/servicebrowser.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/serviceinstaller_sfw_symbian/exampleinstaller/exampleinstaller.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/serviceinstaller_sfw_symbian/exampleinstaller/exampleinstaller.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/serviceinstaller_sfw_symbian/exampleservices.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/serviceinstaller_sfw_symbian/exampleservices.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/sfwecho/sfwecho_client2/sfwecho_client2.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/sfwecho/sfwecho_client2/sfwecho_client2.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/sfwecho/sfwecho_client/sfwecho_client.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/sfwecho/sfwecho_client/sfwecho_client.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/sfwecho/sfwecho.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/sfwecho/sfwecho.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/sfwecho/sfwecho_service/sfwecho_service.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/sfwecho/sfwecho_service/sfwecho_service.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/sfw-notes/sfw-notes.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/sfw-notes/sfw-notes.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/slideshow/slideshow.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/slideshow/slideshow.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/sysinfo/sysinfo.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/sysinfo/sysinfo.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/todo/todo.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/todo/todo.pro
diff -up qt-mobility-opensource-src-1.2.2/examples/videographicsitem/videographicsitem.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/videographicsitem/videographicsitem.pro
--- qt-mobility-opensource-src-1.2.2/examples/videographicsitem/videographicsitem.pro.no_rpath 2014-03-25 14:26:00.000000000 -0500
+++ qt-mobility-opensource-src-1.2.2/examples/videographicsitem/videographicsitem.pro 2014-06-04 21:48:47.592302064 -0500
@@ -7,7 +7,7 @@ include(../mobility_examples.pri)
CONFIG += mobility
MOBILITY = multimedia
-QMAKE_RPATHDIR += $$DESTDIR
+#QMAKE_RPATHDIR += $$DESTDIR
!symbian:contains(QT_CONFIG, opengl): QT += opengl
diff -up qt-mobility-opensource-src-1.2.2/examples/videowidget/videowidget.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/videowidget/videowidget.pro
--- qt-mobility-opensource-src-1.2.2/examples/videowidget/videowidget.pro.no_rpath 2014-03-25 14:26:00.000000000 -0500
+++ qt-mobility-opensource-src-1.2.2/examples/videowidget/videowidget.pro 2014-06-04 21:48:47.592302064 -0500
@@ -7,7 +7,7 @@ include(../mobility_examples.pri)
CONFIG += mobility
MOBILITY = multimedia
-QMAKE_RPATHDIR += $$DESTDIR
+#QMAKE_RPATHDIR += $$DESTDIR
HEADERS = \
videoplayer.h \
diff -up qt-mobility-opensource-src-1.2.2/examples/writemessage/writemessage.pro.no_rpath qt-mobility-opensource-src-1.2.2/examples/writemessage/writemessage.pro
diff -up qt-mobility-opensource-src-1.2.2/features/basic_examples_setup.pri.no_rpath qt-mobility-opensource-src-1.2.2/features/basic_examples_setup.pri
--- qt-mobility-opensource-src-1.2.2/features/basic_examples_setup.pri.no_rpath 2014-03-25 14:26:00.000000000 -0500
+++ qt-mobility-opensource-src-1.2.2/features/basic_examples_setup.pri 2014-06-04 21:48:47.572302276 -0500
@@ -42,7 +42,7 @@ mac:contains(QT_CONFIG,qt_framework) {
}
QMAKE_LIBDIR = $$OUTPUT_DIR/lib
-QMAKE_RPATHDIR+=$$QT_MOBILITY_LIB
+#QMAKE_RPATHDIR+=$$QT_MOBILITY_LIB
INCLUDEPATH+= $$QT_MOBILITY_SOURCE_TREE/src/global
maemo6 {
diff -up qt-mobility-opensource-src-1.2.2/features/mobility.prf.template.no_rpath qt-mobility-opensource-src-1.2.2/features/mobility.prf.template
--- qt-mobility-opensource-src-1.2.2/features/mobility.prf.template.no_rpath 2014-03-25 14:26:00.000000000 -0500
+++ qt-mobility-opensource-src-1.2.2/features/mobility.prf.template 2014-06-04 21:48:47.572302276 -0500
@@ -36,7 +36,7 @@ defineTest(qtMobilityAddLibrary) {
LIBS+= -L$${MOBILITY_LIB}
}
-QMAKE_RPATHDIR+=$${MOBILITY_LIB}
+#QMAKE_RPATHDIR+=$${MOBILITY_LIB}
# versit depends on contacts
contains(MOBILITY, versit) {

View File

@ -1,19 +0,0 @@
diff -up qt-mobility-opensource-src-1.2.2/features/deploy.pri.pkgconfig qt-mobility-opensource-src-1.2.2/features/deploy.pri
--- qt-mobility-opensource-src-1.2.2/features/deploy.pri.pkgconfig 2012-02-23 07:43:48.000000000 -0600
+++ qt-mobility-opensource-src-1.2.2/features/deploy.pri 2014-04-28 07:08:10.030082137 -0500
@@ -4,13 +4,14 @@ headers.path = $$QT_MOBILITY_INCLUDE/$$T
contains(TEMPLATE,.*lib) {
target.path=$$QT_MOBILITY_LIB
- maemo5|maemo6|meego {
+ linux-*|maemo5|maemo6|meego {
CONFIG += create_pc create_prl
QMAKE_PKGCONFIG_NAME = lib$$TARGET
QMAKE_PKGCONFIG_DESTDIR = pkgconfig
QMAKE_PKGCONFIG_LIBDIR = $$target.path
QMAKE_PKGCONFIG_INCDIR = $$headers.path
QMAKE_PKGCONFIG_CFLAGS = -I$${QT_MOBILITY_INCLUDE}/QtMobility
+ QMAKE_PKGCONFIG_REQUIRES_PRIVATE = QtCore
pkgconfig.files = $${TARGET}.pc
pkgconfig.path = $$QT_MOBILITY_LIB/pkgconfig

View File

@ -1,11 +0,0 @@
diff -up qt-mobility-opensource-src-1.2.2/doc/src/snippets/sensors/creating.cpp.sensors_qtbfs qt-mobility-opensource-src-1.2.2/doc/src/snippets/sensors/creating.cpp
--- qt-mobility-opensource-src-1.2.2/doc/src/snippets/sensors/creating.cpp.sensors_qtbfs 2014-03-25 14:26:00.000000000 -0500
+++ qt-mobility-opensource-src-1.2.2/doc/src/snippets/sensors/creating.cpp 2014-04-28 09:11:14.118957034 -0500
@@ -41,6 +41,7 @@
#include <QWidget>
#include <qaccelerometer.h>
+#include <qmagnetometer.h>
#include <qorientationsensor.h>
QTM_USE_NAMESPACE

View File

@ -1,84 +1,40 @@
# options
#define examples 1
%define git_long 169da60c8f657b3b61309c0a570d296107181411
%define git_short 169da60c
%define snap 20140317
#define examples 1
Name: qt-mobility
Version: 1.1.3
Release: 2%{?dist}
Summary: Qt Mobility Framework
Version: 1.2.2
Release: 0.30.%{snap}git%{git_short}%{?dist}
Group: System Environment/Libraries
License: LGPLv2 with exceptions
URL: https://code.qt.io/cgit/qt-mobility/qt-mobility.git
%if 0%{?snap:1}
# git clone https://code.qt.io/qt-mobility/qt-mobility.git
# cd qt-mobility; git archive --prefix=qt-mobility-opensource-src-%{version}/ %{git_long} | xz -9 > qt-mobility-opensources-src-%{version}-%{git_short}.tar.xz
Source0: qt-mobility-opensource-src-%{version}-%{git_short}.tar.xz
%else
URL: http://qt.nokia.com/products/qt-addons/mobility
Source0: http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-%{version}.tar.gz
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Provides: qt4-mobility = %{version}-%{release}
Provides: qt4-mobility%{?_isa} = %{version}-%{release}
## local patches
# kill rpath
Patch1: qt-mobility-opensource-src-1.2.2-no_rpath.patch
## upstreamable patches
Patch50: qt-mobility-opensource-src-1.2.0-translationsdir.patch
# add pkgconfig for linux-* platforms too, Requires.private: QtCore
Patch51: qt-mobility-opensource-src-1.2.2-pkgconfig.patch
# fix ftbfs in sensors doc
Patch52: qt-mobility-opensource-src-1.2.2-sensors_ftbfs.patch
# dso
Patch53: qt-mobility-opensource-src-1.1.0-pulseaudio-lib.patch
# gcc6 FTBFS
Patch54: qt-mobility-opensource-src-1.2.2-gcc6.patch
Patch50: qt-mobility-opensource-src-1.1.0-translationsdir.patch
## upstream patches
# double-check if this is still required -- Rex
Patch101: qt-mobility-opensource-src-1.1.0-pulseaudio-lib.patch
BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(blkid)
BuildRequires: pkgconfig(bluez)
%if 0%{?fedora} < 26 && 0%{?rhel} <= 7
BuildRequires: pkgconfig(gstreamer-plugins-bad-0.10)
BuildRequires: pkgconfig(gstreamer-app-0.10)
%endif
BuildRequires: pkgconfig(libpulse)
%if 0%{?fedora} || 0%{?rhel} > 6
BuildRequires: pkgconfig(libudev)
%endif
BuildRequires: pkgconfig(NetworkManager)
BuildRequires: pkgconfig(QtCore)
BuildRequires: pkgconfig(QtDeclarative)
BuildRequires: pkgconfig(QtGui) pkgconfig(QtOpenGL)
BuildRequires: pkgconfig(QtNetwork) >= 4.7
BuildRequires: pkgconfig(xv)
BuildRequires: proj-devel
BuildRequires: perl
BuildRequires: alsa-lib-devel
BuildRequires: bluez-libs-devel
BuildRequires: chrpath
BuildRequires: gstreamer-plugins-bad-free-devel
BuildRequires: gstreamer-plugins-base-devel
BuildRequires: libXv-devel
BuildRequires: NetworkManager-devel
BuildRequires: pulseaudio-libs-devel
## under review, http://bugzilla.redhat.com/626122
# BuildRequires: libqmf-devel >= 1.0
BuildRequires: qt4-devel
Provides: qt4-mobility = %{version}-%{release}
Provides: qt4-mobility%{?_isa} = %{version}-%{release}
# base metapackage pulls in split stuff for upgrade path
Requires: %{name}-bearer%{?_isa} = %{version}-%{release}
Requires: %{name}-connectivity%{?_isa} = %{version}-%{release}
Requires: %{name}-feedback%{?_isa} = %{version}-%{release}
Requires: %{name}-gallery%{?_isa} = %{version}-%{release}
Requires: %{name}-location%{?_isa} = %{version}-%{release}
Requires: %{name}-multimediakit%{?_isa} = %{version}-%{release}
Requires: %{name}-pim%{?_isa} = %{version}-%{release}
#Requires: %{name}-contacts%{?_isa} = %{version}-%{release}
#Requires: %{name}-organizer%{?_isa} = %{version}-%{release}
#Requires: %{name}-versit%{?_isa} = %{version}-%{release}
Requires: %{name}-publishsubscribe%{?_isa} = %{version}-%{release}
Requires: %{name}-sensors%{?_isa} = %{version}-%{release}
Requires: %{name}-serviceframework%{?_isa} = %{version}-%{release}
Requires: %{name}-systeminfo%{?_isa} = %{version}-%{release}
%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
%description
Qt Mobility Project delivers a set of new APIs to Qt with features that are well
@ -88,36 +44,29 @@ them to phones, netbooks and non-mobile personal computers. The framework not
only improves many aspects of a mobile experience, because it improves the use
of these technologies, but has applicability beyond the mobile device arena.
%package common
Summary: Common files for %{name}
%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
%description common
%{summary}.
%package devel
Summary: Qt Mobility Framework development files
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: qt4-devel
Provides: qt4-mobility-devel = %{version}-%{release}
Provides: qt4-mobility-devel%{?_isa} = %{version}-%{release}
Provides: %{name}-messaging-devel = %{version}-%{release}
Provides: %{name}-bearer-devel = %{version}-%{release}
Provides: %{name}-connectivity-devel = %{version}-%{release}
Provides: %{name}-versit-devel = %{version}-%{release}
Provides: %{name}-contacts-devel = %{version}-%{release}
Provides: %{name}-feedback-devel = %{version}-%{release}
Provides: %{name}-gallery-devel = %{version}-%{release}
Provides: %{name}-location-devel = %{version}-%{release}
Provides: %{name}-multimediakit-devel = %{version}-%{release}
Provides: %{name}-organizer-devel = %{version}-%{release}
Provides: %{name}-multimedia-devel = %{version}-%{release}
Provides: %{name}-publishsubscribe-devel = %{version}-%{release}
Provides: %{name}-sensors-devel = %{version}-%{release}
Provides: %{name}-serviceframework-devel = %{version}-%{release}
Provides: %{name}-systeminfo-devel = %{version}-%{release}
Provides: %{name}-versit-devel = %{version}-%{release}
%description devel
%{summary}.
%package doc
Summary: API documentation for %{name}
Group: Documentation
Requires: qt4
BuildArch: noarch
%description doc
@ -125,126 +74,17 @@ BuildArch: noarch
%package examples
Summary: Qt Mobility Framework examples
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
%description examples
%{summary}.
%package bearer
Summary: QtBearer support
Requires: %{name}-common%{?_isa} = %{version}-%{release}
%description bearer
%{summary}.
%package connectivity
Summary: QtConnectivity support
Requires: %{name}-common%{?_isa} = %{version}-%{release}
%description connectivity
%{summary}.
%package contacts
Summary: QtContacts support
Requires: %{name}-common%{?_isa} = %{version}-%{release}
Requires: %{name}-serviceframework%{?_isa} = %{version}-%{release}
Requires: %{name}-versit%{?_isa} = %{version}-%{release}
%description contacts
%{summary}.
%package feedback
Summary: QtFeedback support
Requires: %{name}-common%{?_isa} = %{version}-%{release}
Requires: %{name}-multimediakit%{?_isa} = %{version}-%{release}
%description feedback
%{summary}.
%package gallery
Summary: QtGallery support
Requires: %{name}-common%{?_isa} = %{version}-%{release}
%description gallery
%{summary}.
%package location
Summary: QtLocation support
Requires: %{name}-common%{?_isa} = %{version}-%{release}
%description location
%{summary}.
%package multimediakit
Summary: QtMultiMediaKit support
Requires: %{name}-common%{?_isa} = %{version}-%{release}
%description multimediakit
%{summary}.
%package organizer
Summary: QtOrganizer support
Requires: %{name}-common%{?_isa} = %{version}-%{release}
Requires: %{name}-contacts%{?_isa} = %{version}-%{release}
Requires: %{name}-versit%{?_isa} = %{version}-%{release}
%description organizer
%{summary}.
# Combine these items since they are (currently) interdependant anyway
%package pim
Summary: Qt Mobility Personal Information Management support
Requires: %{name}-common%{?_isa} = %{version}-%{release}
## contacts
Provides: %{name}-contacts%{?_isa} = %{version}-%{release}
Requires: %{name}-serviceframework%{?_isa} = %{version}-%{release}
#Requires: %{name}-versit%{?_isa} = %{version}-%{release}
## organizer
Provides: %{name}-organizer%{?_isa} = %{version}-%{release}
#Requires: %{name}-contacts%{?_isa} = %{version}-%{release}
#Requires: %{name}-versit%{?_isa} = %{version}-%{release}
## versit
Provides: %{name}-versit%{?_isa} = %{version}-%{release}
#Requires: %{name}-contacts%{?_isa} = %{version}-%{release}
#Requires: %{name}-organizer%{?_isa} = %{version}-%{release}
%description pim
%{summary}, including:
QtContacts, QtOrganzier, QtVersit, QtVersitOrganizer.
%package publishsubscribe
Summary: QtPublishSubscribe support
Requires: %{name}-common%{?_isa} = %{version}-%{release}
%description publishsubscribe
%{summary}.
%package sensors
Summary: QtSensors support
Requires: %{name}-common%{?_isa} = %{version}-%{release}
%description sensors
%{summary}.
%package serviceframework
Summary: QtServiceFramework support
Requires: %{name}-common%{?_isa} = %{version}-%{release}
%description serviceframework
%{summary}.
%package systeminfo
Summary: QtSystemInfo support
Requires: %{name}-common%{?_isa} = %{version}-%{release}
%description systeminfo
%{summary}.
%package versit
Summary: QtVersit and QtVersitOrganzier support
Requires: %{name}-common%{?_isa} = %{version}-%{release}
Requires: %{name}-contacts%{?_isa} = %{version}-%{release}
Requires: %{name}-organizer%{?_isa} = %{version}-%{release}
%description versit
%{summary}.
%prep
%setup -q -n %{name}-opensource-src-%{version}
rm -r src/3rdparty/proj
%patch1 -p1 -b .no_rpath
%patch50 -p1 -b .translationsdir
%patch51 -p1 -b .pkgconfig
%patch52 -p1 -b .sensors_ftbfs
%patch53 -p1 -b .pulseaudio_lib
%patch54 -p1 -b .gcc6
%patch101 -p1 -b .pulseaudio_lib
%build
@ -254,23 +94,17 @@ PATH=%{_qt4_bindir}:$PATH; export PATH
-prefix %{_qt4_prefix} \
-bindir %{_bindir} \
-headerdir %{_qt4_headerdir} \
-languages "ar cs da de es fr he hu ja ko pl pt ru sk sl sv uk zh_CN zh_TW" \
-libdir %{_qt4_libdir} \
-plugindir %{_qt4_plugindir} \
-qmake-exec %{_qt4_qmake} \
-release \
%{?examples:-examples}
# manually rerun qmake to ensure build flags, though this may be fragile
# consider using qmake wrapper for -qmake-exec above in that case -- rex
%{qmake_qt4} -r
make %{?_smp_mflags}
make %{?_smp_mflags} qch_docs
make %{?_smp_mflags}
%install
rm -rf %{buildroot}
make install INSTALL_ROOT=%{buildroot}
# manually install docs
@ -278,112 +112,54 @@ install -p -m644 -D doc/qch/qtmobility.qch %{buildroot}%{_qt4_docdir}/qch/qtmobi
mkdir -p %{buildroot}%{_qt4_docdir}/html/qtmobility
cp -a doc/html/* %{buildroot}%{_qt4_docdir}/html/qtmobility/
%find_lang %{name} --all-name --with-qt --without-mo
## WTF, translations went awol in 1.1.0 ? -- Rex
#find_lang %{name} --all-name --with-qt --without-mo
# die rpath, die
chrpath --delete %{buildroot}%{_bindir}/* ||:
chrpath --delete %{buildroot}%{_qt4_libdir}/libQt*.so ||:
chrpath --delete %{buildroot}%{_qt4_plugindir}/*/*.so ||:
%if 0%{?_qt4_importdir:1}
chrpath --delete %{buildroot}%{_qt4_importdir}/*/*.so ||:
chrpath --delete %{buildroot}%{_qt4_importdir}/*/*/*.so ||:
%endif
%files
# empty metapackage
%clean
rm -rf %{buildroot}
%files common -f %{name}.lang
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc LICENSE.LGPL LGPL_EXCEPTION.txt
%dir %{_qt4_importdir}/QtMobility/
%post bearer -p /sbin/ldconfig
%postun bearer -p /sbin/ldconfig
%files bearer
%doc changes*
%{_qt4_libdir}/libQtBearer.so.1*
%post connectivity -p /sbin/ldconfig
%postun connectivity -p /sbin/ldconfig
%files connectivity
%{_qt4_libdir}/libQtConnectivity.so.1*
%{_qt4_importdir}/QtMobility/connectivity/
%post feedback -p /sbin/ldconfig
%postun feedback -p /sbin/ldconfig
%files feedback
%{_qt4_libdir}/libQtFeedback.so.1*
%{_qt4_importdir}/QtMobility/feedback/
%{_qt4_plugindir}/feedback/
%post gallery -p /sbin/ldconfig
%postun gallery -p /sbin/ldconfig
%files gallery
%{_qt4_libdir}/libQtGallery.so.1*
%{_qt4_importdir}/QtMobility/gallery/
%post location -p /sbin/ldconfig
%postun location -p /sbin/ldconfig
%files location
%{_qt4_libdir}/libQtLocation.so.1*
%{_qt4_importdir}/QtMobility/location/
%{_qt4_plugindir}/geoservices/
%{_qt4_plugindir}/landmarks/
%post multimediakit -p /sbin/ldconfig
%postun multimediakit -p /sbin/ldconfig
%files multimediakit
%{_qt4_libdir}/libQtMultimediaKit.so.1*
%{_qt4_importdir}/QtMultimediaKit/
%{_qt4_plugindir}/audio/
%{_qt4_plugindir}/mediaservice/
%{_qt4_plugindir}/playlistformats/
%post pim -p /sbin/ldconfig
%postun pim -p /sbin/ldconfig
%files pim
#files contacts
%{_qt4_libdir}/libQtContacts.so.1*
%{_qt4_importdir}/QtMobility/contacts/
%{_qt4_plugindir}/contacts/
#files organizer
%{_qt4_libdir}/libQtFeedback.so.1*
%{_qt4_libdir}/libQtGallery.so.1*
%{_qt4_libdir}/libQtLocation.so.1*
%{_qt4_libdir}/libQtMultimediaKit.so.1*
%{_qt4_libdir}/libQtOrganizer.so.1*
%{_qt4_importdir}/QtMobility/organizer/
#files versit
%{_qt4_libdir}/libQtPublishSubscribe.so.1*
%{_qt4_libdir}/libQtSensors.so.1*
%{_qt4_libdir}/libQtServiceFramework.so.1*
%{_qt4_libdir}/libQtSystemInfo.so.1*
%{_qt4_libdir}/libQtVersit.so.1*
%{_qt4_libdir}/libQtVersitOrganizer.so.1*
%{_qt4_plugindir}/versit/
%post publishsubscribe -p /sbin/ldconfig
%postun publishsubscribe -p /sbin/ldconfig
%files publishsubscribe
%{_qt4_libdir}/libQtPublishSubscribe.so.1*
%{_qt4_importdir}/QtMobility/publishsubscribe/
%post sensors -p /sbin/ldconfig
%postun sensors -p /sbin/ldconfig
%files sensors
%{_qt4_libdir}/libQtSensors.so.1*
%{_qt4_importdir}/QtMobility/sensors/
%{_qt4_plugindir}/sensorgestures/
%{_qt4_plugindir}/sensors/
%post serviceframework -p /sbin/ldconfig
%postun serviceframework -p /sbin/ldconfig
%files serviceframework
%{_qt4_libdir}/libQtServiceFramework.so.1*
%{_qt4_importdir}/QtMobility/serviceframework/
%post systeminfo -p /sbin/ldconfig
%postun systeminfo -p /sbin/ldconfig
%files systeminfo
%{_qt4_libdir}/libQtSystemInfo.so.1*
%{_qt4_importdir}/QtMobility/systeminfo/
%if 0%{?_qt4_importdir:1}
%{_qt4_importdir}/QtMobility/
%{_qt4_importdir}/QtMultimediaKit/
%endif
%{_qt4_plugindir}/*
%files devel
%defattr(-,root,root,-)
%{_bindir}/icheck
%{_bindir}/ndefhandlergen
%{_bindir}/qcrmlgen
%{_bindir}/servicedbgen
%{_bindir}/servicefw
@ -394,14 +170,15 @@ cp -a doc/html/* %{buildroot}%{_qt4_docdir}/html/qtmobility/
%{_qt4_headerdir}/Qt*/
%{_qt4_libdir}/libQt*.prl
%{_qt4_libdir}/libQt*.so
%{_qt4_libdir}/pkgconfig/Qt*.pc
%files doc
%defattr(-,root,root,-)
%{_qt4_docdir}/qch/qtmobility.qch
%{_qt4_docdir}/html/qtmobility/
%if 0%{?examples}
%files examples
%defattr(-,root,root,-)
%{_qt4_bindir}/arrowkeys
%{_qt4_bindir}/audiodevices
%{_qt4_bindir}/audioinput
@ -448,128 +225,10 @@ cp -a doc/html/* %{buildroot}%{_qt4_docdir}/html/qtmobility/
%changelog
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-0.30.20140317git169da60c
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Tue Oct 31 2017 Merlin Mathesius <mmathesi@redhat.com> - 1.2.2-0.29.20140317git169da60c
- Cleanup spec file conditionals and add needed BuildRequires for perl
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-0.28.20140317git169da60c
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-0.27.20140317git169da60c
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-0.26.20140317git169da60c
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Thu Jan 26 2017 Dan Horák <dan@danny.cz> - 1.2.2-0.25.20140317git169da60c
- Rebuilt for proj 4.9.3
* Mon Dec 12 2016 Rex Dieter <rdieter@fedoraproject.org> - 1.2.2-0.24
- drop gstreamer support on f26+
* Sun Feb 07 2016 Rex Dieter <rdieter@fedoraproject.org> 1.2.2-0.23.20140317git169da60c
- gcc6 FTBFS (#1305226), update URL
* Wed Feb 03 2016 Rex Dieter <rdieter@fedoraproject.org> - 1.2.2-0.22.20140317git169da60c
- use %%qmake_qt4 macro to ensure proper build flags
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.2-0.21.20140317git169da60c
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 1.2.2-0.20.20140317git169da60c
- Rebuilt for GCC 5 C++11 ABI change
* Wed Mar 11 2015 Rex Dieter <rdieter@fedoraproject.org> 1.2.2-0.19.20140317git169da60c
- rebuild (proj)
* Wed Feb 18 2015 Rex Dieter <rdieter@fedoraproject.org> 1.2.2-0.18.20140317git169da60c
- rebuild (gcc5)
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.2-0.17.20140317git169da60c
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.2-0.16.20140317git169da60c
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Sat Jun 07 2014 Rex Dieter <rdieter@fedoraproject.org> 1.2.2-0.15.20140317git169da60c
- revert proj workaround, postinstaller's google-earth packaging is fixed
* Wed Jun 04 2014 Rex Dieter <rdieter@fedoraproject.org> 1.2.2-0.14.20140317git169da60c
- update no_rpath patch for -examples too (which isn't enabled by default yet)
* Wed Jun 04 2014 Rex Dieter <rdieter@fedoraproject.org> 1.2.2-0.13.20140317git169da60c
- -location: add explicit 'Requires: proj' to workaround google-earth packaging bug (kde#335751)
* Fri May 02 2014 Rex Dieter <rdieter@fedoraproject.org> 1.2.2-0.12.20140317git169da60c
- update URL
* Mon Apr 28 2014 Rex Dieter <rdieter@fedoraproject.org> - 1.2.2-0.11.20140317git169da60c
- split packaging
- (re)enable translations
- better rpath handling
* Mon Apr 28 2014 Rex Dieter <rdieter@fedoraproject.org> 1.2.2-0.10.20140317git169da60c
- fresh snapshot
* Mon Apr 28 2014 Rex Dieter <rdieter@fedoraproject.org> 1.2.2-0.9.20120224git
- .spec cleanup, pkgconfig: +Requires.private: QtCore
* Wed Mar 19 2014 Ville Skyttä <ville.skytta@iki.fi> - 1.2.2-0.8.20120224git
- Use system proj instead of bundled one
* Sat Mar 08 2014 Kevin Kofler <Kevin@tigcc.ticalc.org> 1.2.2-0.7.20120224git
- rebuild against fixed qt to fix -debuginfo (#1074041)
* Fri Oct 25 2013 Rex Dieter <rdieter@fedoraproject.org> 1.2.2-0.6.20120224git
- BR: pkgconfig(QtNetwork) >= 4.7
- omit udev support on el6 (ftbfs)
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.2-0.5.20120224git
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.2-0.4.20120224git
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.2-0.3.20120224git
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Thu Jun 14 2012 Rex Dieter <rdieter@fedoraproject.org> 1.2.2-0.2.20120224git
- rebuild for newer libudev/systemd (#831991)
* Fri Feb 24 2012 Rex Dieter <rdieter@fedoraproject.org> 1.2.2-0.1.20120224git
- 1.2.2 20120224git snapshot
* Fri Feb 24 2012 Rex Dieter <rdieter@fedoraproject.org> 1.2.0-9.20110922
- build in release mode
* Fri Feb 24 2012 Jaroslav Reznik <jreznik@redhat.com> - 1.2.0-8.20110922
- fix FTBFS because of missing unistd.h include
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.0-7.20110922
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Sat Oct 29 2011 Rex Dieter <rdieter@fedoraproject.org> 1.2.0-6.20110922
- add pkgconfig support
* Thu Sep 22 2011 Rex Dieter <rdieter@fedoraproject.org> 1.2.0-5.20110922
- 20110922 snapshot
- use pkgconfig-style deps
* Wed Jul 20 2011 Rex Dieter <rdieter@fedoraproject.org> 1.2.0-4
- rebuild (qt48)
* Mon May 23 2011 Rex Dieter <rdieter@fedoraproject.org> 1.2.0-3
* Mon May 23 2011 Rex Dieter <rdieter@fedoraproject.org> 1.1.3-2
- drop BR: qt4-webkit-devel
- BR: libXv-devel
* Tue May 17 2011 Rex Dieter <rdieter@fedoraproject.org> 1.2.0-2
- BR: libudev-devel
- BR: gstreamer-plugins-bad-free-devel gstreamer-plugins-base-devel
* Fri May 13 2011 Jaroslav Reznik <jreznik@redhat.com> 1.2.0-1
- 1.2.0
- BR: gstreamer-plugins-bad-free-devel gstreamer-plugins-base-devel libXv-devel
- tweaks for qt-4.6 (el6)
* Mon May 09 2011 Jaroslav Reznik <jreznik@redhat.com> 1.1.3-1
- 1.1.3

View File

@ -1 +1 @@
95ebc1a0a331ebcc9d185faa5ee20388 qt-mobility-opensource-src-1.2.2-169da60c.tar.xz
4bf0cccd007c98a35aad94436538124f qt-mobility-opensource-src-1.1.3.tar.gz