Changes between Initial Version and Version 1 of Ticket #52471, comment 7


Ignore:
Timestamp:
Oct 5, 2016, 9:44:37 PM (8 years ago)
Author:
mkae (Marko Käning)
Comment:

Legend:

Unmodified
Added
Removed
Modified
  • Ticket #52471, comment 7

    initial v1  
    1 Despite this:
    2 {{{
    3 Index: Portfile
    4 ===================================================================
    5 --- Portfile    (revision 153452)
    6 +++ Portfile    (working copy)
    7 @@ -45,7 +45,8 @@
    8  
    9  patch.dir           ${workpath}/${distname}
    10  patch.pre_args      -p1
    11 -patchfiles          patch-mainRaster.diff
    12 +patchfiles          patch-mainRaster.diff \
    13 +                    patch-CMakeLists_QGPGME.txt.diff
    14  #
    15  # OK, let's try building with documentation and see whether we end up with meinproc crashing again:
    16  #
    17 Index: files/patch-CMakeLists_QGPGME.txt.diff
    18 ===================================================================
    19 --- files/patch-CMakeLists_QGPGME.txt.diff      (nonexistent)
    20 +++ files/patch-CMakeLists_QGPGME.txt.diff      (working copy)
    21 @@ -0,0 +1,18 @@
    22 +*** kmymoney-4.7.2/CMakeLists.txt      Sat Apr 25 19:20:16 2015
    23 +--- kmymoney-4.7.2/CMakeLists.txt      Wed Oct  5 23:14:44 2016
    24 +***************
    25 +*** 70,75 ****
    26 +--- 70,82 ----
    27 +  endif (WIN32)
    28 +  # needed by libkgpgfile
    29 +  find_package(QGpgme REQUIRED)
    30 ++
    31 ++ # This is specific for MacPorts, as it ships a newer version of gpgme (1.7.0)
    32 ++ if (QGPGME_FOUND)
    33 ++   set(GPGME_INCLUDES "%PREFIX%/include/kde4")
    34 ++   include_directories(${GPGME_INCLUDES})
    35 ++ endif (QGPGME_FOUND)
    36 ++
    37 +  find_package(KdepimLibs REQUIRED)
    38 +  find_package(SharedMimeInfo REQUIRED)
    39 
    40 }}}
    41 I still get above error concerning not being able to find {{{gpgmepp_export.h}}}, although the file is installed by {{{port:gpgme}}}:
    42 {{{
    43 $ port contents gpgme | grep _export
    44   /opt/local/include/gpgme++/gpgmepp_export.h
    45 }}}
    46 Well, and the to-be-used file is actually using "++" instead of "pp":
    47 {{{
    48 $ ls /opt/local/include/kde4/gpgme++/gpgme*_export.h
    49 /opt/local/include/kde4/gpgme++/gpgme++_export.h
    50 }}}
    51 What can/should be done about this! René, you described this situation already...
     1Removed previous comment, as I've found that I was missing a needed {{{reinplace}}} for the PREFIX.
     2
     3Fixed in r153611