[arch-commits] CVS update of extra/network/aria (4 files)
Eric Belanger
eric at archlinux.org
Wed Dec 12 06:35:10 UTC 2007
Date: Wednesday, December 12, 2007 @ 01:35:10
Author: eric
Path: /home/cvs-extra/extra/network/aria
Removed: PKGBUILD (1.10) aria-gcc41.patch (1.1)
aria-gcc41_x86_64.patch (1.1) bugfix.patch (1.1)
extra repo cleanup
-------------------------+
PKGBUILD | 25 --------------
aria-gcc41.patch | 73 ----------------------------------------
aria-gcc41_x86_64.patch | 11 ------
bugfix.patch | 82 ----------------------------------------------
4 files changed, 191 deletions(-)
Index: extra/network/aria/PKGBUILD
diff -u extra/network/aria/PKGBUILD:1.10 extra/network/aria/PKGBUILD:removed
--- extra/network/aria/PKGBUILD:1.10 Fri Jul 7 17:29:44 2006
+++ extra/network/aria/PKGBUILD Wed Dec 12 01:35:10 2007
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD,v 1.10 2006/07/07 21:29:44 andyrtr Exp $
-# Maintainer: dorphell <dorphell at archlinux.org>
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-#
-pkgname=aria
-pkgver=1.0.0
-pkgrel=4
-pkgdesc=" Aria is a download tool for Linux similar to Reget or GetRight"
-depends=('gtk' 'openssl' 'zlib' 'gcc')
-source=(http://aria.rednoah.com/storage/sources/$pkgname-$pkgver.tar.bz2 bugfix.patch \
- aria-gcc41.patch aria-gcc41_x86_64.patch)
-url="http://aria.rednoah.com/"
-
-
-build() {
- cd $startdir/src/$pkgname-$pkgver
- patch -p1 -i ../bugfix.patch || return 1
- patch -Np1 -i ../aria-gcc41.patch || return 1
- [ "$CARCH" = "x86_64" ] && patch -Np0 -i ../aria-gcc41_x86_64.patch || return 1
- ./configure --prefix=/usr --build=i686-pc-linux-gnu
- make || return 1
- make prefix=$startdir/pkg/usr install
-}
-md5sums=('e4e968fd10f3beb2402b851f5dad74ff' '2b4a9c4d9195c70694378e9ba5f99673'\
- '589f0772a2255e3886f06a11815c612f' '3d5cde0ec447c3419ce89f3ea4deb965')
Index: extra/network/aria/aria-gcc41.patch
diff -u extra/network/aria/aria-gcc41.patch:1.1 extra/network/aria/aria-gcc41.patch:removed
--- extra/network/aria/aria-gcc41.patch:1.1 Sun Jun 4 08:26:30 2006
+++ extra/network/aria/aria-gcc41.patch Wed Dec 12 01:35:10 2007
@@ -1,73 +0,0 @@
-diff -ur --exclude=.deps aria-1.0.0-orig/src/gui_download.cc aria-1.0.0/src/gui_download.cc
---- aria-1.0.0-orig/src/gui_download.cc 2006-05-10 20:45:44.000000000 -0400
-+++ aria-1.0.0/src/gui_download.cc 2006-05-10 20:46:50.000000000 -0400
-@@ -24,7 +24,7 @@
- #include <sys/time.h>
- #include <sys/types.h>
- #include <sys/socket.h>
--#include <pair.h>
-+#include <utility>
- #include <list>
- #include <algorithm>
- #include "aria.h"
-diff -ur --exclude=.deps aria-1.0.0-orig/src/gui_file.cc aria-1.0.0/src/gui_file.cc
---- aria-1.0.0-orig/src/gui_file.cc 2006-05-10 20:45:44.000000000 -0400
-+++ aria-1.0.0/src/gui_file.cc 2006-05-10 20:47:05.000000000 -0400
-@@ -19,7 +19,7 @@
-
- // $Id: aria-gcc41.patch,v 1.1 2006/06/04 12:26:30 tpowa Exp $
-
--#include <fstream.h>
-+#include <fstream>
- #include <stdlib.h>
- #include <unistd.h>
- #include <sys/time.h>
-diff -ur --exclude=.deps aria-1.0.0-orig/src/gui_popup.cc aria-1.0.0/src/gui_popup.cc
---- aria-1.0.0-orig/src/gui_popup.cc 2006-05-10 20:45:44.000000000 -0400
-+++ aria-1.0.0/src/gui_popup.cc 2006-05-10 20:47:16.000000000 -0400
-@@ -19,7 +19,7 @@
-
- // $Id: aria-gcc41.patch,v 1.1 2006/06/04 12:26:30 tpowa Exp $
-
--#include <iostream.h>
-+#include <iostream>
- #include "aria.h"
- #include "gui_utils.h"
-
-diff -ur --exclude=.deps aria-1.0.0-orig/src/ItemCellPartial.h aria-1.0.0/src/ItemCellPartial.h
---- aria-1.0.0-orig/src/ItemCellPartial.h 2006-05-10 20:45:44.000000000 -0400
-+++ aria-1.0.0/src/ItemCellPartial.h 2006-05-10 20:46:08.000000000 -0400
-@@ -70,7 +70,7 @@
- ItemCell *ret_Boss();
-
- void WriteSplitInfo(const string& filename);
-- ItemCell::DownloadStatusType ItemCellPartial::Download_Main();
-+ ItemCell::DownloadStatusType Download_Main();
-
- SplitStatusType SplitNumberChanged(const string& filename);
- };
-diff -ur --exclude=.deps aria-1.0.0-orig/src/ItemList.h aria-1.0.0/src/ItemList.h
---- aria-1.0.0-orig/src/ItemList.h 2006-05-10 20:45:44.000000000 -0400
-+++ aria-1.0.0/src/ItemList.h 2006-05-10 20:46:20.000000000 -0400
-@@ -31,7 +31,7 @@
- #include <string>
- #include <fstream>
- //#include <map>
--#include <pair.h>
-+#include <utility>
- #include "aria.h"
- #include "utils.h"
- #include "ProxyList.h"
-diff -ur --exclude=.deps aria-1.0.0-orig/src/RetrieveFTP.h aria-1.0.0/src/RetrieveFTP.h
---- aria-1.0.0-orig/src/RetrieveFTP.h 2006-05-10 20:45:44.000000000 -0400
-+++ aria-1.0.0/src/RetrieveFTP.h 2006-05-10 20:46:34.000000000 -0400
-@@ -27,7 +27,7 @@
- #include <arpa/inet.h>
- #include <errno.h>
- #include <fstream>
--#include <pair.h>
-+#include <utility>
- #include "aria.h"
- #include "FTPcontainer.h"
- #include "ItemCell.h"
-
Index: extra/network/aria/aria-gcc41_x86_64.patch
diff -u extra/network/aria/aria-gcc41_x86_64.patch:1.1 extra/network/aria/aria-gcc41_x86_64.patch:removed
--- extra/network/aria/aria-gcc41_x86_64.patch:1.1 Fri Jul 7 17:29:44 2006
+++ extra/network/aria/aria-gcc41_x86_64.patch Wed Dec 12 01:35:10 2007
@@ -1,11 +0,0 @@
---- src/gui_download.cc 2006-07-07 23:22:27.000000000 +0200
-+++ src/gui_download.cc.new 2006-07-07 23:23:13.000000000 +0200
-@@ -131,7 +131,7 @@
- static void Backup_selection_list(GtkWidget *clist, list<int>& selection_temp)
- {
- for(GList* node = GTK_CLIST(clist)->selection; node != NULL; node = g_list_next(node)) {
-- selection_temp.push_back((int)node->data);
-+ selection_temp.push_back((long)node->data);
- }
- }
-
Index: extra/network/aria/bugfix.patch
diff -u extra/network/aria/bugfix.patch:1.1 extra/network/aria/bugfix.patch:removed
--- extra/network/aria/bugfix.patch:1.1 Tue Jan 4 20:13:30 2005
+++ extra/network/aria/bugfix.patch Wed Dec 12 01:35:10 2007
@@ -1,82 +0,0 @@
-diff -ruN aria-1.0.0-old/src/CtrlSocket.cc aria-1.0.0/src/CtrlSocket.cc
---- aria-1.0.0-old/src/CtrlSocket.cc 2002-10-01 17:32:00.000000000 +0200
-+++ aria-1.0.0/src/CtrlSocket.cc 2004-01-10 02:13:30.000000000 +0100
-@@ -183,7 +183,7 @@
- stored_uid = getuid();
- euid = geteuid();
- setuid(euid);
-- sprintf(saddr.sun_path, "%s/aria_%s.%d", g_get_tmp_dir(), g_get_user_name(), session);
-+ snprintf(saddr.sun_path, sizeof(saddr.sun_path)-1, "%s/aria_%s.%d", g_get_tmp_dir(), g_get_user_name(), session);
- setreuid(stored_uid, euid);
- if (connect(fd, (struct sockaddr *) &saddr, sizeof (saddr)) != -1)
- return fd;
-diff -ru a/src/HistoryWindow.cc aria-1.0.0/src/HistoryWindow.cc
---- a/src/HistoryWindow.cc 2003-08-15 12:40:09.000000000 -0500
-+++ aria-1.0.0/src/HistoryWindow.cc 2003-08-15 14:53:41.000000000 -0500
-@@ -479,7 +479,7 @@
- {
- ifstream infile(filename.c_str(), ios::in);
-
-- if(infile.bad()) return false;
-+ if(!infile.is_open() || infile.bad()) return false;
- int count = 0;
- while(!infile.eof() && count < maxHistory) {
- string line;
-diff -ru a/src/ProxyList.cc aria-1.0.0/src/ProxyList.cc
---- a/src/ProxyList.cc 2003-08-15 12:40:09.000000000 -0500
-+++ aria-1.0.0/src/ProxyList.cc 2003-08-15 14:52:35.000000000 -0500
-@@ -130,12 +130,12 @@
- bool ProxyList::Read_proxy_list(const string& file_proxy_list)
- {
- ifstream infile(file_proxy_list.c_str(), ios::in);//ios::skipws|ios::in);
-- if(infile.bad() || infile.eof()) return false;
-+ if(!infile.is_open() || infile.bad() || infile.eof()) return false;
-
- while(!infile.eof()) {
- string line;
- getline(infile, line, '\n');
-- if(infile.bad()) return false;
-+ if(!infile.is_open() || infile.bad()) return false;
- line = Remove_white(line);
- if(line.empty() || line.at(0) == '#') continue;
- string server_name = Token_splitter(line, ": \t");
-diff -ru a/src/gui_main.cc aria-1.0.0/src/gui_main.cc
---- a/src/gui_main.cc 2003-08-15 12:40:09.000000000 -0500
-+++ aria-1.0.0/src/gui_main.cc 2003-08-15 14:55:34.000000000 -0500
-@@ -830,8 +830,8 @@
- */
- ifstream infile(filename.c_str(), ios::in);
- map<string, string> guiInfoMap;
-- if(infile.bad()) return false;
--
-+ if(!infile.is_open() || infile.bad()) return false;
-+
- if(infile.eof()) return false;
- while(!infile.eof()) {
- string line;
-diff -ruN aria-1.0.0-old/po/Makefile.in.in aria-1.0.0/po/Makefile.in.in
---- aria-1.0.0-old/po/Makefile.in.in 2000-10-11 09:30:42.000000000 +0200
-+++ aria-1.0.0/po/Makefile.in.in 2003-08-07 01:40:47.000000000 +0200
-@@ -85,7 +85,7 @@
- $(srcdir)/$(PACKAGE).pot: $(POTFILES)
- $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
- --add-comments --keyword=_ --keyword=N_ \
-- --files-from=$(srcdir)/POTFILES.in \
-+ --files-from=$(srcdir)/POTFILES.in --from-code=ISO-8859-1 \
- && test ! -f $(PACKAGE).po \
- || ( rm -f $(srcdir)/$(PACKAGE).pot \
- && mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot )
-diff -ruN aria-1.0.0-old/src/md5.c aria-1.0.0/src/md5.c
---- aria-1.0.0-old/src/md5.c 2001-05-19 20:38:59.000000000 +0200
-+++ aria-1.0.0/src/md5.c 2003-08-07 01:34:12.000000000 +0200
-@@ -291,8 +291,8 @@
-
- p = hd->buf;
- #ifdef BIG_ENDIAN_HOST
-- #define X(a) do { *p++ = hd->##a ; *p++ = hd->##a >> 8; \
-- *p++ = hd->##a >> 16; *p++ = hd->##a >> 24; } while(0)
-+ #define X(a) do { *p++ = hd->a ; *p++ = hd->a >> 8; \
-+ *p++ = hd->a >> 16; *p++ = hd->a >> 24; } while(0)
- #else /* little endian */
- /*#define X(a) do { *(u32*)p = hd->##a ; p += 4; } while(0)*/
- /* Unixware's cpp doesn't like the above construct so we do it his way:
More information about the arch-commits
mailing list