From d6101558a171dbd2390792ac1e78d09fc2c27711 Mon Sep 17 00:00:00 2001 From: James Cook Date: Mon, 6 Jul 2009 21:58:04 +0000 Subject: Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also UI color refactoring and new FreeType font library on Linux. svn merge -r126038:126164 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5 --- install.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'install.xml') diff --git a/install.xml b/install.xml index 1b3c34737c..77279c57c1 100644 --- a/install.xml +++ b/install.xml @@ -435,9 +435,9 @@ linux md5sum - eeffb03bd6672b6e7751448e5306d874 + 978ad7c67fe4a2419bfc841e2956ff9f url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.1.5-linux-20081201.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.3.9-linux-20090521c.tar.bz2 linux64 -- cgit v1.2.3 From 541e0b1dfce8ecffdaaf444f0e0ae02ca28c9323 Mon Sep 17 00:00:00 2001 From: Adam Moss Date: Tue, 7 Jul 2009 10:23:45 +0000 Subject: cherrypicking the fix for linux startup issue DEV-33209 - the bug has percolated around for so long without the fix that I can't stand it any longer. svn merge -c123659 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-viewer/maint-viewer-15-sandbox-3 --- install.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'install.xml') diff --git a/install.xml b/install.xml index 77279c57c1..6be876bc09 100644 --- a/install.xml +++ b/install.xml @@ -1351,9 +1351,9 @@ anguage Infrstructure (CLI) international standard linux md5sum - 80ee8d5a30563ce0f55d37fed6dfc744 + 1804b54034ef7f82832506a44acb06b8 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/zlib-1.2.3-linux-20090417.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/zlib-1.2.3-linux-20090603.tar.bz2 linux64 -- cgit v1.2.3 From 0274c1f2b16e571a0cc6295d1f3073b136210a7c Mon Sep 17 00:00:00 2001 From: Mark Palange Date: Thu, 16 Jul 2009 17:54:58 +0000 Subject: Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2. merged all changes, post copy, from the following branches: linden/brachnes/enable-o-v user/cg/qar-1538 user/mani/viewer2-enable-o-v --- install.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'install.xml') diff --git a/install.xml b/install.xml index 6be876bc09..dd50191507 100644 --- a/install.xml +++ b/install.xml @@ -207,30 +207,30 @@ darwin md5sum - 081ef195a856c708cc473c4421b4b290 + 6be5bca5f4b031b1b79824da5cfd4ddf url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.34.1-darwin-20090223.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.34.1-darwin-20090702a.tar.bz2 linux md5sum - b516a8576ecad0f957db7fc2cd972aac + 113ca35011c916660a8aa55bc1ca462a url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.34.1-linux-20090223a.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.34.1-linux-20090702.tar.bz2 linux64 md5sum - 6db62bb7f141b3a1b3107e1f9aad0eb0 + 270f64d3aa416cec96f445d58dfcfb6d url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.34.1-linux64-20090223a.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.34.1-linux64-20090702.tar.bz2 windows md5sum - 3b56fe9e8d2975c612639d0a5370ffe7 + 44d4fdf386742b94419c93ad2baa1616 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.34.1-windows-20090225.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.34.1-windows-20090702.tar.bz2 -- cgit v1.2.3 From 134f394c25c8e89116bbc7a2d19f72f2fe93ca7a Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Mon, 3 Aug 2009 18:50:35 -0700 Subject: New boost packages for windows and os x. Combines the Boost.Coroutine changes in old login-api with the -Woverloaded-virtuals changes in viewer-2.0.0-3. --- install.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'install.xml') diff --git a/install.xml b/install.xml index 07a6d75b30..7cb81d09c6 100644 --- a/install.xml +++ b/install.xml @@ -207,9 +207,9 @@ darwin md5sum - 6be5bca5f4b031b1b79824da5cfd4ddf + a25595e9fccdba35d8e27854db4e7bc5 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.34.1-darwin-20090702a.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.34.1-darwin-20090803.tar.bz2 linux @@ -228,9 +228,9 @@ windows md5sum - 44d4fdf386742b94419c93ad2baa1616 + 76a436d78f34286a7d13faca5f522f6b url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.34.1-windows-20090702.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.34.1-windows-20090803.tar.bz2 -- cgit v1.2.3 From 945656147ccdca0557c5096c933817e5fd803344 Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Tue, 4 Aug 2009 14:29:30 -0700 Subject: New linux packages for linux and linux64. Combines the Boost.Coroutine changes in old login-api with the -Woverloaded-virtuals changes in viewer-2.0.0-3. I could not verify the 64 bit build for now, as other breakage is getting in the way... --- install.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'install.xml') diff --git a/install.xml b/install.xml index 7cb81d09c6..02d9625a2a 100644 --- a/install.xml +++ b/install.xml @@ -214,16 +214,16 @@ linux md5sum - 113ca35011c916660a8aa55bc1ca462a + 8fb4151b883b5f5d2b12da19a6ff8e7d url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.34.1-linux-20090702.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.34.1-linux-20090804.tar.bz2 linux64 md5sum - 270f64d3aa416cec96f445d58dfcfb6d + 77237f33b1740daef0dc1e6c801f68e1 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.34.1-linux64-20090702.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.34.1-linux64-20090804.tar.bz2 windows -- cgit v1.2.3 From 03ebc43132331b9a8dcb3c418ec9c319a6beddda Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 5 Aug 2009 16:08:17 -0400 Subject: DEV-34837: Remove dependency on Leopard-only /usr/local/lib/libexpat.0.1.0.dylib. On Mac, add libexpat[.0.5.0].dylib to apr_suite package. Update libapr-1[.0.3.7].dylib and libaprutil-1[.0.3.8].dylib with versions that reference this expat. Make viewer_manifiest.py copy expat dylib to app bundle. --- install.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'install.xml') diff --git a/install.xml b/install.xml index df92a5d799..e514f3b496 100644 --- a/install.xml +++ b/install.xml @@ -85,9 +85,9 @@ darwin md5sum - 30e3b60d596801a4f4c74c56ece059dc + 115d8ac44a91efdb173e9b3e478c46b6 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.3.7-darwin-20090731.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.3.7-darwin-20090805.tar.bz2 linux @@ -340,9 +340,9 @@ darwin md5sum - 9c5603e328e9f543e0a599d6b25be973 + c457a0a041ac4946265889a503d26c3d url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/expat-1.95.8-darwin-20080812.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/expat-1.95.8-darwin-20090805.tar.bz2 linux -- cgit v1.2.3 From 2d32f4779c523d082b7fcd71fa01cf69ed0b4565 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 5 Aug 2009 21:36:32 -0400 Subject: DEV-34837: The problem with prepackaging library headers is that changes in different branches must be manually merged. Here I've applied the Linden patch to boost::coroutines found in http://svn.lindenlab.com/svn/lindenlib/trunk/boost_1_34_1/boost-coroutine-linden.patch and rebuilt the Mac boost package. --- install.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'install.xml') diff --git a/install.xml b/install.xml index 9fa02628c7..aeed2b76a9 100644 --- a/install.xml +++ b/install.xml @@ -207,9 +207,9 @@ darwin md5sum - a25595e9fccdba35d8e27854db4e7bc5 + 74f3a765644927c93fa3bc7acc730552 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.34.1-darwin-20090803.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.34.1-darwin-20090805.tar.bz2 linux -- cgit v1.2.3