Ticket #45107: digikam-correct4OSX-4.4.0.patch

File digikam-correct4OSX-4.4.0.patch, 6.1 KB (added by RJVB (René Bertin), 10 years ago)

patch for making a functional showfoto appbundle and ditto digikam app bundle on a case-sensitive filesystem

  • new file core/cmake/templates/Info.plist.cmake.in

    diff --git core/cmake/templates/Info.plist.cmake.in core/cmake/templates/Info.plist.cmake.in
    new file mode 100644
    index 0000000..fc8ec77
    - +  
     1<?xml version="1.0" encoding="UTF-8"?>
     2<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
     3<plist version="1.0">
     4<dict>
     5    <key>CFBundleDevelopmentRegion</key>
     6    <string>English</string>
     7    <key>CFBundleExecutable</key>
     8    <string>digikam</string>
     9    <key>CFBundleGetInfoString</key>
     10    <string>digiKam is an advanced digital photo management application for Linux, Windows, and Mac-OSX</string>
     11    <key>CFBundleIconFile</key>
     12    <string>${MACOSX_BUNDLE_ICON_FILE}</string>
     13    <key>CFBundleIdentifier</key>
     14    <string>org.kde.digiKam</string>
     15    <key>CFBundleInfoDictionaryVersion</key>
     16    <string>6.0</string>
     17    <key>CFBundleLongVersionString</key>
     18    <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
     19    <key>CFBundleName</key>
     20    <string>digiKam</string>
     21    <key>CFBundlePackageType</key>
     22    <string>APPL</string>
     23    <key>CFBundleShortVersionString</key>
     24    <string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
     25    <key>CFBundleSignature</key>
     26    <string>digiK</string>
     27    <key>CFBundleVersion</key>
     28    <string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
     29    <key>CSResourcesFileMapped</key>
     30    <true/>
     31    <key>LSRequiresCarbon</key>
     32    <true/>
     33    <key>NSHumanReadableCopyright</key>
     34    <string>GPLv2</string>
     35    <key>NSPrincipalClass</key>
     36    <string>NSApplication</string>
     37    <key>LSEnvironment</key>
     38    <dict>
     39        <key>RasterOff</key>
     40        <string>yes</string>
     41    </dict>
     42</dict>
     43</plist>
  • new file core/showfoto/CMakeLists.txt

    diff --git core/showfoto/CMakeLists.txt core/showfoto/CMakeLists.txt
    new file mode 100644
    index 0000000..e3ac287
    - +  
     1SET_DEBUG_AREA_CODE(${AREA_CODE_SHOWFOTO})
     2
     3# We need to include the setup dir for showfoto BEFORE the other include dirs,
     4# otherwise the one from the "utilities" dir will be used
     5INCLUDE_DIRECTORIES(BEFORE
     6        ${CMAKE_CURRENT_SOURCE_DIR}/thumbbar
     7        ${CMAKE_CURRENT_SOURCE_DIR}/setup
     8        ${CMAKE_CURRENT_SOURCE_DIR}/main
     9)
     10
     11#Require by Greycstoration algorithm (CImg.h)
     12IF(NOT MSVC)
     13    ADD_DEFINITIONS(${KDE4_ENABLE_EXCEPTIONS})
     14ENDIF(NOT MSVC)
     15
     16SET(showfoto_SRCS
     17    ${libsetupshowfoto_SRCS}
     18    ${libshowfotosetup_SRCS}
     19
     20    thumbbar/showfotoiteminfo.cpp
     21    thumbbar/showfotoimagemodel.cpp
     22    thumbbar/showfotothumbnailmodel.cpp
     23    thumbbar/showfotofiltermodel.cpp
     24    thumbbar/showfotodragdrophandler.cpp
     25    thumbbar/showfotokineticscroller.cpp
     26    thumbbar/showfotoitemsortsettings.cpp
     27    thumbbar/showfotocoordinatesoverlay.cpp
     28    thumbbar/itemviewshowfotodelegate.cpp
     29    thumbbar/showfotodelegate.cpp
     30    thumbbar/showfototooltipfiller.cpp
     31    thumbbar/showfotocategorizedview.cpp
     32    thumbbar/showfotothumbnailbar.cpp
     33
     34    main/showfotosettings.cpp
     35    main/main.cpp
     36    main/showfoto.cpp
     37   )
     38
     39KDE4_ADD_APP_ICON(showfoto_SRCS "../data/icons/apps/hi*-app-showfoto.png")
     40
     41KDE4_ADD_EXECUTABLE(showfoto ${showfoto_SRCS})
     42
     43# To fill plist XML file for OSX #####################################################
     44
     45SET(MACOSX_BUNDLE_LONG_VERSION_STRING ${DIGIKAM_VERSION_STRING})
     46SET(MACOSX_BUNDLE_SHORT_VERSION_STRING ${DIGIKAM_VERSION_SHORT})
     47SET(MACOSX_BUNDLE_BUNDLE_VERSION ${DIGIKAM_VERSION_STRING})
     48CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/templates/Info.plist.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/Info.plist)
     49SET_TARGET_PROPERTIES(showfoto PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_BINARY_DIR}/Info.plist)
     50
     51TARGET_LINK_LIBRARIES(showfoto
     52                      digikamcore
     53                      ${KEXIV2_LIBRARIES}
     54                      ${KDCRAW_LIBRARIES}
     55                      ${KGEOMAP_LIBRARIES}
     56                      ${KDE4_KIO_LIBS}
     57                      ${LCMS_LIBRARIES}
     58
     59                      # To link under Solaris (see bug #274484)
     60                      ${MATH_LIBRARY}
     61
     62                      # To link under FreeBSD
     63                      ${KVM_LIBRARY}
     64                     )
     65
     66INSTALL(TARGETS showfoto ${INSTALL_TARGETS_DEFAULT_ARGS})
     67
     68INSTALL(PROGRAMS main/showfoto.desktop  DESTINATION ${XDG_APPS_INSTALL_DIR} )
     69INSTALL(FILES main/showfoto.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata )
     70INSTALL(FILES main/showfotoui.rc DESTINATION ${DATA_INSTALL_DIR}/showfoto )
  • new file core/showfoto/Info.plist.cmake.in

    diff --git core/showfoto/Info.plist.cmake.in core/showfoto/Info.plist.cmake.in
    new file mode 100644
    index 0000000..6b879b1
    - +  
     1<?xml version="1.0" encoding="UTF-8"?>
     2<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
     3<plist version="1.0">
     4<dict>
     5    <key>CFBundleDevelopmentRegion</key>
     6    <string>English</string>
     7    <key>CFBundleExecutable</key>
     8    <string>showfoto</string>
     9    <key>CFBundleGetInfoString</key>
     10    <string>Photo Viewer and Editor for Linux, Windows, and Mac-OSX</string>
     11    <key>CFBundleIconFile</key>
     12    <string>${MACOSX_BUNDLE_ICON_FILE}</string>
     13    <key>CFBundleIdentifier</key>
     14    <string>org.kde.showfoto</string>
     15    <key>CFBundleInfoDictionaryVersion</key>
     16    <string>6.0</string>
     17    <key>CFBundleLongVersionString</key>
     18    <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
     19    <key>CFBundleName</key>
     20    <string>showfoto</string>
     21    <key>CFBundlePackageType</key>
     22    <string>APPL</string>
     23    <key>CFBundleShortVersionString</key>
     24    <string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
     25    <key>CFBundleSignature</key>
     26    <string>????</string>
     27    <key>CFBundleVersion</key>
     28    <string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
     29    <key>CSResourcesFileMapped</key>
     30    <true/>
     31    <key>LSRequiresCarbon</key>
     32    <true/>
     33    <key>NSHumanReadableCopyright</key>
     34    <string>GPLv2</string>
     35    <key>NSPrincipalClass</key>
     36    <string>NSApplication</string>
     37    <key>LSEnvironment</key>
     38    <dict>
     39        <key>RasterOff</key>
     40        <string>yes</string>
     41    </dict>
     42</dict>
     43</plist>