OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 21-Nov-2005 09:42:58
Branch: HEAD Handle: 2005112108425800
Modified files:
openpkg-src/scribus scribus.patch scribus.spec
Log:
partial success only
Summary:
Revision Changes Path
1.18 +13 -23 openpkg-src/scribus/scribus.patch
1.44 +4 -5 openpkg-src/scribus/scribus.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/scribus/scribus.patch
============================================================================
$ cvs diff -u -r1.17 -r1.18 scribus.patch
--- openpkg-src/scribus/scribus.patch 6 Jul 2005 13:28:35 -0000 1.17
+++ openpkg-src/scribus/scribus.patch 21 Nov 2005 08:42:58 -0000 1.18
@@ -31,31 +31,21 @@
# Maybe install the static library, too.
test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-Index: scribus/scribus.cpp
---- scribus/scribus.cpp.orig 2005-07-02 23:38:36 +0200
-+++ scribus/scribus.cpp 2005-07-06 13:49:35 +0200
-@@ -605,10 +605,10 @@
- handler = SIG_DFL;
- sigset_t mask;
- sigemptyset(&mask);
+Index: scribus/main.cpp
+--- scribus/main.cpp.orig 2005-07-05 08:36:03 +0200
++++ scribus/main.cpp 2005-08-01 13:17:02 +0200
+@@ -80,10 +80,10 @@
+ handler = SIG_DFL;
+ sigset_t mask;
+ sigemptyset(&mask);
-#ifdef SIGSEGV
-- signal (SIGSEGV, handler);
-- sigaddset(&mask, SIGSEGV);
+- signal (SIGSEGV, handler);
+- sigaddset(&mask, SIGSEGV);
-#endif
+//#ifdef SIGSEGV
-+// signal (SIGSEGV, handler);
-+// sigaddset(&mask, SIGSEGV);
++// signal (SIGSEGV, handler);
++// sigaddset(&mask, SIGSEGV);
+//#endif
#ifdef SIGFPE
- signal (SIGFPE, handler);
- sigaddset(&mask, SIGFPE);
-@@ -8157,7 +8157,8 @@
- }
- *idNr = (*demo1)();
- if (*typ < 4)
-- dlclose(mo);
-+// dlclose(mo);
-+ 0;
- else
- {
- dlerror();
+ signal (SIGFPE, handler);
+ sigaddset(&mask, SIGFPE);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/scribus/scribus.spec
============================================================================
$ cvs diff -u -r1.43 -r1.44 scribus.spec
--- openpkg-src/scribus/scribus.spec 6 Jul 2005 13:28:35 -0000 1.43
+++ openpkg-src/scribus/scribus.spec 21 Nov 2005 08:42:58 -0000 1.44
@@ -32,8 +32,8 @@
Class: EVAL
Group: Editor
License: GPL
-Version: 1.2.2.1
-Release: 20050706
+Version: 1.3.1
+Release: 20051121
# list of sources
Source0:
http://www.scribus.org.uk/downloads/%{version}/scribus-%{version}.tar.bz2
@@ -61,6 +61,7 @@
%track
prog scribus = {
+ comment = "thl/1.3.1: scribus/libpostscript: No such file or
directory"
version = %{version}
url =
http://www.scribus.org.uk/modules.php?op=modload&name=Downloads&file=index
regex = (\d+\.\d+(\.\d+)*).Release
@@ -84,11 +85,9 @@
scribus/plugins/fontpreview/Makefile.in \
scribus/plugins/psimport/Makefile.in \
scribus/libpostscript/Makefile.in \
- scribus/libpdf/Makefile.in
%{l_shtool} subst \
-e 's;\([^=] *\)$(prefix);\1$(DESTDIR)$(prefix);' \
scribus/libpostscript/Makefile.in \
- scribus/libpdf/Makefile.in
%{l_shtool} subst \
-e 's;\(LIBFREETYPE_LIBS =\).*;\1;' \
`find . -name Makefile.in -print`
@@ -118,7 +117,7 @@
--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
+ for buildir in libabout libpostscript libprefs
do
( cd scribus/$buildir
%{l_make} %{l_mflags -O} AM_LDFLAGS=""
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
