I have made the following changes intended for : CE:Apps:MTF / irc-chatter
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/5120 Thank You, iamer [This message was auto-generated] --- Request # 5120: Messages from BOSS: State: review at 2012-06-22T13:58:16 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:iamer:branches:CE:Apps:MTF / irc-chatter -> CE:Apps:MTF / irc-chatter changes files: -------------- --- irc-chatter.changes +++ irc-chatter.changes @@ -0,0 +1,3 @@ +* Fri Jun 22 2012 Islam Amer <[email protected]> - 0.2.92 +- Update to latest git tagged release + old: ---- irc-chatter-0.0.1.tar.gz new: ---- 0001-Install-splash-files-as-well.patch 0001-Remove-booster.patch irc-chatter-0.2.92.tar.gz spec files: ----------- --- irc-chatter.spec +++ irc-chatter.spec @@ -1,37 +1,43 @@ # # Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.23 +# Generated by: spectacle version 0.24.1 # + +Name: irc-chatter + # >> macros # << macros -Name: irc-chatter Summary: IRC client -Version: 0.0.1 +Version: 0.2.92 Release: 1 Group: Applications/System License: LGPL v2.1 URL: http://gitorious.org/colorful-apps/irc-chatter Source0: %{name}-%{version}.tar.gz Source100: irc-chatter.yaml +Patch0: 0001-Remove-booster.patch +Patch1: 0001-Install-splash-files-as-well.patch BuildRequires: pkgconfig(QtOpenGL) BuildRequires: pkgconfig(QtDeclarative) BuildRequires: pkgconfig(QtGui) +BuildRequires: pkgconfig(meegotouch) BuildRequires: pkgconfig(icu-i18n) -BuildRequires: pkgconfig(qdeclarative-boostable) BuildRequires: libircclient-qt-devel BuildRequires: desktop-file-utils - %description IRC client for Harmattan/Nemo/etc. - %prep %setup -q -n %{name}-%{version} +# 0001-Remove-booster.patch +%patch0 -p1 +# 0001-Install-splash-files-as-well.patch +%patch1 -p1 # >> setup # << setup @@ -45,6 +51,7 @@ # >> build post # << build post + %install rm -rf %{buildroot} # >> install pre @@ -53,15 +60,11 @@ # >> install post # << install post + desktop-file-install --delete-original \ --dir %{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/*.desktop - - - - - %files %defattr(-,root,root,-) %{_bindir}/irc-chatter @@ -71,5 +74,3 @@ %{_datadir}/irc-chatter/irc-chatter-splash-harmattan-landscape.jpg # >> files # << files - - other changes: -------------- ++++++ 0001-Install-splash-files-as-well.patch (new) --- 0001-Install-splash-files-as-well.patch +++ 0001-Install-splash-files-as-well.patch @@ -0,0 +1,39 @@ +From a04e6d65234b50b233fc719d2bae2b9e656d9c1c Mon Sep 17 00:00:00 2001 +From: Islam Amer <[email protected]> +Date: Sun, 17 Jun 2012 22:10:24 +0000 +Subject: [PATCH] Install splash files as well + +Signed-off-by: Islam Amer <[email protected]> +--- + irc-chatter.pro | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/irc-chatter.pro b/irc-chatter.pro +index d2778b9..2b3946a 100644 +--- a/irc-chatter.pro ++++ b/irc-chatter.pro +@@ -75,15 +75,15 @@ unix { + desktopfile.path = /usr/share/applications + } + ++INSTALLS += splashportrait splashlandscape ++splashportrait.files = installables/irc-chatter-splash-harmattan-portrait.jpg ++splashportrait.path = /usr/share/irc-chatter ++splashlandscape.files = installables/irc-chatter-splash-harmattan-landscape.jpg ++splashlandscape.path = /usr/share/irc-chatter ++ + contains(MEEGO_EDITION, harmattan) { + # for Harmattan + CONFIG += qdeclarative-boostable link_pkgconfig + PKGCONFIG += qdeclarative-boostable + INCLUDEPATH += /usr/include/applauncherd +- +- INSTALLS += splashportrait splashlandscape +- splashportrait.files = installables/irc-chatter-splash-harmattan-portrait.jpg +- splashportrait.path = /usr/share/irc-chatter +- splashlandscape.files = installables/irc-chatter-splash-harmattan-landscape.jpg +- splashlandscape.path = /usr/share/irc-chatter + } +-- +1.7.10.3 + ++++++ 0001-Remove-booster.patch (new) --- 0001-Remove-booster.patch +++ 0001-Remove-booster.patch @@ -0,0 +1,43 @@ +From 5e95e12439a5419cc6e2eacef3186c146d88e0c6 Mon Sep 17 00:00:00 2001 +From: Islam Amer <[email protected]> +Date: Sun, 17 Jun 2012 22:02:19 +0000 +Subject: [PATCH] Remove booster + +Signed-off-by: Islam Amer <[email protected]> +--- + main.cpp | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/main.cpp b/main.cpp +index e1466b2..3e84954 100644 +--- a/main.cpp ++++ b/main.cpp +@@ -19,7 +19,6 @@ + #include <QtGui/QApplication> + #include <QtDeclarative> + #include <QSettings> +-#include <MDeclarativeCache> + + #include "appeventlistener.h" + #include "model/ircmodel.h" +@@ -39,7 +38,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) + QApplication::setOrganizationName("irc-chatter"); + QApplication::setApplicationVersion(APP_VERSION); + +- QApplication *app = MDeclarativeCache::qApplication(argc, argv); ++ QApplication *app = new QApplication(argc, argv); + AppSettings *appSettings = new AppSettings(app); + IrcModel *model = new IrcModel(app, appSettings); + AppEventListener *eventListener = new AppEventListener(model); +@@ -50,7 +49,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) + qmlRegisterUncreatableType<ChannelModel>("net.venemo.ircchatter", 1, 0, "ChannelModel", "This object is created in the model."); + qmlRegisterUncreatableType<IrcModel>("net.venemo.ircchatter", 1, 0, "IrcModel", "This object is created in the model."); + +- QDeclarativeView *view = MDeclarativeCache::qDeclarativeView(); ++ QDeclarativeView *view = new QDeclarativeView(); + QObject::connect(eventListener, SIGNAL(applicationActivated()), view, SLOT(raise())); + QObject::connect(app, SIGNAL(aboutToQuit()), appSettings, SLOT(saveServerSettings())); + QObject::connect(view->engine(), SIGNAL(quit()), app, SLOT(quit())); +-- +1.7.10.3 + ++++++ irc-chatter-0.0.1.tar.gz -> irc-chatter-0.2.92.tar.gz (31073 lines skipped) ++++++ irc-chatter.yaml --- irc-chatter.yaml +++ irc-chatter.yaml @@ -1,12 +1,16 @@ Name: irc-chatter Summary: IRC client -Version: 0.0.1 +Version: 0.2.92 Release: 1 Group: Applications/System License: LGPL v2.1 URL: http://gitorious.org/colorful-apps/irc-chatter Sources: - "%{name}-%{version}.tar.gz" +Patches: + - 0001-Remove-booster.patch + - 0001-Install-splash-files-as-well.patch + Description: | IRC client for Harmattan/Nemo/etc. @@ -17,8 +21,8 @@ - QtOpenGL - QtDeclarative - QtGui + - meegotouch - icu-i18n - - qdeclarative-boostable Configure: none Builder: qmake
