[meego-commits] 9390: Changes to Trunk:Testing/libmeegotouch

Thu Nov 11 09:05:01 UTC 2010

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

Thank You,
Fathi Boudra

[This message was auto-generated]

---

Request #9390:

  submit:   devel:qt-mtf/libmeegotouch(r115) -> Trunk:Testing/libmeegotouch


Message:
    * Thu Nov 11 2010 Wang Quanxian <quanxian.wang at intel.com> 0.20.51
- Since icu is upgrade to 4.5.2, the pc mechanism is changed
- Change to adapt icu 4.5.2
* Wed Nov 09 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.51
- BMC#9902:Spec file post errors for libmeegotouch-tests
 - fdupes order in spectacle
 - disabled /usr/sbin/locale-gen in %post because it has to generated different way
- version numbers corrention in changes file
- temporary meegotouch-theme dependency change restored 
* Mon Nov 08 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.51
- cleaning unpackaged files
- moved fdupes post install before post for test package 
* Fri Nov 05 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.51
- added correction patch for arm build arm_read_write.patch
* Thu Nov 04 2010 Kaitlin Rupert <kaitlin.rupert at intel.com> 0.20.51
- Temporarily change the meegotouch-theme version dependency to enable build
* Thu Nov 04 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.51
- updated to release 0.20.51-1
* Mon Nov 01 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.50
- updated to release 0.20.50-1
* Tue Oct 26 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.49
* Wed Oct 20 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.48
* Thu Oct 19 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.48
* Thu Oct 14 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.48
* Fri Oct 08 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.46
* Fri Oct 08 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.46
* Wed Oct 06 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.46
* Fri Oct 01 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.45

State:   new          2010-11-11T01:04:47 boudra
Comment: None



changes files:
--------------

--- libmeegotouch.changes
+++ libmeegotouch.changes
@@ -1 +1,28 @@
-* Tue Oct 26 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.49-1
+* Thu Nov 11 2010 Wang Quanxian <quanxian.wang at intel.com> 0.20.51
+- Since icu is upgrade to 4.5.2, the pc mechanism is changed
+- Change to adapt icu 4.5.2
+
+* Wed Nov 09 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.51
+- BMC#9902:Spec file post errors for libmeegotouch-tests
+ - fdupes order in spectacle
+ - disabled /usr/sbin/locale-gen in %post because it has to generated different way
+- version numbers corrention in changes file
+- temporary meegotouch-theme dependency change restored 
+
+* Mon Nov 08 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.51
+- cleaning unpackaged files
+- moved fdupes post install before post for test package 
+
+* Fri Nov 05 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.51
+- added correction patch for arm build arm_read_write.patch
+
+* Thu Nov 04 2010 Kaitlin Rupert <kaitlin.rupert at intel.com> 0.20.51
+- Temporarily change the meegotouch-theme version dependency to enable build
+
+* Thu Nov 04 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.51
+- updated to release 0.20.51-1
+
+* Mon Nov 01 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.50
+- updated to release 0.20.50-1
+
+* Tue Oct 26 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.49
@@ -4 +31 @@
-* Wed Oct 20 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.48-1
+* Wed Oct 20 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.48
@@ -8 +35 @@
-* Thu Oct 19 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.48-1
+* Thu Oct 19 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.48
@@ -13 +40 @@
-* Thu Oct 14 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.48-1
+* Thu Oct 14 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.48
@@ -19 +46 @@
-* Fri Oct 08 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.46-1
+* Fri Oct 08 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.46
@@ -24 +51 @@
-* Fri Oct 08 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.46-1
+* Fri Oct 08 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.46
@@ -33 +60 @@
-* Wed Oct 06 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.46-1
+* Wed Oct 06 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.46
@@ -38 +65 @@
-* Fri Oct 01 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.45~1
+* Fri Oct 01 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.45

old:
----
  libmeegotouch-0.20.49.tar.bz2

new:
----
  arm_read_write.patch
  libmeegotouch-0.20.51.tar.bz2

spec files:
-----------
--- libmeegotouch.spec
+++ libmeegotouch.spec
@@ -7,7 +7,7 @@
 
 Name:       libmeegotouch
 Summary:    MeeGo Touch Framework
-Version:    0.20.49
+Version:    0.20.51
 Release:    1
 Group:      System/Libraries
 License:    LGPLv2.1
@@ -18,6 +18,7 @@
 Source100:  libmeegotouch.yaml
 Patch0:     arm_ftbfs_egl.patch
 Patch1:     arm_egl_visibility.patch
+Patch2:     arm_read_write.patch
 Requires:   meegotouch-theme >= %{version}
 Requires:   libmeegotouch-l10n-en
 Requires(post): /sbin/ldconfig
@@ -30,7 +31,7 @@
 BuildRequires:  pkgconfig(gstreamer-plugins-base-0.10)
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(xdamage)
-BuildRequires:  pkgconfig(icu)
+BuildRequires:  pkgconfig(icu-uc)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(gconf-2.0)
 BuildRequires:  pkgconfig(contextprovider-1.0)
@@ -182,6 +183,8 @@
 %patch0 -p1
 # arm_egl_visibility.patch
 %patch1 -p1
+# arm_read_write.patch
+%patch2 -p1
 # >> setup
 # << setup
 
@@ -226,19 +229,6 @@
 rm -f %{buildroot}%{_datadir}/themes/base/meegotouch/widgetsgallery/feedbacks/press-space/vibra.ivt
 rm -f %{buildroot}%{_datadir}/themes/base/meegotouch/widgetsgallery/feedbacks/release-babytoy/vibra.ivt
 
-# Remove unpackaged files
-rm -f %{buildroot}%{_datadir}/l10n/meegotouch/libmeegotouch.qm
-rm -f %{buildroot}%{_datadir}/l10n/meegotouch/animatedlayout.qm
-rm -f %{buildroot}%{_datadir}/l10n/meegotouch/widgetsgallery.qm
-
-%post  tests
-# add en_US.UTF-8 locale if not already there:
-# (this locale is needed for the test ft_meegotouchgconfitem)
-if ! egrep -q -E "^[[:space:]]*en_US.UTF-8[[:space:]]+UTF-8" /etc/locale.gen ; then
-echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
-/usr/sbin/locale-gen
-fi
-
 # << install post
 %fdupes  %{buildroot}/%{_datadir}
 
@@ -395,6 +385,9 @@
 %{_datadir}/themes/base/meegotouch/widgetsgallery/style/widgetsgallery.css
 %{_datadir}/themes/base/meegotouch/widgetsgallery/svg/Widgets-Gallery-Graphics.svg
 %{_datadir}/themes/base/meegotouch/widgetsgallery/svg/multimedia-overlays.svg
+%exclude %{_datadir}/l10n/meegotouch/animatedlayout.qm
+%exclude %{_datadir}/l10n/meegotouch/libmeegotouch.qm
+%exclude %{_datadir}/l10n/meegotouch/widgetsgallery.qm
 %attr(1777, -, -) /var/cache/meegotouch
 # << files
 
@@ -489,6 +482,7 @@
 %{_includedir}/meegotouch/MGridLayoutPolicy
 %{_includedir}/meegotouch/MGroupAnimation
 %{_includedir}/meegotouch/MGroupAnimationStyle
+%{_includedir}/meegotouch/MHelpButton
 %{_includedir}/meegotouch/MHomeButtonPanel
 %{_includedir}/meegotouch/MImageWidget
 %{_includedir}/meegotouch/MImageWidgetView
@@ -667,7 +661,6 @@
 %{_includedir}/meegotouch/mcheckboxstyle.h
 %{_includedir}/meegotouch/mcheckboxview.h
 %{_includedir}/meegotouch/mcity.h
-%{_includedir}/meegotouch/mclassfactory.h
 %{_includedir}/meegotouch/mcollator.h
 %{_includedir}/meegotouch/mcombobox.h
 %{_includedir}/meegotouch/mcomboboxmodel.h
@@ -739,6 +732,7 @@
 %{_includedir}/meegotouch/mgridlayoutpolicy.h
 %{_includedir}/meegotouch/mgroupanimation.h
 %{_includedir}/meegotouch/mgroupanimationstyle.h
+%{_includedir}/meegotouch/mhelpbutton.h
 %{_includedir}/meegotouch/mhomebuttonpanel.h
 %{_includedir}/meegotouch/mhomebuttonpanelstyle.h
 %{_includedir}/meegotouch/mhomebuttonpanelview.h
@@ -898,10 +892,6 @@
 %{_includedir}/meegotouch/mstylablewidgetstyle.h
 %{_includedir}/meegotouch/mstyle.h
 %{_includedir}/meegotouch/mstylecreator.h
-%{_includedir}/meegotouch/mstylesheet.h
-%{_includedir}/meegotouch/mstylesheetattribute.h
-%{_includedir}/meegotouch/mstylesheetparser.h
-%{_includedir}/meegotouch/mstylesheetselector.h
 %{_includedir}/meegotouch/msubdatastore.h
 %{_includedir}/meegotouch/mswiperecognizer.h
 %{_includedir}/meegotouch/mswiperecognizerstyle.h
@@ -1056,7 +1046,6 @@
 %{_libdir}/libmeegotouch-tests/ft_mgconfitem
 %{_libdir}/libmeegotouch-tests/ft_mgconfitem_exec
 %{_libdir}/libmeegotouch-tests/ft_mmoc
-%{_libdir}/libmeegotouch-tests/ft_mmoc-samples
 %{_libdir}/libmeegotouch-tests/ft_mmoc-samples/ft_mmoc.h
 %{_libdir}/libmeegotouch-tests/ft_mmoc-samples/mextensionhandlemodel.h
 %{_libdir}/libmeegotouch-tests/ft_mmoc-samples/moc_ft_mmoc.cpp.correct
@@ -1088,18 +1077,15 @@
 %{_libdir}/libmeegotouch-tests/ft_numbers
 %{_libdir}/libmeegotouch-tests/ft_sorting
 %{_libdir}/libmeegotouch-tests/ft_theme
-%{_libdir}/libmeegotouch-tests/icudt42l
 %{_libdir}/libmeegotouch-tests/icudt42l/fi_FI.res
 %{_libdir}/libmeegotouch-tests/priorities.conf
 %{_libdir}/libmeegotouch-tests/test.ini
 %{_libdir}/libmeegotouch-tests/test.mov
 %{_libdir}/libmeegotouch-tests/test2.ini
-%{_libdir}/libmeegotouch-tests/translations-qttrid
 %{_libdir}/libmeegotouch-tests/translations-qttrid/ut_translations-qttrid.qm
 %{_libdir}/libmeegotouch-tests/translations-qttrid/ut_translations-qttrid_ar_EG.qm
 %{_libdir}/libmeegotouch-tests/translations-qttrid/ut_translations-qttrid_de_DE.qm
 %{_libdir}/libmeegotouch-tests/translations-qttrid/ut_translations-qttrid_en_GB.qm
-%{_libdir}/libmeegotouch-tests/translations-tr
 %{_libdir}/libmeegotouch-tests/translations-tr/ut_translations-tr_en_GB.qm
 %{_libdir}/libmeegotouch-tests/translations-tr/ut_translations-tr_fi_FI.qm
 %{_libdir}/libmeegotouch-tests/ut_mabstractitemmodel
@@ -1260,6 +1246,7 @@
 %{_libdir}/libmeegotouch-tests/ut_mtextedit
 %{_libdir}/libmeegotouch-tests/ut_mtexteditview
 %{_libdir}/libmeegotouch-tests/ut_mtheme
+%{_libdir}/libmeegotouch-tests/ut_mtheme.svg
 %{_libdir}/libmeegotouch-tests/ut_mthemedaemonprotocol
 %{_libdir}/libmeegotouch-tests/ut_mtoolbar
 %{_libdir}/libmeegotouch-tests/ut_mtoolbarview

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

++++++ arm_read_write.patch (new)
--- arm_read_write.patch
+++ arm_read_write.patch
+diff --git a/mthemedaemon/mthemedaemonserver.cpp b/mthemedaemon/mthemedaemonserver.cpp
+index 8ad2f9f..dbbe008 100644
+--- a/mthemedaemon/mthemedaemonserver.cpp
++++ b/mthemedaemon/mthemedaemonserver.cpp
+@@ -671,26 +671,30 @@ bool MThemeDaemonServer::createCacheDir(const QString& path)
+ void MThemeDaemonServer::hupSignalHandler(int)
+ {
+     char a = 1;
+-    ::write(sighupFd[0], &a, sizeof(a));
++    ssize_t writtenBytes = ::write(sighupFd[0], &a, sizeof(a));
++    Q_UNUSED(writtenBytes);
+ }
+ 
+ void MThemeDaemonServer::termSignalHandler(int)
+ {
+     char a = 1;
+-    ::write(sigtermFd[0], &a, sizeof(a));
++    ssize_t writtenBytes = ::write(sigtermFd[0], &a, sizeof(a));
++    Q_UNUSED(writtenBytes);
+ }
+ 
+ void MThemeDaemonServer::intSignalHandler(int)
+ {
+     char a = 1;
+-    ::write(sigintFd[0], &a, sizeof(a));
++    ssize_t writtenBytes = ::write(sigintFd[0], &a, sizeof(a));
++    Q_UNUSED(writtenBytes);
+ }
+ 
+ void MThemeDaemonServer::handleSigTerm()
+ {
+     snTerm->setEnabled(false);
+     char tmp;
+-    ::read(sigtermFd[1], &tmp, sizeof(tmp));
++    ssize_t readBytes = ::read(sigtermFd[1], &tmp, sizeof(tmp));
++    Q_UNUSED(readBytes);
+ 
+     // kill the daemon so that it can save it's current state (caches, refcounts, etc)
+     qApp->quit();
+@@ -702,7 +706,8 @@ void MThemeDaemonServer::handleSigHup()
+ {
+     snHup->setEnabled(false);
+     char tmp;
+-    ::read(sighupFd[1], &tmp, sizeof(tmp));
++    ssize_t readBytes = ::read(sighupFd[1], &tmp, sizeof(tmp));
++    Q_UNUSED(readBytes);
+ 
+     themeChanged(true);
+ 
+@@ -713,7 +718,8 @@ void MThemeDaemonServer::handleSigInt()
+ {
+     snInt->setEnabled(false);
+     char tmp;
+-    ::read(sigintFd[1], &tmp, sizeof(tmp));
++    ssize_t readBytes = ::read(sigintFd[1], &tmp, sizeof(tmp));
++    Q_UNUSED(readBytes);
+ 
+     // kill the daemon so that it can save it's current state (caches, refcounts, etc)
+     qApp->quit();

++++++ libmeegotouch-0.20.49.tar.bz2 -> libmeegotouch-0.20.51.tar.bz2
21552 lines of diff (skipped)

++++++ libmeegotouch.yaml
--- libmeegotouch.yaml
+++ libmeegotouch.yaml
@@ -1,6 +1,6 @@
 Name: libmeegotouch
 Summary: MeeGo Touch Framework
-Version: 0.20.49
+Version: 0.20.51
 Release: 1
 Group: System/Libraries
 License: LGPLv2.1
@@ -12,6 +12,7 @@
 Patches:
     - arm_ftbfs_egl.patch 
     - arm_egl_visibility.patch
+    - arm_read_write.patch
 Description: |
     Qt based MeeGo Touch Framework for developing touch based user interfaces.
 Requires: 
@@ -27,7 +28,7 @@
     - gstreamer-plugins-base-0.10
     - dbus-1
     - xdamage
-    - icu
+    - icu-uc
     - x11
     - gconf-2.0
     - contextprovider-1.0


