[Pkg-ace-commits] [pkg-ace] r657 - trunk/debian/patches

[Thomas Girard]

Author: tgg
Date: 2010-05-01 12:13:27 +0000 (Sat, 01 May 2010)
New Revision: 657

Added:
   trunk/debian/patches/14-fix-tcl-flags.dpatch
   trunk/debian/patches/15-fix-lzo-flags.dpatch
Modified:
   trunk/debian/patches/00list
Log:
Add and enable new patches for:
 - Tcl/Tk compilation working only on Ubuntu. The complete test was dropped
   so that any distro will get the same line.
 - Hardcode Lzo header path to make Lzo TAO compressor work.


Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list	2010-05-01 12:10:03 UTC (rev 656)
+++ trunk/debian/patches/00list	2010-05-01 12:13:27 UTC (rev 657)
@@ -1,6 +1,8 @@
 10-fix-prj-install.dpatch
 11-create-ace_qt4reactor-mpb.dpatch
 11-promote-QtResource-to-qt4.dpatch
+14-fix-tcl-flags.dpatch
+15-fix-lzo-flags.dpatch
 19-gcc43
 24-add-missing-headers
 34-bts386713

Added: trunk/debian/patches/14-fix-tcl-flags.dpatch
===================================================================
--- trunk/debian/patches/14-fix-tcl-flags.dpatch	                        (rev 0)
+++ trunk/debian/patches/14-fix-tcl-flags.dpatch	2010-05-01 12:13:27 UTC (rev 657)
@@ -0,0 +1,42 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 14-fix-tcl-flags.dpatch by Thomas Girard <thomas.g.girard at free.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix TCL Tk compilation flags.
+
+ at DPATCH@
+
+--- ACE_wrappers/include/makeinclude/platform_linux_common.GNU-	2010-04-30 23:03:53.140594788 +0200
++++ ACE_wrappers/include/makeinclude/platform_linux_common.GNU	2010-04-30 23:09:34.180595413 +0200
+@@ -46,24 +46,13 @@
+ PLATFORM_BOOST_LDLAGS ?=
+ PLATFORM_BOOST_UTF_LIBS ?= -lboost_unit_test_framework
+ 
+-ifeq (Ubuntu, $(findstring Ubuntu,$(LSB_RELEASE_ID)))
+-  PLATFORM_TK_CPPFLAGS=$(shell . /usr/lib/tk*/tkConfig.sh && echo -n $$TK_INCLUDE_SPEC $$TK_DEFS)
+-  PLATFORM_TK_LIBS=$(shell . /usr/lib/tk*/tkConfig.sh && echo -n $$TK_LIB_FLAG)
+-  PLATFORM_TK_LDFLAGS=
+-
+-  PLATFORM_TCL_CPPFLAGS=
+-  PLATFORM_TCL_LIBS=-ltcl8.4
+-  PLATFORM_TCL_LDFLAGS=
+-else
+-  PLATFORM_TK_CPPFLAGS=-I$(shell . /usr/lib*/tkConfig.sh && echo -n $$TK_INC_DIR $$TK_DEFS)
+-  PLATFORM_TK_LIBS=$(shell . /usr/lib*/tkConfig.sh && echo -n $$TK_LIB_FLAG)
+-  PLATFORM_TK_LDFLAGS=
+-
+-
+-  PLATFORM_TCL_CPPFLAGS=
+-  PLATFORM_TCL_LIBS=-ltcl
+-  PLATFORM_TCL_LDFLAGS=
+-endif
++PLATFORM_TK_CPPFLAGS=$(shell . /usr/lib/tkConfig.sh && echo -n $$TK_INCLUDE_SPEC $$TK_DEFS)
++PLATFORM_TK_LIBS=$(shell . /usr/lib/tkConfig.sh && echo -n $$TK_LIB_FLAG)
++PLATFORM_TK_LDFLAGS=
++
++PLATFORM_TCL_CPPFLAGS=$(shell . /usr/lib/tclConfig.sh && echo -n $$TCL_INCLUDE_SPEC $$TCL_DEFS)
++PLATFORM_TCL_LIBS=$(shell . /usr/lib/tcl*/tclConfig.sh && echo -n $$(eval echo $$TCL_LIB_FLAG))
++PLATFORM_TCL_LDFLAGS=
+ 
+ PLATFORM_QT_CPPFLAGS ?= -I$(QTDIR)/include
+ PLATFORM_QT_LIBS ?= -lqt-mt


Property changes on: trunk/debian/patches/14-fix-tcl-flags.dpatch
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/debian/patches/15-fix-lzo-flags.dpatch
===================================================================
--- trunk/debian/patches/15-fix-lzo-flags.dpatch	                        (rev 0)
+++ trunk/debian/patches/15-fix-lzo-flags.dpatch	2010-05-01 12:13:27 UTC (rev 657)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 15-fix-lzo-flags.dpatch by Thomas Girard <thomas.g.girard at free.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: hardcode LZO headers location.
+
+ at DPATCH@
+
+--- ACE_wrappers/MPC/config/lzo1.mpb-	2009-05-07 17:44:53.000000000 +0200
++++ ACE_wrappers/MPC/config/lzo1.mpb	2010-05-01 13:41:44.652596448 +0200
+@@ -2,8 +2,7 @@
+ // $Id: lzo1.mpb 1577 2009-05-07 15:44:53Z elliott_c $
+ 
+ feature(lzo1) {
+-  includes += $(LZO1_ROOT)/include
+-  libpaths += $(LZO1_ROOT)/lib
++  includes += /usr/include/lzo
+   specific (prop:microsoft) {
+     lit_libs += liblzo
+   } else {