Changeset 112338 for trunk/dports/kde


Ignore:
Timestamp:
Oct 19, 2013, 7:05:57 AM (6 years ago)
Author:
nicos@…
Message:

Kdevelop: update to 4.5.1, correct okteta and valgrind variants, solve license conflict with openssl

Location:
trunk/dports/kde/kdevelop
Files:
2 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/kde/kdevelop/Portfile

    r99826 r112338  
    77
    88name                kdevelop
    9 version             4.4.1
     9version             4.5.1
    1010categories          kde kde4
    1111platforms           darwin
     
    2424master_sites        kde:stable/kdevelop/${version}/src/
    2525
    26 checksums           rmd160  e37a5f25711bb283b68e7a8d2a2f194c3176abcb \
    27                     sha256  7efac56e0390910247e8d3c4a80ce215a1dc4c75b0a1ecc5b594d8de35acde0c
     26checksums           rmd160  447d1a8ff4f995a0ff876eeabb048b63a7d77b25 \
     27                    sha256  36b559b0c0aff13370e27dda57383605e719b55e4b95abd932e513183fcb46ee
    2828
    2929use_bzip2           yes
     
    3636                    port:oxygen-icons
    3737
    38 #1. Avoid automatic use of valgrind unless specified in variant
    39 #2. Avoid automatic use of okteta unless specified in variant
    40 #3. Suppress general std=c++0x definition which crashes with pure C files
    41 #4-5. Change use of std::list with QList which is recognized during build
    42 patchfiles          patch-ConfigureChecks.diff \
    43                     patch-okteta.diff \
    44                     patch-Cxx.diff \
     38#Binaries do not link to openssl, nor use the ssl backend of kdelibs4
     39license_noconflict  openssl
     40
     41pre-configure {
     42    #Suppress these arguments from cmake portgroup
     43    #which break compilation for develop
     44    configure.args-delete   -DCMAKE_OSX_DEPLOYMENT_TARGET="" \
     45                            -DCMAKE_OSX_SYSROOT=/
     46}
     47
     48pre-build {
     49    #Mac compilers do not link with .so libraries
     50    reinplace "s|../../../lib/kdevcpplanguagesupport.so||g" \
     51        ${workpath}/build/languages/cpp/tests/CMakeFiles/cppassistantstest.dir/link.txt
     52}
     53
     54#1. Avoid automatic use of okteta unless specified in variant (find scripts are broken)
     55#2-3. Change use of std::list with QList which is recognized during build
     56patchfiles          patch-okteta.diff \
    4557                    patch-declarationbuilder.diff \
    4658                    patch-context.diff
     
    5062}
    5163
    52 variant valgrind description "Adds support for valgrind" {
    53     depends_lib-append  port:valgrind
    54     patchfiles-delete   patch-ConfigureChecks.diff
    55 }
     64variant valgrind description \
     65    "Obsolete stub variant (kdevelop does not use valgrind anymore)" {}
    5666
    57 variant okteta description "Adds support for okteta and kdesdk" {
    58     depends_lib-append  port:kdesdk4
     67variant okteta description "Adds support for okteta" {
     68    depends_lib-append  port:okteta
    5969    patchfiles-delete   patch-okteta.diff
    6070}   
  • trunk/dports/kde/kdevelop/files/patch-CMakeLists.diff

    r95522 r112338  
    1 --- CMakeLists.txt.orig 2012-04-14 04:58:45.000000000 +0900
    2 +++ CMakeLists.txt      2012-07-14 19:47:30.000000000 +0900
    3 @@ -50,7 +50,7 @@
     1--- CMakeLists.txt.orig 2013-10-18 21:01:21.000000000 +0900
     2+++ CMakeLists.txt      2013-10-18 21:01:26.000000000 +0900
     3@@ -49,7 +49,7 @@
    44 add_subdirectory(documentation)
    5  add_subdirectory(providers)
     5 add_subdirectory(kdeintegration)
    66 add_subdirectory(utils)
    77-add_subdirectory(doc)
    88+#add_subdirectory(doc)
     9 add_subdirectory(file_templates)
     10 
    911 #macro_optional_add_subdirectory(doc)
    10  
    11  macro_display_feature_log()
  • trunk/dports/kde/kdevelop/files/patch-okteta.diff

    r99255 r112338  
    1 --- utils/CMakeLists.txt.orig   2012-10-16 06:40:52.000000000 +0900
    2 +++ utils/CMakeLists.txt        2012-10-30 00:55:39.000000000 +0900
     1--- utils/CMakeLists.txt.orig   2013-10-19 14:45:54.000000000 +0900
     2+++ utils/CMakeLists.txt        2013-10-19 14:46:00.000000000 +0900
    33@@ -1,4 +1,4 @@
    44-macro_optional_find_package( LibOktetaKasten )
Note: See TracChangeset for help on using the changeset viewer.