Skip to content

Commit 27f296d

Browse files
jef-njef-n
committedOct 23, 2014
update changelog for brighton release
·
ltr-3_44archive/master_2
1 parent 2c7378b commit 27f296d

File tree

6 files changed

+377
-209
lines changed

6 files changed

+377
-209
lines changed
 

‎INSTALL

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
QGIS
22
Building QGIS from source - step by step
3-
Friday July 25, 2014
3+
Thursday October 23, 2014
44

55

6-
Last Updated: Friday July 25, 2014
7-
Last Change : Friday July 25, 2014
6+
Last Updated: Thursday October 23, 2014
7+
Last Change : Sunday September 28, 2014
88

99

1010
1. Introduction
@@ -1457,9 +1457,8 @@ your own risk.
14571457
5.4.5. Additional dependencies: SIP
14581458
===================================
14591459

1460-
Mt Lion note: SIP 4.15.7 appears to not work on Mt Lion. Install either
1461-
prior version: 4.14.6.
1462-
later version: 4.16.3+
1460+
Mt Lion note: SIP 4.15.7 appears to not work on Mt Lion. Install either
1461+
a prior version to 4.14.6 or a later version 4.16.3+
14631462

14641463
Retrieve the python bindings toolkit SIP from
14651464

@@ -1520,7 +1519,6 @@ for Mavericks:
15201519
python2.7 configure.py -d /Library/Python/2.7/site-packages -b /usr/local/bin \
15211520
-e /usr/local/include -v /usr/local/share/sip --arch=x86_64 -s MacOSX10.9.sdk
15221521

1523-
15241522
continue...
15251523

15261524
Then continue with compilation and installation:
@@ -1560,7 +1558,7 @@ Save the qscintilla.pro file and build the QScintilla2 C++ library:
15601558
sudo make install
15611559

15621560
adjust the install_name_tool command for the version installed of QScintilla installed:
1563-
1561+
15641562
sudo install_name_tool -id /usr/local/lib/libqscintilla2.11.dylib \
15651563
/usr/local/lib/libqscintilla2.11.dylib
15661564

@@ -1646,7 +1644,7 @@ Then make again.
16461644
This will create the Qsci.so module in /Library/Python/2.x/site-packages/PyQt4.
16471645
Like PyQt, it needs help to not install in system locations.
16481646

1649-
Snow Leopard: substitute ‘2.6’ for Python version
1647+
Snow Leopard: substitute '2.6' for Python version
16501648

16511649
cd <QScintilla2 source dir>
16521650
cd Python

‎NEWS

Lines changed: 132 additions & 85 deletions
Large diffs are not rendered by default.

‎doc/INSTALL.html

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@
7777
<DIV CLASS="header" ID="header">
7878
<H1>QGIS</H1>
7979
<H2>Building QGIS from source - step by step</H2>
80-
<H3>Friday July 25, 2014</H3>
80+
<H3>Thursday October 23, 2014</H3>
8181
</DIV>
8282

8383
<DIV CLASS="body" ID="body">
8484
<P>
85-
Last Updated: Friday July 25, 2014
86-
Last Change : Friday July 25, 2014
85+
Last Updated: Thursday October 23, 2014
86+
Last Change : Sunday September 28, 2014
8787
</P>
8888
<DIV CLASS="toc">
8989

@@ -1669,7 +1669,7 @@ <H1>5. Building on MacOS X</H1>
16691669
some fiddling with the system. It is best to stick with a single, default,
16701670
architecture build and follow these instructions for an initial build.
16711671
Included are notes for building on Mac OS X 10.5 (<U>Leopard</U>), 10.6
1672-
(<U>Snow Leopard</U>), 10.7 (<U>Lion</U>) and 10.8 (<U>Mt. Lion</U>).
1672+
(<U>Snow Leopard</U>), 10.7 (<U>Lion</U>), 10.8 (<U>Mt. Lion</U>) and 10.9 (<U>Mavericks</U>)
16731673
(These names will be used throughout the instructions.)
16741674
Make sure to read each section completely before typing the first command you see.
16751675
</P>
@@ -2038,8 +2038,8 @@ <H3>5.4.4. Additional dependencies: Python</H3>
20382038
<H3>5.4.5. Additional dependencies: SIP</H3>
20392039

20402040
<P>
2041-
<U>Mt Lion note:</U> SIP 4.15.7 appears to not work on Mt Lion. Install 4.14.6.
2042-
(or a later working version when available)
2041+
<U>Mt Lion note:</U> SIP 4.15.7 appears to not work on Mt Lion. Install either
2042+
a prior version to 4.14.6 or a later version 4.16.3+
20432043
</P>
20442044
<P>
20452045
Retrieve the python bindings toolkit SIP from
@@ -2127,6 +2127,15 @@ <H3>5.4.5. Additional dependencies: SIP</H3>
21272127
-e /usr/local/include -v /usr/local/share/sip --arch=x86_64 -s MacOSX10.8.sdk
21282128
</PRE></div>
21292129

2130+
<P>
2131+
for Mavericks:
2132+
</P>
2133+
2134+
<div class="code"><PRE>
2135+
python2.7 configure.py -d /Library/Python/2.7/site-packages -b /usr/local/bin \
2136+
-e /usr/local/include -v /usr/local/share/sip --arch=x86_64 -s MacOSX10.9.sdk
2137+
</PRE></div>
2138+
21302139
<P>
21312140
<U>continue...</U>
21322141
</P>
@@ -2174,16 +2183,22 @@ <H3>5.4.6. Additional dependencies: QScintilla2</H3>
21742183
</PRE></div>
21752184

21762185
<P>
2177-
Save the qscintilla.pro file and build the QScintilla2 C++ library (adjust the install_name_tool command for the version installed):
2186+
Save the qscintilla.pro file and build the QScintilla2 C++ library:
21782187
</P>
21792188

21802189
<div class="code"><PRE>
21812190
qmake -spec macx-g++ qscintilla.pro
21822191
make -j [#cpus]
21832192
sudo make install
2193+
</PRE></div>
2194+
2195+
<P>
2196+
adjust the install_name_tool command for the version installed of QScintilla installed:
2197+
</P>
21842198

2185-
sudo install_name_tool -id /usr/local/lib/libqscintilla2.9.dylib \
2186-
/usr/local/lib/libqscintilla2.9.dylib
2199+
<div class="code"><PRE>
2200+
sudo install_name_tool -id /usr/local/lib/libqscintilla2.11.dylib \
2201+
/usr/local/lib/libqscintilla2.11.dylib
21872202
</PRE></div>
21882203

21892204
<P>
@@ -2272,7 +2287,7 @@ <H3>5.4.7. Additional dependencies: PyQt</H3>
22722287
</PRE></div>
22732288

22742289
<P>
2275-
<U>Lion and Mt. Lion system Python</U>
2290+
<U>Lion, Mt. Lion, and Mavericks system Python</U>
22762291
</P>
22772292
<P>
22782293
Similar to Snow Leopard, you should install outside the system Python path.

‎doc/news.html

Lines changed: 147 additions & 97 deletions
Large diffs are not rendered by default.

‎doc/news.t2t

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,52 @@ Change history for the QGIS Project
3838
Last Updated: %%date(%A %B %d, %Y)
3939
Last Change : %%mtime(%A %B %d, %Y)
4040

41-
= Whats new in Version 2.4.0 'Chugiak'? =
41+
= What's new in Version 2.6.0 'Brighton'? =
42+
43+
This is a minor release increment with the following new features:
44+
45+
- Improved DXF export
46+
- Project filename in project properties
47+
- Allow removing last point while measuring via del/backspace keys
48+
- Select related feature on the canvas from the relation reference widget
49+
- Editor widgets support null and other improvements
50+
- Optionally use just a subset of fields from the joined layer
51+
- Expression field (virtual fields)
52+
- Can toggle display of classes within graduated and categorised renderers
53+
- Additional expressions types and options
54+
- Added icon support to actions
55+
- Classes within graduated and categorised renderers can be toggled
56+
- Legend improvements such as filtering, layer management icons etc.
57+
- Control over hiding print composer items from prints/exports
58+
- Control over page printing for empty composer frames
59+
- New Composer Item tree panel
60+
- More control over appearance of composer arrow/line items
61+
- Data defined control of composer items
62+
- Composer images can be specifed as remote URLS
63+
- Composer Table improvements (header fonts / colors, better pagination support, filter to atlas feature etc.)
64+
- Composer improvements
65+
- Improved item snapping
66+
- Multiple overviews for a map item
67+
- HTML item improvements
68+
- Composer map grid improvements
69+
- Processing now has an online collection of models and scripts
70+
- Processing graphical modeller completely rewritten
71+
- API changes for QGIS widgets
72+
- Enhancements of searching with GetFeatureInfo request
73+
- Add a precision setting for GetFeatureInfo geometry attributes
74+
- Better random color choice
75+
- Symbology UI Improvements
76+
- Syntax highlighting code and expression editor
77+
- User defined color palettes
78+
- New color picker dialog
79+
- Single select feature tool merged into select by rectangle
80+
- Add layer to map canvas behavior
81+
- Support icon sizes of 48 and 64 pixels
82+
- New color buttons
83+
- Context menu for identify tool
84+
-
85+
86+
= What's new in Version 2.4.0 'Chugiak'? =
4287

4388
This is the minor release sports a number of great new features:
4489

‎doc/osx.t2t

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ from source and rather use frameworks wherever possible.
99
some fiddling with the system. It is best to stick with a single, default,
1010
architecture build and follow these instructions for an initial build.
1111
Included are notes for building on Mac OS X 10.5 (__Leopard__), 10.6
12-
(__Snow Leopard__), 10.7 (__Lion__) and 10.8 (__Mt. Lion__).
12+
(__Snow Leopard__), 10.7 (__Lion__), 10.8 (__Mt. Lion__) and 10.9 (__Mavericks__)
1313
(These names will be used throughout the instructions.)
1414
Make sure to read each section completely before typing the first command you see.
1515

@@ -296,8 +296,8 @@ your own risk.
296296

297297
=== Additional dependencies: SIP ===
298298

299-
__Mt Lion note:__ SIP 4.15.7 appears to not work on Mt Lion. Install 4.14.6.
300-
(or a later working version when available)
299+
__Mt Lion note:__ SIP 4.15.7 appears to not work on Mt Lion. Install either
300+
a prior version to 4.14.6 or a later version 4.16.3+
301301

302302
Retrieve the python bindings toolkit SIP from
303303

@@ -365,6 +365,15 @@ python2.7 configure.py -d /Library/Python/2.7/site-packages -b /usr/local/bin \
365365
-e /usr/local/include -v /usr/local/share/sip --arch=x86_64 -s MacOSX10.8.sdk
366366
```
367367

368+
for Mavericks:
369+
370+
```
371+
python2.7 configure.py -d /Library/Python/2.7/site-packages -b /usr/local/bin \
372+
-e /usr/local/include -v /usr/local/share/sip --arch=x86_64 -s MacOSX10.9.sdk
373+
```
374+
375+
376+
368377
__continue...__
369378

370379
Then continue with compilation and installation:
@@ -400,15 +409,19 @@ current line --> new line
400409
target.path = $$[QT_INSTALL_LIBS] --> target.path = /usr/local/lib
401410
header.path = $$[QT_INSTALL_HEADERS] --> header.path = /usr/local/include
402411
```
403-
Save the qscintilla.pro file and build the QScintilla2 C++ library (adjust the install_name_tool command for the version installed):
412+
Save the qscintilla.pro file and build the QScintilla2 C++ library:
404413

405414
```
406415
qmake -spec macx-g++ qscintilla.pro
407416
make -j [#cpus]
408417
sudo make install
418+
```
409419

410-
sudo install_name_tool -id /usr/local/lib/libqscintilla2.9.dylib \
411-
/usr/local/lib/libqscintilla2.9.dylib
420+
adjust the install_name_tool command for the version installed of QScintilla installed:
421+
422+
```
423+
sudo install_name_tool -id /usr/local/lib/libqscintilla2.11.dylib \
424+
/usr/local/lib/libqscintilla2.11.dylib
412425
```
413426

414427
This installs QScintilla2's dylib in /usr/local/lib/ and the header files in
@@ -476,7 +489,7 @@ python2.6 configure.py -d /Library/Python/2.6/site-packages -b /usr/local/bin \
476489
-n /usr/local/Qt4.8/qsci -v /usr/local/share/sip/PyQt4 --use-arch x86_64
477490
```
478491

479-
__Lion and Mt. Lion system Python__
492+
__Lion, Mt. Lion, and Mavericks system Python__
480493

481494
Similar to Snow Leopard, you should install outside the system Python path.
482495
But you don't need the use-arch option:

0 commit comments

Comments
 (0)
Please sign in to comment.