[meego-commits] 11271: Changes to MeeGo:1.1:Core:Update:Testing/libmeegotouch

[Fathi Boudra]

Hi,
I have made the following changes to libmeegotouch in project MeeGo:1.1:Core:Update:Testing. Please review and accept ASAP.

Thank You,
Fathi Boudra

[This message was auto-generated]

---

Request #11271:

  submit:   devel:qt-mtf:MeeGo:1.1/libmeegotouch(r3) -> MeeGo:1.1:Core:Update:Testing/libmeegotouch


Message:
    * Fri Dec 24 2010 Fathi Boudra <fathi.boudra at nokia.com> - 0.20.25
- BMC#8938 - Remove linker options from meegotouch_common.prf which prevents
  compiling MTF applications if older Qt is used in the system

State:   new          2010-12-24T04:05:20 boudra
Comment: None



changes files:
--------------
--- libmeegotouch.changes
+++ libmeegotouch.changes
@@ -0,0 +1,4 @@
+* Fri Dec 24 2010 Fathi Boudra <fathi.boudra at nokia.com> - 0.20.25
+- BMC#8938 - Remove linker options from meegotouch_common.prf which prevents
+  compiling MTF applications if older Qt is used in the system
+

new:
----
  QMAKE_LFLAGS_RPATH_meegotouch_common.prf_bmc8938.patch

spec files:
-----------
--- libmeegotouch.spec
+++ libmeegotouch.spec
@@ -28,6 +28,7 @@
 Patch11:     include_order.patch
 Patch12:     arm_ftbfs_egl.patch
 Patch13:     hide_status_bar_for_vkb.patch
+Patch14:     QMAKE_LFLAGS_RPATH_meegotouch_common.prf_bmc8938.patch
 Requires:   meegotouch-theme >= 0.20.14
 Requires(pre): GConf2
 Requires(preun): GConf2
@@ -112,6 +113,8 @@
 %patch12 -p1
 # hide_status_bar_for_vkb.patch
 %patch13 -p1
+# QMAKE_LFLAGS_RPATH_meegotouch_common.prf_bmc8938.patch
+%patch14 -p1
 # >> setup
 # << setup
 

other changes:
--------------

++++++ QMAKE_LFLAGS_RPATH_meegotouch_common.prf_bmc8938.patch (new)
--- QMAKE_LFLAGS_RPATH_meegotouch_common.prf_bmc8938.patch
+++ QMAKE_LFLAGS_RPATH_meegotouch_common.prf_bmc8938.patch
+Description: backport to 0.20.25
+
+From 29ab5fe7f7a6c1b3c092c2cb19bd3cfbb2100290 Mon Sep 17 00:00:00 2001
+From: Sergiy Dubovik <sergiy.dubovik at nokia.com>
+Date: Mon, 8 Nov 2010 10:40:57 +0200
+Subject: [PATCH] Changes: Removing linker options from meegotouch_common.prf which prevents compiling MTF apps if old QT is used in the system.
+
+RevBy: Stanislav Ionascu, Tomas Junnonen
+
+Details: Those lines force linker to search for libraries in /usr/lib (if MTF installed there) which means that if your
+system QT is 4.6 (officially supported by ubuntu) and you are compiling your application with your own version of QT,
+linker will use system QT even though you used qmake from other version.
+
+--- a/mkspecs/features/meegotouch_common.prf
++++ b/mkspecs/features/meegotouch_common.prf
+@@ -22,12 +22,8 @@ contains(TEMPLATE, app) {
+     M_INC_DIR = $$M_PREFIX/include/meegotouch
+     M_LIB_DIR = $$M_LIBDIR
+ 
+-    GSTREAMER_INC = /usr/include/gstreamer-0.10 /usr/include/glib-2.0 /usr/lib/glib-2.0/include /usr/include/libxml2
+-
+-    INCLUDEPATH += $${M_INC_DIR} $${GSTREAMER_INC}
++    INCLUDEPATH += $${M_INC_DIR}
+     DEPENDPATH += $${M_INC_DIR}
+ 
+-    unix: QMAKE_LFLAGS += $${QMAKE_LFLAGS_RPATH}$${M_LIB_DIR}
+-
+     LIBS += -L$${M_LIB_DIR}
+ }
+ 

++++++ libmeegotouch.yaml
--- libmeegotouch.yaml
+++ libmeegotouch.yaml
@@ -22,6 +22,7 @@
     - include_order.patch
     - arm_ftbfs_egl.patch
     - hide_status_bar_for_vkb.patch
+    - QMAKE_LFLAGS_RPATH_meegotouch_common.prf_bmc8938.patch
 Requires: 
     - meegotouch-theme >= 0.20.14
 Description: |