Hello community,
here is the log from the commit of package gtk2
checked in at Tue May 6 19:00:54 CEST 2008.
--------
--- GNOME/gtk2/gtk2.changes 2008-04-22 16:00:06.000000000 +0200
+++ /mounts/work_src_done/STABLE/gtk2/gtk2.changes 2008-05-06 14:34:55.000000000 +0200
@@ -1,0 +2,14 @@
+Tue May 6 14:34:38 CEST 2008 - schwab@suse.de
+
+- Don't use libtool before it is created.
+
+-------------------------------------------------------------------
+Tue May 6 02:02:14 CEST 2008 - federico@novell.com
+
+- Added gtk2-bnc310710-bgo524166-underallocated-gtklabel-position.diff
+ to fix https://bugzilla.novell.com/show_bug.cgi?id=310710 - Labels
+ with too-small allocations should still pay attention to their
+ alignment. This fixes a clipped "Computer" label in
+ gnome-main-menu.
+
+-------------------------------------------------------------------
New:
----
gtk2-bnc310710-bgo524166-underallocated-gtklabel-position.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gtk2.spec ++++++
--- /var/tmp/diff_new_pack.Na4278/_old 2008-05-06 18:59:50.000000000 +0200
+++ /var/tmp/diff_new_pack.Na4278/_new 2008-05-06 18:59:50.000000000 +0200
@@ -8,7 +8,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
Name: gtk2
@@ -29,7 +28,7 @@
AutoReqProv: on
PreReq: /usr/bin/touch /bin/rm /bin/rmdir
Version: 2.12.9
-Release: 20
+Release: 28
Summary: Library for Creation of Graphical User Interfaces (version 2)
Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.12/%{_name}-%{version}.tar.bz2
Source1: SuSEconfig.gtk2
@@ -65,6 +64,8 @@
Patch52: gtk2-bnc171077-bgo314873-filechooser-tab-in-the-middle-of-entry.diff
# PATCH-FIX-OPENSUSE gtk-path-local.patch Search in /usr/local/%{_lib} by default. bgo369696
Patch53: gtk-path-local.patch
+# PATCH-FIX-UPSTREAM gtk2-bnc310710-bgo524166-underallocated-gtklabel-position.diff bnc310710 bgo524166 federico@novell.com - Fix positioning of GtkLabels with too-small allocations
+Patch54: gtk2-bnc310710-bgo524166-underallocated-gtklabel-position.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: cairo >= 0.9.2 hicolor-icon-theme
%if %suse_version > 1020
@@ -279,6 +280,7 @@
%patch51 -p1
%patch52 -p1
%patch53
+%patch54 -p1
gnome-patch-translation-update
%build
@@ -410,6 +412,14 @@
%{_datadir}/gtk-doc/html/*
%changelog
+* Tue May 06 2008 schwab@suse.de
+- Don't use libtool before it is created.
+* Tue May 06 2008 federico@novell.com
+- Added gtk2-bnc310710-bgo524166-underallocated-gtklabel-position.diff
+ to fix https://bugzilla.novell.com/show_bug.cgi?id=310710 - Labels
+ with too-small allocations should still pay attention to their
+ alignment. This fixes a clipped "Computer" label in
+ gnome-main-menu.
* Tue Apr 22 2008 sbrabec@suse.cz
- Added patch supporting /usr/local instead of /etc/profile.d stuff
doing nearly the same (bnc#369696).
++++++ gtk2-bnc310710-bgo524166-underallocated-gtklabel-position.diff ++++++
2007-12-17 Federico Mena Quintero
* gtk/gtklabel.c (get_layout_location): For single-line labels,
align the requisition to the allocation unconditionally, even if
we are under-allocated. For multi-line labels, try to show the
top of the text as before. Fixes
https://bugzilla.novell.com/show_bug.cgi?id=310710
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index cd6c5ac..6e38a7d 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -2362,9 +2362,17 @@ get_layout_location (GtkLabel *label,
else
x = MIN (x, widget->allocation.x + widget->allocation.width - misc->xpad);
- y = floor (widget->allocation.y + (gint)misc->ypad
- + MAX (((widget->allocation.height - widget->requisition.height) * misc->yalign),
- 0));
+ /* For single-line labels, *do* align the requisition with respect to the allocation, even
+ * if we are under-allocated. For multi-line labels, always show the top of the text when
+ * they are under-allocated.
+ */
+ if (pango_layout_get_line_count (label->layout) == 1)
+ y = floor (widget->allocation.y + (gint)misc->ypad
+ + (widget->allocation.height - widget->requisition.height) * misc->yalign);
+ else
+ y = floor (widget->allocation.y + (gint)misc->ypad
+ + MAX (((widget->allocation.height - widget->requisition.height) * misc->yalign),
+ 0));
if (xp)
*xp = x;
++++++ gtk2-libtool.patch ++++++
--- /var/tmp/diff_new_pack.Na4278/_old 2008-05-06 18:59:53.000000000 +0200
+++ /var/tmp/diff_new_pack.Na4278/_new 2008-05-06 18:59:53.000000000 +0200
@@ -1,38 +1,10 @@
--- configure.in
+++ configure.in
-@@ -377,7 +377,11 @@ AC_MSG_CHECKING([Whether to write depend
+@@ -373,6 +373,7 @@ AC_ARG_ENABLE(explicit-deps,
+ [use explicit dependencies in .pc files [default=auto]])],,
+ [enable_explicit_deps=auto])
+
++m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
+ AC_MSG_CHECKING([Whether to write dependencies into .pc files])
case $enable_explicit_deps in
auto)
- export SED
-+ if test -x libtool; then
- deplibs_check_method=`(./libtool --config; echo 'eval echo $deplibs_check_method') | sh`
-+ else
-+ deplibs_check_method=`(libtool --config; echo 'eval echo $deplibs_check_method') | sh`
-+ fi
- if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then
- enable_explicit_deps=yes
- else
-@@ -726,7 +730,11 @@ else
- dnl Now we check to see if our libtool supports shared lib deps
- dnl (in a rather ugly way even)
- if $dynworks; then
-+ if test -x libtool; then
- pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
-+ else
-+ pixbuf_libtool_config="libtool --config"
-+ fi
- pixbuf_deplibs_check=`$pixbuf_libtool_config | \
- grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
- sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
-@@ -1636,7 +1644,11 @@ AM_CONDITIONAL(TEST_PRINT_BACKEND, test
- # We are using gmodule-no-export now, but I'm leaving the stripping
- # code in place for now, since pango and atk still require gmodule.
- export SED
-+if test -x libtool; then
- export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
-+else
-+export_dynamic=`(libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
-+fi
- if test -n "$export_dynamic"; then
- GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"`
- GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"`
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org