debian/patches/100-fix-linking-with-no-add-needed.patch |   73 ----------------
 1 file changed, 1 insertion(+), 72 deletions(-)

New commits:
commit 9c0a5e26bf1a461dd78e3a79a5c0e14de4e1cec5
Author: Robert Hooker <robert.hoo...@canonical.com>
Date:   Tue Feb 22 12:45:47 2011 -0500

    Refresh 100-fix-linking-with-no-add-needed.patch

diff --git a/debian/patches/100-fix-linking-with-no-add-needed.patch 
b/debian/patches/100-fix-linking-with-no-add-needed.patch
index d551510..8be6bef 100644
--- a/debian/patches/100-fix-linking-with-no-add-needed.patch
+++ b/debian/patches/100-fix-linking-with-no-add-needed.patch
@@ -4,27 +4,8 @@ Date: Mon, 22 Nov 2010 15:26:02 -0500
 Subject: [PATCH] x11-apps: Fix linking with --no-add-needed
 
 ---
- bitmap/Makefile.in |    2 +-
  oclock/Makefile.in |    2 +-
- xbiff/Makefile.in  |    2 +-
- xcalc/Makefile.in  |    2 +-
- xgc/Makefile.in    |    2 +-
- xman/Makefile.in   |    2 +-
- 6 files changed, 6 insertions(+), 6 deletions(-)
 
-diff --git a/bitmap/Makefile.in b/bitmap/Makefile.in
-index b301374..5923cc4 100644
---- a/bitmap/Makefile.in
-+++ b/bitmap/Makefile.in
-@@ -319,7 +319,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = man
- bitmap_CFLAGS = $(CWARNFLAGS) $(BITMAP_CFLAGS)
--bitmap_LDADD = $(BITMAP_LIBS) -lm
-+bitmap_LDADD = $(BITMAP_LIBS) -lm -lX11
- bitmap_SOURCES = \
-          BitEdit.c \
-          CutPaste.c \
 diff --git a/oclock/Makefile.in b/oclock/Makefile.in
 index 86c348c..bc2e82c 100644
 --- a/oclock/Makefile.in
@@ -38,58 +19,6 @@ index 86c348c..bc2e82c 100644
  oclock_SOURCES = \
          Clock.c \
          Clock.h \
-diff --git a/xbiff/Makefile.in b/xbiff/Makefile.in
-index 69764ba..f75ed34 100644
---- a/xbiff/Makefile.in
-+++ b/xbiff/Makefile.in
-@@ -250,7 +250,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AM_CFLAGS = $(CWARNFLAGS) $(XBIFF_CFLAGS) -D_BSD_SOURCE
--xbiff_LDADD = $(XBIFF_LIBS)
-+xbiff_LDADD = $(XBIFF_LIBS) -lXmu -lX11
- xbiff_SOURCES = \
-         Mailbox.c \
-         Mailbox.h \
-diff --git a/xcalc/Makefile.in b/xcalc/Makefile.in
-index 0950bbc..75892c7 100644
---- a/xcalc/Makefile.in
-+++ b/xcalc/Makefile.in
-@@ -255,7 +255,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AM_CFLAGS = $(XCALC_CFLAGS)
--xcalc_LDADD = $(XCALC_LIBS) -lm
-+xcalc_LDADD = $(XCALC_LIBS) -lm -lX11
- xcalc_SOURCES = \
-         actions.c \
-         math.c \
-diff --git a/xgc/Makefile.in b/xgc/Makefile.in
-index 44fa2a0..1cfb5ef 100644
---- a/xgc/Makefile.in
-+++ b/xgc/Makefile.in
-@@ -277,7 +277,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AM_YFLAGS = -d
- AM_CFLAGS = $(CWARNFLAGS) $(XGC_CFLAGS) -D_BSD_SOURCE
--xgc_LDADD = $(XGC_LIBS) -lm
-+xgc_LDADD = $(XGC_LIBS) -lm -lX11
- xgc_SOURCES = \
-         choice.c \
-         constants.h \
-diff --git a/xman/Makefile.in b/xman/Makefile.in
-index d728eed..08f8a6e 100644
---- a/xman/Makefile.in
-+++ b/xman/Makefile.in
-@@ -266,7 +266,7 @@ dist_help_DATA = xman.help
- AM_CFLAGS = $(CWARNFLAGS) $(XMAN_CFLAGS) \
-       -D_BSD_SOURCE -DHELPFILE=\"$(helpdir)/xman.help\"
- 
--xman_LDADD = $(XMAN_LIBS)
-+xman_LDADD = $(XMAN_LIBS) -lX11
- xman_SOURCES = \
-         buttons.c \
-         defs.h \
--- 
+---
 1.7.2.3
 


-- 
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/e1prwns-0006dm...@alioth.debian.org

Reply via email to