The following commit has been merged in the ubuntu-natty-3.3.1 branch:
commit 381cdb52dd54911d27dd8914ec064b319115ecf5
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Tue Feb 15 11:12:30 2011 +0100
starting work on 3.3.1~rc1-3ubuntu1
removing superfluous patch file fix-mesa-headers-check.diff
diff --git a/patches/fix-mesa-headers-check.diff
b/patches/fix-mesa-headers-check.diff
deleted file mode 100644
index 20b1744..0000000
--- a/patches/fix-mesa-headers-check.diff
+++ /dev/null
@@ -1,104 +0,0 @@
---- /dev/null 2010-12-28 14:11:38.191102592 +0100
-+++
libreoffice-3.3.0/libreoffice-build/patches/dev300/fix-mesa-headers-check.diff
2010-12-29 21:25:14.000000000 +0100
-@@ -0,0 +1,90 @@
-+diff --git a/configure.in b/configure.in
-+index e431cbf..5fbe4d3 100644
-+--- configure.in
-++++ configure.in
-+@@ -5564,26 +5564,6 @@
-+ AC_SUBST(ENABLE_RANDR)
-+
-+ dnl ===================================================================
-+-dnl Check for system Mesa
-+-dnl ===================================================================
-+-AC_MSG_CHECKING([which Mesa headers to use])
-+-if test "$with_system_mesa_headers" = "no"; then
-+- AC_MSG_RESULT([internal])
-+- SYSTEM_MESA_HEADERS=NO
-+- BUILD_TYPE="$BUILD_TYPE MESA"
-+-else
-+- AC_MSG_RESULT([external])
-+- SYSTEM_MESA_HEADERS=YES
-+- AC_LANG_PUSH(C)
-+- AC_CHECK_HEADER(GL/glxext.h, [],
-+- [ AC_MSG_ERROR(mesa headers not found.)], [#include <GL/glx.h>])
-+- AC_MSG_CHECKING([whether GL/glxext.h defines PFNGLXBINDTEXIMAGEEXTPROC])
-+- AC_EGREP_HEADER(PFNGLXBINDTEXIMAGEEXTPROC, GL/glxext.h,
[AC_MSG_RESULT([yes])], AC_MSG_ERROR(no))
-+- AC_LANG_POP(C)
-+-fi
-+-AC_SUBST(SYSTEM_MESA_HEADERS)
-+-
-+-dnl ===================================================================
-+ dnl Check for building neon
-+ dnl ===================================================================
-+ AC_MSG_CHECKING([whether to use neon])
-+@@ -6330,22 +6316,45 @@ dnl
===================================================================
-+ AC_MSG_CHECKING([whether to build the OpenGL Transitions component])
-+ ENABLE_OPENGL=
-+
-+-if test "x$enable_opengl" != "xno" ; then
-+- save_LDFLAGS=$LDFLAGS
-+- LDFLAGS="$LDFLAGS -lm"
-+- AC_MSG_RESULT([yes])
-+- AC_CHECK_HEADER(GL/gl.h, [],
-+- [AC_MSG_ERROR([OpenGL headers not found])], [])
-+- AC_CHECK_LIB(GL, main, [],
-+- [AC_MSG_ERROR(libGL not installed or functional)], [])
-+- AC_CHECK_LIB(GLU, main, [],
-+- [AC_MSG_ERROR(libGLU not installed or functional)], [])
-+- ENABLE_OPENGL=TRUE
-+- LDFLAGS=$save_LDFLAGS
-++ if test "x$enable_opengl" != "xno" ; then
-++ if test "$_os" != "WINNT"; then
-++ save_LDFLAGS=$LDFLAGS
-++ LDFLAGS="$LDFLAGS -lm"
-++ AC_MSG_RESULT([yes])
-++ AC_CHECK_LIB(GL, main, [],
-++ [AC_MSG_ERROR(libGL not installed or functional)], [])
-++ AC_CHECK_LIB(GLU, main, [],
-++ [AC_MSG_ERROR(libGLU not installed or functional)], [])
-++ ENABLE_OPENGL=TRUE
-++ LDFLAGS=$save_LDFLAGS
-++
-++ dnl
===================================================================
-++ dnl Check for system Mesa
-++ dnl
===================================================================
-++ AC_MSG_CHECKING([which Mesa headers to use])
-++ if test -n "$with_system_mesa_headers" -o -n "$with_system_headers"
&& \
-++ test "$with_system_mesa_headers" != "no"; then
-++ AC_MSG_RESULT([external])
-++ SYSTEM_MESA_HEADERS=YES
-++ AC_LANG_PUSH(C)
-++ AC_CHECK_HEADER(GL/glxext.h, [],
-++ [ AC_MSG_ERROR(mesa headers not found.)], [#include <GL/glx.h>])
-++ AC_MSG_CHECKING([whether GL/glxext.h defines
PFNGLXBINDTEXIMAGEEXTPROC])
-++ AC_EGREP_HEADER(PFNGLXBINDTEXIMAGEEXTPROC, GL/glxext.h,
[AC_MSG_RESULT([yes])], AC_MSG_ERROR(no))
-++ AC_LANG_POP(C)
-++ else
-++ AC_MSG_RESULT([internal])
-++ SYSTEM_MESA_HEADERS=NO
-++ BUILD_TYPE="$BUILD_TYPE MESA"
-++ fi
-++ else
-++ AC_MSG_RESULT([not on windows])
-++ fi
-+ else
-+- AC_MSG_RESULT([no])
-++ AC_MSG_RESULT([no])
-+ fi
-+
-++AC_SUBST(SYSTEM_MESA_HEADERS)
-+ AC_SUBST(ENABLE_OPENGL)
-+
-+ AC_MSG_CHECKING([whether to build extra presenter ui])
---- libreoffice-3.3.0/libreoffice-build/patches/dev300/apply-old
2010-12-29 21:27:25.000000000 +0100
-+++ libreoffice-3.3.0/libreoffice-build/patches/dev300/apply 2010-12-29
21:27:48.000000000 +0100
-@@ -1548,6 +1548,8 @@
-
- transogl-more-transitions.diff
-
-+fix-mesa-headers-check.diff
-+
- [ OpenGLTransitionsMesa703 ]
-
- # very hacky build fix for Mesa-7.0.3; used on openSUSE-10.2
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ppjjp-0000gw...@alioth.debian.org
