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

Upgrade to 2.4.0, initial work

Browse Source
This commit is contained in:
Rob Taylor 2004-03-19 13:29:23 +00:00
parent 8fe8085315
commit 404c552082
13 changed files with 79 additions and 14500 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
gtk+2.0 (2.4.0) experimental; urgency=low
* debian/control
- upgraded to 2.4.0
-- Rob Taylor <robtaylor@fastmail.fm> Thu, 18 Mar 2004 19:19:07 -0300
gtk+2.0 (2.2.4-3) unstable; urgency=low
* debian/patches/:

6
debian/control vendored
View File

@ -2,8 +2,8 @@ Source: gtk+2.0
Section: libs
Priority: optional
Maintainer: Akira TAGOH <tagoh@debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Andrew Lau <netsnipe@users.sourceforge.net>, Edd Dumbill <ejad@debian.org>, Emil Soleyman-Zomalan <emil@nishra.com>, Gustavo Noronha Silva <kov@debian.org>, Johannes Rohr <j.rohr@comlink.apc.org>, Jordi Mallach <jordi@debian.org>, Josselin Mouette <joss@debian.org>, Rob Bradford <rob@debianplanet.org>, Robert McQueen <robot101@debian.org>, Ross Burton <ross@burtonini.com>, Sebastien Bacher <seb128@debian.org>, Takuo KITAME <kitame@debian.org>
Build-Depends: debhelper (>> 4.0.0), gettext, pkg-config, libglib2.0-dev (>= 2.2.0), libpango1.0-dev (>= 1.2.0-3), libatk1.0-dev (>= 1.2.0), xlibs-pic (>= 4.2.1-6), xlibs-dev, libtiff3g-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Andrew Lau <netsnipe@users.sourceforge.net>, Edd Dumbill <ejad@debian.org>, Emil Soleyman-Zomalan <emil@nishra.com>, Gustavo Noronha Silva <kov@debian.org>, J.H.M. Dassen (Ray) <jdassen@debian.org>, Johannes Rohr <j.rohr@comlink.org>, Jordi Mallach <jordi@debian.org>, Jose Carlos Garcia Sogo <jsogo@debian.org>, Josselin Mouette <joss@debian.org>, Ondřej Surý <ondrej@debian.org>, Rob Bradford <rob@debianplanet.org>, Robert McQueen <robot101@debian.org>, Ross Burton <ross@burtonini.com>, Sebastien Bacher <seb128@debian.org>, Takuo KITAME <kitame@debian.org>
Build-Depends: debhelper (>> 4.0.0), gettext, pkg-config, libglib2.0-dev (>= 2.4.0), libpango1.0-dev (>= 1.2.0-3), libatk1.0-dev (>= 1.2.0), xlibs-pic (>= 4.2.1-6), xlibs-dev, libtiff3g-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools
Build-Depends-Indep: gtk-doc-tools, docbook-xml
Standards-Version: 3.6.1.0
@ -38,7 +38,7 @@ Description: Common files for the GTK+ graphical user interface library
Package: libgtk2.0-dev
Section: libdevel
Architecture: any
Depends: libgtk2.0-0 (= ${Source-Version}), libglib2.0-dev (>= 2.2.0), libpango1.0-dev (>= 1.2.0-3), libatk1.0-dev (>= 1.2.0), xlibs-dev, pkg-config
Depends: libgtk2.0-0 (= ${Source-Version}), libglib2.0-dev (>= 2.4.0), libpango1.0-dev (>= 1.2.0-3), libatk1.0-dev (>= 1.2.0), xlibs-dev, pkg-config
Suggests: libgtk2.0-doc
Replaces: libgtk1.3-dev
Conflicts: libgtk1.3-dev

4
debian/control.in vendored
View File

@ -3,7 +3,7 @@ Section: libs
Priority: optional
Maintainer: Akira TAGOH <tagoh@debian.org>
Uploaders: @GNOME_TEAM@
Build-Depends: debhelper (>> 4.0.0), gettext, pkg-config, libglib2.0-dev (>= 2.2.0), libpango1.0-dev (>= 1.2.0-3), libatk1.0-dev (>= 1.2.0), xlibs-pic (>= 4.2.1-6), xlibs-dev, libtiff3g-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools
Build-Depends: debhelper (>> 4.0.0), gettext, pkg-config, libglib2.0-dev (>= 2.4.0), libpango1.0-dev (>= 1.2.0-3), libatk1.0-dev (>= 1.2.0), xlibs-pic (>= 4.2.1-6), xlibs-dev, libtiff3g-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools
Build-Depends-Indep: gtk-doc-tools, docbook-xml
Standards-Version: 3.6.1.0
@ -38,7 +38,7 @@ Description: Common files for the GTK+ graphical user interface library
Package: libgtk2.0-dev
Section: libdevel
Architecture: any
Depends: libgtk2.0-@SONAME@ (= ${Source-Version}), libglib2.0-dev (>= 2.2.0), libpango1.0-dev (>= 1.2.0-3), libatk1.0-dev (>= 1.2.0), xlibs-dev, pkg-config
Depends: libgtk2.0-@SONAME@ (= ${Source-Version}), libglib2.0-dev (>= 2.4.0), libpango1.0-dev (>= 1.2.0-3), libatk1.0-dev (>= 1.2.0), xlibs-dev, pkg-config
Suggests: libgtk2.0-doc
Replaces: libgtk1.3-dev
Conflicts: libgtk1.3-dev

21
debian/patches/000_gtk+-2.2.0-buildfix-immodule.patch vendored
View File

@ -1,32 +1,33 @@
diff -ruN gtk+-2.2.0.orig/modules/input/Makefile.am gtk+-2.2.0/modules/input/Makefile.am
--- gtk+-2.2.0.orig/modules/input/Makefile.am 2003-01-06 23:40:37.000000000 +0900
+++ gtk+-2.2.0/modules/input/Makefile.am 2003-01-06 23:46:35.000000000 +0900
@@ -113,7 +113,11 @@
@@ -118,7 +118,12 @@
im-viqr.la
gtk.immodules: Makefile.am $(module_LTLIBRARIES)
- $(top_builddir)/gtk/gtk-query-immodules-2.0 *.la > gtk.immodules
- $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules
+ @if $(RUN_QUERY_IMMODULES_TEST) ; then \
+ $(top_builddir)/gtk/gtk-query-immodules-2.0 *.la > gtk.immodules ; \
+ $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules \
+ else \
+ touch $@ ; \
+ fi
+
CLEANFILES = gtk.immodules
if CROSS_COMPILING
else
diff -ruN gtk+-2.2.0.orig/modules/input/Makefile.in gtk+-2.2.0/modules/input/Makefile.in
--- gtk+-2.2.0.orig/modules/input/Makefile.in 2003-01-06 23:39:08.000000000 +0900
+++ gtk+-2.2.0/modules/input/Makefile.in 2003-01-06 23:46:44.000000000 +0900
@@ -815,7 +815,11 @@
fi
@@ -785,7 +785,11 @@
rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules
gtk.immodules: Makefile.am $(module_LTLIBRARIES)
- $(top_builddir)/gtk/gtk-query-immodules-2.0 *.la > gtk.immodules
- $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules
+ @if $(RUN_QUERY_IMMODULES_TEST) ; then \
+ $(top_builddir)/gtk/gtk-query-immodules-2.0 *.la > gtk.immodules ; \
+ $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules \
+ else \
+ touch $@ ; \
+ fi
@CROSS_COMPILING_FALSE@all-local: gtk.immodules
# Tell versions [3.59,3.63) of GNU make to not export all variables.

12812
debian/patches/000_gtk+-2.2.4-non-weak-symbols.patch vendored
View File

File diff suppressed because it is too large Load Diff

12
debian/patches/000_gtk+-2.2.4-socketfocus.patch vendored
View File

@ -1,12 +0,0 @@
diff -ur gtk+-2.2.4.orig/gtk/gtksocket.c gtk+-2.2.4/gtk/gtksocket.c
--- gtk+-2.2.4.orig/gtk/gtksocket.c 2003-10-31 23:54:57.000000000 +0100
+++ gtk+-2.2.4/gtk/gtksocket.c 2003-10-31 23:55:34.000000000 +0100
@@ -840,7 +840,7 @@
if (socket->plug_widget)
return gtk_widget_child_focus (socket->plug_widget, direction);
- if (!GTK_WIDGET_HAS_FOCUS (widget))
+ if (!gtk_widget_is_focus (widget))
{
switch (direction)
{

67
debian/patches/000_gtk+-debian-xinerama-pic.patch vendored
View File

@ -1,44 +1,73 @@
diff -ruN gtk+-2.2.2.orig/configure gtk+-2.2.2/configure
--- gtk+-2.2.2.orig/configure 2003-06-10 05:30:17.000000000 +0900
+++ gtk+-2.2.2/configure 2003-07-13 02:01:52.000000000 +0900
@@ -26592,13 +26592,13 @@
@@ -28377,13 +28377,13 @@
*)
# Check for XFree
use_xfree_xinerama=yes
- echo "$as_me:$LINENO: checking for XineramaQueryExtension in -lXinerama" >&5
-echo $ECHO_N "checking for XineramaQueryExtension in -lXinerama... $ECHO_C" >&6
-if test "${ac_cv_lib_Xinerama_XineramaQueryExtension+set}" = set; then
+ echo "$as_me:$LINENO: checking for XineramaQueryExtension in -lXinerama_pic" >&5
+echo $ECHO_N "checking for XineramaQueryExtension in -lXinerama_pic... $ECHO_C" >&6
if test "${ac_cv_lib_Xinerama_XineramaQueryExtension+set}" = set; then
+if test "${ac_cv_lib_Xinerama_pic_XineramaQueryExtension+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lXinerama -lXext $x_libs_for_checks $LIBS"
+LIBS="-lXinerama_pic -lXext $x_libs_for_checks $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
@@ -26687,7 +26687,7 @@
echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5
echo "${ECHO_T}$ac_cv_header_X11_extensions_Xinerama_h" >&6
if test $ac_cv_header_X11_extensions_Xinerama_h = yes; then
- x_extra_libs="-lXinerama $x_extra_libs"
+ x_extra_libs="-lXinerama_pic $x_extra_libs"
if test -z "`echo $x_extra_libs $x_libs | grep "\-lXext" 2> /dev/null`"; then
x_extra_libs="-lXext $x_extra_libs"
fi
diff -ruN gtk+-2.2.2.orig/configure.in gtk+-2.2.2/configure.in
_ACEOF
@@ -28428,20 +28428,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_Xinerama_XineramaQueryExtension=yes
+ ac_cv_lib_Xinerama_pic_XineramaQueryExtension=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_Xinerama_XineramaQueryExtension=no
+ac_cv_lib_Xinerama_pic_XineramaQueryExtension=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaQueryExtension" >&5
-echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaQueryExtension" >&6
-if test $ac_cv_lib_Xinerama_XineramaQueryExtension = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_pic_XineramaQueryExtension" >&5
+echo "${ECHO_T}$ac_cv_lib_Xinerama_pic_XineramaQueryExtension" >&6
+if test $ac_cv_lib_Xinerama_pic_XineramaQueryExtension = yes; then
echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5
echo $ECHO_N "checking for X11/extensions/Xinerama.h... $ECHO_C" >&6
if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then
@@ -28497,8 +28497,8 @@
esac
case "$x_extra_libs " in
- *-lXinerama[\ \ ]*) ;;
- *) x_extra_libs="-lXinerama $x_extra_libs" ;;
+ *-lXinerama_pic[\ \ ]*) ;;
+ *) x_extra_libs="-lXinerama_pic $x_extra_libs" ;;
esac
cat >>confdefs.h <<\_ACEOF
--- gtk+-2.2.2.orig/configure.in 2003-06-09 13:24:51.000000000 +0900
+++ gtk+-2.2.2/configure.in 2003-07-13 01:58:11.000000000 +0900
@@ -1119,9 +1119,9 @@
@@ -1113,10 +1113,10 @@
*)
# Check for XFree
use_xfree_xinerama=yes
- AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
+ AC_CHECK_LIB(Xinerama_pic, XineramaQueryExtension,
[AC_CHECK_HEADER(X11/extensions/Xinerama.h,
- x_extra_libs="-lXinerama $x_extra_libs"
+ x_extra_libs="-lXinerama_pic $x_extra_libs"
if test -z "`echo $x_extra_libs $x_libs | grep "\-lXext" 2> /dev/null`"; then
x_extra_libs="-lXext $x_extra_libs"
fi
[GTK_ADD_LIB(x_extra_libs,Xext)
- GTK_ADD_LIB(x_extra_libs,Xinerama)
+ GTK_ADD_LIB(x_extra_libs,Xinerama_pic)
AC_DEFINE(HAVE_XFREE_XINERAMA)
AC_DEFINE(HAVE_XINERAMA)],
use_xfree_xinerama=no,

401
debian/patches/001_gtk+-debian-aclocal-pass_all.patch vendored
View File

@ -1,413 +1,24 @@
diff -ruN gtk+-2.2.4.orig/aclocal.m4 gtk+-2.2.4/aclocal.m4
--- gtk+-2.2.4.orig/aclocal.m4 2003-09-05 02:17:07.000000000 +0900
+++ gtk+-2.2.4/aclocal.m4 2003-09-08 00:47:50.000000000 +0900
@@ -2335,7 +2335,7 @@
@@ -3123,7 +3123,7 @@
# This must be Linux ELF.
linux*)
case $host_cpu in
- alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh* | x86_64*)
+ alpha* | arm* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh* | x86_64*)
- alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*|x86_64*)
+ alpha*|arm*|hppa*|i*86|ia64*|m68*|mips*|mipsel|powerpc*|sparc*|s390*|sh*|x86_64*)
lt_cv_deplibs_check_method=pass_all ;;
*)
# glibc up to 2.1.1 does not perform some relocations on ARM
diff -ruN gtk+-2.2.4.orig/configure gtk+-2.2.4/configure
--- gtk+-2.2.4.orig/configure 2003-09-08 00:46:04.000000000 +0900
+++ gtk+-2.2.4/configure 2003-09-08 00:49:01.000000000 +0900
@@ -1145,7 +1145,7 @@
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi
- cd $ac_popdir
+ cd "$ac_popdir"
done
fi
@@ -1342,7 +1342,7 @@
echo "$as_me: caught signal $ac_signal"
echo "$as_me: exit $exit_status"
} >&5
- rm -f core core.* *.core &&
+ rm -f core *.core &&
rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
exit $exit_status
' 0
@@ -2658,8 +2658,7 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
for ac_declaration in \
- ''\
- '#include <stdlib.h>' \
+ '' \
'extern "C" void std::exit (int) throw (); using std::exit;' \
'extern "C" void std::exit (int); using std::exit;' \
'extern "C" void exit (int) throw ();' \
@@ -2673,8 +2672,8 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <stdlib.h>
$ac_declaration
+#include <stdlib.h>
int
main ()
{
@@ -3256,7 +3255,7 @@
@@ -3625,7 +3625,7 @@
# This must be Linux ELF.
linux*)
case $host_cpu in
- alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh* | x86_64*)
+ alpha* | arm* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh* | x86_64*)
- alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*|x86_64*)
+ alpha*|arm*|hppa*|i*86|ia64*|m68*|mips*|mipsel|powerpc*|sparc*|s390*|sh*|x86_64*)
lt_cv_deplibs_check_method=pass_all ;;
*)
# glibc up to 2.1.1 does not perform some relocations on ARM
@@ -3386,7 +3385,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 3389 "configure"' > conftest.$ac_ext
+ echo '#line 3388 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -4161,7 +4160,7 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
fi
@@ -4606,8 +4605,7 @@
fi
fi
for ac_declaration in \
- ''\
- '#include <stdlib.h>' \
+ '' \
'extern "C" void std::exit (int) throw (); using std::exit;' \
'extern "C" void std::exit (int); using std::exit;' \
'extern "C" void exit (int) throw ();' \
@@ -4621,8 +4619,8 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <stdlib.h>
$ac_declaration
+#include <stdlib.h>
int
main ()
{
@@ -5023,7 +5021,7 @@
# Provide some information about the compiler.
-echo "$as_me:5026:" \
+echo "$as_me:5024:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6028,11 +6026,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6031: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6029: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6035: \$? = $ac_status" >&5
+ echo "$as_me:6033: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -6260,11 +6258,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6263: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6261: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6267: \$? = $ac_status" >&5
+ echo "$as_me:6265: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -6327,11 +6325,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6330: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6328: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6334: \$? = $ac_status" >&5
+ echo "$as_me:6332: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -7692,7 +7690,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*)
- echo '#line 7695 "configure"' > conftest.$ac_ext
+ echo '#line 7693 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -8388,7 +8386,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 8391 "configure"
+#line 8389 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -8486,7 +8484,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 8489 "configure"
+#line 8487 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10618,11 +10616,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10621: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10619: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10625: \$? = $ac_status" >&5
+ echo "$as_me:10623: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -10685,11 +10683,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10688: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10686: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10692: \$? = $ac_status" >&5
+ echo "$as_me:10690: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -11256,7 +11254,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*)
- echo '#line 11259 "configure"' > conftest.$ac_ext
+ echo '#line 11257 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -11952,7 +11950,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11955 "configure"
+#line 11953 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12050,7 +12048,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12053 "configure"
+#line 12051 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12872,11 +12870,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12875: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12873: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12879: \$? = $ac_status" >&5
+ echo "$as_me:12877: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -12939,11 +12937,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12942: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12940: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12946: \$? = $ac_status" >&5
+ echo "$as_me:12944: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14282,7 +14280,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*)
- echo '#line 14285 "configure"' > conftest.$ac_ext
+ echo '#line 14283 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -14928,11 +14926,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14931: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14929: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14935: \$? = $ac_status" >&5
+ echo "$as_me:14933: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -15160,11 +15158,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15163: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15161: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15167: \$? = $ac_status" >&5
+ echo "$as_me:15165: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -15227,11 +15225,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15230: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15228: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15234: \$? = $ac_status" >&5
+ echo "$as_me:15232: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16592,7 +16590,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*)
- echo '#line 16595 "configure"' > conftest.$ac_ext
+ echo '#line 16593 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -17288,7 +17286,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 17291 "configure"
+#line 17289 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -17386,7 +17384,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 17389 "configure"
+#line 17387 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -20738,10 +20736,10 @@
{ echo "$as_me:$LINENO: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&5
echo "$as_me: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&2;}
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
LIBS=$gtk_save_LIBS
@@ -21066,7 +21064,7 @@
( exit $ac_status )
no_glib=yes
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
@@ -22003,7 +22001,7 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
fi
@@ -22568,7 +22566,7 @@
( exit $ac_status )
ac_cv_func_mmap_fixed_mapped=no
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
@@ -26696,7 +26694,7 @@
use_xfree_xinerama=yes
echo "$as_me:$LINENO: checking for XineramaQueryExtension in -lXinerama_pic" >&5
echo $ECHO_N "checking for XineramaQueryExtension in -lXinerama_pic... $ECHO_C" >&6
-if test "${ac_cv_lib_Xinerama_XineramaQueryExtension+set}" = set; then
+if test "${ac_cv_lib_Xinerama_pic_XineramaQueryExtension+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -26736,19 +26734,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_Xinerama_XineramaQueryExtension=yes
+ ac_cv_lib_Xinerama_pic_XineramaQueryExtension=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_Xinerama_XineramaQueryExtension=no
+ac_cv_lib_Xinerama_pic_XineramaQueryExtension=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaQueryExtension" >&5
-echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaQueryExtension" >&6
-if test $ac_cv_lib_Xinerama_XineramaQueryExtension = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_pic_XineramaQueryExtension" >&5
+echo "${ECHO_T}$ac_cv_lib_Xinerama_pic_XineramaQueryExtension" >&6
+if test $ac_cv_lib_Xinerama_pic_XineramaQueryExtension = yes; then
echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5
echo $ECHO_N "checking for X11/extensions/Xinerama.h... $ECHO_C" >&6
if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then

1218
debian/patches/001_gtk+-ximian-gtk2-filesel-navbutton-5.patch vendored
View File

File diff suppressed because it is too large Load Diff

26
debian/patches/002_gtk+-debian-freetype.patch vendored
View File

@ -1,26 +0,0 @@
diff -Nru gtk+-2.2.4.orig/configure gtk+-2.2.4/configure
--- gtk+-2.2.4.orig/configure 2003-12-26 15:02:48.427829000 +0000
+++ gtk+-2.2.4/configure 2003-12-26 15:41:00.350762731 +0000
@@ -24745,7 +24745,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
#include FT_ERRORS_H
int
diff -Nru gtk+-2.2.4.orig/configure.in gtk+-2.2.4/configure.in
--- gtk+-2.2.4.orig/configure.in 2003-12-26 15:02:48.324791000 +0000
+++ gtk+-2.2.4/configure.in 2003-12-26 15:36:27.533900776 +0000
@@ -964,7 +964,8 @@
AC_MSG_CHECKING([For sufficiently new FreeType (at least 2.0.1)])
AC_TRY_COMPILE([
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
#include FT_ERRORS_H
],
[(void)1;],:,have_freetype=false)

2
debian/scripts/vars vendored
View File

@ -8,7 +8,7 @@
SOURCE_DIR=build-tree
# For a single pkg, this is the directory that is embedded in the tarball.
# For multiple pkgs, this is null.
TAR_DIR=gtk+-2.2.4
TAR_DIR=gtk+-2.4.0
# Where to place all the stamp files. This directory can be removed, and
# all the targets will then be rerun.
STAMP_DIR=debian/stampdir

2
debian/sources vendored
View File

@ -1 +1 @@
upstream tar ../gtk+-2.2.4.tar.gz
upstream tar ../gtk+-2.4.0.tar.gz

2
debian/watch vendored
View File

@ -1,4 +1,4 @@
version=2
ftp://ftp.gnome.org/pub/GNOME/sources/gtk+/2.2/ \
ftp://ftp.gnome.org/pub/GNOME/sources/gtk+/2.4/ \
gtk\+-(.*)\.tar\.gz \
debian uupdate