rpms/mingw32-gtk2/devel gdk-pixbuf.loaders, NONE, 1.1 import.log, NONE, 1.1 mingw32-gtk2-2.15.0-xbuttons.patch, NONE, 1.1 mingw32-gtk2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Richard W.M. Jones]

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25901/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gdk-pixbuf.loaders import.log 
	mingw32-gtk2-2.15.0-xbuttons.patch mingw32-gtk2.spec 
Log Message:
Initial import.



--- NEW FILE gdk-pixbuf.loaders ---
# GdkPixbuf Image Loader Modules file
# Automatically generated file, do not edit
# Created by gdk-pixbuf-query-loaders.exe from gtk+-2.14.2
#
# LoaderDir = Z:\usr\i686-pc-mingw32\sys-root\mingw/lib/gtk-2.0/2.10.0/loaders
#
"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-emf.dll"
"emf" 4 "gtk20" "The EMF image format" "LGPL"
"application/emf" "application/x-emf" "image/x-emf" "image/x-mgx-emf" ""
"emf" ""
"\001" "" 100

"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll"
"ani" 4 "gtk20" "The ANI image format" "LGPL"
"application/x-navi-animation" ""
"ani" ""
"RIFF    ACON" "    xxxx    " 100

"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.dll"
"png" 5 "gtk20" "The PNG image format" "LGPL"
"image/png" ""
"png" ""
"\211PNG\r\n\032\n" "" 100

"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-gif.dll"
"gif" 5 "gtk20" "The GIF image format" "LGPL"
"image/gif" ""
"gif" ""
"GIF8" "" 100

"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.dll"
"xbm" 4 "gtk20" "The XBM image format" "LGPL"
"image/x-xbitmap" ""
"xbm" ""
"#define " "" 100
"/*" "" 50

"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.dll"
"icns" 4 "gtk20" "The ICNS image format" "GPL"
"image/x-icns" ""
"icns" ""
"icns" "" 100

"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-wmf.dll"
"wmf" 4 "gtk20" "The WMF image format" "LGPL"
"image/x-wmf" ""
"wmf" "apm" ""
"\327\315\306\232" "" 100
"\001" "" 100

"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll"
"tga" 4 "gtk20" "The Targa image format" "LGPL"
"image/x-tga" ""
"tga" "targa" ""
" \001\001" "x  " 100
" \001\t" "x  " 100
"  \002" "xz " 99
"  \003" "xz " 100
"  \n" "xz " 100
"  \013" "xz " 100

"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.dll"
"pcx" 4 "gtk20" "The PCX image format" "LGPL"
"image/x-pcx" ""
"pcx" ""
"\n \001" "" 100
"\n\002\001" "" 100
"\n\003\001" "" 100
"\n\004\001" "" 100
"\n\005\001" "" 100

"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jasper.dll"
"jpeg2000" 4 "gtk20" "The JPEG 2000 image format" "LGPL"
"image/jp2" "image/jpeg2000" "image/jpx" ""
"jp2" "jpc" "jpx" "j2k" "jpf" ""
"    jP" "!!!!  " 100
"\377O\377Q" "" 100

"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-bmp.dll"
"bmp" 5 "gtk20" "The BMP image format" "LGPL"
"image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
"bmp" ""
"BM" "" 100

"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-tiff.dll"
"tiff" 5 "gtk20" "The TIFF image format" "LGPL"
"image/tiff" ""
"tiff" "tif" ""
"MM *" "  z " 100
"II* " "   z" 100

"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.dll"
"pnm" 4 "gtk20" "The PNM/PBM/PGM/PPM image format family" "LGPL"
"image/x-portable-anymap" "image/x-portable-bitmap" "image/x-portable-graymap" "image/x-portable-pixmap" ""
"pnm" "pbm" "pgm" "ppm" ""
"P1" "" 100
"P2" "" 100
"P3" "" 100
"P4" "" 100
"P5" "" 100
"P6" "" 100

"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-jpeg.dll"
"jpeg" 5 "gtk20" "The JPEG image format" "LGPL"
"image/jpeg" ""
"jpeg" "jpe" "jpg" ""
"\377\330" "" 100

"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll"
"wbmp" 4 "gtk20" "The WBMP image format" "LGPL"
"image/vnd.wap.wbmp" ""
"wbmp" ""
"  " "zz" 1
" `" "z " 1
" @" "z " 1
"  " "z " 1

"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.dll"
"xpm" 4 "gtk20" "The XPM image format" "LGPL"
"image/x-xpixmap" ""
"xpm" ""
"/* XPM */" "" 100

"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.dll"
"ras" 4 "gtk20" "The Sun raster image format" "LGPL"
"image/x-cmu-raster" "image/x-sun-raster" ""
"ras" ""
"Y\246j\225" "" 100

"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-ico.dll"
"ico" 4 "gtk20" "The ICO image format" "LGPL"
"image/x-icon" "image/x-ico" ""
"ico" "cur" ""
"  \001   " "zz znz" 100
"  \002   " "zz znz" 100



--- NEW FILE import.log ---
mingw32-gtk2-2_15_0-3_fc11:HEAD:mingw32-gtk2-2.15.0-3.fc11.src.rpm:1234346125

mingw32-gtk2-2.15.0-xbuttons.patch:

--- NEW FILE mingw32-gtk2-2.15.0-xbuttons.patch ---
--- gtk+-2.15.0.orig/gtk/gtkstatusicon.c	2009-01-01 19:41:45.000000000 +0000
+++ gtk+-2.15.0/gtk/gtkstatusicon.c	2009-01-23 19:03:37.000000000 +0000
@@ -707,11 +707,13 @@
 	  button = 3;
 	  goto buttondown0;
 
+#ifdef WM_XBUTTONDOWN
 	case WM_XBUTTONDOWN:
 	  if (HIWORD (wparam) == XBUTTON1)
 	    button = 4;
 	  else
 	    button = 5;
+#endif
 
 	buttondown0:
 	  bc = g_new (ButtonCallbackData, 1);
@@ -733,11 +735,13 @@
 	  button = 3;
 	  goto buttonup0;
 
+#ifdef WM_XBUTTONUP
 	case WM_XBUTTONUP:
 	  if (HIWORD (wparam) == XBUTTON1)
 	    button = 4;
 	  else
 	    button = 5;
+#endif
 
 	buttonup0:
 	  bc = g_new (ButtonCallbackData, 1);


--- NEW FILE mingw32-gtk2.spec ---
%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-gtk2
Version:        2.15.0
Release:        3%{?dist}
Summary:        MinGW Windows Gtk2 library

License:        LGPLv2+
Group:          Development/Libraries
URL:            http://www.gtk.org
Source0:        http://download.gnome.org/sources/gtk+/2.15/gtk+-%{version}.tar.bz2

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# If you want to rebuild this, do:
# wine %{_mingw32_bindir}/gdk-pixbuf-query-loaders.exe > gdk-pixbuf.loaders
Source1:        gdk-pixbuf.loaders

# Fix use of extended buttons in gtkstatusicon.
Patch1000:      mingw32-gtk2-2.15.0-xbuttons.patch

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 40
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils

BuildRequires:  mingw32-atk >= 1.13.0
BuildRequires:  mingw32-cairo >= 1.8.0
BuildRequires:  mingw32-dlfcn
BuildRequires:  mingw32-gettext
BuildRequires:  mingw32-glib2 >= 2.17.7
BuildRequires:  mingw32-iconv
BuildRequires:  mingw32-jasper
BuildRequires:  mingw32-libjpeg
BuildRequires:  mingw32-libpng >= 1.2.2
BuildRequires:  mingw32-pango >= 1.20.0
BuildRequires:  mingw32-pixman
BuildRequires:  mingw32-zlib

BuildRequires:  pkgconfig

# Native one for msgfmt
BuildRequires:  gettext
# Native one for glib-genmarsjal
BuildRequires:  glib2-devel
# Native one for gtk-update-icon-cache
BuildRequires:  gtk2
# Native one for gdk-pixbuf-csource
BuildRequires:  gtk2-devel

Requires:       pkgconfig


%description
MinGW Windows Gtk2 library.


%prep
%setup -q -n gtk+-%{version}

%patch1000 -p1


%build
# Need to run the correct version of glib-mkenums.
PATH=%{_mingw32_bindir}:$PATH

%{_mingw32_configure} --disable-cups --disable-static
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 manpages which duplicate those in Fedora native.
rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}

# Remove documentation too.
rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc

# Install gdk-pixbuf.loaders.
mkdir -p $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/gtk-2.0/
install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/gtk-2.0/

%find_lang %{name} --all-name


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root)
%doc COPYING
%{_mingw32_datadir}/themes/*
%{_mingw32_bindir}/gdk-pixbuf-csource.exe
%{_mingw32_bindir}/gdk-pixbuf-query-loaders.exe
%{_mingw32_bindir}/gtk-builder-convert
%{_mingw32_bindir}/gtk-demo.exe
%{_mingw32_bindir}/gtk-query-immodules-2.0.exe
%{_mingw32_bindir}/gtk-update-icon-cache.exe
%{_mingw32_bindir}/libgailutil-18.dll
%{_mingw32_bindir}/libgdk-win32-2.0-0.dll
%{_mingw32_bindir}/libgdk_pixbuf-2.0-0.dll
%{_mingw32_bindir}/libgtk-win32-2.0-0.dll
%{_mingw32_libdir}/gtk-2.0/
%{_mingw32_libdir}/libgailutil.dll.a
%{_mingw32_libdir}/libgailutil.la
%{_mingw32_libdir}/libgdk-win32-2.0.dll.a
%{_mingw32_libdir}/libgdk-win32-2.0.la
%{_mingw32_libdir}/libgdk_pixbuf-2.0.dll.a
%{_mingw32_libdir}/libgdk_pixbuf-2.0.la
%{_mingw32_libdir}/libgtk-win32-2.0.dll.a
%{_mingw32_libdir}/libgtk-win32-2.0.la
%{_mingw32_libdir}/gdk_pixbuf-2.0.def
%{_mingw32_libdir}/gdk-win32-2.0.def
%{_mingw32_libdir}/gtk-win32-2.0.def
%{_mingw32_libdir}/pkgconfig/gail.pc
%{_mingw32_libdir}/pkgconfig/gdk-2.0.pc
%{_mingw32_libdir}/pkgconfig/gdk-win32-2.0.pc
%{_mingw32_libdir}/pkgconfig/gdk-pixbuf-2.0.pc
%{_mingw32_libdir}/pkgconfig/gtk+-2.0.pc
%{_mingw32_libdir}/pkgconfig/gtk+-win32-2.0.pc
%{_mingw32_includedir}/gtk-2.0/
%{_mingw32_includedir}/gail-1.0/
%{_mingw32_sysconfdir}/gtk-2.0/
%{_mingw32_datadir}/aclocal/gtk-2.0.m4
%{_mingw32_datadir}/gtk-2.0/


%changelog
* Fri Feb  6 2009 Richard W.M. Jones <rjones at redhat.com> - 2.15.0-3
- Remove documentation.
- Add license file.
- Added extra BRs suggested by auto-buildrequires.

* Fri Jan 30 2009 Richard W.M. Jones <rjones at redhat.com> - 2.15.0-2
- Requires pkgconfig.

* Fri Jan 23 2009 Richard W.M. Jones <rjones at redhat.com> - 2.15.0-1
- Rebase to Fedora native version 2.15.0.
- Disable static libraries.
- Use _smp_mflags.
- Use find_lang macro.

* Mon Oct 27 2008 Richard W.M. Jones <rjones at redhat.com> - 2.14.4-3
- Remove preun script, no longer used.

* Fri Oct 24 2008 Richard W.M. Jones <rjones at redhat.com> - 2.14.4-1
- New upstream version 2.14.4.
- Require cairo >= 1.8.0 because of important fixes.
- Remove a couple of patches which are now upstream.

* Fri Oct 10 2008 Richard W.M. Jones <rjones at redhat.com> - 2.14.2-3
- Remove the requirement for Wine at build or install time.
- Conflicts with (native) cups-devel.

* Wed Sep 24 2008 Richard W.M. Jones <rjones at redhat.com> - 2.14.2-2
- Rename mingw -> mingw32.

* Mon Sep 22 2008 Daniel P. Berrange <berrange at redhat.com> - 2.14.2-1
- Update to 2.14.2 release

* Sun Sep 21 2008 Richard W.M. Jones <rjones at redhat.com> - 2.14.0-5
- Remove manpages duplicating those in Fedora native packages.

* Thu Sep 11 2008 Daniel P. Berrange <berrange at redhat.com> - 2.14.0-4
- Added dep on pkgconfig, gettext and glib2 (native)

* Thu Sep 11 2008 Richard W.M. Jones <rjones at redhat.com> - 2.14.0-3
- post/preun scripts to update the gdk-pixbuf.loaders list.

* Wed Sep 10 2008 Richard W.M. Jones <rjones at redhat.com> - 2.14.0-2
- Jasper DLLs now fixed.
- Fix source URL.
- Run the correct glib-mkenums.

* Tue Sep  9 2008 Daniel P. Berrange <berrange at redhat.com> - 2.14.0-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Feb 2009 22:21:30 -0000	1.1
+++ .cvsignore	11 Feb 2009 10:09:34 -0000	1.2
@@ -0,0 +1 @@
+gtk+-2.15.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Feb 2009 22:21:30 -0000	1.1
+++ sources	11 Feb 2009 10:09:35 -0000	1.2
@@ -0,0 +1 @@
+23ff288d00b24f0820a4ae79a747f25e  gtk+-2.15.0.tar.bz2