Hello community, here is the log from the commit of package libqt5-qtwebkit for openSUSE:Factory checked in at 2014-02-18 16:18:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtwebkit (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtwebkit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtwebkit" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtwebkit/libqt5-qtwebkit.changes 2013-12-23 12:32:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libqt5-qtwebkit.new/libqt5-qtwebkit.changes 2014-02-18 16:18:33.000000000 +0100 @@ -1,0 +2,9 @@ +Wed Feb 5 17:07:24 UTC 2014 - [email protected] + +- 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 +- Change aarch64-support.patch to upstream version (merged for 5.3) + +------------------------------------------------------------------- Old: ---- qtwebkit-opensource-src-5.2.0.tar.xz New: ---- qtwebkit-opensource-src-5.2.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtwebkit.spec ++++++ --- /var/tmp/diff_new_pack.oUlkul/_old 2014-02-18 16:18:34.000000000 +0100 +++ /var/tmp/diff_new_pack.oUlkul/_new 2014-02-18 16:18:34.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libqt5-qtwebkit # -# 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,33 +16,20 @@ # +%define qt5_snapshot 0 + %define libname libQt5WebKitWidgets5 Name: libqt5-qtwebkit -Version: 5.2.0 +Version: 5.2.1 Release: 0 -BuildRequires: libqt5-qtdeclarative-devel >= %{version} -BuildRequires: libqt5-qtdeclarative-private-headers-devel >= %{version} -BuildRequires: libqt5-qtsensors-devel >= %{version} %define base_name libqt5 -%define real_version 5.2.0 -%define so_version 5.2.0 -%define tar_version qtwebkit-opensource-src-%{real_version} -%if 0%{?suse_version} < 1320 -BuildRequires: pkgconfig(gstreamer-0.10) -BuildRequires: pkgconfig(gstreamer-app-0.10) -BuildRequires: pkgconfig(gstreamer-base-0.10) -BuildRequires: pkgconfig(gstreamer-interfaces-0.10) -BuildRequires: pkgconfig(gstreamer-pbutils-0.10) -BuildRequires: pkgconfig(gstreamer-plugins-base-0.10) -BuildRequires: pkgconfig(gstreamer-video-0.10) +%define real_version 5.2.1 +%define so_version 5.2.1 +%if %qt5_snapshot +%define tar_version qtwebkit-%{real_version} %else -BuildRequires: pkgconfig(gstreamer-1.0) -BuildRequires: pkgconfig(gstreamer-app-1.0) -BuildRequires: pkgconfig(gstreamer-base-1.0) -BuildRequires: pkgconfig(gstreamer-pbutils-1.0) -BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) -BuildRequires: pkgconfig(gstreamer-video-1.0) +%define tar_version qtwebkit-opensource-src-%{real_version} %endif Summary: Qt 5 WebKit Library License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 @@ -61,17 +48,64 @@ Patch130: no-Werror-rpath.diff # PATCH-FIX-UPSTREAM fix build with disabled jit Patch131: fix-no-jit-build.patch +BuildRequires: pkgconfig(Qt5Core) >= %{version} +BuildRequires: pkgconfig(Qt5Network) >= %{version} +BuildRequires: pkgconfig(Qt5OpenGL) >= %{version} +BuildRequires: pkgconfig(Qt5PrintSupport) >= %{version} +BuildRequires: pkgconfig(Qt5Quick) >= %{version} +BuildRequires: pkgconfig(Qt5Sql) >= %{version} +BuildRequires: pkgconfig(Qt5Test) >= %{version} +BuildRequires: pkgconfig(Qt5Widgets) >= %{version} +#BuildRequires: pkgconfig(positioning) +BuildRequires: libQt5Core-private-headers-devel >= %{version} +BuildRequires: libQt5Gui-private-headers-devel >= %{version} +BuildRequires: libQt5Widgets-private-headers-devel >= %{version} +BuildRequires: libqt5-qtdeclarative-private-headers-devel >= %{version} +BuildRequires: pkgconfig(Qt5Sensors) >= %{version} +%if 0%{?suse_version} < 1330 +BuildRequires: pkgconfig(gstreamer-0.10) +BuildRequires: pkgconfig(gstreamer-app-0.10) +BuildRequires: pkgconfig(gstreamer-base-0.10) +BuildRequires: pkgconfig(gstreamer-interfaces-0.10) +BuildRequires: pkgconfig(gstreamer-pbutils-0.10) +BuildRequires: pkgconfig(gstreamer-plugins-base-0.10) +BuildRequires: pkgconfig(gstreamer-video-0.10) +%else +BuildRequires: pkgconfig(gstreamer-1.0) +BuildRequires: pkgconfig(gstreamer-app-1.0) +BuildRequires: pkgconfig(gstreamer-base-1.0) +BuildRequires: pkgconfig(gstreamer-pbutils-1.0) +BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) +BuildRequires: pkgconfig(gstreamer-video-1.0) +%endif BuildRequires: bison BuildRequires: flex BuildRequires: gperf BuildRequires: libicu-devel +BuildRequires: libjpeg-devel BuildRequires: libxslt-devel -BuildRequires: procps BuildRequires: python-xml BuildRequires: ruby +BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(gl) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(libpcre) +BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(libwebp) +BuildRequires: pkgconfig(sqlite3) +BuildRequires: pkgconfig(udev) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xcomposite) +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xrender) +BuildRequires: pkgconfig(zlib) +%if %qt5_snapshot +#to create the forwarding headers +BuildRequires: perl +%endif +BuildRequires: procps BuildRequires: xz BuildRequires: pkgconfig(libwebp) - BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -81,7 +115,11 @@ handling. %prep +%if %qt5_snapshot +%setup -q -n qtwebkit-%{real_version} +%else %setup -q -n qtwebkit-opensource-src-%{real_version} +%endif %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -112,6 +150,7 @@ Group: Development/Libraries/X11 Requires: %libname = %{version} Requires: libQt5WebKit5-devel = %{version} +Requires: libicu-devel Requires: libqt5-qtdeclarative-devel >= %{version} Requires: libqt5-qtsensors-devel >= %{version} @@ -122,11 +161,25 @@ Summary: Qt Development Kit Group: Development/Libraries/X11 Requires: libQt5WebKit5 = %version -Requires: libicu-devel -Requires: libqt5-qtdeclarative-devel >= %{version} +Requires: libjpeg-devel Requires: libxslt-devel +Requires: pkgconfig(Qt5Core) >= %version +Requires: pkgconfig(Qt5Gui) >= %version +Requires: pkgconfig(Qt5Network) >= %version +Requires: pkgconfig(Qt5Qml) >= %version +Requires: pkgconfig(Qt5Quick) >= %version +Requires: pkgconfig(Qt5Sensors) >= %version +Requires: pkgconfig(Qt5Sql) >= %version +Requires: pkgconfig(fontconfig) +Requires: pkgconfig(gl) +Requires: pkgconfig(glib-2.0) +Requires: pkgconfig(libpng) Requires: pkgconfig(libwebp) -%if 0%{?suse_version} < 1320 +Requires: pkgconfig(sqlite3) +Requires: pkgconfig(x11) +Requires: pkgconfig(xext) +Requires: pkgconfig(xrender) +%if 0%{?suse_version} < 1330 Requires: pkgconfig(gstreamer-0.10) Requires: pkgconfig(gstreamer-app-0.10) Requires: pkgconfig(gstreamer-base-0.10) @@ -162,7 +215,6 @@ Summary: Non-ABI stable experimental API Group: Development/Libraries/C and C++ Requires: libQt5WebKit5-devel = %{version} -Requires: libqt5-qtdeclarative-private-headers-devel >= %{version} %description -n libQt5WebKit-private-headers-devel This package provides private headers of libqt5-qtwebkit that are normally @@ -202,33 +254,29 @@ %postun -n libQt5WebKit5 -p /sbin/ldconfig %build -export PATH=%{_libqt5_bindir}:$PATH -export QMAKEPATH=`pwd`/qtwebkit/Tools/qmake -%ifarch ppc64 - RPM_OPT_FLAGS="%{optflags} -mminimal-toc" +%if %qt5_snapshot +#force the configure script to generate the forwarding headers (it checks whether .git directory exists) +mkdir .git %endif -# runs out of memory otherwise -%ifarch %arm aarch64 +export QMAKEPATH=`pwd` +RPM_OPT_FLAGS="$RPM_OPT_FLAGS " export RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-g / /} -%endif -export CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS -DOPENSSL_LOAD_CONF" -export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -DOPENSSL_LOAD_CONF" export LDFLAGS="$LDFLAGS -Wl,--reduce-memory-overheads -Wl,--no-keep-memory -Wl,--as-needed" - +export PATH=%{_libqt5_bindir}:$PATH %ifarch ppc ppc64 ppc64le s390 s390x -qmake DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0 DEFINES+=ENABLE_ASSEMBLER=0 +%_libqt5_qmake DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0 DEFINES+=ENABLE_ASSEMBLER=0 %else -qmake +%_libqt5_qmake %endif -make +%make_jobs %install -make INSTALL_ROOT=%{buildroot} install +%qmake5_install find %{buildroot}/%{_libqt5_libdir} -type f -name '*la' -print -exec perl -pi -e 's,-L%{_builddir}/\S+,,g' {} \; find %{buildroot}/%{_libqt5_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=%{_lib}qt5_bindir/moc," -e "s,uic_location=.*,uic_location=%{_lib}qt5_bindir/uic," {} \; -%clean -rm -rf %{buildroot} +# kill .la files +rm -f %{buildroot}%{_libqt5_libdir}/lib*.la %files -n %libname %defattr(-,root,root,755) @@ -255,7 +303,6 @@ %exclude %{_libqt5_includedir}/QtWebKit/%{so_version} %{_libqt5_includedir}/QtWebKit %{_libqt5_libdir}/cmake/Qt5WebKit -%{_libqt5_libdir}/libQt5WebKit.la %{_libqt5_libdir}/libQt5WebKit.prl %{_libqt5_libdir}/libQt5WebKit.so %{_libqt5_libdir}/pkgconfig/Qt5WebKit.pc @@ -267,7 +314,6 @@ %exclude %{_libqt5_includedir}/QtWebKitWidgets/%{so_version} %{_libqt5_includedir}/QtWebKitWidgets %{_libqt5_libdir}/cmake/Qt5WebKitWidgets -%{_libqt5_libdir}/libQt5WebKitWidgets.la %{_libqt5_libdir}/libQt5WebKitWidgets.prl %{_libqt5_libdir}/libQt5WebKitWidgets.so %{_libqt5_libdir}/pkgconfig/Qt5WebKitWidgets.pc ++++++ aarch64-support.patch ++++++ --- /var/tmp/diff_new_pack.oUlkul/_old 2014-02-18 16:18:34.000000000 +0100 +++ /var/tmp/diff_new_pack.oUlkul/_new 2014-02-18 16:18:34.000000000 +0100 @@ -1,42 +1,56 @@ -Index: webkitgtk-2.0.1/Source/WTF/wtf/Platform.h -=================================================================== ---- webkitgtk-2.0.1.orig/Source/WTF/wtf/Platform.h -+++ webkitgtk-2.0.1/Source/WTF/wtf/Platform.h -@@ -318,6 +318,14 @@ - #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1 - #endif - +From: Allan Sandfeld Jensen <[email protected]> +Date: Tue, 07 Jan 2014 15:05:17 +0000 +Subject: Detect AArch64 architecture +X-Git-Url: http://quickgit.kde.org/?p=qt%2Fqtwebkit.git&a=commitdiff&h=eb7186ce272378deab35de91e86f123b0e9967ab +--- +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: I81b8c43fb3a6a65c56446f84a7b1001075998d1e +Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <[email protected]> +Reviewed-by: Thiago Macieira <[email protected]> +--- + + +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -322,6 +322,14 @@ + + #endif /* ARM */ + +/* CPU(AARCH64) - AArch64 */ +#if defined(__aarch64__) +#define WTF_CPU_AARCH64 1 -+#if defined(__AARCH64BE__) ++#if defined(__AARCH64EB__) +#define WTF_CPU_BIG_ENDIAN 1 +#endif +#endif + - /* ==== OS() - underlying operating system; only to be used for mandated low-level services like - virtual memory, not to choose a GUI toolkit ==== */ - -@@ -744,7 +752,8 @@ + #if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC) + #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1 + #endif +@@ -725,6 +733,7 @@ || CPU(ALPHA) \ || CPU(SPARC64) \ || CPU(S390X) \ -- || CPU(PPC64) -+ || CPU(PPC64) \ -+ || CPU(AARCH64) ++ || CPU(AARCH64) \ + || CPU(PPC64) #define WTF_USE_JSVALUE64 1 #else - #define WTF_USE_JSVALUE32_64 1 -Index: webkitgtk-2.0.1/Source/WTF/wtf/dtoa/utils.h -=================================================================== ---- webkitgtk-2.0.1.orig/Source/WTF/wtf/dtoa/utils.h -+++ webkitgtk-2.0.1/Source/WTF/wtf/dtoa/utils.h +--- a/Source/WTF/wtf/dtoa/utils.h ++++ b/Source/WTF/wtf/dtoa/utils.h @@ -49,7 +49,7 @@ defined(__ARMEL__) || \ defined(_MIPS_ARCH_MIPS32R2) #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 -#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) -+#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(AARCH64) ++#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(MIPS64) || CPU(AARCH64) #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 #elif defined(_M_IX86) || defined(__i386__) #if defined(_WIN32) + ++++++ no-Werror-rpath.diff ++++++ --- /var/tmp/diff_new_pack.oUlkul/_old 2014-02-18 16:18:34.000000000 +0100 +++ /var/tmp/diff_new_pack.oUlkul/_new 2014-02-18 16:18:35.000000000 +0100 @@ -1,7 +1,6 @@ -diff -Naur qtwebkit-opensource-src-5.2.0-beta1.orig/Tools/qmake/mkspecs/features/unix/default_post.prf qtwebkit-opensource-src-5.2.0-beta1/Tools/qmake/mkspecs/features/unix/default_post.prf ---- qtwebkit-opensource-src-5.2.0-beta1.orig/Tools/qmake/mkspecs/features/unix/default_post.prf 2013-10-22 10:49:32.000000000 +0200 -+++ qtwebkit-opensource-src-5.2.0-beta1/Tools/qmake/mkspecs/features/unix/default_post.prf 2013-10-24 03:21:13.236166006 +0200 -@@ -19,7 +19,7 @@ +--- qtwebkit/Tools/qmake/mkspecs/features/unix/default_post.prf 2012/12/06 19:59:43 1.1 ++++ qtwebkit/Tools/qmake/mkspecs/features/unix/default_post.prf 2012/12/06 20:00:17 +@@ -38,7 +38,7 @@ linux-g++*:isEqual(QT_ARCH,i386) { linux-*g++* { !production_build { # Treat warnings as errors on x86/Linux/GCC @@ -9,13 +8,13 @@ + #isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror } } - -@@ -39,7 +39,7 @@ + +@@ -58,7 +58,7 @@ linux-*g++* { QMAKE_OBJECTIVE_CFLAGS += -Wno-c++11-extensions -Wno-c++0x-extensions } - + -contains(TEMPLATE, app): CONFIG += rpath +#contains(TEMPLATE, app): CONFIG += rpath - - isEqual(QT_ARCH,i386):CONFIG(debug, debug|release) { - # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. + + CONFIG(debug, debug|release)|force_debug_info|separate_debug_info { + # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. ++++++ qtwebkit-opensource-src-5.2.0.tar.xz -> qtwebkit-opensource-src-5.2.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/libqt5-qtwebkit/qtwebkit-opensource-src-5.2.0.tar.xz /work/SRC/openSUSE:Factory/.libqt5-qtwebkit.new/qtwebkit-opensource-src-5.2.1.tar.xz differ: char 26, line 1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
