Revbump which fixes broken WebUI for nox binaries. Thanks to upstream for the quick patch

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 109 insertions, 4 deletions

diff --git a/net-p2p/qbittorrent/ChangeLog b/net-p2p/qbittorrent/ChangeLog
index 16d8da095767..7f0b5de901ec 100644
--- a/net-p2p/qbittorrent/ChangeLog
+++ b/net-p2p/qbittorrent/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-p2p/qbittorrent
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.88 2010/06/17 09:45:51 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.89 2010/06/17 12:09:12 hwoarang Exp $
+
+*qbittorrent-2.2.9-r1 (17 Jun 2010)
+
+  17 Jun 2010; Markos Chandras <hwoarang@gentoo.org>
+  -qbittorrent-2.2.9.ebuild, +qbittorrent-2.2.9-r1.ebuild,
+  +files/nox-webui-fix.patch:
+  Revbump which fixes broken WebUI for nox binaries. Thanks to upstream for
+  the quick patch
 
 *qbittorrent-2.2.9 (17 Jun 2010)
 
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 18f848609504..976b318d3380 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,4 +1,5 @@
 AUX moc_bug_workaround.patch 796 RMD160 b4b4d70bea959d0375ad753dfaa9afdf65ea5508 SHA1 4f8088ce859e2acf41e03ccb19e7efeda9044852 SHA256 3c99d404d5206fc1b320ab26a367f0e28bd1408fe56eacd4a86e05ec8aade36e
+AUX nox-webui-fix.patch 2673 RMD160 349085981eee5e2deed5dce6e8b9557c07022ec7 SHA1 7a290fe64ee74a95bc3d97c6d2eef26cc459bad2 SHA256 ebe5d99aca9614c13a5b00c0b66aa2b189cce47acd1a1792665f6fc7430c8af4
 DIST qbittorrent-2.2.2.tar.gz 2498865 RMD160 c9ff7b7ac51ab1f0bf439205a69cae99a44ab27d SHA1 cb12f934f6c61c78f71b7afce065442d77e6dc9c SHA256 9750ae4c384f0b283f9185722fdb1206148438132c5f44b094c6b0e697c5711d
 DIST qbittorrent-2.2.5.tar.gz 2504251 RMD160 3e54e49bf877778b00d6c26c73bb8a66a8a17a4c SHA1 a7568c220d1e5ed3113c6be861bab4422ef5343a SHA256 461f1b8f38c3ca8d769e7d628ec897adc1cc1f81b43e36e1bcd3847dfe382f2d
 DIST qbittorrent-2.2.6.tar.gz 2557087 RMD160 a00dd9dc45523474bcd60c26acf7917f8e2891c9 SHA1 06db1b922e038659ea04f8e1030d4131dd82bfc4 SHA256 c24b4b9f89ef7420a15a49f2b84b9c45bbc53f71fee774d9da768874e97915ba
@@ -11,7 +12,7 @@ EBUILD qbittorrent-2.2.5.ebuild 1642 RMD160 8091a7b960f1f4b0c67de67d55d5f2572bc5
 EBUILD qbittorrent-2.2.6.ebuild 1644 RMD160 2f0d53fe978d64e59451cdbb35dbaf475410cb53 SHA1 47c445cae4442ae1900a917e2fe6ad5f93b628a7 SHA256 37923ca31aec8e09fa108b9ff5bff773f4b681f05cf08656ee0723d1a41e11f2
 EBUILD qbittorrent-2.2.7.ebuild 1644 RMD160 fba816796d2be19657865822ffebf7574d707942 SHA1 9bc1641d8e37cc44cc16b33c6acf249bc8ac6927 SHA256 32495a6225e4e561f8e99ed7ff88d82fa5e778af6d4f6cfa9602e6a21c6b4938
 EBUILD qbittorrent-2.2.8.ebuild 1684 RMD160 f3f1f3493bfb5625f49a2ae01107af6e0be9246d SHA1 cea4413f886076683c7f500c8d7e16db8797e024 SHA256 815f85ad12645ee9004ae95d7c12ec7bbba7be232d50fdb59e33872e04c545cf
-EBUILD qbittorrent-2.2.9.ebuild 1837 RMD160 938eaaf43198d627eb88b9aefdd6abbbfd33a223 SHA1 593471aba998fa534979bbecd608099b040453d4 SHA256 a3b290325704944276bbbac7c289d60dcdd29363018d77d4e6ee923daa7995c3
+EBUILD qbittorrent-2.2.9-r1.ebuild 1910 RMD160 28879c0457623fbb9f3e958eb1b67eddb116d782 SHA1 ad1e9ea5b476a95cfa3e097119d6686aa215f303 SHA256 00c1e5dd8a82f68e2bf1a1d019dbfa223c9a659c5ccaf5d2aaec60e9dad13b9e
 EBUILD qbittorrent-2.3.0_beta1.ebuild 1733 RMD160 ff30289572603ec004dd35ce4de03b2ac2466e53 SHA1 66d4f31908eabfe505aa050b32ce716c8d1d1fc1 SHA256 ef74c04b1187cd974fb6b36e4ca8e5a17fd121f1dff0af8d0937cca802d0e5b6
-MISC ChangeLog 14661 RMD160 ed2771bc9df5c28c6b55dfa2859023a66510eafa SHA1 afa458359a37bb7e614041ee309db535fdd307cf SHA256 2b66b3e653b3b55cd1f4ce13f48ca5b579a3d45ff5d555024965fa25fb63299c
+MISC ChangeLog 14935 RMD160 50d646a38d40ae37d510101f24b851c42cf50e73 SHA1 cd3c7b7a1efbe13938e2afe7a2ad8e747071ee6d SHA256 ba06b94f58f5510e7a7de0cea81b64eb3843611fcaf25eb699433082fa54d71a
 MISC metadata.xml 280 RMD160 25c947a1034c150a136911351c7da9ed8783ee44 SHA1 17a16b5a0ddc3de88d81a1493cd5cb4c1aa795aa SHA256 07e3116f2c52c06760e21dc1b8bd3b318b7d9a140fb1b8942736aedd0d750b73
diff --git a/net-p2p/qbittorrent/files/nox-webui-fix.patch b/net-p2p/qbittorrent/files/nox-webui-fix.patch
new file mode 100644
index 000000000000..b4b676665bdc
--- /dev/null
+++ b/net-p2p/qbittorrent/files/nox-webui-fix.patch
@@ -0,0 +1,94 @@
+Index: src/httpconnection.cpp
+===================================================================
+--- src/httpconnection.cpp	(revision 4101)
++++ src/httpconnection.cpp	(working copy)
+@@ -237,6 +237,7 @@
+   QFile file(url);
+   if(!file.open(QIODevice::ReadOnly))
+   {
++    qDebug("File %s was not found!", qPrintable(url));
+     respondNotFound();
+     return;
+   }
+Index: src/src.pro
+===================================================================
+--- src/src.pro	(revision 4101)
++++ src/src.pro	(working copy)
+@@ -142,8 +142,9 @@
+ contains(DEFINES, DISABLE_GUI) {
+   QT = core
+   TARGET = qbittorrent-nox
++} else {
++  TARGET = qbittorrent
+ }
+-else:TARGET = qbittorrent
+ 
+ # QMAKE_CXXFLAGS_RELEASE += -fwrapv
+ # QMAKE_CXXFLAGS_DEBUG += -fwrapv
+@@ -211,25 +212,27 @@
+   }
+   unix:!macx:contains(DEFINES, WITH_GEOIP_EMBEDDED):message("You chose to embed GeoIP database in qBittorrent executable.")
+ 
++}
++
+ # Resource files
+ RESOURCES = icons.qrc \
+     lang.qrc \
+     search.qrc \
+     webui.qrc
+ 
+-  # Add GeoIP resource file if the GeoIP database
+-  # should be embedded in qBittorrent executable
+-  contains(DEFINES, WITH_GEOIP_EMBEDDED) {
+-    exists("geoip/GeoIP.dat") {
+-      message("GeoIP.dat was found in src/geoip/.")
+-      RESOURCES += geoip.qrc
+-    }
+-    else {
+-      DEFINES -= WITH_GEOIP_EMBEDDED
+-      error("GeoIP.dat was not found in src/geoip/ folder, please follow instructions in src/geoip/README.")
+-    }
++# Add GeoIP resource file if the GeoIP database
++# should be embedded in qBittorrent executable
++contains(DEFINES, WITH_GEOIP_EMBEDDED) {
++  exists("geoip/GeoIP.dat") {
++    message("GeoIP.dat was found in src/geoip/.")
++    RESOURCES += geoip.qrc
+   }
+-else:message("GeoIP database will not be embedded in qBittorrent executable.")
++  else {
++    DEFINES -= WITH_GEOIP_EMBEDDED
++    error("GeoIP.dat was not found in src/geoip/ folder, please follow instructions in src/geoip/README.")
++  }
++} else {
++  message("GeoIP database will not be embedded in qBittorrent executable.")
+ }
+ 
+ # Translations
+@@ -284,7 +287,7 @@
+     scannedfoldersmodel.h
+ 
+ contains(DEFINES, DISABLE_GUI) {
+-  HEADERS += headlessloader.h
++     HEADERS +=  headlessloader.h
+ } else {
+      HEADERS +=  GUI.h \
+                  feedList.h \
+@@ -331,7 +334,8 @@
+   }
+ }
+ 
+-!contains(DEFINES, DISABLE_GUI):FORMS += ui/mainwindow.ui \
++!contains(DEFINES, DISABLE_GUI) {
++   FORMS += ui/mainwindow.ui \
+ 	    ui/options.ui \
+ 	    ui/about.ui \
+ 	    ui/createtorrent.ui \
+@@ -350,6 +354,7 @@
+ 	    ui/propertieswidget.ui \
+ 	    ui/peer.ui \
+ 	    ui/confirmdeletiondlg.ui
++}
+ 
+ contains(DEFINES, DISABLE_GUI) {
+   include(qtsingleapp/qtsinglecoreapplication.pri)
diff --git a/net-p2p/qbittorrent/qbittorrent-2.2.9.ebuild b/net-p2p/qbittorrent/qbittorrent-2.2.9-r1.ebuild
index a96f298bc96e..6c990bb9f69a 100644
--- a/net-p2p/qbittorrent/qbittorrent-2.2.9.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-2.2.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-2.2.9.ebuild,v 1.1 2010/06/17 09:45:51 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-2.2.9-r1.ebuild,v 1.1 2010/06/17 12:09:12 hwoarang Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2"
@@ -39,6 +39,8 @@ src_prepare() {
 	# Move saveDHTEntry definition away from slots so the moc
 	# doens't get confused and breaks compilation
 	epatch "${FILESDIR}"/moc_bug_workaround.patch
+	# fix WebUI for nox binary
+	epatch "${FILESDIR}"/nox-webui-fix.patch
 	# Respect LDFLAGS
 	sed -i -e 's/-Wl,--as-needed/$(LDFLAGS)/g' src/src.pro
 	qt4-r2_src_prepare