- updated to 0.16.6 (from pixman.spec)

Changed files:
    crossmingw32-pixman.spec -> 1.7
    pixman-no_pkgconfig.patch -> 1.1

diff --git a/crossmingw32-pixman.spec b/crossmingw32-pixman.spec
index c1235d6ee77a229888585cdf2089ee7a6a3b28d7..493db127b6efcd778a39a4e150b8421428135d7a 100644 (file)
--- a/crossmingw32-pixman.spec
+++ b/crossmingw32-pixman.spec
@@ -1,17 +1,17 @@
 Summary:       Pixel manipulation library - cross Mingw32
 Summary(pl.UTF-8):     Biblioteka operacji na pikselach - wersja skrośna Mingw32
 Name:          crossmingw32-pixman
-Version:       0.12.0
+Version:       0.16.6
 Release:       1
 License:       MIT
 Group:         Development/Libraries
 Source0:       http://xorg.freedesktop.org/archive/individual/lib/pixman-%{version}.tar.bz2
-# Source0-md5: 494af78c1c7d825c9ad6815d7b91f17d
+# Source0-md5: fbd6ee9cb09d0b26281557bc7afcb3ab
+Patch0:                pixman-no_pkgconfig.patch
 URL:           http://xorg.freedesktop.org/
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake
 BuildRequires: crossmingw32-gcc
-BuildRequires: crossmingw32-zlib
 BuildRequires: libtool
 BuildRequires: sed >= 4.0
 Requires:      crossmingw32-runtime
@@ -73,6 +73,7 @@ Biblioteka DLL pixman dla Windows.
 
 %prep
 %setup -q -n pixman-%{version}
+%patch0 -p1
 
 # disable gtk-based test
 :> test/Makefile.am
@@ -97,6 +98,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+sed -i -e 's#<pixman-version.h>#<pixman-1/pixman-version.h>#g' $RPM_BUILD_ROOT%{_includedir}/pixman-1/pixman.h
+
 install -d $RPM_BUILD_ROOT%{_dlldir}
 mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
 

diff --git a/pixman-no_pkgconfig.patch b/pixman-no_pkgconfig.patch
new file mode 100644 (file)
index 0000000..d6cd1c4
--- /dev/null
+++ b/pixman-no_pkgconfig.patch
@@ -0,0 +1,17 @@
+--- pixman-0.12.0/configure.ac.orig    2008-11-27 00:33:27.424372137 +0100
++++ pixman-0.12.0/configure.ac 2008-11-27 00:33:46.923032039 +0100
+@@ -282,14 +282,6 @@
+                    [enable tests using GTK+ [default=auto]])],
+    [enable_gtk=$enableval], [enable_gtk=auto])
+ 
+-PKG_PROG_PKG_CONFIG
+-if test $enable_gtk = auto ; then
+-   PKG_CHECK_EXISTS([gtk+-2.0], [enable_gtk=yes], [enable_gtk=no])
+-fi
+-if test $enable_gtk = yes ; then
+-   PKG_CHECK_MODULES(GTK, [gtk+-2.0])
+-fi
+-
+ AM_CONDITIONAL(HAVE_GTK, [test "x$enable_gtk" = xyes])
+ 
+ AC_SUBST(GTK_CFLAGS)