[arch-commits] Commit in openoffice-base-devel/trunk (ChangeLog cppunit_gcc45.diff)

[andyrtr at archlinux.org]

    Date: Monday, June 21, 2010 @ 13:43:07
  Author: andyrtr
Revision: 83456

upgpkg: openoffice-base-devel 3.3_dev300_m83-1
now the build is fixed. so we can test the latest and greatest again :)

Modified:
  openoffice-base-devel/trunk/ChangeLog
  openoffice-base-devel/trunk/cppunit_gcc45.diff

--------------------+
 ChangeLog          |    2 ++
 cppunit_gcc45.diff |   22 +++++++++-------------
 2 files changed, 11 insertions(+), 13 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2010-06-21 17:41:30 UTC (rev 83455)
+++ ChangeLog	2010-06-21 17:43:07 UTC (rev 83456)
@@ -2,6 +2,8 @@
 
         * 3.3_dev300_m83-1:
 	- new snapshot
+	- apply fix from http://www.openoffice.org/issues/show_bug.cgi?id=111141
+	  for broken i686 internal cppunit
 
 2010-06-13 Andreas Radke <andyrtr at archlinux.org>
 

Modified: cppunit_gcc45.diff
===================================================================
--- cppunit_gcc45.diff	2010-06-21 17:41:30 UTC (rev 83455)
+++ cppunit_gcc45.diff	2010-06-21 17:43:07 UTC (rev 83456)
@@ -1,15 +1,11 @@
---- misc/build/cppunit-1.12.1/src/cppunit/Makefile.am	2008-02-20 06:36:38.000000000 +0100
-+++ misc/build/cppunit-1.12.1/src/cppunit/Makefile.am.new	2010-06-19 16:48:11.181542138 +0200
-@@ -63,5 +63,11 @@
-
- libcppunit_la_LDFLAGS= \
+--- misc/cppunit-1.12.1/src/cppunit/Makefile.in	2008-02-20 06:59:55.000000000 +0100
++++ misc/build/cppunit-1.12.1/src/cppunit/Makefile.in	2010-06-21 17:01:38.324370072 +0200
+@@ -300,7 +300,7 @@
+ 
+ libcppunit_la_LDFLAGS = \
   -no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
 - -release $(LT_RELEASE)
-+ -release $(LT_RELEASE) @LIBADD_DL@
-
-+TESTS = t_link
-+
-+check_PROGRAMS = t_link
-+
-+t_link_SOURCES = t_link.cpp
-+t_link_LDADD = libcppunit.la
++ -release $(LT_RELEASE) $(LIBADD_DL)
+ 
+ all: all-am
+