[arch-commits] Commit in fatrat/trunk (PKGBUILD QTBUG-22829-workaround.diff)

[Lukas Jirkovsky]

    Date: Sunday, August 24, 2014 @ 15:25:59
  Author: stativ
Revision: 117831

upgpkg: fatrat 1.2.0_beta2-13

boost 1.56 rebuild

Modified:
  fatrat/trunk/PKGBUILD
Deleted:
  fatrat/trunk/QTBUG-22829-workaround.diff

-----------------------------+
 PKGBUILD                    |   11 ++++++-----
 QTBUG-22829-workaround.diff |   12 ------------
 2 files changed, 6 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-24 13:18:56 UTC (rev 117830)
+++ PKGBUILD	2014-08-24 13:25:59 UTC (rev 117831)
@@ -2,7 +2,7 @@
 # Maintainer: Lukas Jirkovsky <l.jirkovsky at gmail.com>
 pkgname=fatrat
 pkgver=1.2.0_beta2
-pkgrel=12
+pkgrel=13
 pkgdesc="Qt4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more"
 arch=('i686' 'x86_64')
 url="http://fatrat.dolezel.info/"
@@ -11,20 +11,21 @@
 optdepends=('geoip: GeoIP support' 'java-runtime: Java plugins')
 makedepends=('boost' 'cmake' 'java-environment')
 source=(http://www.dolezel.info/download/data/fatrat/fatrat-$pkgver.tar.xz \
-        QTBUG-22829-workaround.diff pion-5.0.diff)
+        pion-5.0.diff)
 md5sums=('ad823d2a81f0583316ece815b928c71b'
-         '9c017f227437b8a72e92219ee6d58578'
          'd7d398e7b6415c0a81eb4960d8271997')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # workaround the moc bug (QTBUG-22829) with new boost
-  patch -Np1 < "$srcdir/QTBUG-22829-workaround.diff" || true
   # fix help generation with qt4
   sed -s 's|qcollectiongenerator|qcollectiongenerator-qt4|' -i CMakeLists.txt
   # fix for the new pion
   patch -Np1 < "$srcdir/pion-5.0.diff" || true
+  # workaround the moc bug (QTBUG-22829) with new boost
+  # by disabling all boost headers during the MOC execution
+  find . -type f -exec sed -i 's|#include <boost/.*|#ifndef Q_MOC_RUN\n&\n#endif|' '{}' ';'
+  find . -type f -exec sed -i 's|#include <pion/.*|#ifndef Q_MOC_RUN\n&\n#endif|' '{}' ';'
 
   cmake \
     -DWITH_EVERYTHING=ON \

Deleted: QTBUG-22829-workaround.diff
===================================================================
--- QTBUG-22829-workaround.diff	2014-08-24 13:18:56 UTC (rev 117830)
+++ QTBUG-22829-workaround.diff	2014-08-24 13:25:59 UTC (rev 117831)
@@ -1,12 +0,0 @@
-diff -rup fatrat-1.2.0_beta2/CMakeLists.txt fatrat-1.2.0_beta2.new/CMakeLists.txt
---- fatrat-1.2.0_beta2/CMakeLists.txt	2012-07-14 11:44:27.000000000 +0000
-+++ fatrat-1.2.0_beta2.new/CMakeLists.txt	2013-03-25 16:21:03.143596960 +0000
-@@ -552,7 +552,7 @@ if(WITH_DOCUMENTATION)
- 	)
- endif(WITH_DOCUMENTATION)
- 
--qt4_wrap_cpp(fatrat_MOC_SRCS ${fatrat_MOC_HDRS})
-+qt4_wrap_cpp(fatrat_MOC_SRCS ${fatrat_MOC_HDRS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
- 
- set(fatrat_RCS
- 	gfx/resources.qrc