Ticket #43720: git-49a61a2fd7399d2a49927e328b55709cfca5b49c.patch

File git-49a61a2fd7399d2a49927e328b55709cfca5b49c.patch, 3.2 KB (added by mkae (Marko Käning), 11 years ago)

patches for the three ports

  • dports/kde/kde4-baseapps/Portfile 

    From: Marko Käning <mk-lists@email.de>
Date: Fri, 16 May 2014 06:42:32 +0000
Subject: kdelibs4, kde4-runtime, kde4-baseapps: apply patch for kdelibs4, revbumping kde4-(runtime|baseapps) (see bko 334702)
X-Git-Url: http://quickgit.kde.org/?p=macports-kde.git&a=commitdiff&h=49a61a2fd7399d2a49927e328b55709cfca5b49c
---
kdelibs4, kde4-runtime, kde4-baseapps: apply patch for kdelibs4, revbumping kde4-(runtime|baseapps) (see bko 334702)
---
    a b  
    66
    77name                kde4-baseapps
    88version             4.12.4
     9revision            1
    910categories          kde kde4
    1011maintainers         nicos
    1112license             GPL-2+ LGPL-2+ GFDL-1.2

  • dports/kde/kde4-runtime/Portfile

    a b  
    66
    77name                kde4-runtime
    88version             4.12.4
    9 revision            1
     9revision            2
    1010categories          kde kde4
    1111maintainers         nicos
    1212license             GPL-2+ LGPL-2.1+
    … …  
    7474    universal_variant no
    7575}
    7676
    77 pre-build {
    78     # Add missing object files manually.
    79     #(Should be in libkdeinit4_kglobalaccel, but do not link)
    80     reinplace "s|-o|CMakeFiles/kdeinit_kglobalaccel.dir/globalshortcutsregistry.o \
    81         CMakeFiles/kdeinit_kglobalaccel.dir/globalshortcut.o \
    82         CMakeFiles/kdeinit_kglobalaccel.dir/globalshortcutcontext.o \
    83         CMakeFiles/kdeinit_kglobalaccel.dir/component.o -o|g" \
    84         ${workpath}/build/kglobalaccel/CMakeFiles/kglobalaccel.dir/link.txt
    85 }
    86 
    8777post-destroot {
    8878# Remove this file as it conflicts with hicolor-icon-theme
    8979    file delete ${destroot}${prefix}/share/icons/hicolor/index.theme

  • dports/kde/kdelibs4/Portfile

    a b  
    66
    77name                kdelibs4
    88version             4.12.4
     9revision            1
    910categories          kde kde4
    1011maintainers         nicos
    1112license             LGPL-2+ GPL-2+ BSD
    … …  
    5657                    workaround-kdeinit4-crash.patch \
    5758                    patch-cmake-modules-FindKDE4-Internal.cmake.diff \
    5859                    patch-cmake-modules-FindPhonon.cmake.diff \
    59                     patch-cmake-modules-FindQt4.cmake.diff
     60                    patch-cmake-modules-FindQt4.cmake.diff \
     61                    patch-cmake-modules-KDE4Macros.cmake.diff
    6062
    6163patch.pre_args      -p1
    6264

  • new file dports/kde/kdelibs4/files/patch-cmake-modules-KDE4Macros.cmake.diff

    - +  
     1diff --git a/cmake/modules/KDE4Macros.cmake b/cmake/modules/KDE4Macros.cmake
     2index f519181..bde7cfe 100644
     3--- a/cmake/modules/KDE4Macros.cmake
     4+++ b/cmake/modules/KDE4Macros.cmake
     5@@ -829,9 +829,9 @@ macro (KDE4_ADD_KDEINIT_EXECUTABLE _target_NAME )
     6 
     7       if (Q_WS_MAC)
     8              list(FIND _SRCS *.icns _icon_position)
     9-             if(NOT _res_position EQUAL -1)
     10+             if(NOT _icon_position EQUAL -1)
     11                      list(GET _SRCS ${_icon_position} _resourcefile)
     12-             endif(NOT _res_position EQUAL -1)
     13+             endif(NOT _icon_position EQUAL -1)
     14       endif (Q_WS_MAC)
     15       kde4_add_executable(${_target_NAME} "${_nogui}" ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp ${_resourcefile})
     16       target_link_libraries(${_target_NAME} kdeinit_${_target_NAME})
    117