Package: gtkglext
Severity: normal
Tags: patch
Since you appear to be inactive, I went ahead with an NMU for
#359688/#360401. I'm including the full patch here, though it differs
from the one I sent to those bugs only in adding a changelog entry
(and some accidental whitespace changes to gdkglenumtypes.[ch] --
evidently "make clean" doesn't quite yield the original state after
all :-/).
-- System Information:
Debian Release: testing/unstable
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'stable'), (300, 'unstable'), (300,
'testing')
Architecture: amd64 (x86_64)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.16.1
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
diff -u gtkglext-1.0.6/configure gtkglext-1.0.6/configure
--- gtkglext-1.0.6/configure
+++ gtkglext-1.0.6/configure
@@ -20080,20 +20080,20 @@
echo "$as_me:$LINENO: checking for \
gtk+-2.0 >= 2.0.0 \
gdk-2.0 >= 2.0.0 \
-pango >= 1.0.0 \
+pangox >= 1.0.0 \
gmodule-2.0 >= 2.0.0 \
" >&5
echo $ECHO_N "checking for \
gtk+-2.0 >= 2.0.0 \
gdk-2.0 >= 2.0.0 \
-pango >= 1.0.0 \
+pangox >= 1.0.0 \
gmodule-2.0 >= 2.0.0 \
... $ECHO_C" >&6
if $PKG_CONFIG --exists "\
gtk+-2.0 >= 2.0.0 \
gdk-2.0 >= 2.0.0 \
-pango >= 1.0.0 \
+pangox >= 1.0.0 \
gmodule-2.0 >= 2.0.0 \
" ; then
echo "$as_me:$LINENO: result: yes" >&5
@@ -20105,7 +20105,7 @@
BASE_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "\
gtk+-2.0 >= 2.0.0 \
gdk-2.0 >= 2.0.0 \
-pango >= 1.0.0 \
+pangox >= 1.0.0 \
gmodule-2.0 >= 2.0.0 \
"`
echo "$as_me:$LINENO: result: $BASE_DEPENDENCIES_CFLAGS" >&5
@@ -20116,7 +20116,7 @@
BASE_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "\
gtk+-2.0 >= 2.0.0 \
gdk-2.0 >= 2.0.0 \
-pango >= 1.0.0 \
+pangox >= 1.0.0 \
gmodule-2.0 >= 2.0.0 \
"`
echo "$as_me:$LINENO: result: $BASE_DEPENDENCIES_LIBS" >&5
@@ -20129,7 +20129,7 @@
BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout
--print-errors "\
gtk+-2.0 >= 2.0.0 \
gdk-2.0 >= 2.0.0 \
-pango >= 1.0.0 \
+pangox >= 1.0.0 \
gmodule-2.0 >= 2.0.0 \
"`
echo $BASE_DEPENDENCIES_PKG_ERRORS
@@ -20149,13 +20149,13 @@
{ { echo "$as_me:$LINENO: error: Library requirements (\
gtk+-2.0 >= 2.0.0 \
gdk-2.0 >= 2.0.0 \
-pango >= 1.0.0 \
+pangox >= 1.0.0 \
gmodule-2.0 >= 2.0.0 \
) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your
libraries are in a nonstandard prefix so pkg-config can find them." >&5
echo "$as_me: error: Library requirements (\
gtk+-2.0 >= 2.0.0 \
gdk-2.0 >= 2.0.0 \
-pango >= 1.0.0 \
+pangox >= 1.0.0 \
gmodule-2.0 >= 2.0.0 \
) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your
libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
{ (exit 1); exit 1; }; }
@@ -22034,7 +22034,7 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -22061,7 +22061,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
for ac_dir in $ac_x_header_dirs; do
- if test -r "$ac_dir/X11/Intrinsic.h"; then
+ if test -r "$ac_dir/X11/Xlib.h"; then
ac_x_includes=$ac_dir
break
fi
@@ -22075,18 +22075,18 @@
# See if we find them without any special options.
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
- LIBS="-lXt $LIBS"
+ LIBS="-lX11 $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
int
main ()
{
-XtMalloc (0)
+XrmInitialize ()
;
return 0;
}
@@ -22124,7 +22124,7 @@
do
# Don't even attempt the hair of trying to link an X program!
for ac_extension in a so sl; do
- if test -r $ac_dir/libXt.$ac_extension; then
+ if test -r $ac_dir/libX11.$ac_extension; then
ac_x_libraries=$ac_dir
break 2
fi
@@ -25497,7 +25497,7 @@
# CFLAGS and LIBS
##################################################
-GDKGLEXT_PACKAGES="gdk-2.0 pango gmodule-2.0"
+GDKGLEXT_PACKAGES="gdk-2.0 pangox gmodule-2.0"
GDKGLEXT_EXTRA_CFLAGS="$GL_CFLAGS $GDKGLEXT_WIN_CFLAGS"
GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GDKGLEXT_WIN_LIBS"
GDKGLEXT_DEP_CFLAGS="$GDKGLEXT_EXTRA_CFLAGS `$PKG_CONFIG --cflags
$GDKGLEXT_PACKAGES`"
diff -u gtkglext-1.0.6/debian/changelog gtkglext-1.0.6/debian/changelog
--- gtkglext-1.0.6/debian/changelog
+++ gtkglext-1.0.6/debian/changelog
@@ -1,3 +1,15 @@
+gtkglext (1.0.6-2.1) unstable; urgency=medium
+
+ * NMU to fix an RC bug that's causing several other packages to FTBFS.
+ (The official maintainer appears to be inactive, so there's no sense
+ in waiting further.)
+ * configure.in: change pango_pkg from pango to pangox to ensure that
+ libgdkglext-x11-1.0.so.0 links against everything it needs. (Closes:
+ #359688).
+ * configure: regenerated.
+
+ -- Aaron M. Ucko <[EMAIL PROTECTED]> Tue, 4 Apr 2006 20:06:51 -0400
+
gtkglext (1.0.6-2) unstable; urgency=medium
* urgency=medium: this is making other packages FTBFS.
only in patch2:
unchanged:
--- gtkglext-1.0.6.orig/gdk/gdkglenumtypes.c
+++ gtkglext-1.0.6/gdk/gdkglenumtypes.c
@@ -52,7 +52,6 @@
}
return etype;
}
-
GType
gdk_gl_config_caveat_get_type (void)
{
@@ -69,7 +68,6 @@
}
return etype;
}
-
GType
gdk_gl_visual_type_get_type (void)
{
@@ -89,7 +87,6 @@
}
return etype;
}
-
GType
gdk_gl_transparent_type_get_type (void)
{
@@ -105,7 +102,6 @@
}
return etype;
}
-
GType
gdk_gl_drawable_type_mask_get_type (void)
{
@@ -121,7 +117,6 @@
}
return etype;
}
-
GType
gdk_gl_render_type_mask_get_type (void)
{
@@ -136,7 +131,6 @@
}
return etype;
}
-
GType
gdk_gl_buffer_mask_get_type (void)
{
@@ -157,7 +151,6 @@
}
return etype;
}
-
GType
gdk_gl_config_error_get_type (void)
{
@@ -177,7 +170,6 @@
}
return etype;
}
-
GType
gdk_gl_render_type_get_type (void)
{
@@ -192,7 +184,6 @@
}
return etype;
}
-
GType
gdk_gl_drawable_attrib_get_type (void)
{
@@ -210,7 +201,6 @@
}
return etype;
}
-
GType
gdk_gl_pbuffer_attrib_get_type (void)
{
@@ -227,7 +217,6 @@
}
return etype;
}
-
GType
gdk_gl_event_mask_get_type (void)
{
@@ -241,7 +230,6 @@
}
return etype;
}
-
GType
gdk_gl_event_type_get_type (void)
{
@@ -256,7 +244,6 @@
}
return etype;
}
-
GType
gdk_gl_drawable_type_get_type (void)
{
@@ -272,7 +259,6 @@
return etype;
}
-
/* enumerations from "gdkglconfig.h" */
GType
gdk_gl_config_mode_get_type (void)
@@ -298,6 +284,5 @@
return etype;
}
-
/* Generated data ends here */
only in patch2:
unchanged:
--- gtkglext-1.0.6.orig/gdk/gdkglenumtypes.h
+++ gtkglext-1.0.6/gdk/gdkglenumtypes.h
@@ -7,56 +7,38 @@
#include <glib-object.h>
G_BEGIN_DECLS
-
/* enumerations from "gdkgltokens.h" */
-
GType gdk_gl_config_attrib_get_type (void);
#define GDK_TYPE_GL_CONFIG_ATTRIB (gdk_gl_config_attrib_get_type())
-
GType gdk_gl_config_caveat_get_type (void);
#define GDK_TYPE_GL_CONFIG_CAVEAT (gdk_gl_config_caveat_get_type())
-
GType gdk_gl_visual_type_get_type (void);
#define GDK_TYPE_GL_VISUAL_TYPE (gdk_gl_visual_type_get_type())
-
GType gdk_gl_transparent_type_get_type (void);
#define GDK_TYPE_GL_TRANSPARENT_TYPE (gdk_gl_transparent_type_get_type())
-
GType gdk_gl_drawable_type_mask_get_type (void);
#define GDK_TYPE_GL_DRAWABLE_TYPE_MASK (gdk_gl_drawable_type_mask_get_type())
-
GType gdk_gl_render_type_mask_get_type (void);
#define GDK_TYPE_GL_RENDER_TYPE_MASK (gdk_gl_render_type_mask_get_type())
-
GType gdk_gl_buffer_mask_get_type (void);
#define GDK_TYPE_GL_BUFFER_MASK (gdk_gl_buffer_mask_get_type())
-
GType gdk_gl_config_error_get_type (void);
#define GDK_TYPE_GL_CONFIG_ERROR (gdk_gl_config_error_get_type())
-
GType gdk_gl_render_type_get_type (void);
#define GDK_TYPE_GL_RENDER_TYPE (gdk_gl_render_type_get_type())
-
GType gdk_gl_drawable_attrib_get_type (void);
#define GDK_TYPE_GL_DRAWABLE_ATTRIB (gdk_gl_drawable_attrib_get_type())
-
GType gdk_gl_pbuffer_attrib_get_type (void);
#define GDK_TYPE_GL_PBUFFER_ATTRIB (gdk_gl_pbuffer_attrib_get_type())
-
GType gdk_gl_event_mask_get_type (void);
#define GDK_TYPE_GL_EVENT_MASK (gdk_gl_event_mask_get_type())
-
GType gdk_gl_event_type_get_type (void);
#define GDK_TYPE_GL_EVENT_TYPE (gdk_gl_event_type_get_type())
-
GType gdk_gl_drawable_type_get_type (void);
#define GDK_TYPE_GL_DRAWABLE_TYPE (gdk_gl_drawable_type_get_type())
-
/* enumerations from "gdkglconfig.h" */
-
GType gdk_gl_config_mode_get_type (void);
#define GDK_TYPE_GL_CONFIG_MODE (gdk_gl_config_mode_get_type())
-
G_END_DECLS
#endif /* __GDK_GL_ENUM_TYPES_H__ */
only in patch2:
unchanged:
--- gtkglext-1.0.6.orig/configure.in
+++ gtkglext-1.0.6/configure.in
@@ -56,7 +56,7 @@
m4_define([gmodule_required_version], [2.0.0])
# Pango
-m4_define([pango_pkg], [pango])
+m4_define([pango_pkg], [pangox])
m4_define([pango_required_version], [1.0.0])
# PangoFT2
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
