[arch-commits] Commit in pan/repos (5 files)
Eric Belanger
eric at archlinux.org
Wed Jul 30 21:28:50 UTC 2008
Date: Wednesday, July 30, 2008 @ 17:28:50
Author: eric
Revision: 7345
Merged revisions 1130-7344 via svnmerge from
svn+ssh://svn.archlinux.org/home/svn-packages/pan/trunk
........
r7338 | eric | 2008-07-30 17:04:42 -0400 (Wed, 30 Jul 2008) | 2 lines
upgpkg: pan 0.133-1
Upstream update, removed old patches
........
Modified:
pan/repos/extra-i686/ (properties)
pan/repos/extra-i686/ChangeLog
pan/repos/extra-i686/PKGBUILD
Deleted:
pan/repos/extra-i686/pan-0.132-gcc43.patch
pan/repos/extra-i686/preview-fix.patch
-----------------------+
ChangeLog | 5 ++
PKGBUILD | 20 +++-------
pan-0.132-gcc43.patch | 88 ------------------------------------------------
preview-fix.patch | 21 -----------
4 files changed, 12 insertions(+), 122 deletions(-)
Property changes on: pan/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
- /pan/trunk:1-1129
+ /pan/trunk:1-7344
Modified: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog 2008-07-30 21:18:56 UTC (rev 7344)
+++ extra-i686/ChangeLog 2008-07-30 21:28:50 UTC (rev 7345)
@@ -1,3 +1,8 @@
+2008-07-30 Eric Belanger <eric at archlinux.org>
+
+ * pan 0.133-1
+ * Upstream update
+
2008-04-30 Eric Belanger <eric at archlinux.org>
* pan 0.132-1
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2008-07-30 21:18:56 UTC (rev 7344)
+++ extra-i686/PKGBUILD 2008-07-30 21:28:50 UTC (rev 7345)
@@ -3,7 +3,7 @@
# Contributor: deepfreeze <sgrealis1 at comcast.net>
pkgname=pan
-pkgver=0.132
+pkgver=0.133
pkgrel=1
pkgdesc="A powerful Newsgroup Article reader based on GTK2"
arch=('i686' 'x86_64')
@@ -13,19 +13,13 @@
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')
+source=(http://pan.rebelbase.com/download/releases/${pkgver}/source/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('ca165da8557605d89d327cff78891b89')
+sha1sums=('a0bd98ea1ba174800896611e3305a6b6d8dbde2f')
build() {
- cd ${startdir}/src/${pkgname}-${pkgver}
- patch -p1 < ../preview-fix.patch || return 1
- patch -p1 < ../pan-0.132-gcc43.patch || return 1
- ./configure --prefix=/usr
+ cd ${srcdir}/${pkgname}-${pkgver}
+ ./configure --prefix=/usr || return 1
make || return 1
- make DESTDIR=${startdir}/pkg install
+ make DESTDIR=${pkgdir} install || return 1
}
Deleted: extra-i686/pan-0.132-gcc43.patch
===================================================================
--- extra-i686/pan-0.132-gcc43.patch 2008-07-30 21:18:56 UTC (rev 7344)
+++ extra-i686/pan-0.132-gcc43.patch 2008-07-30 21:28:50 UTC (rev 7345)
@@ -1,88 +0,0 @@
-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"
-
Deleted: extra-i686/preview-fix.patch
===================================================================
--- extra-i686/preview-fix.patch 2008-07-30 21:18:56 UTC (rev 7344)
+++ extra-i686/preview-fix.patch 2008-07-30 21:28:50 UTC (rev 7345)
@@ -1,21 +0,0 @@
-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