Author: draenog Date: Sun Jun 27 01:40:39 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 1.7.1
- remove -DQT_NO_CODECS from CXXFLAGS to prevent segfault
---- Files affected:
packages/doxygen:
doxygen-qt-dirs.patch (1.6 -> 1.7) , doxygen.spec (1.112 -> 1.113)
---- Diffs:
================================================================
Index: packages/doxygen/doxygen-qt-dirs.patch
diff -u packages/doxygen/doxygen-qt-dirs.patch:1.6
packages/doxygen/doxygen-qt-dirs.patch:1.7
--- packages/doxygen/doxygen-qt-dirs.patch:1.6 Tue Feb 9 03:59:19 2010
+++ packages/doxygen/doxygen-qt-dirs.patch Sun Jun 27 03:40:33 2010
@@ -5,7 +5,7 @@
# See the GNU General Public License for more details.
#
--QMAKE=qmake
+-QMAKE=qmake $(MKSPECS)
-
all: Makefile.doxywizard
$(MAKE) -f Makefile.doxywizard
@@ -33,7 +33,7 @@
if test -z "$QTDIR"; then
echo " QTDIR environment variable not set!"
echo -n " Checking for Qt..."
-- for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4}; do
+- for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4} /usr; do
+ for d in /usr/{lib64,lib,share,qt}/{qt-4,qt4,qt,qt*,4}; do
if test -x "$d/bin/qmake"; then
QTDIR=$d
================================================================
Index: packages/doxygen/doxygen.spec
diff -u packages/doxygen/doxygen.spec:1.112 packages/doxygen/doxygen.spec:1.113
--- packages/doxygen/doxygen.spec:1.112 Sun Mar 28 08:05:18 2010
+++ packages/doxygen/doxygen.spec Sun Jun 27 03:40:33 2010
@@ -10,13 +10,13 @@
Summary(ru.UTF-8): Система документирования для C та C++
Summary(uk.UTF-8): Система документування для C та C++
Name: doxygen
-Version: 1.6.3
+Version: 1.7.1
Release: 1
Epoch: 1
License: GPL
Group: Development/Tools
Source0:
ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
-# Source0-md5: 2d6ea20a9d850d94321cee78bab7bb87
+# Source0-md5: 13e76e10fb55581a16ee04de35c264f0
Patch0: %{name}-qt-dirs.patch
URL: http://www.doxygen.org/
%{?with_qt:BuildRequires: QtGui-devel >= 4.3}
@@ -148,7 +148,7 @@
LINK="%{__cxx}" \
QTDIR="%{_prefix}" \
CFLAGS="%{rpmcflags}" \
- CXXFLAGS="%{rpmcxxflags} -DQT_NO_CODECS -DQT_LITE_UNICODE -DNODEBUG
-fno-rtti -fno-exceptions" \
+ CXXFLAGS="%{rpmcxxflags} -DQT_LITE_UNICODE -DNODEBUG -fno-rtti
-fno-exceptions" \
LFLAGS="%{rpmldflags}"
%{__make} docs
@@ -182,6 +182,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.113 2010/06/27 01:40:33 draenog
+- up to 1.7.1
+- remove -DQT_NO_CODECS from CXXFLAGS to prevent segfault
+
Revision 1.112 2010/03/28 06:05:18 draenog
-up to 1.6.3
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/doxygen/doxygen-qt-dirs.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/doxygen/doxygen.spec?r1=1.112&r2=1.113&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
