From: Richard W.M. Jones <"Richard W.M. Jones "> Date: Tue, 14 Apr 2009 21:39:02 +0000 (+0100) Subject: Packages moved to Fedora. X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=1bfa81e5d2a88f1c2bbc583ff2ada6756d6537cc;p=fedora-mingw.git Packages moved to Fedora. --- diff --git a/cairomm/mingw32-cairomm.spec b/cairomm/mingw32-cairomm.spec deleted file mode 100644 index 639ff46..0000000 --- a/cairomm/mingw32-cairomm.spec +++ /dev/null @@ -1,75 +0,0 @@ -%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-cairomm -Version: 1.6.2 -Release: 5%{?dist} -Summary: MinGW Windows C++ API for the cairo graphics library - -License: LGPLv2+ -Group: Development/Libraries -URL: http://www.cairographics.org -Source0: http://www.cairographics.org/releases/cairomm-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildArch: noarch - -BuildRequires: mingw32-filesystem >= 30 -BuildRequires: mingw32-gcc -BuildRequires: mingw32-gcc-c++ -BuildRequires: mingw32-binutils -BuildRequires: mingw32-cairo -BuildRequires: pkgconfig - -Requires: pkgconfig - - -%description -Cairomm is the C++ API for the cairo graphics library. It offers all the power -of cairo with an interface familiar to C++ developers, including use of the -Standard Template Library where it makes sense. - - -%prep -%setup -q -n cairomm-%{version} - - -%build -%{_mingw32_configure} --enable-static=no --enable-docs=no -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 COPYING -%{_mingw32_bindir}/libcairomm-1.0-1.dll -%{_mingw32_libdir}/libcairomm-1.0.dll.a -%{_mingw32_libdir}/libcairomm-1.0.la -%{_mingw32_libdir}/pkgconfig/cairomm-1.0.pc -%{_mingw32_includedir}/cairomm-1.0 - - -%changelog -* Fri Feb 20 2009 Richard W.M. Jones - 1.6.2-5 -- Rebuild for mingw32-gcc 4.4 - -* Fri Feb 6 2009 Richard W.M. Jones - 1.6.2-4 -- Include license. - -* Fri Jan 23 2009 Richard W.M. Jones - 1.6.2-3 -- Use _smp_mflags. - -* Fri Oct 24 2008 Richard W.M. Jones - 1.6.2-2 -- Initial RPM release. diff --git a/expat/mingw32-expat.spec b/expat/mingw32-expat.spec deleted file mode 100644 index fe5f4ea..0000000 --- a/expat/mingw32-expat.spec +++ /dev/null @@ -1,86 +0,0 @@ -%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-expat -Version: 2.0.1 -Release: 4%{?dist} -Summary: MinGW Windows port of expat XML parser library - -License: MIT -Group: Development/Libraries -URL: http://www.libexpat.org/ -Source0: http://download.sourceforge.net/expat/expat-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildArch: noarch - -BuildRequires: mingw32-filesystem >= 33 -BuildRequires: mingw32-gcc -BuildRequires: mingw32-binutils -BuildRequires: autoconf, automake, libtool - - -%description -This is expat, the C library for parsing XML, written by James Clark. Expat -is a stream oriented XML parser. This means that you register handlers with -the parser prior to starting the parse. These handlers are called when the -parser discovers the associated structures in the document being parsed. A -start tag is an example of the kind of structures for which you may -register handlers. - - -%prep -%setup -q -n expat-%{version} - -rm -rf autom4te*.cache -cp `aclocal --print-ac-dir`/libtool.m4 conftools || exit 1 -libtoolize --copy --force --automake && aclocal && autoheader && autoconf - -chmod -x COPYING - - -%build -%{_mingw32_configure} -make %{?_smp_mflags} - - -%install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install - -# Remove static libraries but DON'T remove *.dll.a files. -rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libexpat.a - -# Remove documentation which duplicates that found in the native package. -rm -r $RPM_BUILD_ROOT%{_mingw32_mandir}/man1 - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-,root,root) -%doc COPYING -%{_mingw32_bindir}/libexpat-1.dll -%{_mingw32_bindir}/xmlwf -%{_mingw32_libdir}/libexpat.dll.a -%{_mingw32_libdir}/libexpat.la -%{_mingw32_includedir}/expat.h -%{_mingw32_includedir}/expat_external.h - - -%changelog -* Mon Mar 9 2009 Richard W.M. Jones - 2.0.1-4 -- Remove +x permissions on COPYING file. - -* Fri Feb 20 2009 Richard W.M. Jones - 2.0.1-3 -- Rebuild for mingw32-gcc 4.4 - -* Fri Feb 6 2009 Richard W.M. Jones - 2.0.1-2 -- Include license. - -* Fri Oct 31 2008 Richard W.M. Jones - 2.0.1-1 -- Initial RPM release. diff --git a/fontconfig/compare.supp b/fontconfig/compare.supp deleted file mode 100644 index 9ff936a..0000000 --- a/fontconfig/compare.supp +++ /dev/null @@ -1,4 +0,0 @@ -# Not relevant for mingw -missing source: '25-no-bitmap-fedora.conf' -# Mingw specific -extra patch 'mingw-fontconfig-2.6.0-remove-logfile.patch' diff --git a/fontconfig/mingw32-fontconfig-2.6.0-remove-logfile.patch b/fontconfig/mingw32-fontconfig-2.6.0-remove-logfile.patch deleted file mode 100644 index 2b784c9..0000000 --- a/fontconfig/mingw32-fontconfig-2.6.0-remove-logfile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- fontconfig-2.6.0.orig/doc/Makefile.am 2007-11-06 00:05:37.000000000 +0000 -+++ fontconfig-2.6.0/doc/Makefile.am 2008-09-21 13:50:38.000000000 +0100 -@@ -121,7 +121,7 @@ - $(DOC2MAN) -o devel-man local-fontconfig-devel.sgml && \ - mv devel-man/manpage.refs func.refs && \ - mv devel-man/*.3 . && \ -- $(RM) devel-man/manpage.links && \ -+ $(RM) devel-man/manpage.links devel-man/manpage.log && \ - rmdir devel-man - - local-fontconfig-devel.sgml: fontconfig-devel.sgml diff --git a/fontconfig/mingw32-fontconfig.spec b/fontconfig/mingw32-fontconfig.spec deleted file mode 100644 index 8e3b118..0000000 --- a/fontconfig/mingw32-fontconfig.spec +++ /dev/null @@ -1,118 +0,0 @@ -%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-fontconfig -Version: 2.6.0 -Release: 9%{?dist} -Summary: MinGW Windows Fontconfig library - -License: MIT -URL: http://fontconfig.org -Source0: http://fontconfig.org/release/fontconfig-%{version}.tar.gz -Group: Development/Libraries -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Patch0: mingw32-fontconfig-2.6.0-remove-logfile.patch - -BuildArch: noarch - -BuildRequires: mingw32-filesystem >= 40 -BuildRequires: mingw32-gcc -BuildRequires: mingw32-binutils -BuildRequires: mingw32-dlfcn -BuildRequires: mingw32-expat -BuildRequires: mingw32-freetype -BuildRequires: mingw32-iconv -BuildRequires: mingw32-libxml2 -BuildRequires: pkgconfig -BuildRequires: docbook-utils -BuildRequires: automake, autoconf, libtool - -Requires: pkgconfig - - -%description -MinGW Windows Fontconfig library. - - -%prep -%setup -q -n fontconfig-%{version} -%patch0 -p1 -libtoolize --force --copy -autoreconf - - -%build -PATH="%{_mingw32_bindir}:$PATH" \ -%{_mingw32_configure} --with-arch=i686 -make %{?_smp_mflags} - - -%install -rm -rf $RPM_BUILD_ROOT - -make DESTDIR=$RPM_BUILD_ROOT install - -rm -f $RPM_BUILD_ROOT/%{_mingw32_libdir}/charset.alias - -# Remove static library. -rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libfontconfig.a - -# Remove duplicate manpages. -rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir} - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-,root,root) -%doc COPYING -%{_mingw32_bindir}/fc-cache.exe -%{_mingw32_bindir}/fc-cat.exe -%{_mingw32_bindir}/fc-list.exe -%{_mingw32_bindir}/fc-match.exe -%{_mingw32_bindir}/libfontconfig-1.dll -%{_mingw32_libdir}/fontconfig.def -%{_mingw32_libdir}/libfontconfig.dll.a -%{_mingw32_libdir}/libfontconfig.la -%{_mingw32_libdir}/pkgconfig/fontconfig.pc -%{_mingw32_includedir}/fontconfig/ -%{_mingw32_sysconfdir}/fonts/ -%{_mingw32_datadir}/doc/fontconfig - -%changelog -* Fri Feb 20 2009 Richard W.M. Jones - 2.6.0-9 -- Rebuild for mingw32-gcc 4.4 - -* Fri Feb 6 2009 Richard W.M. Jones - 2.6.0-8 -- Include license. - -* Fri Jan 30 2009 Richard W.M. Jones - 2.6.0-7 -- Requires pkgconfig. - -* Fri Jan 23 2009 Richard W.M. Jones - 2.6.0-6 -- Use _smp_mflags. -- Rebuild libtool configuration. -- More BRs suggested by auto-buildrequires. - -* Wed Sep 24 2008 Richard W.M. Jones - 2.6.0-5 -- Rename mingw -> mingw32. - -* Sun Sep 21 2008 Richard W.M. Jones - 2.6.0-4 -- Remove duplicate manpages. -- Patch to delete logfile left when building (unused) manpages. - -* Thu Sep 11 2008 Daniel P. Berrange - 2.6.0-3 -- Add mingw_bindir to $PATH for freetype-config script - -* Wed Sep 10 2008 Richard W.M. Jones - 2.6.0-2 -- Remove static library. -- +BR mingw-libxml2. - -* Tue Sep 9 2008 Daniel P. Berrange - 2.6.0-1 -- Initial RPM release diff --git a/glibmm24/mingw32-glibmm24.spec b/glibmm24/mingw32-glibmm24.spec deleted file mode 100644 index b71fbce..0000000 --- a/glibmm24/mingw32-glibmm24.spec +++ /dev/null @@ -1,92 +0,0 @@ -%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-glibmm24 -Version: 2.18.1 -Release: 5%{?dist} -Summary: MinGW Windows C++ interface for GTK2 (a GUI library for X) - -License: LGPLv2+ -Group: Development/Libraries -URL: http://gtkmm.sourceforge.net/ -Source0: http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.18/glibmm-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildArch: noarch - -BuildRequires: mingw32-filesystem >= 30 -BuildRequires: mingw32-gcc -BuildRequires: mingw32-gcc-c++ -BuildRequires: mingw32-binutils -BuildRequires: mingw32-libsigc++20 >= 2.0.0 -BuildRequires: mingw32-glib2 >= 2.17.3 -BuildRequires: pkgconfig - -Requires: pkgconfig - - -%description -glibmm provides a C++ interface to the GTK+ GLib low-level core -library. Highlights include typesafe callbacks, widgets extensible via -inheritance and a comprehensive set of widget classes that can be -freely combined to quickly create complex user interfaces. - - -%prep -%setup -q -n glibmm-%{version} - - -%build -%{_mingw32_configure} --disable-static -make %{?_smp_mflags} - - -%install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install - -# Remove docs, duplicate native package. -rm -r $RPM_BUILD_ROOT%{_mingw32_docdir}/glibmm-2.4 -rm -r $RPM_BUILD_ROOT%{_mingw32_datadir}/devhelp - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-,root,root) -%doc COPYING COPYING.tools -%{_mingw32_bindir}/libgiomm-2.4-1.dll -%{_mingw32_bindir}/libglibmm_generate_extra_defs-2.4-1.dll -%{_mingw32_bindir}/libglibmm-2.4-1.dll -%{_mingw32_libdir}/libgiomm-2.4.dll.a -%{_mingw32_libdir}/libgiomm-2.4.la -%{_mingw32_libdir}/libglibmm_generate_extra_defs-2.4.dll.a -%{_mingw32_libdir}/libglibmm_generate_extra_defs-2.4.la -%{_mingw32_libdir}/libglibmm-2.4.dll.a -%{_mingw32_libdir}/libglibmm-2.4.la -%{_mingw32_libdir}/giomm-2.4 -%{_mingw32_libdir}/glibmm-2.4 -%{_mingw32_includedir}/giomm-2.4 -%{_mingw32_includedir}/glibmm-2.4 -%{_mingw32_libdir}/pkgconfig/giomm-2.4.pc -%{_mingw32_libdir}/pkgconfig/glibmm-2.4.pc -%{_mingw32_datadir}/aclocal/glibmm_check_perl.m4 - - -%changelog -* Fri Feb 20 2009 Richard W.M. Jones - 2.18.1-5 -- Rebuild for mingw32-gcc 4.4 - -* Fri Feb 6 2009 Richard W.M. Jones - 2.18.1-4 -- Include license. - -* Fri Jan 23 2009 Richard W.M. Jones - 2.18.1-3 -- Use _smp_mflags. - -* Fri Oct 24 2008 Richard W.M. Jones - 2.18.1-2 -- Initial RPM release. diff --git a/jasper/compare.supp b/jasper/compare.supp deleted file mode 100644 index bc12b76..0000000 --- a/jasper/compare.supp +++ /dev/null @@ -1,10 +0,0 @@ -# Mingw specific -extra patch 'jasper-1.900.1-enable-shared.patch' -# Mingw specific -extra patch 'jasper-1.900.1-mingw.patch' -# Mingw specific -extra patch 'jasper-1.900.1-sleep.patch' -# Linux OpenGL specific -missing patch 'jasper-1.701.0-GL-ac.patch' -# Linux OpenGL specific -missing patch 'jasper-1.701.0-GL.patch' diff --git a/jasper/jasper-1.701.0-GL.patch b/jasper/jasper-1.701.0-GL.patch deleted file mode 100644 index 11f0187..0000000 --- a/jasper/jasper-1.701.0-GL.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- jasper-1.701.0.GEO/configure.GL 2006-02-20 20:01:30.000000000 -0600 -+++ jasper-1.701.0.GEO/configure 2006-02-24 07:40:46.000000000 -0600 -@@ -9464,7 +9464,7 @@ - OPENGL_LIBS="" - if test $ENABLE_OPENGL = yes; then - if test $HAVE_OPENGL = no; then -- TMPLIBS="-lglut -lGL -lGLU $X_PRE_LIBS -lX11 -lXmu -lXi -lXext -lXt $X_EXTRA_LIBS $X_LIBS" -+ TMPLIBS="-lglut" - echo "$as_me:$LINENO: checking for glutInit in -lglut" >&5 - echo $ECHO_N "checking for glutInit in -lglut... $ECHO_C" >&6 - if test "${ac_cv_lib_glut_glutInit+set}" = set; then diff --git a/jasper/jasper-1.900.1-mingw32.patch b/jasper/jasper-1.900.1-mingw32.patch deleted file mode 100644 index f388349..0000000 --- a/jasper/jasper-1.900.1-mingw32.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rup jasper-1.900.1.orig/src/libjasper/Makefile.in jasper-1.900.1.new/src/libjasper/Makefile.in ---- jasper-1.900.1.orig/src/libjasper/Makefile.in 2007-01-19 16:54:45.000000000 -0500 -+++ jasper-1.900.1.new/src/libjasper/Makefile.in 2008-09-09 10:08:43.000000000 -0400 -@@ -290,7 +290,7 @@ libjasper_la_LIBADD = \ - - # -release $(LT_RELEASE) - libjasper_la_LDFLAGS = \ -- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -+ -no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) - - all: all-recursive - diff --git a/jasper/jasper-1.900.1-sleep.patch b/jasper/jasper-1.900.1-sleep.patch deleted file mode 100644 index b647e48..0000000 --- a/jasper/jasper-1.900.1-sleep.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -rup jasper-1.900.1/src/appl/tmrdemo.c jasper-1.900.1.new/src/appl/tmrdemo.c ---- jasper-1.900.1/src/appl/tmrdemo.c 2007-01-19 16:43:08.000000000 -0500 -+++ jasper-1.900.1.new/src/appl/tmrdemo.c 2008-09-09 09:14:21.000000000 -0400 -@@ -1,4 +1,5 @@ - #include -+#include - - int main(int argc, char **argv) - { -@@ -43,7 +44,7 @@ int main(int argc, char **argv) - printf("zero time %.3f us\n", t * 1e6); - - jas_tmr_start(&tmr); -- sleep(1); -+ Sleep(1); - jas_tmr_stop(&tmr); - t = jas_tmr_get(&tmr); - printf("time delay %.8f s\n", t); diff --git a/jasper/mingw32-jasper.spec b/jasper/mingw32-jasper.spec deleted file mode 100644 index 8896784..0000000 --- a/jasper/mingw32-jasper.spec +++ /dev/null @@ -1,122 +0,0 @@ -%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-jasper -Version: 1.900.1 -Release: 8%{?dist} -Summary: MinGW Windows Jasper library - -License: JasPer -Group: Development/Libraries - -URL: http://www.ece.uvic.ca/~mdadams/jasper/ -Source0: http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-%{version}.zip - -# Patches from Fedora native package. -# OpenGL is disabled in this build, so we don't need this patch: -#Patch1: jasper-1.701.0-GL.patch -# Note patch2 appears in native package, but is not applied: -#Patch2: jasper-1.701.0-GL-ac.patch -Patch3: patch-libjasper-stepsizes-overflow.diff - -# MinGW-specific patches. -# This patch adds '-no-undefined' flag to libtool line: -Patch1000: jasper-1.900.1-mingw32.patch -# This patch is a bit of a hack, but it's just there to fix a demo program: -Patch1001: jasper-1.900.1-sleep.patch - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch - -BuildRequires: mingw32-filesystem >= 23 -BuildRequires: mingw32-gcc -BuildRequires: mingw32-binutils -BuildRequires: mingw32-libjpeg -BuildRequires: mingw32-dlfcn - - -%description -MinGW Windows Jasper library. - - -%prep -%setup -q -n jasper-%{version} -%patch3 -p1 -b .CVE-2007-2721 - -%patch1000 -p1 -b .mingw32 -%patch1001 -p1 -b .sleep - - -%build -%{_mingw32_configure} \ - --disable-opengl --enable-libjpeg --disable-static --enable-shared -make %{?_smp_mflags} - - -%install -rm -rf $RPM_BUILD_ROOT - -make DESTDIR=$RPM_BUILD_ROOT install mandir=%{_mingw32_mandir} - -# Remove the manual pages - don't duplicate documentation which -# is in the native Fedora package. -rm $RPM_BUILD_ROOT%{_mingw32_mandir}/man1/* - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-,root,root,-) -%doc COPYRIGHT LICENSE NEWS README -%{_mingw32_bindir}/i686-pc-mingw32-imgcmp.exe -%{_mingw32_bindir}/i686-pc-mingw32-imginfo.exe -%{_mingw32_bindir}/i686-pc-mingw32-jasper.exe -%{_mingw32_bindir}/i686-pc-mingw32-tmrdemo.exe -%{_mingw32_bindir}/libjasper-1.dll -%{_mingw32_libdir}/libjasper.dll.a -%{_mingw32_libdir}/libjasper.la -%{_mingw32_includedir}/jasper/ - - -%changelog -* Mon Mar 9 2009 Richard W.M. Jones - 1.900.1-8 -- Fix defattr line. -- Remove the enable-shared patch, and just use --enable-shared on - the configure line. -- Disable the GL patch since OpenGL is disabled. -- Document what the patches are for in the spec file. -- Only patch Makefile.in so we don't have to rerun autotools, and - remove autotools dependency. - -* Fri Feb 20 2009 Richard W.M. Jones - 1.900.1-7 -- Rebuild for mingw32-gcc 4.4 - -* Fri Jan 23 2009 Richard W.M. Jones - 1.900.1-6 -- Use _smp_mflags. -- Disable static libraries. -- Include documentation. -- Use the same patches as Fedora native package. -- Just run autoconf instead of autoreconf so we don't upgrade libtool. -- +BR mingw32-dlfcn. -- Don't need the manual pages. - -* Wed Sep 24 2008 Richard W.M. Jones - 1.900.1-5 -- Rename mingw -> mingw32. - -* Mon Sep 22 2008 Daniel P. Berrange - 1.900.1-4 -- Add overflow patch from rawhide - -* Thu Sep 11 2008 Daniel P. Berrange - 1.900.1-3 -- Run autoreconf after changing configure.ac script and add BRs for autotools - -* Wed Sep 10 2008 Richard W.M. Jones - 1.900.1-2 -- Enable DLLs. -- Remove static libraries. - -* Tue Sep 9 2008 Daniel P. Berrange - 1.900.1-1 -- Initial RPM release diff --git a/jasper/patch-libjasper-stepsizes-overflow.diff b/jasper/patch-libjasper-stepsizes-overflow.diff deleted file mode 100644 index 097559f..0000000 --- a/jasper/patch-libjasper-stepsizes-overflow.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_cs.c 2007-01-19 22:43:07.000000000 +0100 -+++ jasper-1.900.1/src/libjasper/jpc/jpc_cs.c 2007-04-06 01:29:02.000000000 +0200 -@@ -982,7 +982,10 @@ static int jpc_qcx_getcompparms(jpc_qcxc - compparms->numstepsizes = (len - n) / 2; - break; - } -- if (compparms->numstepsizes > 0) { -+ if (compparms->numstepsizes > 3 * JPC_MAXRLVLS + 1) { -+ jpc_qcx_destroycompparms(compparms); -+ return -1; -+ } else if (compparms->numstepsizes > 0) { - compparms->stepsizes = jas_malloc(compparms->numstepsizes * - sizeof(uint_fast16_t)); - assert(compparms->stepsizes); diff --git a/pango/compare.supp b/pango/compare.supp deleted file mode 100644 index 3f06f32..0000000 --- a/pango/compare.supp +++ /dev/null @@ -1 +0,0 @@ -missing patch 'pango-1.21.4-lib64.patch' diff --git a/pango/mingw32-pango.spec b/pango/mingw32-pango.spec deleted file mode 100644 index 6a63f0b..0000000 --- a/pango/mingw32-pango.spec +++ /dev/null @@ -1,235 +0,0 @@ -%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-pango -Version: 1.23.0 -Release: 1%{?dist} -Summary: MinGW Windows Pango library - -License: LGPLv2+ -Group: Development/Libraries -URL: http://www.pango.org -Source0: http://download.gnome.org/sources/pango/1.23/pango-%{version}.tar.bz2 - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -# Native pango uses a %post script to generate this, but the -# pango-querymodules.exe binary is not something we can easily run on -# a Linux host. We could use wine but wine isn't happy in a mock -# environment. So we just include a pre-generated copy on basis that -# it won't ever change much. -# -# If you want to rebuild this, do: -# wine %{_mingw32_bindir}/pango-querymodules.exe > pango.modules -Source1: pango.modules - -Patch1000: pango_enable_static_build.patch - -BuildArch: noarch - -BuildRequires: mingw32-filesystem >= 23 -BuildRequires: mingw32-gcc -BuildRequires: mingw32-binutils - -BuildRequires: mingw32-cairo >= 1.8.0 -BuildRequires: mingw32-dlfcn -BuildRequires: mingw32-expat -BuildRequires: mingw32-fontconfig -BuildRequires: mingw32-freetype -BuildRequires: mingw32-gettext -BuildRequires: mingw32-glib2 -BuildRequires: mingw32-iconv -BuildRequires: mingw32-libpng -BuildRequires: mingw32-pixman -BuildRequires: pkgconfig - -# Required in order to rebuild the configure script. -BuildRequires: gtk-doc - -# These are required for the patch -BuildRequires: autoconf, automake, libtool - -Requires: pkgconfig - - -%description -MinGW Windows Pango library. - - -%package static -Summary: Static version of the MinGW Windows Pango library -Requires: %{name} = %{version}-%{release} -Group: Development/Libraries - -%description static -Static version of the MinGW Windows Pango library. - - -%prep -%setup -q -n pango-%{version} -%patch1000 - -# Regenerate the configure script -aclocal -autoreconf -libtoolize - - -%build -# Need to run the correct version of glib-mkenums. -PATH=%{_mingw32_bindir}:$PATH \ -%{_mingw32_configure} --enable-static --enable-shared -make %{?_smp_mflags} - - -%install -rm -rf $RPM_BUILD_ROOT - -make DESTDIR=$RPM_BUILD_ROOT install - -mkdir -p $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/pango/ -cp %{SOURCE1} $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/pango/ - -rm -f $RPM_BUILD_ROOT/%{_mingw32_libdir}/charset.alias - -rm $RPM_BUILD_ROOT/%{_mingw32_mandir}/man1/*.1 - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-,root,root,-) -%doc COPYING -%{_mingw32_bindir}/libpango-1.0-0.dll -%{_mingw32_bindir}/libpangocairo-1.0-0.dll -%{_mingw32_bindir}/libpangoft2-1.0-0.dll -%{_mingw32_bindir}/libpangowin32-1.0-0.dll -%{_mingw32_bindir}/pango-querymodules.exe -%{_mingw32_includedir}/pango-1.0/ -%{_mingw32_libdir}/libpango-1.0.dll.a -%{_mingw32_libdir}/libpango-1.0.la -%{_mingw32_libdir}/libpangocairo-1.0.dll.a -%{_mingw32_libdir}/libpangocairo-1.0.la -%{_mingw32_libdir}/libpangoft2-1.0.dll.a -%{_mingw32_libdir}/libpangoft2-1.0.la -%{_mingw32_libdir}/libpangowin32-1.0.dll.a -%{_mingw32_libdir}/libpangowin32-1.0.la -%{_mingw32_libdir}/pango-1.0.def -%{_mingw32_libdir}/pangocairo-1.0.def -%{_mingw32_libdir}/pangoft2-1.0.def -%{_mingw32_libdir}/pangowin32-1.0.def -%dir %{_mingw32_libdir}/pango -%dir %{_mingw32_libdir}/pango/1.6.0 -%dir %{_mingw32_libdir}/pango/1.6.0/modules -%{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-win32.dll -%{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-win32.dll.a -%{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-win32.la -%{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-lang.dll -%{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-lang.dll.a -%{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-lang.la -%{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-lang.dll -%{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-lang.dll.a -%{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-lang.la -%{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-fc.dll -%{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-fc.dll.a -%{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-fc.la -%{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-fc.dll -%{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-fc.dll.a -%{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-fc.la -%{_mingw32_libdir}/pango/1.6.0/modules/pango-hangul-fc.dll -%{_mingw32_libdir}/pango/1.6.0/modules/pango-hangul-fc.dll.a -%{_mingw32_libdir}/pango/1.6.0/modules/pango-hangul-fc.la -%{_mingw32_libdir}/pango/1.6.0/modules/pango-hebrew-fc.dll -%{_mingw32_libdir}/pango/1.6.0/modules/pango-hebrew-fc.dll.a -%{_mingw32_libdir}/pango/1.6.0/modules/pango-hebrew-fc.la -%{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-fc.dll -%{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-fc.dll.a -%{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-fc.la -%{_mingw32_libdir}/pango/1.6.0/modules/pango-khmer-fc.dll -%{_mingw32_libdir}/pango/1.6.0/modules/pango-khmer-fc.dll.a -%{_mingw32_libdir}/pango/1.6.0/modules/pango-khmer-fc.la -%{_mingw32_libdir}/pango/1.6.0/modules/pango-syriac-fc.dll -%{_mingw32_libdir}/pango/1.6.0/modules/pango-syriac-fc.dll.a -%{_mingw32_libdir}/pango/1.6.0/modules/pango-syriac-fc.la -%{_mingw32_libdir}/pango/1.6.0/modules/pango-thai-fc.dll -%{_mingw32_libdir}/pango/1.6.0/modules/pango-thai-fc.dll.a -%{_mingw32_libdir}/pango/1.6.0/modules/pango-thai-fc.la -%{_mingw32_libdir}/pango/1.6.0/modules/pango-tibetan-fc.dll -%{_mingw32_libdir}/pango/1.6.0/modules/pango-tibetan-fc.dll.a -%{_mingw32_libdir}/pango/1.6.0/modules/pango-tibetan-fc.la -%{_mingw32_libdir}/pkgconfig/pango.pc -%{_mingw32_libdir}/pkgconfig/pangocairo.pc -%{_mingw32_libdir}/pkgconfig/pangoft2.pc -%{_mingw32_libdir}/pkgconfig/pangowin32.pc -%{_mingw32_datadir}/gtk-doc/html/pango/ -%{_mingw32_sysconfdir}/pango/ - - -%files static -%defattr(-,root,root,-) -%{_mingw32_libdir}/libpango-1.0.a -%{_mingw32_libdir}/libpangocairo-1.0.a -%{_mingw32_libdir}/libpangoft2-1.0.a -%{_mingw32_libdir}/libpangowin32-1.0.a -%{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-win32.a -%{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-lang.a -%{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-lang.a -%{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-fc.a -%{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-fc.a -%{_mingw32_libdir}/pango/1.6.0/modules/pango-hangul-fc.a -%{_mingw32_libdir}/pango/1.6.0/modules/pango-hebrew-fc.a -%{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-fc.a -%{_mingw32_libdir}/pango/1.6.0/modules/pango-khmer-fc.a -%{_mingw32_libdir}/pango/1.6.0/modules/pango-syriac-fc.a -%{_mingw32_libdir}/pango/1.6.0/modules/pango-thai-fc.a -%{_mingw32_libdir}/pango/1.6.0/modules/pango-tibetan-fc.a - - -%changelog -* Mon Mar 9 2009 Richard W.M. Jones - 1.23.0-1 -- Remove man page which duplicates what is in base Fedora. -- Rebase to 1.23.0 to match Fedora. -- +BR mingw32-dlfcn. - -* Fri Feb 20 2009 Erik van Pienbroek - 1.22.1-6 -- Added -static subpackage - -* Fri Feb 20 2009 Richard W.M. Jones - 1.22.1-5 -- Rebuild for mingw32-gcc 4.4 - -* Fri Jan 30 2009 Richard W.M. Jones - 1.22.1-4 -- Requires pkgconfig. - -* Tue Jan 27 2009 Levente Farkas - 1.22.1-3 -- Include license file in documentation section. - -* Fri Jan 23 2009 Richard W.M. Jones - 1.22.1-2 -- Disable static libraries. -- Use _smp_mflags. - -* Fri Oct 24 2008 Richard W.M. Jones - 1.22.1-1 -- New upstream version 1.22.1. -- BR cairo >= 1.8.0 because of important fixes. - -* Wed Sep 24 2008 Richard W.M. Jones - 1.21.6-6 -- Rename mingw -> mingw32. - -* Tue Sep 23 2008 Daniel P. Berrange - 1.21.6-5 -- Remove use of wine in %-post. - -* Thu Sep 11 2008 Daniel P. Berrange - 1.21.6-4 -- Add dep on pkgconfig - -* Thu Sep 11 2008 Richard W.M. Jones - 1.21.6-3 -- post/preun scripts to update the pango.modules list. - -* Wed Sep 10 2008 Richard W.M. Jones - 1.21.6-2 -- Run the correct glib-mkenums. - -* Tue Sep 9 2008 Daniel P. Berrange - 1.21.6-1 -- Initial RPM release diff --git a/pango/pango.modules b/pango/pango.modules deleted file mode 100644 index 79538e8..0000000 --- a/pango/pango.modules +++ /dev/null @@ -1,35 +0,0 @@ -# Pango Modules file -# Automatically generated file, do not edit -# -# ModulesPath = Z:\usr\i686-pc-mingw32\sys-root\mingw\lib\pango\1.6.0\modules -# -"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-thai-fc.dll" ThaiScriptEngineFc PangoEngineShape PangoRenderFc thai:* lao:* -"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-basic-win32.dll" BasicScriptEngineWin32 PangoEngineShape PangoRenderWin32 common: -"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" devaScriptEngineFc PangoEngineShape PangoRenderFc devanagari:* -"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" bengScriptEngineFc PangoEngineShape PangoRenderFc bengali:* -"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" guruScriptEngineFc PangoEngineShape PangoRenderFc gurmukhi:* -"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" gujrScriptEngineFc PangoEngineShape PangoRenderFc gujarati:* -"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" oryaScriptEngineFc PangoEngineShape PangoRenderFc oriya:* -"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" tamlScriptEngineFc PangoEngineShape PangoRenderFc tamil:* -"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" teluScriptEngineFc PangoEngineShape PangoRenderFc telugu:* -"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" kndaScriptEngineFc PangoEngineShape PangoRenderFc kannada:* -"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" mlymScriptEngineFc PangoEngineShape PangoRenderFc malayalam:* -"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" sinhScriptEngineFc PangoEngineShape PangoRenderFc sinhala:* -"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-syriac-fc.dll" SyriacScriptEngineFc PangoEngineShape PangoRenderFc syriac:* -"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-khmer-fc.dll" KhmerScriptEngineFc PangoEngineShape PangoRenderFc khmer:* -"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-arabic-lang.dll" ArabicScriptEngineLang PangoEngineLang PangoRenderNone arabic:* -"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-basic-fc.dll" BasicScriptEngineFc PangoEngineShape PangoRenderFc latin:* cyrillic:* greek:* armenian:* georgian:* runic:* ogham:* bopomofo:* cherokee:* coptic:* deseret:* ethiopic:* gothic:* han:* hiragana:* katakana:* old-italic:* canadian-aboriginal:* yi:* braille:* cypriot:* limbu:* osmanya:* shavian:* linear-b:* ugaritic:* glagolitic:* cuneiform:* phoenician:* common: -"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-arabic-fc.dll" ArabicScriptEngineFc PangoEngineShape PangoRenderFc arabic:* nko:* -"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" devaIndicScriptEngineLang PangoEngineLang PangoRenderNone devanagari:* -"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" bengIndicScriptEngineLang PangoEngineLang PangoRenderNone bengali:* -"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" guruIndicScriptEngineLang PangoEngineLang PangoRenderNone gurmukhi:* -"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" gujrIndicScriptEngineLang PangoEngineLang PangoRenderNone gujarati:* -"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" oryaIndicScriptEngineLang PangoEngineLang PangoRenderNone oriya:* -"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" tamlIndicScriptEngineLang PangoEngineLang PangoRenderNone tamil:* -"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" teluIndicScriptEngineLang PangoEngineLang PangoRenderNone telugu:* -"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" kndaIndicScriptEngineLang PangoEngineLang PangoRenderNone kannada:* -"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" mlymIndicScriptEngineLang PangoEngineLang PangoRenderNone malayalam:* -"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" sinhIndicScriptEngineLang PangoEngineLang PangoRenderNone sinhala:* -"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-hebrew-fc.dll" HebrewScriptEngineFc PangoEngineShape PangoRenderFc hebrew:* -"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-tibetan-fc.dll" TibetanScriptEngineFc PangoEngineShape PangoRenderFc tibetan:* -"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-hangul-fc.dll" HangulScriptEngineFc PangoEngineShape PangoRenderFc hangul:* diff --git a/pango/pango_enable_static_build.patch b/pango/pango_enable_static_build.patch deleted file mode 100644 index 09941d0..0000000 --- a/pango/pango_enable_static_build.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- configure.in.orig 2009-02-20 20:37:09.166924103 +0100 -+++ configure.in 2009-02-20 20:37:20.893924816 +0100 -@@ -123,16 +123,16 @@ - AC_LIBTOOL_WIN32_DLL - AM_DISABLE_STATIC - --if test "$pango_os_win32" = "yes"; then -- if test x$enable_static = xyes -o x$enable_static = x; then -- AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.]) -- enable_static=no -- fi -- if test x$enable_shared = xno; then -- AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.]) -- fi -- enable_shared=yes --fi -+#if test "$pango_os_win32" = "yes"; then -+# if test x$enable_static = xyes -o x$enable_static = x; then -+# AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.]) -+# enable_static=no -+# fi -+# if test x$enable_shared = xno; then -+# AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.]) -+# fi -+# enable_shared=yes -+#fi - - AM_PROG_LIBTOOL - dnl when using libtool 2.x create libtool early, because it's used in configure diff --git a/pangomm/mingw32-pangomm.spec b/pangomm/mingw32-pangomm.spec deleted file mode 100644 index d97b5fe..0000000 --- a/pangomm/mingw32-pangomm.spec +++ /dev/null @@ -1,93 +0,0 @@ -%define __strip %{_mingw32_strip} -%define __objdump %{_mingw32_objdump} -%define _use_internal_dependency_generator 0 -%define __find_requires %{_mingw32_findrequires} -%define __find_provides %{_mingw32_findprovides} - -%define apiver 1.4 - -Name: mingw32-pangomm -Version: 2.14.0 -Release: 6%{?dist} -Summary: MinGW Windows C++ interface for Pango - -License: LGPLv2+ -Group: Development/Libraries -URL: http://gtkmm.sourceforge.net/ -Source0: http://ftp.gnome.org/pub/GNOME/sources/pangomm/2.14/pangomm-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Patch0: pangomm-2.14.0-devhelp.patch - -BuildArch: noarch - -BuildRequires: mingw32-filesystem >= 30 -BuildRequires: mingw32-gcc -BuildRequires: mingw32-gcc-c++ -BuildRequires: mingw32-binutils -BuildRequires: mingw32-glibmm24 >= 2.14.1 -BuildRequires: mingw32-cairomm >= 1.2.2 -BuildRequires: mingw32-pango >= 1.21.4 -BuildRequires: doxygen -BuildRequires: graphviz - -Requires: pkgconfig - - -%description -pangomm provides a C++ interface to the Pango library. Highlights -include typesafe callbacks, widgets extensible via inheritance and a -comprehensive set of widget classes that can be freely combined to -quickly create complex user interfaces. - - -%prep -%setup -q -n pangomm-%{version} -%patch0 -p1 -b .devhelp - - -%build -%{_mingw32_configure} --disable-static -make %{?_smp_mflags} - - -%install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install - -rm -r $RPM_BUILD_ROOT%{_mingw32_libdir}/pangomm-%{apiver} - -# Remove documentation. -rm -r $RPM_BUILD_ROOT%{_mingw32_docdir}/pangomm-%{apiver} -rm -r $RPM_BUILD_ROOT%{_mingw32_datadir}/devhelp - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-,root,root) -%doc COPYING COPYING.tools -%{_mingw32_bindir}/libpangomm-%{apiver}-1.dll -%{_mingw32_libdir}/libpangomm-%{apiver}.la -%{_mingw32_libdir}/libpangomm-%{apiver}.dll.a -%{_mingw32_libdir}/pkgconfig/pangomm-%{apiver}.pc -%{_mingw32_includedir}/pangomm-%{apiver} - - -%changelog -* Fri Feb 20 2009 Richard W.M. Jones - 2.14.0-6 -- Rebuild for mingw32-gcc 4.4 - -* Fri Feb 6 2009 Richard W.M. Jones - 2.14.0-5 -- Include license file. - -* Fri Jan 23 2009 Richard W.M. Jones - 2.14.0-4 -- Use _smp_mflags. - -* Tue Jan 13 2009 Richard W.M. Jones - 2.14.0-3 -- Requires pkgconfig. - -* Fri Oct 24 2008 Richard W.M. Jones - 2.14.0-2 -- Initial RPM release. diff --git a/pangomm/pangomm-2.14.0-devhelp.patch b/pangomm/pangomm-2.14.0-devhelp.patch deleted file mode 100644 index 10f6de2..0000000 --- a/pangomm/pangomm-2.14.0-devhelp.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- pangomm-2.14.0/docs/reference/pangomm-1.4.devhelp~ 2008-08-02 12:02:10.000000000 +0200 -+++ pangomm-2.14.0/docs/reference/pangomm-1.4.devhelp 2008-10-12 11:54:51.000000000 +0200 -@@ -1,5 +1,5 @@ - -- -+ - - - diff --git a/qt-win/application.qrc b/qt-win/application.qrc deleted file mode 100644 index 986ac3b..0000000 --- a/qt-win/application.qrc +++ /dev/null @@ -1,10 +0,0 @@ - - - copy.png - cut.png - new.png - open.png - paste.png - save.png - - \ No newline at end of file diff --git a/qt-win/copy.png b/qt-win/copy.png deleted file mode 100644 index 9d12fc2..0000000 Binary files a/qt-win/copy.png and /dev/null differ diff --git a/qt-win/cut.png b/qt-win/cut.png deleted file mode 100644 index 2fb9af4..0000000 Binary files a/qt-win/cut.png and /dev/null differ diff --git a/qt-win/example.pro b/qt-win/example.pro deleted file mode 100644 index 2b0975d..0000000 --- a/qt-win/example.pro +++ /dev/null @@ -1,16 +0,0 @@ -# Simple application example from: -# http://doc.trolltech.com/4.0/mainwindows-application.html -# -# Process this file with -# QMAKESPEC=fedora-win32-cross qmake-qt4 -win32 example.pro -# and then run 'make'. - -TEMPLATE = app -TARGET = example - -CONFIG += qt warn_on - -HEADERS = mainwindow.h -SOURCES = mainwindow.cpp main.cpp - -RESOURCES += application.qrc diff --git a/qt-win/main.cpp b/qt-win/main.cpp deleted file mode 100644 index 4024c69..0000000 --- a/qt-win/main.cpp +++ /dev/null @@ -1,36 +0,0 @@ -/**************************************************************************** - ** - ** Copyright (C) 2004-2005 Trolltech AS. All rights reserved. - ** - ** This file is part of the documentation of the Qt Toolkit. - ** - ** This file may be used under the terms of the GNU General Public -** License version 2.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of -** this file. Please review the following information to ensure GNU -** General Public Licensing requirements will be met: -** http://www.trolltech.com/products/qt/opensource.html -** -** If you are unsure which license is appropriate for your use, please -** review the following information: -** http://www.trolltech.com/products/qt/licensing.html or contact the -** sales department at sales@trolltech.com. - ** - ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE - ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - ** - ****************************************************************************/ - - #include - - #include "mainwindow.h" - - int main(int argc, char *argv[]) - { - Q_INIT_RESOURCE(application); - - QApplication app(argc, argv); - MainWindow mainWin; - mainWin.show(); - return app.exec(); - } diff --git a/qt-win/mainwindow.cpp b/qt-win/mainwindow.cpp deleted file mode 100644 index faa104f..0000000 --- a/qt-win/mainwindow.cpp +++ /dev/null @@ -1,296 +0,0 @@ -/**************************************************************************** - ** - ** Copyright (C) 2004-2005 Trolltech AS. All rights reserved. - ** - ** This file is part of the documentation of the Qt Toolkit. - ** - ** This file may be used under the terms of the GNU General Public -** License version 2.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of -** this file. Please review the following information to ensure GNU -** General Public Licensing requirements will be met: -** http://www.trolltech.com/products/qt/opensource.html -** -** If you are unsure which license is appropriate for your use, please -** review the following information: -** http://www.trolltech.com/products/qt/licensing.html or contact the -** sales department at sales@trolltech.com. - ** - ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE - ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - ** - ****************************************************************************/ - - #include - - #include "mainwindow.h" - - MainWindow::MainWindow() - { - textEdit = new QTextEdit; - setCentralWidget(textEdit); - - createActions(); - createMenus(); - createToolBars(); - createStatusBar(); - - readSettings(); - - connect(textEdit->document(), SIGNAL(contentsChanged()), - this, SLOT(documentWasModified())); - - setCurrentFile(""); - } - - void MainWindow::closeEvent(QCloseEvent *event) - { - if (maybeSave()) { - writeSettings(); - event->accept(); - } else { - event->ignore(); - } - } - - void MainWindow::newFile() - { - if (maybeSave()) { - textEdit->clear(); - setCurrentFile(""); - } - } - - void MainWindow::open() - { - if (maybeSave()) { - QString fileName = QFileDialog::getOpenFileName(this); - if (!fileName.isEmpty()) - loadFile(fileName); - } - } - - bool MainWindow::save() - { - if (curFile.isEmpty()) { - return saveAs(); - } else { - return saveFile(curFile); - } - } - - bool MainWindow::saveAs() - { - QString fileName = QFileDialog::getSaveFileName(this); - if (fileName.isEmpty()) - return false; - - return saveFile(fileName); - } - - void MainWindow::about() - { - QMessageBox::about(this, tr("About Application"), - tr("The Application example demonstrates how to " - "write modern GUI applications using Qt, with a menu bar, " - "toolbars, and a status bar.")); - } - - void MainWindow::documentWasModified() - { - setWindowModified(true); - } - - void MainWindow::createActions() - { - newAct = new QAction(QIcon(":/images/new.png"), tr("&New"), this); - newAct->setShortcut(tr("Ctrl+N")); - newAct->setStatusTip(tr("Create a new file")); - connect(newAct, SIGNAL(triggered()), this, SLOT(newFile())); - - openAct = new QAction(QIcon(":/images/open.png"), tr("&Open..."), this); - openAct->setShortcut(tr("Ctrl+O")); - openAct->setStatusTip(tr("Open an existing file")); - connect(openAct, SIGNAL(triggered()), this, SLOT(open())); - - saveAct = new QAction(QIcon(":/images/save.png"), tr("&Save"), this); - saveAct->setShortcut(tr("Ctrl+S")); - saveAct->setStatusTip(tr("Save the document to disk")); - connect(saveAct, SIGNAL(triggered()), this, SLOT(save())); - - saveAsAct = new QAction(tr("Save &As..."), this); - saveAsAct->setStatusTip(tr("Save the document under a new name")); - connect(saveAsAct, SIGNAL(triggered()), this, SLOT(saveAs())); - - exitAct = new QAction(tr("E&xit"), this); - exitAct->setShortcut(tr("Ctrl+Q")); - exitAct->setStatusTip(tr("Exit the application")); - connect(exitAct, SIGNAL(triggered()), this, SLOT(close())); - - cutAct = new QAction(QIcon(":/images/cut.png"), tr("Cu&t"), this); - cutAct->setShortcut(tr("Ctrl+X")); - cutAct->setStatusTip(tr("Cut the current selection's contents to the " - "clipboard")); - connect(cutAct, SIGNAL(triggered()), textEdit, SLOT(cut())); - - copyAct = new QAction(QIcon(":/images/copy.png"), tr("&Copy"), this); - copyAct->setShortcut(tr("Ctrl+C")); - copyAct->setStatusTip(tr("Copy the current selection's contents to the " - "clipboard")); - connect(copyAct, SIGNAL(triggered()), textEdit, SLOT(copy())); - - pasteAct = new QAction(QIcon(":/images/paste.png"), tr("&Paste"), this); - pasteAct->setShortcut(tr("Ctrl+V")); - pasteAct->setStatusTip(tr("Paste the clipboard's contents into the current " - "selection")); - connect(pasteAct, SIGNAL(triggered()), textEdit, SLOT(paste())); - - aboutAct = new QAction(tr("&About"), this); - aboutAct->setStatusTip(tr("Show the application's About box")); - connect(aboutAct, SIGNAL(triggered()), this, SLOT(about())); - - aboutQtAct = new QAction(tr("About &Qt"), this); - aboutQtAct->setStatusTip(tr("Show the Qt library's About box")); - connect(aboutQtAct, SIGNAL(triggered()), qApp, SLOT(aboutQt())); - - cutAct->setEnabled(false); - copyAct->setEnabled(false); - connect(textEdit, SIGNAL(copyAvailable(bool)), - cutAct, SLOT(setEnabled(bool))); - connect(textEdit, SIGNAL(copyAvailable(bool)), - copyAct, SLOT(setEnabled(bool))); - } - - void MainWindow::createMenus() - { - fileMenu = menuBar()->addMenu(tr("&File")); - fileMenu->addAction(newAct); - fileMenu->addAction(openAct); - fileMenu->addAction(saveAct); - fileMenu->addAction(saveAsAct); - fileMenu->addSeparator(); - fileMenu->addAction(exitAct); - - editMenu = menuBar()->addMenu(tr("&Edit")); - editMenu->addAction(cutAct); - editMenu->addAction(copyAct); - editMenu->addAction(pasteAct); - - menuBar()->addSeparator(); - - helpMenu = menuBar()->addMenu(tr("&Help")); - helpMenu->addAction(aboutAct); - helpMenu->addAction(aboutQtAct); - } - - void MainWindow::createToolBars() - { - fileToolBar = addToolBar(tr("File")); - fileToolBar->addAction(newAct); - fileToolBar->addAction(openAct); - fileToolBar->addAction(saveAct); - - editToolBar = addToolBar(tr("Edit")); - editToolBar->addAction(cutAct); - editToolBar->addAction(copyAct); - editToolBar->addAction(pasteAct); - } - - void MainWindow::createStatusBar() - { - statusBar()->showMessage(tr("Ready")); - } - - void MainWindow::readSettings() - { - QSettings settings("Trolltech", "Application Example"); - QPoint pos = settings.value("pos", QPoint(200, 200)).toPoint(); - QSize size = settings.value("size", QSize(400, 400)).toSize(); - resize(size); - move(pos); - } - - void MainWindow::writeSettings() - { - QSettings settings("Trolltech", "Application Example"); - settings.setValue("pos", pos()); - settings.setValue("size", size()); - } - - bool MainWindow::maybeSave() - { - if (textEdit->document()->isModified()) { - int ret = QMessageBox::warning(this, tr("Application"), - tr("The document has been modified.\n" - "Do you want to save your changes?"), - QMessageBox::Yes | QMessageBox::Default, - QMessageBox::No, - QMessageBox::Cancel | QMessageBox::Escape); - if (ret == QMessageBox::Yes) - return save(); - else if (ret == QMessageBox::Cancel) - return false; - } - return true; - } - - void MainWindow::loadFile(const QString &fileName) - { - QFile file(fileName); - if (!file.open(QFile::ReadOnly | QFile::Text)) { - QMessageBox::warning(this, tr("Application"), - tr("Cannot read file %1:\n%2.") - .arg(fileName) - .arg(file.errorString())); - return; - } - - QTextStream in(&file); - QApplication::setOverrideCursor(Qt::WaitCursor); - textEdit->setPlainText(in.readAll()); - QApplication::restoreOverrideCursor(); - - setCurrentFile(fileName); - statusBar()->showMessage(tr("File loaded"), 2000); - } - - bool MainWindow::saveFile(const QString &fileName) - { - QFile file(fileName); - if (!file.open(QFile::WriteOnly | QFile::Text)) { - QMessageBox::warning(this, tr("Application"), - tr("Cannot write file %1:\n%2.") - .arg(fileName) - .arg(file.errorString())); - return false; - } - - QTextStream out(&file); - QApplication::setOverrideCursor(Qt::WaitCursor); - out << textEdit->toPlainText(); - QApplication::restoreOverrideCursor(); - - setCurrentFile(fileName); - statusBar()->showMessage(tr("File saved"), 2000); - return true; - } - - void MainWindow::setCurrentFile(const QString &fileName) - { - curFile = fileName; - textEdit->document()->setModified(false); - setWindowModified(false); - - QString shownName; - if (curFile.isEmpty()) - shownName = "untitled.txt"; - else - shownName = strippedName(curFile); - - setWindowTitle(tr("%1[*] - %2").arg(shownName).arg(tr("Application"))); - } - - QString MainWindow::strippedName(const QString &fullFileName) - { - return QFileInfo(fullFileName).fileName(); - } diff --git a/qt-win/mainwindow.h b/qt-win/mainwindow.h deleted file mode 100644 index 4fef93d..0000000 --- a/qt-win/mainwindow.h +++ /dev/null @@ -1,84 +0,0 @@ -/**************************************************************************** - ** - ** Copyright (C) 2004-2005 Trolltech AS. All rights reserved. - ** - ** This file is part of the documentation of the Qt Toolkit. - ** - ** This file may be used under the terms of the GNU General Public -** License version 2.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of -** this file. Please review the following information to ensure GNU -** General Public Licensing requirements will be met: -** http://www.trolltech.com/products/qt/opensource.html -** -** If you are unsure which license is appropriate for your use, please -** review the following information: -** http://www.trolltech.com/products/qt/licensing.html or contact the -** sales department at sales@trolltech.com. - ** - ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE - ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - ** - ****************************************************************************/ - - #ifndef MAINWINDOW_H - #define MAINWINDOW_H - - #include - - class QAction; - class QMenu; - class QTextEdit; - - class MainWindow : public QMainWindow - { - Q_OBJECT - - public: - MainWindow(); - - protected: - void closeEvent(QCloseEvent *event); - - private slots: - void newFile(); - void open(); - bool save(); - bool saveAs(); - void about(); - void documentWasModified(); - - private: - void createActions(); - void createMenus(); - void createToolBars(); - void createStatusBar(); - void readSettings(); - void writeSettings(); - bool maybeSave(); - void loadFile(const QString &fileName); - bool saveFile(const QString &fileName); - void setCurrentFile(const QString &fileName); - QString strippedName(const QString &fullFileName); - - QTextEdit *textEdit; - QString curFile; - - QMenu *fileMenu; - QMenu *editMenu; - QMenu *helpMenu; - QToolBar *fileToolBar; - QToolBar *editToolBar; - QAction *newAct; - QAction *openAct; - QAction *saveAct; - QAction *saveAsAct; - QAction *exitAct; - QAction *cutAct; - QAction *copyAct; - QAction *pasteAct; - QAction *aboutAct; - QAction *aboutQtAct; - }; - - #endif diff --git a/qt-win/mingw32-qt-4.4.3-no-fpu-functions.patch b/qt-win/mingw32-qt-4.4.3-no-fpu-functions.patch deleted file mode 100644 index 368f6e7..0000000 --- a/qt-win/mingw32-qt-4.4.3-no-fpu-functions.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -ur qt-win-opensource-src-4.4.3.orig/src/corelib/tools/qlocale.cpp qt-win-opensource-src-4.4.3/src/corelib/tools/qlocale.cpp ---- qt-win-opensource-src-4.4.3.orig/src/corelib/tools/qlocale.cpp 2008-09-27 10:00:55.000000000 +0100 -+++ qt-win-opensource-src-4.4.3/src/corelib/tools/qlocale.cpp 2009-02-02 11:39:40.000000000 +0000 -@@ -6238,6 +6238,10 @@ - - Q_CORE_EXPORT char *qdtoa ( double d, int mode, int ndigits, int *decpt, int *sign, char **rve, char **resultp) - { -+ // RWMJ: The 8087-twiddling functions just don't seem to exist -+ // in MinGW cross-compiler, so comment out that code and hope for -+ // the best ... -+#if 0 - // Some values of the floating-point control word can cause _qdtoa to crash with an underflow. - // We set a safe value here. - #ifdef Q_OS_WIN -@@ -6257,9 +6261,11 @@ - fenv_t envp; - feholdexcept(&envp); - #endif -+#endif - - char *s = _qdtoa(d, mode, ndigits, decpt, sign, rve, resultp); - -+#if 0 // RWMJ - see above. - #ifdef Q_OS_WIN - _clear87(); - #ifndef _M_X64 -@@ -6272,6 +6278,7 @@ - #if defined(Q_OS_LINUX) && !defined(__UCLIBC__) - fesetenv(&envp); - #endif -+#endif - - return s; - } diff --git a/qt-win/mingw32-qt-win.spec b/qt-win/mingw32-qt-win.spec deleted file mode 100644 index d75d682..0000000 --- a/qt-win/mingw32-qt-win.spec +++ /dev/null @@ -1,201 +0,0 @@ -%define __strip %{_mingw32_strip} -%define __objdump %{_mingw32_objdump} -%define _use_internal_dependency_generator 0 -%define __find_requires %{_mingw32_findrequires} -%define __find_provides %{_mingw32_findprovides} - -# NOTES, please read these carefully first: -# -# . We only build a few libraries at the moment, those listed in -# %{subdirs} below. We could build more without too much effort. -# -# . We should build our own qmake instead of relying on the one -# from the native Fedora package. The reason is so that we can -# set the default include and library paths correctly. - -%define subdirs src/corelib src/xml src/network src/gui src/winmain src/svg src/sql src/qt3support - -Name: mingw32-qt-win -Version: 4.5.0 -Release: 1%{?dist} -Summary: Qt for Windows - -License: GPLv3 with exceptions or LGPLv2 with exceptions -Group: Development/Libraries - -URL: http://www.qtsoftware.com/ -Source0: ftp://ftp.trolltech.no/qt/source/qt-win-opensource-src-%{version}.zip - -# To make the configure patch - see below. -Source1: qt-win-configure.sh - -# Override .qmake.cache -Source2: qmake.cache.in - -# Special cross-compilation qmake target. -Source3: qmake.conf -Source4: qplatformdefs.h - -# Qt-win is supplied with a binary configure.exe. Although we have source -# for this, (a) it can't be compiled on Linux, and (b) we cannot run -# the Windows binary during the build. Instead we run the command by -# hand and create this diff to record what it did. -# -# Generate this patch using "qt-win-configure.sh". -Patch0: qt-win-configure.patch - -Patch11: mingw32-qt-4.4.3-no-fpu-functions.patch - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch - -BuildRequires: mingw32-filesystem >= 35 -BuildRequires: mingw32-gcc -BuildRequires: mingw32-gcc-c++ -BuildRequires: mingw32-binutils - -# For the native qmake, moc programs. -# Note that the precise same native version is required - eg. moc will -# not work unless it's the same version. -#BuildRequires: qt-devel = %{version} Stupid, can't write this ... -BuildRequires: qt-devel - -BuildRequires: zip -BuildRequires: dos2unix - -# This is required because we want qmake, but also because we -# install the cross-compile qmake specs into a directory owned -# by this package. -Requires: qt-devel - - -%description -This package contains the Qt software toolkit for developing -cross-platform applications. - -This is the Windows version of Qt, for use in conjunction with the -Fedora Windows cross-compiler. - - -%prep -%setup -q -n qt-win-opensource-src-%{version} - -%patch0 -p1 - -%patch11 -p1 - -for f in LICENSE.GPL3 LICENSE.LGPL LGPL_EXCEPTION.txt KNOWN.ISSUES README; do - dos2unix --keepdate $f -done - -# Override the .qmake.cache file. -rm .qmake.cache -sed -e s,@builddir@,$(pwd),g < %{SOURCE2} > .qmake.cache - -# Cross-compilation qmake target. -mkdir mkspecs/fedora-win32-cross -cp %{SOURCE3} %{SOURCE4} mkspecs/fedora-win32-cross - - -%build -for d in %{subdirs}; do - # Precompiled headers from a previous iteration of this loop - # cause the compiler deep confusion, so make sure any are removed - # _and_ the PCH directories are fresh and empty. - rm -rf tmp/obj/release_shared/qt_pch.h.gch - mkdir -p tmp/obj/release_shared/qt_pch.h.gch - rm -rf tmp/obj/release_shared/qt_gui_pch.h.gch - mkdir -p tmp/obj/release_shared/qt_gui_pch.h.gch - - # Now build in this directory. - pushd $d - qmake-qt4 -win32 *.pro - make %{?_smp_mflags} - popd -done - - -%install -rm -rf $RPM_BUILD_ROOT - -for d in %{subdirs}; do - # As above ... WTF is Qt doing confusing make and make install?? - rm -rf tmp/obj/release_shared/qt_pch.h.gch - mkdir -p tmp/obj/release_shared/qt_pch.h.gch - rm -rf tmp/obj/release_shared/qt_gui_pch.h.gch - mkdir -p tmp/obj/release_shared/qt_gui_pch.h.gch - - pushd $d - make %{?_smp_mflags} INSTALL_ROOT=$RPM_BUILD_ROOT install - popd -done - -# Qt ignores our carefully configured directories and just -# puts stuff in default directories. Move them to the proper -# places ... -# (Actually this may be because we are using the native qmake) -mkdir -p $RPM_BUILD_ROOT%{_mingw32_includedir} -mv $RPM_BUILD_ROOT%{_includedir}/* $RPM_BUILD_ROOT%{_mingw32_includedir} -mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir} -mkdir -p $RPM_BUILD_ROOT%{_mingw32_libdir} -mv $RPM_BUILD_ROOT%{_libdir}/*.dll $RPM_BUILD_ROOT%{_mingw32_bindir} -mv $RPM_BUILD_ROOT%{_libdir}/*.a $RPM_BUILD_ROOT%{_mingw32_libdir} -rm $RPM_BUILD_ROOT%{_libdir}/qt4/bin/* -rm $RPM_BUILD_ROOT%{_libdir}/*.prl - -# Cross-compiler qmake specs. -mkdir -p $RPM_BUILD_ROOT%{_libdir}/qt4/mkspecs/fedora-win32-cross -cp %{SOURCE3} %{SOURCE4} \ - $RPM_BUILD_ROOT%{_libdir}/qt4/mkspecs/fedora-win32-cross - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-,root,root) -%doc configure.output -%doc LICENSE.GPL3 LICENSE.LGPL LGPL_EXCEPTION.txt KNOWN.ISSUES README -%{_mingw32_bindir}/QtCore4.dll -%{_mingw32_bindir}/QtGui4.dll -%{_mingw32_bindir}/QtNetwork4.dll -%{_mingw32_bindir}/QtXml4.dll -%{_mingw32_bindir}/QtSvg4.dll -%{_mingw32_bindir}/QtSql4.dll -%{_mingw32_bindir}/Qt3Support4.dll -%{_mingw32_libdir}/libQtCore4.a -%{_mingw32_libdir}/libQtGui4.a -%{_mingw32_libdir}/libQtNetwork4.a -%{_mingw32_libdir}/libQtXml4.a -%{_mingw32_libdir}/libQtSvg4.a -%{_mingw32_libdir}/libQtSql4.a -%{_mingw32_libdir}/libQt3Support4.a -%{_mingw32_libdir}/libqtmain.a -%{_mingw32_includedir}/Qt/ -%{_mingw32_includedir}/QtCore/ -%{_mingw32_includedir}/QtGui/ -%{_mingw32_includedir}/QtNetwork/ -%{_mingw32_includedir}/QtXml/ -%{_mingw32_includedir}/QtSvg/ -%{_mingw32_includedir}/QtSql/ -%{_mingw32_includedir}/Qt3Support/ -%{_libdir}/qt4/mkspecs/fedora-win32-cross - - -%changelog -* Thu Mar 12 2009 Thomas Sailer - 4.5.0-1 -- update to Qt 4.5.0 (release) -- also build QtSvg, QtSql, Qt3Support - -* Sat Feb 21 2009 Richard W.M. Jones - 4.5.0-0.2.rc1 -- Update to Qt 4.5.0-rc1. - -* Fri Feb 20 2009 Richard W.M. Jones - 4.4.3-4 -- Rebuild for mingw32-gcc 4.4 - -* Fri Feb 6 2009 Richard W.M. Jones - 4.4.3-3 -- Fix required for older W32API in Fedora 10. - -* Sun Feb 1 2009 Richard W.M. Jones - 4.4.3-2 -- Initial RPM release. diff --git a/qt-win/new.png b/qt-win/new.png deleted file mode 100644 index 5777e26..0000000 Binary files a/qt-win/new.png and /dev/null differ diff --git a/qt-win/open.png b/qt-win/open.png deleted file mode 100644 index a847203..0000000 Binary files a/qt-win/open.png and /dev/null differ diff --git a/qt-win/paste.png b/qt-win/paste.png deleted file mode 100644 index 8108bb8..0000000 Binary files a/qt-win/paste.png and /dev/null differ diff --git a/qt-win/qmake.cache.in b/qt-win/qmake.cache.in deleted file mode 100644 index 587b1dd..0000000 --- a/qt-win/qmake.cache.in +++ /dev/null @@ -1,20 +0,0 @@ -QMAKE_QT_VERSION_OVERRIDE = 4 -OBJECTS_DIR = @builddir@/tmp/obj/release_shared -MOC_DIR = @builddir@/tmp/moc/release_shared -RCC_DIR = @builddir@/tmp/rcc/release_shared -sql-plugins += sqlite -styles += windows plastique cleanlooks motif cde -imageformat-plugins += gif tiff jpeg -CONFIG += dist-config large-config medium-config minimal-config small-config full-config release incremental create_prl link_prl depend_includepath QTDIR_build -QT_BUILD_PARTS = libs tools examples demos docs translations -QMAKESPEC = @builddir@/mkspecs/fedora-win32-cross -ARCH = windows -QT_BUILD_TREE = @builddir@ -QT_SOURCE_TREE = @builddir@ -QMAKE_MOC = moc-qt4 -QMAKE_UIC = uic-qt4 -QMAKE_UIC3 = uic3 -QMAKE_RCC = rcc -QMAKE_DUMPCPP = dumpcpp -QMAKE_INCDIR_QT = $$QT_BUILD_TREE/include -QMAKE_LIBDIR_QT = $$QT_BUILD_TREE/lib diff --git a/qt-win/qmake.conf b/qt-win/qmake.conf deleted file mode 100644 index 1581323..0000000 --- a/qt-win/qmake.conf +++ /dev/null @@ -1,107 +0,0 @@ -# -# qmake configuration for fedora-win32-cross -# (Fedora Windows cross-compiler) -# by Richard W.M. Jones (rjones@redhat.com) -# -# Written for MinGW -# - -MAKEFILE_GENERATOR = MINGW -TEMPLATE = app -CONFIG += qt warn_on release link_prl copy_dir_files debug_and_release debug_and_release_target precompile_header -QT += core gui -DEFINES += UNICODE QT_LARGEFILE_SUPPORT -QMAKE_COMPILER_DEFINES += __GNUC__ WIN32 - -QMAKE_EXT_OBJ = .o -QMAKE_EXT_RES = _res.o - -QMAKE_CC = i686-pc-mingw32-gcc -QMAKE_LEX = flex -QMAKE_LEXFLAGS = -QMAKE_YACC = byacc -QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 --param=ssp-buffer-size=4 -mms-bitfields -QMAKE_CFLAGS_DEPS = -M -QMAKE_CFLAGS_WARN_ON = -Wall -QMAKE_CFLAGS_WARN_OFF = -w -QMAKE_CFLAGS_RELEASE = -O2 -QMAKE_CFLAGS_DEBUG = -g -QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - -QMAKE_CXX = i686-pc-mingw32-g++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS -QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF -QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE -QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG -QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC -QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD -QMAKE_CXXFLAGS_RTTI_ON = -frtti -QMAKE_CXXFLAGS_RTTI_OFF = -fno-rtti -QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads -QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions - -QMAKE_INCDIR = -#QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_INCDIR_QT = /usr/i686-pc-mingw32/sys-root/mingw/include -#QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] -QMAKE_LIBDIR_QT = /usr/i686-pc-mingw32/sys-root/mingw/lib - -QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src -QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< -QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src -QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< - -QMAKE_LINK = i686-pc-mingw32-g++ -QMAKE_LFLAGS = -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc -QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads -Wl -QMAKE_LFLAGS_EXCEPTIONS_OFF = -QMAKE_LFLAGS_RELEASE = -Wl,-s -QMAKE_LFLAGS_DEBUG = -QMAKE_LFLAGS_CONSOLE = -Wl,-subsystem,console -QMAKE_LFLAGS_WINDOWS = -Wl,-subsystem,windows -QMAKE_LFLAGS_DLL = -shared -QMAKE_LINK_OBJECT_MAX = 10 -QMAKE_LINK_OBJECT_SCRIPT= object_script - - -QMAKE_LIBS = -QMAKE_LIBS_CORE = -lkernel32 -luser32 -lshell32 -luuid -lole32 -ladvapi32 -lws2_32 -QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lws2_32 -lole32 -luuid -luser32 -ladvapi32 -QMAKE_LIBS_NETWORK = -lws2_32 -QMAKE_LIBS_OPENGL = -lopengl32 -lglu32 -lgdi32 -luser32 -QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32 -QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain - -QMAKE_DIR_SEP = / -QMAKE_COPY = cp -f -QMAKE_COPY_FILE = $(COPY) -QMAKE_COPY_DIR = $(COPY) -a -QMAKE_MOVE = mv -f -QMAKE_DEL_FILE = rm -f -QMAKE_DEL_DIR = rmdir -QMAKE_STRIP = strip -QMAKE_STRIPFLAGS_LIB += --strip-unneeded -QMAKE_INSTALL_FILE = install -m 644 -p -QMAKE_INSTALL_PROGRAM = install -m 755 -p - -# "qmake -win32" always appears to generate code like this: -# $(CHK_DIR_EXISTS) somedir $(MKDIR) somedir -# We can't write a Unix macro that is compatible, so we have to hack it: -QMAKE_CHK_DIR_EXISTS = mkdir -p -QMAKE_MKDIR = - -QMAKE_MOC = moc-qt4 -QMAKE_UIC = uic-qt4 -QMAKE_IDC = idc - -QMAKE_IDL = midl -QMAKE_LIB = i686-pc-mingw32-ar -ru -QMAKE_RC = i686-pc-mingw32-windres -QMAKE_ZIP = zip -r -9 - -QMAKE_STRIP = strip -QMAKE_STRIPFLAGS_LIB += --strip-unneeded -load(qt_config) diff --git a/qt-win/qplatformdefs.h b/qt-win/qplatformdefs.h deleted file mode 100644 index 30e5945..0000000 --- a/qt-win/qplatformdefs.h +++ /dev/null @@ -1,160 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) -** -** This file is part of the qmake spec of the Qt Toolkit. -** -** Commercial Usage -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. -** -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License versions 2.0 or 3.0 as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information -** to ensure GNU General Public Licensing requirements will be met: -** http://www.fsf.org/licensing/licenses/info/GPLv2.html and -** http://www.gnu.org/copyleft/gpl.html. In addition, as a special -** exception, Nokia gives you certain additional rights. These rights -** are described in the Nokia Qt GPL Exception version 1.3, included in -** the file GPL_EXCEPTION.txt in this package. -** -** Qt for Windows(R) Licensees -** As a special exception, Nokia, as the sole copyright holder for Qt -** Designer, grants users of the Qt/Eclipse Integration plug-in the -** right for the Qt/Eclipse Integration to link to functionality -** provided by Qt Designer and its related libraries. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at qt-sales@nokia.com. -** -****************************************************************************/ - -#ifndef QPLATFORMDEFS_H -#define QPLATFORMDEFS_H - -#ifdef UNICODE -#ifndef _UNICODE -#define _UNICODE -#endif -#endif - -// Get Qt defines/settings - -#include "qglobal.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#if !defined(_WIN32_WINNT) || (_WIN32_WINNT-0 < 0x0500) -typedef enum { - NameUnknown = 0, - NameFullyQualifiedDN = 1, - NameSamCompatible = 2, - NameDisplay = 3, - NameUniqueId = 6, - NameCanonical = 7, - NameUserPrincipal = 8, - NameCanonicalEx = 9, - NameServicePrincipal = 10, - NameDnsDomain = 12 -} EXTENDED_NAME_FORMAT, *PEXTENDED_NAME_FORMAT; -#endif - -#define Q_FS_FAT -#ifdef QT_LARGEFILE_SUPPORT -#define QT_STATBUF struct _stati64 // non-ANSI defs -#define QT_STATBUF4TSTAT struct _stati64 // non-ANSI defs -#define QT_STAT ::_stati64 -#define QT_FSTAT ::_fstati64 -#else -#define QT_STATBUF struct _stat // non-ANSI defs -#define QT_STATBUF4TSTAT struct _stat // non-ANSI defs -#define QT_STAT ::_stat -#define QT_FSTAT ::_fstat -#endif -#define QT_STAT_REG _S_IFREG -#define QT_STAT_DIR _S_IFDIR -#define QT_STAT_MASK _S_IFMT -#if defined(_S_IFLNK) -# define QT_STAT_LNK _S_IFLNK -#endif -#define QT_FILENO _fileno -#define QT_OPEN ::_open -#define QT_CLOSE ::_close -#ifdef QT_LARGEFILE_SUPPORT -#define QT_LSEEK ::_lseeki64 -#ifndef UNICODE -#define QT_TSTAT ::_stati64 -#else -#define QT_TSTAT ::_wstati64 -#endif -#else -#define QT_LSEEK ::_lseek -#ifndef UNICODE -#define QT_TSTAT ::_stat -#else -#define QT_TSTAT ::_wstat -#endif -#endif -#define QT_READ ::_read -#define QT_WRITE ::_write -#define QT_ACCESS ::_access -#define QT_GETCWD ::_getcwd -#define QT_CHDIR ::_chdir -#define QT_MKDIR ::_mkdir -#define QT_RMDIR ::_rmdir -#define QT_OPEN_LARGEFILE 0 -#define QT_OPEN_RDONLY _O_RDONLY -#define QT_OPEN_WRONLY _O_WRONLY -#define QT_OPEN_RDWR _O_RDWR -#define QT_OPEN_CREAT _O_CREAT -#define QT_OPEN_TRUNC _O_TRUNC -#define QT_OPEN_APPEND _O_APPEND -#if defined(O_TEXT) -# define QT_OPEN_TEXT _O_TEXT -# define QT_OPEN_BINARY _O_BINARY -#endif - -#define QT_FOPEN ::fopen -#ifdef QT_LARGEFILE_SUPPORT -#define QT_FSEEK ::fseeko64 -#define QT_FTELL ::ftello64 -#else -#define QT_FSEEK ::fseek -#define QT_FTELL ::ftell -#endif -#define QT_FGETPOS ::fgetpos -#define QT_FSETPOS ::fsetpos -#define QT_FPOS_T fpos_t -#ifdef QT_LARGEFILE_SUPPORT -#define QT_OFF_T off64_t -#else -#define QT_OFF_T long -#endif - -#define QT_SIGNAL_ARGS int - -#define QT_VSNPRINTF ::_vsnprintf -#define QT_SNPRINTF ::_snprintf - -# define F_OK 0 -# define X_OK 1 -# define W_OK 2 -# define R_OK 4 - - -#endif // QPLATFORMDEFS_H diff --git a/qt-win/qt-win-configure.patch b/qt-win/qt-win-configure.patch deleted file mode 100644 index f081098..0000000 --- a/qt-win/qt-win-configure.patch +++ /dev/null @@ -1,623 +0,0 @@ -diff -urN qt-win-opensource-src-4.5.0-rc1.orig/configure.cache qt-win-opensource-src-4.5.0-rc1/configure.cache ---- qt-win-opensource-src-4.5.0-rc1.orig/configure.cache 1970-01-01 01:00:00.000000000 +0100 -+++ qt-win-opensource-src-4.5.0-rc1/configure.cache 2009-02-21 11:25:13.000000000 +0000 -@@ -0,0 +1,30 @@ -+-platform -+fedora-win32-cross -+-confirm-license -+-no-qmake -+-dont-process -+-prefix -+/usr/i686-pc-mingw32/sys-root/mingw -+-bindir -+/usr/i686-pc-mingw32/sys-root/mingw/bin -+-datadir -+/usr/i686-pc-mingw32/sys-root/mingw/share -+-demosdir -+/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/demos -+-docdir -+/usr/i686-pc-mingw32/sys-root/mingw/share/doc -+-examplesdir -+/usr/i686-pc-mingw32/sys-root/mingw/share/qt4/examples -+-headerdir -+/usr/i686-pc-mingw32/sys-root/mingw/include -+-libdir -+/usr/i686-pc-mingw32/sys-root/mingw/lib -+-plugindir -+/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/plugins -+-translationdir -+/usr/i686-pc-mingw32/sys-root/mingw/share/qt4/translations -+-no-mmx -+-no-sse -+-no-sse2 -+-release -+-shared -diff -urN qt-win-opensource-src-4.5.0-rc1.orig/configure.output qt-win-opensource-src-4.5.0-rc1/configure.output ---- qt-win-opensource-src-4.5.0-rc1.orig/configure.output 1970-01-01 01:00:00.000000000 +0100 -+++ qt-win-opensource-src-4.5.0-rc1/configure.output 2009-02-21 11:25:13.000000000 +0000 -@@ -0,0 +1,122 @@ -+Xlib: extension "Generic Event Extension" missing on display "localhost:13.0". -+ -+This is the Qt for Windows Open Source Edition. -+ -+You have already accepted the terms of the license. -+ -+Setting Direct3D to NO, since the proper Direct3D SDK was not detected. -+Make sure you have the Direct3D SDK installed, and that you have run -+the \Utilities\Bin\dx_setenv.cmd script. -+The D3D SDK library path *needs* to appear before the Platform SDK library -+path in your LIB environment variable. -+All the required DirectShow/Direct3D files couldn't be found. -+Make sure you have either the platform SDK AND the DirectX SDK or the Windows SDK installed. -+If you have the DirectX SDK installed, please make sure that you have run the \SetEnv.Cmd script. -+Environment: -+ INCLUDE= -+ Unset -+ LIB= -+ Unset -+ PATH= -+ C:\windows\system32 -+ C:\windows -+ Z:\usr\i686-pc-mingw32\sys-root\mingw\bin -+You are licensed to use this software under the terms of the GNU GPL version 2 or 3. -+See Z:/home/rjones/d/fedora-mingw--devel/qt-win/qt-win-opensource-src-4.5.0-rc1/LICENSE.GPL2 -+ or Z:/home/rjones/d/fedora-mingw--devel/qt-win/qt-win-opensource-src-4.5.0-rc1/LICENSE.GPL3 -+ -+Configuration: -+ dist-config -+ large-config -+ medium-config -+ minimal-config -+ small-config -+ full-config -+ release -+Qt Configuration: -+ release -+ zlib -+ png -+ accessibility -+ qt3support -+ opengl -+ ipv6 -+ scripttools -+ xmlpatterns -+ svg -+ minimal-config -+ small-config -+ medium-config -+ large-config -+ full-config -+ -+QMAKESPEC...................fedora-win32-cross (commandline) -+Architecture................windows -+Maketool....................make -+Debug symbols...............no -+Accessibility support.......yes -+STL support.................yes -+Exception support...........yes -+RTTI support................yes -+MMX support.................no -+3DNOW support...............no -+SSE support.................no -+SSE2 support................no -+IWMMXT support..............no -+OpenGL support..............yes -+Direct3D support............no -+OpenSSL support.............no -+QtDBus support..............no -+QtXmlPatterns support.......yes -+Phonon support..............no -+WebKit support..............no -+QtScriptTools support.......yes -+Graphics System.............raster -+Qt3 compatibility...........yes -+ -+Third Party Libraries: -+ ZLIB support............qt -+ GIF support.............plugin -+ TIFF support............plugin -+ JPEG support............plugin -+ PNG support.............qt -+ MNG support.............plugin -+ -+Styles: -+ Windows.................yes -+ Windows XP..............no -+ Windows Vista...........no -+ Plastique...............yes -+ Cleanlooks..............yes -+ Motif...................yes -+ CDE.....................yes -+ Windows CE..............no -+ Windows Mobile..........no -+ -+Sql Drivers: -+ ODBC....................no -+ MySQL...................no -+ OCI.....................no -+ PostgreSQL..............no -+ TDS.....................no -+ DB2.....................no -+ SQLite..................plugin (qt) -+ SQLite2.................no -+ InterBase...............no -+ -+Sources are in..............Z:\home\rjones\d\fedora-mingw--devel\qt-win\qt-win-opensource-src-4.5.0-rc1 -+Build is done in............Z:\home\rjones\d\fedora-mingw--devel\qt-win\qt-win-opensource-src-4.5.0-rc1 -+Install prefix............../usr/i686-pc-mingw32/sys-root/mingw -+Headers installed to......../usr/i686-pc-mingw32/sys-root/mingw/include -+Libraries installed to....../usr/i686-pc-mingw32/sys-root/mingw/lib -+Plugins installed to......../usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/plugins -+Binaries installed to......./usr/i686-pc-mingw32/sys-root/mingw/bin -+Docs installed to.........../usr/i686-pc-mingw32/sys-root/mingw/share/doc -+Data installed to.........../usr/i686-pc-mingw32/sys-root/mingw/share -+Translations installed to.../usr/i686-pc-mingw32/sys-root/mingw/share/qt4/translations -+Examples installed to......./usr/i686-pc-mingw32/sys-root/mingw/share/qt4/examples -+Demos installed to........../usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/demos -+ -+Processing of project files have been disabled. -+Only use this option if you really know what you're doing. -+ -diff -urN qt-win-opensource-src-4.5.0-rc1.orig/include/Qt/qconfig.h qt-win-opensource-src-4.5.0-rc1/include/Qt/qconfig.h ---- qt-win-opensource-src-4.5.0-rc1.orig/include/Qt/qconfig.h 1970-01-01 01:00:00.000000000 +0100 -+++ qt-win-opensource-src-4.5.0-rc1/include/Qt/qconfig.h 2009-02-21 11:25:13.000000000 +0000 -@@ -0,0 +1 @@ -+#include "../../src/corelib/global/qconfig.h" -diff -urN qt-win-opensource-src-4.5.0-rc1.orig/include/QtCore/qconfig.h qt-win-opensource-src-4.5.0-rc1/include/QtCore/qconfig.h ---- qt-win-opensource-src-4.5.0-rc1.orig/include/QtCore/qconfig.h 1970-01-01 01:00:00.000000000 +0100 -+++ qt-win-opensource-src-4.5.0-rc1/include/QtCore/qconfig.h 2009-02-21 11:25:13.000000000 +0000 -@@ -0,0 +1 @@ -+#include "../../src/corelib/global/qconfig.h" -diff -urN qt-win-opensource-src-4.5.0-rc1.orig/mkspecs/default/qmake.conf qt-win-opensource-src-4.5.0-rc1/mkspecs/default/qmake.conf ---- qt-win-opensource-src-4.5.0-rc1.orig/mkspecs/default/qmake.conf 1970-01-01 01:00:00.000000000 +0100 -+++ qt-win-opensource-src-4.5.0-rc1/mkspecs/default/qmake.conf 2009-02-21 11:25:13.000000000 +0000 -@@ -0,0 +1,109 @@ -+# -+# qmake configuration for fedora-win32-cross -+# (Fedora Windows cross-compiler) -+# by Richard W.M. Jones (rjones@redhat.com) -+# -+# Written for MinGW -+# -+ -+MAKEFILE_GENERATOR = MINGW -+TEMPLATE = app -+CONFIG += qt warn_on release link_prl copy_dir_files debug_and_release debug_and_release_target precompile_header -+QT += core gui -+DEFINES += UNICODE QT_LARGEFILE_SUPPORT -+QMAKE_COMPILER_DEFINES += __GNUC__ WIN32 -+ -+QMAKE_EXT_OBJ = .o -+QMAKE_EXT_RES = _res.o -+ -+QMAKE_CC = i686-pc-mingw32-gcc -+QMAKE_LEX = flex -+QMAKE_LEXFLAGS = -+QMAKE_YACC = byacc -+QMAKE_YACCFLAGS = -d -+QMAKE_CFLAGS = -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 --param=ssp-buffer-size=4 -mms-bitfields -+QMAKE_CFLAGS_DEPS = -M -+QMAKE_CFLAGS_WARN_ON = -Wall -+QMAKE_CFLAGS_WARN_OFF = -w -+QMAKE_CFLAGS_RELEASE = -O2 -+QMAKE_CFLAGS_DEBUG = -g -+QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses -+ -+QMAKE_CXX = i686-pc-mingw32-g++ -+QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -+QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS -+QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -+QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF -+QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE -+QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG -+QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC -+QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD -+QMAKE_CXXFLAGS_RTTI_ON = -frtti -+QMAKE_CXXFLAGS_RTTI_OFF = -fno-rtti -+QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads -+QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions -+ -+QMAKE_INCDIR = -+#QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -+QMAKE_INCDIR_QT = /usr/i686-pc-mingw32/sys-root/mingw/include -+#QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] -+QMAKE_LIBDIR_QT = /usr/i686-pc-mingw32/sys-root/mingw/lib -+ -+QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src -+QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< -+QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src -+QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< -+ -+QMAKE_LINK = i686-pc-mingw32-g++ -+QMAKE_LFLAGS = -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc -+QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads -Wl -+QMAKE_LFLAGS_EXCEPTIONS_OFF = -+QMAKE_LFLAGS_RELEASE = -Wl,-s -+QMAKE_LFLAGS_DEBUG = -+QMAKE_LFLAGS_CONSOLE = -Wl,-subsystem,console -+QMAKE_LFLAGS_WINDOWS = -Wl,-subsystem,windows -+QMAKE_LFLAGS_DLL = -shared -+QMAKE_LINK_OBJECT_MAX = 10 -+QMAKE_LINK_OBJECT_SCRIPT= object_script -+ -+ -+QMAKE_LIBS = -+QMAKE_LIBS_CORE = -lkernel32 -luser32 -lshell32 -luuid -lole32 -ladvapi32 -lws2_32 -+QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lws2_32 -lole32 -luuid -luser32 -ladvapi32 -+QMAKE_LIBS_NETWORK = -lws2_32 -+QMAKE_LIBS_OPENGL = -lopengl32 -lglu32 -lgdi32 -luser32 -+QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32 -+QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain -+ -+QMAKE_DIR_SEP = / -+QMAKE_COPY = cp -f -+QMAKE_COPY_FILE = $(COPY) -+QMAKE_COPY_DIR = $(COPY) -a -+QMAKE_MOVE = mv -f -+QMAKE_DEL_FILE = rm -f -+QMAKE_DEL_DIR = rmdir -+QMAKE_STRIP = strip -+QMAKE_STRIPFLAGS_LIB += --strip-unneeded -+QMAKE_INSTALL_FILE = install -m 644 -p -+QMAKE_INSTALL_PROGRAM = install -m 755 -p -+ -+# "qmake -win32" always appears to generate code like this: -+# $(CHK_DIR_EXISTS) somedir $(MKDIR) somedir -+# We can't write a Unix macro that is compatible, so we have to hack it: -+QMAKE_CHK_DIR_EXISTS = mkdir -p -+QMAKE_MKDIR = -+ -+QMAKE_MOC = moc-qt4 -+QMAKE_UIC = uic-qt4 -+QMAKE_IDC = idc -+ -+QMAKE_IDL = midl -+QMAKE_LIB = i686-pc-mingw32-ar -ru -+QMAKE_RC = i686-pc-mingw32-windres -+QMAKE_ZIP = zip -r -9 -+ -+QMAKE_STRIP = strip -+QMAKE_STRIPFLAGS_LIB += --strip-unneeded -+load(qt_config) -+ -+QMAKESPEC_ORIGINAL=Z:/home/rjones/d/fedora-mingw--devel/qt-win/qt-win-opensource-src-4.5.0-rc1/mkspecs/fedora-win32-cross -diff -urN qt-win-opensource-src-4.5.0-rc1.orig/mkspecs/default/qplatformdefs.h qt-win-opensource-src-4.5.0-rc1/mkspecs/default/qplatformdefs.h ---- qt-win-opensource-src-4.5.0-rc1.orig/mkspecs/default/qplatformdefs.h 1970-01-01 01:00:00.000000000 +0100 -+++ qt-win-opensource-src-4.5.0-rc1/mkspecs/default/qplatformdefs.h 2009-02-21 11:25:06.000000000 +0000 -@@ -0,0 +1,160 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -+** Contact: Qt Software Information (qt-info@nokia.com) -+** -+** This file is part of the qmake spec of the Qt Toolkit. -+** -+** Commercial Usage -+** Licensees holding valid Qt Commercial licenses may use this file in -+** accordance with the Qt Commercial License Agreement provided with the -+** Software or, alternatively, in accordance with the terms contained in -+** a written agreement between you and Nokia. -+** -+** -+** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU -+** General Public License versions 2.0 or 3.0 as published by the Free -+** Software Foundation and appearing in the file LICENSE.GPL included in -+** the packaging of this file. Please review the following information -+** to ensure GNU General Public Licensing requirements will be met: -+** http://www.fsf.org/licensing/licenses/info/GPLv2.html and -+** http://www.gnu.org/copyleft/gpl.html. In addition, as a special -+** exception, Nokia gives you certain additional rights. These rights -+** are described in the Nokia Qt GPL Exception version 1.3, included in -+** the file GPL_EXCEPTION.txt in this package. -+** -+** Qt for Windows(R) Licensees -+** As a special exception, Nokia, as the sole copyright holder for Qt -+** Designer, grants users of the Qt/Eclipse Integration plug-in the -+** right for the Qt/Eclipse Integration to link to functionality -+** provided by Qt Designer and its related libraries. -+** -+** If you are unsure which license is appropriate for your use, please -+** contact the sales department at qt-sales@nokia.com. -+** -+****************************************************************************/ -+ -+#ifndef QPLATFORMDEFS_H -+#define QPLATFORMDEFS_H -+ -+#ifdef UNICODE -+#ifndef _UNICODE -+#define _UNICODE -+#endif -+#endif -+ -+// Get Qt defines/settings -+ -+#include "qglobal.h" -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#if !defined(_WIN32_WINNT) || (_WIN32_WINNT-0 < 0x0500) -+typedef enum { -+ NameUnknown = 0, -+ NameFullyQualifiedDN = 1, -+ NameSamCompatible = 2, -+ NameDisplay = 3, -+ NameUniqueId = 6, -+ NameCanonical = 7, -+ NameUserPrincipal = 8, -+ NameCanonicalEx = 9, -+ NameServicePrincipal = 10, -+ NameDnsDomain = 12 -+} EXTENDED_NAME_FORMAT, *PEXTENDED_NAME_FORMAT; -+#endif -+ -+#define Q_FS_FAT -+#ifdef QT_LARGEFILE_SUPPORT -+#define QT_STATBUF struct _stati64 // non-ANSI defs -+#define QT_STATBUF4TSTAT struct _stati64 // non-ANSI defs -+#define QT_STAT ::_stati64 -+#define QT_FSTAT ::_fstati64 -+#else -+#define QT_STATBUF struct _stat // non-ANSI defs -+#define QT_STATBUF4TSTAT struct _stat // non-ANSI defs -+#define QT_STAT ::_stat -+#define QT_FSTAT ::_fstat -+#endif -+#define QT_STAT_REG _S_IFREG -+#define QT_STAT_DIR _S_IFDIR -+#define QT_STAT_MASK _S_IFMT -+#if defined(_S_IFLNK) -+# define QT_STAT_LNK _S_IFLNK -+#endif -+#define QT_FILENO _fileno -+#define QT_OPEN ::_open -+#define QT_CLOSE ::_close -+#ifdef QT_LARGEFILE_SUPPORT -+#define QT_LSEEK ::_lseeki64 -+#ifndef UNICODE -+#define QT_TSTAT ::_stati64 -+#else -+#define QT_TSTAT ::_wstati64 -+#endif -+#else -+#define QT_LSEEK ::_lseek -+#ifndef UNICODE -+#define QT_TSTAT ::_stat -+#else -+#define QT_TSTAT ::_wstat -+#endif -+#endif -+#define QT_READ ::_read -+#define QT_WRITE ::_write -+#define QT_ACCESS ::_access -+#define QT_GETCWD ::_getcwd -+#define QT_CHDIR ::_chdir -+#define QT_MKDIR ::_mkdir -+#define QT_RMDIR ::_rmdir -+#define QT_OPEN_LARGEFILE 0 -+#define QT_OPEN_RDONLY _O_RDONLY -+#define QT_OPEN_WRONLY _O_WRONLY -+#define QT_OPEN_RDWR _O_RDWR -+#define QT_OPEN_CREAT _O_CREAT -+#define QT_OPEN_TRUNC _O_TRUNC -+#define QT_OPEN_APPEND _O_APPEND -+#if defined(O_TEXT) -+# define QT_OPEN_TEXT _O_TEXT -+# define QT_OPEN_BINARY _O_BINARY -+#endif -+ -+#define QT_FOPEN ::fopen -+#ifdef QT_LARGEFILE_SUPPORT -+#define QT_FSEEK ::fseeko64 -+#define QT_FTELL ::ftello64 -+#else -+#define QT_FSEEK ::fseek -+#define QT_FTELL ::ftell -+#endif -+#define QT_FGETPOS ::fgetpos -+#define QT_FSETPOS ::fsetpos -+#define QT_FPOS_T fpos_t -+#ifdef QT_LARGEFILE_SUPPORT -+#define QT_OFF_T off64_t -+#else -+#define QT_OFF_T long -+#endif -+ -+#define QT_SIGNAL_ARGS int -+ -+#define QT_VSNPRINTF ::_vsnprintf -+#define QT_SNPRINTF ::_snprintf -+ -+# define F_OK 0 -+# define X_OK 1 -+# define W_OK 2 -+# define R_OK 4 -+ -+ -+#endif // QPLATFORMDEFS_H -diff -urN qt-win-opensource-src-4.5.0-rc1.orig/mkspecs/qconfig.pri qt-win-opensource-src-4.5.0-rc1/mkspecs/qconfig.pri ---- qt-win-opensource-src-4.5.0-rc1.orig/mkspecs/qconfig.pri 1970-01-01 01:00:00.000000000 +0100 -+++ qt-win-opensource-src-4.5.0-rc1/mkspecs/qconfig.pri 2009-02-21 11:25:13.000000000 +0000 -@@ -0,0 +1,11 @@ -+CONFIG+= release shared stl exceptions rtti -+QT_ARCH = windows -+QT_EDITION = OpenSource -+QT_CONFIG += release zlib png accessibility qt3support opengl ipv6 scripttools xmlpatterns svg minimal-config small-config medium-config large-config full-config -+#versioning -+QT_VERSION = 4.5.0-rc1 -+QT_MAJOR_VERSION = 4 -+QT_MINOR_VERSION = 5 -+QT_PATCH_VERSION = 0 -+#Qt for Windows CE c-runtime deployment -+QT_CE_C_RUNTIME = no -diff -urN qt-win-opensource-src-4.5.0-rc1.orig/.qmake.cache qt-win-opensource-src-4.5.0-rc1/.qmake.cache ---- qt-win-opensource-src-4.5.0-rc1.orig/.qmake.cache 1970-01-01 01:00:00.000000000 +0100 -+++ qt-win-opensource-src-4.5.0-rc1/.qmake.cache 2009-02-21 11:25:13.000000000 +0000 -@@ -0,0 +1,20 @@ -+QMAKE_QT_VERSION_OVERRIDE = 4 -+OBJECTS_DIR = tmp\obj\release_shared -+MOC_DIR = tmp\moc\release_shared -+RCC_DIR = tmp\rcc\release_shared -+sql-plugins += sqlite -+styles += windows plastique cleanlooks motif cde -+imageformat-plugins += gif tiff jpeg -+CONFIG += dist-config large-config medium-config minimal-config small-config full-config release incremental create_prl link_prl depend_includepath QTDIR_build -+QT_BUILD_PARTS = libs tools examples demos docs translations -+QMAKESPEC = Z:\home\rjones\d\fedora-mingw--devel\qt-win\qt-win-opensource-src-4.5.0-rc1\mkspecs\fedora-win32-cross -+ARCH = windows -+QT_BUILD_TREE = Z:\home\rjones\d\fedora-mingw--devel\qt-win\qt-win-opensource-src-4.5.0-rc1 -+QT_SOURCE_TREE = Z:\home\rjones\d\fedora-mingw--devel\qt-win\qt-win-opensource-src-4.5.0-rc1 -+QMAKE_MOC = $$QT_BUILD_TREE\bin\moc.exe -+QMAKE_UIC = $$QT_BUILD_TREE\bin\uic.exe -+QMAKE_UIC3 = $$QT_BUILD_TREE\bin\uic3.exe -+QMAKE_RCC = $$QT_BUILD_TREE\bin\rcc.exe -+QMAKE_DUMPCPP = $$QT_BUILD_TREE\bin\dumpcpp.exe -+QMAKE_INCDIR_QT = $$QT_BUILD_TREE\include -+QMAKE_LIBDIR_QT = $$QT_BUILD_TREE\lib -diff -urN qt-win-opensource-src-4.5.0-rc1.orig/src/corelib/global/qconfig.cpp qt-win-opensource-src-4.5.0-rc1/src/corelib/global/qconfig.cpp ---- qt-win-opensource-src-4.5.0-rc1.orig/src/corelib/global/qconfig.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ qt-win-opensource-src-4.5.0-rc1/src/corelib/global/qconfig.cpp 2009-02-21 11:25:13.000000000 +0000 -@@ -0,0 +1,27 @@ -+/* Licensed */ -+static const char qt_configure_licensee_str [512 + 12] = "qt_lcnsuser=Open Source"; -+static const char qt_configure_licensed_products_str [512 + 12] = "qt_lcnsprod=OpenSource"; -+static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=/usr/i686-pc-mingw32/sys-root/mingw"; -+static const char qt_configure_documentation_path_str[512 + 12] = "qt_docspath=/usr/i686-pc-mingw32/sys-root/mingw/share/doc"; -+static const char qt_configure_headers_path_str [512 + 12] = "qt_hdrspath=/usr/i686-pc-mingw32/sys-root/mingw/include"; -+static const char qt_configure_libraries_path_str [512 + 12] = "qt_libspath=/usr/i686-pc-mingw32/sys-root/mingw/lib"; -+static const char qt_configure_binaries_path_str [512 + 12] = "qt_binspath=/usr/i686-pc-mingw32/sys-root/mingw/bin"; -+static const char qt_configure_plugins_path_str [512 + 12] = "qt_plugpath=/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/plugins"; -+static const char qt_configure_data_path_str [512 + 12] = "qt_datapath=/usr/i686-pc-mingw32/sys-root/mingw/share"; -+static const char qt_configure_translations_path_str [512 + 12] = "qt_trnspath=/usr/i686-pc-mingw32/sys-root/mingw/share/qt4/translations"; -+static const char qt_configure_examples_path_str [512 + 12] = "qt_xmplpath=/usr/i686-pc-mingw32/sys-root/mingw/share/qt4/examples"; -+static const char qt_configure_demos_path_str [512 + 12] = "qt_demopath=/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/demos"; -+/* strlen( "qt_lcnsxxxx" ) == 12 */ -+#define QT_CONFIGURE_LICENSEE qt_configure_licensee_str + 12; -+#define QT_CONFIGURE_LICENSED_PRODUCTS qt_configure_licensed_products_str + 12; -+#define QT_CONFIGURE_PREFIX_PATH qt_configure_prefix_path_str + 12; -+#define QT_CONFIGURE_DOCUMENTATION_PATH qt_configure_documentation_path_str + 12; -+#define QT_CONFIGURE_HEADERS_PATH qt_configure_headers_path_str + 12; -+#define QT_CONFIGURE_LIBRARIES_PATH qt_configure_libraries_path_str + 12; -+#define QT_CONFIGURE_BINARIES_PATH qt_configure_binaries_path_str + 12; -+#define QT_CONFIGURE_PLUGINS_PATH qt_configure_plugins_path_str + 12; -+#define QT_CONFIGURE_DATA_PATH qt_configure_data_path_str + 12; -+#define QT_CONFIGURE_TRANSLATIONS_PATH qt_configure_translations_path_str + 12; -+#define QT_CONFIGURE_EXAMPLES_PATH qt_configure_examples_path_str + 12; -+#define QT_CONFIGURE_DEMOS_PATH qt_configure_demos_path_str + 12; -+ -diff -urN qt-win-opensource-src-4.5.0-rc1.orig/src/corelib/global/qconfig.h qt-win-opensource-src-4.5.0-rc1/src/corelib/global/qconfig.h ---- qt-win-opensource-src-4.5.0-rc1.orig/src/corelib/global/qconfig.h 1970-01-01 01:00:00.000000000 +0100 -+++ qt-win-opensource-src-4.5.0-rc1/src/corelib/global/qconfig.h 2009-02-21 11:25:13.000000000 +0000 -@@ -0,0 +1,102 @@ -+/* Everything */ -+ -+#ifndef QT_DLL -+#define QT_DLL -+#endif -+ -+/* License information */ -+#define QT_PRODUCT_LICENSEE "Open Source" -+#define QT_PRODUCT_LICENSE "OpenSource" -+ -+// Qt Edition -+#ifndef QT_EDITION -+# define QT_EDITION QT_EDITION_OPENSOURCE -+#endif -+ -+#if (defined(_DEBUG) || defined(DEBUG)) -+# if (defined(WIN64) || defined(_WIN64) || defined(__WIN64__)) -+# define QT_BUILD_KEY "Windows x64 msvc debug full-config" -+# else -+# define QT_BUILD_KEY "Windows msvc debug full-config" -+# endif -+#else -+# if (defined(WIN64) || defined(_WIN64) || defined(__WIN64__)) -+# define QT_BUILD_KEY "Windows x64 msvc release full-config" -+# else -+# define QT_BUILD_KEY "Windows msvc release full-config" -+# endif -+#endif -+ -+/* Machine byte-order */ -+#define Q_BIG_ENDIAN 4321 -+#define Q_LITTLE_ENDIAN 1234 -+#define Q_BYTE_ORDER Q_LITTLE_ENDIAN -+ -+// Compile time features -+#define QT_ARCH_WINDOWS -+#if defined(QT_GRAPHICSSYSTEM_RASTER) && defined(QT_NO_GRAPHICSSYSTEM_RASTER) -+# undef QT_GRAPHICSSYSTEM_RASTER -+#elif !defined(QT_GRAPHICSSYSTEM_RASTER) -+# define QT_GRAPHICSSYSTEM_RASTER -+#endif -+ -+#if defined(QT_NO_DBUS) && defined(QT_DBUS) -+# undef QT_NO_DBUS -+#elif !defined(QT_NO_DBUS) -+# define QT_NO_DBUS -+#endif -+ -+#if defined(QT_NO_DIRECT3D) && defined(QT_DIRECT3D) -+# undef QT_NO_DIRECT3D -+#elif !defined(QT_NO_DIRECT3D) -+# define QT_NO_DIRECT3D -+#endif -+ -+#if defined(QT_NO_OPENSSL) && defined(QT_OPENSSL) -+# undef QT_NO_OPENSSL -+#elif !defined(QT_NO_OPENSSL) -+# define QT_NO_OPENSSL -+#endif -+ -+#if defined(QT_NO_PHONON) && defined(QT_PHONON) -+# undef QT_NO_PHONON -+#elif !defined(QT_NO_PHONON) -+# define QT_NO_PHONON -+#endif -+ -+#if defined(QT_NO_STYLE_GTK) && defined(QT_STYLE_GTK) -+# undef QT_NO_STYLE_GTK -+#elif !defined(QT_NO_STYLE_GTK) -+# define QT_NO_STYLE_GTK -+#endif -+ -+#if defined(QT_NO_STYLE_WINDOWSCE) && defined(QT_STYLE_WINDOWSCE) -+# undef QT_NO_STYLE_WINDOWSCE -+#elif !defined(QT_NO_STYLE_WINDOWSCE) -+# define QT_NO_STYLE_WINDOWSCE -+#endif -+ -+#if defined(QT_NO_STYLE_WINDOWSMOBILE) && defined(QT_STYLE_WINDOWSMOBILE) -+# undef QT_NO_STYLE_WINDOWSMOBILE -+#elif !defined(QT_NO_STYLE_WINDOWSMOBILE) -+# define QT_NO_STYLE_WINDOWSMOBILE -+#endif -+ -+#if defined(QT_NO_STYLE_WINDOWSVISTA) && defined(QT_STYLE_WINDOWSVISTA) -+# undef QT_NO_STYLE_WINDOWSVISTA -+#elif !defined(QT_NO_STYLE_WINDOWSVISTA) -+# define QT_NO_STYLE_WINDOWSVISTA -+#endif -+ -+#if defined(QT_NO_STYLE_WINDOWSXP) && defined(QT_STYLE_WINDOWSXP) -+# undef QT_NO_STYLE_WINDOWSXP -+#elif !defined(QT_NO_STYLE_WINDOWSXP) -+# define QT_NO_STYLE_WINDOWSXP -+#endif -+ -+#if defined(QT_NO_WEBKIT) && defined(QT_WEBKIT) -+# undef QT_NO_WEBKIT -+#elif !defined(QT_NO_WEBKIT) -+# define QT_NO_WEBKIT -+#endif -+ diff --git a/qt-win/qt-win-configure.sh b/qt-win/qt-win-configure.sh deleted file mode 100755 index 3bfab93..0000000 --- a/qt-win/qt-win-configure.sh +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/bash - - -# Before running this, you will need the following RPMs installed: -# . wine -# . qt-devel -# . mingw32-filesystem -# and you need to have downloaded the source zip file. Run this -# command from the RPM SOURCES directory in order to (re-)create -# qt-win-configure.patch - -# Notes: -# . -no-mmx is needed because we didn't enable MMX instructions -# when building GCC (I think?). The error is: -# /usr/lib64/gcc/i686-pc-mingw32/4.3.2/include/mmintrin.h:35:3: -# error: #error "MMX instruction set not enabled" -# . Same as above for -no-sse and -no-sse2 - -version=4.5.0-rc1 -platform=fedora-win32-cross - -set -e - -if [ ! -f qt-win-opensource-src-$version.zip -o \ - ! -f qmake.conf -o \ - ! -f qplatformdefs.h ]; then - echo "You're trying to run this from the wrong directory." - echo "Run it from the RPM SOURCES directory, or Fedora CVS checkout." - exit 1 -fi - -echo "Unpacking source file ... (this can take a minute or two)" - -srcdir=qt-win-opensource-src-$version - -rm -rf $srcdir.orig $srcdir - -unzip -qq qt-win-opensource-src-$version.zip -cp -a $srcdir $srcdir.orig -mkdir $srcdir/mkspecs/fedora-win32-cross -cp qmake.conf qplatformdefs.h $srcdir/mkspecs/fedora-win32-cross - -cd $srcdir - -wine configure.exe \ - -platform $platform \ - -confirm-license \ - -no-qmake \ - -dont-process \ - -prefix $(rpm --eval %{_mingw32_prefix}) \ - -bindir $(rpm --eval %{_mingw32_bindir}) \ - -datadir $(rpm --eval %{_mingw32_datadir}) \ - -demosdir $(rpm --eval %{_mingw32_libdir})/qt4/demos \ - -docdir $(rpm --eval %{_mingw32_docdir}) \ - -examplesdir $(rpm --eval %{_mingw32_datadir})/qt4/examples \ - -headerdir $(rpm --eval %{_mingw32_includedir}) \ - -libdir $(rpm --eval %{_mingw32_libdir}) \ - -plugindir $(rpm --eval %{_mingw32_libdir})/qt4/plugins \ - -translationdir $(rpm --eval %{_mingw32_datadir})/qt4/translations \ - -no-mmx -no-sse -no-sse2 \ - -release \ - -shared > configure.output 2>&1 - -cd .. - -rm -r $srcdir/mkspecs/fedora-win32-cross - -diff -urN $srcdir.orig $srcdir > qt-win-configure.patch ||: - -rm -r $srcdir.orig $srcdir - -echo qt-win-configure.patch successfully updated \ No newline at end of file diff --git a/qt-win/save.png b/qt-win/save.png deleted file mode 100644 index 8e2b5fe..0000000 Binary files a/qt-win/save.png and /dev/null differ