Ticket #46359: kde4-workspace-diff.patch

File kde4-workspace-diff.patch, 3.3 KB (added by RJVB (René Bertin), 9 years ago)

How are the new seven patches to be used in regards to the previous four ones? As shown in the updated Portfile ... which I completely forgot to add :-/

  • /opt/local/site-ports/kde/kde4-workspace-git/

    old new  
    11# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
    2 # $Id: Portfile 127391 2014-10-26 23:24:49Z mk@macports.org $
     2# $Id: Portfile 120204 2014-05-19 15:26:03Z nicos@macports.org $
    33
    44PortSystem          1.0
    55PortGroup           kde4   1.1
    66
     7fetch.type          git
     8git.url             git://anongit.kde.org/kde-workspace
     9#git.branch          e7a4d0bc
     10git.branch          fc11b509
     11
    712name                kde4-workspace
    8 version             4.13.3
    9 set plasmaversion   4.11.11
     13version             4.11.14
     14revision            1
    1015categories          kde kde4
    11 maintainers         gmail.com:rjvbertin
     16maintainers         rjvbertin@gmail.com
    1217license             GPL-2+ LGPL-2.1+
    1318description         KDE Workspace
    1419long_description    Brings certain aspects of Linux/X11 KDE workspaces ("Plasma") to OS X, \
    1520                    notably the System Settings application and the Oxygen style.\
    16                     KDE ${version} has Plasma ${plasmaversion}
    1721platforms           darwin
    1822homepage            http://www.kde.org/workspaces/
    1923master_sites        kde:stable/${version}/src/
    2024use_xz              yes
    21 distname            kde-workspace-${plasmaversion}
    2225
    23 checksums           rmd160  e0cdcde2c455e376a8bf785bb2c3ef114fa9a5f1 \
    24                     sha256  f188b003c56d2a40f71d4eea8c91b7ae0febcf25c252c383913281fce73c4d73
    2526
    26 #Fully removing X11 only function to prevent automoc to include it (RR 120287)
    27 patchfiles          patch-CmakeLists-for-OSX.patch \
    28                     libs-CmakeLists-deactivate-taskmanager.patch \
    29                     patch-KControl-CmakeLists.patch \
    30                     krdb-noX11onOSX.patch
     27patchfiles          patch-CMakeLists-for-OSX.patch \
     28                    patch-libs-CMakeLists.patch \
     29                    patch-kcontrol.patch \
     30                    patch-plasma.patch \
     31                    systemsettings-correct-menuplacement.patch
    3132
    3233depends_build-append port:boost \
    3334                    port:freetype \
     
    3839                    port:kactivities \
    3940                    port:nepomuk-core \
    4041                    port:libqalculate \
     42                    port:phonon \
    4143                    port:qjson \
    4244                    port:qimageblitz
    4345
    4446configure.args-append  -DBUILD_webkit:BOOL=ON
    4547
    46 variant nostrip description {Prevent stripping of binaries} {
     48variant nostrip description {Prevent stripping of binaries} {}
     49
     50if { [variant_isset nostrip] } {
    4751        configure.args-delete -DCMAKE_BUILD_TYPE=Release
    4852        configure.args-append -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo -DCMAKE_STRIP:FILEPATH=/bin/echo
    4953}
    5054
    51 livecheck.url       http://kde.mirrors.hoobly.com/stable/
    52 livecheck.regex     (\\d+(\\.\\d+)+)
     55variant without_oxygen description {Don't build the Oxygen theme} {}
     56
     57if { [variant_isset without_oxygen] } {
     58    patchfiles-delete     no-oxygen-theme.patch
     59}
     60
     61post-destroot {
     62    ln -s /Applications/MacPorts/KDE4/plasma-windowed.app/Contents/MacOS/plasma-windowed ${destroot}/opt/local/bin/plasma-windowed
     63}
     64
     65#livecheck.url       http://kde.mirrors.hoobly.com/stable/
     66#livecheck.regex     (\\d+(\\.\\d+)+)