From ad64cf0dc81347be2e2dae7329add8c5b03bcb22 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 29 Jan 2009 00:22:39 +0000 Subject: [PATCH 01/28] Setup of module mingw32-pixman --- .cvsignore | 0 Makefile | 21 +++++++++++++++++++++ sources | 0 3 files changed, 21 insertions(+) create mode 100644 .cvsignore create mode 100644 Makefile create mode 100644 sources diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..e69de29 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..0359893 --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# Makefile for source rpm: mingw32-pixman +# $Id$ +NAME := mingw32-pixman +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From 77bf6ea8be888fbf079c60e81416cbdec945b90d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 30 Jan 2009 11:48:10 +0000 Subject: [PATCH 02/28] Initial import. --- .cvsignore | 1 + import.log | 1 + make-pixman-snapshot.sh | 16 +++++++ mingw32-pixman.spec | 88 +++++++++++++++++++++++++++++++++++++ pixman-0.13.2-license.patch | 27 ++++++++++++ sources | 1 + 6 files changed, 134 insertions(+) create mode 100644 import.log create mode 100755 make-pixman-snapshot.sh create mode 100644 mingw32-pixman.spec create mode 100644 pixman-0.13.2-license.patch diff --git a/.cvsignore b/.cvsignore index e69de29..f264e47 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +pixman-0.13.2.tar.gz diff --git a/import.log b/import.log new file mode 100644 index 0000000..d253c51 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +mingw32-pixman-0_13_2-2_fc11:HEAD:mingw32-pixman-0.13.2-2.fc11.src.rpm:1233315903 diff --git a/make-pixman-snapshot.sh b/make-pixman-snapshot.sh new file mode 100755 index 0000000..0cd65a3 --- /dev/null +++ b/make-pixman-snapshot.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +DIRNAME=pixman-$( date +%Y%m%d ) + +rm -rf $DIRNAME +git clone git://git.freedesktop.org/git/pixman $DIRNAME +cd $DIRNAME +if [ -z "$1" ]; then + git log | head -1 +else + git checkout $1 +fi +rm -rf .git +cd .. +tar jcf $DIRNAME.tar.bz2 $DIRNAME +rm -rf $DIRNAME diff --git a/mingw32-pixman.spec b/mingw32-pixman.spec new file mode 100644 index 0000000..d8d373d --- /dev/null +++ b/mingw32-pixman.spec @@ -0,0 +1,88 @@ +%define __strip %{_mingw32_strip} +%define __objdump %{_mingw32_objdump} +%define _use_internal_dependency_generator 0 +%define __find_requires %{_mingw32_findrequires} +%define __find_provides %{_mingw32_findprovides} + +Name: mingw32-pixman +Version: 0.13.2 +Release: 2%{?dist} +Summary: MinGW Windows Pixman library + +License: MIT +URL: http://xorg.freedesktop.org/ +Group: Development/Libraries + +Source0: http://xorg.freedesktop.org/archive/individual/lib/pixman-%{version}.tar.gz +Source1: make-pixman-snapshot.sh + +Patch0: pixman-0.13.2-license.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch + +BuildRequires: mingw32-filesystem >= 23 +BuildRequires: mingw32-gcc +BuildRequires: mingw32-binutils +BuildRequires: mingw32-dlfcn + +Requires: pkgconfig + +%description +MinGW Windows Pixman library. + + +%prep +%setup -q -n pixman-%{version} +%patch0 -p1 + + +%build +# Uses GTK for its testsuite, so disable this otherwise +# we have a chicken & egg problem on mingw +%{_mingw32_configure} --disable-gtk --disable-static +make %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT + +make DESTDIR=$RPM_BUILD_ROOT install + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root) +%doc LICENSE +%{_mingw32_bindir}/libpixman-1-0.dll +%{_mingw32_includedir}/pixman-1 +%{_mingw32_libdir}/libpixman-1.dll.a +%{_mingw32_libdir}/libpixman-1.la +%{_mingw32_libdir}/pkgconfig/pixman-1.pc + + +%changelog +* Thu Jan 15 2009 Richard W.M. Jones - 0.13.2-2 +- Include LICENSE file (freedesktop bug 19582). + +* Tue Jan 13 2009 Richard W.M. Jones - 0.13.2-1 +- Resynch with Fedora package (0.13.2). +- Disable static library for speed. +- Use _smp_mflags. +- Requires pkgconfig. +- Depends on dlfcn. + +* Wed Sep 24 2008 Richard W.M. Jones - 0.12.0-2 +- Rename mingw -> mingw32. + +* Mon Sep 22 2008 Daniel P. Berrange - 0.12.0-1 +- Update to 0.12.0 release + +* Wed Sep 10 2008 Richard W.M. Jones - 0.11.10-2 +- Remove static library. + +* Tue Sep 9 2008 Daniel P. Berrange - 0.11.10-1 +- Initial RPM release diff --git a/pixman-0.13.2-license.patch b/pixman-0.13.2-license.patch new file mode 100644 index 0000000..c717677 --- /dev/null +++ b/pixman-0.13.2-license.patch @@ -0,0 +1,27 @@ +diff -urN pixman-0.13.2.orig/LICENSE pixman-0.13.2/LICENSE +--- pixman-0.13.2.orig/LICENSE 1970-01-01 01:00:00.000000000 +0100 ++++ pixman-0.13.2/LICENSE 2009-01-15 13:14:47.000000000 +0000 +@@ -0,0 +1,23 @@ ++ Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. ++ 2005 Lars Knoll & Zack Rusin, Trolltech ++ 2008 Aaron Plattner, NVIDIA Corporation ++ ++ Permission to use, copy, modify, distribute, and sell this software and its ++ documentation for any purpose is hereby granted without fee, provided that ++ the above copyright notice appear in all copies and that both that ++ copyright notice and this permission notice appear in supporting ++ documentation, and that the name of Keith Packard not be used in ++ advertising or publicity pertaining to distribution of the software without ++ specific, written prior permission. Keith Packard makes no ++ representations about the suitability of this software for any purpose. It ++ is provided "as is" without express or implied warranty. ++ ++ THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS ++ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND ++ FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY ++ SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN ++ AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING ++ OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS ++ SOFTWARE. ++ diff --git a/sources b/sources index e69de29..56ff122 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +837df4a02c61a60a880644393b57faed pixman-0.13.2.tar.gz From 153807c7bee9c43eb296e5a4ca5e0829bb4f8f4f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 20 Feb 2009 23:29:20 +0000 Subject: [PATCH 03/28] Rebuild for gcc 4.4 --- mingw32-pixman.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mingw32-pixman.spec b/mingw32-pixman.spec index d8d373d..d4f3b31 100644 --- a/mingw32-pixman.spec +++ b/mingw32-pixman.spec @@ -6,7 +6,7 @@ Name: mingw32-pixman Version: 0.13.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows Pixman library License: MIT @@ -21,7 +21,7 @@ Patch0: pixman-0.13.2-license.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: mingw32-filesystem >= 23 +BuildRequires: mingw32-filesystem >= 49 BuildRequires: mingw32-gcc BuildRequires: mingw32-binutils BuildRequires: mingw32-dlfcn @@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Feb 20 2009 Richard W.M. Jones - 0.13.2-3 +- Rebuild for mingw32-gcc 4.4 + * Thu Jan 15 2009 Richard W.M. Jones - 0.13.2-2 - Include LICENSE file (freedesktop bug 19582). From de1c3b173dcb9b3356da27590647c1ac80086949 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Thu, 26 Feb 2009 01:20:54 +0000 Subject: [PATCH 04/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- mingw32-pixman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw32-pixman.spec b/mingw32-pixman.spec index d4f3b31..2757804 100644 --- a/mingw32-pixman.spec +++ b/mingw32-pixman.spec @@ -6,7 +6,7 @@ Name: mingw32-pixman Version: 0.13.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MinGW Windows Pixman library License: MIT @@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 0.13.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Fri Feb 20 2009 Richard W.M. Jones - 0.13.2-3 - Rebuild for mingw32-gcc 4.4 From c9063f21d597be790577f27bd106809b8cb8bc5c Mon Sep 17 00:00:00 2001 From: epienbro Date: Tue, 14 Apr 2009 19:30:36 +0000 Subject: [PATCH 05/28] - Fixed %defattr line - Added -static subpackage --- mingw32-pixman.spec | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/mingw32-pixman.spec b/mingw32-pixman.spec index 2757804..593423a 100644 --- a/mingw32-pixman.spec +++ b/mingw32-pixman.spec @@ -6,7 +6,7 @@ Name: mingw32-pixman Version: 0.13.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: MinGW Windows Pixman library License: MIT @@ -32,6 +32,15 @@ Requires: pkgconfig MinGW Windows Pixman library. +%package static +Summary: Static version of the MinGW Windows Pixman library +Requires: %{name} = %{version}-%{release} +Group: Development/Libraries + +%description static +Static version of the MinGW Windows Pixman library. + + %prep %setup -q -n pixman-%{version} %patch0 -p1 @@ -40,7 +49,7 @@ MinGW Windows Pixman library. %build # Uses GTK for its testsuite, so disable this otherwise # we have a chicken & egg problem on mingw -%{_mingw32_configure} --disable-gtk --disable-static +%{_mingw32_configure} --disable-gtk --enable-static --enable-shared make %{?_smp_mflags} @@ -55,7 +64,7 @@ rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root) +%defattr(-,root,root,-) %doc LICENSE %{_mingw32_bindir}/libpixman-1-0.dll %{_mingw32_includedir}/pixman-1 @@ -64,7 +73,16 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_libdir}/pkgconfig/pixman-1.pc +%files static +%defattr(-,root,root,-) +%{_mingw32_libdir}/libpixman-1.a + + %changelog +* Fri Apr 3 2009 Erik van Pienbroek - 0.13.2-5 +- Fixed %%defattr line +- Added -static subpackage + * Wed Feb 25 2009 Fedora Release Engineering - 0.13.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 1d668894a695d13803024bb647b4303d1e23d176 Mon Sep 17 00:00:00 2001 From: epienbro Date: Wed, 10 Jun 2009 19:35:34 +0000 Subject: [PATCH 06/28] - Update to 0.15.10 - Use %%global instead of %%define - Dropped pixman-0.13.2-license.patch as freedesktop bug #19582 is resolved --- mingw32-pixman.spec | 24 +++++++++++++----------- pixman-0.13.2-license.patch | 27 --------------------------- 2 files changed, 13 insertions(+), 38 deletions(-) delete mode 100644 pixman-0.13.2-license.patch diff --git a/mingw32-pixman.spec b/mingw32-pixman.spec index 593423a..06112ce 100644 --- a/mingw32-pixman.spec +++ b/mingw32-pixman.spec @@ -1,12 +1,12 @@ -%define __strip %{_mingw32_strip} -%define __objdump %{_mingw32_objdump} -%define _use_internal_dependency_generator 0 -%define __find_requires %{_mingw32_findrequires} -%define __find_provides %{_mingw32_findprovides} +%global __strip %{_mingw32_strip} +%global __objdump %{_mingw32_objdump} +%global _use_internal_dependency_generator 0 +%global __find_requires %{_mingw32_findrequires} +%global __find_provides %{_mingw32_findprovides} Name: mingw32-pixman -Version: 0.13.2 -Release: 5%{?dist} +Version: 0.15.10 +Release: 1%{?dist} Summary: MinGW Windows Pixman library License: MIT @@ -16,8 +16,6 @@ Group: Development/Libraries Source0: http://xorg.freedesktop.org/archive/individual/lib/pixman-%{version}.tar.gz Source1: make-pixman-snapshot.sh -Patch0: pixman-0.13.2-license.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -43,7 +41,6 @@ Static version of the MinGW Windows Pixman library. %prep %setup -q -n pixman-%{version} -%patch0 -p1 %build @@ -65,7 +62,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc LICENSE +%doc COPYING %{_mingw32_bindir}/libpixman-1-0.dll %{_mingw32_includedir}/pixman-1 %{_mingw32_libdir}/libpixman-1.dll.a @@ -79,6 +76,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jun 10 2009 Erik van Pienbroek - 0.15.10-1 +- Update to 0.15.10 +- Use %%global instead of %%define +- Dropped pixman-0.13.2-license.patch as freedesktop bug #19582 is resolved + * Fri Apr 3 2009 Erik van Pienbroek - 0.13.2-5 - Fixed %%defattr line - Added -static subpackage diff --git a/pixman-0.13.2-license.patch b/pixman-0.13.2-license.patch deleted file mode 100644 index c717677..0000000 --- a/pixman-0.13.2-license.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -urN pixman-0.13.2.orig/LICENSE pixman-0.13.2/LICENSE ---- pixman-0.13.2.orig/LICENSE 1970-01-01 01:00:00.000000000 +0100 -+++ pixman-0.13.2/LICENSE 2009-01-15 13:14:47.000000000 +0000 -@@ -0,0 +1,23 @@ -+ Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. -+ 2005 Lars Knoll & Zack Rusin, Trolltech -+ 2008 Aaron Plattner, NVIDIA Corporation -+ -+ Permission to use, copy, modify, distribute, and sell this software and its -+ documentation for any purpose is hereby granted without fee, provided that -+ the above copyright notice appear in all copies and that both that -+ copyright notice and this permission notice appear in supporting -+ documentation, and that the name of Keith Packard not be used in -+ advertising or publicity pertaining to distribution of the software without -+ specific, written prior permission. Keith Packard makes no -+ representations about the suitability of this software for any purpose. It -+ is provided "as is" without express or implied warranty. -+ -+ THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS -+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND -+ FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY -+ SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN -+ AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING -+ OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -+ SOFTWARE. -+ From e77a5adfcfe501563e3d60939f7a77afc3d23004 Mon Sep 17 00:00:00 2001 From: epienbro Date: Wed, 10 Jun 2009 19:38:19 +0000 Subject: [PATCH 07/28] Forgot to do a 'make new-sources'.. --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index f264e47..e7fd12d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pixman-0.13.2.tar.gz +pixman-0.15.10.tar.gz diff --git a/sources b/sources index 56ff122..b20fc98 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -837df4a02c61a60a880644393b57faed pixman-0.13.2.tar.gz +8813e13aa3817df03039bd66a4863670 pixman-0.15.10.tar.gz From e90967d33c82cb502bc6db40e192198cd597be92 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 25 Jul 2009 14:29:19 +0000 Subject: [PATCH 08/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- mingw32-pixman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw32-pixman.spec b/mingw32-pixman.spec index 06112ce..df6b534 100644 --- a/mingw32-pixman.spec +++ b/mingw32-pixman.spec @@ -6,7 +6,7 @@ Name: mingw32-pixman Version: 0.15.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows Pixman library License: MIT @@ -76,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jul 25 2009 Fedora Release Engineering - 0.15.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Wed Jun 10 2009 Erik van Pienbroek - 0.15.10-1 - Update to 0.15.10 - Use %%global instead of %%define From eca989e8533e869e6f4f8b856bd5ef4f20491dfe Mon Sep 17 00:00:00 2001 From: epienbro Date: Wed, 12 Aug 2009 22:31:15 +0000 Subject: [PATCH 09/28] - Update to version 0.15.20 - Updated SOURCE0 and URL --- .cvsignore | 2 +- mingw32-pixman.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index e7fd12d..c4e9a36 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pixman-0.15.10.tar.gz +pixman-0.15.20.tar.bz2 diff --git a/mingw32-pixman.spec b/mingw32-pixman.spec index df6b534..0e08c7c 100644 --- a/mingw32-pixman.spec +++ b/mingw32-pixman.spec @@ -5,15 +5,15 @@ %global __find_provides %{_mingw32_findprovides} Name: mingw32-pixman -Version: 0.15.10 -Release: 2%{?dist} +Version: 0.15.20 +Release: 1%{?dist} Summary: MinGW Windows Pixman library License: MIT -URL: http://xorg.freedesktop.org/ +URL: http://cgit.freedesktop.org/pixman/ Group: Development/Libraries -Source0: http://xorg.freedesktop.org/archive/individual/lib/pixman-%{version}.tar.gz +Source0: http://xorg.freedesktop.org/archive/individual/lib/pixman-%{version}.tar.bz2 Source1: make-pixman-snapshot.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -76,6 +76,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Aug 13 2009 Erik van Pienbroek - 0.15.20-1 +- Update to version 0.15.20 +- Updated SOURCE0 and URL + * Sat Jul 25 2009 Fedora Release Engineering - 0.15.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index b20fc98..c1229a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8813e13aa3817df03039bd66a4863670 pixman-0.15.10.tar.gz +8cca7bdf45bd3c31cf95ecea0f05bddc pixman-0.15.20.tar.bz2 From 438c30754d8c156bc42c64f43df3422d54774733 Mon Sep 17 00:00:00 2001 From: epienbro Date: Wed, 12 Aug 2009 22:50:52 +0000 Subject: [PATCH 10/28] - Automatically generate debuginfo subpackage - Don't build the 'blitters-test' testcase as it requires the memalign function which we don't have on MinGW --- mingw32-pixman.spec | 12 +++++++++++- pixman-disable-blitters-test-testcase.patch | 20 ++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 pixman-disable-blitters-test-testcase.patch diff --git a/mingw32-pixman.spec b/mingw32-pixman.spec index 0e08c7c..d3da3d9 100644 --- a/mingw32-pixman.spec +++ b/mingw32-pixman.spec @@ -3,6 +3,7 @@ %global _use_internal_dependency_generator 0 %global __find_requires %{_mingw32_findrequires} %global __find_provides %{_mingw32_findprovides} +%define __debug_install_post %{_mingw32_debug_install_post} Name: mingw32-pixman Version: 0.15.20 @@ -16,10 +17,12 @@ Group: Development/Libraries Source0: http://xorg.freedesktop.org/archive/individual/lib/pixman-%{version}.tar.bz2 Source1: make-pixman-snapshot.sh +Patch0: pixman-disable-blitters-test-testcase.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: mingw32-filesystem >= 49 +BuildRequires: mingw32-filesystem >= 52 BuildRequires: mingw32-gcc BuildRequires: mingw32-binutils BuildRequires: mingw32-dlfcn @@ -39,8 +42,12 @@ Group: Development/Libraries Static version of the MinGW Windows Pixman library. +%{_mingw32_debug_package} + + %prep %setup -q -n pixman-%{version} +%patch0 -p0 %build @@ -79,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT * Thu Aug 13 2009 Erik van Pienbroek - 0.15.20-1 - Update to version 0.15.20 - Updated SOURCE0 and URL +- Automatically generate debuginfo subpackage +- Don't build the 'blitters-test' testcase as it requires the memalign function + which we don't have on MinGW * Sat Jul 25 2009 Fedora Release Engineering - 0.15.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/pixman-disable-blitters-test-testcase.patch b/pixman-disable-blitters-test-testcase.patch new file mode 100644 index 0000000..d376539 --- /dev/null +++ b/pixman-disable-blitters-test-testcase.patch @@ -0,0 +1,20 @@ +--- test/Makefile.in.orig 2009-08-13 00:44:30.275385290 +0200 ++++ test/Makefile.in 2009-08-13 00:47:49.722395581 +0200 +@@ -58,7 +58,7 @@ + @HAVE_GTK_TRUE@ alpha-test$(EXEEXT) screen-test$(EXEEXT) \ + @HAVE_GTK_TRUE@ convolution-test$(EXEEXT) trap-test$(EXEEXT) + am__EXEEXT_2 = region-test$(EXEEXT) scaling-test$(EXEEXT) \ +- blitters-test$(EXEEXT) fetch-test$(EXEEXT) oob-test$(EXEEXT) \ ++ fetch-test$(EXEEXT) oob-test$(EXEEXT) \ + window-test$(EXEEXT) trap-crasher$(EXEEXT) $(am__EXEEXT_1) + PROGRAMS = $(noinst_PROGRAMS) + am__alpha_test_SOURCES_DIST = alpha-test.c utils.c utils.h +@@ -282,7 +282,7 @@ + TEST_LDADD = $(top_builddir)/pixman/libpixman-1.la + INCLUDES = -I$(top_srcdir)/pixman -I$(top_builddir)/pixman \ + $(am__append_2) +-TESTPROGRAMS = region-test scaling-test blitters-test fetch-test \ ++TESTPROGRAMS = region-test scaling-test fetch-test \ + oob-test window-test trap-crasher $(am__append_1) + fetch_test_LDADD = $(TEST_LDADD) + region_test_LDADD = $(TEST_LDADD) From 36b0f7c681d57eb133d36326c374afac0f57f99e Mon Sep 17 00:00:00 2001 From: epienbro Date: Sat, 29 Aug 2009 20:56:33 +0000 Subject: [PATCH 11/28] Updated to 0.16.0 --- .cvsignore | 2 +- mingw32-pixman.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index c4e9a36..36289e2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pixman-0.15.20.tar.bz2 +pixman-0.16.0.tar.bz2 diff --git a/mingw32-pixman.spec b/mingw32-pixman.spec index d3da3d9..463182c 100644 --- a/mingw32-pixman.spec +++ b/mingw32-pixman.spec @@ -6,7 +6,7 @@ %define __debug_install_post %{_mingw32_debug_install_post} Name: mingw32-pixman -Version: 0.15.20 +Version: 0.16.0 Release: 1%{?dist} Summary: MinGW Windows Pixman library @@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Aug 29 2009 Erik van Pienbroek - 0.16.0-1 +- Update to 0.16.0 + * Thu Aug 13 2009 Erik van Pienbroek - 0.15.20-1 - Update to version 0.15.20 - Updated SOURCE0 and URL diff --git a/sources b/sources index c1229a2..694a05d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8cca7bdf45bd3c31cf95ecea0f05bddc pixman-0.15.20.tar.bz2 +183dea8a100c1d9732cdb2146ec90f68 pixman-0.16.0.tar.bz2 From abefe225f6043c99996a0b6ac1f324963788acbc Mon Sep 17 00:00:00 2001 From: epienbro Date: Fri, 18 Sep 2009 21:54:41 +0000 Subject: [PATCH 12/28] Rebuild because of broken mingw32-gcc/mingw32-binutils --- mingw32-pixman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw32-pixman.spec b/mingw32-pixman.spec index 463182c..d9204c7 100644 --- a/mingw32-pixman.spec +++ b/mingw32-pixman.spec @@ -7,7 +7,7 @@ Name: mingw32-pixman Version: 0.16.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows Pixman library License: MIT @@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Sep 18 2009 Erik van Pienbroek - 0.16.0-2 +- Rebuild because of broken mingw32-gcc/mingw32-binutils + * Sat Aug 29 2009 Erik van Pienbroek - 0.16.0-1 - Update to 0.16.0 From f8d421f4961c52169ab6153d1d42c5d0aa3f9233 Mon Sep 17 00:00:00 2001 From: epienbro Date: Tue, 29 Sep 2009 21:19:51 +0000 Subject: [PATCH 13/28] Update to 0.16.2 --- .cvsignore | 2 +- mingw32-pixman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 36289e2..c78b9f3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pixman-0.16.0.tar.bz2 +pixman-0.16.2.tar.bz2 diff --git a/mingw32-pixman.spec b/mingw32-pixman.spec index d9204c7..6946954 100644 --- a/mingw32-pixman.spec +++ b/mingw32-pixman.spec @@ -6,8 +6,8 @@ %define __debug_install_post %{_mingw32_debug_install_post} Name: mingw32-pixman -Version: 0.16.0 -Release: 2%{?dist} +Version: 0.16.2 +Release: 1%{?dist} Summary: MinGW Windows Pixman library License: MIT @@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Sep 29 2009 Erik van Pienbroek - 0.16.2-1 +- Update to 0.16.2 + * Fri Sep 18 2009 Erik van Pienbroek - 0.16.0-2 - Rebuild because of broken mingw32-gcc/mingw32-binutils diff --git a/sources b/sources index 694a05d..b32ba9d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -183dea8a100c1d9732cdb2146ec90f68 pixman-0.16.0.tar.bz2 +0ce7de6d649f1a80d328b05e403730b6 pixman-0.16.2.tar.bz2 From 8896f1d5e4dc51d3f0c061f40e31f0e263efe093 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:18:50 +0000 Subject: [PATCH 14/28] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0359893..ed3ab60 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: mingw32-pixman -# $Id$ +# $Id: Makefile,v 1.1 2009/01/29 00:22:39 kevin Exp $ NAME := mingw32-pixman SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 6c97c6e1a63cebae907c8baba042e9471442ec41 Mon Sep 17 00:00:00 2001 From: epienbro Date: Mon, 12 Jul 2010 16:07:30 +0000 Subject: [PATCH 15/28] Update to 0.18.2 (RHBZ #613665) --- .cvsignore | 2 +- mingw32-pixman.spec | 8 ++++---- pixman-disable-blitters-test-testcase.patch | 20 -------------------- sources | 2 +- 4 files changed, 6 insertions(+), 26 deletions(-) delete mode 100644 pixman-disable-blitters-test-testcase.patch diff --git a/.cvsignore b/.cvsignore index c78b9f3..4ffd58d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pixman-0.16.2.tar.bz2 +pixman-0.18.2.tar.bz2 diff --git a/mingw32-pixman.spec b/mingw32-pixman.spec index 6946954..e66e78f 100644 --- a/mingw32-pixman.spec +++ b/mingw32-pixman.spec @@ -6,7 +6,7 @@ %define __debug_install_post %{_mingw32_debug_install_post} Name: mingw32-pixman -Version: 0.16.2 +Version: 0.18.2 Release: 1%{?dist} Summary: MinGW Windows Pixman library @@ -17,8 +17,6 @@ Group: Development/Libraries Source0: http://xorg.freedesktop.org/archive/individual/lib/pixman-%{version}.tar.bz2 Source1: make-pixman-snapshot.sh -Patch0: pixman-disable-blitters-test-testcase.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -47,7 +45,6 @@ Static version of the MinGW Windows Pixman library. %prep %setup -q -n pixman-%{version} -%patch0 -p0 %build @@ -83,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jul 12 2010 Erik van Pienbroek - 0.18.2-1 +- Update to 0.18.2 (RHBZ #613665) + * Tue Sep 29 2009 Erik van Pienbroek - 0.16.2-1 - Update to 0.16.2 diff --git a/pixman-disable-blitters-test-testcase.patch b/pixman-disable-blitters-test-testcase.patch deleted file mode 100644 index d376539..0000000 --- a/pixman-disable-blitters-test-testcase.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- test/Makefile.in.orig 2009-08-13 00:44:30.275385290 +0200 -+++ test/Makefile.in 2009-08-13 00:47:49.722395581 +0200 -@@ -58,7 +58,7 @@ - @HAVE_GTK_TRUE@ alpha-test$(EXEEXT) screen-test$(EXEEXT) \ - @HAVE_GTK_TRUE@ convolution-test$(EXEEXT) trap-test$(EXEEXT) - am__EXEEXT_2 = region-test$(EXEEXT) scaling-test$(EXEEXT) \ -- blitters-test$(EXEEXT) fetch-test$(EXEEXT) oob-test$(EXEEXT) \ -+ fetch-test$(EXEEXT) oob-test$(EXEEXT) \ - window-test$(EXEEXT) trap-crasher$(EXEEXT) $(am__EXEEXT_1) - PROGRAMS = $(noinst_PROGRAMS) - am__alpha_test_SOURCES_DIST = alpha-test.c utils.c utils.h -@@ -282,7 +282,7 @@ - TEST_LDADD = $(top_builddir)/pixman/libpixman-1.la - INCLUDES = -I$(top_srcdir)/pixman -I$(top_builddir)/pixman \ - $(am__append_2) --TESTPROGRAMS = region-test scaling-test blitters-test fetch-test \ -+TESTPROGRAMS = region-test scaling-test fetch-test \ - oob-test window-test trap-crasher $(am__append_1) - fetch_test_LDADD = $(TEST_LDADD) - region_test_LDADD = $(TEST_LDADD) diff --git a/sources b/sources index b32ba9d..1bbac39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0ce7de6d649f1a80d328b05e403730b6 pixman-0.16.2.tar.bz2 +8f0c47bbb12a0d9c0d14242596bf6bf9 pixman-0.18.2.tar.bz2 From 258aff8450341e0a619c6010b0c066010bdc33a0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 03:22:28 +0000 Subject: [PATCH 16/28] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index ed3ab60..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: mingw32-pixman -# $Id: Makefile,v 1.1 2009/01/29 00:22:39 kevin Exp $ -NAME := mingw32-pixman -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index d253c51..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -mingw32-pixman-0_13_2-2_fc11:HEAD:mingw32-pixman-0.13.2-2.fc11.src.rpm:1233315903 From 08366c914487dca0fe9b2fd358145078d2bf516c Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Tue, 7 Sep 2010 21:20:42 +0200 Subject: [PATCH 17/28] Update to 0.19.2 --- .gitignore | 1 + mingw32-pixman.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4ffd58d..fef984a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ pixman-0.18.2.tar.bz2 +/pixman-0.19.2.tar.bz2 diff --git a/mingw32-pixman.spec b/mingw32-pixman.spec index e66e78f..f4d7d86 100644 --- a/mingw32-pixman.spec +++ b/mingw32-pixman.spec @@ -6,7 +6,7 @@ %define __debug_install_post %{_mingw32_debug_install_post} Name: mingw32-pixman -Version: 0.18.2 +Version: 0.19.2 Release: 1%{?dist} Summary: MinGW Windows Pixman library @@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Sep 7 2010 Erik van Pienbroek - 0.19.2-1 +- Update to 0.19.2 + * Mon Jul 12 2010 Erik van Pienbroek - 0.18.2-1 - Update to 0.18.2 (RHBZ #613665) diff --git a/sources b/sources index 1bbac39..478200b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8f0c47bbb12a0d9c0d14242596bf6bf9 pixman-0.18.2.tar.bz2 +4ed74b6aa9139541718c0d61a581fd50 pixman-0.19.2.tar.bz2 From 3588a869de542d5a4a7168bfcec8ba7c09472513 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Fri, 24 Sep 2010 15:37:54 +0200 Subject: [PATCH 18/28] Update to 0.19.4 - Update to 0.19.4 - Fixed Source URL - Fixed a small rpmlint warning --- .gitignore | 1 + ...t-check-for-mprotect-and-getpagesize.patch | 35 +++++++++++++++++++ mingw32-pixman.spec | 16 +++++++-- sources | 2 +- 4 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 mingw32-pixman-dont-check-for-mprotect-and-getpagesize.patch diff --git a/.gitignore b/.gitignore index fef984a..1e5bb4d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ pixman-0.18.2.tar.bz2 /pixman-0.19.2.tar.bz2 +/pixman-0.19.4.tar.gz diff --git a/mingw32-pixman-dont-check-for-mprotect-and-getpagesize.patch b/mingw32-pixman-dont-check-for-mprotect-and-getpagesize.patch new file mode 100644 index 0000000..946b068 --- /dev/null +++ b/mingw32-pixman-dont-check-for-mprotect-and-getpagesize.patch @@ -0,0 +1,35 @@ +--- configure.orig 2010-09-24 15:34:21.764058125 +0200 ++++ configure 2010-09-24 15:35:04.629551788 +0200 +@@ -12521,32 +12521,6 @@ + + + +-ac_fn_c_check_func "$LINENO" "mprotect" "ac_cv_func_mprotect" +-if test "x$ac_cv_func_mprotect" = x""yes; then : +- have_mprotect=yes +-else +- have_mprotect=no +-fi +- +-if test x$have_mprotect = xyes; then +- +-$as_echo "#define HAVE_MPROTECT 1" >>confdefs.h +- +-fi +- +-ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize" +-if test "x$ac_cv_func_getpagesize" = x""yes; then : +- have_getpagesize=yes +-else +- have_getpagesize=no +-fi +- +-if test x$have_getpagesize = xyes; then +- +-$as_echo "#define HAVE_GETPAGESIZE 1" >>confdefs.h +- +-fi +- + ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday" + if test "x$ac_cv_func_gettimeofday" = x""yes; then : + have_gettimeofday=yes diff --git a/mingw32-pixman.spec b/mingw32-pixman.spec index f4d7d86..10e47b8 100644 --- a/mingw32-pixman.spec +++ b/mingw32-pixman.spec @@ -6,7 +6,7 @@ %define __debug_install_post %{_mingw32_debug_install_post} Name: mingw32-pixman -Version: 0.19.2 +Version: 0.19.4 Release: 1%{?dist} Summary: MinGW Windows Pixman library @@ -14,9 +14,13 @@ License: MIT URL: http://cgit.freedesktop.org/pixman/ Group: Development/Libraries -Source0: http://xorg.freedesktop.org/archive/individual/lib/pixman-%{version}.tar.bz2 +Source0: http://cairographics.org/releases/pixman-%{version}.tar.gz Source1: make-pixman-snapshot.sh +# The configure script checks for the availability of the functions mprotect and getpagesize, but +# these checks return an invalid result which results in a compile failure +Patch0: mingw32-pixman-dont-check-for-mprotect-and-getpagesize.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -40,11 +44,12 @@ Group: Development/Libraries Static version of the MinGW Windows Pixman library. -%{_mingw32_debug_package} +%{?_mingw32_debug_package} %prep %setup -q -n pixman-%{version} +%patch0 -p0 %build @@ -80,6 +85,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Sep 24 2010 Erik van Pienbroek - 0.19.4-1 +- Update to 0.19.4 +- Fixed Source URL +- Fixed a small rpmlint warning + * Tue Sep 7 2010 Erik van Pienbroek - 0.19.2-1 - Update to 0.19.2 diff --git a/sources b/sources index 478200b..cf552e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4ed74b6aa9139541718c0d61a581fd50 pixman-0.19.2.tar.bz2 +100a2d23f1d5683fdaa5d7ca71a0182b pixman-0.19.4.tar.gz From be85629a6ff049b5dccc73453dc43b7703826ce0 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 13:02:40 -0600 Subject: [PATCH 19/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- mingw32-pixman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw32-pixman.spec b/mingw32-pixman.spec index 10e47b8..4dd652b 100644 --- a/mingw32-pixman.spec +++ b/mingw32-pixman.spec @@ -7,7 +7,7 @@ Name: mingw32-pixman Version: 0.19.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows Pixman library License: MIT @@ -85,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 0.19.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Fri Sep 24 2010 Erik van Pienbroek - 0.19.4-1 - Update to 0.19.4 - Fixed Source URL From 6313d29b5ae07d87659da62328b5cc05322de267 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 25 Apr 2011 00:07:11 +0300 Subject: [PATCH 20/28] Update to 0.20.2 --- .gitignore | 1 + mingw32-pixman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1e5bb4d..928e051 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ pixman-0.18.2.tar.bz2 /pixman-0.19.2.tar.bz2 /pixman-0.19.4.tar.gz +/pixman-0.20.2.tar.gz diff --git a/mingw32-pixman.spec b/mingw32-pixman.spec index 4dd652b..603e69b 100644 --- a/mingw32-pixman.spec +++ b/mingw32-pixman.spec @@ -6,8 +6,8 @@ %define __debug_install_post %{_mingw32_debug_install_post} Name: mingw32-pixman -Version: 0.19.4 -Release: 2%{?dist} +Version: 0.20.2 +Release: 1%{?dist} Summary: MinGW Windows Pixman library License: MIT @@ -85,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Apr 25 2011 Kalev Lember - 0.20.2-1 +- Update to 0.20.2 + * Tue Feb 08 2011 Fedora Release Engineering - 0.19.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index cf552e4..10fcb1e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -100a2d23f1d5683fdaa5d7ca71a0182b pixman-0.19.4.tar.gz +a923c20af88e469ac29ba42cfedb88c2 pixman-0.20.2.tar.gz From 11ac6524c8d3bd0a145601be154705da243f9560 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sun, 8 May 2011 23:03:11 +0300 Subject: [PATCH 21/28] Update to 0.22.0 --- .gitignore | 1 + ...t-check-for-mprotect-and-getpagesize.patch | 35 ------------------- mingw32-pixman.spec | 12 +++---- sources | 2 +- 4 files changed, 7 insertions(+), 43 deletions(-) delete mode 100644 mingw32-pixman-dont-check-for-mprotect-and-getpagesize.patch diff --git a/.gitignore b/.gitignore index 928e051..e6af2a9 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ pixman-0.18.2.tar.bz2 /pixman-0.19.2.tar.bz2 /pixman-0.19.4.tar.gz /pixman-0.20.2.tar.gz +/pixman-0.22.0.tar.gz diff --git a/mingw32-pixman-dont-check-for-mprotect-and-getpagesize.patch b/mingw32-pixman-dont-check-for-mprotect-and-getpagesize.patch deleted file mode 100644 index 946b068..0000000 --- a/mingw32-pixman-dont-check-for-mprotect-and-getpagesize.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- configure.orig 2010-09-24 15:34:21.764058125 +0200 -+++ configure 2010-09-24 15:35:04.629551788 +0200 -@@ -12521,32 +12521,6 @@ - - - --ac_fn_c_check_func "$LINENO" "mprotect" "ac_cv_func_mprotect" --if test "x$ac_cv_func_mprotect" = x""yes; then : -- have_mprotect=yes --else -- have_mprotect=no --fi -- --if test x$have_mprotect = xyes; then -- --$as_echo "#define HAVE_MPROTECT 1" >>confdefs.h -- --fi -- --ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize" --if test "x$ac_cv_func_getpagesize" = x""yes; then : -- have_getpagesize=yes --else -- have_getpagesize=no --fi -- --if test x$have_getpagesize = xyes; then -- --$as_echo "#define HAVE_GETPAGESIZE 1" >>confdefs.h -- --fi -- - ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday" - if test "x$ac_cv_func_gettimeofday" = x""yes; then : - have_gettimeofday=yes diff --git a/mingw32-pixman.spec b/mingw32-pixman.spec index 603e69b..69fe908 100644 --- a/mingw32-pixman.spec +++ b/mingw32-pixman.spec @@ -6,7 +6,7 @@ %define __debug_install_post %{_mingw32_debug_install_post} Name: mingw32-pixman -Version: 0.20.2 +Version: 0.22.0 Release: 1%{?dist} Summary: MinGW Windows Pixman library @@ -17,10 +17,6 @@ Group: Development/Libraries Source0: http://cairographics.org/releases/pixman-%{version}.tar.gz Source1: make-pixman-snapshot.sh -# The configure script checks for the availability of the functions mprotect and getpagesize, but -# these checks return an invalid result which results in a compile failure -Patch0: mingw32-pixman-dont-check-for-mprotect-and-getpagesize.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -49,14 +45,13 @@ Static version of the MinGW Windows Pixman library. %prep %setup -q -n pixman-%{version} -%patch0 -p0 %build # Uses GTK for its testsuite, so disable this otherwise # we have a chicken & egg problem on mingw %{_mingw32_configure} --disable-gtk --enable-static --enable-shared -make %{?_smp_mflags} +make %{?_smp_mflags} V=1 %install @@ -85,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun May 08 2011 Kalev Lember - 0.22.0-1 +- Update to 0.22.0 + * Mon Apr 25 2011 Kalev Lember - 0.20.2-1 - Update to 0.20.2 diff --git a/sources b/sources index 10fcb1e..5b0e891 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a923c20af88e469ac29ba42cfedb88c2 pixman-0.20.2.tar.gz +cb8f3cb5ce2c8d7294f73ecb7021fda6 pixman-0.22.0.tar.gz From ba2fb1beb336e9583ca7af32a592f317fb22ee04 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 16 Jul 2011 14:19:11 +0300 Subject: [PATCH 22/28] Update to 0.22.2 --- .gitignore | 1 + mingw32-pixman.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e6af2a9..b05000b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ pixman-0.18.2.tar.bz2 /pixman-0.19.4.tar.gz /pixman-0.20.2.tar.gz /pixman-0.22.0.tar.gz +/pixman-0.22.2.tar.gz diff --git a/mingw32-pixman.spec b/mingw32-pixman.spec index 69fe908..376e866 100644 --- a/mingw32-pixman.spec +++ b/mingw32-pixman.spec @@ -6,7 +6,7 @@ %define __debug_install_post %{_mingw32_debug_install_post} Name: mingw32-pixman -Version: 0.22.0 +Version: 0.22.2 Release: 1%{?dist} Summary: MinGW Windows Pixman library @@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jul 16 2011 Kalev Lember - 0.22.2-1 +- Update to 0.22.2 + * Sun May 08 2011 Kalev Lember - 0.22.0-1 - Update to 0.22.0 diff --git a/sources b/sources index 5b0e891..42edb8b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cb8f3cb5ce2c8d7294f73ecb7021fda6 pixman-0.22.0.tar.gz +3dd0d9ed05dbf0e5e75d526ebae42e11 pixman-0.22.2.tar.gz From f3a65ca14eb594f8b4027542a4dd99588e195026 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 16 Jul 2011 14:19:42 +0300 Subject: [PATCH 23/28] Spec cleanup - Use automatic mingw dep extraction - Cleaned up the spec file for modern rpmbuild --- mingw32-pixman.spec | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/mingw32-pixman.spec b/mingw32-pixman.spec index 376e866..b1caba9 100644 --- a/mingw32-pixman.spec +++ b/mingw32-pixman.spec @@ -1,8 +1,5 @@ %global __strip %{_mingw32_strip} %global __objdump %{_mingw32_objdump} -%global _use_internal_dependency_generator 0 -%global __find_requires %{_mingw32_findrequires} -%global __find_provides %{_mingw32_findprovides} %define __debug_install_post %{_mingw32_debug_install_post} Name: mingw32-pixman @@ -17,10 +14,9 @@ Group: Development/Libraries Source0: http://cairographics.org/releases/pixman-%{version}.tar.gz Source1: make-pixman-snapshot.sh -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: mingw32-filesystem >= 52 +BuildRequires: mingw32-filesystem >= 68 BuildRequires: mingw32-gcc BuildRequires: mingw32-binutils BuildRequires: mingw32-dlfcn @@ -55,17 +51,10 @@ make %{?_smp_mflags} V=1 %install -rm -rf $RPM_BUILD_ROOT - make DESTDIR=$RPM_BUILD_ROOT install -%clean -rm -rf $RPM_BUILD_ROOT - - %files -%defattr(-,root,root,-) %doc COPYING %{_mingw32_bindir}/libpixman-1-0.dll %{_mingw32_includedir}/pixman-1 @@ -75,13 +64,14 @@ rm -rf $RPM_BUILD_ROOT %files static -%defattr(-,root,root,-) %{_mingw32_libdir}/libpixman-1.a %changelog * Sat Jul 16 2011 Kalev Lember - 0.22.2-1 - Update to 0.22.2 +- Use automatic mingw dep extraction +- Cleaned up the spec file for modern rpmbuild * Sun May 08 2011 Kalev Lember - 0.22.0-1 - Update to 0.22.0 From 74fb36e0eb888ab343b80a67fa7357cce98736e9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 04:06:44 -0600 Subject: [PATCH 24/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- mingw32-pixman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw32-pixman.spec b/mingw32-pixman.spec index b1caba9..b33ad9e 100644 --- a/mingw32-pixman.spec +++ b/mingw32-pixman.spec @@ -4,7 +4,7 @@ Name: mingw32-pixman Version: 0.22.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows Pixman library License: MIT @@ -68,6 +68,9 @@ make DESTDIR=$RPM_BUILD_ROOT install %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 0.22.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Sat Jul 16 2011 Kalev Lember - 0.22.2-1 - Update to 0.22.2 - Use automatic mingw dep extraction From 1d6980e78ac0a67a07d588c8fa89de8f28903d8d Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 1 Feb 2012 21:13:38 +0200 Subject: [PATCH 25/28] Update to 0.24.2 --- .gitignore | 1 + mingw32-pixman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b05000b..7c44b4f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ pixman-0.18.2.tar.bz2 /pixman-0.20.2.tar.gz /pixman-0.22.0.tar.gz /pixman-0.22.2.tar.gz +/pixman-0.24.2.tar.gz diff --git a/mingw32-pixman.spec b/mingw32-pixman.spec index b33ad9e..557474e 100644 --- a/mingw32-pixman.spec +++ b/mingw32-pixman.spec @@ -3,8 +3,8 @@ %define __debug_install_post %{_mingw32_debug_install_post} Name: mingw32-pixman -Version: 0.22.2 -Release: 2%{?dist} +Version: 0.24.2 +Release: 1%{?dist} Summary: MinGW Windows Pixman library License: MIT @@ -68,6 +68,9 @@ make DESTDIR=$RPM_BUILD_ROOT install %changelog +* Wed Feb 01 2012 Kalev Lember - 0.24.2-1 +- Update to 0.24.2 + * Fri Jan 13 2012 Fedora Release Engineering - 0.22.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 42edb8b..08c0216 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3dd0d9ed05dbf0e5e75d526ebae42e11 pixman-0.22.2.tar.gz +87837698855729650fd87b50171b348d pixman-0.24.2.tar.gz From 326b1bce95911425f7d1bc72ec97c736660a5c19 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Mon, 27 Feb 2012 20:31:02 +0100 Subject: [PATCH 26/28] Rebuild against the mingw-w64 toolchain --- mingw32-pixman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw32-pixman.spec b/mingw32-pixman.spec index 557474e..3e45a07 100644 --- a/mingw32-pixman.spec +++ b/mingw32-pixman.spec @@ -4,7 +4,7 @@ Name: mingw32-pixman Version: 0.24.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows Pixman library License: MIT @@ -68,6 +68,9 @@ make DESTDIR=$RPM_BUILD_ROOT install %changelog +* Mon Feb 27 2012 Erik van Pienbroek - 0.24.2-2 +- Rebuild against the mingw-w64 toolchain + * Wed Feb 01 2012 Kalev Lember - 0.24.2-1 - Update to 0.24.2 From 50a8f1e4f237375eacf4bdf175beaf3815d5124b Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 28 Feb 2012 14:38:00 +0200 Subject: [PATCH 27/28] Update to 0.24.4 ... and remove .la files. --- mingw32-pixman.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/mingw32-pixman.spec b/mingw32-pixman.spec index 3e45a07..2427cb1 100644 --- a/mingw32-pixman.spec +++ b/mingw32-pixman.spec @@ -3,8 +3,8 @@ %define __debug_install_post %{_mingw32_debug_install_post} Name: mingw32-pixman -Version: 0.24.2 -Release: 2%{?dist} +Version: 0.24.4 +Release: 1%{?dist} Summary: MinGW Windows Pixman library License: MIT @@ -21,8 +21,6 @@ BuildRequires: mingw32-gcc BuildRequires: mingw32-binutils BuildRequires: mingw32-dlfcn -Requires: pkgconfig - %description MinGW Windows Pixman library. @@ -52,6 +50,7 @@ make %{?_smp_mflags} V=1 %install make DESTDIR=$RPM_BUILD_ROOT install +rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/*.la %files @@ -59,7 +58,6 @@ make DESTDIR=$RPM_BUILD_ROOT install %{_mingw32_bindir}/libpixman-1-0.dll %{_mingw32_includedir}/pixman-1 %{_mingw32_libdir}/libpixman-1.dll.a -%{_mingw32_libdir}/libpixman-1.la %{_mingw32_libdir}/pkgconfig/pixman-1.pc @@ -68,6 +66,10 @@ make DESTDIR=$RPM_BUILD_ROOT install %changelog +* Tue Feb 28 2012 Kalev Lember - 0.24.4-1 +- Update to 0.24.4 +- Remove .la files + * Mon Feb 27 2012 Erik van Pienbroek - 0.24.2-2 - Rebuild against the mingw-w64 toolchain From 1667efdd75bdb429cfd5109470060e70058c36da Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 28 Feb 2012 14:41:04 +0200 Subject: [PATCH 28/28] Update sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 7c44b4f..54eb62e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ pixman-0.18.2.tar.bz2 /pixman-0.22.0.tar.gz /pixman-0.22.2.tar.gz /pixman-0.24.2.tar.gz +/pixman-0.24.4.tar.gz diff --git a/sources b/sources index 08c0216..15e4af0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -87837698855729650fd87b50171b348d pixman-0.24.2.tar.gz +fee074965c310c46d9c0ab3e5fd656bf pixman-0.24.4.tar.gz