[arch-commits] Commit in pan/repos (5 files)
Eric Belanger
eric at archlinux.org
Thu May 1 02:21:41 UTC 2008
Date: Wednesday, April 30, 2008 @ 22:21:41
Author: eric
Revision: 1120
fixed svn conflict
Added:
pan/repos/extra-x86_64/ChangeLog
(from rev 1119, pan/trunk/ChangeLog)
pan/repos/extra-x86_64/pan-0.132-gcc43.patch
(from rev 1119, pan/trunk/pan-0.132-gcc43.patch)
pan/repos/extra-x86_64/preview-fix.patch
(from rev 1119, pan/trunk/preview-fix.patch)
Modified:
pan/repos/extra-x86_64/ (properties)
pan/repos/extra-x86_64/PKGBUILD
-----------------------+
ChangeLog | 10 +++++
PKGBUILD | 36 ++++++++++++-------
pan-0.132-gcc43.patch | 88 ++++++++++++++++++++++++++++++++++++++++++++++++
preview-fix.patch | 21 +++++++++++
4 files changed, 141 insertions(+), 14 deletions(-)
Property changes on: pan/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
- /pan/trunk:1
+ /pan/trunk:1-1119
Copied: pan/repos/extra-x86_64/ChangeLog (from rev 1119, pan/trunk/ChangeLog)
===================================================================
--- extra-x86_64/ChangeLog (rev 0)
+++ extra-x86_64/ChangeLog 2008-05-01 02:21:41 UTC (rev 1120)
@@ -0,0 +1,10 @@
+2008-04-30 Eric Belanger <eric at archlinux.org>
+
+ * pan 0.132-1
+ * Upstream update
+ * Switch to devel branch (close FS#10272)
+ * Fixed license
+ * Updated depends
+ * Disabled SMP build
+ * Patched for gcc 4.3
+ * Added ChangeLog
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2008-05-01 02:19:56 UTC (rev 1119)
+++ extra-x86_64/PKGBUILD 2008-05-01 02:21:41 UTC (rev 1120)
@@ -1,23 +1,31 @@
# $Id$
-# Maintainer: dorphell <dorphell at archlinux.org>
-# Contributor: deepfreeze (sgrealis1 at comcast.net)
+# Maintainer: Eric Belanger <eric at archlinux.org>
+# Contributor: deepfreeze <sgrealis1 at comcast.net>
+
pkgname=pan
-pkgver=0.14.2.91
-pkgrel=3
+pkgver=0.132
+pkgrel=1
pkgdesc="A powerful Newsgroup Article reader based on GTK2"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('gtkspell' 'gnet' 'pcre' 'libxml2')
-source=(http://pan.rebelbase.com/download/releases/$pkgver/SOURCE/$pkgname-$pkgver.tar.gz
-http://cvs.fedora.redhat.com/viewcvs/*checkout*/devel/pan/pan-0.14.2.91-gcc4-2.patch)
+arch=('i686' 'x86_64')
url="http://pan.rebelbase.com/"
-md5sums=('26bf7253a5e320793e5aba1c731448cd'
- '8ba6afcc31900a8353dc12ef62681f38')
+license=('GPL2')
+depends=('gtkspell' 'pcre' 'gmime')
+conflicts=('pan-devel')
+replaces=('pan-devel')
+options=('!makeflags')
+source=(http://pan.rebelbase.com/download/releases/${pkgver}/source/${pkgname}-${pkgver}.tar.bz2 \
+ preview-fix.patch pan-0.132-gcc43.patch)
+md5sums=('2c337dbd5105b7772a4326d549a45638' '8afd4877916523112c78db17cccc4e8a'\
+ '0aa6c79728989fd65aacabc8a846cdb4')
+sha1sums=('dc0bf586145b9d617039f49101874fbc76a9dc18'
+ '371e9376db3808a0d0b98f04699a3afe43cb9ed8'
+ '549d20acab82d1183a00057326256128b40eff7d')
build() {
- cd $startdir/src/$pkgname-$pkgver
- patch -Np1 -i ../pan-0.14.2.91-gcc4-2.patch || return 1
+ cd ${startdir}/src/${pkgname}-${pkgver}
+ patch -p1 < ../preview-fix.patch || return 1
+ patch -p1 < ../pan-0.132-gcc43.patch || return 1
./configure --prefix=/usr
make || return 1
- make prefix=$startdir/pkg/usr install
+ make DESTDIR=${startdir}/pkg install
}
Copied: pan/repos/extra-x86_64/pan-0.132-gcc43.patch (from rev 1119, pan/trunk/pan-0.132-gcc43.patch)
===================================================================
--- extra-x86_64/pan-0.132-gcc43.patch (rev 0)
+++ extra-x86_64/pan-0.132-gcc43.patch 2008-05-01 02:21:41 UTC (rev 1120)
@@ -0,0 +1,88 @@
+diff -Naur pan-0.132-orig/pan/data-impl/my-tree.cc pan-0.132/pan/data-impl/my-tree.cc
+--- pan-0.132-orig/pan/data-impl/my-tree.cc 2008-04-30 00:04:44.000000000 -0400
++++ pan-0.132/pan/data-impl/my-tree.cc 2008-04-30 00:06:53.000000000 -0400
+@@ -19,7 +19,7 @@
+
+ #include <config.h>
+ #include <cassert>
+-#include <glib/gmessages.h> // for g_assert
++#include <glib.h> // for g_assert
+ #include <pan/general/debug.h>
+ #include <pan/general/foreach.h>
+ #include <pan/general/quark.h>
+diff -Naur pan-0.132-orig/pan/general/file-util.cc pan-0.132/pan/general/file-util.cc
+--- pan-0.132-orig/pan/general/file-util.cc 2008-04-30 00:04:44.000000000 -0400
++++ pan-0.132/pan/general/file-util.cc 2008-04-30 00:10:06.000000000 -0400
+@@ -19,6 +19,7 @@
+
+ #include <config.h>
+
++#include <algorithm>
+ #include <cassert>
+ #include <cerrno>
+ #include <cctype>
+diff -Naur pan-0.132-orig/pan/general/line-reader.cc pan-0.132/pan/general/line-reader.cc
+--- pan-0.132-orig/pan/general/line-reader.cc 2008-04-30 00:04:44.000000000 -0400
++++ pan-0.132/pan/general/line-reader.cc 2008-04-30 00:10:06.000000000 -0400
+@@ -1,5 +1,6 @@
+ #include <config.h>
+ #include <cstdio>
++#include <cstdlib>
+ extern "C"{
+ #include <glib/gi18n.h>
+ }
+diff -Naur pan-0.132-orig/pan/general/string-view.h pan-0.132/pan/general/string-view.h
+--- pan-0.132-orig/pan/general/string-view.h 2008-04-30 00:04:44.000000000 -0400
++++ pan-0.132/pan/general/string-view.h 2008-04-30 00:10:06.000000000 -0400
+@@ -22,6 +22,7 @@
+
+ #include <iosfwd>
+ #include <string>
++#include <cstring>
+
+ namespace pan
+ {
+diff -Naur pan-0.132-orig/pan/gui/prefs.cc pan-0.132/pan/gui/prefs.cc
+--- pan-0.132-orig/pan/gui/prefs.cc 2008-04-30 00:04:44.000000000 -0400
++++ pan-0.132/pan/gui/prefs.cc 2008-04-30 00:06:18.000000000 -0400
+@@ -22,6 +22,7 @@
+ #include <fstream>
+ #include <sstream>
+ #include <string>
++#include <cstdlib>
+ extern "C" {
+ #include <glib.h>
+ #include <glib/gi18n.h>
+diff -Naur pan-0.132-orig/pan/tasks/socket-impl-scripted.cc pan-0.132/pan/tasks/socket-impl-scripted.cc
+--- pan-0.132-orig/pan/tasks/socket-impl-scripted.cc 2008-04-30 00:04:44.000000000 -0400
++++ pan-0.132/pan/tasks/socket-impl-scripted.cc 2008-04-30 00:07:33.000000000 -0400
+@@ -19,6 +19,7 @@
+
+ #include <config.h>
+ #include <cassert>
++#include <cstdlib>
+ #include <pan/general/debug.h>
+ #include <pan/general/messages.h>
+ #include <pan/general/string-view.h>
+diff -Naur pan-0.132-orig/pan/usenet-utils/gnksa-test.cc pan-0.132/pan/usenet-utils/gnksa-test.cc
+--- pan-0.132-orig/pan/usenet-utils/gnksa-test.cc 2008-04-30 00:04:44.000000000 -0400
++++ pan-0.132/pan/usenet-utils/gnksa-test.cc 2008-04-30 00:08:53.000000000 -0400
+@@ -1,6 +1,7 @@
+ #include <config.h>
+ #include <iostream>
+ #include <string>
++#include <climits>
+ #include <pan/general/string-view.h>
+ #include <pan/general/test.h>
+ #include "gnksa.h"
+diff -Naur pan-0.132-orig/pan/usenet-utils/numbers.cc pan-0.132/pan/usenet-utils/numbers.cc
+--- pan-0.132-orig/pan/usenet-utils/numbers.cc 2008-04-30 00:04:44.000000000 -0400
++++ pan-0.132/pan/usenet-utils/numbers.cc 2008-04-30 00:08:53.000000000 -0400
+@@ -19,6 +19,7 @@
+
+ #include <config.h>
+ #include <cctype>
++#include <algorithm>
+ #include <pan/general/string-view.h>
+ #include "numbers.h"
+
Copied: pan/repos/extra-x86_64/preview-fix.patch (from rev 1119, pan/trunk/preview-fix.patch)
===================================================================
--- extra-x86_64/preview-fix.patch (rev 0)
+++ extra-x86_64/preview-fix.patch 2008-05-01 02:21:41 UTC (rev 1120)
@@ -0,0 +1,21 @@
+diff -ru pan-0.132/pan/gui/body-pane.cc pan-0.132.hacked/pan/gui/body-pane.cc
+--- pan-0.132/pan/gui/body-pane.cc 2007-08-01 12:00:00.000000000 -0500
++++ pan-0.132.hacked/pan/gui/body-pane.cc 2007-10-09 00:30:43.000000000 -0500
+@@ -815,8 +815,15 @@
+ GMimeStream * mem_stream (g_mime_stream_mem_new ());
+ g_mime_data_wrapper_write_to_stream (wrapper, mem_stream);
+ GByteArray * buffer (GMIME_STREAM_MEM(mem_stream)->buffer);
+- if (buffer->len)
+- gdk_pixbuf_loader_write (l, (guchar*)buffer->data, buffer->len, &err);
++ size_t c = 0;
++ size_t left = buffer->len;
++ while (left > 0)
++ {
++ size_t len = left < 1024 ? left : 1024; /* KLUDGE magic number */
++ gdk_pixbuf_loader_write (l, ((guchar*)buffer->data) + c, len, &err);
++ left -= len;
++ c += len;
++ }
+ g_object_unref (mem_stream);
+ g_object_unref (wrapper);
+ }
More information about the arch-commits
mailing list