[mingw32-filesystem] Don't provide the wrapper i686-pc-mingw32-pkg-config anymore as we now have a mingw32-pkg-config pac
by Erik van Pienbroek
commit 92ccc6e10a514b063c29b4b642b19283a1235396
Author: Erik van Pienbroek <epienbro(a)fedoraproject.org>
Date: Tue Jan 31 20:38:26 2012 +0100
Don't provide the wrapper i686-pc-mingw32-pkg-config anymore as we now have a mingw32-pkg-config package
macros.mingw32 | 3 +--
mingw32-filesystem.spec | 8 ++++++--
2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/macros.mingw32 b/macros.mingw32
index 95ac080..54cf300 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -99,8 +99,7 @@ package or when debugging this package.\
done; \
unset x i
-%_mingw32_pkg_config \
- PKG_CONFIG_LIBDIR="%{_mingw32_libdir}/pkgconfig:%{_mingw32_datadir}/pkgconfig" pkg-config
+%_mingw32_pkg_config %{_mingw32_target}-pkg-config
%_mingw32_configure %{_mingw32_env} ; \
__mingw32_topdir=.; if ! test -x configure; then __mingw32_topdir=..; fi; \\\
diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec
index 940476e..ec2147f 100644
--- a/mingw32-filesystem.spec
+++ b/mingw32-filesystem.spec
@@ -2,7 +2,7 @@
Name: mingw32-filesystem
Version: 69
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: MinGW base filesystem and environment
Group: Development/Libraries
@@ -103,7 +103,7 @@ install -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_libexecdir}/mingw32-scripts
mkdir -p $RPM_BUILD_ROOT%{_bindir}
pushd $RPM_BUILD_ROOT%{_bindir}
-for i in mingw32-configure mingw32-make mingw32-pkg-config i686-pc-mingw32-pkg-config mingw32-cmake mingw32-qmake-qt4; do
+for i in mingw32-configure mingw32-make mingw32-pkg-config mingw32-cmake mingw32-qmake-qt4; do
ln -s %{_libexecdir}/mingw32-scripts $i
done
popd
@@ -191,6 +191,10 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32
%changelog
+* Tue Jan 31 2012 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 69-12
+- Don't provide the wrapper i686-pc-mingw32-pkg-config anymore as we now
+ have a mingw32-pkg-config package
+
* Tue Jan 10 2012 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 69-11
- Set Boost_COMPILER to -gcc47 in cmake toolchain file
12 years, 2 months
[mingw-pkg-config] Initial import
by Erik van Pienbroek
commit b912db3586512df464e56531194e8d1e9971963c
Author: Erik van Pienbroek <epienbro(a)fedoraproject.org>
Date: Tue Jan 31 20:34:50 2012 +0100
Initial import
.gitignore | 1 +
mingw-pkg-config.spec | 77 +++++++++++++++++++++++++++++++++++++++++++++++++
sources | 1 +
3 files changed, 79 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..9325b84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/pkg-config-0.26.tar.gz
diff --git a/mingw-pkg-config.spec b/mingw-pkg-config.spec
new file mode 100644
index 0000000..834554f
--- /dev/null
+++ b/mingw-pkg-config.spec
@@ -0,0 +1,77 @@
+Name: mingw-pkg-config
+Version: 0.26
+Release: 2%{?dist}
+Summary: MinGW Windows pkg-config tool for cross compiling
+
+License: GPLv2+
+Group: Development/Tools
+URL: http://pkgconfig.freedesktop.org
+Source0: http://www.freedesktop.org/software/pkgconfig/releases/pkg-config-%{versi...
+
+BuildRequires: glib2-devel
+BuildRequires: popt-devel
+BuildRequires: mingw32-filesystem
+
+
+%description
+The pkgconfig tool determines compilation options. For each required
+library, it reads the configuration file and outputs the necessary
+compiler and linker flags.
+
+This package contains pkg-config tool for cross compiling with the MinGW
+toolchain.
+
+
+# Mingw32
+%package -n mingw32-pkg-config
+Summary: %{summary}
+
+# Make sure that the mingw32-filesystem package doesn't
+# contain the pkg-config wrapper anymore
+Requires: mingw32-filesystem >= 69-12
+
+%description -n mingw32-pkg-config
+The pkgconfig tool determines compilation options. For each required
+library, it reads the configuration file and outputs the necessary
+compiler and linker flags.
+
+This package contains pkg-config tool for cross compiling with the MinGW
+toolchain.
+
+
+%prep
+%setup -q -n pkg-config-%{version}
+
+
+%build
+%configure \
+ --program-prefix=%{_mingw32_target}- \
+ --with-installed-popt \
+ --with-pc-path=%{_mingw32_libdir}/pkgconfig:%{_mingw32_datadir}/pkgconfig
+
+make %{?_smp_mflags}
+
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+
+# These files conflict with ordinary pkg-config.
+rm -rf ${RPM_BUILD_ROOT}%{_datadir}/aclocal
+rm -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/pkg-config
+
+
+%files -n mingw32-pkg-config
+%doc AUTHORS README NEWS COPYING pkg-config-guide.html
+%{_bindir}/%{_mingw32_target}-pkg-config
+%{_mandir}/man1/%{_mingw32_target}-pkg-config.1*
+
+
+%changelog
+* Tue Jan 31 2012 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 0.26-2
+- Dropped the configure argument --with-installed-glib as it's not needed
+ anymore as of pkg-config 0.26
+- Fixed typo in RPM macros
+
+* Tue Jan 31 2012 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 0.26-1
+- Initial package (based on the OpenSuSE mingw32-cross-pkg-config package)
+
diff --git a/sources b/sources
index e69de29..765d2a7 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+47525c26a9ba7ba14bf85e01509a7234 pkg-config-0.26.tar.gz
12 years, 2 months
[mingw32-cairo] Rebuild against libpng 1.5 and various cleanups
by Erik van Pienbroek
commit 92fdddc1484371c69f7117a8e6a9210c10a5fb29
Author: Erik van Pienbroek <epienbro(a)fedoraproject.org>
Date: Tue Jan 31 18:50:13 2012 +0100
Rebuild against libpng 1.5 and various cleanups
- Rebuild against libpng 1.5
- Dropped .la files
- Dropped unneeded RPM tags
mingw32-cairo.spec | 24 +++++++++---------------
1 files changed, 9 insertions(+), 15 deletions(-)
---
diff --git a/mingw32-cairo.spec b/mingw32-cairo.spec
index 1448651..92f0c78 100644
--- a/mingw32-cairo.spec
+++ b/mingw32-cairo.spec
@@ -1,20 +1,16 @@
%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-cairo
Version: 1.10.2
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: MinGW Windows Cairo library
License: LGPLv2 or MPLv1.1
URL: http://cairographics.org
Source0: http://cairographics.org/releases/cairo-%{version}.tar.gz
Group: Development/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# The file cairo.c refers to a function called ffs(), but it
# isn't declared in any of the mingw headers. work around this
@@ -22,7 +18,7 @@ Patch0: mingw32-cairo-fix-ffs-declaration.patch
BuildArch: noarch
-BuildRequires: mingw32-filesystem >= 52
+BuildRequires: mingw32-filesystem >= 68
BuildRequires: mingw32-gcc
BuildRequires: mingw32-binutils
BuildRequires: mingw32-libxml2
@@ -77,30 +73,24 @@ make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
-
make DESTDIR=$RPM_BUILD_ROOT install
rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/charset.alias
rm -r $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc/html/cairo/
-%clean
-rm -rf $RPM_BUILD_ROOT
+# Drop all .la files
+find $RPM_BUILD_ROOT -name "*.la" -delete
%files
-%defattr(-,root,root,-)
%doc COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1
%{_mingw32_bindir}/libcairo-2.dll
%{_mingw32_bindir}/libcairo-gobject-2.dll
%{_mingw32_bindir}/libcairo-script-interpreter-2.dll
%{_mingw32_includedir}/cairo/
%{_mingw32_libdir}/libcairo.dll.a
-%{_mingw32_libdir}/libcairo.la
%{_mingw32_libdir}/libcairo-gobject.dll.a
-%{_mingw32_libdir}/libcairo-gobject.la
%{_mingw32_libdir}/libcairo-script-interpreter.dll.a
-%{_mingw32_libdir}/libcairo-script-interpreter.la
%{_mingw32_libdir}/pkgconfig/cairo-gobject.pc
%{_mingw32_libdir}/pkgconfig/cairo-pdf.pc
%{_mingw32_libdir}/pkgconfig/cairo-png.pc
@@ -111,13 +101,17 @@ rm -rf $RPM_BUILD_ROOT
%{_mingw32_libdir}/pkgconfig/cairo.pc
%files static
-%defattr(-,root,root,-)
%{_mingw32_libdir}/libcairo.a
%{_mingw32_libdir}/libcairo-gobject.a
%{_mingw32_libdir}/libcairo-script-interpreter.a
%changelog
+* Tue Jan 23 2012 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 1.10.2-6
+- Rebuild against libpng 1.5
+- Dropped .la files
+- Dropped unneeded RPM tags
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.10.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
12 years, 2 months
mingw-glib2/gtk2 question
by Boszormenyi Zoltan
Hi,
until recently, there were 2 versions of mingw-glib2 in the repository,
2.30.1 and 2.31.x (some older point release, I don't remember
the exact 3rd number). The 2.31.x unstable version was not usable
with GTK2 2.24.3, I had constant GPFs under Windows with it. So I kept
downgrading to 2.30.1. Now, only glib2-2.31.12 is there and gtk2 was
upgraded to 2.24.9. Is this combination stable?
Thanks,
Zoltán Böszörményi
12 years, 2 months
[mingw32-libpng] Update to 1.5.7
by Erik van Pienbroek
commit 268189135e1e372ebdc557a84b310b611bd8b793
Author: Erik van Pienbroek <epienbro(a)fedoraproject.org>
Date: Tue Jan 31 18:08:03 2012 +0100
Update to 1.5.7
- Update to 1.5.7
- Dropped .la files
.gitignore | 1 +
mingw32-libpng.spec | 27 ++++++++++++++++-----------
sources | 2 +-
3 files changed, 18 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c807b4b..734cdbe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
libpng-1.4.3.tar.bz2
/libpng-1.4.8.tar.xz
+/libpng-1.5.7.tar.xz
diff --git a/mingw32-libpng.spec b/mingw32-libpng.spec
index e51961f..9dfbb3e 100644
--- a/mingw32-libpng.spec
+++ b/mingw32-libpng.spec
@@ -3,8 +3,8 @@
%define __debug_install_post %{_mingw32_debug_install_post}
Name: mingw32-libpng
-Version: 1.4.8
-Release: 3%{?dist}
+Version: 1.5.7
+Release: 1%{?dist}
Summary: MinGW Windows Libpng library
License: zlib
@@ -51,6 +51,9 @@ make %{?_smp_mflags}
%install
make DESTDIR=$RPM_BUILD_ROOT install
+# Drop all .la files
+find $RPM_BUILD_ROOT -name "*.la" -delete
+
# No need to distribute manpages which appear in the Fedora
# native packages already.
rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
@@ -59,24 +62,26 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
%files
%doc ANNOUNCE CHANGES LICENSE README TODO
%{_mingw32_bindir}/libpng-config
-%{_mingw32_bindir}/libpng14-14.dll
-%{_mingw32_bindir}/libpng14-config
-%{_mingw32_includedir}/libpng14
+%{_mingw32_bindir}/libpng15-15.dll
+%{_mingw32_bindir}/libpng15-config
+%{_mingw32_includedir}/libpng15
%{_mingw32_includedir}/png.h
%{_mingw32_includedir}/pngconf.h
+%{_mingw32_includedir}/pnglibconf.h
%{_mingw32_libdir}/libpng.dll.a
-%{_mingw32_libdir}/libpng.la
-%{_mingw32_libdir}/libpng14.dll.a
-%{_mingw32_libdir}/libpng14.la
+%{_mingw32_libdir}/libpng15.dll.a
%{_mingw32_libdir}/pkgconfig/libpng.pc
-%{_mingw32_libdir}/pkgconfig/libpng14.pc
+%{_mingw32_libdir}/pkgconfig/libpng15.pc
%files static
-%defattr(-,root,root,-)
%{_mingw32_libdir}/libpng.a
-%{_mingw32_libdir}/libpng14.a
+%{_mingw32_libdir}/libpng15.a
%changelog
+* Tue Jan 31 2012 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 1.5.7-1
+- Update to 1.5.7
+- Dropped .la files
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.4.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index 046b6f5..c3b4e96 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2ce595d571f2b06a9403ed5bcfa4ecbd libpng-1.4.8.tar.xz
+c3ae9ce4e81ec0aafdd4ac961586ee0d libpng-1.5.7.tar.xz
12 years, 2 months