[meego-commits] 7528: Changes to Trunk:Testing/libmeegotouch
Miroslav Safr
no_reply at build.meego.com
Wed Sep 15 13:25:48 UTC 2010
Hi,
I have made the following changes to libmeegotouch in project Trunk:Testing. Please review and accept ASAP.
Thank You,
Miroslav Safr
[This message was auto-generated]
---
Request #7528:
submit: home:msafr/libmeegotouch(r4) -> Trunk:Testing/libmeegotouch
Message:
* Wed Sep 15 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.42
- updated to 0.20.42-2
- updated to 0.20.42-1 release
- BMC#6679 - Missing default gconf schemas for handset installs of libmeegotouch
- BMC#6594 - themedaemon crashes if target name gconf value is missing
- BMC#4812 - Mthemedaemon is missing in start up session
- BMC#6595 - Themedaemon fails to parse meegotouch-theme default theme on host builds
- separated meegotuch-config-default package which should be (or target specific package) added to all images
- unit_tests_init.patch reformated
* Mon Sep 13 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.38
- added unit_tests_init.patch which fixes 2 unit tests build for ARM7
* Fri Sep 10 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.38
- removed Requires libmeegotouch dependency between meegotouch-config packages
- updated changelog
* Thu Sep 09 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.38
- patch for ARM visibility EGL issue added - disables KHRONOS_APICALL __attribute__((visibility("default"))) option in
- meegotouch-config-default package added back but without any relationship to libmeegotouch (schemas files in installed and rpm requiers to package it than.)
- gconf settings are not cleaned after uninstalation
- Requires meegotouch-config relation removed so the configuration (schemas file) is optional
* Wed Sep 08 2010 Miroslav Safr <miroslav.safr at tieto.com> 0.20.38
- fixed EGL visibility compilation problem for arm7 builds
- BMC#6423 - libmeegotouch new upstream release
- sources updated to 0.20.38-1 release
- mthemedaemon.desktop moved from theme to libmeegotouch
- deployment of packages was a bit changed and meegotouch-config packages introduced
libmeegotouch
libmeegotouch-benchmarks
libmeegotouch-debuginfo
libmeegotouch-devel
libmeegotouch-docs
State: new 2010-09-15T06:25:34 msafr
Comment: None
changes files:
--------------
--- libmeegotouch.changes
+++ libmeegotouch.changes
@@ -0,0 +1,42 @@
+* Wed Sep 15 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.42
+- updated to 0.20.42-2
+- updated to 0.20.42-1 release
+- BMC#6679 - Missing default gconf schemas for handset installs of libmeegotouch
+- BMC#6594 - themedaemon crashes if target name gconf value is missing
+- BMC#4812 - Mthemedaemon is missing in start up session
+- BMC#6595 - Themedaemon fails to parse meegotouch-theme default theme on host builds
+ - separated meegotuch-config-default package which should be (or target specific package) added to all images
+- unit_tests_init.patch reformated
+
+* Mon Sep 13 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.38
+- added unit_tests_init.patch which fixes 2 unit tests build for ARM7
+
+* Fri Sep 10 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.38
+- removed Requires libmeegotouch dependency between meegotouch-config packages
+- updated changelog
+
+* Thu Sep 09 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.38
+- patch for ARM visibility EGL issue added - disables KHRONOS_APICALL __attribute__((visibility("default"))) option in
+- meegotouch-config-default package added back but without any relationship to libmeegotouch (schemas files in installed and rpm requiers to package it than.)
+- gconf settings are not cleaned after uninstalation
+- Requires meegotouch-config relation removed so the configuration (schemas file) is optional
+
+* Wed Sep 08 2010 Miroslav Safr <miroslav.safr at tieto.com> 0.20.38
+- fixed EGL visibility compilation problem for arm7 builds
+- BMC#6423 - libmeegotouch new upstream release
+- sources updated to 0.20.38-1 release
+- mthemedaemon.desktop moved from theme to libmeegotouch
+- deployment of packages was a bit changed and meegotouch-config packages introduced
+ libmeegotouch
+ libmeegotouch-benchmarks
+ libmeegotouch-debuginfo
+ libmeegotouch-devel
+ libmeegotouch-docs
+ libmeegotouch-l10n
+ libmeegotouch-qtstyle
+ libmeegotouch-tests
+ meegotouch-config-default
+ meegotouch-demos
+ meegotouch-demos-l10n
+
+
old:
----
fix_locale_build_issue.patch
fix_mbubble_build_issue.patch
libmeegotouch-0.20.1-ARMv5-build-failure.patch
libmeegotouch-0.20.1-Add-various-devices-to-device-conf.patch
libmeegotouch-0.20.1-Changes-Read-target-device-from-GConf.patch
libmeegotouch-0.20.1-Fix-Ensure-rowsRemoved-updates-visible-cells.patch
libmeegotouch-0.20.10-Workaround-icu-config-bug.patch
libmeegotouch-0.20.10-missing-Epoch-function.patch
libmeegotouch-0.20.15-ARM-QEMU-stall-fix.patch
libmeegotouch-0.20.15-Revert-c90025d6bde5184346d8bbe148effd47aef354af-Fixe.patch
libmeegotouch-0.20.25.tar.bz2
re-enable_code_to_set_orientation.patch
new:
----
arm_egl_visibility.patch
libmeegotouch-0.20.42.tar.bz2
mthemedaemon.desktop
unit_tests_init.patch
spec files:
-----------
--- libmeegotouch.spec
+++ libmeegotouch.spec
@@ -7,37 +7,22 @@
Name: libmeegotouch
Summary: MeeGo Touch Framework
-Version: 0.20.25
+Version: 0.20.42
Release: 1
Group: System/Libraries
License: LGPLv2.1
URL: http://meego.gitorious.org/meegotouch/libmeegotouch
Source0: %{name}-%{version}.tar.bz2
+Source1: mthemedaemon.desktop
Source100: libmeegotouch.yaml
-Patch0: libmeegotouch-0.20.1-Changes-Read-target-device-from-GConf.patch
-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.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
-Patch10: re-enable_code_to_set_orientation.patch
-Patch11: include_order.patch
-Patch12: arm_ftbfs_egl.patch
-Requires: meegotouch-theme >= 0.20.14
-Requires(pre): GConf2
-Requires(preun): GConf2
+Patch0: include_order.patch
+Patch1: arm_ftbfs_egl.patch
+Patch2: arm_egl_visibility.patch
+Patch3: unit_tests_init.patch
+Requires: meegotouch-theme >= %{version}
Requires(post): /sbin/ldconfig
-Requires(post): GConf2
Requires(postun): /sbin/ldconfig
-BuildRequires: pkgconfig(QtCore) >= 4.7.0
-BuildRequires: pkgconfig(QtDBus)
BuildRequires: pkgconfig(QtOpenGL)
-BuildRequires: pkgconfig(QtNetwork)
-BuildRequires: pkgconfig(QtGui)
BuildRequires: pkgconfig(gstreamer-0.10)
BuildRequires: pkgconfig(gstreamer-base-0.10)
BuildRequires: pkgconfig(gstreamer-plugins-base-0.10)
@@ -47,6 +32,7 @@
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(contextprovider-1.0)
+BuildRequires: doxygen
BuildRequires: icu
BuildRequires: fdupes
Provides: libdui >= 0.20.0
@@ -54,15 +40,14 @@
%description
-Qt based MeeGo Touch Framework for developing touch based user interfaces
+Qt based MeeGo Touch Framework for developing touch based user interfaces.
%package devel
-Summary: Development files for the MeeGo Touch Framework
+Summary: MeeGo Touch Framework development files
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-BuildRequires: desktop-file-utils
%description devel
This package contains the files necessary to develop
@@ -70,53 +55,102 @@
%package qtstyle
-Summary: QtStyle plugin for the MeeGo Touch Framework
+Summary: MeeGo Touch Framework QtStyle plugin
Group: System/Libraries
Requires: %{name} = %{version}-%{release}
BuildRequires: desktop-file-utils
%description qtstyle
-This package contains the QtStyle plugin for the MeeGo Touch Framework
+This package contains the QtStyle plugin for the MeeGo Touch Framework.
+
+
+%package docs
+Summary: MeeGo Touch Framework documentation
+Group: Development/Languages
+Requires: %{name} = %{version}-%{release}
+
+%description docs
+This package contains the documentation for the MeeGo Touch Framework.
+
+
+%package l10n
+Summary: MeeGo Touch Framework translations
+Group: Development/Languages
+Requires: %{name} = %{version}-%{release}
+
+%description l10n
+This package contains the translations for the MeeGo Touch Framework.
+
+
+%package benchmarks
+Summary: Benchmark tests
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description benchmarks
+This package contains benchmark tests for the MeeGo Touch Framework.
+
+
+%package tests
+Summary: Unit and functional tests
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description tests
+This package contains unit and functional tests for the MeeGo Touch Framework.
+
+
+%package -n meegotouch-demos
+Summary: MeeGo Touch Framework demos
+Group: System/Libraries
+Requires: %{name} = %{version}-%{release}
+BuildRequires: desktop-file-utils
+
+%description -n meegotouch-demos
+This package contains demos for the MeeGo Touch Framework.
+
+
+%package -n meegotouch-demos-l10n
+Summary: MeeGo Touch Framework demos translations
+Group: Development/Languages
+Requires: %{name} = %{version}-%{release}
+
+%description -n meegotouch-demos-l10n
+This package contains the demos translations for the MeeGo Touch Framework.
+
+%package -n meegotouch-config-default
+Summary: MeeGo Touch Framework default settings
+Group: System/Libraries
+Requires(pre): GConf2
+Requires(preun): GConf2
+Requires(post): GConf2
+Provides: meegotouch-config
+
+%description -n meegotouch-config-default
+This package contains the default settings for the MeeGo Touch Framework.
+
+
%prep
-%setup -q -n %{name}-%{version}
+%setup -q -n ./%{name}-%{version}
-# libmeegotouch-0.20.1-Changes-Read-target-device-from-GConf.patch
+# include_order.patch
%patch0 -p1
-# libmeegotouch-0.20.1-Fix-Ensure-rowsRemoved-updates-visible-cells.patch
+# arm_ftbfs_egl.patch
%patch1 -p1
-# libmeegotouch-0.20.1-ARMv5-build-failure.patch
+# arm_egl_visibility.patch
%patch2 -p1
-# libmeegotouch-0.20.1-Add-various-devices-to-device-conf.patch
+# unit_tests_init.patch
%patch3 -p1
-# libmeegotouch-0.20.10-Workaround-icu-config-bug.patch
-%patch4 -p1
-# libmeegotouch-0.20.10-missing-Epoch-function.patch
-%patch5 -p1
-# libmeegotouch-0.20.15-Revert-c90025d6bde5184346d8bbe148effd47aef354af-Fixe.patch
-%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
-# re-enable_code_to_set_orientation.patch
-%patch10 -p1
-# include_order.patch
-%patch11 -p1
-# arm_ftbfs_egl.patch
-%patch12 -p1
# >> setup
# << setup
%build
# >> build pre
-#PlainQt plugin isn't rendering properly - disabling for now
-#./configure -prefix /usr -release -plainqt
-./configure -prefix /usr -release
+unset LD_AS_NEEDED
+./configure -prefix %{_prefix} -release -plainqt -tests -benchmarks
make %{?jobs:-j%jobs}
# << build pre
@@ -129,14 +163,26 @@
# >> install pre
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
%qmake_install
+
+# The one file the main package contains
+# (rpmlint complains if it doesn't have any file at all)
+install -m 644 -D -p LICENSE.LGPL \
+%{buildroot}/usr/share/doc/packages/%{name}/LICENSE.LGPL
+
+# FIXME the next 2 lines should go to the Makefile
+install -m 644 -D -p demos/widgetsgallery/translations/widgetsgallery.ts \
+%{buildroot}/usr/share/doc/meegotouch-demos-widgetsgallery-l10n-eng-en/widgetsgallery.ts
+install -m 644 -D -p src/translations/libmeegotouch.ts \
+%{buildroot}/usr/share/doc/libmeegotouch-l10n-eng-en/libmeegotouch.ts
+
# << install pre
# >> install post
mkdir -p %{buildroot}/etc/profile.d
echo "export M_DECORATED=0" > %{buildroot}/etc/profile.d/libmeegotouch.sh
-%define GCONF_CONFIG_SOURCE `gconftool-2 --get-default-source`
-gconftool-2 --direct --config-source %{GCONF_CONFIG_SOURCE} --makefile-install-rule src/meegotouch.schemas
+mkdir -p %{buildroot}/etc/xdg/autostart
+cp %{SOURCE1} %{buildroot}/etc/xdg/autostart
#Fix rpmlint errors - some header files have invalid permissions
chmod 644 %{buildroot}/usr/include/meegotouch/mrichtexteditstyle.h
@@ -153,17 +199,41 @@
rm %{buildroot}/usr/share/themes/base/meegotouch/widgetsgallery/feedbacks/release-space/vibra.ivt
-rm %{buildroot}/usr/share/themes/devel/meegotouch/widgetsgallery/style/widgetsgallery.css
+#rm %{buildroot}/usr/share/themes/devel/meegotouch/widgetsgallery/style/widgetsgallery.css
rm %{buildroot}/usr/share/themes/base/meegotouch/widgetsgallery/widgetsgallery.conf
rm %{buildroot}/usr/share/themes/base/meegotouch/widgetsgallery/feedbacks/press-space/vibra.ivt
rm %{buildroot}/usr/share/themes/base/meegotouch/widgetsgallery/feedbacks/release-babytoy/vibra.ivt
+
+
+%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}
-%pre
+
+
+%post -p /sbin/ldconfig
+
+%postun
+/sbin/ldconfig
+# >> postun
+if [ -d /var/cache/meegotouch ]; then
+rm -rf /var/cache/meegotouch
+fi
+# << postun
+
+
+
+%pre -n meegotouch-config-default
if [ "$1" -gt 1 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule \
@@ -171,7 +241,7 @@
> /dev/null || :
fi
-%preun
+%preun -n meegotouch-config-default
if [ "$1" -eq 0 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule \
@@ -179,13 +249,23 @@
> /dev/null || :
fi
-%post
-/sbin/ldconfig
+%post -n meegotouch-config-default
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
/etc/gconf/schemas/meegotouch.schemas > /dev/null || :
-%postun -p /sbin/ldconfig
+
+
+
+
+
+
+
+
+
+
+
+
@@ -198,6 +278,11 @@
%defattr(-,root,root,-)
# >> files
%attr(1777, -, -) /var/cache/meegotouch
+%dir %{_libdir}/meegotouch
+%dir /usr/share/meegotouch/targets
+%dir /etc/meegotouch
+%dir %{_libdir}/meegotouch/applets
+
%{_bindir}/mthemedaemon
%{_bindir}/mservicemapper
%{_libdir}/libmeegotouchcore.so.*
@@ -212,9 +297,17 @@
%{_datadir}/meegotouch/imtoolbars/RichTextEditorToolbar1.xml
%{_datadir}/l10n/meegotouch/libmeegotouch*
# Config files
-%config /etc/meegotouch/devices.conf
-%config /etc/gconf/schemas/meegotouch.schemas
+%config /usr/share/meegotouch/targets/*.conf
+%config /etc/meegotouch/themedaemonpriorities.conf
%config /etc/profile.d/libmeegotouch.sh
+%config /etc/xdg/autostart/mthemedaemon.desktop
+
+%dir %{_datadir}/l10n
+%dir %{_datadir}/l10n/meegotouch
+%dir %{_datadir}/doc/libmeegotouch-l10n-eng-en
+%{_datadir}/l10n/meegotouch/libmeegotouch.qm
+%{_datadir}/doc/libmeegotouch-l10n-eng-en/libmeegotouch.ts
+
# << files
@@ -227,31 +320,145 @@
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%{_datadir}/qt4/mkspecs/features/*.prf
+
+
+
+
+%dir /usr/include/meegotouch
+/usr/include/meegotouch/*
+%{_libdir}/libmeegotouch*.so
+%{_libdir}/libmeegotouch*.prl
+%{_libdir}/pkgconfig/*
+
+%dir %{_datadir}/meegotouch/imtoolbars
+%{_datadir}/meegotouch/imtoolbars/*
+
+#Tools
+%{_bindir}/mmoc
+%{_bindir}/mmoc.pl
+%{_bindir}/mgen
+%{_bindir}/m-servicefwgen
+%{_bindir}/mapplettester
+%{_bindir}/mapplicationextensiontester
+%{_bindir}/mnotificationtool
+%{_bindir}/mnotificationstresstest
+%{_bindir}/dui-rename-files
+%{_bindir}/dui-rename-symbols
+# << files devel
+
+%files qtstyle
+%defattr(-,root,root,-)
+# >> files qtstyle
+%{_libdir}/qt4/plugins/styles/libmeegotouchqtstyleplugin.so
+%{_datadir}/qtstyleexample/themes/*
+%{_datadir}/applications/qtstyledialogs-windows-style.desktop
+%{_datadir}/applications/qtstyledialogs.desktop
+%{_datadir}/applications/qtstyleexample-windows-style.desktop
+%{_datadir}/applications/qtstyleexample.desktop
+
+%dir %{_datadir}/qtstyleexample
+%dir %{_datadir}/qtstyleexample/themes
+/usr/bin/qtstyle*
+%{_datadir}/applications/qtstyle*
+%{_datadir}/dbus-1/services/com.nokia.qtstyle*
+%{_datadir}/qtstyleexample/themes/*
+# << files qtstyle
+
+%files docs
+%defattr(-,root,root,-)
+# >> files docs
+%dir /usr/share/doc/packages/%{name}
+%doc /usr/share/doc/packages/%{name}/*
+# << files docs
+
+%files l10n
+%defattr(-,root,root,-)
+# >> files l10n
+%dir %{_datadir}/l10n
+%dir %{_datadir}/l10n/meegotouch
+%{_datadir}/l10n/meegotouch/libmeegotouch_ur.qm
+%{_datadir}/l10n/meegotouch/libmeegotouch_hu.qm
+%{_datadir}/l10n/meegotouch/libmeegotouch_de.qm
+%{_datadir}/l10n/meegotouch/libmeegotouch_fi.qm
+%{_datadir}/l10n/meegotouch/libmeegotouch_zh_CN.qm
+%{_datadir}/l10n/meegotouch/libmeegotouch_en.qm
+%{_datadir}/l10n/meegotouch/libmeegotouch_ar.qm
+# << files l10n
+
+%files benchmarks
+%defattr(-,root,root,-)
+# >> files benchmarks
+%dir %{_libdir}/libmeegotouch-benchmarks
+%{_libdir}/libmeegotouch-benchmarks/*
+# << files benchmarks
+
+%files tests
+%defattr(-,root,root,-)
+# >> files tests
+%dir %{_libdir}/libmeegotouch-tests
+%dir %{_datadir}/libmeegotouch-tests
+%{_datadir}/libmeegotouch-tests/*
+%{_libdir}/libmeegotouch-tests/*
+# << files tests
+
+%files -n meegotouch-demos
+%defattr(-,root,root,-)
+# >> files meegotouch-demos
# WidgetsGallery
-%{_datadir}/widgetsgallery
+%dir %{_datadir}/widgetsgallery
+%{_bindir}/widgetsgallery
+%{_datadir}/widgetsgallery/*
%{_datadir}/applications/widgetsgallery.desktop
%{_datadir}/meegotouch-demos-widgetsgallery-tests/tests.xml
%{_datadir}/l10n/meegotouch/widgetsgallery*
%{_datadir}/themes/*
%{_datadir}/animatedlayout/themes/*
%{_datadir}/l10n/meegotouch/animatedlayout*
+%{_datadir}/dbus-1/services/com.nokia.widgetsgallery.service
# Demos
+%dir %{_datadir}/animatedlayout
+%{_bindir}/animatedlayout
+%{_datadir}/animatedlayout/*
%{_datadir}/meegotouch/applicationextensions/appletinstallationsource.desktop
%{_datadir}/meegotouch/applicationextensions/applicationextensiondemo-demoextension.desktop
%{_datadir}/meegotouch/applicationextensions/applicationextensiondemo-demoextension2.desktop
%{_libdir}/meegotouch/applicationextensions/libappletinventory-fakeinstallationsource.so
%{_libdir}/meegotouch/applicationextensions/libapplicationextensiondemo-demoextension.so
%{_libdir}/meegotouch/applicationextensions/libapplicationextensiondemo-demoextension2.so
-# << files devel
-%files qtstyle
+%dir %{_datadir}/l10n
+%dir %{_datadir}/l10n/meegotouch
+%dir %{_datadir}/doc/meegotouch-demos-widgetsgallery-l10n-eng-en
+%{_datadir}/l10n/meegotouch/widgetsgallery.qm
+%{_datadir}/doc/meegotouch-demos-widgetsgallery-l10n-eng-en/widgetsgallery.ts
+
+%dir %{_datadir}/meegotouch-demos-widgetsgallery-tests
+%{_datadir}/meegotouch-demos-widgetsgallery-tests/tests.xml
+# << files meegotouch-demos
+
+%files -n meegotouch-demos-l10n
%defattr(-,root,root,-)
-# >> files qtstyle
-%{_libdir}/qt4/plugins/styles/libmeegotouchqtstyleplugin.so
-%{_datadir}/qtstyleexample/themes/*
-%{_datadir}/applications/qtstyledialogs-windows-style.desktop
-%{_datadir}/applications/qtstyledialogs.desktop
-%{_datadir}/applications/qtstyleexample-windows-style.desktop
-%{_datadir}/applications/qtstyleexample.desktop
-# << files qtstyle
+# >> files meegotouch-demos-l10n
+%dir %{_datadir}/l10n
+%dir %{_datadir}/l10n/meegotouch
+%{_datadir}/l10n/meegotouch/widgetsgallery_zh_CN.qm
+%{_datadir}/l10n/meegotouch/widgetsgallery_en.qm
+%{_datadir}/l10n/meegotouch/widgetsgallery_ar.qm
+%{_datadir}/l10n/meegotouch/animatedlayout_ja.qm
+%{_datadir}/l10n/meegotouch/widgetsgallery_fi.qm
+%{_datadir}/l10n/meegotouch/widgetsgallery_de.qm
+%{_datadir}/l10n/meegotouch/widgetsgallery_hu.qm
+%{_datadir}/l10n/meegotouch/widgetsgallery_ur.qm
+
+%dir %{_datadir}/l10n/meegotouch
+%{_datadir}/l10n/meegotouch/animatedlayout_en.qm
+%{_datadir}/l10n/meegotouch/animatedlayout_de.qm
+# << files meegotouch-demos-l10n
+
+%files -n meegotouch-config-default
+%defattr(-,root,root,-)
+# >> files meegotouch-config-default
+%config(noreplace) /etc/gconf/schemas/meegotouch.schemas
+# << files meegotouch-config-default
+
other changes:
--------------
++++++ arm_egl_visibility.patch (new)
--- arm_egl_visibility.patch
+++ arm_egl_visibility.patch
+Description: fix ARM visibility EGL issue
+Author: Miroslav Safr <miroslav.safr at tieto.com>
+--- a/demos/widgetsgallery/swaphook.h
++++ b/demos/widgetsgallery/swaphook.h
+***************
+*** 7,17 ****
+ #ifdef __arm__
+ #define EGL
+ #define MESA_EGL_NO_X11_HEADERS
+- #include <EGL/egl.h>
+- # ifdef M_OS_MAEMO5
+ # define EGLAPI
+ # define EGLAPIENTRY
+! # endif //M_OS_MAEMO5
+ #endif //__arm__
+
+ #include <QObject>
+--- 7,15 ----
+ #ifdef __arm__
+ #define EGL
+ #define MESA_EGL_NO_X11_HEADERS
+ # define EGLAPI
+ # define EGLAPIENTRY
+! #include <EGL/egl.h>
+ #endif //__arm__
+
+ #include <QObject>
++++++ libmeegotouch-0.20.25.tar.bz2 -> libmeegotouch-0.20.42.tar.bz2
139905 lines of diff (skipped)
++++++ libmeegotouch.yaml
--- libmeegotouch.yaml
+++ libmeegotouch.yaml
@@ -1,38 +1,27 @@
Name: libmeegotouch
Summary: MeeGo Touch Framework
-Version: 0.20.25
+Version: 0.20.42
Release: 1
Group: System/Libraries
License: LGPLv2.1
URL: http://meego.gitorious.org/meegotouch/libmeegotouch
Sources:
- "%{name}-%{version}.tar.bz2"
+ - mthemedaemon.desktop
Patches:
- - libmeegotouch-0.20.1-Changes-Read-target-device-from-GConf.patch
- - 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.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
- - re-enable_code_to_set_orientation.patch
- include_order.patch
- - arm_ftbfs_egl.patch
-Requires:
- - meegotouch-theme >= 0.20.14
+ - arm_ftbfs_egl.patch
+ - arm_egl_visibility.patch
+ - unit_tests_init.patch
Description: |
- Qt based MeeGo Touch Framework for developing touch based user interfaces
+ Qt based MeeGo Touch Framework for developing touch based user interfaces.
+Requires:
+ - meegotouch-theme >= %{version}
PkgBR:
- - icu #Needed to pull in genrb and pkgdata
+ - doxygen
+ - icu
PkgConfigBR:
- - QtCore >= 4.7.0
- - QtDBus
- QtOpenGL
- - QtNetwork
- - QtGui
- gstreamer-0.10
- gstreamer-base-0.10
- gstreamer-plugins-base-0.10
@@ -42,23 +31,71 @@
- x11
- gconf-2.0
- contextprovider-1.0
-Provides:
+Provides:
- libdui >= 0.20.0
-Obsoletes:
+Obsoletes:
- libdui < 0.20.0
-Configure: none
+Configure: none
Builder: none
RunFdupes: "%{_datadir}"
SubPackages:
- - Name: devel
- Summary: Development files for the MeeGo Touch Framework
- Group: Development/Libraries
- Description: |
+ - Name: devel
+ Summary: MeeGo Touch Framework development files
+ Group: Development/Libraries
+ Description: |
This package contains the files necessary to develop
applications using the touch framework.
- - Name: qtstyle
- Summary: QtStyle plugin for the MeeGo Touch Framework
- Group: System/Libraries
- Description: |
- This package contains the QtStyle plugin for the MeeGo Touch Framework
+ - Name: qtstyle
+ Summary: MeeGo Touch Framework QtStyle plugin
+ Group: System/Libraries
+ Description: |
+ This package contains the QtStyle plugin for the MeeGo Touch Framework.
+
+ - Name: docs
+ Summary: MeeGo Touch Framework documentation
+ Group: Development/Languages
+ Description: |
+ This package contains the documentation for the MeeGo Touch Framework.
+
+ - Name: l10n
+ Summary: MeeGo Touch Framework translations
+ Group: Development/Languages
+ Description: |
+ This package contains the translations for the MeeGo Touch Framework.
+
+ - Name: benchmarks
+ Summary: Benchmark tests
+ Group: Development/Libraries
+ Description: |
+ This package contains benchmark tests for the MeeGo Touch Framework.
+
+ - Name: tests
+ Summary: Unit and functional tests
+ Group: Development/Libraries
+ Description: |
+ This package contains unit and functional tests for the MeeGo Touch Framework.
+
+ - Name: meegotouch-demos
+ AsWholeName: yes
+ Summary: MeeGo Touch Framework demos
+ Group: System/Libraries
+ Description: |
+ This package contains demos for the MeeGo Touch Framework.
+
+ - Name: meegotouch-demos-l10n
+ AsWholeName: yes
+ Summary: MeeGo Touch Framework demos translations
+ Group: Development/Languages
+ Description: |
+ This package contains the demos translations for the MeeGo Touch Framework.
+
+ - Name: meegotouch-config-default
+ AsWholeName: yes
+ Summary: MeeGo Touch Framework default settings
+ Group: System/Libraries
+ Description: |
+ This package contains the default settings for the MeeGo Touch Framework.
+ Provides:
+ - meegotouch-config
+
++++++ mthemedaemon.desktop (new)
--- mthemedaemon.desktop
+++ mthemedaemon.desktop
+[Desktop Entry]
+Exec=/usr/bin/mthemedaemon
+X-Moblin-Priority=Highest
+OnlyShowIn=X-MEEGO-HS;
++++++ unit_tests_init.patch (new)
--- unit_tests_init.patch
+++ unit_tests_init.patch
+From d1a5ab60b283513a19ca9d757457c6e264adda8a Mon Sep 17 00:00:00 2001
+From: Miroslav Safr <miroslav.safr at tieto.com>
+Date: Mon, 13 Sep 2010 11:20:06 +0300
+Subject: [PATCH] Changes: init in unit tests: ut_mlayout and Ut_MLinearLayoutPolicy
+
+---
+ tests/ut_mlayout/ut_mlayout.cpp | 2 +-
+ .../ut_mlinearlayoutpolicy.cpp | 5 ++---
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/tests/ut_mlayout/ut_mlayout.cpp b/tests/ut_mlayout/ut_mlayout.cpp
+index 3c2ff7b..890eec8 100644
+--- a/tests/ut_mlayout/ut_mlayout.cpp
++++ b/tests/ut_mlayout/ut_mlayout.cpp
+@@ -2835,7 +2835,7 @@ void Ut_MLayout::testChildItems()
+ QGraphicsWidget *widget3 = new QGraphicsWidget;
+ innerLayout->addItem(widget3);
+
+- QGraphicsWidget *innerLayoutForm;
++ QGraphicsWidget *innerLayoutForm(NULL);
+ if (innerLayoutInWidget) {
+ innerLayoutForm = new QGraphicsWidget;
+ innerLayoutForm->setLayout(innerLayout);
+diff --git a/tests/ut_mlinearlayoutpolicy/ut_mlinearlayoutpolicy.cpp b/tests/ut_mlinearlayoutpolicy/ut_mlinearlayoutpolicy.cpp
+index c8c54d3..a3efd9b 100644
+--- a/tests/ut_mlinearlayoutpolicy/ut_mlinearlayoutpolicy.cpp
++++ b/tests/ut_mlinearlayoutpolicy/ut_mlinearlayoutpolicy.cpp
+@@ -106,7 +106,6 @@ void Ut_MLinearLayoutPolicy::init()
+
+ m_mockLayout->setAnimation(0); // turn off animation
+ }
+-
+ void Ut_MLinearLayoutPolicy::cleanup()
+ {
+ Q_ASSERT(0 != m_mockItem100);
+@@ -209,8 +208,8 @@ void Ut_MLinearLayoutPolicy::testStretch_data()
+ void Ut_MLinearLayoutPolicy::testStretch()
+ {
+ QFETCH(bool, useQt);
+- QGraphicsLinearLayout *qt_layout;
+- QGraphicsWidget *form;
++ QGraphicsLinearLayout *qt_layout(NULL);
++ QGraphicsWidget *form(NULL);
+ if (useQt) {
+ form = new QGraphicsWidget;
+ form->setMinimumSize(600, 600);
+--
+1.7.0.4
+
++++++ deleted files:
--- fix_locale_build_issue.patch
--- fix_mbubble_build_issue.patch
--- libmeegotouch-0.20.1-ARMv5-build-failure.patch
--- libmeegotouch-0.20.1-Add-various-devices-to-device-conf.patch
--- libmeegotouch-0.20.1-Changes-Read-target-device-from-GConf.patch
--- libmeegotouch-0.20.1-Fix-Ensure-rowsRemoved-updates-visible-cells.patch
--- libmeegotouch-0.20.10-Workaround-icu-config-bug.patch
--- libmeegotouch-0.20.10-missing-Epoch-function.patch
--- libmeegotouch-0.20.15-ARM-QEMU-stall-fix.patch
--- libmeegotouch-0.20.15-Revert-c90025d6bde5184346d8bbe148effd47aef354af-Fixe.patch
--- re-enable_code_to_set_orientation.patch
More information about the MeeGo-commits
mailing list