From: Richard W.M. Jones <"Richard W.M. Jones "> Date: Fri, 20 Feb 2009 09:04:42 +0000 (+0000) Subject: These packages have been moved into Fedora. X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=b33ce6db6da2cfdc1289de889d926c8552acb713;p=fedora-mingw.git These packages have been moved into Fedora. --- diff --git a/gtk-vnc/mingw32-gtk-vnc.spec b/gtk-vnc/mingw32-gtk-vnc.spec deleted file mode 100644 index beb2591..0000000 --- a/gtk-vnc/mingw32-gtk-vnc.spec +++ /dev/null @@ -1,107 +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 _default_patch_fuzz 2 - -Name: mingw32-gtk-vnc -Version: 0.3.8 -Release: 3%{?dist} -Summary: MinGW Windows port of VNC client GTK widget - -License: LGPLv2+ -Group: Development/Libraries -URL: http://sourceforge.net/projects/gtk-vnc -Source0: http://downloads.sourceforge.net/gtk-vnc/gtk-vnc-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildArch: noarch - -BuildRequires: mingw32-filesystem >= 40 -BuildRequires: mingw32-gcc -BuildRequires: mingw32-binutils - -BuildRequires: mingw32-cairo -BuildRequires: mingw32-dlfcn -BuildRequires: mingw32-gettext -BuildRequires: mingw32-iconv -BuildRequires: mingw32-gnutls -BuildRequires: mingw32-gtk2 -BuildRequires: pkgconfig - -Requires: pkgconfig - - -%description -gtk-vnc is a VNC viewer widget for GTK. It is built using coroutines -allowing it to be completely asynchronous while remaining single threaded. - - -%prep -%setup -q -n gtk-vnc-%{version} - - -%build -%{_mingw32_configure} --without-python --with-examples --disable-static -make %{?_smp_mflags} - - -%install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install - -# automake gives gvncviewer a strange name ... -mv $RPM_BUILD_ROOT%{_mingw32_bindir}/i686-pc-mingw32-gvncviewer.exe \ - $RPM_BUILD_ROOT%{_mingw32_bindir}/gvncviewer.exe \ - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-,root,root) -%doc COPYING.LIB -%{_mingw32_bindir}/gvncviewer.exe -%{_mingw32_bindir}/libgtk-vnc-1.0-0.dll -%{_mingw32_libdir}/libgtk-vnc-1.0.dll.a -%{_mingw32_libdir}/libgtk-vnc-1.0.la -%{_mingw32_libdir}/pkgconfig/gtk-vnc-1.0.pc -%{_mingw32_includedir}/gtk-vnc-1.0 - - -%changelog -* Fri Feb 6 2009 Richard W.M. Jones - 0.3.8-3 -- Downgrade mingw32-filesystem version so it can still build on F-10. - -* Fri Feb 6 2009 Richard W.M. Jones - 0.3.8-2 -- Needs mingw32-filesystem with the pkg-config library path fix. -- Added optional BRs suggested by auto-buildrequires. -- Include the license file. - -* Tue Feb 3 2009 Michel Salim - 0.3.8-1 -- Update to 0.3.8 - -* Fri Jan 30 2009 Richard W.M. Jones - 0.3.8-0.4.20081030hg -- Requires pkgconfig. - -* Fri Jan 23 2009 Richard W.M. Jones - 0.3.8-0.3.20081030hg -- Use _smp_mflags. -- Disable static library. -- Rebuild libtool. - -* Thu Oct 30 2008 Richard W.M. Jones - 0.3.8-0.2.20081030hg -- Add Dan's fd/socket fix for Windows. - -* Thu Oct 30 2008 Richard W.M. Jones - 0.3.8-0.1.20081030hg -- Upgrade to current version in Mercurial (pre-release of 0.3.8). -- More MinGW patches. - -* Fri Oct 10 2008 Richard W.M. Jones - 0.3.7-3 -- Missing BRs discovered by mock. -- Added description section. - -* Thu Oct 9 2008 Richard W.M. Jones - 0.3.7-2 -- Initial RPM release. diff --git a/gtk2/Makefile b/gtk2/Makefile deleted file mode 100644 index 7f04289..0000000 --- a/gtk2/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# Build some Gtk test programs under Wine. - -CFLAGS = -g `pkg-config --cflags gtk+-2.0` -LIBS = `pkg-config --libs gtk+-2.0` - -MINGW32_LIBDIR=/usr/i686-pc-mingw32/sys-root/mingw/lib - -all: test1 test1.exe test2 test2.exe test3 test3.exe - -test1: test1.c - gcc $(CFLAGS) $< $(LIBS) -o $@ - -test1.exe: test1.c - export PKG_CONFIG_PATH=$(MINGW32_LIBDIR)/pkgconfig; \ - i686-pc-mingw32-gcc $(CFLAGS) $< $(LIBS) -o $@ - -test2: test2.c - gcc $(CFLAGS) $< $(LIBS) -o $@ - -test2.exe: test2.c - export PKG_CONFIG_PATH=$(MINGW32_LIBDIR)/pkgconfig; \ - i686-pc-mingw32-gcc $(CFLAGS) $< $(LIBS) -o $@ - -test3: test3.c - gcc $(CFLAGS) $< $(LIBS) -o $@ - -test3.exe: test3.c - export PKG_CONFIG_PATH=$(MINGW32_LIBDIR)/pkgconfig; \ - i686-pc-mingw32-gcc $(CFLAGS) $< $(LIBS) -o $@ - -clean: - rm -f test1 test2 test3 *.exe *~ diff --git a/gtk2/compare.supp b/gtk2/compare.supp deleted file mode 100644 index ec6fb7c..0000000 --- a/gtk2/compare.supp +++ /dev/null @@ -1,4 +0,0 @@ -missing source: 'update-gtk-immodules' -missing source: 'update-gdk-pixbuf-loaders' -missing patch 'workaround.patch' -missing patch 'gtk+-2.13.5-lib64.patch' diff --git a/gtk2/gail-leaks.patch b/gtk2/gail-leaks.patch deleted file mode 100644 index a368f76..0000000 --- a/gtk2/gail-leaks.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -up gtk+-2.14.2/modules/other/gail/gailcell.c.gail-leaks gtk+-2.14.2/modules/other/gail/gailcell.c ---- gtk+-2.14.2/modules/other/gail/gailcell.c.gail-leaks 2008-09-19 00:55:50.000000000 -0400 -+++ gtk+-2.14.2/modules/other/gail/gailcell.c 2008-09-19 00:56:24.000000000 -0400 -@@ -118,6 +118,7 @@ gail_cell_destroyed (GtkWidget *wi - * GtkWidget. We set the pointer location to NULL; - */ - cell->widget = NULL; -+ g_signal_handlers_disconnect_by_func (widget, gail_cell_destroyed, cell); - } - - static void -diff -up gtk+-2.14.2/modules/other/gail/gailtreeview.c.gail-leaks gtk+-2.14.2/modules/other/gail/gailtreeview.c ---- gtk+-2.14.2/modules/other/gail/gailtreeview.c.gail-leaks 2008-09-19 00:55:02.000000000 -0400 -+++ gtk+-2.14.2/modules/other/gail/gailtreeview.c 2008-09-19 00:55:39.000000000 -0400 -@@ -3667,12 +3667,12 @@ static gboolean - garbage_collect_cell_data (gpointer data) - { - GailTreeView *tree_view; -- GList *temp_list; -+ GList *temp_list, *list; - GailTreeViewCellInfo *cell_info; - - g_assert (GAIL_IS_TREE_VIEW (data)); - tree_view = (GailTreeView *)data; -- temp_list = g_list_copy (tree_view->cell_data); -+ list = g_list_copy (tree_view->cell_data); - - tree_view->garbage_collection_pending = FALSE; - if (tree_view->idle_garbage_collect_id != 0) -@@ -3682,6 +3682,7 @@ garbage_collect_cell_data (gpointer data - } - - /* Must loop through them all */ -+ temp_list = list; - while (temp_list != NULL) - { - cell_info = temp_list->data; -@@ -3696,7 +3697,7 @@ garbage_collect_cell_data (gpointer data - } - temp_list = temp_list->next; - } -- g_list_free (temp_list); -+ g_list_free (list); - - return tree_view->garbage_collection_pending; - } diff --git a/gtk2/gdk-pixbuf.loaders b/gtk2/gdk-pixbuf.loaders deleted file mode 100644 index 0c9e733..0000000 --- a/gtk2/gdk-pixbuf.loaders +++ /dev/null @@ -1,136 +0,0 @@ -# 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 - diff --git a/gtk2/info-leak.patch b/gtk2/info-leak.patch deleted file mode 100644 index b94106a..0000000 --- a/gtk2/info-leak.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up gtk+-2.14.2/gdk-pixbuf/gdk-pixbuf-io.c.info-leak gtk+-2.14.2/gdk-pixbuf/gdk-pixbuf-io.c ---- gtk+-2.14.2/gdk-pixbuf/gdk-pixbuf-io.c.info-leak 2008-09-18 14:34:02.000000000 -0400 -+++ gtk+-2.14.2/gdk-pixbuf/gdk-pixbuf-io.c 2008-09-18 14:34:46.000000000 -0400 -@@ -688,9 +688,10 @@ gdk_pixbuf_load_module_unlocked (GdkPixb - if (fill_vtable) { - image_module->module = (void *) 1; - (* fill_vtable) (image_module); -- image_module->info = g_new0 (GdkPixbufFormat, 1); -- (* fill_info) (image_module->info); -- -+ if (image_module->info == NULL) { -+ image_module->info = g_new0 (GdkPixbufFormat, 1); -+ (* fill_info) (image_module->info); -+ } - return TRUE; - } - else diff --git a/gtk2/mingw32-gtk2-2.15.0-xbuttons.patch b/gtk2/mingw32-gtk2-2.15.0-xbuttons.patch deleted file mode 100644 index 6138fce..0000000 --- a/gtk2/mingw32-gtk2-2.15.0-xbuttons.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- 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); diff --git a/gtk2/mingw32-gtk2.spec b/gtk2/mingw32-gtk2.spec deleted file mode 100644 index e99dab9..0000000 --- a/gtk2/mingw32-gtk2.spec +++ /dev/null @@ -1,188 +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-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 - 2.15.0-3 -- Remove documentation. -- Add license file. -- Added extra BRs suggested by auto-buildrequires. - -* Fri Jan 30 2009 Richard W.M. Jones - 2.15.0-2 -- Requires pkgconfig. - -* Fri Jan 23 2009 Richard W.M. Jones - 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 - 2.14.4-3 -- Remove preun script, no longer used. - -* Fri Oct 24 2008 Richard W.M. Jones - 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 - 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 - 2.14.2-2 -- Rename mingw -> mingw32. - -* Mon Sep 22 2008 Daniel P. Berrange - 2.14.2-1 -- Update to 2.14.2 release - -* Sun Sep 21 2008 Richard W.M. Jones - 2.14.0-5 -- Remove manpages duplicating those in Fedora native packages. - -* Thu Sep 11 2008 Daniel P. Berrange - 2.14.0-4 -- Added dep on pkgconfig, gettext and glib2 (native) - -* Thu Sep 11 2008 Richard W.M. Jones - 2.14.0-3 -- post/preun scripts to update the gdk-pixbuf.loaders list. - -* Wed Sep 10 2008 Richard W.M. Jones - 2.14.0-2 -- Jasper DLLs now fixed. -- Fix source URL. -- Run the correct glib-mkenums. - -* Tue Sep 9 2008 Daniel P. Berrange - 2.14.0-1 -- Initial RPM release diff --git a/gtk2/test1.c b/gtk2/test1.c deleted file mode 100644 index c9ff03d..0000000 --- a/gtk2/test1.c +++ /dev/null @@ -1,102 +0,0 @@ -/* Hello, world from - * http://library.gnome.org/devel/gtk-tutorial/stable/c39.html#SEC-HELLOWORLD - */ - -#include - -/* This is a callback function. The data arguments are ignored - * in this example. More on callbacks below. */ -static void hello( GtkWidget *widget, - gpointer data ) -{ - g_print ("Hello World\n"); -} - -static gboolean delete_event( GtkWidget *widget, - GdkEvent *event, - gpointer data ) -{ - /* If you return FALSE in the "delete_event" signal handler, - * GTK will emit the "destroy" signal. Returning TRUE means - * you don't want the window to be destroyed. - * This is useful for popping up 'are you sure you want to quit?' - * type dialogs. */ - - g_print ("delete event occurred\n"); - - /* Change TRUE to FALSE and the main window will be destroyed with - * a "delete_event". */ - - return TRUE; -} - -/* Another callback */ -static void destroy( GtkWidget *widget, - gpointer data ) -{ - gtk_main_quit (); -} - -int main( int argc, - char *argv[] ) -{ - /* GtkWidget is the storage type for widgets */ - GtkWidget *window; - GtkWidget *button; - - /* This is called in all GTK applications. Arguments are parsed - * from the command line and are returned to the application. */ - gtk_init (&argc, &argv); - - /* create a new window */ - window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - - /* When the window is given the "delete_event" signal (this is given - * by the window manager, usually by the "close" option, or on the - * titlebar), we ask it to call the delete_event () function - * as defined above. The data passed to the callback - * function is NULL and is ignored in the callback function. */ - g_signal_connect (G_OBJECT (window), "delete_event", - G_CALLBACK (delete_event), NULL); - - /* Here we connect the "destroy" event to a signal handler. - * This event occurs when we call gtk_widget_destroy() on the window, - * or if we return FALSE in the "delete_event" callback. */ - g_signal_connect (G_OBJECT (window), "destroy", - G_CALLBACK (destroy), NULL); - - /* Sets the border width of the window. */ - gtk_container_set_border_width (GTK_CONTAINER (window), 10); - - /* Creates a new button with the label "Hello World". */ - button = gtk_button_new_with_label ("Hello World"); - - /* When the button receives the "clicked" signal, it will call the - * function hello() passing it NULL as its argument. The hello() - * function is defined above. */ - g_signal_connect (G_OBJECT (button), "clicked", - G_CALLBACK (hello), NULL); - - /* This will cause the window to be destroyed by calling - * gtk_widget_destroy(window) when "clicked". Again, the destroy - * signal could come from here, or the window manager. */ - g_signal_connect_swapped (G_OBJECT (button), "clicked", - G_CALLBACK (gtk_widget_destroy), - G_OBJECT (window)); - - /* This packs the button into the window (a gtk container). */ - gtk_container_add (GTK_CONTAINER (window), button); - - /* The final step is to display this newly created widget. */ - gtk_widget_show (button); - - /* and the window */ - gtk_widget_show (window); - - /* All GTK applications must have a gtk_main(). Control ends here - * and waits for an event to occur (like a key press or - * mouse event). */ - gtk_main (); - - return 0; -} diff --git a/gtk2/test2.c b/gtk2/test2.c deleted file mode 100644 index 94d3a96..0000000 --- a/gtk2/test2.c +++ /dev/null @@ -1,97 +0,0 @@ -/* Two-button dialog from - * http://library.gnome.org/devel/gtk-tutorial/stable/x345.html - */ - -#include - -/* Our new improved callback. The data passed to this function - * is printed to stdout. */ -static void callback( GtkWidget *widget, - gpointer data ) -{ - g_print ("Hello again - %s was pressed\n", (gchar *) data); -} - -/* another callback */ -static gboolean delete_event( GtkWidget *widget, - GdkEvent *event, - gpointer data ) -{ - gtk_main_quit (); - return FALSE; -} - -int main( int argc, - char *argv[] ) -{ - /* GtkWidget is the storage type for widgets */ - GtkWidget *window; - GtkWidget *button; - GtkWidget *box1; - - /* This is called in all GTK applications. Arguments are parsed - * from the command line and are returned to the application. */ - gtk_init (&argc, &argv); - - /* Create a new window */ - window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - - /* This is a new call, which just sets the title of our - * new window to "Hello Buttons!" */ - gtk_window_set_title (GTK_WINDOW (window), "Hello Buttons!"); - - /* Here we just set a handler for delete_event that immediately - * exits GTK. */ - g_signal_connect (G_OBJECT (window), "delete_event", - G_CALLBACK (delete_event), NULL); - - /* Sets the border width of the window. */ - gtk_container_set_border_width (GTK_CONTAINER (window), 10); - - /* We create a box to pack widgets into. This is described in detail - * in the "packing" section. The box is not really visible, it - * is just used as a tool to arrange widgets. */ - box1 = gtk_hbox_new (FALSE, 0); - - /* Put the box into the main window. */ - gtk_container_add (GTK_CONTAINER (window), box1); - - /* Creates a new button with the label "Button 1". */ - button = gtk_button_new_with_label ("Button 1"); - - /* Now when the button is clicked, we call the "callback" function - * with a pointer to "button 1" as its argument */ - g_signal_connect (G_OBJECT (button), "clicked", - G_CALLBACK (callback), (gpointer) "button 1"); - - /* Instead of gtk_container_add, we pack this button into the invisible - * box, which has been packed into the window. */ - gtk_box_pack_start (GTK_BOX(box1), button, TRUE, TRUE, 0); - - /* Always remember this step, this tells GTK that our preparation for - * this button is complete, and it can now be displayed. */ - gtk_widget_show (button); - - /* Do these same steps again to create a second button */ - button = gtk_button_new_with_label ("Button 2"); - - /* Call the same callback function with a different argument, - * passing a pointer to "button 2" instead. */ - g_signal_connect (G_OBJECT (button), "clicked", - G_CALLBACK (callback), (gpointer) "button 2"); - - gtk_box_pack_start(GTK_BOX (box1), button, TRUE, TRUE, 0); - - /* The order in which we show the buttons is not really important, but I - * recommend showing the window last, so it all pops up at once. */ - gtk_widget_show (button); - - gtk_widget_show (box1); - - gtk_widget_show (window); - - /* Rest in gtk_main and wait for the fun to begin! */ - gtk_main (); - - return 0; -} diff --git a/gtk2/test3.c b/gtk2/test3.c deleted file mode 100644 index 5c1a7a1..0000000 --- a/gtk2/test3.c +++ /dev/null @@ -1,417 +0,0 @@ -/* Calendar tutorial from - * http://library.gnome.org/devel/gtk-tutorial/stable/x1102.html - */ - -/* - * Copyright (C) 1998 Cesar Miquel, Shawn T. Amundson, Mattias Gr�nlund - * Copyright (C) 2000 Tony Gale - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#include -#include -#include - -#define DEF_PAD 10 -#define DEF_PAD_SMALL 5 - -#define TM_YEAR_BASE 1900 - -typedef struct _CalendarData { - GtkWidget *flag_checkboxes[5]; - gboolean settings[5]; - GtkWidget *font_dialog; - GtkWidget *window; - GtkWidget *prev2_sig; - GtkWidget *prev_sig; - GtkWidget *last_sig; - GtkWidget *month; -} CalendarData; - -enum { - calendar_show_header, - calendar_show_days, - calendar_month_change, - calendar_show_week, - calendar_monday_first -}; - -/* - * GtkCalendar - */ - -static void calendar_date_to_string( CalendarData *data, - char *buffer, - gint buff_len ) -{ - GDate date; - guint year, month, day; - - gtk_calendar_get_date (GTK_CALENDAR (data->window), - &year, &month, &day); - g_date_set_dmy (&date, day, month + 1, year); - g_date_strftime (buffer, buff_len - 1, "%x", &date); - -} - -static void calendar_set_signal_strings( char *sig_str, - CalendarData *data ) -{ - const gchar *prev_sig; - - prev_sig = gtk_label_get_text (GTK_LABEL (data->prev_sig)); - gtk_label_set_text (GTK_LABEL (data->prev2_sig), prev_sig); - - prev_sig = gtk_label_get_text (GTK_LABEL (data->last_sig)); - gtk_label_set_text (GTK_LABEL (data->prev_sig), prev_sig); - gtk_label_set_text (GTK_LABEL (data->last_sig), sig_str); -} - -static void calendar_month_changed( GtkWidget *widget, - CalendarData *data ) -{ - char buffer[256] = "month_changed: "; - - calendar_date_to_string (data, buffer + 15, 256 - 15); - calendar_set_signal_strings (buffer, data); -} - -static void calendar_day_selected( GtkWidget *widget, - CalendarData *data ) -{ - char buffer[256] = "day_selected: "; - - calendar_date_to_string (data, buffer + 14, 256 - 14); - calendar_set_signal_strings (buffer, data); -} - -static void calendar_day_selected_double_click ( GtkWidget *widget, - CalendarData *data ) -{ - char buffer[256] = "day_selected_double_click: "; - guint day; - - calendar_date_to_string (data, buffer + 27, 256 - 27); - calendar_set_signal_strings (buffer, data); - - gtk_calendar_get_date (GTK_CALENDAR (data->window), - NULL, NULL, &day); - - if (GTK_CALENDAR (data->window)->marked_date[day-1] == 0) { - gtk_calendar_mark_day (GTK_CALENDAR (data->window), day); - } else { - gtk_calendar_unmark_day (GTK_CALENDAR (data->window), day); - } -} - -static void calendar_prev_month( GtkWidget *widget, - CalendarData *data ) -{ - char buffer[256] = "prev_month: "; - - calendar_date_to_string (data, buffer + 12, 256 - 12); - calendar_set_signal_strings (buffer, data); -} - -static void calendar_next_month( GtkWidget *widget, - CalendarData *data ) -{ - char buffer[256] = "next_month: "; - - calendar_date_to_string (data, buffer + 12, 256 - 12); - calendar_set_signal_strings (buffer, data); -} - -static void calendar_prev_year( GtkWidget *widget, - CalendarData *data ) -{ - char buffer[256] = "prev_year: "; - - calendar_date_to_string (data, buffer + 11, 256 - 11); - calendar_set_signal_strings (buffer, data); -} - -static void calendar_next_year( GtkWidget *widget, - CalendarData *data ) -{ - char buffer[256] = "next_year: "; - - calendar_date_to_string (data, buffer + 11, 256 - 11); - calendar_set_signal_strings (buffer, data); -} - - -static void calendar_set_flags( CalendarData *calendar ) -{ - gint i; - gint options = 0; - for (i = 0;i < 5; i++) - if (calendar->settings[i]) - { - options = options + (1 << i); - } - if (calendar->window) - gtk_calendar_display_options (GTK_CALENDAR (calendar->window), options); -} - -static void calendar_toggle_flag( GtkWidget *toggle, - CalendarData *calendar) -{ - gint i; - gint j; - j = 0; - for (i = 0; i < 5; i++) - if (calendar->flag_checkboxes[i] == toggle) - j = i; - - calendar->settings[j] = !calendar->settings[j]; - calendar_set_flags (calendar); - -} - -static void calendar_font_selection_ok( GtkWidget *button, - CalendarData *calendar ) -{ - GtkRcStyle *style; - char *font_name; - - if (calendar->window) - { - font_name = gtk_font_selection_dialog_get_font_name (GTK_FONT_SELECTION_DIALOG (calendar->font_dialog)); - if (font_name) - { - style = gtk_rc_style_new (); - pango_font_description_free (style->font_desc); - style->font_desc = pango_font_description_from_string (font_name); - gtk_widget_modify_style (calendar->window, style); - g_free (font_name); - } - } - - gtk_widget_destroy (calendar->font_dialog); -} - -static void calendar_select_font( GtkWidget *button, - CalendarData *calendar ) -{ - GtkWidget *window; - - if (!calendar->font_dialog) { - window = gtk_font_selection_dialog_new ("Font Selection Dialog"); - g_return_if_fail (GTK_IS_FONT_SELECTION_DIALOG (window)); - calendar->font_dialog = window; - - gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_MOUSE); - - g_signal_connect (window, "destroy", - G_CALLBACK (gtk_widget_destroyed), - &calendar->font_dialog); - - g_signal_connect (GTK_FONT_SELECTION_DIALOG (window)->ok_button, - "clicked", G_CALLBACK (calendar_font_selection_ok), - calendar); - g_signal_connect_swapped (GTK_FONT_SELECTION_DIALOG (window)->cancel_button, - "clicked", G_CALLBACK (gtk_widget_destroy), - calendar->font_dialog); - } - window = calendar->font_dialog; - if (!GTK_WIDGET_VISIBLE (window)) - gtk_widget_show (window); - else - gtk_widget_destroy (window); - -} - -static void create_calendar( void ) -{ - GtkWidget *window; - GtkWidget *vbox, *vbox2, *vbox3; - GtkWidget *hbox; - GtkWidget *hbbox; - GtkWidget *calendar; - GtkWidget *toggle; - GtkWidget *button; - GtkWidget *frame; - GtkWidget *separator; - GtkWidget *label; - GtkWidget *bbox; - static CalendarData calendar_data; - gint i; - - struct { - char *label; - } flags[] = - { - { "Show Heading" }, - { "Show Day Names" }, - { "No Month Change" }, - { "Show Week Numbers" }, - { "Week Start Monday" } - }; - - - calendar_data.window = NULL; - calendar_data.font_dialog = NULL; - - for (i = 0; i < 5; i++) { - calendar_data.settings[i] = 0; - } - - window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_window_set_title (GTK_WINDOW (window), "GtkCalendar Example"); - gtk_container_set_border_width (GTK_CONTAINER (window), 5); - g_signal_connect (window, "destroy", - G_CALLBACK (gtk_main_quit), - NULL); - g_signal_connect (window, "delete-event", - G_CALLBACK (gtk_false), - NULL); - gtk_window_set_resizable (GTK_WINDOW (window), FALSE); - - vbox = gtk_vbox_new (FALSE, DEF_PAD); - gtk_container_add (GTK_CONTAINER (window), vbox); - - /* - * The top part of the window, Calendar, flags and fontsel. - */ - - hbox = gtk_hbox_new (FALSE, DEF_PAD); - gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, DEF_PAD); - hbbox = gtk_hbutton_box_new (); - gtk_box_pack_start (GTK_BOX (hbox), hbbox, FALSE, FALSE, DEF_PAD); - gtk_button_box_set_layout (GTK_BUTTON_BOX (hbbox), GTK_BUTTONBOX_SPREAD); - gtk_box_set_spacing (GTK_BOX (hbbox), 5); - - /* Calendar widget */ - frame = gtk_frame_new ("Calendar"); - gtk_box_pack_start(GTK_BOX (hbbox), frame, FALSE, TRUE, DEF_PAD); - calendar=gtk_calendar_new (); - calendar_data.window = calendar; - calendar_set_flags (&calendar_data); - gtk_calendar_mark_day (GTK_CALENDAR (calendar), 19); - gtk_container_add (GTK_CONTAINER (frame), calendar); - g_signal_connect (calendar, "month_changed", - G_CALLBACK (calendar_month_changed), - &calendar_data); - g_signal_connect (calendar, "day_selected", - G_CALLBACK (calendar_day_selected), - &calendar_data); - g_signal_connect (calendar, "day_selected_double_click", - G_CALLBACK (calendar_day_selected_double_click), - &calendar_data); - g_signal_connect (calendar, "prev_month", - G_CALLBACK (calendar_prev_month), - &calendar_data); - g_signal_connect (calendar, "next_month", - G_CALLBACK (calendar_next_month), - &calendar_data); - g_signal_connect (calendar, "prev_year", - G_CALLBACK (calendar_prev_year), - &calendar_data); - g_signal_connect (calendar, "next_year", - G_CALLBACK (calendar_next_year), - &calendar_data); - - - separator = gtk_vseparator_new (); - gtk_box_pack_start (GTK_BOX (hbox), separator, FALSE, TRUE, 0); - - vbox2 = gtk_vbox_new (FALSE, DEF_PAD); - gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, DEF_PAD); - - /* Build the Right frame with the flags in */ - - frame = gtk_frame_new ("Flags"); - gtk_box_pack_start (GTK_BOX (vbox2), frame, TRUE, TRUE, DEF_PAD); - vbox3 = gtk_vbox_new (TRUE, DEF_PAD_SMALL); - gtk_container_add (GTK_CONTAINER (frame), vbox3); - - for (i = 0; i < 5; i++) - { - toggle = gtk_check_button_new_with_label (flags[i].label); - g_signal_connect (toggle, - "toggled", - G_CALLBACK (calendar_toggle_flag), - &calendar_data); - gtk_box_pack_start (GTK_BOX (vbox3), toggle, TRUE, TRUE, 0); - calendar_data.flag_checkboxes[i] = toggle; - } - /* Build the right font-button */ - button = gtk_button_new_with_label ("Font..."); - g_signal_connect (button, - "clicked", - G_CALLBACK (calendar_select_font), - &calendar_data); - gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE, 0); - - /* - * Build the Signal-event part. - */ - - frame = gtk_frame_new ("Signal events"); - gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, DEF_PAD); - - vbox2 = gtk_vbox_new (TRUE, DEF_PAD_SMALL); - gtk_container_add (GTK_CONTAINER (frame), vbox2); - - hbox = gtk_hbox_new (FALSE, 3); - gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, TRUE, 0); - label = gtk_label_new ("Signal:"); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0); - calendar_data.last_sig = gtk_label_new (""); - gtk_box_pack_start (GTK_BOX (hbox), calendar_data.last_sig, FALSE, TRUE, 0); - - hbox = gtk_hbox_new (FALSE, 3); - gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, TRUE, 0); - label = gtk_label_new ("Previous signal:"); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0); - calendar_data.prev_sig = gtk_label_new (""); - gtk_box_pack_start (GTK_BOX (hbox), calendar_data.prev_sig, FALSE, TRUE, 0); - - hbox = gtk_hbox_new (FALSE, 3); - gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, TRUE, 0); - label = gtk_label_new ("Second previous signal:"); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0); - calendar_data.prev2_sig = gtk_label_new (""); - gtk_box_pack_start (GTK_BOX (hbox), calendar_data.prev2_sig, FALSE, TRUE, 0); - - bbox = gtk_hbutton_box_new (); - gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0); - gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_END); - - button = gtk_button_new_with_label ("Close"); - g_signal_connect (button, "clicked", - G_CALLBACK (gtk_main_quit), - NULL); - gtk_container_add (GTK_CONTAINER (bbox), button); - GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); - gtk_widget_grab_default (button); - - gtk_widget_show_all (window); -} - - -int main (int argc, - char *argv[]) -{ - gtk_init (&argc, &argv); - - create_calendar (); - - gtk_main (); - - return 0; -}