clibs/wv
SHA256
5
0
Fork 0
forked from pool/wv
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wv?expand=0&rev=2

Browse Source
This commit is contained in:
OBS User unknown
2007-01-18 00:48:25 +00:00
committed by Git OBS Bridge
parent 22e696c7bb
commit 7b593eeccb
9 changed files with 57 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
wv-1.0.3-autoconf.patch
View File

@@ -1,52 +0,0 @@
--- GNUmakefile.am
+++ GNUmakefile.am
@@ -26,6 +26,8 @@
LIBEXPORTER =
endif
+AUTOMAKE_OPTIONS=foreign
+
DIST_SUBDIRS = xml help wingdingfont patterns glib-wv libole2 magick expat exporter .
SUBDIRS = xml help wingdingfont patterns $(DIRGLIB) libole2 magick $(DIREXPAT) $(DIREXPORTER) .
@@ -37,7 +39,7 @@
CFLAGS = @CFLAGS@ @ANSI_CFLAGS@
-CPPFLAGS = @CPPFLAGS@ @WMF_CFLAGS@ @XML_CFLAGS@ @GLIB_CFLAGS@ @ICONV_CFLAGS@ @PNG_CFLAGS@ @ZLIB_CFLAGS@
+CPPFLAGS = $(filter-out -I/usr/include,@CPPFLAGS@ @WMF_CFLAGS@ @XML_CFLAGS@ @GLIB_CFLAGS@ @ICONV_CFLAGS@ @PNG_CFLAGS@ @ZLIB_CFLAGS@)
WVLIBS = @WMF_LIBS@ @XML_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ @PNG_LIBS@ @ZLIB_LIBS@ @LIBS@ -lm
--- exporter/GNUmakefile.am
+++ exporter/GNUmakefile.am
@@ -6,7 +6,7 @@
INCLUDES = -I. -I$(top_builddir) -I$(srcdir) -I$(top_srcdir)/libole2 -I$(top_srcdir)/oledecod $(INCGLIB)
-CPPFLAGS = @CPPFLAGS@ @GLIB_CFLAGS@ @ICONV_CFLAGS@ @ZLIB_CFLAGS@
+AM_CPPFLAGS = @CPPFLAGS@ @GLIB_CFLAGS@ @ICONV_CFLAGS@ @ZLIB_CFLAGS@
wvhdrdir = $(includedir)/wv
--- libole2/GNUmakefile.am
+++ libole2/GNUmakefile.am
@@ -6,7 +6,7 @@
INCLUDES = -I. -I$(top_builddir) -I$(top_srcdir) -I$(srcdir) -I$(top_srcdir)/libole2 -I$(top_srcdir)/oledecod $(INCGLIB)
-CPPFLAGS = @CPPFLAGS@ @GLIB_CFLAGS@ @ICONV_CFLAGS@ @ZLIB_CFLAGS@
+AM_CPPFLAGS = @CPPFLAGS@ @GLIB_CFLAGS@ @ICONV_CFLAGS@ @ZLIB_CFLAGS@
noinst_LTLIBRARIES = libole2.la
--- magick/GNUmakefile.am
+++ magick/GNUmakefile.am
@@ -1,6 +1,6 @@
INCLUDES = -I. -I$(top_builddir) -I$(srcdir) -I$(srcdir)/magick
-CPPFLAGS = @CPPFLAGS@ @PNG_CFLAGS@ @ZLIB_CFLAGS@
+AM_CPPFLAGS = @CPPFLAGS@ @PNG_CFLAGS@ @ZLIB_CFLAGS@
noinst_LTLIBRARIES = libmagick.la

120
wv-1.0.3-s390.patch
View File

@@ -1,120 +0,0 @@
--- configure.ac
+++ configure.ac
@@ -731,6 +731,102 @@
#endif /* ! HAVE_WV_CONFIG_H */
])
+dnl **********************
+dnl *** va_copy checks ***
+dnl **********************
+dnl we currently check for all three va_copy possibilities, so we get
+dnl all results in config.log for bug reports.
+AC_MSG_CHECKING(for an implementation of va_copy())
+AC_CACHE_VAL(glib_cv_va_copy,[
+ AC_TRY_RUN([
+ #include <stdarg.h>
+ void f (int i, ...) {
+ va_list args1, args2;
+ va_start (args1, i);
+ va_copy (args2, args1);
+ if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42)
+ exit (1);
+ va_end (args1); va_end (args2);
+ }
+ int main() {
+ f (0, 42);
+ return 0;
+ }],
+ glib_cv_va_copy=yes
+ ,
+ glib_cv_va_copy=no
+ ,)
+])
+AC_MSG_RESULT($glib_cv_va_copy)
+AC_MSG_CHECKING(for an implementation of __va_copy())
+AC_CACHE_VAL(glib_cv___va_copy,[
+ AC_TRY_RUN([
+ #include <stdarg.h>
+ void f (int i, ...) {
+ va_list args1, args2;
+ va_start (args1, i);
+ __va_copy (args2, args1);
+ if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42)
+ exit (1);
+ va_end (args1); va_end (args2);
+ }
+ int main() {
+ f (0, 42);
+ return 0;
+ }],
+ glib_cv___va_copy=yes
+ ,
+ glib_cv___va_copy=no
+ ,)
+])
+AC_MSG_RESULT($glib_cv___va_copy)
+AC_MSG_CHECKING(whether va_lists can be copied by value)
+AC_CACHE_VAL(glib_cv_va_val_copy,[
+ AC_TRY_RUN([
+ #include <stdarg.h>
+ void f (int i, ...) {
+ va_list args1, args2;
+ va_start (args1, i);
+ args2 = args1;
+ if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42)
+ exit (1);
+ va_end (args1); va_end (args2);
+ }
+ int main() {
+ f (0, 42);
+ return 0;
+ }],
+ glib_cv_va_val_copy=yes
+ ,
+ glib_cv_va_val_copy=no
+ ,)
+])
+if test "x$glib_cv_va_copy" = "xyes"; then
+ AC_DEFINE([G_VA_COPY], va_copy, [va_copy])
+else if test "x$glib_cv___va_copy" = "xyes"; then
+ AC_DEFINE([G_VA_COPY], __va_copy, [va_copy])
+fi
+fi
+if test "x$glib_cv_va_val_copy" = "xno"; then
+ AC_DEFINE([G_VA_COPY_AS_ARRAY], 1, [VA_COPY_AS_ARRAY])
+fi
+AC_MSG_RESULT($glib_cv_va_val_copy)
+
+case xyes in
+x$glib_cv_va_copy) glib_vacopy='#define G_VA_COPY va_copy' ;;
+x$glib_cv___va_copy) glib_vacopy='#define G_VA_COPY __va_copy' ;;
+*) glib_vacopy=''
+esac
+
+if test x$glib_cv_va_val_copy = xno; then
+ glib_vacopy="\$glib_vacopy
+#define G_VA_COPY_AS_ARRAY 1"
+fi
+
+
+
+
+
AC_CONFIG_FILES([
wvAbw
wvDVI
--- glib-wv/glib.h
+++ glib-wv/glib.h
@@ -27,6 +27,12 @@
#ifndef __G_LIB_H__
#define __G_LIB_H__
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+
/* system specific config file glibconfig.h provides definitions for
* the extrema of many of the standard types. These are:
*

BIN
wv-1.0.3.tar.bz2 (Stored with Git LFS)
View File

Binary file not shown.

19
wv-1.2.2-automake.patch Normal file
View File

@@ -0,0 +1,19 @@
Index: GNUmakefile.am
===================================================================
--- GNUmakefile.am.orig
+++ GNUmakefile.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS=foreign
+
DIST_SUBDIRS = xml help wingdingfont patterns
SUBDIRS = xml help wingdingfont patterns .
@@ -8,7 +10,7 @@ INCLUDES = -I. -I$(top_builddir) -I$(src
CFLAGS = @CFLAGS@ @ANSI_CFLAGS@
-CPPFLAGS = @CPPFLAGS@ @WMF_CFLAGS@ @XML_CFLAGS@ @GLIB_CFLAGS@ @GSF_CFLAGS@ @PNG_CFLAGS@ @ZLIB_CFLAGS@
+CPPFLAGS = $(filter-out -I/usr/include,@CPPFLAGS@ @WMF_CFLAGS@ @XML_CFLAGS@ @GLIB_CFLAGS@ @GSF_CFLAGS@ @PNG_CFLAGS@ @ZLIB_CFLAGS@)
WVLIBS = @WMF_LIBS@ @XML_LIBS@ @GLIB_LIBS@ @GSF_LIBS@ @PNG_LIBS@ @ZLIB_LIBS@ @LIBS@ -lm

19
wv-1.0.3-overflow.patch → wv-1.2.2-overflow.patch
View File

@@ -1,13 +1,16 @@
--- lfo.c
Index: lfo.c
===================================================================
--- lfo.c.orig
+++ lfo.c
@@ -1,5 +1,6 @@
@@ -23,6 +23,7 @@
#include <stdlib.h>
#include <stdio.h>
+#include <limits.h>
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -12,6 +13,16 @@
#include "wv.h"
/*
@@ -32,6 +33,16 @@ one has (LFO.clfolvl), and writes out, i
followed by its corresponding LVL structure (if LFOLVL.fFormatting is set).
*/
@@ -24,7 +27,7 @@
int
wvGetLFO_records (LFO ** lfo, LFOLVL ** lfolvl, LVL ** lvl, U32 * nolfo,
U32 * nooflvl, U32 offset, U32 len, wvStream * fd)
@@ -29,7 +40,9 @@
@@ -49,7 +60,9 @@ wvGetLFO_records (LFO ** lfo, LFOLVL **
wvTrace (("pos %x %d\n", wvStream_tell (fd), *nooflvl));
wvTrace (("nolfo is %d nooflvl is %d\n", *nolfo, *nooflvl));
@@ -35,7 +38,7 @@
{
*lfolvl = NULL;
*lvl = NULL;
@@ -81,16 +94,22 @@
@@ -101,16 +114,22 @@ wvGetLFO_PLF (LFO ** lfo, U32 * nolfo, U
*nolfo = read_32ubit (fd);
wvTrace (("%d\n", *nolfo));

BIN
wv-1.2.2.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

29
wv-libole2-readonly.patch
View File

@@ -1,29 +0,0 @@
--- libole2/ms-ole.c-old 2004-10-22 20:59:51.000000000 -0400
+++ libole2/ms-ole.c 2005-08-03 10:06:14.000000000 -0400
@@ -1723,7 +1723,7 @@
gboolean try_mmap,
MsOleSysWrappers *wrappers)
{
- int prot = PROT_READ | PROT_WRITE;
+ int prot = PROT_READ;
MsOle *f;
MsOleHandleType file;
@@ -1737,15 +1737,9 @@
f = *fs = ms_ole_new ();
take_wrapper_functions (f, wrappers);
- f->file_des = file = f->syswrap->open2 (name, O_RDWR, f->syswrap->closure);
+ f->file_des = file = f->syswrap->open2 (name, O_RDONLY, f->syswrap->closure);
f->ref_count = 0;
- f->mode = 'w';
-
- if (file == BAD_MSOLE_HANDLE) {
- f->file_des = file = f->syswrap->open2 (name, O_RDONLY, f->syswrap->closure);
- f->mode = 'r';
- prot &= ~PROT_WRITE;
- }
+ f->mode = 'r';
if ((file == BAD_MSOLE_HANDLE) || !(f->syswrap->isregfile (file, f->syswrap->closure))) {
g_warning ("No such file '%s'\n", name);

6
wv.changes
View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jan 17 20:15:54 CET 2007 - joeshaw@suse.de
- Update to 1.2.2. It requires libgsf and glib2 now, and I've
updated some patches and dropepd others.
-------------------------------------------------------------------
Wed Nov 15 12:05:04 CET 2006 - prusnak@suse.cz

35
wv.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package wv (Version 1.0.3)
# spec file for package wv (Version 1.2.2)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -11,24 +11,23 @@
# norootforbuild
Name: wv
BuildRequires: freetype2-devel libtiff-devel libwmf-devel libxml2-devel pkgconfig w3m
BuildRequires: glib2-devel libgsf-devel libtiff-devel libwmf-devel libxml2-devel pkgconfig
Obsoletes: mswordvw
Provides: mswordvw
License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL)
Group: Productivity/Publishing/Word
Autoreqprov: on
Version: 1.0.3
Release: 40
Version: 1.2.2
Release: 1
Summary: Word 8 Converter for Unix
URL: http://wvWare.sourceforge.net/
Source: http://www.csn.ul.ie/~caolan/publink/mswordview/wv-%{version}.tar.bz2
Patch2: wv-%{version}-s390.patch
Patch4: wv-%{version}-autoconf.patch
Patch5: wv-%{version}-wvText.patch
Patch6: wv-libole2-readonly.patch
Patch7: wv-%{version}-pc.patch
Patch8: wv-%{version}-overflow.patch
Source: wv-%{version}.tar.gz
Patch: wv-1.2.2-automake.patch
Patch5: wv-1.0.3-wvText.patch
Patch7: wv-1.0.3-pc.patch
Patch8: wv-1.2.2-overflow.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: w3m
%description
WV is a program that can understand the Microsoft Word 8 binary file
@@ -42,8 +41,8 @@ Authors:
Caolan McNamara <Caolan.McNamara@ul.ie>
%package devel
Requires: %{name} = %{version} w3m
Requires: libwmf-devel
Requires: %{name} = %{version}
Requires: bzip2 glib2-devel libgsf-devel libwmf-devel
Obsoletes: mswordvd
Provides: mswordvd
Summary: Static Libraries and Header Files for wv
@@ -61,10 +60,8 @@ Authors:
%prep
%setup
%patch2
%patch4
%patch
%patch5
%patch6
%patch7
%patch8
@@ -118,10 +115,14 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root)
/usr/%_lib/pkgconfig/*
/usr/include/wv
%{_libdir}/*.a
%{_libdir}/*.la
%{_libdir}/*.so
%changelog -n wv
* Wed Jan 17 2007 - joeshaw@suse.de
- Update to 1.2.2. It requires libgsf and glib2 now, and I've
updated some patches and dropepd others.
* Wed Nov 15 2006 - prusnak@suse.cz
- fixed VUL-0: overflow (overflow.patch) [#215612]
* Sat Oct 21 2006 - dmueller@suse.de