I have made the following changes intended for : CE:Apps / newsflow Please review and accept ASAP - BOSS has already processed this request and suggests ??? See the "Messages from BOSS" section below
https://build.pub.meego.com/request/show/2679 Thank You, bossbot ([email protected]) [This message was auto-generated] --- Request # 2679: Messages from BOSS: None State: new 2011-10-24T18:53:26 bossbot Reviews: from bossbot :BOSS suggests accepting this review. See email for more details. BOSS accepted this review because: Target repo CE_Apps_armv7hl found. accepted on No date Changes: submit: Project:DE:Trunk:Testing:1.3 / newsflow -> CE:Apps / newsflow Index: fix_version.patch =================================================================== --- fix_version.patch (revision 0) +++ fix_version.patch (revision 3) @@ -0,0 +1,12 @@ +diff --git a/NewsFlow.desktop b/NewsFlow.desktop +index e551f1c..d569471 100755 +--- a/NewsFlow.desktop ++++ b/NewsFlow.desktop +@@ -1,6 +1,6 @@ + [Desktop Entry] + Encoding=UTF-8 +-Version=1.0.0 ++Version=1.0 + Type=Application + Terminal=false + Name=newsflow Index: com.substanceofcode.newsflow.spec =================================================================== --- com.substanceofcode.newsflow.spec (revision 0) +++ com.substanceofcode.newsflow.spec (revision 3) @@ -0,0 +1,79 @@ +# +# Do NOT Edit the Auto-generated Part! +# Generated by: spectacle version 0.22 +# +# >> macros +# << macros + +Name: com.substanceofcode.newsflow +Summary: Google Reader client +Version: 1.0 +Release: 1 +Group: Applications/Internet +License: TBD +URL: http://www.substanceofcode.com/ +Source0: %{name}-%{version}.tar.gz +Source100: com.substanceofcode.newsflow.yaml +Patch0: fix_version.patch +Patch1: fix_blank_screen.patch +Patch2: fix_moc_files.patch +BuildRequires: pkgconfig(QtCore) >= 4.7.0 +BuildRequires: pkgconfig(QtGui) +BuildRequires: pkgconfig(QtWebKit) +BuildRequires: pkgconfig(QtOpenGL) +BuildRequires: desktop-file-utils + + +%description +Google Reader client, for rss feeds at Google Reader service + + + +%prep +%setup -q -n %{name}-%{version} + +# fix_version.patch +%patch0 -p1 +# fix_blank_screen.patch +%patch1 -p1 +# fix_moc_files.patch +%patch2 -p1 +# >> setup +# << setup + +%build +# >> build pre +# << build pre + +%qmake + +make %{?jobs:-j%jobs} + +# >> build post +# << build post +%install +rm -rf %{buildroot} +# >> install pre +# << install pre +%qmake_install + +# >> install post +# << install post +desktop-file-install --delete-original \ + --dir %{buildroot}%{_datadir}/applications \ + %{buildroot}%{_datadir}/applications/*.desktop + + + + + + +%files +%defattr(-,root,root,-) +/usr/share/applications/NewsFlow.desktop +/opt/%{name} +/usr/share/icons/hicolor/*/apps/NewsFlow.png +# >> files +# << files + + Index: fix_moc_files.patch =================================================================== --- fix_moc_files.patch (revision 0) +++ fix_moc_files.patch (revision 3) @@ -0,0 +1,150 @@ +diff --git a/moc/moc_qmlapplicationviewer.cpp b/moc/moc_qmlapplicationviewer.cpp +deleted file mode 100755 +index b4c6dc5..0000000 +--- a/moc/moc_qmlapplicationviewer.cpp ++++ /dev/null +@@ -1,69 +0,0 @@ +-/**************************************************************************** +-** Meta object code from reading C++ file 'qmlapplicationviewer.h' +-** +-** Created: Tue 25. Jan 21:45:29 2011 +-** by: The Qt Meta Object Compiler version 62 (Qt 4.7.1) +-** +-** WARNING! All changes made in this file will be lost! +-*****************************************************************************/ +- +-#include "../qmlapplicationviewer/qmlapplicationviewer.h" +-#if !defined(Q_MOC_OUTPUT_REVISION) +-#error "The header file 'qmlapplicationviewer.h' doesn't include <QObject>." +-#elif Q_MOC_OUTPUT_REVISION != 62 +-#error "This file was generated using the moc from 4.7.1. It" +-#error "cannot be used with the include files from this version of Qt." +-#error "(The moc has changed too much.)" +-#endif +- +-QT_BEGIN_MOC_NAMESPACE +-static const uint qt_meta_data_QmlApplicationViewer[] = { +- +- // content: +- 5, // revision +- 0, // classname +- 0, 0, // classinfo +- 0, 0, // methods +- 0, 0, // properties +- 0, 0, // enums/sets +- 0, 0, // constructors +- 0, // flags +- 0, // signalCount +- +- 0 // eod +-}; +- +-static const char qt_meta_stringdata_QmlApplicationViewer[] = { +- "QmlApplicationViewer\0" +-}; +- +-const QMetaObject QmlApplicationViewer::staticMetaObject = { +- { &QDeclarativeView::staticMetaObject, qt_meta_stringdata_QmlApplicationViewer, +- qt_meta_data_QmlApplicationViewer, 0 } +-}; +- +-#ifdef Q_NO_DATA_RELOCATION +-const QMetaObject &QmlApplicationViewer::getStaticMetaObject() { return staticMetaObject; } +-#endif //Q_NO_DATA_RELOCATION +- +-const QMetaObject *QmlApplicationViewer::metaObject() const +-{ +- return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +-} +- +-void *QmlApplicationViewer::qt_metacast(const char *_clname) +-{ +- if (!_clname) return 0; +- if (!strcmp(_clname, qt_meta_stringdata_QmlApplicationViewer)) +- return static_cast<void*>(const_cast< QmlApplicationViewer*>(this)); +- return QDeclarativeView::qt_metacast(_clname); +-} +- +-int QmlApplicationViewer::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +-{ +- _id = QDeclarativeView::qt_metacall(_c, _id, _a); +- if (_id < 0) +- return _id; +- return _id; +-} +-QT_END_MOC_NAMESPACE +diff --git a/moc_qmlapplicationviewer.cpp b/moc_qmlapplicationviewer.cpp +deleted file mode 100755 +index 4051e7d..0000000 +--- a/moc_qmlapplicationviewer.cpp ++++ /dev/null +@@ -1,69 +0,0 @@ +-/**************************************************************************** +-** Meta object code from reading C++ file 'qmlapplicationviewer.h' +-** +-** Created: Thu 27. Jan 16:01:59 2011 +-** by: The Qt Meta Object Compiler version 62 (Qt 4.7.0) +-** +-** WARNING! All changes made in this file will be lost! +-*****************************************************************************/ +- +-#include "qmlapplicationviewer/qmlapplicationviewer.h" +-#if !defined(Q_MOC_OUTPUT_REVISION) +-#error "The header file 'qmlapplicationviewer.h' doesn't include <QObject>." +-#elif Q_MOC_OUTPUT_REVISION != 62 +-#error "This file was generated using the moc from 4.7.0. It" +-#error "cannot be used with the include files from this version of Qt." +-#error "(The moc has changed too much.)" +-#endif +- +-QT_BEGIN_MOC_NAMESPACE +-static const uint qt_meta_data_QmlApplicationViewer[] = { +- +- // content: +- 5, // revision +- 0, // classname +- 0, 0, // classinfo +- 0, 0, // methods +- 0, 0, // properties +- 0, 0, // enums/sets +- 0, 0, // constructors +- 0, // flags +- 0, // signalCount +- +- 0 // eod +-}; +- +-static const char qt_meta_stringdata_QmlApplicationViewer[] = { +- "QmlApplicationViewer\0" +-}; +- +-const QMetaObject QmlApplicationViewer::staticMetaObject = { +- { &QDeclarativeView::staticMetaObject, qt_meta_stringdata_QmlApplicationViewer, +- qt_meta_data_QmlApplicationViewer, 0 } +-}; +- +-#ifdef Q_NO_DATA_RELOCATION +-const QMetaObject &QmlApplicationViewer::getStaticMetaObject() { return staticMetaObject; } +-#endif //Q_NO_DATA_RELOCATION +- +-const QMetaObject *QmlApplicationViewer::metaObject() const +-{ +- return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +-} +- +-void *QmlApplicationViewer::qt_metacast(const char *_clname) +-{ +- if (!_clname) return 0; +- if (!strcmp(_clname, qt_meta_stringdata_QmlApplicationViewer)) +- return static_cast<void*>(const_cast< QmlApplicationViewer*>(this)); +- return QDeclarativeView::qt_metacast(_clname); +-} +- +-int QmlApplicationViewer::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +-{ +- _id = QDeclarativeView::qt_metacall(_c, _id, _a); +- if (_id < 0) +- return _id; +- return _id; +-} +-QT_END_MOC_NAMESPACE Index: com.substanceofcode.newsflow.yaml =================================================================== --- com.substanceofcode.newsflow.yaml (revision 0) +++ com.substanceofcode.newsflow.yaml (revision 3) @@ -0,0 +1,27 @@ +Name: com.substanceofcode.newsflow +Summary: Google Reader client +Version: 1.0 +Release: 1 +Group: Applications/Internet +License: TBD +URL: http://www.substanceofcode.com/ +Sources: + - "%{name}-%{version}.tar.gz" +Patches: + - fix_version.patch + - fix_blank_screen.patch + - fix_moc_files.patch +Description: + Google Reader client, for rss feeds at Google Reader service + +PkgConfigBR: + - QtCore >= 4.7.0 + - QtGui + - QtWebKit + - QtOpenGL +Configure: none +Builder: qmake +Files: + - "/usr/share/applications/NewsFlow.desktop" + - "/opt/%{name}" + - "/usr/share/icons/hicolor/*/apps/NewsFlow.png" Index: com.substanceofcode.newsflow.changes =================================================================== --- com.substanceofcode.newsflow.changes (revision 0) +++ com.substanceofcode.newsflow.changes (revision 3) @@ -0,0 +1,12 @@ +* Fri Sep 23 2011 Jari Paloj?rvi <[email protected]> - 1.0 +- Added a patch that removes moc files from the source package + (the moc files caused compilation failure) + +* Thu Sep 22 2011 Jari Paloj?rvi <[email protected]> - 1.0 +- For integration to the MeeGo CE Fall Release + Created this changes file and changed the Files section in the yaml + file to mention the desktop and png files +- Changed the version number in the .desktop file as the earlier version + caused build problems after the above yaml file change +- Changed the application to now show a non-blank screen (with an exit + option) after attempting auto-logon without a network connection Index: fix_blank_screen.patch =================================================================== --- fix_blank_screen.patch (revision 0) +++ fix_blank_screen.patch (revision 3) @@ -0,0 +1,14 @@ +diff --git a/qml/NewsFlow/js/script.js b/qml/NewsFlow/js/script.js +index 5ed2800..0984c8a 100755 +--- a/qml/NewsFlow/js/script.js ++++ b/qml/NewsFlow/js/script.js +@@ -148,6 +148,9 @@ function parseToken(data) { + } else { + addError("Couldn't parse SID"); + waiting.state = "hidden"; ++ // To avoid having totally blank screen (with no option even to exit) ++ // in case of e.g. a connectivity error in automatic logon case: ++ navigation.state = "menu"; + } + } + Index: com.substanceofcode.newsflow-1.0.tar.gz =================================================================== Binary file com.substanceofcode.newsflow-1.0.tar.gz added
