I have made the following changes intended for : CE:Apps / qt-components Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below.
https://build.pub.meego.com//request/show/4956 Thank You, Marko Saukko [This message was auto-generated] --- Request # 4956: Messages from BOSS: State: review at 2012-06-06T13:37:31 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:sage:branches:CE:Apps / qt-components -> CE:Apps / qt-components changes files: -------------- --- qt-components.changes +++ qt-components.changes @@ -0,0 +1,6 @@ +* Wed Jun 06 2012 Marko Saukko <[email protected]> - 1.3~git20120215-1 +- Update to latest git tag 1.3~git20120215-1 +- Added xdamage build requirement to compile XDamage support. +- Dropped unused xext build requirement. +- Added qt-components-1.3git20120215-1-fix-defines.patch to fix compile issue without MTF. + old: ---- boss.conf qt-components-1.0~git20111124.tar.bz2 new: ---- qt-components-1.3git20120215-1-fix-defines.patch qt-components-qt-components-1.3git20120215-1.tar.gz spec files: ----------- --- qt-components.spec +++ qt-components.spec @@ -1,36 +1,37 @@ # # Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.23 +# Generated by: spectacle version 0.24 # + +Name: qt-components + # >> macros # << macros -Name: qt-components Summary: Qt Quick UX Components -Version: 1.0~git20111124 -Release: 1fn +Version: 1.3~git20120215 +Release: 1 Group: System/Libraries License: BSD -Source0: %{name}-%{version}.tar.bz2 -Source1: boss.conf +URL: https://qt.gitorious.org/qt-components/qt-components +Source0: qt-components-qt-components-1.3git20120215-1.tar.gz Source100: qt-components.yaml Patch0: xruxa-screen-resolution.patch +Patch1: qt-components-1.3git20120215-1-fix-defines.patch BuildRequires: pkgconfig(QtCore) >= 4.7.0 BuildRequires: pkgconfig(QtGui) BuildRequires: pkgconfig(QtOpenGL) -BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xrandr) +BuildRequires: pkgconfig(xdamage) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(contextsubscriber-1.0) BuildRequires: pkgconfig(maliit-1.0) BuildRequires: desktop-file-utils BuildRequires: fdupes - %description The Harmattan Qt Quick UX Components - %package devel Summary: Qt UX Components Devel Group: Development/Libraries @@ -43,10 +44,12 @@ %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{name} # xruxa-screen-resolution.patch %patch0 -p1 +# qt-components-1.3git20120215-1-fix-defines.patch +%patch1 -p1 # >> setup # << setup @@ -60,6 +63,7 @@ # >> build post # << build post + %install rm -rf %{buildroot} # >> install pre @@ -74,15 +78,8 @@ #desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop # << install post -%fdupes %{buildroot}/%{_libdir} - - - - - - - +%fdupes %{buildroot}/%{_libdir} %files %defattr(-,root,root,-) @@ -95,10 +92,8 @@ # Galleries etc # << files - %files devel %defattr(-,root,root,-) # >> files devel %{_datadir}/qt4/mkspecs/* # << files devel - other changes: -------------- ++++++ qt-components-1.3git20120215-1-fix-defines.patch (new) --- qt-components-1.3git20120215-1-fix-defines.patch +++ qt-components-1.3git20120215-1-fix-defines.patch @@ -0,0 +1,18 @@ +diff --git a/src/meego/plugin.cpp b/src/meego/plugin.cpp +index 931d69f..409390f 100644 +--- a/src/meego/plugin.cpp ++++ b/src/meego/plugin.cpp +@@ -157,11 +157,13 @@ public: + QString defaultFontFamily = QLatin1String("Nokia Pure Text"); + QString defaultFontFamilyLight = QLatin1String("Nokia Pure Text Light"); + ++#ifdef HAVE_MEEGOTOUCH + // use arial when language is set to farsi + if (locale && locale->language() == QLatin1String("fa")) { + defaultFontFamily = QLatin1String("Arial"); + defaultFontFamilyLight = QLatin1String("Arial"); + } ++#endif + + QDeclarativePropertyMap *uiConstantsData = new QDeclarativePropertyMap(); + uiConstantsData->insert("DefaultMargin", QVariant(16)); ++++++ qt-components-qt-components-1.3git20120215-1.tar.gz (new) ++++++ qt-components.yaml --- qt-components.yaml +++ qt-components.yaml @@ -1,27 +1,25 @@ Name: qt-components Summary: Qt Quick UX Components -Version: 1.0~git20111124 -Release: 1fn +Version: 1.3~git20120215 +Release: 1 Group: System/Libraries License: BSD +URL: https://qt.gitorious.org/qt-components/qt-components Sources: - - "%{name}-%{version}.tar.bz2" - - boss.conf + - qt-components-qt-components-1.3git20120215-1.tar.gz Patches: - xruxa-screen-resolution.patch + - qt-components-1.3git20120215-1-fix-defines.patch Description: The Harmattan Qt Quick UX Components - -#Requires: -# - qt-components-base-icons PkgBR: - desktop-file-utils PkgConfigBR: - QtCore >= 4.7.0 - QtGui - QtOpenGL - - xext - xrandr + - xdamage - x11 - contextsubscriber-1.0 - maliit-1.0 ++++++ deleted files: --- boss.conf --- qt-components-1.0~git20111124.tar.bz2
