I have made the following changes intended for : nemo:devel:mw / libprofile-qt
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.merproject.org//request/show/165 Thank You, Vesa Halttunen [This message was auto-generated] --- Request # 165: Messages from BOSS: State: review at 2013-04-03T15:37:59 by cibot Reviews: new for home:vesuri:branches:nemo:devel:mw : accepted by cibot : Prechecks succeeded. new for nemo:devel:mw : 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:vesuri:branches:nemo:devel:mw / libprofile-qt -> nemo:devel:mw / libprofile-qt changes files: -------------- --- libprofile-qt.changes +++ libprofile-qt.changes @@ -0,0 +1,3 @@ +* Wed Apr 03 2013 Vesa Halttunen <[email protected]> - 0.34.0.3 +- Don't unnecessarily depend on libmeegotouch - Fixes NEMO#659 + old: ---- libprofile-qt-0.34.0.2.tar.bz2 new: ---- libprofile-qt-0.34.0.3.tar.bz2 spec files: ----------- --- libprofile-qt.spec +++ libprofile-qt.spec @@ -9,18 +9,17 @@ # << macros Summary: Qt library for profiles -Version: 0.34.0.2 +Version: 0.34.0.3 Release: 1 Group: System/System Control License: LGPLv2.1 -URL: http://meego.gitorious.org/meego-middleware/profile-qt +URL: http://github.com/nemomobile/libprofile-qt Source0: %{name}-%{version}.tar.bz2 Source100: libprofile-qt.yaml Requires: profiled Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig BuildRequires: pkgconfig(QtCore) -BuildRequires: pkgconfig(meegotouch) BuildRequires: doxygen %description @@ -59,7 +58,7 @@ %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name} # >> setup # << setup @@ -112,7 +111,6 @@ %files -n libprofile-qt-doc %defattr(-,root,root,-) -%attr(644,root,root) %{_datadir}/doc/libprofile-qt/html/installdox %{_docdir}/libprofile-qt/* # >> files libprofile-qt-doc # << files libprofile-qt-doc other changes: -------------- ++++++ libprofile-qt-0.34.0.2.tar.bz2 -> libprofile-qt-0.34.0.3.tar.bz2 --- doc/doc.pri +++ doc/doc.pri @@ -1,19 +0,0 @@ -DOXYGEN_BIN=doxygen - -QMAKE_EXTRA_TARGETS += doc -doc.target = doc -isEmpty(DOXYGEN_BIN) { - doc.commands = @echo "Unable to detect doxygen in PATH" -} else { - doc.commands = $${DOXYGEN_BIN} doc/doxyfile.cfg ; - doc.commands += ./doc/xmlize.pl ; - - # Install rules - htmldocs.files = doc/html - - htmldocs.path = /usr/share/doc/libprofile-qt -# htmldocs.CONFIG += no_check_exist - htmldocs.depends += doc - INSTALLS += htmldocs -} -doc.depends = FORCE --- doc/doc.pro +++ doc/doc.pro @@ -0,0 +1,20 @@ +# Stupid qmake wants to link everything. +QMAKE_LINK = @: IGNORE THIS LINE + +QMAKE_EXTRA_TARGETS += doc +QMAKE_EXTRA_COMPILER += doc + +doc.target = html/index.html +doc.config += no_check_exist no_link explicit_dependencies +doc.commands = doxygen doxyfile.cfg +doc.input = $${doc.depends} +doc.output = $${doc.target} + +## Make are doc target build by default If 'make' is executed in doc folder +PRE_TARGETDEPS += $${doc.output} + +# Install rules +htmldocs.files = html/* +htmldocs.path = /usr/share/doc/libprofile-qt +htmldocs.CONFIG += no_check_exist +INSTALLS += htmldocs --- doc/doxyfile.cfg +++ doc/doxyfile.cfg @@ -1,6 +1,6 @@ PROJECT_NAME = libprofile-qt PROJECT_NUMBER = -OUTPUT_DIRECTORY = ./doc +OUTPUT_DIRECTORY = . OUTPUT_LANGUAGE = English DISABLE_INDEX = NO EXTRACT_ALL = NO @@ -42,13 +42,13 @@ # configuration options related to the input files #--------------------------------------------------------------------------- -FILE_VERSION_FILTER = "head -1 ./debian/changelog" -INPUT = ./src/ +FILE_VERSION_FILTER = "head -1 ../debian/changelog" +INPUT = ../src/ FILE_PATTERNS = *.cpp *.h *.dox RECURSIVE = YES EXCLUDE = EXCLUDE_PATTERNS = moc_*.cpp *_p.h *_p.cpp -IMAGE_PATH = ./doc/src/images +IMAGE_PATH = ./src/images INPUT_FILTER = #--------------------------------------------------------------------------- @@ -66,9 +66,9 @@ GENERATE_TESTLIST = YES GENERATE_HTML = YES HTML_OUTPUT = html -HTML_HEADER = doc/header.html -HTML_FOOTER = doc/footer.html -HTML_STYLESHEET = doc/dui.css +HTML_HEADER = header.html +HTML_FOOTER = footer.html +HTML_STYLESHEET = dui.css HTML_ALIGN_MEMBERS = YES GENERATE_HTMLHELP = NO @@ -120,7 +120,7 @@ TAGFILES = qt.tag # GENERATE_TAGFILE = YES ALLEXTERNALS = NO -PERL_PATH = /usr/bin/perl +PERL_PATH = /scratchbox/tools/bin #--------------------------------------------------------------------------- # Configuration options related to the dot tool @@ -131,10 +131,10 @@ COLLABORATION_GRAPH = YES INCLUDE_GRAPH = YES GRAPHICAL_HIERARCHY = YES -# DOT_PATH = /scratchbox/devkits/doctools/bin/ +DOT_PATH = /scratchbox/devkits/doctools/bin/ #--------------------------------------------------------------------------- -# Configuration::addtions/ related to the search engine +# Configuration::addtions related to the search engine #--------------------------------------------------------------------------- SEARCHENGINE = NO --- doc/html +++ doc/html -(directory) --- doc/html/.gitignore +++ doc/html/.gitignore --- profile.pro +++ profile.pro @@ -1,6 +1,5 @@ TEMPLATE = subdirs SUBDIRS = \ src \ - tests - -include(doc/doc.pri) + tests \ + doc --- src/src.pro +++ src/src.pro @@ -7,6 +7,8 @@ QMAKE_LFLAGS += --coverage } +unix:QMAKE_CXXFLAGS *= -fvisibility=hidden -fvisibility-inlines-hidden + PROFILE_PREFIX = . DEFINES += PROFILE_QT --- tests/tests.pro +++ tests/tests.pro @@ -10,7 +10,7 @@ QMAKE_LFLAGS += --coverage } -CONFIG += meegotouch link_prl +CONFIG += link_prl QT += testlib dbus DEFINES += UNIT_TEST QMAKE_EXTRA_TARGETS = check --- tests/ut_profile.cpp +++ tests/ut_profile.cpp @@ -48,7 +48,7 @@ #include <QDBusConnection> -#include <MApplication> +#include <QApplication> #include <QSignalSpy> @@ -97,7 +97,7 @@ { int argc = 1; char* app_name = (char*) "./ut_profile"; - app = new MApplication(argc, &app_name); + app = new QApplication(argc, &app_name); ProfilePrivate *priv = new ProfilePrivate(); m_subject = new Profile(priv); --- tests/ut_profile.h +++ tests/ut_profile.h @@ -39,7 +39,7 @@ #include <QtTest/QtTest> #include <QObject> #include <QDBusInterface> -#include <MApplication> +#include <QApplication> #include <Profile> #include <profile_p.h> @@ -88,7 +88,7 @@ private: Profile* m_subject; Profile* m_tmp; - MApplication *app; + QApplication *app; MocDBus *mocDbus; }; ++++++ libprofile-qt.yaml --- libprofile-qt.yaml +++ libprofile-qt.yaml @@ -1,16 +1,15 @@ Name: libprofile-qt Summary: Qt library for profiles -Version: 0.34.0.2 +Version: 0.34.0.3 Release: 1 Group: System/System Control License: LGPLv2.1 -URL: http://meego.gitorious.org/meego-middleware/profile-qt +URL: http://github.com/nemomobile/libprofile-qt Sources: - "%{name}-%{version}.tar.bz2" Description: Qt wrapper library for profiles PkgConfigBR: - QtCore - - meegotouch PkgBR: - doxygen Requires: @@ -55,7 +54,6 @@ Summary: API documentation for libprofile-qt Group: Documentation Files: - - "%attr(644,root,root) %{_datadir}/doc/libprofile-qt/html/installdox" - "%{_docdir}/libprofile-qt/*" Description: | API documentation for libprofile-qt
