Compare commits

..

11 Commits

Author SHA1 Message Date
openeuler-ci-bot
3d9f3662b3
!15 [sync] PR-12: 增加source来源注释
From: @openeuler-sync-bot 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang
2024-03-26 09:29:01 +00:00
lyn1001
30e06c7013 fix source
(cherry picked from commit 3396ad5bb7ddaa527c9318c3ac23b477d60e1b7c)
2024-03-26 09:01:08 +08:00
openeuler-ci-bot
b0a86ecae9
!11 [sync] PR-10: fix build error
From: @openeuler-sync-bot 
Reviewed-by: @small_leek 
Signed-off-by: @small_leek
2022-04-12 03:28:28 +00:00
chen-jan
929a90439e fix build error
(cherry picked from commit 50473263b6b66a820c26419150f7437b0248857c)
2022-04-07 11:18:25 +08:00
openeuler-ci-bot
c0c8f46ba9
!8 update to upstream version 1.2.2-4
Merge pull request !8 from pei-jiankang/master
2022-01-11 06:31:28 +00:00
pei-jiankang
aa97912e0e update to upstream version 1.2.2-4 2021-12-30 20:00:17 +08:00
openeuler-ci-bot
aff6088937 !5 fix rpath error
From: @wang_yue111
Reviewed-by: @small_leek
Signed-off-by: @small_leek
2021-09-10 02:23:52 +00:00
wang_yue111
8da4e5802a fix rpath error 2021-09-09 21:07:45 +08:00
openeuler-ci-bot
539a126601 !4 modify yaml
Merge pull request !4 from huanghaitao/master
2020-07-07 21:02:47 +08:00
hht8
9b2c7c8554 modify yaml 2020-07-07 11:40:05 +08:00
openeuler-ci-bot
0bdf3ae3d7 !3 Add qt-mobility.yaml
Merge pull request !3 from huanghaitao/master
2020-05-13 15:32:50 +08:00
7 changed files with 346 additions and 19 deletions

23
qt-mobility-libnm.patch Normal file
View File

@ -0,0 +1,23 @@
diff -up qt-mobility-opensource-src-1.2.2/config.tests/networkmanager/main.cpp.libnm qt-mobility-opensource-src-1.2.2/config.tests/networkmanager/main.cpp
--- qt-mobility-opensource-src-1.2.2/config.tests/networkmanager/main.cpp.libnm 2014-03-25 14:26:00.000000000 -0500
+++ qt-mobility-opensource-src-1.2.2/config.tests/networkmanager/main.cpp 2018-07-21 20:32:28.267494349 -0500
@@ -41,7 +41,7 @@
#if defined(QT_NO_DBUS)
sjkp //error is no QtDBus
#endif
-#include <NetworkManager/NetworkManager.h>
+#include <NetworkManager.h>
int main(int argc, char** argv)
{
diff -up qt-mobility-opensource-src-1.2.2/config.tests/networkmanager/networkmanager.pro.libnm qt-mobility-opensource-src-1.2.2/config.tests/networkmanager/networkmanager.pro
--- qt-mobility-opensource-src-1.2.2/config.tests/networkmanager/networkmanager.pro.libnm 2014-03-25 14:26:00.000000000 -0500
+++ qt-mobility-opensource-src-1.2.2/config.tests/networkmanager/networkmanager.pro 2018-07-21 20:32:13.362392782 -0500
@@ -12,3 +12,7 @@ SOURCES += main.cpp
!contains(QT_CONFIG,dbus): {
DEFINES += QT_NO_DBUS
}
+
+CONFIG += link_pkgconfig
+
+PKGCONFIG += libnm

View File

@ -0,0 +1,11 @@
--- qt-mobility-opensource-src-1.1.0/src/multimedia/audio/audio.pri.orig 2010-09-08 19:07:17.624306462 -0300
+++ qt-mobility-opensource-src-1.1.0/src/multimedia/audio/audio.pri 2010-09-08 19:07:32.694317010 -0300
@@ -68,7 +68,7 @@
SOURCES += audio/qaudiodeviceinfo_alsa_p.cpp \
audio/qaudiooutput_alsa_p.cpp \
audio/qaudioinput_alsa_p.cpp
- LIBS_PRIVATE += -lasound
+ LIBS_PRIVATE += -lasound -lpulse
}
}
}

View File

@ -0,0 +1,12 @@
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

@ -0,0 +1,219 @@
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) {

10
qt-mobility-proj6.patch Normal file
View File

@ -0,0 +1,10 @@
diff -up qt-mobility-opensource-src-1.2.2/config.tests/proj/proj.pro.proj6 qt-mobility-opensource-src-1.2.2/config.tests/proj/proj.pro
--- qt-mobility-opensource-src-1.2.2/config.tests/proj/proj.pro.proj6 2014-03-25 13:26:00.000000000 -0600
+++ qt-mobility-opensource-src-1.2.2/config.tests/proj/proj.pro 2019-09-08 19:57:01.450992211 -0600
@@ -1,5 +1,6 @@
TEMPLATE = app
LIBS += -lproj
+QMAKE_CXXFLAGS += -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
SOURCES += proj.cpp

View File

@ -1,18 +1,27 @@
Name: qt-mobility
Version: 1.2.2
Release: 2
Release: 6
Summary: Framwork of qt mobility
License: LGPLv2 with exceptions
URL: https://code.qt.io/cgit/qt-mobility/qt-mobility.git
#git clone https://code.qt.io/qt-mobility/qt-mobility.git
#cd qt-mobility/
#git archive --prefix=qt-mobility-opensource-src-1.2.2/ 169da60c8f657b3b61309c0a570d296107181411 |xz -9 >qt-mobility-opensource-src-1.2.2-169da60c.tar.xz
Source0: qt-mobility-opensource-src-%{version}-169da60c.tar.xz
Patch0: qt-mobility-opensource-src-1.2.2-gcc6.patch
Patch1: qt-mobility-opensource-src-1.2.2-pkgconfig.patch
Patch2: qt-mobility-opensource-src-1.2.2-sensors_ftbfs.patch
Patch3: qt-mobility-opensource-src-1.2.2-no_rpath.patch
Patch4: qt-mobility-proj6.patch
Patch5: qt-mobility-opensource-src-1.2.0-translationsdir.patch
Patch6: qt-mobility-opensource-src-1.1.0-pulseaudio-lib.patch
Patch7: qt-mobility-libnm.patch
BuildRequires: gcc-c++ perl proj-devel pkgconfig(xv) pkgconfig(QtGui) pkgconfig(QtOpenGL)
BuildRequires: gcc-c++ perl pkgconfig(xv) pkgconfig(QtGui) pkgconfig(QtOpenGL)
BuildRequires: pkgconfig(QtDeclarative) pkgconfig(QtCore) pkgconfig(libudev) pkgconfig(libnm)
BuildRequires: pkgconfig(alsa) pkgconfig(blkid) pkgconfig(bluez) pkgconfig(libpulse)
BuildRequires: pkgconfig(alsa) pkgconfig(blkid) pkgconfig(bluez) pkgconfig(libpulse) chrpath
Requires: qt4
#BuildRequires: make pkgconfig(gstreamer-plugins-bad-1.0) pkgconfig(gstreamer-app-1.0) pkgconfig(QtNetwork) >= 4.7
Provides: qt4-mobility = %{version}-%{release} qt4-mobility%{?_isa} = %{version}-%{release}
Provides: %{name}-connectivity = %{version}-%{release} %{name}-contacts = %{version}-%{release}
@ -38,24 +47,38 @@ features. It will be used by developers to build a variety of applications and s
capable or familiar to mobile users, irrespective of whether the platform is mobile or not. This means
that there is the possibility of easy transfer of user experience from PC to phone or vice versa.
%package devel
Summary: The development files for %{name}
Requires: qt4-devel %{name} = %{version}-%{release}
Provides: qt4-mobility-devel = %{version}-%{release} qt4-mobility-devel%{?_isa} = %{version}-%{release}
Provides: %{name}-bearer-devel = %{version}-%{release} %{name}-connectivity-devel = %{version}-%{release}
Provides: %{name}-feedback-devel = %{version}-%{release} %{name}-contacts-devel = %{version}-%{release}
Provides: %{name}-gallery-devel = %{version}-%{release} %{name}-location-devel = %{version}-%{release}
Provides: %{name}-multimediakit-devel = %{version}-%{release} %{name}-organizer-devel = %{version}-%{release}
Provides: %{name}-publishsubscribe-devel = %{version}-%{release} %{name}-sensors-devel = %{version}-%{release}
Provides: %{name}-serviceframework-devel = %{version}-%{release} %{name}-versit-devel = %{version}-%{release}
Provides: %{name}-systeminfo-devel = %{version}-%{release}
%package devel
Summary: The development files for %{name}
Requires: qt4-devel %{name} = %{version}-%{release}
Provides: qt4-mobility-devel = %{version}-%{release} qt4-mobility-devel%{?_isa} = %{version}-%{release}
Provides: %{name}-bearer-devel = %{version}-%{release} %{name}-connectivity-devel = %{version}-%{release}
Provides: %{name}-feedback-devel = %{version}-%{release} %{name}-contacts-devel = %{version}-%{release}
Provides: %{name}-gallery-devel = %{version}-%{release} %{name}-location-devel = %{version}-%{release}
Provides: %{name}-multimediakit-devel = %{version}-%{release} %{name}-organizer-devel = %{version}-%{release}
Provides: %{name}-publishsubscribe-devel = %{version}-%{release} %{name}-sensors-devel = %{version}-%{release}
Provides: %{name}-serviceframework-devel = %{version}-%{release} %{name}-versit-devel = %{version}-%{release}
Provides: %{name}-systeminfo-devel = %{version}-%{release}
%description devel
%description devel
This package contain the development files for %{name}.
%package doc
Summary: API documentation for %{name}
Requires: qt4
BuildArch: noarch
%description doc
%{summary}.
%prep
%autosetup -n %{name}-opensource-src-%{version} -p1
rm -r src/3rdparty/proj
%setup -q -n %{name}-opensource-src-%{version}
%patch0 -p1 -b .gcc6
%patch1 -p1 -b .pkgconfig
%patch2 -p1 -b .sensors_ftbfs
%patch3 -p1 -b .no_rpath
%patch4 -p1 -b .proj6
%patch5 -p1 -b .translationsdir
%patch6 -p1 -b .pulseaudio_lib
%patch7 -p1 -b .libnm
%build
PATH=%{_qt4_bindir}:$PATH; export PATH
@ -64,6 +87,7 @@ PATH=%{_qt4_bindir}:$PATH; export PATH
-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} \
export CXXFLAGS="%{optflags} -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"
%{qmake_qt4} -r
%make_build
%make_build qch_docs
@ -71,10 +95,22 @@ PATH=%{_qt4_bindir}:$PATH; export PATH
%install
make install INSTALL_ROOT=%{buildroot}
install -p -m644 -D doc/qch/qtmobility.qch %{buildroot}%{_qt4_docdir}/qch/qtmobility.qch
mkdir -p %{buildroot}%{_qt4_docdir}/html/qtmobility
cp -a doc/html/* %{buildroot}%{_qt4_docdir}/html/qtmobility/
mv %{buildroot}%{_qt4_translationdir} %{buildroot}%{_qt4_prefix}
%find_lang %{name} --all-name --with-qt --without-mo
%ldconfig_scriptlets
cd $RPM_BUILD_ROOT/usr
file `find -type f` | grep -w ELF | awk -F":" '{print $1}' | for i in `xargs`
do
chrpath -d $i
done
cd -
%files -f %{name}.lang
%license LICENSE.LGPL LGPL_EXCEPTION.txt
%dir %{_qt4_importdir}/QtMobility/
@ -97,6 +133,22 @@ make install INSTALL_ROOT=%{buildroot}
%{_qt4_libdir}/{libQt*.prl,libQt*.so}
%{_qt4_libdir}/pkgconfig/Qt*.pc
%files doc
%{_qt4_docdir}/qch/qtmobility.qch
%{_qt4_docdir}/html/qtmobility/
%changelog
* Sat Nov 19 2022 liyanan <liyanan32@h-partners.com> - 1.2.2-6
- Change source
* Mon Jan 24 2022 chenchen <chen_aka_jan@163.com> - 1.2.2-5
- remove proj for fix build error
* Wed Oct 13 2021 peijiankang <peijiankang@kylinos.cn> - 1.2.2-4
- update to upstream version 1.2.2-4
* Thu Sep 09 2021 wangyue <wangyue92@huawei.com> - 1.2.2-2
- fix rpath error
* Thu Dec 12 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.2.2-1
- Package init

View File

@ -1,4 +1,4 @@
version_control: git
src_repo: https://code.qt.io/qt-mobility/qt-mobility.git
tag_pattern: ^v
seperator: .
tag_prefix: "^v"
separator: "."