Perform the upgrade to Gtk 2.8 together with the upgrade of all its direct dependency libraries. Gtk 2.8 is considered API compatible with Gtk 2.6 but nevertheless this upgrade at least required lots of small changes to mostly all involved packages. The most notable change is that Gtk 2.8 is now based on Cairo.

atk/atk.spec

@@ -23,9 +23,9 @@
 ##
 
 #   package version
-%define       V_atk         1.9.0
-%define       V_glib_major  2.6
-%define       V_gtk_major   2.6
+%define       V_atk         1.10.1
+%define       V_glib_major  2.8
+%define       V_gtk_major   2.8
 
 #   package information
 Name:         atk
@@ -38,7 +38,7 @@ Class:        PLUS
 Group:        XWindow
 License:      GPL
 Version:      %{V_atk}
-Release:      20041224
+Release:      20050820
 
 #   list of sources
 Source0:      ftp://ftp.gtk.org/pub/gtk/v%{V_gtk_major}/atk-%{V_atk}.tar.bz2
@@ -47,8 +47,10 @@ Patch0:       atk.patch
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20040130, X11, glib2 >= %{V_glib_major}, make
-PreReq:       OpenPKG, openpkg >= 20040130, X11, glib2 >= %{V_glib_major}
+BuildPreReq:  OpenPKG, openpkg >= 20040130, make, pkgconfig
+PreReq:       OpenPKG, openpkg >= 20040130
+BuildPreReq:  X11, glib2 >= %{V_glib_major}
+PreReq:       X11, glib2 >= %{V_glib_major}
 AutoReq:      no
 AutoReqProv:  no
 

cairo/cairo.patch

@@ -0,0 +1,11 @@
+Index: cairo.pc.in
+--- cairo.pc.in.orig	2005-08-10 23:29:15 +0200
++++ cairo.pc.in	2005-08-20 13:55:35 +0200
+@@ -8,5 +8,5 @@
+ Version: @VERSION@
+ 
+ @PKGCONFIG_REQUIRES@: @FREETYPE_REQUIRES@ @XRENDER_REQUIRES@ @PNG_REQUIRES@ @GLITZ_REQUIRES@
+-Libs: @FREETYPE_LIBS@ -L${libdir} -lcairo 
+-Cflags: @FREETYPE_CFLAGS@ -I${includedir}/cairo
++Libs: -L${libdir} -lcairo @FREETYPE_LIBS@ -lm
++Cflags: -I${includedir}/cairo @FREETYPE_CFLAGS@

cairo/cairo.spec

@@ -25,7 +25,7 @@
 #   package information
 Name:         cairo
 Summary:      Cairo Vector Graphics Library
-URL:          http://www.cairo.org/
+URL:          http://cairographics.org/
 Vendor:       Carl Worth & Keith Packard
 Packager:     OpenPKG
 Distribution: OpenPKG
@@ -33,16 +33,17 @@ Class:        PLUS
 Group:        XWindow
 License:      MIT-style
 Version:      0.9.2
-Release:      20050813
+Release:      20050820
 
 #   package options
 %option       with_pdf   yes
 %option       with_ps    yes
 %option       with_png   yes
-%option       with_x11   no
+%option       with_x11   yes
 
 #   list of sources
 Source0:      http://cairographics.org/snapshots/cairo-%{version}.tar.gz
+Patch0:       cairo.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -87,6 +88,7 @@ AutoReqProv:  no
 
 %prep
     %setup -q
+    %patch -p0
 
 %build
     %{l_shtool} subst \
@@ -130,6 +132,7 @@ AutoReqProv:  no
 %else
         --disable-xlib \
 %endif
+        --enable-freetype \
         --disable-xcb \
         --disable-gl \
         --disable-shared
@@ -138,6 +141,7 @@ AutoReqProv:  no
 %install
     rm -rf $RPM_BUILD_ROOT
     %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+    rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/gtk-doc
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
         '%not %dir %{l_prefix}/lib/pkgconfig'

fontconfig/fontconfig.patch

@@ -1,12 +0,0 @@
-Index: src/fcfreetype.c
---- src/fcfreetype.c.orig	2003-05-17 04:15:21.000000000 +0200
-+++ src/fcfreetype.c	2003-11-16 12:01:27.000000000 +0100
-@@ -57,7 +57,7 @@
- 
- #if (FREETYPE_MINOR > 1 || (FREETYPE_MINOR == 1 && FREETYPE_PATCH >= 4))
- #include <freetype/ftbdf.h>
--#include <freetype/ftmodule.h>
-+#include <freetype/ftmodapi.h>
- #define USE_FTBDF
- #define HAS_BDF_PROPERTY(f) ((f) && (f)->driver && \
- 			     (f)->driver->root.clazz->get_interface)

fontconfig/fontconfig.spec

@@ -32,12 +32,11 @@ Distribution: OpenPKG
 Class:        BASE
 Group:        XWindow
 License:      GPL
-Version:      2.2.90
-Release:      20050212
+Version:      2.3.2
+Release:      20050820
 
 #   list of sources
-Source0:      http://freedesktop.org/software/fontconfig/releases/fontconfig-%{version}.tar.gz
-Patch0:       fontconfig.patch
+Source0:      http://fontconfig.org/release/fontconfig-%{version}.tar.gz
 
 #   build information
 Prefix:       %{l_prefix}
@@ -57,13 +56,12 @@ AutoReqProv:  no
 %track
     prog fontconfig = {
         version   = %{version}
-        url       = http://freedesktop.org/software/fontconfig/releases/
+        url       = http://fontconfig.org/release/
         regex     = fontconfig-(\d+\.\d+\.\d+)\.tar\.gz
     }
 
 %prep
     %setup -q
-    %patch -p0
     echo 'ac_cv_prog_HASDOCBOOK=${ac_cv_prog_HASDOCBOOK=no}' >config.cache
 
 %build
@@ -107,10 +105,16 @@ AutoReqProv:  no
         $RPM_BUILD_ROOT%{l_prefix}/etc/fontconfig \
         $RPM_BUILD_ROOT%{l_prefix}/share/fontconfig
     %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
-    strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
+    strip  $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
+    rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/fontconfig/fontconfig-devel
+    rm -f  $RPM_BUILD_ROOT%{l_prefix}/share/fontconfig/*.html
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
-        '%not %dir %{l_prefix}/lib/pkgconfig'
+        '%not %dir %{l_prefix}/lib/pkgconfig' \
+        '%config %{l_prefix}/etc/fontconfig/*.conf' \
+        '%config %{l_prefix}/etc/fontconfig/conf.d/*.conf' \
+        '%doc %{l_prefix}/share/fontconfig/*.pdf' \
+        '%doc %{l_prefix}/share/fontconfig/*.txt'
 
 %files -f files
 

glib2/glib2.patch

@@ -1,6 +1,7 @@
---- gmodule/gmodule-dl.c.orig	Sat Feb 17 08:28:07 2001
-+++ gmodule/gmodule-dl.c	Fri Jan 18 09:48:45 2002
-@@ -104,6 +104,7 @@
+Index: gmodule/gmodule-dl.c
+--- gmodule/gmodule-dl.c.orig	2004-02-20 02:41:00 +0100
++++ gmodule/gmodule-dl.c	2005-08-15 10:07:43 +0200
+@@ -106,6 +106,7 @@
  static gpointer
  _g_module_self (void)
  {
@@ -8,7 +9,7 @@
    gpointer handle;
    
    /* to query symbols from the program itself, special link options
-@@ -115,6 +116,9 @@
+@@ -117,6 +118,9 @@
      g_module_set_error (fetch_dlerror (TRUE));
    
    return handle;

glib2/glib2.spec

@@ -23,8 +23,8 @@
 ##
 
 #   package version
-%define       V_glib2_major  2.6
-%define       V_glib2_minor  6
+%define       V_glib2_major  2.8
+%define       V_glib2_minor  0
 
 #   package information
 Name:         glib2
@@ -37,7 +37,7 @@ Class:        BASE
 Group:        Algorithm
 License:      GPL
 Version:      %{V_glib2_major}.%{V_glib2_minor}
-Release:      20050802
+Release:      20050820
 
 #   package options
 %option       with_threads  no
@@ -49,10 +49,10 @@ Patch0:       glib2.patch
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20040130, make
-BuildPreReq:  gettext, libiconv, pkgconfig >= 0.14.0, perl
+BuildPreReq:  OpenPKG, openpkg >= 20040130, make, pkgconfig
 PreReq:       OpenPKG, openpkg >= 20040130
-PreReq:       gettext, libiconv, pkgconfig >= 0.14.0, perl
+BuildPreReq:  gettext, libiconv, perl
+PreReq:       gettext, libiconv, perl
 AutoReq:      no
 AutoReqProv:  no
 
@@ -81,12 +81,17 @@ AutoReqProv:  no
         configure
     %{l_shtool} subst \
         -e 's;/glib-2\.0;/glib2;g' \
+        -e 's;/gobject-2\.0;/gobject2;g' \
+        -e 's;/gthread-2\.0;/gthread2;g' \
+        -e 's;/gmodule-2\.0;/gmodule2;g' \
         -e 's;lib\(g[a-z]*\)-2\.0;lib\12;g' \
-        Makefile.in \
-        */Makefile.in \
+        `find . -name Makefile.in -print` \
         m4macros/glib-2.0.m4
     %{l_shtool} subst \
         -e 's;/glib-2\.0;/glib2;g' \
+        -e 's;/gobject-2\.0;/gobject2;g' \
+        -e 's;/gthread-2\.0;/gthread2;g' \
+        -e 's;/gmodule-2\.0;/gmodule2;g' \
         -e 's;-l\(g[a-z]*\)-2\.0;-l\12;g' \
         *-2.0.pc.in
 

gtk2/gtk2.spec

@@ -23,11 +23,11 @@
 ##
 
 #   package version
-%define       V_gtk         2.6.9
-%define       V_gtk_major   2.6
-%define       V_glib_major  2.6
-%define       V_pango_major 1.8
-%define       V_atk_major   1.9
+%define       V_gtk         2.8.0
+%define       V_gtk_major   2.8
+%define       V_glib_major  2.8
+%define       V_pango_major 1.10
+%define       V_atk_major   1.10
 
 #   package information
 Name:         gtk2
@@ -40,7 +40,7 @@ Class:        PLUS
 Group:        XWindow
 License:      GPL
 Version:      %{V_gtk}
-Release:      20050802
+Release:      20050820
 
 #   list of sources
 Source0:      ftp://ftp.gtk.org/pub/gtk/v%{V_gtk_major}/gtk+-%{V_gtk}.tar.gz
@@ -48,10 +48,10 @@ Source0:      ftp://ftp.gtk.org/pub/gtk/v%{V_gtk_major}/gtk+-%{V_gtk}.tar.gz
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20040130
+BuildPreReq:  OpenPKG, openpkg >= 20040130, make, pkgconfig
 PreReq:       OpenPKG, openpkg >= 20040130
-BuildPreReq:  X11, png, jpeg, tiff, gettext, pkgconfig >= 0.14.0, make
-PreReq:       X11, png, jpeg, tiff, gettext, pkgconfig >= 0.14.0
+BuildPreReq:  X11, png, jpeg, tiff, gettext
+PreReq:       X11, png, jpeg, tiff, gettext
 BuildPreReq:  glib2 >= %{V_glib_major}, pango >= %{V_pango_major}, atk >= %{V_atk_major}
 PreReq:       glib2 >= %{V_glib_major}, pango >= %{V_pango_major}, atk >= %{V_atk_major}
 AutoReq:      no
@@ -112,13 +112,13 @@ AutoReqProv:  no
         -e 's;/@PACKAGE@;;g' \
         -e 's;-\$(GTK_API_VERSION);2;g' \
         -e 's;/\$(GTK_BINARY_VERSION);;g' \
-        Makefile.in \
-        */Makefile.in \
-        */*/Makefile.in
+        `find . -name Makefile.in -print`
     %{l_shtool} subst \
         -e 's;/gtk-2\.0;/gtk2;g' \
         -e 's;-l\(g[-_a-z]*\)-@GTK_API_VERSION@;-l\12;g' \
         -e 's;-l\(g[-_a-z]*\)-\${target}-@GTK_API_VERSION@;-l\12;g' \
+        -e 's;\(@GDK_EXTRA_LIBS@\);@X_LIBS@ \1;' \
+        -e 's;\(@GDK_EXTRA_CFLAGS@\);@X_CFLAGS@ \1;' \
         *-2.0.pc.in
     %{l_shtool} subst \
         -e 's;gtk-2.0;gtk2;g' \
@@ -133,11 +133,6 @@ AutoReqProv:  no
         -e 's;\$(libdir)/locale;\$(datadir)/locale;' \
         po/Makefile.in.in
 
-    #   correct unnecessary and flawed dependency
-    %{l_shtool} subst \
-        -e 's;[a-zA-Z0-9$()-_/.]*libgdk_pixbuf-2.0.la *;;' \
-        modules/engines/pixbuf/Makefile.in
-
 %build
     #   set x11 paths
     xinc=`%{l_rc} --query x11_incdir`
@@ -213,7 +208,10 @@ AutoReqProv:  no
     rm -f  $RPM_BUILD_ROOT%{l_prefix}/lib/*.s[ol]
     rm -f  $RPM_BUILD_ROOT%{l_prefix}/lib/*.s[ol].*
     rm -f  $RPM_BUILD_ROOT%{l_prefix}/lib/*.la
-    rm -f  $RPM_BUILD_ROOT%{l_prefix}/lib/gtk2/immodules/*
+    rm -f  $RPM_BUILD_ROOT%{l_prefix}/lib/gtk2/engines/*.a
+    rm -f  $RPM_BUILD_ROOT%{l_prefix}/lib/gtk2/engines/*.la
+    rm -f  $RPM_BUILD_ROOT%{l_prefix}/lib/gtk2/immodules/*.a
+    rm -f  $RPM_BUILD_ROOT%{l_prefix}/lib/gtk2/immodules/*.la
     rm -f  $RPM_BUILD_ROOT%{l_prefix}/bin/*-[0-9][0-9.]*
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1
 

pango/pango.patch

@@ -96,3 +96,26 @@ Index: pangoxft.pc.in
  Libs: -L${libdir} -lpangoxft-@PANGO_API_VERSION@ @PKGCONFIG_XFT_LIBS@
 -Cflags: -I${includedir}/pango-1.0 @XFT_CFLAGS@
 +Cflags: -I${includedir}/pango-1.0 -I${includedir} @XFT_CFLAGS@
+Index: pango/opentype/Makefile.in
+--- pango/opentype/Makefile.in.orig	2005-08-20 13:19:38 +0200
++++ pango/opentype/Makefile.in	2005-08-20 13:21:47 +0200
+@@ -283,7 +283,6 @@
+ libpango_ot_la_LIBADD = \
+ 	$(x_ldflags)	\
+ 	$(x_libs)	\
+-	$(GLIB_LIBS)	\
+ 	-lm
+ 
+ 
+Index: Makefile.in
+--- Makefile.in.orig	2005-08-20 16:09:38 +0200
++++ Makefile.in	2005-08-20 16:13:38 +0200
+@@ -252,7 +252,7 @@
+ 
+ AUTOMAKE_OPTIONS = 1.7
+ 
+-SUBDIRS = pango modules examples docs tools tests
++SUBDIRS = pango modules docs tools tests
+ 
+ EXTRA_DIST = \
+ 	pango.pc.in		\

pango/pango.spec

@@ -23,9 +23,9 @@
 ##
 
 #   package version
-%define       V_pango       1.8.2
-%define       V_glib_major  2.6
-%define       V_gtk_major   2.6
+%define       V_pango       1.10.0
+%define       V_glib_major  2.8
+%define       V_gtk_major   2.8
 
 #   package information
 Name:         pango
@@ -38,7 +38,7 @@ Class:        PLUS
 Group:        XWindow
 License:      GPL
 Version:      %{V_pango}
-Release:      20050802
+Release:      20050820
 
 #   list of sources
 Source0:      ftp://ftp.gtk.org/pub/gtk/v%{V_gtk_major}/pango-%{V_pango}.tar.bz2
@@ -47,10 +47,10 @@ Patch0:       pango.patch
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20040130, X11, make, gcc
+BuildPreReq:  OpenPKG, openpkg >= 20040130, X11, make, gcc, pkgconfig
 PreReq:       OpenPKG, openpkg >= 20040130, X11
-BuildPreReq:  glib2 >= %{V_glib_major}, libiconv, freetype, fontconfig, xft
-PreReq:       glib2 >= %{V_glib_major}, libiconv, freetype, fontconfig, xft
+BuildPreReq:  glib2 >= %{V_glib_major}, libiconv, freetype, fontconfig, xft, cairo >= 0.9.2-20050820
+PreReq:       glib2 >= %{V_glib_major}, libiconv, freetype, fontconfig, xft, cairo >= 0.9.2-20050820
 AutoReq:      no
 AutoReqProv:  no
 
@@ -65,7 +65,7 @@ AutoReqProv:  no
     prog pango = {
         version   = %{version}
         url       = ftp://ftp.gtk.org/pub/gtk/
-        regex     = (v2\.[2468])
+        regex     = (v2\.[24678])
         url       = ftp://ftp.gtk.org/pub/gtk/__NEWVER__/
         regex     = pango-(__VER__)\.tar\.(gz|bz2)
     }
@@ -84,23 +84,24 @@ AutoReqProv:  no
         pango\*.pc.in
 
 %build
+    ( echo "ac_cv_lib_cairo_cairo_ft_scaled_font_lock_face=yes"
+    ) >config.cache
     CC="%{l_cc}" \
     CFLAGS="%{l_cflags -O}" \
     CPPFLAGS="%{l_cppflags} -I`%{l_rc} --query x11_incdir`" \
     LDFLAGS="%{l_ldflags} -L`%{l_rc} --query x11_libdir`" \
     ./configure \
+        --cache-file=./config.cache \
         --prefix=%{l_prefix} \
         --with-x \
         --x-includes=`%{l_rc} --query x11_incdir` \
         --x-libraries=`%{l_rc} --query x11_libdir` \
         --with-html-dir="%{l_prefix}/share" \
         --with-xml-catalog="%{l_prefix}/share/sgml/catalog.xml" \
-        --disable-nls \
-        --with-native-locale=no \
         --disable-dependency-tracking \
-        --enable-shm \
         --disable-debug \
         --disable-rebuilds \
+        --enable-shared \
         --enable-static
     %{l_make} %{l_mflags -O}
 
@@ -117,7 +118,7 @@ AutoReqProv:  no
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/pango
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
-        '%config %{l_prefix}/etc/pango/pangox.aliases' \
+        '%config %{l_prefix}/etc/pango/*' \
         '%not %dir %{l_prefix}/lib/pkgconfig'
 
 %files -f files