rpm/libqt5-qtscript
SHA256
1
0
Fork 0
forked from pool/libqt5-qtscript
Code Pull Requests Activity

Accepting request 221704 from KDE:Qt5

Browse Source 
install license files to %doc (forwarded request 221618 from mlin7442)

OBS-URL: https://build.opensuse.org/request/show/221704
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtscript?expand=0&rev=8
This commit is contained in:
Stephan Kulow 2014-02-18 15:18:10 +00:00 committed by Git OBS Bridge
parent 316968e434
commit fed8b1f320
5 changed files with 106 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
aarch64-support.patch Normal file
View File

@ -0,0 +1,49 @@
From: Riku Voipio <riku.voipio@iki.fi>
Date: Tue, 07 Jan 2014 15:15:56 +0000
Subject: Detect AArch64 architecture
X-Git-Url: http://quickgit.kde.org/?p=qt%2Fqtscript.git&a=commitdiff&h=2e049836ee16f4aedbe7ccc3335fc57852725716
---
Detect AArch64 architecture
Adds WTF platform support for the AArch64 architecture.
Patch is based on WebKit-gtk patch done by Riku Voipio, and was
cherry-picked and tested by Marcin Juszkiewicz.
Task-number: QTBUG-35442
Change-Id: Ie6194f3c430cb6513367a3cdf221a41d60a1ed14
Signed-off-by: Riku Voipio <riku.voipio@iki.fi>
Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
---
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
@@ -209,6 +209,14 @@
#define WTF_CPU_AIX64 1
#endif
+/* CPU(AARCH64) - AArch64 */
+#if defined(__aarch64__)
+#define WTF_CPU_AARCH64 1
+#if defined(__AARCH64EB__)
+#define WTF_CPU_BIG_ENDIAN 1
+#endif
+#endif
+
/* CPU(ARM) - ARM, any version*/
#if defined(arm) \
|| defined(__arm__) \
@@ -896,7 +904,7 @@
#endif
#if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
-#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64)
+#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64)
#define WTF_USE_JSVALUE64 1
#elif CPU(ARM) || CPU(PPC64)
#define WTF_USE_JSVALUE32 1

14
libqt5-qtscript.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Mon Feb 10 11:23:04 UTC 2014 - mlin@suse.com
- Install LICENSE files to %doc
-------------------------------------------------------------------
Wed Feb 5 17:07:24 UTC 2014 - hrvoje.senjan@gmail.com
- Update to 5.2.1:
* For more details please see:
http://blog.qt.digia.com/blog/2014/02/05/qt-5-2-1-released/
- Remove libtool archives from packages
- Added aarch64-support.patch from upstream (merged for 5.3)
-------------------------------------------------------------------
Mon Dec 16 23:20:56 UTC 2013 - uweigand@de.ibm.com

57
libqt5-qtscript.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package libqt5-qtscript
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,24 +16,39 @@
#
%define qt5_snapshot 0
%define libname libQt5Script5
Name: libqt5-qtscript
Version: 5.2.0
Version: 5.2.1
Release: 0
Summary: Qt 5 QtScript Library
License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
Group: Development/Libraries/X11
Url: http://qt.digia.com
%define base_name libqt5
%define real_version 5.2.0
%define so_version 5.2.0
%define real_version 5.2.1
%define so_version 5.2.1
%if %qt5_snapshot
%define tar_version qtscript-%{real_version}
%else
%define tar_version qtscript-opensource-src-%{real_version}
%endif
Source: %{tar_version}.tar.xz
# PATCH-FIX-UPSTREAM ppc64le-support.diff uweigand@de.ibm.com -- add support for ppc64le
Patch1: ppc64le-support.patch
BuildRequires: libqt5-qtbase-devel >= %{version}
BuildRequires: libqt5-qtbase-private-headers-devel >= %{version}
# PATCH-FIX-UPSTREAM aarch64-support.patch -- add support for aarch64
Patch2: aarch64-support.patch
BuildRequires: libQt5Core-private-headers-devel >= %{version}
BuildRequires: libQt5Widgets-private-headers-devel >= %{version}
BuildRequires: pkgconfig(Qt5DBus) >= %{version}
BuildRequires: pkgconfig(Qt5Gui) >= %{version}
BuildRequires: pkgconfig(Qt5Widgets) >= %{version}
%if %qt5_snapshot
#to create the forwarding headers
BuildRequires: perl
%endif
BuildRequires: xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -45,8 +60,13 @@ This package contains base tools, like string, xml, and network
handling.
%prep
%if %qt5_snapshot
%setup -q -n qtscript-%{real_version}
%else
%setup -q -n qtscript-opensource-src-%{real_version}
%endif
%patch1 -p1
%patch2 -p1
%package -n %libname
Summary: Qt 5 QtScript Library
@ -62,10 +82,8 @@ handling.
Summary: Qt Development Kit
Group: Development/Libraries/X11
Requires: %libname = %{version}
Requires: libqt5-qtbase-devel >= %{version}
Provides: libQt5Script-devel = %{version}
# TODO: change to < on 5.2.1 update
Obsoletes: libQt5Script-devel <= %{version}
Obsoletes: libQt5Script-devel < %{version}
%description devel
You need this package, if you want to compile programs with qtscript.
@ -73,11 +91,11 @@ You need this package, if you want to compile programs with qtscript.
%package private-headers-devel
Summary: Non-ABI stable experimental API
Group: Development/Libraries/C and C++
Requires: libqt5-qtbase-private-headers-devel >= %{version}
Requires: libqt5-qtscript-devel = %{version}
Requires: %{name}-devel = %{version}
Requires: libQt5Core-private-headers-devel >= %{version}
Requires: libQt5Widgets-private-headers-devel >= %{version}
Provides: libQt5Script-private-headers-devel = %{version}
# TODO: change to < on 5.2.1 update
Obsoletes: libQt5Script-private-headers-devel <= %{version}
Obsoletes: libQt5Script-private-headers-devel < %{version}
%description private-headers-devel
This package provides private headers of libqt5-qtscript that are normally
@ -90,6 +108,10 @@ the exact Qt version.
%postun -n %libname -p /sbin/ldconfig
%build
%if %qt5_snapshot
#force the configure script to generate the forwarding headers (it checks whether .git directory exists)
mkdir .git
%endif
%qmake5
%make_jobs
@ -97,24 +119,25 @@ the exact Qt version.
%qmake5_install
find %{buildroot}/%{_libdir} -type f -name '*la' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \;
find %{buildroot}/%{_libdir} -type f -name '*pc' -print -exec perl -pi -e "s, -L$RPM_BUILD_DIR/?\S+,,g" {} \; -exec sed -i -e "s,^moc_location=.*,moc_location=%{_libqt5_bindir}/moc," -e "s,uic_location=.*,uic_location=%{_libqt5_bindir}/uic," {} \;
%clean
rm -rf %{buildroot}
# kill .la files
rm -f %{buildroot}%{_libqt5_libdir}/lib*.la
%files -n %libname
%defattr(-,root,root,755)
%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL
%{_libqt5_libdir}/libQt5*.so.*
%files private-headers-devel
%defattr(-,root,root,755)
%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL
%{_libqt5_includedir}/Qt*/%{so_version}
%files devel
%defattr(-,root,root,755)
%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL
%exclude %{_libqt5_includedir}/Qt*/%{so_version}
%{_libqt5_includedir}/Qt*
%{_libqt5_libdir}/cmake/Qt5*
%{_libqt5_libdir}/libQt5*.la
%{_libqt5_libdir}/libQt5*.prl
%{_libqt5_libdir}/libQt5*.so
%{_libqt5_libdir}/pkgconfig/Qt5*.pc

3
qtscript-opensource-src-5.2.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ea717e633c9a586dc66b435aad50c9870d6f0c4d1bc185f91144b002bd060294
size 2583368

3
qtscript-opensource-src-5.2.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6621350d5eff65cb6f9853247246f30a2d4cdb465c14923ff7ccbd8c3a9cdefa
size 2585204