Hello community, here is the log from the commit of package qbittorrent for openSUSE:Factory checked in at 2016-06-19 12:53:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qbittorrent (Old) and /work/SRC/openSUSE:Factory/.qbittorrent.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qbittorrent" Changes: -------- --- /work/SRC/openSUSE:Factory/qbittorrent/qbittorrent.changes 2016-04-01 13:02:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qbittorrent.new/qbittorrent.changes 2016-06-19 12:53:03.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jun 17 17:03:09 UTC 2016 - sor.ale...@meowr.ru + +- Add qbittorrent-gcc6.patch from commit e2bf462: fix GCC 6 errors + with qmake (boo#985244). + +------------------------------------------------------------------- New: ---- qbittorrent-gcc6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qbittorrent.spec ++++++ --- /var/tmp/diff_new_pack.23qut2/_old 2016-06-19 12:53:04.000000000 +0200 +++ /var/tmp/diff_new_pack.23qut2/_new 2016-06-19 12:53:04.000000000 +0200 @@ -28,20 +28,24 @@ Source: http://downloads.sf.net/%{name}/%{name}-%{version}.tar.xz Source1: http://downloads.sf.net/%{name}/%{name}-%{version}.tar.xz.asc Source2: %{name}.keyring -Patch1: bittorrent_missing_ppc64le_in_ax_boost_base.m4.patch +# PATCH-FIX-OPENSUSE bittorrent_missing_ppc64le_in_ax_boost_base.m4.patch norm...@linux.vnet.ibm.com -- Add ppc64le support. +Patch0: bittorrent_missing_ppc64le_in_ax_boost_base.m4.patch +# PATCH-FIX-UPSTREAM qbittorrent-gcc6.patch boo#985244 sledgehammer...@qbittorrent.org -- Fix GCC 6 compilation with qmake. +Patch1: %{name}-gcc6.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: boost-devel >= 1.35 BuildRequires: fdupes BuildRequires: hicolor-icon-theme +BuildRequires: pkg-config BuildRequires: update-desktop-files BuildRequires: pkgconfig(libtorrent-rasterbar) >= 1.0.6 -# For geolocalization. +# For geolocalisation. Requires: GeoIP # For search engines. Requires: python3 Recommends: python -%if 0%{?suse_version} >= 1320 || (0%{?suse_version} == 1315 && 0%{?is_opensuse}) +%if 0%{?suse_version} >= 1320 || (0%{?sle_version} >= 120100 && 0%{?is_opensuse}) BuildRequires: libqt5-linguist >= 5.2.0 BuildRequires: pkgconfig(Qt5Concurrent) >= 5.2.0 BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 @@ -65,7 +69,7 @@ It aims to be a good alternative to all other bittorrent clients out there. qBittorrent is fast, stable and provides unicode support -as well as many features. +as well as lots of features. %package nox Summary: A BitTorrent client in Qt, CLI version @@ -77,10 +81,11 @@ It aims to be a good alternative to all other bittorrent clients out there. qBittorrent is fast, stable and provides unicode support -as well as many features. +as well as lots of features. %prep %setup -q +%patch0 -p1 %patch1 -p1 %build @@ -93,7 +98,7 @@ pushd $ui %configure \ $ui_opt \ -%if 0%{?suse_version} < 1320 && !(0%{?suse_version} == 1315 && 0%{?is_opensuse}) +%if 0%{?suse_version} < 1320 && !(0%{?sle_version} >= 120100 && 0%{?is_opensuse}) --with-qt4 \ %endif --enable-systemd ++++++ qbittorrent-gcc6.patch ++++++ --- a/conf.pri.in +++ b/conf.pri.in @@ -6,8 +6,14 @@ DATADIR = @EXPAND_DATADIR@ MANPREFIX = @EXPAND_MANDIR@ QMAKE_CXXFLAGS += @QBT_CONF_EXTRA_CFLAGS@ -INCLUDEPATH += @QBT_CONF_INCLUDES@ -LIBS += @LDFLAGS@ @LIBS@ + +EXTERNAL_INCLUDES = @QBT_CONF_INCLUDES@ +EXTERNAL_INCLUDES -= $$QMAKE_DEFAULT_INCDIRS +INCLUDEPATH += $$EXTERNAL_INCLUDES + +EXTERNAL_LIBS = @LDFLAGS@ @LIBS@ +EXTERNAL_LIBS -= $$QMAKE_DEFAULT_LIBDIRS +LIBS += $$EXTERNAL_LIBS CONFIG += @QBT_ADD_CONFIG@ CONFIG -= @QBT_REMOVE_CONFIG@
