[prev in list] [next in list] [prev in thread] [next in thread]
List: fink-commits
Subject: [cvs] dists/10.7/stable/main/finkinfo/devel doxygen.info, 1.3, 1.4 doxygen.patch, 1.2, 1.3
From: Alexander Hansen <alexkhansen () users ! sourceforge ! net>
Date: 2013-01-31 16:49:30
Message-ID: E1U0xKP-0000Ct-Dh () sfs-ml-2 ! v29 ! ch3 ! sourceforge ! com
[Download RAW message or body]
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/devel
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv2575
Modified Files:
doxygen.info doxygen.patch
Log Message:
Slight tweak on https://sourceforge.net/tracker/?func=detail&aid=3602826&group_id=17203&atid=414256
which makes backporting to 10.5/10.6 easier.
Index: doxygen.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/devel/doxygen.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- doxygen.patch 2 Jul 2012 19:42:20 -0000 1.2
+++ doxygen.patch 31 Jan 2013 16:49:28 -0000 1.3
@@ -1,18 +1,18 @@
-diff -ruN doxygen-1.7.4/Makefile.in doxygen-1.7.4-patched/Makefile.in
---- doxygen-1.7.4/Makefile.in 2009-08-20 13:41:13.000000000 -0600
-+++ doxygen-1.7.4-patched/Makefile.in 2012-07-02 13:40:11.000000000 -0600
-@@ -44,7 +44,7 @@
+diff -uNr doxygen-1.8.3.1/Makefile.in doxygen-1.8.3.1.fink/Makefile.in
+--- doxygen-1.8.3.1/Makefile.in 2013-01-04 07:42:07.000000000 -0500
++++ doxygen-1.8.3.1.fink/Makefile.in 2013-01-31 10:49:48.000000000 -0500
+@@ -53,7 +53,7 @@
DATE=$(shell date "+%B %Y")
-MAN1DIR = man/man1
+MAN1DIR = share/man/man1
- install: doxywizard_install
+ install: doxywizard_install doxysearch_install
$(INSTTOOL) -d $(DESTDIR)/$(INSTALL)/bin
-diff -ruN doxygen-1.7.4/addon/doxywizard/doxywizard.pro.in \
doxygen-1.7.4-patched/addon/doxywizard/doxywizard.pro.in
---- doxygen-1.7.4/addon/doxywizard/doxywizard.pro.in 2011-01-03 13:20:50.000000000 \
-0700
-+++ doxygen-1.7.4-patched/addon/doxywizard/doxywizard.pro.in 2012-07-02 \
13:40:11.000000000 -0600 +diff -uNr \
doxygen-1.8.3.1/addon/doxywizard/doxywizard.pro.in \
doxygen-1.8.3.1.fink/addon/doxywizard/doxywizard.pro.in +--- \
doxygen-1.8.3.1/addon/doxywizard/doxywizard.pro.in 2013-01-05 10:35:52.000000000 \
-0500 ++++ doxygen-1.8.3.1.fink/addon/doxywizard/doxywizard.pro.in 2013-01-31 \
10:51:30.000000000 -0500 @@ -6,7 +6,7 @@
DESTDIR = ../../bin
TARGET =
@@ -27,16 +27,16 @@
DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
-macx-g++ {
-- CONFIG += x86 ppc
+- CONFIG += x86
-}
-
# Input
HEADERS += doxywizard.h version.h expert.h config.h helplabel.h \
inputbool.h inputstring.h inputint.h inputstrlist.h wizard.h
-diff -ruN doxygen-1.7.4/configure doxygen-1.7.4-patched/configure
---- doxygen-1.7.4/configure 2011-03-28 07:12:47.000000000 -0600
-+++ doxygen-1.7.4-patched/configure 2012-07-02 13:40:11.000000000 -0600
-@@ -559,7 +559,7 @@
+diff -uNr doxygen-1.8.3.1/configure doxygen-1.8.3.1.fink/configure
+--- doxygen-1.8.3.1/configure 2013-01-19 17:49:36.000000000 -0500
++++ doxygen-1.8.3.1.fink/configure 2013-01-31 10:49:48.000000000 -0500
+@@ -587,7 +587,7 @@
TMAKE_CXXFLAGS += -D_LARGEFILE_SOURCE
EOF
fi
@@ -45,27 +45,9 @@
if test -n "`ls /Developer/SDKs/MacOSX10.*.sdk 2>/dev/null`"; then
mac_sdk=MacOSX10.4u.sdk
fi
-diff -ruN doxygen-1.7.4/qtools/qglobal.h doxygen-1.7.4-patched/qtools/qglobal.h
---- doxygen-1.7.4/qtools/qglobal.h 2010-06-09 03:49:13.000000000 -0600
-+++ doxygen-1.7.4-patched/qtools/qglobal.h 2012-07-02 13:42:38.000000000 -0600
-@@ -89,7 +89,13 @@
- # if !defined(MAC_OS_X_VERSION_10_6)
- # define MAC_OS_X_VERSION_10_6 MAC_OS_X_VERSION_10_5 + 1
- # endif
--# if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_6)
-+# if !defined(MAC_OS_X_VERSION_10_7)
-+# define MAC_OS_X_VERSION_10_7 MAC_OS_X_VERSION_10_6 + 1
-+# endif
-+# if !defined(MAC_OS_X_VERSION_10_8)
-+# define MAC_OS_X_VERSION_10_8 MAC_OS_X_VERSION_10_7 + 1
-+# endif
-+# if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_8)
- # error "This version of Mac OS X is unsupported"
- # endif
- #elif defined(MSDOS) || defined(_MSDOS) || defined(__MSDOS__)
-diff -ruN doxygen-1.7.4/qtools/qtools.pro.in \
doxygen-1.7.4-patched/qtools/qtools.pro.in
---- doxygen-1.7.4/qtools/qtools.pro.in 2010-06-09 13:41:23.000000000 -0600
-+++ doxygen-1.7.4-patched/qtools/qtools.pro.in 2012-07-02 13:40:11.000000000 -0600
+diff -uNr doxygen-1.8.3.1/qtools/qtools.pro.in \
doxygen-1.8.3.1.fink/qtools/qtools.pro.in +--- \
doxygen-1.8.3.1/qtools/qtools.pro.in 2010-06-09 15:41:23.000000000 -0400 ++++ \
doxygen-1.8.3.1.fink/qtools/qtools.pro.in 2013-01-31 10:49:48.000000000 -0500 @@ \
-93,7 +93,7 @@ qmutex_win32.cpp \
qwaitcondition_win32.cpp
@@ -75,9 +57,9 @@
#TMAKE_CXXFLAGS += -DQT_NO_CODECS -DQT_LITE_UNICODE
TMAKE_CXXFLAGS += -DQT_LITE_UNICODE
win32:TMAKE_CXXFLAGS += -DQT_NODLL
-diff -ruN doxygen-1.7.4/src/doxygen.pro.in doxygen-1.7.4-patched/src/doxygen.pro.in
---- doxygen-1.7.4/src/doxygen.pro.in 2011-01-03 13:14:46.000000000 -0700
-+++ doxygen-1.7.4-patched/src/doxygen.pro.in 2012-07-02 13:40:11.000000000 -0600
+diff -uNr doxygen-1.8.3.1/src/doxygen.pro.in doxygen-1.8.3.1.fink/src/doxygen.pro.in
+--- doxygen-1.8.3.1/src/doxygen.pro.in 2013-01-05 10:17:41.000000000 -0500
++++ doxygen-1.8.3.1.fink/src/doxygen.pro.in 2013-01-31 10:49:48.000000000 -0500
@@ -18,7 +18,7 @@
CONFIG = console warn_on $extraopts
HEADERS = doxygen.h
@@ -89,36 +71,16 @@
win32-msvc:LIBS += qtools.lib md5.lib doxygen.lib doxycfg.lib \
shell32.lib iconv.lib @@ -28,7 +28,7 @@
win32:TMAKE_CXXFLAGS += -DQT_NODLL
- win32-g++:LIBS = -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -liconv \
-lpthread + win32-g++:LIBS = -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 \
-liconv -lpthread -Wl,--as-needed -lole32 win32-g++:TMAKE_CXXFLAGS += \
-fno-exceptions -fno-rtti
-INCLUDEPATH += ../qtools ../libmd5 .
+INCLUDEPATH += ../qtools ../libmd5 . @PREFIX@/include
DESTDIR = ../bin
TARGET = doxygen
unix:TARGETDEPS = ../lib/libdoxygen.a ../lib/libdoxycfg.a
-diff -ruN doxygen-1.7.4/src/doxytag.pro.in doxygen-1.7.4-patched/src/doxytag.pro.in
---- doxygen-1.7.4/src/doxytag.pro.in 2011-01-03 13:14:46.000000000 -0700
-+++ doxygen-1.7.4-patched/src/doxytag.pro.in 2012-07-02 13:40:11.000000000 -0600
-@@ -18,7 +18,7 @@
- CONFIG = console warn_on $extraopts
- HEADERS = logos.h version.h
- SOURCES = doxytag.cpp logos.cpp version.cpp
--unix:LIBS += -L../lib -lqtools
-+unix:LIBS += -L../lib -lqtools -L@PREFIX@/lib
- win32:INCLUDEPATH += .
- win32-mingw:LIBS += -L../lib -lqtools
- win32-msvc:LIBS += qtools.lib shell32.lib
-@@ -26,6 +26,6 @@
- win32-borland:LIBS += qtools.lib shell32.lib
- win32-borland:TMAKE_LFLAGS += -L..\lib -L$(BCB)\lib\psdk
- win32:TMAKE_CXXFLAGS += -DQT_NODLL
--INCLUDEPATH += ../qtools
-+INCLUDEPATH += ../qtools @PREFIX@/include
- OBJECTS_DIR = ../objects
- TARGET = ../bin/doxytag
-diff -ruN doxygen-1.7.4/src/libdoxycfg.pro.in \
doxygen-1.7.4-patched/src/libdoxycfg.pro.in
---- doxygen-1.7.4/src/libdoxycfg.pro.in 2011-01-03 13:14:46.000000000 -0700
-+++ doxygen-1.7.4-patched/src/libdoxycfg.pro.in 2012-07-02 13:40:11.000000000 -0600
+diff -uNr doxygen-1.8.3.1/src/libdoxycfg.pro.in \
doxygen-1.8.3.1.fink/src/libdoxycfg.pro.in +--- \
doxygen-1.8.3.1/src/libdoxycfg.pro.in 2013-01-05 10:17:42.000000000 -0500 ++++ \
doxygen-1.8.3.1.fink/src/libdoxycfg.pro.in 2013-01-31 10:50:09.000000000 -0500 @@ \
-20,7 +20,7 @@ SOURCES = config.cpp configoptions.cpp portable.cpp portable_c.c
win32:TMAKE_CXXFLAGS += -DQT_NODLL
@@ -128,10 +90,10 @@
win32:INCLUDEPATH += .
DESTDIR = ../lib
TARGET = doxycfg
-diff -ruN doxygen-1.7.4/src/libdoxygen.pro.in \
doxygen-1.7.4-patched/src/libdoxygen.pro.in
---- doxygen-1.7.4/src/libdoxygen.pro.in 2011-01-03 13:14:46.000000000 -0700
-+++ doxygen-1.7.4-patched/src/libdoxygen.pro.in 2012-07-02 13:40:11.000000000 -0600
-@@ -248,9 +248,10 @@
+diff -uNr doxygen-1.8.3.1/src/libdoxygen.pro.in \
doxygen-1.8.3.1.fink/src/libdoxygen.pro.in +--- \
doxygen-1.8.3.1/src/libdoxygen.pro.in 2013-01-05 10:17:42.000000000 -0500 ++++ \
doxygen-1.8.3.1.fink/src/libdoxygen.pro.in 2013-01-31 10:50:09.000000000 -0500 +@@ \
-265,9 +265,10 @@ win32-msvc:TMAKE_CXXFLAGS += -Zm200
win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
linux-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
@@ -143,16 +105,16 @@
win32:INCLUDEPATH += .
#win32-g++:INCLUDEPATH = ../qtools /usr/include/libpng12 ../libmd5
win32-g++:INCLUDEPATH = ../qtools ../libmd5
-diff -ruN doxygen-1.7.4/tmake/lib/macosx-uni-c++/tmake.conf \
doxygen-1.7.4-patched/tmake/lib/macosx-uni-c++/tmake.conf
---- doxygen-1.7.4/tmake/lib/macosx-uni-c++/tmake.conf 2010-05-31 15:53:42.000000000 \
-0600
-+++ doxygen-1.7.4-patched/tmake/lib/macosx-uni-c++/tmake.conf 2012-07-02 \
13:40:11.000000000 -0600 +diff -uNr \
doxygen-1.8.3.1/tmake/lib/macosx-uni-c++/tmake.conf \
doxygen-1.8.3.1.fink/tmake/lib/macosx-uni-c++/tmake.conf +--- \
doxygen-1.8.3.1/tmake/lib/macosx-uni-c++/tmake.conf 2012-08-09 14:29:37.000000000 \
-0400 ++++ doxygen-1.8.3.1.fink/tmake/lib/macosx-uni-c++/tmake.conf 2013-01-31 \
10:54:05.000000000 -0500 @@ -8,7 +8,7 @@
CONFIG = qt warn_on release
TMAKE_CC = cc
-TMAKE_CFLAGS = -pipe -arch i386 -arch ppc
-+TMAKE_CFLAGS = -pipe -arch x86_64
- TMAKE_CFLAGS_WARN_ON = -Wall -W
++TMAKE_CFLAGS = -pipe -arch @FINK_ARCH@
+ TMAKE_CFLAGS_WARN_ON = -Wall -W -Wno-deprecated-declarations \
-Wno-invalid-source-encoding TMAKE_CFLAGS_WARN_OFF =
TMAKE_CFLAGS_RELEASE = -O2
@@ -36,7 +36,7 @@
@@ -160,7 +122,7 @@
TMAKE_LINK = c++
TMAKE_LINK_SHLIB = c++
-TMAKE_LFLAGS = -Wl,-search_paths_first -arch i386 -arch ppc
-+TMAKE_LFLAGS = -Wl,-search_paths_first -arch x86_64
++TMAKE_LFLAGS = -Wl,-search_paths_first -arch @FINK_ARCH@
TMAKE_LFLAGS_RELEASE =
TMAKE_LFLAGS_DEBUG =
TMAKE_LFLAGS_SHLIB = -shared
Index: doxygen.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/devel/doxygen.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- doxygen.info 2 Jul 2012 19:42:20 -0000 1.3
+++ doxygen.info 31 Jan 2013 16:49:28 -0000 1.4
@@ -1,11 +1,11 @@
Info3: <<
Package: doxygen
-Version: 1.7.4
+Version: 1.8.3.1
Revision: 1
Source: ftp://ftp.stack.nl/pub/users/dimitri/%n-%v.src.tar.gz
SourceDirectory: %n-%v
-Source-MD5: ff908759ff7cd9464424b04ae6c68e48
+Source-MD5: 31b0aaab51c5cab7db9f0ebbe9f85530
Depends: <<
libiconv,
<<
@@ -13,16 +13,15 @@
fink (>= 0.25.0),
libiconv-dev
<<
-#NoSetMAKEFLAGS: true
-#SetMAKEFLAGS: -j1
PatchFile: %n.patch
-PatchFile-MD5: 84ed8db406537a8e01e7940d27f1e6b7
+PatchFile-MD5: 6fa2690fb487dd1e4e8fe513f88c739d
PatchScript: <<
- sed 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p1
+ sed -e 's|@PREFIX@|%p|g' \
+ -e 's|@FINK_ARCH@|%m|g' <%{PatchFile} | patch -p1
<<
GCC: 4.0
CompileScript: <<
- ./configure --prefix %p --release --install /usr/bin/install --dot %p/bin/dot
+ ./configure --prefix %p --release --install /usr/bin/install --dot %p/bin/dot \
--bison /usr/bin/bison --flex /usr/bin/flex make
<<
InstallScript: <<
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_jan
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic