[library-web] Remove gtk/gdk modules, as there is now gtk2/gdk2 and gtk3/gdk3



commit 3922d30b8e6e3fd3be0ef34e423138514efff793
Author: FrÃdÃric PÃters <fpeters 0d be>
Date:   Fri Dec 7 12:48:33 2012 +0100

    Remove gtk/gdk modules, as there is now gtk2/gdk2 and gtk3/gdk3

 data/extra-tarballs     |    5 -----
 data/overlay.xml.in     |    4 ++--
 data/xslt/html2html.xsl |    9 +++++++++
 src/defaults.lgorc      |    2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/data/extra-tarballs b/data/extra-tarballs
index d3179d0..fe447cd 100644
--- a/data/extra-tarballs
+++ b/data/extra-tarballs
@@ -1,8 +1,3 @@
-# those are old versions required for LSB
-ftp://ftp.gtk.org/pub/gtk/v2.6/atk-1.9.0.tar.bz2
-ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-2.6.10.tar.bz2
-ftp://ftp.gtk.org/pub/gtk/v2.6/glib-2.6.6.tar.bz2
-ftp://ftp.gtk.org/pub/gtk/v2.6/pango-1.8.2.tar.bz2
 # GNOME external dependencies
 http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.88.tar.gz
 http://cairographics.org/releases/cairo-1.6.4.tar.gz
diff --git a/data/overlay.xml.in b/data/overlay.xml.in
index 688c108..d7230c6 100644
--- a/data/overlay.xml.in
+++ b/data/overlay.xml.in
@@ -179,7 +179,7 @@
       </_abstract>
       <extra-devel-releases>2.90</extra-devel-releases>
     </document>
-    <document doc_module="gdk" channel="devel" weight="0.88">
+    <document doc_module="gdk2" channel="devel" weight="0.88">
       <category>api-base</category>
       <subsection>api-ui</subsection>
       <_abstract>
@@ -199,7 +199,7 @@
       </_abstract>
       <extra-devel-releases>2.90</extra-devel-releases>
     </document>
-    <document doc_module="gtk" channel="devel" weight="0.87">
+    <document doc_module="gtk2" channel="devel" weight="0.87">
       <category>api-base</category>
       <subsection>api-ui</subsection>
       <_abstract>
diff --git a/data/xslt/html2html.xsl b/data/xslt/html2html.xsl
index 3ed6762..d4af155 100644
--- a/data/xslt/html2html.xsl
+++ b/data/xslt/html2html.xsl
@@ -243,6 +243,15 @@ along with libgo; if not, write to the Free Software Foundation, Inc.,
            <xsl:when test="contains(., '/clutter/')">
              <xsl:value-of select="concat('../../clutter/stable/', substring-after(., '/clutter/'))"/>
            </xsl:when>
+           <xsl:when test="contains(., '/gdk2/stable/')">
+             <xsl:value-of select="concat('../../gdk2/stable/', substring-after(., '/gdk2/stable/'))"/>
+           </xsl:when>
+           <xsl:when test="contains(., '/gdk2/unstable/')">
+             <xsl:value-of select="concat('../../gdk2/unstable/', substring-after(., '/gdk2/unstable/'))"/>
+           </xsl:when>
+           <xsl:when test="contains(., '/gdk2/')">
+             <xsl:value-of select="concat('../../gdk2/stable/', substring-after(., '/gdk2/'))"/>
+           </xsl:when>
            <xsl:otherwise>
              <xsl:value-of select="."/>
            </xsl:otherwise>
diff --git a/src/defaults.lgorc b/src/defaults.lgorc
index 3b2fe0a..4c899e1 100644
--- a/src/defaults.lgorc
+++ b/src/defaults.lgorc
@@ -32,7 +32,7 @@ languages = None
 
 # documents to blacklist
 blacklist = ['gnome-feedback', 'gnome-keyring-manager', 'gnome-nettool',
-             'libempathy', 'libempathy-gtk']
+             'libempathy', 'libempathy-gtk', 'gtk', 'gdk']
 
 # extra tarballs to process
 extra_tarballs_file = os.path.join(__datadir__, 'extra-tarballs')



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]