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: 16-Jun-2004 19:08:50
Branch: HEAD Handle: -NONE-
Added files:
openpkg-src/scribus scribus.patch
Modified files:
openpkg-src/scribus scribus.spec
Log:
update to new URL, remove python scripting option, add dependency for
CMS support, install missing integrated user guide, repair damaged
patch code from choice to move it to shtool subst, correct DESTDIR
handling in additional makefiles, correct libtool static linkage to
libfreetype, correctly build plugins and all dlopen(3)...ed libs
dynamically and do not strip, add patches from FreeBSD ports, remove
SIGSEGV signal handler (to prevent a hang), allow for normal file
extensions even when wishing for short ones, fix plugin type
comparison bug, and don't dlclose(3) plugins at all after
initialization to work around a segfault
Summary:
Revision Changes Path
1.15 +118 -0 openpkg-src/scribus/scribus.patch
1.34 +0 -0 openpkg-src/scribus/scribus.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/scribus/scribus.patch
============================================================================
$ cvs diff -u -r0 -r1.15 scribus.patch
--- /dev/null 2004-06-16 19:08:50.000000000 +0200
+++ scribus.patch 2004-06-16 19:08:50.000000000 +0200
@@ -0,0 +1,118 @@
+Index: admin/ltmain.sh
+diff -Nau admin/ltmain.sh.orig admin/ltmain.sh
+--- admin/ltmain.sh.orig Mon Jun 7 02:20:19 2004
++++ admin/ltmain.sh Mon Jun 7 02:24:08 2004
+@@ -1123,6 +1123,7 @@
+ ;;
+
+ -avoid-version)
++ build_old_libs=no
+ avoid_version=yes
+ continue
+ ;;
+@@ -1202,7 +1203,7 @@
+ -l*)
+ if test "$arg" = "-lc"; then
+ case $host in
+- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-*-freebsd*)
+ # These systems don't actually have c library (as such)
+ continue
+ ;;
+@@ -2744,7 +2745,7 @@
+ if test "$build_libtool_libs" = yes; then
+ if test -n "$rpath"; then
+ case $host in
+- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-*-freebsd*)
+ # these systems don't actually have a c library (as such)!
+ ;;
+ *-*-rhapsody* | *-*-darwin1.[012])
+@@ -4622,10 +4623,12 @@
+ fi
+
+ # Install the pseudo-library for information purposes.
++ if /usr/bin/false; then
+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ instname="$dir/$name"i
+ $show "$install_prog $instname $destdir/$name"
+ $run eval "$install_prog $instname $destdir/$name" || exit $?
++ fi
+
+ # Maybe install the static library, too.
+ test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+Index: scribus/plugins/pixmapexport/export.cpp
+diff -Nau scribus/plugins/pixmapexport/export.cpp.orig
scribus/plugins/pixmapexport/export.cpp
+--- scribus/plugins/pixmapexport/export.cpp.orig Mon Jun 7 01:15:14 2004
++++ scribus/plugins/pixmapexport/export.cpp Mon Jun 7 01:18:23 2004
+@@ -116,7 +116,7 @@
+ QObject::tr("No"),
+ QObject::tr("Yes"),
+ // hack for multiple overwritting (petr)
+- (single==TRUE) ? 0 : QObject::tr("Yes all"),
++ (single==TRUE) ? QString::null : QObject::tr("Yes
all"),
+ 0, 0);
+ QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+ if (over == 1)
+Index: scribus/scribus.cpp
+diff -Nau scribus/scribus.cpp.orig scribus/scribus.cpp
+--- scribus/scribus.cpp.orig 2004-05-31 12:38:49 +0200
++++ scribus/scribus.cpp 2004-06-16 18:00:01 +0200
+@@ -565,10 +565,10 @@
+ handler = SIG_DFL;
+ sigset_t mask;
+ sigemptyset(&mask);
+-#ifdef SIGSEGV
+- signal (SIGSEGV, handler);
+- sigaddset(&mask, SIGSEGV);
+-#endif
++//#ifdef SIGSEGV
++// signal (SIGSEGV, handler);
++// sigaddset(&mask, SIGSEGV);
++//#endif
+ #ifdef SIGFPE
+ signal (SIGFPE, handler);
+ sigaddset(&mask, SIGFPE);
+@@ -3259,18 +3259,18 @@
+ form2 =
QString(QImageIO::inputFormats().at(i)).upper();
+ if (form1 == "jpeg")
+ {
+- form1 = "jpg";
+- form2 = "JPG";
++ formats += "JPEG (*.jpg *.jpeg *.JPG
*.JPEG);;";
++ formatD += "*.jpg *.jpeg *.JPG *.JPEG ";
+ }
+- if ((form1 == "jpg") || (form1 == "png") || (form1 ==
"xpm") || (form1 == "gif"))
++ if ((form1 == "png") || (form1 == "xpm") || (form1 ==
"gif"))
+ {
+ formats += form2 + " (*."+form1+"
*."+form2+");;";
+ formatD += "*."+form1+" *."+form2+" ";
+ }
+ }
+ #ifdef HAVE_TIFF
+- formats += "TIFF (*.tif *.TIF);;";
+- formatD += "*.tif *.TIF";
++ formats += "TIFF (*.tif *.tiff *.TIF *.TIFF);;";
++ formatD += "*.tif *.tiff *.TIF *.TIFF";
+ #endif
+ formats += "EPS (*.eps *.EPS);;PDF (*.pdf *.PDF);;" + tr("All
Files (*)");
+ formatD += " *.eps *.EPS *.pdf *.PDF";
+@@ -7308,7 +7308,7 @@
+ typedef void (*sdem)(QWidget *d, ScribusApp *plug);
+ sdem demo;
+ QString pfad = PREL;
+- if (pda.Typ != 4)
++ if (pda.Typ < 4)
+ {
+ pfad += "/lib/scribus/plugins/" + pda.Datei;
+ mo = dlopen(pfad, RTLD_LAZY | RTLD_GLOBAL);
+@@ -7371,7 +7371,8 @@
+ *typ = (*demo1)();
+ *Zeig = mo;
+ if (*typ < 4)
+- dlclose(mo);
++// dlclose(mo);
++ 0;
+ else
+ {
+ dlerror();
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/scribus/scribus.spec
============================================================================
$ cvs diff -u -r1.33 -r1.34 scribus.spec
--- openpkg-src/scribus/scribus.spec 6 Jun 2004 11:35:14 -0000 1.33
+++ openpkg-src/scribus/scribus.spec 16 Jun 2004 17:08:49 -0000 1.34
@@ -26,7 +26,7 @@
# package information
Name: scribus
Summary: Desktop Publishing Application
-URL: http://www.scribus.org.uk/
+URL: http://www.scribus.net/
Vendor: Franz Schmid
Packager: The OpenPKG Project
Distribution: OpenPKG
@@ -34,25 +34,20 @@
Group: Editor
License: GPL
Version: 1.1.7
-Release: 20040606
-
-# package options
-%option with_python no
+Release: 20040616
# list of sources
Source0: http://web2.altmuehlnet.de/fschmid/scribus-%{version}.tar.gz
+Source1: http://web2.altmuehlnet.de/fschmid/scribus-i18n-en.tar.gz
+Patch0: scribus.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, qt, freetype, libart
-BuildPreReq: ghostscript, png, jpeg, tiff, zlib, pkgconfig
+BuildPreReq: ghostscript, png, jpeg, tiff, zlib, lcms, pkgconfig
PreReq: OpenPKG, openpkg >= 20040130, qt, freetype, libart
-PreReq: ghostscript, png, jpeg, tiff, zlib
-%if "%{with_python}" == "yes"
-BuildPreReq: python
-PreReq: python
-%endif
+PreReq: ghostscript, png, jpeg, tiff, zlib, lcms
AutoReq: no
AutoReqProv: no
@@ -75,6 +70,8 @@
%prep
%setup -q
+ %setup -a1
+ %patch -p0
%{l_shtool} subst \
-e 's;$(prefix);$(DESTDIR)$(prefix);' \
scribus/Makefile.in \
@@ -85,15 +82,65 @@
scribus/plugins/psimport/Makefile.in \
scribus/plugins/fontpreview/Makefile.in
%{l_shtool} subst \
+ -e 's;\(pluginsdir = \)$(DESTDIR)\($(prefix)\);\1\2;' \
+ scribus/plugins/psimport/Makefile.in \
+ scribus/plugins/fontpreview/Makefile.in
+ %{l_shtool} subst \
-e 's;\([^=] *\)$(prefix);\1$(DESTDIR)$(prefix);' \
scribus/libpostscript/Makefile.in \
scribus/libpdf/Makefile.in
%{l_shtool} subst \
+ -e 's;\(pluginsdir = \)$(DESTDIR)\($(prefix)\);\1\2;' \
+ scribus/libpostscript/Makefile.in \
+ scribus/libpdf/Makefile.in
+ %{l_shtool} subst \
+ -e 's;\(LIBFREETYPE_LIBS =\).*;\1;' \
+ `find . -name Makefile.in -print`
+ %{l_shtool} subst \
-e 's; ! -f $libstdcpp;;g' \
-e 's;^\(jpeg_incdirs="\)[^"]*\("\);\1%{l_prefix}/include\2;' \
configure
%build
+ # make dynamic plugins, but build statically again later
+ mkdir libsdyn plugdyn
+ 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`\
+ --with-qt-dir=%{l_prefix} \
+ --with-qt-includes=%{l_prefix}/include/qt/ \
+ --with-qt-libraries=%{l_prefix}/lib/
+ for buildir in libabout libpdf libpostscript libprefs
+ do
+ ( cd scribus/$buildir
+ %{l_make} %{l_mflags -O} AM_LDFLAGS=""
+ cp -f .libs/*.s[ol] ../../libsdyn
+ %{l_make} %{l_mflags} distclean
+ ) || exit $?
+ done
+ for buildir in fontpreview libchar pixmapexport \
+ printpreview psimport svgexplugin svgimplugin
+ do
+ ( cd scribus/plugins/$buildir
+ %{l_make} %{l_mflags -O} AM_LDFLAGS=""
+ cp -f .libs/*.s[ol] ../../../plugdyn
+ %{l_make} %{l_mflags} distclean
+ ) || exit $?
+ done
+
+ # now make everything statically as we normally do
CC="%{l_cc}" \
CXX="%{l_cxx}" \
CFLAGS="%{l_cflags -O} `%{l_prefix}/bin/pkg-config --cflags-only-other qt`" \
@@ -117,6 +164,15 @@
%install
rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+ %{l_shtool} install -c -m 755 \
+ libsdyn/*.s[ol] \
+ $RPM_BUILD_ROOT%{l_prefix}/lib/scribus/libs
+ %{l_shtool} install -c -m 755 \
+ plugdyn/*.s[ol] \
+ $RPM_BUILD_ROOT%{l_prefix}/lib/scribus/plugins
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/share/scribus/doc
+ mv -f scribus-i18n-en/docs/en $RPM_BUILD_ROOT%{l_prefix}/share/scribus/doc
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
