OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 20-Aug-2003 19:20:13
Branch: HEAD Handle: 2003082018201300
Modified files:
openpkg-src/scribus scribus.spec
Log:
Back out mixed dynamic and static configuration that caused a segfault
Summary:
Revision Changes Path
1.20 +0 -34 openpkg-src/scribus/scribus.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/scribus/scribus.spec
============================================================================
$ cvs diff -u -r1.19 -r1.20 scribus.spec
--- openpkg-src/scribus/scribus.spec 20 Aug 2003 16:55:52 -0000 1.19
+++ openpkg-src/scribus/scribus.spec 20 Aug 2003 17:20:13 -0000 1.20
@@ -71,7 +71,6 @@
scribus/*.h
%build
- # configure and build the real installation with static libs
CC="%{l_cc}" \
CXX="%{l_cxx}" \
CFLAGS="%{l_cflags -O} `%{l_prefix}/bin/pkg-config --cflags-only-other qt`" \
@@ -84,39 +83,6 @@
--disable-threading \
--disable-shared \
--enable-static \
- --with-x \
- --x-includes=`%{l_prefix}/etc/rc --query x11_incdir` \
- --x-libraries=`%{l_prefix}/etc/rc --query x11_libdir`\
- --with-qt-dir=%{l_prefix} \
- --with-qt-includes=%{l_prefix}/include/qt/ \
- --with-qt-libraries=%{l_prefix}/lib/
- %{l_make} %{l_mflags -O}
-
- # clean the shared object dirs (libs and plugins)
- for sodir in libabout libprefs libpostscript libpdf; do
- ( cd scribus/$sodir
- %{l_make} distclean
- ) || exit $?
- done;
- for sodir in libchar svgexplugin printpreview; do
- ( cd scribus/plugins/$sodir
- %{l_make} distclean
- ) || exit $?
- done;
-
- # configure and build shared objects just for using plugins
- CC="%{l_cc}" \
- CXX="%{l_cxx}" \
- CFLAGS="%{l_cflags -O} `%{l_prefix}/bin/pkg-config --cflags-only-other qt`" \
- CXXFLAGS="%{l_cxxflags -O} `%{l_prefix}/bin/pkg-config --cflags-only-other qt`"
\
- CPPFLAGS="%{l_cppflags tiff} `%{l_prefix}/bin/pkg-config --cflags-only-I qt`" \
- LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/pkg-config --libs-only-L qt`" \
- LIBS="$LIBS `%{l_prefix}/bin/pkg-config --libs-only-l --libs-only-other qt`" \
- ./configure \
- --prefix=%{l_prefix} \
- --disable-threading \
- --enable-shared \
- --disable-static \
--with-x \
--x-includes=`%{l_prefix}/etc/rc --query x11_incdir` \
--x-libraries=`%{l_prefix}/etc/rc --query x11_libdir`\
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
