Package: aplus-fsf
Version: 4.22.1-4
Followup-For: Bug #625102
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
*** /tmp/tmp1ExG17
In Ubuntu, the attached patch was applied to achieve the following:
* src/main/Makefile.am/in: Fix order of arguments to allow building
with --as-needed.
* src/MSGUI/Makefile.am/in: Include X11 libs when linking
* src/MSTypes/MSTypeData.H: Add <cstddef> to headers (LP: #766003)
Thanks for considering the patch.
- -- System Information:
Debian Release: wheezy/sid
APT prefers oneiric
APT policy: (500, 'oneiric')
Architecture: amd64 (x86_64)
Kernel: Linux 3.0.0-999-generic (SMP w/2 CPU cores)
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Shell: /bin/sh linked to /bin/dash
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBAgAGBQJOBkZjAAoJEGHzRCZ03mYkScUP/1902tdXVc/kDMYxe5bVzeBx
1xg6DfBP2L8hqx/lR9aPoICmr6rDMAE3+kPPgpJhzoAdBUD/CQ2qSsDFj70mNtgt
3UkRcB6740VNVQ2Of+D3rZB2ZQHaFzKITWyYHtLB0HL4tkxPvk0GEgH/SjwDd6Zz
+hkTHBVvyhmVjWUULC7WdbfXrlRZomr0MgS2XKCxqlW2X6vBVxgw4c3QI+7AkknV
572LKD8b3jzKCAvnwGTylfkpZ0rQ/uKr4zbgi9EbcbtDmIXiOy49Vt87SNTNSdGy
e1If0fhMbMo6akvgssx/PC7Gze+SuCuY5udwa1QFX5Mr8iE/WoqX8rm2HjTAhSYc
pTFKhWxWKnttuK3afe3BP1xe1pIW7Uxs8qqFXOtb/ZFj4+aosnpfdmefDGxc7bUa
MA7MXsQUp4PAbk17SO8BoxtVXGo6fIQaszu3EMCX0sJJubnllIn1ka5WQSxYIpkq
5xoBd1hb3cUyGrF171O0kHOhOSJSpzFjUs+978/LoMzfzverdcDMDundhnoN+yEC
hQOH86Esy+Hj9EmfeA0JMEO0CDSoy2WdMQ4blGxN11Vc+ZYrOjcDGmqPiKK1lGnu
3C1NJDc/skv/OEFlH9PVkXRSAVuJ4a4S8OjW3Ip1QtdAFPvSuIutg5wpLisIW2EI
bp6es5MB6f7ec/Uvep+/
=9rJl
-----END PGP SIGNATURE-----
=== modified file 'src/MSGUI/Makefile.am'
--- src/MSGUI/Makefile.am 2003-10-08 21:54:42 +0000
+++ src/MSGUI/Makefile.am 2011-06-25 19:56:58 +0000
@@ -382,6 +382,8 @@
MSWidgetView.H\
MSWindow.H
+libMSGUI_la_LIBADD = $(X_LIBS)
+
EXTRA_DIST = \
MSArrayViewInlines.C\
MSCompositeTextInlines.C\
=== modified file 'src/MSGUI/Makefile.in'
--- src/MSGUI/Makefile.in 2008-04-07 23:04:32 +0000
+++ src/MSGUI/Makefile.in 2011-06-25 19:57:14 +0000
@@ -466,6 +466,7 @@
MSWidgetView.H\
MSWindow.H
+libMSGUI_la_LIBADD = $(X_LIBS)
EXTRA_DIST = \
MSArrayViewInlines.C\
=== modified file 'src/MSTypes/MSTypeData.H'
--- src/MSTypes/MSTypeData.H 2008-04-07 23:04:32 +0000
+++ src/MSTypes/MSTypeData.H 2011-06-25 19:56:22 +0000
@@ -9,6 +9,7 @@
//
///////////////////////////////////////////////////////////////////////////////
+#include <cstddef>
#ifndef MSDefinesHEADER
#include <MSTypes/MSDefines.H>
=== modified file 'src/main/Makefile.am'
--- src/main/Makefile.am 2005-09-02 21:36:16 +0000
+++ src/main/Makefile.am 2011-06-25 19:58:00 +0000
@@ -37,7 +37,8 @@
$(top_srcdir)/src/dap/libdap.la \
$(top_srcdir)/src/MSGUI/libMSGUI.la \
$(top_srcdir)/src/MSIPC/libMSIPC.la \
- $(top_srcdir)/src/MSTypes/libMSTypes.la
+ $(top_srcdir)/src/MSTypes/libMSTypes.la \
+ $(X_LIBS) $(LIBS)
aplus_LDFLAGS = \
-L$(top_srcdir)/src/IPC \
@@ -51,8 +52,7 @@
-L$(top_srcdir)/src/dap \
-L$(top_srcdir)/src/MSGUI \
-L$(top_srcdir)/src/MSIPC \
- -L$(top_srcdir)/src/MSTypes \
- $(X_LIBS) $(LIBS)
+ -L$(top_srcdir)/src/MSTypes
install-exec-hook:
mv $(DESTDIR)$(bindir)/aplus $(DESTDIR)$(bindir)/a+
=== modified file 'src/main/Makefile.in'
--- src/main/Makefile.in 2008-04-07 23:04:32 +0000
+++ src/main/Makefile.in 2011-06-25 19:58:15 +0000
@@ -122,7 +122,8 @@
$(top_srcdir)/src/dap/libdap.la \
$(top_srcdir)/src/MSGUI/libMSGUI.la \
$(top_srcdir)/src/MSIPC/libMSIPC.la \
- $(top_srcdir)/src/MSTypes/libMSTypes.la
+ $(top_srcdir)/src/MSTypes/libMSTypes.la \
+ $(X_LIBS) $(LIBS)
aplus_LDFLAGS = \
@@ -137,8 +138,7 @@
-L$(top_srcdir)/src/dap \
-L$(top_srcdir)/src/MSGUI \
-L$(top_srcdir)/src/MSIPC \
- -L$(top_srcdir)/src/MSTypes \
- $(X_LIBS) $(LIBS)
+ -L$(top_srcdir)/src/MSTypes
subdir = src/main
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
