Hi, Is there someone around to upload a fixed package or sponsor a NMU ?
There is a source package at http://www.imalip.info/amaya/9.2.1-6.1/ with the attached patch applied, and the following new changelog entry : ----8<------------------------------------------------- amaya (9.2.1-6.1) unstable; urgency=low * NMU for xlibs-dev transition + Replace xlibs-dev build-dependency by libxt-dev, libx11-dev, libxinerama-dev and libxxf86vm-dev (Closes: #346632) * Build-depend on libfreetype6-dev. (Closes: #340289) * Pass --with-gl option when running configure script. This makes the amaya binary link against the system-provided libGL and libGLU instead of building Mesa and linking against the built lib. (Closes: #348706, #348705) * Pass --disable-rpath option when configuring wxWidgets. With the previous change, there is no more rpath set. (Closes: #341424) * When calling make, set the HOME environment variable to the build directory, so tools can safely write in it. (Closes: #336014) * Apply a patch stolen from upstream CVS to wxWidgets/src/gtk/window.cpp, wxWidgets can build against GTK+ 2.8. * Remove debian/amaya.doc-base.EX and add debian/amaya.links, fixing 2 lintian warnings. ----8<------------------------------------------------- Also, I am a bit of a masochist, so I packaged amaya 9.3. I will try to make the package available tomorrow evening, if anyone is interested. HTH, Regis On Fri, 2006-01-13 at 10:04 +0100, Amaya wrote: > Anand Kumria wrote: > > Hmm -- it compiled before, so you seem to have a interesting version > > of libpango > > Isn't it cool to realize pbuilder was pointing to testing for some > wicked reason? I am full of joy. > > > Unless you are a masochist, you don't want to be touching a new > > upstream. > > I slightly tried and realized I am not enough of a masochist, and also > there is plenty of work to do... > > I am going to try to fix my pbuilder setup and give it a run. I'll keep > you updated on this. (I still want to do this. Just because it is > recursive and cute and wiked and schizophreniac) LOL >
diff -urN -x changelog amaya-9.2.1-6/Amaya/configure amaya-9.2.1-6.1/Amaya/configure
--- amaya-9.2.1-6/Amaya/configure 2005-08-13 01:29:25.000000000 +0100
+++ amaya-9.2.1-6.1/Amaya/configure 2006-01-31 23:01:36.255538552 +0000
@@ -13703,7 +13703,7 @@
# --enable-unicode compile wxString with Unicode support
# --with-gtk use GTK+
# --with-opengl use OpenGL (or Mesa)
- WXCONFIGURE_OPTION="--with-opengl --with-gtk --enable-gtk2 --enable-unicode --enable-ipc --disable-shared --with-libpng=builtin --with-libjpeg=builtin --with-libtiff=builtin $WXCONFIGURE_TUNNING_OPTION"
+ WXCONFIGURE_OPTION="--with-opengl --with-gtk --enable-gtk2 --enable-unicode --enable-ipc --disable-shared --with-libpng=builtin --with-libjpeg=builtin --with-libtiff=builtin $WXCONFIGURE_TUNNING_OPTION --disable-rpath"
fi
if test "$AMAYAOS" = "MACOSX" ; then
# MACOSX
diff -urN -x changelog amaya-9.2.1-6/debian/amaya.doc-base.EX amaya-9.2.1-6.1/debian/amaya.doc-base.EX
--- amaya-9.2.1-6/debian/amaya.doc-base.EX 2006-01-31 22:57:38.733647368 +0000
+++ amaya-9.2.1-6.1/debian/amaya.doc-base.EX 1970-01-01 01:00:00.000000000 +0100
@@ -1,22 +0,0 @@
-Document: amaya
-Title: Debian amaya Manual
-Author: <insert document author here>
-Abstract: This manual describes what amaya is
- and how it can be used to
- manage online manuals on Debian systems.
-Section: unknown
-
-Format: debiandoc-sgml
-Files: /usr/share/doc/amaya/amaya.sgml.gz
-
-Format: postscript
-Files: /usr/share/doc/amaya/amaya.ps.gz
-
-Format: text
-Files: /usr/share/doc/amaya/amaya.text.gz
-
-Format: HTML
-Index: /usr/share/doc/amaya/html/index.html
-Files: /usr/share/doc/amaya/html/*.html
-
-
diff -urN -x changelog amaya-9.2.1-6/debian/amaya.links amaya-9.2.1-6.1/debian/amaya.links
--- amaya-9.2.1-6/debian/amaya.links 1970-01-01 01:00:00.000000000 +0100
+++ amaya-9.2.1-6.1/debian/amaya.links 2006-01-31 23:01:36.647478968 +0000
@@ -0,0 +1 @@
+usr/share/man/man1/amaya.1 usr/share/man/man1/amaya-wx.1
diff -urN -x changelog amaya-9.2.1-6/debian/control amaya-9.2.1-6.1/debian/control
--- amaya-9.2.1-6/debian/control 2006-01-31 22:57:38.736646912 +0000
+++ amaya-9.2.1-6.1/debian/control 2006-01-31 23:01:36.648478816 +0000
@@ -2,7 +2,7 @@
Section: web
Priority: optional
Maintainer: Anand Kumria <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), automake1.7, libgtk2.0-dev, libpng12-dev, libjpeg62-dev, xlibs-dev (>> 4.1.0), libglu1-xorg-dev, xutils
+Build-Depends: debhelper (>= 4.0.0), automake1.7, libgtk2.0-dev, libpng12-dev, libjpeg62-dev, libglu1-xorg-dev, libxt-dev, , libx11-dev, libxinerama-dev, libxxf86vm-dev, libfreetype6-dev, xutils
Standards-Version: 3.6.2.1
Package: amaya
diff -urN -x changelog amaya-9.2.1-6/debian/rules amaya-9.2.1-6.1/debian/rules
--- amaya-9.2.1-6/debian/rules 2006-01-31 22:57:38.737646760 +0000
+++ amaya-9.2.1-6.1/debian/rules 2006-01-31 23:01:36.647478968 +0000
@@ -40,7 +40,7 @@
# Add here commands to configure the package.
mkdir -p Amaya/WX
cd Amaya/WX && \
- ../configure --prefix=/usr --with-wx --with-dav \
+ ../configure --prefix=/usr --with-wx --with-gl --with-dav \
--enable-offical-build && \
cd ../..
# --libpng, libjpeg, libtiff (currently builtin)
@@ -58,7 +58,7 @@
# Add here commands to compile the arch part of the package.
cd Amaya/WX && \
- $(MAKE) CFLAGS="$(CFLAGS)" && \
+ HOME="$(CURDIR)/Amaya/WX" $(MAKE) CFLAGS="$(CFLAGS)" && \
cd ../..
touch build-arch-stamp
diff -urN -x changelog amaya-9.2.1-6/wxWidgets/src/gtk/window.cpp amaya-9.2.1-6.1/wxWidgets/src/gtk/window.cpp
--- amaya-9.2.1-6/wxWidgets/src/gtk/window.cpp 2005-08-13 01:29:47.000000000 +0100
+++ amaya-9.2.1-6.1/wxWidgets/src/gtk/window.cpp 2006-01-31 23:01:36.642479728 +0000
@@ -4280,12 +4280,10 @@
return gtk_widget_get_pango_context( m_widget );
}
+// MR: Returns the same as GtkGetPangoDefaultContext until the symbol can be removed in 2.7.x
PangoContext *wxWindowGTK::GtkGetPangoX11Context()
{
- if (!m_x11Context)
- m_x11Context = pango_x_get_context( gdk_display );
-
- return m_x11Context;
+ return gtk_widget_get_pango_context( m_widget );
}
#endif
signature.asc
Description: This is a digitally signed message part
