Commit b4b3f9af authored by Jouni Pentikäinen's avatar Jouni Pentikäinen

Merge remote-tracking branch 'origin/master' into rempt/intel-3

parents c11eac48 fd31bc71
......@@ -3,7 +3,7 @@
If you need to build Krita's dependencies for the following reasons:
* you develop on Windows and aren't using Craft
* you develop on OSX and aren't using Homebrew
* you develop on OSX and aren't using Homebrew, or are on OSX and want to make distributable app bundles
* you want to build a generic, distro-agnostic version of Krita for Linux
* you develop on Linux, but some dependencies aren't available for your distribution
......@@ -184,6 +184,9 @@ Linux, fontconfig is needed for poppler. Poppler is needed for PDF import.
Note 2: if you want to build a release, you need to get the binary gettext
Note 3: in order to build fontconfig on macOS, you need to have pkg-config installed.
You probably need homebrew for that... See http://macappstore.org/pkg-config/ .
archives from files.kde.org/krita/build/dependencies:
http://files.kde.org/krita/build/dependencies/gettext0.19.8.1-iconv1.14-shared-32.zip
......
......@@ -8,7 +8,7 @@ if (UNIX)
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/pyport_osx.diff
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${PREFIX_ext_python} ${GLOBAL_AUTOMAKE_PROFILE} --enable-shared
CONFIGURE_COMMAND <SOURCE_DIR>/configure MACOSX_DEPLOYMENT_TARGET=10.11 -prefix=${PREFIX_ext_python} ${GLOBAL_AUTOMAKE_PROFILE} --enable-shared
BUILD_COMMAND make
INSTALL_COMMAND make install
COMMAND ${CMAKE_COMMAND} -E copy ${PREFIX_ext_python}/bin/python3 ${PREFIX_ext_python}/bin/python
......
......@@ -163,7 +163,7 @@ else( APPLE )
# NOTE: This should be fixed by Qt 5.7.1 see here: http://code.qt.io/cgit/qt/qtbase.git/commit/?h=dev&id=77a71c32c9d19b87f79b208929e71282e8d8b5d9
# NOTE: but no one's holding their breath.
set(ext_qt_PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/macdeploy-qt.diff
#COMMAND ${PATCH_COMMAND} -p1 -b -d <SOURCE_DIR>/qtbase -i ${CMAKE_CURRENT_SOURCE_DIR}/qtbase-configure.patch
COMMAND ${PATCH_COMMAND} -p1 -b -d <SOURCE_DIR>/qtbase -i ${CMAKE_CURRENT_SOURCE_DIR}/mac_standardpaths_qtbug-61159.diff
#COMMAND ${PATCH_COMMAND} -p1 -b -d <SOURCE_DIR>/qtbase/mkspecs/features/mac -i ${CMAKE_CURRENT_SOURCE_DIR}/mac-default.patch
)
message(STATUS "${EXTPREFIX_qt}:Additional patches injected.")
......
diff --git a/src/corelib/io/qstandardpaths_mac.mm b/src/corelib/io/qstandardpaths_mac.mm
index e25339a..3bb7a78 100644
--- a/src/corelib/io/qstandardpaths_mac.mm
+++ b/src/corelib/io/qstandardpaths_mac.mm
@@ -196,42 +196,31 @@
it != masks.end(); ++it) {
const QString path = baseWritableLocation(type, *it, true);
if (!path.isEmpty() && !dirs.contains(path))
dirs.append(path);
}
}
if (type == AppDataLocation || type == AppLocalDataLocation) {
CFBundleRef mainBundle = CFBundleGetMainBundle();
if (mainBundle) {
- CFURLRef bundleUrl = CFBundleCopyBundleURL(mainBundle);
- CFStringRef cfBundlePath = CFURLCopyFileSystemPath(bundleUrl, kCFURLPOSIXPathStyle);
- QString bundlePath = QString::fromCFString(cfBundlePath);
- CFRelease(cfBundlePath);
- CFRelease(bundleUrl);
-
- CFURLRef resourcesUrl = CFBundleCopyResourcesDirectoryURL(mainBundle);
- CFStringRef cfResourcesPath = CFURLCopyFileSystemPath(resourcesUrl,
- kCFURLPOSIXPathStyle);
- QString resourcesPath = QString::fromCFString(cfResourcesPath);
- CFRelease(cfResourcesPath);
- CFRelease(resourcesUrl);
-
- // Handle bundled vs unbundled executables. CFBundleGetMainBundle() returns
- // a valid bundle in both cases. CFBundleCopyResourcesDirectoryURL() returns
- // an absolute path for unbundled executables.
- if (resourcesPath.startsWith(QLatin1Char('/')))
- dirs.append(resourcesPath);
- else
- dirs.append(bundlePath + resourcesPath);
- }
- }
+ if (QCFType<CFURLRef> resourcesURL = CFBundleCopyResourcesDirectoryURL(mainBundle)) {
+ if (QCFType<CFURLRef> absoluteResouresURL = CFURLCopyAbsoluteURL(resourcesURL)) {
+ if (QCFType<CFStringRef> path = CFURLCopyFileSystemPath(absoluteResouresURL,
+ kCFURLPOSIXPathStyle)) {
+ dirs.append(QString::fromCFString(path));
+ }
+ }
+ }
+ }
+ }
+
const QString localDir = writableLocation(type);
if (!localDir.isEmpty())
dirs.prepend(localDir);
return dirs;
}
#ifndef QT_BOOTSTRAPPED
QString QStandardPaths::displayName(StandardLocation type)
{
// Use "Home" instead of the user's Unix username
......@@ -58,7 +58,7 @@ if (APPLE)
set(KDE_SKIP_RPATH_SETTINGS TRUE)
set(CMAKE_MACOSX_RPATH 1)
set(BUILD_WITH_INSTALL_RPATH 1)
add_definitions(-mmacosx-version-min=10.9 -Wno-macro-redefined -Wno-deprecated-register)
add_definitions(-mmacosx-version-min=10.11 -Wno-macro-redefined -Wno-deprecated-register)
endif()
if (LINUX)
......
......@@ -100,7 +100,7 @@ MACRO(ADD_SIP_PYTHON_MODULE MODULE_NAME MODULE_SIP)
DEPENDS ${_abs_module_sip} ${SIP_EXTRA_FILES_DEPEND}
)
# not sure if type MODULE could be uses anywhere, limit to cygwin for now
IF (WIN32 OR CYGWIN)
IF (WIN32 OR CYGWIN OR APPLE)
ADD_LIBRARY(${_logical_name} MODULE ${_sip_output_files} )
ELSE (WIN32 OR CYGWIN)
ADD_LIBRARY(${_logical_name} SHARED ${_sip_output_files} )
......
install( FILES
abominable_snowman.png
bamboo_leaves_random.gih
bokey_circle.gbr
brick.gih
bristle.png
bristles_chisel_dense.png
bristles_circle_dense.png
bristles_circle_medium.png
bristles_circle_random.gih
bristles_circle_sparse.png
bristles_circle_variable.svg
bristles_grouped.gbr
chalk_chisel.gih
chalk_chisel_random.gih
chalk_chisel_random_small.gih
chalk.png
chalk_round_hard.png
chalk_sparse.png
chisel_bent_rough.gih
chisel_dense_smear.png
chisel_eroded.png
chisel_knife.svg
chisel_soft.png
chisel_streaks.png
circle_hard_eroded.gih
crackles.gbr
fairy-dust.gih
floor.gih
freckles.png
gradient.png
graphite_grain.gih
grass.gih
grass_patch.gih
hair.png
hearts.gih
impressionism_brush.gih
leaves.png
leaves-scattered.svg
mountains_distant.gih
noise.gih
oil_bristle.png
oil_knife.png
paint_splats.gih
plain_rake.png
rake_dense.png
rake_dotted.png
rake_flat.png
rake_sparse.png
random-debris.gbr
random_particles.png
random-vegetal.gih
rock_light.gih
rock_pitted.gih
rock.png
rock_scraped.gih
scales.png
scratches_rough.gih
scribbles.png
shapes_mech_random.gih
shapes_round_random.gih
shapes_spiked_random.gih
smear_paint.png
smoke.png
snow.gih
sparkle.png
spike_blob.png
spike_eroded.png
spines.png
splat_dots.png
splats_large.gih
square_eroded.png
square_rough_lightgrey.png
square_rough.png
starfield.png
triangle.svg
vegetal.gbr
vegetal_stylised.gih
watercolor.gih
water_still.gih
DESTINATION ${DATA_INSTALL_DIR}/krita/brushes)
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="1000"
height="1000"
viewBox="0 0 1000 1000"
id="svg2"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="bristles_circle_variable.svg">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.35"
inkscape:cx="6.0738625"
inkscape:cy="515.71429"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
units="px"
inkscape:window-width="1600"
inkscape:window-height="871"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-52.362161)">
<path
style="fill:#000000"
d="m 520.23907,1016.3028 c -16.29932,-23.27066 -2.70743,-49.12523 25.82548,-49.12523 27.28965,0 42.10222,37.21293 20.76223,52.16003 -15.14939,10.6111 -38.07584,9.1176 -46.58771,-3.0348 z M 672.678,927.54927 c -17.76107,-6.34765 -24.01711,-31.42415 -11.06975,-44.37153 10.63171,-10.63169 32.01275,-9.06259 40.43913,2.96771 9.73476,13.89834 8.94479,20.34166 -4.09251,33.37892 -11.52131,11.52135 -13.62493,12.18921 -25.27687,8.0249 z M 291.56416,912.26084 c -10.95621,-4.07395 -29.11784,-25.42529 -29.11784,-34.23176 0,-3.23004 5.31023,-12.18367 11.80056,-19.89688 22.27401,-26.47129 61.12956,-14.16098 61.12956,19.36731 0,23.05155 -24.02986,42.1172 -43.81228,34.76133 z M 478.8728,883.33728 c -19.27443,-8.39834 -41.91402,-35.69329 -47.83059,-57.66575 -10.52302,-39.07955 20.9691,-94.68685 58.0561,-102.51275 6.95747,-1.46812 16.38528,-3.41746 20.95074,-4.33186 25.40591,-5.08847 69.50983,21.50685 84.67239,51.05876 6.89272,13.43394 7.23885,50.34394 0.63189,67.38518 -6.41648,16.54989 -25.35975,37.2428 -42.09989,45.98826 -15.33335,8.0105 -56.07767,8.05329 -74.38064,0.078 z m 214.23204,-86.60445 c -19.31776,-8.41727 -42.20477,-36.03293 -45.81591,-55.28186 -6.39901,-34.10972 21.94928,-76.36673 59.55739,-88.77851 21.922,-7.23494 50.89289,3.23691 70.39038,25.44334 16.58083,18.88452 20.40501,32.07784 17.29518,59.6682 -5.56174,49.34326 -56.08354,78.70626 -101.42704,58.94883 z m -431.12398,-72.3665 c -53.7155,-35.8843 -29.66942,-117.2469 34.65139,-117.2469 49.62483,0 80.71221,57.17681 54.0026,99.32282 -17.70228,27.93276 -60.66838,36.61965 -88.65399,17.92408 z m 612.73978,-46.55875 c -14.55027,-10.19139 -19.87604,-29.7537 -12.72835,-46.753 16.59651,-39.47154 75.05721,-27.96368 75.05721,14.77485 0,31.51258 -36.36016,50.16736 -62.32886,31.97815 z M 59.402316,664.26912 C 53.248963,658.11564 48.21422,651.07014 48.21422,648.61239 c 0,-13.34674 10.738082,-28.97466 23.63461,-34.39724 18.206756,-7.65538 33.43794,-1.78245 42.91715,16.54825 5.79649,11.20922 5.77523,14.40606 -0.17316,25.909 -11.43253,22.10802 -37.140534,25.64663 -55.190504,7.59672 z M 478.31113,620.78926 c -32.63031,-7.37009 -59.86962,-33.7525 -67.26976,-65.15367 -4.53823,-19.25706 5.03244,-47.30979 22.88081,-67.06568 50.22261,-55.59045 143.21086,-21.08856 142.96011,53.04313 -0.17276,51.09029 -49.06074,90.35899 -98.57116,79.17622 z m 214.11473,-35.7609 c -33.43643,-11.63262 -53.65598,-28.78486 -67.64998,-57.38758 -16.62742,-33.98524 -18.75338,-55.50634 -8.66095,-87.67458 11.04435,-35.20225 39.99486,-64.75764 74.17945,-75.72944 30.28668,-9.7207 39.18223,-9.77611 68.13821,-0.42437 59.26754,19.1413 93.57822,82.67446 76.20472,141.10863 -19.17026,64.47761 -83.30104,100.6023 -142.21145,80.10735 z m -460.0875,-37.8369 c -34.0039,-7.62411 -74.77744,-54.8173 -74.70356,-86.46552 0.1499,-63.98032 60.18824,-113.765 119.91743,-99.43619 33.10158,7.94092 63.92632,39.26381 70.97251,72.11949 14.85062,69.24569 -46.56636,129.3918 -116.18638,113.78222 z M 465.28305,402.37458 c -50.26192,-8.82932 -90.6139,-44.76098 -106.7887,-95.09087 -12.56568,-39.09929 -11.05227,-61.36237 6.88818,-101.33933 18.79015,-41.87007 51.12187,-66.94491 100.59527,-78.01656 49.39173,-11.0534 113.57387,19.72059 139.31085,66.7967 19.47483,35.62179 24.19318,66.14404 15.60498,100.9458 -18.06742,73.21437 -84.99676,119.10868 -155.61058,106.70426 z m 217.87203,-91.11236 c -50.94303,-32.00706 -28.94252,-114.40855 30.54608,-114.40855 40.76254,0 74.22012,45.91897 59.44603,81.5868 -14.94342,36.07658 -59.15007,52.19955 -89.99211,32.82175 z M 139.02621,197.20429 c -8.03219,-8.03218 -13.32376,-18.12793 -13.32376,-25.42033 0,-17.25065 22.72954,-38.7441 40.97225,-38.7441 19.18021,0 30.4402,6.63409 38.84454,22.88644 20.72619,40.08012 -33.8257,73.94528 -66.49303,41.27799 z m 602.81825,-38.24896 c -21.63301,-23.02731 -5.26942,-57.82238 27.19302,-57.82238 31.70919,0 47.82645,37.27674 25.27671,58.46115 -14.45661,13.58128 -39.39587,13.27768 -52.46973,-0.63877 z M 298.56079,133.39049 c -26.39297,-26.39298 -10.44776,-64.164454 27.08696,-64.164454 14.54256,0 20.31947,2.715411 29.83508,14.024118 34.37254,40.849426 -19.10602,87.956436 -56.92204,50.140336 z"
id="path4147"
inkscape:connector-curvature="0" />
</g>
</svg>
This diff is collapsed.
abominable_snowman.png
bamboo_leaves_random.gih
bokey_circle.gbr
brick.gih
bristle.png
bristles_chisel_dense.png
bristles_circle_dense.png
bristles_circle_medium.png
bristles_circle_random.gih
bristles_circle_sparse.png
bristles_circle_variable.svg
bristles_grouped.gbr
chalk_chisel.gih
chalk_chisel_random.gih
chalk_chisel_random_small.gih
chalk.png
chalk_round_hard.png
chalk_sparse.png
chisel_bent_rough.gih
chisel_dense_smear.png
chisel_eroded.png
chisel_knife.svg
chisel_soft.png
chisel_streaks.png
circle_hard_eroded.gih
crackles.gbr
fairy-dust.gih
floor.gih
freckles.png
gradient.png
graphite_grain.gih
grass.gih
grass_patch.gih
hair.png
hearts.gih
impressionism_brush.gih
leaves.png
leaves-scattered.svg
mountains_distant.gih
noise.gih
oil_bristle.png
oil_knife.png
paint_splats.gih
plain_rake.png
rake_dense.png
rake_dotted.png
rake_flat.png
rake_sparse.png
random-debris.gbr
random_particles.png
random-vegetal.gih
rock_light.gih
rock_pitted.gih
rock.png
rock_scraped.gih
scales.png
scratches_rough.gih
scribbles.png
shapes_mech_random.gih
shapes_round_random.gih
shapes_spiked_random.gih
smear_paint.png
smoke.png
snow.gih
sparkle.png
spike_blob.png
spike_eroded.png
spines.png
splat_dots.png
splats_large.gih
square_eroded.png
square_rough_lightgrey.png
square_rough.png
starfield.png
triangle.svg
vegetal.gbr
vegetal_stylised.gih
watercolor.gih
water_still.gih
This diff is collapsed.
install( FILES
README
Krita_3_Default_Resources.bundle
Krita_4_Default_Resources.bundle
DESTINATION ${DATA_INSTALL_DIR}/krita/bundles)
......@@ -466,5 +466,15 @@ LastReturnType=Custom Document
Theme=Krita dark
[python]
enable_colorspace=true
enable_comics_project_management_tools=true
enable_documenttools=true
enable_exportlayers=true
enable_filtermanager=true
enable_lastdocumentsdocker=true
enable_palette_docker=true
enable_quick_settings_docker=true
enable_scripter=true
enable_tenbrushes=true
enable_tenscripts=true
install( FILES
a\)_Eraser_Circle.kpp
a\)_Eraser_Small.kpp
a\)_Eraser_Soft.kpp
b\)_Airbrush_Soft.kpp
b\)_Basic-1.kpp
b\)_Basic-2_Opacity.kpp
b\)_Basic-3_Flow.kpp
b\)_Basic-4_Flow_Opacity.kpp
b\)_Basic-5_Size_default.kpp
b\)_Basic-5_Size_Opacity.kpp
b\)_Basic-6_Details.kpp
c\)_Pencil-1_Hard.kpp
c\)_Pencil-2.kpp
c\)_Pencil-3_Large_4B.kpp
c\)_Pencil-4_Soft.kpp
c\)_Pencil-5_Tilted.kpp
c\)_Pencil-6_Quick_Shade.kpp
d\)_Ink-1_Precision.kpp
d\)_Ink-2_Fineliner.kpp
d\)_Ink-3_Gpen.kpp
d\)_Ink-4_Pen_Rough.kpp
d\)_Ink-7_Brush_Rough.kpp
d\)_Ink-8_Sumi-e.kpp
e\)_Marker_Chisel_Smooth.kpp
e\)_Marker_Details.kpp
e\)_Marker_Dry.kpp
f\)_Bristles-1_Details.kpp
f\)_Bristles-2_Flat_Rough.kpp
f\)_Bristles-3_Large_Smooth.kpp
f\)_Bristles-4_Glaze.kpp
f\)_Bristles-5_Flat.kpp
f\)_Charcoal_Rock_Soft.kpp
f\)_Dry_Roller.kpp
g\)_Dry_Bristles_Eroded.kpp
g\)_Dry_Bristles.kpp
g\)_Dry_Brushing.kpp
g\)_Dry_Textured_Creases.kpp
h\)_Chalk_Details.kpp
h\)_Chalk_Grainy.kpp
h\)_Chalk_Soft.kpp
h\)_Charcoal_pencil_large.kpp
h\)_Charcoal_Pencil_Medium.kpp
h\)_Charcoal_Pencil_Thin.kpp
i\)_Wet_Bristles.kpp
i\)_Wet_Bristles_Rough.kpp
i\)_Wet_Circle.kpp
i\)_Wet_Knife.kpp
i\)_Wet_Paint_Details.kpp