[qxmpp-dev/f17] Fixing patches

[Minh Ngo]

commit ee2bc8e7829dcf9cac75d22d2c6bd6e3449f0b6a
Author: Minh Ngo <nlminhtl at gmail.com>
Date:   Sat Mar 17 10:56:34 2012 +0200

    Fixing patches

 qxmpp-dev-dynamiclib.patch |   16 +++-------------
 qxmpp-dev-htmldoc.patch    |   14 ++++++++++----
 qxmpp-dev-rename.patch     |   24 +++++++++++++++++-------
 3 files changed, 30 insertions(+), 24 deletions(-)
---
diff --git a/qxmpp-dev-dynamiclib.patch b/qxmpp-dev-dynamiclib.patch
index bb58a1d..9a77c59 100644
--- a/qxmpp-dev-dynamiclib.patch
+++ b/qxmpp-dev-dynamiclib.patch
@@ -1,5 +1,6 @@
---- qxmpp.pri	2011-07-18 03:12:56.000000000 +0300
-+++ qxmpp.pri	2011-07-30 10:06:40.882149129 +0300
+diff -ru qxmpp-0.3.47/qxmpp.pri qxmpp-0.3.47.new/qxmpp.pri
+--- qxmpp-0.3.47/qxmpp.pri	2012-02-23 21:34:24.000000000 +0200
++++ qxmpp-0.3.47.new/qxmpp.pri	2012-03-17 10:55:40.250193681 +0200
 @@ -32,7 +32,7 @@
  # Path of the QXmpp library file, for expressing dependency.
  symbian {
@@ -9,14 +10,3 @@
  }
  
  unix {
---- src/src.pro	2011-07-18 03:12:56.000000000 +0300
-+++ src/src.pro	2011-07-30 10:06:14.832474792 +0300
-@@ -4,7 +4,7 @@
- 
- TEMPLATE = lib
- 
--CONFIG += staticlib
-+CONFIG += dynamiclib
- INCLUDEPATH += $$QXMPP_INCLUDE_DIR $$QXMPP_INTERNAL_INCLUDES
- LIBS += $$QXMPP_INTERNAL_LIBS
- 
diff --git a/qxmpp-dev-htmldoc.patch b/qxmpp-dev-htmldoc.patch
index a34d3e1..7355b15 100644
--- a/qxmpp-dev-htmldoc.patch
+++ b/qxmpp-dev-htmldoc.patch
@@ -1,7 +1,13 @@
---- qxmpp.pro	2011-06-04 20:19:57.000000000 +0300
-+++ qxmpp.pro	2011-06-06 00:06:09.751272301 +0300
-@@ -28,4 +28,3 @@
- htmldocs.CONFIG += no_check_exist directory
+diff -ru qxmpp-0.3.47/qxmpp.pro qxmpp-0.3.47.new/qxmpp.pro
+--- qxmpp-0.3.47/qxmpp.pro	2012-02-23 21:34:24.000000000 +0200
++++ qxmpp-0.3.47.new/qxmpp.pro	2012-03-17 10:55:40.542199387 +0200
+@@ -20,9 +20,5 @@
+ dist.depends = docs
+ 
+ # Install rules
+-htmldocs.files = doc/html
+-htmldocs.path = $$PREFIX/share/doc/qxmpp
+-htmldocs.CONFIG += no_check_exist directory
  
  QMAKE_EXTRA_TARGETS += dist docs
 -INSTALLS += htmldocs
diff --git a/qxmpp-dev-rename.patch b/qxmpp-dev-rename.patch
index 5bdd75b..693eeec 100644
--- a/qxmpp-dev-rename.patch
+++ b/qxmpp-dev-rename.patch
@@ -1,6 +1,6 @@
-diff -ru qxmpp-0.3.45.2/qxmpp.pri qxmpp-0.3.45.2.new/qxmpp.pri
---- qxmpp-0.3.45.2/qxmpp.pri	2011-08-21 13:55:17.000000000 +0300
-+++ qxmpp-0.3.45.2.new/qxmpp.pri	2012-02-19 15:31:39.182411838 +0200
+diff -ru qxmpp-0.3.47/qxmpp.pri qxmpp-0.3.47.new/qxmpp.pri
+--- qxmpp-0.3.47/qxmpp.pri	2012-02-23 21:34:24.000000000 +0200
++++ qxmpp-0.3.47.new/qxmpp.pri	2012-03-17 10:55:40.834205093 +0200
 @@ -5,9 +5,9 @@
  QXMPP_LIBRARY_DIR = $$PWD/lib
  
@@ -13,10 +13,19 @@ diff -ru qxmpp-0.3.45.2/qxmpp.pri qxmpp-0.3.45.2.new/qxmpp.pri
  }
  
  # Libraries used internal by QXmpp
-diff -ru qxmpp-0.3.45.2/src/src.pro qxmpp-0.3.45.2.new/src/src.pro
---- qxmpp-0.3.45.2/src/src.pro	2011-08-21 13:55:17.000000000 +0300
-+++ qxmpp-0.3.45.2.new/src/src.pro	2012-02-19 15:32:01.288908937 +0200
-@@ -197,6 +197,6 @@
+@@ -25,7 +25,7 @@
+ }
+ 
+ # FIXME: we should be able to use the link_prl option to automatically pull
+-# in the extra libraries which the qxmpp library needs, but this does not
++# in the extra libraries which the qxmpp-dev library needs, but this does not
+ # seem to work on win32, so we specify the dependencies here:
+ QXMPP_LIBS += $$QXMPP_INTERNAL_LIBS
+ 
+diff -ru qxmpp-0.3.47/src/src.pro qxmpp-0.3.47.new/src/src.pro
+--- qxmpp-0.3.47/src/src.pro	2012-02-23 21:34:24.000000000 +0200
++++ qxmpp-0.3.47.new/src/src.pro	2012-03-17 10:55:40.851205424 +0200
+@@ -198,7 +198,7 @@
  
  # Installation
  headers.files = $$INSTALL_HEADERS
@@ -24,3 +33,4 @@ diff -ru qxmpp-0.3.45.2/src/src.pro qxmpp-0.3.45.2.new/src/src.pro
 +headers.path = $$PREFIX/include/qxmpp-dev
  target.path = $$PREFIX/$$LIBDIR
  INSTALLS += headers target
+