[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [emerge/kde-4.8] portage/extragear/quassel: added workaround for cmake WORKING DIR problem
From:       Patrick von Reth <patrick.vonreth () gmail ! com>
Date:       2012-03-26 7:43:29
Message-ID: 20120326074329.4A7FDA60A9 () git ! kde ! org
[Download RAW message or body]

Git commit 21bff06d265006784ffdbb9d46139ce7ecbb196b by Patrick von Reth.
Committed on 26/03/2012 at 09:42.
Pushed by vonreth into branch 'kde-4.8'.

added workaround for cmake WORKING DIR problem

A  +13   -0    portage/extragear/quassel/cd_WINDOWS.diff
M  +1    -0    portage/extragear/quassel/quassel-0.8.0.py

http://commits.kde.org/emerge/21bff06d265006784ffdbb9d46139ce7ecbb196b

diff --git a/portage/extragear/quassel/cd_WINDOWS.diff b/portage/extragear/quassel/cd_WINDOWS.diff
new file mode 100644
index 0000000..37f96bb
--- /dev/null
+++ b/portage/extragear/quassel/cd_WINDOWS.diff
@@ -0,0 +1,13 @@
+diff --git a/cmake/modules/QuasselMacros.cmake b/cmake/modules/QuasselMacros.cmake
+index 2e2dfef..d0655eb 100644
+--- a/cmake/modules/QuasselMacros.cmake
++++ b/cmake/modules/QuasselMacros.cmake
+@@ -22,7 +22,7 @@ macro(generate_ts outvar basename)
+   set(input ${basename}.po)
+   set(output ${CMAKE_BINARY_DIR}/po/${basename}.ts)
+   add_custom_command(OUTPUT ${output}
+-          COMMAND ${QT_LCONVERT_EXECUTABLE}
++          COMMAND cd /D ${CMAKE_SOURCE_DIR}/po && ${QT_LCONVERT_EXECUTABLE}
+           ARGS -i ${input}
+                -of ts
+                -o ${output}
diff --git a/portage/extragear/quassel/quassel-0.8.0.py b/portage/extragear/quassel/quassel-0.8.0.py
index 0ddd962..e3d84a7 100644
--- a/portage/extragear/quassel/quassel-0.8.0.py
+++ b/portage/extragear/quassel/quassel-0.8.0.py
@@ -7,6 +7,7 @@ from Package.CMakePackageBase import *
 class subinfo(info.infoclass):
     def setTargets( self ):
         self.svnTargets['gitHEAD'] = 'git://gitorious.org/quassel/quassel.git'
+        self.patchToApply[ 'gitHEAD' ] = ('cd_WINDOWS.diff', 1)
         self.svnTargets['0.6'] = 'git://gitorious.org/quassel/quassel.git|0.6|'
         for ver in ['0.7.1','0.7.2','0.7.3','0.8.0']:
             self.targets[ver] = 'http://quassel-irc.org/pub/quassel-%s.tar.bz2' % ver
[prev in list] [next in list] [prev in thread] [next in thread]