aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDavid Seikel2011-03-03 07:27:08 +1000
committerDavid Seikel2011-03-03 07:27:08 +1000
commit957c32e37e35aef3ece3bc919b6a17323153d5fc (patch)
treeb523a3b5bef5cf1bfe7744fca518b447aabd1a82
parentMerge branch 'branding' into weekly (diff)
downloadmeta-impy-957c32e37e35aef3ece3bc919b6a17323153d5fc.zip
meta-impy-957c32e37e35aef3ece3bc919b6a17323153d5fc.tar.gz
meta-impy-957c32e37e35aef3ece3bc919b6a17323153d5fc.tar.bz2
meta-impy-957c32e37e35aef3ece3bc919b6a17323153d5fc.tar.xz
Added pixman to the "use system GTK+" list of things to remove.
-rwxr-xr-xlinden/scripts/linux/2-trim-libraries-from-SL5
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/scripts/linux/2-trim-libraries-from-SL b/linden/scripts/linux/2-trim-libraries-from-SL
index f86f0d8..b6fcf06 100755
--- a/linden/scripts/linux/2-trim-libraries-from-SL
+++ b/linden/scripts/linux/2-trim-libraries-from-SL
@@ -61,9 +61,9 @@ fi
61# Let's use the system GTK+ if available: 61# Let's use the system GTK+ if available:
62if check $USE_SYSTEM_GTK /usr/include/atk-1.0/atk/atk.h "GTK+" ; then 62if check $USE_SYSTEM_GTK /usr/include/atk-1.0/atk/atk.h "GTK+" ; then
63 cd $PATH_TO_SOURCES/libraries/x86_64-linux/lib_release_client 63 cd $PATH_TO_SOURCES/libraries/x86_64-linux/lib_release_client
64 rm -f libgtk* libgdk* libglib* libgmodule* libgobject* libgthread* libpango* libatk* 64 rm -f libgtk* libgdk* libglib* libgmodule* libgobject* libgthread* libpango* libatk* libpixman*
65 cd ../include 65 cd ../include
66 rm -rf atk-1.0/ gtk-2.0/ glib-2.0/ pango-1.0/ 66 rm -rf atk-1.0/ gtk-2.0/ glib-2.0/ pango-1.0/ pixman-1/
67 cp -a /usr/include/atk-1.0 . 67 cp -a /usr/include/atk-1.0 .
68 cp -a /usr/include/gtk-2.0 . 68 cp -a /usr/include/gtk-2.0 .
69 cp -a /usr/lib/gtk-2.0/include/* gtk-2.0/ 69 cp -a /usr/lib/gtk-2.0/include/* gtk-2.0/
@@ -85,6 +85,7 @@ if check $USE_SYSTEM_GTK /usr/include/atk-1.0/atk/atk.h "GTK+" ; then
85 update_manifest libgobject 85 update_manifest libgobject
86 update_manifest libgthread 86 update_manifest libgthread
87 update_manifest libpango 87 update_manifest libpango
88 update_manifest libpixman
88fi 89fi
89 90
90# Let's use the system zlib if available: 91# Let's use the system zlib if available: