diff -Nru ntk-0.0.0+git20130822/.git/COMMIT_EDITMSG ntk-0.0.0+git20130824/.git/COMMIT_EDITMSG --- ntk-0.0.0+git20130822/.git/COMMIT_EDITMSG 1970-01-01 00:00:00.000000000 +0000 +++ ntk-0.0.0+git20130824/.git/COMMIT_EDITMSG 2013-08-24 03:03:32.000000000 +0000 @@ -0,0 +1,16 @@ +package tweaks +# Please enter the commit message for your changes. Lines starting +# with '#' will be ignored, and an empty message aborts the commit. +# On branch master +# Your branch is behind 'origin/master' by 2 commits, and can be fast-forwarded. +# +# Changes to be committed: +# (use "git reset HEAD ..." to unstage) +# +# deleted: ntk_gl.pc.in +# modified: wscript +# +# Untracked files: +# (use "git add ..." to include in what will be committed) +# +# debian/ diff -Nru ntk-0.0.0+git20130822/.git/FETCH_HEAD ntk-0.0.0+git20130824/.git/FETCH_HEAD --- ntk-0.0.0+git20130822/.git/FETCH_HEAD 2013-08-22 10:27:35.000000000 +0000 +++ ntk-0.0.0+git20130824/.git/FETCH_HEAD 2013-08-24 03:03:35.000000000 +0000 @@ -1,2 +1,2 @@ -d0063527aa360a3f1fd34e76fc0dd9125efb9202 branch 'master' of git://git.tuxfamily.org/gitroot/non/fltk +38275d616800d5af826fd4a9c761a98068e7311a branch 'master' of git://git.tuxfamily.org/gitroot/non/fltk 259307e6ada552b58eb66a0de91f174129b97aa5 not-for-merge branch 'cairo-device' of git://git.tuxfamily.org/gitroot/non/fltk diff -Nru ntk-0.0.0+git20130822/.git/ORIG_HEAD ntk-0.0.0+git20130824/.git/ORIG_HEAD --- ntk-0.0.0+git20130822/.git/ORIG_HEAD 2013-08-22 10:26:59.000000000 +0000 +++ ntk-0.0.0+git20130824/.git/ORIG_HEAD 2013-08-24 03:03:35.000000000 +0000 @@ -1 +1 @@ -81f41f5fed153f7f9aa5f7b845d7171f74919750 +9d98644b34148e4c5ee3db7037d869e58f0c0558 Binary files /tmp/FiXA6dcF3x/ntk-0.0.0+git20130822/.git/index and /tmp/wPbYgPsdxl/ntk-0.0.0+git20130824/.git/index differ diff -Nru ntk-0.0.0+git20130822/.git/logs/HEAD ntk-0.0.0+git20130824/.git/logs/HEAD --- ntk-0.0.0+git20130822/.git/logs/HEAD 2013-08-22 10:27:35.000000000 +0000 +++ ntk-0.0.0+git20130824/.git/logs/HEAD 2013-08-24 03:03:35.000000000 +0000 @@ -3,3 +3,5 @@ 5db6dfccef8b26076f2dc985ace462655c176c82 8ee564bef320b3561e204d17c1aa054311b2ce47 falkTX 1371199509 +0100 pull: Fast-forward 8ee564bef320b3561e204d17c1aa054311b2ce47 81f41f5fed153f7f9aa5f7b845d7171f74919750 falkTX 1374348670 +0100 pull: Fast-forward 81f41f5fed153f7f9aa5f7b845d7171f74919750 d0063527aa360a3f1fd34e76fc0dd9125efb9202 falkTX 1377167255 +0100 pull: Fast-forward +d0063527aa360a3f1fd34e76fc0dd9125efb9202 9d98644b34148e4c5ee3db7037d869e58f0c0558 falkTX 1377313406 +0100 commit: package tweaks +9d98644b34148e4c5ee3db7037d869e58f0c0558 867ff8d942752ddcb82b438f18353ed7eb2d5f1a falkTX 1377313415 +0100 pull: Merge made by the 'recursive' strategy. diff -Nru ntk-0.0.0+git20130822/.git/logs/refs/heads/master ntk-0.0.0+git20130824/.git/logs/refs/heads/master --- ntk-0.0.0+git20130822/.git/logs/refs/heads/master 2013-08-22 10:27:35.000000000 +0000 +++ ntk-0.0.0+git20130824/.git/logs/refs/heads/master 2013-08-24 03:03:35.000000000 +0000 @@ -3,3 +3,5 @@ 5db6dfccef8b26076f2dc985ace462655c176c82 8ee564bef320b3561e204d17c1aa054311b2ce47 falkTX 1371199509 +0100 pull: Fast-forward 8ee564bef320b3561e204d17c1aa054311b2ce47 81f41f5fed153f7f9aa5f7b845d7171f74919750 falkTX 1374348670 +0100 pull: Fast-forward 81f41f5fed153f7f9aa5f7b845d7171f74919750 d0063527aa360a3f1fd34e76fc0dd9125efb9202 falkTX 1377167255 +0100 pull: Fast-forward +d0063527aa360a3f1fd34e76fc0dd9125efb9202 9d98644b34148e4c5ee3db7037d869e58f0c0558 falkTX 1377313406 +0100 commit: package tweaks +9d98644b34148e4c5ee3db7037d869e58f0c0558 867ff8d942752ddcb82b438f18353ed7eb2d5f1a falkTX 1377313415 +0100 pull: Merge made by the 'recursive' strategy. diff -Nru ntk-0.0.0+git20130822/.git/logs/refs/remotes/origin/master ntk-0.0.0+git20130824/.git/logs/refs/remotes/origin/master --- ntk-0.0.0+git20130822/.git/logs/refs/remotes/origin/master 2013-08-22 10:26:59.000000000 +0000 +++ ntk-0.0.0+git20130824/.git/logs/refs/remotes/origin/master 2013-08-24 03:02:50.000000000 +0000 @@ -2,3 +2,4 @@ 5db6dfccef8b26076f2dc985ace462655c176c82 8ee564bef320b3561e204d17c1aa054311b2ce47 falkTX 1371199509 +0100 pull: fast-forward 8ee564bef320b3561e204d17c1aa054311b2ce47 81f41f5fed153f7f9aa5f7b845d7171f74919750 falkTX 1374348670 +0100 pull: fast-forward 81f41f5fed153f7f9aa5f7b845d7171f74919750 d0063527aa360a3f1fd34e76fc0dd9125efb9202 falkTX 1377167219 +0100 pull: fast-forward +d0063527aa360a3f1fd34e76fc0dd9125efb9202 38275d616800d5af826fd4a9c761a98068e7311a falkTX 1377313370 +0100 pull: fast-forward Binary files /tmp/FiXA6dcF3x/ntk-0.0.0+git20130822/.git/objects/02/7420262532751efdb98053be08ebe068725a87 and /tmp/wPbYgPsdxl/ntk-0.0.0+git20130824/.git/objects/02/7420262532751efdb98053be08ebe068725a87 differ Binary files /tmp/FiXA6dcF3x/ntk-0.0.0+git20130822/.git/objects/2a/58954421b39378723f562bb8c37c7e4d04b653 and /tmp/wPbYgPsdxl/ntk-0.0.0+git20130824/.git/objects/2a/58954421b39378723f562bb8c37c7e4d04b653 differ diff -Nru ntk-0.0.0+git20130822/.git/objects/38/275d616800d5af826fd4a9c761a98068e7311a ntk-0.0.0+git20130824/.git/objects/38/275d616800d5af826fd4a9c761a98068e7311a --- ntk-0.0.0+git20130822/.git/objects/38/275d616800d5af826fd4a9c761a98068e7311a 1970-01-01 00:00:00.000000000 +0000 +++ ntk-0.0.0+git20130824/.git/objects/38/275d616800d5af826fd4a9c761a98068e7311a 2013-08-24 03:02:50.000000000 +0000 @@ -0,0 +1 @@ +xAj0E)1#㱠Bv9H5.ddqr>Z^~8ǮB +:tWS[GSQp5uy8=cZ|c{_|$` \ No newline at end of file Binary files /tmp/FiXA6dcF3x/ntk-0.0.0+git20130822/.git/objects/9d/98644b34148e4c5ee3db7037d869e58f0c0558 and /tmp/wPbYgPsdxl/ntk-0.0.0+git20130824/.git/objects/9d/98644b34148e4c5ee3db7037d869e58f0c0558 differ Binary files /tmp/FiXA6dcF3x/ntk-0.0.0+git20130822/.git/objects/b1/216eb0bf5b4bf07973df0320072816e0cfa3bf and /tmp/wPbYgPsdxl/ntk-0.0.0+git20130824/.git/objects/b1/216eb0bf5b4bf07973df0320072816e0cfa3bf differ Binary files /tmp/FiXA6dcF3x/ntk-0.0.0+git20130822/.git/objects/b9/58e5980ee4c4e853091cb5217629932444a8bc and /tmp/wPbYgPsdxl/ntk-0.0.0+git20130824/.git/objects/b9/58e5980ee4c4e853091cb5217629932444a8bc differ Binary files /tmp/FiXA6dcF3x/ntk-0.0.0+git20130822/.git/objects/d4/688523279e05fc0ffb6dca7a32d68df0175c21 and /tmp/wPbYgPsdxl/ntk-0.0.0+git20130824/.git/objects/d4/688523279e05fc0ffb6dca7a32d68df0175c21 differ Binary files /tmp/FiXA6dcF3x/ntk-0.0.0+git20130822/.git/objects/e1/542f4d59a678dede50ef2117b8cc41821a1a7c and /tmp/wPbYgPsdxl/ntk-0.0.0+git20130824/.git/objects/e1/542f4d59a678dede50ef2117b8cc41821a1a7c differ diff -Nru ntk-0.0.0+git20130822/.git/objects/e8/26e0c34ecdf3cb30cbb17a6fc9fab51f1cac0d ntk-0.0.0+git20130824/.git/objects/e8/26e0c34ecdf3cb30cbb17a6fc9fab51f1cac0d --- ntk-0.0.0+git20130822/.git/objects/e8/26e0c34ecdf3cb30cbb17a6fc9fab51f1cac0d 1970-01-01 00:00:00.000000000 +0000 +++ ntk-0.0.0+git20130824/.git/objects/e8/26e0c34ecdf3cb30cbb17a6fc9fab51f1cac0d 2013-08-24 03:03:26.000000000 +0000 @@ -0,0 +1 @@ +x+)JMU02f040031QK,L/JeX&&^\}qn%67grsvu a؜Ư/h-~? ϝa{´3.xj Wϐ`O9^JN5G=!ʾ䑉(0G,0ݼ1Lb@$}K2Cb X8ȿ,YBQ|zEm8p;Z_r$=X|j`ڳau׾ҥv]r-_~ E ~ x[qT'6[CdKRK5Fz{a'kk﯍^PT<1{yIMu] ]uGyqrQfA C(fVwi7-L\M_0? \ No newline at end of file diff -Nru ntk-0.0.0+git20130822/.git/objects/f7/0a8ecbf16a7f3483fe4c1c401736a0bbc9a920 ntk-0.0.0+git20130824/.git/objects/f7/0a8ecbf16a7f3483fe4c1c401736a0bbc9a920 --- ntk-0.0.0+git20130822/.git/objects/f7/0a8ecbf16a7f3483fe4c1c401736a0bbc9a920 1970-01-01 00:00:00.000000000 +0000 +++ ntk-0.0.0+git20130824/.git/objects/f7/0a8ecbf16a7f3483fe4c1c401736a0bbc9a920 2013-08-24 03:02:50.000000000 +0000 @@ -0,0 +1 @@ +x[NB1@*fL 1L |۩\\Kt[3y@>>Y>{(%IÒIbYZ0q"1@,n+dc1d)h9$B2r6kҏRaڬNO: U#XCahѮw$۷'7=ȻLu0-L} \ No newline at end of file diff -Nru ntk-0.0.0+git20130822/.git/refs/heads/master ntk-0.0.0+git20130824/.git/refs/heads/master --- ntk-0.0.0+git20130822/.git/refs/heads/master 2013-08-22 10:27:35.000000000 +0000 +++ ntk-0.0.0+git20130824/.git/refs/heads/master 2013-08-24 03:03:35.000000000 +0000 @@ -1 +1 @@ -d0063527aa360a3f1fd34e76fc0dd9125efb9202 +867ff8d942752ddcb82b438f18353ed7eb2d5f1a diff -Nru ntk-0.0.0+git20130822/.git/refs/remotes/origin/master ntk-0.0.0+git20130824/.git/refs/remotes/origin/master --- ntk-0.0.0+git20130822/.git/refs/remotes/origin/master 2013-08-22 10:26:59.000000000 +0000 +++ ntk-0.0.0+git20130824/.git/refs/remotes/origin/master 2013-08-24 03:02:50.000000000 +0000 @@ -1 +1 @@ -d0063527aa360a3f1fd34e76fc0dd9125efb9202 +38275d616800d5af826fd4a9c761a98068e7311a diff -Nru ntk-0.0.0+git20130822/debian/changelog ntk-0.0.0+git20130824/debian/changelog --- ntk-0.0.0+git20130822/debian/changelog 2013-08-22 10:28:14.000000000 +0000 +++ ntk-0.0.0+git20130824/debian/changelog 2013-08-24 03:05:45.000000000 +0000 @@ -1,4 +1,4 @@ -ntk (0.0.0+git20130822-0~precise1) precise; urgency=low +ntk (0.0.0+git20130824-0~precise1) precise; urgency=low * New Git (scripted) diff -Nru ntk-0.0.0+git20130822/src/Fl_Cairo_Graphics_Driver.cxx ntk-0.0.0+git20130824/src/Fl_Cairo_Graphics_Driver.cxx --- ntk-0.0.0+git20130822/src/Fl_Cairo_Graphics_Driver.cxx 2013-05-01 01:32:01.000000000 +0000 +++ ntk-0.0.0+git20130824/src/Fl_Cairo_Graphics_Driver.cxx 2013-08-24 03:03:35.000000000 +0000 @@ -102,7 +102,7 @@ static double lw = 1; static double hlw; -static cairo_antialias_t aa = CAIRO_ANTIALIAS_GRAY; +//static cairo_antialias_t aa = CAIRO_ANTIALIAS_GRAY; static int npoints = 0; @@ -167,8 +167,6 @@ void Fl_Cairo_Graphics_Driver::pop_matrix ( void ) { - cairo_t *cr = Fl::cairo_cc(); - if (sptr==0) Fl::error("fl_pop_matrix(): matrix stack underflow."); else @@ -179,7 +177,6 @@ void Fl_Cairo_Graphics_Driver::translate ( double x, double y ) { - cairo_t *cr = Fl::cairo_cc(); cairo_matrix_translate( &m, x, y ); set_cairo_matrix(); @@ -187,7 +184,6 @@ void Fl_Cairo_Graphics_Driver::scale ( double x, double y ) { - cairo_t *cr = Fl::cairo_cc(); cairo_matrix_scale( &m, x, y ); set_cairo_matrix(); @@ -195,7 +191,6 @@ void Fl_Cairo_Graphics_Driver::rotate ( double a ) { - cairo_t *cr = Fl::cairo_cc(); cairo_matrix_rotate( &m, a * ( M_PI / 180.0 ) ); set_cairo_matrix(); @@ -203,8 +198,6 @@ void Fl_Cairo_Graphics_Driver::mult_matrix ( double a, double b, double c, double d, double x, double y ) { - cairo_t *cr = Fl::cairo_cc(); - cairo_matrix_t m2; cairo_matrix_init( &m2, a, b, c, d, x, y ); @@ -303,8 +296,6 @@ void fl_set_antialias ( int v ) { - cairo_t *cr = Fl::cairo_cc(); - switch ( v ) { case FL_ANTIALIAS_DEFAULT: @@ -918,7 +909,7 @@ cairo_t *cr = Fl::cairo_cc(); - cairo_format_t fmt; + cairo_format_t fmt = CAIRO_FORMAT_ARGB32; switch (img->d() ) { diff -Nru ntk-0.0.0+git20130822/src/vsnprintf.c ntk-0.0.0+git20130824/src/vsnprintf.c --- ntk-0.0.0+git20130822/src/vsnprintf.c 2013-05-01 01:32:01.000000000 +0000 +++ ntk-0.0.0+git20130824/src/vsnprintf.c 2013-08-24 03:03:35.000000000 +0000 @@ -26,6 +26,8 @@ */ #include +#include +#include #include "flstring.h" #ifdef HAVE_SYS_STDTYPES_H diff -Nru ntk-0.0.0+git20130822/wscript ntk-0.0.0+git20130824/wscript --- ntk-0.0.0+git20130822/wscript 2013-08-22 10:27:59.000000000 +0000 +++ ntk-0.0.0+git20130824/wscript 2013-08-24 03:03:35.000000000 +0000 @@ -78,9 +78,9 @@ conf.load('gnu_dirs') # conf.load('ntk_fluid') conf.line_just = 52 - conf.env.append_value('CFLAGS', ['-Wall', '-ansi','-pedantic']) + conf.env.append_value('CFLAGS', ['-Wall']) # conf.env.append_value('CXXFLAGS',['-Wall','-fno-exceptions', '-fno-rtti']) - conf.env.append_value('CXXFLAGS', ['-Wall', '-ansi','-pedantic']) + conf.env.append_value('CXXFLAGS', ['-Wall']) conf.check_cfg(package='x11', uselib_store='X11', args="--cflags --libs", mandatory=True)