[DRE-commits] r1915 - in packages/libqt4-ruby/trunk/debian: . patches

[fourmond at alioth.debian.org]

Author: fourmond
Date: 2007-09-19 21:41:45 +0000 (Wed, 19 Sep 2007)
New Revision: 1915

Added:
   packages/libqt4-ruby/trunk/debian/patches/28-optimization.dpatch
Modified:
   packages/libqt4-ruby/trunk/debian/changelog
   packages/libqt4-ruby/trunk/debian/patches/00list
   packages/libqt4-ruby/trunk/debian/patches/25-fix-hppa-build.dpatch
Log:
Fix FTBS problems on HPPA

Modified: packages/libqt4-ruby/trunk/debian/changelog
===================================================================
--- packages/libqt4-ruby/trunk/debian/changelog	2007-09-16 19:36:43 UTC (rev 1914)
+++ packages/libqt4-ruby/trunk/debian/changelog	2007-09-19 21:41:45 UTC (rev 1915)
@@ -1,8 +1,9 @@
-libqt4-ruby (1.4.9-5) UNRELEASED; urgency=low
+libqt4-ruby (1.4.9-5) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Fix FTBS on HPPA (closes: #434668)
+  * Turn on optimization (-O2) by default - it seems it wasn't done yet.
 
- -- Vincent Fourmond <fourmond at debian.org>  Wed, 25 Jul 2007 18:41:00 +0200
+ -- Vincent Fourmond <fourmond at debian.org>  Wed, 19 Sep 2007 23:29:23 +0200
 
 libqt4-ruby (1.4.9-4) unstable; urgency=low
 

Modified: packages/libqt4-ruby/trunk/debian/patches/00list
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/00list	2007-09-16 19:36:43 UTC (rev 1914)
+++ packages/libqt4-ruby/trunk/debian/patches/00list	2007-09-19 21:41:45 UTC (rev 1915)
@@ -4,6 +4,8 @@
 # 10-kalyptus
 # 15-fix-install
 # 20-visibility
+25-fix-hppa-build
+28-optimization
 30-qt_enum
 # 31-constants-warning
 97-soname

Modified: packages/libqt4-ruby/trunk/debian/patches/25-fix-hppa-build.dpatch
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/25-fix-hppa-build.dpatch	2007-09-16 19:36:43 UTC (rev 1914)
+++ packages/libqt4-ruby/trunk/debian/patches/25-fix-hppa-build.dpatch	2007-09-19 21:41:45 UTC (rev 1915)
@@ -16,7 +16,7 @@
 +
  add_definitions (${QT_DEFINITIONS}  -DHAVE_CONFIG_H=1)
 +IF(ARCH MATCHES parisc)
-+  ADD_DEFINITIONS(-ffunction-sections)
++  ADD_DEFINITIONS(-fno-exceptions -fno-check-new -fno-common -fPIC -O2)
 +ENDIF(ARCH MATCHES parisc)
  include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${QT_INCLUDES} )
  

Added: packages/libqt4-ruby/trunk/debian/patches/28-optimization.dpatch
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/28-optimization.dpatch	                        (rev 0)
+++ packages/libqt4-ruby/trunk/debian/patches/28-optimization.dpatch	2007-09-19 21:41:45 UTC (rev 1915)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 28-optimization.dpatch by  <fourmond at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad libqt4-ruby-1.4.9~/CMakeLists.txt libqt4-ruby-1.4.9/CMakeLists.txt
+--- libqt4-ruby-1.4.9~/CMakeLists.txt	2007-09-19 23:28:10.000000000 +0200
++++ libqt4-ruby-1.4.9/CMakeLists.txt	2007-09-19 23:28:36.000000000 +0200
+@@ -20,9 +20,9 @@
+ 
+ EXECUTE_PROCESS(COMMAND uname -m OUTPUT_VARIABLE ARCH)
+ 
+-add_definitions (${QT_DEFINITIONS}  -DHAVE_CONFIG_H=1)
++add_definitions (${QT_DEFINITIONS}  -DHAVE_CONFIG_H=1 -O2)
+ IF(ARCH MATCHES parisc)
+-  ADD_DEFINITIONS(-fno-exceptions -fno-check-new -fno-common -fPIC -O2)
++  ADD_DEFINITIONS(-fno-exceptions -fno-check-new -fno-common -fPIC)
+ ENDIF(ARCH MATCHES parisc)
+ include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${QT_INCLUDES} )
+ 


Property changes on: packages/libqt4-ruby/trunk/debian/patches/28-optimization.dpatch
___________________________________________________________________
Name: svn:executable
   + *