[qxmpp-dev/f17] Fixing patches
Minh Ngo
ignotusp at fedoraproject.org
Sat Mar 17 09:08:05 UTC 2012
commit 264746223a649c5653f78f08dd6aec0f0db4d867
Author: Minh Ngo <nlminhtl at gmail.com>
Date: Sat Mar 17 11:07:43 2012 +0200
Fixing patches
qxmpp-dev-dynamiclib.patch | 14 +++++++++++++-
qxmpp-dev-htmldoc.patch | 2 +-
qxmpp-dev-rename.patch | 4 ++--
qxmpp-dev.spec | 4 ++--
4 files changed, 18 insertions(+), 6 deletions(-)
---
diff --git a/qxmpp-dev-dynamiclib.patch b/qxmpp-dev-dynamiclib.patch
index 9a77c59..deb5251 100644
--- a/qxmpp-dev-dynamiclib.patch
+++ b/qxmpp-dev-dynamiclib.patch
@@ -1,6 +1,6 @@
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
++++ qxmpp-0.3.47.new/qxmpp.pri 2012-03-17 11:04:00.296567164 +0200
@@ -32,7 +32,7 @@
# Path of the QXmpp library file, for expressing dependency.
symbian {
@@ -10,3 +10,15 @@ diff -ru qxmpp-0.3.47/qxmpp.pri qxmpp-0.3.47.new/qxmpp.pri
}
unix {
+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 11:04:00.322567722 +0200
+@@ -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 7355b15..5585fad 100644
--- a/qxmpp-dev-htmldoc.patch
+++ b/qxmpp-dev-htmldoc.patch
@@ -1,6 +1,6 @@
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
++++ qxmpp-0.3.47.new/qxmpp.pro 2012-03-17 11:04:00.668575137 +0200
@@ -20,9 +20,5 @@
dist.depends = docs
diff --git a/qxmpp-dev-rename.patch b/qxmpp-dev-rename.patch
index 693eeec..aee34e4 100644
--- a/qxmpp-dev-rename.patch
+++ b/qxmpp-dev-rename.patch
@@ -1,6 +1,6 @@
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
++++ qxmpp-0.3.47.new/qxmpp.pri 2012-03-17 11:04:00.997582188 +0200
@@ -5,9 +5,9 @@
QXMPP_LIBRARY_DIR = $$PWD/lib
@@ -24,7 +24,7 @@ diff -ru qxmpp-0.3.47/qxmpp.pri qxmpp-0.3.47.new/qxmpp.pri
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
++++ qxmpp-0.3.47.new/src/src.pro 2012-03-17 11:04:01.025582788 +0200
@@ -198,7 +198,7 @@
# Installation
diff --git a/qxmpp-dev.spec b/qxmpp-dev.spec
index d57c1ad..7956c7d 100644
--- a/qxmpp-dev.spec
+++ b/qxmpp-dev.spec
@@ -43,8 +43,8 @@ QXmpp-dev is a cross-platform C++ XMPP client library. It is based on Qt and C++
%prep
%setup -qn qxmpp-%{version}
%patch2 -p1
-%patch0
-%patch1
+%patch0 -p1
+%patch1 -p1
%build
%{_qt4_qmake} PREFIX=%{_prefix} QMAKE_STRIP="" QMAKE_CXXFLAGS+="%{optflags}"
More information about the scm-commits
mailing list