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 18:55:52
Branch: HEAD Handle: 2003082017555101
Modified files:
openpkg-src/scribus scribus.patch scribus.spec
Log:
Fix badly offset patch and make it MSvB style, try to install shared
objects libs and plugins since scribus dlopens them uncoditionally
anyhow (I hope this works)
Summary:
Revision Changes Path
1.8 +13 -11 openpkg-src/scribus/scribus.patch
1.19 +35 -1 openpkg-src/scribus/scribus.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/scribus/scribus.patch
============================================================================
$ cvs diff -u -r1.7 -r1.8 scribus.patch
--- openpkg-src/scribus/scribus.patch 20 Aug 2003 07:01:40 -0000 1.7
+++ openpkg-src/scribus/scribus.patch 20 Aug 2003 16:55:51 -0000 1.8
@@ -1,6 +1,7 @@
---- scribus/scribus.cpp.orig 2003-07-11 21:58:11.000000000 +0200
-+++ scribus/scribus.cpp 2003-07-15 10:59:33.000000000 +0200
-@@ -3051,7 +3051,7 @@
+diff -Naur scribus-1.0.1.orig/scribus/scribus.cpp scribus-1.0.1/scribus/scribus.cpp
+--- scribus-1.0.1.orig/scribus/scribus.cpp Wed Aug 6 12:51:44 2003
++++ scribus-1.0.1/scribus/scribus.cpp Wed Aug 20 13:29:39 2003
+@@ -3052,7 +3052,7 @@
void ScribusApp::slotHelpAbout()
{
void *mo;
@@ -9,7 +10,7 @@
typedef About* (*sdem)(QWidget *d);
sdem demo;
QString pfad = PREL;
-@@ -4694,7 +4694,7 @@
+@@ -4696,7 +4696,7 @@
void ScribusApp::slotPrefsOrg()
{
void *mo;
@@ -18,7 +19,7 @@
bool zChange = false;
typedef Preferences* (*sdem)(QWidget *d, preV *Vor);
sdem demo;
-@@ -5156,7 +5156,7 @@
+@@ -5158,7 +5158,7 @@
PSLib* ScribusApp::getPSDriver(bool psart, SCFonts &AllFonts, QMap<QString,QFont>
DocFonts, CListe DocColors, bool pdf)
{
@@ -27,7 +28,7 @@
typedef PSLib* (*sdem)(bool psart, SCFonts &AllFonts, QMap<QString,QFont>
DocFonts, CListe DocColors, bool pdf);
sdem demo;
QString pfad = PREL;
-@@ -5191,7 +5191,7 @@
+@@ -5193,7 +5193,7 @@
bool ScribusApp::getPDFDriver(QString fn, QString nam, int Components, int frPa,
int toPa, QMap<int,QPixmap> thumbs)
{
bool ret = false;
@@ -36,7 +37,7 @@
void *PDFDriver;
typedef bool (*sdem)(ScribusApp *plug, QString fn, QString nam, int
Components, int frPa, int toPa, QMap<int,QPixmap> thumbs);
sdem demo;
-@@ -5738,7 +5738,7 @@
+@@ -5740,7 +5740,7 @@
void ScribusApp::FinalizePlugs()
{
@@ -45,7 +46,7 @@
QMap<QString, PlugData>::Iterator it;
struct PlugData pda;
typedef void (*sdem2)();
-@@ -5808,7 +5808,7 @@
+@@ -5810,7 +5810,7 @@
void ScribusApp::CallDLL(QString name)
{
void *mo;
@@ -54,7 +55,7 @@
struct PlugData pda;
pda = PluginMap[name];
typedef void (*sdem)(QWidget *d, ScribusApp *plug);
-@@ -5842,7 +5842,7 @@
+@@ -5844,7 +5844,7 @@
bool ScribusApp::DLLName(QString name, QString *PName, int *typ, void **Zeig)
{
void *mo;
@@ -63,8 +64,9 @@
typedef QString (*sdem0)();
typedef int (*sdem1)();
typedef void (*sdem2)(QWidget *d, ScribusApp *plug);
---- scribus/scfonts_ttftypes.h.orig Tue Aug 19 16:07:30 2003
-+++ scribus/scfonts_ttftypes.h Tue Aug 19 16:04:30 2003
+diff -Naur scribus-1.0.1.orig/scribus/scfonts_ttftypes.h
scribus-1.0.1/scribus/scfonts_ttftypes.h
+--- scribus-1.0.1.orig/scribus/scfonts_ttftypes.h Mon May 19 20:26:31 2003
++++ scribus-1.0.1/scribus/scfonts_ttftypes.h Wed Aug 20 13:39:40 2003
@@ -7,6 +7,11 @@
typedef unsigned int u_int32_t;
#endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/scribus/scribus.spec
============================================================================
$ cvs diff -u -r1.18 -r1.19 scribus.spec
--- openpkg-src/scribus/scribus.spec 20 Aug 2003 09:26:27 -0000 1.18
+++ openpkg-src/scribus/scribus.spec 20 Aug 2003 16:55:52 -0000 1.19
@@ -61,7 +61,7 @@
%prep
%setup -q -n scribus-%{version}
- %patch -p0
+ %patch -p1
%{l_shtool} subst \
-e 's; ! -f $libstdcpp;;g' \
configure
@@ -71,6 +71,7 @@
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`" \
@@ -83,6 +84,39 @@
--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]
