benn/lumiera_
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove Debian/Lenny workarounds

Browse source 
definitively requiring Squeeze now
This commit is contained in:
Fischlurch 2011-12-03 01:56:30 +01:00
parent 77548e74c6
commit 34f2de641f
2 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
SConstruct
View file

@ -1,6 +1,6 @@
# -*- python -*- # -*- python -*-
## ##
## SConstruct - SCons based build-sytem for Lumiera ## SConstruct - SCons based build-system for Lumiera
## ##
# Copyright (C) Lumiera.org # Copyright (C) Lumiera.org
@ -52,8 +52,9 @@ installIcon = '#$DESTDIR/share/lumiera/icons'
installUIRes = '#$DESTDIR/share/lumiera/' installUIRes = '#$DESTDIR/share/lumiera/'
installConf = '#$DESTDIR/lib/lumiera/config' installConf = '#$DESTDIR/lib/lumiera/config'
localDefinitions = locals()
#-----------------------------------Configuration #-----------------------------------Configuration
localDefinitions = locals()
@ -87,8 +88,6 @@ def setupBasicEnvironment(localDefinitions):
) )
handleVerboseMessages(env) handleVerboseMessages(env)
env.Append ( CCCOM=' -std=gnu99')
env.Append ( SHCCCOM=' -std=gnu99') # workaround for a bug: CCCOM currently doesn't honour CFLAGS, only CCFLAGS
env.Replace( CPPPATH =["#src"] # used to find includes, "#" means always absolute to build-root env.Replace( CPPPATH =["#src"] # used to find includes, "#" means always absolute to build-root
, CPPDEFINES=['LUMIERA_VERSION='+VERSION ] # note: it's a list to append further defines , CPPDEFINES=['LUMIERA_VERSION='+VERSION ] # note: it's a list to append further defines
, CCFLAGS='-Wall -Wextra ' , CCFLAGS='-Wall -Wextra '

20
src/gui/widgets/timecode-widget.cpp
View file

@ -189,8 +189,7 @@ TimeCode::set_widget_name(string name)
void void
TimeCode::setup_events() TimeCode::setup_events()
{ {
// FIXME: change to set_can_focus(true) once Debian squeeze is released clock_base.set_can_focus(true);
clock_base.set_flags(CAN_FOCUS);
const Gdk::EventMask eventMask = const Gdk::EventMask eventMask =
Gdk::BUTTON_PRESS_MASK| Gdk::BUTTON_PRESS_MASK|
@ -210,15 +209,14 @@ TimeCode::setup_events()
ms_seconds_ebox.add_events(eventMask); ms_seconds_ebox.add_events(eventMask);
audio_frames_ebox.add_events(eventMask); audio_frames_ebox.add_events(eventMask);
// FIXME: change to set_can_focus(true) once Debian squeeze is released hours_ebox.set_can_focus(true);
hours_ebox.set_flags(CAN_FOCUS); minutes_ebox.set_can_focus(true);
minutes_ebox.set_flags(CAN_FOCUS); seconds_ebox.set_can_focus(true);
seconds_ebox.set_flags(CAN_FOCUS); frames_ebox.set_can_focus(true);
frames_ebox.set_flags(CAN_FOCUS); audio_frames_ebox.set_can_focus(true);
audio_frames_ebox.set_flags(CAN_FOCUS); ms_hours_ebox.set_can_focus(true);
ms_hours_ebox.set_flags(CAN_FOCUS); ms_minutes_ebox.set_can_focus(true);
ms_minutes_ebox.set_flags(CAN_FOCUS); ms_seconds_ebox.set_can_focus(true);
ms_seconds_ebox.set_flags(CAN_FOCUS);
hours_ebox.signal_motion_notify_event().connect(bind(mem_fun( hours_ebox.signal_motion_notify_event().connect(bind(mem_fun(
*this, &TimeCode::field_motion_notify_event), SMPTE_Hours)); *this, &TimeCode::field_motion_notify_event), SMPTE_Hours));