[packages/lxqt-common] - up to 0.8.0 - migrating from qt4 to qt5

[rotom]

commit 8f2fa05a1ab29085d4d2422476f2db6cbadfd66d
Author: rotom <rotom at pld-linux.org>
Date:   Sun Oct 26 22:02:20 2014 +0100

    - up to 0.8.0
    - migrating from qt4 to qt5

 lxqt-common.spec | 33 +++++++++++++++++++--------------
 startlxqt.patch  | 11 +++++------
 2 files changed, 24 insertions(+), 20 deletions(-)
---
diff --git a/lxqt-common.spec b/lxqt-common.spec
index b799991..7ae5aee 100644
--- a/lxqt-common.spec
+++ b/lxqt-common.spec
@@ -1,21 +1,21 @@
 #
 # Conditional build:
 #
-%define		qtver		4.8.5
+%define		qtver		5.3.1
 
 Summary:	lxqt-common
 Name:		lxqt-common
-Version:	0.7.0
-Release:	0.2
+Version:	0.8.0
+Release:	0.3
 License:	GPLv2 and LGPL-2.1+
 Group:		X11/Applications
-Source0:	http://lxqt.org/downloads/lxqt/0.7.0/%{name}-%{version}.tar.xz
-# Source0-md5:	f1a64db07d04f686b584cc8952479910
+Source0:	http://lxqt.org/downloads/lxqt/%{version}/%{name}-%{version}.tar.xz
+# Source0-md5:	b48d6df01f23d56115448076ae875680
 Patch0:		startlxqt.patch
 URL:		http://www.lxqt.org/
 BuildRequires:	cmake >= 2.8.3
 BuildRequires:	xz-devel
-Requires:	liblxqt >= 0.7.0
+Requires:	liblxqt >= 0.8.0
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -23,13 +23,14 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 lxqt-common.
 
 %prep
-%setup -q -c %{name}-%{version}
-%patch0 -p1
+%setup -q
+%patch0 -p0
 
 %build
 install -d build
 cd build
 %cmake \
+    -DUSE_QT5=ON \
 	../
 
 %{__make}
@@ -51,13 +52,14 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/startlxqt
+%dir %{_datadir}/lxqt
 %{_datadir}/lxqt/graphics
-%dir %{_sysconfdir}/qt4/lxqt
-%{_sysconfdir}/qt4/lxqt/*.conf
-%{_datadir}/lxqt/openbox
-%dir %{_sysconfdir}/qt4/pcmanfm-qt
-%dir %{_sysconfdir}/qt4/pcmanfm-qt/lxqt
-%{_sysconfdir}/qt4/pcmanfm-qt/lxqt/*.conf
+%dir %{_sysconfdir}/qt5/lxqt
+%{_sysconfdir}/qt5/lxqt/*.conf
+%{_datadir}/lxqt-qt5/openbox
+%dir %{_sysconfdir}/qt5/pcmanfm-qt
+%dir %{_sysconfdir}/qt5/pcmanfm-qt/lxqt
+%{_sysconfdir}/qt5/pcmanfm-qt/lxqt/*.conf
 %{_sysconfdir}/xdg/autostart/lxqt*.desktop
 %{_sysconfdir}/X11/sessions/lxqt.desktop
 %dir %{_datadir}/lxqt/themes
@@ -66,3 +68,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/lxqt/themes/light
 %{_datadir}/lxqt/themes/flat
 %{_datadir}/lxqt/themes/green
+%{_datadir}/lxqt/themes/flat-dark-alpha
+%{_datadir}/lxqt/themes/plasma-next-alpha
+
diff --git a/startlxqt.patch b/startlxqt.patch
index 430e361..b31fdff 100644
--- a/startlxqt.patch
+++ b/startlxqt.patch
@@ -1,11 +1,10 @@
---- lxqt-common-0.7.0/startlxqt.in.orig	2014-05-14 08:38:59.553023365 +0200
-+++ lxqt-common-0.7.0/startlxqt.in	2014-05-14 08:39:14.589614229 +0200
-@@ -27,7 +27,7 @@ fi
- # FIXME: the plugin is not yet ready
- export QT_PLATFORM_PLUGIN=lxqt
+--- startlxqt.in.orig   2014-08-23 11:12:54.000000000 +0200
++++ startlxqt.in        2014-10-18 23:57:51.336099878 +0200
+@@ -30,7 +30,7 @@
+ export QT_QPA_PLATFORMTHEME=lxqt
  
+ # use lxde-applications.menu for main app menu
 -export XDG_MENU_PREFIX="lxde-"
 +###export XDG_MENU_PREFIX="lxde-"
  
  export XDG_CURRENT_DESKTOP="LXQt"
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lxqt-common.git/commitdiff/8f2fa05a1ab29085d4d2422476f2db6cbadfd66d