[meego-commits] 5648: Changes to Trunk/libmeegotouch

Anas Nashif nashif at linux.intel.com
Tue Jul 13 22:59:27 UTC 2010 

Hi,
I have made the following changes to libmeegotouch in project Trunk. Please review and accept ASAP.

Thank You,
Anas Nashif

[This message was auto-generated]

---

Request #5648:

  submit:   Trunk:Testing/libmeegotouch(r4) -> Trunk/libmeegotouch


Message:
    Move to Trunk

State:   new          2010-07-13T10:54:04 nashif
Comment: None



changes files:
--------------
--- libmeegotouch.changes
+++ libmeegotouch.changes
@@ -0,0 +1,9 @@
+* Fri Jul 09 2010 Kaitlin Rupert <kaitlin.rupert at intel.com> 0.20.25
+- Update to release tag 0.20.25-2
+- Remove obsolete patches:
+  Remove-QtStyle-icons-from-desktop.patch
+- This update fixes BMC #2185, BMC #3564, BMC #3482
+
+* Fri Jul 09 2010 Kaitlin Rupert <kaitlin.rupert at intel.com> 0.20.15
+- Fix compile issues with updated version of gcc.
+

old:
----
  libmeegotouch-0.20.15.tar.bz2
  libmeegotouch-0.20.8-Remove-QtStyle-icons-from-desktop.patch

new:
----
  fix_locale_build_issue.patch
  fix_mbubble_build_issue.patch
  libmeegotouch-0.20.25.tar.bz2

spec files:
-----------
--- libmeegotouch.spec
+++ libmeegotouch.spec
@@ -1,13 +1,13 @@
 # 
 # Do not Edit! Generated by:
-# spectacle version 0.17
+# spectacle version 0.18
 # 
 # >> macros
 # << macros
 
 Name:       libmeegotouch
 Summary:    MeeGo Touch Framework
-Version:    0.20.15
+Version:    0.20.25
 Release:    1
 Group:      System/Libraries
 License:    LGPL v2.1
@@ -18,11 +18,12 @@
 Patch1:     libmeegotouch-0.20.1-Fix-Ensure-rowsRemoved-updates-visible-cells.patch
 Patch2:     libmeegotouch-0.20.1-ARMv5-build-failure.patch
 Patch3:     libmeegotouch-0.20.1-Add-various-devices-to-device-conf.patch
-Patch4:     libmeegotouch-0.20.8-Remove-QtStyle-icons-from-desktop.patch
-Patch5:     libmeegotouch-0.20.10-Workaround-icu-config-bug.patch
-Patch6:     libmeegotouch-0.20.10-missing-Epoch-function.patch
-Patch7:     libmeegotouch-0.20.15-Revert-c90025d6bde5184346d8bbe148effd47aef354af-Fixe.patch
-Patch8:     libmeegotouch-0.20.15-ARM-QEMU-stall-fix.patch
+Patch4:     libmeegotouch-0.20.10-Workaround-icu-config-bug.patch
+Patch5:     libmeegotouch-0.20.10-missing-Epoch-function.patch
+Patch6:     libmeegotouch-0.20.15-Revert-c90025d6bde5184346d8bbe148effd47aef354af-Fixe.patch
+Patch7:     libmeegotouch-0.20.15-ARM-QEMU-stall-fix.patch
+Patch8:     fix_locale_build_issue.patch
+Patch9:     fix_mbubble_build_issue.patch
 Requires:   meegotouch-theme >= 0.20.14
 Requires(pre): GConf2
 Requires(preun): GConf2
@@ -49,6 +50,7 @@
 Provides:   libdui >= 0.20.0
 Obsoletes:   libdui < 0.20.0
 
+
 %description
 Qt based MeeGo Touch Framework for developing touch based user interfaces
 
@@ -58,6 +60,7 @@
 Summary:    Development files for the MeeGo Touch Framework
 Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
+BuildRequires:   desktop-file-utils
 
 %description devel
 This package contains the files necessary to develop
@@ -68,6 +71,7 @@
 Summary:    QtStyle plugin for the MeeGo Touch Framework
 Group:      System/Libraries
 Requires:   %{name} = %{version}-%{release}
+BuildRequires:   desktop-file-utils
 
 %description qtstyle
 This package contains the QtStyle plugin for the MeeGo Touch Framework 
@@ -85,16 +89,18 @@
 %patch2 -p1
 # libmeegotouch-0.20.1-Add-various-devices-to-device-conf.patch
 %patch3 -p1
-# libmeegotouch-0.20.8-Remove-QtStyle-icons-from-desktop.patch
-%patch4 -p1
 # libmeegotouch-0.20.10-Workaround-icu-config-bug.patch
-%patch5 -p1
+%patch4 -p1
 # libmeegotouch-0.20.10-missing-Epoch-function.patch
-%patch6 -p1
+%patch5 -p1
 # libmeegotouch-0.20.15-Revert-c90025d6bde5184346d8bbe148effd47aef354af-Fixe.patch
-%patch7 -p1
+%patch6 -p1
 # libmeegotouch-0.20.15-ARM-QEMU-stall-fix.patch
+%patch7 -p1
+# fix_locale_build_issue.patch
 %patch8 -p1
+# fix_mbubble_build_issue.patch
+%patch9 -p1
 # >> setup
 # << setup
 
@@ -180,18 +186,10 @@
 
 
 
-%post devel
-update-desktop-database %{_datadir}/applications &> /dev/null || :
 
-%postun devel
-update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 
-%post qtstyle
-update-desktop-database %{_datadir}/applications &> /dev/null || :
 
-%postun qtstyle
-update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %files
 %defattr(-,root,root,-)

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

++++++ fix_locale_build_issue.patch (new)
--- fix_locale_build_issue.patch
+++ fix_locale_build_issue.patch
+diff -Naur libmeegotouch-0.20.15/src/corelib/i18n/mlocale.cpp libmeegotouch-0.20.15-new/src/corelib/i18n/mlocale.cpp
+--- libmeegotouch-0.20.15/src/corelib/i18n/mlocale.cpp	2010-06-03 11:13:09.000000000 -0700
++++ libmeegotouch-0.20.15-new/src/corelib/i18n/mlocale.cpp	2010-07-06 17:26:41.884866898 -0700
+@@ -739,7 +739,7 @@
+     }
+ }
+ 
+-QLocale::QLocale MLocalePrivate::createQLocale(MLocale::Category category) const
++QLocale MLocalePrivate::createQLocale(MLocale::Category category) const
+ {
+     Q_Q(const MLocale);
+     QLocale qlocale(q->categoryLanguage(category)

++++++ fix_mbubble_build_issue.patch (new)
--- fix_mbubble_build_issue.patch
+++ fix_mbubble_build_issue.patch
+diff -Naur libmeegotouch-0.20.15/src/corelib/widgets/mbubbleitemmodel.h libmeegotouch-0.20.15-new/src/corelib/widgets/mbubbleitemmodel.h
+--- libmeegotouch-0.20.15/src/corelib/widgets/mbubbleitemmodel.h	2010-06-03 11:13:09.000000000 -0700
++++ libmeegotouch-0.20.15-new/src/corelib/widgets/mbubbleitemmodel.h	2010-07-07 09:07:29.177290352 -0700
+@@ -73,7 +73,7 @@
+       \property MBubbleItemModel::type
+       \brief centralWidget.
+       */
+-    M_MODEL_PTR_PROPERTY(int, messageType, MessageType, true, NULL)
++    M_MODEL_PTR_PROPERTY(int, messageType, MessageType, true, 0)
+ 
+     /*!
+       \property MBubbleItemModel::commentsString
+diff -Naur libmeegotouch-0.20.15/src/views/mlistview_p.cpp libmeegotouch-0.20.15-new/src/views/mlistview_p.cpp
+--- libmeegotouch-0.20.15/src/views/mlistview_p.cpp	2010-06-03 11:13:09.000000000 -0700
++++ libmeegotouch-0.20.15-new/src/views/mlistview_p.cpp	2010-07-07 09:12:05.599693696 -0700
+@@ -45,7 +45,7 @@
+     moving = false;
+     hseparator = NULL;
+     headersCreator = NULL;
+-    hdrHeight = NULL;
++    hdrHeight = 0;
+     forceRepaint = false;
+     viewportTopLeft = QPointF();
+     viewportVisibleHeight = 0;
+@@ -460,7 +460,7 @@
+ int MPlainListViewPrivate::itemsCount() const
+ {
+     if (model == 0)
+-        return NULL;
++        return 0;
+ 
+     return rowCount;
+ }

++++++ libmeegotouch-0.20.1-Add-various-devices-to-device-conf.patch
--- libmeegotouch-0.20.1-Add-various-devices-to-device-conf.patch
+++ libmeegotouch-0.20.1-Add-various-devices-to-device-conf.patch
@@ -1,6 +1,6 @@
-diff -Naur libmeegotouch-0.20.15/src/corelib/workspace/devices.conf libmeegotouch-0.20.15-new/src/corelib/workspace/devices.conf
---- libmeegotouch-0.20.15/src/corelib/workspace/devices.conf	2010-06-03 11:13:09.000000000 -0700
-+++ libmeegotouch-0.20.15-new/src/corelib/workspace/devices.conf	2010-06-16 11:14:19.453987830 -0700
+diff -Naur libmeegotouch-0.20.25/src/data/devices.conf libmeegotouch-0.20.25-new/src/data/devices.conf
+--- libmeegotouch-0.20.25/src/data/devices.conf	2010-07-06 15:41:33.418741306 -0700
++++ libmeegotouch-0.20.25-new/src/data/devices.conf	2010-07-06 15:48:05.191213707 -0700
 @@ -47,3 +47,45 @@
  ppiY=209
  showStatusBar=false	
@@ -47,92 +47,3 @@
 +resolutionY=600
 +ppiX=261
 +ppiY=261
-diff -Naur libmeegotouch-0.20.15/src/corelib/workspace/devices.conf.orig libmeegotouch-0.20.15-new/src/corelib/workspace/devices.conf.orig
---- libmeegotouch-0.20.15/src/corelib/workspace/devices.conf.orig	1969-12-31 16:00:00.000000000 -0800
-+++ libmeegotouch-0.20.15-new/src/corelib/workspace/devices.conf.orig	2010-06-16 11:13:15.722701044 -0700
-@@ -0,0 +1,85 @@
-+[Default]
-+resolutionX=864
-+resolutionY=480
-+ppiX=261
-+ppiY=261
-+showStatusBar=true
-+
-+[N900]
-+resolutionX=800
-+resolutionY=480
-+ppiX=261
-+ppiY=261
-+showStatusBar=false	
-+
-+[N95]
-+resolutionX=240
-+resolutionY=320
-+ppiX=153
-+ppiY=153
-+showStatusBar=false	
-+
-+[Pineapple]
-+resolutionX=480
-+resolutionY=320
-+ppiX=163
-+ppiY=163
-+showStatusBar=false	
-+
-+[N95i]
-+resolutionX=240
-+resolutionY=800
-+ppiX=152
-+ppiY=152
-+showStatusBar=false	
-+
-+[QVGAL]
-+resolutionX=320
-+resolutionY=240
-+ppiX=152
-+ppiY=152
-+showStatusBar=true
-+
-+[N97]
-+resolutionX=640
-+resolutionY=360
-+ppiX=209
-+ppiY=209
-+showStatusBar=false	
-+
-+[mbook]
-+resolutionX=1024 
-+resolutionY=570
-+ppiX=248
-+ppiY=248
-+ 
-+[jax10]
-+resolutionX=800
-+resolutionY=460
-+ppiX=192
-+ppiY=192
-+ 
-+[dellmini]
-+resolutionX=1280
-+resolutionY=780
-+ppiX=125
-+ppiY=125
-+
-+[eero]
-+resolutionX=1280
-+resolutionY=720
-+ppiX=120
-+ppiY=120
-+
-+[aava]
-+resolutionX=864
-+resolutionY=480
-+ppiX=256
-+ppiY=256
-+
-+[russelville]
-+resolutionX=800
-+resolutionY=480
-+ppiX=120
-+ppiY=120
-+

++++++ libmeegotouch-0.20.15.tar.bz2 -> libmeegotouch-0.20.25.tar.bz2
47220 lines of diff (skipped)

++++++ libmeegotouch.yaml
--- libmeegotouch.yaml
+++ libmeegotouch.yaml
@@ -1,6 +1,6 @@
 Name: libmeegotouch
 Summary: MeeGo Touch Framework
-Version: 0.20.15
+Version: 0.20.25
 Release: 1
 Group: System/Libraries
 License: LGPL v2.1
@@ -12,11 +12,12 @@
     - libmeegotouch-0.20.1-Fix-Ensure-rowsRemoved-updates-visible-cells.patch
     - libmeegotouch-0.20.1-ARMv5-build-failure.patch
     - libmeegotouch-0.20.1-Add-various-devices-to-device-conf.patch
-    - libmeegotouch-0.20.8-Remove-QtStyle-icons-from-desktop.patch
     - libmeegotouch-0.20.10-Workaround-icu-config-bug.patch
     - libmeegotouch-0.20.10-missing-Epoch-function.patch
     - libmeegotouch-0.20.15-Revert-c90025d6bde5184346d8bbe148effd47aef354af-Fixe.patch
     - libmeegotouch-0.20.15-ARM-QEMU-stall-fix.patch
+    - fix_locale_build_issue.patch
+    - fix_mbubble_build_issue.patch
 Requires: 
     - meegotouch-theme >= 0.20.14
 Description: |

++++++ deleted files:
--- libmeegotouch-0.20.8-Remove-QtStyle-icons-from-desktop.patch

More information about the MeeGo-commits mailing list