OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 20-Aug-2005 23:54:35
Branch: HEAD Handle: 2005082022543301
Added files:
openpkg-src/cairo cairo.patch
Modified files:
openpkg-src/atk atk.spec
openpkg-src/cairo cairo.spec
openpkg-src/fontconfig fontconfig.spec
openpkg-src/glib2 glib2.patch glib2.spec
openpkg-src/gtk2 gtk2.spec
openpkg-src/pango pango.patch pango.spec
Removed files:
openpkg-src/fontconfig fontconfig.patch
Log:
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.
Summary:
Revision Changes Path
1.25 +8 -6 openpkg-src/atk/atk.spec
1.6 +11 -0 openpkg-src/cairo/cairo.patch
1.13 +7 -3 openpkg-src/cairo/cairo.spec
1.2 +0 -12 openpkg-src/fontconfig/fontconfig.patch
1.18 +12 -8 openpkg-src/fontconfig/fontconfig.spec
1.2 +5 -4 openpkg-src/glib2/glib2.patch
1.54 +13 -8 openpkg-src/glib2/glib2.spec
1.54 +16 -18 openpkg-src/gtk2/gtk2.spec
1.10 +23 -0 openpkg-src/pango/pango.patch
1.45 +13 -12 openpkg-src/pango/pango.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/atk/atk.spec
============================================================================
$ cvs diff -u -r1.24 -r1.25 atk.spec
--- openpkg-src/atk/atk.spec 24 Mar 2005 11:18:26 -0000 1.24
+++ openpkg-src/atk/atk.spec 20 Aug 2005 21:54:33 -0000 1.25
@@ -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 @@
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 @@
# 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
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cairo/cairo.patch
============================================================================
$ cvs diff -u -r0 -r1.6 cairo.patch
--- /dev/null 2005-08-20 23:54:31 +0200
+++ cairo.patch 2005-08-20 23:54:33 +0200
@@ -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@
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cairo/cairo.spec
============================================================================
$ cvs diff -u -r1.12 -r1.13 cairo.spec
--- openpkg-src/cairo/cairo.spec 13 Aug 2005 18:13:15 -0000 1.12
+++ openpkg-src/cairo/cairo.spec 20 Aug 2005 21:54:33 -0000 1.13
@@ -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 @@
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 @@
%prep
%setup -q
+ %patch -p0
%build
%{l_shtool} subst \
@@ -130,6 +132,7 @@
%else
--disable-xlib \
%endif
+ --enable-freetype \
--disable-xcb \
--disable-gl \
--disable-shared
@@ -138,6 +141,7 @@
%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'
@@ .
rm -f openpkg-src/fontconfig/fontconfig.patch <<'@@ .'
Index: openpkg-src/fontconfig/fontconfig.patch
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/fontconfig/fontconfig.spec
============================================================================
$ cvs diff -u -r1.17 -r1.18 fontconfig.spec
--- openpkg-src/fontconfig/fontconfig.spec 24 Mar 2005 11:18:49 -0000
1.17
+++ openpkg-src/fontconfig/fontconfig.spec 20 Aug 2005 21:54:33 -0000
1.18
@@ -32,12 +32,11 @@
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 @@
%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 @@
$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
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/glib2/glib2.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 glib2.patch
--- openpkg-src/glib2/glib2.patch 5 Jun 2004 15:33:46 -0000 1.1
+++ openpkg-src/glib2/glib2.patch 20 Aug 2005 21:54:34 -0000 1.2
@@ -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;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/glib2/glib2.spec
============================================================================
$ cvs diff -u -r1.53 -r1.54 glib2.spec
--- openpkg-src/glib2/glib2.spec 2 Aug 2005 06:53:49 -0000 1.53
+++ openpkg-src/glib2/glib2.spec 20 Aug 2005 21:54:34 -0000 1.54
@@ -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 @@
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 @@
# 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 @@
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
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gtk2/gtk2.spec
============================================================================
$ cvs diff -u -r1.53 -r1.54 gtk2.spec
--- openpkg-src/gtk2/gtk2.spec 2 Aug 2005 11:38:13 -0000 1.53
+++ openpkg-src/gtk2/gtk2.spec 20 Aug 2005 21:54:34 -0000 1.54
@@ -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 @@
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 @@
# 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 @@
-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]*\)[EMAIL PROTECTED]@;-l\12;g' \
-e 's;-l\(g[-_a-z]*\)[EMAIL PROTECTED]@;-l\12;g' \
+ -e 's;\(@[EMAIL PROTECTED]);@X_LIBS@ \1;' \
+ -e 's;\(@[EMAIL PROTECTED]);@X_CFLAGS@ \1;' \
*-2.0.pc.in
%{l_shtool} subst \
-e 's;gtk-2.0;gtk2;g' \
@@ -133,11 +133,6 @@
-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 @@
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
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pango/pango.patch
============================================================================
$ cvs diff -u -r1.9 -r1.10 pango.patch
--- openpkg-src/pango/pango.patch 2 Aug 2005 19:15:49 -0000 1.9
+++ openpkg-src/pango/pango.patch 20 Aug 2005 21:54:34 -0000 1.10
@@ -96,3 +96,26 @@
Libs: -L${libdir} [EMAIL PROTECTED]@ @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 \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pango/pango.spec
============================================================================
$ cvs diff -u -r1.44 -r1.45 pango.spec
--- openpkg-src/pango/pango.spec 2 Aug 2005 19:15:49 -0000 1.44
+++ openpkg-src/pango/pango.spec 20 Aug 2005 21:54:34 -0000 1.45
@@ -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 @@
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 @@
# 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 @@
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 @@
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 @@
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
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
