Hello community,
here is the log from the commit of package qupzilla for openSUSE:Factory
checked in at 2014-10-14 07:10:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qupzilla (Old)
and /work/SRC/openSUSE:Factory/.qupzilla.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qupzilla"
Changes:
--------
--- /work/SRC/openSUSE:Factory/qupzilla/qupzilla-qt5.changes 2014-05-17
21:44:50.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.qupzilla.new/qupzilla-qt5.changes
2014-10-14 07:10:37.000000000 +0200
@@ -1,0 +2,42 @@
+Tue Oct 7 16:06:47 UTC 2014 - sor.ale...@meowr.ru
+
+- Update to 1.8.2 (changes since 1.6.6):
+ * use bigger default font sizes
+ * fixed: profile version check when updating from 1.8.0
+ * reverted setting DNT header by default
+ * fixed: autofill not working for some frames
+ * fixed: saving speed dial in case of crash
+ * added support for window.beforeunload event
+ * added support for external.AddSearchProvider js function
+ * added undo/redo actions to context menu in forms
+ * added new theme Breathe
+ * added new commandline option to toggle fullscreen
+ * added new commandline option to enable portable mode
+ * added new context menu action to open links in private window
+ * added new smooth and fully transparent loading animation
+ * added option to disable weak ciphers in SSL Manager
+ * added support for shadow builds with Qt Creator
+ * completely rewritten bookmarks (including multi-level folders support)
+ * location bar completer is now running in separate thread
+ * menus are not closed when opening links with middle mouse button
+ * ctrl+w shortcut no longer closes pinned tab
+ * pinned tabs are now restored everytime, not only when restoring session
+ * enable sending DoNotTrack header by default
+ * full support for search engines that use POST method
+ * Oxygen icon theme is now default fallback icon theme
+ * Qt translations are now loaded from system directories where available
+ * correctly load one-word hosts (eg. localhost or anything other in
/etc/hosts)
+ * search engines manager can now be opened from preferences
+ * various tweaks in SpeedDial theme including lower minimal size for dials
+ * various tweaks in Linux theme including support for big fonts in location
bar
+ * various fixes for Qt5 including bugs in tab bar
+ * various fixes for RTL languages including rendering of location bar
completer
+ * AdBlock: support for exception css rules
+ * AdBlock: improved performance of loading rules
+ * MouseGestures: option to set mouse button for gestures
+ * MouseGestures: support for rocker navigation to go back/forward in history
+ * GreaseMonkey: correctly load scripts in frames
+ * GreaseMonkey: fix rare issue that userscripts won't load on some sites
+ * KWalletPasswords: support for KF5 KWallet
+
+-------------------------------------------------------------------
qupzilla.changes: same change
Old:
----
QupZilla-1.6.6.tar.xz
_service
New:
----
QupZilla-1.8.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qupzilla-qt5.spec ++++++
--- /var/tmp/diff_new_pack.jpC5EY/_old 2014-10-14 07:10:38.000000000 +0200
+++ /var/tmp/diff_new_pack.jpC5EY/_new 2014-10-14 07:10:38.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package qupzilla
+# spec file for package qupzilla-qt5
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2012-2014 Mariusz Fik <fi...@opensuse.org>
@@ -17,14 +17,9 @@
#
-%define qt5_build 1
-
-%if !0%{?qt5_build}
-Name: qupzilla
-%else
+%bcond_without qt5
Name: qupzilla-qt5
-%endif
-Version: 1.6.6
+Version: 1.8.2
Release: 0
Summary: A very fast open source browser based on WebKit core
License: GPL-3.0+
@@ -34,28 +29,29 @@
# WORKAROUND FOR QTBUG-34950
Patch0: qupzilla-gdb-workaround.patch
BuildRequires: fdupes
-%if !0%{?qt5_build}
+%if %{with qt5}
+%if 0%{?suse_version} > 1310
+BuildRequires: libQt5Gui-private-headers-devel
+%else
+BuildRequires: libqt5-qtbase-private-headers-devel
+%endif
+BuildRequires: libqt5-qttools-devel
+%else
BuildRequires: libkde4-devel
BuildRequires: pkgconfig(gnome-keyring-1)
%endif
BuildRequires: pkgconfig(hunspell)
-%if 0%{?qt5_build}
+%if %{with qt5}
BuildRequires: pkgconfig(Qt5Concurrent)
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5Gui)
+BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(Qt5PrintSupport)
BuildRequires: pkgconfig(Qt5Script)
BuildRequires: pkgconfig(Qt5Sql)
-BuildRequires: pkgconfig(Qt5Widgets)
-%if 0%{?suse_version} > 1310
-BuildRequires: libQt5Gui-private-headers-devel
-%else
-BuildRequires: libqt5-qtbase-private-headers-devel
-%endif
-BuildRequires: libqt5-qttools-devel
-BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(Qt5WebKitWidgets)
+BuildRequires: pkgconfig(Qt5Widgets)
%else
BuildRequires: pkgconfig(QtCore) >= 4.7
BuildRequires: pkgconfig(QtGui) >= 4.7
@@ -64,16 +60,15 @@
%endif
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(openssl)
-%if 0%{?qt5_build}
+%if %{with qt5}
Conflicts: qupzilla
%endif
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
QupZilla is modern web browser based on WebKit core and Qt Framework.
WebKit guarante fast browsing and Qt availability on all major platforms.
-%if !0%{?qt5_build}
+%if !0%{with qt5}
%package kwallet
Summary: Kwallet plugin for qupzilla
Group: Productivity/Networking/Web/Browsers
@@ -96,26 +91,30 @@
%setup -q -n QupZilla-%{version}
# WORKAROUND for QTBUG-34950.
%patch0 -p1
-# remove BUILDTIME usage from build
-sed '/static const QString BUILDTIME/d' -i src/lib/app/qupzilla.h
-sed '/QupZilla::BUILDTIME/d' -i src/lib/other/aboutdialog.cpp
-sed '/QupZilla::BUILDTIME/d' -i src/lib/app/commandlineoptions.cpp
-sed '/QupZilla::BUILDTIME/d' -i src/lib/app/qupzilla.cpp
-sed '/QupZilla::BUILDTIME/d' -i
src/lib/network/schemehandlers/qupzillaschemehandler.cpp
+# Remove BUILDTIME usage from build.
+sed -i '/BUILDTIME;^/d' src/lib/app/qzcommon.h
+sed -i '/BUILDTIME = /d' src/lib/app/qzcommon.cpp
+sed -i '/Qz::BUILDTIME/d' src/lib/other/aboutdialog.cpp
+sed -i '/Qz::BUILDTIME/d' src/lib/app/commandlineoptions.cpp
+sed -i '/Qz::BUILDTIME/d' src/lib/app/qzcommon.cpp
+sed -i '/Qz::BUILDTIME/d'
src/lib/network/schemehandlers/qupzillaschemehandler.cpp
%build
export USE_WEBGL=true
-%if !0%{?qt5_build}
-# It enables better kde integration, it's also needed for kwallet plugin.
+%if !0%{with qt5}
+# Enable better KDE integration, it is also needed for KWallet plugin.
export KDE_INTEGRATION=true
-# It enables gnome keyring support
+# Enable GNOME Keyring support.
export GNOME_INTEGRATION=true
%endif
-# It sets proper LIBPATH.
+# Set proper LIBPATH.
export USE_LIBPATH=%{_libdir}
-%if !0%{?qt5_build}
+%if !0%{with qt5}
# Debug config is needed for -debuginfo and -debugsource packages.
-qmake CONFIG+=debug
+%{_libdir}/qt4/bin/qmake \
+ QMAKE_CFLAGS="%{optflags}" \
+ QMAKE_CXXFLAGS="%{optflags}" \
+ CONFIG+=debug
%else
%qmake5
%endif
@@ -140,24 +139,21 @@
%doc AUTHORS COPYRIGHT FAQ GPLv3
%{_bindir}/qupzilla
%{_libdir}/libQupZilla.so.*
-%dir %{_libdir}/qupzilla
+%dir %{_libdir}/qupzilla/
%{_libdir}/qupzilla/libAccessKeysNavigation.so
%{_libdir}/qupzilla/libAutoScroll.so
%{_libdir}/qupzilla/libMouseGestures.so
%{_libdir}/qupzilla/libGreaseMonkey.so
%{_libdir}/qupzilla/libPIM.so
%{_libdir}/qupzilla/libStatusBarIcons.so
+%{_datadir}/appdata/
%{_datadir}/applications/qupzilla.desktop
%{_datadir}/pixmaps/qupzilla.png
-%{_datadir}/icons/hicolor
-%dir %{_datadir}/qupzilla
-%{_datadir}/qupzilla/locale
-%{_datadir}/qupzilla/themes
-%dir %{_datadir}/bash-completion
-%dir %{_datadir}/bash-completion/completions
-%{_datadir}/bash-completion/completions/qupzilla
+%{_datadir}/icons/hicolor/
+%{_datadir}/qupzilla/
+%{_datadir}/bash-completion/
-%if !0%{?qt5_build}
+%if !0%{with qt5}
%files kwallet
%defattr(-,root,root)
%{_libdir}/qupzilla/libKWalletPasswords.so
++++++ qupzilla.spec ++++++
--- /var/tmp/diff_new_pack.jpC5EY/_old 2014-10-14 07:10:38.000000000 +0200
+++ /var/tmp/diff_new_pack.jpC5EY/_new 2014-10-14 07:10:38.000000000 +0200
@@ -17,14 +17,9 @@
#
-%define qt5_build 0
-
-%if !0%{?qt5_build}
+%bcond_with qt5
Name: qupzilla
-%else
-Name: qupzilla-qt5
-%endif
-Version: 1.6.6
+Version: 1.8.2
Release: 0
Summary: A very fast open source browser based on WebKit core
License: GPL-3.0+
@@ -34,28 +29,29 @@
# WORKAROUND FOR QTBUG-34950
Patch0: qupzilla-gdb-workaround.patch
BuildRequires: fdupes
-%if !0%{?qt5_build}
+%if %{with qt5}
+%if 0%{?suse_version} > 1310
+BuildRequires: libQt5Gui-private-headers-devel
+%else
+BuildRequires: libqt5-qtbase-private-headers-devel
+%endif
+BuildRequires: libqt5-qttools-devel
+%else
BuildRequires: libkde4-devel
BuildRequires: pkgconfig(gnome-keyring-1)
%endif
BuildRequires: pkgconfig(hunspell)
-%if 0%{?qt5_build}
+%if %{with qt5}
BuildRequires: pkgconfig(Qt5Concurrent)
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5Gui)
+BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(Qt5PrintSupport)
BuildRequires: pkgconfig(Qt5Script)
BuildRequires: pkgconfig(Qt5Sql)
-BuildRequires: pkgconfig(Qt5Widgets)
-%if 0%{?suse_version} > 1310
-BuildRequires: libQt5Gui-private-headers-devel
-%else
-BuildRequires: libqt5-qtbase-private-headers-devel
-%endif
-BuildRequires: libqt5-qttools-devel
-BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(Qt5WebKitWidgets)
+BuildRequires: pkgconfig(Qt5Widgets)
%else
BuildRequires: pkgconfig(QtCore) >= 4.7
BuildRequires: pkgconfig(QtGui) >= 4.7
@@ -64,16 +60,15 @@
%endif
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(openssl)
-%if 0%{?qt5_build}
+%if %{with qt5}
Conflicts: qupzilla
%endif
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
QupZilla is modern web browser based on WebKit core and Qt Framework.
WebKit guarante fast browsing and Qt availability on all major platforms.
-%if !0%{?qt5_build}
+%if !0%{with qt5}
%package kwallet
Summary: Kwallet plugin for qupzilla
Group: Productivity/Networking/Web/Browsers
@@ -96,26 +91,30 @@
%setup -q -n QupZilla-%{version}
# WORKAROUND for QTBUG-34950.
%patch0 -p1
-# remove BUILDTIME usage from build
-sed '/static const QString BUILDTIME/d' -i src/lib/app/qupzilla.h
-sed '/QupZilla::BUILDTIME/d' -i src/lib/other/aboutdialog.cpp
-sed '/QupZilla::BUILDTIME/d' -i src/lib/app/commandlineoptions.cpp
-sed '/QupZilla::BUILDTIME/d' -i src/lib/app/qupzilla.cpp
-sed '/QupZilla::BUILDTIME/d' -i
src/lib/network/schemehandlers/qupzillaschemehandler.cpp
+# Remove BUILDTIME usage from build.
+sed -i '/BUILDTIME;^/d' src/lib/app/qzcommon.h
+sed -i '/BUILDTIME = /d' src/lib/app/qzcommon.cpp
+sed -i '/Qz::BUILDTIME/d' src/lib/other/aboutdialog.cpp
+sed -i '/Qz::BUILDTIME/d' src/lib/app/commandlineoptions.cpp
+sed -i '/Qz::BUILDTIME/d' src/lib/app/qzcommon.cpp
+sed -i '/Qz::BUILDTIME/d'
src/lib/network/schemehandlers/qupzillaschemehandler.cpp
%build
export USE_WEBGL=true
-%if !0%{?qt5_build}
-# It enables better kde integration, it's also needed for kwallet plugin.
+%if !0%{with qt5}
+# Enable better KDE integration, it is also needed for KWallet plugin.
export KDE_INTEGRATION=true
-# It enables gnome keyring support
+# Enable GNOME Keyring support.
export GNOME_INTEGRATION=true
%endif
-# It sets proper LIBPATH.
+# Set proper LIBPATH.
export USE_LIBPATH=%{_libdir}
-%if !0%{?qt5_build}
+%if !0%{with qt5}
# Debug config is needed for -debuginfo and -debugsource packages.
-qmake CONFIG+=debug
+%{_libdir}/qt4/bin/qmake \
+ QMAKE_CFLAGS="%{optflags}" \
+ QMAKE_CXXFLAGS="%{optflags}" \
+ CONFIG+=debug
%else
%qmake5
%endif
@@ -140,24 +139,21 @@
%doc AUTHORS COPYRIGHT FAQ GPLv3
%{_bindir}/qupzilla
%{_libdir}/libQupZilla.so.*
-%dir %{_libdir}/qupzilla
+%dir %{_libdir}/qupzilla/
%{_libdir}/qupzilla/libAccessKeysNavigation.so
%{_libdir}/qupzilla/libAutoScroll.so
%{_libdir}/qupzilla/libMouseGestures.so
%{_libdir}/qupzilla/libGreaseMonkey.so
%{_libdir}/qupzilla/libPIM.so
%{_libdir}/qupzilla/libStatusBarIcons.so
+%{_datadir}/appdata/
%{_datadir}/applications/qupzilla.desktop
%{_datadir}/pixmaps/qupzilla.png
-%{_datadir}/icons/hicolor
-%dir %{_datadir}/qupzilla
-%{_datadir}/qupzilla/locale
-%{_datadir}/qupzilla/themes
-%dir %{_datadir}/bash-completion
-%dir %{_datadir}/bash-completion/completions
-%{_datadir}/bash-completion/completions/qupzilla
+%{_datadir}/icons/hicolor/
+%{_datadir}/qupzilla/
+%{_datadir}/bash-completion/
-%if !0%{?qt5_build}
+%if !0%{with qt5}
%files kwallet
%defattr(-,root,root)
%{_libdir}/qupzilla/libKWalletPasswords.so
++++++ QupZilla-1.6.6.tar.xz -> QupZilla-1.8.2.tar.xz ++++++
++++ 436489 lines of diff (skipped)
++++++ pre_checkin.sh ++++++
--- /var/tmp/diff_new_pack.jpC5EY/_old 2014-10-14 07:10:40.000000000 +0200
+++ /var/tmp/diff_new_pack.jpC5EY/_new 2014-10-14 07:10:40.000000000 +0200
@@ -1,5 +1,9 @@
#!/bin/sh
-cp qupzilla.spec qupzilla-qt5.spec
-sed -e 's,qt5_build 0,qt5_build 1,' qupzilla.spec > qupzilla-qt5.spec
-cp qupzilla.changes qupzilla-qt5.changes
+cp -f qupzilla.spec qupzilla-qt5.spec
+cp -f qupzilla.changes qupzilla-qt5.changes
+
+sed -i 's/^%bcond_with qt5$/%bcond_without qt5/' qupzilla-qt5.spec
+sed -i -e 's/^Name: .*$/Name: qupzilla-qt5/' qupzilla-qt5.spec
+
+osc service localrun format_spec_file
++++++ qupzilla-gdb-workaround.patch ++++++
--- /var/tmp/diff_new_pack.jpC5EY/_old 2014-10-14 07:10:40.000000000 +0200
+++ /var/tmp/diff_new_pack.jpC5EY/_new 2014-10-14 07:10:40.000000000 +0200
@@ -1,12 +1,12 @@
---- QupZilla-1.6.5.orig/src/defines.pri 2014-04-18 16:12:04.000000000
+0200
-+++ QupZilla-1.6.5/src/defines.pri 2014-04-20 20:25:46.988991269 +0200
-@@ -7,6 +7,9 @@ UI_DIR = $$PWD/../build
+--- a/src/defines.pri
++++ b/src/defines.pri
+@@ -8,6 +8,9 @@
# workaround for #849: see
https://bugreports.qt-project.org/browse/QTBUG-23196
mocinclude.CONFIG *= fix_target
+# workaround for https://bugreports.qt-project.org/browse/QTBUG-34950
+CONFIG -= gdb_dwarf_index
+
- unix: VERSION = 1.6.6
-
- # Please read BUILD information #
+ QZ_VERSION = 1.8.2
+ unix: VERSION = $$QZ_VERSION
+ DEFINES *= QUPZILLA_VERSION=\\\"""$$QZ_VERSION"\\\""
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
