callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Move experimental branch of gtk+2.0 to unstable

Browse Source
This commit is contained in:
Loïc Minier
2007-09-20 09:59:21 +00:00
parent 0fe927ecfc f70ca65d4f
commit ee84f4aaa7
23 changed files with 2799 additions and 1402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
debian/changelog vendored
View File

@ -1,4 +1,32 @@
gtk+2.0 (2.10.14-1) unstable; urgency=low
gtk+2.0 (2.12.0-2) UNRELEASED; urgency=low
* Add a conflict against openoffice.org-core (<< 2.2.1-8).
Closes: #439256.
-- Josselin Mouette <joss@debian.org> Wed, 19 Sep 2007 13:23:14 +0200
gtk+2.0 (2.12.0-1) experimental; urgency=low
[ Alan Baghumian ]
* New upstream stable release
- Regenerated 070_mandatory-relibtoolize.patch
* Added 081_icon-cache-validate.patch, GNOME #476342
[ Loic Minier ]
* Refresh patches 033_treeview_resizing and 040_filechooser_single-click to
apply cleanly.
* Drop patch 080_from_svn_fix_dangling_tooltip, merged upstream.
* Bump shlibs to 2.12.0 in the new upstream release for the addition of
gdk_window_thaw_toplevel_updates_libgtk_only() and
gdk_window_freeze_toplevel_updates_libgtk_only() to the ABI.
* Add disabled patch 091_workaround_no_gtk_init_incorrect_display, taken
from the Ubuntu package; it works around broken applications missing a
call to gtk_init() but the breakage should better be exposed now so that
applications can be fixed in time for release.
-- Loic Minier <lool@dooz.org> Tue, 18 Sep 2007 22:30:39 +0200
gtk+2.0 (2.11.6-1) experimental; urgency=low
[ Loic Minier ]
* Don't run the directfb testsuite on kfreebsd as it hangs; proposed patch
@ -13,16 +41,111 @@ gtk+2.0 (2.10.14-1) unstable; urgency=low
created if they don't already exist.
* Install this script and its manual page in libgtk2.0-bin.
[ Alan Baghumian ]
* New upstream release
- Regenerated 070_mandatory-relibtoolize.patch
[ Loic Minier ]
* Call dh_shlibdeps separately for the udeb and add a
-l/usr/lib/libcairo-directfb/lib/ flag to ensure libcairo-directfb2 is
found.
* New upstream development release, with API additions.
- Bump up shlibs to >= 2.11.6.
- Refresh patches 006_proper-directfb-modules,
015_default-fallback-icon-theme, 040_filechooser_single-click to apply
cleanly.
- Update patches 009_gtk-export-filechooser, 033_treeview_resizing to
apply; update relibtoolizing patch, 070_mandatory-relibtoolize.
* Update patch 009_gtk-export-filechooser:
- gtk/Makefile.am (gtk_private_h_sources, gtk_semi_private_h_sources):
export gtkquery.h and gtksearchengine.h as semi-private.
- gtk/gtkquery.h: add GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED #ifdef guard.
- gtk/gtksearchengine.h: add GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED #ifdef
guard.
-- Loic Minier <lool@dooz.org> Tue, 31 Jul 2007 13:20:59 +0200
-- Loic Minier <lool@dooz.org> Tue, 24 Jul 2007 10:43:23 +0200
gtk+2.0 (2.11.5-1) experimental; urgency=low
* New upstream development release, with API additions; the new API may
still change incompatibly, especially the tooltips API.
- Bump shlibs to >= 2.11.5.
- Bump up libpango1.0-dev build-dep to >= 1.17.3.
- Ship the new gtk-builder-convert Python script to convert Glade files to
GtkBuilder syntax in libgtk2.0-dev; don't call dh_py* to generate a
${python:Depends} but Recommend python (>= 2.4) to avoid pulling python
on buildds; the script requires python >= 2.4, but this is not enforced
in the dependencies.
- Refresh patches 001_static-linking-dont-query-immodules,
006_proper-directfb-modules, 040_filechooser_single-click to apply
cleanly.
- Update relibtoolizing patch, 070_mandatory-relibtoolize.
* Use -s instead of -a in arch-specific dh_* calls.
-- Loic Minier <lool@dooz.org> Tue, 03 Jul 2007 13:01:25 +0200
gtk+2.0 (2.11.4-1) experimental; urgency=low
[ Josselin Mouette ]
* 040_filechooser_single-click.patch: fix the patch to apply cleanly
again, and enable it.
[ Loic Minier ]
* Pass -mminimal-toc in CFLAGS for ppc64 support; thanks Andreas Jochens;
closes: #386815.
* New upstream development release, with API additions; the new API may
still change incompatibly.
- Bump shlibs to >= 2.11.3.
- Refresh patches 006_proper-directfb-modules,
008_implicit_pointer_conversion_gdkgc_directfb,
009_gtk-export-filechooser, 030_gtkentry_password-char-circle,
033_treeview_resizing, 040_filechooser_single-click, and 041_ia32-libs
to apply cleanly.
- Update relibtoolizing patch, 070_mandatory-relibtoolize.
* Add a debian/dh_listmissing.pl script based on dh_install snippets but
customized to handle multiple source installation dirs which can report
files which were not installed to a package.
* New list-missing rule to list files which were not installed to a package
calling debian/dh_listmissing.pl.
* Also depend on libxcomposite-dev, libxdamage-dev; thanks Sébastien Bacher.
* Ship etc/gtk-2.0/im-multipress.conf in the shared library.
* New upstream development release, with incompatible API changes; the new
API may still change incompatibly.
- Bump shlibs to >= 2.11.4.
- Refresh relibtoolizing patch, 070_mandatory-relibtoolize.
- Bump up libglib2.0-dev build-dep to >= 2.11.5.
-- Loic Minier <lool@dooz.org> Wed, 20 Jun 2007 10:47:42 +0200
gtk+2.0 (2.11.2-1) experimental; urgency=low
* New upstream release series; these are development releases, the new API
may still change incompatibly.
- Target at experimental; include check-dist.
- Bump shlibs to >= 2.11.2.
- Refresh patches 001_static-linking-dont-query-immodules, 005_xpmico,
009_gtk-export-filechooser, 015_default-fallback-icon-theme,
033_treeview_resizing, 041_ia32-libs to apply cleanly.
- Update patch 021_loader-files-d to apply with the upstream G_MODULE
changes and the support for included modules.
- Update patch 030_gtkentry_password-char-circle to apply.
- Drop patch 031_cursor-blinking-timeout, merged upstream.
- Disable 040_filechooser_single-click for now as it doesn't apply cleanly
and doesn't seem critical; add a description and cross-refs.
- Update relibtoolizing patch, 070_mandatory-relibtoolize.
- Bump up build-deps to libglib2.0-dev >= 2.13.1, libpango1.0-dev >=
1.15.3, gtk-doc-tools >= 1.6.
- Build-dep on libxcomposite-dev for composite support.
- Build-dep on libxdamage-dev for damage support.
- Enable test print backend by passing --enable-test-print-backend to
configure.
* Update 007_implicit_pointer_conversion_gdkdrawable_directfb to include
cairo.h instead of defining the directfb feature manually.
* New patch, 006_proper-directfb-modules, fixes pkg-config modules included
to build directfb stuff, uncovered by the change in
007_implicit_pointer_conversion_gdkdrawable_directfb; refresh
relibtoolizing patch.
* Add cross-refs to patch headers.
* Clean up CFLAGS.
* Prepare passing -z defs via LDFLAGS in the future.
-- Loic Minier <lool@dooz.org> Wed, 13 Jun 2007 16:57:47 +0200
gtk+2.0 (2.10.13-1) unstable; urgency=low

12
debian/control vendored
View File

@ -6,8 +6,8 @@ Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.o
Build-Depends: debhelper (>= 5.0.22),
gettext,
pkg-config,
libglib2.0-dev (>= 2.12.0),
libpango1.0-dev (>= 1.12.1-2),
libglib2.0-dev (>= 2.13.5),
libpango1.0-dev (>= 1.17.3),
libatk1.0-dev (>= 1.9.0),
libx11-dev (>= 2:1.0.0-6),
libxext-dev,
@ -17,6 +17,8 @@ Build-Depends: debhelper (>= 5.0.22),
libxrender-dev,
libxft-dev,
libxcursor-dev,
libxcomposite-dev,
libxdamage-dev,
libxkbfile-dev,
libxinerama-dev,
libxfixes-dev,
@ -32,7 +34,7 @@ Build-Depends: debhelper (>= 5.0.22),
libdirectfb-dev (>= 0.9.24),
libcupsys2-dev (>= 1.2),
quilt
Build-Depends-Indep: gtk-doc-tools,
Build-Depends-Indep: gtk-doc-tools (>= 1.6),
docbook-xml
Standards-Version: 3.7.2
@ -52,6 +54,7 @@ Conflicts: libgtk2.0-0png3,
libgnomeui-0 (<= 2.14.1-3),
gtk2.0-examples (<< 2.2.0),
libgdkxft0,
openoffice.org-core (<< 2.2.1-8),
gtk2-engines-wonderland (<< 1.0-4),
gtk2-engines-cleanice (<< 2.4.0-1.1),
gtk2-engines-thinice (<< 2.6),
@ -186,7 +189,10 @@ Depends: libgtk2.0-0 (= ${binary:Version}),
libxrandr-dev,
libxcursor-dev,
libxfixes-dev,
libxcomposite-dev,
libxdamage-dev,
pkg-config
Recommends: python (>= 2.4)
Suggests: libgtk2.0-doc
Replaces: libgtk1.3-dev,
gtk2-engines-pixbuf (<< 2.8.18-5)

12
debian/control.in vendored
View File

@ -6,8 +6,8 @@ Uploaders: @GNOME_TEAM@
Build-Depends: debhelper (>= 5.0.22),
gettext,
pkg-config,
libglib2.0-dev (>= 2.12.0),
libpango1.0-dev (>= 1.12.1-2),
libglib2.0-dev (>= 2.13.5),
libpango1.0-dev (>= 1.17.3),
libatk1.0-dev (>= 1.9.0),
libx11-dev (>= 2:1.0.0-6),
libxext-dev,
@ -17,6 +17,8 @@ Build-Depends: debhelper (>= 5.0.22),
libxrender-dev,
libxft-dev,
libxcursor-dev,
libxcomposite-dev,
libxdamage-dev,
libxkbfile-dev,
libxinerama-dev,
libxfixes-dev,
@ -32,7 +34,7 @@ Build-Depends: debhelper (>= 5.0.22),
libdirectfb-dev (>= 0.9.24),
libcupsys2-dev (>= 1.2),
quilt
Build-Depends-Indep: gtk-doc-tools,
Build-Depends-Indep: gtk-doc-tools (>= 1.6),
docbook-xml
Standards-Version: 3.7.2
@ -52,6 +54,7 @@ Conflicts: libgtk2.0-0png3,
libgnomeui-0 (<= 2.14.1-3),
gtk2.0-examples (<< 2.2.0),
libgdkxft0,
openoffice.org-core (<< 2.2.1-8),
gtk2-engines-wonderland (<< 1.0-4),
gtk2-engines-cleanice (<< 2.4.0-1.1),
gtk2-engines-thinice (<< 2.6),
@ -186,7 +189,10 @@ Depends: @SHARED_PKG@ (= ${binary:Version}),
libxrandr-dev,
libxcursor-dev,
libxfixes-dev,
libxcomposite-dev,
libxdamage-dev,
pkg-config
Recommends: python (>= 2.4)
Suggests: @DOC_PKG@
Replaces: libgtk1.3-dev,
gtk2-engines-pixbuf (<< 2.8.18-5)

79
debian/dh_listmissing.pl vendored Normal file
View File

@ -0,0 +1,79 @@
#!/bin/false /usr/bin/perl -w
# shebang disabled while this script resides in debian/
# similar to dh_install; needs some documentation
use strict;
use File::Find;
use Debian::Debhelper::Dh_Lib;
init();
# list of sourcedirs
my @sourcedirs = @ARGV;
my @installed;
my $srcdir = '.';
# dh_install code, but not doing any installation, just building @installed
# and stripping sourcedirs from these
foreach my $package (@{$dh{DOPACKAGES}}) {
my $tmp=tmpdir($package);
my $file=pkgfile($package,"install");
my @install;
if ($file) {
@install=filedoublearray($file); # no globbing yet
}
# Support for -X flag.
my $exclude = '';
if ($dh{EXCLUDE_FIND}) {
$exclude = '! \( '.$dh{EXCLUDE_FIND}.' \)';
}
foreach my $set (@install) {
if (! defined $dh{AUTODEST} && @$set > 1) {
pop @$set;
}
foreach my $src (map { glob "$srcdir/$_" } @$set) {
next if excludefile($src);
# strip source dir
foreach my $d (@sourcedirs) {
$src=~s/^\Q$srcdir\E\/\Q$d\E\///;
}
# Keep track of what's installed.
# Kill any extra slashes. Makes the @installed stuff more robust.
$src=~y:/:/:s;
$src=~s:/+$::;
$src=~s:^(\./)*::;
push @installed, "\Q$src\E\/.*|\Q$src\E";
}
}
}
# dh_install code, but stripping sourcedirs
my @missing;
my $installed=join("|", @installed);
$installed=qr{^($installed)$};
find(sub {
-f || -l || return;
$_="$File::Find::dir/$_";
foreach my $d (@sourcedirs) {
s/^\Q$d\E\///;
}
if (! /$installed/ && ! excludefile($_)) {
my $file=$_;
push @missing, $file;
}
}, @sourcedirs);
if (@missing) {
warning "$_ has been installed upstream but is not in any package" foreach @missing;
if ($dh{FAIL_MISSING}) {
error("missing files, aborting");
}
}

1
debian/libgtk2.0-0.install.in vendored
View File

@ -2,6 +2,7 @@
debian/update-gdkpixbuf-loaders usr/lib/@SHARED_PKG@
debian/update-gtk-immodules usr/lib/@SHARED_PKG@
# from the shared flavor
debian/install/shared/etc/gtk-@APIVER@/im-multipress.conf etc/gtk-@APIVER@
debian/install/shared/usr/bin/gdk-pixbuf-query-loaders usr/lib/@SHARED_PKG@
debian/install/shared/usr/bin/gtk-query-immodules-2.0 usr/lib/@SHARED_PKG@
debian/install/shared/usr/bin/gtk-update-icon-cache usr/lib/@SHARED_PKG@

3
debian/libgtk2.0-dev.install.in vendored
View File

@ -1,7 +1,8 @@
# from Debian
debian/dh_gtkmodules usr/bin
# from the shared flavor
debian/install/shared/usr/bin/gdk-pixbuf-csource usr/bin
debian/install/shared/usr/bin/gdk-pixbuf-csource usr/bin
debian/install/shared/usr/bin/gtk-builder-convert usr/bin
debian/install/shared/usr/include usr
debian/install/shared/usr/lib/*.la usr/lib
debian/install/shared/usr/lib/*.so usr/lib

20
debian/patches/001_static-linking-dont-query-immodules.patch vendored
View File

@ -1,20 +1,20 @@
Index: gtk+2.0-2.10.10/configure.in
Index: gtk+2.0-2.11.5/configure.in
===================================================================
--- gtk+2.0-2.10.10.orig/configure.in 2007-03-13 14:10:00.000000000 +0100
+++ gtk+2.0-2.10.10/configure.in 2007-03-13 14:10:04.000000000 +0100
--- gtk+2.0-2.11.5.orig/configure.in 2007-07-02 17:04:27.000000000 +0200
+++ gtk+2.0-2.11.5/configure.in 2007-07-03 11:34:03.000000000 +0200
@@ -134,6 +134,7 @@
dnl Initialize libtool
AC_PROG_CC
AM_DISABLE_STATIC
+AM_CONDITIONAL([ENABLE_STATIC], [test "$enable_static" = yes])
if test "$os_win32" = "yes"; then
if test x$enable_static = xyes -o x$enable_static = x; then
Index: gtk+2.0-2.10.10/modules/input/Makefile.am
dnl
dnl Check for a working C++ compiler, but do not bail out, if none is found.
Index: gtk+2.0-2.11.5/modules/input/Makefile.am
===================================================================
--- gtk+2.0-2.10.10.orig/modules/input/Makefile.am 2007-03-12 14:58:52.000000000 +0100
+++ gtk+2.0-2.10.10/modules/input/Makefile.am 2007-03-13 14:10:04.000000000 +0100
@@ -94,8 +94,12 @@
--- gtk+2.0-2.11.5.orig/modules/input/Makefile.am 2007-07-02 17:04:10.000000000 +0200
+++ gtk+2.0-2.11.5/modules/input/Makefile.am 2007-07-03 11:34:03.000000000 +0200
@@ -106,8 +106,12 @@
if CROSS_COMPILING
RUN_QUERY_IMMODULES_TEST=false
else
@ -27,7 +27,7 @@ Index: gtk+2.0-2.10.10/modules/input/Makefile.am
# Running this if cross compiling or if DESTDIR is set is going to
# not work at all, so skip it.
@@ -135,7 +139,18 @@
@@ -148,7 +152,18 @@
$(IM_IME_MODULE)
gtk.immodules: Makefile.am $(module_LTLIBRARIES)

8
debian/patches/005_xpmico.patch vendored
View File

@ -1,8 +1,8 @@
Index: gtk+2.0-2.10.10/gdk-pixbuf/io-ico.c
Index: gtk+2.0-2.11.2/gdk-pixbuf/io-ico.c
===================================================================
--- gtk+2.0-2.10.10.orig/gdk-pixbuf/io-ico.c 2007-03-12 14:57:04.000000000 +0100
+++ gtk+2.0-2.10.10/gdk-pixbuf/io-ico.c 2007-03-13 14:10:18.000000000 +0100
@@ -210,6 +210,14 @@
--- gtk+2.0-2.11.2.orig/gdk-pixbuf/io-ico.c 2007-06-06 13:43:15.000000000 +0200
+++ gtk+2.0-2.11.2/gdk-pixbuf/io-ico.c 2007-06-13 11:07:11.000000000 +0200
@@ -208,6 +208,14 @@
State->HeaderSize = 6 + IconCount*16;

34
debian/patches/006_proper-directfb-modules.patch vendored Normal file
View File

@ -0,0 +1,34 @@
GNOME #447118; related to Debian #381081
--- gtk+2.0-2.11.6.orig/configure.in 2007-07-23 21:59:10.000000000 +0200
+++ gtk+2.0-2.11.6/configure.in 2007-07-23 21:59:13.000000000 +0200
@@ -1404,8 +1404,18 @@
if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb && $PKG_CONFIG --exists cairo-directfb ; then
AC_MSG_RESULT(found)
- GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags cairo-directfb` $GDK_EXTRA_CFLAGS"
- GDK_EXTRA_LIBS="`$PKG_CONFIG --libs cairo-directfb` $GDK_EXTRA_LIBS"
+ # prepend cairo-directfb so that cairo-directfb's CFLAGS appear before
+ # cairo's if both are available (cairo is required by pango); this is
+ # enough to build gdk/
+ GDK_PACKAGES="cairo-directfb directfb $GDK_PACKAGES"
+ # you'd think this isn't needed, but as soon as cairo-directfb or
+ # directfb requires a "rpath" and you want to build binaries (for
+ # example gtk-query-immodules), you need the CFLAGS and LDFLAGS
+ # everywhere; this trick abuses the fact that GTK_DEP_LIBS and
+ # GTK_DEP_CFLAGS include the GDK_EXTRA_LIBS and _FLAGS to pull the
+ # necessary rpath flags
+ GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags cairo-directfb directfb`"
+ GDK_EXTRA_LIBS="`$PKG_CONFIG --libs cairo-directfb directfb` $GDK_EXTRA_LIBS"
else
AC_MSG_ERROR([
*** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend
@@ -1457,7 +1467,7 @@
CFLAGS="$saved_cflags"
LDFLAGS="$saved_ldflags"
-GDK_PACKAGES="$PANGO_PACKAGES"
+GDK_PACKAGES="$GDK_PACKAGES $PANGO_PACKAGES"
if test "x$gdktarget" = "xx11"; then
GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES"
fi

4
debian/patches/007_implicit_pointer_conversion_gdkdrawable_directfb.patch vendored
View File

@ -1,3 +1,5 @@
Debian #381081; GNOME #447118
Index: gtk+2.0-2.10.10/gdk/directfb/gdkdrawable-directfb.c
===================================================================
--- gtk+2.0-2.10.10.orig/gdk/directfb/gdkdrawable-directfb.c 2007-03-12 15:06:54.000000000 +0100
@ -6,7 +8,7 @@ Index: gtk+2.0-2.10.10/gdk/directfb/gdkdrawable-directfb.c
#include "gdkregion-generic.h"
#include "gdkalias.h"
+#define CAIRO_HAS_DIRECTFB_SURFACE
+#include <cairo.h>
#include "cairo-directfb.h"
#define WARN_UNIMPLEMENTED(func)\

12
debian/patches/008_implicit_pointer_conversion_gdkgc_directfb.patch vendored
View File

@ -1,9 +1,11 @@
Index: gtk+2.0-2.10.10/gdk/directfb/gdkgc-directfb.c
GNOME #447163; Debian 381082
Index: gtk+2.0-2.11.3/gdk/directfb/gdkgc-directfb.c
===================================================================
--- gtk+2.0-2.10.10.orig/gdk/directfb/gdkgc-directfb.c 2007-03-12 15:06:51.000000000 +0100
+++ gtk+2.0-2.10.10/gdk/directfb/gdkgc-directfb.c 2007-03-13 14:10:26.000000000 +0100
@@ -31,6 +31,7 @@
*/
--- gtk+2.0-2.11.3.orig/gdk/directfb/gdkgc-directfb.c 2007-06-15 20:08:17.000000000 +0200
+++ gtk+2.0-2.11.3/gdk/directfb/gdkgc-directfb.c 2007-06-16 14:25:00.000000000 +0200
@@ -33,6 +33,7 @@
#undef GDK_DISABLE_DEPRECATED
#include <config.h>
+#undef GDK_DISABLE_DEPRECATED

101
debian/patches/009_gtk-export-filechooser.patch vendored
View File

@ -1,3 +1,11 @@
2007-06-24 Loic Minier <lool@dooz.org>
* gtk/Makefile.am (gtk_private_h_sources, gtk_semi_private_h_sources):
export gtkquery.h and gtksearchengine.h as semi-private
* gtk/gtkquery.h: add GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED #ifdef guard
* gtk/gtksearchengine.h: add GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED #ifdef
guard
2007-02-07 Kristian Rietveld <kris@imendio.com>
* gtk/gtkfilechooserutils.[ch]
@ -26,10 +34,8 @@
* tests/autotestfilechooser.c: build with
GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
Index: gtk+2.0-2.10.12/gtk/Makefile.am
===================================================================
--- gtk+2.0-2.10.12.orig/gtk/Makefile.am 2007-05-02 18:41:42.000000000 +0200
+++ gtk+2.0-2.10.12/gtk/Makefile.am 2007-05-30 15:24:54.000000000 +0200
--- gtk+2.0-2.11.6.orig/gtk/Makefile.am 2007-07-20 22:12:29.000000000 +0200
+++ gtk+2.0-2.11.6/gtk/Makefile.am 2007-07-24 10:31:52.000000000 +0200
@@ -33,6 +33,8 @@
-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
@ -39,7 +45,7 @@ Index: gtk+2.0-2.10.12/gtk/Makefile.am
-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
$(GTK_DEBUG_FLAGS) \
@@ -329,7 +331,10 @@
@@ -335,12 +337,15 @@
# that are not included in gtk/gtk.h
gtk_semi_private_h_sources = \
gtktextlayout.h \
@ -47,11 +53,18 @@ Index: gtk+2.0-2.10.12/gtk/Makefile.am
+ gtkfilesystem.h \
+ gtkfilesystemmodel.h \
+ gtkfilechooserprivate.h \
+ gtkfilechooserutils.h
+ gtkfilechooserutils.h \
+ gtkquery.h \
+ gtksearchengine.h
# GTK+ header files that don't get installed
gtk_private_h_sources = \
@@ -338,10 +343,7 @@
- gtkquery.h \
- gtksearchengine.h \
gtksearchenginebeagle.h \
gtksearchenginetracker.h\
gtksearchenginesimple.h \
@@ -350,10 +355,7 @@
gtkfilechooserdefault.h \
gtkfilechooserembed.h \
gtkfilechooserentry.h \
@ -62,11 +75,9 @@ Index: gtk+2.0-2.10.12/gtk/Makefile.am
gtkfilesystemunix.h \
gtkhsv.h \
gtkiconcache.h \
Index: gtk+2.0-2.10.12/gtk/gtk.symbols
===================================================================
--- gtk+2.0-2.10.12.orig/gtk/gtk.symbols 2007-05-02 18:26:59.000000000 +0200
+++ gtk+2.0-2.10.12/gtk/gtk.symbols 2007-05-30 15:24:16.000000000 +0200
@@ -1363,6 +1363,12 @@
--- gtk+2.0-2.11.6.orig/gtk/gtk.symbols 2007-07-20 22:12:29.000000000 +0200
+++ gtk+2.0-2.11.6/gtk/gtk.symbols 2007-07-24 09:09:13.000000000 +0200
@@ -1416,6 +1416,12 @@
#endif
#endif
@ -79,10 +90,8 @@ Index: gtk+2.0-2.10.12/gtk/gtk.symbols
#if IN_HEADER(__GTK_FILE_CHOOSER_WIDGET_H__)
#if IN_FILE(__GTK_FILE_CHOOSER_WIDGET_C__)
gtk_file_chooser_widget_get_type G_GNUC_CONST
Index: gtk+2.0-2.10.12/gtk/gtkfilechooserprivate.h
===================================================================
--- gtk+2.0-2.10.12.orig/gtk/gtkfilechooserprivate.h 2007-05-02 18:26:59.000000000 +0200
+++ gtk+2.0-2.10.12/gtk/gtkfilechooserprivate.h 2007-05-30 15:24:16.000000000 +0200
--- gtk+2.0-2.11.6.orig/gtk/gtkfilechooserprivate.h 2007-07-20 22:12:28.000000000 +0200
+++ gtk+2.0-2.11.6/gtk/gtkfilechooserprivate.h 2007-07-24 09:09:14.000000000 +0200
@@ -21,6 +21,14 @@
#ifndef __GTK_FILE_CHOOSER_PRIVATE_H__
#define __GTK_FILE_CHOOSER_PRIVATE_H__
@ -98,10 +107,8 @@ Index: gtk+2.0-2.10.12/gtk/gtkfilechooserprivate.h
#include "gtkfilechooser.h"
#include "gtkfilesystem.h"
#include "gtkfilesystemmodel.h"
Index: gtk+2.0-2.10.12/gtk/gtkfilechooserutils.c
===================================================================
--- gtk+2.0-2.10.12.orig/gtk/gtkfilechooserutils.c 2007-05-02 18:26:59.000000000 +0200
+++ gtk+2.0-2.10.12/gtk/gtkfilechooserutils.c 2007-05-30 15:24:16.000000000 +0200
--- gtk+2.0-2.11.6.orig/gtk/gtkfilechooserutils.c 2007-07-20 22:12:29.000000000 +0200
+++ gtk+2.0-2.11.6/gtk/gtkfilechooserutils.c 2007-07-24 09:09:14.000000000 +0200
@@ -119,6 +119,22 @@
"do-overwrite-confirmation");
}
@ -132,10 +139,8 @@ Index: gtk+2.0-2.10.12/gtk/gtkfilechooserutils.c
+
+#define __GTK_FILE_CHOOSER_UTILS_C__
+#include "gtkaliasdef.c"
Index: gtk+2.0-2.10.12/gtk/gtkfilechooserutils.h
===================================================================
--- gtk+2.0-2.10.12.orig/gtk/gtkfilechooserutils.h 2007-05-02 18:26:59.000000000 +0200
+++ gtk+2.0-2.10.12/gtk/gtkfilechooserutils.h 2007-05-30 15:24:16.000000000 +0200
--- gtk+2.0-2.11.6.orig/gtk/gtkfilechooserutils.h 2007-07-20 22:12:29.000000000 +0200
+++ gtk+2.0-2.11.6/gtk/gtkfilechooserutils.h 2007-07-24 09:09:14.000000000 +0200
@@ -22,6 +22,14 @@
#ifndef __GTK_FILE_CHOOSER_UTILS_H__
#define __GTK_FILE_CHOOSER_UTILS_H__
@ -161,10 +166,8 @@ Index: gtk+2.0-2.10.12/gtk/gtkfilechooserutils.h
void _gtk_file_chooser_delegate_iface_init (GtkFileChooserIface *iface);
void _gtk_file_chooser_set_delegate (GtkFileChooser *receiver,
Index: gtk+2.0-2.10.12/gtk/gtkfilesystemmodel.h
===================================================================
--- gtk+2.0-2.10.12.orig/gtk/gtkfilesystemmodel.h 2007-05-02 18:26:59.000000000 +0200
+++ gtk+2.0-2.10.12/gtk/gtkfilesystemmodel.h 2007-05-30 15:24:16.000000000 +0200
--- gtk+2.0-2.11.6.orig/gtk/gtkfilesystemmodel.h 2007-07-20 22:12:28.000000000 +0200
+++ gtk+2.0-2.11.6/gtk/gtkfilesystemmodel.h 2007-07-24 09:09:14.000000000 +0200
@@ -21,6 +21,10 @@
#ifndef __GTK_FILE_SYSTEM_MODEL_H__
#define __GTK_FILE_SYSTEM_MODEL_H__
@ -176,15 +179,47 @@ Index: gtk+2.0-2.10.12/gtk/gtkfilesystemmodel.h
#include <glib-object.h>
#include "gtkfilesystem.h"
#include <gtk/gtktreemodel.h>
Index: gtk+2.0-2.10.12/tests/autotestfilechooser.c
===================================================================
--- gtk+2.0-2.10.12.orig/tests/autotestfilechooser.c 2007-05-02 18:27:12.000000000 +0200
+++ gtk+2.0-2.10.12/tests/autotestfilechooser.c 2007-05-30 15:24:16.000000000 +0200
--- gtk+2.0-2.11.6.orig/tests/autotestfilechooser.c 2007-07-20 22:13:57.000000000 +0200
+++ gtk+2.0-2.11.6/tests/autotestfilechooser.c 2007-07-24 09:09:14.000000000 +0200
@@ -30,6 +30,7 @@
*/
#define GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED
+#define GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
#undef GTK_DISABLE_DEPRECATED
#include <config.h>
#include <string.h>
--- gtk+2.0-2.11.6.orig/gtk/gtkquery.h 2007-07-24 10:31:23.000000000 +0200
+++ gtk+2.0-2.11.6/gtk/gtkquery.h 2007-07-24 10:31:26.000000000 +0200
@@ -23,6 +23,14 @@
#ifndef __GTK_QUERY_H__
#define __GTK_QUERY_H__
+/* This is a "semi-private" header; it is meant only for
+ * alternate GtkFileChooser implementations; no stability guarantees
+ * are made at this point
+ */
+#ifndef GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
+#error "gtkfilechooserprivate.h is not supported API for general use"
+#endif
+
#include <glib-object.h>
G_BEGIN_DECLS
--- gtk+2.0-2.11.6.orig/gtk/gtksearchengine.h 2007-07-24 10:30:25.000000000 +0200
+++ gtk+2.0-2.11.6/gtk/gtksearchengine.h 2007-07-24 10:30:55.000000000 +0200
@@ -23,6 +23,14 @@
#ifndef __GTK_SEARCH_ENGINE_H__
#define __GTK_SEARCH_ENGINE_H__
+/* This is a "semi-private" header; it is meant only for
+ * alternate GtkFileChooser implementations; no stability guarantees
+ * are made at this point
+ */
+#ifndef GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
+#error "gtkfilechooserprivate.h is not supported API for general use"
+#endif
+
#include <glib-object.h>
#include "gtkquery.h"

8
debian/patches/015_default-fallback-icon-theme.patch vendored
View File

@ -1,8 +1,6 @@
Index: gtk+2.0-2.10.12/gtk/gtksettings.c
===================================================================
--- gtk+2.0-2.10.12.orig/gtk/gtksettings.c 2007-05-03 21:26:35.000000000 +0200
+++ gtk+2.0-2.10.12/gtk/gtksettings.c 2007-05-03 21:26:40.000000000 +0200
@@ -247,7 +247,7 @@
--- gtk+2.0-2.11.6.orig/gtk/gtksettings.c 2007-07-20 22:12:29.000000000 +0200
+++ gtk+2.0-2.11.6/gtk/gtksettings.c 2007-07-23 22:00:25.000000000 +0200
@@ -290,7 +290,7 @@
g_param_spec_string ("gtk-fallback-icon-theme",
P_("Fallback Icon Theme Name"),
P_("Name of a icon theme to fall back to"),

136
debian/patches/021_loader-files-d.patch vendored
View File

@ -1,7 +1,7 @@
Index: gtk+2.0-2.10.10/gdk-pixbuf/gdk-pixbuf-io.c
Index: gtk+2.0-2.11.2/gdk-pixbuf/gdk-pixbuf-io.c
===================================================================
--- gtk+2.0-2.10.10.orig/gdk-pixbuf/gdk-pixbuf-io.c 2007-03-12 14:57:01.000000000 +0100
+++ gtk+2.0-2.10.10/gdk-pixbuf/gdk-pixbuf-io.c 2007-03-13 14:10:35.000000000 +0100
--- gtk+2.0-2.11.2.orig/gdk-pixbuf/gdk-pixbuf-io.c 2007-06-06 13:43:15.000000000 +0200
+++ gtk+2.0-2.11.2/gdk-pixbuf/gdk-pixbuf-io.c 2007-06-13 11:57:45.000000000 +0200
@@ -45,6 +45,9 @@
#undef STRICT
#endif
@ -12,9 +12,9 @@ Index: gtk+2.0-2.10.10/gdk-pixbuf/gdk-pixbuf-io.c
static gint
format_check (GdkPixbufModule *module, guchar *buffer, int size)
{
@@ -282,28 +285,93 @@
return result;
}
@@ -284,87 +287,93 @@
#endif /* USE_GMODULE */
+/* FIXME this is a static copy of a public pango function which should really
+ * livein glib */
@ -95,6 +95,7 @@ Index: gtk+2.0-2.10.10/gdk-pixbuf/gdk-pixbuf-io.c
-gdk_pixbuf_io_init (void)
+process_module_file (const gchar *filename, GIOChannel *channel)
{
-#ifdef USE_GMODULE
- GIOChannel *channel;
gchar *line_buf;
gsize term;
@ -106,18 +107,76 @@ Index: gtk+2.0-2.10.10/gdk-pixbuf/gdk-pixbuf-io.c
int n_patterns = 0;
GdkPixbufModulePattern *pattern;
- GError *error = NULL;
-#endif
- GdkPixbufModule *builtin_module = NULL;
-
-#define load_one_builtin_module(format) \
- builtin_module = g_new0 (GdkPixbufModule, 1); \
- builtin_module->module_name = #format; \
- if (_gdk_pixbuf_load_module (builtin_module, NULL)) \
- file_formats = g_slist_prepend (file_formats, builtin_module);\
- else \
- g_free (builtin_module)
-
-#ifdef INCLUDE_ani
- load_one_builtin_module (ani);
-#endif
-#ifdef INCLUDE_png
- load_one_builtin_module (png);
-#endif
-#ifdef INCLUDE_bmp
- load_one_builtin_module (bmp);
-#endif
-#ifdef INCLUDE_wbmp
- load_one_builtin_module (wbmp);
-#endif
-#ifdef INCLUDE_gif
- load_one_builtin_module (gif);
-#endif
-#ifdef INCLUDE_ico
- load_one_builtin_module (ico);
-#endif
-#ifdef INCLUDE_jpeg
- load_one_builtin_module (jpeg);
-#endif
-#ifdef INCLUDE_pnm
- load_one_builtin_module (pnm);
-#endif
-#ifdef INCLUDE_ras
- load_one_builtin_module (ras);
-#endif
-#ifdef INCLUDE_tiff
- load_one_builtin_module (tiff);
-#endif
-#ifdef INCLUDE_xpm
- load_one_builtin_module (xpm);
-#endif
-#ifdef INCLUDE_xbm
- load_one_builtin_module (xbm);
-#endif
-#ifdef INCLUDE_tga
- load_one_builtin_module (tga);
-#endif
-#ifdef INCLUDE_pcx
- load_one_builtin_module (pcx);
-#endif
-
-#undef load_one_builtin_module
-#ifdef USE_GMODULE
- channel = g_io_channel_new_file (filename, "r", &error);
- if (!channel) {
- g_warning ("Cannot open pixbuf loader module file '%s': %s",
- filename, error->message);
- /* Don't bother warning if we have some built-in loaders */
- if (file_formats == NULL)
- g_warning ("Cannot open pixbuf loader module file '%s': %s",
- filename, error->message);
- return;
- }
-
while (!have_error && g_io_channel_read_line (channel, &line_buf, NULL, &term, NULL) == G_IO_STATUS_NORMAL) {
const char *p;
@@ -436,8 +504,81 @@
@@ -497,8 +506,138 @@
g_free (line_buf);
}
g_string_free (tmp_buf, TRUE);
@ -128,6 +187,7 @@ Index: gtk+2.0-2.10.10/gdk-pixbuf/gdk-pixbuf-io.c
+static void
+gdk_pixbuf_io_init (void)
+{
+#ifdef USE_GMODULE
+ GIOChannel *channel;
+ gchar *gdkpixbuf_module_file_str = gdk_pixbuf_get_module_file ();
+ /* FIXME: using an absolute path requires patching Makefile.am */
@ -139,7 +199,63 @@ Index: gtk+2.0-2.10.10/gdk-pixbuf/gdk-pixbuf-io.c
+ char **files;
+ GError *error = NULL;
+ int n;
+#endif
+ GdkPixbufModule *builtin_module = NULL;
+
+#define load_one_builtin_module(format) \
+ builtin_module = g_new0 (GdkPixbufModule, 1); \
+ builtin_module->module_name = #format; \
+ if (_gdk_pixbuf_load_module (builtin_module, NULL)) \
+ file_formats = g_slist_prepend (file_formats, builtin_module);\
+ else \
+ g_free (builtin_module)
+
+#ifdef INCLUDE_ani
+ load_one_builtin_module (ani);
+#endif
+#ifdef INCLUDE_png
+ load_one_builtin_module (png);
+#endif
+#ifdef INCLUDE_bmp
+ load_one_builtin_module (bmp);
+#endif
+#ifdef INCLUDE_wbmp
+ load_one_builtin_module (wbmp);
+#endif
+#ifdef INCLUDE_gif
+ load_one_builtin_module (gif);
+#endif
+#ifdef INCLUDE_ico
+ load_one_builtin_module (ico);
+#endif
+#ifdef INCLUDE_jpeg
+ load_one_builtin_module (jpeg);
+#endif
+#ifdef INCLUDE_pnm
+ load_one_builtin_module (pnm);
+#endif
+#ifdef INCLUDE_ras
+ load_one_builtin_module (ras);
+#endif
+#ifdef INCLUDE_tiff
+ load_one_builtin_module (tiff);
+#endif
+#ifdef INCLUDE_xpm
+ load_one_builtin_module (xpm);
+#endif
+#ifdef INCLUDE_xbm
+ load_one_builtin_module (xbm);
+#endif
+#ifdef INCLUDE_tga
+ load_one_builtin_module (tga);
+#endif
+#ifdef INCLUDE_pcx
+ load_one_builtin_module (pcx);
+#endif
+
+#undef load_one_builtin_module
+
+#ifdef USE_GMODULE
+ list_str = g_strjoin (G_SEARCHPATH_SEPARATOR_S,
+ gdkpixbuf_module_file_str,
+ gdkpixbuf_module_files_d_str,
@ -198,6 +314,6 @@ Index: gtk+2.0-2.10.10/gdk-pixbuf/gdk-pixbuf-io.c
+ g_free (list_str);
+ g_free (gdkpixbuf_module_files_d_str);
+ g_free (gdkpixbuf_module_file_str);
#endif
}
/* actually load the image handler - gdk_pixbuf_get_module only get a */

14
debian/patches/030_gtkentry_password-char-circle.patch vendored
View File

@ -1,8 +1,8 @@
Index: gtk+2.0-2.10.10/gtk/gtkentry.c
Index: gtk+2.0-2.11.3/gtk/gtkentry.c
===================================================================
--- gtk+2.0-2.10.10.orig/gtk/gtkentry.c 2007-03-12 14:51:19.000000000 +0100
+++ gtk+2.0-2.10.10/gtk/gtkentry.c 2007-03-13 14:10:39.000000000 +0100
@@ -526,7 +526,7 @@
--- gtk+2.0-2.11.3.orig/gtk/gtkentry.c 2007-06-15 20:07:37.000000000 +0200
+++ gtk+2.0-2.11.3/gtk/gtkentry.c 2007-06-16 14:25:47.000000000 +0200
@@ -537,7 +537,7 @@
g_param_spec_unichar ("invisible-char",
P_("Invisible character"),
P_("The character to use when masking entry contents (in \"password mode\")"),
@ -11,7 +11,7 @@ Index: gtk+2.0-2.10.10/gtk/gtkentry.c
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
@@ -1064,7 +1064,7 @@
@@ -1101,7 +1101,7 @@
entry->editable = TRUE;
entry->visible = TRUE;
@ -20,7 +20,7 @@ Index: gtk+2.0-2.10.10/gtk/gtkentry.c
entry->dnd_position = -1;
entry->width_chars = -1;
entry->is_cell_renderer = FALSE;
@@ -4325,9 +4325,9 @@
@@ -4550,9 +4550,9 @@
* gtk_entry_set_visibility() has been called to set text visibility
* to %FALSE. i.e. this is the character used in "password mode" to
* show the user how many characters have been typed. The default
@ -30,6 +30,6 @@ Index: gtk+2.0-2.10.10/gtk/gtkentry.c
+ * invisible char is a black circle (Unicode character 25CF). If
+ * you set the invisible char to 0, then the user will get no
+ * feedback at all; there will be no text on the screen as they type.
*
**/
void
gtk_entry_set_invisible_char (GtkEntry *entry,

44
debian/patches/033_treeview_resizing.patch vendored
View File

@ -1,8 +1,6 @@
Index: gtk+-2.10.12/gtk/gtktreeviewcolumn.c
===================================================================
--- gtk+-2.10.12.orig/gtk/gtktreeviewcolumn.c 2007-05-18 19:06:21.720534000 +0200
+++ gtk+-2.10.12/gtk/gtktreeviewcolumn.c 2007-05-18 19:36:28.845472250 +0200
@@ -2115,6 +2115,7 @@
--- gtk+2.0-2.12.0.orig/gtk/gtktreeviewcolumn.c 2007-09-13 22:35:40.000000000 +0200
+++ gtk+2.0-2.12.0/gtk/gtktreeviewcolumn.c 2007-09-16 18:24:32.000000000 +0200
@@ -2142,6 +2142,7 @@
tree_column->tree_view != NULL &&
GTK_WIDGET_REALIZED (tree_column->tree_view))
{
@ -10,11 +8,9 @@ Index: gtk+-2.10.12/gtk/gtktreeviewcolumn.c
gtk_widget_queue_resize (tree_column->tree_view);
}
Index: gtk+-2.10.12/gtk/gtktreeview.c
===================================================================
--- gtk+-2.10.12.orig/gtk/gtktreeview.c 2007-05-18 19:06:21.696532500 +0200
+++ gtk+-2.10.12/gtk/gtktreeview.c 2007-05-18 20:30:24.331677500 +0200
@@ -2093,18 +2093,20 @@
--- gtk+2.0-2.12.0.orig/gtk/gtktreeview.c 2007-09-14 00:43:35.000000000 +0200
+++ gtk+2.0-2.12.0/gtk/gtktreeview.c 2007-09-16 18:24:32.000000000 +0200
@@ -2159,18 +2159,20 @@
/* GtkWidget::size_allocate helper */
static void
@ -37,7 +33,7 @@ Index: gtk+-2.10.12/gtk/gtktreeview.c
tree_view = GTK_TREE_VIEW (widget);
@@ -2139,12 +2141,38 @@
@@ -2205,12 +2207,38 @@
number_of_expand_columns++;
}
@ -77,7 +73,7 @@ Index: gtk+-2.10.12/gtk/gtktreeview.c
for (list = (rtl ? last_column : first_column);
list != (rtl ? first_column->prev : last_column->next);
list = (rtl ? list->prev : list->next))
@@ -2199,6 +2227,10 @@
@@ -2265,6 +2293,10 @@
{
column->width += extra;
}
@ -88,7 +84,7 @@ Index: gtk+-2.10.12/gtk/gtktreeview.c
g_object_notify (G_OBJECT (column), "width");
@@ -2233,13 +2265,13 @@
@@ -2299,13 +2331,13 @@
g_return_if_fail (GTK_IS_TREE_VIEW (widget));
@ -105,7 +101,7 @@ Index: gtk+-2.10.12/gtk/gtktreeview.c
tmp_list = tree_view->priv->children;
while (tmp_list)
@@ -2326,7 +2358,7 @@
@@ -2392,7 +2424,7 @@
allocation->height - TREE_VIEW_HEADER_HEIGHT (tree_view));
}
@ -114,7 +110,7 @@ Index: gtk+-2.10.12/gtk/gtktreeview.c
if (tree_view->priv->tree == NULL)
invalidate_empty_focus (tree_view);
@@ -2737,7 +2769,7 @@
@@ -2837,7 +2869,7 @@
gtk_grab_add (widget);
GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_IN_COLUMN_RESIZE);
@ -123,7 +119,7 @@ Index: gtk+-2.10.12/gtk/gtktreeview.c
/* block attached dnd signal handler */
drag_data = g_object_get_data (G_OBJECT (widget), "gtk-site-data");
@@ -3450,6 +3482,8 @@
@@ -3546,6 +3578,8 @@
{
column->use_resized_width = TRUE;
column->resized_width = new_width;
@ -132,7 +128,7 @@ Index: gtk+-2.10.12/gtk/gtktreeview.c
gtk_widget_queue_resize (widget);
}
@@ -11192,7 +11226,7 @@
@@ -11472,7 +11506,7 @@
if (GTK_WIDGET_REALIZED (tree_view))
{
gtk_widget_queue_resize (GTK_WIDGET (tree_view));
@ -141,18 +137,16 @@ Index: gtk+-2.10.12/gtk/gtktreeview.c
}
g_signal_emit (tree_view, tree_view_signals[COLUMNS_CHANGED], 0);
Index: gtk+-2.10.12/gtk/gtktreeprivate.h
===================================================================
--- gtk+-2.10.12.orig/gtk/gtktreeprivate.h 2007-05-18 19:06:21.648529500 +0200
+++ gtk+-2.10.12/gtk/gtktreeprivate.h 2007-05-18 19:36:28.869473750 +0200
@@ -263,6 +263,10 @@
--- gtk+2.0-2.12.0.orig/gtk/gtktreeprivate.h 2007-09-13 22:35:41.000000000 +0200
+++ gtk+2.0-2.12.0/gtk/gtktreeprivate.h 2007-09-16 18:24:32.000000000 +0200
@@ -265,6 +265,10 @@
gboolean tree_lines_enabled;
GdkGC *tree_line_gc;
+
+ gint last_extra_space;
+ gint last_extra_space_per_column;
+ gint last_number_of_expand_columns;
+
gint tooltip_column;
};
#ifdef __GNUC__

64
debian/patches/040_filechooser_single-click.patch vendored
View File

@ -1,8 +1,20 @@
Index: gtk+-2.10.12/gtk/gtkfilechooserdefault.c
===================================================================
--- gtk+-2.10.12.orig/gtk/gtkfilechooserdefault.c 2007-05-18 18:33:08.711978750 +0200
+++ gtk+-2.10.12/gtk/gtkfilechooserdefault.c 2007-05-18 18:33:18.636599000 +0200
@@ -3250,8 +3250,22 @@
Debian #405296; GNOME #148828; permit single click in filechooser instead of
requiring double-click.
--- gtk+2.0-2.12.0.orig/gtk/gtkfilechooserdefault.c 2007-09-13 22:35:40.000000000 +0200
+++ gtk+2.0-2.12.0/gtk/gtkfilechooserdefault.c 2007-09-16 18:24:40.000000000 +0200
@@ -390,10 +390,6 @@
static void filter_combo_changed (GtkComboBox *combo_box,
GtkFileChooserDefault *impl);
-static void shortcuts_row_activated_cb (GtkTreeView *tree_view,
- GtkTreePath *path,
- GtkTreeViewColumn *column,
- GtkFileChooserDefault *impl);
static gboolean shortcuts_key_press_event_cb (GtkWidget *widget,
GdkEventKey *event,
@@ -3657,8 +3653,22 @@
shortcuts_selection_changed_cb (GtkTreeSelection *selection,
GtkFileChooserDefault *impl)
{
@ -17,7 +29,7 @@ Index: gtk+-2.10.12/gtk/gtkfilechooserdefault.c
+
+ if (gtk_tree_selection_get_selected(selection, NULL, &iter))
+ {
+ gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (impl->shortcuts_filter_model),
+ gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (impl->shortcuts_pane_filter_model),
+ &child_iter,
+ &iter);
+ shortcuts_activate_iter (impl, &child_iter);
@ -25,7 +37,17 @@ Index: gtk+-2.10.12/gtk/gtkfilechooserdefault.c
}
static gboolean
@@ -7920,25 +7934,6 @@
@@ -3938,9 +3948,6 @@
g_signal_connect (selection, "changed",
G_CALLBACK (shortcuts_selection_changed_cb), impl);
- g_signal_connect (impl->browse_shortcuts_tree_view, "row_activated",
- G_CALLBACK (shortcuts_row_activated_cb), impl);
-
g_signal_connect (impl->browse_shortcuts_tree_view, "key_press_event",
G_CALLBACK (shortcuts_key_press_event_cb), impl);
@@ -8593,25 +8600,6 @@
gtk_file_path_free (path);
return retval;
}
@ -41,7 +63,7 @@ Index: gtk+-2.10.12/gtk/gtkfilechooserdefault.c
- {
- shortcuts_activate_iter (impl, &iter);
-
- gtk_widget_grab_focus (impl->browse_files_tree_view);
- focus_browse_tree_view_if_possible (impl);
- }
- else
- goto file_list;
@ -51,21 +73,29 @@ Index: gtk+-2.10.12/gtk/gtkfilechooserdefault.c
else if (impl->toplevel_last_focus_widget == impl->browse_files_tree_view)
{
/* The focus is on a dialog's action area button, *and* the widget that
@@ -8267,17 +8262,6 @@
GtkTreeViewColumn *column,
GtkFileChooserDefault *impl)
{
@@ -10469,25 +10457,6 @@
}
}
-/* Callback used when a row in the shortcuts list is activated */
-static void
-shortcuts_row_activated_cb (GtkTreeView *tree_view,
- GtkTreePath *path,
- GtkTreeViewColumn *column,
- GtkFileChooserDefault *impl)
-{
- GtkTreeIter iter;
- GtkTreeIter child_iter;
-
- if (!gtk_tree_model_get_iter (impl->shortcuts_filter_model, &iter, path))
- if (!gtk_tree_model_get_iter (impl->shortcuts_pane_filter_model, &iter, path))
- return;
-
- gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (impl->shortcuts_filter_model),
- gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (impl->shortcuts_pane_filter_model),
- &child_iter,
- &iter);
- shortcuts_activate_iter (impl, &child_iter);
-}
-
gtk_widget_grab_focus (impl->browse_files_tree_view);
}
/* Handler for GtkWidget::key-press-event on the shortcuts list */
static gboolean
shortcuts_key_press_event_cb (GtkWidget *widget,

18
debian/patches/041_ia32-libs.patch vendored
View File

@ -1,7 +1,7 @@
Index: gtk+2.0-2.10.11/gdk-pixbuf/gdk-pixbuf-io.c
Index: gtk+2.0-2.11.3/gdk-pixbuf/gdk-pixbuf-io.c
===================================================================
--- gtk+2.0-2.10.11.orig/gdk-pixbuf/gdk-pixbuf-io.c 2007-04-13 10:56:36.000000000 +0200
+++ gtk+2.0-2.10.11/gdk-pixbuf/gdk-pixbuf-io.c 2007-04-13 10:56:40.000000000 +0200
--- gtk+2.0-2.11.3.orig/gdk-pixbuf/gdk-pixbuf-io.c 2007-06-16 14:25:47.000000000 +0200
+++ gtk+2.0-2.11.3/gdk-pixbuf/gdk-pixbuf-io.c 2007-06-16 14:26:24.000000000 +0200
@@ -280,8 +280,20 @@
gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE"));
@ -25,11 +25,11 @@ Index: gtk+2.0-2.10.11/gdk-pixbuf/gdk-pixbuf-io.c
return result;
}
Index: gtk+2.0-2.10.11/gtk/gtkrc.c
Index: gtk+2.0-2.11.3/gtk/gtkrc.c
===================================================================
--- gtk+2.0-2.10.11.orig/gtk/gtkrc.c 2007-04-13 10:56:36.000000000 +0200
+++ gtk+2.0-2.10.11/gtk/gtkrc.c 2007-04-13 10:56:40.000000000 +0200
@@ -447,7 +447,20 @@
--- gtk+2.0-2.11.3.orig/gtk/gtkrc.c 2007-06-15 20:07:37.000000000 +0200
+++ gtk+2.0-2.11.3/gtk/gtkrc.c 2007-06-16 14:26:24.000000000 +0200
@@ -450,7 +450,20 @@
if (im_module_file)
result = g_strdup (im_module_file);
else
@ -51,7 +51,7 @@ Index: gtk+2.0-2.10.11/gtk/gtkrc.c
}
return result;
@@ -519,7 +532,21 @@
@@ -522,7 +535,21 @@
else
{
const gchar *home;
@ -74,7 +74,7 @@ Index: gtk+2.0-2.10.11/gtk/gtkrc.c
gtk_rc_add_default_file (str);
g_free (str);
@@ -527,7 +554,21 @@
@@ -530,7 +557,21 @@
home = g_get_home_dir ();
if (home)
{

3393
debian/patches/070_mandatory-relibtoolize.patch vendored
View File

File diff suppressed because it is too large Load Diff

30
debian/patches/081_icon-cache-validate.patch vendored Normal file
View File

@ -0,0 +1,30 @@
# See: http://bugzilla.gnome.org/show_bug.cgi?id=476342
--- trunk/gtk/gtkiconcache.c 2007/09/14 01:01:59 18822
+++ trunk/gtk/gtkiconcache.c 2007/09/14 02:11:01 18823
@@ -127,14 +127,19 @@
info.n_directories = 0;
info.flags = CHECK_OFFSETS|CHECK_STRINGS;
- if (!_gtk_icon_cache_validate (&info))
+#ifdef G_ENABLE_DEBUG
+ if (gtk_debug_flags & GTK_DEBUG_ICONTHEME)
{
- g_mapped_file_free (map);
- g_warning ("Icon cache '%s' is invalid\n", cache_filename);
+ if (!_gtk_icon_cache_validate (&info))
+ {
+ g_mapped_file_free (map);
+ g_warning ("Icon cache '%s' is invalid\n", cache_filename);
- goto done;
+ goto done;
+ }
}
-
+#endif
+
GTK_NOTE (ICONTHEME, g_print ("found cache for %s\n", path));
cache = g_new0 (GtkIconCache, 1);

12
debian/patches/091_workaround_no_gtk_init_incorrect_display.patch vendored Normal file
View File

@ -0,0 +1,12 @@
Index: gtk+2.0-2.11.6/gtk/gtkclipboard.c
===================================================================
--- gtk+2.0-2.11.6.orig/gtk/gtkclipboard.c 2007-08-31 16:52:48.000000000 +0200
+++ gtk+2.0-2.11.6/gtk/gtkclipboard.c 2007-08-31 16:53:16.000000000 +0200
@@ -287,6 +287,7 @@
gtk_clipboard_get_for_display (GdkDisplay *display,
GdkAtom selection)
{
+ g_return_val_if_fail (display != NULL, NULL);
g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
g_return_val_if_fail (!display->closed, NULL);

3
debian/patches/series vendored
View File

@ -2,6 +2,7 @@
002_static-linking-dont-build-perf.patch
004_gtk+-ximian-gtk2-filesel-navbutton-5.patch
005_xpmico.patch
006_proper-directfb-modules.patch
007_implicit_pointer_conversion_gdkdrawable_directfb.patch
008_implicit_pointer_conversion_gdkgc_directfb.patch
009_gtk-export-filechooser.patch
@ -9,8 +10,8 @@
020_immodules-files-d.patch
021_loader-files-d.patch
030_gtkentry_password-char-circle.patch
031_cursor-blinking-timeout.patch
033_treeview_resizing.patch
040_filechooser_single-click.patch
041_ia32-libs.patch
070_mandatory-relibtoolize.patch
081_icon-cache-validate.patch

58
debian/rules vendored
View File

@ -3,6 +3,8 @@
# Debian GNOME Maintainers
DISABLE_UPDATE_UPLOADERS := 1
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
# prevent accidental uploads to unstable
include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
# get-orig-source target
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
@ -26,20 +28,27 @@ MAKEFLAGS += $(if $(DEB_BUILD_OPTIONS_PARALLEL),-j$(DEB_BUILD_OPTIONS_PARALLEL))
DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
CFLAGS += -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
CFLAGS += -O2
# ppc64 support; see #386815
# XXX Should probably be fixed in binutils
# XXX Use LDFLAGS instead of CFLAGS?
# XXX shouldn't we check the arch instead of the CPU?
ifeq ($(DEB_BUILD_GNU_CPU),powerpc64)
CFLAGS += -mminimal-toc
endif
CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
# used to fail in directfb code -- but this might be fixed -- currently fails
# in the cups gtkprint backend
#LDFLAGS += -Wl,-z,defs
DEBVERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
VERSION := $(shell echo $(DEBVERSION) | sed -e 's/-[^-]*$$//')
APIVER := 2.0
SONAME := 0
SHVER := 2.10.12-3
SHVER := 2.12.0
# earliest version that this release has backwards binary compatibility for
GTK_BINARY_VERSION := 2.10.0
@ -104,7 +113,8 @@ common_configure_flags := \
--infodir=\$${prefix}/share/info \
--sysconfdir=/etc \
--with-html-dir=\$${prefix}/share/doc/$(DOC_PKG) \
--enable-explicit-deps=yes
--enable-explicit-deps=yes \
--enable-test-print-backend
ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
common_configure_flags += --build=$(DEB_BUILD_GNU_TYPE)
else
@ -250,7 +260,7 @@ binary-indep: build $(maybe_check) install $(call dh_subst_files,$(BINARY_INDEP_
binary-arch: build $(maybe_check) install $(call dh_subst_files,$(BINARY_ARCH_PKGS)) debian/update-gdkpixbuf-loaders debian/update-gtk-immodules debian/dh_gtkmodules debian/dh_gtkmodules.1
dh_testdir
dh_testroot
dh_install -a
dh_install -s
# empty the dependency_libs in the *.la files
sed -i "/dependency_libs/ s/'.*'/''/" debian/$(DEV_PKG)/usr/lib/*.la
# we don't need the rpath in the udeb
@ -261,7 +271,7 @@ binary-arch: build $(maybe_check) install $(call dh_subst_files,$(BINARY_ARCH_PK
done
dh_installchangelogs -p$(EXAMPLES_PKG) -p$(PIXBUF_PKG) ChangeLog ChangeLog.*
dh_installdocs -p$(EXAMPLES_PKG) -p$(PIXBUF_PKG) NEWS NEWS.pre-1-0 README
dh_installman -a
dh_installman -s
# fix the permissions of the development package because it ships
# dh_gtkmodules which we need to invoke in this build
dh_fixperms -p$(DEV_PKG)
@ -281,12 +291,12 @@ binary-arch: build $(maybe_check) install $(call dh_subst_files,$(BINARY_ARCH_PK
debian/$(DEV_PKG)/usr/bin/dh_gtkmodules \
-k \
-p$(UDEB_PKG)
dh_installexamples -a
dh_link -a
dh_strip -a --dbg-package=$(DEBUG_PKG)
dh_compress -a
dh_fixperms -a -Xusr/lib/$(SHARED_PKG)
dh_makeshlibs -p$(SHARED_PKG)\
dh_installexamples -s
dh_link -s
dh_strip -s --dbg-package=$(DEBUG_PKG)
dh_compress -s
dh_fixperms -s -Xusr/lib/$(SHARED_PKG)
dh_makeshlibs -p$(SHARED_PKG) \
-X$(MODULES_BASE_PATH) \
-V"$(SHARED_PKG) (>= $(SHVER))" \
--add-udeb=$(UDEB_PKG)
@ -294,7 +304,7 @@ binary-arch: build $(maybe_check) install $(call dh_subst_files,$(BINARY_ARCH_PK
-X$(MODULES_BASE_PATH) \
-V"$(DIRECTFB_PKG) (>= $(SHVER))" \
--add-udeb=$(UDEB_PKG)
dh_installdeb -a
dh_installdeb -s
# override shlibs for libraries from this source before computing
# dependencies of packages generated from this source; we already have
# inter-dependencies expressed manually in the control file, we do not
@ -302,12 +312,16 @@ binary-arch: build $(maybe_check) install $(call dh_subst_files,$(BINARY_ARCH_PK
cat debian/*/DEBIAN/shlibs | \
sed -n -r -e 's/(([^ ]+: )?([^ ]+) ([^ ]+)) .*/\1/p' \
> debian/shlibs.local
dh_shlibdeps -a -N$(UDEB_PKG)
dh_shlibdeps -s -N$(UDEB_PKG)
dh_shlibdeps -p$(UDEB_PKG) -l/usr/lib/libcairo-directfb/lib/
-rm -f debian/shlibs.local
dh_gencontrol -a
dh_md5sums -a
dh_builddeb -a
dh_gencontrol -s
dh_md5sums -s
dh_builddeb -s
list-missing:
perl -w debian/dh_listmissing.pl $(foreach f,$(FLAVORS),$(subst $(CURDIR)/,,$(installbasedir))/$(f)) 2>&1 | \
egrep -v '(\.la|usr/lib/gtk-2.0/$(GTK_BINARY_VERSION)/[^/]+/[^/]+\.a) has been installed' >&2
binary: binary-indep binary-arch
.PHONY: patch configure build check install clean binary-indep binary-arch binary
.PHONY: patch configure build check install clean binary-indep binary-arch list-missing binary