I have made the following changes intended for : CE:Apps / qmlgallery 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/6062 Thank You, John Brooks [This message was auto-generated] --- Request # 6062: Messages from BOSS: State: review at 2012-08-24T09:39:13 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:special:branches:CE:Apps / qmlgallery -> CE:Apps / qmlgallery changes files: -------------- --- qmlgallery.changes +++ qmlgallery.changes @@ -0,0 +1,5 @@ +* Fri Aug 24 2012 John Brooks <[email protected]> - 0.0.8 +- Fixes NEMO#363: Only one instance of gallery should be started +- Use desktop file from source rather than obs +- Display name of the menu entry *actually* changed from qmlgallery to Gallery + old: ---- qmlgallery.desktop new: ---- 0001-NEMO-363-Use-single-instance-invoker-to-launch.patch spec files: ----------- --- qmlgallery.spec +++ qmlgallery.spec @@ -15,8 +15,8 @@ License: BSD URL: https://github.com/nemomobile/qmlgallery Source0: %{name}-%{version}.tar.bz2 -Source1: qmlgallery.desktop Source100: qmlgallery.yaml +Patch0: 0001-NEMO-363-Use-single-instance-invoker-to-launch.patch Requires: libdeclarative-gallery Requires: nemo-qml-plugins-thumbnailer BuildRequires: pkgconfig(QtCore) >= 4.7.0 @@ -32,6 +32,8 @@ %prep %setup -q -n %{name} +# 0001-NEMO-363-Use-single-instance-invoker-to-launch.patch +%patch0 -p1 # >> setup # << setup @@ -54,8 +56,6 @@ %install rm -rf %{buildroot} # >> install pre -mkdir -p %{buildroot}/%{_datadir}/applications -cp %{SOURCE1} %{buildroot}/%{_datadir}/applications/qmlgallery.desktop # << install pre %qmake_install @@ -70,9 +70,6 @@ %defattr(-,root,root,-) %{_bindir}/qmlgallery %{_datadir}/applications/qmlgallery.desktop -%{_libdir}/qt4/imports/org/nemomobile/qmlgallery/qmldir -%{_libdir}/qt4/imports/org/nemomobile/qmlgallery/GalleryDelegate.qml -%{_libdir}/qt4/imports/org/nemomobile/qmlgallery/GalleryModel.qml -%{_libdir}/qt4/imports/org/nemomobile/qmlgallery/GalleryView.qml +%{_libdir}/qt4/imports/org/nemomobile/qmlgallery/* # >> files # << files other changes: -------------- ++++++ 0001-NEMO-363-Use-single-instance-invoker-to-launch.patch (new) --- 0001-NEMO-363-Use-single-instance-invoker-to-launch.patch +++ 0001-NEMO-363-Use-single-instance-invoker-to-launch.patch @@ -0,0 +1,42 @@ +From 743148a1dc2c07b30eb6d888d93ce620f7158106 Mon Sep 17 00:00:00 2001 +From: John Brooks <[email protected]> +Date: Thu, 23 Aug 2012 19:40:45 -0600 +Subject: [PATCH 1/1] NEMO#363: Use single-instance invoker to launch + +Also, actually install the desktop file. +--- + qmlgallery.desktop | 2 +- + qmlgallery.pro | 4 ++++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/qmlgallery.desktop b/qmlgallery.desktop +index 463d55a..dab4d52 100644 +--- a/qmlgallery.desktop ++++ b/qmlgallery.desktop +@@ -4,7 +4,7 @@ Version=1.0 + Type=Application + Terminal=false + Name=Gallery +-Exec=/opt/qmlgallery/bin/qmlgallery ++Exec=invoker -s --type=d /usr/bin/qmlgallery -fullscreen + Icon=icons-Applications-photos + X-Window-Icon= + X-HildonDesk-ShowInToolbar=true +diff --git a/qmlgallery.pro b/qmlgallery.pro +index 78e054a..59dd71a 100644 +--- a/qmlgallery.pro ++++ b/qmlgallery.pro +@@ -9,6 +9,10 @@ INSTALLS += qml_api + target.path = $$INSTALL_ROOT/usr/bin + INSTALLS += target + ++desktop.files = $${PROJECT_NAME}.desktop ++desktop.path = $$INSTALL_ROOT/usr/share/applications ++INSTALLS += desktop ++ + RESOURCES += res.qrc + SOURCES += main.cpp + +-- +1.7.9.5 + ++++++ qmlgallery.yaml --- qmlgallery.yaml +++ qmlgallery.yaml @@ -7,7 +7,8 @@ URL: https://github.com/nemomobile/qmlgallery Sources: - "%{name}-%{version}.tar.bz2" - - "qmlgallery.desktop" +Patches: + - 0001-NEMO-363-Use-single-instance-invoker-to-launch.patch Description: Photo Gallery application using Qt Quick for Nemo Mobile. Configure: none Builder: qmake @@ -35,7 +36,4 @@ Files: - "%{_bindir}/qmlgallery" - "%{_datadir}/applications/qmlgallery.desktop" - - "%{_libdir}/qt4/imports/org/nemomobile/qmlgallery/qmldir" - - "%{_libdir}/qt4/imports/org/nemomobile/qmlgallery/GalleryDelegate.qml" - - "%{_libdir}/qt4/imports/org/nemomobile/qmlgallery/GalleryModel.qml" - - "%{_libdir}/qt4/imports/org/nemomobile/qmlgallery/GalleryView.qml" + - "%{_libdir}/qt4/imports/org/nemomobile/qmlgallery/*" ++++++ deleted files: --- qmlgallery.desktop
