rev 16485 - in kde-extras/kde-style-qtcurve/trunk/debian: . patches

[Pino Toscano]

Author: pino-guest
Date: 2009-12-24 13:12:11 +0000 (Thu, 24 Dec 2009)
New Revision: 16485

Added:
   kde-extras/kde-style-qtcurve/trunk/debian/patches/02_bypass_braindead_buildsystem.diff
Modified:
   kde-extras/kde-style-qtcurve/trunk/debian/changelog
   kde-extras/kde-style-qtcurve/trunk/debian/patches/series
Log:
add patch 02_bypass_braindead_buildsystem.diff to fix #541667


Modified: kde-extras/kde-style-qtcurve/trunk/debian/changelog
===================================================================
--- kde-extras/kde-style-qtcurve/trunk/debian/changelog	2009-12-23 15:00:24 UTC (rev 16484)
+++ kde-extras/kde-style-qtcurve/trunk/debian/changelog	2009-12-24 13:12:11 UTC (rev 16485)
@@ -1,3 +1,12 @@
+kde-style-qtcurve (0.69.2-2) UNRELEASED; urgency=low
+
+  [ Pino Toscano ]
+  * Add 02_bypass_braindead_buildsystem.diff:
+    - disable "smart" kde3/kde4 prefix detection, which breaks when used on
+      read-only home directories. (Closes: #541667)
+
+ -- Fathi Boudra <fabo at debian.org>  Thu, 24 Dec 2009 14:09:20 +0100
+
 kde-style-qtcurve (0.69.2-1) unstable; urgency=low
 
   * New upstream release.

Added: kde-extras/kde-style-qtcurve/trunk/debian/patches/02_bypass_braindead_buildsystem.diff
===================================================================
--- kde-extras/kde-style-qtcurve/trunk/debian/patches/02_bypass_braindead_buildsystem.diff	                        (rev 0)
+++ kde-extras/kde-style-qtcurve/trunk/debian/patches/02_bypass_braindead_buildsystem.diff	2009-12-24 13:12:11 UTC (rev 16485)
@@ -0,0 +1,32 @@
+From: Pino Toscano <pino at kde.org>
+Description: Disable braindead KDE3/4 prefix detection
+ The current detection of the KDE 3 and KDE 4 prefixes is done running
+ kde-config and kde4-config, resp.
+ This can be problematic, as these two could create files in ~/.kde,
+ thus breaking when the home of the current user (eg in buildds) is read-only.
+ Given the build system sets anyway "/usr" as prefix of KDE 3 and KDE 4
+ if they were not detected, then just let it to.
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=541667
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -16,6 +16,11 @@
+ set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${QTCURVE_VERSION_FULL}")
+ include(CPack)
+ 
++# 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)
+ set(OLD_CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
+ 
+ # Try to find kde4-config...
+@@ -48,6 +53,7 @@
+                     ARGS --prefix
+                     OUTPUT_VARIABLE KDE4PREFIX)
+ endif (KDE4_KDECONFIG_EXECUTABLE)
++endif (BRAINDEAD_DETECTION)
+ 
+ if(NOT KDE3PREFIX)
+     if(KDE4PREFIX)

Modified: kde-extras/kde-style-qtcurve/trunk/debian/patches/series
===================================================================
--- kde-extras/kde-style-qtcurve/trunk/debian/patches/series	2009-12-23 15:00:24 UTC (rev 16484)
+++ kde-extras/kde-style-qtcurve/trunk/debian/patches/series	2009-12-24 13:12:11 UTC (rev 16485)
@@ -1 +1,2 @@
 01_ftbfs_missing_terminating_characher_bug541667.diff
+02_bypass_braindead_buildsystem.diff