[arch-commits] Commit in qbittorrent/trunk (3 files)

[Antonio Rojas]

    Date: Monday, May 9, 2016 @ 09:45:00
  Author: arojas
Revision: 174409

libtorrent and hooks rebuild, fix build with GCC6

Added:
  qbittorrent/trunk/qbittorrent-gcc6.patch
Modified:
  qbittorrent/trunk/PKGBUILD
Deleted:
  qbittorrent/trunk/qbittorrent.install

------------------------+
 PKGBUILD               |   19 +++++++++++++------
 qbittorrent-gcc6.patch |   14 ++++++++++++++
 qbittorrent.install    |   13 -------------
 3 files changed, 27 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-09 07:41:22 UTC (rev 174408)
+++ PKGBUILD	2016-05-09 07:45:00 UTC (rev 174409)
@@ -8,8 +8,8 @@
 
 pkgbase=qbittorrent
 pkgname=(qbittorrent qbittorrent-nox)
-pkgver=3.3.3
-pkgrel=2
+pkgver=3.3.4
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.qbittorrent.org"
 license=('custom' 'GPL')
@@ -16,11 +16,19 @@
 makedepends=('libtorrent-rasterbar' 'qt5-base' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils' 'boost' 'qt5-tools')
 source=("http://downloads.sourceforge.net/sourceforge/qbittorrent/$pkgname-$pkgver.tar.xz"
         'qbittorrent.service'
-	'qbittorrent at .service')
-sha256sums=('9c8d8bdc3fb2632019cb3ee5f811baaa41b41fe7ce542c753c6771bcc110db53'
+	'qbittorrent at .service' 'qbittorrent-gcc6.patch')
+sha256sums=('c0d0d4b72c240f113b59a061146803bc1b7926d3d7f39b06b50a4d26f5ad91b8'
             '8c5879673c66368ada97f6d70a1d8fe3b6a4995f79aab4fc6bf54fbdcbe811d0'
-            '12dfd06104eaf302b79328c8096248c051208f69348e33f7fb2e4a2fb49caa29')
+            '12dfd06104eaf302b79328c8096248c051208f69348e33f7fb2e4a2fb49caa29'
+            '27180ec398d510bf077907c0df8c831fd49431c1908a71f8d16fac5e410c817c')
 
+prepare() {
+  cd $pkgbase-$pkgver
+  # Fix build with GCC 6 (Fedora)
+  patch -p1 -i ../qbittorrent-gcc6.patch
+  ./bootstrap.sh
+}
+
 build() {
   cd $pkgbase-$pkgver
 
@@ -40,7 +48,6 @@
   pkgdesc="An advanced BitTorrent client programmed in C++, based on Qt toolkit and libtorrent-rasterbar."
   depends=('libtorrent-rasterbar' 'qt5-base' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils')
   optdepends=('python: needed for torrent search tab')
-  install=$pkgname.install
 
   cd $pkgbase-$pkgver/$pkgbase
 

Added: qbittorrent-gcc6.patch
===================================================================
--- qbittorrent-gcc6.patch	                        (rev 0)
+++ qbittorrent-gcc6.patch	2016-05-09 07:45:00 UTC (rev 174409)
@@ -0,0 +1,14 @@
+diff -up qBittorrent-release-3.3.3/configure.ac.gcc6 qBittorrent-release-3.3.3/configure.ac
+--- qBittorrent-release-3.3.3/configure.ac.gcc6	2016-01-20 16:49:39.000000000 -0600
++++ qBittorrent-release-3.3.3/configure.ac	2016-03-13 07:45:03.512293512 -0500
+@@ -157,8 +157,8 @@ AX_BOOST_BASE([1.35])
+ AS_IF([test "x$BOOST_CPPFLAGS" = "x"],
+       [AC_MSG_ERROR([Could not find Boost])],
+       [AC_MSG_NOTICE([Boost CPPFLGAS: $BOOST_CPPFLAGS])
+-      CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS"
+-      LDFLAGS="$BOOST_LDFLAGS $LDFLAGS"])
++      #CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS"
++      #LDFLAGS="$BOOST_LDFLAGS $LDFLAGS"])
+ 
+ AX_BOOST_SYSTEM()
+ # HAVE_BOOST_SYSTEM is set to an empty value when Boost.System is found.

Deleted: qbittorrent.install
===================================================================
--- qbittorrent.install	2016-05-09 07:41:22 UTC (rev 174408)
+++ qbittorrent.install	2016-05-09 07:45:00 UTC (rev 174409)
@@ -1,13 +0,0 @@
-
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}