update to 1.2.2; based on a submission by Christian.Kellermann@nefkom.net

This commit is contained in:
naddy 2005-01-23 21:42:49 +00:00
parent 2ece7077a7
commit aeca8f4bb7
6 changed files with 31 additions and 58 deletions

View File

@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.27 2004/11/21 17:51:45 espie Exp $
# $OpenBSD: Makefile,v 1.28 2005/01/23 21:42:49 naddy Exp $
COMMENT= "full featured GTK Napster client"
DISTNAME= lopster-1.2.0
PKGNAME= ${DISTNAME}p2
DISTNAME= lopster-1.2.2
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lopster/}
@ -13,18 +12,20 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xext Xi c glib gmodule m z
WANTLIB= X11 Xext Xi c glib gmodule m pthread z
MODULES= devel/gettext
LIB_DEPENDS= gtk.1.2,gdk.1.2::x11/gtk+ \
ogg.4::audio/libogg
LIB_DEPENDS= gtk.1.2,gdk.1.2::x11/gtk+ \
gthread.1.2::devel/glib \
ogg.4::audio/libogg \
FLAC.5::audio/flac
USE_GMAKE= Yes
USE_X11= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS+=--with-zlib
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"

View File

@ -1,4 +1,5 @@
MD5 (lopster-1.2.0.tar.gz) = fedbe6b5c7944a4a21bc4554358a057d
RMD160 (lopster-1.2.0.tar.gz) = cbe281edd5c749b907a60b508d46bcd9feb39e4b
SHA1 (lopster-1.2.0.tar.gz) = 055ba228f37e0da3bb95fe512625be455491fc75
MD5 (lopster-1.2.2.tar.gz) = ae857116eddd01f1f7d2769908a142c0
RMD160 (lopster-1.2.2.tar.gz) = 60b236962d3b3cf998a56aa7b087381349b9e610
SHA1 (lopster-1.2.2.tar.gz) = 27655baa659e748406326bcac4e6b94b8982f258
SIZE (lopster-1.2.2.tar.gz) = 630325
SIZE (lopster-1.2.0.tar.gz) = 606295

View File

@ -1,15 +1,14 @@
$OpenBSD: patch-configure,v 1.1 2003/06/22 02:45:31 jolan Exp $
--- configure.orig Tue Mar 4 14:09:14 2003
+++ configure Sat Jun 14 22:29:21 2003
@@ -2162,14 +2162,14 @@ fi
--- configure.orig Sun Aug 29 20:38:43 2004
+++ configure Thu Jan 20 11:58:08 2005
@@ -2245,14 +2245,14 @@
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
- echo $ac_n "checking for main in -lpthread""... $ac_c" 1>&6
-echo "configure:2167: checking for main in -lpthread" >&5
+ echo $ac_n "checking for main in -pthread""... $ac_c" 1>&6
+echo "configure:2167: checking for main in -pthread" >&5
ac_lib_var=`echo pthread'_'main | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6
-echo "configure:2250: checking for pthread_attr_init in -lpthread" >&5
+ echo $ac_n "checking for pthread_attr_init in -pthread""... $ac_c" 1>&6
+echo "configure:2250: checking for pthread_attr_init in -pthread" >&5
ac_lib_var=`echo pthread'_'pthread_attr_init | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -17,5 +16,5 @@ $OpenBSD: patch-configure,v 1.1 2003/06/22 02:45:31 jolan Exp $
-LIBS="-lpthread $LIBS"
+LIBS="-pthread $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2175 "configure"
#line 2258 "configure"
#include "confdefs.h"

View File

@ -1,12 +1,11 @@
$OpenBSD: patch-src_Makefile_in,v 1.2 2003/04/05 22:19:35 margarida Exp $
--- src/Makefile.in.orig Tue Mar 4 14:08:56 2003
+++ src/Makefile.in Wed Mar 5 16:58:10 2003
@@ -70,7 +70,7 @@ INCLUDES = @GTK_CFLAGS@
--- src/Makefile.in.orig Sun Aug 29 20:38:42 2004
+++ src/Makefile.in Thu Jan 20 12:13:03 2005
@@ -72,7 +72,7 @@
bin_PROGRAMS = lopster
-lopster_SOURCES = global.c global.h browse.c browse.h sarray.c sarray.h buffer.c buffer.h transfer.c transfer.h bannet.c bannet.h files.c files.h utils.c utils.h main.c lopster.h log.c log.h support.c support.h file_tree.c file_tree.h interface.c interface.h dirselect.c dirselect.h scheme.c scheme.h resume.c resume.h server.c server.h preferences.c preferences.h dialog.c dialog.h splash.c splash.h exec.c exec.h md5.c md5.h wizard.c wizard.h statistic.c statistic.h whois.c whois.h about.c about.h napster.c napster.h share2.c share2.h callbacks.c callbacks.h filetips.c filetips.h handler.c handler.h connection.c connection.h getopt.c getopt1.c getopt.h string_list.c string_list.h commands.c commands.h subscription.c subscription.h chat.c chat.h search.c search.h userinfo.c userinfo.h mp3_ext.c mp3_ext.h hotlist.c hotlist.h ogg_ext.c ogg_ext.h clist_rename.c clist_rename.h ping.c ping.h irc.c irc.h irc_handler.c irc_handler.h napster_handler.c napster_handler.h
+lopster_SOURCES = global.c global.h browse.c browse.h sarray.c sarray.h buffer.c buffer.h transfer.c transfer.h bannet.c bannet.h files.c files.h utils.c utils.h main.c lopster.h log.c log.h support.c support.h file_tree.c file_tree.h interface.c interface.h dirselect.c dirselect.h scheme.c scheme.h resume.c resume.h server.c server.h preferences.c preferences.h dialog.c dialog.h splash.c splash.h exec.c exec.h md5.c md5.h wizard.c wizard.h statistic.c statistic.h whois.c whois.h about.c about.h napster.c napster.h share2.c share2.h callbacks.c callbacks.h filetips.c filetips.h handler.c handler.h connection.c connection.h string_list.c string_list.h commands.c commands.h subscription.c subscription.h chat.c chat.h search.c search.h userinfo.c userinfo.h mp3_ext.c mp3_ext.h hotlist.c hotlist.h ogg_ext.c ogg_ext.h clist_rename.c clist_rename.h ping.c ping.h irc.c irc.h irc_handler.c irc_handler.h napster_handler.c napster_handler.h
-lopster_SOURCES = mtypes.c mtypes.h global.c global.h browse.c browse.h sarray.c sarray.h buffer.c buffer.h transfer.c transfer.h bannet.c bannet.h files.c files.h utils.c utils.h main.c lopster.h log.c log.h support.c support.h file_tree.c file_tree.h interface.c interface.h dirselect.c dirselect.h scheme.c scheme.h resume.c resume.h server.c server.h preferences.c preferences.h dialog.c dialog.h splash.c splash.h exec.c exec.h md5.c md5.h wizard.c wizard.h statistic.c statistic.h whois.c whois.h about.c about.h napster.c napster.h share2.c share2.h callbacks.c callbacks.h filetips.c filetips.h handler.c handler.h connection.c connection.h getopt.c getopt1.c getopt.h string_list.c string_list.h commands.c commands.h subscription.c subscription.h chat.c chat.h search.c search.h userinfo.c userinfo.h mp3_ext.c mp3_ext.h flac_ext.c flac_ext.h hotlist.c hotlist.h ogg_ext.c ogg_ext.h clist_rename.c clist_rename.h ping.c ping.h irc.c irc.h irc_handler.c irc_handler.h napster_handler.c napster_handler.h
+lopster_SOURCES = mtypes.c mtypes.h global.c global.h browse.c browse.h sarray.c sarray.h buffer.c buffer.h transfer.c transfer.h bannet.c bannet.h files.c files.h utils.c utils.h main.c lopster.h log.c log.h support.c support.h file_tree.c file_tree.h interface.c interface.h dirselect.c dirselect.h scheme.c scheme.h resume.c resume.h server.c server.h preferences.c preferences.h dialog.c dialog.h splash.c splash.h exec.c exec.h md5.c md5.h wizard.c wizard.h statistic.c statistic.h whois.c whois.h about.c about.h napster.c napster.h share2.c share2.h callbacks.c callbacks.h filetips.c filetips.h handler.c handler.h connection.c connection.h string_list.c string_list.h commands.c commands.h subscription.c subscription.h chat.c chat.h search.c search.h userinfo.c userinfo.h mp3_ext.c mp3_ext.h flac_ext.c flac_ext.h hotlist.c hotlist.h ogg_ext.c ogg_ext.h clist_rename.c clist_rename.h ping.c ping.h irc.c irc.h irc_handler.c irc_handler.h napster_handler.c napster_handler.h
# wpnp.c wpnp.h

View File

@ -1,31 +0,0 @@
$OpenBSD: patch-src_transfer_c,v 1.3 2003/09/24 00:52:55 jolan Exp $
--- src/transfer.c.orig 2003-03-04 14:08:57.000000000 -0600
+++ src/transfer.c 2003-09-23 19:33:13.000000000 -0500
@@ -5907,6 +5907,7 @@ void upload_update_speed(user_info_t* us
GtkCList *clist;
socket_t *socket;
upload_t *upload;
+ share_t *share;
int i1;
if (!userinfo) return;
@@ -5915,10 +5916,15 @@ void upload_update_speed(user_info_t* us
gtk_clist_freeze(clist);
for (i1 = 0; i1 < clist->rows; i1++) {
socket = gtk_clist_get_row_data(clist, i1);
- upload = socket->data;
- if (upload->data->user_info != userinfo) continue;
-
- upload_update(socket);
+ if (socket->type == S_UPLOAD) {
+ upload = socket->data;
+ if (upload->data->user_info != userinfo) continue;
+ upload_update(socket);
+ } else if (socket->type == S_SHARE) {
+ share = socket->data;
+ if (share->data->user_info != userinfo) continue;
+ share_update(socket);
+ }
}
gtk_clist_thaw(clist);
}

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.9 2004/09/14 23:16:54 espie Exp $
@comment $OpenBSD: PLIST,v 1.10 2005/01/23 21:42:49 naddy Exp $
bin/lopster
share/lopster/
share/lopster/pixmaps/
@ -29,6 +29,10 @@ share/lopster/pixmaps/project.xpm
share/lopster/pixmaps/search.xpm
share/lopster/pixmaps/server.xpm
share/lopster/pixmaps/server_con.xpm
share/lopster/pixmaps/server_deact.xpm
share/lopster/pixmaps/server_napi.xpm
share/lopster/pixmaps/server_nnapi.xpm
share/lopster/pixmaps/server_perm.xpm
share/lopster/pixmaps/share_all.xpm
share/lopster/pixmaps/share_none.xpm
share/lopster/pixmaps/share_part.xpm