Merge lp:~sil2100/appmenu-qt/appmenu-qt-multi into lp:appmenu-qt

[Łukasz Zemczak]

Straight port appmenu-qt to also support Qt5. Change packaging to do a double-build, building both appmenu-qt (for Qt4) and appmenu-qt5 (for Qt5) packages. In appmenu-qt5, do not depend on Qt5 in the package deps, instead let's Suggest them - we hack shlibs variable to do this nicely. This way we won't pull in Qt5 by default to Ubuntu.

- Problem:

Current appmenu-qt does not support Qt5, only Qt4 (LP: #1126205).

- Fix:

Straight port appmenu-qt to support also Qt5. Change packaging to do a double-build, building both appmenu-qt (for Qt4) and appmenu-qt5 (for Qt5). In appmenu-qt5, we do not depend on Qt5 in the package deps, instead let's Suggest them. This way we won't pull in Qt5 by default to Ubuntu.

NOTE! This needs the respective libdbusmenu-qt changes incorporated as well. A merge request for those will be soon available.

- Tests:

N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:64
http://jenkins.qa.ubuntu.com/job/appmenu-qt-ci/1/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/appmenu-qt-raring-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/appmenu-qt-raring-armhf-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/appmenu-qt-ci/1/rebuild

review: Needs Fixing (continuous-integration)

[Mathieu Trudel-Lapierre (cyphermox)]

Could you also add Vcs-Browser: https://code.launchpad.net/~indicator-applet-developers/appmenu-qt/trunk/files below Vcs-Bzr ?

Also, debian/copyright is inconsistent, some places mention GPL 2, but refer to /usr/share/common-licenses/GPL-3; also, the License: stanza always mentions the unversioned name of the license, when it should be GPL-3, GPL-2, or LGPL-2.1.

review: Needs Fixing

[Mathieu Trudel-Lapierre (cyphermox)]

Should be
118 +License: LGPL-2

LGPL-2.1; given that the license text below mentions 2.1... or fix the text... Also correct the reference to the file in /usr/share/common-licenses. :)

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:66
http://jenkins.qa.ubuntu.com/job/appmenu-qt-ci/2/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/appmenu-qt-raring-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/appmenu-qt-raring-armhf-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/appmenu-qt-ci/2/rebuild

review: Needs Fixing (continuous-integration)

[Mathieu Trudel-Lapierre (cyphermox)]

Jenkins wants the depends to be fixed :)

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:66
http://jenkins.qa.ubuntu.com/job/appmenu-qt-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/appmenu-qt-raring-amd64-ci/3
    FAILURE: http://jenkins.qa.ubuntu.com/job/appmenu-qt-raring-armhf-ci/3/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/appmenu-qt-ci/3/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:67
http://jenkins.qa.ubuntu.com/job/appmenu-qt-ci/4/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/appmenu-qt-raring-amd64-ci/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/appmenu-qt-raring-armhf-ci/4/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/appmenu-qt-ci/4/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:68
http://jenkins.qa.ubuntu.com/job/appmenu-qt-ci/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/appmenu-qt-raring-amd64-ci/5
    FAILURE: http://jenkins.qa.ubuntu.com/job/appmenu-qt-raring-armhf-ci/5/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/appmenu-qt-ci/5/rebuild

review: Needs Fixing (continuous-integration)

[Mathieu Trudel-Lapierre (cyphermox)]

Looks good.

review: Approve

[Mathieu Trudel-Lapierre (cyphermox)]

armhf fails because it's not setup with the PPA for testing that build -- approving.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/appmenu-qt-autolanding/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/appmenu-qt-raring-amd64-autolanding/1
    FAILURE: http://jenkins.qa.ubuntu.com/job/appmenu-qt-raring-armhf-autolanding/1/console

review: Needs Fixing (continuous-integration)

[Allan LeSage (allanlesage)]

One more time! Disabled armhf build temporarily.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-04-05 15:10:00 +0000
+++ CMakeLists.txt	2013-03-28 19:20:25 +0000
@@ -7,6 +7,16 @@
 set(appmenu_qt_VERSION_PATCH 6)
 set(appmenu_qt_VERSION ${appmenu_qt_VERSION_MAJOR}.${appmenu_qt_VERSION_MINOR}.${appmenu_qt_VERSION_PATCH})
 
+# Check if we want to explicitly select the Qt version to be used or autodetect
+if(NOT USE_QT4 AND NOT USE_QT5)
+    # Autodetect, prefering Qt5
+    message(STATUS "Autodetecting Qt version to use")
+    find_package(Qt5Widgets QUIET)
+    if (Qt5Widgets_FOUND)
+        set(USE_QT5 TRUE)
+    endif()
+endif()
+
 # Packaging
 set(ARCHIVE_NAME appmenu-qt-${appmenu_qt_VERSION})
 add_custom_target(dist
@@ -28,8 +38,16 @@
 
 # Dependencies
 find_package(PkgConfig REQUIRED)
-find_package(Qt4 REQUIRED)
-pkg_check_modules(DBUSMENUQT REQUIRED dbusmenu-qt>=0.9.0)
+if(USE_QT5)
+    find_package(Qt5Widgets REQUIRED)
+    find_package(Qt5Core REQUIRED)
+    find_package(Qt5DBus REQUIRED)
+    pkg_check_modules(DBUSMENUQT REQUIRED dbusmenu-qt5>=0.9.0)
+    add_definitions( -DUSE_QT5 )
+else()
+    find_package(Qt4 REQUIRED)
+    pkg_check_modules(DBUSMENUQT REQUIRED dbusmenu-qt>=0.9.0)
+endif()
 
 # Source
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Woverloaded-virtual")
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-01-18 02:00:49 +0000
+++ debian/changelog	2013-03-28 19:20:25 +0000
@@ -1,3 +1,13 @@
+appmenu-qt (0.2.7daily13.01.18-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/control:
+    - Add the appmenu-qt5 package for Qt5 appmenu support
+  * debian/rules:
+    - Enable a double build - first build a Qt4 version of appmenu for 
+      appmenu-qt and then a Qt5 version for appmenu-qt5
+
+ -- Łukasz 'sil2100' Zemczak <[e-mail]>  Wed, 27 Mar 2013 19:54:44 +0100
+
 appmenu-qt (0.2.7daily13.01.18-0ubuntu1) raring; urgency=low
 
   * Automatic snapshot from revision 53
 
=== modified file 'debian/control'
--- debian/control	2012-11-22 18:19:57 +0000
+++ debian/control	2013-03-28 19:20:25 +0000
@@ -6,7 +6,9 @@
 Uploaders: Ritesh Raj Sarraf <[e-mail]>
 Build-Depends: cmake,
                debhelper (>= 9),
-               libdbusmenu-qt-dev (>= 0.9.0),
+               libdbusmenu-qt-dev,
+               libdbusmenu-qt5-dev,
+               qtbase5-dev (>= 5.0.1+dfsg-0ubuntu4~),
                libqt4-dev (>= 4:4.8),
                pkg-config,
 Standards-Version: 3.9.3
@@ -14,6 +16,7 @@
 # If you aren't ~indicator-applet-developers but need to upload packaging changes,
 # just go ahead.  ~indicator-applet-developers will notice and sync up the code again.
 Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/appmenu-qt/trunk
+Vcs-Browser: https://code.launchpad.net/~indicator-applet-developers/appmenu-qt/trunk/files
 
 Package: appmenu-qt
 Architecture: any
@@ -24,3 +27,18 @@
  global menu bar
  .
  appmenu-qt will work for applications designed for Qt and KDE
+
+Package: appmenu-qt5
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Suggests: libqt5core5,
+          libqt5dbus5,
+          libqt5gui5,
+          libqt5widgets5,
+Description: application menu for Qt5
+ appmenu provides you with an integrated application menu in your
+ global menu bar
+ .
+ appmenu-qt5 will work for applications designed for Qt and KDE
+ This is the Qt5 version
 
=== modified file 'debian/copyright'
--- debian/copyright	2012-11-22 17:15:51 +0000
+++ debian/copyright	2013-03-28 19:20:25 +0000
@@ -6,7 +6,7 @@
 
 Files: *
 Copyright: Aurélien Gâteau <[e-mail]>
-License: LGPL
+License: LGPL-3
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU Lesser General Public License version 3, as
  published by  the Free Software Foundation
@@ -26,7 +26,7 @@
 
 Files: src/private/qabstractplatformmenubar_p.h patches/qmenubar-plugin-system-4.7.3.diff
 Copyright: 2010 Nokia Corporation and/or its subsidiary(-ies).
-License: LGPL
+License: LGPL-2.1
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU Lesser General Public License version 2.1, as
  published by  the Free Software Foundation
@@ -41,11 +41,11 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  .
  On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/LGPL-2
+ can be found in /usr/share/common-licenses/LGPL-2.1
 
 Files: debian/*
 Copyright: 2012 Ritesh Raj Sarraf
-License: GPL
+License: GPL-2
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License version 2, as
  published by  the Free Software Foundation
@@ -60,4 +60,4 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  .
  On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-3
+ can be found in /usr/share/common-licenses/GPL-2
 
=== modified file 'debian/rules'
--- debian/rules	2012-11-23 16:23:39 +0000
+++ debian/rules	2013-03-28 19:20:25 +0000
@@ -7,11 +7,33 @@
 %:
 	dh $@
 
+override_dh_auto_configure:
+	mkdir qt4
+	mkdir qt5
+	cd qt4 && QT_SELECT=qt4 cmake -DUSE_QT4=true ../
+	cd qt5 && QT_SELECT=qt5 cmake -DUSE_QT5=true ../
+
+override_dh_auto_build:
+	cd qt4 && make
+	cd qt5 && make
+
+override_dh_auto_install:
+	cd qt4 && make DESTDIR=../debian/appmenu-qt install
+	cd qt5 && make DESTDIR=../debian/appmenu-qt5 install
+
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS
 
 override_dh_makeshlibs:
-	dh_makeshlibs -Xqt4/plugins
+	dh_makeshlibs -Xqt5/plugins -Xqt4/plugins
 
 override_dh_install:
 	dh_install --fail-missing
+
+override_dh_gencontrol:
+	# Ugly hack, since we don't want to have Qt5 as our depends, we prefer
+	# those as Suggests for now
+	sed -i '/^shlibs/s/libqt5[^,]*, //g' debian/appmenu-qt5.substvars
+	sed -i '/^shlibs/s/,[^,]* libqt5.*$$//' debian/appmenu-qt5.substvars
+
+	dh_gencontrol
 
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2013-01-11 15:05:38 +0000
+++ src/CMakeLists.txt	2013-03-28 19:20:25 +0000
@@ -1,3 +1,16 @@
+# Compat variables for plugins.
+function(_QT5_QUERY_QMAKE VAR RESULT)
+    get_target_property(QT_QMAKE_EXECUTABLE ${Qt5Core_QMAKE_EXECUTABLE} LOCATION)
+    execute_process(COMMAND ${QT_QMAKE_EXECUTABLE} "-query" ${VAR}
+                    RESULT_VARIABLE return_code
+                    OUTPUT_VARIABLE output)
+    if(NOT return_code)
+        file(TO_CMAKE_PATH "${output}" output)
+        STRING(REGEX REPLACE "(\r?\n)+$" "" output "${output}")
+        set(${RESULT} ${output} PARENT_SCOPE)
+    endif(NOT return_code)
+endfunction(_QT5_QUERY_QMAKE)
+
 # Source
 set(appmenu_qt_SRCS
     appmenuplatformmenubar.cpp
@@ -8,18 +21,37 @@
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${DBUSMENUQT_INCLUDE_DIRS}
-    ${QT_INCLUDE_DIR}
-    ${QT_QTCORE_INCLUDE_DIR}
-    ${QT_QTDBUS_INCLUDE_DIR}
-    ${QT_QTGUI_INCLUDE_DIR}
-    ${QT_QTXML_INCLUDE_DIR}
     )
 
-qt4_add_dbus_interface(appmenu_qt_SRCS com.canonical.AppMenu.Registrar.xml
-                       registrar)
-
-
-qt4_automoc(${appmenu_qt_SRCS})
+if(USE_QT5)
+    include_directories(
+        ${QT_INCLUDE_DIRS}
+        ${Qt5Core_INCLUDE_DIRS}
+        ${Qt5Widgets_INCLUDE_DIRS}
+        ${Qt5DBus_INCLUDE_DIRS}
+        ${Qt5Gui_INCLUDE_DIRS}
+        ${Qt5Xml_INCLUDE_DIRS}
+        )
+
+    qt5_add_dbus_interface(appmenu_qt_SRCS com.canonical.AppMenu.Registrar.xml
+                           registrar)
+    set(CMAKE_AUTOMOC TRUE)
+    # Fetch the Qt5 plugins directory path
+    _qt5_query_qmake(QT_INSTALL_PLUGINS QT_PLUGINS_DIR)
+else()
+    include_directories(
+        ${QT_INCLUDE_DIR}
+        ${QT_QTCORE_INCLUDE_DIR}
+        ${QT_QTDBUS_INCLUDE_DIR}
+        ${QT_QTGUI_INCLUDE_DIR}
+        ${QT_QTXML_INCLUDE_DIR}
+        )
+
+    qt4_add_dbus_interface(appmenu_qt_SRCS com.canonical.AppMenu.Registrar.xml
+                           registrar)
+    qt4_automoc(${appmenu_qt_SRCS})
+endif()
+
 
 link_directories(
     ${DBUSMENUQT_LIBRARY_DIRS}
@@ -29,13 +61,24 @@
     ${appmenu_qt_SRCS}
     )
 
-target_link_libraries(appmenu-qt
-    ${DBUSMENUQT_LIBRARIES}
-    ${QT_QTCORE_LIBRARIES}
-    ${QT_QTDBUS_LIBRARIES}
-    ${QT_QTGUI_LIBRARIES}
-    ${QT_QTXML_LIBRARIES}
-    )
+if(USE_QT5)
+    target_link_libraries(appmenu-qt
+        ${DBUSMENUQT_LIBRARIES}
+        ${Qt5Core_LIBRARIES}
+        ${Qt5DBus_LIBRARIES}
+        ${Qt5Widgets_LIBRARIES}
+        ${Qt5Gui_LIBRARIES}
+        ${Qt5Xml_LIBRARIES}
+        )
+else()
+    target_link_libraries(appmenu-qt
+        ${DBUSMENUQT_LIBRARIES}
+        ${QT_QTCORE_LIBRARIES}
+        ${QT_QTDBUS_LIBRARIES}
+        ${QT_QTGUI_LIBRARIES}
+        ${QT_QTXML_LIBRARIES}
+        )
+endif()
 
 # Install
 install(TARGETS appmenu-qt
 
=== modified file 'src/appmenuplatformmenubar.cpp'
--- src/appmenuplatformmenubar.cpp	2013-01-17 12:53:26 +0000
+++ src/appmenuplatformmenubar.cpp	2013-03-28 19:20:25 +0000
@@ -486,7 +486,9 @@
     return new AppMenuPlatformMenuBar;
 }
 
+#ifndef USE_QT5
 Q_EXPORT_PLUGIN2(appmenuplatformmenubar, AppMenuPlatformMenuBarFactory)
+#endif
 
 QT_END_NAMESPACE
 
 
=== modified file 'src/appmenuplatformmenubar.h'
--- src/appmenuplatformmenubar.h	2013-01-14 10:44:22 +0000
+++ src/appmenuplatformmenubar.h	2013-03-28 19:20:25 +0000
@@ -84,6 +84,11 @@
 class Q_GUI_EXPORT AppMenuPlatformMenuBarFactory : public QObject, public QPlatformMenuBarFactoryInterface
 {
     Q_OBJECT
+
+#ifdef USE_QT5
+    Q_PLUGIN_METADATA(IID QPlatformMenuBarFactoryInterface_iid FILE "appmenuplatformmenubar.json")
+#endif
+
     Q_INTERFACES(QPlatformMenuBarFactoryInterface:QFactoryInterface)
 public:
     virtual QAbstractPlatformMenuBar* create();
 
=== added file 'src/appmenuplatformmenubar.json'
--- src/appmenuplatformmenubar.json	1970-01-01 00:00:00 +0000
+++ src/appmenuplatformmenubar.json	2013-03-28 19:20:25 +0000
@@ -0,0 +1,1 @@
+{ "Keys": [ "default" ] }