pool/gtk2
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gtk2?expand=0&rev=68

Browse Source
This commit is contained in:
OBS User unknown 2009-05-27 22:51:56 +00:00 committed by Git OBS Bridge
parent 6c3bbfc379
commit fb0a055c73
9 changed files with 100 additions and 2860 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk+-2.16.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2f1f3fbdb2f5f907913838d6efbb595419e370c950838bb7fad51eb0ed776d50
size 18297352

3
gtk+-2.17.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6e686f9108b0d8e2ceb71fc610f8b58b31420217a35e04864e8cdbdebead7522
size 18301390

13
gtk+-mac_ctree.patch
View File

@ -1,13 +0,0 @@
--- gtk+-2.4.0/gtk/gtkctree.c
+++ gtk+-2.4.0/gtk/gtkctree.c
@@ -654,8 +654,8 @@
ctree->tree_indent = 20;
ctree->tree_spacing = 5;
ctree->tree_column = 0;
- ctree->line_style = GTK_CTREE_LINES_SOLID;
- ctree->expander_style = GTK_CTREE_EXPANDER_SQUARE;
+ ctree->line_style = GTK_CTREE_LINES_NONE;
+ ctree->expander_style = GTK_CTREE_EXPANDER_TRIANGLE;
ctree->drag_compare = NULL;
ctree->show_stub = TRUE;

0
gtk2-flash-player-busyloop.patch → gtk2-bnc294385-bgo463773-flash-player-busyloop.patch
View File

146
gtk2-bnc343858-buggy-intel-xinerama.patch
View File

@ -1,146 +0,0 @@
2008-01-15 Federico Mena Quintero <federico@novell.com>
Start fixing https://bugzilla.novell.com/show_bug.cgi?id=343858 -
X servers with Intel 915GM graphics report a connected VGA output
incorrectly, so applications don't use the whole screen.
* gdk/x11/gdkscreen-x11.c (check_xfree_xinerama): Sanitize the
monitors that we get from XineramaQueryScreens().
(sanitize_monitors): Workaround for an Intel 915GM driver bug,
where it will return that a VGA output is connected to a laptop,
even though it isn't. In the case of just two overlapping
monitors ("laptop plus cloned external display"), simulate that we
have only *one* monitor.
diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
index 624870f..7626ca8 100644
--- a/gdk/x11/gdkscreen-x11.c
+++ b/gdk/x11/gdkscreen-x11.c
@@ -596,6 +596,73 @@ check_solaris_xinerama (GdkScreen *screen)
return FALSE;
}
+static GdkRectangle
+pick_the_biggest_geometry (GdkRectangle *geometries, int num_geometries)
+{
+ long max_pixels;
+ int largest_index;
+ int i;
+
+ max_pixels = 0;
+ largest_index = 0;
+
+ for (i = 0; i < num_geometries; i++)
+ {
+ long pixels;
+
+ pixels = (long) geometries[i].width * geometries[i].height;
+
+ if (pixels > max_pixels)
+ {
+ max_pixels = pixels;
+ largest_index = i;
+ }
+ }
+
+ return geometries[largest_index];
+}
+
+static void
+sanitize_monitors (GdkRectangle *monitors, int n_monitors,
+ GdkRectangle **monitors_ret, int *n_monitors_ret)
+{
+ if (n_monitors == 2
+ && gdk_rectangle_intersect (monitors + 0, monitors + 1, NULL))
+ {
+ /* https://bugzilla.novell.com/show_bug.cgi?id=310208
+ *
+ * The X driver for Intel 915GM chipsets has/had a bug where it would
+ * report that laptops started with a VGA output connected, and most
+ * of the time it defaults to a resolution of 1024x768. This doesn't
+ * match the resolution of the laptop, which these days is big and fancy.
+ *
+ * Both monitors (the VGA output's and the laptop's) *overlap* in the Xinerama
+ * configuration, since that is how "clone the display" is implemented.
+ * So, we see if there are only two monitors *and* if they intersect --- in
+ * that case, we can be reasonably confident that we can just pick the bigger
+ * monitor, which will be the laptop's display.
+ *
+ * This shouldn't break real setups with "make a big screen out of two monitors",
+ * since those monitors don't overlap in the Xinerama configuration.
+ *
+ * To summarize: in the case of just two overlapping monitors ("laptop
+ * plus cloned external display"), we simulate that we have only *one* monitor.
+ */
+
+ *n_monitors_ret = 1;
+ *monitors_ret = g_new (GdkRectangle, 1);
+
+ **monitors_ret = pick_the_biggest_geometry (monitors, n_monitors);
+
+ g_free (monitors);
+ }
+ else
+ {
+ *monitors_ret = monitors;
+ *n_monitors_ret = n_monitors;
+ }
+}
+
static gboolean
check_xfree_xinerama (GdkScreen *screen)
{
@@ -603,9 +670,10 @@ check_xfree_xinerama (GdkScreen *screen)
if (XineramaIsActive (GDK_SCREEN_XDISPLAY (screen)))
{
GdkScreenX11 *screen_x11 = GDK_SCREEN_X11 (screen);
+ int num_monitors;
XineramaScreenInfo *monitors = XineramaQueryScreens (GDK_SCREEN_XDISPLAY (screen),
- &screen_x11->num_monitors);
- if (screen_x11->num_monitors <= 0 || monitors == NULL)
+ &num_monitors);
+ if (num_monitors <= 0 || monitors == NULL)
{
/* If Xinerama doesn't think we have any monitors, try acting as
* though we had no Xinerama. If the "no monitors" condition
@@ -614,23 +682,34 @@ check_xfree_xinerama (GdkScreen *screen)
* and can go back into Xinerama-ish mode at that point. */
if (monitors)
XFree (monitors);
+
+ screen_x11->num_monitors = 0;
return FALSE;
}
else
{
+ GdkRectangle *rects;
int i;
- screen_x11->monitors = g_new0 (GdkRectangle, screen_x11->num_monitors);
+ GdkRectangle *sane_rects;
+ int sane_num_monitors;
+
+ rects = g_new0 (GdkRectangle, num_monitors);
- for (i = 0; i < screen_x11->num_monitors; i++)
+ for (i = 0; i < num_monitors; i++)
{
- screen_x11->monitors[i].x = monitors[i].x_org;
- screen_x11->monitors[i].y = monitors[i].y_org;
- screen_x11->monitors[i].width = monitors[i].width;
- screen_x11->monitors[i].height = monitors[i].height;
+ rects[i].x = monitors[i].x_org;
+ rects[i].y = monitors[i].y_org;
+ rects[i].width = monitors[i].width;
+ rects[i].height = monitors[i].height;
}
XFree (monitors);
+ sanitize_monitors (rects, num_monitors, &sane_rects, &sane_num_monitors);
+
+ screen_x11->num_monitors = sane_num_monitors;
+ screen_x11->monitors = sane_rects;
+
return TRUE;
}
}

1503
gtk2-bnc355503-file-chooser-remember-geometry.diff
View File

File diff suppressed because it is too large Load Diff

1174
gtk2-filesel-navbuttons.patch
View File

File diff suppressed because it is too large Load Diff

47
gtk2.changes
View File

@ -1,3 +1,50 @@
-------------------------------------------------------------------
Mon May 12 01:11:34 CEST 2009 - federico@novell.com
- Removed these patches for deprecated widgets:
gtk+-mac_ctree.patch, gtk2-filesel-navbuttons.patch
- Removed gtk2-bnc355503-file-chooser-remember-geometry.diff; this
code is in the upstream tarball now.
- Removed gtk2-bnc343858-buggy-intel-xinerama.patch; the new GTK+
detects RANDR pre-1.2 and applications should already handle
overlapping monitors anyway.
- Renamed gtk2-flash-player-busyloop.patch to
gtk2-bnc294385-bgo463773-flash-player-busyloop.patch
-------------------------------------------------------------------
Tue May 5 17:17:10 CEST 2009 - vuntz@novell.com
- Update to version 2.17.0:
+ GtkBuilder:
- Scale marks can now be specified in builder markup
- GtkAssistant action widgets can be added in builder markup
+ Changes that are relevant for theme authors
- GtkEntry now has a ::invisible-char style property that allows
themes to set the preferred invisible character
+ Printing:
- GTK+ supports authentication of users against CUPS servers
now.
+ Bugs fixed:
- bgo#578634: gtkdial example fails to compile
- bgo#580678: Minor improvement to GTK+ mediaLib code
- bgo#580511: gdk_x11_atom_to_xatom_for_display translates
GDK_NONE...
- bgo#581110: Handlebox widget uses static variables, crashes
in multi...
- bgo#553385: gtk-builder-convert creates untranslated combobox
models
- bgo#580814: GtkTextLayout incorrectly assumes pango iterates
in logi...
- bgo#579366: gtkbuilderparser leaks RequiresInfo objects
- bgo#579741: gailcombox should emit
property-changed:accessible-name...
- bgo#574386: Remove deprecated call to
gtk_status_icon_set_tooltip...
- bgo#384940: handle rejecting jobs and authentication
meaningfully
+ Updated translations
- Pass --enable-man to configure.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Apr 12 06:19:06 CEST 2009 - mboman@suse.de Sun Apr 12 06:19:06 CEST 2009 - mboman@suse.de

71
gtk2.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package gtk2 (Version 2.16.1) # spec file for package gtk2 (Version 2.17.0)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -38,7 +38,7 @@ Obsoletes: gtk2-64bit
%endif %endif
# #
PreReq: /usr/bin/touch /bin/rm /bin/rmdir PreReq: /usr/bin/touch /bin/rm /bin/rmdir
Version: 2.16.1 Version: 2.17.0
Release: 1 Release: 1
Summary: Library for Creation of Graphical User Interfaces (version 2) 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 Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.12/%{_name}-%{version}.tar.bz2
@ -47,10 +47,6 @@ Source2: README.SuSE
Source3: gtkrc Source3: gtkrc
# PATCH-FIX-UPSTREAM gtk+-strict-aliasing.patch federico@novell.com - Fix compiler warnings. This is already in SVN trunk as of 2008/07/18 # PATCH-FIX-UPSTREAM gtk+-strict-aliasing.patch federico@novell.com - Fix compiler warnings. This is already in SVN trunk as of 2008/07/18
Patch: gtk+-strict-aliasing.patch Patch: gtk+-strict-aliasing.patch
# PATCH-FEATURE-OPENSUSE gtk2-filesel-navbuttons.patch federico@novell.com - Prettify the obsolete GtkFileSelection (this is an old Ximian patch)
Patch4: gtk2-filesel-navbuttons.patch
# PATCH-FEATURE-OPENSUSE gtk+-mac_ctree.patch federico@novell.com - Make the obsolete GtkCTree widget prettier (this is an old Ximian patch)
Patch6: gtk+-mac_ctree.patch
# PATCH-FIX-OPENSUSE gtk64.patch sbrabec@novell.com - 64-bit dual install. See also the Fedora patch for a simpler way of doing this. # PATCH-FIX-OPENSUSE gtk64.patch sbrabec@novell.com - 64-bit dual install. See also the Fedora patch for a simpler way of doing this.
Patch8: gtk64.patch Patch8: gtk64.patch
# PATCH-FIX-OPENSUSE gdk-modules-information.diff hhetter@suse.de - Info on how to manually regenerate modules information # PATCH-FIX-OPENSUSE gdk-modules-information.diff hhetter@suse.de - Info on how to manually regenerate modules information
@ -61,22 +57,18 @@ Patch22: bugzilla-129753-gtk+-2.8.9-localize-font-style-name.diff
Patch23: bugzilla-131498-allow-xim-for-all-languages.patch Patch23: bugzilla-131498-allow-xim-for-all-languages.patch
# PATCH-FIX-UPSTREAM gtk2-bnc130159-bgo319483-async-selection-in-gtk-font-selection.diff bnc130159 bgo319483 federico@novell.com - Load fonts asynchronously in GtkFontSelection to make it appear faster for CJK languages # PATCH-FIX-UPSTREAM gtk2-bnc130159-bgo319483-async-selection-in-gtk-font-selection.diff bnc130159 bgo319483 federico@novell.com - Load fonts asynchronously in GtkFontSelection to make it appear faster for CJK languages
Patch24: gtk2-bnc130159-bgo319483-async-selection-in-gtk-font-selection.diff Patch24: gtk2-bnc130159-bgo319483-async-selection-in-gtk-font-selection.diff
# PATCH-FIX-UPSTREAM gtk2-flash-player-busyloop.patch bnc294385 bgo463773 federico@novell.com - Workaround for a bug in the non-free Flash player # PATCH-FIX-UPSTREAM gtk2-flash-player-busyloop.patch bnc294385 bgo463773 federico@novell.com - Workaround for a bug in the non-free Flash player - an equivalent patch got commited upstream; remove this patch when we get the new version
Patch35: gtk2-flash-player-busyloop.patch Patch35: gtk2-bnc294385-bgo463773-flash-player-busyloop.patch
# Patches taken from upstream or slated to go upstream. We can expect these to become obsolete # Patches taken from upstream or slated to go upstream. We can expect these to become obsolete
# in future releases. # in future releases.
# Please don't delete this comment even if this section is empty -- "# empty" should # Please don't delete this comment even if this section is empty -- "# empty" should
# be sufficient. # be sufficient.
# FIXME: this section is incomplete, and that some of the patches listed earlier should # FIXME: this section is incomplete, and that some of the patches listed earlier should
# be here instead. # be here instead.
# PATCH-NEEDS-REBASE gtk2-bnc343858-buggy-intel-xinerama.patch bnc343858 bgo523408 vuntz@novell.com -- Some Intel cards misreports a connected output and this leads applications to use a lower screen resolution than the real one (was PATCH-FIX-UPSTREAM). vuntz: maybe fixed? See bgo543317 # PATCH-FIX-OPENSUSE gtk-path-local.patch Search in /usr/local/%{_lib} by default. bnc369696 bgo534474
Patch51: gtk2-bnc343858-buggy-intel-xinerama.patch
# PATCH-FIX-OPENSUSE gtk-path-local.patch Search in /usr/local/%{_lib} by default. bgo369696
Patch53: gtk-path-local.patch 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 # PATCH-FIX-UPSTREAM gtk2-bnc310710-bgo524166-underallocated-gtklabel-position.diff bnc310710 bgo524166 federico@novell.com - Fix positioning of GtkLabels with too-small allocations - note that this is already committed upstream
Patch54: gtk2-bnc310710-bgo524166-underallocated-gtklabel-position.diff Patch54: gtk2-bnc310710-bgo524166-underallocated-gtklabel-position.diff
# PATCH-NEEDS-REBASE gtk2-bnc355503-file-chooser-remember-geometry.diff bnc355503 federico@novell.com - Make the file chooser remember its size across invocations - WAS PATCH-FEATURE-OPENSUSE (Once a new patch is submitted to openSUSE 11.1, take it, rebase it and enable this one again)
Patch55: gtk2-bnc355503-file-chooser-remember-geometry.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: %{name}-lang = %{version} Requires: %{name}-lang = %{version}
Requires: hicolor-icon-theme Requires: hicolor-icon-theme
@ -240,8 +232,6 @@ Authors:
# This breaks due to bugs in a Makefile.am; # This breaks due to bugs in a Makefile.am;
# gnome-patch-translation-prepare # gnome-patch-translation-prepare
%patch -p1 %patch -p1
%patch4 -p1
%patch6 -p1
cp -a %{S:1} . cp -a %{S:1} .
%if "%_lib" == "lib64" %if "%_lib" == "lib64"
cp -a %{S:2} . cp -a %{S:2} .
@ -253,12 +243,8 @@ cp -a %{S:2} .
%patch23 -p1 %patch23 -p1
%patch24 -p1 %patch24 -p1
%patch35 %patch35
# FIXME: Needs rebase
# %patch51 -p1
%patch53 %patch53
%patch54 -p1 %patch54 -p1
# FIXME: Needs rebase and new updated patch from 11.1 once there is one
# %patch55 -p1
# gnome-patch-translation-update # gnome-patch-translation-update
%build %build
@ -275,7 +261,9 @@ export CFLAGS="$CFLAGS -mminimal-toc"
# http://sources.redhat.com/bugzilla/show_bug.cgi?id=2388 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=2388
sed -i /HAVE__NL_TIME_FIRST_WEEKDAY/d config.h.in sed -i /HAVE__NL_TIME_FIRST_WEEKDAY/d config.h.in
%endif %endif
%configure --with-xinput=xfree %configure \
--enable-man \
--with-xinput=xfree
make %{?jobs:-j%jobs} make %{?jobs:-j%jobs}
%install %install
@ -379,6 +367,47 @@ fi
%{_datadir}/gtk-doc/html/* %{_datadir}/gtk-doc/html/*
%changelog %changelog
* Tue May 12 2009 federico@novell.com
- Removed these patches for deprecated widgets:
gtk+-mac_ctree.patch, gtk2-filesel-navbuttons.patch
- Removed gtk2-bnc355503-file-chooser-remember-geometry.diff; this
code is in the upstream tarball now.
- Removed gtk2-bnc343858-buggy-intel-xinerama.patch; the new GTK+
detects RANDR pre-1.2 and applications should already handle
overlapping monitors anyway.
- Renamed gtk2-flash-player-busyloop.patch to
gtk2-bnc294385-bgo463773-flash-player-busyloop.patch
* Tue May 05 2009 vuntz@novell.com
- Update to version 2.17.0:
+ GtkBuilder:
- Scale marks can now be specified in builder markup
- GtkAssistant action widgets can be added in builder markup
+ Changes that are relevant for theme authors
- GtkEntry now has a ::invisible-char style property that allows
themes to set the preferred invisible character
+ Printing:
- GTK+ supports authentication of users against CUPS servers
now.
+ Bugs fixed:
- bgo#578634: gtkdial example fails to compile
- bgo#580678: Minor improvement to GTK+ mediaLib code
- bgo#580511: gdk_x11_atom_to_xatom_for_display translates
GDK_NONE...
- bgo#581110: Handlebox widget uses static variables, crashes
in multi...
- bgo#553385: gtk-builder-convert creates untranslated combobox
models
- bgo#580814: GtkTextLayout incorrectly assumes pango iterates
in logi...
- bgo#579366: gtkbuilderparser leaks RequiresInfo objects
- bgo#579741: gailcombox should emit
property-changed:accessible-name...
- bgo#574386: Remove deprecated call to
gtk_status_icon_set_tooltip...
- bgo#384940: handle rejecting jobs and authentication
meaningfully
+ Updated translations
- Pass --enable-man to configure.
* Sun Apr 12 2009 mboman@suse.de * Sun Apr 12 2009 mboman@suse.de
- Update to version 2.16.1: - Update to version 2.16.1:
+ GtkBuilder: + GtkBuilder: