diff --git a/baselibs.conf b/baselibs.conf index a2640b1..f618248 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,5 +1,3 @@ -libQt5Bluetooth5 -libQt5Nfc5 -libqt5-qtconnectivity-devel - requires "libQt5Nfc5- = " - requires "libQt5Bluetooth5- = " \ No newline at end of file +libqt5-qtwebengine +libqt5-qtwebengine-devel + requires "libqt5-qtwebengine- = " \ No newline at end of file diff --git a/libqt5-qtwebengine.changes b/libqt5-qtwebengine.changes index 3660c34..fe92d0c 100644 --- a/libqt5-qtwebengine.changes +++ b/libqt5-qtwebengine.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Jun 3 22:56:36 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 5.4.2 + * Bugfix release, for more details please see: + http://blog.qt.io/blog/2015/06/02/qt-5-4-2-released/ +- Use correct names in baselibs.conf + +------------------------------------------------------------------- +Wed May 27 10:24:39 UTC 2015 - aj@ajaissle.de + +- Fix summary, this is not an Qt 5 Nfc Addon + ------------------------------------------------------------------- Tue Feb 24 16:10:33 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/libqt5-qtwebengine.spec b/libqt5-qtwebengine.spec index 3305df5..6925b0e 100644 --- a/libqt5-qtwebengine.spec +++ b/libqt5-qtwebengine.spec @@ -1,7 +1,7 @@ # # spec file for package libqt5-qtwebengine # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -19,15 +19,15 @@ %define qt5_snapshot 0 Name: libqt5-qtwebengine -Version: 5.4.1 +Version: 5.4.2 Release: 0 -Summary: Qt 5 Nfc Addon +Summary: Qt 5 WebEngine 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.4.1 -%define so_version 5.4.1 +%define real_version 5.4.2 +%define so_version 5.4.2 %define tar_version qtwebengine-opensource-src-%{real_version} Source: %{tar_version}.tar.xz Source1: baselibs.conf @@ -57,6 +57,7 @@ BuildRequires: python BuildRequires: python-devel BuildRequires: python-xml BuildRequires: re2c +BuildRequires: snappy-devel BuildRequires: sqlite3-devel BuildRequires: update-desktop-files BuildRequires: usbutils @@ -77,6 +78,9 @@ BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gmodule-2.0) BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gthread-2.0) +%if 0%{?suse_version} > 1320 +BuildRequires: pkgconfig(jsoncpp) +%endif BuildRequires: pkgconfig(libcrypto) BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libevent) @@ -89,6 +93,7 @@ BuildRequires: pkgconfig(libsrtp) BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(libusb-1.0) BuildRequires: pkgconfig(libwebp) +BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxslt) BuildRequires: pkgconfig(nspr) BuildRequires: pkgconfig(nss) @@ -170,6 +175,46 @@ Examples for libqt5-qtwebengine module. #force the configure script to generate the forwarding headers (it checks whether .git directory exists) mkdir .git %endif +myconf+=" -Duse_system_expat=1 + -Duse_system_flac=1 + -Duse_system_icu=1 +%if 0%{?suse_version} > 1320 + -Duse_system_jsoncpp=1 +%endif + -Duse_system_libevent=1 + -Duse_system_libjpeg=1 + -Duse_system_libpng=1 + -Duse_system_libusb=1 + -Duse_system_libxml=1 + -Duse_system_libxslt=1 + -Duse_system_openssl=1 + -Duse_system_opus=1 + -Duse_system_snappy=1 + -Duse_system_speex=1" + +# gyp files for these 2 system libs are using some magical chromium tool which doesn't exist in qtwebengine tarball +# building with system zlib needs system minizip, which we don't have in openSUSE (yet) +# gen/shim_headers/re2/target/third_party/re2/re2/re2.h:8:21: fatal error: re2/re2.h: No such file or directory +# ../../../src/3rdparty/chromium/media/filters/vpx_video_decoder.cc:270:58: error: 'vpx_codec_set_frame_buffer_functions' was not declared in this scope +# /home/abuild/rpmbuild/BUILD/qtwebengine-opensource-src-5.4.1/src/core/Release/../../../src/3rdparty/chromium/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystemPosix.cpp:79: undefined reference to `chromium_sqlite3_destroy_reusable_file_handle' +%if 0 +myconf+=" -Duse_system_harfbuzz=1 + -Duse_system_libwebp=1 + -Duse_system_libvpx=1 + -Duse_system_re2=1 + -Duse_system_zlib=1 + -Duse_system_sqlite=1" +%endif + +pushd src/3rdparty/chromium/ +build/linux/unbundle/replace_gyp_files.py $myconf +popd + +%if 0 +sed -i 's|<(harfbuzz_libraries)|harfbuzz-icu|g' src/3rdparty/chromium/third_party/harfbuzz-ng/harfbuzz.gyp +sed -i 's|<(libraries)|libwebpdemux|g' src/3rdparty/chromium/third_party/libwebp/libwebp.gyp +%endif + export LDFLAGS="$LDFLAGS -Wl,--reduce-memory-overheads -Wl,--no-keep-memory -Wl,--as-needed" %qmake5 %make_jobs @@ -183,6 +228,8 @@ find %{buildroot}/%{_libdir} -type f -name '*pc' -exec sed -i -e "/^RPM_BUILD_DI sed -i '/^Libs.private/d' %{buildroot}%{_libdir}/pkgconfig/Qt*Web*.pc # kill .la files rm -f %{buildroot}%{_libqt5_libdir}/lib*.la +# webenginecore expects icudatl.dat at this location +ln -sf %{_datadir}/icu/*/icudt*l.dat %{buildroot}%{_datadir}/qt5/icudtl.dat %files %defattr(-,root,root,755) diff --git a/qtwebengine-opensource-src-5.4.1.tar.xz b/qtwebengine-opensource-src-5.4.1.tar.xz deleted file mode 100644 index 29b416c..0000000 --- a/qtwebengine-opensource-src-5.4.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3242abcab5b5f2a80529d16cadd5003600d3f6720220d3aa38ec756e609faab0 -size 113976568 diff --git a/qtwebengine-opensource-src-5.4.2.tar.xz b/qtwebengine-opensource-src-5.4.2.tar.xz new file mode 100644 index 0000000..8aaa112 --- /dev/null +++ b/qtwebengine-opensource-src-5.4.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:084601956755f82c236b52fbba458d6552460f404d239b71b453e53bc6a19e19 +size 113993924