View | Details | Raw Unified | Return to bug 109918
Collapse All | Expand All

(-)amarok.old/Makefile (-1 / +26 lines)
Lines 26-37 Link Here
26
USE_GMAKE=	yes
26
USE_GMAKE=	yes
27
USE_AUTOTOOLS=	libtool:15
27
USE_AUTOTOOLS=	libtool:15
28
USE_SDL=	sdl
28
USE_SDL=	sdl
29
USE_RUBY=	yes
30
USE_LDCONFIG=	yes
29
USE_LDCONFIG=	yes
31
30
32
OPTIONS=	GPOD "iPod support" on \
31
OPTIONS=	GPOD "iPod support" on \
33
		NJB "Creative Nomad and Dell support" on \
32
		NJB "Creative Nomad and Dell support" on \
34
		MTP "MTP device support" on \
33
		MTP "MTP device support" on \
34
		RUBY "Ruby scripts and libraries" off \
35
		DAAP "DAAP share music server (required Ruby)" off \
35
		OPENGL "OpenGL support" on \
36
		OPENGL "OpenGL support" on \
36
		AMAZON "Amazon cover fetching support" on \
37
		AMAZON "Amazon cover fetching support" on \
37
		MYSQL "Use MySQL as collection backend" off \
38
		MYSQL "Use MySQL as collection backend" off \
Lines 73-78 Link Here
73
PLIST_SUB+=	MTP=""
74
PLIST_SUB+=	MTP=""
74
.endif
75
.endif
75
76
77
.if !defined(WITH_DAAP)
78
PLIST_SUB+=	DAAP="@comment "
79
CONFIGURE_ARGS+=--without-libdaap
80
.else
81
.if !defined(WITH_RUBY)
82
USE_RUBY=	yes
83
.endif
84
PLIST_SUB+=	DAAP=""
85
.endif
86
87
.if !defined(WITH_RUBY)
88
PLIST_SUB+=	RUBY="@comment "
89
.else
90
.if !defined(WITH_DAAP)
91
USE_RUBY=	yes
92
.endif
93
PLIST_SUB+=	RUBY=""
94
.endif
95
76
.if defined(WITHOUT_OPENGL)
96
.if defined(WITHOUT_OPENGL)
77
CONFIGURE_ARGS+=--without-opengl
97
CONFIGURE_ARGS+=--without-opengl
78
.endif
98
.endif
Lines 108-113 Link Here
108
post-install:
128
post-install:
109
.if defined(WITH_MTP) || defined(WITH_NJB) || defined(WITH_GPOD)
129
.if defined(WITH_MTP) || defined(WITH_NJB) || defined(WITH_GPOD)
110
	@${CAT} ${PKGMESSAGE}
130
	@${CAT} ${PKGMESSAGE}
131
.endif
132
.if !defined(WITH_RUBY)
133
.for i in lyrics_astraweb lyrics_lyrc ruby_debug score_default score_impulsive
134
	${RM} -rf ${PREFIX}/share/apps/amarok/scripts/${i}
135
.endfor
111
.endif
136
.endif
112
137
113
check-options-version:
138
check-options-version:
(-)amarok.old/files/patch-yy (+16 lines)
Line 0 Link Here
1
--- configure.bak	Sat Feb 24 02:37:56 2007
2
+++ configure	Sat Feb 24 02:40:37 2007
3
@@ -44543,10 +44543,12 @@
4
 ###############################################################################
5
 ## TODO: Check version number >= 1.8
6
 
7
-if test "x$RUBY" = "xno" -o "x$have_ruby_h" = "xno"; then
8
+if test "with_daap_TRUE" = ""; then
9
+  if test "x$RUBY" = "xno" -o "x$have_ruby_h" = "xno"; then
10
     amarok_error_noruby=yes
11
     DO_NOT_COMPILE="$DO_NOT_COMPILE amarok"
12
     no_amarok=yes
13
+  fi
14
 fi
15
 
16
 ###############################################################################
(-)amarok.old/pkg-plist (-74 / +74 lines)
Lines 1-8 Link Here
1
bin/amarok
1
bin/amarok
2
bin/amarokapp
2
bin/amarokapp
3
bin/amarokcollectionscanner
3
bin/amarokcollectionscanner
4
bin/amarok_daapserver.rb
4
%%DAAP%%bin/amarok_daapserver.rb
5
bin/amarok_proxy.rb
5
%%DAAP%%bin/amarok_proxy.rb
6
lib/libamarok.a
6
lib/libamarok.a
7
lib/libamarok.la
7
lib/libamarok.la
8
lib/libamarok.so
8
lib/libamarok.so
Lines 10-18 Link Here
10
lib/kde3/konqsidebar_universalamarok.a
10
lib/kde3/konqsidebar_universalamarok.a
11
lib/kde3/konqsidebar_universalamarok.la
11
lib/kde3/konqsidebar_universalamarok.la
12
lib/kde3/konqsidebar_universalamarok.so
12
lib/kde3/konqsidebar_universalamarok.so
13
lib/kde3/libamarok_daap-mediadevice.so
13
%%DAAP%%lib/kde3/libamarok_daap-mediadevice.so
14
lib/kde3/libamarok_daap-mediadevice.la
14
%%DAAP%%lib/kde3/libamarok_daap-mediadevice.la
15
lib/kde3/libamarok_daap-mediadevice.a
15
%%DAAP%%lib/kde3/libamarok_daap-mediadevice.a
16
lib/kde3/libamarok_massstorage-device.so
16
lib/kde3/libamarok_massstorage-device.so
17
lib/kde3/libamarok_massstorage-device.la
17
lib/kde3/libamarok_massstorage-device.la
18
lib/kde3/libamarok_massstorage-device.a
18
lib/kde3/libamarok_massstorage-device.a
Lines 34-44 Link Here
34
lib/kde3/libamarok_void-engine_plugin.a
34
lib/kde3/libamarok_void-engine_plugin.a
35
lib/kde3/libamarok_void-engine_plugin.la
35
lib/kde3/libamarok_void-engine_plugin.la
36
lib/kde3/libamarok_void-engine_plugin.so
36
lib/kde3/libamarok_void-engine_plugin.so
37
lib/ruby_lib/http11.rb
37
%%RUBY%%lib/ruby_lib/http11.rb
38
lib/ruby_lib/libhttp11.so.0
38
%%RUBY%%lib/ruby_lib/libhttp11.so.0
39
lib/ruby_lib/libhttp11.so
39
%%RUBY%%lib/ruby_lib/libhttp11.so
40
lib/ruby_lib/libhttp11.la
40
%%RUBY%%lib/ruby_lib/libhttp11.la
41
lib/ruby_lib/libhttp11.a
41
%%RUBY%%lib/ruby_lib/libhttp11.a
42
share/applications/kde/amarok.desktop
42
share/applications/kde/amarok.desktop
43
share/apps/amarok/amarokui.rc
43
share/apps/amarok/amarokui.rc
44
share/apps/amarok/data/Amarok_1.4_Welcome.ogg
44
share/apps/amarok/data/Amarok_1.4_Welcome.ogg
Lines 454-524 Link Here
454
share/apps/amarok/images/wizard_compact.png
454
share/apps/amarok/images/wizard_compact.png
455
share/apps/amarok/images/wizard_xmms.png
455
share/apps/amarok/images/wizard_xmms.png
456
share/apps/amarok/images/xine_logo.png
456
share/apps/amarok/images/xine_logo.png
457
share/apps/amarok/ruby_lib/codes.rb
457
%%RUBY%%share/apps/amarok/ruby_lib/codes.rb
458
share/apps/amarok/ruby_lib/gemconfigure.rb
458
%%RUBY%%share/apps/amarok/ruby_lib/gemconfigure.rb
459
share/apps/amarok/ruby_lib/gem_plugin.rb
459
%%RUBY%%share/apps/amarok/ruby_lib/gem_plugin.rb
460
share/apps/amarok/ruby_lib/mongrel.rb
460
%%RUBY%%share/apps/amarok/ruby_lib/mongrel.rb
461
share/apps/amarok/ruby_lib/rubygems.rb
461
%%RUBY%%share/apps/amarok/ruby_lib/rubygems.rb
462
share/apps/amarok/ruby_lib/mongrel/cgi.rb
462
%%RUBY%%share/apps/amarok/ruby_lib/mongrel/cgi.rb
463
share/apps/amarok/ruby_lib/mongrel/command.rb
463
%%RUBY%%share/apps/amarok/ruby_lib/mongrel/command.rb
464
share/apps/amarok/ruby_lib/mongrel/configurator.rb
464
%%RUBY%%share/apps/amarok/ruby_lib/mongrel/configurator.rb
465
share/apps/amarok/ruby_lib/mongrel/debug.rb
465
%%RUBY%%share/apps/amarok/ruby_lib/mongrel/debug.rb
466
share/apps/amarok/ruby_lib/mongrel/handlers.rb
466
%%RUBY%%share/apps/amarok/ruby_lib/mongrel/handlers.rb
467
share/apps/amarok/ruby_lib/mongrel/init.rb
467
%%RUBY%%share/apps/amarok/ruby_lib/mongrel/init.rb
468
share/apps/amarok/ruby_lib/mongrel/mime_types.yml
468
%%RUBY%%share/apps/amarok/ruby_lib/mongrel/mime_types.yml
469
share/apps/amarok/ruby_lib/mongrel/stats.rb
469
%%RUBY%%share/apps/amarok/ruby_lib/mongrel/stats.rb
470
share/apps/amarok/ruby_lib/mongrel/tcphack.rb
470
%%RUBY%%share/apps/amarok/ruby_lib/mongrel/tcphack.rb
471
share/apps/amarok/ruby_lib/rbconfig/datadir.rb
471
%%RUBY%%share/apps/amarok/ruby_lib/rbconfig/datadir.rb
472
share/apps/amarok/ruby_lib/rubygems/._gem_commands.rb
472
%%RUBY%%share/apps/amarok/ruby_lib/rubygems/._gem_commands.rb
473
share/apps/amarok/ruby_lib/rubygems/builder.rb
473
%%RUBY%%share/apps/amarok/ruby_lib/rubygems/builder.rb
474
share/apps/amarok/ruby_lib/rubygems/cmd_manager.rb
474
%%RUBY%%share/apps/amarok/ruby_lib/rubygems/cmd_manager.rb
475
share/apps/amarok/ruby_lib/rubygems/command.rb
475
%%RUBY%%share/apps/amarok/ruby_lib/rubygems/command.rb
476
share/apps/amarok/ruby_lib/rubygems/config_file.rb
476
%%RUBY%%share/apps/amarok/ruby_lib/rubygems/config_file.rb
477
share/apps/amarok/ruby_lib/rubygems/custom_require.rb
477
%%RUBY%%share/apps/amarok/ruby_lib/rubygems/custom_require.rb
478
share/apps/amarok/ruby_lib/rubygems/dependency_list.rb
478
%%RUBY%%share/apps/amarok/ruby_lib/rubygems/dependency_list.rb
479
share/apps/amarok/ruby_lib/rubygems/doc_manager.rb
479
%%RUBY%%share/apps/amarok/ruby_lib/rubygems/doc_manager.rb
480
share/apps/amarok/ruby_lib/rubygems/format.rb
480
%%RUBY%%share/apps/amarok/ruby_lib/rubygems/format.rb
481
share/apps/amarok/ruby_lib/rubygems/gem_commands.rb
481
%%RUBY%%share/apps/amarok/ruby_lib/rubygems/gem_commands.rb
482
share/apps/amarok/ruby_lib/rubygems/gem_openssl.rb
482
%%RUBY%%share/apps/amarok/ruby_lib/rubygems/gem_openssl.rb
483
share/apps/amarok/ruby_lib/rubygems/gem_runner.rb
483
%%RUBY%%share/apps/amarok/ruby_lib/rubygems/gem_runner.rb
484
share/apps/amarok/ruby_lib/rubygems/incremental_fetcher.rb
484
%%RUBY%%share/apps/amarok/ruby_lib/rubygems/incremental_fetcher.rb
485
share/apps/amarok/ruby_lib/rubygems/installer.rb
485
%%RUBY%%share/apps/amarok/ruby_lib/rubygems/installer.rb
486
share/apps/amarok/ruby_lib/rubygems/loadpath_manager.rb
486
%%RUBY%%share/apps/amarok/ruby_lib/rubygems/loadpath_manager.rb
487
share/apps/amarok/ruby_lib/rubygems/old_format.rb
487
%%RUBY%%share/apps/amarok/ruby_lib/rubygems/old_format.rb
488
share/apps/amarok/ruby_lib/rubygems/open-uri.rb
488
%%RUBY%%share/apps/amarok/ruby_lib/rubygems/open-uri.rb
489
share/apps/amarok/ruby_lib/rubygems/package.rb
489
%%RUBY%%share/apps/amarok/ruby_lib/rubygems/package.rb
490
share/apps/amarok/ruby_lib/rubygems/remote_installer.rb
490
%%RUBY%%share/apps/amarok/ruby_lib/rubygems/remote_installer.rb
491
share/apps/amarok/ruby_lib/rubygems/rubygems_version.rb
491
%%RUBY%%share/apps/amarok/ruby_lib/rubygems/rubygems_version.rb
492
share/apps/amarok/ruby_lib/rubygems/security.rb
492
%%RUBY%%share/apps/amarok/ruby_lib/rubygems/security.rb
493
share/apps/amarok/ruby_lib/rubygems/source_index.rb
493
%%RUBY%%share/apps/amarok/ruby_lib/rubygems/source_index.rb
494
share/apps/amarok/ruby_lib/rubygems/specification.rb
494
%%RUBY%%share/apps/amarok/ruby_lib/rubygems/specification.rb
495
share/apps/amarok/ruby_lib/rubygems/timer.rb
495
%%RUBY%%share/apps/amarok/ruby_lib/rubygems/timer.rb
496
share/apps/amarok/ruby_lib/rubygems/user_interaction.rb
496
%%RUBY%%share/apps/amarok/ruby_lib/rubygems/user_interaction.rb
497
share/apps/amarok/ruby_lib/rubygems/validator.rb
497
%%RUBY%%share/apps/amarok/ruby_lib/rubygems/validator.rb
498
share/apps/amarok/ruby_lib/rubygems/version.rb
498
%%RUBY%%share/apps/amarok/ruby_lib/rubygems/version.rb
499
share/apps/amarok/scripts/common/Publisher.py
499
share/apps/amarok/scripts/common/Publisher.py
500
share/apps/amarok/scripts/common/Zeroconf.py
500
share/apps/amarok/scripts/common/Zeroconf.py
501
share/apps/amarok/scripts/lyrics_astraweb/COPYING
501
%%RUBY%%share/apps/amarok/scripts/lyrics_astraweb/COPYING
502
share/apps/amarok/scripts/lyrics_astraweb/README
502
%%RUBY%%share/apps/amarok/scripts/lyrics_astraweb/README
503
share/apps/amarok/scripts/lyrics_astraweb/lyrics_astraweb.rb
503
%%RUBY%%share/apps/amarok/scripts/lyrics_astraweb/lyrics_astraweb.rb
504
share/apps/amarok/scripts/lyrics_astraweb/lyrics_astraweb.spec
504
%%RUBY%%share/apps/amarok/scripts/lyrics_astraweb/lyrics_astraweb.spec
505
share/apps/amarok/scripts/lyrics_lyrc/COPYING
505
%%RUBY%%share/apps/amarok/scripts/lyrics_lyrc/COPYING
506
share/apps/amarok/scripts/lyrics_lyrc/README
506
%%RUBY%%share/apps/amarok/scripts/lyrics_lyrc/README
507
share/apps/amarok/scripts/lyrics_lyrc/lyrics_lyrc.rb
507
%%RUBY%%share/apps/amarok/scripts/lyrics_lyrc/lyrics_lyrc.rb
508
share/apps/amarok/scripts/lyrics_lyrc/lyrics_lyrc.spec
508
%%RUBY%%share/apps/amarok/scripts/lyrics_lyrc/lyrics_lyrc.spec
509
share/apps/amarok/scripts/playlist2html/Playlist.py
509
share/apps/amarok/scripts/playlist2html/Playlist.py
510
share/apps/amarok/scripts/playlist2html/PlaylistServer.py
510
share/apps/amarok/scripts/playlist2html/PlaylistServer.py
511
share/apps/amarok/scripts/playlist2html/README
511
share/apps/amarok/scripts/playlist2html/README
512
share/apps/amarok/scripts/playlist2html/playlist2html.py
512
share/apps/amarok/scripts/playlist2html/playlist2html.py
513
share/apps/amarok/scripts/ruby_debug/debug.rb
513
%%RUBY%%share/apps/amarok/scripts/ruby_debug/debug.rb
514
share/apps/amarok/scripts/score_default/COPYING
514
%%RUBY%%share/apps/amarok/scripts/score_default/COPYING
515
share/apps/amarok/scripts/score_default/README
515
%%RUBY%%share/apps/amarok/scripts/score_default/README
516
share/apps/amarok/scripts/score_default/score_default.spec
516
%%RUBY%%share/apps/amarok/scripts/score_default/score_default.spec
517
share/apps/amarok/scripts/score_default/score_default.rb
517
%%RUBY%%share/apps/amarok/scripts/score_default/score_default.rb
518
share/apps/amarok/scripts/score_impulsive/COPYING
518
%%RUBY%%share/apps/amarok/scripts/score_impulsive/COPYING
519
share/apps/amarok/scripts/score_impulsive/README
519
%%RUBY%%share/apps/amarok/scripts/score_impulsive/README
520
share/apps/amarok/scripts/score_impulsive/score_impulsive.spec
520
%%RUBY%%share/apps/amarok/scripts/score_impulsive/score_impulsive.spec
521
share/apps/amarok/scripts/score_impulsive/score_impulsive.rb
521
%%RUBY%%share/apps/amarok/scripts/score_impulsive/score_impulsive.rb
522
share/apps/amarok/scripts/templates/amarok.rb
522
share/apps/amarok/scripts/templates/amarok.rb
523
share/apps/amarok/scripts/templates/python_qt_template.py
523
share/apps/amarok/scripts/templates/python_qt_template.py
524
share/apps/amarok/scripts/templates/ruby_qt_template.rb
524
share/apps/amarok/scripts/templates/ruby_qt_template.rb
Lines 1105-1114 Link Here
1105
@dirrm share/apps/amarok/scripts/lyrics_astraweb
1105
@dirrm share/apps/amarok/scripts/lyrics_astraweb
1106
@dirrm share/apps/amarok/scripts/common
1106
@dirrm share/apps/amarok/scripts/common
1107
@dirrm share/apps/amarok/scripts
1107
@dirrm share/apps/amarok/scripts
1108
@dirrm share/apps/amarok/ruby_lib/rubygems
1108
%%RUBY%%@dirrm share/apps/amarok/ruby_lib/rubygems
1109
@dirrm share/apps/amarok/ruby_lib/rbconfig
1109
%%RUBY%%@dirrm share/apps/amarok/ruby_lib/rbconfig
1110
@dirrm share/apps/amarok/ruby_lib/mongrel
1110
%%RUBY%%@dirrm share/apps/amarok/ruby_lib/mongrel
1111
@dirrm share/apps/amarok/ruby_lib
1111
%%RUBY%%@dirrm share/apps/amarok/ruby_lib
1112
@dirrm share/apps/amarok/images
1112
@dirrm share/apps/amarok/images
1113
@dirrm share/apps/amarok/icons/crystalsvg/64x64/actions
1113
@dirrm share/apps/amarok/icons/crystalsvg/64x64/actions
1114
@dirrm share/apps/amarok/icons/crystalsvg/64x64
1114
@dirrm share/apps/amarok/icons/crystalsvg/64x64
Lines 1131-1134 Link Here
1131
@dirrm share/apps/amarok/icons
1131
@dirrm share/apps/amarok/icons
1132
@dirrm share/apps/amarok/data
1132
@dirrm share/apps/amarok/data
1133
@dirrm share/apps/amarok
1133
@dirrm share/apps/amarok
1134
@dirrm lib/ruby_lib
1134
%%RUBY%%@dirrm lib/ruby_lib

Return to bug 109918