Attachment #575 for bug #981

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 981
Collapse All | Expand All

Lines 16-21 Link Here

(-)amarok/amarok/src/mediadevice/daap/mongrel/http11/CMakeLists.txt.ORI (+1 lines)
16		16
17	include_directories(	17	include_directories(
18	${RUBY_INCLUDE_DIR}	18	${RUBY_INCLUDE_DIR}
		19	${RUBY_ARCH_INCLUDE_DIR}
19	)	20	)
20		21
21	##### other data ################################	22	##### other data ################################




  tde_message_fatal( "Unable to run ${RUBY_EXECUTABLE}!\n RUBY is correctly installed?" )
endif( )

execute_process(
  COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['MAJOR'] )"
  OUTPUT_VARIABLE RUBY_MAJOR_VERSION
  RESULT_VARIABLE _result
  OUTPUT_STRIP_TRAILING_WHITESPACE)
if( _result )
  tde_message_fatal( "Unable to run ${RUBY_EXECUTABLE}!\n RUBY is correctly installed?" )
endif( )

execute_process(
  COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['MINOR'] )"
  OUTPUT_VARIABLE RUBY_MINOR_VERSION
  RESULT_VARIABLE _result
  OUTPUT_STRIP_TRAILING_WHITESPACE)
if( _result )
  tde_message_fatal( "Unable to run ${RUBY_EXECUTABLE}!\n RUBY is correctly installed?" )
endif( )

if( RUBY_INCLUDE_DIR AND RUBY_LDFLAGS )
  message( STATUS "Found RUBY: ${RUBY_EXECUTABLE}" )
  message( STATUS "  RUBY_INCLUDE_DIR: ${RUBY_INCLUDE_DIR}" )
  message( STATUS "  RUBY_LDFLAGS: ${RUBY_LDFLAGS}" )
  message( STATUS "  RUBY_MAJOR_VERSION: ${RUBY_MAJOR_VERSION}")
  message( STATUS "  RUBY_MINOR_VERSION: ${RUBY_MINOR_VERSION}")
endif( )

if ( "${RUBY_MAJOR_VERSION}.${RUBY_MINOR_VERSION}" VERSION_LESS "1.9" )
  message( STATUS "  You have an old version of Ruby ! (<1.9)")
  set ( HAVE_OLD_RUBY 1 CACHE INTERNAL "" )
endif( )

Lines 16-18 Link Here

(-)amarok/config.h.cmake.ORI (+2 lines)
16		16
17	#cmakedefine TAGLIB_15 1	17	#cmakedefine TAGLIB_15 1
18	#cmakedefine HAVE_QGLWIDGET 1	18	#cmakedefine HAVE_QGLWIDGET 1
		19
		20	#cmakedefine HAVE_OLD_RUBY @HAVE_OLD_RUBY@

Lines 15-20 Link Here

(-)amarok/amarok/src/mediadevice/daap/mongrel/http11/CMakeLists.txt.ORI (+1 lines)
15	)	15	)
16		16
17	include_directories(	17	include_directories(
		18	${CMAKE_BINARY_DIR}
18	${RUBY_INCLUDE_DIR}	19	${RUBY_INCLUDE_DIR}
19	${RUBY_ARCH_INCLUDE_DIR}	20	${RUBY_ARCH_INCLUDE_DIR}
20	)	21	)

Lines 2-7 Link Here

(-)amarok/amarok/src/mediadevice/daap/mongrel/http11/http11.c.ruby (+27 lines)
2	* Copyright (c) 2005 Zed A. Shaw	2	* Copyright (c) 2005 Zed A. Shaw
3	* You can redistribute it and/or modify it under the same terms as Ruby.	3	* You can redistribute it and/or modify it under the same terms as Ruby.
4	*/	4	*/
		5	#include "config.h"
5	#include "ruby.h"	6	#include "ruby.h"
6	#include "ext_help.h"	7	#include "ext_help.h"
7	#include <assert.h>	8	#include <assert.h>
Lines 74-80 Link Here
74	f = rb_str_dup(global_http_prefix);	75	f = rb_str_dup(global_http_prefix);
75	f = rb_str_buf_cat(f, field, flen);	76	f = rb_str_buf_cat(f, field, flen);
76		77
		78	#ifdef HAVE_OLD_RUBY
77	for(ch = RSTRING(f)->ptr, end = ch + RSTRING(f)->len; ch < end; ch++) {	79	for(ch = RSTRING(f)->ptr, end = ch + RSTRING(f)->len; ch < end; ch++) {
		80	#else
		81	for(ch = RSTRING_PTR(f), end = ch + RSTRING_LEN(f); ch < end; ch++) {
		82	#endif
78	if(*ch == '-') {	83	if(*ch == '-') {
79	*ch = '_';	84	*ch = '_';
80	} else {	85	} else {
Lines 157-168 Link Here
157		162
158	rb_hash_aset(req, global_gateway_interface, global_gateway_interface_value);	163	rb_hash_aset(req, global_gateway_interface, global_gateway_interface_value);
159	if((temp = rb_hash_aref(req, global_http_host)) != Qnil) {	164	if((temp = rb_hash_aref(req, global_http_host)) != Qnil) {
		165	#ifdef HAVE_OLD_RUBY
160	colon = strchr(RSTRING(temp)->ptr, ':');	166	colon = strchr(RSTRING(temp)->ptr, ':');
		167	#else
		168	colon = strchr(RSTRING_PTR(temp), ':');
		169	#endif
161	if(colon != NULL) {	170	if(colon != NULL) {
		171	#ifdef HAVE_OLD_RUBY
162	rb_hash_aset(req, global_server_name, rb_str_substr(temp, 0, colon - RSTRING(temp)->ptr));	172	rb_hash_aset(req, global_server_name, rb_str_substr(temp, 0, colon - RSTRING(temp)->ptr));
		173	#else
		174	rb_hash_aset(req, global_server_name, rb_str_substr(temp, 0, colon - RSTRING_PTR(temp)));
		175	#endif
163	rb_hash_aset(req, global_server_port,	176	rb_hash_aset(req, global_server_port,
		177	#ifdef HAVE_OLD_RUBY
164	rb_str_substr(temp, colon - RSTRING(temp)->ptr+1,	178	rb_str_substr(temp, colon - RSTRING(temp)->ptr+1,
165	RSTRING(temp)->len));	179	RSTRING(temp)->len));
		180	#else
		181	rb_str_substr(temp, colon - RSTRING_PTR(temp)+1,
		182	RSTRING_LEN(temp)));
		183	#endif
166	} else {	184	} else {
167	rb_hash_aset(req, global_server_name, temp);	185	rb_hash_aset(req, global_server_name, temp);
168	rb_hash_aset(req, global_server_port, global_port_80);	186	rb_hash_aset(req, global_server_port, global_port_80);
Lines 281-288 Link Here
281	DATA_GET(self, http_parser, http);	299	DATA_GET(self, http_parser, http);
282		300
283	from = FIX2INT(start);	301	from = FIX2INT(start);
		302	#ifdef HAVE_OLD_RUBY
284	dptr = RSTRING(data)->ptr;	303	dptr = RSTRING(data)->ptr;
285	dlen = RSTRING(data)->len;	304	dlen = RSTRING(data)->len;
		305	#else
		306	dptr = RSTRING_PTR(data);
		307	dlen = RSTRING_LEN(data);
		308	#endif
286		309
287	if(from >= dlen) {	310	if(from >= dlen) {
288	rb_raise(eHttpParserError, "Requested start is after data buffer end.");	311	rb_raise(eHttpParserError, "Requested start is after data buffer end.");
Lines 512-518 Link Here
512	if(pref_len == 1 && uri_str[0] == '/') {	535	if(pref_len == 1 && uri_str[0] == '/') {
513	rb_ary_push(result, uri);	536	rb_ary_push(result, uri);
514	} else {	537	} else {
		538	#ifdef HAVE_OLD_RUBY
515	rb_ary_push(result, rb_str_substr(uri, pref_len, RSTRING(uri)->len));	539	rb_ary_push(result, rb_str_substr(uri, pref_len, RSTRING(uri)->len));
		540	#else
		541	rb_ary_push(result, rb_str_substr(uri, pref_len, RSTRING_LEN(uri)));
		542	#endif
516	}	543	}
517		544
518	rb_ary_push(result, (VALUE)handler);	545	rb_ary_push(result, (VALUE)handler);

Return to bug 981

Lines 32-39 Link Here

(-)amarok/amarok/src/mediadevice/daap/ConfigureChecks.cmake.ruby (+25 lines)
32	tde_message_fatal( "Unable to run ${RUBY_EXECUTABLE}!\n RUBY is correctly installed?" )	32	tde_message_fatal( "Unable to run ${RUBY_EXECUTABLE}!\n RUBY is correctly installed?" )
33	endif( )	33	endif( )
34		34
		35	execute_process(
		36	COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['MAJOR'] )"
		37	OUTPUT_VARIABLE RUBY_MAJOR_VERSION
		38	RESULT_VARIABLE _result
		39	OUTPUT_STRIP_TRAILING_WHITESPACE)
		40	if( _result )
		41	tde_message_fatal( "Unable to run ${RUBY_EXECUTABLE}!\n RUBY is correctly installed?" )
		42	endif( )
		43
		44	execute_process(
		45	COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['MINOR'] )"
		46	OUTPUT_VARIABLE RUBY_MINOR_VERSION
		47	RESULT_VARIABLE _result
		48	OUTPUT_STRIP_TRAILING_WHITESPACE)
		49	if( _result )
		50	tde_message_fatal( "Unable to run ${RUBY_EXECUTABLE}!\n RUBY is correctly installed?" )
		51	endif( )
		52
35	if( RUBY_INCLUDE_DIR AND RUBY_LDFLAGS )	53	if( RUBY_INCLUDE_DIR AND RUBY_LDFLAGS )
36	message( STATUS "Found RUBY: ${RUBY_EXECUTABLE}" )	54	message( STATUS "Found RUBY: ${RUBY_EXECUTABLE}" )
37	message( STATUS " RUBY_INCLUDE_DIR: ${RUBY_INCLUDE_DIR}" )	55	message( STATUS " RUBY_INCLUDE_DIR: ${RUBY_INCLUDE_DIR}" )
38	message( STATUS " RUBY_LDFLAGS: ${RUBY_LDFLAGS}" )	56	message( STATUS " RUBY_LDFLAGS: ${RUBY_LDFLAGS}" )
		57	message( STATUS " RUBY_MAJOR_VERSION: ${RUBY_MAJOR_VERSION}")
		58	message( STATUS " RUBY_MINOR_VERSION: ${RUBY_MINOR_VERSION}")
39	endif( )	59	endif( )
		60
		61	if ( "${RUBY_MAJOR_VERSION}.${RUBY_MINOR_VERSION}" VERSION_LESS "1.9" )
		62	message( STATUS " You have an old version of Ruby ! (<1.9)")
		63	set ( HAVE_OLD_RUBY 1 CACHE INTERNAL "" )
		64	endif( )