diff --git a/gtk+-2.91.7.tar.bz2 b/gtk+-2.91.7.tar.bz2 deleted file mode 100644 index 805c5ab..0000000 --- a/gtk+-2.91.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:24fbfd9d7f45a57df80cbc7ac8185672f0cdc9f259dc3680b0d35401fc906860 -size 16923801 diff --git a/gtk+-2.99.0.tar.bz2 b/gtk+-2.99.0.tar.bz2 new file mode 100644 index 0000000..a78ee58 --- /dev/null +++ b/gtk+-2.99.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:304a9f4553b6e5de224053245d21b897ede9ef44a232de7f769e5116f40bd41a +size 17208765 diff --git a/gtk3.changes b/gtk3.changes index 61dbbc7..c528425 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,30 +1,79 @@ +------------------------------------------------------------------- +Fri Jan 7 16:55:29 CET 2011 - vuntz@opensuse.org + +- Update to version 2.99.0: + + Various API deprecations and removals, see NEWS for details. + + The gtk-update-icon-cache and gtk-builder-convert utilities + have been renamed back to their un-suffixed names. + Distributions will have to resolve the conflict between GTK+ + 2.x and 3.0 packages by dropping one set of the utilities and + adding a dependency. + + It is now possible to include multiple GDK backends in a single + library. The --with-gdk-backend option has been split into + separate --enable-{x11,win32,quartz}-backend options. + + The GDK Quartz backend has been ported to the new GDK backend + API. + + A number of widgets have been ported to use GtkStyleContext + directly. + + Various problems with width-for-height geometry management have + been fixed in GtkAlignment, GtkCheckButton, GtkBin. + + The GtkComboBox, GtkIconView and GtkCellView widgets have been + ported to use GtkCellArea for their cell layouts. + + The cups print backend can now send print jobs directly in PDF + if cups supports it. + + GtkNumerableIcon is a variant of GEmblemedIcon for using + numbers as emblems. + + Bugs fixed: bgo#144324, bgo#165987, bgo#307963, bgo#321958, + bgo#533745, bgo#553404, bgo#559503, bgo#560177, bgo#562182, + bgo#599130, bgo#617312, bgo#617315, bgo#617322, bgo#617327, + bgo#617471, bgo#621720, bgo#622125, bgo#629955, bgo#633795, + bgo#634711, bgo#635299, bgo#637691, bgo#637721, bgo#637736, + bgo#637763, bgo#637834, bgo#637849, bgo#637895, bgo#637907, + bgo#637910, bgo#637958, bgo#637974, bgo#638179, bgo#638193, + bgo#638231, bgo#638386, bgo#638580, bgo#638608. + + Updated translations. +- Remove --with-xinput=xfree from configure call: the option + has been renamed to --enable-xinput, and there's no need to + specify it in our case, really. +- Use update-alternatives mechanism for gtk-update-icon-cache and + gtk-builder-convert since both tools are shipped with the same + names in gtk2 and gtk3: + + Rename the non-versioned tools and man pages to versioned + filenames. + + Add update-alternatives Requires(post/postun) to tools and + devel subpackages. + + Call update-alterantives in %post/%postun of the tools and + devel subpackages. + ------------------------------------------------------------------- Wed Dec 22 21:14:11 CET 2010 - dimstar@opensuse.org - Update to version 2.91.7: + The treeview-refactor branch has been merged, bringing more - flexible cell arrangement with GtkCellArea, GtkCellAreaBox, etc + flexible cell arrangement with GtkCellArea, GtkCellAreaBox, + etc. + The gdk-backend branch has been merged. This branch cleans up the internal frontend/backend separation in GDK, with the ultimate goal of allowing to build a single gdk library that contains multiple backends (interesting combinations are x11+wayland or quartz+x11). + + Various API deprecations and removals, see NEWS for details. + A number of GTK+ widgets have been ported to use - GtkStyleContext directly for rendering + GtkStyleContext directly for rendering. + The tracker search backend for the file chooser has been updated to work with libtracker-sparql as available in - tracker >= 0.9 + tracker >= 0.9. + The GtkAboutDialog has been given a facelift. It no longer - opens second-level dialogs + opens second-level dialogs. + The GDK X11 backend now uses XI2 (including multi-device capabilities) by default. Use gdk_disable_multidevice() to - switch back to the XI1/Core implementation + switch back to the XI1/Core implementation. + Bugs fixed: bgo#629923, bgo#634657, bgo#635401, bgo#636732, bgo#636777, bgo#637018, bgo#637069, bgo#637155, bgo#637156, bgo#637189, bgo#637243, bgo#637256, bgo#637464, bgo#637471, bgo#637520, bgo#637606, bgo#637608 + Updated translations. -- Remove -DGTK_COMPILATION in CFLAGS fixup; it's no longer needed. +- Remove -DGTK_COMPILATION in CFLAGS fixup: it's no longer needed. - Enable parallel build again. ------------------------------------------------------------------- diff --git a/gtk3.spec b/gtk3.spec index 641d8bd..d74e28b 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -1,5 +1,5 @@ # -# spec file for package gtk3 (Version 2.91.7) +# spec file for package gtk3 (Version 2.99.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 Dominique Leuenebrger, Amsterdam, Netherlands @@ -22,7 +22,7 @@ Name: gtk3 %define _name gtk+ -Version: 2.91.7 +Version: 2.99.0 Release: 1 License: LGPLv2.1+ Summary: The GTK+ toolkit library (version 3) @@ -216,6 +216,8 @@ This package provides an input method based on the X Input Method. License: LGPLv2.1+ Summary: The GTK+ toolkit library (version 3) -- Tools Group: System/Libraries +Requires(post): update-alternatives +Requires(postun): update-alternatives %description tools GTK+ is a multi-platform toolkit for creating graphical user interfaces. @@ -254,6 +256,8 @@ Group: Development/Libraries/X11 Requires: libgtk-3_0-0 = %{version} # gtk-builder-convert needs this. Requires: python-xml +Requires(post): update-alternatives +Requires(postun): update-alternatives %description devel GTK+ is a multi-platform toolkit for creating graphical user interfaces. @@ -279,7 +283,6 @@ gnome-patch-translation-update %configure \ --disable-static \ --enable-man \ - --with-xinput=xfree \ --enable-introspection %{__make} V=1 %{?_smp_mflags} @@ -300,6 +303,16 @@ touch %{buildroot}%{_libdir}/gtk-3.0/%{gtk_binary_version}/immodules.cache # create theming-engines directory that should have been created during the build test ! -d %{buildroot}%{_libdir}/gtk-3.0/%{gtk_binary_version}/theming-engines mkdir %{buildroot}%{_libdir}/gtk-3.0/%{gtk_binary_version}/theming-engines +# Alternatives for gtk-update-icon-cache and gtk-builder-convert +mv %{buildroot}%{_bindir}/gtk-update-icon-cache %{buildroot}%{_bindir}/gtk-update-icon-cache-3.0 +mv %{buildroot}%{_mandir}/man1/gtk-update-icon-cache.1 %{buildroot}%{_mandir}/man1/gtk-update-icon-cache-3.0.1 +mv %{buildroot}%{_bindir}/gtk-builder-convert %{buildroot}%{_bindir}/gtk-builder-convert-3.0 +mv %{buildroot}%{_mandir}/man1/gtk-builder-convert.1 %{buildroot}%{_mandir}/man1/gtk-builder-convert-3.0.1 +touch %{buildroot}%{_bindir}/gtk-update-icon-cache +touch %{buildroot}%{_mandir}/man1/gtk-update-icon-cache.1 +touch %{buildroot}%{_bindir}/gtk-builder-convert +touch %{buildroot}%{_mandir}/man1/gtk-builder-convert.1 +chmod a+x %{buildroot}%{_bindir}/gtk-update-icon-cache %{buildroot}%{_bindir}/gtk-builder-convert # Install rpm macros mkdir -p %{buildroot}%{_sysconfdir}/rpm cp %{S:3} %{buildroot}%{_sysconfdir}/rpm @@ -366,6 +379,20 @@ if [ $1 == 1 ]; then %{_gtk_query_immodules_update_cache} fi fi +%if 0 +# If the gtk-update-icon-cache group is in automatic mode, then this will also +# switch all symlinks automatically +%endif +update-alternatives --install %{_bindir}/gtk-update-icon-cache gtk-update-icon-cache %{_bindir}/gtk-update-icon-cache-3.0 3 \ + --slave %{_mandir}/man1/gtk-update-icon-cache.1.gz gtk-update-icon-cache.1.gz %{_mandir}/man1/gtk-update-icon-cache-3.0.1.gz + +%post devel +%if 0 +# If the gtk-builder-convert group is in automatic mode, then this will also +# switch all symlinks automatically +%endif +update-alternatives --install %{_bindir}/gtk-builder-convert gtk-builder-convert %{_bindir}/gtk-builder-convert-3.0 3 \ + --slave %{_mandir}/man1/gtk-builder-convert.1.gz gtk-builder-convert.1.gz %{_mandir}/man1/gtk-builder-convert-3.0.1.gz %post data %glib2_gsettings_schema_post @@ -402,6 +429,22 @@ fi %postun data %glib2_gsettings_schema_postun +%postun tools +%if 0 +# Note: we don't use "$1 -eq 0", to avoid issues if the package gets renamed +%endif +if [ ! -f %{_bindir}/gtk-update-icon-cache-3.0 ]; then + update-alternatives --remove gtk-update-icon-cache %{_bindir}/gtk-update-icon-cache-3.0 +fi + +%postun devel +%if 0 +# Note: we don't use "$1 -eq 0", to avoid issues if the package gets renamed +%endif +if [ ! -f %{_bindir}/gtk-builder-convert-3.0 ]; then + update-alternatives --remove gtk-builder-convert %{_bindir}/gtk-builder-convert-3.0 +fi + %files -n libgtk-3_0-0 %defattr(-, root, root) %doc AUTHORS COPYING README NEWS ChangeLog @@ -465,8 +508,10 @@ fi %defattr(-,root,root) %{_bindir}/gtk-query-immodules-3.0* %{_bindir}/gtk-update-icon-cache-3.0 +%ghost %{_bindir}/gtk-update-icon-cache %{_mandir}/man1/gtk-query-immodules-3.0*.1* %{_mandir}/man1/gtk-update-icon-cache-3.0.1* +%ghost %{_mandir}/man1/gtk-update-icon-cache.1* %files data %defattr(-,root,root) @@ -488,7 +533,9 @@ fi %doc %{_datadir}/gtk-doc/html/gtk3/ %{_bindir}/gtk3-demo %{_bindir}/gtk-builder-convert-3.0 +%ghost %{_bindir}/gtk-builder-convert %{_mandir}/man1/gtk-builder-convert-3.0.1* +%ghost %{_mandir}/man1/gtk-builder-convert.1* %{_datadir}/aclocal/gtk-3.0.m4 %{_datadir}/gir-1.0/*.gir %dir %{_datadir}/gtk-3.0 @@ -498,6 +545,7 @@ fi %{_libdir}/gtk-3.0/modules/libferret.so %{_libdir}/pkgconfig/gail-3.0.pc %{_libdir}/pkgconfig/gdk-3.0.pc +%{_libdir}/pkgconfig/gdk-x11-3.0.pc %{_libdir}/pkgconfig/gtk+-3.0.pc %{_libdir}/pkgconfig/gtk+-unix-print-3.0.pc %{_libdir}/pkgconfig/gtk+-x11-3.0.pc