Package: ktoon
Version: 0.8.1-3
Followup-For: Bug #458873
User: [EMAIL PROTECTED]
Usertags: origin-ubuntu hardy ubuntu-patch
The attached patch fixes the FTBFS and drops the libminghack patch,
which would cause libming to not be detected anymore.
*** /tmp/tmppsNTUD
In Ubuntu, we've applied the attached patch to achieve the following:
* Fix build on unix (LP: #180470)
- added debian/patches/80_fix_build_on_unix.dpatch
* Drop debian/patches/20_libminghack:
ming-config has moved to /usr/bin/ming-config
We thought you might be interested in doing the same.
--- ktoon-0.8.1/debian/patches/20_libminghack
+++ ktoon-0.8.1.orig/debian/patches/20_libminghack
@@ -1,26 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_libminghack.dpatch by Juan Manuel Garcia Molina <[EMAIL PROTECTED]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix libming detection.
-
[EMAIL PROTECTED]@
---- ktoon-0.8.orig/configure 2006-07-28 20:47:08.000000000 +0200
-+++ ktoon-0.8/configure 2006-08-08 15:16:29.000000000 +0200
-@@ -107,12 +107,12 @@
-
- # Checking ming
-
--if [ -x "`which ming-config`" ]
-+export MING_BINARY="/usr/lib/libming/bin/ming-config"
-+if [ -x ${MING_BINARY} ]
- then
-- export MING_LIBS=`ming-config --libs`
-- export MING_INCLUDE=`ming-config --cflags`
-+ export MING_LIBS=`${MING_BINARY} --libs`
-+ export MING_INCLUDE=`${MING_BINARY} --cflags`
- fi
--
- check "ming" ming "${MING_INCLUDE}" "${MING_LIBS}" && LIBS="$LIBS
${MING_LIBS}" && defineMacro HAVE_MING
-
-
diff -u ktoon-0.8.1/debian/patches/00list ktoon-0.8.1/debian/patches/00list
--- ktoon-0.8.1/debian/patches/00list
+++ ktoon-0.8.1/debian/patches/00list
@@ -1,4 +1,4 @@
-20_libminghack
31_dirs
40_configure_bin_bash
60_daction_q_object
+80_fix_build_on_unix.dpatch
only in patch2:
unchanged:
--- ktoon-0.8.1.orig/debian/patches/80_fix_build_on_unix.dpatch
+++ ktoon-0.8.1/debian/patches/80_fix_build_on_unix.dpatch
@@ -0,0 +1,92 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 80_fix_build_on_unix.dpatch by dAniel hAhler <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix build on Unix (LP: #180470)
+## DP: find . -name \*.pro | xargs grep -l "^macx\s*{" | xargs sed -r -i
's/^macx\s*\{/!win32{/g'
+
[EMAIL PROTECTED]@
+diff -urNad ktoon-0.8.1~/src/components/export/export.pro
ktoon-0.8.1/src/components/export/export.pro
+--- ktoon-0.8.1~/src/components/export/export.pro 2007-06-15
04:33:05.000000000 +0200
++++ ktoon-0.8.1/src/components/export/export.pro 2008-01-05
16:24:43.329936475 +0100
+@@ -14,7 +14,7 @@
+ CONFIG += release \
+ warn_on
+ TEMPLATE = subdirs
+-macx{
++!win32{
+ LIBS += -ldcore -ldgui -lktoon -lstore
+ QMAKE_LIBDIR = ../../../../src/dlib/dcore ../../../../src/dlib/dgui
../../../../src/ktoonlib ../../../../src/store
+ }
+diff -urNad
ktoon-0.8.1~/src/components/export/genericexportplugin/genericexportplugin.pro
ktoon-0.8.1/src/components/export/genericexportplugin/genericexportplugin.pro
+---
ktoon-0.8.1~/src/components/export/genericexportplugin/genericexportplugin.pro
2007-06-15 04:33:05.000000000 +0200
++++
ktoon-0.8.1/src/components/export/genericexportplugin/genericexportplugin.pro
2008-01-05 16:24:43.329936475 +0100
+@@ -17,7 +17,7 @@
+ TEMPLATE = lib
+ HEADERS += genericexportplugin.h
+ SOURCES += genericexportplugin.cpp
+-macx{
++!win32{
+ LIBS += -ldcore -ldgui -lktoon -lstore
+ QMAKE_LIBDIR = ../../../../src/dlib/dcore ../../../../src/dlib/dgui
../../../../src/ktoonlib ../../../../src/store
+ }
+diff -urNad
ktoon-0.8.1~/src/components/export/smilexportplugin/smilexportplugin.pro
ktoon-0.8.1/src/components/export/smilexportplugin/smilexportplugin.pro
+--- ktoon-0.8.1~/src/components/export/smilexportplugin/smilexportplugin.pro
2007-06-15 04:33:05.000000000 +0200
++++ ktoon-0.8.1/src/components/export/smilexportplugin/smilexportplugin.pro
2008-01-05 16:24:43.329936475 +0100
+@@ -28,7 +28,7 @@
+ ../../../../src/store/release
+ }
+
+-macx {
++!win32{
+ LIBS += -ldcore -ldgui -lktoon -lstore
+ QMAKE_LIBDIR += ../../../../src/store \
+ ../../../../src/ktoonlib \
+diff -urNad ktoon-0.8.1~/src/dlib/dgui/dgui.pro
ktoon-0.8.1/src/dlib/dgui/dgui.pro
+--- ktoon-0.8.1~/src/dlib/dgui/dgui.pro 2007-06-15 04:33:09.000000000
+0200
++++ ktoon-0.8.1/src/dlib/dgui/dgui.pro 2008-01-05 16:24:43.329936475 +0100
+@@ -112,7 +112,7 @@
+ warn_on \
+ dll
+ TEMPLATE = lib
+-macx{
++!win32{
+ QMAKE_LIBDIR = ../../../src/dlib/dcore
+ LIBS += -ldcore
+ }
+diff -urNad ktoon-0.8.1~/src/ktoonlib/ktoonlib.pro
ktoon-0.8.1/src/ktoonlib/ktoonlib.pro
+--- ktoon-0.8.1~/src/ktoonlib/ktoonlib.pro 2007-06-15 04:33:04.000000000
+0200
++++ ktoon-0.8.1/src/ktoonlib/ktoonlib.pro 2008-01-05 16:24:43.329936475
+0100
+@@ -36,7 +36,7 @@
+ warn_on \
+ dll
+ TEMPLATE = lib
+-macx{
++!win32{
+ LIBS += -ldcore -ldgui
+ QMAKE_LIBDIR = ../../src/dlib/dcore ../../src/dlib/dgui
+ }
+diff -urNad ktoon-0.8.1~/src/modules/arthury/interfaces/interfaces.pro
ktoon-0.8.1/src/modules/arthury/interfaces/interfaces.pro
+--- ktoon-0.8.1~/src/modules/arthury/interfaces/interfaces.pro 2007-06-15
04:33:09.000000000 +0200
++++ ktoon-0.8.1/src/modules/arthury/interfaces/interfaces.pro 2008-01-05
16:24:43.329936475 +0100
+@@ -17,7 +17,7 @@
+ TEMPLATE = lib
+
+ # a little hack
+-macx {
++!win32{
+ TEMPLATE = subdirs
+ }
+ win32 {
+diff -urNad ktoon-0.8.1~/src/store/store.pro ktoon-0.8.1/src/store/store.pro
+--- ktoon-0.8.1~/src/store/store.pro 2007-06-15 04:33:10.000000000 +0200
++++ ktoon-0.8.1/src/store/store.pro 2008-01-05 16:24:43.329936475 +0100
+@@ -44,7 +44,7 @@
+ dll
+ TEMPLATE = lib
+
+-macx {
++!win32{
+ LIBS += -ldcore -ldgui -lktoon
+ QMAKE_LIBDIR = ../../src/dlib/dcore ../../src/dlib/dgui ../../src/ktoonlib
+ }
