[Tizen-submit] 26060: Changes to Tizen:Mobile/qt5

noreply at tizen.org noreply at tizen.org
Mon Apr 28 12:42:25 GMT 2014


Hi,
Tomasz Olszak have made the following changes to qt5 in project Tizen:Mobile. Please review and accept ASAP.

Thank You,

[This message was auto-generated]

---

Request: #26060

  submit:       Tizen:Mobile:build/qt5(cleanup) -> Tizen:Mobile


Message:
Submitter: Tomasz Olszak <olszak.tomasz at gmail.com>
Comments: Update to 5.3.0 RC1 (5.2.95+rc1) version
Git project: platform/upstream/qtbase
Tag: submit/tizen/20140428.999990
Commit: 9433a79f0f0b59c0fd8035eef913522f14e3d2ee packaging: Use qt's xkbcommon (0.4.*) version.

State:   new        2014-04-28T12:42:07 tizenrobot
Comment: <no comment>
old:
----
  0001-Temporary-removed-tizenscim-input-context-plugin.patch
  qt5-5.2.2.tar.bz2

new:
----
  qt5-5.2.95+rc1.tar.bz2
  qt5.manifest

spec files:
-----------
--- qt5.spec
+++ qt5.spec
@@ -28,6 +28,25 @@
 # libFOO.a files and as such rpmlint never complains about
 # installed-but-unpackaged static libs.
 # This flag tells rpmbuild to behave.
+
+%if "%{tizen}" == "2.1"
+%define profile mobile
+%define _with_x 1
+%define xkb_config_root -xkb-config-root /etc/X11/xkb
+%else
+%define _with_xkbcommon 1
+%define xkb_config_root %{nil}
+%endif
+
+%if "%{profile}" == "mobile"
+%define _with_tizenscim 1
+%else
+%define _with_egl 1
+%endif
+
+%bcond_with egl
+%bcond_with tizenscim
+%bcond_with xkbcommon
 %bcond_with wayland
 %bcond_with x
 
@@ -37,9 +56,9 @@
 # make sense. This allows to update spec contents easily as snapshots
 # evolve.
 Name:       qt5
-VCS:        platform/upstream/qtbase#f2e8e8e80bf59f88660f994cb97332a75c0e63e5
+VCS:        platform/upstream/qtbase#9433a79f0f0b59c0fd8035eef913522f14e3d2ee
 Summary:    Cross-platform application and UI framework
-Version:    5.2.2
+Version:    5.2.95+rc1
 Release:    0
 Group:      Base/Libraries
 License:    LGPL-2.1+ or GPL-3.0
@@ -47,8 +66,7 @@
 Source0:    %{name}-%{version}.tar.bz2
 Source1:    macros.qt5-default
 Source100:  qtbase-rpmlintrc
-# Patches auto-generated by git-buildpackage:
-Patch0:         0001-Temporary-removed-tizenscim-input-context-plugin.patch
+Source1001: %{name}.manifest
 BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(freetype2)
@@ -71,11 +89,17 @@
 BuildRequires:  readline-devel
 BuildRequires:  python
 BuildRequires:  pkgconfig(fontconfig)
+%if %{with xkbcommon}
 BuildRequires:  pkgconfig(xkbcommon)
-BuildRequires:  pkgconfig(gles20)
-%if "%{profile}" != "mobile"
+BuildRequires:  pkgconfig(xkeyboard-config)
+%endif
+%if %{with egl}
 BuildRequires:  pkgconfig(egl)
 %endif
+%if %{with tizenscim}
+BuildRequires:  pkgconfig(scim)
+%endif
+BuildRequires:  pkgconfig(gles20)
 %if %{with x}
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xcursor)
@@ -271,7 +295,6 @@
 %description plugin-sqldriver-sqlite
 This package contains the sqlite sql driver plugin
 

Please refer to OBS webUI for more details about this SR.


More information about the Tizen-submit mailing list