Update of /cvsroot/fink/experimental/rangerrick/common/main/finkinfo/x11
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26098/common/main/finkinfo/x11
Modified Files:
qt3.info qt3.patch
Log Message:
fix up install_names, still building, but should work
Index: qt3.info
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/common/main/finkinfo/x11/qt3.info,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- qt3.info 26 Mar 2006 23:18:29 -0000 1.49
+++ qt3.info 27 Mar 2006 22:30:24 -0000 1.50
@@ -1,6 +1,6 @@
Package: qt3
Version: 3.3.6
-Revision: 2
+Revision: 3
GCC: 3.3
CustomMirror: <<
Primary: ftp://ftp.trolltech.com/qt/source
@@ -132,7 +132,7 @@
$LIBRESOLV -fast -buildkey qt3-jaguar \
-platform darwin-g++ -xplatform darwin-g++ \
-prefix '%p/lib/qt3' -docdir '%p/share/doc/%n' \
- -headerdir '%p/include/qt' \
+ -headerdir '%p/include/qt' -libdir '%p/lib' \
-release -shared -no-exceptions -thread -cups -stl \
-qt-gif -plugin-imgfmt-png -plugin-imgfmt-jpeg
-plugin-imgfmt-mng \
-system-libpng -system-libjpeg -system-zlib -largefile \
@@ -153,14 +153,6 @@
make install INSTALL_ROOT=%d
- #### CLEAN UP FILES ####
-
- # fix the -L$(QTDIR) junk in the .la file
- perl -pi -e 's,\$\(QTDIR\),%p/lib/qt3,g' %i/lib/qt3/lib/*.la
-
- # remove the .prl files, we don't want them
- rm -rf %i/lib/qt3/lib/*.prl
-
#### COMPATIBILITY WITH OLD QT3 PACKAGES ####
# set up symlinks for compatibility with some old packages
@@ -176,7 +168,9 @@
ln -sf %p/include/qt %i/lib/qt3/include
# %p/lib
- install -d -m 0755 %i/lib
+ install -d -m 0755 %i/lib/qt3/lib
+ mv %i/lib/*.* %i/lib/qt3/lib/
+
for file in `cd %i/lib/qt3/lib; ls`; do
[ "$file" != "pkgconfig" ] && ln -sf %p/lib/qt3/lib/$file
%i/lib/$file
done
@@ -186,6 +180,14 @@
# %p/lib/qt3/doc
ln -sf %p/share/doc/%N %i/lib/qt3/doc
+ #### CLEAN UP FILES ####
+
+ # fix the -L$(QTDIR) junk in the .la file
+ perl -pi -e 's,\$\(QTDIR\),%p/lib/qt3,g' %i/lib/qt3/lib/*.la
+
+ # remove the .prl files, we don't want them
+ rm -rf %i/lib/qt3/lib/*.prl
+
#### MAN PAGES ####
install -d -m 0755 %i/share/man/man1
@@ -281,7 +283,6 @@
bin/designer
lib/libdesigner*
share/applnk/Development/designer.desktop
- share/qt3/templates
lib/qt3/bin/designer
lib/qt3/lib/libdesigner*
lib/qt3/plugins/designer
@@ -296,7 +297,6 @@
Files: <<
bin/l*
bin/qm2ts
- share/qt3/phrasebooks
share/man/man1/lrelease.1
share/man/man1/lupdate.1
share/applnk/Development/linguist.desktop
@@ -323,3 +323,13 @@
License: GPL
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Homepage: http://www.trolltech.com/
+DescPackaging: <<
+ As of Qt 3.3.6-2, I've moved everything to %p/lib/qt3 instead of %p.
+ This lets me put the headers back into a "standard" location
($QTDIR/include)
+ and clean up a lot of stuff. -install_name's are preserved as
+ %p/lib/libfoo.x.dylib, and symlinks exist to make sure things are still
+ available to software that expects things in the fink non-standard
locations,
+ so the change should be transparent to existing software.
+
+ Also, "make install" actually works again. Yay!
+<<
Index: qt3.patch
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/common/main/finkinfo/x11/qt3.patch,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- qt3.patch 26 Mar 2006 23:18:29 -0000 1.38
+++ qt3.patch 27 Mar 2006 22:30:24 -0000 1.39
@@ -113,7 +113,7 @@
-QMAKE_INCDIR = /usr/local/include
-QMAKE_LIBDIR =
+QMAKE_INCDIR = @PREFIX@/lib/qt3/include
-+QMAKE_LIBDIR = @PREFIX@/lib/qt3/lib
++QMAKE_LIBDIR = @PREFIX@/lib
QMAKE_INCDIR_X11 = /usr/X11R6/include
QMAKE_LIBDIR_X11 = /usr/X11R6/lib
QMAKE_INCDIR_QT = $(QTDIR)/include
@@ -130,7 +130,7 @@
QMAKE_LFLAGS_DEBUG =
QMAKE_LFLAGS_APP = -prebind
-QMAKE_LFLAGS_SHLIB = -prebind -dynamiclib -single_module
-headerpad_max_install_names
-+QMAKE_LFLAGS_SHLIB = -prebind -dynamiclib -single_module
-headerpad_max_install_names -install_name @PREFIX@/lib/qt3/lib/$(TARGET1)
++QMAKE_LFLAGS_SHLIB = -prebind -dynamiclib -single_module
-headerpad_max_install_names -install_name @PREFIX@/lib/$(TARGET1)
QMAKE_LFLAGS_PLUGIN = -bundle
QMAKE_LFLAGS_THREAD =
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
