[meego-commits] 7338: Changes to Trunk:Testing/libmeegotouch
Fathi Boudra
no_reply at build.meego.com
Mon Sep 6 07:36:14 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 #7338:
submit: home:boudra:branches:Trunk:Testing/libmeegotouch(r3)(cleanup) -> Trunk:Testing/libmeegotouch
Message:
NOTE: I'm bypassing devel:qt-mtf libmeegotouch package because
it's a new upstream version and contains several new sub packages.
The version in devel:qt-mtf needs a proper review by his owner
before being ready for submission.
In the meantime, I'm pushing my bug fixes only changes to Trunk:Testing project.
* Fri Aug 27 2010 Fathi Boudra <fathi.boudra at nokia.com> 0.20.25
- Add include_order.patch to fix build failure with Qt
- Add arm_ftbfs_egl.patch to fix buidl failure on ARM when using EGL
Thanks to Carsten Valdemar Munk
- Various cleanup in the yaml files
State: new 2010-09-06T00:36:13 boudra
Comment: None
changes files:
--------------
--- libmeegotouch.changes
+++ libmeegotouch.changes
@@ -0,0 +1,6 @@
+* Fri Aug 27 2010 Fathi Boudra <fathi.boudra at nokia.com> 0.20.25
+- Add include_order.patch to fix build failure with Qt
+- Add arm_ftbfs_egl.patch to fix buidl failure on ARM when using EGL
+ Thanks to Carsten Valdemar Munk
+- Various cleanup in the yaml files
+
new:
----
arm_ftbfs_egl.patch
include_order.patch
spec files:
-----------
--- libmeegotouch.spec
+++ libmeegotouch.spec
@@ -1,6 +1,6 @@
#
-# Do not Edit! Generated by:
-# spectacle version 0.18
+# Do NOT Edit the Auto-generated Part!
+# Generated by: spectacle version 0.19
#
# >> macros
# << macros
@@ -10,8 +10,8 @@
Version: 0.20.25
Release: 1
Group: System/Libraries
-License: LGPL v2.1
-URL: http://www.meego.com
+License: LGPLv2.1
+URL: http://meego.gitorious.org/meegotouch/libmeegotouch
Source0: %{name}-%{version}.tar.bz2
Source100: libmeegotouch.yaml
Patch0: libmeegotouch-0.20.1-Changes-Read-target-device-from-GConf.patch
@@ -25,13 +25,15 @@
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
Requires(post): /sbin/ldconfig
Requires(post): GConf2
Requires(postun): /sbin/ldconfig
-BuildRequires: pkgconfig(QtCore) >= 4.6.0
+BuildRequires: pkgconfig(QtCore) >= 4.7.0
BuildRequires: pkgconfig(QtDBus)
BuildRequires: pkgconfig(QtOpenGL)
BuildRequires: pkgconfig(QtNetwork)
@@ -45,8 +47,8 @@
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(contextprovider-1.0)
-BuildRequires: fdupes
BuildRequires: icu
+BuildRequires: fdupes
Provides: libdui >= 0.20.0
Obsoletes: libdui < 0.20.0
@@ -103,38 +105,36 @@
%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
-export PATH=$PATH:/usr/lib/qt4/bin
-
#PlainQt plugin isn't rendering properly - disabling for now
#./configure -prefix /usr -release -plainqt
./configure -prefix /usr -release
+make %{?jobs:-j%jobs}
# << build pre
-make %{?jobs:-j%jobs}
# >> build post
# << build post
%install
rm -rf %{buildroot}
# >> install pre
-export INSTALL_ROOT=%{buildroot}
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+%qmake_install
# << install pre
-%make_install
# >> install post
-%fdupes %{buildroot}%{_datadir}
-
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
@@ -161,6 +161,7 @@
rm %{buildroot}/usr/share/themes/base/meegotouch/widgetsgallery/feedbacks/release-babytoy/vibra.ivt
# << install post
+%fdupes %{buildroot}/%{_datadir}
%pre
if [ "$1" -gt 1 ]; then
other changes:
--------------
++++++ arm_ftbfs_egl.patch (new)
--- arm_ftbfs_egl.patch
+++ arm_ftbfs_egl.patch
+Description: fix ftbfs on ARM when using EGL (when the macro is defined,
+ X11 headers will not be included)
+Author: Carsten Valdemar Munk <carsten at maemo.org>
+--- a/demos/widgetsgallery/swaphook.h
++++ b/demos/widgetsgallery/swaphook.h
+@@ -6,6 +6,7 @@ typedef unsigned long long timestamp;
+
+ #ifdef __arm__
+ #define EGL
++#define MESA_EGL_NO_X11_HEADERS
+ #include <EGL/egl.h>
+ # ifdef HAVE_N900
+ # define EGLAPI
++++++ fix_locale_build_issue.patch
--- fix_locale_build_issue.patch
+++ fix_locale_build_issue.patch
@@ -1,7 +1,6 @@
-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 @@
+--- a/src/corelib/i18n/mlocale.cpp
++++ b/src/corelib/i18n/mlocale.cpp
+@@ -749,7 +749,7 @@ void MLocalePrivate::removeTrFromQCoreAp
}
}
++++++ fix_mbubble_build_issue.patch
--- fix_mbubble_build_issue.patch
+++ fix_mbubble_build_issue.patch
@@ -1,7 +1,6 @@
-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 @@
+--- a/src/corelib/widgets/mbubbleitemmodel.h
++++ b/src/corelib/widgets/mbubbleitemmodel.h
+@@ -73,7 +73,7 @@ public:
\property MBubbleItemModel::type
\brief centralWidget.
*/
@@ -10,10 +9,9 @@
/*!
\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 @@
+--- a/src/views/mlistview_p.cpp
++++ b/src/views/mlistview_p.cpp
+@@ -47,7 +47,7 @@ MListViewPrivate::MListViewPrivate() : r
moving = false;
hseparator = NULL;
headersCreator = NULL;
@@ -22,7 +20,7 @@
forceRepaint = false;
viewportTopLeft = QPointF();
viewportVisibleHeight = 0;
-@@ -460,7 +460,7 @@
+@@ -562,7 +562,7 @@ int MPlainListViewPrivate::totalHeight()
int MPlainListViewPrivate::itemsCount() const
{
if (model == 0)
++++++ include_order.patch (new)
--- include_order.patch
+++ include_order.patch
+Description: fix ftbfs by reorder includes (error: #error qtextstream.h must be
+included before any header file that defines Status)
+Author: Fathi Boudra <fathi.boudra at nokia.com>
+--- a/demos/widgetsgallery/panningbenchmark.cpp
++++ b/demos/widgetsgallery/panningbenchmark.cpp
+@@ -1,14 +1,13 @@
+-#include "panningbenchmark.h"
+-#include "timedemo.h"
++#include <QDebug>
++#include <QTimer>
+
+ #include <MApplication>
+ #include <MApplicationPage>
+ #include <MPannableViewport>
+ #include <MPhysics2DPanning>
+
+-#include <QTimer>
+-#include <qdebug.h>
+-
++#include "panningbenchmark.h"
++#include "timedemo.h"
+
+ namespace {
+ const int updateInterval = 20; // ms
+--- a/demos/widgetsgallery/timedemo.cpp
++++ b/demos/widgetsgallery/timedemo.cpp
+@@ -17,21 +17,21 @@
+ **
+ ****************************************************************************/
+
+-#include "timedemo.h"
+-#include "mainpage.h"
+-#include "timedemobenchmark.h"
+-#include "templatepage.h"
++#include <QApplication>
++#include <QFile>
++#include <QTextStream>
++#include <QTimer>
++#include <QXmlStreamWriter>
+
+ #include <MApplication>
+ #include <MWindow>
+ #include <MSceneManager>
+ #include <MApplicationPage>
+
+-#include <QApplication>
+-#include <QTextStream>
+-#include <QXmlStreamWriter>
+-#include <QFile>
+-#include <QTimer>
++#include "timedemo.h"
++#include "mainpage.h"
++#include "timedemobenchmark.h"
++#include "templatepage.h"
+
+ namespace
+ {
+--- a/demos/widgetsgallery/staticpagebenchmark.cpp
++++ b/demos/widgetsgallery/staticpagebenchmark.cpp
+@@ -1,10 +1,10 @@
+-#include "staticpagebenchmark.h"
+-#include "timedemo.h"
++#include <QTimer>
+
+ #include <MApplication>
+ #include <MApplicationPage>
+
+-#include <QTimer>
++#include "staticpagebenchmark.h"
++#include "timedemo.h"
+
+ namespace
+ {
++++++ libmeegotouch-0.20.1-ARMv5-build-failure.patch
--- libmeegotouch-0.20.1-ARMv5-build-failure.patch
+++ libmeegotouch-0.20.1-ARMv5-build-failure.patch
@@ -1,7 +1,6 @@
-diff -ru libmeegotouch-0.20.1.orig/src/corelib/core/mapplication.cpp libmeegotouch-0.20.1/src/corelib/core/mapplication.cpp
---- libmeegotouch-0.20.1.orig/src/corelib/core/mapplication.cpp 2010-04-21 19:01:44.000000000 +0000
-+++ libmeegotouch-0.20.1/src/corelib/core/mapplication.cpp 2010-04-25 14:38:17.000000000 +0000
-@@ -450,6 +450,7 @@
+--- a/src/corelib/core/mapplication.cpp
++++ b/src/corelib/core/mapplication.cpp
+@@ -466,6 +466,7 @@ bool MApplication::isPrestarted()
*/
static int set_runfast()
{
@@ -9,7 +8,7 @@
int tmp;
__asm__ volatile(
"fmrx %[tmp], fpscr\n\t"
-@@ -459,6 +460,9 @@
+@@ -475,6 +476,9 @@ static int set_runfast()
"fmxr fpscr, %[tmp]\n\t"
: [tmp] "=r"(tmp));
return tmp;
@@ -19,7 +18,7 @@
}
/*
-@@ -466,6 +470,7 @@
+@@ -482,6 +486,7 @@ static int set_runfast()
*/
static int set_ieee()
{
@@ -27,7 +26,7 @@
int tmp;
__asm__ volatile(
"fmrx %[tmp], fpscr\n\t"
-@@ -474,6 +479,9 @@
+@@ -490,6 +495,9 @@ static int set_ieee()
"fmxr fpscr, %[tmp]\n\t"
: [tmp] "=r"(tmp));
return tmp;
++++++ 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,7 +1,6 @@
-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 @@
+--- a/src/data/devices.conf
++++ b/src/data/devices.conf
+@@ -47,3 +47,45 @@ ppiX=209
ppiY=209
showStatusBar=false
++++++ libmeegotouch-0.20.1-Changes-Read-target-device-from-GConf.patch
--- libmeegotouch-0.20.1-Changes-Read-target-device-from-GConf.patch
+++ libmeegotouch-0.20.1-Changes-Read-target-device-from-GConf.patch
@@ -1,6 +1,5 @@
-diff -Naur libmeegotouch-0.20.0rc5/src/corelib/core/mcomponentdata.cpp libmeegotouch-0.20.0rc5-new/src/corelib/core/mcomponentdata.cpp
---- libmeegotouch-0.20.0rc5/src/corelib/core/mcomponentdata.cpp 2010-04-14 10:52:37.879196979 -0700
-+++ libmeegotouch-0.20.0rc5-new/src/corelib/core/mcomponentdata.cpp 2010-04-14 15:23:14.409124454 -0700
+--- a/src/corelib/core/mcomponentdata.cpp
++++ b/src/corelib/core/mcomponentdata.cpp
@@ -24,6 +24,9 @@
#include <qglobal.h>
#include <QInputContextFactory>
@@ -11,7 +10,7 @@
#include "minputmethodstate.h"
#include "mtheme.h"
-@@ -301,6 +304,13 @@
+@@ -313,6 +316,13 @@ void MComponentDataPrivate::init(int &ar
deviceName = "N900";
#endif //HAVE_N900
++++++ libmeegotouch-0.20.1-Fix-Ensure-rowsRemoved-updates-visible-cells.patch
--- libmeegotouch-0.20.1-Fix-Ensure-rowsRemoved-updates-visible-cells.patch
+++ libmeegotouch-0.20.1-Fix-Ensure-rowsRemoved-updates-visible-cells.patch
@@ -1,7 +1,6 @@
-diff -Naur libmeegotouch-0.20.14/src/views/mlistview.cpp libmeegotouch-0.20.14-new/src/views/mlistview.cpp
---- libmeegotouch-0.20.14/src/views/mlistview.cpp 2010-06-02 09:46:48.000000000 -0700
-+++ libmeegotouch-0.20.14-new/src/views/mlistview.cpp 2010-06-03 08:23:31.482559801 -0700
-@@ -207,6 +207,13 @@
+--- a/src/views/mlistview.cpp
++++ b/src/views/mlistview.cpp
+@@ -222,6 +222,13 @@ void MListView::dataChanged(const QModel
int topLeftRow = d_ptr->indexToFlatRow(topLeft);
int bottomRightRow = d_ptr->indexToFlatRow(bottomRight);
@@ -15,7 +14,7 @@
int top = qMax(topLeftRow, firstVisibleRow);
int lastCellInLastVisibleRow = lastVisibleRow + model()->columns() - lastVisibleRow % model()->columns() - 1;
int bottom = qMin(bottomRightRow, lastCellInLastVisibleRow);
-@@ -248,6 +255,8 @@
+@@ -263,6 +270,8 @@ void MListView::rowsRemoved(const QModel
Q_UNUSED(start);
Q_UNUSED(end);
Q_UNUSED(animated);
++++++ libmeegotouch-0.20.10-Workaround-icu-config-bug.patch
--- libmeegotouch-0.20.10-Workaround-icu-config-bug.patch
+++ libmeegotouch-0.20.10-Workaround-icu-config-bug.patch
@@ -6,9 +6,8 @@
/usr/bin. See BMC #2342
-diff -Naur libmeegotouch-0.20.14-new/src/icu-extradata/icu-extradata.pro libmeegotouch-0.20.14-new2/src/icu-extradata/icu-extradata.pro
---- libmeegotouch-0.20.14-new/src/icu-extradata/icu-extradata.pro 2010-06-02 09:46:48.456870165 -0700
-+++ libmeegotouch-0.20.14-new2/src/icu-extradata/icu-extradata.pro 2010-06-03 08:28:09.995569593 -0700
+--- a/src/icu-extradata/icu-extradata.pro
++++ b/src/icu-extradata/icu-extradata.pro
@@ -1,6 +1,7 @@
include($${M_BUILD_TREE}/mkspecs/features/meegotouch_defines.prf)
++++++ libmeegotouch-0.20.10-missing-Epoch-function.patch
--- libmeegotouch-0.20.10-missing-Epoch-function.patch
+++ libmeegotouch-0.20.10-missing-Epoch-function.patch
@@ -5,10 +5,9 @@
Once the version of Qt is upgraded, this patch can be removed.
-diff -Naur libmeegotouch-0.20.10/src/corelib/i18n/mcalendar.cpp libmeegotouch-0.20.10-new/src/corelib/i18n/mcalendar.cpp
---- libmeegotouch-0.20.10/src/corelib/i18n/mcalendar.cpp 2010-05-18 16:02:08.580321972 -0700
-+++ libmeegotouch-0.20.10-new/src/corelib/i18n/mcalendar.cpp 2010-05-20 09:28:03.054078670 -0700
-@@ -249,14 +249,14 @@
+--- a/src/corelib/i18n/mcalendar.cpp
++++ b/src/corelib/i18n/mcalendar.cpp
+@@ -249,14 +249,14 @@ void MCalendar::setDateTime(QDateTime da
// We cannot use QDateTime::toTime_t because this
// works only for dates after 1970-01-01T00:00:00.000.
@@ -27,7 +26,7 @@
if (originalTimeSpec == Qt::LocalTime) {
// convert from local time to UTC
-@@ -292,9 +292,9 @@
+@@ -292,9 +292,9 @@ QDateTime MCalendar::qDateTime(Qt::TimeS
}
// We cannot use QDateTime::setTime_t because this
// works only for dates after 1970-01-01T00:00:00.000.
@@ -40,7 +39,7 @@
// Qt < 4.7 lacks QDateTime::setMSecsSinceEpoch(), we need to emulate it.
qint64 msecs = qint64(icuDate);
int ddays = msecs / MSECS_PER_DAY;
-@@ -306,7 +306,7 @@
+@@ -306,7 +306,7 @@ QDateTime MCalendar::qDateTime(Qt::TimeS
}
time.setDate(QDate(1970, 1, 1).addDays(ddays));
time.setTime(QTime().addMSecs(msecs));
++++++ libmeegotouch-0.20.15-ARM-QEMU-stall-fix.patch
--- libmeegotouch-0.20.15-ARM-QEMU-stall-fix.patch
+++ libmeegotouch-0.20.15-ARM-QEMU-stall-fix.patch
@@ -1,7 +1,6 @@
-diff -ru libmeegotouch-0.20.15/configure libmeegotouch-0.20.15-stallfix/configure
---- libmeegotouch-0.20.15/configure 2010-06-03 18:13:09.000000000 +0000
-+++ libmeegotouch-0.20.15-stallfix/configure 2010-06-17 07:50:27.000000000 +0000
-@@ -402,10 +402,16 @@
+--- a/configure
++++ b/configure
+@@ -402,10 +402,16 @@ if [ $? -eq 0 ]; then
HAVE_CONTENTACTION=no
fi
++++++ libmeegotouch-0.20.15-Revert-c90025d6bde5184346d8bbe148effd47aef354af-Fixe.patch
--- libmeegotouch-0.20.15-Revert-c90025d6bde5184346d8bbe148effd47aef354af-Fixe.patch
+++ libmeegotouch-0.20.15-Revert-c90025d6bde5184346d8bbe148effd47aef354af-Fixe.patch
@@ -21,11 +21,9 @@
src/corelib/widgets/mwindow.cpp | 2 +-
4 files changed, 12 insertions(+), 54 deletions(-)
-diff --git a/src/corelib/core/mcomponentcache.cpp b/src/corelib/core/mcomponentcache.cpp
-index 3175ae6..b890ff2 100644
--- a/src/corelib/core/mcomponentcache.cpp
+++ b/src/corelib/core/mcomponentcache.cpp
-@@ -52,11 +52,6 @@ MComponentCachePrivate::~MComponentCachePrivate()
+@@ -52,11 +52,6 @@ MComponentCachePrivate::~MComponentCache
delete glWidgetOfOtherWindow;
if (mApplicationWindowInstance != 0)
delete mApplicationWindowInstance;
@@ -37,7 +35,7 @@
}
bool MComponentCachePrivate::populating()
-@@ -86,33 +81,13 @@ void MComponentCachePrivate::populateForMApplication()
+@@ -86,33 +81,13 @@ void MComponentCachePrivate::populateFor
cacheBeingPopulated = false;
}
@@ -76,7 +74,7 @@
}
MApplication* MComponentCachePrivate::mApplication(int &argc, char **argv, const QString &appIdentifier, MApplicationService *service)
-@@ -224,21 +199,17 @@ MApplicationWindow* MComponentCachePrivate::mApplicationWindow()
+@@ -224,21 +199,17 @@ MApplicationWindow* MComponentCachePriva
return returnValue;
}
@@ -111,8 +109,6 @@
-{
- return d_ptr->glWidget(&format);
-}
-diff --git a/src/corelib/core/mcomponentcache.h b/src/corelib/core/mcomponentcache.h
-index 8eb52b7..2f3b309 100644
--- a/src/corelib/core/mcomponentcache.h
+++ b/src/corelib/core/mcomponentcache.h
@@ -28,7 +28,6 @@ class MApplication;
@@ -131,8 +127,6 @@
friend class MApplicationWindow;
friend class MWindowPrivate;
-diff --git a/src/corelib/core/mcomponentcache_p.h b/src/corelib/core/mcomponentcache_p.h
-index 8143d4e..533a34c 100644
--- a/src/corelib/core/mcomponentcache_p.h
+++ b/src/corelib/core/mcomponentcache_p.h
@@ -20,9 +20,6 @@
@@ -170,11 +164,9 @@
#ifdef UNIT_TEST
friend class Ut_MComponentCache;
#endif
-diff --git a/src/corelib/widgets/mwindow.cpp b/src/corelib/widgets/mwindow.cpp
-index 1581fea..44ed22c 100644
--- a/src/corelib/widgets/mwindow.cpp
+++ b/src/corelib/widgets/mwindow.cpp
-@@ -180,7 +180,7 @@ void MWindowPrivate::initGLViewport()
+@@ -184,7 +184,7 @@ void MWindowPrivate::initGLViewport()
fmt.setSamples(0);
fmt.setAlpha(true); // Workaround for NB#153625
@@ -183,6 +175,3 @@
QPalette palette;
palette.setColor(QPalette::Base, Qt::transparent);
glWidget->setAutoFillBackground(true);
---
-1.7.0.4
-
++++++ libmeegotouch.yaml
--- libmeegotouch.yaml
+++ libmeegotouch.yaml
@@ -3,8 +3,8 @@
Version: 0.20.25
Release: 1
Group: System/Libraries
-License: LGPL v2.1
-URL: http://www.meego.com
+License: LGPLv2.1
+URL: http://meego.gitorious.org/meegotouch/libmeegotouch
Sources:
- "%{name}-%{version}.tar.bz2"
Patches:
@@ -19,16 +19,16 @@
- 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
Description: |
Qt based MeeGo Touch Framework for developing touch based user interfaces
-
PkgBR:
- - fdupes
- icu #Needed to pull in genrb and pkgdata
PkgConfigBR:
- - QtCore >= 4.6.0
+ - QtCore >= 4.7.0
- QtDBus
- QtOpenGL
- QtNetwork
@@ -42,13 +42,13 @@
- x11
- gconf-2.0
- contextprovider-1.0
-
-Provides:
+Provides:
- libdui >= 0.20.0
-Obsoletes:
+Obsoletes:
- libdui < 0.20.0
Configure: none
-Builder: make
+Builder: none
+RunFdupes: "%{_datadir}"
SubPackages:
- Name: devel
Summary: Development files for the MeeGo Touch Framework
@@ -57,7 +57,7 @@
This package contains the files necessary to develop
applications using the touch framework.
- - Name: qtstyle
+ - Name: qtstyle
Summary: QtStyle plugin for the MeeGo Touch Framework
Group: System/Libraries
Description: |
++++++ re-enable_code_to_set_orientation.patch
--- re-enable_code_to_set_orientation.patch
+++ re-enable_code_to_set_orientation.patch
@@ -6,10 +6,9 @@
Signed-off-by: Kaitlin Rupert <kaitlin.rupert at linux.intel.com>
-diff -Naur libmeegotouch-0.20.25/src/corelib/events/morientationtracker.cpp libmeegotouch-0.20.25-new/src/corelib/events/morientationtracker.cpp
---- libmeegotouch-0.20.25/src/corelib/events/morientationtracker.cpp 2010-07-06 15:41:33.000000000 -0700
-+++ libmeegotouch-0.20.25-new/src/corelib/events/morientationtracker.cpp 2010-07-13 12:39:55.796439925 -0700
-@@ -71,25 +71,23 @@
+--- a/src/corelib/events/morientationtracker.cpp
++++ b/src/corelib/events/morientationtracker.cpp
+@@ -71,25 +71,23 @@ void MOrientationTrackerPrivate::topEdge
M::Orientation orientation = M::Landscape;
QString edge = topEdgeProperty.value().toString();
More information about the MeeGo-commits
mailing list