diff options
| author | ABCD <en.ABCD@gmail.com> | 2009-06-23 14:04:16 -0400 |
|---|---|---|
| committer | ABCD <en.ABCD@gmail.com> | 2009-06-23 14:05:19 -0400 |
| commit | 8a6bb0c74b40ba76d5c07dac97491b664cb33474 (patch) | |
| tree | 10344a8157904443c52e93664dd188393e884b9b /kde-misc/onelinecalc | |
| parent | fdabe0950a81891329185d7555321d69ea636720 (diff) | |
| download | kde-8a6bb0c74b40ba76d5c07dac97491b664cb33474.tar.gz kde-8a6bb0c74b40ba76d5c07dac97491b664cb33474.tar.bz2 kde-8a6bb0c74b40ba76d5c07dac97491b664cb33474.zip | |
[kde-misc/{eyesaver,onelinecalc,panelspacer}] Convert context diffs to unified diffs
Diffstat (limited to 'kde-misc/onelinecalc')
| -rw-r--r-- | kde-misc/onelinecalc/Manifest | 2 | ||||
| -rw-r--r-- | kde-misc/onelinecalc/files/cmake_fix_for_kde-4_2.patch | 41 |
2 files changed, 17 insertions, 26 deletions
diff --git a/kde-misc/onelinecalc/Manifest b/kde-misc/onelinecalc/Manifest index 4215d783468..1fae7ff7c13 100644 --- a/kde-misc/onelinecalc/Manifest +++ b/kde-misc/onelinecalc/Manifest @@ -1,4 +1,4 @@ -AUX cmake_fix_for_kde-4_2.patch 880 RMD160 6dc29ccf2cb4f3339fedff6e692c6cb91bdb5edf SHA1 dfcfc3a762f38bd002b1eb8a5ffcbb9c0b250884 SHA256 5cb3d5d9001d3547d408c6d52a19a85699f964ebd0fbd712b1c10a49fe892d98 +AUX cmake_fix_for_kde-4_2.patch 535 RMD160 6c0a2109b0b8b4e5085c3b4cf22177c2e6ac62c5 SHA1 8b9410c97bd9efea0112ff9650de6d509baa0b0a SHA256 76fc0f53d4bb5f140c578e27f358fd56acfd2e52a741de8f6d4eb6fd49e0b5a1 DIST 89524-onelinecalc-0.2.tar.gz 2943 RMD160 6e060f7028785b0e8e31e1bcb0c748096c5ab57b SHA1 a5b1d13f792c76312ec5fedc1afbb36e141522b2 SHA256 8be6fca395887f079b63ddd4232352f27c67c0785df6e9dd70572d5bf92be41a EBUILD onelinecalc-0.2.ebuild 589 RMD160 0a5a6d4e3a83f9501ea3b23c7f563411f291b088 SHA1 00f8f1752e12c263a487dae9f26a40f80ca15ab3 SHA256 d947be33c1aa7f590ce32acba5e4a842f0b03f9cb77b2efec87d1f416a40956e MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-misc/onelinecalc/files/cmake_fix_for_kde-4_2.patch b/kde-misc/onelinecalc/files/cmake_fix_for_kde-4_2.patch index 7f1888d46bd..7983810f3fa 100644 --- a/kde-misc/onelinecalc/files/cmake_fix_for_kde-4_2.patch +++ b/kde-misc/onelinecalc/files/cmake_fix_for_kde-4_2.patch @@ -1,25 +1,16 @@ -*** onelinecalc-0.2.original/CMakeLists.txt 2009-02-17 23:02:54.881216789 +0300 ---- onelinecalc-0.2/CMakeLists.txt 2009-02-17 23:03:04.808216459 +0300 -*************** -*** 4,11 **** - # Find the required Libaries - find_package(KDE4 REQUIRED) - include(KDE4Defaults) -- find_package(Plasma REQUIRED) - - add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) - include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ) - ---- 4,15 ---- - # Find the required Libaries - find_package(KDE4 REQUIRED) - include(KDE4Defaults) - -+ if ( ${KDE_VERSION} VERSION_LESS "4.1.90" ) -+ else ( ${KDE_VERSION} VERSION_LESS "4.1.90" ) -+ set( PLASMA_LIBS ${KDE4_PLASMA_LIBS} ) -+ endif ( ${KDE_VERSION} VERSION_LESS "4.1.90" ) -+ - add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) - include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ) - +--- onelinecalc-0.2.original/CMakeLists.txt ++++ onelinecalc-0.2/CMakeLists.txt +@@ -4,8 +4,12 @@ + # Find the required Libaries + find_package(KDE4 REQUIRED) + include(KDE4Defaults) +-find_package(Plasma REQUIRED) + ++if ( ${KDE_VERSION} VERSION_LESS "4.1.90" ) ++else ( ${KDE_VERSION} VERSION_LESS "4.1.90" ) ++set( PLASMA_LIBS ${KDE4_PLASMA_LIBS} ) ++endif ( ${KDE_VERSION} VERSION_LESS "4.1.90" ) ++ + add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) + include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ) + |