SOURCES: libstk-fixes.patch - kill `-gcc-mt-X_XX' suffixes from bo...

[twittner]

Author: twittner                     Date: Thu Sep 22 21:43:56 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- kill `-gcc-mt-X_XX' suffixes from boost libraries names (it should be ok
  since boost.spec 1.47 rev.)

---- Files affected:
SOURCES:
   libstk-fixes.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/libstk-fixes.patch
diff -u SOURCES/libstk-fixes.patch:1.4 SOURCES/libstk-fixes.patch:1.5
--- SOURCES/libstk-fixes.patch:1.4	Wed Dec  1 11:29:02 2004
+++ SOURCES/libstk-fixes.patch	Thu Sep 22 23:43:50 2005
@@ -29,26 +29,6 @@
                  break;
  
              default:
---- libstk/test/Makefile.am.orig	2003-10-31 22:27:13.000000000 +0100
-+++ libstk/test/Makefile.am	2004-05-08 16:30:51.760922512 +0200
-@@ -44,11 +44,11 @@
- test_area_SOURCES         = test_area.cpp 
- printing_test_SOURCES	  = printing_test.cpp
- 
--hello_world_LDADD       = $(SDL_LIBS) $(DIRECTFB_LIBS) $(FREETYPE_LIBS) $(LIBPNG_LIBS) $(LIBJPEB_LIBS) -lboost_signals -lboost_thread $(top_srcdir)/libstk/libstk.la
--test_app_LDADD          = $(SDL_LIBS) $(DIRECTFB_LIBS) $(FREETYPE_LIBS) $(LIBPNG_LIBS) $(LIBJPEB_LIBS) -lboost_signals -lboost_thread $(top_srcdir)/libstk/libstk.la
--hydra_LDADD             = $(SDL_LIBS) $(DIRECTFB_LIBS) $(FREETYPE_LIBS) $(LIBPNG_LIBS) $(LIBJPEB_LIBS) -lboost_signals -lboost_thread $(top_srcdir)/libstk/libstk.la
--xine_test_LDADD         = $(SDL_LIBS) $(DIRECTFB_LIBS) $(FREETYPE_LIBS) $(LIBPNG_LIBS) $(LIBJPEB_LIBS) -lboost_signals -lboost_thread $(top_srcdir)/libstk/libstk.la 
-+hello_world_LDADD       = $(SDL_LIBS) $(DIRECTFB_LIBS) $(FREETYPE_LIBS) $(LIBPNG_LIBS) $(LIBJPEB_LIBS) -lboost_signals-gcc-mt-1_32 -lboost_thread-gcc-mt-1_32 $(top_srcdir)/libstk/libstk.la
-+test_app_LDADD          = $(SDL_LIBS) $(DIRECTFB_LIBS) $(FREETYPE_LIBS) $(LIBPNG_LIBS) $(LIBJPEB_LIBS) -lboost_signals-gcc-mt-1_32 -lboost_thread-gcc-mt-1_32 $(top_srcdir)/libstk/libstk.la
-+hydra_LDADD             = $(SDL_LIBS) $(DIRECTFB_LIBS) $(FREETYPE_LIBS) $(LIBPNG_LIBS) $(LIBJPEB_LIBS) -lboost_signals-gcc-mt-1_32 -lboost_thread-gcc-mt-1_32 $(top_srcdir)/libstk/libstk.la
-+xine_test_LDADD         = $(SDL_LIBS) $(DIRECTFB_LIBS) $(FREETYPE_LIBS) $(LIBPNG_LIBS) $(LIBJPEB_LIBS) -lboost_signals-gcc-mt-1_32 -lboost_thread-gcc-mt-1_32 $(top_srcdir)/libstk/libstk.la 
- xine_test_LDFLAGS       = `xine-config --libs`
- timer_test_LDADD        = $(top_srcdir)/libstk/libstk.la
--test_area_LDADD         = $(SDL_LIBS) $(DIRECTFB_LIBS) $(FREETYPE_LIBS) $(LIBPNG_LIBS)  $(LIBJPEB_LIBS) -lboost_signals -lboost_thread $(top_srcdir)/libstk/libstk.la
--printing_test_LDADD     = -lboost_signals -lboost_thread $(top_srcdir)/libstk/libstk.la -lijs 
-+test_area_LDADD         = $(SDL_LIBS) $(DIRECTFB_LIBS) $(FREETYPE_LIBS) $(LIBPNG_LIBS)  $(LIBJPEB_LIBS) -lboost_signals-gcc-mt-1_32 -lboost_thread-gcc-mt-1_32 $(top_srcdir)/libstk/libstk.la
-+printing_test_LDADD     = -lboost_signals-gcc-mt-1_32 -lboost_thread-gcc-mt-1_32 $(top_srcdir)/libstk/libstk.la -lijs 
 --- libstk/test/timer_test.cpp.orig	2003-08-23 18:36:12.000000000 +0200
 +++ libstk/test/timer_test.cpp	2004-05-08 16:33:06.228480336 +0200
 @@ -8,7 +8,9 @@
@@ -61,38 +41,26 @@
      std::cout << "Libstk timer test, please wait 2 seconds" << std::endl;
  
      time_value a = get_current_time_value();
---- libstk/libstk.pc.in.orig	2004-05-08 16:34:01.851024424 +0200
-+++ libstk/libstk.pc.in	2004-05-08 00:35:46.000000000 +0200
-@@ -7,6 +7,6 @@
- Description: The Settop box Toolkit
- Requires:
- Version: @VERSION@
--Libs: -L${libdir} -lstk -lboost_signals -lfreetype
-+Libs: -L${libdir} -lstk -lboost_signals-gcc-mt-1_32 -lfreetype
- Cflags: -I${includedir}/libstk- at VERSION@  -I/usr/include/freetype2
  
---- libstk/configure.in.orig	2004-05-07 21:53:51.000000000 +0200
-+++ libstk/configure.in	2004-05-08 16:34:48.201978008 +0200
-@@ -191,7 +191,7 @@
- 
- AM_CONFIG_HEADER(libstk/config.h)
- 
--CXXFLAGS="$CXXFLAGS -Wall -W -Wno-switch -pedantic -O3 -pthread"
-+CXXFLAGS="$CXXFLAGS -Wall -W -Wno-switch -pedantic -pthread"
- 
- AC_OUTPUT([
- Makefile
-diff -ur libstk.orig/configure.in libstk/configure.in
---- libstk.orig/configure.in	2004-05-07 21:53:51.000000000 +0200
-+++ libstk/configure.in	2004-12-01 11:26:30.522682032 +0100
+--- libstk/configure.in~	2005-09-21 15:11:14.578522856 +0200
++++ libstk/configure.in	2005-09-21 15:12:27.406451328 +0200
 @@ -24,8 +24,8 @@
  dnl FIXME make this use AC_CHECK_HEADERS and update the event_system/producers accordingly
  dnl AC_CHECK_HEADER(boost/thread/mutex.hpp, , [AC_MSG_ERROR( *** boost/thread/mutex.hpp not found - build will fail)])
  
 -AC_CHECK_LIB(boost_signals-gcc-mt-1_31, main, , [AC_MSG_ERROR( *** boost_signals library not found - build will fail)])
 -AC_CHECK_LIB(boost_thread-gcc-mt-1_31, main, , [AC_MSG_ERROR( *** boost_thread library not found - build will fail)])
-+AC_CHECK_LIB(boost_signals-gcc-mt-1_32, main, , [AC_MSG_ERROR( *** boost_signals library not found - build will fail)])
-+AC_CHECK_LIB(boost_thread-gcc-mt-1_32, main, , [AC_MSG_ERROR( *** boost_thread library not found - build will fail)])
++AC_CHECK_LIB(boost_signals, main, , [AC_MSG_ERROR( *** boost_signals library not found - build will fail)])
++AC_CHECK_LIB(boost_thread, main, , [AC_MSG_ERROR( *** boost_thread library not found - build will fail)])
  AC_LANG_RESTORE
  
  
+@@ -191,7 +191,7 @@
+ 
+ AM_CONFIG_HEADER(libstk/config.h)
+ 
+-CXXFLAGS="$CXXFLAGS -Wall -W -Wno-switch -pedantic -O3 -pthread"
++CXXFLAGS="$CXXFLAGS -Wall -W -Wno-switch -pedantic -pthread"
+ 
+ AC_OUTPUT([
+ Makefile
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/libstk-fixes.patch?r1=1.4&r2=1.5&f=u