debian/changelog | 6 +
debian/patches/001-configure-check-if-issetugid-is-declared.diff | 36
++++++++++
debian/patches/series | 1
3 files changed, 43 insertions(+)
New commits:
commit 5b7541d415d2b1782425cfee7e11826cf02b1b44
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Apr 29 17:36:00 2012 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index e14a710..830c5b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-libx11 (2:1.4.99.901-2) UNRELEASED; urgency=low
+libx11 (2:1.4.99.901-2) unstable; urgency=low
* Add AC_CHECK_DECL(issetugid) to fix FTBFS on kfreebsd (closes: #669670).
- -- Julien Cristau <jcris...@debian.org> Sun, 29 Apr 2012 16:48:42 +0200
+ -- Julien Cristau <jcris...@debian.org> Sun, 29 Apr 2012 16:55:39 +0200
libx11 (2:1.4.99.901-1) unstable; urgency=low
commit 088a086bfe14ce7a904c5b21d0c5ac9f4da2b0f1
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Apr 29 16:51:41 2012 +0200
Add AC_CHECK_DECL(issetugid) to fix FTBFS on kfreebsd (closes: #669670).
diff --git a/debian/changelog b/debian/changelog
index 5b436d1..e14a710 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libx11 (2:1.4.99.901-2) UNRELEASED; urgency=low
+
+ * Add AC_CHECK_DECL(issetugid) to fix FTBFS on kfreebsd (closes: #669670).
+
+ -- Julien Cristau <jcris...@debian.org> Sun, 29 Apr 2012 16:48:42 +0200
+
libx11 (2:1.4.99.901-1) unstable; urgency=low
* New upstream release candidate (1.5 RC1)
diff --git a/debian/patches/001-configure-check-if-issetugid-is-declared.diff
b/debian/patches/001-configure-check-if-issetugid-is-declared.diff
new file mode 100644
index 0000000..cc05bf4
--- /dev/null
+++ b/debian/patches/001-configure-check-if-issetugid-is-declared.diff
@@ -0,0 +1,36 @@
+From d595779341387bf7c867ac28811883a3b8fe6e88 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcris...@debian.org>
+Date: Sun, 29 Apr 2012 16:27:52 +0200
+Subject: [PATCH libX11] configure: check if issetugid is declared
+
+GNU/kFreeBSD has issetugid in libc (for legacy apps?), but doesn't
+declare it anywhere, causing gcc to error out with
+-Werror=implicit-function-declaration. Use AC_CHECK_DECL in addition to
+AC_CHECK_FUNC so we disable this code instead of failing to build it.
+
+Debian bug#669670 <http://bugs.debian.org/669670>
+
+Signed-off-by: Julien Cristau <jcris...@debian.org>
+---
+ configure.ac | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index aaec968..c91234f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -223,8 +223,9 @@ AC_CHECK_HEADERS([sys/select.h])
+ AC_CHECK_FUNCS([strtol seteuid])
+ # Used in lcFile.c (see also --enable-xlocaledir settings below)
+ XLOCALEDIR_IS_SAFE="no"
+-AC_CHECK_FUNC([issetugid], [XLOCALEDIR_IS_SAFE="yes"]
+- AC_DEFINE(HASSETUGID,1,[Has issetugid() function]))
++AC_CHECK_DECL([issetugid],
++ AC_CHECK_FUNC([issetugid], [XLOCALEDIR_IS_SAFE="yes"]
++ AC_DEFINE(HASSETUGID,1,[Has issetugid() function])))
+ AC_CHECK_FUNC([getresuid], [XLOCALEDIR_IS_SAFE="yes"]
+ AC_DEFINE(HASGETRESUID,1,[Has getresuid() & getresgid() functions]))
+ # Used in Font.c
+--
+1.7.10
+
diff --git a/debian/patches/series b/debian/patches/series
index f20e030..cd291f9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+001-configure-check-if-issetugid-is-declared.diff
003_recognize_glibc_2.3.2_locale_names.diff
006_tailor_pt_BR.UTF-8_Compose.diff
007_iso8859-15_Compose_fix.diff
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1sowb6-0000bo...@vasks.debian.org
