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: 09-Feb-2007 08:30:54
Branch: HEAD Handle: 2007020907305300
Modified files:
openpkg-src/gmime gmime.patch gmime.spec
Log:
upgrading package: gmime 2.2.3 -> 2.2.4
Summary:
Revision Changes Path
1.5 +18 -32 openpkg-src/gmime/gmime.patch
1.65 +3 -2 openpkg-src/gmime/gmime.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gmime/gmime.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 gmime.patch
--- openpkg-src/gmime/gmime.patch 3 Dec 2006 21:22:03 -0000 1.4
+++ openpkg-src/gmime/gmime.patch 9 Feb 2007 07:30:53 -0000 1.5
@@ -1,6 +1,6 @@
Index: MIME-Fast-1.6/Fast/Part.xs
--- MIME-Fast-1.6/Fast/Part.xs.orig 2004-12-17 12:55:42 +0100
-+++ MIME-Fast-1.6/Fast/Part.xs 2006-08-03 09:32:29 +0200
++++ MIME-Fast-1.6/Fast/Part.xs 2007-02-09 08:15:50 +0100
@@ -48,7 +48,6 @@
XSINTERFACE_FUNC_MIMEFAST_PART_SET
INTERFACE:
@@ -29,35 +29,9 @@
} else {
croak("mime_set_content: Unknown type: %d", (int)svvaltype);
}
-Index: MIME-Fast-1.6/Makefile.PL
---- MIME-Fast-1.6/Makefile.PL.orig 2003-10-16 11:01:46 +0200
-+++ MIME-Fast-1.6/Makefile.PL 2006-08-03 09:32:29 +0200
-@@ -5,7 +5,13 @@
- require 5.8.0; # require perl v5.8.0 or higher
-
- # my $libs = `pkg-config --libs gmime-2.0`;
--my $libs = `gmime-config --libs`;
-+my $libs = "-L../gmime/.libs [EMAIL PROTECTED]@/lib ".`gmime-config
--libs`." -lgmime-2.0 ".`pkg-config --libs glib-2.0`;
-+$libs =~ s/-lgthread-\d\.\d//s;
-+$libs =~ s/-pthread//s;
-+$libs =~ s/\n/ /sg;
-+my $cflags = "-I. -Icinclude -I.. [EMAIL PROTECTED]@/include ".`pkg-config
--cflags glib-2.0`." ".`gmime-config --cflags`;
-+$cflags =~ s/-pthread//s;
-+$cflags =~ s/\n/ /sg;
- my $vers = `gmime-config --version`;
-
- if ($libs eq '') {
-@@ -77,6 +83,5 @@
- # 'Fast.so' => qw{cinclude/gmime-stream-perlio.o}
- },
- 'clean' => { FILES => "gmime-version.h" },
-- # 'INC' => `pkg-config --cflags gmime-2.0` # e.g.,
'-I/usr/include/other'
-- 'INC' => "-I. -Icinclude " . `gmime-config --cflags`,
-+ 'INC' => $cflags,
- );
Index: MIME-Fast-1.6/gmime-stream-perlio.h
--- MIME-Fast-1.6/gmime-stream-perlio.h.orig 2004-12-16 21:28:51 +0100
-+++ MIME-Fast-1.6/gmime-stream-perlio.h 2006-08-03 09:32:29 +0200
++++ MIME-Fast-1.6/gmime-stream-perlio.h 2007-02-09 08:15:50 +0100
@@ -36,11 +36,11 @@
#include <gmime/gmime-stream.h>
@@ -76,8 +50,8 @@
typedef struct _GMimeStreamPerlIO GMimeStreamPerlIO;
typedef struct _GMimeStreamPerlIOClass GMimeStreamPerlIOClass;
Index: gmime/gmime-gpg-context.c
---- gmime/gmime-gpg-context.c.orig 2006-06-23 21:44:27 +0200
-+++ gmime/gmime-gpg-context.c 2006-08-03 09:42:31 +0200
+--- gmime/gmime-gpg-context.c.orig 2007-02-08 06:18:39 +0100
++++ gmime/gmime-gpg-context.c 2007-02-09 08:15:50 +0100
@@ -27,6 +27,7 @@
#include <string.h>
#include <sys/time.h>
@@ -87,8 +61,8 @@
#include <sys/stat.h>
#include <sys/wait.h>
Index: util/list.h
---- util/list.h.orig 2006-06-21 22:07:53 +0200
-+++ util/list.h 2006-12-03 22:18:58 +0100
+--- util/list.h.orig 2007-01-20 23:29:08 +0100
++++ util/list.h 2007-02-09 08:15:50 +0100
@@ -25,6 +25,15 @@
#include <string.h>
@@ -105,3 +79,15 @@
G_BEGIN_DECLS
typedef struct _ListNode {
+Index: zentimer.h
+--- zentimer.h.orig 2007-02-08 06:12:08 +0100
++++ zentimer.h 2007-02-09 08:18:06 +0100
+@@ -29,6 +29,8 @@
+ #include <stdint.h>
+ #elif HAVE_INTTYPES_H
+ #include <inttypes.h>
++#elif !defined(__linux__)
++#include <sys/types.h>
+ #else
+ typedef unsigned char uint8_t;
+ typedef unsigned long int uint32_t;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gmime/gmime.spec
============================================================================
$ cvs diff -u -r1.64 -r1.65 gmime.spec
--- openpkg-src/gmime/gmime.spec 1 Jan 2007 17:38:13 -0000 1.64
+++ openpkg-src/gmime/gmime.spec 9 Feb 2007 07:30:53 -0000 1.65
@@ -24,7 +24,7 @@
# package version
%define V_major 2.2
-%define V_minor 3
+%define V_minor 4
%define V_perl 1.6
# package information
@@ -38,7 +38,7 @@
Group: Libraries
License: GPL
Version: %{V_major}.%{V_minor}
-Release: 20061203
+Release: 20070209
# package options
%option with_perl no
@@ -93,6 +93,7 @@
CFLAGS="%{l_cflags -O}" \
CPPFLAGS="%{l_cppflags}" \
LDFLAGS="%{l_ldflags}" \
+ GREP="grep" \
./configure \
--prefix=%{l_prefix} \
--datadir=%{l_prefix}/share/gmime \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
