[arch-commits] Commit in qtcurve-kde3/trunk (PKGBUILD bypass-kde-config.patch)

[Andrea Scarpino]

    Date: Tuesday, September 14, 2010 @ 10:27:37
  Author: andrea
Revision: 90645

upgpkg: qtcurve-kde3 1.6.0-1
upstream release

Added:
  qtcurve-kde3/trunk/bypass-kde-config.patch
Modified:
  qtcurve-kde3/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   18 +++++++++++++-----
 bypass-kde-config.patch |   24 ++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-09-14 14:17:29 UTC (rev 90644)
+++ PKGBUILD	2010-09-14 14:27:37 UTC (rev 90645)
@@ -3,7 +3,7 @@
 # Contributor: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=qtcurve-kde3
-pkgver=1.5.0
+pkgver=1.6.0
 pkgrel=1
 arch=('i686' 'x86_64')
 groups=('qtcurve')
@@ -13,14 +13,22 @@
 depends=('kdelibs3')
 makedepends=('cmake' 'kdelibs')
 source=("http://craigd.wikispaces.com/file/view/QtCurve-KDE3-${pkgver}.tar.bz2"
-	'kdeglobals')
-md5sums=('c91536b835d28f726726da53751f56dc'         
-	'05a6294c7f0e239e698e7e5224fc8e7f')
+	'kdeglobals'
+	'bypass-kde-config.patch')
+md5sums=('8f93476bdb1e832c246d32dbe3e8d92d'
+         '05a6294c7f0e239e698e7e5224fc8e7f'
+         'e1ab2c0995e412b2cbfe804fba75517e')
 
 build() {
 	. /etc/profile.d/qt3.sh
 	. /etc/profile.d/kde3.sh
-	cd $srcdir
+
+        cd ${srcdir}/QtCurve-KDE3-${pkgver}
+        # Bypass KDE prefix detection by kde4-config, see:
+        # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=541667
+        patch -Np1 -i ${srcdir}/bypass-kde-config.patch
+
+	cd ${srcdir}
 	mkdir build
 	cd build
 	cmake ../QtCurve-KDE3-${pkgver} \

Added: bypass-kde-config.patch
===================================================================
--- bypass-kde-config.patch	                        (rev 0)
+++ bypass-kde-config.patch	2010-09-14 14:27:37 UTC (rev 90645)
@@ -0,0 +1,24 @@
+--- QtCurve-KDE3-1.6.0/CMakeLists.txt~	2010-09-14 16:19:36.543333337 +0200
++++ QtCurve-KDE3-1.6.0/CMakeLists.txt	2010-09-14 16:22:18.160000003 +0200
+@@ -44,6 +44,12 @@
+     endif (QT_PLUGINS_DIR MATCHES NOTFOUND)
+ endif (NOT QTC_QT_ONLY)
+ 
++# Comment the kde3/kde4 prefix detection as a whole as it wants to run
++# kde-config and kde4-config, which in turn can create stuff in ~/.kde.
++# This cannot work on read-only homes.
++# So, the "fallback" prefixes ("/usr" for both) will be used.
++if (BRAINDEAD_DETECTION)
++
+ if (NOT QTC_QT_ONLY)
+ exec_program(kde-config
+              ARGS --prefix --expandvars
+@@ -71,6 +77,8 @@
+                  OUTPUT_VARIABLE KDE4PREFIX)
+ endif(KDE4_KDECONFIG_EXECUTABLE)
+ 
++endif (BRAINDEAD_DETECTION)
++
+ if(NOT KDE4PREFIX)
+     set(KDE4PREFIX ${KDE3PREFIX})
+ endif(NOT KDE4PREFIX)