Move gtk+2.0 branch to unstable
This commit is contained in:
Emilio Pozuelo Monfort
144
debian/changelog
vendored
144
debian/changelog
vendored
@ -1,20 +1,129 @@
|
||||
gtk+2.0 (2.12.12-1) unstable; urgency=low
|
||||
gtk+2.0 (2.14.7-3) experimental; urgency=low
|
||||
|
||||
[ Josselin Mouette ]
|
||||
* dh_gtkmodules.in: fix a pod2man error.
|
||||
* New upstream release.
|
||||
+ Fixes infinite loop caused by setting color scheme.
|
||||
Closes: #492590.
|
||||
* 021_loader-files-d.patch: updated to apply cleanly.
|
||||
* 070_mandatory-relibtoolize.patch: regenerated for the new version.
|
||||
* 032_gdkwindowimpl_directfb.patch: new version of the patch. This
|
||||
should restore the basic functionality of the backend, but there is
|
||||
still work underway.
|
||||
* 033_directfb_client-message.patch: stolen from the upstream SVN. Fix
|
||||
the DirectFB client_message API.
|
||||
* 034_directfb_memleak.patch: stolen from the upstream SVN. Fix memory
|
||||
leak in the DirectFB code.
|
||||
* Require DirectFB 1.0.0 for the 034 patch.
|
||||
* 070_mandatory-relibtoolize.patch: updated accordingly.
|
||||
|
||||
-- Josselin Mouette <joss@debian.org> Sat, 21 Feb 2009 14:59:45 +0100
|
||||
|
||||
gtk+2.0 (2.14.7-2) experimental; urgency=low
|
||||
|
||||
* 008_implicit_pointer_conversion_gdkgc_directfb.patch: removed, it’s
|
||||
obsolete and just defines the same macro a second time.
|
||||
* 007_implicit_pointer_conversion_gdkdrawable_directfb.patch: removed,
|
||||
it’s not needed anymore with the latest directfb.
|
||||
* 006_proper-directfb-modules.patch: removed from the package, it
|
||||
won’t be necessary anymore.
|
||||
* 001_static-linking-dont-query-immodules.patch,
|
||||
002_static-linking-dont-build-perf.patch,
|
||||
003_gdk.pc_privates.patch,
|
||||
004_gtk+-ximian-gtk2-filesel-navbutton-5.patch: refreshed.
|
||||
* Remove 071_correct_directfb_declarations.patch, and replace it by
|
||||
032_gdkwindowimpl_directfb.patch, a patch from Sven Neumann to
|
||||
(hopefully) fix DirectFB support for GTK+ 2.14.
|
||||
|
||||
-- Josselin Mouette <joss@debian.org> Tue, 17 Feb 2009 23:17:56 +0100
|
||||
|
||||
gtk+2.0 (2.14.7-1) experimental; urgency=low
|
||||
|
||||
[ Loic Minier ]
|
||||
* Don't purge /etc/gtk-2.0/gdk-pixbuf.loaders and /etc/gtk-2.0/gtk.immodules
|
||||
during first configuration.
|
||||
|
||||
-- Josselin Mouette <joss@debian.org> Mon, 16 Feb 2009 13:47:06 +0100
|
||||
[ Sebastian Dröge ]
|
||||
* New upstream bugfix release:
|
||||
+ debian/patches/070_mandatory-relibtoolize.patch:
|
||||
- Regenerated for the new version.
|
||||
|
||||
gtk+2.0 (2.12.11-4) unstable; urgency=low
|
||||
-- Sebastian Dröge <slomo@debian.org> Thu, 08 Jan 2009 08:06:02 +0100
|
||||
|
||||
gtk+2.0 (2.14.5-1) experimental; urgency=low
|
||||
|
||||
[ Josselin Mouette ]
|
||||
* Really install the faq and tutorial files correctly so that the
|
||||
devhelp file is read.
|
||||
* Update doc-base files accordingly.
|
||||
* gruik2devhelp.awk: new script to generate the devhelp files
|
||||
automatically for the FAQ and tutorial, based on the HTML doc.
|
||||
* Build-depend on gawk, run the script appropriately.
|
||||
|
||||
[ Sebastian Dröge ]
|
||||
* New upstream bugfix release:
|
||||
+ debian/patches/070_mandatory-relibtoolize.patch:
|
||||
- Regenerated for the new version.
|
||||
|
||||
-- Sebastian Dröge <slomo@debian.org> Tue, 25 Nov 2008 11:00:35 +0100
|
||||
|
||||
gtk+2.0 (2.14.4-3) experimental; urgency=low
|
||||
|
||||
* libgail*.install: fix installation paths. Closes: #505105.
|
||||
* Do not ship .la files for gail modules.
|
||||
* Generate shlibs for libgail.
|
||||
* Bump shlibs version to 2.14.0.
|
||||
* Do not install libgailutil in libgtk2.0-0.
|
||||
* Do not install gtk libs in libgail-dev.
|
||||
* Rework docs installation.
|
||||
* Add doc links where needed.
|
||||
* Install .devhelp files at the correct places. Closes: #504807.
|
||||
* Bump dependencies for the development package.
|
||||
* Fix dependencies of gail packages.
|
||||
* Don’t install libgail in the udeb.
|
||||
* Stop shipping /usr/lib/pkgconfig/libgtk-directfb-2.0-0/, nobody uses
|
||||
it.
|
||||
* Remove versioned conflicts with libgail packages.
|
||||
* Remove libgail18.shlibs.
|
||||
* Put debugging symbols of libgail modules in libgail-dbg.
|
||||
* dh_gtkmodules.in: fix a pod2man error.
|
||||
* Disable 006_proper-directfb-modules.patch.
|
||||
* Update 070_mandatory_relibtoolize.patch accordingly.
|
||||
|
||||
-- Josselin Mouette <joss@debian.org> Tue, 11 Nov 2008 14:44:21 +0100
|
||||
|
||||
gtk+2.0 (2.14.4-2) experimental; urgency=low
|
||||
|
||||
* debian/control, debian/rules, debian/libgail*:
|
||||
- split libgail packages
|
||||
|
||||
-- Gustavo Noronha Silva <kov@debian.org> Wed, 05 Nov 2008 14:54:08 -0200
|
||||
|
||||
gtk+2.0 (2.14.4-1) experimental; urgency=low
|
||||
|
||||
[ Gustavo Noronha Silva ]
|
||||
* New upstream release
|
||||
* debian/patches/006_proper-directfb-modules.patch:
|
||||
- refreshed
|
||||
* debian/patches/008_implicit_pointer_conversion_gdkgc_directfb.patch,
|
||||
debian/patches/009_gtk-export-filechooser.patch,
|
||||
debian/patches/020_immodules-files-d.patch,
|
||||
debian/patches/021_loader-files-d.patch,
|
||||
- update borrowed from Ubuntu's package
|
||||
* debian/patches/071_correct_directfb_declarations.patch,
|
||||
debian/patches/072_workaround_directfb_build.patch:
|
||||
- borrowed from ubuntu
|
||||
* debian/patches/033_treeview_resizing.patch,
|
||||
debian/patches/095_gtk-im-module-setting.patch:
|
||||
- removed; fixed upstream
|
||||
* debian/patches/070_mandatory-relibtoolize.patch:
|
||||
- refreshed
|
||||
* debian/control.in:
|
||||
- added libjasper-dev to the Build-Depends, as GTK+ now supports
|
||||
JPEG2000
|
||||
- make GTK+ packages conflict/replace with gail ones, since they are now
|
||||
included in GTK+
|
||||
* debian/patches/092_fix_printtest_include.patch:
|
||||
- new patch, to fix build problem in print test
|
||||
* debian/patches/071_jasper_link_fix.patch:
|
||||
- make gdk-pixbuf-csource link correctly with libjasper
|
||||
* debian/rules, debian/control:
|
||||
- newer libcairo2-dev contains everything needed to build the directfb
|
||||
target, so disable building with the dummy libcairo-directfb2-dev
|
||||
- this makes us have to build depend on libcairo2-dev >= 1.6.4-6.1
|
||||
|
||||
[ Loic Minier ]
|
||||
* Let libgtk2.0-dev recommend debhelper for dh_gtkmodules.
|
||||
@ -22,15 +131,14 @@ gtk+2.0 (2.12.11-4) unstable; urgency=low
|
||||
gtk-builder-convert to work and might be relied upon by packages bdeping
|
||||
on libgtk2.0-dev.
|
||||
|
||||
[ Josselin Mouette ]
|
||||
* Build-depend on libcairo2-dev 1.6.4-6.1, remove references to
|
||||
libcairo-directfb2-dev.
|
||||
* Disable 006_proper-directfb-modules.patch, it is made unnecessary by
|
||||
these changes.
|
||||
* 070_mandatory-relibtoolize.patch: updated accordingly.
|
||||
* rules: remove -l flag to dh_shlibdeps.
|
||||
[ Emilio Pozuelo Monfort ]
|
||||
* Update build-dependencies for the new version:
|
||||
- libglib2.0-dev >= 2.17.6
|
||||
- libpango1.0-dev >= 1.20
|
||||
- libatk1.0-dev >= 1.13.0
|
||||
- libcairo2-dev >= 1.6.0
|
||||
|
||||
-- Josselin Mouette <joss@debian.org> Mon, 13 Oct 2008 11:14:40 +0200
|
||||
-- Gustavo Noronha Silva <kov@debian.org> Wed, 24 Sep 2008 21:38:58 -0300
|
||||
|
||||
gtk+2.0 (2.12.11-3) unstable; urgency=low
|
||||
|
||||
|
||||
94
debian/control
vendored
94
debian/control
vendored
@ -2,13 +2,13 @@ Source: gtk+2.0
|
||||
Section: libs
|
||||
Priority: optional
|
||||
Maintainer: Sebastien Bacher <seb128@debian.org>
|
||||
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Josselin Mouette <joss@debian.org>, Loic Minier <lool@dooz.org>, Sebastian Dröge <slomo@debian.org>
|
||||
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Gustavo Noronha Silva <kov@debian.org>, Josselin Mouette <joss@debian.org>, Sebastian Dröge <slomo@debian.org>
|
||||
Build-Depends: debhelper (>= 5.0.22),
|
||||
gettext,
|
||||
pkg-config,
|
||||
libglib2.0-dev (>= 2.13.5),
|
||||
libpango1.0-dev (>= 1.17.3),
|
||||
libatk1.0-dev (>= 1.9.0),
|
||||
libglib2.0-dev (>= 2.17.6),
|
||||
libpango1.0-dev (>= 1.20),
|
||||
libatk1.0-dev (>= 1.13.0),
|
||||
libx11-dev (>= 2:1.0.0-6),
|
||||
libxext-dev (>= 1:1.0.1-2),
|
||||
libxi-dev (>= 1:1.0.1-4),
|
||||
@ -25,15 +25,17 @@ Build-Depends: debhelper (>= 5.0.22),
|
||||
libcairo2-dev (>= 1.6.4-6.1),
|
||||
libtiff4-dev,
|
||||
libjpeg62-dev,
|
||||
libjasper-dev,
|
||||
libpng12-dev,
|
||||
gnome-pkg-tools (>= 0.11),
|
||||
chrpath,
|
||||
dpkg-dev (>= 1.13.19),
|
||||
x11proto-xext-dev,
|
||||
libdirectfb-dev (>= 0.9.26),
|
||||
libdirectfb-dev (>= 1.0.0),
|
||||
libcups2-dev (>= 1.2),
|
||||
quilt
|
||||
Build-Depends-Indep: gtk-doc-tools (>= 1.6),
|
||||
quilt,
|
||||
gawk
|
||||
Build-Depends-Indep: gtk-doc-tools (>= 1.8),
|
||||
docbook-xml
|
||||
Standards-Version: 3.8.0
|
||||
|
||||
@ -186,10 +188,10 @@ Depends: libgtk2.0-0 (= ${binary:Version}),
|
||||
libgtk2.0-common,
|
||||
${misc:Depends},
|
||||
${shlibs:Depends},
|
||||
libglib2.0-dev (>= 2.12.0),
|
||||
libpango1.0-dev (>= 1.10.0-2),
|
||||
libatk1.0-dev (>= 1.6.1-2),
|
||||
libcairo2-dev,
|
||||
libglib2.0-dev (>= 2.17.6),
|
||||
libpango1.0-dev (>= 1.20),
|
||||
libatk1.0-dev (>= 1.13.0),
|
||||
libcairo2-dev (>= 1.6.4-6.1),
|
||||
libx11-dev (>= 2:1.0.0-6),
|
||||
libxext-dev (>= 1:1.0.1-2),
|
||||
libxinerama-dev (>= 1:1.0.1-4.1),
|
||||
@ -307,3 +309,73 @@ Description: Pixbuf-based theme for GTK+ 2.x
|
||||
suites.
|
||||
.
|
||||
This package contains the pixbuf theme engine.
|
||||
|
||||
Package: libgail18
|
||||
Architecture: any
|
||||
Depends: ${misc:Depends},
|
||||
${shlibs:Depends},
|
||||
libgtk2.0-0 (= ${binary:Version})
|
||||
Replaces: libgail17
|
||||
Description: GNOME Accessibility Implementation Library -- shared libraries
|
||||
Gail implements ATK interfaces for GTK+ widgets which are dynamically
|
||||
loadable at runtime by a GTK+ application. Once loaded, those parts of
|
||||
an application that use standard GTK+ widgets will have a basic level
|
||||
of accessibility, without the need to modify the application at all.
|
||||
.
|
||||
This package contains the shared library.
|
||||
|
||||
Package: libgail-common
|
||||
Architecture: any
|
||||
Depends: ${misc:Depends},
|
||||
${shlibs:Depends},
|
||||
libgail18 (= ${binary:Version})
|
||||
Description: GNOME Accessibility Implementation Library -- common modules
|
||||
Gail implements ATK interfaces for GTK+ widgets which are dynamically
|
||||
loadable at runtime by a GTK+ application. Once loaded, those parts of
|
||||
an application that use standard GTK+ widgets will have a basic level
|
||||
of accessibility, without the need to modify the application at all.
|
||||
.
|
||||
This package contains core shared libraries.
|
||||
|
||||
Package: libgail-dev
|
||||
Architecture: any
|
||||
Section: libdevel
|
||||
Depends: ${misc:Depends},
|
||||
libgail18 (= ${binary:Version}),
|
||||
libgail-common (= ${binary:Version}),
|
||||
libgtk2.0-dev (= ${binary:Version}),
|
||||
pkg-config,
|
||||
libatk1.0-dev (>= 1.13.0)
|
||||
Suggests: libgail-doc
|
||||
Description: GNOME Accessibility Implementation Library -- development files
|
||||
Gail implements ATK interfaces for GTK+ widgets which are dynamically
|
||||
loadable at runtime by a GTK+ application. Once loaded, those parts of
|
||||
an application that use standard GTK+ widgets will have a basic level
|
||||
of accessibility, without the need to modify the application at all.
|
||||
.
|
||||
This package contains the development files for Gail.
|
||||
|
||||
Package: libgail-dbg
|
||||
Architecture: any
|
||||
Section: libdevel
|
||||
Priority: extra
|
||||
Depends: ${misc:Depends}, libgail18 (= ${binary:Version})
|
||||
Recommends: libgtk2.0-0-dbg
|
||||
Description: Gail libraries and debugging symbols
|
||||
Gail is the "GNOME Accessibility Implementation Library".
|
||||
.
|
||||
This package contains detached debugging symbols.
|
||||
.
|
||||
Most people will not need this package.
|
||||
|
||||
Package: libgail-doc
|
||||
Architecture: all
|
||||
Section: doc
|
||||
Depends: ${misc:Depends}, lynx | www-browser
|
||||
Description: documentation files of the Gail library
|
||||
Gail implements ATK interfaces for GTK+ widgets which are dynamically
|
||||
loadable at runtime by a GTK+ application. Once loaded, those parts of
|
||||
an application that use standard GTK+ widgets will have a basic level
|
||||
of accessibility, without the need to modify the application at all.
|
||||
.
|
||||
This package contains the documentation files for Gail.
|
||||
|
||||
92
debian/control.in
vendored
92
debian/control.in
vendored
@ -6,9 +6,9 @@ Uploaders: @GNOME_TEAM@
|
||||
Build-Depends: debhelper (>= 5.0.22),
|
||||
gettext,
|
||||
pkg-config,
|
||||
libglib2.0-dev (>= 2.13.5),
|
||||
libpango1.0-dev (>= 1.17.3),
|
||||
libatk1.0-dev (>= 1.9.0),
|
||||
libglib2.0-dev (>= 2.17.6),
|
||||
libpango1.0-dev (>= 1.20),
|
||||
libatk1.0-dev (>= 1.13.0),
|
||||
libx11-dev (>= 2:1.0.0-6),
|
||||
libxext-dev (>= 1:1.0.1-2),
|
||||
libxi-dev (>= 1:1.0.1-4),
|
||||
@ -25,15 +25,17 @@ Build-Depends: debhelper (>= 5.0.22),
|
||||
libcairo2-dev (>= 1.6.4-6.1),
|
||||
libtiff4-dev,
|
||||
libjpeg62-dev,
|
||||
libjasper-dev,
|
||||
libpng12-dev,
|
||||
gnome-pkg-tools (>= 0.11),
|
||||
chrpath,
|
||||
dpkg-dev (>= 1.13.19),
|
||||
x11proto-xext-dev,
|
||||
libdirectfb-dev (>= 0.9.26),
|
||||
libdirectfb-dev (>= 1.0.0),
|
||||
libcups2-dev (>= 1.2),
|
||||
quilt
|
||||
Build-Depends-Indep: gtk-doc-tools (>= 1.6),
|
||||
quilt,
|
||||
gawk
|
||||
Build-Depends-Indep: gtk-doc-tools (>= 1.8),
|
||||
docbook-xml
|
||||
Standards-Version: 3.8.0
|
||||
|
||||
@ -186,10 +188,10 @@ Depends: @SHARED_PKG@ (= ${binary:Version}),
|
||||
@COMMON_PKG@,
|
||||
${misc:Depends},
|
||||
${shlibs:Depends},
|
||||
libglib2.0-dev (>= 2.12.0),
|
||||
libpango1.0-dev (>= 1.10.0-2),
|
||||
libatk1.0-dev (>= 1.6.1-2),
|
||||
libcairo2-dev,
|
||||
libglib2.0-dev (>= 2.17.6),
|
||||
libpango1.0-dev (>= 1.20),
|
||||
libatk1.0-dev (>= 1.13.0),
|
||||
libcairo2-dev (>= 1.6.4-6.1),
|
||||
libx11-dev (>= 2:1.0.0-6),
|
||||
libxext-dev (>= 1:1.0.1-2),
|
||||
libxinerama-dev (>= 1:1.0.1-4.1),
|
||||
@ -307,3 +309,73 @@ Description: Pixbuf-based theme for GTK+ 2.x
|
||||
suites.
|
||||
.
|
||||
This package contains the pixbuf theme engine.
|
||||
|
||||
Package: libgail18
|
||||
Architecture: any
|
||||
Depends: ${misc:Depends},
|
||||
${shlibs:Depends},
|
||||
@SHARED_PKG@ (= ${binary:Version})
|
||||
Replaces: libgail17
|
||||
Description: GNOME Accessibility Implementation Library -- shared libraries
|
||||
Gail implements ATK interfaces for GTK+ widgets which are dynamically
|
||||
loadable at runtime by a GTK+ application. Once loaded, those parts of
|
||||
an application that use standard GTK+ widgets will have a basic level
|
||||
of accessibility, without the need to modify the application at all.
|
||||
.
|
||||
This package contains the shared library.
|
||||
|
||||
Package: libgail-common
|
||||
Architecture: any
|
||||
Depends: ${misc:Depends},
|
||||
${shlibs:Depends},
|
||||
libgail18 (= ${binary:Version})
|
||||
Description: GNOME Accessibility Implementation Library -- common modules
|
||||
Gail implements ATK interfaces for GTK+ widgets which are dynamically
|
||||
loadable at runtime by a GTK+ application. Once loaded, those parts of
|
||||
an application that use standard GTK+ widgets will have a basic level
|
||||
of accessibility, without the need to modify the application at all.
|
||||
.
|
||||
This package contains core shared libraries.
|
||||
|
||||
Package: libgail-dev
|
||||
Architecture: any
|
||||
Section: libdevel
|
||||
Depends: ${misc:Depends},
|
||||
libgail18 (= ${binary:Version}),
|
||||
libgail-common (= ${binary:Version}),
|
||||
@DEV_PKG@ (= ${binary:Version}),
|
||||
pkg-config,
|
||||
libatk1.0-dev (>= 1.13.0)
|
||||
Suggests: libgail-doc
|
||||
Description: GNOME Accessibility Implementation Library -- development files
|
||||
Gail implements ATK interfaces for GTK+ widgets which are dynamically
|
||||
loadable at runtime by a GTK+ application. Once loaded, those parts of
|
||||
an application that use standard GTK+ widgets will have a basic level
|
||||
of accessibility, without the need to modify the application at all.
|
||||
.
|
||||
This package contains the development files for Gail.
|
||||
|
||||
Package: libgail-dbg
|
||||
Architecture: any
|
||||
Section: libdevel
|
||||
Priority: extra
|
||||
Depends: ${misc:Depends}, libgail18 (= ${binary:Version})
|
||||
Recommends: @DEBUG_PKG@
|
||||
Description: Gail libraries and debugging symbols
|
||||
Gail is the "GNOME Accessibility Implementation Library".
|
||||
.
|
||||
This package contains detached debugging symbols.
|
||||
.
|
||||
Most people will not need this package.
|
||||
|
||||
Package: libgail-doc
|
||||
Architecture: all
|
||||
Section: doc
|
||||
Depends: ${misc:Depends}, lynx | www-browser
|
||||
Description: documentation files of the Gail library
|
||||
Gail implements ATK interfaces for GTK+ widgets which are dynamically
|
||||
loadable at runtime by a GTK+ application. Once loaded, those parts of
|
||||
an application that use standard GTK+ widgets will have a basic level
|
||||
of accessibility, without the need to modify the application at all.
|
||||
.
|
||||
This package contains the documentation files for Gail.
|
||||
|
||||
29
debian/gruik2devhelp.awk
vendored
Normal file
29
debian/gruik2devhelp.awk
vendored
Normal file
@ -0,0 +1,29 @@
|
||||
#! /usr/bin/awk -f
|
||||
|
||||
BEGIN { print "<?xml version=\"1.0\"?>";
|
||||
level=1 }
|
||||
|
||||
title == 1 { print "<book title=\"" gensub("^>(.*)</TITLE$","\\1",1) "\" name =\"" name "\" link=\"book1.html\">";
|
||||
print "<chapters>";
|
||||
title=0 }
|
||||
/^><TITLE/ { title=1 }
|
||||
|
||||
/^><DD$/ { level++ }
|
||||
/^><\/DD$/ { level-- }
|
||||
|
||||
intext == 0 && href != "" && /^>([^<>]*)<.*$/ { n=n gensub("^>(.*)<.*$", "\\1",1); }
|
||||
intext == 1 && href != "" && /^([^<>]*)$/ { n=n $0 " "; }
|
||||
intext == 0 && href != "" && /^>([^<>]*)$/ { n=n gensub("^>(.*)$", "\\1",1) " "; intext=1 }
|
||||
intext == 1 && href != "" && /^([^<>]*)<.*$/ { n=n gensub("^([^<>]*)<.*$", "\\1",1); intext=0 }
|
||||
href != "" && /<\/A$/ { for (i=level; i<lastlevel+1; i++) print "</sub>";
|
||||
print "<sub name=\"" n "\" link=\"" href "\">";
|
||||
href = "";
|
||||
lastlevel = level }
|
||||
ending != 1 && /^HREF=".*"$/ { href=gensub("^HREF=\"(.*)\"$","\\1",1);
|
||||
n = "";
|
||||
intext = 0 }
|
||||
/^CLASS="NAVFOOTER"$/ { ending = 1 }
|
||||
|
||||
END { for (i=0; i<lastlevel; i++) print "</sub>";
|
||||
print "</chapters>";
|
||||
print "</book>" }
|
||||
1
debian/libgail-common.install.in
vendored
Normal file
1
debian/libgail-common.install.in
vendored
Normal file
@ -0,0 +1 @@
|
||||
debian/install/shared/@LIBDIR@/gtk-@APIVER@/modules/*.so @LIBDIR@/gtk-@APIVER@/modules
|
||||
1
debian/libgail-dbg.dirs
vendored
Normal file
1
debian/libgail-dbg.dirs
vendored
Normal file
@ -0,0 +1 @@
|
||||
usr/lib/debug/
|
||||
5
debian/libgail-dev.install
vendored
Normal file
5
debian/libgail-dev.install
vendored
Normal file
@ -0,0 +1,5 @@
|
||||
debian/install/shared/usr/include/gail* /usr/include
|
||||
debian/install/shared/usr/lib/libgail*.so /usr/lib
|
||||
debian/install/shared/usr/lib/libgail*.la /usr/lib
|
||||
debian/install/static/usr/lib/libgail*.a /usr/lib
|
||||
debian/install/shared/usr/lib/pkgconfig/gail*.pc /usr/lib/pkgconfig
|
||||
10
debian/libgail-doc.doc-base.gail-reference
vendored
Normal file
10
debian/libgail-doc.doc-base.gail-reference
vendored
Normal file
@ -0,0 +1,10 @@
|
||||
Document: gail-reference
|
||||
Title: Gail Reference Manual
|
||||
Author: Padraig O'Briain <padraig.obriain@sun.com>
|
||||
Abstract: This manual describes APIs for libgail-util
|
||||
Section: Accessibility
|
||||
|
||||
Format: HTML
|
||||
Index: /usr/share/gtk-doc/html/gail-libgail-util/index.html
|
||||
Files: /usr/share/gtk-doc/html/gail-libgail-util/*.html
|
||||
|
||||
1
debian/libgail-doc.install
vendored
Normal file
1
debian/libgail-doc.install
vendored
Normal file
@ -0,0 +1 @@
|
||||
debian/install/shared/usr/share/gtk-doc/html/gail* usr/share/gtk-doc/html
|
||||
1
debian/libgail-doc.links
vendored
Normal file
1
debian/libgail-doc.links
vendored
Normal file
@ -0,0 +1 @@
|
||||
/usr/share/gtk-doc/html/gail-libgail-util /usr/share/doc/libgail-doc/html
|
||||
1
debian/libgail18.install
vendored
Normal file
1
debian/libgail18.install
vendored
Normal file
@ -0,0 +1 @@
|
||||
debian/install/shared/usr/lib/libgail*.so.* /usr/lib
|
||||
2
debian/libgtk-directfb-2.0-0-udeb.install.in
vendored
2
debian/libgtk-directfb-2.0-0-udeb.install.in
vendored
@ -1,3 +1,3 @@
|
||||
# from the directfb flavor
|
||||
debian/install/directfb/@MODULES_BASE_PATH@/loaders/libpixbufloader-png.so @MODULES_BASE_PATH@/loaders
|
||||
debian/install/directfb/@LIBDIR@/*.so.* @LIBDIR@
|
||||
debian/install/directfb/@LIBDIR@/libg?k*.so.* @LIBDIR@
|
||||
|
||||
1
debian/libgtk-directfb-2.0-dev.install.in
vendored
1
debian/libgtk-directfb-2.0-dev.install.in
vendored
@ -1,6 +1,5 @@
|
||||
# from the directfb flavor
|
||||
debian/install/directfb/usr/include/gtk-@APIVER@/gdk/*directfb* usr/include/gtk-@APIVER@/gdk
|
||||
debian/install/directfb/@LIBDIR@/*directfb*.so @LIBDIR@
|
||||
debian/install/directfb/@LIBDIR@/pkgconfig/* @LIBDIR@/pkgconfig/@DIRECTFB_PKG@
|
||||
debian/install/directfb/@LIBDIR@/pkgconfig/*directfb* @LIBDIR@/pkgconfig
|
||||
debian/install/directfb/@LIBDIR@/gtk-@APIVER@/include/gdkconfig.h @LIBDIR@/gtk-@APIVER@/include/directfb
|
||||
|
||||
3
debian/libgtk2.0-0.install.in
vendored
3
debian/libgtk2.0-0.install.in
vendored
@ -9,4 +9,5 @@ debian/install/shared/usr/bin/gtk-update-icon-cache @LIBDIR@/@SHARED_PKG@
|
||||
debian/install/shared/@MODULES_BASE_PATH@/loaders/*.so @MODULES_BASE_PATH@/loaders
|
||||
debian/install/shared/@MODULES_BASE_PATH@/immodules/*.so @MODULES_BASE_PATH@/immodules
|
||||
debian/install/shared/@MODULES_BASE_PATH@/printbackends/*.so @MODULES_BASE_PATH@/printbackends
|
||||
debian/install/shared/@LIBDIR@/*.so.* @LIBDIR@
|
||||
debian/install/shared/@LIBDIR@/libgtk*.so.* @LIBDIR@
|
||||
debian/install/shared/@LIBDIR@/libgdk*.so.* @LIBDIR@
|
||||
|
||||
10
debian/libgtk2.0-dev.install.in
vendored
10
debian/libgtk2.0-dev.install.in
vendored
@ -3,12 +3,12 @@ debian/dh_gtkmodules usr/bin
|
||||
# from the shared flavor
|
||||
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/@LIBDIR@/*.la @LIBDIR@
|
||||
debian/install/shared/@LIBDIR@/*.so @LIBDIR@
|
||||
debian/install/shared/@LIBDIR@/pkgconfig @LIBDIR@
|
||||
debian/install/shared/usr/include/gtk* usr/include
|
||||
debian/install/shared/@LIBDIR@/libg?k*.la @LIBDIR@
|
||||
debian/install/shared/@LIBDIR@/libg?k*.so @LIBDIR@
|
||||
debian/install/shared/@LIBDIR@/pkgconfig/g?k* @LIBDIR@/pkgconfig
|
||||
debian/install/shared/@LIBDIR@/gtk-@APIVER@/include @LIBDIR@/gtk-@APIVER@
|
||||
debian/install/shared/usr/share/aclocal usr/share
|
||||
debian/install/shared/usr/share/man/man1/gdk-pixbuf-csource.1 usr/share/man/man1/
|
||||
# from the static flavor
|
||||
debian/install/static/@LIBDIR@/*.a @LIBDIR@
|
||||
debian/install/static/@LIBDIR@/libg?k*.a @LIBDIR@
|
||||
|
||||
4
debian/libgtk2.0-doc.doc-base.gtk-faq
vendored
4
debian/libgtk2.0-doc.doc-base.gtk-faq
vendored
@ -8,5 +8,5 @@ Abstract: This document is intended to answer questions that are
|
||||
Section: Programming/C
|
||||
|
||||
Format: HTML
|
||||
Index: /usr/share/doc/libgtk2.0-doc/faq/html/book1.html
|
||||
Files: /usr/share/doc/libgtk2.0-doc/faq/html/*.html
|
||||
Index: /usr/share/doc/libgtk2.0-doc/faq/book1.html
|
||||
Files: /usr/share/doc/libgtk2.0-doc/faq/*.html
|
||||
|
||||
4
debian/libgtk2.0-doc.doc-base.gtk2-tutorial
vendored
4
debian/libgtk2.0-doc.doc-base.gtk2-tutorial
vendored
@ -14,5 +14,5 @@ Abstract: GTK+ (GIMP Toolkit) is a library for creating graphical user
|
||||
Section: Programming/C
|
||||
|
||||
Format: HTML
|
||||
Index: /usr/share/doc/libgtk2.0-doc/tutorial/html/book1.html
|
||||
Files: /usr/share/doc/libgtk2.0-doc/tutorial/html/*.html
|
||||
Index: /usr/share/doc/libgtk2.0-doc/tutorial/book1.html
|
||||
Files: /usr/share/doc/libgtk2.0-doc/tutorial/*.html
|
||||
|
||||
11
debian/libgtk2.0-doc.install.in
vendored
11
debian/libgtk2.0-doc.install.in
vendored
@ -1,9 +1,10 @@
|
||||
# from Debian
|
||||
debian/gtk-faq.devhelp usr/share/doc/@DOC_PKG@/gtk-faq
|
||||
debian/gtk-tutorial.devhelp usr/share/doc/@DOC_PKG@/gtk-tutorial
|
||||
debian/gtk-faq.devhelp usr/share/doc/@DOC_PKG@/faq
|
||||
debian/gtk-tutorial.devhelp usr/share/doc/@DOC_PKG@/tutorial
|
||||
# from the shared flavor
|
||||
debian/install/shared/usr/share/doc/@DOC_PKG@ usr/share/doc
|
||||
debian/install/shared/usr/share/gtk-doc/html/gtk* usr/share/doc/@DOC_PKG@
|
||||
debian/install/shared/usr/share/gtk-doc/html/gdk* usr/share/doc/@DOC_PKG@
|
||||
# from the source
|
||||
docs/faq/html usr/share/doc/@DOC_PKG@/faq
|
||||
docs/tutorial/html usr/share/doc/@DOC_PKG@/tutorial
|
||||
docs/faq/html/* usr/share/doc/@DOC_PKG@/faq
|
||||
docs/tutorial/html/* usr/share/doc/@DOC_PKG@/tutorial
|
||||
docs/*.txt usr/share/doc/@DOC_PKG@
|
||||
|
||||
2
debian/libgtk2.0-doc.links.in
vendored
2
debian/libgtk2.0-doc.links.in
vendored
@ -1,6 +1,8 @@
|
||||
usr/share/doc/@DOC_PKG@/gdk usr/share/gtk-doc/html/gdk
|
||||
usr/share/doc/@DOC_PKG@/gdk-pixbuf usr/share/gtk-doc/html/gdk-pixbuf
|
||||
usr/share/doc/@DOC_PKG@/gtk usr/share/gtk-doc/html/gtk
|
||||
usr/share/doc/@DOC_PKG@/faq usr/share/gtk-doc/html/gtk-faq
|
||||
usr/share/doc/@DOC_PKG@/tutorial usr/share/gtk-doc/html/gtk-tutorial
|
||||
usr/share/doc/libatk1.0-doc/atk usr/share/doc/@DOC_PKG@/atk
|
||||
usr/share/doc/libglib2.0-doc/glib usr/share/doc/@DOC_PKG@/glib
|
||||
usr/share/doc/libglib2.0-doc/gobject usr/share/doc/@DOC_PKG@/gobject
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
Index: gtk+2.0-2.11.5/configure.in
|
||||
Index: gtk+-2.14.7/configure.in
|
||||
===================================================================
|
||||
--- 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 @@
|
||||
--- gtk+-2.14.7.orig/configure.in 2009-01-07 17:33:57.000000000 +0100
|
||||
+++ gtk+-2.14.7/configure.in 2009-02-17 23:06:24.718714576 +0100
|
||||
@@ -152,6 +152,7 @@ esac
|
||||
dnl Initialize libtool
|
||||
AC_PROG_CC
|
||||
AM_DISABLE_STATIC
|
||||
@ -10,11 +10,11 @@ Index: gtk+2.0-2.11.5/configure.in
|
||||
|
||||
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
|
||||
Index: gtk+-2.14.7/modules/input/Makefile.am
|
||||
===================================================================
|
||||
--- 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 @@
|
||||
--- gtk+-2.14.7.orig/modules/input/Makefile.am 2009-01-07 17:33:31.000000000 +0100
|
||||
+++ gtk+-2.14.7/modules/input/Makefile.am 2009-02-17 23:06:24.731083956 +0100
|
||||
@@ -178,8 +178,12 @@ dist_imconffile_DATA = im-multipress.con
|
||||
if CROSS_COMPILING
|
||||
RUN_QUERY_IMMODULES_TEST=false
|
||||
else
|
||||
@ -27,8 +27,8 @@ Index: gtk+2.0-2.11.5/modules/input/Makefile.am
|
||||
|
||||
# Running this if cross compiling or if DESTDIR is set is going to
|
||||
# not work at all, so skip it.
|
||||
@@ -148,7 +152,18 @@
|
||||
$(IM_IME_MODULE)
|
||||
@@ -240,7 +244,18 @@ noinst_LTLIBRARIES = \
|
||||
included-modules: $(noinst_LTLIBRARIES)
|
||||
|
||||
gtk.immodules: Makefile.am $(module_LTLIBRARIES)
|
||||
- $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
Index: gtk+2.0-2.10.10/Makefile.am
|
||||
Index: gtk+-2.14.7/Makefile.am
|
||||
===================================================================
|
||||
--- gtk+2.0-2.10.10.orig/Makefile.am 2007-03-12 15:12:11.000000000 +0100
|
||||
+++ gtk+2.0-2.10.10/Makefile.am 2007-03-13 14:10:07.000000000 +0100
|
||||
@@ -1,6 +1,11 @@
|
||||
--- gtk+-2.14.7.orig/Makefile.am 2009-01-07 17:33:57.000000000 +0100
|
||||
+++ gtk+-2.14.7/Makefile.am 2009-02-17 23:07:14.895082593 +0100
|
||||
@@ -1,7 +1,12 @@
|
||||
## Makefile.am for GTK+
|
||||
include $(top_srcdir)/Makefile.decl
|
||||
|
||||
-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
|
||||
+# don't build perf measurement tools in static builds
|
||||
|
||||
18
debian/patches/003_gdk.pc_privates.patch
vendored
18
debian/patches/003_gdk.pc_privates.patch
vendored
@ -1,10 +1,10 @@
|
||||
Index: gtk+-2.12.1/configure.in
|
||||
Index: gtk+-2.14.7/configure.in
|
||||
===================================================================
|
||||
--- gtk+-2.12.1.orig/configure.in 2007-11-18 00:51:06.548600130 +0100
|
||||
+++ gtk+-2.12.1/configure.in 2007-11-18 01:06:06.279872893 +0100
|
||||
@@ -1459,21 +1459,23 @@ LDFLAGS="$saved_ldflags"
|
||||
--- gtk+-2.14.7.orig/configure.in 2009-02-17 23:06:24.718714576 +0100
|
||||
+++ gtk+-2.14.7/configure.in 2009-02-17 23:07:30.398582828 +0100
|
||||
@@ -1680,21 +1680,23 @@ LDFLAGS="$saved_ldflags"
|
||||
|
||||
GDK_PACKAGES="$PANGO_PACKAGES"
|
||||
GDK_PACKAGES="$PANGO_PACKAGES gio-2.0"
|
||||
if test "x$gdktarget" = "xx11"; then
|
||||
- GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES"
|
||||
+ GDK_PRIVATE_PACKAGES="$X_PACKAGES"
|
||||
@ -30,12 +30,12 @@ Index: gtk+-2.12.1/configure.in
|
||||
AC_SUBST(GDK_EXTRA_LIBS)
|
||||
AC_SUBST(GDK_EXTRA_CFLAGS)
|
||||
AC_SUBST(GDK_DEP_LIBS)
|
||||
Index: gtk+-2.12.1/gdk-2.0.pc.in
|
||||
Index: gtk+-2.14.7/gdk-2.0.pc.in
|
||||
===================================================================
|
||||
--- gtk+-2.12.1.orig/gdk-2.0.pc.in 2007-11-17 23:53:16.038827049 +0100
|
||||
+++ gtk+-2.12.1/gdk-2.0.pc.in 2007-11-18 01:06:30.821271428 +0100
|
||||
--- gtk+-2.14.7.orig/gdk-2.0.pc.in 2009-01-07 17:33:57.000000000 +0100
|
||||
+++ gtk+-2.14.7/gdk-2.0.pc.in 2009-02-17 23:07:30.402582917 +0100
|
||||
@@ -8,5 +8,6 @@ Name: GDK
|
||||
Description: GIMP Drawing Kit (${target} target)
|
||||
Description: GTK+ Drawing Kit (${target} target)
|
||||
Version: @VERSION@
|
||||
Requires: gdk-pixbuf-2.0 @GDK_PACKAGES@
|
||||
+Requires.private: @GDK_PRIVATE_PACKAGES@
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
Index: gtk+2.0-2.10.10/gtk/gtkfilesel.c
|
||||
Index: gtk+-2.14.7/gtk/gtkfilesel.c
|
||||
===================================================================
|
||||
--- gtk+2.0-2.10.10.orig/gtk/gtkfilesel.c 2007-03-12 14:51:01.000000000 +0100
|
||||
+++ gtk+2.0-2.10.10/gtk/gtkfilesel.c 2007-03-13 14:10:10.000000000 +0100
|
||||
@@ -79,9 +79,13 @@
|
||||
#undef GTK_DISABLE_DEPRECATED
|
||||
--- gtk+-2.14.7.orig/gtk/gtkfilesel.c 2009-01-07 17:32:57.000000000 +0100
|
||||
+++ gtk+-2.14.7/gtk/gtkfilesel.c 2009-02-17 23:07:34.883084908 +0100
|
||||
@@ -80,9 +80,13 @@
|
||||
#include "gtkeventbox.h"
|
||||
#include "gtkoptionmenu.h"
|
||||
|
||||
+#include "gtkimage.h"
|
||||
@ -16,7 +16,7 @@ Index: gtk+2.0-2.10.10/gtk/gtkfilesel.c
|
||||
#include "gtkalias.h"
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
@@ -317,6 +321,9 @@
|
||||
@@ -318,6 +322,9 @@ static gint cmpl_last_val
|
||||
*/
|
||||
static gchar* cmpl_completion_fullname (const gchar*, CompletionState* cmpl_state);
|
||||
|
||||
@ -26,7 +26,7 @@ Index: gtk+2.0-2.10.10/gtk/gtkfilesel.c
|
||||
|
||||
/* Directory operations. */
|
||||
static CompletionDir* open_ref_dir (gchar* text_to_complete,
|
||||
@@ -626,6 +633,10 @@
|
||||
@@ -627,6 +634,10 @@ gtk_file_selection_init (GtkFileSelectio
|
||||
GtkWidget *spacer;
|
||||
GtkDialog *dialog;
|
||||
|
||||
@ -37,7 +37,7 @@ Index: gtk+2.0-2.10.10/gtk/gtkfilesel.c
|
||||
GtkListStore *model;
|
||||
GtkTreeViewColumn *column;
|
||||
|
||||
@@ -639,18 +650,9 @@
|
||||
@@ -640,18 +651,9 @@ gtk_file_selection_init (GtkFileSelectio
|
||||
filesel->main_vbox = dialog->vbox;
|
||||
gtk_container_set_border_width (GTK_CONTAINER (filesel), 10);
|
||||
|
||||
@ -57,7 +57,7 @@ Index: gtk+2.0-2.10.10/gtk/gtkfilesel.c
|
||||
gtk_box_pack_start (GTK_BOX (filesel->main_vbox), pulldown_hbox, FALSE, FALSE, 0);
|
||||
gtk_widget_show (pulldown_hbox);
|
||||
|
||||
@@ -662,14 +664,27 @@
|
||||
@@ -663,14 +665,27 @@ gtk_file_selection_init (GtkFileSelectio
|
||||
|
||||
/* The horizontal box containing the directory and file listboxes */
|
||||
|
||||
@ -87,7 +87,7 @@ Index: gtk+2.0-2.10.10/gtk/gtkfilesel.c
|
||||
if (WANT_HPANED)
|
||||
list_container = g_object_new (GTK_TYPE_HPANED,
|
||||
"visible", TRUE,
|
||||
@@ -681,9 +696,78 @@
|
||||
@@ -682,9 +697,78 @@ gtk_file_selection_init (GtkFileSelectio
|
||||
|
||||
spacer = gtk_hbox_new (FALSE, 0);
|
||||
gtk_widget_set_size_request (spacer, -1, 5);
|
||||
@ -167,7 +167,7 @@ Index: gtk+2.0-2.10.10/gtk/gtkfilesel.c
|
||||
/* The directories list */
|
||||
|
||||
model = gtk_list_store_new (1, G_TYPE_STRING);
|
||||
@@ -756,6 +840,15 @@
|
||||
@@ -757,6 +841,15 @@ gtk_file_selection_init (GtkFileSelectio
|
||||
gtk_widget_show (filesel->file_list);
|
||||
gtk_widget_show (scrolled_win);
|
||||
|
||||
@ -183,7 +183,7 @@ Index: gtk+2.0-2.10.10/gtk/gtkfilesel.c
|
||||
/* action area for packing buttons into. */
|
||||
filesel->action_area = gtk_hbox_new (TRUE, 0);
|
||||
gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->action_area,
|
||||
@@ -1071,39 +1164,94 @@
|
||||
@@ -1012,39 +1105,94 @@ gtk_file_selection_new (const gchar *tit
|
||||
void
|
||||
gtk_file_selection_show_fileop_buttons (GtkFileSelection *filesel)
|
||||
{
|
||||
@ -292,7 +292,7 @@ Index: gtk+2.0-2.10.10/gtk/gtkfilesel.c
|
||||
gtk_widget_show (filesel->fileop_ren_file);
|
||||
}
|
||||
|
||||
@@ -1805,6 +1953,95 @@
|
||||
@@ -1746,6 +1894,95 @@ gtk_file_selection_update_fileops (GtkFi
|
||||
gtk_widget_set_sensitive (fs->fileop_ren_file, sensitive);
|
||||
}
|
||||
|
||||
@ -388,10 +388,10 @@ Index: gtk+2.0-2.10.10/gtk/gtkfilesel.c
|
||||
static gint
|
||||
gtk_file_selection_key_press (GtkWidget *widget,
|
||||
GdkEventKey *event,
|
||||
Index: gtk+2.0-2.10.10/gtk/stock-icons/ximian-icons.h
|
||||
Index: gtk+-2.14.7/gtk/stock-icons/ximian-icons.h
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ gtk+2.0-2.10.10/gtk/stock-icons/ximian-icons.h 2007-03-13 14:10:10.000000000 +0100
|
||||
+++ gtk+-2.14.7/gtk/stock-icons/ximian-icons.h 2009-02-17 23:07:34.887082553 +0100
|
||||
@@ -0,0 +1,825 @@
|
||||
+/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */
|
||||
+
|
||||
|
||||
83
debian/patches/009_gtk-export-filechooser.patch
vendored
83
debian/patches/009_gtk-export-filechooser.patch
vendored
@ -34,22 +34,25 @@
|
||||
|
||||
* tests/autotestfilechooser.c: build with
|
||||
GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
|
||||
--- a/gtk/Makefile.am 2008-04-01 11:10:41.000000000 +0200
|
||||
+++ b/gtk/Makefile.am 2008-04-01 11:10:48.000000000 +0200
|
||||
@@ -37,6 +37,8 @@
|
||||
Index: gtk+2.0-2.14.0/gtk/Makefile.am
|
||||
===================================================================
|
||||
--- gtk+2.0-2.14.0.orig/gtk/Makefile.am 2008-09-04 06:35:27.000000000 +0200
|
||||
+++ gtk+2.0-2.14.0/gtk/Makefile.am 2008-09-05 00:36:25.000000000 +0200
|
||||
@@ -34,6 +34,8 @@
|
||||
-I$(top_srcdir)/gdk \
|
||||
-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \
|
||||
-DGDK_PIXBUF_DISABLE_DEPRECATED \
|
||||
-DGDK_DISABLE_DEPRECATED \
|
||||
+ -DMAEMO_CHANGES \
|
||||
+ -DGTK_FILE_CHOOSER_ENABLE_UNSUPPORTED \
|
||||
-DGTK_DISABLE_DEPRECATED \
|
||||
-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \
|
||||
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
|
||||
$(GTK_DEBUG_FLAGS) \
|
||||
@@ -341,12 +343,15 @@
|
||||
@@ -336,12 +338,16 @@
|
||||
# Installed header files without compatibility guarantees
|
||||
# that are not included in gtk/gtk.h
|
||||
gtk_semi_private_h_sources = \
|
||||
gtktextlayout.h \
|
||||
- gtkfilesystem.h
|
||||
- gtktextlayout.h
|
||||
+ gtktextlayout.h \
|
||||
+ gtkfilesystem.h \
|
||||
+ gtkfilesystemmodel.h \
|
||||
+ gtkfilechooserprivate.h \
|
||||
@ -64,21 +67,23 @@
|
||||
gtksearchenginesimple.h \
|
||||
gtkdndcursors.h \
|
||||
gtkentryprivate.h \
|
||||
@@ -354,10 +359,7 @@
|
||||
@@ -349,11 +355,7 @@
|
||||
gtkfilechooserdefault.h \
|
||||
gtkfilechooserembed.h \
|
||||
gtkfilechooserentry.h \
|
||||
- gtkfilechooserprivate.h \
|
||||
gtkfilechoosersettings.h \
|
||||
- gtkfilechooserutils.h \
|
||||
- gtkfilesystem.h \
|
||||
- gtkfilesystemmodel.h \
|
||||
gtkfilesystemunix.h \
|
||||
gtkhsv.h \
|
||||
gtkiconcache.h \
|
||||
|
||||
--- a/gtk/gtk.symbols 2008-04-01 11:10:41.000000000 +0200
|
||||
+++ b/gtk/gtk.symbols 2008-04-01 11:10:48.000000000 +0200
|
||||
@@ -1416,6 +1416,12 @@
|
||||
gtkintl.h \
|
||||
gtkkeyhash.h \
|
||||
Index: gtk+2.0-2.14.0/gtk/gtk.symbols
|
||||
===================================================================
|
||||
--- gtk+2.0-2.14.0.orig/gtk/gtk.symbols 2008-09-04 06:35:27.000000000 +0200
|
||||
+++ gtk+2.0-2.14.0/gtk/gtk.symbols 2008-09-05 00:36:25.000000000 +0200
|
||||
@@ -1492,6 +1492,12 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@ -91,8 +96,10 @@
|
||||
#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
|
||||
--- a/gtk/gtkfilechooserprivate.h 2008-04-01 11:10:41.000000000 +0200
|
||||
+++ b/gtk/gtkfilechooserprivate.h 2008-04-01 11:10:48.000000000 +0200
|
||||
Index: gtk+2.0-2.14.0/gtk/gtkfilechooserprivate.h
|
||||
===================================================================
|
||||
--- gtk+2.0-2.14.0.orig/gtk/gtkfilechooserprivate.h 2008-09-04 06:35:27.000000000 +0200
|
||||
+++ gtk+2.0-2.14.0/gtk/gtkfilechooserprivate.h 2008-09-05 00:36:25.000000000 +0200
|
||||
@@ -21,6 +21,14 @@
|
||||
#ifndef __GTK_FILE_CHOOSER_PRIVATE_H__
|
||||
#define __GTK_FILE_CHOOSER_PRIVATE_H__
|
||||
@ -108,8 +115,10 @@
|
||||
#include "gtkfilechooser.h"
|
||||
#include "gtkfilesystem.h"
|
||||
#include "gtkfilesystemmodel.h"
|
||||
--- a/gtk/gtkfilechooserutils.c 2008-04-01 11:10:41.000000000 +0200
|
||||
+++ b/gtk/gtkfilechooserutils.c 2008-04-01 11:10:48.000000000 +0200
|
||||
Index: gtk+2.0-2.14.0/gtk/gtkfilechooserutils.c
|
||||
===================================================================
|
||||
--- gtk+2.0-2.14.0.orig/gtk/gtkfilechooserutils.c 2008-09-04 06:35:27.000000000 +0200
|
||||
+++ gtk+2.0-2.14.0/gtk/gtkfilechooserutils.c 2008-09-05 00:36:25.000000000 +0200
|
||||
@@ -119,6 +119,22 @@
|
||||
"do-overwrite-confirmation");
|
||||
}
|
||||
@ -140,8 +149,10 @@
|
||||
+
|
||||
+#define __GTK_FILE_CHOOSER_UTILS_C__
|
||||
+#include "gtkaliasdef.c"
|
||||
--- a/gtk/gtkfilechooserutils.h 2008-04-01 11:10:41.000000000 +0200
|
||||
+++ b/gtk/gtkfilechooserutils.h 2008-04-01 11:10:48.000000000 +0200
|
||||
Index: gtk+2.0-2.14.0/gtk/gtkfilechooserutils.h
|
||||
===================================================================
|
||||
--- gtk+2.0-2.14.0.orig/gtk/gtkfilechooserutils.h 2008-09-04 06:35:27.000000000 +0200
|
||||
+++ gtk+2.0-2.14.0/gtk/gtkfilechooserutils.h 2008-09-05 00:36:25.000000000 +0200
|
||||
@@ -22,6 +22,14 @@
|
||||
#ifndef __GTK_FILE_CHOOSER_UTILS_H__
|
||||
#define __GTK_FILE_CHOOSER_UTILS_H__
|
||||
@ -167,8 +178,10 @@
|
||||
|
||||
void _gtk_file_chooser_delegate_iface_init (GtkFileChooserIface *iface);
|
||||
void _gtk_file_chooser_set_delegate (GtkFileChooser *receiver,
|
||||
--- a/gtk/gtkfilesystemmodel.h 2008-04-01 11:10:41.000000000 +0200
|
||||
+++ b/gtk/gtkfilesystemmodel.h 2008-04-01 11:10:48.000000000 +0200
|
||||
Index: gtk+2.0-2.14.0/gtk/gtkfilesystemmodel.h
|
||||
===================================================================
|
||||
--- gtk+2.0-2.14.0.orig/gtk/gtkfilesystemmodel.h 2008-09-04 06:35:27.000000000 +0200
|
||||
+++ gtk+2.0-2.14.0/gtk/gtkfilesystemmodel.h 2008-09-05 00:36:25.000000000 +0200
|
||||
@@ -21,6 +21,10 @@
|
||||
#ifndef __GTK_FILE_SYSTEM_MODEL_H__
|
||||
#define __GTK_FILE_SYSTEM_MODEL_H__
|
||||
@ -177,21 +190,13 @@
|
||||
+#error "GtkFileSystemModel is not supported API for general use"
|
||||
+#endif
|
||||
+
|
||||
#include <glib-object.h>
|
||||
#include "gtkfilesystem.h"
|
||||
#include <gtk/gtktreemodel.h>
|
||||
--- a/tests/autotestfilechooser.c 2008-04-01 11:10:41.000000000 +0200
|
||||
+++ b/tests/autotestfilechooser.c 2008-04-01 11:10:48.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>
|
||||
--- a/gtk/gtkquery.h 2008-04-01 11:10:41.000000000 +0200
|
||||
+++ b/gtk/gtkquery.h 2008-04-01 11:10:48.000000000 +0200
|
||||
Index: gtk+2.0-2.14.0/gtk/gtkquery.h
|
||||
===================================================================
|
||||
--- gtk+2.0-2.14.0.orig/gtk/gtkquery.h 2008-09-04 06:35:27.000000000 +0200
|
||||
+++ gtk+2.0-2.14.0/gtk/gtkquery.h 2008-09-05 00:36:25.000000000 +0200
|
||||
@@ -23,6 +23,14 @@
|
||||
#ifndef __GTK_QUERY_H__
|
||||
#define __GTK_QUERY_H__
|
||||
@ -207,8 +212,10 @@
|
||||
#include <glib-object.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
--- a/gtk/gtksearchengine.h 2008-04-01 11:10:41.000000000 +0200
|
||||
+++ b/gtk/gtksearchengine.h 2008-04-01 11:10:48.000000000 +0200
|
||||
Index: gtk+2.0-2.14.0/gtk/gtksearchengine.h
|
||||
===================================================================
|
||||
--- gtk+2.0-2.14.0.orig/gtk/gtksearchengine.h 2008-09-04 06:35:28.000000000 +0200
|
||||
+++ gtk+2.0-2.14.0/gtk/gtksearchengine.h 2008-09-05 00:36:25.000000000 +0200
|
||||
@@ -23,6 +23,14 @@
|
||||
#ifndef __GTK_SEARCH_ENGINE_H__
|
||||
#define __GTK_SEARCH_ENGINE_H__
|
||||
@ -221,6 +228,6 @@
|
||||
+#error "gtkfilechooserprivate.h is not supported API for general use"
|
||||
+#endif
|
||||
+
|
||||
#include <glib-object.h>
|
||||
#include "gtkquery.h"
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
21
debian/patches/020_immodules-files-d.patch
vendored
21
debian/patches/020_immodules-files-d.patch
vendored
@ -1,8 +1,8 @@
|
||||
Index: gtk+2.0-2.10.10/gtk/gtkimmodule.c
|
||||
Index: gtk+2.0-2.14.0/gtk/gtkimmodule.c
|
||||
===================================================================
|
||||
--- gtk+2.0-2.10.10.orig/gtk/gtkimmodule.c 2007-03-12 14:51:28.000000000 +0100
|
||||
+++ gtk+2.0-2.10.10/gtk/gtkimmodule.c 2007-03-13 14:10:33.000000000 +0100
|
||||
@@ -59,6 +59,9 @@
|
||||
--- gtk+2.0-2.14.0.orig/gtk/gtkimmodule.c 2008-09-04 06:35:28.000000000 +0200
|
||||
+++ gtk+2.0-2.14.0/gtk/gtkimmodule.c 2008-09-05 00:36:29.000000000 +0200
|
||||
@@ -58,6 +58,9 @@
|
||||
#define GTK_IM_MODULE(im_module) (G_TYPE_CHECK_INSTANCE_CAST ((im_module), GTK_TYPE_IM_MODULE, GtkIMModule))
|
||||
#define GTK_IS_IM_MODULE(im_module) (G_TYPE_CHECK_INSTANCE_TYPE ((im_module), GTK_TYPE_IM_MODULE))
|
||||
|
||||
@ -12,8 +12,8 @@ Index: gtk+2.0-2.10.10/gtk/gtkimmodule.c
|
||||
struct _GtkIMModule
|
||||
{
|
||||
GTypeModule parent_instance;
|
||||
@@ -261,31 +264,15 @@
|
||||
|
||||
@@ -298,19 +301,15 @@
|
||||
}
|
||||
|
||||
static void
|
||||
-gtk_im_module_initialize (void)
|
||||
@ -30,6 +30,13 @@ Index: gtk+2.0-2.10.10/gtk/gtkimmodule.c
|
||||
|
||||
- contexts_hash = g_hash_table_new (g_str_hash, g_str_equal);
|
||||
-
|
||||
#define do_builtin(m) \
|
||||
{ \
|
||||
const GtkIMContextInfo **contexts; \
|
||||
@@ -368,18 +367,6 @@
|
||||
|
||||
#undef do_builtin
|
||||
|
||||
- file = g_fopen (filename, "r");
|
||||
- if (!file)
|
||||
- {
|
||||
@ -45,7 +52,7 @@ Index: gtk+2.0-2.10.10/gtk/gtkimmodule.c
|
||||
while (!have_error && pango_read_line (file, line_buf))
|
||||
{
|
||||
const char *p;
|
||||
@@ -383,10 +370,76 @@
|
||||
@@ -477,10 +464,76 @@
|
||||
else if (module)
|
||||
add_module (module, infos);
|
||||
|
||||
|
||||
133
debian/patches/021_loader-files-d.patch
vendored
133
debian/patches/021_loader-files-d.patch
vendored
@ -1,23 +1,42 @@
|
||||
Index: gtk+-2.12.12/gdk-pixbuf/gdk-pixbuf-io.c
|
||||
Index: gtk+2.0-2.14.2/gdk-pixbuf/Makefile.am
|
||||
===================================================================
|
||||
--- gtk+-2.12.12.orig/gdk-pixbuf/gdk-pixbuf-io.c 2008-09-13 02:00:46.000000000 +0200
|
||||
+++ gtk+-2.12.12/gdk-pixbuf/gdk-pixbuf-io.c 2008-12-09 21:01:23.065715544 +0100
|
||||
@@ -45,6 +45,9 @@
|
||||
#undef STRICT
|
||||
#endif
|
||||
--- gtk+2.0-2.14.2.orig/gdk-pixbuf/Makefile.am 2008-09-18 03:49:27.000000000 +0200
|
||||
+++ gtk+2.0-2.14.2/gdk-pixbuf/Makefile.am 2008-09-18 11:14:51.000000000 +0200
|
||||
@@ -62,6 +62,7 @@
|
||||
libgdk_pixbuf-2.0.la
|
||||
|
||||
loaderdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loaders
|
||||
+loaderfilesdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loader-files.d
|
||||
|
||||
module_libs = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
|
||||
|
||||
@@ -513,7 +514,7 @@
|
||||
$(GDK_PIXBUF_DEP_CFLAGS) \
|
||||
-DGDK_PIXBUF_ENABLE_BACKEND
|
||||
|
||||
-AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
|
||||
+AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DPIXBUF_FILES_LIBDIR=\"$(loaderfilesdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
|
||||
LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
|
||||
|
||||
noinst_PROGRAMS = test-gdk-pixbuf
|
||||
Index: gtk+2.0-2.14.2/gdk-pixbuf/gdk-pixbuf-io.c
|
||||
===================================================================
|
||||
--- gtk+2.0-2.14.2.orig/gdk-pixbuf/gdk-pixbuf-io.c 2008-09-18 11:14:59.000000000 +0200
|
||||
+++ gtk+2.0-2.14.2/gdk-pixbuf/gdk-pixbuf-io.c 2008-09-18 11:15:06.000000000 +0200
|
||||
@@ -51,6 +51,9 @@
|
||||
#define SNIFF_BUFFER_SIZE 4096
|
||||
#define LOAD_BUFFER_SIZE 65536
|
||||
|
||||
+#define LOADERFILEEXT ".loaders"
|
||||
+#define LOADERFILEEXT_LEN ((int) strlen (LOADERFILEEXT))
|
||||
+
|
||||
#ifndef GDK_PIXBUF_USE_GIO_MIME
|
||||
static gint
|
||||
format_check (GdkPixbufModule *module, guchar *buffer, int size)
|
||||
{
|
||||
@@ -289,89 +292,94 @@ static gboolean
|
||||
@@ -310,115 +313,93 @@
|
||||
gdk_pixbuf_load_module_unlocked (GdkPixbufModule *image_module,
|
||||
GError **error);
|
||||
|
||||
-static void
|
||||
-gdk_pixbuf_io_init (void)
|
||||
+/* FIXME this is a static copy of a public pango function which should really
|
||||
+ * livein glib */
|
||||
+static char *
|
||||
@ -41,7 +60,7 @@ Index: gtk+-2.12.12/gdk-pixbuf/gdk-pixbuf-io.c
|
||||
+ * livein glib */
|
||||
+char **
|
||||
+_ugly_copy_of_pango_split_file_list (const char *str)
|
||||
{
|
||||
+{
|
||||
+ int i = 0;
|
||||
+ int j;
|
||||
+ char **files;
|
||||
@ -92,12 +111,13 @@ Index: gtk+-2.12.12/gdk-pixbuf/gdk-pixbuf-io.c
|
||||
+
|
||||
+ return files;
|
||||
+}
|
||||
+
|
||||
static void
|
||||
-gdk_pixbuf_io_init (void)
|
||||
+process_module_file (const gchar *filename, GIOChannel *channel)
|
||||
{
|
||||
#ifdef USE_GMODULE
|
||||
- GIOChannel *channel;
|
||||
+
|
||||
+static void
|
||||
+process_module_file (const gchar *filename, GIOChannel *channel)
|
||||
+{
|
||||
gchar *line_buf;
|
||||
gsize term;
|
||||
GString *tmp_buf = g_string_new (NULL);
|
||||
@ -109,7 +129,12 @@ Index: gtk+-2.12.12/gdk-pixbuf/gdk-pixbuf-io.c
|
||||
GdkPixbufModulePattern *pattern;
|
||||
- GError *error = NULL;
|
||||
-#endif
|
||||
- GdkPixbufModule *builtin_module = NULL;
|
||||
- GdkPixbufModule *builtin_module ;
|
||||
-
|
||||
- /* initialize on separate line to avoid compiler warnings in the
|
||||
- * common case of no compiled-in modules.
|
||||
- */
|
||||
- builtin_module = NULL;
|
||||
-
|
||||
-#define load_one_builtin_module(format) \
|
||||
- builtin_module = g_new0 (GdkPixbufModule, 1); \
|
||||
@ -118,7 +143,7 @@ Index: gtk+-2.12.12/gdk-pixbuf/gdk-pixbuf-io.c
|
||||
- file_formats = g_slist_prepend (file_formats, builtin_module);\
|
||||
- else \
|
||||
- g_free (builtin_module)
|
||||
|
||||
-
|
||||
-#ifdef INCLUDE_ani
|
||||
- load_one_builtin_module (ani);
|
||||
-#endif
|
||||
@ -161,6 +186,28 @@ Index: gtk+-2.12.12/gdk-pixbuf/gdk-pixbuf-io.c
|
||||
-#ifdef INCLUDE_pcx
|
||||
- load_one_builtin_module (pcx);
|
||||
-#endif
|
||||
-#ifdef INCLUDE_icns
|
||||
- load_one_builtin_module (icns);
|
||||
-#endif
|
||||
-#ifdef INCLUDE_jasper
|
||||
- load_one_builtin_module (jasper);
|
||||
-#endif
|
||||
-#ifdef INCLUDE_gdiplus
|
||||
- /* We don't bother having the GDI+ loaders individually selectable
|
||||
- * for building in or not.
|
||||
- */
|
||||
- load_one_builtin_module (ico);
|
||||
- load_one_builtin_module (wmf);
|
||||
- load_one_builtin_module (emf);
|
||||
- load_one_builtin_module (bmp);
|
||||
- load_one_builtin_module (gif);
|
||||
- load_one_builtin_module (jpeg);
|
||||
- load_one_builtin_module (tiff);
|
||||
-#endif
|
||||
-#ifdef INCLUDE_gdip_png
|
||||
- /* Except the gdip-png loader which normally isn't built at all even */
|
||||
- load_one_builtin_module (png);
|
||||
-#endif
|
||||
-
|
||||
-#undef load_one_builtin_module
|
||||
-
|
||||
@ -175,19 +222,18 @@ Index: gtk+-2.12.12/gdk-pixbuf/gdk-pixbuf-io.c
|
||||
- g_free (filename);
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
|
||||
while (!have_error && g_io_channel_read_line (channel, &line_buf, NULL, &term, NULL) == G_IO_STATUS_NORMAL) {
|
||||
const char *p;
|
||||
|
||||
@@ -508,8 +516,134 @@ gdk_pixbuf_io_init (void)
|
||||
@@ -556,8 +537,156 @@
|
||||
g_free (line_buf);
|
||||
}
|
||||
g_string_free (tmp_buf, TRUE);
|
||||
- g_io_channel_unref (channel);
|
||||
- g_free (filename);
|
||||
+#endif /* USE_GMODULE */
|
||||
+}
|
||||
+
|
||||
+#endif /* USE_GMODULE */
|
||||
+
|
||||
+static void
|
||||
+gdk_pixbuf_io_init (void)
|
||||
@ -205,7 +251,7 @@ Index: gtk+-2.12.12/gdk-pixbuf/gdk-pixbuf-io.c
|
||||
+#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)) \
|
||||
+ if (gdk_pixbuf_load_module_unlocked (builtin_module, NULL)) \
|
||||
+ file_formats = g_slist_prepend (file_formats, builtin_module);\
|
||||
+ else \
|
||||
+ g_free (builtin_module)
|
||||
@ -252,6 +298,28 @@ Index: gtk+-2.12.12/gdk-pixbuf/gdk-pixbuf-io.c
|
||||
+#ifdef INCLUDE_pcx
|
||||
+ load_one_builtin_module (pcx);
|
||||
+#endif
|
||||
+#ifdef INCLUDE_icns
|
||||
+ load_one_builtin_module (icns);
|
||||
+#endif
|
||||
+#ifdef INCLUDE_jasper
|
||||
+ load_one_builtin_module (jasper);
|
||||
+#endif
|
||||
+#ifdef INCLUDE_gdiplus
|
||||
+ /* We don't bother having the GDI+ loaders individually selectable
|
||||
+ * for building in or not.
|
||||
+ */
|
||||
+ load_one_builtin_module (ico);
|
||||
+ load_one_builtin_module (wmf);
|
||||
+ load_one_builtin_module (emf);
|
||||
+ load_one_builtin_module (bmp);
|
||||
+ load_one_builtin_module (gif);
|
||||
+ load_one_builtin_module (jpeg);
|
||||
+ load_one_builtin_module (tiff);
|
||||
+#endif
|
||||
+#ifdef INCLUDE_gdip_png
|
||||
+ /* Except the gdip-png loader which normally isn't built at all even */
|
||||
+ load_one_builtin_module (png);
|
||||
+#endif
|
||||
+
|
||||
+#undef load_one_builtin_module
|
||||
+
|
||||
@ -316,24 +384,3 @@ Index: gtk+-2.12.12/gdk-pixbuf/gdk-pixbuf-io.c
|
||||
#endif
|
||||
}
|
||||
|
||||
Index: gtk+-2.12.12/gdk-pixbuf/Makefile.am
|
||||
===================================================================
|
||||
--- gtk+-2.12.12.orig/gdk-pixbuf/Makefile.am 2008-09-13 02:00:46.000000000 +0200
|
||||
+++ gtk+-2.12.12/gdk-pixbuf/Makefile.am 2008-12-09 20:54:01.889718455 +0100
|
||||
@@ -59,6 +59,7 @@ lib_LTLIBRARIES = \
|
||||
libgdk_pixbuf-2.0.la
|
||||
|
||||
loaderdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loaders
|
||||
+loaderfilesdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loader-files.d
|
||||
|
||||
module_libs = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
|
||||
|
||||
@@ -319,7 +320,7 @@ INCLUDES = \
|
||||
$(GDK_PIXBUF_DEP_CFLAGS) \
|
||||
-DGDK_PIXBUF_ENABLE_BACKEND
|
||||
|
||||
-AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
|
||||
+AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DPIXBUF_FILES_LIBDIR=\"$(loaderfilesdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
|
||||
LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GLIB_LIBS)
|
||||
|
||||
noinst_PROGRAMS = test-gdk-pixbuf
|
||||
|
||||
904
debian/patches/032_gdkwindowimpl_directfb.patch
vendored
Normal file
904
debian/patches/032_gdkwindowimpl_directfb.patch
vendored
Normal file
@ -0,0 +1,904 @@
|
||||
Patch from Sven Neumann to fix DirectFB support for GTK+ 2.14.
|
||||
Based on the original Ubuntu patch for 2.12.
|
||||
|
||||
GNOME #554407
|
||||
Upstream svn r22358,r22381,r22383,r22385
|
||||
|
||||
Index: gtk+-2.14.7/gdk/directfb/gdkgeometry-directfb.c
|
||||
===================================================================
|
||||
--- gtk+-2.14.7.orig/gdk/directfb/gdkgeometry-directfb.c 2009-02-21 14:15:18.127086939 +0100
|
||||
+++ gtk+-2.14.7/gdk/directfb/gdkgeometry-directfb.c 2009-02-21 14:15:20.018583625 +0100
|
||||
@@ -41,9 +41,9 @@
|
||||
|
||||
|
||||
void
|
||||
-_gdk_windowing_window_get_offsets (GdkWindow *window,
|
||||
- gint *x_offset,
|
||||
- gint *y_offset)
|
||||
+_gdk_directfb_window_get_offsets (GdkWindow *window,
|
||||
+ gint *x_offset,
|
||||
+ gint *y_offset)
|
||||
{
|
||||
if (x_offset)
|
||||
*x_offset = 0;
|
||||
@@ -69,9 +69,9 @@ _gdk_windowing_window_queue_antiexpose (
|
||||
* brings in from offscreen areas are invalidated.
|
||||
**/
|
||||
void
|
||||
-gdk_window_scroll (GdkWindow *window,
|
||||
- gint dx,
|
||||
- gint dy)
|
||||
+_gdk_directfb_window_scroll (GdkWindow *window,
|
||||
+ gint dx,
|
||||
+ gint dy)
|
||||
{
|
||||
GdkWindowObject *private;
|
||||
GdkDrawableImplDirectFB *impl;
|
||||
@@ -161,10 +161,10 @@ gdk_window_scroll (GdkWindow *window,
|
||||
* Since: 2.8
|
||||
**/
|
||||
void
|
||||
-gdk_window_move_region (GdkWindow *window,
|
||||
- const GdkRegion *region,
|
||||
- gint dx,
|
||||
- gint dy)
|
||||
+_gdk_directfb_window_move_region (GdkWindow *window,
|
||||
+ const GdkRegion *region,
|
||||
+ gint dx,
|
||||
+ gint dy)
|
||||
{
|
||||
GdkWindowObject *private;
|
||||
GdkDrawableImplDirectFB *impl;
|
||||
Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c
|
||||
===================================================================
|
||||
--- gtk+-2.14.7.orig/gdk/directfb/gdkwindow-directfb.c 2009-02-21 14:15:18.091090046 +0100
|
||||
+++ gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c 2009-02-21 14:54:17.138584001 +0100
|
||||
@@ -33,6 +33,7 @@
|
||||
|
||||
#include "config.h"
|
||||
#include "gdk.h"
|
||||
+#include "gdkwindowimpl.h"
|
||||
#include "gdkwindow.h"
|
||||
|
||||
#include "gdkdirectfb.h"
|
||||
@@ -67,6 +68,9 @@ static void gdk_window_impl_directfb_ini
|
||||
static void gdk_window_impl_directfb_class_init (GdkWindowImplDirectFBClass *klass);
|
||||
static void gdk_window_impl_directfb_finalize (GObject *object);
|
||||
|
||||
+static void gdk_window_impl_iface_init (GdkWindowImplIface *iface);
|
||||
+
|
||||
+
|
||||
typedef struct
|
||||
{
|
||||
GdkWindowChildChanged changed;
|
||||
@@ -98,9 +102,8 @@ gdk_window_directfb_process_all_updates
|
||||
tmp_list = old_update_windows;
|
||||
while (tmp_list)
|
||||
{
|
||||
- GdkWindowObject *private = GDK_WINDOW_OBJECT( tmp_list->data );
|
||||
- GdkWindowImplDirectFB *wimpl = GDK_WINDOW_IMPL_DIRECTFB( private->impl );
|
||||
-
|
||||
+ GdkWindowObject *private = GDK_WINDOW_OBJECT( tmp_list->data );
|
||||
+
|
||||
if (private->update_freeze_count)
|
||||
{
|
||||
D_DEBUG_AT( GDKDFB_Updates, " -> %p frozen [%4d,%4d-%4dx%4d] (%d boxes)\n",
|
||||
@@ -115,7 +118,7 @@ gdk_window_directfb_process_all_updates
|
||||
wimpl->flips.num_regions );
|
||||
gdk_window_process_updates(tmp_list->data,TRUE);
|
||||
}
|
||||
-
|
||||
+
|
||||
g_object_unref (tmp_list->data);
|
||||
tmp_list = tmp_list->next;
|
||||
}
|
||||
@@ -220,6 +223,13 @@ gdk_window_impl_directfb_get_type (void)
|
||||
NULL
|
||||
};
|
||||
|
||||
+ const GInterfaceInfo window_impl_info =
|
||||
+ {
|
||||
+ (GInterfaceInitFunc) gdk_window_impl_iface_init,
|
||||
+ NULL,
|
||||
+ NULL
|
||||
+ };
|
||||
+
|
||||
object_type = g_type_register_static (GDK_TYPE_DRAWABLE_IMPL_DIRECTFB,
|
||||
"GdkWindowImplDirectFB",
|
||||
&object_info, 0);
|
||||
@@ -227,6 +237,9 @@ gdk_window_impl_directfb_get_type (void)
|
||||
GDK_TYPE_PAINTABLE,
|
||||
&paintable_info);
|
||||
|
||||
+ g_type_add_interface_static (object_type,
|
||||
+ GDK_TYPE_WINDOW_IMPL,
|
||||
+ &window_impl_info);
|
||||
}
|
||||
|
||||
return object_type;
|
||||
@@ -401,11 +414,11 @@ _gdk_windowing_window_init (void)
|
||||
|
||||
g_assert (_gdk_parent_root == NULL);
|
||||
|
||||
- _gdk_display->layer->GetConfiguration(
|
||||
- _gdk_display->layer, &dlc );
|
||||
+ _gdk_display->layer->GetConfiguration (_gdk_display->layer, &dlc);
|
||||
|
||||
_gdk_parent_root = g_object_new (GDK_TYPE_WINDOW, NULL);
|
||||
private = GDK_WINDOW_OBJECT (_gdk_parent_root);
|
||||
+ private->impl = g_object_new (_gdk_window_impl_get_type (), NULL);
|
||||
impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
|
||||
|
||||
private->window_type = GDK_WINDOW_ROOT;
|
||||
@@ -647,8 +660,8 @@ gdk_directfb_window_new (GdkWindow
|
||||
|
||||
GdkWindow *
|
||||
_gdk_window_new (GdkWindow *parent,
|
||||
- GdkWindowAttr *attributes,
|
||||
- gint attributes_mask)
|
||||
+ GdkWindowAttr *attributes,
|
||||
+ gint attributes_mask)
|
||||
{
|
||||
g_return_val_if_fail (attributes != NULL, NULL);
|
||||
|
||||
@@ -1230,28 +1243,19 @@ show_window_internal (GdkWindow *window,
|
||||
}
|
||||
}
|
||||
|
||||
-void
|
||||
-gdk_window_show_unraised (GdkWindow *window)
|
||||
-{
|
||||
- g_return_if_fail (GDK_IS_WINDOW (window));
|
||||
-
|
||||
- D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", __FUNCTION__, window );
|
||||
-
|
||||
- show_window_internal (window, FALSE);
|
||||
-}
|
||||
-
|
||||
-void
|
||||
-gdk_window_show (GdkWindow *window)
|
||||
+static void
|
||||
+gdk_directfb_window_show (GdkWindow *window,
|
||||
+ gboolean raise)
|
||||
{
|
||||
g_return_if_fail (GDK_IS_WINDOW (window));
|
||||
|
||||
D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", __FUNCTION__, window );
|
||||
|
||||
- show_window_internal (window, TRUE);
|
||||
+ show_window_internal (window, raise);
|
||||
}
|
||||
|
||||
-void
|
||||
-gdk_window_hide (GdkWindow *window)
|
||||
+static void
|
||||
+gdk_directfb_window_hide (GdkWindow *window)
|
||||
{
|
||||
GdkWindowObject *private;
|
||||
GdkWindowImplDirectFB *impl;
|
||||
@@ -1276,11 +1280,11 @@ gdk_window_hide (GdkWindow *window)
|
||||
|
||||
if (!private->input_only && private->parent)
|
||||
{
|
||||
- _gdk_windowing_window_clear_area (GDK_WINDOW (private->parent),
|
||||
- private->x,
|
||||
- private->y,
|
||||
- impl->drawable.width,
|
||||
- impl->drawable.height);
|
||||
+ gdk_window_clear_area (GDK_WINDOW (private->parent),
|
||||
+ private->x,
|
||||
+ private->y,
|
||||
+ impl->drawable.width,
|
||||
+ impl->drawable.height);
|
||||
}
|
||||
|
||||
event_win = gdk_directfb_other_event_window (window, GDK_UNMAP);
|
||||
@@ -1299,8 +1303,8 @@ gdk_window_hide (GdkWindow *window)
|
||||
}
|
||||
}
|
||||
|
||||
-void
|
||||
-gdk_window_withdraw (GdkWindow *window)
|
||||
+static void
|
||||
+gdk_directfb_window_withdraw (GdkWindow *window)
|
||||
{
|
||||
g_return_if_fail (GDK_IS_WINDOW (window));
|
||||
|
||||
@@ -1309,80 +1313,6 @@ gdk_window_withdraw (GdkWindow *window)
|
||||
}
|
||||
|
||||
void
|
||||
-gdk_window_move (GdkWindow *window,
|
||||
- gint x,
|
||||
- gint y)
|
||||
-{
|
||||
- GdkWindowObject *private;
|
||||
- GdkWindowImplDirectFB *impl;
|
||||
-
|
||||
- g_return_if_fail (GDK_IS_WINDOW (window));
|
||||
-
|
||||
- private = GDK_WINDOW_OBJECT (window);
|
||||
- impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
|
||||
-
|
||||
- if (impl->window)
|
||||
- {
|
||||
- private->x = x;
|
||||
- private->y = y;
|
||||
- impl->window->MoveTo (impl->window, x, y);
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- gint width=impl->drawable.width;
|
||||
- gint height=impl->drawable.height;
|
||||
- GdkRectangle old =
|
||||
- { private->x, private->y,width,height };
|
||||
-
|
||||
- _gdk_directfb_move_resize_child (window, x, y, width, height);
|
||||
- _gdk_directfb_calc_abs (window);
|
||||
-
|
||||
- if (GDK_WINDOW_IS_MAPPED (private))
|
||||
- {
|
||||
- GdkWindow *mousewin;
|
||||
- GdkRectangle new = { x, y, width, height };
|
||||
-
|
||||
- gdk_rectangle_union (&new, &old, &new);
|
||||
- gdk_window_invalidate_rect (GDK_WINDOW (private->parent), &new,TRUE);
|
||||
-
|
||||
- /* The window the pointer is in might have changed */
|
||||
- mousewin = gdk_window_at_pointer (NULL, NULL);
|
||||
- gdk_directfb_window_send_crossing_events (NULL, mousewin,
|
||||
- GDK_CROSSING_NORMAL);
|
||||
- }
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-void
|
||||
-gdk_window_resize (GdkWindow *window,
|
||||
- gint width,
|
||||
- gint height)
|
||||
-{
|
||||
- GdkWindowObject *private;
|
||||
- gint x, y;
|
||||
-
|
||||
- g_return_if_fail (GDK_IS_WINDOW (window));
|
||||
-
|
||||
- private = GDK_WINDOW_OBJECT (window);
|
||||
-
|
||||
- x = private->x;
|
||||
- y = private->y;
|
||||
-
|
||||
- if (private->parent && (private->parent->window_type != GDK_WINDOW_CHILD))
|
||||
- {
|
||||
- GdkWindowChildHandlerData *data;
|
||||
-
|
||||
- data = g_object_get_data (G_OBJECT (private->parent),
|
||||
- "gdk-window-child-handler");
|
||||
-
|
||||
- if (data)
|
||||
- (*data->get_pos) (window, &x, &y, data->user_data);
|
||||
- }
|
||||
-
|
||||
- gdk_window_move_resize (window, x, y, width, height);
|
||||
-}
|
||||
-
|
||||
-void
|
||||
_gdk_directfb_move_resize_child (GdkWindow *window,
|
||||
gint x,
|
||||
gint y,
|
||||
@@ -1407,15 +1337,17 @@ _gdk_directfb_move_resize_child (GdkWind
|
||||
|
||||
if (!private->input_only)
|
||||
{
|
||||
- if (impl->drawable.surface) {
|
||||
- GdkDrawableImplDirectFB *dimpl = GDK_DRAWABLE_IMPL_DIRECTFB (private->impl);
|
||||
- if(dimpl->cairo_surface) {
|
||||
- cairo_surface_destroy(dimpl->cairo_surface);
|
||||
- dimpl->cairo_surface= NULL;
|
||||
- }
|
||||
- impl->drawable.surface->Release (impl->drawable.surface);
|
||||
- impl->drawable.surface = NULL;
|
||||
- }
|
||||
+ if (impl->drawable.surface)
|
||||
+ {
|
||||
+ if (impl->drawable.cairo_surface)
|
||||
+ {
|
||||
+ cairo_surface_destroy (impl->drawable.cairo_surface);
|
||||
+ impl->drawable.cairo_surface = NULL;
|
||||
+ }
|
||||
+
|
||||
+ impl->drawable.surface->Release (impl->drawable.surface);
|
||||
+ impl->drawable.surface = NULL;
|
||||
+ }
|
||||
|
||||
parent_impl = GDK_WINDOW_IMPL_DIRECTFB (GDK_WINDOW_OBJECT (private->parent)->impl);
|
||||
|
||||
@@ -1432,19 +1364,66 @@ _gdk_directfb_move_resize_child (GdkWind
|
||||
for (list = private->children; list; list = list->next)
|
||||
{
|
||||
private = GDK_WINDOW_OBJECT (list->data);
|
||||
- impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
|
||||
+ impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
|
||||
+
|
||||
_gdk_directfb_move_resize_child (list->data,
|
||||
private->x, private->y,
|
||||
impl->drawable.width, impl->drawable.height);
|
||||
}
|
||||
}
|
||||
|
||||
-void
|
||||
-gdk_window_move_resize (GdkWindow *window,
|
||||
- gint x,
|
||||
- gint y,
|
||||
- gint width,
|
||||
- gint height)
|
||||
+static void
|
||||
+gdk_directfb_window_move (GdkWindow *window,
|
||||
+ gint x,
|
||||
+ gint y)
|
||||
+{
|
||||
+ GdkWindowObject *private;
|
||||
+ GdkWindowImplDirectFB *impl;
|
||||
+
|
||||
+ g_return_if_fail (GDK_IS_WINDOW (window));
|
||||
+
|
||||
+ private = GDK_WINDOW_OBJECT (window);
|
||||
+ impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
|
||||
+
|
||||
+ if (impl->window)
|
||||
+ {
|
||||
+ private->x = x;
|
||||
+ private->y = y;
|
||||
+ impl->window->MoveTo (impl->window, x, y);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ gint width=impl->drawable.width;
|
||||
+ gint height=impl->drawable.height;
|
||||
+ GdkRectangle old =
|
||||
+ { private->x, private->y,width,height };
|
||||
+
|
||||
+ _gdk_directfb_move_resize_child (window, x, y, width, height);
|
||||
+ _gdk_directfb_calc_abs (window);
|
||||
+
|
||||
+ if (GDK_WINDOW_IS_MAPPED (private))
|
||||
+ {
|
||||
+ GdkWindow *mousewin;
|
||||
+ GdkRectangle new = { x, y, width, height };
|
||||
+
|
||||
+ gdk_rectangle_union (&new, &old, &new);
|
||||
+ gdk_window_invalidate_rect (GDK_WINDOW (private->parent), &new,TRUE);
|
||||
+
|
||||
+ /* The window the pointer is in might have changed */
|
||||
+ mousewin = gdk_window_at_pointer (NULL, NULL);
|
||||
+ gdk_directfb_window_send_crossing_events (NULL, mousewin,
|
||||
+ GDK_CROSSING_NORMAL);
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static void
|
||||
+gdk_directfb_window_move_resize (GdkWindow *window,
|
||||
+ gboolean with_move,
|
||||
+ gint x,
|
||||
+ gint y,
|
||||
+ gint width,
|
||||
+ gint height)
|
||||
{
|
||||
GdkWindowObject *private;
|
||||
GdkWindowImplDirectFB *impl;
|
||||
@@ -1454,8 +1433,14 @@ gdk_window_move_resize (GdkWindow *windo
|
||||
private = GDK_WINDOW_OBJECT (window);
|
||||
impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
|
||||
|
||||
+ if (with_move && (width < 0 && height < 0))
|
||||
+ {
|
||||
+ gdk_directfb_window_move (window, x, y);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
if (width < 1)
|
||||
- width = 1;
|
||||
+ width = 1;
|
||||
if (height < 1)
|
||||
height = 1;
|
||||
|
||||
@@ -1478,26 +1463,39 @@ gdk_window_move_resize (GdkWindow *windo
|
||||
|
||||
if (impl->drawable.width == width && impl->drawable.height == height)
|
||||
{
|
||||
- gdk_window_move (window, x, y);
|
||||
+ if (with_move)
|
||||
+ gdk_directfb_window_move (window, x, y);
|
||||
}
|
||||
else if (impl->window)
|
||||
{
|
||||
- private->x = x;
|
||||
- private->y = y;
|
||||
- impl->window->MoveTo (impl->window, x, y);
|
||||
+ private->x = x;
|
||||
+ private->y = y;
|
||||
+ impl->drawable.width = width;
|
||||
+ impl->drawable.height = height;
|
||||
+
|
||||
+ if (with_move)
|
||||
+ impl->window->MoveTo (impl->window, x, y);
|
||||
impl->window->Resize (impl->window, width, height);
|
||||
}
|
||||
else
|
||||
{
|
||||
- GdkRectangle old =
|
||||
- { private->x, private->y, impl->drawable.width, impl->drawable.height };
|
||||
- _gdk_directfb_move_resize_child (window, x, y, width, height);
|
||||
+ GdkRectangle old = { private->x, private->y,
|
||||
+ impl->drawable.width, impl->drawable.height };
|
||||
+ GdkRectangle new = { x, y, width, height };
|
||||
+
|
||||
+ if (! with_move)
|
||||
+ {
|
||||
+ new.x = private->x;
|
||||
+ new.y = private->y;
|
||||
+ }
|
||||
+
|
||||
+ _gdk_directfb_move_resize_child (window,
|
||||
+ new.x, new.y, new.width, new.height);
|
||||
_gdk_directfb_calc_abs (window);
|
||||
|
||||
if (GDK_WINDOW_IS_MAPPED (private))
|
||||
{
|
||||
- GdkWindow *mousewin;
|
||||
- GdkRectangle new = { x, y, width, height };
|
||||
+ GdkWindow *mousewin;
|
||||
|
||||
gdk_rectangle_union (&new, &old, &new);
|
||||
gdk_window_invalidate_rect (GDK_WINDOW (private->parent), &new,TRUE);
|
||||
@@ -1510,11 +1508,11 @@ gdk_window_move_resize (GdkWindow *windo
|
||||
}
|
||||
}
|
||||
|
||||
-void
|
||||
-_gdk_window_reparent (GdkWindow *window,
|
||||
- GdkWindow *new_parent,
|
||||
- gint x,
|
||||
- gint y)
|
||||
+static gboolean
|
||||
+gdk_directfb_window_reparent (GdkWindow *window,
|
||||
+ GdkWindow *new_parent,
|
||||
+ gint x,
|
||||
+ gint y)
|
||||
{
|
||||
GdkWindowObject *window_private;
|
||||
GdkWindowObject *parent_private;
|
||||
@@ -1523,10 +1521,10 @@ _gdk_window_reparent (GdkWindow *window,
|
||||
GdkWindowImplDirectFB *parent_impl;
|
||||
GdkVisual *visual;
|
||||
|
||||
- g_return_if_fail (GDK_IS_WINDOW (window));
|
||||
+ g_return_val_if_fail (GDK_IS_WINDOW (window), FALSE);
|
||||
|
||||
if (GDK_WINDOW_DESTROYED (window))
|
||||
- return;
|
||||
+ return FALSE;
|
||||
|
||||
if (!new_parent)
|
||||
new_parent = _gdk_parent_root;
|
||||
@@ -1539,7 +1537,7 @@ _gdk_window_reparent (GdkWindow *window,
|
||||
|
||||
/* already parented */
|
||||
if( window_private->parent == (GdkWindowObject *)new_parent )
|
||||
- return;
|
||||
+ return FALSE;
|
||||
|
||||
window_private->parent = (GdkWindowObject *) new_parent;
|
||||
|
||||
@@ -1593,7 +1591,7 @@ _gdk_window_reparent (GdkWindow *window,
|
||||
{
|
||||
g_assert(0);
|
||||
_gdk_window_destroy (window, FALSE);
|
||||
- return;
|
||||
+ return FALSE;
|
||||
}
|
||||
/* we hold a reference count on ourselves */
|
||||
g_object_ref (window);
|
||||
@@ -1609,14 +1607,17 @@ _gdk_window_reparent (GdkWindow *window,
|
||||
&rect,
|
||||
&impl->drawable.surface);
|
||||
}
|
||||
+
|
||||
+ return TRUE;
|
||||
}
|
||||
|
||||
-void
|
||||
-_gdk_windowing_window_clear_area (GdkWindow *window,
|
||||
- gint x,
|
||||
- gint y,
|
||||
- gint width,
|
||||
- gint height)
|
||||
+static void
|
||||
+gdk_directfb_window_clear_area (GdkWindow *window,
|
||||
+ gint x,
|
||||
+ gint y,
|
||||
+ gint width,
|
||||
+ gint height,
|
||||
+ gboolean send_expose)
|
||||
{
|
||||
GdkWindowObject *private;
|
||||
GdkDrawableImplDirectFB *impl;
|
||||
@@ -1700,51 +1701,8 @@ _gdk_windowing_window_clear_area (GdkWin
|
||||
g_object_unref (gc);
|
||||
}
|
||||
|
||||
-void
|
||||
-_gdk_windowing_window_clear_area_e (GdkWindow *window,
|
||||
- gint x,
|
||||
- gint y,
|
||||
- gint width,
|
||||
- gint height)
|
||||
-{
|
||||
- GdkRectangle rect;
|
||||
- GdkWindowObject *private;
|
||||
- GdkWindowImplDirectFB *impl;
|
||||
-
|
||||
- D_DEBUG_AT( GDKDFB_Window, "%s( %p, %4d,%4d-%4dx%4d )\n", __FUNCTION__, window, x, y, width, height );
|
||||
-
|
||||
- g_return_if_fail (GDK_IS_WINDOW (window));
|
||||
-
|
||||
- private = GDK_WINDOW_OBJECT (window);
|
||||
- impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
|
||||
-
|
||||
- /**
|
||||
- Follow XClearArea definition for zero height width
|
||||
- **/
|
||||
- if( width == 0 )
|
||||
- width = impl->drawable.width-x;
|
||||
- if( height == 0 )
|
||||
- height = impl->drawable.height-y;
|
||||
-
|
||||
- rect.x = x;
|
||||
- rect.y = y;
|
||||
- rect.width = width;
|
||||
- rect.height = height;
|
||||
-
|
||||
- g_return_if_fail (GDK_IS_WINDOW (window));
|
||||
-
|
||||
- if (GDK_WINDOW_DESTROYED (window)) {
|
||||
- D_DEBUG_AT( GDKDFB_Window, " -> DESTROYED!\n" );
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- _gdk_windowing_window_clear_area (window, x, y, width, height);
|
||||
-
|
||||
- gdk_window_invalidate_rect (window, &rect, TRUE);
|
||||
-}
|
||||
-
|
||||
-void
|
||||
-gdk_window_raise (GdkWindow *window)
|
||||
+static void
|
||||
+gdk_window_directfb_raise (GdkWindow *window)
|
||||
{
|
||||
GdkWindowImplDirectFB *impl;
|
||||
|
||||
@@ -1774,8 +1732,8 @@ gdk_window_raise (GdkWindow *window)
|
||||
}
|
||||
}
|
||||
|
||||
-void
|
||||
-gdk_window_lower (GdkWindow *window)
|
||||
+static void
|
||||
+gdk_window_directfb_lower (GdkWindow *window)
|
||||
{
|
||||
GdkWindowImplDirectFB *impl;
|
||||
|
||||
@@ -1875,9 +1833,9 @@ gdk_window_set_role (GdkWindow *window
|
||||
* Since: 2.12
|
||||
*
|
||||
**/
|
||||
-void
|
||||
+void
|
||||
gdk_window_set_startup_id (GdkWindow *window,
|
||||
- const gchar *startup_id)
|
||||
+ const gchar *startup_id)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -1907,9 +1865,9 @@ gdk_window_set_transient_for (GdkWindow
|
||||
root->children = g_list_insert (root->children, window, i);
|
||||
}
|
||||
|
||||
-void
|
||||
-gdk_window_set_background (GdkWindow *window,
|
||||
- const GdkColor *color)
|
||||
+static void
|
||||
+gdk_directfb_window_set_background (GdkWindow *window,
|
||||
+ const GdkColor *color)
|
||||
{
|
||||
GdkWindowObject *private;
|
||||
|
||||
@@ -1930,10 +1888,10 @@ gdk_window_set_background (GdkWindow *wi
|
||||
private->bg_pixmap = NULL;
|
||||
}
|
||||
|
||||
-void
|
||||
-gdk_window_set_back_pixmap (GdkWindow *window,
|
||||
- GdkPixmap *pixmap,
|
||||
- gint parent_relative)
|
||||
+static void
|
||||
+gdk_directfb_window_set_back_pixmap (GdkWindow *window,
|
||||
+ GdkPixmap *pixmap,
|
||||
+ gboolean parent_relative)
|
||||
{
|
||||
GdkWindowObject *private;
|
||||
GdkPixmap *old_pixmap;
|
||||
@@ -1972,9 +1930,9 @@ gdk_window_set_back_pixmap (GdkWindow *w
|
||||
}
|
||||
}
|
||||
|
||||
-void
|
||||
-gdk_window_set_cursor (GdkWindow *window,
|
||||
- GdkCursor *cursor)
|
||||
+static void
|
||||
+gdk_directfb_window_set_cursor (GdkWindow *window,
|
||||
+ GdkCursor *cursor)
|
||||
{
|
||||
GdkWindowImplDirectFB *impl;
|
||||
GdkCursor *old_cursor;
|
||||
@@ -2011,13 +1969,13 @@ gdk_window_set_cursor (GdkWindow *window
|
||||
gdk_cursor_unref (old_cursor);
|
||||
}
|
||||
|
||||
-void
|
||||
-gdk_window_get_geometry (GdkWindow *window,
|
||||
- gint *x,
|
||||
- gint *y,
|
||||
- gint *width,
|
||||
- gint *height,
|
||||
- gint *depth)
|
||||
+static void
|
||||
+gdk_directfb_window_get_geometry (GdkWindow *window,
|
||||
+ gint *x,
|
||||
+ gint *y,
|
||||
+ gint *width,
|
||||
+ gint *height,
|
||||
+ gint *depth)
|
||||
{
|
||||
GdkWindowObject *private;
|
||||
GdkDrawableImplDirectFB *impl;
|
||||
@@ -2078,10 +2036,10 @@ _gdk_directfb_calc_abs (GdkWindow *windo
|
||||
}
|
||||
}
|
||||
|
||||
-gboolean
|
||||
-gdk_window_get_origin (GdkWindow *window,
|
||||
- gint *x,
|
||||
- gint *y)
|
||||
+static gboolean
|
||||
+gdk_directfb_window_get_origin (GdkWindow *window,
|
||||
+ gint *x,
|
||||
+ gint *y)
|
||||
{
|
||||
g_return_val_if_fail (GDK_IS_WINDOW (window), FALSE);
|
||||
|
||||
@@ -2215,8 +2173,8 @@ _gdk_windowing_window_get_pointer (displ
|
||||
|
||||
}
|
||||
|
||||
-GdkEventMask
|
||||
-gdk_window_get_events (GdkWindow *window)
|
||||
+static GdkEventMask
|
||||
+gdk_directfb_window_get_events (GdkWindow *window)
|
||||
{
|
||||
g_return_val_if_fail (GDK_IS_WINDOW (window), 0);
|
||||
|
||||
@@ -2226,9 +2184,9 @@ gdk_window_get_events (GdkWindow *window
|
||||
return GDK_WINDOW_OBJECT (window)->event_mask;
|
||||
}
|
||||
|
||||
-void
|
||||
-gdk_window_set_events (GdkWindow *window,
|
||||
- GdkEventMask event_mask)
|
||||
+static void
|
||||
+gdk_directfb_window_set_events (GdkWindow *window,
|
||||
+ GdkEventMask event_mask)
|
||||
{
|
||||
g_return_if_fail (GDK_IS_WINDOW (window));
|
||||
|
||||
@@ -2240,27 +2198,27 @@ gdk_window_set_events (GdkWindow *win
|
||||
GDK_WINDOW_OBJECT (window)->event_mask = event_mask;
|
||||
}
|
||||
|
||||
-void
|
||||
-gdk_window_shape_combine_mask (GdkWindow *window,
|
||||
- GdkBitmap *mask,
|
||||
- gint x,
|
||||
- gint y)
|
||||
+static void
|
||||
+gdk_directfb_window_shape_combine_mask (GdkWindow *window,
|
||||
+ GdkBitmap *mask,
|
||||
+ gint x,
|
||||
+ gint y)
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
gdk_window_input_shape_combine_mask (GdkWindow *window,
|
||||
- GdkBitmap *mask,
|
||||
- gint x,
|
||||
- gint y)
|
||||
+ GdkBitmap *mask,
|
||||
+ gint x,
|
||||
+ gint y)
|
||||
{
|
||||
}
|
||||
|
||||
-void
|
||||
-gdk_window_shape_combine_region (GdkWindow *window,
|
||||
- const GdkRegion *shape_region,
|
||||
- gint offset_x,
|
||||
- gint offset_y)
|
||||
+static void
|
||||
+gdk_directfb_window_shape_combine_region (GdkWindow *window,
|
||||
+ const GdkRegion *shape_region,
|
||||
+ gint offset_x,
|
||||
+ gint offset_y)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -2584,13 +2542,13 @@ gdk_window_set_functions (GdkWindow
|
||||
g_message("unimplemented %s", __FUNCTION__);
|
||||
}
|
||||
|
||||
-void
|
||||
-gdk_window_set_child_shapes (GdkWindow *window)
|
||||
+static void
|
||||
+gdk_directfb_window_set_child_shapes (GdkWindow *window)
|
||||
{
|
||||
}
|
||||
|
||||
-void
|
||||
-gdk_window_merge_child_shapes (GdkWindow *window)
|
||||
+static void
|
||||
+gdk_directfb_window_merge_child_shapes (GdkWindow *window)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -2604,9 +2562,9 @@ gdk_window_merge_child_input_shapes (Gdk
|
||||
{
|
||||
}
|
||||
|
||||
-gboolean
|
||||
-gdk_window_set_static_gravities (GdkWindow *window,
|
||||
- gboolean use_static)
|
||||
+static gboolean
|
||||
+gdk_directfb_window_set_static_gravities (GdkWindow *window,
|
||||
+ gboolean use_static)
|
||||
{
|
||||
g_return_val_if_fail (GDK_IS_WINDOW (window), FALSE);
|
||||
|
||||
@@ -2708,6 +2666,7 @@ GdkWindow *gdk_directfb_create_child_win
|
||||
|
||||
window = g_object_new (GDK_TYPE_WINDOW, NULL);
|
||||
private = GDK_WINDOW_OBJECT (window);
|
||||
+ private->impl = g_object_new (_gdk_window_impl_get_type (), NULL);
|
||||
parent_private = GDK_WINDOW_OBJECT (parent);
|
||||
parent_impl = GDK_WINDOW_IMPL_DIRECTFB (parent_private->impl);
|
||||
private->parent = parent_private;
|
||||
@@ -2787,6 +2746,7 @@ gdk_window_foreign_new_for_display (GdkD
|
||||
/* we hold a reference count on ourselves */
|
||||
g_object_ref (window);
|
||||
private = GDK_WINDOW_OBJECT (window);
|
||||
+ private->impl = g_object_new (_gdk_window_impl_get_type (), NULL);
|
||||
private->parent = parent_private;
|
||||
private->window_type = GDK_WINDOW_TOPLEVEL;
|
||||
impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
|
||||
@@ -3153,11 +3113,11 @@ gdk_window_impl_directfb_begin_paint_reg
|
||||
|
||||
D_DEBUG_AT( GDKDFB_Window, " -> [%2d] %4d,%4d-%4dx%4d\n", i, GDKDFB_RECTANGLE_VALS_FROM_BOX( box ) );
|
||||
|
||||
- _gdk_windowing_window_clear_area (GDK_WINDOW(wimpl->gdkWindow),
|
||||
- box->x1,
|
||||
- box->y1,
|
||||
- box->x2 - box->x1,
|
||||
- box->y2 - box->y1);
|
||||
+ gdk_window_clear_area (GDK_WINDOW(wimpl->gdkWindow),
|
||||
+ box->x1,
|
||||
+ box->y1,
|
||||
+ box->x2 - box->x1,
|
||||
+ box->y2 - box->y1);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3281,6 +3241,33 @@ _gdk_windowing_window_set_composited (Gd
|
||||
{
|
||||
}
|
||||
|
||||
+static void
|
||||
+gdk_window_impl_iface_init (GdkWindowImplIface *iface)
|
||||
+{
|
||||
+ iface->show = gdk_directfb_window_show;
|
||||
+ iface->hide = gdk_directfb_window_hide;
|
||||
+ iface->withdraw = gdk_directfb_window_withdraw;
|
||||
+ iface->raise = gdk_window_directfb_raise;
|
||||
+ iface->lower = gdk_window_directfb_lower;
|
||||
+ iface->move_resize = gdk_directfb_window_move_resize;
|
||||
+ iface->move_region = _gdk_directfb_window_move_region;
|
||||
+ iface->scroll = _gdk_directfb_window_scroll;
|
||||
+ iface->clear_area = gdk_directfb_window_clear_area;
|
||||
+ iface->set_background = gdk_directfb_window_set_background;
|
||||
+ iface->set_back_pixmap = gdk_directfb_window_set_back_pixmap;
|
||||
+ iface->get_events = gdk_directfb_window_get_events;
|
||||
+ iface->set_events = gdk_directfb_window_set_events;
|
||||
+ iface->reparent = gdk_directfb_window_reparent;
|
||||
+ iface->set_cursor = gdk_directfb_window_set_cursor;
|
||||
+ iface->get_geometry = gdk_directfb_window_get_geometry;
|
||||
+ iface->get_origin = gdk_directfb_window_get_origin;
|
||||
+ iface->get_offsets = _gdk_directfb_window_get_offsets;
|
||||
+ iface->shape_combine_mask = gdk_directfb_window_shape_combine_mask;
|
||||
+ iface->shape_combine_region = gdk_directfb_window_shape_combine_region;
|
||||
+ iface->set_child_shapes = gdk_directfb_window_set_child_shapes;
|
||||
+ iface->merge_child_shapes = gdk_directfb_window_merge_child_shapes;
|
||||
+ iface->set_static_gravities = gdk_directfb_window_set_static_gravities;
|
||||
+}
|
||||
|
||||
#define __GDK_WINDOW_X11_C__
|
||||
#include "gdkaliasdef.c"
|
||||
Index: gtk+-2.14.7/gdk/directfb/gdkprivate-directfb.h
|
||||
===================================================================
|
||||
--- gtk+-2.14.7.orig/gdk/directfb/gdkprivate-directfb.h 2009-02-21 14:15:18.071083243 +0100
|
||||
+++ gtk+-2.14.7/gdk/directfb/gdkprivate-directfb.h 2009-02-21 14:48:30.330588850 +0100
|
||||
@@ -172,6 +172,17 @@ void gdk_directfb_window_id_table
|
||||
void gdk_directfb_window_id_table_remove (DFBWindowID dfb_id);
|
||||
GdkWindow * gdk_directfb_window_id_table_lookup (DFBWindowID dfb_id);
|
||||
|
||||
+void _gdk_directfb_window_get_offsets (GdkWindow *window,
|
||||
+ gint *x_offset,
|
||||
+ gint *y_offset);
|
||||
+void _gdk_directfb_window_scroll (GdkWindow *window,
|
||||
+ gint dx,
|
||||
+ gint dy);
|
||||
+void _gdk_directfb_window_move_region (GdkWindow *window,
|
||||
+ const GdkRegion *region,
|
||||
+ gint dx,
|
||||
+ gint dy);
|
||||
+
|
||||
|
||||
typedef struct
|
||||
{
|
||||
Index: gtk+-2.14.7/gdk/directfb/gdkdisplay-directfb.c
|
||||
===================================================================
|
||||
--- gtk+-2.14.7.orig/gdk/directfb/gdkdisplay-directfb.c 2009-02-21 14:50:43.626587155 +0100
|
||||
+++ gtk+-2.14.7/gdk/directfb/gdkdisplay-directfb.c 2009-02-21 14:51:12.202624962 +0100
|
||||
@@ -36,14 +36,13 @@
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
-
|
||||
-extern void _gdk_visual_init (void);
|
||||
-extern void _gdk_events_init (void);
|
||||
-extern void _gdk_input_init (void);
|
||||
-extern void _gdk_dnd_init (void);
|
||||
-extern void _gdk_windowing_window_init (void);
|
||||
-extern void _gdk_windowing_image_init (void);
|
||||
-extern void _gdk_directfb_keyboard_init (void);
|
||||
+extern void _gdk_visual_init (void);
|
||||
+extern void _gdk_events_init (void);
|
||||
+extern void _gdk_input_init (void);
|
||||
+extern void _gdk_dnd_init (void);
|
||||
+extern void _gdk_windowing_window_init (void);
|
||||
+extern void _gdk_windowing_image_init (void);
|
||||
+extern void _gdk_directfb_keyboard_init (void);
|
||||
|
||||
static gboolean gdk_directfb_argb_font = FALSE;
|
||||
static gint gdk_directfb_glyph_surface_cache = 8;
|
||||
@@ -130,11 +129,10 @@ GdkDisplay * gdk_display_open (const gch
|
||||
_gdk_screen = g_object_new (GDK_TYPE_SCREEN, NULL);
|
||||
|
||||
_gdk_visual_init ();
|
||||
+ _gdk_windowing_window_init ();
|
||||
|
||||
gdk_screen_set_default_colormap (_gdk_screen,
|
||||
- gdk_screen_get_system_colormap (_gdk_screen));
|
||||
- _gdk_windowing_window_init ();
|
||||
- _gdk_windowing_image_init ();
|
||||
+ gdk_screen_get_system_colormap (_gdk_screen)); _gdk_windowing_image_init ();
|
||||
|
||||
_gdk_input_init ();
|
||||
_gdk_dnd_init ();
|
||||
72
debian/patches/033_directfb_client-message.patch
vendored
Normal file
72
debian/patches/033_directfb_client-message.patch
vendored
Normal file
@ -0,0 +1,72 @@
|
||||
GNOME #560671
|
||||
Upstream svn r22364
|
||||
|
||||
Index: gtk+-2.14.7/gdk/directfb/gdkevents-directfb.c
|
||||
===================================================================
|
||||
--- gtk+-2.14.7.orig/gdk/directfb/gdkevents-directfb.c 2009-02-21 14:35:01.226582685 +0100
|
||||
+++ gtk+-2.14.7/gdk/directfb/gdkevents-directfb.c 2009-02-21 14:35:44.242582415 +0100
|
||||
@@ -162,24 +162,22 @@ dfb_events_process_window_event (DFBWind
|
||||
|
||||
static gboolean
|
||||
gdk_event_send_client_message_by_window (GdkEvent *event,
|
||||
- GdkWindow *window)
|
||||
+ GdkWindow *window)
|
||||
{
|
||||
- GdkEvent *new_event;
|
||||
+ DFBUserEvent evt;
|
||||
|
||||
g_return_val_if_fail(event != NULL, FALSE);
|
||||
g_return_val_if_fail(GDK_IS_WINDOW(window), FALSE);
|
||||
|
||||
- new_event = gdk_directfb_event_make (window, GDK_CLIENT_EVENT);
|
||||
- new_event->client.message_type = event->client.message_type;
|
||||
- new_event->client.data_format = event->client.data_format;
|
||||
- memcpy(&new_event->client.data,
|
||||
- &event->client.data,
|
||||
- sizeof(event->client.data));
|
||||
+ evt.clazz = DFEC_USER;
|
||||
+ evt.type = GPOINTER_TO_UINT (GDK_ATOM_TO_POINTER (event->client.message_type));
|
||||
+ evt.data = (void *) event->client.data.l[0];
|
||||
+
|
||||
+ _gdk_display->buffer->PostEvent(_gdk_display->buffer, DFB_EVENT (&evt));
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
-
|
||||
static void
|
||||
dfb_events_dispatch (void)
|
||||
{
|
||||
@@ -230,6 +228,32 @@ dfb_events_io_func (GIOChannel *channe
|
||||
else
|
||||
dfb_events_process_window_event (&event->window);
|
||||
break;
|
||||
+
|
||||
+ case DFEC_USER:
|
||||
+ {
|
||||
+ GList *list;
|
||||
+
|
||||
+ GDK_NOTE (EVENTS, g_print (" client_message"));
|
||||
+
|
||||
+ for (list = client_filters; list; list = list->next)
|
||||
+ {
|
||||
+ GdkClientFilter *filter = list->data;
|
||||
+ DFBUserEvent *user_event = (DFBUserEvent *) event;
|
||||
+ GdkAtom type;
|
||||
+
|
||||
+ type = GDK_POINTER_TO_ATOM (GUINT_TO_POINTER (user_event->type));
|
||||
+
|
||||
+ if (filter->type == type)
|
||||
+ {
|
||||
+ if (filter->function (user_event,
|
||||
+ NULL,
|
||||
+ filter->data) != GDK_FILTER_CONTINUE)
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ break;
|
||||
+
|
||||
default:
|
||||
break;
|
||||
}
|
||||
117
debian/patches/034_directfb_memleak.patch
vendored
Normal file
117
debian/patches/034_directfb_memleak.patch
vendored
Normal file
@ -0,0 +1,117 @@
|
||||
GNOME #533456
|
||||
Upstream svn r22369
|
||||
|
||||
Index: gtk+-2.14.7/configure.in
|
||||
===================================================================
|
||||
--- gtk+-2.14.7.orig/configure.in 2009-02-21 14:48:32.835086281 +0100
|
||||
+++ gtk+-2.14.7/configure.in 2009-02-21 14:54:42.690587468 +0100
|
||||
@@ -1620,7 +1620,7 @@ AC_SUBST(GDK_PIXBUF_XLIB_DEP_LIBS)
|
||||
AC_SUBST(GDK_PIXBUF_XLIB_DEP_CFLAGS)
|
||||
|
||||
if test "x$gdktarget" = "xdirectfb"; then
|
||||
- DIRECTFB_REQUIRED_VERSION=0.9.26
|
||||
+ DIRECTFB_REQUIRED_VERSION=1.0.0
|
||||
AC_MSG_CHECKING(for DirectFB)
|
||||
|
||||
if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb && $PKG_CONFIG --exists cairo-directfb ; then
|
||||
Index: gtk+-2.14.7/gdk/directfb/gdkcursor-directfb.c
|
||||
===================================================================
|
||||
--- gtk+-2.14.7.orig/gdk/directfb/gdkcursor-directfb.c 2009-02-21 14:48:30.306588314 +0100
|
||||
+++ gtk+-2.14.7/gdk/directfb/gdkcursor-directfb.c 2009-02-21 14:54:42.690587468 +0100
|
||||
@@ -41,10 +41,6 @@
|
||||
|
||||
#include <directfb_version.h>
|
||||
|
||||
-#if DIRECTFB_MAJOR_VERSION < 1
|
||||
-#define u32 __u32
|
||||
-#define u8 __u8
|
||||
-#endif
|
||||
|
||||
static struct {
|
||||
const guchar *bits;
|
||||
Index: gtk+-2.14.7/gdk/directfb/gdkdirectfb.h
|
||||
===================================================================
|
||||
--- gtk+-2.14.7.orig/gdk/directfb/gdkdirectfb.h 2009-02-21 14:48:30.374585434 +0100
|
||||
+++ gtk+-2.14.7/gdk/directfb/gdkdirectfb.h 2009-02-21 14:54:42.690587468 +0100
|
||||
@@ -80,10 +80,8 @@ GdkVisual * gdk_directfb_visual_by_forma
|
||||
IDirectFBWindow *gdk_directfb_window_lookup(GdkWindow *window);
|
||||
IDirectFBSurface *gdk_directfb_surface_lookup(GdkWindow *window);
|
||||
|
||||
-#if (DIRECTFB_MAJOR_VERSION >= 1)
|
||||
GdkWindow *gdk_directfb_create_child_window(GdkWindow *parent,
|
||||
- IDirectFBSurface *subsurface);
|
||||
-#endif
|
||||
+ IDirectFBSurface *subsurface);
|
||||
|
||||
|
||||
G_END_DECLS
|
||||
Index: gtk+-2.14.7/gdk/directfb/gdkevents-directfb.c
|
||||
===================================================================
|
||||
--- gtk+-2.14.7.orig/gdk/directfb/gdkevents-directfb.c 2009-02-21 14:54:41.887087234 +0100
|
||||
+++ gtk+-2.14.7/gdk/directfb/gdkevents-directfb.c 2009-02-21 14:54:42.690587468 +0100
|
||||
@@ -419,7 +419,6 @@ gdk_directfb_event_windows_add (GdkWindo
|
||||
impl->window->CreateEventBuffer (impl->window, &EventBuffer);
|
||||
}
|
||||
|
||||
-#if (DIRECTFB_MAJOR_VERSION >= 1)
|
||||
void
|
||||
gdk_directfb_event_windows_remove (GdkWindow *window)
|
||||
{
|
||||
@@ -436,7 +435,6 @@ gdk_directfb_event_windows_remove (GdkWi
|
||||
impl->window->DetachEventBuffer (impl->window, EventBuffer);
|
||||
/* FIXME: should we warn if (! EventBuffer) ? */
|
||||
}
|
||||
-#endif
|
||||
|
||||
GdkWindow *
|
||||
gdk_directfb_child_at (GdkWindow *window,
|
||||
Index: gtk+-2.14.7/gdk/directfb/gdkprivate-directfb.h
|
||||
===================================================================
|
||||
--- gtk+-2.14.7.orig/gdk/directfb/gdkprivate-directfb.h 2009-02-21 14:48:30.330588850 +0100
|
||||
+++ gtk+-2.14.7/gdk/directfb/gdkprivate-directfb.h 2009-02-21 14:54:42.690587468 +0100
|
||||
@@ -239,10 +239,8 @@ GdkImage* _gdk_directfb_copy_to_image (G
|
||||
gint width,
|
||||
gint height);
|
||||
|
||||
-void gdk_directfb_event_windows_add (GdkWindow *window);
|
||||
-#if (DIRECTFB_MAJOR_VERSION >= 1)
|
||||
+void gdk_directfb_event_windows_add (GdkWindow *window);
|
||||
void gdk_directfb_event_windows_remove (GdkWindow *window);
|
||||
-#endif
|
||||
|
||||
GdkGrabStatus gdk_directfb_keyboard_grab (GdkDisplay *display,
|
||||
GdkWindow *window,
|
||||
Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c
|
||||
===================================================================
|
||||
--- gtk+-2.14.7.orig/gdk/directfb/gdkwindow-directfb.c 2009-02-21 14:54:17.138584001 +0100
|
||||
+++ gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c 2009-02-21 14:54:42.694585602 +0100
|
||||
@@ -698,9 +698,8 @@ _gdk_windowing_window_destroy (GdkWindow
|
||||
impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
|
||||
|
||||
_gdk_selection_window_destroyed (window);
|
||||
-#if (DIRECTFB_MAJOR_VERSION >= 1)
|
||||
gdk_directfb_event_windows_remove (window);
|
||||
-#endif
|
||||
+
|
||||
if (window == _gdk_directfb_pointer_grab_window)
|
||||
gdk_pointer_ungrab (GDK_CURRENT_TIME);
|
||||
if (window == _gdk_directfb_keyboard_grab_window)
|
||||
@@ -2651,9 +2650,8 @@ gdk_window_get_frame_extents (GdkWindow
|
||||
* Given a directfb window and a subsurface of that window
|
||||
* create a gdkwindow child wrapper
|
||||
*/
|
||||
-#if (DIRECTFB_MAJOR_VERSION >= 1)
|
||||
GdkWindow *gdk_directfb_create_child_window(GdkWindow *parent,
|
||||
- IDirectFBSurface *subsurface)
|
||||
+ IDirectFBSurface *subsurface)
|
||||
{
|
||||
GdkWindow *window;
|
||||
GdkWindowObject *private;
|
||||
@@ -2698,7 +2696,6 @@ GdkWindow *gdk_directfb_create_child_win
|
||||
return window;
|
||||
|
||||
}
|
||||
-#endif
|
||||
|
||||
/*
|
||||
* The wrapping is not perfect since directfb does not give full access
|
||||
33655
debian/patches/070_mandatory-relibtoolize.patch
vendored
33655
debian/patches/070_mandatory-relibtoolize.patch
vendored
File diff suppressed because it is too large
Load Diff
32
debian/patches/071_jasper_link_fix.patch
vendored
Normal file
32
debian/patches/071_jasper_link_fix.patch
vendored
Normal file
@ -0,0 +1,32 @@
|
||||
diff -urN gtk+-2.14.4.old/configure gtk+-2.14.4/configure
|
||||
--- gtk+-2.14.4.old/configure 2008-11-04 17:41:20.000000000 -0200
|
||||
+++ gtk+-2.14.4/configure 2008-11-04 17:45:07.000000000 -0200
|
||||
@@ -29356,8 +29356,11 @@
|
||||
if echo "$included_loaders" | egrep '(^|,)png($|,)' > /dev/null; then
|
||||
STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG"
|
||||
fi
|
||||
+ if echo "$included_loaders" | egrep '(^|,)jasper($|,)' > /dev/null; then
|
||||
+ STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJASPER"
|
||||
+ fi
|
||||
else
|
||||
- STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG"
|
||||
+ STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG $LIBJASPER"
|
||||
fi
|
||||
|
||||
# Checks to see whether we should include mediaLib
|
||||
diff -urN gtk+-2.14.4.old/configure.in gtk+-2.14.4/configure.in
|
||||
--- gtk+-2.14.4.old/configure.in 2008-10-17 01:06:38.000000000 -0300
|
||||
+++ gtk+-2.14.4/configure.in 2008-11-04 17:44:57.000000000 -0200
|
||||
@@ -1163,8 +1163,11 @@
|
||||
if echo "$included_loaders" | egrep '(^|,)png($|,)' > /dev/null; then
|
||||
STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG"
|
||||
fi
|
||||
+ if echo "$included_loaders" | egrep '(^|,)jasper($|,)' > /dev/null; then
|
||||
+ STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJASPER"
|
||||
+ fi
|
||||
else
|
||||
- STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG"
|
||||
+ STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG $LIBJASPER"
|
||||
fi
|
||||
|
||||
# Checks to see whether we should include mediaLib
|
||||
20
debian/patches/072_workaround_directfb_build.patch
vendored
Normal file
20
debian/patches/072_workaround_directfb_build.patch
vendored
Normal file
@ -0,0 +1,20 @@
|
||||
Index: gtk+2.0-2.14.0/gdk/directfb/gdktestutils-directfb.c
|
||||
===================================================================
|
||||
--- gtk+2.0-2.14.0.orig/gdk/directfb/gdktestutils-directfb.c 2008-09-04 06:36:10.000000000 +0200
|
||||
+++ gtk+2.0-2.14.0/gdk/directfb/gdktestutils-directfb.c 2008-09-05 00:36:44.000000000 +0200
|
||||
@@ -175,7 +175,6 @@
|
||||
|
||||
evt.clazz = DFEC_WINDOW;
|
||||
evt.type = (key_pressrelease == GDK_KEY_PRESS) ? DWET_KEYDOWN : DWET_KEYUP;
|
||||
- evt.flags = DWEF_NONE;
|
||||
evt.window_id = impl->dfb_id;
|
||||
evt.x = MAX(x, 0);
|
||||
evt.y = MAX(y, 0);
|
||||
@@ -241,7 +240,6 @@
|
||||
|
||||
evt.clazz = DFEC_WINDOW;
|
||||
evt.type = (button_pressrelease == GDK_BUTTON_PRESS) ? DWET_BUTTONDOWN : DWET_BUTTONUP;
|
||||
- evt.flags = DWEF_NONE;
|
||||
evt.window_id = impl->dfb_id;
|
||||
evt.x = MAX(x, 0);
|
||||
evt.y = MAX(y, 0);
|
||||
19
debian/patches/092_fix_printtest_include.patch
vendored
Normal file
19
debian/patches/092_fix_printtest_include.patch
vendored
Normal file
@ -0,0 +1,19 @@
|
||||
Index: gtk+2.0-2.14.3/modules/printbackends/test/gtkprintbackendtest.c
|
||||
===================================================================
|
||||
--- gtk+2.0-2.14.3.orig/modules/printbackends/test/gtkprintbackendtest.c 2008-09-24 21:07:22.000000000 -0300
|
||||
+++ gtk+2.0-2.14.3/modules/printbackends/test/gtkprintbackendtest.c 2008-09-24 21:07:28.000000000 -0300
|
||||
@@ -35,12 +35,12 @@
|
||||
|
||||
#include <glib/gi18n-lib.h>
|
||||
|
||||
-#include "gtkprintoperation.h"
|
||||
+#include <gtk/gtk.h>
|
||||
|
||||
#include "gtkprintbackend.h"
|
||||
#include "gtkprintbackendtest.h"
|
||||
|
||||
-#include "gtkprinter.h"
|
||||
+#include <gtk/gtkunixprint.h>
|
||||
#include "gtkprinter-private.h"
|
||||
|
||||
typedef struct _GtkPrintBackendTestClass GtkPrintBackendTestClass;
|
||||
11
debian/patches/series
vendored
11
debian/patches/series
vendored
@ -3,9 +3,6 @@
|
||||
003_gdk.pc_privates.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
|
||||
010_gdkpixbuf_-lm.patch
|
||||
015_default-fallback-icon-theme.patch
|
||||
@ -14,10 +11,14 @@
|
||||
022_module-files-append-compat-module-files-d.patch
|
||||
030_gtkentry_password-char-circle.patch
|
||||
031_directfb_dead-keys.patch
|
||||
033_treeview_resizing.patch
|
||||
032_gdkwindowimpl_directfb.patch
|
||||
033_directfb_client-message.patch
|
||||
034_directfb_memleak.patch
|
||||
041_ia32-libs.patch
|
||||
042_treeview_single-focus.patch
|
||||
060_ignore-random-icons.patch
|
||||
070_mandatory-relibtoolize.patch
|
||||
071_jasper_link_fix.patch
|
||||
072_workaround_directfb_build.patch
|
||||
091_workaround_no_gtk_init_incorrect_display.patch
|
||||
095_gtk-im-module-setting.patch
|
||||
092_fix_printtest_include.patch
|
||||
|
||||
25
debian/rules
vendored
25
debian/rules
vendored
@ -46,7 +46,7 @@ DEBVERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
|
||||
VERSION := $(shell echo $(DEBVERSION) | sed -e 's/-[^-]*$$//')
|
||||
APIVER := 2.0
|
||||
SONAME := 0
|
||||
SHVER := 2.12.0
|
||||
SHVER := 2.14.0
|
||||
|
||||
# earliest version that this release has backwards binary compatibility for
|
||||
GTK_BINARY_VERSION := 2.10.0
|
||||
@ -68,8 +68,8 @@ EXAMPLES_PKG := gtk$(APIVER)-examples
|
||||
PIXBUF_PKG := gtk2-engines-pixbuf
|
||||
|
||||
# package groups, used in rule dependencies and in cleanup
|
||||
BINARY_INDEP_PKGS := $(COMMON_PKG) $(BIN_PKG) $(DOC_PKG)
|
||||
BINARY_ARCH_PKGS := $(SHARED_PKG) $(DIRECTFB_PKG) $(UDEB_PKG) $(DEV_PKG) $(DIRECTFB_DEV_PKG) $(DEBUG_PKG) $(EXAMPLES_PKG) $(PIXBUF_PKG)
|
||||
BINARY_INDEP_PKGS := $(COMMON_PKG) $(BIN_PKG) $(DOC_PKG) libgail-doc
|
||||
BINARY_ARCH_PKGS := $(SHARED_PKG) $(DIRECTFB_PKG) $(UDEB_PKG) $(DEV_PKG) $(DIRECTFB_DEV_PKG) $(DEBUG_PKG) $(EXAMPLES_PKG) $(PIXBUF_PKG) libgail18 libgail-dbg libgail-dev libgail-common
|
||||
ALL_PKGS := $(BINARY_INDEP_PKGS) $(BINARY_ARCH_PKGS)
|
||||
|
||||
# list of flavors we build; each gets a builddir, a configure pass (configure
|
||||
@ -118,7 +118,6 @@ common_configure_flags := \
|
||||
--mandir=\$${prefix}/share/man \
|
||||
--infodir=\$${prefix}/share/info \
|
||||
--sysconfdir=/etc \
|
||||
--with-html-dir=\$${prefix}/share/doc/$(DOC_PKG) \
|
||||
--enable-test-print-backend
|
||||
ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
|
||||
common_configure_flags += --build=$(DEB_BUILD_GNU_TYPE)
|
||||
@ -148,6 +147,11 @@ DH_INSTALLDOCS_FILES := NEWS README ChangeLog
|
||||
# ".in" file; pass the list of packages in $(1)
|
||||
dh_subst_files = $(patsubst %.in,%,$(wildcard $(addprefix debian/, $(addsuffix *.in, $(1)))))
|
||||
|
||||
# Gruik gruik generation of .devhelp files for the FAQ and tutorial
|
||||
debian/gtk-%.devhelp: docs/%/html/book1.html
|
||||
gawk -f debian/gruik2devhelp.awk -v name=gtk-$* $< > $@
|
||||
devhelpfiles: debian/gtk-faq.devhelp debian/gtk-tutorial.devhelp
|
||||
|
||||
debian/dh_gtkmodules.1: debian/dh_gtkmodules
|
||||
cd debian && pod2man -c "Gtk" -r "$(DEBVERSION)" dh_gtkmodules dh_gtkmodules.1
|
||||
|
||||
@ -249,6 +253,7 @@ clean:: debian/control
|
||||
# unapply patches, if any
|
||||
QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null pop -a -R || test $$? = 2
|
||||
-rm -rf .pc
|
||||
rm -f debian/*.devhelp
|
||||
-rm -rf $(STAMP_DIR)
|
||||
-rm -f $(call dh_subst_files,$(ALL_PKGS))
|
||||
-rm -f debian/update-gdkpixbuf-loaders debian/update-gtk-immodules debian/dh_gtkmodules debian/dh_gtkmodules.1
|
||||
@ -256,7 +261,7 @@ clean:: debian/control
|
||||
|
||||
maybe_check = $(if $(findstring nocheck,$(DEB_BUILD_OPTIONS)),,check)
|
||||
|
||||
binary-indep: build $(maybe_check) install $(call dh_subst_files,$(BINARY_INDEP_PKGS))
|
||||
binary-indep: build $(maybe_check) install $(call dh_subst_files,$(BINARY_INDEP_PKGS)) devhelpfiles
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
dh_install -i
|
||||
@ -320,7 +325,8 @@ binary-arch: build $(maybe_check) install $(call dh_subst_files,$(BINARY_ARCH_PK
|
||||
-p$(UDEB_PKG)
|
||||
dh_installexamples -s
|
||||
dh_link -s
|
||||
dh_strip -s --dbg-package=$(DEBUG_PKG) -N$(UDEB_PKG)
|
||||
dh_strip -s --dbg-package=$(DEBUG_PKG) -N$(UDEB_PKG) -Nlibgail18 -Nlibgail-common
|
||||
dh_strip -plibgail18 -plibgail-common --dbg-package=libgail-dbg
|
||||
dh_strip -p$(UDEB_PKG)
|
||||
dh_compress -s -X.sgml -X.devhelp
|
||||
dh_fixperms -s -X$(LIBDIR)/$(SHARED_PKG)
|
||||
@ -332,6 +338,9 @@ 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_makeshlibs -plibgail18 \
|
||||
-X$(MODULES_BASE_PATH) \
|
||||
-V"libgail18 (>= $(SHVER)), libgail-common (>= $(SHVER))"
|
||||
dh_installdeb -s
|
||||
# override shlibs for libraries from this source before computing
|
||||
# dependencies of packages generated from this source; we already have
|
||||
@ -340,7 +349,7 @@ 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 -s
|
||||
dh_shlibdeps
|
||||
-rm -f debian/shlibs.local
|
||||
dh_gencontrol -s
|
||||
dh_md5sums -s
|
||||
@ -351,4 +360,4 @@ list-missing:
|
||||
egrep -v '(\.la|$(LIBDIR)/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 list-missing binary
|
||||
.PHONY: patch configure build check install clean binary-indep binary-arch list-missing binary devhelpfiles
|
||||
|
||||
Reference in New Issue
Block a user