Attachment 53621 Details for Bug 81118 – file.diff

[patch] file.diff

file.diff (text/plain), 6.20 KB, created by tkato432 on 2005-05-16 19:10:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2005-05-16 19:10:00 UTC

Size: 6.20 KB

patch

obsolete

>diff -urN /usr/ports/audio/tunesbrowser/Makefile audio/tunesbrowser/Makefile
>--- /usr/ports/audio/tunesbrowser/Makefile	Sat Mar 12 20:20:28 2005
>+++ audio/tunesbrowser/Makefile	Mon May 16 20:03:27 2005
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	tunesbrowser
>-PORTVERSION=	0.2.0
>-PORTREVISION=	2
>+PORTVERSION=	0.3.0
> CATEGORIES=	audio
> MASTER_SITES=	http://craz.net/programs/itunes/files/
> 
>@@ -17,19 +16,21 @@
> LIB_DEPENDS=	opendaap.0:${PORTSDIR}/devel/libopendaap
> 
> USE_BZIP2=	yes
>-USE_INC_LIBTOOL_VER=15
> USE_X_PREFIX=	yes
>-USE_GNOME=	libglade2 gnometarget gnomehack gnomeprefix
>+USE_GNOME=	gnomehack gnomeprefix gnometarget libglade2
>+WANT_GNOME=	yes
> USE_GSTREAMER=	mad
>+GNU_CONFIGURE=	yes
> 
> MAN1=		tunesbrowser.1
> 
>-DATADIR=	${PREFIX}/share/gnome/${PORTNAME}
>+.include <bsd.port.pre.mk>
> 
>-pre-everything::
>-	@${ECHO_MSG} '===>'
>-	@${ECHO_MSG} '===> Warning: ${PORTNAME} is extremelly buggy, especially'
>-	@${ECHO_MSG} '===> on the FreeBSD 4.x branch, and may not run at all'
>-	@${ECHO_MSG} '===>'
>+.if ${HAVE_GNOME:Mlibgnome}!=""
>+PKGNAMESUFFIX=	-gnome
>+USE_GNOME+=	libgnome
>+.else
>+CONFIGURE_ARGS+=	--disable-gnome
>+.endif
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff -urN /usr/ports/audio/tunesbrowser/distinfo audio/tunesbrowser/distinfo
>--- /usr/ports/audio/tunesbrowser/distinfo	Thu Feb  3 19:50:13 2005
>+++ audio/tunesbrowser/distinfo	Mon May 16 19:30:26 2005
>@@ -1,2 +1,2 @@
>-MD5 (tunesbrowser-0.2.0.tar.bz2) = e0fa00ca89ded223033430f4c54a83f9
>-SIZE (tunesbrowser-0.2.0.tar.bz2) = 208472
>+MD5 (tunesbrowser-0.3.0.tar.bz2) = dacfc3f7209c3165be9a9211dfb7bf0e
>+SIZE (tunesbrowser-0.3.0.tar.bz2) = 222593
>diff -urN /usr/ports/audio/tunesbrowser/files/patch-Makefile.in audio/tunesbrowser/files/patch-Makefile.in
>--- /usr/ports/audio/tunesbrowser/files/patch-Makefile.in	Thu Feb  3 12:32:26 2005
>+++ audio/tunesbrowser/files/patch-Makefile.in	Mon May 16 19:39:21 2005
>@@ -1,17 +1,20 @@
>---- Makefile.in.orig	Wed Feb  2 22:27:56 2005
>-+++ Makefile.in	Wed Feb  2 22:29:51 2005
>-@@ -389,12 +389,12 @@
>- uiDATA_INSTALL = $(INSTALL_DATA)
>- install-uiDATA: $(ui_DATA)
>- 	@$(NORMAL_INSTALL)
>--	$(mkinstalldirs) $(DESTDIR)$(uidir)
>-+	$(mkinstalldirs) $(DESTDIR)$(uidir)/tunesbrowser
>- 	@list='$(ui_DATA)'; for p in $$list; do \
>- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
>- 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
>- 	  echo " $(uiDATA_INSTALL) $$d$$p $(DESTDIR)$(uidir)/$$f"; \
>--	  $(uiDATA_INSTALL) $$d$$p $(DESTDIR)$(uidir)/$$f; \
>-+	  $(uiDATA_INSTALL) $$d$$p $(DESTDIR)$(uidir)/tunesbrowser/$$f; \
>- 	done
>+--- Makefile.in.orig	Mon May 16 14:48:28 2005
>++++ Makefile.in	Mon May 16 19:39:09 2005
>+@@ -144,7 +144,7 @@
>+ sysconfdir = @sysconfdir@
>+ target_alias = @target_alias@
>+ SUBDIRS = debug
>+-uidir = $(datadir)
>++uidir = $(pkgdatadir)
>+ bin_PROGRAMS = tunesbrowser
>+ tunesbrowser_SOURCES = albumlist.c artistlist.c audioplayer.c \
>+                        daap.c main.c misc_ui.c songlist.c sourcelist.c \
>+@@ -158,7 +158,7 @@
>+ man_MANS = tunesbrowser.1
>  
>- uninstall-uiDATA:
>+ INCLUDES = -I$(srcdir) -I$(srcdir)/debug
>+-AM_CFLAGS = $(TB_CFLAGS) -W -Wall -DUIDIR=$(datadir)
>++AM_CFLAGS = $(TB_CFLAGS) -W -Wall -DUIDIR=$(pkgdatadir)
>+ 
>+ ui_DATA = tunesbrowser.glade \
>+           comp.blue.png comp.red.png \
>diff -urN /usr/ports/audio/tunesbrowser/files/patch-audioplayer.c audio/tunesbrowser/files/patch-audioplayer.c
>--- /usr/ports/audio/tunesbrowser/files/patch-audioplayer.c	Thu Feb  3 19:50:13 2005
>+++ audio/tunesbrowser/files/patch-audioplayer.c	Thu Jan  1 09:00:00 1970
>@@ -1,25 +0,0 @@
>---- audioplayer.c.orig	Mon Dec 20 03:03:55 2004
>-+++ audioplayer.c	Wed Feb  2 21:42:19 2005
>-@@ -106,7 +106,8 @@
>- 
>- static void async_cmd_cb_gst_setup_clock(__UNUSED__ void *data)
>- {
>--    GstClock *clock = gst_bin_get_clock(GST_BIN(pipeline_thread));
>-+    GstClock *clock;
>-+    clock = gst_bin_get_clock(GST_BIN(pipeline_thread));
>-     songstarted = gst_clock_get_time(clock) / GST_SECOND;
>- }
>- 
>-@@ -157,8 +158,10 @@
>- 
>- static void cb_iterate(GstBin *bin, __UNUSED__ gpointer data)
>- {
>--    GstClock *clock = gst_bin_get_clock(bin);
>--    int seconds = gst_clock_get_time(clock) / GST_SECOND;
>-+    GstClock *clock;
>-+    int seconds;
>-+    clock = gst_bin_get_clock(bin);
>-+    seconds = gst_clock_get_time(clock) / GST_SECOND; 
>- 
>-     seconds = seconds - songstarted;
>- 
>diff -urN /usr/ports/audio/tunesbrowser/files/patch-main.c audio/tunesbrowser/files/patch-main.c
>--- /usr/ports/audio/tunesbrowser/files/patch-main.c	Wed Feb 16 03:24:08 2005
>+++ audio/tunesbrowser/files/patch-main.c	Thu Jan  1 09:00:00 1970
>@@ -1,34 +0,0 @@
>---- main.c.orig	Mon Jan  3 21:58:29 2005
>-+++ main.c	Wed Feb  2 21:56:11 2005
>-@@ -38,7 +38,7 @@
>- {
>-     fprintf(stderr, "Oops! TunesBrowser has crashed. Sorry about that!\n");
>-     fprintf(stderr, "This probably won't be of any use unless you feel like debugging,\n");
>--    fprintf(stderr, "but the crash occured because of %p being bad.\n", siginfo->si_ptr);
>-+    fprintf(stderr, "but the crash occured because of %p being bad.\n", siginfo->si_value.sigval_ptr);
>- #if 0
>-     fprintf(stderr, "\n\nRaised SIGSTOP. You can now attach a debugger.\n");
>-     fprintf(stderr, "Attach to PID %i\n", getpid());
>-@@ -66,11 +66,11 @@
>-     int ret;
>- 
>-     sa.sa_handler = (void*)sighandler_sigsegv;
>--    sa.sa_flags = SA_NOMASK | SA_SIGINFO;
>-+    sa.sa_flags = SA_NODEFER | SA_SIGINFO;
>-     ret = sigaction(SIGSEGV, &sa, NULL);
>- 
>-     sa.sa_handler = (void*)sighandler_sigpipe;
>--    sa.sa_flags = SA_NOMASK | SA_SIGINFO;
>-+    sa.sa_flags = SA_NODEFER | SA_SIGINFO;
>-     ret = sigaction(SIGPIPE, &sa, NULL);
>- }
>- 
>-@@ -94,7 +94,7 @@
>- 
>-     gtk_init(&argc, &argv);
>- 
>--    xml = glade_xml_new(XSTR(UIDIR) "/tunesbrowser.glade", NULL, NULL);
>-+    xml = glade_xml_new(XSTR(UIDIR) "/tunesbrowser/tunesbrowser.glade", NULL, NULL);
>- 
>-     glade_xml_signal_autoconnect(xml);
>- 
>diff -urN /usr/ports/audio/tunesbrowser/pkg-plist audio/tunesbrowser/pkg-plist
>--- /usr/ports/audio/tunesbrowser/pkg-plist	Thu Feb  3 12:32:25 2005
>+++ audio/tunesbrowser/pkg-plist	Mon May 16 19:40:18 2005
>@@ -3,5 +3,7 @@
> share/gnome/tunesbrowser/comp.red.png
> share/gnome/tunesbrowser/sound1.png
> share/gnome/tunesbrowser/sound2.png
>+share/gnome/tunesbrowser/soundfile.png
>+share/gnome/tunesbrowser/tips.txt
> share/gnome/tunesbrowser/tunesbrowser.glade
> @dirrm share/gnome/tunesbrowser

Actions: View | Diff

Attachments on bug 81118: 53621