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-2004 20:08:51
Branch: HEAD Handle: 2004082019085000
Modified files:
openpkg-src/qt qt.patch qt.spec
Log:
add more diff(1) context and correct LIBDIRS substitution pattern
Summary:
Revision Changes Path
1.9 +16 -0 openpkg-src/qt/qt.patch
1.113 +2 -2 openpkg-src/qt/qt.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.patch
============================================================================
$ cvs diff -u -r1.8 -r1.9 qt.patch
--- openpkg-src/qt/qt.patch 11 Aug 2004 15:06:37 -0000 1.8
+++ openpkg-src/qt/qt.patch 20 Aug 2004 18:08:50 -0000 1.9
@@ -1,4 +1,5 @@
Index: configure
+diff -Nau configure.orig configure
--- configure.orig 2004-06-14 11:18:55 +0200
+++ configure 2004-08-11 16:13:39 +0200
@@ -1782,21 +1782,6 @@
@@ -46,6 +47,7 @@
if [ "$CFG_TABLET" = "yes" ]; then
QMAKE_CONFIG="$QMAKE_CONFIG tablet"
Index: config.test/x11/xfreetype.test
+diff -Nau config.tests/x11/xfreetype.test.orig config.tests/x11/xfreetype.test
--- config.tests/x11/xfreetype.test.orig 2003-12-08 10:04:06 +0100
+++ config.tests/x11/xfreetype.test 2004-08-11 16:14:43 +0200
@@ -56,7 +56,7 @@
@@ -67,6 +69,7 @@
fi
Index: src/3rdparty/libpng/pngconf.h
+diff -Nau src/3rdparty/libpng/pngconf.h.orig src/3rdparty/libpng/pngconf.h
--- src/3rdparty/libpng/pngconf.h.orig 2003-05-27 17:19:23 +0200
+++ src/3rdparty/libpng/pngconf.h 2004-08-11 16:18:06 +0200
@@ -251,10 +251,6 @@
@@ -81,6 +84,7 @@
/* include setjmp.h for error handling */
Index: src/3rdparty/libpng/pngerror.c
+diff -Nau src/3rdparty/libpng/pngerror.c.orig src/3rdparty/libpng/pngerror.c
--- src/3rdparty/libpng/pngerror.c.orig 2003-05-27 17:19:23 +0200
+++ src/3rdparty/libpng/pngerror.c 2004-08-11 16:19:27 +0200
@@ -135,10 +135,13 @@
@@ -100,6 +104,7 @@
}
Index: src/3rdparty/libpng/pngrtran.c
+diff -Nau src/3rdparty/libpng/pngrtran.c.orig src/3rdparty/libpng/pngrtran.c
--- src/3rdparty/libpng/pngrtran.c.orig 2003-05-27 17:19:23 +0200
+++ src/3rdparty/libpng/pngrtran.c 2004-08-11 16:26:04 +0200
@@ -1889,8 +1889,8 @@
@@ -170,6 +175,7 @@
This fixes the most dangerous of the newly reported vulnerabilities
Index: src/3rdparty/libpng/pngrutil.c
+diff -Nau src/3rdparty/libpng/pngrutil.c.orig src/3rdparty/libpng/pngrutil.c
--- src/3rdparty/libpng/pngrutil.c.orig 2004-08-11 16:29:37 +0200
+++ src/3rdparty/libpng/pngrutil.c 2004-08-11 16:30:11 +0200
@@ -1241,7 +1241,8 @@
@@ -189,6 +195,7 @@
and png_get_uint_31(), which are needed by patches 05-08.
Index: src/3rdparty/libpng/png.h
+diff -Nau src/3rdparty/libpng/png.h.orig src/3rdparty/libpng/png.h
--- src/3rdparty/libpng/png.h.orig 2003-05-27 17:19:23 +0200
+++ src/3rdparty/libpng/png.h 2004-08-11 16:31:06 +0200
@@ -833,7 +833,11 @@
@@ -214,6 +221,7 @@
/* Initialize png_ptr struct for reading, and allocate any other memory.
* (old interface - DEPRECATED - use png_create_read_struct instead).
Index: src/3rdparty/libpng/pngrutil.c
+diff -Nau src/3rdparty/libpng/pngrutil.c.orig src/3rdparty/libpng/pngrutil.c
--- src/3rdparty/libpng/pngrutil.c.orig 2004-08-11 16:29:37 +0200
+++ src/3rdparty/libpng/pngrutil.c 2004-08-11 16:32:11 +0200
@@ -38,6 +38,14 @@
@@ -237,6 +245,7 @@
Requires one of libpng-patch04*
Index: src/3rdparty/libpng/pngpread.c
+diff -Nau src/3rdparty/libpng/pngpread.c.orig src/3rdparty/libpng/pngpread.c
--- src/3rdparty/libpng/pngpread.c.orig 2003-05-27 17:19:23 +0200
+++ src/3rdparty/libpng/pngpread.c 2004-08-11 16:34:45 +0200
@@ -208,7 +208,7 @@
@@ -276,6 +285,7 @@
Requires libpng-patch04-*
Index: src/3rdparty/libpng/pngpread.c
+diff -Nau src/3rdparty/libpng/pngread.c.orig src/3rdparty/libpng/pngread.c
--- src/3rdparty/libpng/pngread.c.orig 2003-05-27 17:19:23 +0200
+++ src/3rdparty/libpng/pngread.c 2004-08-11 16:36:04 +0200
@@ -384,7 +384,7 @@
@@ -333,6 +343,7 @@
Requires libpng-patch04-*
Index: src/3rdparty/libpng/pngread.c
+diff -Nau src/3rdparty/libpng/pngread.c.orig src/3rdparty/libpng/pngread.c
--- src/3rdparty/libpng/pngread.c.orig 2004-08-11 16:36:04 +0200
+++ src/3rdparty/libpng/pngread.c 2004-08-11 16:37:39 +0200
@@ -1290,6 +1290,9 @@
@@ -353,6 +364,7 @@
The "sPLT chunk too long" check from Matthias Clasen (RedHat libpng package
maintainer)
Index: src/3rdparty/libpng/pngrutil.c
+diff -Nau src/3rdparty/libpng/pngrutil.c.orig src/3rdparty/libpng/pngrutil.c
--- src/3rdparty/libpng/pngrutil.c.orig 2004-08-05 15:27:41 +0200
+++ src/3rdparty/libpng/pngrutil.c 2004-08-11 16:38:53 +0200
@@ -1154,8 +1162,18 @@
@@ -381,6 +393,7 @@
Libpng-1.0.5 and earlier didn't implement iCCP chunk reading.
Index: src/3rdparty/libpng/pngrutil.c
+diff -Nau src/3rdparty/libpng/pngrutil.c.orig src/3rdparty/libpng/pngrutil.c
--- src/3rdparty/libpng/pngrutil.c.orig 2004-08-05 15:27:41 +0200
+++ src/3rdparty/libpng/pngrutil.c 2004-08-11 16:40:46 +0200
@@ -977,8 +985,7 @@
@@ -401,6 +414,7 @@
harmless duplicate chunks.
Index: src/3rdparty/libpng/pngrutil.c
+diff -Nau src/3rdparty/libpng/pngrutil.c.orig src/3rdparty/libpng/pngrutil.c
--- src/3rdparty/libpng/pngrutil.c.orig 2004-08-11 16:40:46 +0200
+++ src/3rdparty/libpng/pngrutil.c 2004-08-11 16:42:31 +0200
@@ -587,7 +587,7 @@
@@ -455,6 +469,7 @@
columns the png format supports.
Index: src/3rdparty/libpng/png.h
+diff -Nau src/3rdparty/libpng/png.h.orig src/3rdparty/libpng/png.h
--- src/3rdparty/libpng/png.h.orig 2004-08-11 16:31:06 +0200
+++ src/3rdparty/libpng/png.h 2004-08-11 16:44:14 +0200
@@ -839,6 +839,9 @@
@@ -468,6 +483,7 @@
/* color type masks */
#define PNG_COLOR_MASK_PALETTE 1
Index: src/3rdparty/libpng/pngrutil.c
+diff -Nau src/3rdparty/libpng/pngrutil.c.orig src/3rdparty/libpng/pngrutil.c
--- src/3rdparty/libpng/pngrutil.c.orig 2004-08-11 16:42:31 +0200
+++ src/3rdparty/libpng/pngrutil.c 2004-08-11 16:45:38 +0200
@@ -355,7 +355,11 @@
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.spec
============================================================================
$ cvs diff -u -r1.112 -r1.113 qt.spec
--- openpkg-src/qt/qt.spec 12 Aug 2004 13:16:25 -0000 1.112
+++ openpkg-src/qt/qt.spec 20 Aug 2004 18:08:50 -0000 1.113
@@ -34,7 +34,7 @@
Group: XWindow
License: GPL
Version: 3.3.3
-Release: 20040812
+Release: 20040820
# package library options (each 'yes' builds more libraries)
%option with_shared no
@@ -103,7 +103,7 @@
# correctly detect OpenPKG xrender and xft installations
%{l_shtool} subst \
-e 's;[^A-Za-z_]\(INCDIRS="\);\1%{l_prefix}/include ;g' \
- -e 's;[^A-Za-z_]\(LIBDIRS="\);\1%{l_prefix}/lib ;g' \
+ -e 's;^\(LIBDIRS="\);\1%{l_prefix}/lib ;g' \
config.tests/x11/xfreetype.test \
config.tests/x11/xrender.test
%{l_shtool} subst \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
