Hello community, here is the log from the commit of package libqt5-qtwebkit for openSUSE:Factory checked in at 2013-10-04 13:54: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-10-01 08:14:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtwebkit.new/libqt5-qtwebkit.changes 2013-10-04 13:54:33.000000000 +0200 @@ -1,0 +2,16 @@ +Tue Oct 1 19:16:58 UTC 2013 - [email protected] + +- Added bison3.patch, fixes build with bison3 +- Postpone gstreamer 1.0 support for 13.2 + +------------------------------------------------------------------- +Thu Aug 29 21:14:24 UTC 2013 - [email protected] + +- Update to version 5.1.1: + * Bugfix release, please see + http://blog.qt.digia.com/blog/2013/08/28/qt-5-1-1-released/ + http://qt.gitorious.org/qt/qtwebkit/blobs/release/dist/changes-5.1.1 + and http://qt-project.org/wiki/Qt511KnownIssues for known issues +- Small spec cleanup + +------------------------------------------------------------------- Old: ---- qtwebkit-opensource-src-5.1.0.tar.xz New: ---- bison3.patch qtwebkit-opensource-src-5.1.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtwebkit.spec ++++++ --- /var/tmp/diff_new_pack.2PE2Pj/_old 2013-10-04 13:54:34.000000000 +0200 +++ /var/tmp/diff_new_pack.2PE2Pj/_new 2013-10-04 13:54:34.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libqt5-qtwebkit # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -15,18 +15,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define libname libQt5WebKitWidgets5 Name: libqt5-qtwebkit -Version: 5.1.0 +Version: 5.1.1 Release: 0 +BuildRequires: libQt5Quick-private-headers-devel >= %{version} %define base_name libqt5 -%define real_version 5.1.0 -%define so_version 5.1.0 +%define real_version 5.1.1 +%define so_version 5.1.1 %define tar_version qtwebkit-opensource-src-%{real_version} -BuildRequires: libQt5Script-devel -BuildRequires: libQt5Quick-private-headers-devel -%if 0%{?suse_version} < 1310 +BuildRequires: libQt5Script-devel >= %{version} +%if 0%{?suse_version} < 1320 BuildRequires: pkgconfig(gstreamer-0.10) BuildRequires: pkgconfig(gstreamer-app-0.10) BuildRequires: pkgconfig(gstreamer-base-0.10) @@ -42,21 +43,24 @@ BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) BuildRequires: pkgconfig(gstreamer-video-1.0) %endif -BuildRequires: libicu-devel -BuildRequires: libxslt-devel -BuildRequires: ruby -BuildRequires: flex -BuildRequires: bison -BuildRequires: gperf -BuildRequires: python-xml -BuildRequires: xz -BuildRequires: procps -Url: http://qt.digia.com Summary: Qt 5 WebKit Library License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 Group: Development/Libraries/X11 +Url: http://qt.digia.com Source: %{tar_version}.tar.xz +# PATCH-FIX-UPSTREAM bison3.patch -- fixes build with bison3 +Patch0: bison3.patch +# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch130: no-Werror-rpath.diff +BuildRequires: bison +BuildRequires: flex +BuildRequires: gperf +BuildRequires: libicu-devel +BuildRequires: libxslt-devel +BuildRequires: procps +BuildRequires: python-xml +BuildRequires: ruby +BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -66,10 +70,9 @@ This package contains base tools, like string, xml, and network handling. - - %prep %setup -q -n qtwebkit-opensource-src-%{real_version} +%patch0 -p1 %patch130 -p1 %package -n %libname @@ -92,12 +95,11 @@ %description -n libQt5WebKit5 You need this package, if you want to compile programs with qtwebkit. - %package -n libQt5WebKitWidgets-devel Summary: Qt Development Kit Group: Development/Libraries/X11 -Requires: %libname = %version -Requires: libQt5WebKit5-devel = %version +Requires: %libname = %{version} +Requires: libQt5WebKit5-devel = %{version} %description -n libQt5WebKitWidgets-devel You need this package, if you want to compile programs with qtwebkit. @@ -105,12 +107,12 @@ %package -n libQt5WebKit5-devel Summary: Qt Development Kit Group: Development/Libraries/X11 -Requires: libQt5WebKit5 = %version -Requires: libQt5Script-devel -Requires: libQt5Quick-private-headers-devel +Requires: libQt5Quick-private-headers-devel >= %{version} +Requires: libQt5Script-devel >= %{version} +Requires: libQt5WebKit5 = %{version} Requires: libicu-devel Requires: libxslt-devel -%if 0%{?suse_version} < 1310 +%if 0%{?suse_version} < 1320 Requires: pkgconfig(gstreamer-0.10) Requires: pkgconfig(gstreamer-app-0.10) Requires: pkgconfig(gstreamer-base-0.10) @@ -133,7 +135,7 @@ %package -n libQt5WebKitWidgets-private-headers-devel Summary: Non-ABI stable experimental API Group: Development/Libraries/C and C++ -Requires: libQt5WebKit-private-headers-devel = %version +Requires: libQt5WebKit-private-headers-devel = %{version} Provides: libQtWebKit-private-headers-devel = 4.99.0+4.5.0.beta1 Obsoletes: libQtWebKit-private-headers-devel < 4.99.0+4.5.0.beta1 @@ -146,8 +148,8 @@ %package -n libQt5WebKit-private-headers-devel Summary: Non-ABI stable experimental API Group: Development/Libraries/C and C++ -Requires: libQt5WebKit5-devel = %version -Requires: libQt5Quick-private-headers-devel +Requires: libQt5Quick-private-headers-devel >= %{version} +Requires: libQt5WebKit5-devel = %{version} Provides: libQt5WebKitWidgets-private-headers-devel:/usr/include/QtWebKit/5.0.0/QtWebKit/private/util.h %description -n libQt5WebKit-private-headers-devel @@ -165,13 +167,13 @@ %postun -n libQt5WebKit5 -p /sbin/ldconfig %build -export PATH=%_libqt5_bindir:$PATH +export PATH=%{_libqt5_bindir}:$PATH export QMAKEPATH=`pwd`/qtwebkit/Tools/qmake %ifarch ppc64 - RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc" + RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %endif -export CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS -DOPENSSL_LOAD_CONF" -export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -DOPENSSL_LOAD_CONF" +export CXXFLAGS="$CXXFLAGS %{optflags} -DOPENSSL_LOAD_CONF" +export CFLAGS="$CFLAGS %{optflags} -DOPENSSL_LOAD_CONF" export LDFLAGS="$LDFLAGS -Wl,--reduce-memory-overheads -Wl,--no-keep-memory" free -m @@ -185,12 +187,12 @@ make %install -make INSTALL_ROOT=$RPM_BUILD_ROOT install -find $RPM_BUILD_ROOT/%{_libqt5_libdir} -type f -name '*la' -print -exec perl -pi -e 's,-L%{_builddir}/\S+,,g' {} \; -find $RPM_BUILD_ROOT/%{_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=%_libqt5_bindir/moc," -e "s,uic_location=.*,uic_location=%_libqt5_bindir/uic," {} \; +make INSTALL_ROOT=%{buildroot} 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 $RPM_BUILD_ROOT +rm -rf %{buildroot} %files -n %libname %defattr(-,root,root,755) @@ -206,15 +208,15 @@ %files -n libQt5WebKitWidgets-private-headers-devel %defattr(-,root,root,755) -%{_libqt5_includedir}/QtWebKitWidgets/5.1.0 +%{_libqt5_includedir}/QtWebKitWidgets/%{so_version} %files -n libQt5WebKit-private-headers-devel %defattr(-,root,root,755) -%{_libqt5_includedir}/QtWebKit/5.1.0 +%{_libqt5_includedir}/QtWebKit/%{so_version} %files -n libQt5WebKit5-devel %defattr(-,root,root,755) -%exclude %{_libqt5_includedir}/QtWebKit/5.1.0 +%exclude %{_libqt5_includedir}/QtWebKit/%{so_version} %{_libqt5_includedir}/QtWebKit %{_libqt5_libdir}/cmake/Qt5WebKit %{_libqt5_libdir}/libQt5WebKit.la @@ -225,7 +227,7 @@ %files -n libQt5WebKitWidgets-devel %defattr(-,root,root,755) -%exclude %{_libqt5_includedir}/QtWebKitWidgets/5.1.0 +%exclude %{_libqt5_includedir}/QtWebKitWidgets/%{so_version} %{_libqt5_includedir}/QtWebKitWidgets %{_libqt5_libdir}/cmake/Qt5WebKitWidgets %{_libqt5_libdir}/libQt5WebKitWidgets.la ++++++ bison3.patch ++++++ >From 60ba8bd5b3575d0c7740571fbb4e681b21a49a82 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen <[email protected]> Date: Fri, 16 Aug 2013 18:27:07 +0200 Subject: [PATCH] ANGLE doesn't build with bison 3.0 https://bugs.webkit.org/show_bug.cgi?id=119798 Reviewed by Antti Koivisto. Make glslang.y compatible with bison 3.0 by using %lex-param to set YYLEX_PARAM. * src/compiler/glslang.y: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154109 268f45cc-cd09-0410-ab3c-d52691b4dbfc Task-number: QTBUG-32913 Change-Id: I15505d31f0588c4d558b73befdb9d2358e29c1a3 Reviewed-by: Jocelyn Turcotte <[email protected]> --- Source/ThirdParty/ANGLE/src/compiler/glslang.y | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Source/ThirdParty/ANGLE/src/compiler/glslang.y b/Source/ThirdParty/ANGLE/src/compiler/glslang.y index 3cad335..b41e95a 100644 --- a/Source/ThirdParty/ANGLE/src/compiler/glslang.y +++ b/Source/ThirdParty/ANGLE/src/compiler/glslang.y @@ -47,6 +47,7 @@ WHICH GENERATES THE GLSL ES PARSER (glslang_tab.cpp AND glslang_tab.h). %expect 1 /* One shift reduce conflict because of if | else */ %pure-parser %parse-param {TParseContext* context} +%lex-param {YYLEX_PARAM} %union { struct { -- 1.7.1 ++++++ qtwebkit-opensource-src-5.1.0.tar.xz -> qtwebkit-opensource-src-5.1.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/libqt5-qtwebkit/qtwebkit-opensource-src-5.1.0.tar.xz /work/SRC/openSUSE:Factory/.libqt5-qtwebkit.new/qtwebkit-opensource-src-5.1.1.tar.xz differ: char 26, line 1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
