[CVS] OpenPKG: openpkg-src/abiword/ abiword.patch abiword.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 15-Oct-2006 12:48:41
Branch: HEAD Handle: 2006101511484000
Modified files:
openpkg-src/abiword abiword.patch abiword.spec
Log:
some style cleanups and a small fix taken over from Michael Schloh
Summary:
RevisionChanges Path
1.9 +12 -0 openpkg-src/abiword/abiword.patch
1.46+4 -4 openpkg-src/abiword/abiword.spec
patch -p0 '@@ .'
Index: openpkg-src/abiword/abiword.patch
$ cvs diff -u -r1.8 -r1.9 abiword.patch
--- openpkg-src/abiword/abiword.patch 21 Nov 2005 08:26:04 - 1.8
+++ openpkg-src/abiword/abiword.patch 15 Oct 2006 10:48:40 - 1.9
@@ -107,3 +107,15 @@
}
s_bInitDone = bRet;
}
+Index: abi/src/wp/impexp/xp/ie_mailmerge.h
+--- abi/src/wp/impexp/xp/ie_mailmerge.h.orig 2005-11-18 16:11:18 +0100
abi/src/wp/impexp/xp/ie_mailmerge.h 2005-11-18 16:12:08 +0100
+@@ -28,6 +28,8 @@
+ typedef UT_sint32 IEMergeType;
+ #define IEMT_Unknown ((IEMergeType)-1)
+
++class IE_MailMerge; // forward to 'friend' construct in IE_MergeSniffer
++
+ class ABI_EXPORT IE_MergeSniffer : public UT_AbiObject
+ {
+ friend class IE_MailMerge;
@@ .
patch -p0 '@@ .'
Index: openpkg-src/abiword/abiword.spec
$ cvs diff -u -r1.45 -r1.46 abiword.spec
--- openpkg-src/abiword/abiword.spec 13 Oct 2006 17:26:38 - 1.45
+++ openpkg-src/abiword/abiword.spec 15 Oct 2006 10:48:40 - 1.46
@@ -33,7 +33,7 @@
Group:DTP
License: GPL
Version: 2.4.1
-Release: 20061013
+Release: 20061015
# list of sources
Source0:
http://switch.dl.sourceforge.net/sourceforge/abiword/abiword-%{version}.tar.gz
@@ -53,12 +53,12 @@
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
BuildPreReq: OpenPKG, openpkg = 20040130, pkgconfig
-BuildPreReq: glib2, glib2::with_threads = yes, expat
-BuildPreReq: fontconfig, fribidi, jpeg, libiconv
-BuildPreReq: libglade, popt, png, xft, libxml, zlib, cairo
PreReq: OpenPKG, openpkg = 20040130
+BuildPreReq: glib2, glib2::with_threads = yes, expat
PreReq: glib2, glib2::with_threads = yes, expat
+BuildPreReq: fontconfig, fribidi, jpeg, libiconv
PreReq: fontconfig, fribidi, jpeg, libiconv
+BuildPreReq: libglade, popt, png, xft, libxml, zlib, cairo
PreReq: libglade, popt, png, xft, libxml, zlib, cairo
AutoReq: no
AutoReqProv: no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/abiword/ abiword.patch abiword.spec
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:26:04
Branch: HEAD Handle: 2005112108260400
Modified files:
openpkg-src/abiword abiword.patch abiword.spec
Log:
partial success only
Summary:
RevisionChanges Path
1.8 +2 -2 openpkg-src/abiword/abiword.patch
1.41+7 -5 openpkg-src/abiword/abiword.spec
patch -p0 '@@ .'
Index: openpkg-src/abiword/abiword.patch
$ cvs diff -u -r1.7 -r1.8 abiword.patch
--- openpkg-src/abiword/abiword.patch 13 Aug 2005 12:24:48 - 1.7
+++ openpkg-src/abiword/abiword.patch 21 Nov 2005 08:26:04 - 1.8
@@ -5,8 +5,8 @@
#if defined (WIN32) || defined(__QNXNTO__) || defined(__CYGWIN__) || \
(defined (__MACH__) defined (__APPLE__)) || \
(defined(TARGET_OS_MAC) TARGET_OS_MAC) || \
--defined(__BEOS__) || defined (__AIX__) || \
-+defined(__BEOS__) || defined (__AIX__) || defined(__FreeBSD__) || \
+-defined (__AIX__) || \
++defined (__AIX__) || defined(__FreeBSD__) || \
(defined(__linux__) defined(__powerpc__) (__GLIBC__ = 2)
(__GLIBC_MINOR__ = 1))
#define ICONV_CONST const
@@ .
patch -p0 '@@ .'
Index: openpkg-src/abiword/abiword.spec
$ cvs diff -u -r1.40 -r1.41 abiword.spec
--- openpkg-src/abiword/abiword.spec 13 Aug 2005 12:24:48 - 1.40
+++ openpkg-src/abiword/abiword.spec 21 Nov 2005 08:26:04 - 1.41
@@ -32,8 +32,8 @@
Class:EVAL
Group:Editor
License: GPL
-Version: 2.2.3
-Release: 20050813
+Version: 2.4.1
+Release: 20051121
# list of sources
Source0:
http://osdn.dl.sourceforge.net/sourceforge/abiword/abiword-%{version}.tar.gz
@@ -55,11 +55,11 @@
BuildPreReq: OpenPKG, openpkg = 20040130, pkgconfig
BuildPreReq: glib2, glib2::with_threads = yes, expat
BuildPreReq: fontconfig, fribidi, jpeg, libiconv
-BuildPreReq: libglade, popt, png, xft, libxml, zlib
+BuildPreReq: libglade, popt, png, xft, libxml, zlib, cairo
PreReq: OpenPKG, openpkg = 20040130
PreReq: glib2, glib2::with_threads = yes, expat
PreReq: fontconfig, fribidi, jpeg, libiconv
-PreReq: libglade, popt, png, xft, libxml, zlib
+PreReq: libglade, popt, png, xft, libxml, zlib, cairo
AutoReq: no
AutoReqProv: no
@@ -76,6 +76,7 @@
%track
prog abiword = {
+comment = thl/2.4.1: error: libgnomeprintui/gnome-print-dialog.h
No such file or directory
version = %{version}
url = http://prdownloads.sourceforge.net/abiword/
regex = abiword-(\d+\.\d+\.\d+(-\d+)?)\.tar\.gz
@@ -107,6 +108,7 @@
-e 's;^\(ABIWORD_APP_NAME=\)AbiWord;\1abiword;' \
-e 's;^\(ABIWORD_APP_LIBDIR=\)AbiWord;\1abiword;' \
-e 's;GTK_CFLAGS=;GTK_CFLAGS=%{l_cppflags} ;' \
+-e 's;libgnomeprintui-2.2 = 2.2.0;;' \
abi/configure
%{l_shtool} subst \
-e 's;\((pkgdatadir)\/\)AbiWord;\1abiword;' \
@@ -177,7 +179,7 @@
CXX=%{l_cxx} \
CFLAGS=%{l_cflags -O} \
CXXFLAGS=%{l_cxxflags -O} \
-CPPFLAGS=%{l_cppflags atk pango gtk2} -I%{l_prefix}/lib/gtk2/include
-I$l_x11_incdir \
+CPPFLAGS=%{l_cppflags atk pango gtk2 cairo}
-I%{l_prefix}/lib/gtk2/include -I$l_x11_incdir \
LDFLAGS=%{l_ldflags} \
ABI_XML_CONFIG=%{l_prefix}/bin/xml2-config \
PKG_CONFIG_PATH=%{l_prefix}/lib/pkgconfig:$l_x11_pkgdir \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/abiword/ abiword.patch abiword.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 13-Aug-2005 14:24:48
Branch: HEAD Handle: 2005081313244800
Modified files:
openpkg-src/abiword abiword.patch abiword.spec
Log:
In my never ending crusade for a correct UUID generation world, fix one
more incorrect piece of code (hell, isn't it nice what cut paste in
the Internet world can result in?)
To understand it:
Fix generation of random multicast MAC address.
In case no real/physical IEEE 802 address is available, both the expired
draft-leach-uuids-guids-01 (section 4. Node IDs when no IEEE 802
network card is available) and RFC 2518 (section 6.4.1 Node Field
Generation Without the IEEE 802 Address) recommend (quoted from RFC
2518):
The ideal solution is to obtain a 47 bit cryptographic quality random
number, and use it as the low 47 bits of the node ID, with the _most_
significant bit of the first octet of the node ID set to 1. This bit
is the unicast/multicast bit, which will never be set in IEEE 802
addresses obtained from network cards; hence, there can never be a
conflict between UUIDs generated by machines with and without network
cards.
Unfortunately, this incorrectly explains how to implement this and
this UUID generator code inherited this generation bug from
the broken reference code in the standards draft. They should instead
specify the _least_ significant bit of the first octet of the node ID
as the multicast bit in a memory and hexadecimal string representation
of a 48-bit IEEE 802 MAC address.
This standards bug arised from a false interpretation, as the multicast
bit is actually the _most_ significant bit in IEEE 802.3 (Ethernet)
_transmission order_ of an IEEE 802 MAC address. The standards authors
forgot that the bitwise order of an _octet_ from a MAC address _memory_
and hexadecimal string representation is still always from left (MSB,
bit 7) to right (LSB, bit 0).
Summary:
RevisionChanges Path
1.7 +12 -0 openpkg-src/abiword/abiword.patch
1.40+1 -1 openpkg-src/abiword/abiword.spec
patch -p0 '@@ .'
Index: openpkg-src/abiword/abiword.patch
$ cvs diff -u -r1.6 -r1.7 abiword.patch
--- openpkg-src/abiword/abiword.patch 13 Jan 2005 14:43:55 - 1.6
+++ openpkg-src/abiword/abiword.patch 13 Aug 2005 12:24:48 - 1.7
@@ -95,3 +95,15 @@
#ifndef _SSIZE_T_
typedef size_t ssize_t;
#endif
+Index: abi/src/af/util/xp/ut_uuid.cpp
+--- abi/src/af/util/xp/ut_uuid.cpp.orig 2004-08-20 00:10:08 +0200
abi/src/af/util/xp/ut_uuid.cpp 2005-08-13 14:21:55 +0200
+@@ -368,7 +368,7 @@
+ * with IEEE 802 addresses obtained from
+ * network cards
+ */
+-s_node[0] |= 0x80;
++s_node[0] |= 0x01;
+ }
+ s_bInitDone = bRet;
+ }
@@ .
patch -p0 '@@ .'
Index: openpkg-src/abiword/abiword.spec
$ cvs diff -u -r1.39 -r1.40 abiword.spec
--- openpkg-src/abiword/abiword.spec 24 Mar 2005 11:18:22 - 1.39
+++ openpkg-src/abiword/abiword.spec 13 Aug 2005 12:24:48 - 1.40
@@ -33,7 +33,7 @@
Group:Editor
License: GPL
Version: 2.2.3
-Release: 20050114
+Release: 20050813
# list of sources
Source0:
http://osdn.dl.sourceforge.net/sourceforge/abiword/abiword-%{version}.tar.gz
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/abiword/ abiword.patch abiword.spec
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: 13-Jan-2005 15:43:56
Branch: HEAD Handle: 2005011314435500
Modified files:
openpkg-src/abiword abiword.patch abiword.spec
Log:
clean up, add platforms, correct dependencies, use external expat and
xml libs, patch flawed libole2 buildconf, and... upgrading package:
abiword 2.2.2 - 2.2.3
Summary:
RevisionChanges Path
1.6 +61 -0 openpkg-src/abiword/abiword.patch
1.37+23 -19 openpkg-src/abiword/abiword.spec
patch -p0 '@@ .'
Index: openpkg-src/abiword/abiword.patch
$ cvs diff -u -r1.5 -r1.6 abiword.patch
--- openpkg-src/abiword/abiword.patch 22 Oct 2004 11:52:00 - 1.5
+++ openpkg-src/abiword/abiword.patch 13 Jan 2005 14:43:55 - 1.6
@@ -34,3 +34,64 @@
}
}
+Index: wv/configure.ac
+--- wv/configure.ac.orig 2004-11-30 02:10:14 +0100
wv/configure.ac 2005-01-13 15:12:22 +0100
+@@ -77,7 +77,7 @@
+ dnl AC_TYPE_SIGNAL
+ dnl AC_FUNC_WAIT3
+
+-AC_CHECK_HEADERS(fcntl.h io.h malloc.h sys/file.h sys/ioctl.h unistd.h)
++AC_CHECK_HEADERS(fcntl.h io.h malloc.h sys/file.h sys/ioctl.h sys/types.h
unistd.h)
+
+ dnl Checks for typedefs, structures, and compiler characteristics.
+
+Index: wv/configure
+--- wv/configure.orig2004-11-30 02:10:13 +0100
wv/configure 2005-01-13 15:12:33 +0100
+@@ -1262,7 +1262,7 @@
+ fi
+
+
+-for ac_hdr in fcntl.h io.h malloc.h sys/file.h sys/ioctl.h unistd.h
++for ac_hdr in fcntl.h io.h malloc.h sys/file.h sys/ioctl.h sys/types.h
unistd.h
+ do
+ ac_safe=`echo $ac_hdr | sed 'y%./+-%__p_%'`
+ echo $ac_n checking for $ac_hdr... $ac_c 16
+Index: wv/libole2/ms-ole.h
+--- wv/libole2/ms-ole.h.orig 2005-01-13 15:14:57 +0100
wv/libole2/ms-ole.h 2005-01-13 15:17:01 +0100
+@@ -11,24 +11,26 @@
+ #ifndef MS_OLE_H
+ #define MS_OLE_H
+
++/* #include libole2-config.h */
++#ifdef HAVE_CONFIG_H
++#include config.h
++#endif
++
+ #ifdef __cplusplus
+ extern C {
+ #endif
+
+ /* This should be done in glib */
+ #if !defined(_WIN32) || defined(__CYGWIN__)
+-#if defined(__QNXNTO__)
+-# include sys/types.h
+-#endif
+-# include fcntl.h /* for mode_t */
+-#else
+-# include stdlib.h
+-#if defined(__MINGW32__) || defined(__WINE__)
++#if defined HAVE_SYS_TYPES_H
+ # include sys/types.h
+ #else
+ typedef unsigned long mode_t;
+ typedef long off_t;
+ #endif
++# include fcntl.h /* for mode_t */
++#else
++# include stdlib.h
+ #ifndef _SSIZE_T_
+ typedef size_t ssize_t;
+ #endif
@@ .
patch -p0 '@@ .'
Index: openpkg-src/abiword/abiword.spec
$ cvs diff -u -r1.36 -r1.37 abiword.spec
--- openpkg-src/abiword/abiword.spec 1 Jan 2005 10:47:38 - 1.36
+++ openpkg-src/abiword/abiword.spec 13 Jan 2005 14:43:55 - 1.37
@@ -33,8 +33,8 @@
Class:EVAL
Group:Editor
License: GPL
-Version: 2.2.2
-Release: 20041215
+Version: 2.2.3
+Release: 20050113
# list of sources
Source0:
http://osdn.dl.sourceforge.net/sourceforge/abiword/abiword-%{version}.tar.gz
@@ -53,9 +53,14 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg = 20040130, fontconfig, pkgconfig, fribidi,
xft
-BuildPreReq: glib2, glib2::with_threads = yes, libiconv, libglade, zlib,
popt, png
-PreReq: OpenPKG, openpkg = 20040130, fontconfig
+BuildPreReq: OpenPKG, openpkg = 20040130, pkgconfig
+BuildPreReq: glib2, glib2::with_threads = yes, expat
+BuildPreReq: fontconfig, fribidi, jpeg, libiconv
+BuildPreReq: libglade, popt, png, xft, libxml, zlib
+PreReq: OpenPKG, openpkg = 20040130
+PreReq: glib2, glib2::with_threads = yes, expat
+PreReq: fontconfig, fribidi, jpeg, libiconv
+PreReq: libglade, popt, png, xft, libxml, zlib
AutoReq: no
AutoReqProv: no
@@ -80,22 +85,22 @@
%prep
%setup -q
%patch -p0
-case %{l_platform -t} in
-sun4*-* )
+case %{l_platform -c} in
+hppa*-* | ppc*-* | sparc*-* )
%setup -q -T -D -a 2
%setup -q -T -D -a 4
%setup -q -T -D -a 6
%setup -q -T -D -a 8
%setup -q -T -D -a 10
;;
-*86*-* )
+
[CVS] OpenPKG: openpkg-src/abiword/ abiword.patch abiword.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Herbert Schmid
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Oct-2004 13:52:00
Branch: HEAD Handle: 200410221252
Modified files:
openpkg-src/abiword abiword.patch abiword.spec
Log:
upgrading package: abiword 2.1.90 - 2.1.91
Summary:
RevisionChanges Path
1.5 +1 -26 openpkg-src/abiword/abiword.patch
1.30+2 -3 openpkg-src/abiword/abiword.spec
patch -p0 '@@ .'
Index: openpkg-src/abiword/abiword.patch
$ cvs diff -u -r1.4 -r1.5 abiword.patch
--- openpkg-src/abiword/abiword.patch 5 Aug 2004 12:41:35 - 1.4
+++ openpkg-src/abiword/abiword.patch 22 Oct 2004 11:52:00 - 1.5
@@ -11,31 +11,6 @@
#define ICONV_CONST const
-Index: libpng/pngrtran.c
libpng/pngrtran.c.orig Wed Oct 2 20:20:24 2002
-+++ libpng/pngrtran.cWed Jan 15 11:30:23 2003
-@@ -1965,8 +1965,8 @@
- /* This changes the data from RRGGBB to RRGGBBXX */
- if (flags PNG_FLAG_FILLER_AFTER)
- {
--png_bytep sp = row + (png_size_t)row_width * 3;
--png_bytep dp = sp + (png_size_t)row_width;
-+png_bytep sp = row + (png_size_t)row_width * 6;
-+png_bytep dp = sp + (png_size_t)row_width * 2;
- for (i = 1; i row_width; i++)
- {
-*(--dp) = hi_filler;
-@@ -1987,8 +1987,8 @@
- /* This changes the data from RRGGBB to XXRRGGBB */
- else
- {
--png_bytep sp = row + (png_size_t)row_width * 3;
--png_bytep dp = sp + (png_size_t)row_width;
-+png_bytep sp = row + (png_size_t)row_width * 6;
-+png_bytep dp = sp + (png_size_t)row_width * 2;
- for (i = 0; i row_width; i++)
- {
-*(--dp) = *(--sp);
Steve G [EMAIL PROTECTED]
Libpng accesses memory that is out of bounds when creating an error message
@@ -52,7 +27,7 @@
+ len = 63;
buffer[iout++] = ':';
buffer[iout++] = ' ';
-- png_memcpy(buffer+iout, error_message, 64);
+- png_strncpy(buffer+iout, error_message, 63);
- buffer[iout+63] = 0;
+ png_memcpy(buffer+iout, error_message, len);
+ buffer[iout+len] = 0;
@@ .
patch -p0 '@@ .'
Index: openpkg-src/abiword/abiword.spec
$ cvs diff -u -r1.29 -r1.30 abiword.spec
--- openpkg-src/abiword/abiword.spec 13 Oct 2004 17:27:46 - 1.29
+++ openpkg-src/abiword/abiword.spec 22 Oct 2004 11:52:00 - 1.30
@@ -33,8 +33,8 @@
Class:EVAL
Group:Editor
License: GPL
-Version: 2.1.90
-Release: 20041013
+Version: 2.1.91
+Release: 20041022
# list of sources
Source0:
http://osdn.dl.sourceforge.net/sourceforge/abiword/abiword-%{version}.tar.gz
@@ -72,7 +72,6 @@
%track
prog abiword = {
-comment = ms: unexpected EOF in broken 2.1.90 tarball
version = %{version}
url = http://prdownloads.sourceforge.net/abiword/
regex = abiword-(\d+\.\d+\.\d+(-\d+)?)\.tar\.gz
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/abiword/ abiword.patch abiword.spec
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: 05-Aug-2004 14:41:35
Branch: HEAD Handle: 2004080513413500
Modified files:
openpkg-src/abiword abiword.patch abiword.spec
Log:
upgrading package: abiword 2.1.3 - 2.1.4
Summary:
RevisionChanges Path
1.4 +1 -0 openpkg-src/abiword/abiword.patch
1.23+5 -3 openpkg-src/abiword/abiword.spec
patch -p0 '@@ .'
Index: openpkg-src/abiword/abiword.patch
$ cvs diff -u -r1.3 -r1.4 abiword.patch
--- openpkg-src/abiword/abiword.patch 29 Apr 2004 15:06:52 - 1.3
+++ openpkg-src/abiword/abiword.patch 5 Aug 2004 12:41:35 - 1.4
@@ -11,6 +11,7 @@
#define ICONV_CONST const
+Index: libpng/pngrtran.c
--- libpng/pngrtran.c.orig Wed Oct 2 20:20:24 2002
+++ libpng/pngrtran.cWed Jan 15 11:30:23 2003
@@ -1965,8 +1965,8 @@
@@ .
patch -p0 '@@ .'
Index: openpkg-src/abiword/abiword.spec
$ cvs diff -u -r1.22 -r1.23 abiword.spec
--- openpkg-src/abiword/abiword.spec 15 Jul 2004 18:39:59 - 1.22
+++ openpkg-src/abiword/abiword.spec 5 Aug 2004 12:41:35 - 1.23
@@ -33,8 +33,8 @@
Class:EVAL
Group:Editor
License: GPL
-Version: 2.1.3
-Release: 20040715
+Version: 2.1.4
+Release: 20040805
# list of sources
Source0:
http://osdn.dl.sourceforge.net/sourceforge/abiword/abiword-%{version}.tar.gz
@@ -117,6 +117,7 @@
abi/src/wp/ap/xp/ap_Prefs_SchemeIds.h
%{l_shtool} subst \
-e 's;\(/dictionary/\);/abiword\1;' \
+abi/src/other/spell/xp/barbarisms.cpp \
abi/src/other/spell/xp/ispell_checker.cpp
%{l_shtool} subst \
-e 's;\(/templates/\);/abiword\1;' \
@@ -139,7 +140,8 @@
abi/src/af/xap/unix/xap_UnixDlg_PluginManager.cpp \
abi/src/wp/ap/unix/ap_UnixApp.cpp \
abi/src/wp/ap/unix/GNUmakefile.in \
-abi/src/wp/ap/unix/Makefile
+abi/src/wp/ap/unix/Makefile \
+abiword-plugins/configure
%{l_shtool} subst \
-e 's;AbiWord\(/help\);abiword\1;' \
abi/src/af/xap/unix/xap_UnixDialogHelper.cpp \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/abiword/ abiword.patch abiword.spec openpkg...
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 29-Apr-2004 17:07:00
Branch: HEAD Handle: 2004042916065208
Added files:
openpkg-src/analog analog.patch
openpkg-src/doxygen doxygen.patch
openpkg-src/kde-qt kde-qt.patch
openpkg-src/perl-tk perl-tk.patch
openpkg-src/rrdtool rrdtool.patch
openpkg-src/tetex tetex.patch
openpkg-src/wx wx.patch
Modified files:
openpkg-src/abiword abiword.patch abiword.spec
openpkg-src/analog analog.spec
openpkg-src/doxygen doxygen.spec
openpkg-src/firefox firefox.patch firefox.spec
openpkg-src/ghostscript ghostscript.patch ghostscript.spec
openpkg-src/kde-qt kde-qt.spec
openpkg-src/mozilla mozilla.patch mozilla.spec
openpkg-src/pdflib pdflib.patch pdflib.spec
openpkg-src/perl-tk perl-tk.spec
openpkg-src/qt qt.patch qt.spec
openpkg-src/rrdtool rrdtool.spec
openpkg-src/tetex tetex.spec
openpkg-src/wx wx.spec
Log:
SA-2004.017-png
Summary:
RevisionChanges Path
1.3 +48 -0 openpkg-src/abiword/abiword.patch
1.17+3 -3 openpkg-src/abiword/abiword.spec
1.1 +22 -0 openpkg-src/analog/analog.patch
1.39+3 -1 openpkg-src/analog/analog.spec
1.1 +47 -0 openpkg-src/doxygen/doxygen.patch
1.35+3 -1 openpkg-src/doxygen/doxygen.spec
1.2 +48 -0 openpkg-src/firefox/firefox.patch
1.3 +1 -1 openpkg-src/firefox/firefox.spec
1.6 +48 -0 openpkg-src/ghostscript/ghostscript.patch
1.55+1 -1 openpkg-src/ghostscript/ghostscript.spec
1.1 +47 -0 openpkg-src/kde-qt/kde-qt.patch
1.10+3 -1 openpkg-src/kde-qt/kde-qt.spec
1.8 +48 -0 openpkg-src/mozilla/mozilla.patch
1.84+1 -1 openpkg-src/mozilla/mozilla.spec
1.2 +48 -0 openpkg-src/pdflib/pdflib.patch
1.27+1 -1 openpkg-src/pdflib/pdflib.spec
1.3 +97 -0 openpkg-src/perl-tk/perl-tk.patch
1.59+3 -1 openpkg-src/perl-tk/perl-tk.spec
1.5 +47 -0 openpkg-src/qt/qt.patch
1.105 +1 -1 openpkg-src/qt/qt.spec
1.4 +47 -0 openpkg-src/rrdtool/rrdtool.patch
1.52+3 -1 openpkg-src/rrdtool/rrdtool.spec
1.3 +47 -0 openpkg-src/tetex/tetex.patch
1.54+3 -1 openpkg-src/tetex/tetex.spec
1.1 +47 -0 openpkg-src/wx/wx.patch
1.10+3 -1 openpkg-src/wx/wx.spec
patch -p0 '@@ .'
Index: openpkg-src/abiword/abiword.patch
$ cvs diff -u -r1.2 -r1.3 abiword.patch
--- openpkg-src/abiword/abiword.patch 5 Jan 2004 14:18:18 - 1.2
+++ openpkg-src/abiword/abiword.patch 29 Apr 2004 15:06:52 - 1.3
@@ -10,3 +10,51 @@
(defined(__linux__) defined(__powerpc__) (__GLIBC__ = 2)
(__GLIBC_MINOR__ = 1))
#define ICONV_CONST const
+
+--- libpng/pngrtran.c.orig Wed Oct 2 20:20:24 2002
libpng/pngrtran.cWed Jan 15 11:30:23 2003
+@@ -1965,8 +1965,8 @@
+ /* This changes the data from RRGGBB to RRGGBBXX */
+ if (flags PNG_FLAG_FILLER_AFTER)
+ {
+-png_bytep sp = row + (png_size_t)row_width * 3;
+-png_bytep dp = sp + (png_size_t)row_width;
++png_bytep sp = row + (png_size_t)row_width * 6;
++png_bytep dp = sp + (png_size_t)row_width * 2;
+ for (i = 1; i row_width; i++)
+ {
+*(--dp) = hi_filler;
+@@ -1987,8 +1987,8 @@
+ /* This changes the data from RRGGBB to XXRRGGBB */
+ else
+ {
+-png_bytep sp = row + (png_size_t)row_width * 3;
+-png_bytep dp = sp + (png_size_t)row_width;
++png_bytep sp = row + (png_size_t)row_width * 6;
++png_bytep dp = sp + (png_size_t)row_width * 2;
+ for (i = 0; i row_width; i++)
+ {
+*(--dp) = *(--sp);
+
+Steve G [EMAIL PROTECTED]
+Libpng accesses memory that is out of bounds when creating an error message
+
+Index: pngerror.c
+--- libpng/pngerror.c.orig 2002-10-03 13:32:27.0 +0200
libpng/pngerror.c2004-04-28 13:24:22.0 +0200
+@@ -135,10 +135,13 @@
+ buffer[iout] = 0;
+else
+{
++ png_size_t len;
