From b04a0494cb3fd392da6a5bc98f6b356e6e9044a8 Mon Sep 17 00:00:00 2001 From: Andrew Benton Date: Sat, 10 Mar 2012 16:51:39 +0000 Subject: [PATCH] gtk+-2.24.10 git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@9666 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- general.ent | 4 +- introduction/welcome/changelog.xml | 5 +- x/lib/gtk+2.xml | 313 ++++++++++++++++------------- 3 files changed, 179 insertions(+), 143 deletions(-) diff --git a/general.ent b/general.ent index c006d3e8ff..8e5c826bbf 100644 --- a/general.ent +++ b/general.ent @@ -176,7 +176,6 @@ $Date$ - @@ -599,7 +598,6 @@ $Date$ - @@ -607,7 +605,7 @@ $Date$ - + diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index 54be87bd0a..2030446a9a 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -47,6 +47,9 @@ [rthomsen] - upgrade to kdeadmin 4.8.1 + + [abenton] - Gtk+-2.24.10 + @@ -56,7 +59,7 @@ [rthomsen] - upgrade to kdemultimedia 4.8.1 - + [rthomsen] - added taglib 1.7 diff --git a/x/lib/gtk+2.xml b/x/lib/gtk+2.xml index b262d7ed1b..ffec229afe 100644 --- a/x/lib/gtk+2.xml +++ b/x/lib/gtk+2.xml @@ -4,12 +4,14 @@ %general-entities; - - - - - - + + + + + + ]> @@ -20,159 +22,171 @@ $Date$ - gtk+->k2-version; + Gtk+->k2-version; gtk2 - Introduction to gtk+-2 + Introduction to Gtk+-2 - The gtk+-2 package contains - gtk+-2 libraries. These are useful - for creating graphical user interfaces for applications. + + The Gtk+-2 package contains + |Gtk+-2 libraries. These are useful for + creating graphical user interfaces for applications. + &lfs71_checked; Package Information - Download (HTTP): + + Download (HTTP): + - Download (FTP): + + Download (FTP): + - Download MD5 sum: >k2-md5sum; + + Download MD5 sum: >k2-md5sum; + - Download size: >k2-size; + + Download size: >k2-size; + - Estimated disk space required: >k2-buildsize; + + Estimated disk space required: >k2-buildsize; + - Estimated build time: >k2-time; + + Estimated build time: >k2-time; + - gtk+-2 Dependencies + Gtk+-2 Dependencies Required - (compiled with libX11 - support), , the - (specifically, libX11, libXext and - libXrender), and + + (compiled with libX11 support), + , + the (specifically, libX11, libXext and + libXrender), + and + + Recommended - + + + Optional - , - , - - - - and - . - - User Notes: - + + , + , + + + + and + . + + + User Notes: + - Installation of gtk+-2 + Installation of Gtk+-2 - Install gtk+-2 by running - the following commands: + + Install Gtk+-2 by running the following + commands: + -sed -i -e '/db2html/i@HAVE_DOCBOOK_TRUE@\t mkdir gtk-tut; ' \ - -e '/gtk-tut html/i@HAVE_DOCBOOK_TRUE@\t mv *.html gtk-tut; ' \ - docs/tutorial/Makefile.in && - -sed -i -e '/db2html/i@HAVE_DOCBOOK_TRUE@\t mkdir gtk-faq; ' \ - -e '/gtk-faq html/i@HAVE_DOCBOOK_TRUE@\t mv *.html gtk-faq;' \ - docs/faq/Makefile.in && - -sed -i -e 's#^\( gtk_icon_view_\)l#\1queue_l#' gtk/gtkiconview.c && - -./configure --prefix=/usr --sysconfdir=/etc && +sed -i 's#l \(gtk-.*\).sgml#& -o \1#' docs/{faq,tutorial}/Makefile.in && +sed -i 's#.*@man_#man_#' docs/reference/gtk/Makefile.in && +./configure --prefix=/usr --sysconfdir=/etc && make - To test the results, issue: make check. Note that - you must run the tests from a session with X Window Display capability - (i.e., not a text-based terminal/console) as the tests attempt to open an X - window, and the tests can take an excessively long time. Using an X Window, - the tests should take less than .3 SBUs + + To test the results, issue: make check. Note that you + must run the tests from a session with X Window Display capability (i.e., + not a text-based terminal/console) as the tests attempt to open an X + window, and the tests can take an excessively long time. Using an X + Window, the tests should take less than 0.3 SBUs + - Now, as the root user: + + Now, as the root user: + -make install && -sed -i 's/#man_MANS/man_MANS/' docs/reference/gtk/Makefile && -make -C docs/reference/gtk install-man && - -install -v -m755 -d /usr/share/doc/gtk+->k2-version; && +make install && +mkdir -pv /usr/share/doc/gtk+->k2-version; && cp -v -R docs/faq/html /usr/share/doc/gtk+->k2-version;/faq && cp -v -R docs/tutorial/html /usr/share/doc/gtk+->k2-version;/tutorial && install -v -m644 docs/*.txt /usr/share/doc/gtk+->k2-version; - - - If you installed the package on to your system using a - DESTDIR method two important files were not installed and - must be copied and/or generated. Generate them using the following - commands as the root - user: + + + If you installed the package on to your system using a + DESTDIR method two important files were not installed and + must be copied and/or generated. Generate them using the following + commands as the root user: + gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders && gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules - - - + Command Explanations - sed -i '/db2html/i@HAVE_DOCBOOK...: If you have - installed (specifically, if configure finds - db2html) then it will try to use it to rebuild some of it's html - documentation and fail due to bugs in some of the Makefiles. These seds fix - the Makefiles. + + sed -i 's#l \(gtk-.*\).sgml#& -o \1#' + docs/{faq,tutorial}/Makefile.in: If you have + installed (specifically, if configure + finds db2html) then it will try to use it to rebuild some of it's html + documentation and fail due to bugs in some of the Makefiles. This sed + fixes the Makefiles. + - sed -i...gtk/gtkiconview.c: This fixes a bug in - gtk+-2.24.8 that makes some applications (eg, lxappearance) crash. - - --sysconfdir=/etc: This switch installs the - configuration files into /etc - instead of /usr/etc. - - sed -i 's/#man_MANS... and - make -C docs...install-man these commands install the - man pages for gtk-builder-convert, gtk-query-immodules-2.0 and - gtk-update-icon-cache. - - : This switch will rebuild - the API documentation during the make command. Ensure - you really want to rebuild this documentation (and end up with what is - already shipped in the source tree) as it takes a very long time. + + sed -i 's#.*@man_#man_#' + docs/reference/gtk/Makefile.in: this sed fixes one of the + Makefiles so it installs the man pages for + gtk-builder-convert, gtk-query-immodules-2.0 and gtk-update-icon-cache. + + - Configuring gtk+-2 + Configuring Gtk+-2 Config Files - ~/.gtkrc-2.0 and - /etc/gtk-2.0/gtkrc + + ~/.gtkrc-2.0 and + /etc/gtk-2.0/gtkrc + ~/.gtkrc-2.0 @@ -185,24 +199,33 @@ gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules Configuration Information - Gtk themes change the way a gtk application looks. A Gtk icon theme - can be used to change the icons that appear on the application's - toolbar. If you have installed a Gtk theme or a Gtk icon theme (such as - ) you can set your prefences in - ~/.gtkrc-2.0: + + Gtk themes change the way a gtk application looks. A Gtk icon theme can + be used to change the icons that appear on the application's toolbar. + If you have installed a Gtk theme (such as + gnome-themes + (requires )) or a Gtk icon theme (such as + ) you can set your preferences in + ~/.gtkrc-2.0: + cat > ~/.gtkrc-2.0 << "EOF" include "/usr/share/themes/Glider/gtk-2.0/gtkrc" gtk-icon-theme-name = "hicolor" EOF - There are many more themes available at - Gnome-Look.org and other - places. + + There are many more themes available at + Gnome-Look.org and other + places. + - Once you've settled on themes you like, you can (as the - root user) make them the - default system wide: + + Once you've settled on themes you like, you can (as the + root user) make them the + default system wide: + cat > /etc/gtk-2.0/gtkrc << "EOF" include "/usr/share/themes/Clearlooks/gtk-2.0/gtkrc" @@ -210,12 +233,11 @@ gtk-icon-theme-name = "elementary" EOF - - LXAppearance is a gtk+-2 application that can help you choose the - themes you like. - + + LXAppearance is a Gtk+-2 application + that can help you choose the themes you like. + - @@ -227,21 +249,27 @@ EOF Installed Directories - gtk-builder-convert, gtk-demo, gtk-query-immodules-2.0, and - gtk-update-icon-cache - libpixmap.so, im-am-et.so, im-cedilla.so, im-cyrillic-translit.so, - im-inuktitut.so, im-ipa.so, im-multipress.so, im-thai.so, im-ti-er.so, - im-ti-et.so, im-viqr.so, im-xim.so, libprintbackend-cups.so - libprintbackend-file.so, libprintbackend-lpr.so, - libferret.so, libgail.so, libgailutil.so, libgdk-x11-2.0.so and - libgtk-x11-2.0.so - /etc/gtk-2.0, /usr/include/gail-1.0, - /usr/include/gtk-2.0, /usr/include/gtk-unix-print-2.0}, - /usr/lib/gtk-2.0, /usr/share/doc/gtk+->k2-version;, - /usr/share/gtk-doc/html/gail-libgail-util, - /usr/share/gtk-doc/html/gdk-pixbuf, /usr/share/gtk-doc/html/gtk, - /usr/share/themes/Default, /usr/share/themes/Emacs and - /usr/share/themes/Raleigh + + gtk-builder-convert, gtk-demo, gtk-query-immodules-2.0 and + gtk-update-icon-cache + + + libpixmap.so, im-am-et.so, im-cedilla.so, im-cyrillic-translit.so, + im-inuktitut.so, im-ipa.so, im-multipress.so, im-thai.so, im-ti-er.so, + im-ti-et.so, im-viqr.so, im-xim.so, libprintbackend-cups.so + libprintbackend-file.so, libprintbackend-lpr.so, + libferret.so, libgail.so, libgailutil.so, libgdk-x11-2.0.so and + libgtk-x11-2.0.so + + + /etc/gtk-2.0, /usr/include/gail-1.0, /usr/include/gtk-2.0, + /usr/include/gtk-unix-print-2.0, /usr/lib/gtk-2.0, + /usr/share/doc/gtk+->k2-version;, + /usr/share/gtk-doc/html/gail-libgail-util, + /usr/share/gtk-doc/html/gdk-pixbuf, /usr/share/gtk-doc/html/gtk, + /usr/share/themes/Default, /usr/share/themes/Emacs and + /usr/share/themes/Raleigh + @@ -253,8 +281,10 @@ EOF gtk-builder-convert - converts glade files into XML files which can be loaded with - GtkBuilder. + + converts glade files into XML files which can be loaded with + GtkBuilder. + gtk-builder-convert @@ -265,8 +295,10 @@ EOF gtk-demo - demonstrates gtk+-2 functionality and - provides code for the examples. + + demonstrates Gtk+-2 functionality and + provides code for the examples. + gtk-demo @@ -277,8 +309,10 @@ EOF gtk-query-immodules-2.0 - collects information about loadable input method modules for - gtk+-2 and writes it to standard output. + + collects information about loadable input method modules for + Gtk+-2 and writes it to standard output. + gtk-query-immodules-2.0 @@ -289,7 +323,9 @@ EOF gtk-update-icon-cache - creates mmap()able cache files for icon themes. + + creates mmap()able cache files for icon themes. + gtk-update-icon-cache @@ -297,17 +333,16 @@ EOF - gtk+-2 Libraries + Gtk+-2 Libraries - provide an API to implement graphical user interfaces. + + provide an API to implement graphical user interfaces. + - gtk+-2 Libraries + Gtk+-2 Libraries - - -