Package: xfe
Version: 1.32.4-1
Severity: minor
Tags: patch
User: debian-...@lists.debian.org
Usertags: ld-as-needed
*** /tmp/tmpOf2Xe0
xfe fails to build from source if the --as-needed flag is passed to ld as the
library libX11 comes before the objects that use them
causing it to not be registered as needed and dropped. --as-needed is now
passed by default when building packages for Ubuntu.
The attached patch resolves the issue by correctly using LIBS rather than
LDFLAGS for adding libraries, reordering the command
line. This has been raised upstream at
https://sourceforge.net/tracker/?func=detail&aid=3344570&group_id=64835&atid=508822
-- System Information:
Debian Release: squeeze/sid
APT prefers natty-updates
APT policy: (500, 'natty-updates'), (500, 'natty-security'), (500, 'natty')
Architecture: i386 (i686)
Kernel: Linux 2.6.38-8-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
=== added directory '.pc/11_ld-as-needed.patch'
=== added file '.pc/11_ld-as-needed.patch/.timestamp'
=== added file '.pc/11_ld-as-needed.patch/configure.ac'
--- .pc/11_ld-as-needed.patch/configure.ac 1970-01-01 00:00:00 +0000
+++ .pc/11_ld-as-needed.patch/configure.ac 2011-06-29 21:47:06 +0000
@@ -0,0 +1,253 @@
+#
+# Script for autoconf 2.61 or later
+#
+
+# Initialize
+AC_INIT([xfe], [1.32.4])
+AC_CONFIG_SRCDIR([src/XFileExplorer.cpp])
+AM_INIT_AUTOMAKE
+AM_CONFIG_HEADER([config.h])
+
+
+# Test if compilation variables are already set and if not, reset them
+# This mechanism prevents these variables to be changed by the following AC
macros
+# while still allowing to use user's variables if they are defined
+if test "$CXXFLAGS" = ""; then
+CXXFLAGS=""
+fi
+if test "$CFLAGS" = ""; then
+CFLAGS=""
+fi
+
+# Minimal LDFLAGS
+LDFLAGS="$LDFLAGS -lX11"
+
+# Is this really necessary?
+AC_USE_SYSTEM_EXTENSIONS
+
+# Checks for programs
+AC_PROG_CC
+AC_PROG_CXX
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+
+
+# Internationalization
+IT_PROG_INTLTOOL
+GETTEXT_PACKAGE=xfe
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The package name, for
gettext])
+AM_GNU_GETTEXT
+
+
+# Checks for header files.
+AC_PATH_X
+AC_FUNC_ALLOCA
+AC_HEADER_DIRENT
+AC_HEADER_STDC
+AC_HEADER_SYS_WAIT
+AC_CHECK_HEADERS([fcntl.h mntent.h stdlib.h string.h sys/ioctl.h sys/statfs.h
sys/time.h unistd.h utime.h])
+
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_HEADER_STDBOOL
+AC_C_CONST
+AC_TYPE_UID_T
+AC_C_INLINE
+AC_TYPE_MODE_T
+AC_TYPE_PID_T
+AC_TYPE_SIZE_T
+AC_CHECK_MEMBERS([struct stat.st_rdev])
+AC_HEADER_TIME
+AC_STRUCT_TM
+
+
+# Checks for library functions.
+AC_FUNC_CHOWN
+AC_FUNC_CLOSEDIR_VOID
+AC_FUNC_ERROR_AT_LINE
+AC_FUNC_FORK
+AC_FUNC_GETGROUPS
+AC_FUNC_GETMNTENT
+AC_FUNC_LSTAT
+AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
+AC_FUNC_MALLOC
+AC_FUNC_MKTIME
+AC_FUNC_REALLOC
+AC_FUNC_STAT
+AC_FUNC_UTIME_NULL
+AC_CHECK_FUNCS([endgrent endpwent gethostname getmntent gettimeofday lchown
memset mkdir mkfifo putenv rmdir setlocale sqrt strchr strdup strerror strstr
strtol strtoul strtoull utime])
+
+
+# Large files support
+AC_SYS_LARGEFILE
+
+
+# Check for FOX 1.6
+AC_CHECK_LIB(FOX-1.6,fxfindfox,,AC_MSG_ERROR("libFOX-1.6 not found"))
+
+
+# Check for FOX 1.6 header files
+AC_HEADER_STDC
+AC_LANG_CPLUSPLUS
+AC_CHECK_HEADER(fox-1.6/fx.h,,AC_MSG_ERROR("fox-1.6/fx.h not found"))
+
+
+# Check if fox-config exists
+AC_CHECK_PROGS(FOX_CONFIG,fox-config-1.6 fox-1.6-config fox-config)
+if test no"$FOX_CONFIG" = no ; then
+ AC_MSG_ERROR("fox-config not found")
+fi
+
+
+# Include flags for the FOX library
+FOXCFLAGS=`$FOX_CONFIG --cflags`
+CXXFLAGS="${CXXFLAGS} $FOXCFLAGS"
+
+
+# Check if FOX was compiled with xft support
+TEST_XFT=`$FOX_CONFIG --libs | grep Xft`
+if test "x$TEST_XFT" != "x" ; then
+
+ echo "checking whether FOX was compiled with Xft support... yes"
+
+ # Check for FreeType2 headers
+ freetype_config=''
+ AC_CHECK_PROGS(freetype_config,freetype-config,)
+ if test -n "$freetype_config"; then
+ freetype_cflags=`$freetype_config --cflags`
+ freetype_libs=`$freetype_config --libs`
+ LDFLAGS="$LDFLAGS $freetype_libs"
+ CPPFLAGS="$freetype_cflags $CPPFLAGS"
+ fi
+ AC_CHECK_HEADER(freetype/config/ftheader.h,,AC_MSG_ERROR("ftheader.h
not found"))
+
+ # Check for Xft headers
+ xft_config=''
+ AC_CHECK_PROGS(xft_config,xft-config,)
+ if test -n "$xft_config"; then
+ xft_cflags=`$xft_config --cflags`
+ xft_libs=`$xft_config --libs`
+ LDFLAGS="$LDFLAGS $xft_libs"
+ CPPFLAGS="$xft_cflags $CPPFLAGS"
+ CXXFLAGS="${CXXFLAGS} -DHAVE_XFT_H"
+ else
+ # On some systems (e.g. Fedora) xft-config is deprecated and
pkg-config should be used instead
+ pkg_config=''
+ AC_CHECK_PROGS(pkg_config,pkg-config,)
+ if test -n "$pkg_config"; then
+ xft_cflags=`$pkg_config --cflags xft`
+ xft_libs=`$pkg_config --libs xft`
+ LDFLAGS="$LDFLAGS $xft_libs"
+ CPPFLAGS="$xft_cflags $CPPFLAGS"
+ CXXFLAGS="${CXXFLAGS} -DHAVE_XFT_H"
+ fi
+ fi
+ AC_CHECK_HEADER(X11/Xft/Xft.h,,AC_MSG_ERROR("Xft.h not found"))
+
+else
+ echo "checking whether FOX was compiled with Xft support... no"
+fi
+
+
+# Check for Xlib headers
+AC_CHECK_HEADER(X11/Xlib.h,,AC_MSG_ERROR("Xlib.h not found"))
+
+
+# Check for libPNG
+AC_CHECK_LIB(png, png_read_info,,AC_MSG_ERROR("libPNG not found"))
+AC_CHECK_HEADER(png.h,,AC_MSG_ERROR("png.h not found"))
+
+
+# Check for startup notification support
+AC_MSG_CHECKING(for startup notification)
+AC_ARG_ENABLE(sn,[ --disable-sn compile without startup
notification support])
+AC_MSG_RESULT([$enable_sn])
+AC_SUBST(STARTUPNOTIFY,false)
+if test "x$enable_sn" != "xno"; then
+ CXXFLAGS="${CXXFLAGS} -DSTARTUP_NOTIFICATION"
+ AC_SUBST(STARTUPNOTIFY,true)
+ enable_sn=yes
+fi
+AM_CONDITIONAL(STARTUPNOTIFY, [test x$enable_sn = xyes])
+
+
+# Building for debugging
+AC_MSG_CHECKING(for debugging)
+AC_ARG_ENABLE(debug,[ --enable-debug compile for debugging])
+AC_MSG_RESULT([$enable_debug])
+
+
+# Building for release
+AC_MSG_CHECKING(for release build)
+AC_ARG_ENABLE(release,[ --enable-release compile for release (advanced
optimizations)])
+AC_MSG_RESULT([$enable_release])
+
+
+# Setting CXXFLAGS
+if test "x$enable_debug" = "xyes" ; then
+ CXXFLAGS="${CXXFLAGS} -Wall -g -DDEBUG"
+elif test "x$enable_release" = "xyes" ; then
+ CXXFLAGS="-DNDEBUG ${CXXFLAGS} "
+ if test "${GXX}" = "yes" ; then
+ CXXFLAGS="-O3 -Wuninitialized -ffast-math -fomit-frame-pointer
-fno-strict-aliasing ${CXXFLAGS}"
+ fi
+else
+ CXXFLAGS="-O2 ${CXXFLAGS}"
+fi
+
+
+# Setting CFLAGS
+if test "x$enable_debug" = "xyes" ; then
+ CFLAGS="${CFLAGS} -Wall -g -DDEBUG"
+elif test "x$enable_release" = "xyes" ; then
+ CFLAGS="-DNDEBUG ${CFLAGS}"
+ if test "${GCC}" = "yes" ; then
+ CFLAGS="-O3 -Wuninitialized -ffast-math -fomit-frame-pointer
-fno-strict-aliasing ${CFLAGS}"
+ fi
+else
+ CFLAGS="-O2 ${CFLAGS}"
+fi
+
+
+# Output
+AC_OUTPUT(Makefile intl/Makefile m4/Makefile po/Makefile.in xfe.spec xferc
xfe.desktop.in xfi.desktop.in xfv.desktop.in
+ xfw.desktop.in xfp.desktop.in makesfx.sh sfx.sh header.sh
src/Makefile
+ icons/Makefile icons/xfe-theme/Makefile icons/gnome-theme/Makefile
+ icons/xfce-theme/Makefile icons/gnomeblue-theme/Makefile
+ icons/windows-theme/Makefile icons/brown-theme/Makefile
icons/blue-theme/Makefile
+ icons/tango-theme/Makefile icons/kde-theme/Makefile)
+
+
+# Display CXXFLAGS, CFLAGS and LDFLAGS
+echo ""
+echo "======================== Compiler and linker flags
========================"
+echo "CXXFLAGS=$CXXFLAGS"
+echo "CFLAGS=$CFLAGS"
+echo "LDFLAGS=$LDFLAGS"
+echo
"==========================================================================="
+
+
+# Warning message about Xft support
+if test "x$TEST_XFT" == "x" ; then
+ echo ""
+ echo "==================================== Warning
================================================"
+ echo "Configure has detected that your FOX library was compiled without
Xft support."
+ echo "You will not have antialiased fonts in Xfe, and non UTF-8 strings
could be wrongly displayed."
+ echo "If this is what you want, you can safely ignore what follows."
+ echo "If not, you have to enable Xft support in FOX and recompile it."
+ echo " Do: './configure --with-xft' to enable Xft support in
FOX."
+ echo " Then : 'make' to compile the FOX library."
+ echo " And: 'make install' (as root) to install it."
+ echo
"============================================================================================="
+fi
+
+
+echo ""
+echo "Configure finished!"
+echo " Do: 'make' to compile Xfe."
+echo " Then: 'make install' (as root) to install Xfe."
+echo ""
+
+
=== modified file '.pc/applied-patches'
--- .pc/applied-patches 2011-06-15 20:19:08 +0000
+++ .pc/applied-patches 2011-06-29 21:47:06 +0000
@@ -8,3 +8,4 @@
08_libreoffice-support-in-xferc.patch
09_preference-imageviewer.patch
10_xournal-support-in-xferc.patch
+11_ld-as-needed.patch
=== modified file 'configure.ac'
--- configure.ac 2011-06-15 20:19:08 +0000
+++ configure.ac 2011-06-29 21:47:06 +0000
@@ -19,8 +19,8 @@
CFLAGS=""
fi
-# Minimal LDFLAGS
-LDFLAGS="$LDFLAGS -lX11"
+# Minimal LIBS
+LIBS="$LIBS -lX11"
# Is this really necessary?
AC_USE_SYSTEM_EXTENSIONS
@@ -118,7 +118,7 @@
if test -n "$freetype_config"; then
freetype_cflags=`$freetype_config --cflags`
freetype_libs=`$freetype_config --libs`
- LDFLAGS="$LDFLAGS $freetype_libs"
+ LIBS="$LIBS $freetype_libs"
CPPFLAGS="$freetype_cflags $CPPFLAGS"
fi
AC_CHECK_HEADER(freetype/config/ftheader.h,,AC_MSG_ERROR("ftheader.h
not found"))
@@ -129,7 +129,7 @@
if test -n "$xft_config"; then
xft_cflags=`$xft_config --cflags`
xft_libs=`$xft_config --libs`
- LDFLAGS="$LDFLAGS $xft_libs"
+ LIBS="$LIBS $xft_libs"
CPPFLAGS="$xft_cflags $CPPFLAGS"
CXXFLAGS="${CXXFLAGS} -DHAVE_XFT_H"
else
@@ -139,7 +139,7 @@
if test -n "$pkg_config"; then
xft_cflags=`$pkg_config --cflags xft`
xft_libs=`$pkg_config --libs xft`
- LDFLAGS="$LDFLAGS $xft_libs"
+ LIBS="$LIBS $xft_libs"
CPPFLAGS="$xft_cflags $CPPFLAGS"
CXXFLAGS="${CXXFLAGS} -DHAVE_XFT_H"
fi
=== modified file 'debian/changelog'
=== modified file 'debian/control'
--- debian/control 2011-06-15 20:19:08 +0000
+++ debian/control 2011-06-29 21:47:06 +0000
@@ -1,9 +1,11 @@
Source: xfe
Section: x11
Priority: optional
Maintainer: Joachim Wiedorn <ad_deb...@joonet.de>
Build-Depends: debhelper (>= 8),
- autotools-dev, intltool,
+ autotools-dev, dh-autoreconf,
+ intltool,
libfox-1.6-dev (>= 1.6.36),
libpng12-dev, libxft-dev,
libx11-dev
=== added file 'debian/patches/11_ld-as-needed.patch'
--- debian/patches/11_ld-as-needed.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/11_ld-as-needed.patch 2011-06-29 21:47:06 +0000
@@ -0,0 +1,42 @@
+Index: xfe/configure.ac
+===================================================================
+--- xfe.orig/configure.ac 2011-06-29 17:05:03.622561265 +0100
++++ xfe/configure.ac 2011-06-29 17:05:10.678561264 +0100
+@@ -19,8 +19,8 @@
+ CFLAGS=""
+ fi
+
+-# Minimal LDFLAGS
+-LDFLAGS="$LDFLAGS -lX11"
++# Minimal LIBS
++LIBS="$LIBS -lX11"
+
+ # Is this really necessary?
+ AC_USE_SYSTEM_EXTENSIONS
+@@ -118,7 +118,7 @@
+ if test -n "$freetype_config"; then
+ freetype_cflags=`$freetype_config --cflags`
+ freetype_libs=`$freetype_config --libs`
+- LDFLAGS="$LDFLAGS $freetype_libs"
++ LIBS="$LIBS $freetype_libs"
+ CPPFLAGS="$freetype_cflags $CPPFLAGS"
+ fi
+ AC_CHECK_HEADER(freetype/config/ftheader.h,,AC_MSG_ERROR("ftheader.h
not found"))
+@@ -129,7 +129,7 @@
+ if test -n "$xft_config"; then
+ xft_cflags=`$xft_config --cflags`
+ xft_libs=`$xft_config --libs`
+- LDFLAGS="$LDFLAGS $xft_libs"
++ LIBS="$LIBS $xft_libs"
+ CPPFLAGS="$xft_cflags $CPPFLAGS"
+ CXXFLAGS="${CXXFLAGS} -DHAVE_XFT_H"
+ else
+@@ -139,7 +139,7 @@
+ if test -n "$pkg_config"; then
+ xft_cflags=`$pkg_config --cflags xft`
+ xft_libs=`$pkg_config --libs xft`
+- LDFLAGS="$LDFLAGS $xft_libs"
++ LIBS="$LIBS $xft_libs"
+ CPPFLAGS="$xft_cflags $CPPFLAGS"
+ CXXFLAGS="${CXXFLAGS} -DHAVE_XFT_H"
+ fi
=== modified file 'debian/patches/series'
--- debian/patches/series 2011-06-15 20:19:08 +0000
+++ debian/patches/series 2011-06-29 21:47:06 +0000
@@ -8,3 +8,4 @@
08_libreoffice-support-in-xferc.patch
09_preference-imageviewer.patch
10_xournal-support-in-xferc.patch
+11_ld-as-needed.patch
=== modified file 'debian/rules'
--- debian/rules 2011-03-28 22:50:23 +0000
+++ debian/rules 2011-06-29 21:47:06 +0000
@@ -6,7 +6,7 @@
%:
- dh $@
+ dh $@ --with autoreconf
override_dh_auto_configure:
